* merged the auto-remove branch

diff --combined apt-pkg/init.h
index 63547619fa01b8aeb26ce3656c1b486d4cfa755e,6a832bddfdb7f7ba1227f907821e6184e77d1434..51a7ba2ebb3b7207fed5a754fcc89720df092066
--- 1/apt-pkg/init.h
--- 2/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@@ -17,8 -17,8 +17,8 @@@
  #include <apt-pkg/pkgsystem.h>
  
  // See the makefile
 -#define APT_PKG_MAJOR 3
 -#define APT_PKG_MINOR 13
 +#define APT_PKG_MAJOR 4
- #define APT_PKG_MINOR 0
++#define APT_PKG_MINOR 1
  #define APT_PKG_RELEASE 0
      
  extern const char *pkgVersion;

diff --combined apt-pkg/makefile
index 7887fce928a243de07f7becb379a984c2d9c38f8,7093d23ceaee873d0d3b879735acac33b480eddc..29c8ee135ceeb45e24a1cc82c542c2cae543e928
--- 1/apt-pkg/makefile
--- 2/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@@ -13,7 -13,7 +13,7 @@@ include ../buildlib/defaults.ma
  # methods/makefile - FIXME
  LIBRARY=apt-pkg
  LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
- MAJOR=4.0
 -MAJOR=3.13
++MAJOR=4.1
  MINOR=0
  SLIBS=$(PTHREADLIB) $(INTLLIBS)
  APT_DOMAIN:=libapt-pkg$(MAJOR)
@@@ -21,11 -21,11 +21,11 @@@
  # 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/hashes.cc \
 +       contrib/md5.cc contrib/sha1.cc contrib/sha256.cc contrib/hashes.cc \
         contrib/cdromutl.cc contrib/crc-16.cc \
         contrib/fileutl.cc 
  HEADERS = mmap.h error.h configuration.h fileutl.h  cmndline.h \
 -        md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h hashes.h
 +        md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h
  
  # Source code for the core main library
  SOURCE+= pkgcache.cc version.cc depcache.cc \

diff --combined apt-pkg/pkgcachegen.cc
index 1106667d5a3309c023a4f7cb5c44853d1d889d0a,e9985e1cb1b8240a7d3353c7429edf113e09f079..3f02725c1af50dd101f14db82204340c7376818f
--- 1/apt-pkg/pkgcachegen.cc
--- 2/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@@ -26,6 -26,8 +26,8 @@@
  #include <apt-pkg/sptr.h>
  #include <apt-pkg/pkgsystem.h>
  
+ #include <apt-pkg/tagfile.h>
+ 
  #include <apti18n.h>
  
  #include <vector>
@@@ -125,46 -127,16 +127,46 @@@ bool pkgCacheGenerator::MergeList(ListP
        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)
         if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == 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();
 +       pkgCache::VerIterator Ver = Pkg.VersionList();
 +       map_ptrloc *LastVer = &Pkg->VersionList;
 +
 +       for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) 
 +       {
 +          pkgCache::DescIterator Desc = Ver.DescriptionList();
 +          map_ptrloc *LastDesc = &Ver->DescriptionList;
 +
 +          for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++)
 +          {
 +
 +             if (MD5SumValue(Desc.md5()) == CurMd5) 
 +               {
 +                // Add new description
 +                *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc);
 +                Desc->ParentPkg = Pkg.Index();
 +                
 +                if (NewFileDesc(Desc,List) == false)
 +                   return _error->Error(_("Error occured while processing %s (NewFileDesc1)"),PackageName.c_str());
 +                break;
 +             }
 +          }
 +       }
 +
         continue;
        }
  
        pkgCache::VerIterator Ver = Pkg.VersionList();
 -      map_ptrloc *Last = &Pkg->VersionList;
 +      map_ptrloc *LastVer = &Pkg->VersionList;
        int Res = 1;
 -      for (; Ver.end() == false; Last = &Ver->NextVer, Ver++)
 +      for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
        {
         Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
         if (Res >= 0)
@@@ -198,7 -170,7 +200,7 @@@
        // Skip to the end of the same version set.
        if (Res == 0)
        {
 -       for (; Ver.end() == false; Last = &Ver->NextVer, Ver++)
 +       for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
         {
            Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
            if (Res != 0)
@@@ -207,10 -179,9 +209,10 @@@
        }
  
        // Add a new version
 -      *Last = NewVersion(Ver,Version,*Last);
 +      *LastVer = NewVersion(Ver,Version,*LastVer);
        Ver->ParentPkg = Pkg.Index();
        Ver->Hash = Hash;
 +
        if (List.NewVersion(Ver) == false)
         return _error->Error(_("Error occurred while processing %s (NewVersion1)"),
                              PackageName.c_str());
@@@ -230,21 -201,6 +232,21 @@@
         FoundFileDeps |= List.HasFileDeps();
         return true;
        }      
 +
 +      /* Record the Description data. Description data always exist in
 +       Packages and Translation-* files. */
 +      pkgCache::DescIterator Desc = Ver.DescriptionList();
 +      map_ptrloc *LastDesc = &Ver->DescriptionList;
 +      
 +      // Skip to the end of description set
 +      for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++);
 +
 +      // Add new description
 +      *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc);
 +      Desc->ParentPkg = Pkg.Index();
 +
 +      if (NewFileDesc(Desc,List) == false)
 +       return _error->Error(_("Error occured while processing %s (NewFileDesc2)"),PackageName.c_str());
     }
  
     FoundFileDeps |= List.HasFileDeps();
@@@ -255,9 -211,6 +257,9 @@@
     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."));
@@@ -320,7 -273,7 +322,7 @@@ bool pkgCacheGenerator::NewPackage(pkgC
     Pkg = Cache.FindPkg(Name);
     if (Pkg.end() == false)
        return true;
 -       
 +
     // Get a structure
     unsigned long Package = Map.Allocate(sizeof(pkgCache::Package));
     if (Package == 0)
@@@ -398,62 -351,6 +400,62 @@@ unsigned long pkgCacheGenerator::NewVer
     return Version;
  }
                                                                        /*}}}*/
 +// CacheGenerator::NewFileDesc - Create a new File<->Desc association /*{{{*/
 +// ---------------------------------------------------------------------
 +/* */
 +bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc,
 +                                 ListParser &List)
 +{
 +   if (CurrentFile == 0)
 +      return true;
 +   
 +   // Get a structure
 +   unsigned long DescFile = Map.Allocate(sizeof(pkgCache::DescFile));
 +   if (DescFile == 0)
 +      return 0;
 +
 +   pkgCache::DescFileIterator DF(Cache,Cache.DescFileP + DescFile);
 +   DF->File = CurrentFile - Cache.PkgFileP;
 +
 +   // Link it to the end of the list
 +   map_ptrloc *Last = &Desc->FileList;
 +   for (pkgCache::DescFileIterator D = Desc.FileList(); D.end() == false; D++)
 +      Last = &D->NextFile;
 +
 +   DF->NextFile = *Last;
 +   *Last = DF.Index();
 +   
 +   DF->Offset = List.Offset();
 +   DF->Size = List.Size();
 +   if (Cache.HeaderP->MaxDescFileSize < DF->Size)
 +      Cache.HeaderP->MaxDescFileSize = DF->Size;
 +   Cache.HeaderP->DescFileCount++;
 +   
 +   return true;
 +}
 +                                                                      /*}}}*/
 +// CacheGenerator::NewDescription - Create a new Description          /*{{{*/
 +// ---------------------------------------------------------------------
 +/* This puts a description structure in the linked list */
 +map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,
 +                                          const string &Lang, const MD5SumValue &md5sum,
 +                                          map_ptrloc Next)
 +{
 +   // Get a structure
 +   map_ptrloc Description = Map.Allocate(sizeof(pkgCache::Description));
 +   if (Description == 0)
 +      return 0;
 +
 +   // Fill it in
 +   Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description);
 +   Desc->NextDesc = Next;
 +   Desc->ID = Cache.HeaderP->DescriptionCount++;
 +   Desc->language_code = Map.WriteString(Lang);
 +   Desc->md5sum = Map.WriteString(md5sum.Value());
 +
 +   return Description;
 +}
 +                                                                      /*}}}*/
  // ListParser::NewDepends - Create a dependency element                       /*{{{*/
  // ---------------------------------------------------------------------
  /* This creates a dependency element in the tree. It is linked to the
@@@ -685,7 -582,7 +687,7 @@@ static bool CheckValidity(const string 
        pkgCache::PkgFileIterator File = (*Start)->FindInCache(Cache);
        if (File.end() == true)
         return false;
 -      
 +
        Visited[File->ID] = true;
     }
     

diff --combined apt-pkg/tagfile.cc
index fc020436ca37345e1e062be8d9d8371a60e52afd,79ff18de4063af437eb8415859eead6dba428f5c..25e2930fac6906b4d24cb3cc5855fdb3bc3bc776
--- 1/apt-pkg/tagfile.cc
--- 2/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@@ -98,7 -98,8 +98,8 @@@ bool pkgTagFile::Jump(pkgTagSection &Ta
     iOffset = Offset;
     Start = Buffer + iOffset;
     
-    if (Tag.Scan(Start,End - Start) == false)
+    // Start != End is a special case to not fail on empty TagFiles
+    if (Start != End && Tag.Scan(Start,End - Start) == false)
        return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str());
     
     return true;
@@@ -342,8 -343,7 +343,8 @@@ static const char *iTFRewritePackageOrd
                            "Filename",
                            "Size",
                            "MD5Sum",
 -                          "SHA1Sum",
 +                          "SHA1",
 +                          "SHA256",
                             "MSDOS-Filename",   // Obsolete
                            "Description",
                            0};

diff --combined configure.in
index a8e565848007cd61ac3511fd546cc839bf4ae872,6d42f340e231f0410cd58824c176eedd7e0b7d97..f0eb6e8f978e94462ca251ceb5d1fd5ee957efa4
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1exp1")
 -AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1-0.1")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.44.2exp1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
@@@ -175,21 -175,12 +175,21 @@@ dnl Check for debiando
  AC_PATH_PROG(DEBIANDOC_HTML,debiandoc2html)
  AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text)
  
 +dnl Check for doxygen
 +AC_PATH_PROG(DOXYGEN, doxygen)
 +
  dnl Check for the SGML tools needed to build man pages
  AC_PATH_PROG(DOCBOOK2MAN,docbook2man)
  
  dnl Check for the XML tools needed to build man pages
  AC_PATH_PROG(XMLTO,xmlto)
  
 +dnl Check for graphviz
 +AC_CHECK_PROG([HAVE_DOT], [dot], [YES], [NO])
 +AC_PATH_PROG([DOT], [dot], [])
 +DOTDIR=$(dirname $DOT)
 +AC_SUBST(DOTDIR)
 +
  dnl Check for YODL
  dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","")
  
@@@ -209,4 -200,4 +209,4 @@@ f
  AC_SUBST(USE_NLS)
  AC_PATH_PROG(BASH, bash)
  
 -AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make -s dirs)
 +AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile,make -s dirs)

diff --combined debian/changelog
index 83135ec08d2065ae05ee03bbf3d794cd440474cb,8b11ff0da37fb181ba677161bc246d23f39e6131..e48fb77d82ec6fa9994f7d191364ea2d0aa634a5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,41 -1,44 +1,50 @@@
- apt (0.6.44.1exp1) experimental; urgency=low
 -apt (0.6.44.2) unstable; urgency=low
 -
 -  * apt-pkg/depcache.cc:
 -    - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
 -  * merged from 
 -    http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
 -      * sk.po: Completed to 512t
 -      * eu.po: Completed to 512t
 -      * fr.po: Completed to 512t
 -      * sv.po: Completed to 512t
 -      * Update all PO and the POT. Gives 506t6f for formerly
 -        complete translations
 -
 - --
++apt (0.6.44.2exp1) experimental; urgency=low
 +
 +  * added support for i18n of the package descriptions
++  * added support for aptitude like auto-install tracking (a HUGE
++    HUGE thanks to Daniel Burrows who made this possible, if you meet
++    him, please give him a HUG and tell him how great he his!)
 +  * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch
 +  * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental
-   * merged patch from Otavio (thanks!) to better support translations
-     that need the full language-code (like pt_BR)
 +  
 + -- Michael Vogt <mvo@debian.org>  Tue,  6 Jun 2006 19:31:31 +0200
  
+ apt (0.6.44.1-0.1) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * Don't give an error when parsing empty Packages/Sources files.
+     (Closes: #366931, #367086, #370160)
+ 
+  -- Steinar H. Gunderson <sesse@debian.org>  Fri,  9 Jun 2006 00:52:21 +0200
+ 
  apt (0.6.44.1) unstable; urgency=low
  
 +  * apt-pkg/acquire-item.cc:
 +    - fix reversed logic of the "Acquire::PDiffs" option
    * merged from 
      http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
      - po/LINGUAS: added "bg" Closes: #360262
      - po/gl.po: Galician translation update. Closes: #366849
      - po/hu.po: Hungarian translation update. Closes: #365448
      - po/cs.po: Czech translation updated. Closes: #367244
 +  * apt-pkg/contrib/sha256.cc:
 +    - applied patch to fix unaligned access problem. Closes: #367417
 +      (thanks to David Mosberger)
  
   -- Michael Vogt <mvo@debian.org>  Tue, 16 May 2006 21:51:16 +0200
  
  apt (0.6.44) unstable; urgency=low
  
    * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large
 +  * apt-pkg/contrib/sha256.{cc,h},hashes.{cc,h}: support for sha256 
 +    (thanks to Anthony Towns)
 +  * ftparchive/cachedb.{cc,h},writer.{cc,h}: optimizations 
 +    (thanks to Anthony Towns)
 +  * apt pdiff support from experimental merged
 +  * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
    * apt-pkg/deb/dpkgpm.cc: 
      - wording fixes (thanks to Matt Zimmerman)
 -    - fix error in dpkg interaction (closes: #364513, 
 -      thanks to Martin Dickopp)
 +    - fix error in dpkg interaction (closes: #364513, thanks to Martin Dickopp)
    * apt-pkg/tagfile.{cc,h}:
      - use MMap to read the entries (thanks to Zephaniah E. Hull for the
        patch) Closes: #350025
@@@ -230,7 -233,7 +239,7 @@@ apt (0.6.42) unstable; urgency=lo
    * cmdline/apt-cdrom.cc: 
      - fix some missing gettext() calls (closes: #334539)
    * doc/apt-cache.8.xml: fix typo (closes: #334714)
 -  
 +
   -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2005 22:02:09 +0200
  
  apt (0.6.41) unstable; urgency=low
@@@ -330,6 -333,7 +339,7 @@@ apt (0.6.37) breezy; urgency=lo
    * Add Welsh translation from Dafydd Harries
      (daf@muse.19inch.net--2005/apt--main--0--patch-1)
    * Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+   * Fix a incorrect example in the man-page (closes: #282918)
  
   -- Matt Zimmerman <mdz@ubuntu.com>  Tue, 24 May 2005 14:38:25 -0700
  

diff --combined doc/examples/configure-index
index 7346ba9bb4324b4ea14c63fd498b769efbc5f3cd,d9e78559dc48fdcdfcd34a07b8f74d19e0faa2a0..ddd9a9d16cbdcd1b3dfdf5a941358cfda7091df2
--- 1/doc/examples/configure-index
--- 2/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@@ -24,11 -24,15 +24,15 @@@ AP
  {
    Architecture "i386";
    Build-Essential "build-essential";
-   
+ 
+   NeverAutoRemove  { "linux-kernel.*";  };  // packages that should never
+                                             // considered for autoRemove
+ 
    // Options for apt-get
    Get 
    {
       Arch-Only "false";
+      AutomaticRemove "false";       
       Download-Only "false";
       Simulate "false";
       Assume-Yes "false";
@@@ -104,8 -108,6 +108,8 @@@ Acquir
    Queue-Mode "host";       // host|access
    Retries "0";
    Source-Symlinks "true";
 +
 +  PDiffs "true";     // try to get the IndexFile diffs
    
    // HTTP method configuration
    http 
@@@ -246,12 -248,14 +250,14 @@@ DPk
  Debug 
  {
    pkgProblemResolver "false";
+   pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
    pkgAcquire "false";
    pkgAcquire::Worker "false";
    pkgDPkgPM "false";
    pkgDPkgProgressReporting "false";
    pkgOrderList "false";
-   
+   pkgAutoRemove "false";   // show information about automatic removes
+ 
    pkgInitialize "false";   // This one will dump the configuration space
    NoLocking "false";
    Acquire::Ftp "false";    // Show ftp command traffic

diff --combined methods/makefile
index 03146d1bcca068a26f309d9ca4c5043b10cfd666,7af5d38d18605ca0bf281cd1937eec561a660360..10fce8bfca66c4d6b6b23614ed289be4ab69eb97
--- 1/methods/makefile
--- 2/methods/makefile
+++ b/methods/makefile
@@@ -7,7 -7,7 +7,7 @@@ include ../buildlib/defaults.ma
  BIN := $(BIN)/methods
  
  # FIXME..
- LIB_APT_PKG_MAJOR = 4.0
 -LIB_APT_PKG_MAJOR = 3.13
++LIB_APT_PKG_MAJOR = 4.1
  APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
  
  # The file method
@@@ -59,13 -59,6 +59,13 @@@ LIB_MAKES = apt-pkg/makefil
  SOURCE = ftp.cc rfc2553emu.cc connect.cc
  include $(PROGRAM_H)
  
 +# The rred method
 +PROGRAM=rred
 +SLIBS = -lapt-pkg $(SOCKETLIBS)
 +LIB_MAKES = apt-pkg/makefile
 +SOURCE = rred.cc
 +include $(PROGRAM_H)
 +
  # The rsh method
  PROGRAM=rsh
  SLIBS = -lapt-pkg

diff --combined po/apt-all.pot
index 262200f4456cdb477e96046a9c84159d1648f316,ebf7c01cba2691d9e84ce46ae2aeb850fbeb4468..e4a6d32d68059e5d5c67015206772e4d14eb54ff
--- 1/po/apt-all.pot
--- 2/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-05-17 17:27+0200\n"
 -"POT-Creation-Date: 2006-06-26 07:08+0200\n"
++"POT-Creation-Date: 2006-06-26 15:51+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,153 -15,145 +15,153 @@@
  "Content-Type: text/plain; charset=CHARSET\n"
  "Content-Transfer-Encoding: 8bit\n"
  
 -#: cmdline/apt-cache.cc:135
 +#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
 -#: cmdline/apt-cache.cc:1508
 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:232
 +#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:272
 +#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:273
 +#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:274
 +#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:275
 +#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:276
 +#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:278
 +#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:280
 +#: cmdline/apt-cache.cc:293
 +msgid "Total Distinct Descriptions: "
 +msgstr ""
 +
 +#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:283
 +#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:285
 +#: cmdline/apt-cache.cc:300
 +msgid "Total Desc/File relations: "
 +msgstr ""
 +
 +#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:297
 +#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:311
 +#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:316
 +#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:324
 +#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1231
 +#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1385
 +#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1462
 +#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1470
 +#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr ""
  
  #. Show any packages have explicit pins
 -#: cmdline/apt-cache.cc:1482
 +#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr ""
  
  #. Installed version
 -#: cmdline/apt-cache.cc:1515
 +#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr ""
  
  #. Candidate Version
 -#: cmdline/apt-cache.cc:1522
 +#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1532
 +#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr ""
  
  #. Show the priority tables
 -#: cmdline/apt-cache.cc:1541
 +#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1556
 +#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
+ #: cmdline/apt-get.cc:2426 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1659
 +#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -251,7 -243,7 +251,7 @@@ msgid "
  "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
  msgstr ""
  
- #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
 -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr ""
@@@ -335,126 -327,115 +335,126 @@@ msgstr "
  msgid "Some files are missing in the package file group `%s'"
  msgstr ""
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr ""
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr ""
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr ""
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
  #, c-format
 -msgid "File date has changed %s"
 +msgid "Failed to stat %s"
  msgstr ""
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr ""
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr ""
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr ""
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr ""
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr ""
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr ""
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr ""
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr ""
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr ""
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr ""
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr ""
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -550,221 -531,221 +550,221 @@@ msgstr "
  msgid "Failed to rename %s to %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:120
+ #: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr ""
  
- #: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
+ #: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1558
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:237
+ #: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr ""
  
- #: cmdline/apt-get.cc:327
+ #: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr ""
  
- #: cmdline/apt-get.cc:329
+ #: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr ""
  
- #: cmdline/apt-get.cc:336
+ #: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr ""
  
- #: cmdline/apt-get.cc:338
+ #: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr ""
  
- #: cmdline/apt-get.cc:341
+ #: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr ""
  
- #: cmdline/apt-get.cc:341
+ #: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr ""
  
- #: cmdline/apt-get.cc:346
+ #: cmdline/apt-get.cc:347
  msgid " or"
  msgstr ""
  
- #: cmdline/apt-get.cc:375
+ #: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr ""
  
- #: cmdline/apt-get.cc:401
+ #: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr ""
  
- #: cmdline/apt-get.cc:423
+ #: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr ""
  
- #: cmdline/apt-get.cc:444
+ #: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr ""
  
- #: cmdline/apt-get.cc:465
+ #: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr ""
  
- #: cmdline/apt-get.cc:485
+ #: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr ""
  
- #: cmdline/apt-get.cc:538
+ #: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr ""
  
- #: cmdline/apt-get.cc:546
+ #: cmdline/apt-get.cc:547
  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:577
+ #: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr ""
  
- #: cmdline/apt-get.cc:581
+ #: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr ""
  
- #: cmdline/apt-get.cc:583
+ #: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr ""
  
- #: cmdline/apt-get.cc:585
+ #: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:589
+ #: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:649
+ #: cmdline/apt-get.cc:650
  msgid "Correcting dependencies..."
  msgstr ""
  
- #: cmdline/apt-get.cc:652
+ #: cmdline/apt-get.cc:653
  msgid " failed."
  msgstr ""
  
- #: cmdline/apt-get.cc:655
+ #: cmdline/apt-get.cc:656
  msgid "Unable to correct dependencies"
  msgstr ""
  
- #: cmdline/apt-get.cc:658
+ #: cmdline/apt-get.cc:659
  msgid "Unable to minimize the upgrade set"
  msgstr ""
  
- #: cmdline/apt-get.cc:660
+ #: cmdline/apt-get.cc:661
  msgid " Done"
  msgstr ""
  
- #: cmdline/apt-get.cc:664
+ #: cmdline/apt-get.cc:665
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr ""
  
- #: cmdline/apt-get.cc:667
+ #: cmdline/apt-get.cc:668
  msgid "Unmet dependencies. Try using -f."
  msgstr ""
  
- #: cmdline/apt-get.cc:689
+ #: cmdline/apt-get.cc:690
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr ""
  
- #: cmdline/apt-get.cc:693
+ #: cmdline/apt-get.cc:694
  msgid "Authentication warning overridden.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:700
+ #: cmdline/apt-get.cc:701
  msgid "Install these packages without verification [y/N]? "
  msgstr ""
  
- #: cmdline/apt-get.cc:702
+ #: cmdline/apt-get.cc:703
  msgid "Some packages could not be authenticated"
  msgstr ""
  
- #: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
+ #: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
  msgid "There are problems and -y was used without --force-yes"
  msgstr ""
  
- #: cmdline/apt-get.cc:755
+ #: cmdline/apt-get.cc:756
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  
- #: cmdline/apt-get.cc:764
+ #: cmdline/apt-get.cc:765
  msgid "Packages need to be removed but remove is disabled."
  msgstr ""
  
- #: cmdline/apt-get.cc:775
+ #: cmdline/apt-get.cc:776
  msgid "Internal error, Ordering didn't finish"
  msgstr ""
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
+ #: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1857 cmdline/apt-get.cc:1890
  msgid "Unable to lock the download directory"
  msgstr ""
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
+ #: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1938 cmdline/apt-get.cc:2174
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr ""
  
- #: cmdline/apt-get.cc:816
+ #: cmdline/apt-get.cc:817
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  
- #: cmdline/apt-get.cc:821
+ #: cmdline/apt-get.cc:822
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:824
+ #: cmdline/apt-get.cc:825
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:829
+ #: cmdline/apt-get.cc:830
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:832
+ #: cmdline/apt-get.cc:833
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+ #: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2028
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:849
+ #: cmdline/apt-get.cc:850
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr ""
  
- #: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
+ #: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  
- #: cmdline/apt-get.cc:866
+ #: cmdline/apt-get.cc:867
  msgid "Yes, do as I say!"
  msgstr ""
  
- #: cmdline/apt-get.cc:868
+ #: cmdline/apt-get.cc:869
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -772,74 -753,74 +772,74 @@@
  " ?] "
  msgstr ""
  
- #: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
+ #: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
  msgid "Abort."
  msgstr ""
  
- #: cmdline/apt-get.cc:889
+ #: cmdline/apt-get.cc:890
  msgid "Do you want to continue [Y/n]? "
  msgstr ""
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
+ #: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1366 cmdline/apt-get.cc:2071
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:979
+ #: cmdline/apt-get.cc:980
  msgid "Some files failed to download"
  msgstr ""
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
+ #: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2080
  msgid "Download complete and in download only mode"
  msgstr ""
  
- #: cmdline/apt-get.cc:986
+ #: cmdline/apt-get.cc:987
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
  msgstr ""
  
- #: cmdline/apt-get.cc:990
+ #: cmdline/apt-get.cc:991
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr ""
  
- #: cmdline/apt-get.cc:995
+ #: cmdline/apt-get.cc:996
  msgid "Unable to correct missing packages."
  msgstr ""
  
- #: cmdline/apt-get.cc:996
+ #: cmdline/apt-get.cc:997
  msgid "Aborting install."
  msgstr ""
  
- #: cmdline/apt-get.cc:1030
+ #: cmdline/apt-get.cc:1031
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1040
+ #: cmdline/apt-get.cc:1041
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1058
+ #: cmdline/apt-get.cc:1059
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1069
+ #: cmdline/apt-get.cc:1070
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1081
+ #: cmdline/apt-get.cc:1082
  msgid " [Installed]"
  msgstr ""
  
- #: cmdline/apt-get.cc:1086
+ #: cmdline/apt-get.cc:1087
  msgid "You should explicitly select one to install."
  msgstr ""
  
- #: cmdline/apt-get.cc:1091
+ #: cmdline/apt-get.cc:1092
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -847,79 -828,97 +847,97 @@@
  "is only available from another source\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1110
+ #: cmdline/apt-get.cc:1111
  msgid "However the following packages replace it:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1113
+ #: cmdline/apt-get.cc:1114
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr ""
  
- #: cmdline/apt-get.cc:1133
+ #: cmdline/apt-get.cc:1134
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1141
+ #: cmdline/apt-get.cc:1142
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1168
+ #: cmdline/apt-get.cc:1169
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr ""
  
- #: cmdline/apt-get.cc:1170
+ #: cmdline/apt-get.cc:1171
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr ""
  
- #: cmdline/apt-get.cc:1176
+ #: cmdline/apt-get.cc:1177
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1313
+ #: cmdline/apt-get.cc:1314
  msgid "The update command takes no arguments"
  msgstr ""
  
- #: cmdline/apt-get.cc:1326
+ #: cmdline/apt-get.cc:1327
  msgid "Unable to lock the list directory"
  msgstr ""
  
- #: cmdline/apt-get.cc:1384
+ #: cmdline/apt-get.cc:1385
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
  msgstr ""
  
- #: cmdline/apt-get.cc:1403
+ #: cmdline/apt-get.cc:1399
+ msgid "We are not supposed to delete stuff, can't start AutoRemover"
+ msgstr ""
+ 
+ #: cmdline/apt-get.cc:1424
+ msgid ""
+ "Hmm, seems like the AutoRemover destroyed something which really\n"
+ "shouldn't happen. Please file a bug report against apt."
+ msgstr ""
+ 
+ #: cmdline/apt-get.cc:1427 cmdline/apt-get.cc:1626
+ msgid "The following information may help to resolve the situation:"
+ msgstr ""
+ 
+ #: cmdline/apt-get.cc:1431
+ msgid "Internal Error, AutoRemover broke stuff"
+ msgstr ""
+ 
+ #: cmdline/apt-get.cc:1450
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
+ #: cmdline/apt-get.cc:1545 cmdline/apt-get.cc:1581
  #, c-format
  msgid "Couldn't find package %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1516
+ #: cmdline/apt-get.cc:1568
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1546
+ #: cmdline/apt-get.cc:1598
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1549
+ #: cmdline/apt-get.cc:1601
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
  msgstr ""
  
- #: cmdline/apt-get.cc:1561
+ #: cmdline/apt-get.cc:1613
  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"
@@@ -927,163 -926,159 +945,159 @@@
  "or been moved out of Incoming."
  msgstr ""
  
- #: cmdline/apt-get.cc:1569
+ #: cmdline/apt-get.cc:1621
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
  "that package should be filed."
  msgstr ""
  
- #: cmdline/apt-get.cc:1574
- msgid "The following information may help to resolve the situation:"
- msgstr ""
- 
- #: cmdline/apt-get.cc:1577
+ #: cmdline/apt-get.cc:1629
  msgid "Broken packages"
  msgstr ""
  
- #: cmdline/apt-get.cc:1603
+ #: cmdline/apt-get.cc:1660
  msgid "The following extra packages will be installed:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1674
+ #: cmdline/apt-get.cc:1731
  msgid "Suggested packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1675
+ #: cmdline/apt-get.cc:1732
  msgid "Recommended packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1695
+ #: cmdline/apt-get.cc:1752
  msgid "Calculating upgrade... "
  msgstr ""
  
- #: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
+ #: cmdline/apt-get.cc:1755 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:1703
+ #: cmdline/apt-get.cc:1760
  msgid "Done"
  msgstr ""
  
- #: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
+ #: cmdline/apt-get.cc:1825 cmdline/apt-get.cc:1833
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1876
+ #: cmdline/apt-get.cc:1933
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  
- #: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
+ #: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:2192
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1950
+ #: cmdline/apt-get.cc:2007
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1974
+ #: cmdline/apt-get.cc:2031
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1979
+ #: cmdline/apt-get.cc:2036
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1982
+ #: cmdline/apt-get.cc:2039
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1988
+ #: cmdline/apt-get.cc:2045
  #, c-format
  msgid "Fetch source %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2019
+ #: cmdline/apt-get.cc:2076
  msgid "Failed to fetch some archives."
  msgstr ""
  
- #: cmdline/apt-get.cc:2047
+ #: cmdline/apt-get.cc:2104
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2059
+ #: cmdline/apt-get.cc:2116
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2060
+ #: cmdline/apt-get.cc:2117
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2077
+ #: cmdline/apt-get.cc:2134
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2096
+ #: cmdline/apt-get.cc:2153
  msgid "Child process failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:2112
+ #: cmdline/apt-get.cc:2169
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  
- #: cmdline/apt-get.cc:2140
+ #: cmdline/apt-get.cc:2197
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2160
+ #: cmdline/apt-get.cc:2217
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2212
+ #: cmdline/apt-get.cc:2269
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr ""
  
- #: cmdline/apt-get.cc:2264
+ #: cmdline/apt-get.cc:2321
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
  "package %s can satisfy version requirements"
  msgstr ""
  
- #: cmdline/apt-get.cc:2299
+ #: cmdline/apt-get.cc:2356
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  
- #: cmdline/apt-get.cc:2324
+ #: cmdline/apt-get.cc:2381
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2338
+ #: cmdline/apt-get.cc:2395
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr ""
  
- #: cmdline/apt-get.cc:2342
+ #: cmdline/apt-get.cc:2399
  msgid "Failed to process build dependencies"
  msgstr ""
  
- #: cmdline/apt-get.cc:2374
+ #: cmdline/apt-get.cc:2431
  msgid "Supported modules:"
  msgstr ""
  
- #: cmdline/apt-get.cc:2415
+ #: cmdline/apt-get.cc:2472
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1368,9 -1363,9 +1382,9 @@@ msgid "The info and temp directories ne
  msgstr ""
  
  #. Build the status cache
- #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748
- #: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
- #: apt-pkg/pkgcachegen.cc:945
 -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645
 -#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719
 -#: apt-pkg/pkgcachegen.cc:842
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr ""
  
@@@ -1499,12 -1494,11 +1513,12 @@@ msgid "File not found
  msgstr ""
  
  #: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
  msgid "Failed to stat"
  msgstr ""
  
  #: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 +#: methods/rred.cc:240
  msgid "Failed to set modification time"
  msgstr ""
  
@@@ -1564,7 -1558,7 +1578,7 @@@ msgstr "
  msgid "Server closed the connection"
  msgstr ""
  
 -#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:471
 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
  msgid "Read error"
  msgstr ""
  
@@@ -1576,7 -1570,7 +1590,7 @@@ msgstr "
  msgid "Protocol corruption"
  msgstr ""
  
 -#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:510
 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
  msgid "Write error"
  msgstr ""
  
@@@ -1630,7 -1624,7 +1644,7 @@@ msgstr "
  msgid "Unable to accept connection"
  msgstr ""
  
 -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr ""
  
@@@ -1761,79 -1755,83 +1775,79 @@@ msgstr "
  msgid "Read error from %s process"
  msgstr ""
  
 -#: methods/http.cc:376
 +#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr ""
  
 -#: methods/http.cc:522
 +#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr ""
  
 -#: methods/http.cc:530
 +#: methods/http.cc:529
  msgid "Bad header line"
  msgstr ""
  
 -#: methods/http.cc:549 methods/http.cc:556
 +#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr ""
  
 -#: methods/http.cc:585
 +#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr ""
  
 -#: methods/http.cc:600
 +#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr ""
  
 -#: methods/http.cc:602
 +#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr ""
  
 -#: methods/http.cc:626
 +#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr ""
  
 -#: methods/http.cc:773
 +#: methods/http.cc:772
  msgid "Select failed"
  msgstr ""
  
 -#: methods/http.cc:778
 +#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr ""
  
 -#: methods/http.cc:801
 +#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr ""
  
 -#: methods/http.cc:832
 +#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr ""
  
 -#: methods/http.cc:860
 +#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr ""
  
 -#: methods/http.cc:874
 +#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  
 -#: methods/http.cc:876
 +#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr ""
  
 -#: methods/http.cc:1107
 +#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr ""
  
 -#: methods/http.cc:1124
 +#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr ""
  
 -#: methods/http.cc:1215
 +#: methods/http.cc:1214
  msgid "Internal error"
  msgstr ""
  
 -#: methods/rsh.cc:330
 -msgid "Connection closed prematurely"
 -msgstr ""
 -
  #: apt-pkg/contrib/mmap.cc:82
  msgid "Can't mmap an empty file"
  msgstr ""
@@@ -1843,7 -1841,7 +1857,7 @@@
  msgid "Couldn't make mmap of %lu bytes"
  msgstr ""
  
 -#: apt-pkg/contrib/strutl.cc:938
 +#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr ""
@@@ -2040,93 -2038,107 +2054,107 @@@ msgstr "
  msgid "Problem syncing the file"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:126
 +#: apt-pkg/pkgcache.cc:137
  msgid "Empty package cache"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:132
 +#: apt-pkg/pkgcache.cc:143
  msgid "The package cache file is corrupted"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:137
 +#: apt-pkg/pkgcache.cc:148
  msgid "The package cache file is an incompatible version"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:142
 +#: apt-pkg/pkgcache.cc:153
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:147
 +#: apt-pkg/pkgcache.cc:158
  msgid "The package cache was built for a different architecture"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:218
 +#: apt-pkg/pkgcache.cc:229
  msgid "Depends"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:218
 +#: apt-pkg/pkgcache.cc:229
  msgid "PreDepends"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:218
 +#: apt-pkg/pkgcache.cc:229
  msgid "Suggests"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:219
 +#: apt-pkg/pkgcache.cc:230
  msgid "Recommends"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:219
 +#: apt-pkg/pkgcache.cc:230
  msgid "Conflicts"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:219
 +#: apt-pkg/pkgcache.cc:230
  msgid "Replaces"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:220
 +#: apt-pkg/pkgcache.cc:231
  msgid "Obsoletes"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:231
 +#: apt-pkg/pkgcache.cc:242
  msgid "important"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:231
 +#: apt-pkg/pkgcache.cc:242
  msgid "required"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:231
 +#: apt-pkg/pkgcache.cc:242
  msgid "standard"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:232
 +#: apt-pkg/pkgcache.cc:243
  msgid "optional"
  msgstr ""
  
 -#: apt-pkg/pkgcache.cc:232
 +#: apt-pkg/pkgcache.cc:243
  msgid "extra"
  msgstr ""
  
- #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+ #: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
  msgid "Building dependency tree"
  msgstr ""
  
- #: apt-pkg/depcache.cc:61
+ #: apt-pkg/depcache.cc:102
  msgid "Candidate versions"
  msgstr ""
  
- #: apt-pkg/depcache.cc:90
+ #: apt-pkg/depcache.cc:131
  msgid "Dependency generation"
  msgstr ""
  
+ #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+ msgid "Reading state information"
+ msgstr ""
+ 
+ #: apt-pkg/depcache.cc:190
+ #, c-format
+ msgid "Failed to open StateFile %s"
+ msgstr ""
+ 
+ #: apt-pkg/depcache.cc:196
+ #, c-format
+ msgid "Failed to write temporary StateFile %s"
+ msgstr ""
+ 
  #: apt-pkg/tagfile.cc:72
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:102
+ #: apt-pkg/tagfile.cc:103
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr ""
@@@ -2161,7 -2173,7 +2189,7 @@@ msgstr "
  msgid "Opening %s"
  msgstr ""
  
 -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr ""
@@@ -2194,19 -2206,19 +2222,19 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr ""
  
- #: apt-pkg/algorithms.cc:241
+ #: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1059
+ #: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1061
+ #: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  
@@@ -2247,12 -2259,12 +2275,12 @@@ msgstr "
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
  
 -#: apt-pkg/init.cc:120
 +#: apt-pkg/init.cc:123
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr ""
  
 -#: apt-pkg/init.cc:136
 +#: apt-pkg/init.cc:139
  msgid "Unable to determine a suitable packaging system type"
  msgstr ""
  
@@@ -2286,134 -2298,119 +2314,134 @@@ msgstr "
  msgid "No priority (or zero) specified for pin"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:74
+ #: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:117
+ #: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:132
 -#: apt-pkg/pkgcachegen.cc:131
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:155
 -#: apt-pkg/pkgcachegen.cc:152
++#: apt-pkg/pkgcachegen.cc:157
 +#, c-format
 +msgid "Error occured while processing %s (NewFileDesc1)"
 +msgstr ""
 +
- #: apt-pkg/pkgcachegen.cc:180
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:184
 -#: apt-pkg/pkgcachegen.cc:156
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:215
 -#: apt-pkg/pkgcachegen.cc:186
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:219
 -#: apt-pkg/pkgcachegen.cc:190
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:223
 -#: apt-pkg/pkgcachegen.cc:194
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:247
 -#: apt-pkg/pkgcachegen.cc:209
++#: apt-pkg/pkgcachegen.cc:249
 +#, c-format
 +msgid "Error occured while processing %s (NewFileDesc2)"
 +msgstr ""
 +
- #: apt-pkg/pkgcachegen.cc:253
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:256
 -#: apt-pkg/pkgcachegen.cc:212
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:259
 -#: apt-pkg/pkgcachegen.cc:215
++#: apt-pkg/pkgcachegen.cc:261
 +msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 +msgstr ""
 +
- #: apt-pkg/pkgcachegen.cc:262
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:290
 -#: apt-pkg/pkgcachegen.cc:243
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:303
 -#: apt-pkg/pkgcachegen.cc:256
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:309
 -#: apt-pkg/pkgcachegen.cc:262
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:679
 -#: apt-pkg/pkgcachegen.cc:576
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:763
 -#: apt-pkg/pkgcachegen.cc:660
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
 -#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:126
 +#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 +#: apt-pkg/acquire-item.cc:407 apt-pkg/acquire-item.cc:656
 +#: apt-pkg/acquire-item.cc:1399
  msgid "MD5Sum mismatch"
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:640
 +#: apt-pkg/acquire-item.cc:1094
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:753
 +#: apt-pkg/acquire-item.cc:1207
  #, 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:812
 +#: apt-pkg/acquire-item.cc:1266
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
  "manually fix this package."
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:848
 +#: apt-pkg/acquire-item.cc:1302
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:935
 +#: apt-pkg/acquire-item.cc:1389
  msgid "Size mismatch"
  msgstr ""
  
@@@ -2422,94 -2419,92 +2450,94 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:507
 +#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
  "Mounting CD-ROM\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:541
 +#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:561
 +#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:579
 +#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:583
 +#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr ""
  
  #. Mount the new CDROM
 -#: apt-pkg/cdrom.cc:591
 +#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:609
 +#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:647
 +#: apt-pkg/cdrom.cc:673
  #, c-format
 -msgid "Found %i package indexes, %i source indexes and %i signatures\n"
 +msgid ""
 +"Found %i package indexes, %i source indexes, %i translation indexes and %i "
 +"signatures\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:710
 +#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:726
 +#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
  "'%s'\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:730
 +#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:754
 +#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:763
 +#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:803
 +#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr ""
  
 -#: apt-pkg/indexcopy.cc:261
 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr ""
  
 -#: apt-pkg/indexcopy.cc:263
 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr ""
  
 -#: apt-pkg/indexcopy.cc:266
 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr ""
  
 -#: apt-pkg/indexcopy.cc:269
 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2563,11 -2558,3 +2591,11 @@@ msgstr "
  #, c-format
  msgid "Completely removed %s"
  msgstr ""
 +
 +#: methods/rred.cc:219
 +msgid "Could not patch file"
 +msgstr ""
 +
 +#: methods/rsh.cc:330
 +msgid "Connection closed prematurely"
 +msgstr ""