* merged the debian/experimental changes back

  into the debian/sid branch
* merged from Christian Perrier:
  * mr.po: New Marathi translation  Closes: #416806
  * zh_CN.po: Updated by Eric Pareja  Closes: #416822
  * tl.po: Updated by Eric Pareja   Closes: #416638
  * gl.po: Updated by Jacobo Tarrio
  * da.po: Updated by Claus Hindsgaul
  * fr.po: Remove a non-breakable space for usability
  * ru.po: Updated Russian translation. Closes: #405476
  * *.po: Unfuzzy after upstream typo corrections
* buildlib/archtable:
  - added support for sh3/sh4 (closes: #424870)
  - added support for m32r (closes: #394096)
* buildlib/systemtable:
  - added support for lpia
* configure.in:
  - check systemtable for architecture mapping too

* Package that contains tall the new features
* Removed all #pragma interface/implementation
* Branch that contains tall the new features:
* translated package descriptions
* task install support
* automatic dependency removal (thanks to Daniel Burrows)
* merged support for the new dpkg "Breaks" field
  (thanks to Ian Jackson)
* handle network failures more gracefully on "update"
* support for unattended-upgrades (via unattended-upgrades
  package)
* added apt-transport-https method
* merged "install-recommends" branch (ABI break):
  - new "--install-recommends"
  - install new recommends on "upgrade" if --install-recommends is
    given
  - new "--fix-policy" option to install all packages with unmet
    important dependencies (usefull with --install-recommends to
    see what not-installed recommends are on the system)
  - fix of recommended packages display (only show CandidateVersion
    fix or-group handling)
* merged "install-task" branch (use with "apt-get install taskname^")
* Applied patch from Daniel Schepler to make apt bin-NMU able.
  * eu.po: Updated
* fix apt-get dist-upgrade
* fix warning if no /var/lib/apt/extended_states is present
* don't download Translations for deb-src sources.list lines
* apt-pkg/tagfile.cc:
  - support not-mmapable files again
* 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)
* synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch
* build from http://people.debian.org/~mvo/bzr/apt/debian-experimental
* apt-pkg/depcache.cc:
  - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
* apt-pkg/acquire-item.cc:
  - fix missing chmod() in the new aquire code
    (thanks to Bastian Blank, Closes: #367425)
* 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
* Fix a incorrect example in the man-page (closes: #282918)

diff --combined apt-pkg/acquire-item.cc
index b48972c227221ce04a4bf9cc7ff32fec1353db8e,3fd2304d2cd9b8e0182a4bebd3ca7abc21dba910..3d05e62ae4aae3124b31c851820604d1049c79b0
--- 1/apt-pkg/acquire-item.cc
--- 2/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@@ -13,9 -13,9 +13,6 @@@
     ##################################################################### */
                                                                        /*}}}*/
  // Include Files                                                      /*{{{*/
--#ifdef __GNUG__
--#pragma implementation "apt-pkg/acquire-item.h"
--#endif
  #include <apt-pkg/acquire-item.h>
  #include <apt-pkg/configuration.h>
  #include <apt-pkg/sourcelist.h>
@@@ -78,7 -78,7 +75,7 @@@ void pkgAcquire::Item::Failed(string Me
         Dequeue();
         return;
        }
 -
 +      
        Status = StatError;
        Dequeue();
     }   
@@@ -270,17 -270,13 +267,17 @@@ bool pkgAcqDiffIndex::ParseDiffIndex(st
         }
        }
  
 -      // we have something, queue the next diff
 -      if(found) 
 +      // no information how to get the patches, bail out
 +      if(!found) 
 +      {
 +       if(Debug)
 +          std::clog << "Can't find a patch in the index file" << std::endl;
 +       // Failed will queue a big package file
 +       Failed("", NULL);
 +      } 
 +      else 
        {
         // queue the diffs
 -      int last_space = Description.rfind(" ");
 -      if(last_space != string::npos)
 -        Description.erase(last_space, Description.size()-last_space);
         new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc,
                              ExpectedMD5, available_patches);
         Complete = false;
@@@ -290,6 -286,11 +287,6 @@@
        }
     }
  
 -   // Nothing found, report and return false
 -   // Failing here is ok, if we return false later, the full
 -   // IndexFile is queued
 -   if(Debug)
 -      std::clog << "Can't find a patch in the index file" << std::endl;
     return false;
  }
  
@@@ -356,7 -357,7 +353,7 @@@ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgA
  
     Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
  
 -   Description = URIDesc;
 +   Desc.Description = URIDesc;
     Desc.Owner = this;
     Desc.ShortDesc = ShortDesc;
  
@@@ -465,7 -466,7 +462,7 @@@ bool pkgAcqIndexDiffs::QueueNextDiff(
  
     // queue the right diff
     Desc.URI = string(RealURI) + ".diff/" + available_patches[0].file + ".gz";
 -   Desc.Description = Description + " " + available_patches[0].file + string(".pdiff");
 +   Desc.Description = available_patches[0].file + string(".pdiff");
  
     DestFile = _config->FindDir("Dir::State::lists") + "partial/";
     DestFile += URItoFileName(RealURI + ".diff/" + available_patches[0].file);
@@@ -737,6 -738,35 +734,35 @@@ void pkgAcqIndex::Done(string Message,u
     Mode = decompProg;
  }
  
+ // AcqIndexTrans::pkgAcqIndexTrans - Constructor                      /*{{{*/
+ // ---------------------------------------------------------------------
+ /* The Translation file is added to the queue */
+ pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner,
+                           string URI,string URIDesc,string ShortDesc) :
+                       pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, "", "")
+ {
+ }
+ 
+                                                                       /*}}}*/
+ // AcqIndexTrans::Failed - Silence failure messages for missing files /*{{{*/
+ // ---------------------------------------------------------------------
+ /* */
+ void pkgAcqIndexTrans::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
+ {
+    if (Cnf->LocalOnly == true || 
+        StringToBool(LookupTag(Message,"Transient-Failure"),false) == false)
+    {      
+       // Ignore this
+       Status = StatDone;
+       Complete = false;
+       Dequeue();
+       return;
+    }
+    
+    Item::Failed(Message,Cnf);
+ }
+                                                                       /*}}}*/
+ 
  pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
                             string URI,string URIDesc,string ShortDesc,
                             string MetaIndexURI, string MetaIndexURIDesc,
@@@ -750,8 -780,9 +776,9 @@@
     DestFile = _config->FindDir("Dir::State::lists") + "partial/";
     DestFile += URItoFileName(URI);
  
-    // remove any partial downloaded sig-file. it may confuse proxies
-    // and is too small to warrant a partial download anyway
+    // remove any partial downloaded sig-file in partial/. 
+    // it may confuse proxies and is too small to warrant a 
+    // partial download anyway
     unlink(DestFile.c_str());
  
     // Create the item
@@@ -818,17 -849,22 +845,22 @@@ void pkgAcqMetaSig::Done(string Message
                                                                        /*}}}*/
  void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
  {
+    string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
  
     // if we get a network error we fail gracefully
-    if(LookupTag(Message,"FailReason") == "Timeout" || 
-       LookupTag(Message,"FailReason") == "TmpResolveFailure" ||
-       LookupTag(Message,"FailReason") == "ConnectionRefused") {
+    if(Status == StatTransientNetworkError)
+    {
        Item::Failed(Message,Cnf);
 -      // move the sigfile back on network failures (and re-authenticated?)
++      // move the sigfile back on transient network failures 
+       if(FileExists(DestFile))
+        Rename(DestFile,Final);
+ 
+       // set the status back to , Item::Failed likes to reset it
+       Status = pkgAcquire::Item::StatTransientNetworkError;
        return;
     }
  
     // Delete any existing sigfile when the acquire failed
-    string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
     unlink(Final.c_str());
  
     // queue a pkgAcqMetaIndex with no sigfile

diff --combined apt-pkg/cdrom.cc
index 17a4f184bc01bec724bd4f2f1aea206555b6b373,aefe9c9e976c33582d01a3df32eaa162513a616f..e61344eee33e83d0a35ed613e30879e03476deff
--- 1/apt-pkg/cdrom.cc
--- 2/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@@ -30,12 -30,16 +30,16 @@@ using namespace std
     search that short circuits when it his a package file in the dir.
     This speeds it up greatly as the majority of the size is in the
     binary-* sub dirs. */
- bool pkgCdrom::FindPackages(string CD,vector<string> &List,
-                           vector<string> &SList, vector<string> &SigList,
+ bool pkgCdrom::FindPackages(string CD,
+                           vector<string> &List,
+                           vector<string> &SList, 
+                           vector<string> &SigList,
+                           vector<string> &TransList,
                            string &InfoDir, pkgCdromStatus *log,
                            unsigned int Depth)
  {
     static ino_t Inodes[9];
+    DIR *D;
  
     // if we have a look we "pulse" now
     if(log)
@@@ -90,8 -94,28 +94,28 @@@
        if (_config->FindB("APT::CDROM::Thorough",false) == false)
         return true;
     }
+ 
+    // see if we find translatin indexes
+    if (stat("i18n",&Buf) == 0)
+    {
+       D = opendir("i18n");
+       for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
+       {
+        if(strstr(Dir->d_name,"Translation") != NULL) 
+        {
+           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);
+        }
+       }
+       closedir(D);
+    }
+ 
     
-    DIR *D = opendir(".");
+    D = opendir(".");
     if (D == 0)
        return _error->Errno("opendir","Unable to read %s",CD.c_str());
     
@@@ -127,7 -151,7 +151,7 @@@
        Inodes[Depth] = Buf.st_ino;
  
        // Descend
-       if (FindPackages(CD + Dir->d_name,List,SList,SigList,InfoDir,log,Depth+1) == false)
+       if (FindPackages(CD + Dir->d_name,List,SList,SigList,TransList,InfoDir,log,Depth+1) == false)
         break;
  
        if (chdir(CD.c_str()) != 0)
@@@ -612,9 -636,10 +636,10 @@@ bool pkgCdrom::Add(pkgCdromStatus *log
     vector<string> List;
     vector<string> SourceList;
     vector<string> SigList;
+    vector<string> TransList;
     string StartDir = SafeGetCWD();
     string InfoDir;
-    if (FindPackages(CDROM,List,SourceList, SigList,InfoDir,log) == false)
+    if (FindPackages(CDROM,List,SourceList, SigList,TransList,InfoDir,log) == false)
     {
        log->Update("\n");
        return false;
@@@ -642,11 -667,13 +667,13 @@@
     DropRepeats(List,"Packages");
     DropRepeats(SourceList,"Sources");
     DropRepeats(SigList,"Release.gpg");
+    DropRepeats(TransList,"");
     if(log) {
        msg.str("");
-       ioprintf(msg, _("Found %i package indexes, %i source indexes and "
-                     "%i signatures\n"), 
-              List.size(), SourceList.size(), SigList.size());
+       ioprintf(msg, _("Found %i package indexes, %i source indexes, "
+                     "%i translation indexes and %i signatures\n"), 
+              List.size(), SourceList.size(), TransList.size(),
+              SigList.size());
        log->Update(msg.str(), STEP_SCAN);
     }
  
@@@ -680,7 -707,7 +707,7 @@@
            
            if(log) {
               msg.str("");
 -             ioprintf(msg, "Found label '%s'\n", Name.c_str());
 +             ioprintf(msg, _("Found label '%s'\n"), Name.c_str());
               log->Update(msg.str());
            }
            Database.Set("CD::" + ID + "::Label",Name);
@@@ -738,8 -765,10 +765,10 @@@
     // Copy the package files to the state directory
     PackageCopy Copy;
     SourceCopy SrcCopy;
+    TranslationsCopy TransCopy;
     if (Copy.CopyPackages(CDROM,Name,List, log) == false ||
-        SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false)
+        SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false ||
+        TransCopy.CopyTranslations(CDROM,Name,TransList, log) == false)
        return false;
  
     // reduce the List so that it takes less space in sources.list
@@@ -804,7 -833,7 +833,7 @@@
  
     // Unmount and finish
     if (_config->FindB("APT::CDROM::NoMount",false) == false) {
 -      log->Update(_("Unmounting CD-ROM..."), STEP_LAST);
 +      log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
        UnmountCdrom(CDROM);
     }
  

diff --combined apt-pkg/deb/debrecords.cc
index 26ca3679992a52bf592dc810b32ababec2df69cc,5eb2d67bb9d63408170eb9ff04122dc1810249cb..2aa47e3436ed9346f331d97609e8bfa387544f01
--- 1/apt-pkg/deb/debrecords.cc
--- 2/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@@ -12,7 -12,9 +12,9 @@@
  #pragma implementation "apt-pkg/debrecords.h"
  #endif
  #include <apt-pkg/debrecords.h>
+ #include <apt-pkg/strutl.h>
  #include <apt-pkg/error.h>
+ #include <langinfo.h>
                                                                        /*}}}*/
  
  // RecordParser::debRecordParser - Constructor                                /*{{{*/
@@@ -30,6 -32,10 +32,10 @@@ debRecordParser::debRecordParser(strin
  bool debRecordParser::Jump(pkgCache::VerFileIterator const &Ver)
  {
     return Tags.Jump(Section,Ver->Offset);
+ }
+ bool debRecordParser::Jump(pkgCache::DescFileIterator const &Desc)
+ {
+    return Tags.Jump(Section,Desc->Offset);
  }
                                                                        /*}}}*/
  // RecordParser::FileName - Return the archive filename on the site   /*{{{*/
@@@ -77,7 -83,7 +83,7 @@@ string debRecordParser::Maintainer(
  /* */
  string debRecordParser::ShortDesc()
  {
-    string Res = Section.FindS("Description");
+    string Res = LongDesc();
     string::size_type Pos = Res.find('\n');
     if (Pos == string::npos)
        return Res;
@@@ -89,47 -95,34 +95,60 @@@
  /* */
  string debRecordParser::LongDesc()
  {
-    return Section.FindS("Description");
+   string orig, dest;
+   char *codeset = nl_langinfo(CODESET);
+ 
+   if (!Section.FindS("Description").empty())
+      orig = Section.FindS("Description").c_str();
+   else 
+      orig = Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()).c_str();
+ 
+   if (strcmp(codeset,"UTF-8") != 0) {
+      UTF8ToCodeset(codeset, orig, &dest);
+      orig = dest;
+    }    
+   
+    return orig;
  }
                                                                        /*}}}*/
 +
 +static const char *SourceVerSeparators = " ()";
 +
  // RecordParser::SourcePkg - Return the source package name if any    /*{{{*/
  // ---------------------------------------------------------------------
  /* */
  string debRecordParser::SourcePkg()
  {
     string Res = Section.FindS("Source");
 -   string::size_type Pos = Res.find(' ');
 +   string::size_type Pos = Res.find_first_of(SourceVerSeparators);
     if (Pos == string::npos)
        return Res;
     return string(Res,0,Pos);
  }
                                                                        /*}}}*/
 +// RecordParser::SourceVer - Return the source version number if present      /*{{{*/
 +// ---------------------------------------------------------------------
 +/* */
 +string debRecordParser::SourceVer()
 +{
 +   string Pkg = Section.FindS("Source");
 +   string::size_type Pos = Pkg.find_first_of(SourceVerSeparators);
 +   if (Pos == string::npos)
 +      return "";
 +
 +   string::size_type VerStart = Pkg.find_first_not_of(SourceVerSeparators, Pos);
 +   if(VerStart == string::npos)
 +     return "";
 +
 +   string::size_type VerEnd = Pkg.find_first_of(SourceVerSeparators, VerStart);
 +   if(VerEnd == string::npos)
 +     // Corresponds to the case of, e.g., "foo (1.2" without a closing
 +     // paren.  Be liberal and guess what it means.
 +     return string(Pkg, VerStart);
 +   else
 +     return string(Pkg, VerStart, VerEnd - VerStart);
 +}
 +                                                                      /*}}}*/
  // RecordParser::GetRec - Return the whole record                     /*{{{*/
  // ---------------------------------------------------------------------
  /* */

diff --combined apt-pkg/deb/debrecords.h
index bb72275a577f9a24499d6964733b8f76ab4c7ec7,fdf8d762b9a0010188f39807ae87ffc2d47228a9..df21931a8cd466bf82b95f4adfba08518d5d9026
--- 1/apt-pkg/deb/debrecords.h
--- 2/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@@ -14,11 -14,8 +14,8 @@@
  #ifndef PKGLIB_DEBRECORDS_H
  #define PKGLIB_DEBRECORDS_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/debrecords.h"
- #endif 
- 
  #include <apt-pkg/pkgrecords.h>
+ #include <apt-pkg/indexfile.h>
  #include <apt-pkg/tagfile.h>
  
  class debRecordParser : public pkgRecords::Parser
@@@ -30,6 -27,7 +27,7 @@@
     protected:
     
     virtual bool Jump(pkgCache::VerFileIterator const &Ver);
+    virtual bool Jump(pkgCache::DescFileIterator const &Desc);
     
     public:
  
@@@ -38,7 -36,6 +36,7 @@@
     virtual string MD5Hash();
     virtual string SHA1Hash();
     virtual string SourcePkg();
 +   virtual string SourceVer();
     
     // These are some general stats about the package
     virtual string Maintainer();

diff --combined apt-pkg/pkgrecords.h
index dcfec07ef6c636bf73a84050c8b770bf5eb82d8d,21aa6632298645bb529fbf78aee674ff13e6e4a9..ea1a23fc484bf1b407d0545d69114d5490be11de
--- 1/apt-pkg/pkgrecords.h
--- 2/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@@ -17,9 -17,6 +17,6 @@@
  #ifndef PKGLIB_PKGRECORDS_H
  #define PKGLIB_PKGRECORDS_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/pkgrecords.h"
- #endif 
  
  #include <apt-pkg/pkgcache.h>
  #include <apt-pkg/fileutl.h>
@@@ -38,6 -35,7 +35,7 @@@ class pkgRecord
  
     // Lookup function
     Parser &Lookup(pkgCache::VerFileIterator const &Ver);
+    Parser &Lookup(pkgCache::DescFileIterator const &Desc);
  
     // Construct destruct
     pkgRecords(pkgCache &Cache);
@@@ -49,6 -47,7 +47,7 @@@ class pkgRecords::Parse
     protected:
     
     virtual bool Jump(pkgCache::VerFileIterator const &Ver) = 0;
+    virtual bool Jump(pkgCache::DescFileIterator const &Desc) = 0;
     
     public:
     friend class pkgRecords;
@@@ -58,7 -57,6 +57,7 @@@
     virtual string MD5Hash() {return string();};
     virtual string SHA1Hash() {return string();};
     virtual string SourcePkg() {return string();};
 +   virtual string SourceVer() {return string();};
  
     // These are some general stats about the package
     virtual string Maintainer() {return string();};

diff --combined configure.in
index 4aa56e117ebffac67ef584d730443f3ecdd26ed0,9fa113938ebdf6a0954223a3c5d7a4838e3db358..34d4dcc78b1702a4281c4b57e373e8f4920b938e
--- 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.47")
 -AC_DEFINE_UNQUOTED(VERSION,"0.7.0")
++AC_DEFINE_UNQUOTED(VERSION,"0.7.2")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
@@@ -78,15 -78,10 +78,15 @@@ AC_SUBST(BDBLIB
  
  dnl Converts the ARCH to be something singular for this general CPU family
  dnl This is often the dpkg architecture string.
 +dnl First check against the full canonical canoncial-system-type in $target
 +dnl and if that fails, just look for the cpu
  AC_MSG_CHECKING(system architecture)
 -archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`"
 +archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/systemtable`"
  if test "x$archset" = "x"; then
 + archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`"
 + if test "x$archset" = "x"; then
    AC_MSG_ERROR(failed: use --host= or check buildlib/archtable)
 + fi
  fi
  AC_MSG_RESULT($archset)
  AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset")
@@@ -180,12 -175,21 +180,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","")
  
@@@ -205,4 -209,4 +214,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 3e59aeb51bc2234a0cc9074fd7e76b9f5c9a2bf1,bbe4c0256b8fcf73875792c781634927b9f9a7d2..a57cf4577cf2bad37bb821cac0f0698e9bf2cd25
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,5 +1,35 @@@
- apt (0.6.47) unstable; urgency=low
++apt (0.7.2) unstable; urgency=low
++  
++  * merged the debian/experimental changes back
++    into the debian/sid branch
++  * merged from Christian Perrier:
++    * mr.po: New Marathi translation  Closes: #416806
++    * zh_CN.po: Updated by Eric Pareja  Closes: #416822
++    * tl.po: Updated by Eric Pareja   Closes: #416638
++    * gl.po: Updated by Jacobo Tarrio
++           Closes: #412828
++    * da.po: Updated by Claus Hindsgaul
++           Closes: #409483
++    * fr.po: Remove a non-breakable space for usability
++           issues. Closes: #408877
++    * ru.po: Updated Russian translation. Closes: #405476
++    * *.po: Unfuzzy after upstream typo corrections
++  * buildlib/archtable:
++    - added support for sh3/sh4 (closes: #424870)
++    - added support for m32r (closes: #394096)
++  * buildlib/systemtable:
++    - added support for lpia
++  * configure.in:
++    - check systemtable for architecture mapping too
++  
++ -- Michael Vogt <mvo@debian.org>  Wed, 06 Jun 2007 23:19:50 +0200
++
+ apt (0.7.1) experimental; urgency=low
  
 +  * ABI library name change because its build against
 +    new glibc
 +  * implement SourceVer() in pkgRecords 
 +     (thanks to Daniel Burrows for the patch!)
    * apt-pkg/algorithm.cc:
      - use clog for all debugging
      - only increase the score of installed applications if they 
@@@ -37,35 -33,27 +63,33 @@@
               issues. Closes: #408877
      * ru.po: Updated Russian translation. Closes: #405476
      * *.po: Unfuzzy after upstream typo corrections
 +    * vi.po: Updated to 515t. Closes: #426976
 +    * eu.po: Updated to 515t. Closes: #423766
 +    * pt.po: 515t. Closes: #423111
 +    * fr.po: Updated by Christian Perrier
 +    * Update all PO and the POT. Gives 513t2f for formerly
 +      complete translations
    * apt-pkg/policy.cc:
      - allow multiple packages (thanks to David Foerster)
-   * merged from Christian Perrier:
-     * mr.po: New Marathi translation  Closes: #416806
-     * zh_CN.po: Updated by Eric Pareja  Closes: #416822
-     * tl.po: Updated by Eric Pareja   Closes: #416638
-     * gl.po: Updated by Jacobo Tarrio
-            Closes: #412828
-     * da.po: Updated by Claus Hindsgaul
-            Closes: #409483
-     * fr.po: Remove a non-breakable space for usability
-            issues. Closes: #408877
-     * ru.po: Updated Russian translation. Closes: #405476
-     * *.po: Unfuzzy after upstream typo corrections
-   * buildlib/archtable:
-     - added support for sh3/sh4 (closes: #424870)
-     - added support for m32r (closes: #394096)
-   * buildlib/systemtable:
-     - added support for lpia
-   * configure.in:
-     - check systemtable for architecture mapping too
-   
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
+ 
+  -- Michael Vogt <mvo@debian.org>  Wed,  2 May 2007 13:43:44 +0200
+ 
+ apt (0.7.0) experimental; urgency=low
+ 
+   * Package that contains tall the new features
+   * Removed all #pragma interface/implementation
+   * Branch that contains tall the new features:
+   * translated package descriptions
+   * task install support
+   * automatic dependency removal (thanks to Daniel Burrows)
+   * merged support for the new dpkg "Breaks" field 
+     (thanks to Ian Jackson)
+   * handle network failures more gracefully on "update"
+   * support for unattended-upgrades (via unattended-upgrades
+     package)
+   * added apt-transport-https method
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 12 Jan 2007 20:48:07 +0100
  
  apt (0.6.46.4-0.1) unstable; urgency=emergency
    
@@@ -154,13 -142,21 +178,23 @@@ apt (0.6.46.2) unstable; urgency=lo
  
  apt (0.6.46.1) unstable; urgency=low
  
+   * merged "install-recommends" branch (ABI break): 
+     - new "--install-recommends"
+     - install new recommends on "upgrade" if --install-recommends is 
+       given
+     - new "--fix-policy" option to install all packages with unmet
+       important dependencies (usefull with --install-recommends to
+       see what not-installed recommends are on the system)
+     - fix of recommended packages display (only show CandidateVersion
+       fix or-group handling)
+   * merged "install-task" branch (use with "apt-get install taskname^")
    * methods/gzip.cc:
      - deal with empty files 
--  * Applied patch from Daniel Schepler to make apt bin-NMU able.  
++  * Applied patch from Daniel Schepler to make apt bin-NMU able.
 +    (closes: bug#359634)
    * rebuild against current g++ because of:
      http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29289
 +    (closes: #390189)
    * fix broken i18n in the dpkg progress reporting, thanks to 
      Frans Pop and Steinar Gunderson. (closes: #389261)
    * Merged from Christian Perrier bzr branch:
@@@ -213,7 -209,7 +247,7 @@@ apt (0.6.45) unstable; urgency=lo
    * apt-pkg/contrib/sha256.cc:
      - fixed the sha256 generation (closes: #378183)
    * ftparchive/cachedb.cc:
 -    - applied patch from ajt to fix Clean() function
 +    - applied patch from Anthony Towns to fix Clean() function
        (closes: #379576)
    * doc/apt-get.8.xml:
      - fix path to the apt user build (Closes: #375640)
@@@ -231,9 -227,6 +265,9 @@@
      - fix for string mangling, closes: #373864
    * apt-pkg/acquire-item.cc:
      - check for bzip2 in /bin (closes: #377391)
 +  * apt-pkg/tagfile.cc:
 +    - make it work on non-mapable files again, thanks 
 +      to James Troup for confirming the fix (closes: #376777)
    * Merged from Christian Perrier bzr branch:
      * ko.po: Updated to 512t. Closes: #378901
      * hu.po: Updated to 512t. Closes: #376330
@@@ -244,26 -237,42 +278,42 @@@
      * dz.po: New Dzongkha translation: 512t
      * ro.po: Updated to 512t
      * eu.po: Updated
+     * eu.po: Updated
+   * fix apt-get dist-upgrade
+   * fix warning if no /var/lib/apt/extended_states is present
+   * don't download Translations for deb-src sources.list lines
+   * apt-pkg/tagfile.cc:
+     - support not-mmapable files again
  
-  -- Michael Vogt <mvo@debian.org>  Thu, 27 Jul 2006 00:52:05 +0200
+  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 25 Jul 2006 11:55:22 +0200
  
- apt  (0.6.44.2) unstable; urgency=low 
-   
-    * apt-pkg/depcache.cc:
-      - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
-    * apt-pkg/acquire-item.cc:
-      - fix missing chmod() in the new aquire code
-        (thanks to Bastian Blank, Closes: #367425)
-    * 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
- 
-  -- Michael Vogt <mvo@debian.org>  Wed, 14 Jun 2006 12:00:57 +0200 
+ 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) 
+   * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch
+   * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon,  3 Jul 2006 21:50:31 +0200
+ 
+ apt (0.6.44.2) unstable; urgency=low
+ 
+   * apt-pkg/depcache.cc:
+     - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
+   * apt-pkg/acquire-item.cc:
+     - fix missing chmod() in the new aquire code 
+       (thanks to Bastian Blank, Closes: #367425)
+   * 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
+ 
+  -- Michael Vogt <mvo@debian.org>  Wed, 14 Jun 2006 12:00:57 +0200
  
  apt (0.6.44.1-0.1) unstable; urgency=low
  
@@@ -495,7 -504,7 +545,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
@@@ -595,6 -604,7 +645,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 po/apt-all.pot
index 6237cd39500559ec2b8f00197ceba7830b8ce0a6,bd066ab0670c408311ee2b9ce6a12a4804238e49..749d4784402e08c98d39cfd7536795eb72615046
--- 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: 2007-05-08 11:09+0200\n"
 -"POT-Creation-Date: 2006-08-15 15:55+0200\n"
++"POT-Creation-Date: 2007-06-06 23:30+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,145 -15,153 +15,153 @@@
  "Content-Type: text/plain; charset=CHARSET\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: cmdline/apt-cache.cc:135
 -#: cmdline/apt-cache.cc:141
++#: cmdline/apt-cache.cc:143
  #, 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
++#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
++#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
++#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
  #, c-format
  msgid "Unable to locate package %s"
  msgstr ""
  
- #: cmdline/apt-cache.cc:232
 -#: cmdline/apt-cache.cc:245
++#: cmdline/apt-cache.cc:247
  msgid "Total package names : "
  msgstr ""
  
- #: cmdline/apt-cache.cc:272
 -#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:287
  msgid "  Normal packages: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:273
 -#: cmdline/apt-cache.cc:286
++#: cmdline/apt-cache.cc:288
  msgid "  Pure virtual packages: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:274
 -#: cmdline/apt-cache.cc:287
++#: cmdline/apt-cache.cc:289
  msgid "  Single virtual packages: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:275
 -#: cmdline/apt-cache.cc:288
++#: cmdline/apt-cache.cc:290
  msgid "  Mixed virtual packages: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:276
 -#: cmdline/apt-cache.cc:289
++#: cmdline/apt-cache.cc:291
  msgid "  Missing: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:278
 -#: cmdline/apt-cache.cc:291
++#: cmdline/apt-cache.cc:293
  msgid "Total distinct versions: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:280
 -#: cmdline/apt-cache.cc:293
++#: cmdline/apt-cache.cc:295
+ msgid "Total Distinct Descriptions: "
+ msgstr ""
+ 
 -#: cmdline/apt-cache.cc:295
++#: cmdline/apt-cache.cc:297
  msgid "Total dependencies: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:283
 -#: cmdline/apt-cache.cc:298
++#: cmdline/apt-cache.cc:300
  msgid "Total ver/file relations: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:285
 -#: cmdline/apt-cache.cc:300
++#: cmdline/apt-cache.cc:302
+ msgid "Total Desc/File relations: "
+ msgstr ""
+ 
 -#: cmdline/apt-cache.cc:302
++#: cmdline/apt-cache.cc:304
  msgid "Total Provides mappings: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:297
 -#: cmdline/apt-cache.cc:314
++#: cmdline/apt-cache.cc:316
  msgid "Total globbed strings: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:311
 -#: cmdline/apt-cache.cc:328
++#: cmdline/apt-cache.cc:330
  msgid "Total dependency version space: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:316
 -#: cmdline/apt-cache.cc:333
++#: cmdline/apt-cache.cc:335
  msgid "Total slack space: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:324
 -#: cmdline/apt-cache.cc:341
++#: cmdline/apt-cache.cc:343
  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
++#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr ""
  
- #: cmdline/apt-cache.cc:1231
 -#: cmdline/apt-cache.cc:1287
++#: cmdline/apt-cache.cc:1293
  msgid "You must give exactly one pattern"
  msgstr ""
  
- #: cmdline/apt-cache.cc:1385
 -#: cmdline/apt-cache.cc:1441
++#: cmdline/apt-cache.cc:1447
  msgid "No packages found"
  msgstr ""
  
- #: cmdline/apt-cache.cc:1462
 -#: cmdline/apt-cache.cc:1518
++#: cmdline/apt-cache.cc:1524
  msgid "Package files:"
  msgstr ""
  
- #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
 -#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
++#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  
- #: cmdline/apt-cache.cc:1470
 -#: cmdline/apt-cache.cc:1526
++#: cmdline/apt-cache.cc:1532
  #, c-format
  msgid "%4i %s\n"
  msgstr ""
  
  #. Show any packages have explicit pins
- #: cmdline/apt-cache.cc:1482
 -#: cmdline/apt-cache.cc:1538
++#: cmdline/apt-cache.cc:1544
  msgid "Pinned packages:"
  msgstr ""
  
- #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
 -#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
++#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
  msgid "(not found)"
  msgstr ""
  
  #. Installed version
- #: cmdline/apt-cache.cc:1515
 -#: cmdline/apt-cache.cc:1571
++#: cmdline/apt-cache.cc:1577
  msgid "  Installed: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
 -#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
++#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
  msgid "(none)"
  msgstr ""
  
  #. Candidate Version
- #: cmdline/apt-cache.cc:1522
 -#: cmdline/apt-cache.cc:1578
++#: cmdline/apt-cache.cc:1584
  msgid "  Candidate: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:1532
 -#: cmdline/apt-cache.cc:1588
++#: cmdline/apt-cache.cc:1594
  msgid "  Package pin: "
  msgstr ""
  
  #. Show the priority tables
- #: cmdline/apt-cache.cc:1541
 -#: cmdline/apt-cache.cc:1597
++#: cmdline/apt-cache.cc:1603
  msgid "  Version table:"
  msgstr ""
  
- #: cmdline/apt-cache.cc:1556
 -#: cmdline/apt-cache.cc:1612
++#: cmdline/apt-cache.cc:1618
  #, 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-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2564 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
++#: cmdline/apt-cache.cc:1721
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -243,7 -251,8 +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:710
 -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
 -#: apt-pkg/pkgcachegen.cc:819
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:819
  #, c-format
  msgid "Unable to write to %s"
  msgstr ""
@@@ -542,221 -551,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:1574
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1655
  #, 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:664
  msgid "Correcting dependencies..."
  msgstr ""
  
- #: cmdline/apt-get.cc:652
+ #: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr ""
  
- #: cmdline/apt-get.cc:655
+ #: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr ""
  
- #: cmdline/apt-get.cc:658
+ #: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr ""
  
- #: cmdline/apt-get.cc:660
+ #: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr ""
  
- #: cmdline/apt-get.cc:664
+ #: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr ""
  
- #: cmdline/apt-get.cc:667
+ #: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr ""
  
- #: cmdline/apt-get.cc:689
+ #: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr ""
  
- #: cmdline/apt-get.cc:693
+ #: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:700
+ #: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr ""
  
- #: cmdline/apt-get.cc:702
+ #: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr ""
  
- #: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
+ #: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr ""
  
- #: cmdline/apt-get.cc:755
+ #: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  
- #: cmdline/apt-get.cc:764
+ #: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr ""
  
- #: cmdline/apt-get.cc:775
+ #: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr ""
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1995 cmdline/apt-get.cc:2028
  msgid "Unable to lock the download directory"
  msgstr ""
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2076 cmdline/apt-get.cc:2312
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr ""
  
- #: cmdline/apt-get.cc:816
+ #: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  
- #: cmdline/apt-get.cc:821
+ #: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:824
+ #: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:829
+ #: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:832
+ #: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2166
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:849
+ #: cmdline/apt-get.cc:864
  #, 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:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  
- #: cmdline/apt-get.cc:866
+ #: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr ""
  
- #: cmdline/apt-get.cc:868
+ #: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -764,74 -773,74 +772,74 @@@
  " ?] "
  msgstr ""
  
- #: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
+ #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr ""
  
- #: cmdline/apt-get.cc:889
+ #: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr ""
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2209
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:979
+ #: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr ""
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2218
  msgid "Download complete and in download only mode"
  msgstr ""
  
- #: cmdline/apt-get.cc:986
+ #: cmdline/apt-get.cc:1001
  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:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr ""
  
- #: cmdline/apt-get.cc:995
+ #: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr ""
  
- #: cmdline/apt-get.cc:996
+ #: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr ""
  
- #: cmdline/apt-get.cc:1030
+ #: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1040
+ #: cmdline/apt-get.cc:1055
  #, 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:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1069
+ #: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1081
+ #: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr ""
  
- #: cmdline/apt-get.cc:1086
+ #: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr ""
  
- #: cmdline/apt-get.cc:1091
+ #: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -839,79 -848,97 +847,117 @@@
  "is only available from another source\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1110
+ #: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1113
+ #: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr ""
  
- #: cmdline/apt-get.cc:1133
+ #: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1141
+ #: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1168
+ #: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr ""
  
- #: cmdline/apt-get.cc:1170
+ #: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr ""
  
- #: cmdline/apt-get.cc:1176
+ #: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1313
+ #: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr ""
  
- #: cmdline/apt-get.cc:1326
+ #: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr ""
  
- #: cmdline/apt-get.cc:1384
 -#: cmdline/apt-get.cc:1401
++#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412
  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:1415
++#: cmdline/apt-get.cc:1433
+ msgid "We are not supposed to delete stuff, can't start AutoRemover"
+ msgstr ""
+ 
 -#: cmdline/apt-get.cc:1440
++#: cmdline/apt-get.cc:1465
++msgid ""
++"The following packages were automatically installed and are no longer "
++"required:"
++msgstr ""
++
++#: cmdline/apt-get.cc:1467
++msgid "Use 'apt-get autoremove' to remove them."
++msgstr ""
++
++#: cmdline/apt-get.cc:1472
+ 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:1443 cmdline/apt-get.cc:1642
++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1736
+ msgid "The following information may help to resolve the situation:"
+ msgstr ""
+ 
 -#: cmdline/apt-get.cc:1447
++#: cmdline/apt-get.cc:1479
+ msgid "Internal Error, AutoRemover broke stuff"
+ msgstr ""
+ 
 -#: cmdline/apt-get.cc:1466
++#: cmdline/apt-get.cc:1498
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 -#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
++#: cmdline/apt-get.cc:1543
++#, c-format
++msgid "Couldn't find task %s"
++msgstr ""
++
++#: cmdline/apt-get.cc:1642 cmdline/apt-get.cc:1678
  #, c-format
  msgid "Couldn't find package %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1516
 -#: cmdline/apt-get.cc:1584
++#: cmdline/apt-get.cc:1665
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1546
 -#: cmdline/apt-get.cc:1614
++#: cmdline/apt-get.cc:1695
++#, c-format
++msgid "%s set to manual installed.\n"
++msgstr ""
++
++#: cmdline/apt-get.cc:1708
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1549
 -#: cmdline/apt-get.cc:1617
++#: cmdline/apt-get.cc:1711
  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:1629
++#: cmdline/apt-get.cc:1723
  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"
@@@ -919,163 -946,159 +965,159 @@@
  "or been moved out of Incoming."
  msgstr ""
  
- #: cmdline/apt-get.cc:1569
 -#: cmdline/apt-get.cc:1637
++#: cmdline/apt-get.cc:1731
  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:1645
++#: cmdline/apt-get.cc:1739
  msgid "Broken packages"
  msgstr ""
  
- #: cmdline/apt-get.cc:1603
 -#: cmdline/apt-get.cc:1676
++#: cmdline/apt-get.cc:1770
  msgid "The following extra packages will be installed:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1765
++#: cmdline/apt-get.cc:1859
  msgid "Suggested packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1766
++#: cmdline/apt-get.cc:1860
  msgid "Recommended packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1786
++#: cmdline/apt-get.cc:1888
  msgid "Calculating upgrade... "
  msgstr ""
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1891 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1794
++#: cmdline/apt-get.cc:1896
  msgid "Done"
  msgstr ""
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
++#: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:1971
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1969
++#: cmdline/apt-get.cc:2071
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
++#: cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2330
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:2043
++#: cmdline/apt-get.cc:2145
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:2067
++#: cmdline/apt-get.cc:2169
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:2072
++#: cmdline/apt-get.cc:2174
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:2075
++#: cmdline/apt-get.cc:2177
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:2081
++#: cmdline/apt-get.cc:2183
  #, c-format
  msgid "Fetch source %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2214
  msgid "Failed to fetch some archives."
  msgstr ""
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2242
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2152
++#: cmdline/apt-get.cc:2254
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2153
++#: cmdline/apt-get.cc:2255
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2170
++#: cmdline/apt-get.cc:2272
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2189
++#: cmdline/apt-get.cc:2291
  msgid "Child process failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2205
++#: cmdline/apt-get.cc:2307
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2233
++#: cmdline/apt-get.cc:2335
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2253
++#: cmdline/apt-get.cc:2355
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2305
++#: cmdline/apt-get.cc:2407
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr ""
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2357
++#: cmdline/apt-get.cc:2459
  #, 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:2317
 -#: cmdline/apt-get.cc:2392
++#: cmdline/apt-get.cc:2494
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2417
++#: cmdline/apt-get.cc:2519
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2431
++#: cmdline/apt-get.cc:2533
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr ""
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2435
++#: cmdline/apt-get.cc:2537
  msgid "Failed to process build dependencies"
  msgstr ""
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2467
++#: cmdline/apt-get.cc:2569
  msgid "Supported modules:"
  msgstr ""
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2508
++#: cmdline/apt-get.cc:2610
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1360,9 -1383,11 +1402,9 @@@ msgid "The info and temp directories ne
  msgstr ""
  
  #. Build the status cache
- #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
- #: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
- #: apt-pkg/pkgcachegen.cc:840
 -#: 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 apt-pkg/pkgcachegen.cc:752
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:752
+ #: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826
+ #: apt-pkg/pkgcachegen.cc:949
  msgid "Reading package lists"
  msgstr ""
  
@@@ -1477,25 -1502,28 +1519,26 @@@ msgstr "
  msgid "Wrong CD-ROM"
  msgstr ""
  
 -#: methods/cdrom.cc:164 methods/cdrom.cc:166
 +#: methods/cdrom.cc:166
  #, c-format
  msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
  msgstr ""
  
 -#: methods/cdrom.cc:169 methods/cdrom.cc:171
 +#: methods/cdrom.cc:171
  msgid "Disk not found."
  msgstr ""
  
 -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 -#: methods/cdrom.cc:179
 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
  msgid "File not found"
  msgstr ""
  
 -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
 -#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
 -#: methods/gzip.cc:141 methods/gzip.cc:150
 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
++#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
  msgid "Failed to stat"
  msgstr ""
  
 -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
 -#: methods/rred.cc:240 methods/gzip.cc:147
 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
++#: methods/rred.cc:240
  msgid "Failed to set modification time"
  msgstr ""
  
@@@ -1621,7 -1649,8 +1664,7 @@@ msgstr "
  msgid "Unable to accept connection"
  msgstr ""
  
- #: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
 -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
 -#: methods/http.cc:958
++#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr ""
  
@@@ -1742,86 -1771,87 +1785,86 @@@ msgid "
  "available:\n"
  msgstr ""
  
 -#: methods/gzip.cc:57 methods/gzip.cc:64
 +#: methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr ""
  
 -#: methods/gzip.cc:102 methods/gzip.cc:109
 +#: methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr ""
  
- #: methods/http.cc:377
 -#: methods/http.cc:375 methods/http.cc:376
++#: methods/http.cc:376
  msgid "Waiting for headers"
  msgstr ""
  
- #: methods/http.cc:523
 -#: methods/http.cc:521 methods/http.cc:522
++#: methods/http.cc:522
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr ""
  
- #: methods/http.cc:531
 -#: methods/http.cc:529 methods/http.cc:530
++#: methods/http.cc:530
  msgid "Bad header line"
  msgstr ""
  
- #: methods/http.cc:550 methods/http.cc:557
 -#: methods/http.cc:548 methods/http.cc:555 methods/http.cc:549
 -#: methods/http.cc:556
++#: methods/http.cc:549 methods/http.cc:556
  msgid "The HTTP server sent an invalid reply header"
  msgstr ""
  
- #: methods/http.cc:586
 -#: methods/http.cc:584 methods/http.cc:585
++#: methods/http.cc:585
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr ""
  
- #: methods/http.cc:601
 -#: methods/http.cc:599 methods/http.cc:600
++#: methods/http.cc:600
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr ""
  
- #: methods/http.cc:603
 -#: methods/http.cc:601 methods/http.cc:602
++#: methods/http.cc:602
  msgid "This HTTP server has broken range support"
  msgstr ""
  
- #: methods/http.cc:627
 -#: methods/http.cc:625 methods/http.cc:626
++#: methods/http.cc:626
  msgid "Unknown date format"
  msgstr ""
  
- #: methods/http.cc:774
 -#: methods/http.cc:772 methods/http.cc:773
++#: methods/http.cc:773
  msgid "Select failed"
  msgstr ""
  
- #: methods/http.cc:779
 -#: methods/http.cc:777 methods/http.cc:778
++#: methods/http.cc:778
  msgid "Connection timed out"
  msgstr ""
  
- #: methods/http.cc:802
 -#: methods/http.cc:800 methods/http.cc:801
++#: methods/http.cc:801
  msgid "Error writing to output file"
  msgstr ""
  
- #: methods/http.cc:833
 -#: methods/http.cc:831 methods/http.cc:832
++#: methods/http.cc:832
  msgid "Error writing to file"
  msgstr ""
  
- #: methods/http.cc:861
 -#: methods/http.cc:859 methods/http.cc:860
++#: methods/http.cc:860
  msgid "Error writing to the file"
  msgstr ""
  
- #: methods/http.cc:875
 -#: methods/http.cc:873 methods/http.cc:874
++#: methods/http.cc:874
  msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  
- #: methods/http.cc:877
 -#: methods/http.cc:875 methods/http.cc:876
++#: methods/http.cc:876
  msgid "Error reading from server"
  msgstr ""
  
- #: methods/http.cc:1108
 -#: methods/http.cc:1106 methods/http.cc:1107
++#: methods/http.cc:1107
  msgid "Bad header data"
  msgstr ""
  
- #: methods/http.cc:1125
 -#: methods/http.cc:1123 methods/http.cc:1124
++#: methods/http.cc:1124
  msgid "Connection failed"
  msgstr ""
  
- #: methods/http.cc:1216
 -#: methods/http.cc:1214 methods/http.cc:1215
++#: methods/http.cc:1215
  msgid "Internal error"
  msgstr ""
  
@@@ -1834,7 -1864,7 +1877,7 @@@ msgstr "
  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 ""
@@@ -1894,12 -1924,12 +1937,12 @@@ msgstr "
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr ""
  
 -#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
 +#: apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr ""
  
 -#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
 +#: apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr ""
@@@ -2031,93 -2061,109 +2074,111 @@@ msgstr "
  msgid "Problem syncing the file"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:126
 -#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:132
 -#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
++#: apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:137
 -#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
++#: apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:142
 -#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
++#: apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:147
 -#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
++#: apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:218
 -#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
++#: apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:218
 -#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
++#: apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:218
 -#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
++#: apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:219
 -#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
++#: apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:219
 -#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
++#: apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:219
 -#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
++#: apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:220
 -#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
++#: apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:231
 -#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
++#: apt-pkg/pkgcache.cc:226
++msgid "Breaks"
++msgstr ""
++
++#: apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:231
 -#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
++#: apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:231
 -#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
++#: apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:232
 -#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
++#: apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:232
 -#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
++#: apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr ""
  
- #: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
 -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
 -#: apt-pkg/depcache.cc:127
++#: apt-pkg/depcache.cc:98 apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr ""
  
- #: apt-pkg/depcache.cc:62
 -#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
++#: apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr ""
  
- #: apt-pkg/depcache.cc:91
 -#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
++#: apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr ""
  
 -#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+ #: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
+ msgid "Reading state information"
+ msgstr ""
+ 
 -#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#: apt-pkg/depcache.cc:196
+ #, c-format
+ msgid "Failed to open StateFile %s"
+ msgstr ""
+ 
 -#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#: apt-pkg/depcache.cc:202
+ #, c-format
+ msgid "Failed to write temporary StateFile %s"
+ msgstr ""
+ 
 -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
 +#: apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr ""
  
 -#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
 +#: apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr ""
@@@ -2152,7 -2198,7 +2213,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 ""
@@@ -2172,7 -2218,7 +2233,7 @@@ msgstr "
  msgid "Malformed line %u in source list %s (vendor id)"
  msgstr ""
  
- #: apt-pkg/packagemanager.cc:402
 -#: apt-pkg/packagemanager.cc:402 apt-pkg/packagemanager.cc:403
++#: apt-pkg/packagemanager.cc:403
  #, c-format
  msgid ""
  "This installation run will require temporarily removing the essential "
@@@ -2185,19 -2231,19 +2246,19 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr ""
  
- #: apt-pkg/algorithms.cc:241
 -#: apt-pkg/algorithms.cc:245 apt-pkg/algorithms.cc:248
++#: apt-pkg/algorithms.cc:248
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1066
 -#: apt-pkg/algorithms.cc:1075 apt-pkg/algorithms.cc:1104
++#: apt-pkg/algorithms.cc:1104
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1068
 -#: apt-pkg/algorithms.cc:1077 apt-pkg/algorithms.cc:1106
++#: apt-pkg/algorithms.cc:1106
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  
@@@ -2213,12 -2259,12 +2274,12 @@@ msgstr "
  
  #. only show the ETA if it makes sense
  #. two days
 -#: apt-pkg/acquire.cc:823 apt-pkg/acquire.cc:830
 +#: apt-pkg/acquire.cc:830
  #, c-format
  msgid "Retrieving file %li of %li (%s remaining)"
  msgstr ""
  
 -#: apt-pkg/acquire.cc:825 apt-pkg/acquire.cc:832
 +#: apt-pkg/acquire.cc:832
  #, c-format
  msgid "Retrieving file %li of %li"
  msgstr ""
@@@ -2233,17 -2279,17 +2294,17 @@@ msgstr "
  msgid "Method %s did not start correctly"
  msgstr ""
  
- #: apt-pkg/acquire-worker.cc:377
 -#: apt-pkg/acquire-worker.cc:377 apt-pkg/acquire-worker.cc:384
++#: apt-pkg/acquire-worker.cc:384
  #, c-format
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
  
- #: apt-pkg/init.cc:120
+ #: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr ""
  
- #: apt-pkg/init.cc:136
+ #: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr ""
  
@@@ -2264,132 -2310,149 +2325,147 @@@ msgstr "
  msgid "You may want to run apt-get update to correct these problems"
  msgstr ""
  
 -#: apt-pkg/policy.cc:269 apt-pkg/policy.cc:270
 +#: apt-pkg/policy.cc:270
  msgid "Invalid record in the preferences file, no Package header"
  msgstr ""
  
 -#: apt-pkg/policy.cc:291 apt-pkg/policy.cc:292
 +#: apt-pkg/policy.cc:292
  #, c-format
  msgid "Did not understand pin type %s"
  msgstr ""
  
 -#: apt-pkg/policy.cc:299 apt-pkg/policy.cc:300
 +#: apt-pkg/policy.cc:300
  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:129
+ #: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:150
+ #: apt-pkg/pkgcachegen.cc:157
+ #, c-format
+ msgid "Error occured while processing %s (NewFileDesc1)"
+ msgstr ""
+ 
+ #: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:154
+ #: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:184
+ #: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:188
+ #: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:192
+ #: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:207
+ #: apt-pkg/pkgcachegen.cc:249
+ #, c-format
+ msgid "Error occured while processing %s (NewFileDesc2)"
+ msgstr ""
+ 
+ #: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:210
+ #: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:213
+ #: apt-pkg/pkgcachegen.cc:261
+ msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+ msgstr ""
+ 
+ #: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:241
+ #: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:254
+ #: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:260
+ #: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:574
 -#: apt-pkg/pkgcachegen.cc:681 apt-pkg/pkgcachegen.cc:682
++#: apt-pkg/pkgcachegen.cc:682
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:658
 -#: apt-pkg/pkgcachegen.cc:765 apt-pkg/pkgcachegen.cc:767
++#: apt-pkg/pkgcachegen.cc:767
  msgid "Collecting File Provides"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
 -#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
+ #: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901
  msgid "IO Error saving source cache"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:126
 -#: apt-pkg/acquire-item.cc:130
++#: apt-pkg/acquire-item.cc:127
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
 -#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
 -#: apt-pkg/acquire-item.cc:1402 apt-pkg/acquire-item.cc:409
 -#: apt-pkg/acquire-item.cc:666 apt-pkg/acquire-item.cc:1416
++#: apt-pkg/acquire-item.cc:405 apt-pkg/acquire-item.cc:662
++#: apt-pkg/acquire-item.cc:1412
  msgid "MD5Sum mismatch"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:647
 -#: apt-pkg/acquire-item.cc:1097
 -msgid "There are no public key available for the following key IDs:\n"
++#: apt-pkg/acquire-item.cc:1107
 +msgid "There is no public key available for the following key IDs:\n"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:760
 -#: apt-pkg/acquire-item.cc:1210 apt-pkg/acquire-item.cc:1224
++#: apt-pkg/acquire-item.cc:1220
  #, 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:819
 -#: apt-pkg/acquire-item.cc:1269 apt-pkg/acquire-item.cc:1283
++#: apt-pkg/acquire-item.cc:1279
  #, 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:855
 -#: apt-pkg/acquire-item.cc:1305 apt-pkg/acquire-item.cc:1319
++#: apt-pkg/acquire-item.cc:1315
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:942
 -#: apt-pkg/acquire-item.cc:1392 apt-pkg/acquire-item.cc:1406
++#: apt-pkg/acquire-item.cc:1402
  msgid "Size mismatch"
  msgstr ""
  
@@@ -2398,97 -2461,94 +2474,99 @@@
  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:683
 -#: apt-pkg/cdrom.cc:737 apt-pkg/cdrom.cc:739
++#: apt-pkg/cdrom.cc:710
 +#, c-format
 +msgid "Found label '%s'\n"
 +msgstr ""
 +
- #: apt-pkg/cdrom.cc:712
++#: apt-pkg/cdrom.cc:739
  msgid "That is not a valid name, try again.\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:728
 -#: apt-pkg/cdrom.cc:753 apt-pkg/cdrom.cc:755
++#: apt-pkg/cdrom.cc:755
  #, c-format
  msgid ""
  "This disc is called: \n"
  "'%s'\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:732
 -#: apt-pkg/cdrom.cc:757 apt-pkg/cdrom.cc:759
++#: apt-pkg/cdrom.cc:759
  msgid "Copying package lists..."
  msgstr ""
  
- #: apt-pkg/cdrom.cc:756
 -#: apt-pkg/cdrom.cc:783 apt-pkg/cdrom.cc:785
++#: apt-pkg/cdrom.cc:785
  msgid "Writing new source list\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:765
 -#: apt-pkg/cdrom.cc:792 apt-pkg/cdrom.cc:794
++#: apt-pkg/cdrom.cc:794
  msgid "Source list entries for this disc are:\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:807
 -#: apt-pkg/cdrom.cc:832 apt-pkg/cdrom.cc:836
 -msgid "Unmounting CD-ROM..."
++#: apt-pkg/cdrom.cc:836
 +msgid "Unmounting CD-ROM...\n"
  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 ""
@@@ -2543,6 -2603,18 +2621,10 @@@ msgstr "
  msgid "Completely removed %s"
  msgstr ""
  
+ #: methods/rred.cc:219
+ msgid "Could not patch file"
+ msgstr ""
+ 
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr ""
 -
 -#: apt-pkg/acquire-item.cc:1097 apt-pkg/acquire-item.cc:1111
 -msgid "There is no public key available for the following key IDs:\n"
 -msgstr ""
 -
 -#: apt-pkg/pkgcache.cc:226
 -msgid "Breaks"
 -msgstr ""