From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sun, 30 Oct 2011 18:48:05 +0000 (-0500)
Subject: merge with my debian-sid branch
X-Git-Tag: 0.9.0~47^2~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/89d88ac3ef3f82fdfeac6d8d231deddeeb0f02e9?hp=-c

merge with my debian-sid branch
---

89d88ac3ef3f82fdfeac6d8d231deddeeb0f02e9
diff --combined apt-pkg/acquire-method.cc
index 1ae139b40,294d78f86..2041fd9e9
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@@ -15,8 -15,6 +15,8 @@@
     ##################################################################### */
  									/*}}}*/
  // Include Files							/*{{{*/
 +#include <config.h>
 +
  #include <apt-pkg/acquire-method.h>
  #include <apt-pkg/error.h>
  #include <apt-pkg/configuration.h>
@@@ -168,8 -166,6 +168,8 @@@ void pkgAcqMethod::URIDone(FetchResult 
        std::cout << "SHA1-Hash: " << Res.SHA1Sum << "\n";
     if (Res.SHA256Sum.empty() == false)
        std::cout << "SHA256-Hash: " << Res.SHA256Sum << "\n";
 +   if (Res.SHA512Sum.empty() == false)
 +      std::cout << "SHA512-Hash: " << Res.SHA512Sum << "\n";
     if (UsedMirror.empty() == false)
        std::cout << "UsedMirror: " << UsedMirror << "\n";
     if (Res.GPGVOutput.empty() == false)
@@@ -203,9 -199,7 +203,9 @@@
  	 std::cout << "Alt-SHA1-Hash: " << Alt->SHA1Sum << "\n";
        if (Alt->SHA256Sum.empty() == false)
  	 std::cout << "Alt-SHA256-Hash: " << Alt->SHA256Sum << "\n";
 -
 +      if (Alt->SHA512Sum.empty() == false)
 +         std::cout << "Alt-SHA512-Hash: " << Alt->SHA512Sum << "\n";
 +     
        if (Alt->IMSHit == true)
  	 std::cout << "Alt-IMS-Hit: true\n";
     }
@@@ -291,12 -285,12 +291,12 @@@ bool pkgAcqMethod::Configuration(strin
        I += Length + 1;
        
        for (; I < MsgEnd && *I == ' '; I++);
-       const char *Equals = I;
-       for (; Equals < MsgEnd && *Equals != '='; Equals++);
-       const char *End = Equals;
-       for (; End < MsgEnd && *End != '\n'; End++);
-       if (End == Equals)
+       const char *Equals = (const char*) memchr(I, '=', MsgEnd - I);
+       if (Equals == NULL)
  	 return false;
+       const char *End = (const char*) memchr(Equals, '\n', MsgEnd - Equals);
+       if (End == NULL)
+ 	 End = MsgEnd;
        
        Cnf.Set(DeQuoteString(string(I,Equals-I)),
  	      DeQuoteString(string(Equals+1,End-Equals-1)));
@@@ -462,6 -456,5 +462,6 @@@ void pkgAcqMethod::FetchResult::TakeHas
     MD5Sum = Hash.MD5.Result();
     SHA1Sum = Hash.SHA1.Result();
     SHA256Sum = Hash.SHA256.Result();
 +   SHA512Sum = Hash.SHA512.Result();
  }
  									/*}}}*/
diff --combined apt-pkg/algorithms.cc
index 4c2ea0f2d,44cba8d92..f7a333606
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@@ -14,26 -14,18 +14,26 @@@
     ##################################################################### */
  									/*}}}*/
  // Include Files							/*{{{*/
 +#include <config.h>
 +
  #include <apt-pkg/algorithms.h>
  #include <apt-pkg/error.h>
  #include <apt-pkg/configuration.h>
  #include <apt-pkg/version.h>
  #include <apt-pkg/sptr.h>
  #include <apt-pkg/acquire-item.h>
 -    
 -#include <apti18n.h>
 +#include <apt-pkg/edsp.h>
 +#include <apt-pkg/sourcelist.h>
 +#include <apt-pkg/fileutl.h>
 +#include <apt-pkg/progress.h>
 +
  #include <sys/types.h>
  #include <cstdlib>
  #include <algorithm>
  #include <iostream>
 +#include <stdio.h>
 +
 +#include <apti18n.h>
  									/*}}}*/
  using namespace std;
  
@@@ -335,12 -327,6 +335,12 @@@ bool pkgFixBroken(pkgDepCache &Cache
   */
  bool pkgDistUpgrade(pkgDepCache &Cache)
  {
 +   std::string const solver = _config->Find("APT::Solver", "internal");
 +   if (solver != "internal") {
 +      OpTextProgress Prog(*_config);
 +      return EDSP::ResolveExternal(solver.c_str(), Cache, false, true, false, &Prog);
 +   }
 +
     pkgDepCache::ActionGroup group(Cache);
  
     /* Upgrade all installed packages first without autoinst to help the resolver
@@@ -393,12 -379,6 +393,12 @@@
     to install packages not marked for install */
  bool pkgAllUpgrade(pkgDepCache &Cache)
  {
 +   std::string const solver = _config->Find("APT::Solver", "internal");
 +   if (solver != "internal") {
 +      OpTextProgress Prog(*_config);
 +      return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false, &Prog);
 +   }
 +
     pkgDepCache::ActionGroup group(Cache);
  
     pkgProblemResolver Fix(&Cache);
@@@ -745,20 -725,7 +745,20 @@@ bool pkgProblemResolver::DoUpgrade(pkgC
     return true;
  }
  									/*}}}*/
 -// ProblemResolver::Resolve - Run the resolution pass			/*{{{*/
 +// ProblemResolver::Resolve - calls a resolver to fix the situation	/*{{{*/
 +// ---------------------------------------------------------------------
 +/* */
 +bool pkgProblemResolver::Resolve(bool BrokenFix)
 +{
 +   std::string const solver = _config->Find("APT::Solver", "internal");
 +   if (solver != "internal") {
 +      OpTextProgress Prog(*_config);
 +      return EDSP::ResolveExternal(solver.c_str(), Cache, false, false, false, &Prog);
 +   }
 +   return ResolveInternal(BrokenFix);
 +}
 +									/*}}}*/
 +// ProblemResolver::ResolveInternal - Run the resolution pass		/*{{{*/
  // ---------------------------------------------------------------------
  /* This routines works by calculating a score for each package. The score
     is derived by considering the package's priority and all reverse 
@@@ -772,10 -739,12 +772,10 @@@
   
     The BrokenFix flag enables a mode where the algorithm tries to 
     upgrade packages to advoid problems. */
 -bool pkgProblemResolver::Resolve(bool BrokenFix)
 +bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
  {
     pkgDepCache::ActionGroup group(Cache);
  
 -   unsigned long Size = Cache.Head().PackageCount;
 -
     // Record which packages are marked for install
     bool Again = false;
     do
@@@ -805,9 -774,7 +805,9 @@@
        clog << "Starting" << endl;
     
     MakeScores();
 -   
 +
 +   unsigned long const Size = Cache.Head().PackageCount;
 +
     /* We have to order the packages so that the broken fixing pass 
        operates from highest score to lowest. This prevents problems when
        high score packages cause the removal of lower score packages that
@@@ -1209,6 -1176,7 +1209,6 @@@
     return true;
  }
  									/*}}}*/
 -
  // ProblemResolver::BreaksInstOrPolicy - Check if the given pkg is broken/*{{{*/
  // ---------------------------------------------------------------------
  /* This checks if the given package is broken either by a hard dependency
@@@ -1220,40 -1188,32 +1220,47 @@@
  */
  bool pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator I)
  {
-    
     // a broken install is always a problem
     if (Cache[I].InstBroken() == true)
+    {
+       if (Debug == true)
+ 	 std::clog << "  Dependencies are not satisfied for " << I << std::endl;
        return true;
+    }
  
     // a newly broken policy (recommends/suggests) is a problem
     if (Cache[I].NowPolicyBroken() == false &&
         Cache[I].InstPolicyBroken() == true)
+    {
+       if (Debug == true)
+ 	 std::clog << "  Policy breaks with upgrade of " << I << std::endl;
        return true;
-        
+    }
+ 
     return false;
  }
 -
 +									/*}}}*/
  // ProblemResolver::ResolveByKeep - Resolve problems using keep		/*{{{*/
  // ---------------------------------------------------------------------
  /* This is the work horse of the soft upgrade routine. It is very gental 
     in that it does not install or remove any packages. It is assumed that the
     system was non-broken previously. */
  bool pkgProblemResolver::ResolveByKeep()
 +{
 +   std::string const solver = _config->Find("APT::Solver", "internal");
 +   if (solver != "internal") {
 +      OpTextProgress Prog(*_config);
 +      return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false, &Prog);
 +   }
 +   return ResolveByKeepInternal();
 +}
 +									/*}}}*/
 +// ProblemResolver::ResolveByKeepInternal - Resolve problems using keep	/*{{{*/
 +// ---------------------------------------------------------------------
 +/* This is the work horse of the soft upgrade routine. It is very gental
 +   in that it does not install or remove any packages. It is assumed that the
 +   system was non-broken previously. */
 +bool pkgProblemResolver::ResolveByKeepInternal()
  {
     pkgDepCache::ActionGroup group(Cache);
  
@@@ -1438,7 -1398,7 +1445,7 @@@ void pkgPrioSortList(pkgCache &Cache,pk
     qsort(List,Count,sizeof(*List),PrioComp);
  }
  									/*}}}*/
 -// CacheFile::ListUpdate - update the cache files                    	/*{{{*/
 +// ListUpdate - update the cache files					/*{{{*/
  // ---------------------------------------------------------------------
  /* This is a simple wrapper to update the cache. it will fetch stuff
   * from the network (or any other sources defined in sources.list)
diff --combined apt-pkg/contrib/cmndline.cc
index 997f26bc7,f7359c36e..159f330a1
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@@ -11,14 -11,11 +11,14 @@@
     ##################################################################### */
  									/*}}}*/
  // Include files							/*{{{*/
 +#include<config.h>
 +
 +#include <apt-pkg/configuration.h>
  #include <apt-pkg/cmndline.h>
  #include <apt-pkg/error.h>
  #include <apt-pkg/strutl.h>
  
 -#include <apti18n.h>    
 +#include <apti18n.h>
  									/*}}}*/
  using namespace std;
  
@@@ -90,9 -87,8 +90,8 @@@ bool CommandLine::Parse(int argc,const 
        Opt++;
  
        // Match up to a = against the list
-       const char *OptEnd = Opt;
        Args *A;
-       for (; *OptEnd != 0 && *OptEnd != '='; OptEnd++);
+       const char *OptEnd = strchrnul(Opt, '=');
        for (A = ArgList; A->end() == false && 
  	   stringcasecmp(Opt,OptEnd,A->LongOpt) != 0; A++);
        
@@@ -100,9 -96,8 +99,8 @@@
        bool PreceedMatch = false;
        if (A->end() == true)
        {
- 	 for (; Opt != OptEnd && *Opt != '-'; Opt++);
- 
- 	 if (Opt == OptEnd)
+          Opt = (const char*) memchr(Opt, '-', OptEnd - Opt);
+ 	 if (Opt == NULL)
  	    return _error->Error(_("Command line option %s is not understood"),argv[I]);
  	 Opt++;
  	 
@@@ -197,9 -192,8 +195,8 @@@ bool CommandLine::HandleOpt(int &I,int 
        // Arbitrary item specification
        if ((A->Flags & ArbItem) == ArbItem)
        {
- 	 const char *J;
- 	 for (J = Argument; *J != 0 && *J != '='; J++);
- 	 if (*J == 0)
+ 	 const char *J = strchr(Argument, '=');
+ 	 if (J == NULL)
  	    return _error->Error(_("Option %s: Configuration item specification must have an =<val>."),argv[I]);
  
  	 // = is trailing
@@@ -215,8 -209,7 +212,7 @@@
  	 return true;
        }
        
-       const char *I = A->ConfName;
-       for (; *I != 0 && *I != ' '; I++);
+       const char *I = strchrnul(A->ConfName, ' ');
        if (*I == ' ')
  	 Conf->Set(string(A->ConfName,0,I-A->ConfName),string(I+1) + Argument);
        else
@@@ -272,10 -265,9 +268,9 @@@
  	 // Skip the leading dash
  	 const char *J = argv[I];
  	 for (; *J != 0 && *J == '-'; J++);
- 	 
- 	 const char *JEnd = J;
- 	 for (; *JEnd != 0 && *JEnd != '-'; JEnd++);
- 	 if (*JEnd != 0)
+ 
+ 	 const char *JEnd = strchr(J, '-');
+ 	 if (JEnd != NULL)
  	 {
  	    strncpy(Buffer,J,JEnd - J);
  	    Buffer[JEnd - J] = 0;
@@@ -376,9 -368,8 +371,8 @@@ void CommandLine::SaveInConfig(unsigne
  	 {
  	    // That is possibly an option: Quote it if it includes spaces,
  	    // the benefit is that this will eliminate also most false positives
- 	    const char* c = &argv[i][j+1];
- 	    for (; *c != '\0' && *c != ' '; ++c);
- 	    if (*c == '\0') continue;
+ 	    const char* c = strchr(&argv[i][j+1], ' ');
+ 	    if (c == NULL) continue;
  	    cmdline[++length] = '"';
  	    closeQuote = true;
  	 }
diff --combined apt-pkg/contrib/strutl.cc
index aaf44b7ff,8dd05b9c0..861cdcbeb
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@@ -15,12 -15,12 +15,12 @@@
     ##################################################################### */
  									/*}}}*/
  // Includes								/*{{{*/
 +#include <config.h>
 +
  #include <apt-pkg/strutl.h>
  #include <apt-pkg/fileutl.h>
  #include <apt-pkg/error.h>
  
 -#include <apti18n.h>
 -    
  #include <ctype.h>
  #include <string.h>
  #include <stdio.h>
@@@ -31,7 -31,7 +31,7 @@@
  #include <stdarg.h>
  #include <iconv.h>
  
 -#include "config.h"
 +#include <apti18n.h>
  
  using namespace std;
  									/*}}}*/
@@@ -179,14 -179,14 +179,14 @@@ bool ParseQuoteWord(const char *&String
     {
        if (*C == '"')
        {
- 	 for (C++; *C != 0 && *C != '"'; C++);
- 	 if (*C == 0)
+ 	 C = strchr(C + 1, '"');
+ 	 if (C == NULL)
  	    return false;
        }
        if (*C == '[')
        {
- 	 for (C++; *C != 0 && *C != ']'; C++);
- 	 if (*C == 0)
+ 	 C = strchr(C + 1, ']');
+ 	 if (C == NULL)
  	    return false;
        }
     }
@@@ -904,11 -904,10 +904,10 @@@ bool StrToTime(const string &Val,time_
  {
     struct tm Tm;
     char Month[10];
-    const char *I = Val.c_str();
-    
+ 
     // Skip the day of the week
-    for (;*I != 0  && *I != ' '; I++);
-    
+    const char *I = strchr(Val.c_str(), ' ');
+ 
     // Handle RFC 1123 time
     Month[0] = 0;
     if (sscanf(I," %d %3s %d %d:%d:%d GMT",&Tm.tm_mday,Month,&Tm.tm_year,
@@@ -970,34 -969,6 +969,34 @@@ bool StrToNum(const char *Str,unsigned 
     return true;
  }
  									/*}}}*/
 +// StrToNum - Convert a fixed length string to a number			/*{{{*/
 +// ---------------------------------------------------------------------
 +/* This is used in decoding the crazy fixed length string headers in 
 +   tar and ar files. */
 +bool StrToNum(const char *Str,unsigned long long &Res,unsigned Len,unsigned Base)
 +{
 +   char S[30];
 +   if (Len >= sizeof(S))
 +      return false;
 +   memcpy(S,Str,Len);
 +   S[Len] = 0;
 +   
 +   // All spaces is a zero
 +   Res = 0;
 +   unsigned I;
 +   for (I = 0; S[I] == ' '; I++);
 +   if (S[I] == 0)
 +      return true;
 +   
 +   char *End;
 +   Res = strtoull(S,&End,Base);
 +   if (End == S)
 +      return false;
 +   
 +   return true;
 +}
 +									/*}}}*/
 +
  // Base256ToNum - Convert a fixed length binary to a number             /*{{{*/
  // ---------------------------------------------------------------------
  /* This is used in decoding the 256bit encoded fixed length fields in
diff --combined apt-pkg/deb/deblistparser.cc
index a36857cb5,0562be44c..fd3e4808d
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@@ -10,14 -10,11 +10,14 @@@
     ##################################################################### */
  									/*}}}*/
  // Include Files							/*{{{*/
 +#include <config.h>
 +
  #include <apt-pkg/deblistparser.h>
  #include <apt-pkg/error.h>
  #include <apt-pkg/configuration.h>
  #include <apt-pkg/aptconfiguration.h>
  #include <apt-pkg/strutl.h>
 +#include <apt-pkg/fileutl.h>
  #include <apt-pkg/crc-16.h>
  #include <apt-pkg/md5.h>
  #include <apt-pkg/macros.h>
@@@ -26,8 -23,6 +26,8 @@@
  #include <ctype.h>
  									/*}}}*/
  
 +using std::string;
 +
  static debListParser::WordList PrioList[] = {{"important",pkgCache::State::Important},
                         {"required",pkgCache::State::Required},
                         {"standard",pkgCache::State::Standard},
@@@ -74,7 -69,10 +74,7 @@@ string debListParser::Package() 
  // ---------------------------------------------------------------------
  /* This will return the Architecture of the package this section describes */
  string debListParser::Architecture() {
 -   std::string const Arch = Section.FindS("Architecture");
 -   if (Arch.empty() == true)
 -      return _config->Find("APT::Architecture");
 -   return Arch;
 +   return Section.FindS("Architecture");
  }
  									/*}}}*/
  // ListParser::ArchitectureAll						/*{{{*/
@@@ -130,7 -128,12 +130,7 @@@ bool debListParser::NewVersion(pkgCache
     }
  
     if (ArchitectureAll() == true)
 -      switch (Ver->MultiArch)
 -      {
 -	 case pkgCache::Version::Foreign: Ver->MultiArch = pkgCache::Version::AllForeign; break;
 -	 case pkgCache::Version::Allowed: Ver->MultiArch = pkgCache::Version::AllAllowed; break;
 -	 default: Ver->MultiArch = pkgCache::Version::All;
 -      }
 +      Ver->MultiArch |= pkgCache::Version::All;
  
     // Archive Size
     Ver->Size = Section.FindULL("Size");
@@@ -522,9 -525,9 +522,9 @@@ const char *debListParser::ParseDepends
        // Skip whitespace
        for (;I != Stop && isspace(*I) != 0; I++);
        Start = I;
-       for (;I != Stop && *I != ')'; I++);
-       if (I == Stop || Start == I)
- 	 return 0;     
+       I = (const char*) memchr(I, ')', Stop - I);
+       if (I == NULL || Start == I)
+ 	 return 0;
        
        // Skip trailing whitespace
        const char *End = I;
@@@ -687,12 -690,12 +687,12 @@@ bool debListParser::ParseProvides(pkgCa
  
     if (MultiArchEnabled == false)
        return true;
 -   else if (Ver->MultiArch == pkgCache::Version::Allowed || Ver->MultiArch == pkgCache::Version::AllAllowed)
 +   else if ((Ver->MultiArch & pkgCache::Version::Allowed) == pkgCache::Version::Allowed)
     {
        string const Package = string(Ver.ParentPkg().Name()).append(":").append("any");
        return NewProvidesAllArch(Ver, Package, Ver.VerStr());
     }
 -   else if (Ver->MultiArch == pkgCache::Version::Foreign || Ver->MultiArch == pkgCache::Version::AllForeign)
 +   else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign)
        return NewProvidesAllArch(Ver, Ver.ParentPkg().Name(), Ver.VerStr());
  
     return true;
@@@ -797,37 -800,32 +797,32 @@@ bool debListParser::LoadReleaseInfo(pkg
        }
  
        // seperate the tag from the data
-       for (; buffer[len] != ':' && buffer[len] != '\0'; ++len)
-          /* nothing */
-          ;
-       if (buffer[len] == '\0')
+       const char* dataStart = strchr(buffer + len, ':');
+       if (dataStart == NULL)
  	 continue;
-       char* dataStart = buffer + len;
+       len = dataStart - buffer;
        for (++dataStart; *dataStart == ' '; ++dataStart)
           /* nothing */
           ;
-       char* dataEnd = dataStart;
-       for (++dataEnd; *dataEnd != '\0'; ++dataEnd)
-          /* nothing */
-          ;
+       const char* dataEnd = (const char*)rawmemchr(dataStart, '\0');
        // The last char should be a newline, but we can never be sure: #633350
-       char* lineEnd = dataEnd;
+       const char* lineEnd = dataEnd;
        for (--lineEnd; *lineEnd == '\r' || *lineEnd == '\n'; --lineEnd)
           /* nothing */
           ;
        ++lineEnd;
  
        // which datastorage need to be updated
 -      map_ptrloc* writeTo = NULL;
 +      enum { Suite, Component, Version, Origin, Codename, Label, None } writeTo = None;
        if (buffer[0] == ' ')
  	 ;
 -      #define APT_PARSER_WRITETO(X, Y) else if (strncmp(Y, buffer, len) == 0) writeTo = &X;
 -      APT_PARSER_WRITETO(FileI->Archive, "Suite")
 -      APT_PARSER_WRITETO(FileI->Component, "Component")
 -      APT_PARSER_WRITETO(FileI->Version, "Version")
 -      APT_PARSER_WRITETO(FileI->Origin, "Origin")
 -      APT_PARSER_WRITETO(FileI->Codename, "Codename")
 -      APT_PARSER_WRITETO(FileI->Label, "Label")
 +      #define APT_PARSER_WRITETO(X) else if (strncmp(#X, buffer, len) == 0) writeTo = X;
 +      APT_PARSER_WRITETO(Suite)
 +      APT_PARSER_WRITETO(Component)
 +      APT_PARSER_WRITETO(Version)
 +      APT_PARSER_WRITETO(Origin)
 +      APT_PARSER_WRITETO(Codename)
 +      APT_PARSER_WRITETO(Label)
        #undef APT_PARSER_WRITETO
        #define APT_PARSER_FLAGIT(X) else if (strncmp(#X, buffer, len) == 0) \
  	 pkgTagSection::FindFlag(FileI->Flags, pkgCache::Flag:: X, dataStart, lineEnd);
@@@ -837,19 -835,19 +832,19 @@@
  
        // load all data from the line and save it
        string data;
 -      if (writeTo != NULL)
 +      if (writeTo != None)
  	 data.append(dataStart, dataEnd);
        if (sizeof(buffer) - 1 == (dataEnd - buffer))
        {
  	 while (fgets(buffer, sizeof(buffer), release) != NULL)
  	 {
 -	    if (writeTo != NULL)
 +	    if (writeTo != None)
  	       data.append(buffer);
  	    if (strlen(buffer) != sizeof(buffer) - 1)
  	       break;
  	 }
        }
 -      if (writeTo != NULL)
 +      if (writeTo != None)
        {
  	 // remove spaces and stuff from the end of the data line
  	 for (std::string::reverse_iterator s = data.rbegin();
@@@ -859,15 -857,7 +854,15 @@@
  	       break;
  	    *s = '\0';
  	 }
 -	 *writeTo = WriteUniqString(data);
 +	 switch (writeTo) {
 +	 case Suite: FileI->Archive = WriteUniqString(data); break;
 +	 case Component: FileI->Component = WriteUniqString(data); break;
 +	 case Version: FileI->Version = WriteUniqString(data); break;
 +	 case Origin: FileI->Origin = WriteUniqString(data); break;
 +	 case Codename: FileI->Codename = WriteUniqString(data); break;
 +	 case Label: FileI->Label = WriteUniqString(data); break;
 +	 case None: break;
 +	 }
        }
     }
     fclose(release);
diff --combined apt-pkg/deb/debversion.cc
index bc9e13d92,340403721..a02699a44
--- a/apt-pkg/deb/debversion.cc
+++ b/apt-pkg/deb/debversion.cc
@@@ -10,7 -10,7 +10,7 @@@
     ##################################################################### */
  									/*}}}*/
  // Include Files							/*{{{*/
 -#define APT_COMPATIBILITY 986
 +#include <config.h>
  
  #include <apt-pkg/debversion.h>
  #include <apt-pkg/pkgcache.h>
@@@ -127,14 -127,12 +127,12 @@@ int debVersioningSystem::CmpFragment(co
  int debVersioningSystem::DoCmpVersion(const char *A,const char *AEnd,
  				      const char *B,const char *BEnd)
  {
-    // Strip off the epoch and compare it 
-    const char *lhs = A;
-    const char *rhs = B;
-    for (;lhs != AEnd && *lhs != ':'; lhs++);
-    for (;rhs != BEnd && *rhs != ':'; rhs++);
-    if (lhs == AEnd)
+    // Strip off the epoch and compare it
+    const char *lhs = (const char*) memchr(A, ':', AEnd - A);
+    const char *rhs = (const char*) memchr(B, ':', BEnd - B);
+    if (lhs == NULL)
        lhs = A;
-    if (rhs == BEnd)
+    if (rhs == NULL)
        rhs = B;
     
     // Special case: a zero epoch is the same as no epoch,
@@@ -169,15 -167,12 +167,12 @@@
     if (rhs != B)
        rhs++;
     
-    // Find the last - 
-    const char *dlhs = AEnd-1;
-    const char *drhs = BEnd-1;
-    for (;dlhs > lhs && *dlhs != '-'; dlhs--);
-    for (;drhs > rhs && *drhs != '-'; drhs--);
- 
-    if (dlhs == lhs)
+    // Find the last -
+    const char *dlhs = (const char*) memrchr(lhs, '-', AEnd - lhs);
+    const char *drhs = (const char*) memrchr(rhs, '-', BEnd - rhs);
+    if (dlhs == NULL)
        dlhs = AEnd;
-    if (drhs == rhs)
+    if (drhs == NULL)
        drhs = BEnd;
     
     // Compare the main version
@@@ -262,7 -257,7 +257,7 @@@ bool debVersioningSystem::CheckDep(cons
  // debVS::UpstreamVersion - Return the upstream version string		/*{{{*/
  // ---------------------------------------------------------------------
  /* This strips all the debian specific information from the version number */
 -string debVersioningSystem::UpstreamVersion(const char *Ver)
 +std::string debVersioningSystem::UpstreamVersion(const char *Ver)
  {
     // Strip off the bit before the first colon
     const char *I = Ver;
@@@ -277,6 -272,6 +272,6 @@@
        if (*I == '-')
  	 Last = I - Ver;
     
 -   return string(Ver,Last);
 +   return std::string(Ver,Last);
  }
  									/*}}}*/
diff --combined apt-pkg/deb/dpkgpm.cc
index 5eb6406c6,b6c92fc23..7c0ed5639
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -8,8 -8,6 +8,8 @@@
     ##################################################################### */
  									/*}}}*/
  // Includes								/*{{{*/
 +#include <config.h>
 +
  #include <apt-pkg/dpkgpm.h>
  #include <apt-pkg/error.h>
  #include <apt-pkg/configuration.h>
@@@ -18,7 -16,6 +18,7 @@@
  #include <apt-pkg/strutl.h>
  #include <apt-pkg/fileutl.h>
  #include <apt-pkg/cachefile.h>
 +#include <apt-pkg/packagemanager.h>
  
  #include <unistd.h>
  #include <stdlib.h>
@@@ -43,26 -40,12 +43,26 @@@
  #include <sys/ioctl.h>
  #include <pty.h>
  
 -#include <config.h>
  #include <apti18n.h>
  									/*}}}*/
  
  using namespace std;
  
 +class pkgDPkgPMPrivate 
 +{
 +public:
 +   pkgDPkgPMPrivate() : dpkgbuf_pos(0), term_out(NULL), history_out(NULL)
 +   {
 +   }
 +   bool stdin_is_dev_null;
 +   // the buffer we use for the dpkg status-fd reading
 +   char dpkgbuf[1024];
 +   int dpkgbuf_pos;
 +   FILE *term_out;
 +   FILE *history_out;
 +   string dpkg_error;
 +};
 +
  namespace
  {
    // Maps the dpkg "processing" info to human readable names.  Entry 0
@@@ -127,9 -110,9 +127,9 @@@ ionice(int PID
  // ---------------------------------------------------------------------
  /* */
  pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) 
 -   : pkgPackageManager(Cache), dpkgbuf_pos(0),
 -     term_out(NULL), history_out(NULL), PackagesDone(0), PackagesTotal(0)
 +   : pkgPackageManager(Cache), PackagesDone(0), PackagesTotal(0)
  {
 +   d = new pkgDPkgPMPrivate();
  }
  									/*}}}*/
  // DPkgPM::pkgDPkgPM - Destructor					/*{{{*/
@@@ -137,7 -120,6 +137,7 @@@
  /* */
  pkgDPkgPM::~pkgDPkgPM()
  {
 +   delete d;
  }
  									/*}}}*/
  // DPkgPM::Install - Install a package					/*{{{*/
@@@ -394,7 -376,7 +394,7 @@@ void pkgDPkgPM::DoStdin(int master
     if (len)
        write(master, input_buf, len);
     else
 -      stdin_is_dev_null = true;
 +      d->stdin_is_dev_null = true;
  }
  									/*}}}*/
  // DPkgPM::DoTerminalPty - Read the terminal pty and write log		/*{{{*/
@@@ -419,8 -401,8 +419,8 @@@ void pkgDPkgPM::DoTerminalPty(int maste
     if(len <= 0) 
        return;
     write(1, term_buf, len);
 -   if(term_out)
 -      fwrite(term_buf, len, sizeof(char), term_out);
 +   if(d->term_out)
 +      fwrite(term_buf, len, sizeof(char), d->term_out);
  }
  									/*}}}*/
  // DPkgPM::ProcessDpkgStatusBuf                                        	/*{{{*/
@@@ -624,14 -606,14 +624,14 @@@ void pkgDPkgPM::DoDpkgStatusFd(int stat
     char *p, *q;
     int len;
  
 -   len=read(statusfd, &dpkgbuf[dpkgbuf_pos], sizeof(dpkgbuf)-dpkgbuf_pos);
 -   dpkgbuf_pos += len;
 +   len=read(statusfd, &d->dpkgbuf[d->dpkgbuf_pos], sizeof(d->dpkgbuf)-d->dpkgbuf_pos);
 +   d->dpkgbuf_pos += len;
     if(len <= 0)
        return;
  
     // process line by line if we have a buffer
 -   p = q = dpkgbuf;
 -   while((q=(char*)memchr(p, '\n', dpkgbuf+dpkgbuf_pos-p)) != NULL)
 +   p = q = d->dpkgbuf;
 +   while((q=(char*)memchr(p, '\n', d->dpkgbuf+d->dpkgbuf_pos-p)) != NULL)
     {
        *q = 0;
        ProcessDpkgStatusLine(OutStatusFd, p);
@@@ -639,8 -621,8 +639,8 @@@
     }
  
     // now move the unprocessed bits (after the final \n that is now a 0x0) 
 -   // to the start and update dpkgbuf_pos
 -   p = (char*)memrchr(dpkgbuf, 0, dpkgbuf_pos);
 +   // to the start and update d->dpkgbuf_pos
 +   p = (char*)memrchr(d->dpkgbuf, 0, d->dpkgbuf_pos);
     if(p == NULL)
        return;
  
@@@ -648,8 -630,8 +648,8 @@@
     p++;
  
     // move the unprocessed tail to the start and update pos
 -   memmove(dpkgbuf, p, p-dpkgbuf);
 -   dpkgbuf_pos = dpkgbuf+dpkgbuf_pos-p;
 +   memmove(d->dpkgbuf, p, p-d->dpkgbuf);
 +   d->dpkgbuf_pos = d->dpkgbuf+d->dpkgbuf_pos-p;
  }
  									/*}}}*/
  // DPkgPM::WriteHistoryTag						/*{{{*/
@@@ -661,7 -643,7 +661,7 @@@ void pkgDPkgPM::WriteHistoryTag(string 
     // poor mans rstrip(", ")
     if (value[length-2] == ',' && value[length-1] == ' ')
        value.erase(length - 2, 2);
 -   fprintf(history_out, "%s: %s\n", tag.c_str(), value.c_str());
 +   fprintf(d->history_out, "%s: %s\n", tag.c_str(), value.c_str());
  }									/*}}}*/
  // DPkgPM::OpenLog							/*{{{*/
  bool pkgDPkgPM::OpenLog()
@@@ -682,11 -664,11 +682,11 @@@
  				   _config->Find("Dir::Log::Terminal"));
     if (!logfile_name.empty())
     {
 -      term_out = fopen(logfile_name.c_str(),"a");
 -      if (term_out == NULL)
 +      d->term_out = fopen(logfile_name.c_str(),"a");
 +      if (d->term_out == NULL)
  	 return _error->WarningE("OpenLog", _("Could not open file '%s'"), logfile_name.c_str());
 -      setvbuf(term_out, NULL, _IONBF, 0);
 -      SetCloseExec(fileno(term_out), true);
 +      setvbuf(d->term_out, NULL, _IONBF, 0);
 +      SetCloseExec(fileno(d->term_out), true);
        struct passwd *pw;
        struct group *gr;
        pw = getpwnam("root");
@@@ -694,7 -676,7 +694,7 @@@
        if (pw != NULL && gr != NULL)
  	  chown(logfile_name.c_str(), pw->pw_uid, gr->gr_gid);
        chmod(logfile_name.c_str(), 0644);
 -      fprintf(term_out, "\nLog started: %s\n", timestr);
 +      fprintf(d->term_out, "\nLog started: %s\n", timestr);
     }
  
     // write your history
@@@ -702,11 -684,11 +702,11 @@@
  				   _config->Find("Dir::Log::History"));
     if (!history_name.empty())
     {
 -      history_out = fopen(history_name.c_str(),"a");
 -      if (history_out == NULL)
 +      d->history_out = fopen(history_name.c_str(),"a");
 +      if (d->history_out == NULL)
  	 return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str());
        chmod(history_name.c_str(), 0644);
 -      fprintf(history_out, "\nStart-Date: %s\n", timestr);
 +      fprintf(d->history_out, "\nStart-Date: %s\n", timestr);
        string remove, purge, install, reinstall, upgrade, downgrade;
        for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
        {
@@@ -747,7 -729,7 +747,7 @@@
        WriteHistoryTag("Downgrade",downgrade);
        WriteHistoryTag("Remove",remove);
        WriteHistoryTag("Purge",purge);
 -      fflush(history_out);
 +      fflush(d->history_out);
     }
     
     return true;
@@@ -761,16 -743,16 +761,16 @@@ bool pkgDPkgPM::CloseLog(
     struct tm *tmp = localtime(&t);
     strftime(timestr, sizeof(timestr), "%F  %T", tmp);
  
 -   if(term_out)
 +   if(d->term_out)
     {
 -      fprintf(term_out, "Log ended: ");
 -      fprintf(term_out, "%s", timestr);
 -      fprintf(term_out, "\n");
 -      fclose(term_out);
 +      fprintf(d->term_out, "Log ended: ");
 +      fprintf(d->term_out, "%s", timestr);
 +      fprintf(d->term_out, "\n");
 +      fclose(d->term_out);
     }
 -   term_out = NULL;
 +   d->term_out = NULL;
  
 -   if(history_out)
 +   if(d->history_out)
     {
        if (disappearedPkgs.empty() == false)
        {
@@@ -787,12 -769,12 +787,12 @@@
  	 }
  	 WriteHistoryTag("Disappeared", disappear);
        }
 -      if (dpkg_error.empty() == false)
 -	 fprintf(history_out, "Error: %s\n", dpkg_error.c_str());
 -      fprintf(history_out, "End-Date: %s\n", timestr);
 -      fclose(history_out);
 +      if (d->dpkg_error.empty() == false)
 +	 fprintf(d->history_out, "Error: %s\n", d->dpkg_error.c_str());
 +      fprintf(d->history_out, "End-Date: %s\n", timestr);
 +      fclose(d->history_out);
     }
 -   history_out = NULL;
 +   d->history_out = NULL;
  
     return true;
  }
@@@ -900,7 -882,7 +900,7 @@@ bool pkgDPkgPM::Go(int OutStatusFd
        }
     }
  
 -   stdin_is_dev_null = false;
 +   d->stdin_is_dev_null = false;
  
     // create log
     OpenLog();
@@@ -961,7 -943,7 +961,7 @@@
        // the argument list is split in a way that A depends on B
        // and they are in the same "--configure A B" run
        // - with the split they may now be configured in different
 -      //   runs 
 +      //   runs, using Immediate-Configure-All can help prevent this.
        if (J - I > (signed)MaxArgs)
        {
  	 J = I + MaxArgs;
@@@ -983,8 -965,6 +983,7 @@@
        char status_fd_buf[20];
        snprintf(status_fd_buf,sizeof(status_fd_buf),"%i", fd[1]);
        ADDARG(status_fd_buf);
- 
 +      unsigned long const Op = I->Op;
  
        switch (I->Op)
        {
@@@ -1087,13 -1067,8 +1086,13 @@@
  	 it to all processes in the group. Since dpkg ignores the signal 
  	 it doesn't die but we do! So we must also ignore it */
        sighandler_t old_SIGQUIT = signal(SIGQUIT,SIG_IGN);
 -      sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN);
 -
 +      sighandler_t old_SIGINT = signal(SIGINT,SigINT);
 +      
 +      // Check here for any SIGINT
 +      if (pkgPackageManager::SigINTStop && (Op == Item::Remove || Op == Item::Purge || Op == Item::Install)) 
 +         break;
 +      
 +      
        // ignore SIGHUP as well (debian #463030)
        sighandler_t old_SIGHUP = signal(SIGHUP,SIG_IGN);
  
@@@ -1112,8 -1087,8 +1111,8 @@@
  	    const char *s = _("Can not write log, openpty() "
  	                      "failed (/dev/pts not mounted?)\n");
  	    fprintf(stderr, "%s",s);
 -            if(term_out)
 -              fprintf(term_out, "%s",s);
 +            if(d->term_out)
 +              fprintf(d->term_out, "%s",s);
  	    master = slave = -1;
  	 }  else {
  	    struct termios rtt;
@@@ -1131,6 -1106,7 +1130,6 @@@
  	    sigprocmask(SIG_SETMASK, &original_sigmask, 0);
  	 }
        }
 -
         // Fork dpkg
        pid_t Child;
        _config->Set("APT::Keep-Fds::",fd[1]);
@@@ -1237,14 -1213,13 +1236,14 @@@
  	    // Restore sig int/quit
  	    signal(SIGQUIT,old_SIGQUIT);
  	    signal(SIGINT,old_SIGINT);
 +
  	    signal(SIGHUP,old_SIGHUP);
  	    return _error->Errno("waitpid","Couldn't wait for subprocess");
  	 }
  
  	 // wait for input or output here
  	 FD_ZERO(&rfds);
 -	 if (master >= 0 && !stdin_is_dev_null)
 +	 if (master >= 0 && !d->stdin_is_dev_null)
  	    FD_SET(0, &rfds); 
  	 FD_SET(_dpkgin, &rfds);
  	 if(master >= 0)
@@@ -1278,7 -1253,6 +1277,7 @@@
        // Restore sig int/quit
        signal(SIGQUIT,old_SIGQUIT);
        signal(SIGINT,old_SIGINT);
 +      
        signal(SIGHUP,old_SIGHUP);
  
        if(master >= 0) 
@@@ -1299,14 -1273,14 +1298,14 @@@
  	    RunScripts("DPkg::Post-Invoke");
  
  	 if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) 
 -	    strprintf(dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]);
 +	    strprintf(d->dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]);
  	 else if (WIFEXITED(Status) != 0)
 -	    strprintf(dpkg_error, "Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
 +	    strprintf(d->dpkg_error, "Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
  	 else 
 -	    strprintf(dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
 +	    strprintf(d->dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
  
 -	 if(dpkg_error.size() > 0)
 -	    _error->Error("%s", dpkg_error.c_str());
 +	 if(d->dpkg_error.size() > 0)
 +	    _error->Error("%s", d->dpkg_error.c_str());
  
  	 if(stopOnError) 
  	 {
@@@ -1316,9 -1290,6 +1315,9 @@@
        }      
     }
     CloseLog();
 +   
 +   if (pkgPackageManager::SigINTStop)
 +       _error->Warning(_("Operation was interrupted before it could finish"));
  
     if (RunScripts("DPkg::Post-Invoke") == false)
        return false;
@@@ -1343,11 -1314,6 +1342,11 @@@
     Cache.writeStateFile(NULL);
     return true;
  }
 +
 +void SigINT(int sig) {
 +   if (_config->FindB("APT::Immediate-Configure-All",false)) 
 +      pkgPackageManager::SigINTStop = true;
 +} 
  									/*}}}*/
  // pkgDpkgPM::Reset - Dump the contents of the command list		/*{{{*/
  // ---------------------------------------------------------------------
@@@ -1478,8 -1444,8 +1477,8 @@@ void pkgDPkgPM::WriteApportReport(cons
     fprintf(report, "ErrorMessage:\n %s\n", errormsg);
  
     // ensure that the log is flushed
 -   if(term_out)
 -      fflush(term_out);
 +   if(d->term_out)
 +      fflush(d->term_out);
  
     // attach terminal log it if we have it
     string logfile_name = _config->FindFile("Dir::Log::Terminal");
diff --combined apt-pkg/init.cc
index 2a709dd36,b283e2dd9..a1c47c030
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@@ -8,18 -8,14 +8,18 @@@
     ##################################################################### */
  									/*}}}*/
  // Include files							/*{{{*/
 +#include<config.h>
 +
  #include <apt-pkg/init.h>
  #include <apt-pkg/fileutl.h>
  #include <apt-pkg/error.h>
 +#include <apt-pkg/pkgsystem.h>
 +#include <apt-pkg/configuration.h>
  
 -#include <apti18n.h>
 -#include <config.h>
  #include <cstdlib>
  #include <sys/stat.h>
 +
 +#include <apti18n.h>
  									/*}}}*/
  
  #define Stringfy_(x) # x
@@@ -78,7 -74,6 +78,7 @@@ bool pkgInitConfig(Configuration &Cnf
     Cnf.CndSet("Dir::Etc::trusted", "trusted.gpg");
     Cnf.CndSet("Dir::Etc::trustedparts","trusted.gpg.d");
     Cnf.CndSet("Dir::Bin::methods","/usr/lib/apt/methods");
 +   Cnf.CndSet("Dir::Bin::solvers::","/usr/lib/apt/solvers");
     Cnf.CndSet("Dir::Media::MountPath","/media/apt");
  
     // State   
@@@ -86,13 -81,12 +86,12 @@@
     Cnf.CndSet("Dir::Log::Terminal","term.log");
     Cnf.CndSet("Dir::Log::History","history.log");
  
-    if (Cnf.Exists("Dir::Ignore-Files-Silently") == false)
-    {
-       Cnf.Set("Dir::Ignore-Files-Silently::", "~$");
-       Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
-       Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
-       Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
-    }
+    Cnf.Set("Dir::Ignore-Files-Silently::", "~$");
+    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
+    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
+    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
+    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$");
+    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.orig$");
  
     // Default cdrom mount point
     Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/");
@@@ -110,14 -104,14 +109,14 @@@
     }
  
     // Read the configuration parts dir
 -   string Parts = Cnf.FindDir("Dir::Etc::parts");
 +   std::string Parts = Cnf.FindDir("Dir::Etc::parts");
     if (DirectoryExists(Parts) == true)
        Res &= ReadConfigDir(Cnf,Parts);
     else
        _error->WarningE("DirectoryExists",_("Unable to read %s"),Parts.c_str());
  
     // Read the main config file
 -   string FName = Cnf.FindFile("Dir::Etc::main");
 +   std::string FName = Cnf.FindFile("Dir::Etc::main");
     if (RealFileExists(FName) == true)
        Res &= ReadConfigFile(Cnf,FName);
  
@@@ -144,7 -138,7 +143,7 @@@
  bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys)
  {
     Sys = 0;
 -   string Label = Cnf.Find("Apt::System","");
 +   std::string Label = Cnf.Find("Apt::System","");
     if (Label.empty() == false)
     {
        Sys = pkgSystem::GetSystem(Label.c_str());
diff --combined apt-pkg/policy.cc
index e6c44ebe2,a369bea83..b47dab90c
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@@ -23,8 -23,6 +23,8 @@@
     ##################################################################### */
  									/*}}}*/
  // Include Files							/*{{{*/
 +#include<config.h>
 +
  #include <apt-pkg/policy.h>
  #include <apt-pkg/configuration.h>
  #include <apt-pkg/tagfile.h>
@@@ -33,10 -31,10 +33,10 @@@
  #include <apt-pkg/error.h>
  #include <apt-pkg/sptr.h>
  
 -#include <apti18n.h>
 -
  #include <iostream>
  #include <sstream>
 +
 +#include <apti18n.h>
  									/*}}}*/
  
  using namespace std;
@@@ -66,7 -64,8 +66,8 @@@ pkgPolicy::pkgPolicy(pkgCache *Owner) 
        {
  	 if ((F->Archive != 0 && vm.ExpressionMatches(DefRel, F.Archive()) == true) ||
  	     (F->Codename != 0 && vm.ExpressionMatches(DefRel, F.Codename()) == true) ||
- 	     (F->Version != 0 && vm.ExpressionMatches(DefRel, F.Version()) == true))
+ 	     (F->Version != 0 && vm.ExpressionMatches(DefRel, F.Version()) == true) ||
+ 	     (DefRel.length() > 2 && DefRel[1] == '='))
  	    found = true;
        }
        if (found == false)
@@@ -321,10 -320,6 +322,10 @@@ signed short pkgPolicy::GetPriority(pkg
     }
     
     return 0;
 +}
 +signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &File)
 +{
 +   return PFPriority[File->ID];
  }
  									/*}}}*/
  // PreferenceSection class - Overriding the default TrimRecord method	/*{{{*/
diff --combined apt-pkg/sourcelist.cc
index 46025fc74,ebfb5289e..f5f458099
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@@ -8,19 -8,15 +8,19 @@@
     ##################################################################### */
  									/*}}}*/
  // Include Files							/*{{{*/
 +#include<config.h>
 +
  #include <apt-pkg/sourcelist.h>
  #include <apt-pkg/error.h>
  #include <apt-pkg/fileutl.h>
  #include <apt-pkg/strutl.h>
  #include <apt-pkg/configuration.h>
 -
 -#include <apti18n.h>
 +#include <apt-pkg/metaindex.h>
 +#include <apt-pkg/indexfile.h>
  
  #include <fstream>
 +
 +#include <apti18n.h>
  									/*}}}*/
  
  using namespace std;
@@@ -270,7 -266,7 +270,7 @@@ bool pkgSourceList::ReadAppend(string F
        // CNC:2003-02-20 - Do not break if '#' is inside [].
        for (I = Buffer; *I != 0 && *I != '#'; I++)
           if (*I == '[')
- 	    for (I++; *I != 0 && *I != ']'; I++);
+ 	    I = strchr(I + 1, ']');
        *I = 0;
        
        const char *C = _strstrip(Buffer);
@@@ -350,14 -346,10 +350,14 @@@ bool pkgSourceList::ReadSourceDir(strin
  /* */
  time_t pkgSourceList::GetLastModifiedTime()
  {
 -   // go over the parts
 +   vector<string> List;
 +
     string Main = _config->FindFile("Dir::Etc::sourcelist");
     string Parts = _config->FindDir("Dir::Etc::sourceparts");
 -   vector<string> const List = GetListOfFilesInDir(Parts, "list", true);
 +
 +   // go over the parts
 +   if (DirectoryExists(Parts) == true)
 +      List = GetListOfFilesInDir(Parts, "list", true);
  
     // calculate the time
     time_t mtime_sources = GetModificationTime(Main);
diff --combined cmdline/apt-get.cc
index 88e734697,49ac8f2cf..1925dea87
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -25,7 -25,8 +25,7 @@@
     ##################################################################### */
  									/*}}}*/
  // Include Files							/*{{{*/
 -#define _LARGEFILE_SOURCE
 -#define _LARGEFILE64_SOURCE
 +#include <config.h>
  
  #include <apt-pkg/aptconfiguration.h>
  #include <apt-pkg/error.h>
@@@ -36,7 -37,6 +36,7 @@@
  #include <apt-pkg/algorithms.h>
  #include <apt-pkg/acquire-item.h>
  #include <apt-pkg/strutl.h>
 +#include <apt-pkg/fileutl.h>
  #include <apt-pkg/clean.h>
  #include <apt-pkg/srcrecords.h>
  #include <apt-pkg/version.h>
@@@ -45,10 -45,9 +45,10 @@@
  #include <apt-pkg/sptr.h>
  #include <apt-pkg/md5.h>
  #include <apt-pkg/versionmatch.h>
 -
 -#include <config.h>
 -#include <apti18n.h>
 +#include <apt-pkg/progress.h>
 +#include <apt-pkg/pkgsystem.h>
 +#include <apt-pkg/pkgrecords.h>
 +#include <apt-pkg/indexfile.h>
  
  #include "acqprogress.h"
  
@@@ -69,7 -68,8 +69,7 @@@
  #include <sys/wait.h>
  #include <sstream>
  
 -#define statfs statfs64
 -#define statvfs statvfs64
 +#include <apti18n.h>
  									/*}}}*/
  
  #define RAMFS_MAGIC     0x858458f6
@@@ -135,11 -135,6 +135,11 @@@ bool YnPrompt(bool Default=true
        c1out << _("Y") << endl;
        return true;
     }
 +   else if (_config->FindB("APT::Get::Assume-No",false) == true)
 +   {
 +      c1out << _("N") << endl;
 +      return false;
 +   }
  
     char response[1024] = "";
     cin.getline(response, sizeof(response));
@@@ -662,22 -657,22 +662,22 @@@ public
  					pkgCache::PkgIterator Pkg = I.OwnerPkg();
  
  					if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) {
- 						out << "  " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr();
+ 						c1out << "  " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr();
  						if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false)
- 							out << _(" [Installed]");
- 						out << endl;
+ 							c1out << _(" [Installed]");
+ 						c1out << endl;
  						++provider;
  					}
  				}
  				// if we found no candidate which provide this package, show non-candidates
  				if (provider == 0)
  					for (I = Pkg.ProvidesList(); I.end() == false; ++I)
- 						out << "  " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr()
+ 						c1out << "  " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr()
  						    << _(" [Not candidate version]") << endl;
  				else
  					out << _("You should explicitly select one to install.") << endl;
  			} else {
- 				ioprintf(out,
+ 				ioprintf(c1out,
  					_("Package %s is not available, but is referred to by another package.\n"
  					  "This may mean that the package is missing, has been obsoleted, or\n"
  					  "is only available from another source\n"),Pkg.FullName(true).c_str());
@@@ -696,9 -691,9 +696,9 @@@
  					List += Dep.ParentPkg().FullName(true) + " ";
  					//VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ???
  				}
- 				ShowList(out,_("However the following packages replace it:"),List,VersionsList);
+ 				ShowList(c1out,_("However the following packages replace it:"),List,VersionsList);
  			}
- 			out << std::endl;
+ 			c1out << std::endl;
  		}
  		return false;
  	}
@@@ -1907,7 -1902,8 +1907,7 @@@ bool DoInstall(CommandLine &CmdL
        {
  	 // Call the scored problem resolver
  	 Fix->InstallProtect();
 -	 if (Fix->Resolve(true) == false)
 -	    _error->Discard();
 +	 Fix->Resolve(true);
  	 delete Fix;
        }
  
@@@ -1933,11 -1929,8 +1933,11 @@@
  	 c1out << _("The following information may help to resolve the situation:") << endl;
  	 c1out << endl;
  	 ShowBroken(c1out,Cache,false);
 -	 return _error->Error(_("Broken packages"));
 -      }   
 +	 if (_error->PendingError() == true)
 +	    return false;
 +	 else
 +	    return _error->Error(_("Broken packages"));
 +      }
     }
     if (!DoAutomaticRemove(Cache)) 
        return false;
@@@ -2327,8 -2320,6 +2327,8 @@@ bool DoDownload(CommandLine &CmdL
        strprintf(descr, _("Downloading %s %s"), Pkg.Name(), Ver.VerStr());
        // get the most appropriate hash
        HashString hash;
 +      if (rec.SHA512Hash() != "")
 +         hash = HashString("sha512", rec.SHA512Hash());
        if (rec.SHA256Hash() != "")
           hash = HashString("sha256", rec.SHA256Hash());
        else if (rec.SHA1Hash() != "")
@@@ -3363,8 -3354,7 +3363,8 @@@ int main(int argc,const char *argv[]
        {'s',"dry-run","APT::Get::Simulate",0},
        {'s',"no-act","APT::Get::Simulate",0},
        {'y',"yes","APT::Get::Assume-Yes",0},
 -      {'y',"assume-yes","APT::Get::Assume-Yes",0},      
 +      {'y',"assume-yes","APT::Get::Assume-Yes",0},
 +      {0,"assume-no","APT::Get::Assume-No",0},
        {'f',"fix-broken","APT::Get::Fix-Broken",0},
        {'u',"show-upgraded","APT::Get::Show-Upgraded",0},
        {'m',"ignore-missing","APT::Get::Fix-Missing",0},
@@@ -3394,7 -3384,6 +3394,7 @@@
        {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean},
        {0,"install-suggests","APT::Install-Suggests",CommandLine::Boolean},
        {0,"fix-policy","APT::Get::Fix-Policy-Broken",0},
 +      {0,"solver","APT::Solver",CommandLine::HasArg},
        {'c',"config-file",0,CommandLine::ConfigFile},
        {'o',"option",0,CommandLine::ArbItem},
        {0,0,0,0}};
diff --combined debian/changelog
index 98a561698,ef4027406..406f1e8a4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,196 -1,66 +1,259 @@@
 -apt (0.8.15.9+nmu1) unstable; urgency=low
 +apt (0.8.16~exp8) experimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/packagemanager.cc:
 +    - do not fail on unpacked packages in SmartUnPack, just don't
 +      shedule them for unpack, but do all checks and configure them
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 17 Oct 2011 11:21:21 +0200
 +
 +apt (0.8.16~exp7) experimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * do not pollute namespace in the headers with using (Closes: #500198)
 +  * use forward declaration in headers if possible instead of includes
 +  * remove old APT_COMPATIBILITY ifdef's
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - use std::vector instead of fixed size arrays to store args and
 +      multiarch-packagename strings
 +    - load the dpkg base arguments only one time and reuse them later
 +  * cmdline/apt-get.cc:
 +    - follow Provides in the evaluation of saving candidates, too, for
 +      statisfying garbage package dependencies (Closes: #640590)
 +  * apt-pkg/algorithms.cc:
 +    - if a package is garbage, don't try to save it with FixByInstall
 +  * apt-pkg/deb/debsrcrecords.cc:
 +    - remove the limit of 400 Binaries for a source package (Closes: #622110)
 +  * apt-pkg/deb/deblistparser.cc:
 +    - fix crash when the dynamic mmap needs to be grown in
 +      LoadReleaseInfo (LP: #854090)
 +  * apt-pkg/deb/debmetaindex.cc:
 +    - none is a separator, not a language: no need for Index (Closes: #624218)
 +  * apt-pkg/aptconfiguration.cc:
 +    - do not builtin languages only if none is forced (Closes: #643787)
 +  * apt-pkg/pkgcachegen.cc:
 +    - refactor MergeList by creating -Group, -Package and -Version specialist
 +    - share description list between "same" versions (LP: #868977)
 +      This also means that descriptions are shared across archives now.
 +    - add implicit dependencies needed for Multi-Arch at the time a Version
 +      struct is created and not at the end of the cache generation
 +  * apt-pkg/pkgcache.cc:
 +    - always prefer "en" over "" for "en"-language regardless of cache-order
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/contrib/configuration.cc:
 +    - fix double delete (LP: #848907)
 +    - ignore only the invalid regexp instead of all options
 +  * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
 +    - fix fetching language information by adding OptionalSubIndexTarget
 +  * methods/https.cc:
 +    - cleanup broken downloads properly
 +
 +  [ Colin Watson ]
 +  * ftparchive/cachedb.cc:
 +    - fix buffersize in bytes2hex
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 14 Oct 2011 13:51:35 +0200
 +
 +apt (0.8.16~exp6) experimental; urgency=low
 +
 +  [ Christopher Baines ]
 +  * enable APT in unpack/configure ordering to handle loops as well
 +    as tight dependencies between immediate packages better
 +    enabling also the possibility to mark all packages as immediate
 +    (at least Closes: #353290, #540227, #559733, #621836, #639290)
 +
 +  [ David Kalnischkies ]
 +  * [abi-break] Support large files in the complete toolset. Indexes of this
 +    size are pretty unlikely for now, but we need it for deb
 +    packages which could become bigger than 4GB now (LP: #815895)
 +  * merged the debian-sid branch
 +  
 +  [ Michael Vogt ]
 +  * bump ABI version
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 14 Sep 2011 21:06:51 +0200
 +
 +apt (0.8.16~exp5) experimental; urgency=low
 +
 +  * merged the latest debian-sid fixes
 +  * apt-pkg/makefile:
 +    - install sha256.h compat header
 +  * apt-pkg/pkgcachegen.{cc,h}:
 +    - use ref-to-ptr semantic in NewDepends() to ensure that the   
 +      libapt does not segfault if the cache is remapped in between
 +      (LP: #812862)
 +    - fix crash when P.Arch() was used but the cache got remapped
 +  * apt-pkg/acquire-item.{cc,h}:
 +    - do not check for a "Package" tag in optional index targets
 +      like the translations index
 +  * apt-pkg/acquire.cc:
 +    - fix potential divide-by-zero
 +  * methods/mirror.cc:
 +    - include the architecture(s) in the query string as well so 
 +      that the server can make better decisions
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 15 Aug 2011 14:52:54 +0200
 +
 +apt (0.8.16~exp4) experimental; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/pkgcache.h:
 +    - [ABI break] Add pkgCache::Header::CacheFileSize, storing the cache size
 +  * apt-pkg/pkgcachegen.cc:
 +    - Write the file size to the cache
 +  * apt-pkg/pkgcache.cc:
 +    - Check that cache is at least CacheFileSize bytes large (LP: #16467)
 +  
 +  [ Michael Vogt ]
 +  * merged latest fixes from debian-sid
 +  * apt-pkg/cdrom.{cc,h}:
 +    - cleanup old ABI break avoidance hacks
 +  * [ABI break] apt-pkg/acquire-item.{cc,h}:
 +    - cleanup around OptionalIndexTarget and SubIndexTarget
 +  * [ABI break] merged patch from Jonathan Thomas to have a new
 +    RecordField() function in the pkgRecorder parser. Many thanks
 +    Thomas
 +  * [ABI break] merge patch from Jonathan Thomas to speed up the
 +    depcache by caching the install-recommends and install-suggests
 +    values
 +  * apt-pkg/contrib/fileutl.{cc,h}:
 +    - add GetModificationTime() helper
 +  * apt-pkg/pkgcachegen.cc:
 +    - regenerate the cache if the sources.list changes to ensure
 +      that changes in the ordering there will be honored by apt
 +  * apt-pkg/sourcelist.{cc,h}:
 +    - add pkgSourceList::GetLastModifiedTime() helper
 +
 + -- Michael Vogt <mvo@debian.org>  Thu, 28 Jul 2011 16:57:08 +0200
 +
 +apt (0.8.16~exp3) experimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/pkgcache.h:
 +    - readd All{Foreign,Allowed} as suggested by Julian to
 +      remain strictly API compatible
 +  * apt-pkg/acquire*.{cc,h}:
 +    - try even harder to support really big files in the fetcher by
 +      converting (hopefully) everything to 'long long' (Closes: #632271)
 +  * ftparchive/writer.cc:
 +    - generate all checksums in one run over the file for Release
 +  * cmdline/apt-get.cc:
 +    - add an --assume-no option for testing to say 'no' to everything
 +  * apt-pkg/deb/debmetaindex.cc:
 +    - add trusted=yes option to mark unsigned (local) repository as trusted
 +      based on a patch from Ansgar Burchardt, thanks a lot! (Closes: #596498)
 +
 +  [ Michael Vogt ]
 +  * merge fixes from the debian/unstable upload
 +  * merge lp:~mvo/apt/sha512-template to get fixes for the 
 +    sha1/md5 verifiation (closes: #632520)
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 15 Jul 2011 09:56:17 +0200
 +
 +apt (0.8.16~exp2) experimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * [ABI-Break] Implement EDSP in libapt-pkg so that all front-ends which
 +    use the internal resolver can now be used also with external
 +    ones as the usage is hidden in between the old API
 +  * provide two edsp solvers in apt-utils:
 +    - 'dump' to quickly output a complete scenario and
 +    - 'apt' to use the internal as an external resolver
 +  * apt-pkg/pkgcache.h:
 +    - clean up mess with the "all" handling in MultiArch to
 +      fix LP: #733741 cleanly for everyone now
 +  * apt-pkg/depcache.cc:
 +    - use a boolean instead of an int for Add/Remove in AddStates
 +      similar to how it works with AddSizes
 +    - let the Mark methods return if their marking was successful
 +    - if a Breaks can't be upgraded, remove it. If it or a Conflict
 +      can't be removed the installation of the breaker fails.
 +  * cmdline/apt-get.cc:
 +    - do not discard the error messages from the resolver and instead
 +      only show the general 'Broken packages' message if nothing else
 +
 +  [ Stefano Zacchiroli ]
 +  * doc/external-dependency-solver-protocol.txt:
 +    - describe EDSP and the configuration interface around it
 +  
 +  [ Michael Vogt ]
 +  * [ABI-Break] merge lp:~mvo/apt/sha512-template to add support for sha512
 +  * [ABI-Break] merge lp:~mvo/apt/dpointer to support easier extending
 +    without breaking the ABI
 +  * increase ABI version and update package names
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 13:57:28 +0200
 +
 +apt (0.8.16~exp1) experimental; urgency=low
 +
 +  * merged with the debian/unstable upload
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 12:40:31 +0200
 +
++apt (1.8.15.9+nmu1) unstable; urgency=low
+ 
+   [ David Kalnischkies ]
+   * algorithms.cc:
+     - show a debug why a package was kept by ResolveByKeep()
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 17 Oct 2011 16:36:22 +0200
+ 
+ apt (0.8.15.9) unstable; urgency=low
+ 
+   [ David Kalnischkies ]
+   * Symbol file update
+   * doc/apt-get.8.xml:
+     - change wording of autoremove description as suggested
+       by Robert Simmons, thanks! (Closes: #641490)
+   * apt-pkg/deb/dpkgpm.cc:
+     - use std::vector instead of fixed size arrays to store args and
+       multiarch-packagename strings
+     - load the dpkg base arguments only one time and reuse them later
+   * cmdline/apt-get.cc:
+     - follow Provides in the evaluation of saving candidates, too, for
+       statisfying garbage package dependencies (Closes: #640590)
+   * apt-pkg/algorithms.cc:
+     - if a package is garbage, don't try to save it with FixByInstall
+   * apt-pkg/init.cc:
+     - silently ignore *.orig and *.save files by default
+   * apt-pkg/policy.cc:
+     - accept generic release pin expressions again in -t (Closes: #644166)
+   * apt-pkg/deb/debmetaindex.cc:
+     - none is a separator, not a language: no need for Index (Closes: #624218)
+   * apt-pkg/aptconfiguration.cc:
+     - do not builtin languages only if none is forced (Closes: #643787)
+   * doc/apt.conf.5.xml:
+     - apply spelling fix by Kevin Lyda, thanks! (Closes: #644104)
+ 
+   [ Christian Perrier ]
+   * Fix spelling error (sensée) in French translation. Thanks
+     to Corentin Le Gall for spotting it.
+ 
+   [ Colin Watson ]
+   * ftparchive/cachedb.cc:
+     - fix buffersize in bytes2hex
+ 
+   [ Michael Vogt ]
+   * ftparchive/cachedb.cc:
+     - make buffer fully dynamic (thanks to Colin Watson)
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 14 Oct 2011 12:00:09 +0200
+ 
+ apt (0.8.15.8) unstable; urgency=low
+ 
+   [ David Kalnischkies ]
+   * cmdline/apt-get.cc:
+     - output list of virtual package providers to c1out in -q=1
+       instead of /dev/null to unbreak sbuild (LP: #816155)
 -  
++
+   [ Michael Vogt ]
+   * apt-pkg/contrib/configuration.cc:
+     - fix double delete (LP: #848907)
+     - ignore only the invalid regexp instead of all options
+ 
+  -- Michael Vogt <mvo@debian.org>  Wed, 14 Sep 2011 12:08:25 +0200
+ 
  apt (0.8.15.7) unstable; urgency=low
  
    [ David Kalnischkies ]
@@@ -470,185 -340,6 +533,185 @@@ apt (0.8.15) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Tue, 28 Jun 2011 18:00:48 +0200
  
 +apt (0.8.15~exp3) experimental; urgency=low
 +
 +  * debian/control:
 +    - add Breaks: 0.8.15~exp3) for libapt-pkg4.10 and 
 +     libapt-inst1.2 (thanks to Jonathan Nieder, closes: #630214)
 +    - use depends for the ${shlibs:Depends} to make the breaks work
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 17 Jun 2011 21:51:41 +0200
 +
 +apt (0.8.15~exp2) experimental; urgency=low
 +
 +  * debian/control:
 +    - fix incorrect Replaces (closes: #630204) for libapt-inst1.2
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 15 Jun 2011 16:51:14 +0200
 +
 +apt (0.8.15~exp1) experimental; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/depcache.cc:
 +    - Really release action groups only once (Closes: #622744)
 +    - Make purge work again for config-files (LP: #244598) (Closes: #150831)
 +  * apt-pkg/acquire-item.cc:
 +    - Reject files known to be invalid (LP: #346386) (Closes: #627642)
 +  * debian/apt.cron.daily:
 +    - Check power after wait, patch by manuel-soto (LP: #705269)
 +  * debian/control:
 +    - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
 +      unpacked if a library is too old and thus break upgrades
 +  * doc/apt-key.8.xml:
 +    - Document apt-key net-update (LP: #192810)
 +
 +  [ Christian Perrier ]
 +  * Galician translation update (Miguel Anxo Bouzada). Closes: #626505
 +  * Italian translation update (Milo Casagrande). Closes: #627834
 +  * German documentation translation update (Chris Leick). Closes: #629949
 +
 +  [ David Kalnischkies ]
 +  * fix a bunch of cppcheck warnings/errors based on a patch by
 +    Niels Thykier, thanks! (Closes: #622805)
 +  * apt-pkg/depcache.cc:
 +    - really include 'rc' packages in the delete count by fixing a
 +      typo which exists since 1999 in the source… (LP: #761175)
 +    - if critical or-group can't be satisfied, exit directly.
 +  * apt-pkg/acquire-method.cc:
 +    - write directly to stdout instead of creating the message in
 +      memory first before writing to avoid hitting limits
 +    - fix order of CurrentURI and UsedMirror in Status() and Log()
 +  * apt-pkg/orderlist.cc:
 +    - let VisitRProvides report if the calls were successful
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - replace obsolete usleep with nanosleep
 +  * debian/apt{,-utils}.symbols:
 +    - update both experimental symbol-files to reflect 0.8.14 state
 +  * debian/rules:
 +    - remove unused embedded jquery by doxygen from libapt-pkg-doc
 +  * cmdline/apt-mark.cc:
 +    - reimplement apt-mark in c++
 +    - provide a 'showmanual' command (Closes: #582791)
 +    - provide a 'dpkg --set-selections' wrapper to set/release holds
 +  * cmdline/apt-get.cc:
 +    - deprecate mostly undocumented 'markauto' in favor of 'apt-mark'
 +  * cmdline/apt-cache.cc:
 +    - deprecate mostly undocumented 'showauto' in favor of 'apt-mark'
 +  * apt-pkg/pkgcache.cc:
 +    - really ignore :arch in FindPkg() in non-multiarch environment
 +  * doc/po/de.po:
 +    - undo the translation of the command 'dump' in manpage of apt-config
 +      as report by Burghard Grossmann on debian-l10n-german, thanks!
 +  * apt-pkg/deb/debmetaindex.cc:
 +    - do not download TranslationIndex if no Translation-* will be
 +      downloaded later on anyway (Closes: #624218)
 +  * test/versions.lst:
 +    - disable obscure version number tests with versions dpkg doesn't
 +      allow any more as they don't start with a number
 +  * apt-pkg/acquire-worker.cc:
 +    - print filename in the unmatching size warning (Closes: #623137)
 +  * apt-pkg/acquire-item.cc:
 +    - apply fix for poorly worded 'locate file' error message from
 +      Ben Finney, thanks! (Closes: #623171)
 +  * methods/http.cc:
 +    - add config option to ignore a closed stdin to be able to easily
 +      use the method as a simple standalone downloader
 +    - Location header in redirects should be absolute URI, but some
 +      servers just send an absolute path so still deal with it properly
 +    - dequote URL taken from Location in redirects as we will otherwise
 +      quote an already quoted string in the request later (Closes: #602412)
 +  * apt-pkg/contrib/netrc.cc:
 +    - replace non-posix gnu-extension strdupa with strdup
 +  * apt-pkg/packagemanager.cc:
 +    - ensure for Multi-Arch:same packages that they are unpacked in
 +      lock step even in immediate configuration (Closes: #618288)
 +
 +  [ Michael Vogt ]
 +  * methods/mirror.cc:
 +    - ignore lines starting with "#" in the mirror file
 +    - ignore non http urls in the mirrors
 +    - append the dist (e.g. sid, wheezy) as a query string when
 +      asking for a suitable mirror 
 +  * debian/control:
 +    - add libapt-pkg4.10 and libapt-inst1.2 library packages
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 10 Jun 2011 15:32:07 +0200
 +
 +apt (0.8.14.2) UNRELEASED; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/depcache.cc:
 +    - Really release action groups only once (Closes: #622744)
 +    - Make purge work again for config-files (LP: #244598) (Closes: #150831)
 +  * debian/apt.cron.daily:
 +    - Check power after wait, patch by manuel-soto (LP: #705269)
 +  * debian/control:
 +    - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
 +      unpacked if a library is too old and thus break upgrades
 +  * doc/apt-key.8.xml:
 +    - Document apt-key net-update (LP: #192810)
 +
 +  [ Christian Perrier ]
 +  * Galician translation update (Miguel Anxo Bouzada). Closes: #626505
 +
 +  [ David Kalnischkies ]
 +  * fix a bunch of cppcheck warnings/errors based on a patch by
 +    Niels Thykier, thanks! (Closes: #622805)
 +  * apt-pkg/depcache.cc:
 +    - really include 'rc' packages in the delete count by fixing a
 +      typo which exists since 1999 in the source… (LP: #761175)
 +    - if critical or-group can't be satisfied, exit directly.
 +  * apt-pkg/acquire-method.cc:
 +    - write directly to stdout instead of creating the message in
 +      memory first before writing to avoid hitting limits
 +    - fix order of CurrentURI and UsedMirror in Status() and Log()
 +  * apt-pkg/orderlist.cc:
 +    - let VisitRProvides report if the calls were successful
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - replace obsolete usleep with nanosleep
 +  * debian/apt{,-utils}.symbols:
 +    - update both experimental symbol-files to reflect 0.8.14 state
 +  * debian/rules:
 +    - remove unused embedded jquery by doxygen from libapt-pkg-doc
 +  * cmdline/apt-mark.cc:
 +    - reimplement apt-mark in c++
 +    - provide a 'showmanual' command (Closes: #582791)
 +    - provide a 'dpkg --set-selections' wrapper to set/release holds
 +  * cmdline/apt-get.cc:
 +    - deprecate mostly undocumented 'markauto' in favor of 'apt-mark'
 +  * cmdline/apt-cache.cc:
 +    - deprecate mostly undocumented 'showauto' in favor of 'apt-mark'
 +  * apt-pkg/pkgcache.cc:
 +    - really ignore :arch in FindPkg() in non-multiarch environment
 +  * doc/po/de.po:
 +    - undo the translation of the command 'dump' in manpage of apt-config
 +      as report by Burghard Grossmann on debian-l10n-german, thanks!
 +  * apt-pkg/deb/debmetaindex.cc:
 +    - do not download TranslationIndex if no Translation-* will be
 +      downloaded later on anyway (Closes: #624218)
 +  * test/versions.lst:
 +    - disable obscure version number tests with versions dpkg doesn't
 +      allow any more as they don't start with a number
 +  * apt-pkg/acquire-worker.cc:
 +    - print filename in the unmatching size warning (Closes: #623137)
 +  * apt-pkg/acquire-item.cc:
 +    - apply fix for poorly worded 'locate file' error message from
 +      Ben Finney, thanks! (Closes: #623171)
 +  * methods/http.cc:
 +    - add config option to ignore a closed stdin to be able to easily
 +      use the method as a simple standalone downloader
 +    - Location header in redirects should be absolute URI, but some
 +      servers just send an absolute path so still deal with it properly
 +    - dequote URL taken from Location in redirects as we will otherwise
 +      quote an already quoted string in the request later (Closes: #602412)
 +  * apt-pkg/contrib/netrc.cc:
 +    - replace non-posix gnu-extension strdupa with strdup
 +  * apt-pkg/packagemanager.cc:
 +    - ensure for Multi-Arch:same packages that they are unpacked in
 +      lock step even in immediate configuration (Closes: #618288)
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 16 May 2011 14:57:52 +0200
 +
  apt (0.8.14.1) unstable; urgency=low
  
    * apt-pkg/acquire-item.cc:
diff --combined doc/apt-get.8.xml
index 36a675bb0,624e4355e..03a418e5c
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@@ -317,7 -317,7 +317,7 @@@
  
       <varlistentry><term>autoremove</term>
       <listitem><para><literal>autoremove</literal> is used to remove packages that were automatically
-      installed to satisfy dependencies for some package and that are no more needed.</para></listitem>
+      installed to satisfy dependencies for other packages and are now no longer needed.</para></listitem>
       </varlistentry>
  
       <varlistentry><term>changelog</term>
@@@ -433,11 -433,6 +433,11 @@@
       Configuration Item: <literal>APT::Get::Assume-Yes</literal>.</para></listitem>
       </varlistentry>
  
 +     <varlistentry><term><option>--assume-no</option></term>
 +     <listitem><para>Automatic "no" to all prompts.
 +     Configuration Item: <literal>APT::Get::Assume-No</literal>.</para></listitem>
 +     </varlistentry>
 +
       <varlistentry><term><option>-u</option></term><term><option>--show-upgraded</option></term>
       <listitem><para>Show upgraded packages; Print out a list of all packages that are to be
       upgraded. 
diff --combined doc/po/de.po
index 6261a470e,0ce5c1bcc..1c3ab0e90
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt-doc 0.8.14-1\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 -"POT-Creation-Date: 2011-10-05 23:06+0300\n"
 +"POT-Creation-Date: 2011-06-08 16:54+0300\n"
  "PO-Revision-Date: 2011-05-31 21:00+0100\n"
  "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
  "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@@ -734,7 -734,7 +734,7 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
 -#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
 +#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
  #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
  #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
  #: sources.list.5.xml:36
@@@ -755,7 -755,7 +755,7 @@@ msgstr "
  "und Generieren von interessanten Ausgaben der Paket-Metadaten bereit."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-cache.8.xml:70 apt-get.8.xml:127
 +#: apt-cache.8.xml:70 apt-get.8.xml:120
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given, "
  "one of the commands below must be present."
@@@ -1254,8 -1254,8 +1254,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
 -#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
 +#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
  msgid "options"
  msgstr "Optionen"
  
@@@ -1282,7 -1282,7 +1282,7 @@@ msgstr "
  "pkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
  #: apt-sortpkgs.1.xml:61
  msgid "<option>-s</option>"
  msgstr "<option>-s</option>"
@@@ -1310,12 -1310,12 +1310,12 @@@ msgstr "
  "srcpkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
  msgid "<option>-q</option>"
  msgstr "<option>-q</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
  msgid "<option>--quiet</option>"
  msgstr "<option>--quiet</option>"
  
@@@ -1394,12 -1394,18 +1394,18 @@@ msgstr "<option>--no-replaces</option>
  msgid "<option>--no-enhances</option>"
  msgstr "<option>--no-enhances</option>"
  
- # FIXME s/twicked/tricked/
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cache.8.xml:317
+ #, fuzzy
+ #| msgid ""
+ #| "Per default the <literal>depends</literal> and <literal>rdepends</"
+ #| "literal> print all dependencies. This can be twicked with these flags "
+ #| "which will omit the specified dependency type.  Configuration Item: "
+ #| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+ #| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 -"print all dependencies. This can be tweaked with these flags which will omit "
 +"print all dependencies. This can be twicked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
@@@ -1411,7 -1417,7 +1417,7 @@@ msgstr "
  "replaceable></literal> z.B. <literal>APT::Cache::ShowRecommends</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
 +#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
  msgid "<option>-f</option>"
  msgstr "<option>-f</option>"
  
@@@ -1430,7 -1436,8 +1436,7 @@@ msgstr "
  "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
 -#: apt-get.8.xml:447
 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
  msgid "<option>-a</option>"
  msgstr "<option>-a</option>"
  
@@@ -1547,14 -1554,14 +1553,14 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist>
  #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591
 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
  #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
  msgid "&apt-commonoptions;"
  msgstr "&apt-commonoptions;"
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144
 -#: apt.conf.5.xml:1110 apt_preferences.5.xml:697
 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
  msgid "Files"
  msgstr "Dateien"
  
@@@ -1565,10 -1572,10 +1571,10 @@@ msgstr "&file-sourceslist; &file-statel
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606
 -#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
 -#: sources.list.5.xml:250
 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
 +#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 +#: sources.list.5.xml:234
  msgid "See Also"
  msgstr "Siehe auch"
  
@@@ -1579,7 -1586,7 +1585,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612
 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
  #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
  msgid "Diagnostics"
  msgstr "Diagnose"
@@@ -1709,12 -1716,12 +1715,12 @@@ msgstr "
  "<placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-cdrom.8.xml:94 apt-key.8.xml:161
 +#: apt-cdrom.8.xml:94 apt-key.8.xml:158
  msgid "Options"
  msgstr "Optionen"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
  msgid "<option>-d</option>"
  msgstr "<option>-d</option>"
  
@@@ -1758,7 -1765,7 +1764,7 @@@ msgstr "
  "Konfigurationselement: <literal>APT::CDROM::Rename</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cdrom.8.xml:116 apt-get.8.xml:375
 +#: apt-cdrom.8.xml:116 apt-get.8.xml:364
  msgid "<option>-m</option>"
  msgstr "<option>-m</option>"
  
@@@ -1813,17 -1820,17 +1819,17 @@@ msgstr "
  "Dies verlängert das Durchsuchen des Mediums deutlich, nimmt aber alle auf."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cdrom.8.xml:143 apt-get.8.xml:406
 +#: apt-cdrom.8.xml:143 apt-get.8.xml:395
  msgid "<option>--just-print</option>"
  msgstr "<option>--just-print</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cdrom.8.xml:144 apt-get.8.xml:408
 +#: apt-cdrom.8.xml:144 apt-get.8.xml:397
  msgid "<option>--recon</option>"
  msgstr "<option>--recon</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cdrom.8.xml:145 apt-get.8.xml:409
 +#: apt-cdrom.8.xml:145 apt-get.8.xml:398
  msgid "<option>--no-act</option>"
  msgstr "<option>--no-act</option>"
  
@@@ -1968,7 -1975,7 +1974,7 @@@ msgid "Just show the contents of the co
  msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
  #: apt-sortpkgs.1.xml:73
  msgid "&apt-conf;"
  msgstr "&apt-conf;"
@@@ -2048,7 -2055,7 +2054,7 @@@ msgstr "
  "XXXX</filename> angegeben wurde"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525
 +#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
  msgid "<option>-t</option>"
  msgstr "<option>-t</option>"
  
@@@ -2337,7 -2344,7 +2343,7 @@@ msgstr "
  "Verwaltung der erforderlichen Einstellungen bereitstellt."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
 +#: apt-ftparchive.1.xml:145 apt-get.8.xml:287
  msgid "clean"
  msgstr "clean"
  
@@@ -2906,8 -2913,8 +2912,8 @@@ msgstr "
  "der Distribution erscheint, typischerweise etwas wie <literal>main contrib "
  "non-free</literal>"
  
 -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
 +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 +#: apt-ftparchive.1.xml:394
  msgid "Architectures"
  msgstr "Architekturen"
  
@@@ -3133,38 -3140,38 +3139,50 @@@ msgid "
  msgstr ""
  "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
  
- # FIXME <literal>Checksum</literal> im letzten Abschnitt <replaceable>?
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:531
++#, fuzzy
++#| msgid ""
++#| "Generate the given checksum. These options default to on, when turned off "
++#| "the generated index files will not have the checksum fields where "
++#| "possible.  Configuration Items: <literal>APT::FTPArchive::"
++#| "<replaceable>Checksum</replaceable></literal> and <literal>APT::"
++#| "FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</"
++#| "replaceable></literal> where <literal><replaceable>Index</replaceable></"
++#| "literal> can be <literal>Packages</literal>, <literal>Sources</literal> "
++#| "or <literal>Release</literal> and <literal><replaceable>Checksum</"
++#| "replaceable></literal> can be <literal>MD5</literal>, <literal>SHA1</"
++#| "literal> or <literal>SHA256</literal>."
  msgid ""
  "Generate the given checksum. These options default to on, when turned off "
  "the generated index files will not have the checksum fields where possible.  "
  "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
  "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
  "replaceable>::<replaceable>Checksum</replaceable></literal> where "
 -"<literal><replaceable>Index</replaceable></literal> can be "
 -"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
 -"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
 -"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 +"<literal>Index</literal> can be <literal>Packages</literal>, "
 +"<literal>Sources</literal> or <literal>Release</literal> and "
 +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
 +"literal> or <literal>SHA256</literal>."
  msgstr ""
  "erzeugt die vorgegebene Prüfsumme. Diese Optionen sind standardmäßig "
  "aktiviert. Wenn sie deaktiviert sind, werden die erzeugten Indexdateien nach "
  "Möglichkeit keine Prüfsummenfelder erhalten. Konfigurationselemente: "
  "<literal>APT::FTPArchive::<replaceable>Prüfsumme</replaceable></literal> und "
  "<literal>APT::FTPArchive::<replaceable>Index</replaceable>::"
- "<replaceable>Prüfsumme</replaceable></literal>, wobei <literal>Index</"
- "literal> <literal>Packages</literal>, <literal>Sources</literal> oder "
- "<literal>Release</literal> sein kann und <literal>Checksum</literal> "
+ "<replaceable>Prüfsumme</replaceable></literal>, wobei "
+ "<literal><replaceable>Index</replaceable></literal> <literal>Packages</"
+ "literal>, <literal>Sources</literal> oder <literal>Release</literal> sein "
+ "kann und <literal><replaceable>Prüfsumme</replaceable></literal> "
  "<literal>MD5</literal>, <literal>SHA1</literal> oder <literal>SHA256</"
  "literal> sein kann."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:540
 +#: apt-ftparchive.1.xml:539
  msgid "<option>--db</option>"
  msgstr "<option>--db</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:542
 +#: apt-ftparchive.1.xml:541
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
  "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@@ -3174,7 -3181,7 +3192,7 @@@ msgstr "
  "DB</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:548
 +#: apt-ftparchive.1.xml:547
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -3188,12 -3195,12 +3206,12 @@@ msgstr "
  "Konfigurationselement: <literal>quiet</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:554
 +#: apt-ftparchive.1.xml:553
  msgid "<option>--delink</option>"
  msgstr "<option>--delink</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:556
 +#: apt-ftparchive.1.xml:555
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
  "then this option actually enables delinking of the files. It defaults to on "
@@@ -3207,12 -3214,12 +3225,12 @@@ msgstr "
  "DeLinkAct</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:562
 +#: apt-ftparchive.1.xml:561
  msgid "<option>--contents</option>"
  msgstr "<option>--contents</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:564
 +#: apt-ftparchive.1.xml:563
  msgid ""
  "Perform contents generation. When this option is set and package indexes are "
  "being generated with a cache DB then the file listing will also be extracted "
@@@ -3228,12 -3235,12 +3246,12 @@@ msgstr "
  "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:572
 +#: apt-ftparchive.1.xml:571
  msgid "<option>--source-override</option>"
  msgstr "<option>--source-override</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:574
 +#: apt-ftparchive.1.xml:573
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@@ -3244,12 -3251,12 +3262,12 @@@ msgstr "
  "SourceOverride</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:578
 +#: apt-ftparchive.1.xml:577
  msgid "<option>--readonly</option>"
  msgstr "<option>--readonly</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:580
 +#: apt-ftparchive.1.xml:579
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3258,12 -3265,12 +3276,12 @@@ msgstr "
  "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:584
 +#: apt-ftparchive.1.xml:583
  msgid "<option>--arch</option>"
  msgstr "<option>--arch</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:585
 +#: apt-ftparchive.1.xml:584
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
  "commands only package files matching <literal>*_arch.deb</literal> or "
@@@ -3277,12 -3284,12 +3295,12 @@@ msgstr "
  "Architecture</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:591
 +#: apt-ftparchive.1.xml:590
  msgid "<option>APT::FTPArchive::AlwaysStat</option>"
  msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:593
 +#: apt-ftparchive.1.xml:592
  msgid ""
  "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
  "packages are recompiled and/or republished with the same version again, this "
@@@ -3306,12 -3313,12 +3324,12 @@@ msgstr "
  "haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:603
 +#: apt-ftparchive.1.xml:602
  msgid "<option>APT::FTPArchive::LongDescription</option>"
  msgstr "<option>APT::FTPArchive::LongDescription</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:605
 +#: apt-ftparchive.1.xml:604
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
  "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@@ -3327,19 -3334,19 +3345,19 @@@ msgstr "
  "werden kann."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
 -#: sources.list.5.xml:209
 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
 +#: sources.list.5.xml:198
  msgid "Examples"
  msgstr "Beispiele"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
 -#: apt-ftparchive.1.xml:623
 +#: apt-ftparchive.1.xml:622
  #, no-wrap
  msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:619
 +#: apt-ftparchive.1.xml:618
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3349,7 -3356,7 +3367,7 @@@ msgstr "
  ">"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:633
 +#: apt-ftparchive.1.xml:632
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -3379,15 -3386,45 +3397,44 @@@ msgstr "APT-Werkzeug für den Umgang mi
  
  #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
  #: apt-get.8.xml:39
+ #, fuzzy
+ #| msgid ""
+ #| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+ #| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+ #| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
+ #| "<arg> <option>-t=</option> <arg choice='plain'> "
+ #| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+ #| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+ #| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+ #| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+ #| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+ #| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+ #| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+ #| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
+ #| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+ #| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+ #| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+ #| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+ #| "<group choice='req'> <arg choice='plain'> "
+ #| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+ #| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+ #| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+ #| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+ #| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+ #| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+ #| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+ #| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+ #| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+ #| "help</arg> </group> </arg> </group>"
  msgid ""
  "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
  "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
  "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
  "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
 -"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
 -"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
 -"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
 -"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
 -"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
 +"replaceable> </arg> </arg> <group choice=\"req\"> <arg "
 +"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
 +"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
 +"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
  "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
  "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
  "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
@@@ -3436,7 -3473,7 +3483,7 @@@ msgstr "
  "group>"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-get.8.xml:122
 +#: apt-get.8.xml:115
  msgid ""
  "<command>apt-get</command> is the command-line tool for handling packages, "
  "and may be considered the user's \"back-end\" to other tools using the APT "
@@@ -3449,12 -3486,12 +3496,12 @@@ msgstr "
  "Oberflächenschnittstellen, wie &dselect;, &aptitude;, &synaptic; und &wajig;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:131 apt-key.8.xml:127
 +#: apt-get.8.xml:124 apt-key.8.xml:127
  msgid "update"
  msgstr "update"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:132
 +#: apt-get.8.xml:125
  msgid ""
  "<literal>update</literal> is used to resynchronize the package index files "
  "from their sources. The indexes of available packages are fetched from the "
@@@ -3478,12 -3515,12 +3525,12 @@@ msgstr "
  "Größe der Pakete nicht im voraus bekannt ist."
  
  #. type: <tag></tag>
 -#: apt-get.8.xml:143 guide.sgml:121
 +#: apt-get.8.xml:136 guide.sgml:121
  msgid "upgrade"
  msgstr "upgrade"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:144
 +#: apt-get.8.xml:137
  msgid ""
  "<literal>upgrade</literal> is used to install the newest versions of all "
  "packages currently installed on the system from the sources enumerated in "
@@@ -3509,12 -3546,12 +3556,12 @@@ msgstr "
  "get</command> die neuen Versionen der verfügbaren Pakete kennt."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:156
 +#: apt-get.8.xml:149
  msgid "dselect-upgrade"
  msgstr "dselect-upgrade"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:157
 +#: apt-get.8.xml:150
  msgid ""
  "<literal>dselect-upgrade</literal> is used in conjunction with the "
  "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@@ -3531,12 -3568,12 +3578,12 @@@ msgstr "
  "Installieren von neuen Paketen)."
  
  #. type: <tag></tag>
 -#: apt-get.8.xml:166 guide.sgml:140
 +#: apt-get.8.xml:159 guide.sgml:140
  msgid "dist-upgrade"
  msgstr "dist-upgrade"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:167
 +#: apt-get.8.xml:160
  msgid ""
  "<literal>dist-upgrade</literal> in addition to performing the function of "
  "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@@ -3560,12 -3597,12 +3607,12 @@@ msgstr "
  "überschreiben der allgemeinen Einstellungen für einzelne Pakete."
  
  #. type: <tag></tag>
 -#: apt-get.8.xml:179 guide.sgml:131
 +#: apt-get.8.xml:172 guide.sgml:131
  msgid "install"
  msgstr "install"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:181
 +#: apt-get.8.xml:174
  msgid ""
  "<literal>install</literal> is followed by one or more packages desired for "
  "installation or upgrading.  Each package is a package name, not a fully "
@@@ -3594,7 -3631,7 +3641,7 @@@ msgstr "
  "vom Konfliktauflösungssystem von apt-get getroffen wurden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:199
 +#: apt-get.8.xml:192
  msgid ""
  "A specific version of a package can be selected for installation by "
  "following the package name with an equals and the version of the package to "
@@@ -3612,7 -3649,7 +3659,7 @@@ msgstr "
  "ausgewählt werden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:206
 +#: apt-get.8.xml:199
  msgid ""
  "Both of the version selection mechanisms can downgrade packages and must be "
  "used with care."
@@@ -3621,7 -3658,7 +3668,7 @@@ msgstr "
  "durchführen und müssen mit Vorsicht gehandhabt werden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:209
 +#: apt-get.8.xml:202
  msgid ""
  "This is also the target to use if you want to upgrade one or more already-"
  "installed packages without upgrading every package you have on your system. "
@@@ -3642,7 -3679,7 +3689,7 @@@ msgstr "
  "heruntergeladen und installiert."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:220
 +#: apt-get.8.xml:213
  msgid ""
  "Finally, the &apt-preferences; mechanism allows you to create an alternative "
  "installation policy for individual packages."
@@@ -3651,7 -3688,7 +3698,7 @@@ msgstr "
  "alternative Installationsrichtlinie für eigene Pakete zu erzeugen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:224
 +#: apt-get.8.xml:217
  msgid ""
  "If no package matches the given expression and the expression contains one "
  "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@@ -3671,12 -3708,12 +3718,12 @@@ msgstr "
  "Zeichen, um genauere reguläre Ausdruck zu erstellen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:233
 +#: apt-get.8.xml:226
  msgid "remove"
  msgstr "remove"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:234
 +#: apt-get.8.xml:227
  msgid ""
  "<literal>remove</literal> is identical to <literal>install</literal> except "
  "that packages are removed instead of installed. Note the removing a package "
@@@ -3691,12 -3728,12 +3738,12 @@@ msgstr "
  "Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:241
 +#: apt-get.8.xml:234
  msgid "purge"
  msgstr "purge"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:242
 +#: apt-get.8.xml:235
  msgid ""
  "<literal>purge</literal> is identical to <literal>remove</literal> except "
  "that packages are removed and purged (any configuration files are deleted "
@@@ -3707,12 -3744,12 +3754,12 @@@ msgstr "
  "Konfigurationsdateien werden mitgelöscht)."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:246
 +#: apt-get.8.xml:239
  msgid "source"
  msgstr "source"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:247
 +#: apt-get.8.xml:240
  msgid ""
  "<literal>source</literal> causes <command>apt-get</command> to fetch source "
  "packages. APT will examine the available packages to decide which source "
@@@ -3732,7 -3769,7 +3779,7 @@@ msgstr "
  "wurde, wenn möglich."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:255
 +#: apt-get.8.xml:248
  msgid ""
  "Source packages are tracked separately from binary packages via <literal>deb-"
  "src</literal> type lines in the &sources-list; file. This means that you "
@@@ -3748,12 -3785,19 +3795,18 @@@ msgstr "
  "installiert haben oder installieren könnten."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:262
 +#: apt-get.8.xml:255
+ #, fuzzy
+ #| msgid ""
+ #| "If the <option>--compile</option> option is specified then the package "
+ #| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+ #| "command>, if <option>--download-only</option> is specified then the "
+ #| "source package will not be unpacked."
  msgid ""
  "If the <option>--compile</option> option is specified then the package will "
 -"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
 -"the architecture as defined by the <command>--host-architecture</command> "
 -"option.  If <option>--download-only</option> is specified then the source "
 -"package will not be unpacked."
 +"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
 +"<option>--download-only</option> is specified then the source package will "
 +"not be unpacked."
  msgstr ""
  "Wenn die <option>--compile</option>-Option angegeben ist, dann wird das "
  "Paket unter Benutzung von <command>dpkg-buildpackage</command> zu einem "
@@@ -3761,7 -3805,7 +3814,7 @@@
  "ist, wird das Quellpaket nicht entpackt."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:269
 +#: apt-get.8.xml:260
  msgid ""
  "A specific source version can be retrieved by postfixing the source name "
  "with an equals and then the version to fetch, similar to the mechanism used "
@@@ -3777,7 -3821,7 +3830,7 @@@ msgstr "
  "literal>-Option."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:275
 +#: apt-get.8.xml:266
  msgid ""
  "Note that source packages are not tracked like binary packages, they exist "
  "only in the current directory and are similar to downloading source tar "
@@@ -3788,27 -3832,34 +3841,31 @@@ msgstr "
  "heruntergeladenen Tarballs ähnlich."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:280
 +#: apt-get.8.xml:271
  msgid "build-dep"
  msgstr "build-dep"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:281
 +#: apt-get.8.xml:272
+ #, fuzzy
+ #| msgid ""
+ #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
+ #| "an attempt to satisfy the build dependencies for a source package."
  msgid ""
  "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 -"attempt to satisfy the build dependencies for a source package. By default "
 -"the dependencies are satisfied to build the package nativly. If desired a "
 -"host-architecture can be specified with the <option>--host-architecture</"
 -"option> option instead."
 +"attempt to satisfy the build dependencies for a source package."
  msgstr ""
  "<literal>build-dep</literal> veranlasst apt-get, Pakete zu installieren/"
  "entfernen, um zu versuchen, die Bauabhängigkeiten eines Quellpakets zu "
  "erfüllen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:287
 +#: apt-get.8.xml:276
  msgid "check"
  msgstr "check"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:288
 +#: apt-get.8.xml:277
  msgid ""
  "<literal>check</literal> is a diagnostic tool; it updates the package cache "
  "and checks for broken dependencies."
@@@ -3817,22 -3868,21 +3874,25 @@@ msgstr "
  "Paketzwischenspeicher und prüft, ob beschädigte Abhängigkeiten vorliegen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:292
 +#: apt-get.8.xml:281
  msgid "download"
  msgstr "download"
  
- # FIXME s/directoy/directory/
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:293
 +#: apt-get.8.xml:282
++#, fuzzy
++#| msgid ""
++#| "<literal>download</literal> will download the given binary package into "
++#| "the current directory."
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
 -"current directory."
 +"current directoy."
  msgstr ""
  "<literal>download</literal> wird das angegebene Binärpaket in das aktuelle "
  "Verzeichnis herunterladen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:299
 +#: apt-get.8.xml:288
  msgid ""
  "<literal>clean</literal> clears out the local repository of retrieved "
  "package files. It removes everything but the lock file from "
@@@ -3851,12 -3901,12 +3911,12 @@@ msgstr "
  "Zeit zu Zeit ausführen, um Plattenplatz freizugeben."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:308
 +#: apt-get.8.xml:297
  msgid "autoclean"
  msgstr "autoclean"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:309
 +#: apt-get.8.xml:298
  msgid ""
  "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
  "local repository of retrieved package files. The difference is that it only "
@@@ -3876,28 -3926,33 +3936,33 @@@ msgstr "
  "sie auf »off« gesetzt ist."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:318
 +#: apt-get.8.xml:307
  msgid "autoremove"
  msgstr "autoremove"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:319
 +#: apt-get.8.xml:308
+ #, fuzzy
+ #| msgid ""
+ #| "<literal>autoremove</literal> is used to remove packages that were "
+ #| "automatically installed to satisfy dependencies for some package and that "
+ #| "are no more needed."
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
 -"automatically installed to satisfy dependencies for other packages and are "
 -"now no longer needed."
 +"automatically installed to satisfy dependencies for some package and that "
 +"are no more needed."
  msgstr ""
  "<literal>autoremove</literal> wird benutzt, um Pakete, die automatisch "
  "installiert wurden, um Abhängigkeiten für einige Pakete zu erfüllen und die "
  "nicht mehr benötigt werden, zu entfernen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:323
 +#: apt-get.8.xml:312
  msgid "changelog"
  msgstr "changelog"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:324
 +#: apt-get.8.xml:313
  msgid ""
  "<literal>changelog</literal> downloads a package changelog and displays it "
  "through <command>sensible-pager</command>. The server name and base "
@@@ -3918,12 -3973,12 +3983,12 @@@ msgstr "
  "Befehl <option>install</option> angeben."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:346
 +#: apt-get.8.xml:335
  msgid "<option>--no-install-recommends</option>"
  msgstr "<option>--no-install-recommends</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:347
 +#: apt-get.8.xml:336
  msgid ""
  "Do not consider recommended packages as a dependency for installing.  "
  "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@@ -3932,12 -3987,12 +3997,12 @@@ msgstr "
  "Konfigurationselement: <literal>APT::Install-Recommends</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:351
 +#: apt-get.8.xml:340
  msgid "<option>--install-suggests</option>"
  msgstr "<option>--install-suggests</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:352
 +#: apt-get.8.xml:341
  msgid ""
  "Consider suggested packages as a dependency for installing.  Configuration "
  "Item: <literal>APT::Install-Suggests</literal>."
@@@ -3946,12 -4001,12 +4011,12 @@@ msgstr "
  "Konfigurationselement: <literal>APT::Install-Suggests</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:356
 +#: apt-get.8.xml:345
  msgid "<option>--download-only</option>"
  msgstr "<option>--download-only</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:357
 +#: apt-get.8.xml:346
  msgid ""
  "Download only; package files are only retrieved, not unpacked or installed.  "
  "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@@ -3961,12 -4016,12 +4026,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:361
 +#: apt-get.8.xml:350
  msgid "<option>--fix-broken</option>"
  msgstr "<option>--fix-broken</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:362
 +#: apt-get.8.xml:351
  msgid ""
  "Fix; attempt to correct a system with broken dependencies in place. This "
  "option, when used with install/remove, can omit any packages to permit APT "
@@@ -3995,17 -4050,17 +4060,17 @@@ msgstr "
  "Konfigurationselement: <literal>APT::Get::Fix-Broken</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:375
 +#: apt-get.8.xml:364
  msgid "<option>--ignore-missing</option>"
  msgstr "<option>--ignore-missing</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:376
 +#: apt-get.8.xml:365
  msgid "<option>--fix-missing</option>"
  msgstr "<option>--fix-missing</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:377
 +#: apt-get.8.xml:366
  msgid ""
  "Ignore missing packages; If packages cannot be retrieved or fail the "
  "integrity check after retrieval (corrupted package files), hold back those "
@@@ -4026,12 -4081,12 +4091,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:387
 +#: apt-get.8.xml:376
  msgid "<option>--no-download</option>"
  msgstr "<option>--no-download</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:388
 +#: apt-get.8.xml:377
  msgid ""
  "Disables downloading of packages. This is best used with <option>--ignore-"
  "missing</option> to force APT to use only the .debs it has already "
@@@ -4043,7 -4098,7 +4108,7 @@@ msgstr "
  "<literal>APT::Get::Download</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:395
 +#: apt-get.8.xml:384
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -4063,17 -4118,17 +4128,17 @@@ msgstr "
  "Konfigurationselement: <literal>quiet</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:405
 +#: apt-get.8.xml:394
  msgid "<option>--simulate</option>"
  msgstr "<option>--simulate</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:407
 +#: apt-get.8.xml:396
  msgid "<option>--dry-run</option>"
  msgstr "<option>--dry-run</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:410
 +#: apt-get.8.xml:399
  msgid ""
  "No action; perform a simulation of events that would occur but do not "
  "actually change the system.  Configuration Item: <literal>APT::Get::"
@@@ -4084,7 -4139,7 +4149,7 @@@ msgstr "
  "<literal>APT::Get::Simulate</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:414
 +#: apt-get.8.xml:403
  msgid ""
  "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
  "literal>)  automatic. Also a notice will be displayed indicating that this "
@@@ -4102,7 -4157,7 +4167,7 @@@ msgstr "
  "Warnungen von <literal>apt-get</literal> wissen, was er tut)."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:420
 +#: apt-get.8.xml:409
  msgid ""
  "Simulate prints out a series of lines each one representing a dpkg "
  "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@@ -4115,22 -4170,22 +4180,22 @@@ msgstr "
  "eckiger Klammern bedeutet Unterbrechungen, die keine Folgen haben (selten)."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:427
 +#: apt-get.8.xml:416
  msgid "<option>-y</option>"
  msgstr "<option>-y</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:427
 +#: apt-get.8.xml:416
  msgid "<option>--yes</option>"
  msgstr "<option>--yes</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:428
 +#: apt-get.8.xml:417
  msgid "<option>--assume-yes</option>"
  msgstr "<option>--assume-yes</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:429
 +#: apt-get.8.xml:418
  msgid ""
  "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
  "non-interactively. If an undesirable situation, such as changing a held "
@@@ -4146,17 -4201,17 +4211,17 @@@ msgstr "
  "Get::Assume-Yes</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:436
 +#: apt-get.8.xml:425
  msgid "<option>-u</option>"
  msgstr "<option>-u</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:436
 +#: apt-get.8.xml:425
  msgid "<option>--show-upgraded</option>"
  msgstr "<option>--show-upgraded</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:437
 +#: apt-get.8.xml:426
  msgid ""
  "Show upgraded packages; Print out a list of all packages that are to be "
  "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@@ -4166,17 -4221,17 +4231,17 @@@ msgstr "
  "Konfigurationselement: <literal>APT::Get::Show-Upgraded</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:442
 +#: apt-get.8.xml:431
  msgid "<option>-V</option>"
  msgstr "<option>-V</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:442
 +#: apt-get.8.xml:431
  msgid "<option>--verbose-versions</option>"
  msgstr "<option>--verbose-versions</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:443
 +#: apt-get.8.xml:432
  msgid ""
  "Show full versions for upgraded and installed packages.  Configuration Item: "
  "<literal>APT::Get::Show-Versions</literal>."
@@@ -4186,22 -4241,40 +4251,22 @@@ msgstr "
  "Versions</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:448
 -#, fuzzy
 -#| msgid "<option>--recurse</option>"
 -msgid "<option>--host-architecture</option>"
 -msgstr "<option>--recurse</option>"
 -
 -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:449
 -msgid ""
 -"This option controls the architecture packages are built for by <command>apt-"
 -"get source --compile</command> and how cross-builddependencies are "
 -"satisfied. By default is not set which means that the host architecture is "
 -"the same as the build architecture (which is defined by <literal>APT::"
 -"Architecture</literal>)  Configuration Item: <literal>APT::Get::Host-"
 -"Architecture</literal>"
 -msgstr ""
 -
 -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:457
 +#: apt-get.8.xml:436
  msgid "<option>-b</option>"
  msgstr "<option>-b</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:457
 +#: apt-get.8.xml:436
  msgid "<option>--compile</option>"
  msgstr "<option>--compile</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:458
 +#: apt-get.8.xml:437
  msgid "<option>--build</option>"
  msgstr "<option>--build</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:459
 +#: apt-get.8.xml:438
  msgid ""
  "Compile source packages after downloading them.  Configuration Item: "
  "<literal>APT::Get::Compile</literal>."
@@@ -4210,12 -4283,12 +4275,12 @@@ msgstr "
  "Konfigurationselement: <literal>APT::Get::Compile</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:463
 +#: apt-get.8.xml:442
  msgid "<option>--ignore-hold</option>"
  msgstr "<option>--ignore-hold</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:464
 +#: apt-get.8.xml:443
  msgid ""
  "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
  "hold placed on a package. This may be useful in conjunction with "
@@@ -4229,12 -4302,12 +4294,12 @@@ msgstr "
  "<literal>APT::Ignore-Hold</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:470
 +#: apt-get.8.xml:449
  msgid "<option>--no-upgrade</option>"
  msgstr "<option>--no-upgrade</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:471
 +#: apt-get.8.xml:450
  msgid ""
  "Do not upgrade packages; When used in conjunction with <literal>install</"
  "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@@ -4248,12 -4321,12 +4313,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:477
 +#: apt-get.8.xml:456
  msgid "<option>--only-upgrade</option>"
  msgstr "<option>--only-upgrade</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:478
 +#: apt-get.8.xml:457
  msgid ""
  "Do not install new packages; When used in conjunction with <literal>install</"
  "literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@@ -4267,12 -4340,12 +4332,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:484
 +#: apt-get.8.xml:463
  msgid "<option>--force-yes</option>"
  msgstr "<option>--force-yes</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:485
 +#: apt-get.8.xml:464
  msgid ""
  "Force yes; This is a dangerous option that will cause apt to continue "
  "without prompting if it is doing something potentially harmful. It should "
@@@ -4287,12 -4360,12 +4352,12 @@@ msgstr "
  "zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:492
 +#: apt-get.8.xml:471
  msgid "<option>--print-uris</option>"
  msgstr "<option>--print-uris</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:493
 +#: apt-get.8.xml:472
  msgid ""
  "Instead of fetching the files to install their URIs are printed. Each URI "
  "will have the path, the destination file name, the size and the expected md5 "
@@@ -4314,12 -4387,12 +4379,12 @@@ msgstr "
  "Get::Print-URIs</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:503
 +#: apt-get.8.xml:482
  msgid "<option>--purge</option>"
  msgstr "<option>--purge</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:504
 +#: apt-get.8.xml:483
  msgid ""
  "Use purge instead of remove for anything that would be removed.  An asterisk "
  "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@@ -4332,12 -4405,12 +4397,12 @@@ msgstr "
  "option>. Konfigurationselement: <literal>APT::Get::Purge</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:511
 +#: apt-get.8.xml:490
  msgid "<option>--reinstall</option>"
  msgstr "<option>--reinstall</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:512
 +#: apt-get.8.xml:491
  msgid ""
  "Re-Install packages that are already installed and at the newest version.  "
  "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@@ -4346,12 -4419,12 +4411,12 @@@ msgstr "
  "Version sind. Konfigurationselement: <literal>APT::Get::ReInstall</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:516
 +#: apt-get.8.xml:495
  msgid "<option>--list-cleanup</option>"
  msgstr "<option>--list-cleanup</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:517
 +#: apt-get.8.xml:496
  msgid ""
  "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
  "it off. When on <command>apt-get</command> will automatically manage the "
@@@ -4369,17 -4442,17 +4434,17 @@@ msgstr "
  "Get::List-Cleanup</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:526
 +#: apt-get.8.xml:505
  msgid "<option>--target-release</option>"
  msgstr "<option>--target-release</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:527
 +#: apt-get.8.xml:506
  msgid "<option>--default-release</option>"
  msgstr "<option>--default-release</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:528
 +#: apt-get.8.xml:507
  msgid ""
  "This option controls the default input to the policy engine, it creates a "
  "default pin at priority 990 using the specified release string.  This "
@@@ -4404,12 -4477,12 +4469,12 @@@ msgstr "
  "auch die &apt-preferences;-Handbuchseite."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:541
 +#: apt-get.8.xml:520
  msgid "<option>--trivial-only</option>"
  msgstr "<option>--trivial-only</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:543
 +#: apt-get.8.xml:522
  msgid ""
  "Only perform operations that are 'trivial'. Logically this can be considered "
  "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@@ -4423,12 -4496,12 +4488,12 @@@ msgstr "
  "Trivial-Only</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:549
 +#: apt-get.8.xml:528
  msgid "<option>--no-remove</option>"
  msgstr "<option>--no-remove</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:550
 +#: apt-get.8.xml:529
  msgid ""
  "If any packages are to be removed apt-get immediately aborts without "
  "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@@ -4437,12 -4510,12 +4502,12 @@@ msgstr "
  "Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:555
 +#: apt-get.8.xml:534
  msgid "<option>--auto-remove</option>"
  msgstr "<option>--auto-remove</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:556
 +#: apt-get.8.xml:535
  msgid ""
  "If the command is either <literal>install</literal> or <literal>remove</"
  "literal>, then this option acts like running <literal>autoremove</literal> "
@@@ -4456,12 -4529,12 +4521,12 @@@ msgstr "
  "AutomaticRemove</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:562
 +#: apt-get.8.xml:541
  msgid "<option>--only-source</option>"
  msgstr "<option>--only-source</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:563
 +#: apt-get.8.xml:542
  msgid ""
  "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
  "literal> commands.  Indicates that the given source names are not to be "
@@@ -4480,22 -4553,22 +4545,22 @@@ msgstr "
  "Get::Only-Source</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:573
 +#: apt-get.8.xml:552
  msgid "<option>--diff-only</option>"
  msgstr "<option>--diff-only</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:573
 +#: apt-get.8.xml:552
  msgid "<option>--dsc-only</option>"
  msgstr "<option>--dsc-only</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:573
 +#: apt-get.8.xml:552
  msgid "<option>--tar-only</option>"
  msgstr "<option>--tar-only</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:574
 +#: apt-get.8.xml:553
  msgid ""
  "Download only the diff, dsc, or tar file of a source archive.  Configuration "
  "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@@ -4507,12 -4580,12 +4572,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:579
 +#: apt-get.8.xml:558
  msgid "<option>--arch-only</option>"
  msgstr "<option>--arch-only</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:580
 +#: apt-get.8.xml:559
  msgid ""
  "Only process architecture-dependent build-dependencies.  Configuration Item: "
  "<literal>APT::Get::Arch-Only</literal>."
@@@ -4521,12 -4594,12 +4586,12 @@@ msgstr "
  "Konfigurationselement: <literal>APT::Get::Arch-Only</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:584
 +#: apt-get.8.xml:563
  msgid "<option>--allow-unauthenticated</option>"
  msgstr "<option>--allow-unauthenticated</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:585
 +#: apt-get.8.xml:564
  msgid ""
  "Ignore if packages can't be authenticated and don't prompt about it.  This "
  "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@@ -4537,7 -4610,7 +4602,7 @@@ msgstr "
  "<literal>APT::Get::AllowUnauthenticated</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
 -#: apt-get.8.xml:598
 +#: apt-get.8.xml:577
  msgid ""
  "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
  "&file-statelists;"
@@@ -4546,7 -4619,7 +4611,7 @@@ msgstr "
  "&file-statelists;"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-get.8.xml:607
 +#: apt-get.8.xml:586
  msgid ""
  "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
  "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@@ -4557,7 -4630,7 +4622,7 @@@ msgstr "
  "preferences;, das APT-Howto."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-get.8.xml:613
 +#: apt-get.8.xml:592
  msgid ""
  "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
  "error."
@@@ -4566,22 -4639,22 +4631,22 @@@ msgstr "
  "100 bei Fehlern."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-get.8.xml:616
 +#: apt-get.8.xml:595
  msgid "ORIGINAL AUTHORS"
  msgstr "ORIGINALAUTOREN"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-get.8.xml:617
 +#: apt-get.8.xml:596
  msgid "&apt-author.jgunthorpe;"
  msgstr "&apt-author.jgunthorpe;"
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-get.8.xml:620
 +#: apt-get.8.xml:599
  msgid "CURRENT AUTHORS"
  msgstr "AKTUELLE AUTOREN"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-get.8.xml:622
 +#: apt-get.8.xml:601
  msgid "&apt-author.team;"
  msgstr "&apt-author.team;"
  
@@@ -4712,31 -4785,33 +4777,31 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:131
  msgid ""
 -"Update the local keyring with the archive keyring and remove from the local "
 -"keyring the archive keys which are no longer valid.  The archive keyring is "
 -"shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
 +"Update the local keyring with the keyring of Debian archive keys and removes "
 +"from the keyring the archive keys which are no longer valid."
  msgstr ""
 +"Den lokalen Schlüsselbund mit dem Schlüsselbund der Debian-Archivschlüssel "
 +"aktualisieren und aus dem Schlüsselbund die Archivschlüssel entfernen, die "
 +"nicht länger gültig sind."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-key.8.xml:141
 +#: apt-key.8.xml:140
  #, fuzzy
  #| msgid "update"
  msgid "net-update"
  msgstr "update"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-key.8.xml:145
 +#: apt-key.8.xml:144
  msgid ""
 -"Work similar to the <command>update</command> command above, but get the "
 -"archive keyring from an URI instead and validate it against a master key.  "
 -"This requires an installed &wget; and an APT build configured to have a "
 -"server to fetch from and a master keyring to validate.  APT in Debian does "
 -"not support this command and relies on <command>update</command> instead, "
 -"but Ubuntu's APT does."
 +"Update the local keyring with the keys of a key server and removes from the "
 +"keyring the archive keys which are no longer valid. This requires an "
 +"installed wget and an APT build configured to have a server to fetch from. "
 +"APT in Debian does not support this command, but Ubuntu's APT does."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-key.8.xml:162
 +#: apt-key.8.xml:159
  msgid ""
  "Note that options need to be defined before the commands described in the "
  "previous section."
@@@ -4745,12 -4820,12 +4810,12 @@@ msgstr "
  "Befehlen definiert sein müssen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-key.8.xml:164
 +#: apt-key.8.xml:161
  msgid "--keyring <replaceable>filename</replaceable>"
  msgstr "--keyring <replaceable>Dateiname</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-key.8.xml:165
 +#: apt-key.8.xml:162
  msgid ""
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
@@@ -4767,45 -4842,45 +4832,45 @@@ msgstr "
  "Schlüssel werden zu diesem hinzugefügt."
  
  #. type: Content of: <refentry><refsect1><variablelist>
 -#: apt-key.8.xml:178
 +#: apt-key.8.xml:175
  msgid "&file-trustedgpg;"
  msgstr "&file-trustedgpg;"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-key.8.xml:180
 +#: apt-key.8.xml:177
  msgid "<filename>/etc/apt/trustdb.gpg</filename>"
  msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-key.8.xml:181
 +#: apt-key.8.xml:178
  msgid "Local trust database of archive keys."
  msgstr "Lokale Datenbank vertrauenswürdiger Archivschlüssel."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-key.8.xml:184
 +#: apt-key.8.xml:181
  msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-key.8.xml:185
 +#: apt-key.8.xml:182
  msgid "Keyring of Debian archive trusted keys."
  msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-key.8.xml:188
 +#: apt-key.8.xml:185
  msgid ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  msgstr ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-key.8.xml:189
 +#: apt-key.8.xml:186
  msgid "Keyring of Debian archive removed trusted keys."
  msgstr ""
  "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-key.8.xml:198
 +#: apt-key.8.xml:195
  msgid "&apt-get;, &apt-secure;"
  msgstr "&apt-get;, &apt-secure;"
  
@@@ -5514,16 -5589,25 +5579,24 @@@ msgstr "
  "die Datei, die durch die Umgebungsvariable <envar>APT_CONFIG</envar> "
  "angegeben wird (falls gesetzt)"
  
- # FIXME s/no or/no/
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
  #: apt.conf.5.xml:52
+ #, fuzzy
+ #| msgid ""
+ #| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+ #| "order which have no or \"<literal>conf</literal>\" as filename extension "
+ #| "and which only contain alphanumeric, hyphen (-), underscore (_) and "
+ #| "period (.) characters.  Otherwise APT will print a notice that it has "
+ #| "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+ #| "Ignore-Files-Silently</literal> configuration list - in this case it will "
+ #| "be silently ignored."
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 -"order which have either no or \"<literal>conf</literal>\" as filename "
 -"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 -"and period (.) characters.  Otherwise APT will print a notice that it has "
 -"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
 -"Ignore-Files-Silently</literal> configuration list - in this case it will be "
 -"silently ignored."
 +"order which have no or \"<literal>conf</literal>\" as filename extension and "
 +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
 +"characters.  Otherwise APT will print a notice that it has ignored a file if "
 +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
 +"literal> configuration list - in this case it will be silently ignored."
  msgstr ""
  "alle Dateien in <literal>Dir::Etc::Parts</literal> in aufsteigender "
  "alphanumerischer Reihenfolge, die kein »<literal>conf</literal>« als "
@@@ -5789,13 -5873,24 +5862,13 @@@ msgstr "
  "heruntergeladen und Paketlisten ausgewertet werden. Die interne Vorgabe ist "
  "die Architektur für die APT kompiliert wurde."
  
 -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:158
 -msgid ""
 -"All Architectures the system supports. Processors implementing the "
 -"<literal>amd64</literal> are e.g. also able to execute binaries compiled for "
 -"<literal>i386</literal>; This list is use when fetching files and parsing "
 -"package lists. The internal default is always the native architecture "
 -"(<literal>APT::Architecture</literal>)  and all foreign architectures it can "
 -"retrieve by calling <command>dpkg --print-foreign-architectures</command>."
 -msgstr ""
 -
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:165
 +#: apt.conf.5.xml:157
  msgid "Default-Release"
  msgstr "Default-Release"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:166
 +#: apt.conf.5.xml:158
  msgid ""
  "Default release to install packages from if more than one version available. "
  "Contains release name, codename or release version. Examples: 'stable', "
@@@ -5808,12 -5903,12 +5881,12 @@@ msgstr "
  "codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:171
 +#: apt.conf.5.xml:163
  msgid "Ignore-Hold"
  msgstr "Ignore-Hold"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:172
 +#: apt.conf.5.xml:164
  msgid ""
  "Ignore Held packages; This global option causes the problem resolver to "
  "ignore held packages in its decision making."
@@@ -5822,12 -5917,12 +5895,12 @@@ msgstr "
  "Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:176
 +#: apt.conf.5.xml:168
  msgid "Clean-Installed"
  msgstr "Clean-Installed"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:177
 +#: apt.conf.5.xml:169
  msgid ""
  "Defaults to on. When turned on the autoclean feature will remove any "
  "packages which can no longer be downloaded from the cache. If turned off "
@@@ -5842,12 -5937,12 +5915,12 @@@ msgstr "
  "Möglichkeiten bereitstellt, um sie erneut zu installieren."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:183
 +#: apt.conf.5.xml:175
  msgid "Immediate-Configure"
  msgstr "Immediate-Configure"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:184
 +#: apt.conf.5.xml:176
  msgid ""
  "Defaults to on which will cause APT to install essential and important "
  "packages as fast as possible in the install/upgrade operation. This is done "
@@@ -5915,12 -6010,12 +5988,12 @@@ msgstr "
  "Upgrade-Prozesses arbeiten kann."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:206
 +#: apt.conf.5.xml:198
  msgid "Force-LoopBreak"
  msgstr "Force-LoopBreak"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:207
 +#: apt.conf.5.xml:199
  msgid ""
  "Never Enable this option unless you -really- know what you are doing. It "
  "permits APT to temporarily remove an essential package to break a Conflicts/"
@@@ -5938,12 -6033,12 +6011,12 @@@ msgstr "
  "bash oder etwas, was davon abhängt, sind."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:215
 +#: apt.conf.5.xml:207
  msgid "Cache-Start, Cache-Grow and Cache-Limit"
  msgstr "Cache-Start, Cache-Grow und Cache-Limit"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:216
 +#: apt.conf.5.xml:208
  msgid ""
  "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
  "the 'available' information. <literal>Cache-Start</literal> acts as a hint "
@@@ -5980,24 -6075,24 +6053,24 @@@ msgstr "
  "auf 0 gesetzt ist, kann der Zwischenspeicher nicht automatisch wachsen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:231
 +#: apt.conf.5.xml:223
  msgid "Build-Essential"
  msgstr "Build-Essential"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:232
 +#: apt.conf.5.xml:224
  msgid "Defines which package(s) are considered essential build dependencies."
  msgstr ""
  "Definiert, welche(s) Paket(e) als essentielle Bauabhängigkeiten betrachtet "
  "werde."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:235
 +#: apt.conf.5.xml:227
  msgid "Get"
  msgstr "Get"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:236
 +#: apt.conf.5.xml:228
  msgid ""
  "The Get subsection controls the &apt-get; tool, please see its documentation "
  "for more information about the options here."
@@@ -6007,12 -6102,12 +6080,12 @@@ msgstr "
  "erhalten."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:240
 +#: apt.conf.5.xml:232
  msgid "Cache"
  msgstr "Cache"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:241
 +#: apt.conf.5.xml:233
  msgid ""
  "The Cache subsection controls the &apt-cache; tool, please see its "
  "documentation for more information about the options here."
@@@ -6022,12 -6117,12 +6095,12 @@@ msgstr "
  "erhalten."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:245
 +#: apt.conf.5.xml:237
  msgid "CDROM"
  msgstr "CD-ROM"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:246
 +#: apt.conf.5.xml:238
  msgid ""
  "The CDROM subsection controls the &apt-cdrom; tool, please see its "
  "documentation for more information about the options here."
@@@ -6037,17 -6132,17 +6110,17 @@@ msgstr "
  "erhalten."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt.conf.5.xml:252
 +#: apt.conf.5.xml:244
  msgid "The Acquire Group"
  msgstr "Die Erwerbgruppe"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:257
 +#: apt.conf.5.xml:249
  msgid "Check-Valid-Until"
  msgstr "Check-Valid-Until"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:258
 +#: apt.conf.5.xml:250
  msgid ""
  "Security related option defaulting to true as an expiring validation for a "
  "Release file prevents longtime replay attacks and can e.g. also help users "
@@@ -6067,22 -6162,69 +6140,33 @@@ msgstr "
  "gewollt ist, kann die Option <literal>Max-ValidTime</literal> benutzt werden."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:268
 +#: apt.conf.5.xml:260
  msgid "Max-ValidTime"
  msgstr "Max-ValidTime"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:269
 -#, fuzzy
 -#| msgid ""
 -#| "Seconds the Release file should be considered valid after it was created. "
 -#| "The default is \"for ever\" (0) if the Release file of the archive "
 -#| "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
 -#| "this date is the default. The date from the Release file or the date "
 -#| "specified by the creation time of the Release file (<literal>Date</"
 -#| "literal> header) plus the seconds specified with this options are used to "
 -#| "check if the validation of a file has expired by using the earlier date "
 -#| "of the two. Archive specific settings can be made by appending the label "
 -#| "of the archive to the option name."
 -msgid ""
 -"Seconds the Release file should be considered valid after it was created "
 -"(indicated by the <literal>Date</literal> header).  If the Release file "
 -"itself includes a <literal>Valid-Until</literal> header the earlier date of "
 -"the two is used as the expiration date.  The default value is <literal>0</"
 -"literal> which stands for \"for ever\".  Archive specific settings can be "
 -"made by appending the label of the archive to the option name."
 -msgstr ""
 -"Sekunden, die die Release-Datei als gültig betrachtet werden sollte, nachdem "
 -"sie erzeugt wurde. Vorgabe ist »für immer« (0), falls die Release-Datei des "
 -"Archivs keine <literal>Valid-Until</literal>-Kopfzeile enthält. Falls dies "
 -"so ist, ist dieses Datum vorgegeben. Das Datum aus der Release-Datei oder "
 -"das Datum, das durch die Erstellungszeit der Release-Datei angegeben wurde "
 -"(<literal>Date</literal>-Kopfzeile) plus die mit diesen Optionen angegebenen "
 -"Sekunden werden benutzt, um zu prüfen, ob die Bestätigung einer Datei "
 -"abgelaufen ist indem das neuere Datum der beiden benutzt wird. "
 -"Archivspezifische Einstellungen können durch Anhängen des Archivetiketts an "
 -"die Option »name« vorgenommen werden."
 -
 -#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:279
 -#, fuzzy
 -#| msgid "Max-ValidTime"
 -msgid "Min-ValidTime"
 -msgstr "Max-ValidTime"
 -
 -#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:280
 +#: apt.conf.5.xml:261
+ #, fuzzy
+ #| msgid ""
+ #| "Seconds the Release file should be considered valid after it was created. "
+ #| "The default is \"for ever\" (0) if the Release file of the archive "
+ #| "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+ #| "this date is the default. The date from the Release file or the date "
+ #| "specified by the creation time of the Release file (<literal>Date</"
+ #| "literal> header) plus the seconds specified with this options are used to "
+ #| "check if the validation of a file has expired by using the earlier date "
+ #| "of the two. Archive specific settings can be made by appending the label "
+ #| "of the archive to the option name."
  msgid ""
 -"Minimum of seconds the Release file should be considered valid after it was "
 -"created (indicated by the <literal>Date</literal> header).  Use this if you "
 -"need to use a seldomly updated (local) mirror of a more regular updated "
 -"archive with a <literal>Valid-Until</literal> header instead of competely "
 -"disabling the expiration date checking.  Archive specific settings can and "
 -"should be used by appending the label of the archive to the option name."
 +"Seconds the Release file should be considered valid after it was created. "
 +"The default is \"for ever\" (0) if the Release file of the archive doesn't "
 +"include a <literal>Valid-Until</literal> header.  If it does then this date "
 +"is the default. The date from the Release file or the date specified by the "
 +"creation time of the Release file (<literal>Date</literal> header) plus the "
 +"seconds specified with this options are used to check if the validation of a "
 +"file has expired by using the earlier date of the two. Archive specific "
 +"settings can be made by appending the label of the archive to the option "
 +"name."
  msgstr ""
  "Sekunden, die die Release-Datei als gültig betrachtet werden sollte, nachdem "
  "sie erzeugt wurde. Vorgabe ist »für immer« (0), falls die Release-Datei des "
@@@ -6096,12 -6238,12 +6180,12 @@@
  "die Option »name« vorgenommen werden."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:290
 +#: apt.conf.5.xml:273
  msgid "PDiffs"
  msgstr "PDiffs"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:291
 +#: apt.conf.5.xml:274
  msgid ""
  "Try to download deltas called <literal>PDiffs</literal> for Packages or "
  "Sources files instead of downloading whole ones. True by default."
@@@ -6111,12 -6253,12 +6195,20 @@@ msgstr "
  "True."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:294
 +#: apt.conf.5.xml:277
++#, fuzzy
++#| msgid ""
++#| "Two sub-options to limit the use of PDiffs are also available: With "
++#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
++#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
++#| "other hand is the maximum percentage of the size of all patches compared "
++#| "to the size of the targeted file. If one of these limits is exceeded the "
++#| "complete file is downloaded instead of the patches."
  msgid ""
  "Two sub-options to limit the use of PDiffs are also available: With "
  "<literal>FileLimit</literal> can be specified how many PDiff files are "
  "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
 -"other hand is the maximum percentage of the size of all patches compared to "
 +"other hand is the maximum precentage of the size of all patches compared to "
  "the size of the targeted file. If one of these limits is exceeded the "
  "complete file is downloaded instead of the patches."
  msgstr ""
@@@ -6129,12 -6271,12 +6221,12 @@@
  "der Patche heruntergeladen."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:303
 +#: apt.conf.5.xml:286
  msgid "Queue-Mode"
  msgstr "Queue-Mode"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:304
 +#: apt.conf.5.xml:287
  msgid ""
  "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
  "literal> or <literal>access</literal> which determines how APT parallelizes "
@@@ -6150,12 -6292,12 +6242,12 @@@ msgstr "
  "URI-Art geöffnet wird."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:311
 +#: apt.conf.5.xml:294
  msgid "Retries"
  msgstr "Retries"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:312
 +#: apt.conf.5.xml:295
  msgid ""
  "Number of retries to perform. If this is non-zero APT will retry failed "
  "files the given number of times."
@@@ -6164,12 -6306,12 +6256,12 @@@ msgstr "
  "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:316
 +#: apt.conf.5.xml:299
  msgid "Source-Symlinks"
  msgstr "Source-Symlinks"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:317
 +#: apt.conf.5.xml:300
  msgid ""
  "Use symlinks for source archives. If set to true then source archives will "
  "be symlinked when possible instead of copying. True is the default."
@@@ -6179,12 -6321,12 +6271,12 @@@ msgstr "
  "kopiert zu werden. True ist die Vorgabe."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:321 sources.list.5.xml:155
 +#: apt.conf.5.xml:304 sources.list.5.xml:144
  msgid "http"
  msgstr "http"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:322
 +#: apt.conf.5.xml:305
  msgid ""
  "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
  "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@@ -6202,7 -6344,7 +6294,7 @@@ msgstr "
  "die Umgebungsvariable <envar>http_proxy</envar> benutzt."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:330
 +#: apt.conf.5.xml:313
  msgid ""
  "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
  "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@@ -6228,7 -6370,7 +6320,7 @@@ msgstr "
  "unterstützt keine dieser Optionen."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:340 apt.conf.5.xml:404
 +#: apt.conf.5.xml:323 apt.conf.5.xml:387
  msgid ""
  "The option <literal>timeout</literal> sets the timeout timer used by the "
  "method, this applies to all things including connection timeout and data "
@@@ -6239,7 -6381,7 +6331,7 @@@ msgstr "
  "Dinge, einschließlich Verbindungs- und Datenzeitüberschreitungen, angewandt."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:343
 +#: apt.conf.5.xml:326
  msgid ""
  "One setting is provided to control the pipeline depth in cases where the "
  "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
@@@ -6259,7 -6401,7 +6351,7 @@@ msgstr "
  "gegen RFC 2068."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:351
 +#: apt.conf.5.xml:334
  msgid ""
  "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
  "literal> which accepts integer values in kilobyte. The default value is 0 "
@@@ -6275,7 -6417,7 +6367,7 @@@ msgstr "
  "deaktiviert.)"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:356
 +#: apt.conf.5.xml:339
  msgid ""
  "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
  "User-Agent for the http download method as some proxies allow access for "
@@@ -6287,12 -6429,12 +6379,12 @@@ msgstr "
  "bekannten Bezeichner verwendet."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:362
 +#: apt.conf.5.xml:345
  msgid "https"
  msgstr "https"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:363
 +#: apt.conf.5.xml:346
  msgid ""
  "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
  "options are the same as for <literal>http</literal> method and will also "
@@@ -6307,7 -6449,7 +6399,7 @@@ msgstr "
  "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:369
 +#: apt.conf.5.xml:352
  msgid ""
  "<literal>CaInfo</literal> suboption specifies place of file that holds info "
  "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@@ -6346,12 -6488,12 +6438,12 @@@ msgstr "
  "SslForceVersion</literal> ist die entsprechende per-Host-Option."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:387 sources.list.5.xml:166
 +#: apt.conf.5.xml:370 sources.list.5.xml:155
  msgid "ftp"
  msgstr "ftp"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:388
 +#: apt.conf.5.xml:371
  msgid ""
  "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
  "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@@ -6386,7 -6528,7 +6478,7 @@@ msgstr "
  "entsprechenden URI-Bestandteil genommen."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:407
 +#: apt.conf.5.xml:390
  msgid ""
  "Several settings are provided to control passive mode. Generally it is safe "
  "to leave passive mode on, it works in nearly every environment.  However "
@@@ -6403,7 -6545,7 +6495,7 @@@ msgstr "
  "Beispielskonfiguration, um Beispiele zu erhalten)."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:414
 +#: apt.conf.5.xml:397
  msgid ""
  "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
  "envar> environment variable to a http url - see the discussion of the http "
@@@ -6417,7 -6559,7 +6509,7 @@@ msgstr "
  "Effizienz nicht empfohlen FTP über HTTP zu benutzen."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:419
 +#: apt.conf.5.xml:402
  msgid ""
  "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
  "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@@ -6433,18 -6575,18 +6525,18 @@@ msgstr "
  "Server RFC2428 unterstützen."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:426 sources.list.5.xml:148
 +#: apt.conf.5.xml:409 sources.list.5.xml:137
  msgid "cdrom"
  msgstr "cdrom"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
 -#: apt.conf.5.xml:432
 +#: apt.conf.5.xml:415
  #, no-wrap
  msgid "/cdrom/::Mount \"foo\";"
  msgstr "/cdrom/::Mount \"foo\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:427
 +#: apt.conf.5.xml:410
  msgid ""
  "CDROM URIs; the only setting for CDROM URIs is the mount point, "
  "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@@ -6466,12 -6608,12 +6558,12 @@@ msgstr "
  "können per UMount angegeben werden."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:437
 +#: apt.conf.5.xml:420
  msgid "gpgv"
  msgstr "gpgv"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:438
 +#: apt.conf.5.xml:421
  msgid ""
  "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
  "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@@ -6482,18 -6624,18 +6574,18 @@@ msgstr "
  "Zusätzliche Parameter werden an gpgv weitergeleitet."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:443
 +#: apt.conf.5.xml:426
  msgid "CompressionTypes"
  msgstr "CompressionTypes"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 -#: apt.conf.5.xml:449
 +#: apt.conf.5.xml:432
  #, no-wrap
  msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
  msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:444
 +#: apt.conf.5.xml:427
  msgid ""
  "List of compression types which are understood by the acquire methods.  "
  "Files like <filename>Packages</filename> can be available in various "
@@@ -6513,19 -6655,19 +6605,19 @@@ msgstr "
  "\"synopsis\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 -#: apt.conf.5.xml:454
 +#: apt.conf.5.xml:437
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order:: \"gz\";"
  msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 -#: apt.conf.5.xml:457
 +#: apt.conf.5.xml:440
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:450
 +#: apt.conf.5.xml:433
  msgid ""
  "Also the <literal>Order</literal> subgroup can be used to define in which "
  "order the acquire system will try to download the compressed files. The "
@@@ -6556,21 -6698,32 +6648,32 @@@ msgstr "
  "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
 -#: apt.conf.5.xml:461
 +#: apt.conf.5.xml:444
  #, no-wrap
  msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
  msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
  
- # FIXME s/> Note/>. Note/
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:459
 +#: apt.conf.5.xml:442
+ #, fuzzy
+ #| msgid ""
+ #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
+ #| "replaceable></literal> will be checked: If this setting exists the method "
+ #| "will only be used if this file exists, e.g. for the bzip2 method (the "
+ #| "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note "
+ #| "also that list entries specified on the command line will be added at the "
+ #| "end of the list specified in the configuration files, but before the "
+ #| "default entries. To prefer a type in this case over the ones specified in "
+ #| "the configuration files you can set the option direct - not in list "
+ #| "style.  This will not override the defined list, it will only prefix the "
+ #| "list with this type."
  msgid ""
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
  "will only be used if this file exists, e.g. for the bzip2 method (the "
 -"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
 -"also that list entries specified on the command line will be added at the "
 -"end of the list specified in the configuration files, but before the default "
 +"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
 +"that list entries specified on the command line will be added at the end of "
 +"the list specified in the configuration files, but before the default "
  "entries. To prefer a type in this case over the ones specified in the "
  "configuration files you can set the option direct - not in list style.  This "
  "will not override the defined list, it will only prefix the list with this "
@@@ -6588,12 -6741,11 +6691,17 @@@ msgstr "
  "nicht im Listenstil. Dies wird die definierte Liste nicht überschreiben, es "
  "wird diesen Typ nur vor die Liste setzen."
  
- # FIXME: s/doesn't provide/don't provide/
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:466
 +#: apt.conf.5.xml:449
++#, fuzzy
++#| msgid ""
++#| "The special type <literal>uncompressed</literal> can be used to give "
++#| "uncompressed files a preference, but note that most archives don't "
++#| "provide uncompressed files so this is mostly only useable for local "
++#| "mirrors."
  msgid ""
  "The special type <literal>uncompressed</literal> can be used to give "
 -"uncompressed files a preference, but note that most archives don't provide "
 +"uncompressed files a preference, but note that most archives doesn't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
  "Der besondere Typ <literal>uncompressed</literal> kann benutzt werden, um "
@@@ -6602,12 -6754,12 +6710,12 @@@
  "dies meist nur für lokale Spiegel benutzt werden kann."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:471
 +#: apt.conf.5.xml:454
  msgid "GzipIndexes"
  msgstr "GzipIndexes"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:473
 +#: apt.conf.5.xml:456
  msgid ""
  "When downloading <literal>gzip</literal> compressed indexes (Packages, "
  "Sources, or Translations), keep them gzip compressed locally instead of "
@@@ -6621,12 -6773,12 +6729,12 @@@ msgstr "
  "False."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:480
 +#: apt.conf.5.xml:463
  msgid "Languages"
  msgstr "Sprachen"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:481
 +#: apt.conf.5.xml:464
  msgid ""
  "The Languages subsection controls which <filename>Translation</filename> "
  "files are downloaded and in which order APT tries to display the Description-"
@@@ -6648,13 -6800,13 +6756,13 @@@ msgstr "
  "hier unmögliche Werte einsetzen."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
 -#: apt.conf.5.xml:497
 +#: apt.conf.5.xml:480
  #, no-wrap
  msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
  msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:487
 +#: apt.conf.5.xml:470
  msgid ""
  "The default list includes \"environment\" and \"en\". "
  "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@@ -6696,7 -6848,7 +6804,7 @@@ msgstr "
  "Reihenfolge »fr, de, en«. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:253
 +#: apt.conf.5.xml:245
  msgid ""
  "The <literal>Acquire</literal> group of options controls the download of "
  "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@@ -6706,12 -6858,12 +6814,12 @@@ msgstr "
  "id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt.conf.5.xml:504
 +#: apt.conf.5.xml:487
  msgid "Directories"
  msgstr "Verzeichnisse"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:506
 +#: apt.conf.5.xml:489
  msgid ""
  "The <literal>Dir::State</literal> section has directories that pertain to "
  "local state information. <literal>lists</literal> is the directory to place "
@@@ -6731,7 -6883,7 +6839,7 @@@ msgstr "
  "filename> oder <filename>./</filename> beginnen."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:513
 +#: apt.conf.5.xml:496
  msgid ""
  "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
  "information, such as the two package caches <literal>srcpkgcache</literal> "
@@@ -6754,7 -6906,7 +6862,7 @@@ msgstr "
  "in <literal>Dir::Cache</literal> enthalten."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:522
 +#: apt.conf.5.xml:505
  msgid ""
  "<literal>Dir::Etc</literal> contains the location of configuration files, "
  "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@@ -6769,7 -6921,7 +6877,7 @@@ msgstr "
  "Konfigurationsdatei erfolgt)."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:528
 +#: apt.conf.5.xml:511
  msgid ""
  "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
  "in lexical order from the directory specified. After this is done then the "
@@@ -6781,7 -6933,7 +6889,7 @@@ msgstr "
  "geladen."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:532
 +#: apt.conf.5.xml:515
  msgid ""
  "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
  "Bin::Methods</literal> specifies the location of the method handlers and "
@@@ -6799,7 -6951,7 +6907,7 @@@ msgstr "
  "Programms an."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:540
 +#: apt.conf.5.xml:523
  msgid ""
  "The configuration item <literal>RootDir</literal> has a special meaning.  If "
  "set, all paths in <literal>Dir::</literal> will be relative to "
@@@ -6819,7 -6971,7 +6927,7 @@@ msgstr "
  "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:553
 +#: apt.conf.5.xml:536
  msgid ""
  "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
  "which files APT should silently ignore while parsing the files in the "
@@@ -6837,12 -6989,12 +6945,12 @@@ msgstr "
  "verwandt werden."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt.conf.5.xml:562
 +#: apt.conf.5.xml:545
  msgid "APT in DSelect"
  msgstr "APT in DSelect"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:564
 +#: apt.conf.5.xml:547
  msgid ""
  "When APT is used as a &dselect; method several configuration directives "
  "control the default behaviour. These are in the <literal>DSelect</literal> "
@@@ -6853,12 -7005,12 +6961,12 @@@ msgstr "
  "<literal>DSelect</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:568
 +#: apt.conf.5.xml:551
  msgid "Clean"
  msgstr "Clean"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:569
 +#: apt.conf.5.xml:552
  msgid ""
  "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
  "and never.  always and prompt will remove all packages from the cache after "
@@@ -6876,7 -7028,7 +6984,7 @@@ msgstr "
  "führt diese Aktion vor dem Herunterladen neuer Pakete durch."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:578
 +#: apt.conf.5.xml:561
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the install phase."
@@@ -6885,12 -7037,12 +6993,12 @@@ msgstr "
  "übermittelt, wenn es für die Installationsphase durchlaufen wird."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:582
 +#: apt.conf.5.xml:565
  msgid "Updateoptions"
  msgstr "Updateoptions"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:583
 +#: apt.conf.5.xml:566
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the update phase."
@@@ -6899,12 -7051,12 +7007,12 @@@ msgstr "
  "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:587
 +#: apt.conf.5.xml:570
  msgid "PromptAfterUpdate"
  msgstr "PromptAfterUpdate"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:588
 +#: apt.conf.5.xml:571
  msgid ""
  "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
  "The default is to prompt only on error."
@@@ -6913,12 -7065,12 +7021,12 @@@ msgstr "
  "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt.conf.5.xml:594
 +#: apt.conf.5.xml:577
  msgid "How APT calls dpkg"
  msgstr "Wie APT Dpkg aufruft"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:595
 +#: apt.conf.5.xml:578
  msgid ""
  "Several configuration directives control how APT invokes &dpkg;. These are "
  "in the <literal>DPkg</literal> section."
@@@ -6927,7 -7079,7 +7035,7 @@@ msgstr "
  "stehen im Abschnitt <literal>DPkg</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:600
 +#: apt.conf.5.xml:583
  msgid ""
  "This is a list of options to pass to dpkg. The options must be specified "
  "using the list notation and each list item is passed as a single argument to "
@@@ -6938,17 -7090,17 +7046,17 @@@ msgstr "
  "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:605
 +#: apt.conf.5.xml:588
  msgid "Pre-Invoke"
  msgstr "Pre-Invoke"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:605
 +#: apt.conf.5.xml:588
  msgid "Post-Invoke"
  msgstr "Post-Invoke"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:606
 +#: apt.conf.5.xml:589
  msgid ""
  "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -6962,12 -7114,12 +7070,12 @@@ msgstr "
  "APT abgebrochen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:612
 +#: apt.conf.5.xml:595
  msgid "Pre-Install-Pkgs"
  msgstr "Pre-Install-Pkgs"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:613
 +#: apt.conf.5.xml:596
  msgid ""
  "This is a list of shell commands to run before invoking dpkg. Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -6984,7 -7136,7 +7092,7 @@@ msgstr "
  "pro Zeile."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:619
 +#: apt.conf.5.xml:602
  msgid ""
  "Version 2 of this protocol dumps more information, including the protocol "
  "version, the APT configuration space and the packages, files and versions "
@@@ -7000,12 -7152,12 +7108,12 @@@ msgstr "
  "literal> gegeben wird."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:626
 +#: apt.conf.5.xml:609
  msgid "Run-Directory"
  msgstr "Run-Directory"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:627
 +#: apt.conf.5.xml:610
  msgid ""
  "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
  "</filename>."
@@@ -7014,12 -7166,12 +7122,12 @@@ msgstr "
  "die Vorgabe ist <filename>/</filename>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:631
 +#: apt.conf.5.xml:614
  msgid "Build-options"
  msgstr "Build-options"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:632
 +#: apt.conf.5.xml:615
  msgid ""
  "These options are passed to &dpkg-buildpackage; when compiling packages, the "
  "default is to disable signing and produce all binaries."
@@@ -7029,12 -7181,12 +7137,12 @@@ msgstr "
  "Programme werden erstellt."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
 -#: apt.conf.5.xml:637
 +#: apt.conf.5.xml:620
  msgid "dpkg trigger usage (and related options)"
  msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt.conf.5.xml:638
 +#: apt.conf.5.xml:621
  msgid ""
  "APT can call dpkg in a way so it can make aggressive use of triggers over "
  "multiple calls of dpkg. Without further options dpkg will use triggers only "
@@@ -7061,7 -7213,7 +7169,7 @@@ msgstr "
  "konfiguriert werden."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
 -#: apt.conf.5.xml:653
 +#: apt.conf.5.xml:636
  #, no-wrap
  msgid ""
  "DPkg::NoTriggers \"true\";\n"
@@@ -7075,7 -7227,7 +7183,7 @@@ msgstr "
  "DPkg::TriggersPending \"true\";"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt.conf.5.xml:647
 +#: apt.conf.5.xml:630
  msgid ""
  "Note that it is not guaranteed that APT will support these options or that "
  "these options will not cause (big) trouble in the future. If you have "
@@@ -7100,12 -7252,12 +7208,12 @@@ msgstr "
  "wäre <placeholder type=\"literallayout\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:659
 +#: apt.conf.5.xml:642
  msgid "DPkg::NoTriggers"
  msgstr "DPkg::NoTriggers"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:660
 +#: apt.conf.5.xml:643
  msgid ""
  "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
  "call).  See &dpkg; if you are interested in what this actually means. In "
@@@ -7126,12 -7278,12 +7234,12 @@@ msgstr "
  "außerdem an die »unpack«- und »remove«-Aufrufe anhängen."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:667
 +#: apt.conf.5.xml:650
  msgid "PackageManager::Configure"
  msgstr "PackageManager::Configure"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:668
 +#: apt.conf.5.xml:651
  msgid ""
  "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
  "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@@ -7160,12 -7312,12 +7268,12 @@@ msgstr "
  "mehr startbar sein könnte."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:678
 +#: apt.conf.5.xml:661
  msgid "DPkg::ConfigurePending"
  msgstr "DPkg::ConfigurePending"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:679
 +#: apt.conf.5.xml:662
  msgid ""
  "If this option is set apt will call <command>dpkg --configure --pending</"
  "command> to let dpkg handle all required configurations and triggers. This "
@@@ -7184,12 -7336,12 +7292,12 @@@ msgstr "
  "deaktivieren."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:685
 +#: apt.conf.5.xml:668
  msgid "DPkg::TriggersPending"
  msgstr "DPkg::TriggersPending"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:686
 +#: apt.conf.5.xml:669
  msgid ""
  "Useful for <literal>smart</literal> configuration as a package which has "
  "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@@ -7205,12 -7357,12 +7313,12 @@@ msgstr "
  "benötigt werden."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:691
 +#: apt.conf.5.xml:674
  msgid "PackageManager::UnpackAll"
  msgstr "PackageManager::UnpackAll"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:692
 +#: apt.conf.5.xml:675
  msgid ""
  "As the configuration can be deferred to be done at the end by dpkg it can be "
  "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@@ -7229,12 -7381,12 +7337,12 @@@ msgstr "
  "und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:699
 +#: apt.conf.5.xml:682
  msgid "OrderList::Score::Immediate"
  msgstr "OrderList::Score::Immediate"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
 -#: apt.conf.5.xml:707
 +#: apt.conf.5.xml:690
  #, no-wrap
  msgid ""
  "OrderList::Score {\n"
@@@ -7252,7 -7404,7 +7360,7 @@@ msgstr "
  "};"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:700
 +#: apt.conf.5.xml:683
  msgid ""
  "Essential packages (and there dependencies) should be configured immediately "
  "after unpacking. It will be a good idea to do this quite early in the "
@@@ -7276,12 -7428,12 +7384,12 @@@ msgstr "
  "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt.conf.5.xml:720
 +#: apt.conf.5.xml:703
  msgid "Periodic and Archives options"
  msgstr "Periodische- und Archivoptionen"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:721
 +#: apt.conf.5.xml:704
  msgid ""
  "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
  "of options configure behavior of apt periodic updates, which is done by "
@@@ -7295,12 -7447,12 +7403,12 @@@ msgstr "
  "Dokumentation dieser Optionen zu erhalten."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt.conf.5.xml:729
 +#: apt.conf.5.xml:712
  msgid "Debug options"
  msgstr "Fehlersuchoptionen"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:731
 +#: apt.conf.5.xml:714
  msgid ""
  "Enabling options in the <literal>Debug::</literal> section will cause "
  "debugging information to be sent to the standard error stream of the program "
@@@ -7318,7 -7470,7 +7426,7 @@@ msgstr "
  "könnten es sein:"
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 -#: apt.conf.5.xml:742
 +#: apt.conf.5.xml:725
  msgid ""
  "<literal>Debug::pkgProblemResolver</literal> enables output about the "
  "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@@ -7329,7 -7481,7 +7437,7 @@@ msgstr "
  "getroffenen Entscheidungen ein."
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 -#: apt.conf.5.xml:750
 +#: apt.conf.5.xml:733
  msgid ""
  "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
  "used to run some operations (for instance, <literal>apt-get -s install</"
@@@ -7340,7 -7492,7 +7448,7 @@@ msgstr "
  "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen."
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 -#: apt.conf.5.xml:759
 +#: apt.conf.5.xml:742
  msgid ""
  "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
  "time that <literal>apt</literal> invokes &dpkg;."
@@@ -7352,7 -7504,7 +7460,7 @@@ msgstr "
  #. 	   motivating example, except I haven't a clue why you'd want
  #. 	   to do this. 
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 -#: apt.conf.5.xml:767
 +#: apt.conf.5.xml:750
  msgid ""
  "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
  "in CDROM IDs."
@@@ -7361,17 -7513,17 +7469,17 @@@ msgstr "
  "Daten in CD-ROM-IDs aus."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:777
 +#: apt.conf.5.xml:760
  msgid "A full list of debugging options to apt follows."
  msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:782
 +#: apt.conf.5.xml:765
  msgid "<literal>Debug::Acquire::cdrom</literal>"
  msgstr "<literal>Debug::Acquire::cdrom</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:786
 +#: apt.conf.5.xml:769
  msgid ""
  "Print information related to accessing <literal>cdrom://</literal> sources."
  msgstr ""
@@@ -7379,48 -7531,48 +7487,48 @@@
  "literal>-Quellen beziehen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:793
 +#: apt.conf.5.xml:776
  msgid "<literal>Debug::Acquire::ftp</literal>"
  msgstr "<literal>Debug::Acquire::ftp</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:797
 +#: apt.conf.5.xml:780
  msgid "Print information related to downloading packages using FTP."
  msgstr ""
  "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
  "beziehen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:804
 +#: apt.conf.5.xml:787
  msgid "<literal>Debug::Acquire::http</literal>"
  msgstr "<literal>Debug::Acquire::http</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:808
 +#: apt.conf.5.xml:791
  msgid "Print information related to downloading packages using HTTP."
  msgstr ""
  "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
  "beziehen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:815
 +#: apt.conf.5.xml:798
  msgid "<literal>Debug::Acquire::https</literal>"
  msgstr "<literal>Debug::Acquire::https</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:819
 +#: apt.conf.5.xml:802
  msgid "Print information related to downloading packages using HTTPS."
  msgstr ""
  "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
  "beziehen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:826
 +#: apt.conf.5.xml:809
  msgid "<literal>Debug::Acquire::gpgv</literal>"
  msgstr "<literal>Debug::Acquire::gpgv</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:830
 +#: apt.conf.5.xml:813
  msgid ""
  "Print information related to verifying cryptographic signatures using "
  "<literal>gpg</literal>."
@@@ -7429,12 -7581,12 +7537,12 @@@ msgstr "
  "mittels <literal>gpg</literal> beziehen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:837
 +#: apt.conf.5.xml:820
  msgid "<literal>Debug::aptcdrom</literal>"
  msgstr "<literal>Debug::aptcdrom</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:841
 +#: apt.conf.5.xml:824
  msgid ""
  "Output information about the process of accessing collections of packages "
  "stored on CD-ROMs."
@@@ -7443,23 -7595,23 +7551,23 @@@ msgstr "
  "CD-ROMs gespeichert sind."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:848
 +#: apt.conf.5.xml:831
  msgid "<literal>Debug::BuildDeps</literal>"
  msgstr "<literal>Debug::BuildDeps</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:851
 +#: apt.conf.5.xml:834
  msgid "Describes the process of resolving build-dependencies in &apt-get;."
  msgstr ""
  "Beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:858
 +#: apt.conf.5.xml:841
  msgid "<literal>Debug::Hashes</literal>"
  msgstr "<literal>Debug::Hashes</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:861
 +#: apt.conf.5.xml:844
  msgid ""
  "Output each cryptographic hash that is generated by the <literal>apt</"
  "literal> libraries."
@@@ -7468,12 -7620,12 +7576,12 @@@ msgstr "
  "Bibliotheken generiert wurde."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:868
 +#: apt.conf.5.xml:851
  msgid "<literal>Debug::IdentCDROM</literal>"
  msgstr "<literal>Debug::IdentCDROM</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:871
 +#: apt.conf.5.xml:854
  msgid ""
  "Do not include information from <literal>statfs</literal>, namely the number "
  "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@@ -7484,12 -7636,12 +7592,12 @@@ msgstr "
  "ID für eine CD-ROM generiert wird."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:879
 +#: apt.conf.5.xml:862
  msgid "<literal>Debug::NoLocking</literal>"
  msgstr "<literal>Debug::NoLocking</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:882
 +#: apt.conf.5.xml:865
  msgid ""
  "Disable all file locking.  For instance, this will allow two instances of "
  "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@@ -7499,24 -7651,24 +7607,24 @@@ msgstr "
  "gleichen Zeit laufen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:890
 +#: apt.conf.5.xml:873
  msgid "<literal>Debug::pkgAcquire</literal>"
  msgstr "<literal>Debug::pkgAcquire</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:894
 +#: apt.conf.5.xml:877
  msgid "Log when items are added to or removed from the global download queue."
  msgstr ""
  "Protokollieren, wenn Elemente aus der globalen Warteschlange zum "
  "Herunterladen hinzugefügt oder entfernt werden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:901
 +#: apt.conf.5.xml:884
  msgid "<literal>Debug::pkgAcquire::Auth</literal>"
  msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:904
 +#: apt.conf.5.xml:887
  msgid ""
  "Output status messages and errors related to verifying checksums and "
  "cryptographic signatures of downloaded files."
@@@ -7525,12 -7677,12 +7633,12 @@@ msgstr "
  "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:911
 +#: apt.conf.5.xml:894
  msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
  msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:914
 +#: apt.conf.5.xml:897
  msgid ""
  "Output information about downloading and applying package index list diffs, "
  "and errors relating to package index list diffs."
@@@ -7539,12 -7691,12 +7647,12 @@@ msgstr "
  "und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:922
 +#: apt.conf.5.xml:905
  msgid "<literal>Debug::pkgAcquire::RRed</literal>"
  msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:926
 +#: apt.conf.5.xml:909
  msgid ""
  "Output information related to patching apt package lists when downloading "
  "index diffs instead of full indices."
@@@ -7554,12 -7706,12 +7662,12 @@@ msgstr "
  "werden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:933
 +#: apt.conf.5.xml:916
  msgid "<literal>Debug::pkgAcquire::Worker</literal>"
  msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:937
 +#: apt.conf.5.xml:920
  msgid ""
  "Log all interactions with the sub-processes that actually perform downloads."
  msgstr ""
@@@ -7567,12 -7719,12 +7675,12 @@@
  "durchführen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:944
 +#: apt.conf.5.xml:927
  msgid "<literal>Debug::pkgAutoRemove</literal>"
  msgstr "<literal>Debug::pkgAutoRemove</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:948
 +#: apt.conf.5.xml:931
  msgid ""
  "Log events related to the automatically-installed status of packages and to "
  "the removal of unused packages."
@@@ -7582,12 -7734,12 +7690,12 @@@ msgstr "
  "beziehen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:955
 +#: apt.conf.5.xml:938
  msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
  msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:958
 +#: apt.conf.5.xml:941
  msgid ""
  "Generate debug messages describing which packages are being automatically "
  "installed to resolve dependencies.  This corresponds to the initial auto-"
@@@ -7603,12 -7755,12 +7711,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:969
 +#: apt.conf.5.xml:952
  msgid "<literal>Debug::pkgDepCache::Marker</literal>"
  msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:972
 +#: apt.conf.5.xml:955
  msgid ""
  "Generate debug messages describing which package is marked as keep/install/"
  "remove while the ProblemResolver does his work.  Each addition or deletion "
@@@ -7640,23 -7792,23 +7748,23 @@@ msgstr "
  "erscheint."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:991
 +#: apt.conf.5.xml:974
  msgid "<literal>Debug::pkgInitConfig</literal>"
  msgstr "<literal>Debug::pkgInitConfig</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:994
 +#: apt.conf.5.xml:977
  msgid "Dump the default configuration to standard error on startup."
  msgstr ""
  "Die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe ausgeben."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:1001
 +#: apt.conf.5.xml:984
  msgid "<literal>Debug::pkgDPkgPM</literal>"
  msgstr "<literal>Debug::pkgDPkgPM</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:1004
 +#: apt.conf.5.xml:987
  msgid ""
  "When invoking &dpkg;, output the precise command line with which it is being "
  "invoked, with arguments separated by a single space character."
@@@ -7666,12 -7818,12 +7774,12 @@@ msgstr "
  "sind."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:1012
 +#: apt.conf.5.xml:995
  msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
  msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:1015
 +#: apt.conf.5.xml:998
  msgid ""
  "Output all the data received from &dpkg; on the status file descriptor and "
  "any errors encountered while parsing it."
@@@ -7680,12 -7832,12 +7788,12 @@@ msgstr "
  "alle während deren Auswertung gefundenen Fehler ausgeben."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:1022
 +#: apt.conf.5.xml:1005
  msgid "<literal>Debug::pkgOrderList</literal>"
  msgstr "<literal>Debug::pkgOrderList</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:1026
 +#: apt.conf.5.xml:1009
  msgid ""
  "Generate a trace of the algorithm that decides the order in which "
  "<literal>apt</literal> should pass packages to &dpkg;."
@@@ -7695,12 -7847,12 +7803,12 @@@ msgstr "
  "soll."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:1034
 +#: apt.conf.5.xml:1017
  msgid "<literal>Debug::pkgPackageManager</literal>"
  msgstr "<literal>Debug::pkgPackageManager</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:1038
 +#: apt.conf.5.xml:1021
  msgid ""
  "Output status messages tracing the steps performed when invoking &dpkg;."
  msgstr ""
@@@ -7708,22 -7860,22 +7816,22 @@@
  "von &dpkg; ausgeführt werden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:1045
 +#: apt.conf.5.xml:1028
  msgid "<literal>Debug::pkgPolicy</literal>"
  msgstr "<literal>Debug::pkgPolicy</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:1049
 +#: apt.conf.5.xml:1032
  msgid "Output the priority of each package list on startup."
  msgstr "Die Priorität jeder Paketliste beim Start ausgeben."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:1055
 +#: apt.conf.5.xml:1038
  msgid "<literal>Debug::pkgProblemResolver</literal>"
  msgstr "<literal>Debug::pkgProblemResolver</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:1059
 +#: apt.conf.5.xml:1042
  msgid ""
  "Trace the execution of the dependency resolver (this applies only to what "
  "happens when a complex dependency problem is encountered)."
@@@ -7733,12 -7885,12 +7841,12 @@@ msgstr "
  "aufgetreten ist)."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:1067
 +#: apt.conf.5.xml:1050
  msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
  msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:1070
 +#: apt.conf.5.xml:1053
  msgid ""
  "Display a list of all installed packages with their calculated score used by "
  "the pkgProblemResolver. The description of the package is the same as "
@@@ -7750,12 -7902,12 +7858,12 @@@ msgstr "
  "beschrieben."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:1078
 +#: apt.conf.5.xml:1061
  msgid "<literal>Debug::sourceList</literal>"
  msgstr "<literal>Debug::sourceList</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:1082
 +#: apt.conf.5.xml:1065
  msgid ""
  "Print information about the vendors read from <filename>/etc/apt/vendors."
  "list</filename>."
@@@ -7764,7 -7916,7 +7872,7 @@@ msgstr "
  "gelesenen Anbieter ausgeben."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:1105
 +#: apt.conf.5.xml:1088
  msgid ""
  "&configureindex; is a configuration file showing example values for all "
  "possible options."
@@@ -7773,13 -7925,13 +7881,13 @@@ msgstr "
  "möglichen Optionen zeigen."
  
  #. type: Content of: <refentry><refsect1><variablelist>
 -#: apt.conf.5.xml:1112
 +#: apt.conf.5.xml:1095
  msgid "&file-aptconf;"
  msgstr "&file-aptconf;"
  
  #.  ? reading apt.conf 
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:1117
 +#: apt.conf.5.xml:1100
  msgid "&apt-cache;, &apt-config;, &apt-preferences;."
  msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
  
@@@ -7878,11 -8030,21 +7986,21 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt_preferences.5.xml:70
+ #, fuzzy
+ #| msgid ""
+ #| "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+ #| "directory are parsed in alphanumeric ascending order and need to obey the "
+ #| "following naming convention: The files have no or \"<literal>pref</"
+ #| "literal>\" as filename extension and which only contain alphanumeric, "
+ #| "hyphen (-), underscore (_) and period (.) characters.  Otherwise APT will "
+ #| "print a notice that it has ignored a file if the file doesn't match a "
+ #| "pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+ #| "configuration list - in this case it will be silently ignored."
  msgid ""
  "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
  "directory are parsed in alphanumeric ascending order and need to obey the "
 -"following naming convention: The files have either no or \"<literal>pref</"
 -"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 +"following naming convention: The files have no or \"<literal>pref</literal>"
 +"\" as filename extension and which only contain alphanumeric, hyphen (-), "
  "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
  "that it has ignored a file if the file doesn't match a pattern in the "
  "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@@ -8351,14 -8513,13 +8469,20 @@@ msgstr "
  msgid "Regular expressions and glob() syntax"
  msgstr "Reguläre Ausdrücke und glob()-Syntax"
  
- # FIXME: s/expression or/expression) or/
  #. type: Content of: <refentry><refsect1><refsect2><para>
  #: apt_preferences.5.xml:264
++#, fuzzy
++#| msgid ""
++#| "APT also supports pinning by glob() expressions and regular expressions "
++#| "surrounded by /. For example, the following example assigns the priority "
++#| "500 to all packages from experimental where the name starts with gnome "
++#| "(as a glob()-like expression) or contains the word kde (as a POSIX "
++#| "extended regular expression surrounded by slashes)."
  msgid ""
  "APT also supports pinning by glob() expressions and regular expressions "
  "surrounded by /. For example, the following example assigns the priority 500 "
  "to all packages from experimental where the name starts with gnome (as a glob"
 -"()-like expression) or contains the word kde (as a POSIX extended regular "
 +"()-like expression or contains the word kde (as a POSIX extended regular "
  "expression surrounded by slashes)."
  msgstr ""
  "APT unterstützt außerdem Pinning mittels glob()-Ausdrücken und regulären "
@@@ -8380,12 -8541,11 +8504,16 @@@ msgstr "
  "Pin: release n=experimental\n"
  "Pin-Priority: 500\n"
  
- # FIXME: s/Those/Thus/
  #. type: Content of: <refentry><refsect1><refsect2><para>
  #: apt_preferences.5.xml:279
++#, fuzzy
++#| msgid ""
++#| "The rule for those expressions is that they can occur anywhere where a "
++#| "string can occur. Thus, the following pin assigns the priority 990 to all "
++#| "packages from a release starting with karmic."
  msgid ""
  "The rule for those expressions is that they can occur anywhere where a "
 -"string can occur. Thus, the following pin assigns the priority 990 to all "
 +"string can occur. Those, the following pin assigns the priority 990 to all "
  "packages from a release starting with karmic."
  msgstr ""
  "Die Regel für diese Ausdrücke ist, dass sie überall dort auftreten können, "
@@@ -9299,8 -9459,9 +9427,9 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><literallayout>
  #: sources.list.5.xml:81
- #, no-wrap
+ #, fuzzy, no-wrap
+ #| msgid "deb uri distribution [component1] [component2] [...]"
 -msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 +msgid "deb uri distribution [component1] [component2] [...]"
  msgstr "deb URI Distribution [Komponente1] [Komponente2] [...]"
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -9372,6 -9533,27 +9501,6 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:112
  msgid ""
 -"<literal>options</literal> is always optional and needs to be surounded by "
 -"square brackets. It can consist of multiple settings in the form "
 -"<literal><replaceable>setting</replaceable>=<replaceable>value</"
 -"replaceable></literal>.  Multiple settings are separated by spaces. The "
 -"following settings are supported by APT, note through that unsupported "
 -"settings will be ignored silently:"
 -msgstr ""
 -
 -#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 -#: sources.list.5.xml:117
 -msgid ""
 -"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 -"replaceable>,…</literal> can be used to specify for which architectures "
 -"packages information should be downloaded. If this option is not set all "
 -"architectures defined by the <literal>APT::Architectures</literal> option "
 -"will be downloaded."
 -msgstr ""
 -
 -#. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:123
 -msgid ""
  "It is important to list sources in order of preference, with the most "
  "preferred source listed first. Typically this will result in sorting by "
  "speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@@ -9384,12 -9566,12 +9513,12 @@@ msgstr "
  "Rechnern, zum Beispiel)."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:128
 +#: sources.list.5.xml:117
  msgid "Some examples:"
  msgstr "Einige Beispiele:"
  
  #. type: Content of: <refentry><refsect1><literallayout>
 -#: sources.list.5.xml:130
 +#: sources.list.5.xml:119
  #, no-wrap
  msgid ""
  "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@@ -9401,17 -9583,17 +9530,17 @@@ msgstr "
  "   "
  
  #. type: Content of: <refentry><refsect1><title>
 -#: sources.list.5.xml:136
 +#: sources.list.5.xml:125
  msgid "URI specification"
  msgstr "URI-Beschreibung"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: sources.list.5.xml:141
 +#: sources.list.5.xml:130
  msgid "file"
  msgstr "file"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: sources.list.5.xml:143
 +#: sources.list.5.xml:132
  msgid ""
  "The file scheme allows an arbitrary directory in the file system to be "
  "considered an archive. This is useful for NFS mounts and local mirrors or "
@@@ -9422,7 -9604,7 +9551,7 @@@ msgstr "
  "lokale Spiegel oder Archive."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: sources.list.5.xml:150
 +#: sources.list.5.xml:139
  msgid ""
  "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
  "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@@ -9432,7 -9614,7 +9561,7 @@@ msgstr "
  "der Quellenliste zu erstellen."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: sources.list.5.xml:157
 +#: sources.list.5.xml:146
  msgid ""
  "The http scheme specifies an HTTP server for the archive. If an environment "
  "variable <envar>http_proxy</envar> is set with the format http://server:"
@@@ -9449,7 -9631,7 +9578,7 @@@ msgstr "
  "Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: sources.list.5.xml:168
 +#: sources.list.5.xml:157
  msgid ""
  "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
  "is highly configurable; for more information see the &apt-conf; manual page. "
@@@ -9469,12 -9651,12 +9598,12 @@@ msgstr "
  "Konfigurationsdatei HTTP benutzen, werden ignoriert."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: sources.list.5.xml:177
 +#: sources.list.5.xml:166
  msgid "copy"
  msgstr "copy"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: sources.list.5.xml:179
 +#: sources.list.5.xml:168
  msgid ""
  "The copy scheme is identical to the file scheme except that packages are "
  "copied into the cache directory instead of used directly at their location.  "
@@@ -9486,17 -9668,17 +9615,17 @@@ msgstr "
  "Platte benutzen, um Dateien mit APT umherzukopieren."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: sources.list.5.xml:184
 +#: sources.list.5.xml:173
  msgid "rsh"
  msgstr "rsh"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: sources.list.5.xml:184
 +#: sources.list.5.xml:173
  msgid "ssh"
  msgstr "ssh"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: sources.list.5.xml:186
 +#: sources.list.5.xml:175
  msgid ""
  "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
  "user and access the files. It is a good idea to do prior arrangements with "
@@@ -9512,12 -9694,12 +9641,12 @@@ msgstr "
  "aus der Ferne durchzuführen."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: sources.list.5.xml:194
 +#: sources.list.5.xml:183
  msgid "more recognizable URI types"
  msgstr "weitere erkennbare URI-Typen"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: sources.list.5.xml:196
 +#: sources.list.5.xml:185
  msgid ""
  "APT can be extended with more methods shipped in other optional packages "
  "which should follow the nameing scheme <literal>apt-transport-"
@@@ -9539,7 -9721,7 +9668,7 @@@ msgstr "
  "citerefentry>."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:138
 +#: sources.list.5.xml:127
  msgid ""
  "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
  "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@@ -9548,7 -9730,7 +9677,7 @@@ msgstr "
  "»ssh«, »rsh«. <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:210
 +#: sources.list.5.xml:199
  msgid ""
  "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
  "stable/main, stable/contrib, and stable/non-free."
@@@ -9557,37 -9739,60 +9686,37 @@@ msgstr "
  "jason/debian für stable/main, stable/contrib und stable/non-free."
  
  #. type: Content of: <refentry><refsect1><literallayout>
 -#: sources.list.5.xml:212
 +#: sources.list.5.xml:201
  #, no-wrap
  msgid "deb file:/home/jason/debian stable main contrib non-free"
  msgstr "deb file:/home/jason/debian stable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:214
 +#: sources.list.5.xml:203
  msgid "As above, except this uses the unstable (development) distribution."
  msgstr ""
  "Wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution "
  "benutzt."
  
  #. type: Content of: <refentry><refsect1><literallayout>
 -#: sources.list.5.xml:215
 +#: sources.list.5.xml:204
  #, no-wrap
  msgid "deb file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb file:/home/jason/debian unstable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:217
 +#: sources.list.5.xml:206
  msgid "Source line for the above"
  msgstr "Quellzeile für obiges"
  
  #. type: Content of: <refentry><refsect1><literallayout>
 -#: sources.list.5.xml:218
 +#: sources.list.5.xml:207
  #, no-wrap
  msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:220
 -msgid ""
 -"The first line gets package information for the architectures in "
 -"<literal>APT::Architectures</literal> while the second always retrieves "
 -"<literal>amd64</literal> and <literal>armel</literal>."
 -msgstr ""
 -
 -#. type: Content of: <refentry><refsect1><literallayout>
 -#: sources.list.5.xml:222
 -#, fuzzy, no-wrap
 -#| msgid ""
 -#| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
 -#| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
 -#| "   "
 -msgid ""
 -"deb http://ftp.debian.org/debian &stable-codename; main\n"
 -"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 -msgstr ""
 -"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
 -"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
 -"   "
 -
 -#. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:225
 +#: sources.list.5.xml:209
  msgid ""
  "Uses HTTP to access the archive at archive.debian.org, and uses only the "
  "hamm/main area."
@@@ -9596,13 -9801,13 +9725,13 @@@ msgstr "
  "den hamm/main-Bereich zu benutzen."
  
  #. type: Content of: <refentry><refsect1><literallayout>
 -#: sources.list.5.xml:227
 +#: sources.list.5.xml:211
  #, no-wrap
  msgid "deb http://archive.debian.org/debian-archive hamm main"
  msgstr "deb http://archive.debian.org/debian-archive hamm main"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:229
 +#: sources.list.5.xml:213
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the &stable-codename;/contrib area."
@@@ -9612,13 -9817,13 +9741,13 @@@ msgstr "
  "benutzen."
  
  #. type: Content of: <refentry><refsect1><literallayout>
 -#: sources.list.5.xml:231
 +#: sources.list.5.xml:215
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:233
 +#: sources.list.5.xml:217
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the unstable/contrib area. If this line appears as "
@@@ -9632,19 -9837,19 +9761,19 @@@ msgstr "
  "für beide Quellzeilen benutzt."
  
  #. type: Content of: <refentry><refsect1><literallayout>
 -#: sources.list.5.xml:237
 +#: sources.list.5.xml:221
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian unstable contrib"
  msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
 -#: sources.list.5.xml:246
 +#: sources.list.5.xml:230
  #, no-wrap
  msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
  msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:239
 +#: sources.list.5.xml:223
  msgid ""
  "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
  "directory, and uses only files found under <filename>unstable/binary-i386</"
@@@ -9664,7 -9869,7 +9793,7 @@@ msgstr "
  "type=\"literallayout\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:251
 +#: sources.list.5.xml:235
  msgid "&apt-cache; &apt-conf;"
  msgstr "&apt-cache; &apt-conf;"
  
@@@ -11221,6 -11426,14 +11350,60 @@@ msgstr "  # apt-get -o dir::cache::arch
  msgid "Which will use the already fetched archives on the disc."
  msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
  
++#, fuzzy
++#~| msgid "<option>--recurse</option>"
++#~ msgid "<option>--host-architecture</option>"
++#~ msgstr "<option>--recurse</option>"
++
++#, fuzzy
++#~| msgid "Max-ValidTime"
++#~ msgid "Min-ValidTime"
++#~ msgstr "Max-ValidTime"
++
++#, fuzzy
++#~| msgid ""
++#~| "Seconds the Release file should be considered valid after it was "
++#~| "created. The default is \"for ever\" (0) if the Release file of the "
++#~| "archive doesn't include a <literal>Valid-Until</literal> header.  If it "
++#~| "does then this date is the default. The date from the Release file or "
++#~| "the date specified by the creation time of the Release file "
++#~| "(<literal>Date</literal> header) plus the seconds specified with this "
++#~| "options are used to check if the validation of a file has expired by "
++#~| "using the earlier date of the two. Archive specific settings can be made "
++#~| "by appending the label of the archive to the option name."
++#~ msgid ""
++#~ "Minimum of seconds the Release file should be considered valid after it "
++#~ "was created (indicated by the <literal>Date</literal> header).  Use this "
++#~ "if you need to use a seldomly updated (local) mirror of a more regular "
++#~ "updated archive with a <literal>Valid-Until</literal> header instead of "
++#~ "competely disabling the expiration date checking.  Archive specific "
++#~ "settings can and should be used by appending the label of the archive to "
++#~ "the option name."
++#~ msgstr ""
++#~ "Sekunden, die die Release-Datei als gültig betrachtet werden sollte, "
++#~ "nachdem sie erzeugt wurde. Vorgabe ist »für immer« (0), falls die Release-"
++#~ "Datei des Archivs keine <literal>Valid-Until</literal>-Kopfzeile enthält. "
++#~ "Falls dies so ist, ist dieses Datum vorgegeben. Das Datum aus der Release-"
++#~ "Datei oder das Datum, das durch die Erstellungszeit der Release-Datei "
++#~ "angegeben wurde (<literal>Date</literal>-Kopfzeile) plus die mit diesen "
++#~ "Optionen angegebenen Sekunden werden benutzt, um zu prüfen, ob die "
++#~ "Bestätigung einer Datei abgelaufen ist indem das neuere Datum der beiden "
++#~ "benutzt wird. Archivspezifische Einstellungen können durch Anhängen des "
++#~ "Archivetiketts an die Option »name« vorgenommen werden."
++
++#, fuzzy
++#~| msgid ""
++#~| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
++#~| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
++#~| "   "
+ #~ msgid ""
 -#~ "Update the local keyring with the keyring of Debian archive keys and "
 -#~ "removes from the keyring the archive keys which are no longer valid."
++#~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
++#~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ #~ msgstr ""
 -#~ "Den lokalen Schlüsselbund mit dem Schlüsselbund der Debian-"
 -#~ "Archivschlüssel aktualisieren und aus dem Schlüsselbund die "
 -#~ "Archivschlüssel entfernen, die nicht länger gültig sind."
++#~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
++#~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
++#~ "   "
+ 
  #~ msgid "<option>--md5</option>"
  #~ msgstr "<option>--md5</option>"
  
diff --combined doc/po/es.po
index 3a21eeecb,dedd69db4..db8b9a848
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@@ -36,7 -36,7 +36,7 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: apt 0.7.25\n"
 -"POT-Creation-Date: 2011-06-28 16:42+0200\n"
 +"POT-Creation-Date: 2011-06-08 16:54+0300\n"
  "PO-Revision-Date: 2010-08-25 03:25+0200\n"
  "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
  "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@@ -1354,7 -1354,7 +1354,7 @@@ msgstr "
  "configuración: <literal>Dir::Cache::pkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393
 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
  #: apt-sortpkgs.1.xml:61
  msgid "<option>-s</option>"
  msgstr "<option>-s</option>"
@@@ -1380,12 -1380,12 +1380,12 @@@ msgstr "
  "Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
  msgid "<option>-q</option>"
  msgstr "<option>-q</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
  msgid "<option>--quiet</option>"
  msgstr "<option>--quiet</option>"
  
@@@ -1466,9 -1466,16 +1466,9 @@@ msgstr "<option>--no-enhances</option>
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cache.8.xml:317
 -#, fuzzy
 -#| msgid ""
 -#| "Per default the <literal>depends</literal> and <literal>rdepends</"
 -#| "literal> print all dependencies. This can be twicked with these flags "
 -#| "which will omit the specified dependency type.  Configuration Item: "
 -#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
 -#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 -"print all dependencies. This can be tweaked with these flags which will omit "
 +"print all dependencies. This can be twicked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
@@@ -1500,7 -1507,7 +1500,7 @@@ msgstr "
  "Opción de configuración: <literal>APT::Cache::ShowFull</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
  msgid "<option>-a</option>"
  msgstr "<option>-a</option>"
  
@@@ -1617,7 -1624,7 +1617,7 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist>
  #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570
 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
  #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
  msgid "&apt-commonoptions;"
  msgstr "&apt-commonoptions;"
@@@ -1635,7 -1642,7 +1635,7 @@@ msgstr "&file-sourceslist; &file-statel
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585
 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
  #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
  #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
  #: sources.list.5.xml:234
@@@ -1649,7 -1656,7 +1649,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591
 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
  #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
  msgid "Diagnostics"
  msgstr "Diagnósticos"
@@@ -1784,7 -1791,7 +1784,7 @@@ msgid "Options
  msgstr "Opciones"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
  msgid "<option>-d</option>"
  msgstr "<option>-d</option>"
  
@@@ -2041,7 -2048,7 +2041,7 @@@ msgid "Just show the contents of the co
  msgstr "Sólo muestra el contenido del espacio de configuración."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
  #: apt-sortpkgs.1.xml:73
  msgid "&apt-conf;"
  msgstr "&apt-conf;"
@@@ -3198,43 -3205,25 +3198,43 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:531
 +#, fuzzy
 +#| msgid ""
 +#| "Values for the additional metadata fields in the Release file are taken "
 +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
 +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
 +#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
 +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
 +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
 +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
 +#| "literal>, <literal>Description</literal>."
  msgid ""
  "Generate the given checksum. These options default to on, when turned off "
  "the generated index files will not have the checksum fields where possible.  "
  "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
  "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
  "replaceable>::<replaceable>Checksum</replaceable></literal> where "
 -"<literal><replaceable>Index</replaceable></literal> can be "
 -"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
 -"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
 -"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 +"<literal>Index</literal> can be <literal>Packages</literal>, "
 +"<literal>Sources</literal> or <literal>Release</literal> and "
 +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
 +"literal> or <literal>SHA256</literal>."
  msgstr ""
 +"Los valores para los campos de metadatos adicionales en el fichero «Release» "
 +"se toman de las variables correspondientes en <literal>APT::FTPArchive::"
 +"Release</literal>, por ejemplo <literal>APT::FTPArchive::Release::Origin</"
 +"literal>. Los campos permitidos son: <literal>Origin</literal>, "
 +"<literal>Label</literal>, <literal>Suite</literal>, <literal>Version</"
 +"literal>, <literal>Codename</literal>, <literal>Date</literal>, "
 +"<literal>Valid-Until</literal>, <literal>Architectures</literal>, "
 +"<literal>Components</literal> y <literal>Description</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:540
 +#: apt-ftparchive.1.xml:539
  msgid "<option>--db</option>"
  msgstr "<option>--db</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:542
 +#: apt-ftparchive.1.xml:541
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
  "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@@ -3243,7 -3232,7 +3243,7 @@@ msgstr "
  "«generate». Opción de configuración: <literal>APT::FTPArchive::DB</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:548
 +#: apt-ftparchive.1.xml:547
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -3257,12 -3246,12 +3257,12 @@@ msgstr "
  "configuración. Opción de configuración: <literal>quiet</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:554
 +#: apt-ftparchive.1.xml:553
  msgid "<option>--delink</option>"
  msgstr "<option>--delink</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:556
 +#: apt-ftparchive.1.xml:555
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
  "then this option actually enables delinking of the files. It defaults to on "
@@@ -3275,12 -3264,12 +3275,12 @@@ msgstr "
  "Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:562
 +#: apt-ftparchive.1.xml:561
  msgid "<option>--contents</option>"
  msgstr "<option>--contents</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:564
 +#: apt-ftparchive.1.xml:563
  msgid ""
  "Perform contents generation. When this option is set and package indexes are "
  "being generated with a cache DB then the file listing will also be extracted "
@@@ -3297,12 -3286,12 +3297,12 @@@ msgstr "
  "Contents</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:572
 +#: apt-ftparchive.1.xml:571
  msgid "<option>--source-override</option>"
  msgstr "<option>--source-override</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:574
 +#: apt-ftparchive.1.xml:573
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@@ -3313,12 -3302,12 +3313,12 @@@ msgstr "
  "FTPArchive::SourceOverride</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:578
 +#: apt-ftparchive.1.xml:577
  msgid "<option>--readonly</option>"
  msgstr "<option>--readonly</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:580
 +#: apt-ftparchive.1.xml:579
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3327,12 -3316,12 +3327,12 @@@ msgstr "
  "Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:584
 +#: apt-ftparchive.1.xml:583
  msgid "<option>--arch</option>"
  msgstr "<option>--arch</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:585
 +#: apt-ftparchive.1.xml:584
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
  "commands only package files matching <literal>*_arch.deb</literal> or "
@@@ -3346,12 -3335,12 +3346,12 @@@ msgstr "
  "FTPArchive::Architecture</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:591
 +#: apt-ftparchive.1.xml:590
  msgid "<option>APT::FTPArchive::AlwaysStat</option>"
  msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:593
 +#: apt-ftparchive.1.xml:592
  msgid ""
  "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
  "packages are recompiled and/or republished with the same version again, this "
@@@ -3375,12 -3364,12 +3375,12 @@@ msgstr "
  "comprobaciones adicionales son innecesarias."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:603
 +#: apt-ftparchive.1.xml:602
  msgid "<option>APT::FTPArchive::LongDescription</option>"
  msgstr "<option>APT::FTPArchive::LongDescription</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:605
 +#: apt-ftparchive.1.xml:604
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
  "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@@ -3396,19 -3385,19 +3396,19 @@@ msgstr "
  "con la orden «generate»."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544
 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
  #: sources.list.5.xml:198
  msgid "Examples"
  msgstr "Ejemplos"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
 -#: apt-ftparchive.1.xml:623
 +#: apt-ftparchive.1.xml:622
  #, no-wrap
  msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  msgstr "<command>apt-ftparchive</command> packages <replaceable>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:619
 +#: apt-ftparchive.1.xml:618
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3417,7 -3406,7 +3417,7 @@@ msgstr "
  "paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:633
 +#: apt-ftparchive.1.xml:632
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -3890,7 -3879,7 +3890,7 @@@ msgstr "
  #: apt-get.8.xml:282
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
 -"current directory."
 +"current directoy."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@@ -5582,11 -5571,12 +5582,11 @@@ msgstr "
  #| "period (.) characters - otherwise they will be silently ignored."
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 -"order which have either no or \"<literal>conf</literal>\" as filename "
 -"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 -"and period (.) characters.  Otherwise APT will print a notice that it has "
 -"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
 -"Ignore-Files-Silently</literal> configuration list - in this case it will be "
 -"silently ignored."
 +"order which have no or \"<literal>conf</literal>\" as filename extension and "
 +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
 +"characters.  Otherwise APT will print a notice that it has ignored a file if "
 +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
 +"literal> configuration list - in this case it will be silently ignored."
  msgstr ""
  "Todos los ficheros en <literal>Dir::Etc::Parts</literal> en orden "
  "alfanumérico ascendente que no tienen extensión o la extensión "
@@@ -6158,11 -6148,11 +6158,19 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:277
++#, fuzzy
++#| msgid ""
++#| "Two sub-options to limit the use of PDiffs are also available: With "
++#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
++#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
++#| "other hand is the maximum percentage of the size of all patches compared "
++#| "to the size of the targeted file. If one of these limits is exceeded the "
++#| "complete file is downloaded instead of the patches."
  msgid ""
  "Two sub-options to limit the use of PDiffs are also available: With "
  "<literal>FileLimit</literal> can be specified how many PDiff files are "
  "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
 -"other hand is the maximum percentage of the size of all patches compared to "
 +"other hand is the maximum precentage of the size of all patches compared to "
  "the size of the targeted file. If one of these limits is exceeded the "
  "complete file is downloaded instead of the patches."
  msgstr ""
@@@ -6615,9 -6605,9 +6623,9 @@@ msgid "
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
  "will only be used if this file exists, e.g. for the bzip2 method (the "
 -"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
 -"also that list entries specified on the command line will be added at the "
 -"end of the list specified in the configuration files, but before the default "
 +"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
 +"that list entries specified on the command line will be added at the end of "
 +"the list specified in the configuration files, but before the default "
  "entries. To prefer a type in this case over the ones specified in the "
  "configuration files you can set the option direct - not in list style.  This "
  "will not override the defined list, it will only prefix the list with this "
@@@ -6639,7 -6629,7 +6647,7 @@@ msgstr "
  #: apt.conf.5.xml:449
  msgid ""
  "The special type <literal>uncompressed</literal> can be used to give "
 -"uncompressed files a preference, but note that most archives don't provide "
 +"uncompressed files a preference, but note that most archives doesn't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
  
@@@ -7932,8 -7922,8 +7940,8 @@@ msgstr "
  msgid ""
  "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
  "directory are parsed in alphanumeric ascending order and need to obey the "
 -"following naming convention: The files have either no or \"<literal>pref</"
 -"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 +"following naming convention: The files have no or \"<literal>pref</literal>"
 +"\" as filename extension and which only contain alphanumeric, hyphen (-), "
  "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
  "that it has ignored a file if the file doesn't match a pattern in the "
  "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@@ -8401,7 -8391,7 +8409,7 @@@ msgid "
  "APT also supports pinning by glob() expressions and regular expressions "
  "surrounded by /. For example, the following example assigns the priority 500 "
  "to all packages from experimental where the name starts with gnome (as a glob"
 -"()-like expression) or contains the word kde (as a POSIX extended regular "
 +"()-like expression or contains the word kde (as a POSIX extended regular "
  "expression surrounded by slashes)."
  msgstr ""
  
@@@ -8425,7 -8415,7 +8433,7 @@@ msgstr "
  #: apt_preferences.5.xml:279
  msgid ""
  "The rule for those expressions is that they can occur anywhere where a "
 -"string can occur. Thus, the following pin assigns the priority 990 to all "
 +"string can occur. Those, the following pin assigns the priority 990 to all "
  "packages from a release starting with karmic."
  msgstr ""
  
diff --combined doc/po/fr.po
index e4a5e1694,e00a87b0e..037c50de5
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@@ -9,7 -9,7 +9,7 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: \n"
 -"POT-Creation-Date: 2011-06-28 16:42+0200\n"
 +"POT-Creation-Date: 2011-06-08 16:54+0300\n"
  "PO-Revision-Date: 2011-02-17 07:50+0100\n"
  "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
  "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@@ -1277,7 -1277,7 +1277,7 @@@ msgstr "
  "<literal>Dir::Cache::pkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393
 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
  #: apt-sortpkgs.1.xml:61
  msgid "<option>-s</option>"
  msgstr "<option>-s</option>"
@@@ -1304,12 -1304,12 +1304,12 @@@ msgstr "
  "<literal>Dir::Cache::srcpkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
  msgid "<option>-q</option>"
  msgstr "<option>-q</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
  msgid "<option>--quiet</option>"
  msgstr "<option>--quiet</option>"
  
@@@ -1391,9 -1391,16 +1391,9 @@@ msgstr "<option>--no-enhances</option>
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cache.8.xml:317
 -#, fuzzy
 -#| msgid ""
 -#| "Per default the <literal>depends</literal> and <literal>rdepends</"
 -#| "literal> print all dependencies. This can be twicked with these flags "
 -#| "which will omit the specified dependency type.  Configuration Item: "
 -#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
 -#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 -"print all dependencies. This can be tweaked with these flags which will omit "
 +"print all dependencies. This can be twicked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
@@@ -1425,7 -1432,7 +1425,7 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
  msgid "<option>-a</option>"
  msgstr "<option>-a</option>"
  
@@@ -1545,7 -1552,7 +1545,7 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist>
  #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570
 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
  #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
  msgid "&apt-commonoptions;"
  msgstr "&apt-commonoptions;"
@@@ -1563,7 -1570,7 +1563,7 @@@ msgstr "&file-sourceslist; &file-statel
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585
 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
  #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
  #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
  #: sources.list.5.xml:234
@@@ -1577,7 -1584,7 +1577,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591
 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
  #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
  msgid "Diagnostics"
  msgstr "Diagnostics"
@@@ -1712,7 -1719,7 +1712,7 @@@ msgid "Options
  msgstr "Options"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
  msgid "<option>-d</option>"
  msgstr "<option>-d</option>"
  
@@@ -1969,7 -1976,7 +1969,7 @@@ msgid "Just show the contents of the co
  msgstr "Affiche seulement le contenu de l'espace de configuration."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
  #: apt-sortpkgs.1.xml:73
  msgid "&apt-conf;"
  msgstr "&apt-conf;"
@@@ -3126,43 -3133,25 +3126,43 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:531
 +#, fuzzy
 +#| msgid ""
 +#| "Values for the additional metadata fields in the Release file are taken "
 +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
 +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
 +#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
 +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
 +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
 +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
 +#| "literal>, <literal>Description</literal>."
  msgid ""
  "Generate the given checksum. These options default to on, when turned off "
  "the generated index files will not have the checksum fields where possible.  "
  "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
  "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
  "replaceable>::<replaceable>Checksum</replaceable></literal> where "
 -"<literal><replaceable>Index</replaceable></literal> can be "
 -"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
 -"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
 -"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 +"<literal>Index</literal> can be <literal>Packages</literal>, "
 +"<literal>Sources</literal> or <literal>Release</literal> and "
 +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
 +"literal> or <literal>SHA256</literal>."
  msgstr ""
 +"La valeur des autres champs de métadonnées du fichier Release sont tirées de "
 +"la valeur correspondante dans <literal>APT::FTPArchive::Release</literal>, "
 +"p. ex. <literal>APT::FTPArchive::Release::Origin</literal>.  Les champs "
 +"reconnus sont : <literal>Origin</literal>, <literal>Label</literal>, "
 +"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
 +"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
 +"<literal>Architectures</literal>, <literal>Components</literal>, "
 +"<literal>Description</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:540
 +#: apt-ftparchive.1.xml:539
  msgid "<option>--db</option>"
  msgstr "<option>--db</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:542
 +#: apt-ftparchive.1.xml:541
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
  "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@@ -3172,7 -3161,7 +3172,7 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:548
 +#: apt-ftparchive.1.xml:547
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -3187,12 -3176,12 +3187,12 @@@ msgstr "
  "configuration : <literal>quiet</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:554
 +#: apt-ftparchive.1.xml:553
  msgid "<option>--delink</option>"
  msgstr "<option>--delink</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:556
 +#: apt-ftparchive.1.xml:555
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
  "then this option actually enables delinking of the files. It defaults to on "
@@@ -3206,12 -3195,12 +3206,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:562
 +#: apt-ftparchive.1.xml:561
  msgid "<option>--contents</option>"
  msgstr "<option>--contents</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:564
 +#: apt-ftparchive.1.xml:563
  msgid ""
  "Perform contents generation. When this option is set and package indexes are "
  "being generated with a cache DB then the file listing will also be extracted "
@@@ -3227,12 -3216,12 +3227,12 @@@ msgstr "
  "de configuration : <literal>APT::FTPArchive::Contents</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:572
 +#: apt-ftparchive.1.xml:571
  msgid "<option>--source-override</option>"
  msgstr "<option>--source-override</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:574
 +#: apt-ftparchive.1.xml:573
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@@ -3243,12 -3232,12 +3243,12 @@@ msgstr "
  "FTPArchive::SourceOverride</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:578
 +#: apt-ftparchive.1.xml:577
  msgid "<option>--readonly</option>"
  msgstr "<option>--readonly</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:580
 +#: apt-ftparchive.1.xml:579
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3257,12 -3246,12 +3257,12 @@@ msgstr "
  "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:584
 +#: apt-ftparchive.1.xml:583
  msgid "<option>--arch</option>"
  msgstr "<option>--arch</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:585
 +#: apt-ftparchive.1.xml:584
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
  "commands only package files matching <literal>*_arch.deb</literal> or "
@@@ -3276,12 -3265,12 +3276,12 @@@ msgstr "
  "<literal>APT::FTPArchive::Architecture</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:591
 +#: apt-ftparchive.1.xml:590
  msgid "<option>APT::FTPArchive::AlwaysStat</option>"
  msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:593
 +#: apt-ftparchive.1.xml:592
  msgid ""
  "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
  "packages are recompiled and/or republished with the same version again, this "
@@@ -3304,12 -3293,12 +3304,12 @@@ msgstr "
  "survenir et l'ensemble de ces contrôles devient inutile."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:603
 +#: apt-ftparchive.1.xml:602
  msgid "<option>APT::FTPArchive::LongDescription</option>"
  msgstr "<option>APT::FTPArchive::LongDescription</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:605
 +#: apt-ftparchive.1.xml:604
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
  "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@@ -3325,19 -3314,19 +3325,19 @@@ msgstr "
  "generate."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544
 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
  #: sources.list.5.xml:198
  msgid "Examples"
  msgstr "Exemples"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
 -#: apt-ftparchive.1.xml:623
 +#: apt-ftparchive.1.xml:622
  #, no-wrap
  msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:619
 +#: apt-ftparchive.1.xml:618
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3346,7 -3335,7 +3346,7 @@@ msgstr "
  "des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:633
 +#: apt-ftparchive.1.xml:632
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -3822,7 -3811,7 +3822,7 @@@ msgstr "download
  #: apt-get.8.xml:282
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
 -"current directory."
 +"current directoy."
  msgstr ""
  "<literal>download</literal> télécharge le fichier binaire indiqué dans le "
  "répertoire courant."
@@@ -5497,13 -5486,23 +5497,13 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
  #: apt.conf.5.xml:52
 -#, fuzzy
 -#| msgid ""
 -#| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 -#| "order which have no or \"<literal>conf</literal>\" as filename extension "
 -#| "and which only contain alphanumeric, hyphen (-), underscore (_) and "
 -#| "period (.) characters.  Otherwise APT will print a notice that it has "
 -#| "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
 -#| "Ignore-Files-Silently</literal> configuration list - in this case it will "
 -#| "be silently ignored."
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 -"order which have either no or \"<literal>conf</literal>\" as filename "
 -"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 -"and period (.) characters.  Otherwise APT will print a notice that it has "
 -"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
 -"Ignore-Files-Silently</literal> configuration list - in this case it will be "
 -"silently ignored."
 +"order which have no or \"<literal>conf</literal>\" as filename extension and "
 +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
 +"characters.  Otherwise APT will print a notice that it has ignored a file if "
 +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
 +"literal> configuration list - in this case it will be silently ignored."
  msgstr ""
  "tous les fichiers de <literal>Dir::Etc::Parts</literal> dans l'ordre "
  "alphanumérique ascendant qui ont soit l'extension \"<literal>conf</literal>"
@@@ -6091,11 -6090,11 +6091,19 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:277
++#, fuzzy
++#| msgid ""
++#| "Two sub-options to limit the use of PDiffs are also available: With "
++#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
++#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
++#| "other hand is the maximum percentage of the size of all patches compared "
++#| "to the size of the targeted file. If one of these limits is exceeded the "
++#| "complete file is downloaded instead of the patches."
  msgid ""
  "Two sub-options to limit the use of PDiffs are also available: With "
  "<literal>FileLimit</literal> can be specified how many PDiff files are "
  "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
 -"other hand is the maximum percentage of the size of all patches compared to "
 +"other hand is the maximum precentage of the size of all patches compared to "
  "the size of the targeted file. If one of these limits is exceeded the "
  "complete file is downloaded instead of the patches."
  msgstr ""
@@@ -6539,13 -6538,25 +6547,13 @@@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:442
 -#, fuzzy
 -#| msgid ""
 -#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 -#| "replaceable></literal> will be checked: If this setting exists the method "
 -#| "will only be used if this file exists, e.g. for the bzip2 method (the "
 -#| "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note "
 -#| "also that list entries specified on the command line will be added at the "
 -#| "end of the list specified in the configuration files, but before the "
 -#| "default entries. To prefer a type in this case over the ones specified in "
 -#| "the configuration files you can set the option direct - not in list "
 -#| "style.  This will not override the defined list, it will only prefix the "
 -#| "list with this type."
  msgid ""
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
  "will only be used if this file exists, e.g. for the bzip2 method (the "
 -"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
 -"also that list entries specified on the command line will be added at the "
 -"end of the list specified in the configuration files, but before the default "
 +"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
 +"that list entries specified on the command line will be added at the end of "
 +"the list specified in the configuration files, but before the default "
  "entries. To prefer a type in this case over the ones specified in the "
  "configuration files you can set the option direct - not in list style.  This "
  "will not override the defined list, it will only prefix the list with this "
@@@ -6567,7 -6578,7 +6575,7 @@@ msgstr "
  #: apt.conf.5.xml:449
  msgid ""
  "The special type <literal>uncompressed</literal> can be used to give "
 -"uncompressed files a preference, but note that most archives don't provide "
 +"uncompressed files a preference, but note that most archives doesn't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
  "Le type spécial <literal>uncompressed</literal> peut servir à donner la "
@@@ -7855,11 -7866,21 +7863,11 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt_preferences.5.xml:70
 -#, fuzzy
 -#| msgid ""
 -#| "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 -#| "directory are parsed in alphanumeric ascending order and need to obey the "
 -#| "following naming convention: The files have no or \"<literal>pref</"
 -#| "literal>\" as filename extension and which only contain alphanumeric, "
 -#| "hyphen (-), underscore (_) and period (.) characters.  Otherwise APT will "
 -#| "print a notice that it has ignored a file if the file doesn't match a "
 -#| "pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
 -#| "configuration list - in this case it will be silently ignored."
  msgid ""
  "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
  "directory are parsed in alphanumeric ascending order and need to obey the "
 -"following naming convention: The files have either no or \"<literal>pref</"
 -"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 +"following naming convention: The files have no or \"<literal>pref</literal>"
 +"\" as filename extension and which only contain alphanumeric, hyphen (-), "
  "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
  "that it has ignored a file if the file doesn't match a pattern in the "
  "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@@ -8325,7 -8346,7 +8333,7 @@@ msgid "
  "APT also supports pinning by glob() expressions and regular expressions "
  "surrounded by /. For example, the following example assigns the priority 500 "
  "to all packages from experimental where the name starts with gnome (as a glob"
 -"()-like expression) or contains the word kde (as a POSIX extended regular "
 +"()-like expression or contains the word kde (as a POSIX extended regular "
  "expression surrounded by slashes)."
  msgstr ""
  
@@@ -8349,7 -8370,7 +8357,7 @@@ msgstr "
  #: apt_preferences.5.xml:279
  msgid ""
  "The rule for those expressions is that they can occur anywhere where a "
 -"string can occur. Thus, the following pin assigns the priority 990 to all "
 +"string can occur. Those, the following pin assigns the priority 990 to all "
  "packages from a release starting with karmic."
  msgstr ""
  
diff --combined doc/po/ja.po
index 607d7e64d,0176369b8..4b08de7df
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@@ -7,7 -7,7 +7,7 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: apt 0.7.25.3\n"
 -"POT-Creation-Date: 2011-06-28 16:42+0200\n"
 +"POT-Creation-Date: 2011-06-08 16:54+0300\n"
  "PO-Revision-Date: 2010-09-07 07:38+0900\n"
  "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
  "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@@ -1357,7 -1357,7 +1357,7 @@@ msgstr "
  "pkgcache</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393
 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
  #: apt-sortpkgs.1.xml:61
  msgid "<option>-s</option>"
  msgstr "<option>-s</option>"
@@@ -1384,12 -1384,12 +1384,12 @@@ msgstr "
  "<literal>Dir::Cache::srcpkgcache</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
  msgid "<option>-q</option>"
  msgstr "<option>-q</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
  msgid "<option>--quiet</option>"
  msgstr "<option>--quiet</option>"
  
@@@ -1475,7 -1475,7 +1475,7 @@@ msgstr "<option>--no-enhances</option>
  #, fuzzy
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 -"print all dependencies. This can be tweaked with these flags which will omit "
 +"print all dependencies. This can be twicked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
@@@ -1505,7 -1505,7 +1505,7 @@@ msgstr "
  "ShowFull</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
  msgid "<option>-a</option>"
  msgstr "<option>-a</option>"
  
@@@ -1627,7 -1627,7 +1627,7 @@@ msgstr "
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><variablelist>
  #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570
 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
  #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
  msgid "&apt-commonoptions;"
  msgstr "&apt-commonoptions;"
@@@ -1647,7 -1647,7 +1647,7 @@@ msgstr "&file-sourceslist; &file-statel
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585
 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
  #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
  #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
  #: sources.list.5.xml:234
@@@ -1663,7 -1663,7 +1663,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591
 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
  #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
  msgid "Diagnostics"
  msgstr "診断メッセージ"
@@@ -1805,7 -1805,7 +1805,7 @@@ msgid "Options
  msgstr "オプション"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
  msgid "<option>-d</option>"
  msgstr "<option>-d</option>"
  
@@@ -2075,7 -2075,7 +2075,7 @@@ msgstr "設定箇所の内容を表示ã
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
  #: apt-sortpkgs.1.xml:73
  msgid "&apt-conf;"
  msgstr "&apt-conf;"
@@@ -3292,43 -3292,26 +3292,43 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:531
 +#, fuzzy
 +#| msgid ""
 +#| "Values for the additional metadata fields in the Release file are taken "
 +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
 +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
 +#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
 +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
 +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
 +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
 +#| "literal>, <literal>Description</literal>."
  msgid ""
  "Generate the given checksum. These options default to on, when turned off "
  "the generated index files will not have the checksum fields where possible.  "
  "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
  "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
  "replaceable>::<replaceable>Checksum</replaceable></literal> where "
 -"<literal><replaceable>Index</replaceable></literal> can be "
 -"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
 -"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
 -"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 +"<literal>Index</literal> can be <literal>Packages</literal>, "
 +"<literal>Sources</literal> or <literal>Release</literal> and "
 +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
 +"literal> or <literal>SHA256</literal>."
  msgstr ""
 +"Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::"
 +"Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::"
 +"Origin</literal>) をとります。サポートするフィールドは、<literal>Origin</"
 +"literal>, <literal>Label</literal>, <literal>Suite</literal>, "
 +"<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</"
 +"literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, "
 +"<literal>Components</literal>, <literal>Description</literal> です。"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:540
 +#: apt-ftparchive.1.xml:539
  msgid "<option>--db</option>"
  msgstr "<option>--db</option>"
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:542
 +#: apt-ftparchive.1.xml:541
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
  "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@@ -3338,7 -3321,7 +3338,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:548
 +#: apt-ftparchive.1.xml:547
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -3351,13 -3334,13 +3351,13 @@@ msgstr "
  "<literal>quiet</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:554
 +#: apt-ftparchive.1.xml:553
  msgid "<option>--delink</option>"
  msgstr "<option>--delink</option>"
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:556
 +#: apt-ftparchive.1.xml:555
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
  "then this option actually enables delinking of the files. It defaults to on "
@@@ -3370,13 -3353,13 +3370,13 @@@ msgstr "
  "<literal>APT::FTPArchive::DeLinkAct</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:562
 +#: apt-ftparchive.1.xml:561
  msgid "<option>--contents</option>"
  msgstr "<option>--contents</option>"
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:564
 +#: apt-ftparchive.1.xml:563
  msgid ""
  "Perform contents generation. When this option is set and package indexes are "
  "being generated with a cache DB then the file listing will also be extracted "
@@@ -3391,13 -3374,13 +3391,13 @@@ msgstr "
  "<literal>APT::FTPArchive::Contents</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:572
 +#: apt-ftparchive.1.xml:571
  msgid "<option>--source-override</option>"
  msgstr "<option>--source-override</option>"
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:574
 +#: apt-ftparchive.1.xml:573
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@@ -3407,13 -3390,13 +3407,13 @@@ msgstr "
  "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:578
 +#: apt-ftparchive.1.xml:577
  msgid "<option>--readonly</option>"
  msgstr "<option>--readonly</option>"
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:580
 +#: apt-ftparchive.1.xml:579
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3422,13 -3405,13 +3422,13 @@@ msgstr "
  "FTPArchive::ReadOnlyDB</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:584
 +#: apt-ftparchive.1.xml:583
  msgid "<option>--arch</option>"
  msgstr "<option>--arch</option>"
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:585
 +#: apt-ftparchive.1.xml:584
  #, fuzzy
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
@@@ -3442,12 -3425,12 +3442,12 @@@ msgstr "
  "literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:591
 +#: apt-ftparchive.1.xml:590
  msgid "<option>APT::FTPArchive::AlwaysStat</option>"
  msgstr "<option>--version</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:593
 +#: apt-ftparchive.1.xml:592
  msgid ""
  "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
  "packages are recompiled and/or republished with the same version again, this "
@@@ -3461,12 -3444,12 +3461,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:603
 +#: apt-ftparchive.1.xml:602
  msgid "<option>APT::FTPArchive::LongDescription</option>"
  msgstr "<option>APT::FTPArchive::LongDescription</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:605
 +#: apt-ftparchive.1.xml:604
  #, fuzzy
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
@@@ -3482,14 -3465,14 +3482,14 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544
 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
  #: sources.list.5.xml:198
  msgid "Examples"
  msgstr "サンプル"
  
  # type: Content of: <refentry><refsect1><para><programlisting>
  #. type: Content of: <refentry><refsect1><para><programlisting>
 -#: apt-ftparchive.1.xml:623
 +#: apt-ftparchive.1.xml:622
  #, no-wrap
  msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  msgstr ""
@@@ -3498,7 -3481,7 +3498,7 @@@
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:619
 +#: apt-ftparchive.1.xml:618
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3508,7 -3491,7 +3508,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:633
 +#: apt-ftparchive.1.xml:632
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -3984,7 -3967,7 +3984,7 @@@ msgstr "
  #: apt-get.8.xml:282
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
 -"current directory."
 +"current directoy."
  msgstr ""
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@@ -5730,11 -5713,12 +5730,11 @@@ msgstr "<envar>APT_CONFIG</envar> 環å¢
  #| "period (.) characters - otherwise they will be silently ignored."
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 -"order which have either no or \"<literal>conf</literal>\" as filename "
 -"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 -"and period (.) characters.  Otherwise APT will print a notice that it has "
 -"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
 -"Ignore-Files-Silently</literal> configuration list - in this case it will be "
 -"silently ignored."
 +"order which have no or \"<literal>conf</literal>\" as filename extension and "
 +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
 +"characters.  Otherwise APT will print a notice that it has ignored a file if "
 +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
 +"literal> configuration list - in this case it will be silently ignored."
  msgstr ""
  "<literal>Dir::Etc::Parts</literal> にあるすべてのファイルを英数字の昇順に。"
  "ファイル名には拡張子がないか、\"<literal>conf</literal>\" となっており、英数"
@@@ -6270,11 -6254,11 +6270,19 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:277
++#, fuzzy
++#| msgid ""
++#| "Two sub-options to limit the use of PDiffs are also available: With "
++#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
++#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
++#| "other hand is the maximum percentage of the size of all patches compared "
++#| "to the size of the targeted file. If one of these limits is exceeded the "
++#| "complete file is downloaded instead of the patches."
  msgid ""
  "Two sub-options to limit the use of PDiffs are also available: With "
  "<literal>FileLimit</literal> can be specified how many PDiff files are "
  "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
 -"other hand is the maximum percentage of the size of all patches compared to "
 +"other hand is the maximum precentage of the size of all patches compared to "
  "the size of the targeted file. If one of these limits is exceeded the "
  "complete file is downloaded instead of the patches."
  msgstr ""
@@@ -6729,9 -6713,9 +6737,9 @@@ msgid "
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
  "will only be used if this file exists, e.g. for the bzip2 method (the "
 -"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
 -"also that list entries specified on the command line will be added at the "
 -"end of the list specified in the configuration files, but before the default "
 +"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
 +"that list entries specified on the command line will be added at the end of "
 +"the list specified in the configuration files, but before the default "
  "entries. To prefer a type in this case over the ones specified in the "
  "configuration files you can set the option direct - not in list style.  This "
  "will not override the defined list, it will only prefix the list with this "
@@@ -6751,7 -6735,7 +6759,7 @@@ msgstr "
  #: apt.conf.5.xml:449
  msgid ""
  "The special type <literal>uncompressed</literal> can be used to give "
 -"uncompressed files a preference, but note that most archives don't provide "
 +"uncompressed files a preference, but note that most archives doesn't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
  
@@@ -7887,8 -7871,8 +7895,8 @@@ msgstr "
  msgid ""
  "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
  "directory are parsed in alphanumeric ascending order and need to obey the "
 -"following naming convention: The files have either no or \"<literal>pref</"
 -"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 +"following naming convention: The files have no or \"<literal>pref</literal>"
 +"\" as filename extension and which only contain alphanumeric, hyphen (-), "
  "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
  "that it has ignored a file if the file doesn't match a pattern in the "
  "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@@ -8353,7 -8337,7 +8361,7 @@@ msgid "
  "APT also supports pinning by glob() expressions and regular expressions "
  "surrounded by /. For example, the following example assigns the priority 500 "
  "to all packages from experimental where the name starts with gnome (as a glob"
 -"()-like expression) or contains the word kde (as a POSIX extended regular "
 +"()-like expression or contains the word kde (as a POSIX extended regular "
  "expression surrounded by slashes)."
  msgstr ""
  
@@@ -8379,7 -8363,7 +8387,7 @@@ msgstr "
  #: apt_preferences.5.xml:279
  msgid ""
  "The rule for those expressions is that they can occur anywhere where a "
 -"string can occur. Thus, the following pin assigns the priority 990 to all "
 +"string can occur. Those, the following pin assigns the priority 990 to all "
  "packages from a release starting with karmic."
  msgstr ""
  
diff --combined doc/po/pt.po
index 863f3dd8b,775e9f77e..3c82b2df1
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@@ -6,7 -6,7 +6,7 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: apt 0.8.0~pre1\n"
 -"POT-Creation-Date: 2011-06-28 16:42+0200\n"
 +"POT-Creation-Date: 2011-06-08 16:54+0300\n"
  "PO-Revision-Date: 2010-08-25 23:07+0100\n"
  "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
  "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@@ -1306,7 -1306,7 +1306,7 @@@ msgstr "
  "<literal>Dir::Cache::pkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393
 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
  #: apt-sortpkgs.1.xml:61
  msgid "<option>-s</option>"
  msgstr "<option>-s</option>"
@@@ -1332,12 -1332,12 +1332,12 @@@ msgstr "
  "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
  msgid "<option>-q</option>"
  msgstr "<option>-q</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
  msgid "<option>--quiet</option>"
  msgstr "<option>--quiet</option>"
  
@@@ -1418,9 -1418,16 +1418,9 @@@ msgstr "<option>--no-enhances</option>
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cache.8.xml:317
 -#, fuzzy
 -#| msgid ""
 -#| "Per default the <literal>depends</literal> and <literal>rdepends</"
 -#| "literal> print all dependencies. This can be twicked with these flags "
 -#| "which will omit the specified dependency type.  Configuration Item: "
 -#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
 -#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 -"print all dependencies. This can be tweaked with these flags which will omit "
 +"print all dependencies. This can be twicked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
@@@ -1451,7 -1458,7 +1451,7 @@@ msgstr "
  "<literal>APT::Cache::ShowFull</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
  msgid "<option>-a</option>"
  msgstr "<option>-a</option>"
  
@@@ -1568,7 -1575,7 +1568,7 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist>
  #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570
 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
  #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
  msgid "&apt-commonoptions;"
  msgstr "&apt-commonoptions;"
@@@ -1586,7 -1593,7 +1586,7 @@@ msgstr "&file-sourceslist; &file-statel
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585
 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
  #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
  #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
  #: sources.list.5.xml:234
@@@ -1600,7 -1607,7 +1600,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591
 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
  #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
  msgid "Diagnostics"
  msgstr "Diagnóstico"
@@@ -1735,7 -1742,7 +1735,7 @@@ msgid "Options
  msgstr "Opções"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
  msgid "<option>-d</option>"
  msgstr "<option>-d</option>"
  
@@@ -1988,7 -1995,7 +1988,7 @@@ msgid "Just show the contents of the co
  msgstr "Apenas mostra o conteúdo do espaço de configuração."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
  #: apt-sortpkgs.1.xml:73
  msgid "&apt-conf;"
  msgstr "&apt-conf;"
@@@ -3137,43 -3144,25 +3137,43 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:531
 +#, fuzzy
 +#| msgid ""
 +#| "Values for the additional metadata fields in the Release file are taken "
 +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
 +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
 +#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
 +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
 +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
 +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
 +#| "literal>, <literal>Description</literal>."
  msgid ""
  "Generate the given checksum. These options default to on, when turned off "
  "the generated index files will not have the checksum fields where possible.  "
  "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
  "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
  "replaceable>::<replaceable>Checksum</replaceable></literal> where "
 -"<literal><replaceable>Index</replaceable></literal> can be "
 -"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
 -"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
 -"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 +"<literal>Index</literal> can be <literal>Packages</literal>, "
 +"<literal>Sources</literal> or <literal>Release</literal> and "
 +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
 +"literal> or <literal>SHA256</literal>."
  msgstr ""
 +"Valores para os campos de metadados adicionais no ficheiro Release são "
 +"tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::"
 +"Release</literal>, ex. <literal>APT::FTPArchive::Release::Origin</literal>.  "
 +"Os campos suportados são: <literal>Origin</literal>, <literal>Label</"
 +"literal>, <literal>Suite</literal>, <literal>Version</literal>, "
 +"<literal>Codename</literal>, <literal>Date</literal>, "
 +"<literal>Architectures</literal>, <literal>Components</literal>, "
 +"<literal>Description</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:540
 +#: apt-ftparchive.1.xml:539
  msgid "<option>--db</option>"
  msgstr "<option>--db</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:542
 +#: apt-ftparchive.1.xml:541
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
  "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@@ -3182,7 -3171,7 +3182,7 @@@ msgstr "
  "generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:548
 +#: apt-ftparchive.1.xml:547
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -3196,12 -3185,12 +3196,12 @@@ msgstr "
  "<literal>quiet</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:554
 +#: apt-ftparchive.1.xml:553
  msgid "<option>--delink</option>"
  msgstr "<option>--delink</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:556
 +#: apt-ftparchive.1.xml:555
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
  "then this option actually enables delinking of the files. It defaults to on "
@@@ -3214,12 -3203,12 +3214,12 @@@ msgstr "
  "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:562
 +#: apt-ftparchive.1.xml:561
  msgid "<option>--contents</option>"
  msgstr "<option>--contents</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:564
 +#: apt-ftparchive.1.xml:563
  msgid ""
  "Perform contents generation. When this option is set and package indexes are "
  "being generated with a cache DB then the file listing will also be extracted "
@@@ -3235,12 -3224,12 +3235,12 @@@ msgstr "
  "de Configuração: <literal>APT::FTPArchive::Contents</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:572
 +#: apt-ftparchive.1.xml:571
  msgid "<option>--source-override</option>"
  msgstr "<option>--source-override</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:574
 +#: apt-ftparchive.1.xml:573
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@@ -3251,12 -3240,12 +3251,12 @@@ msgstr "
  "SourceOverride</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:578
 +#: apt-ftparchive.1.xml:577
  msgid "<option>--readonly</option>"
  msgstr "<option>--readonly</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:580
 +#: apt-ftparchive.1.xml:579
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3265,12 -3254,12 +3265,12 @@@ msgstr "
  "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:584
 +#: apt-ftparchive.1.xml:583
  msgid "<option>--arch</option>"
  msgstr "<option>--arch</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:585
 +#: apt-ftparchive.1.xml:584
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
  "commands only package files matching <literal>*_arch.deb</literal> or "
@@@ -3284,12 -3273,12 +3284,12 @@@ msgstr "
  "FTPArchive::Architecture</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:591
 +#: apt-ftparchive.1.xml:590
  msgid "<option>APT::FTPArchive::AlwaysStat</option>"
  msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:593
 +#: apt-ftparchive.1.xml:592
  msgid ""
  "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
  "packages are recompiled and/or republished with the same version again, this "
@@@ -3313,12 -3302,12 +3313,12 @@@ msgstr "
  "as verificações extras serão desnecessárias."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:603
 +#: apt-ftparchive.1.xml:602
  msgid "<option>APT::FTPArchive::LongDescription</option>"
  msgstr "<option>APT::FTPArchive::LongDescription</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:605
 +#: apt-ftparchive.1.xml:604
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
  "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@@ -3333,19 -3322,19 +3333,19 @@@ msgstr "
  "<filename>Translation-en</filename> só pode ser criado no comando generate."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544
 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
  #: sources.list.5.xml:198
  msgid "Examples"
  msgstr "Examples"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
 -#: apt-ftparchive.1.xml:623
 +#: apt-ftparchive.1.xml:622
  #, no-wrap
  msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:619
 +#: apt-ftparchive.1.xml:618
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3354,7 -3343,7 +3354,7 @@@ msgstr "
  "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:633
 +#: apt-ftparchive.1.xml:632
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -3824,7 -3813,7 +3824,7 @@@ msgstr "
  #: apt-get.8.xml:282
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
 -"current directory."
 +"current directoy."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@@ -5505,11 -5494,12 +5505,11 @@@ msgstr "
  #| "period (.) characters - otherwise they will be silently ignored."
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 -"order which have either no or \"<literal>conf</literal>\" as filename "
 -"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 -"and period (.) characters.  Otherwise APT will print a notice that it has "
 -"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
 -"Ignore-Files-Silently</literal> configuration list - in this case it will be "
 -"silently ignored."
 +"order which have no or \"<literal>conf</literal>\" as filename extension and "
 +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
 +"characters.  Otherwise APT will print a notice that it has ignored a file if "
 +"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
 +"literal> configuration list - in this case it will be silently ignored."
  msgstr ""
  "todos os ficheiros em <literal>Dir::Etc::Parts</literal> em ordem ascendente "
  "alfanumérica sem extensão ou com \"<literal>conf</literal>\" como extensão "
@@@ -6077,11 -6067,11 +6077,19 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:277
++#, fuzzy
++#| msgid ""
++#| "Two sub-options to limit the use of PDiffs are also available: With "
++#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
++#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
++#| "other hand is the maximum percentage of the size of all patches compared "
++#| "to the size of the targeted file. If one of these limits is exceeded the "
++#| "complete file is downloaded instead of the patches."
  msgid ""
  "Two sub-options to limit the use of PDiffs are also available: With "
  "<literal>FileLimit</literal> can be specified how many PDiff files are "
  "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
 -"other hand is the maximum percentage of the size of all patches compared to "
 +"other hand is the maximum precentage of the size of all patches compared to "
  "the size of the targeted file. If one of these limits is exceeded the "
  "complete file is downloaded instead of the patches."
  msgstr ""
@@@ -6530,9 -6520,9 +6538,9 @@@ msgid "
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
  "will only be used if this file exists, e.g. for the bzip2 method (the "
 -"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
 -"also that list entries specified on the command line will be added at the "
 -"end of the list specified in the configuration files, but before the default "
 +"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
 +"that list entries specified on the command line will be added at the end of "
 +"the list specified in the configuration files, but before the default "
  "entries. To prefer a type in this case over the ones specified in the "
  "configuration files you can set the option direct - not in list style.  This "
  "will not override the defined list, it will only prefix the list with this "
@@@ -6553,7 -6543,7 +6561,7 @@@ msgstr "
  #: apt.conf.5.xml:449
  msgid ""
  "The special type <literal>uncompressed</literal> can be used to give "
 -"uncompressed files a preference, but note that most archives don't provide "
 +"uncompressed files a preference, but note that most archives doesn't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
  
@@@ -7828,8 -7818,8 +7836,8 @@@ msgstr "
  msgid ""
  "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
  "directory are parsed in alphanumeric ascending order and need to obey the "
 -"following naming convention: The files have either no or \"<literal>pref</"
 -"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 +"following naming convention: The files have no or \"<literal>pref</literal>"
 +"\" as filename extension and which only contain alphanumeric, hyphen (-), "
  "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
  "that it has ignored a file if the file doesn't match a pattern in the "
  "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@@ -8295,7 -8285,7 +8303,7 @@@ msgid "
  "APT also supports pinning by glob() expressions and regular expressions "
  "surrounded by /. For example, the following example assigns the priority 500 "
  "to all packages from experimental where the name starts with gnome (as a glob"
 -"()-like expression) or contains the word kde (as a POSIX extended regular "
 +"()-like expression or contains the word kde (as a POSIX extended regular "
  "expression surrounded by slashes)."
  msgstr ""
  
@@@ -8319,7 -8309,7 +8327,7 @@@ msgstr "
  #: apt_preferences.5.xml:279
  msgid ""
  "The rule for those expressions is that they can occur anywhere where a "
 -"string can occur. Thus, the following pin assigns the priority 990 to all "
 +"string can occur. Those, the following pin assigns the priority 990 to all "
  "packages from a release starting with karmic."
  msgstr ""
  
diff --combined po/apt-all.pot
index b409363d0,dd9d75977..8e4d9d62b
--- a/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: 2011-06-29 12:34+0100\n"
 -"POT-Creation-Date: 2011-07-26 12:05+0200\n"
++"POT-Creation-Date: 2011-10-30 13:46-0500\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"
@@@ -17,150 -17,149 +17,150 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
  
--#: cmdline/apt-cache.cc:154
++#: cmdline/apt-cache.cc:158
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr ""
  
--#: cmdline/apt-cache.cc:282
++#: cmdline/apt-cache.cc:286
  msgid "Total package names: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:284
++#: cmdline/apt-cache.cc:288
  msgid "Total package structures: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:328
  msgid "  Normal packages: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:325
++#: cmdline/apt-cache.cc:329
  msgid "  Pure virtual packages: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:326
++#: cmdline/apt-cache.cc:330
  msgid "  Single virtual packages: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:327
++#: cmdline/apt-cache.cc:331
  msgid "  Mixed virtual packages: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:328
++#: cmdline/apt-cache.cc:332
  msgid "  Missing: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:330
++#: cmdline/apt-cache.cc:334
  msgid "Total distinct versions: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:332
++#: cmdline/apt-cache.cc:336
  msgid "Total distinct descriptions: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:334
++#: cmdline/apt-cache.cc:338
  msgid "Total dependencies: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:337
++#: cmdline/apt-cache.cc:341
  msgid "Total ver/file relations: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:339
++#: cmdline/apt-cache.cc:343
  msgid "Total Desc/File relations: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:341
++#: cmdline/apt-cache.cc:345
  msgid "Total Provides mappings: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:353
++#: cmdline/apt-cache.cc:357
  msgid "Total globbed strings: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:367
++#: cmdline/apt-cache.cc:371
  msgid "Total dependency version space: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:372
++#: cmdline/apt-cache.cc:376
  msgid "Total slack space: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:380
++#: cmdline/apt-cache.cc:384
  msgid "Total space accounted for: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
++#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr ""
  
--#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
--#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
--#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
++#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
++#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:39
++#: cmdline/apt-mark.cc:86 cmdline/apt-mark.cc:162
  msgid "No packages found"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1218
++#: cmdline/apt-cache.cc:1222
  msgid "You must give at least one search pattern"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1353
++#: cmdline/apt-cache.cc:1357
  msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
  msgstr ""
  
--#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
++#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:445
  #, c-format
  msgid "Unable to locate package %s"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1478
++#: cmdline/apt-cache.cc:1482
  msgid "Package files:"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
++#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1499
++#: cmdline/apt-cache.cc:1503
  msgid "Pinned packages:"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
  msgid "(not found)"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1519
++#: cmdline/apt-cache.cc:1523
  msgid "  Installed: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:1520
++#: cmdline/apt-cache.cc:1524
  msgid "  Candidate: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
++#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
  msgid "(none)"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1553
++#: cmdline/apt-cache.cc:1557
  msgid "  Package pin: "
  msgstr ""
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1562
++#: cmdline/apt-cache.cc:1566
  msgid "  Version table:"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
--#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
- #: cmdline/apt-get.cc:3126 cmdline/apt-internal-solver.cc:30
- #: cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
++#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
++#: cmdline/apt-get.cc:3244 cmdline/apt-internal-solver.cc:32
++#: cmdline/apt-mark.cc:266 cmdline/apt-sortpkgs.cc:147
  #, c-format
  msgid "%s %s for %s compiled on %s %s\n"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1682
++#: cmdline/apt-cache.cc:1686
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@@ -197,28 -196,28 +197,28 @@@
  "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
  msgstr ""
  
--#: cmdline/apt-cdrom.cc:77
++#: cmdline/apt-cdrom.cc:79
  msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
  msgstr ""
  
--#: cmdline/apt-cdrom.cc:92
++#: cmdline/apt-cdrom.cc:94
  msgid "Please insert a Disc in the drive and press enter"
  msgstr ""
  
--#: cmdline/apt-cdrom.cc:127
++#: cmdline/apt-cdrom.cc:129
  #, c-format
  msgid "Failed to mount '%s' to '%s'"
  msgstr ""
  
--#: cmdline/apt-cdrom.cc:162
++#: cmdline/apt-cdrom.cc:164
  msgid "Repeat this process for the rest of the CDs in your set."
  msgstr ""
  
--#: cmdline/apt-config.cc:44
++#: cmdline/apt-config.cc:46
  msgid "Arguments not in pairs"
  msgstr ""
  
--#: cmdline/apt-config.cc:79
++#: cmdline/apt-config.cc:81
  msgid ""
  "Usage: apt-config [options] command\n"
  "\n"
@@@ -234,12 -233,12 +234,12 @@@
  "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
  msgstr ""
  
--#: cmdline/apt-extracttemplates.cc:98
++#: cmdline/apt-extracttemplates.cc:100
  #, c-format
  msgid "%s not a valid DEB package."
  msgstr ""
  
--#: cmdline/apt-extracttemplates.cc:232
++#: cmdline/apt-extracttemplates.cc:234
  msgid ""
  "Usage: apt-extracttemplates file1 [file2 ...]\n"
  "\n"
@@@ -253,40 -252,40 +253,40 @@@
  "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
  msgstr ""
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
++#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1269
  #, c-format
  msgid "Unable to write to %s"
  msgstr ""
  
--#: cmdline/apt-extracttemplates.cc:309
++#: cmdline/apt-extracttemplates.cc:311
  msgid "Cannot get debconf version. Is debconf installed?"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
++#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
  msgid "Package extension list is too long"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
--#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
--#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
++#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
++#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263
++#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
  #, c-format
  msgid "Error processing directory %s"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:260
++#: ftparchive/apt-ftparchive.cc:261
  msgid "Source extension list is too long"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:377
++#: ftparchive/apt-ftparchive.cc:378
  msgid "Error writing header to contents file"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:407
++#: ftparchive/apt-ftparchive.cc:408
  #, c-format
  msgid "Error processing contents %s"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:595
++#: ftparchive/apt-ftparchive.cc:596
  msgid ""
  "Usage: apt-ftparchive [options] command\n"
  "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@@ -328,136 -327,136 +328,136 @@@
  "  -o=?  Set an arbitrary configuration option"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:801
++#: ftparchive/apt-ftparchive.cc:802
  msgid "No selections matched"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:879
++#: ftparchive/apt-ftparchive.cc:880
  #, c-format
  msgid "Some files are missing in the package file group `%s'"
  msgstr ""
  
--#: ftparchive/cachedb.cc:43
++#: ftparchive/cachedb.cc:46
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr ""
  
--#: ftparchive/cachedb.cc:61
++#: ftparchive/cachedb.cc:64
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr ""
  
--#: ftparchive/cachedb.cc:72
++#: ftparchive/cachedb.cc:75
  msgid ""
  "DB format is invalid. If you upgraded from an older version of apt, please "
  "remove and re-create the database."
  msgstr ""
  
--#: ftparchive/cachedb.cc:77
++#: ftparchive/cachedb.cc:80
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr ""
  
--#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
--#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
++#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
++#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
  #, c-format
  msgid "Failed to stat %s"
  msgstr ""
  
- #: ftparchive/cachedb.cc:245
 -#: ftparchive/cachedb.cc:242
++#: ftparchive/cachedb.cc:248
  msgid "Archive has no control record"
  msgstr ""
  
- #: ftparchive/cachedb.cc:482
 -#: ftparchive/cachedb.cc:448
++#: ftparchive/cachedb.cc:489
  msgid "Unable to get a cursor"
  msgstr ""
  
- #: ftparchive/writer.cc:79
 -#: ftparchive/writer.cc:78
++#: ftparchive/writer.cc:80
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr ""
  
- #: ftparchive/writer.cc:84
 -#: ftparchive/writer.cc:83
++#: ftparchive/writer.cc:85
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr ""
  
- #: ftparchive/writer.cc:140
 -#: ftparchive/writer.cc:139
++#: ftparchive/writer.cc:141
  msgid "E: "
  msgstr ""
  
- #: ftparchive/writer.cc:142
 -#: ftparchive/writer.cc:141
++#: ftparchive/writer.cc:143
  msgid "W: "
  msgstr ""
  
- #: ftparchive/writer.cc:149
 -#: ftparchive/writer.cc:148
++#: ftparchive/writer.cc:150
  msgid "E: Errors apply to file "
  msgstr ""
  
- #: ftparchive/writer.cc:167 ftparchive/writer.cc:199
 -#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
++#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
  #, c-format
  msgid "Failed to resolve %s"
  msgstr ""
  
- #: ftparchive/writer.cc:180
 -#: ftparchive/writer.cc:179
++#: ftparchive/writer.cc:181
  msgid "Tree walking failed"
  msgstr ""
  
- #: ftparchive/writer.cc:207
 -#: ftparchive/writer.cc:206
++#: ftparchive/writer.cc:208
  #, c-format
  msgid "Failed to open %s"
  msgstr ""
  
- #: ftparchive/writer.cc:266
 -#: ftparchive/writer.cc:265
++#: ftparchive/writer.cc:267
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr ""
  
- #: ftparchive/writer.cc:274
 -#: ftparchive/writer.cc:273
++#: ftparchive/writer.cc:275
  #, c-format
  msgid "Failed to readlink %s"
  msgstr ""
  
- #: ftparchive/writer.cc:278
 -#: ftparchive/writer.cc:277
++#: ftparchive/writer.cc:279
  #, c-format
  msgid "Failed to unlink %s"
  msgstr ""
  
- #: ftparchive/writer.cc:285
 -#: ftparchive/writer.cc:284
++#: ftparchive/writer.cc:286
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr ""
  
- #: ftparchive/writer.cc:295
 -#: ftparchive/writer.cc:294
++#: ftparchive/writer.cc:296
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr ""
  
- #: ftparchive/writer.cc:400
 -#: ftparchive/writer.cc:398
++#: ftparchive/writer.cc:401
  msgid "Archive had no package field"
  msgstr ""
  
- #: ftparchive/writer.cc:408 ftparchive/writer.cc:710
 -#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
++#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr ""
  
- #: ftparchive/writer.cc:476 ftparchive/writer.cc:826
 -#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
++#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr ""
  
- #: ftparchive/writer.cc:720
 -#: ftparchive/writer.cc:713
++#: ftparchive/writer.cc:721
  #, c-format
  msgid "  %s has no source override entry\n"
  msgstr ""
  
- #: ftparchive/writer.cc:724
 -#: ftparchive/writer.cc:717
++#: ftparchive/writer.cc:725
  #, c-format
  msgid "  %s has no binary override entry either\n"
  msgstr ""
  
--#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
++#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
  msgid "realloc - Failed to allocate memory"
  msgstr ""
  
@@@ -468,17 -467,17 +468,17 @@@ msgstr "
  
  #: ftparchive/override.cc:60 ftparchive/override.cc:166
  #, c-format
--msgid "Malformed override %s line %lu #1"
++msgid "Malformed override %s line %llu #1"
  msgstr ""
  
  #: ftparchive/override.cc:74 ftparchive/override.cc:178
  #, c-format
--msgid "Malformed override %s line %lu #2"
++msgid "Malformed override %s line %llu #2"
  msgstr ""
  
  #: ftparchive/override.cc:88 ftparchive/override.cc:191
  #, c-format
--msgid "Malformed override %s line %lu #3"
++msgid "Malformed override %s line %llu #3"
  msgstr ""
  
  #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@@ -486,63 -485,63 +486,63 @@@
  msgid "Failed to read the override file %s"
  msgstr ""
  
--#: ftparchive/multicompress.cc:67
++#: ftparchive/multicompress.cc:69
  #, c-format
  msgid "Unknown compression algorithm '%s'"
  msgstr ""
  
--#: ftparchive/multicompress.cc:97
++#: ftparchive/multicompress.cc:99
  #, c-format
  msgid "Compressed output %s needs a compression set"
  msgstr ""
  
--#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
++#: ftparchive/multicompress.cc:167 methods/rsh.cc:97
  msgid "Failed to create IPC pipe to subprocess"
  msgstr ""
  
--#: ftparchive/multicompress.cc:191
++#: ftparchive/multicompress.cc:193
  msgid "Failed to create FILE*"
  msgstr ""
  
--#: ftparchive/multicompress.cc:194
++#: ftparchive/multicompress.cc:196
  msgid "Failed to fork"
  msgstr ""
  
--#: ftparchive/multicompress.cc:208
++#: ftparchive/multicompress.cc:210
  msgid "Compress child"
  msgstr ""
  
--#: ftparchive/multicompress.cc:231
++#: ftparchive/multicompress.cc:233
  #, c-format
  msgid "Internal error, failed to create %s"
  msgstr ""
  
--#: ftparchive/multicompress.cc:282
++#: ftparchive/multicompress.cc:284
  msgid "Failed to create subprocess IPC"
  msgstr ""
  
--#: ftparchive/multicompress.cc:319
++#: ftparchive/multicompress.cc:321
  msgid "Failed to exec compressor "
  msgstr ""
  
--#: ftparchive/multicompress.cc:358
++#: ftparchive/multicompress.cc:360
  msgid "decompressor"
  msgstr ""
  
--#: ftparchive/multicompress.cc:401
++#: ftparchive/multicompress.cc:403
  msgid "IO to subprocess/file failed"
  msgstr ""
  
--#: ftparchive/multicompress.cc:453
++#: ftparchive/multicompress.cc:455
  msgid "Failed to read while computing MD5"
  msgstr ""
  
--#: ftparchive/multicompress.cc:470
++#: ftparchive/multicompress.cc:472
  #, c-format
  msgid "Problem unlinking %s"
  msgstr ""
  
--#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
++#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:188
  #, c-format
  msgid "Failed to rename %s to %s"
  msgstr ""
@@@ -551,133 -550,133 +551,137 @@@
  msgid "Y"
  msgstr ""
  
--#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
++#: cmdline/apt-get.cc:140
++msgid "N"
++msgstr ""
++
++#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:252
++#: cmdline/apt-get.cc:257
  msgid "The following packages have unmet dependencies:"
  msgstr ""
  
--#: cmdline/apt-get.cc:342
++#: cmdline/apt-get.cc:347
  #, c-format
  msgid "but %s is installed"
  msgstr ""
  
--#: cmdline/apt-get.cc:344
++#: cmdline/apt-get.cc:349
  #, c-format
  msgid "but %s is to be installed"
  msgstr ""
  
--#: cmdline/apt-get.cc:351
++#: cmdline/apt-get.cc:356
  msgid "but it is not installable"
  msgstr ""
  
--#: cmdline/apt-get.cc:353
++#: cmdline/apt-get.cc:358
  msgid "but it is a virtual package"
  msgstr ""
  
--#: cmdline/apt-get.cc:356
++#: cmdline/apt-get.cc:361
  msgid "but it is not installed"
  msgstr ""
  
--#: cmdline/apt-get.cc:356
++#: cmdline/apt-get.cc:361
  msgid "but it is not going to be installed"
  msgstr ""
  
--#: cmdline/apt-get.cc:361
++#: cmdline/apt-get.cc:366
  msgid " or"
  msgstr ""
  
--#: cmdline/apt-get.cc:390
++#: cmdline/apt-get.cc:395
  msgid "The following NEW packages will be installed:"
  msgstr ""
  
--#: cmdline/apt-get.cc:416
++#: cmdline/apt-get.cc:421
  msgid "The following packages will be REMOVED:"
  msgstr ""
  
--#: cmdline/apt-get.cc:438
++#: cmdline/apt-get.cc:443
  msgid "The following packages have been kept back:"
  msgstr ""
  
--#: cmdline/apt-get.cc:459
++#: cmdline/apt-get.cc:464
  msgid "The following packages will be upgraded:"
  msgstr ""
  
--#: cmdline/apt-get.cc:480
++#: cmdline/apt-get.cc:485
  msgid "The following packages will be DOWNGRADED:"
  msgstr ""
  
--#: cmdline/apt-get.cc:500
++#: cmdline/apt-get.cc:505
  msgid "The following held packages will be changed:"
  msgstr ""
  
--#: cmdline/apt-get.cc:555
++#: cmdline/apt-get.cc:560
  #, c-format
  msgid "%s (due to %s) "
  msgstr ""
  
--#: cmdline/apt-get.cc:563
++#: cmdline/apt-get.cc:568
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
  msgstr ""
  
--#: cmdline/apt-get.cc:594
++#: cmdline/apt-get.cc:599
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr ""
  
--#: cmdline/apt-get.cc:598
++#: cmdline/apt-get.cc:603
  #, c-format
  msgid "%lu reinstalled, "
  msgstr ""
  
--#: cmdline/apt-get.cc:600
++#: cmdline/apt-get.cc:605
  #, c-format
  msgid "%lu downgraded, "
  msgstr ""
  
--#: cmdline/apt-get.cc:602
++#: cmdline/apt-get.cc:607
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:606
++#: cmdline/apt-get.cc:611
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:628
++#: cmdline/apt-get.cc:633
  #, c-format
  msgid "Note, selecting '%s' for task '%s'\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:634
++#: cmdline/apt-get.cc:639
  #, c-format
  msgid "Note, selecting '%s' for regex '%s'\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:651
++#: cmdline/apt-get.cc:656
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:662
++#: cmdline/apt-get.cc:667
  msgid " [Installed]"
  msgstr ""
  
--#: cmdline/apt-get.cc:671
++#: cmdline/apt-get.cc:676
  msgid " [Not candidate version]"
  msgstr ""
  
--#: cmdline/apt-get.cc:673
++#: cmdline/apt-get.cc:678
  msgid "You should explicitly select one to install."
  msgstr ""
  
--#: cmdline/apt-get.cc:676
++#: cmdline/apt-get.cc:681
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -685,177 -684,177 +689,177 @@@
  "is only available from another source\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:694
++#: cmdline/apt-get.cc:699
  msgid "However the following packages replace it:"
  msgstr ""
  
--#: cmdline/apt-get.cc:706
++#: cmdline/apt-get.cc:711
  #, c-format
  msgid "Package '%s' has no installation candidate"
  msgstr ""
  
--#: cmdline/apt-get.cc:717
++#: cmdline/apt-get.cc:722
  #, c-format
  msgid "Virtual packages like '%s' can't be removed\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:748
++#: cmdline/apt-get.cc:753
  #, c-format
  msgid "Note, selecting '%s' instead of '%s'\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:778
++#: cmdline/apt-get.cc:783
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:782
++#: cmdline/apt-get.cc:787
  #, c-format
  msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:794
++#: cmdline/apt-get.cc:799
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:799
++#: cmdline/apt-get.cc:804
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2082 cmdline/apt-mark.cc:59
 -#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
++#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:2103 cmdline/apt-mark.cc:61
  #, c-format
  msgid "%s set to manually installed.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:844
++#: cmdline/apt-get.cc:849
  #, c-format
  msgid "Selected version '%s' (%s) for '%s'\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:854
  #, c-format
  msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:896
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:971
++#: cmdline/apt-get.cc:974
  msgid "Correcting dependencies..."
  msgstr ""
  
--#: cmdline/apt-get.cc:974
++#: cmdline/apt-get.cc:977
  msgid " failed."
  msgstr ""
  
--#: cmdline/apt-get.cc:977
++#: cmdline/apt-get.cc:980
  msgid "Unable to correct dependencies"
  msgstr ""
  
--#: cmdline/apt-get.cc:980
++#: cmdline/apt-get.cc:983
  msgid "Unable to minimize the upgrade set"
  msgstr ""
  
--#: cmdline/apt-get.cc:982
++#: cmdline/apt-get.cc:985
  msgid " Done"
  msgstr ""
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:989
  msgid "You might want to run 'apt-get -f install' to correct these."
  msgstr ""
  
--#: cmdline/apt-get.cc:989
++#: cmdline/apt-get.cc:992
  msgid "Unmet dependencies. Try using -f."
  msgstr ""
  
--#: cmdline/apt-get.cc:1014
++#: cmdline/apt-get.cc:1017
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr ""
  
--#: cmdline/apt-get.cc:1018
++#: cmdline/apt-get.cc:1021
  msgid "Authentication warning overridden.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1025
++#: cmdline/apt-get.cc:1028
  msgid "Install these packages without verification [y/N]? "
  msgstr ""
  
--#: cmdline/apt-get.cc:1027
++#: cmdline/apt-get.cc:1030
  msgid "Some packages could not be authenticated"
  msgstr ""
  
--#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
++#: cmdline/apt-get.cc:1039 cmdline/apt-get.cc:1200
  msgid "There are problems and -y was used without --force-yes"
  msgstr ""
  
--#: cmdline/apt-get.cc:1077
++#: cmdline/apt-get.cc:1080
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1089
  msgid "Packages need to be removed but remove is disabled."
  msgstr ""
  
--#: cmdline/apt-get.cc:1097
++#: cmdline/apt-get.cc:1100
  msgid "Internal error, Ordering didn't finish"
  msgstr ""
  
--#: cmdline/apt-get.cc:1135
++#: cmdline/apt-get.cc:1138
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
--#: cmdline/apt-get.cc:1142
++#: cmdline/apt-get.cc:1145
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
--#: cmdline/apt-get.cc:1147
++#: cmdline/apt-get.cc:1150
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
--#: cmdline/apt-get.cc:1154
++#: cmdline/apt-get.cc:1157
  #, c-format
  msgid "After this operation, %sB of additional disk space will be used.\n"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
--#: cmdline/apt-get.cc:1159
++#: cmdline/apt-get.cc:1162
  #, c-format
  msgid "After this operation, %sB disk space will be freed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2496
- #: cmdline/apt-get.cc:2499
 -#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
 -#: cmdline/apt-get.cc:2502
++#: cmdline/apt-get.cc:1177 cmdline/apt-get.cc:1180 cmdline/apt-get.cc:2523
++#: cmdline/apt-get.cc:2526
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:1187
++#: cmdline/apt-get.cc:1190
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr ""
  
--#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
++#: cmdline/apt-get.cc:1206 cmdline/apt-get.cc:1226
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  
--#: cmdline/apt-get.cc:1205
++#: cmdline/apt-get.cc:1208
  msgid "Yes, do as I say!"
  msgstr ""
  
--#: cmdline/apt-get.cc:1207
++#: cmdline/apt-get.cc:1210
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -863,46 -862,46 +867,46 @@@
  " ?] "
  msgstr ""
  
--#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
++#: cmdline/apt-get.cc:1216 cmdline/apt-get.cc:1235
  msgid "Abort."
  msgstr ""
  
--#: cmdline/apt-get.cc:1228
++#: cmdline/apt-get.cc:1231
  msgid "Do you want to continue [Y/n]? "
  msgstr ""
  
- #: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2561 apt-pkg/algorithms.cc:1453
 -#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
++#: cmdline/apt-get.cc:1303 cmdline/apt-get.cc:2588 apt-pkg/algorithms.cc:1492
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1318
++#: cmdline/apt-get.cc:1321
  msgid "Some files failed to download"
  msgstr ""
  
- #: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2573
 -#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
++#: cmdline/apt-get.cc:1322 cmdline/apt-get.cc:2600
  msgid "Download complete and in download only mode"
  msgstr ""
  
--#: cmdline/apt-get.cc:1325
++#: cmdline/apt-get.cc:1328
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
  msgstr ""
  
--#: cmdline/apt-get.cc:1329
++#: cmdline/apt-get.cc:1332
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr ""
  
--#: cmdline/apt-get.cc:1334
++#: cmdline/apt-get.cc:1337
  msgid "Unable to correct missing packages."
  msgstr ""
  
--#: cmdline/apt-get.cc:1335
++#: cmdline/apt-get.cc:1338
  msgid "Aborting install."
  msgstr ""
  
--#: cmdline/apt-get.cc:1363
++#: cmdline/apt-get.cc:1366
  msgid ""
  "The following package disappeared from your system as\n"
  "all files have been overwritten by other packages:"
@@@ -912,35 -911,35 +916,35 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
--#: cmdline/apt-get.cc:1367
++#: cmdline/apt-get.cc:1370
  msgid "Note: This is done automatic and on purpose by dpkg."
  msgstr ""
  
- #: cmdline/apt-get.cc:1497
 -#: cmdline/apt-get.cc:1505
++#: cmdline/apt-get.cc:1508
  #, c-format
  msgid "Ignore unavailable target release '%s' of package '%s'"
  msgstr ""
  
- #: cmdline/apt-get.cc:1529
 -#: cmdline/apt-get.cc:1537
++#: cmdline/apt-get.cc:1540
  #, c-format
  msgid "Picking '%s' as source package instead of '%s'\n"
  msgstr ""
  
  #. if (VerTag.empty() == false && Last == 0)
- #: cmdline/apt-get.cc:1567
 -#: cmdline/apt-get.cc:1575
++#: cmdline/apt-get.cc:1578
  #, c-format
  msgid "Ignore unavailable version '%s' of package '%s'"
  msgstr ""
  
- #: cmdline/apt-get.cc:1583
 -#: cmdline/apt-get.cc:1591
++#: cmdline/apt-get.cc:1594
  msgid "The update command takes no arguments"
  msgstr ""
  
- #: cmdline/apt-get.cc:1645
 -#: cmdline/apt-get.cc:1653
++#: cmdline/apt-get.cc:1657
  msgid "We are not supposed to delete stuff, can't start AutoRemover"
  msgstr ""
  
- #: cmdline/apt-get.cc:1740
 -#: cmdline/apt-get.cc:1748
++#: cmdline/apt-get.cc:1761
  msgid ""
  "Hmm, seems like the AutoRemover destroyed something which really\n"
  "shouldn't happen. Please file a bug report against apt."
@@@ -956,15 -955,15 +960,15 @@@ msgstr "
  #. "that package should be filed.") << endl;
  #. }
  #.
- #: cmdline/apt-get.cc:1743 cmdline/apt-get.cc:1912
 -#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
++#: cmdline/apt-get.cc:1764 cmdline/apt-get.cc:1933
  msgid "The following information may help to resolve the situation:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1747
 -#: cmdline/apt-get.cc:1755
++#: cmdline/apt-get.cc:1768
  msgid "Internal Error, AutoRemover broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1754
 -#: cmdline/apt-get.cc:1762
++#: cmdline/apt-get.cc:1775
  msgid ""
  "The following package was automatically installed and is no longer required:"
  msgid_plural ""
@@@ -973,7 -972,7 +977,7 @@@
  msgstr[0] ""
  msgstr[1] ""
  
- #: cmdline/apt-get.cc:1758
 -#: cmdline/apt-get.cc:1766
++#: cmdline/apt-get.cc:1779
  #, c-format
  msgid "%lu package was automatically installed and is no longer required.\n"
  msgid_plural ""
@@@ -981,25 -980,25 +985,25 @@@
  msgstr[0] ""
  msgstr[1] ""
  
- #: cmdline/apt-get.cc:1760
 -#: cmdline/apt-get.cc:1768
++#: cmdline/apt-get.cc:1781
  msgid "Use 'apt-get autoremove' to remove them."
  msgstr ""
  
- #: cmdline/apt-get.cc:1779
 -#: cmdline/apt-get.cc:1787
++#: cmdline/apt-get.cc:1800
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1878
 -#: cmdline/apt-get.cc:1886
++#: cmdline/apt-get.cc:1899
  msgid "You might want to run 'apt-get -f install' to correct these:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1882
 -#: cmdline/apt-get.cc:1890
++#: cmdline/apt-get.cc:1903
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
  msgstr ""
  
- #: cmdline/apt-get.cc:1897
 -#: cmdline/apt-get.cc:1906
++#: cmdline/apt-get.cc:1918
  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"
@@@ -1007,80 -1006,80 +1011,80 @@@
  "or been moved out of Incoming."
  msgstr ""
  
- #: cmdline/apt-get.cc:1918
 -#: cmdline/apt-get.cc:1924
++#: cmdline/apt-get.cc:1939
  msgid "Broken packages"
  msgstr ""
  
- #: cmdline/apt-get.cc:1944
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:1965
  msgid "The following extra packages will be installed:"
  msgstr ""
  
- #: cmdline/apt-get.cc:2034
 -#: cmdline/apt-get.cc:2040
++#: cmdline/apt-get.cc:2055
  msgid "Suggested packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:2035
 -#: cmdline/apt-get.cc:2041
++#: cmdline/apt-get.cc:2056
  msgid "Recommended packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2083
++#: cmdline/apt-get.cc:2098
  #, c-format
  msgid "Couldn't find package %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2084 cmdline/apt-mark.cc:61
 -#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
++#: cmdline/apt-get.cc:2105 cmdline/apt-mark.cc:63
  #, c-format
  msgid "%s set to automatically installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2092 cmdline/apt-mark.cc:105
 -#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
++#: cmdline/apt-get.cc:2113 cmdline/apt-mark.cc:107
  msgid ""
  "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
  "instead."
  msgstr ""
  
- #: cmdline/apt-get.cc:2108
 -#: cmdline/apt-get.cc:2114
++#: cmdline/apt-get.cc:2129
  msgid "Calculating upgrade... "
  msgstr ""
  
- #: cmdline/apt-get.cc:2111 methods/ftp.cc:707 methods/connect.cc:111
 -#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
++#: cmdline/apt-get.cc:2132 methods/ftp.cc:711 methods/connect.cc:115
  msgid "Failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:2116
 -#: cmdline/apt-get.cc:2122
++#: cmdline/apt-get.cc:2137
  msgid "Done"
  msgstr ""
  
- #: cmdline/apt-get.cc:2183 cmdline/apt-get.cc:2191
 -#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
++#: cmdline/apt-get.cc:2204 cmdline/apt-get.cc:2212
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2248
 -#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
++#: cmdline/apt-get.cc:2240 cmdline/apt-get.cc:2276
  msgid "Unable to lock the download directory"
  msgstr ""
  
- #: cmdline/apt-get.cc:2299
 -#: cmdline/apt-get.cc:2305
++#: cmdline/apt-get.cc:2327
  #, c-format
  msgid "Downloading %s %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2357
 -#: cmdline/apt-get.cc:2361
++#: cmdline/apt-get.cc:2385
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  
- #: cmdline/apt-get.cc:2398 cmdline/apt-get.cc:2694
 -#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
++#: cmdline/apt-get.cc:2425 cmdline/apt-get.cc:2737
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2415
 -#: cmdline/apt-get.cc:2418
++#: cmdline/apt-get.cc:2442
  #, c-format
  msgid ""
  "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
  "%s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2420
 -#: cmdline/apt-get.cc:2423
++#: cmdline/apt-get.cc:2447
  #, c-format
  msgid ""
  "Please use:\n"
@@@ -1088,120 -1087,141 +1092,141 @@@
  "to retrieve the latest (possibly unreleased) updates to the package.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2473
 -#: cmdline/apt-get.cc:2476
++#: cmdline/apt-get.cc:2500
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2510
 -#: cmdline/apt-get.cc:2513
++#: cmdline/apt-get.cc:2537
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
- #: cmdline/apt-get.cc:2519
 -#: cmdline/apt-get.cc:2522
++#: cmdline/apt-get.cc:2546
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
- #: cmdline/apt-get.cc:2524
 -#: cmdline/apt-get.cc:2527
++#: cmdline/apt-get.cc:2551
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2530
 -#: cmdline/apt-get.cc:2533
++#: cmdline/apt-get.cc:2557
  #, c-format
  msgid "Fetch source %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2568
 -#: cmdline/apt-get.cc:2571
++#: cmdline/apt-get.cc:2595
  msgid "Failed to fetch some archives."
  msgstr ""
  
- #: cmdline/apt-get.cc:2599
 -#: cmdline/apt-get.cc:2602
++#: cmdline/apt-get.cc:2626
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2611
 -#: cmdline/apt-get.cc:2614
++#: cmdline/apt-get.cc:2638
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2612
 -#: cmdline/apt-get.cc:2615
++#: cmdline/apt-get.cc:2639
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2629
 -#: cmdline/apt-get.cc:2637
++#: cmdline/apt-get.cc:2661
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2649
 -#: cmdline/apt-get.cc:2657
++#: cmdline/apt-get.cc:2681
  msgid "Child process failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:2668
 -#: cmdline/apt-get.cc:2676
++#: cmdline/apt-get.cc:2700
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  
- #: cmdline/apt-get.cc:2699
 -#: cmdline/apt-get.cc:2701
++#: cmdline/apt-get.cc:2725
+ #, c-format
+ msgid ""
+ "No architecture information available for %s. See apt.conf(5) APT::"
+ "Architectures for setup"
+ msgstr ""
+ 
 -#: cmdline/apt-get.cc:2718
++#: cmdline/apt-get.cc:2742
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2719
 -#: cmdline/apt-get.cc:2738
++#: cmdline/apt-get.cc:2762
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2770
 -#: cmdline/apt-get.cc:2868
++#: cmdline/apt-get.cc:2892
+ #, c-format
+ msgid ""
+ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+ "packages"
+ msgstr ""
+ 
 -#: cmdline/apt-get.cc:2889
++#: cmdline/apt-get.cc:2913
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr ""
  
- #: cmdline/apt-get.cc:2823
 -#: cmdline/apt-get.cc:2912
++#: cmdline/apt-get.cc:2936
+ #, c-format
+ msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+ msgstr ""
+ 
 -#: cmdline/apt-get.cc:2951
++#: cmdline/apt-get.cc:2975
  #, c-format
  msgid ""
- "%s dependency for %s cannot be satisfied because no available versions of "
- "package %s can satisfy version requirements"
+ "%s dependency for %s cannot be satisfied because candidate version of "
+ "package %s can't satisfy version requirements"
  msgstr ""
  
- #: cmdline/apt-get.cc:2859
 -#: cmdline/apt-get.cc:2957
++#: cmdline/apt-get.cc:2981
  #, c-format
- msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+ msgid ""
+ "%s dependency for %s cannot be satisfied because package %s has no candidate "
+ "version"
  msgstr ""
  
- #: cmdline/apt-get.cc:2886
 -#: cmdline/apt-get.cc:2980
++#: cmdline/apt-get.cc:3004
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2902
 -#: cmdline/apt-get.cc:2996
++#: cmdline/apt-get.cc:3020
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr ""
  
- #: cmdline/apt-get.cc:2907
 -#: cmdline/apt-get.cc:3001
++#: cmdline/apt-get.cc:3025
  msgid "Failed to process build dependencies"
  msgstr ""
  
- #: cmdline/apt-get.cc:3000 cmdline/apt-get.cc:3012
 -#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
++#: cmdline/apt-get.cc:3118 cmdline/apt-get.cc:3130
  #, c-format
  msgid "Changelog for %s (%s)"
  msgstr ""
  
- #: cmdline/apt-get.cc:3131
 -#: cmdline/apt-get.cc:3225
++#: cmdline/apt-get.cc:3249
  msgid "Supported modules:"
  msgstr ""
  
- #: cmdline/apt-get.cc:3172
 -#: cmdline/apt-get.cc:3266
++#: cmdline/apt-get.cc:3290
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1247,7 -1267,7 +1272,7 @@@
  "                       This APT has Super Cow Powers.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:3335
 -#: cmdline/apt-get.cc:3429
++#: cmdline/apt-get.cc:3455
  msgid ""
  "NOTE: This is only a simulation!\n"
  "      apt-get needs root privileges for real execution.\n"
@@@ -1255,33 -1275,33 +1280,33 @@@
  "      so don't depend on the relevance to the real current situation!"
  msgstr ""
  
--#: cmdline/acqprogress.cc:57
++#: cmdline/acqprogress.cc:59
  msgid "Hit "
  msgstr ""
  
--#: cmdline/acqprogress.cc:81
++#: cmdline/acqprogress.cc:83
  msgid "Get:"
  msgstr ""
  
--#: cmdline/acqprogress.cc:112
++#: cmdline/acqprogress.cc:114
  msgid "Ign "
  msgstr ""
  
--#: cmdline/acqprogress.cc:116
++#: cmdline/acqprogress.cc:118
  msgid "Err "
  msgstr ""
  
--#: cmdline/acqprogress.cc:137
++#: cmdline/acqprogress.cc:139
  #, c-format
  msgid "Fetched %sB in %s (%sB/s)\n"
  msgstr ""
  
--#: cmdline/acqprogress.cc:227
++#: cmdline/acqprogress.cc:229
  #, c-format
  msgid " [Working]"
  msgstr ""
  
--#: cmdline/acqprogress.cc:283
++#: cmdline/acqprogress.cc:285
  #, c-format
  msgid ""
  "Media change: please insert the disc labeled\n"
@@@ -1289,62 -1309,46 +1314,62 @@@
  "in the drive '%s' and press enter\n"
  msgstr ""
  
- #: cmdline/apt-internal-solver.cc:34
 -#: cmdline/apt-mark.cc:46
++#: cmdline/apt-internal-solver.cc:36
 +msgid ""
 +"Usage: apt-internal-resolver\n"
 +"\n"
 +"apt-internal-resolver is an interface to use the current internal\n"
 +"like an external resolver for the APT family for debugging or alike\n"
 +"\n"
 +"Options:\n"
 +"  -h  This help text.\n"
 +"  -q  Loggable output - no progress indicator\n"
 +"  -c=? Read this configuration file\n"
 +"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 +"apt.conf(5) manual pages for more information and options.\n"
 +"                       This APT has Super Cow Powers.\n"
 +msgstr ""
 +
- #: cmdline/apt-mark.cc:46
++#: cmdline/apt-mark.cc:48
  #, c-format
  msgid "%s can not be marked as it is not installed.\n"
  msgstr ""
  
--#: cmdline/apt-mark.cc:52
++#: cmdline/apt-mark.cc:54
  #, c-format
  msgid "%s was already set to manually installed.\n"
  msgstr ""
  
--#: cmdline/apt-mark.cc:54
++#: cmdline/apt-mark.cc:56
  #, c-format
  msgid "%s was already set to automatically installed.\n"
  msgstr ""
  
--#: cmdline/apt-mark.cc:169
++#: cmdline/apt-mark.cc:171
  #, c-format
  msgid "%s was already set on hold.\n"
  msgstr ""
  
--#: cmdline/apt-mark.cc:171
++#: cmdline/apt-mark.cc:173
  #, c-format
  msgid "%s was already not hold.\n"
  msgstr ""
  
--#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
++#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:209
  #, c-format
  msgid "%s set on hold.\n"
  msgstr ""
  
--#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
++#: cmdline/apt-mark.cc:189 cmdline/apt-mark.cc:214
  #, c-format
  msgid "Canceled hold on %s.\n"
  msgstr ""
  
--#: cmdline/apt-mark.cc:220
++#: cmdline/apt-mark.cc:222
  msgid "Executing dpkg failed. Are you root?"
  msgstr ""
  
--#: cmdline/apt-mark.cc:268
++#: cmdline/apt-mark.cc:270
  msgid ""
  "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
  "\n"
@@@ -1366,11 -1370,11 +1391,11 @@@
  "See the apt-mark(8) and apt.conf(5) manual pages for more information."
  msgstr ""
  
--#: cmdline/apt-sortpkgs.cc:86
++#: cmdline/apt-sortpkgs.cc:89
  msgid "Unknown package record!"
  msgstr ""
  
--#: cmdline/apt-sortpkgs.cc:150
++#: cmdline/apt-sortpkgs.cc:153
  msgid ""
  "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
  "\n"
@@@ -1418,196 -1422,196 +1443,196 @@@ msgstr "
  msgid "Merging available information"
  msgstr ""
  
--#: apt-inst/contrib/extracttar.cc:114
++#: apt-inst/contrib/extracttar.cc:117
  msgid "Failed to create pipes"
  msgstr ""
  
--#: apt-inst/contrib/extracttar.cc:141
++#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr ""
  
--#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
++#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
  msgid "Corrupted archive"
  msgstr ""
  
--#: apt-inst/contrib/extracttar.cc:193
++#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr ""
  
--#: apt-inst/contrib/extracttar.cc:300
++#: apt-inst/contrib/extracttar.cc:303
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr ""
  
--#: apt-inst/contrib/arfile.cc:70
++#: apt-inst/contrib/arfile.cc:74
  msgid "Invalid archive signature"
  msgstr ""
  
--#: apt-inst/contrib/arfile.cc:78
++#: apt-inst/contrib/arfile.cc:82
  msgid "Error reading archive member header"
  msgstr ""
  
--#: apt-inst/contrib/arfile.cc:90
++#: apt-inst/contrib/arfile.cc:94
  #, c-format
  msgid "Invalid archive member header %s"
  msgstr ""
  
--#: apt-inst/contrib/arfile.cc:102
++#: apt-inst/contrib/arfile.cc:106
  msgid "Invalid archive member header"
  msgstr ""
  
--#: apt-inst/contrib/arfile.cc:128
++#: apt-inst/contrib/arfile.cc:132
  msgid "Archive is too short"
  msgstr ""
  
--#: apt-inst/contrib/arfile.cc:132
++#: apt-inst/contrib/arfile.cc:136
  msgid "Failed to read the archive headers"
  msgstr ""
  
--#: apt-inst/filelist.cc:380
++#: apt-inst/filelist.cc:382
  msgid "DropNode called on still linked node"
  msgstr ""
  
--#: apt-inst/filelist.cc:412
++#: apt-inst/filelist.cc:414
  msgid "Failed to locate the hash element!"
  msgstr ""
  
--#: apt-inst/filelist.cc:459
++#: apt-inst/filelist.cc:461
  msgid "Failed to allocate diversion"
  msgstr ""
  
--#: apt-inst/filelist.cc:464
++#: apt-inst/filelist.cc:466
  msgid "Internal error in AddDiversion"
  msgstr ""
  
--#: apt-inst/filelist.cc:477
++#: apt-inst/filelist.cc:479
  #, c-format
  msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
  msgstr ""
  
--#: apt-inst/filelist.cc:506
++#: apt-inst/filelist.cc:508
  #, c-format
  msgid "Double add of diversion %s -> %s"
  msgstr ""
  
--#: apt-inst/filelist.cc:549
++#: apt-inst/filelist.cc:551
  #, c-format
  msgid "Duplicate conf file %s/%s"
  msgstr ""
  
--#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
++#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
  #, c-format
  msgid "Failed to write file %s"
  msgstr ""
  
--#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
++#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
  #, c-format
  msgid "Failed to close file %s"
  msgstr ""
  
--#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
++#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
  #, c-format
  msgid "The path %s is too long"
  msgstr ""
  
--#: apt-inst/extract.cc:124
++#: apt-inst/extract.cc:127
  #, c-format
  msgid "Unpacking %s more than once"
  msgstr ""
  
--#: apt-inst/extract.cc:134
++#: apt-inst/extract.cc:137
  #, c-format
  msgid "The directory %s is diverted"
  msgstr ""
  
--#: apt-inst/extract.cc:144
++#: apt-inst/extract.cc:147
  #, c-format
  msgid "The package is trying to write to the diversion target %s/%s"
  msgstr ""
  
--#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
++#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
  msgid "The diversion path is too long"
  msgstr ""
  
--#: apt-inst/extract.cc:240
++#: apt-inst/extract.cc:243
  #, c-format
  msgid "The directory %s is being replaced by a non-directory"
  msgstr ""
  
--#: apt-inst/extract.cc:280
++#: apt-inst/extract.cc:283
  msgid "Failed to locate node in its hash bucket"
  msgstr ""
  
--#: apt-inst/extract.cc:284
++#: apt-inst/extract.cc:287
  msgid "The path is too long"
  msgstr ""
  
--#: apt-inst/extract.cc:412
++#: apt-inst/extract.cc:415
  #, c-format
  msgid "Overwrite package match with no version for %s"
  msgstr ""
  
--#: apt-inst/extract.cc:429
++#: apt-inst/extract.cc:432
  #, c-format
  msgid "File %s/%s overwrites the one in the package %s"
  msgstr ""
  
  #. Only warn if there are no sources.list.d.
  #. Only warn if there is no sources.list file.
--#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
--#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
- #: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:102
- #: apt-pkg/init.cc:110 apt-pkg/clean.cc:33 apt-pkg/policy.cc:318
 -#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
 -#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
--#: methods/mirror.cc:91
++#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
++#: apt-pkg/contrib/fileutl.cc:344 apt-pkg/sourcelist.cc:208
++#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
++#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
++#: methods/mirror.cc:95
  #, c-format
  msgid "Unable to read %s"
  msgstr ""
  
--#: apt-inst/extract.cc:489
++#: apt-inst/extract.cc:492
  #, c-format
  msgid "Unable to stat %s"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
++#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
  #, c-format
  msgid "Failed to remove %s"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
++#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
  #, c-format
  msgid "Unable to create %s"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:114
++#: apt-inst/deb/dpkgdb.cc:118
  #, c-format
  msgid "Failed to stat %sinfo"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:119
++#: apt-inst/deb/dpkgdb.cc:123
  msgid "The info and temp directories need to be on the same filesystem"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
--#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
- #: apt-pkg/pkgcachegen.cc:1304
 -#: apt-pkg/pkgcachegen.cc:1320
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1168
++#: apt-pkg/pkgcachegen.cc:1272 apt-pkg/pkgcachegen.cc:1278
++#: apt-pkg/pkgcachegen.cc:1434
  msgid "Reading package lists"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:176
++#: apt-inst/deb/dpkgdb.cc:180
  #, c-format
  msgid "Failed to change to the admin dir %sinfo"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
--#: apt-inst/deb/dpkgdb.cc:444
++#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
++#: apt-inst/deb/dpkgdb.cc:448
  msgid "Internal error getting a package name"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
++#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
  msgid "Reading file listing"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:212
++#: apt-inst/deb/dpkgdb.cc:216
  #, c-format
  msgid ""
  "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@@ -1615,488 -1619,482 +1640,487 @@@
  "package!"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
++#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
  #, c-format
  msgid "Failed reading the list file %sinfo/%s"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:262
++#: apt-inst/deb/dpkgdb.cc:266
  msgid "Internal error getting a node"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:305
++#: apt-inst/deb/dpkgdb.cc:309
  #, c-format
  msgid "Failed to open the diversions file %sdiversions"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:320
++#: apt-inst/deb/dpkgdb.cc:324
  msgid "The diversion file is corrupted"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
--#: apt-inst/deb/dpkgdb.cc:337
++#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
++#: apt-inst/deb/dpkgdb.cc:341
  #, c-format
  msgid "Invalid line in the diversion file: %s"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:358
++#: apt-inst/deb/dpkgdb.cc:362
  msgid "Internal error adding a diversion"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:379
++#: apt-inst/deb/dpkgdb.cc:383
  msgid "The pkg cache must be initialized first"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:439
++#: apt-inst/deb/dpkgdb.cc:443
  #, c-format
  msgid "Failed to find a Package: header, offset %lu"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:461
++#: apt-inst/deb/dpkgdb.cc:465
  #, c-format
  msgid "Bad ConfFile section in the status file. Offset %lu"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:466
++#: apt-inst/deb/dpkgdb.cc:470
  #, c-format
  msgid "Error parsing MD5. Offset %lu"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
++#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
  #, c-format
  msgid "This is not a valid DEB archive, missing '%s' member"
  msgstr ""
  
  #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
--#: apt-inst/deb/debfile.cc:53
++#: apt-inst/deb/debfile.cc:56
  #, c-format
  msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:113
++#: apt-inst/deb/debfile.cc:116
  #, c-format
  msgid "Couldn't change to %s"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:154
++#: apt-inst/deb/debfile.cc:157
  #, c-format
  msgid "Internal error, could not locate member %s"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:189
++#: apt-inst/deb/debfile.cc:192
  msgid "Failed to locate a valid control file"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:274
++#: apt-inst/deb/debfile.cc:277
  msgid "Unparsable control file"
  msgstr ""
  
--#: methods/bzip2.cc:60 methods/gzip.cc:52
++#: methods/bzip2.cc:63 methods/gzip.cc:54
  msgid "Empty files can't be valid archives"
  msgstr ""
  
--#: methods/bzip2.cc:64
++#: methods/bzip2.cc:67
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr ""
  
--#: methods/bzip2.cc:108
++#: methods/bzip2.cc:111
  #, c-format
  msgid "Read error from %s process"
  msgstr ""
  
--#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
--#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
--#: methods/rred.cc:533
++#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
++#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:530
++#: methods/rred.cc:539
  msgid "Failed to stat"
  msgstr ""
  
--#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
--#: methods/rred.cc:530
++#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
++#: methods/rred.cc:536
  msgid "Failed to set modification time"
  msgstr ""
  
--#: methods/cdrom.cc:199
++#: methods/cdrom.cc:203
  #, c-format
  msgid "Unable to read the cdrom database %s"
  msgstr ""
  
--#: methods/cdrom.cc:208
++#: methods/cdrom.cc:212
  msgid ""
  "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
  "cannot be used to add new CD-ROMs"
  msgstr ""
  
--#: methods/cdrom.cc:218
++#: methods/cdrom.cc:222
  msgid "Wrong CD-ROM"
  msgstr ""
  
--#: methods/cdrom.cc:245
++#: methods/cdrom.cc:249
  #, c-format
  msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
  msgstr ""
  
--#: methods/cdrom.cc:250
++#: methods/cdrom.cc:254
  msgid "Disk not found."
  msgstr ""
  
--#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
++#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
  msgid "File not found"
  msgstr ""
  
--#: methods/file.cc:44
++#: methods/file.cc:47
  msgid "Invalid URI, local URIS must not start with //"
  msgstr ""
  
  #. Login must be before getpeername otherwise dante won't work.
--#: methods/ftp.cc:168
++#: methods/ftp.cc:172
  msgid "Logging in"
  msgstr ""
  
--#: methods/ftp.cc:174
++#: methods/ftp.cc:178
  msgid "Unable to determine the peer name"
  msgstr ""
  
--#: methods/ftp.cc:179
++#: methods/ftp.cc:183
  msgid "Unable to determine the local name"
  msgstr ""
  
--#: methods/ftp.cc:210 methods/ftp.cc:238
++#: methods/ftp.cc:214 methods/ftp.cc:242
  #, c-format
  msgid "The server refused the connection and said: %s"
  msgstr ""
  
--#: methods/ftp.cc:216
++#: methods/ftp.cc:220
  #, c-format
  msgid "USER failed, server said: %s"
  msgstr ""
  
--#: methods/ftp.cc:223
++#: methods/ftp.cc:227
  #, c-format
  msgid "PASS failed, server said: %s"
  msgstr ""
  
--#: methods/ftp.cc:243
++#: methods/ftp.cc:247
  msgid ""
  "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
  "is empty."
  msgstr ""
  
--#: methods/ftp.cc:271
++#: methods/ftp.cc:275
  #, c-format
  msgid "Login script command '%s' failed, server said: %s"
  msgstr ""
  
--#: methods/ftp.cc:297
++#: methods/ftp.cc:301
  #, c-format
  msgid "TYPE failed, server said: %s"
  msgstr ""
  
--#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
++#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
  msgid "Connection timeout"
  msgstr ""
  
--#: methods/ftp.cc:341
++#: methods/ftp.cc:345
  msgid "Server closed the connection"
  msgstr ""
  
--#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
++#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:832 methods/rsh.cc:197
  msgid "Read error"
  msgstr ""
  
--#: methods/ftp.cc:351 methods/rsh.cc:198
++#: methods/ftp.cc:355 methods/rsh.cc:204
  msgid "A response overflowed the buffer."
  msgstr ""
  
--#: methods/ftp.cc:368 methods/ftp.cc:380
++#: methods/ftp.cc:372 methods/ftp.cc:384
  msgid "Protocol corruption"
  msgstr ""
  
--#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
++#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:874 methods/rsh.cc:239
  msgid "Write error"
  msgstr ""
  
--#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
++#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
  msgid "Could not create a socket"
  msgstr ""
  
--#: methods/ftp.cc:703
++#: methods/ftp.cc:707
  msgid "Could not connect data socket, connection timed out"
  msgstr ""
  
--#: methods/ftp.cc:709
++#: methods/ftp.cc:713
  msgid "Could not connect passive socket."
  msgstr ""
  
--#: methods/ftp.cc:727
++#: methods/ftp.cc:731
  msgid "getaddrinfo was unable to get a listening socket"
  msgstr ""
  
--#: methods/ftp.cc:741
++#: methods/ftp.cc:745
  msgid "Could not bind a socket"
  msgstr ""
  
--#: methods/ftp.cc:745
++#: methods/ftp.cc:749
  msgid "Could not listen on the socket"
  msgstr ""
  
--#: methods/ftp.cc:752
++#: methods/ftp.cc:756
  msgid "Could not determine the socket's name"
  msgstr ""
  
--#: methods/ftp.cc:784
++#: methods/ftp.cc:788
  msgid "Unable to send PORT command"
  msgstr ""
  
--#: methods/ftp.cc:794
++#: methods/ftp.cc:798
  #, c-format
  msgid "Unknown address family %u (AF_*)"
  msgstr ""
  
--#: methods/ftp.cc:803
++#: methods/ftp.cc:807
  #, c-format
  msgid "EPRT failed, server said: %s"
  msgstr ""
  
--#: methods/ftp.cc:823
++#: methods/ftp.cc:827
  msgid "Data socket connect timed out"
  msgstr ""
  
--#: methods/ftp.cc:830
++#: methods/ftp.cc:834
  msgid "Unable to accept connection"
  msgstr ""
  
--#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
++#: methods/ftp.cc:873 methods/http.cc:1031 methods/rsh.cc:309
  msgid "Problem hashing file"
  msgstr ""
  
--#: methods/ftp.cc:882
++#: methods/ftp.cc:886
  #, c-format
  msgid "Unable to fetch file, server said '%s'"
  msgstr ""
  
--#: methods/ftp.cc:897 methods/rsh.cc:322
++#: methods/ftp.cc:901 methods/rsh.cc:328
  msgid "Data socket timed out"
  msgstr ""
  
--#: methods/ftp.cc:927
++#: methods/ftp.cc:931
  #, c-format
  msgid "Data transfer failed, server said '%s'"
  msgstr ""
  
  #. Get the files information
--#: methods/ftp.cc:1004
++#: methods/ftp.cc:1008
  msgid "Query"
  msgstr ""
  
--#: methods/ftp.cc:1116
++#: methods/ftp.cc:1120
  msgid "Unable to invoke "
  msgstr ""
  
--#: methods/connect.cc:71
++#: methods/connect.cc:75
  #, c-format
  msgid "Connecting to %s (%s)"
  msgstr ""
  
--#: methods/connect.cc:82
++#: methods/connect.cc:86
  #, c-format
  msgid "[IP: %s %s]"
  msgstr ""
  
--#: methods/connect.cc:89
++#: methods/connect.cc:93
  #, c-format
  msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
  msgstr ""
  
--#: methods/connect.cc:95
++#: methods/connect.cc:99
  #, c-format
  msgid "Cannot initiate the connection to %s:%s (%s)."
  msgstr ""
  
--#: methods/connect.cc:103
++#: methods/connect.cc:107
  #, c-format
  msgid "Could not connect to %s:%s (%s), connection timed out"
  msgstr ""
  
--#: methods/connect.cc:121
++#: methods/connect.cc:125
  #, c-format
  msgid "Could not connect to %s:%s (%s)."
  msgstr ""
  
  #. We say this mainly because the pause here is for the
  #. ssh connection that is still going
--#: methods/connect.cc:149 methods/rsh.cc:425
++#: methods/connect.cc:153 methods/rsh.cc:431
  #, c-format
  msgid "Connecting to %s"
  msgstr ""
  
--#: methods/connect.cc:168 methods/connect.cc:187
++#: methods/connect.cc:172 methods/connect.cc:191
  #, c-format
  msgid "Could not resolve '%s'"
  msgstr ""
  
--#: methods/connect.cc:193
++#: methods/connect.cc:197
  #, c-format
  msgid "Temporary failure resolving '%s'"
  msgstr ""
  
--#: methods/connect.cc:196
++#: methods/connect.cc:200
  #, c-format
  msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
  msgstr ""
  
--#: methods/connect.cc:243
++#: methods/connect.cc:247
  #, c-format
  msgid "Unable to connect to %s:%s:"
  msgstr ""
  
- #. TRANSLATOR: %s is the trusted keyring parts directory
- #: methods/gpgv.cc:71
- #, c-format
- msgid "No keyring installed in %s."
- msgstr ""
- 
- #: methods/gpgv.cc:163
 -#: methods/gpgv.cc:166
++#: methods/gpgv.cc:172
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  
- #: methods/gpgv.cc:168
 -#: methods/gpgv.cc:171
++#: methods/gpgv.cc:177
  msgid "At least one invalid signature was encountered."
  msgstr ""
  
- #: methods/gpgv.cc:172
 -#: methods/gpgv.cc:175
++#: methods/gpgv.cc:181
  msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
  msgstr ""
  
- #: methods/gpgv.cc:177
 -#: methods/gpgv.cc:180
++#: methods/gpgv.cc:186
  msgid "Unknown error executing gpgv"
  msgstr ""
  
- #: methods/gpgv.cc:211 methods/gpgv.cc:218
 -#: methods/gpgv.cc:214 methods/gpgv.cc:221
++#: methods/gpgv.cc:220 methods/gpgv.cc:227
  msgid "The following signatures were invalid:\n"
  msgstr ""
  
- #: methods/gpgv.cc:225
 -#: methods/gpgv.cc:228
++#: methods/gpgv.cc:234
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
  msgstr ""
  
--#: methods/http.cc:385
++#: methods/http.cc:393
  msgid "Waiting for headers"
  msgstr ""
  
--#: methods/http.cc:531
++#: methods/http.cc:539
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr ""
  
--#: methods/http.cc:539
++#: methods/http.cc:547
  msgid "Bad header line"
  msgstr ""
  
--#: methods/http.cc:564 methods/http.cc:571
++#: methods/http.cc:572 methods/http.cc:579
  msgid "The HTTP server sent an invalid reply header"
  msgstr ""
  
--#: methods/http.cc:600
++#: methods/http.cc:608
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr ""
  
--#: methods/http.cc:615
++#: methods/http.cc:623
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr ""
  
--#: methods/http.cc:617
++#: methods/http.cc:625
  msgid "This HTTP server has broken range support"
  msgstr ""
  
--#: methods/http.cc:641
++#: methods/http.cc:649
  msgid "Unknown date format"
  msgstr ""
  
--#: methods/http.cc:800
++#: methods/http.cc:808
  msgid "Select failed"
  msgstr ""
  
--#: methods/http.cc:805
++#: methods/http.cc:813
  msgid "Connection timed out"
  msgstr ""
  
--#: methods/http.cc:828
++#: methods/http.cc:836
  msgid "Error writing to output file"
  msgstr ""
  
--#: methods/http.cc:859
++#: methods/http.cc:867
  msgid "Error writing to file"
  msgstr ""
  
--#: methods/http.cc:887
++#: methods/http.cc:895
  msgid "Error writing to the file"
  msgstr ""
  
--#: methods/http.cc:901
++#: methods/http.cc:909
  msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  
--#: methods/http.cc:903
++#: methods/http.cc:911
  msgid "Error reading from server"
  msgstr ""
  
--#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
++#: methods/http.cc:1016 apt-pkg/contrib/mmap.cc:293
  msgid "Failed to truncate file"
  msgstr ""
  
--#: methods/http.cc:1183
++#: methods/http.cc:1191
  msgid "Bad header data"
  msgstr ""
  
--#: methods/http.cc:1200 methods/http.cc:1255
++#: methods/http.cc:1208 methods/http.cc:1263
  msgid "Connection failed"
  msgstr ""
  
--#: methods/http.cc:1347
++#: methods/http.cc:1355
  msgid "Internal error"
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:77
++#: apt-pkg/contrib/mmap.cc:79
  msgid "Can't mmap an empty file"
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:89
++#: apt-pkg/contrib/mmap.cc:91
  #, c-format
  msgid "Couldn't duplicate file descriptor %i"
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
++#: apt-pkg/contrib/mmap.cc:99
  #, c-format
--msgid "Couldn't make mmap of %lu bytes"
++msgid "Couldn't make mmap of %llu bytes"
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:124
++#: apt-pkg/contrib/mmap.cc:126
  msgid "Unable to close mmap"
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
++#: apt-pkg/contrib/mmap.cc:154 apt-pkg/contrib/mmap.cc:182
  msgid "Unable to synchronize mmap"
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:310
++#: apt-pkg/contrib/mmap.cc:260
++#, c-format
++msgid "Couldn't make mmap of %lu bytes"
++msgstr ""
++
++#: apt-pkg/contrib/mmap.cc:312
  #, c-format
  msgid ""
  "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
  "Current value: %lu. (man 5 apt.conf)"
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:409
++#: apt-pkg/contrib/mmap.cc:411
  #, c-format
  msgid ""
  "Unable to increase the size of the MMap as the limit of %lu bytes is already "
  "reached."
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:412
++#: apt-pkg/contrib/mmap.cc:414
  msgid ""
  "Unable to increase size of the MMap as automatic growing is disabled by user."
  msgstr ""
@@@ -2125,93 -2123,93 +2149,93 @@@ msgstr "
  msgid "%lis"
  msgstr ""
  
--#: apt-pkg/contrib/strutl.cc:1138
++#: apt-pkg/contrib/strutl.cc:1165
  #, c-format
  msgid "Selection %s not found"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:452
 -#: apt-pkg/contrib/configuration.cc:465
++#: apt-pkg/contrib/configuration.cc:468
  #, c-format
  msgid "Unrecognized type abbreviation: '%c'"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:510
 -#: apt-pkg/contrib/configuration.cc:523
++#: apt-pkg/contrib/configuration.cc:526
  #, c-format
  msgid "Opening configuration file %s"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:678
 -#: apt-pkg/contrib/configuration.cc:691
++#: apt-pkg/contrib/configuration.cc:694
  #, c-format
  msgid "Syntax error %s:%u: Block starts with no name."
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:697
 -#: apt-pkg/contrib/configuration.cc:710
++#: apt-pkg/contrib/configuration.cc:713
  #, c-format
  msgid "Syntax error %s:%u: Malformed tag"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:714
 -#: apt-pkg/contrib/configuration.cc:727
++#: apt-pkg/contrib/configuration.cc:730
  #, c-format
  msgid "Syntax error %s:%u: Extra junk after value"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:754
 -#: apt-pkg/contrib/configuration.cc:767
++#: apt-pkg/contrib/configuration.cc:770
  #, c-format
  msgid "Syntax error %s:%u: Directives can only be done at the top level"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:761
 -#: apt-pkg/contrib/configuration.cc:774
++#: apt-pkg/contrib/configuration.cc:777
  #, c-format
  msgid "Syntax error %s:%u: Too many nested includes"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
 -#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
++#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
  #, c-format
  msgid "Syntax error %s:%u: Included from here"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:774
 -#: apt-pkg/contrib/configuration.cc:787
++#: apt-pkg/contrib/configuration.cc:790
  #, c-format
  msgid "Syntax error %s:%u: Unsupported directive '%s'"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:777
 -#: apt-pkg/contrib/configuration.cc:790
++#: apt-pkg/contrib/configuration.cc:793
  #, c-format
  msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:827
 -#: apt-pkg/contrib/configuration.cc:840
++#: apt-pkg/contrib/configuration.cc:843
  #, c-format
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr ""
  
- #: apt-pkg/contrib/progress.cc:144
 -#: apt-pkg/contrib/progress.cc:153
++#: apt-pkg/contrib/progress.cc:146
  #, c-format
  msgid "%c%s... Error!"
  msgstr ""
  
- #: apt-pkg/contrib/progress.cc:146
 -#: apt-pkg/contrib/progress.cc:155
++#: apt-pkg/contrib/progress.cc:148
  #, c-format
  msgid "%c%s... Done"
  msgstr ""
  
--#: apt-pkg/contrib/cmndline.cc:77
++#: apt-pkg/contrib/cmndline.cc:80
  #, c-format
  msgid "Command line option '%c' [from %s] is not known."
  msgstr ""
  
--#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
--#: apt-pkg/contrib/cmndline.cc:119
++#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
++#: apt-pkg/contrib/cmndline.cc:120
  #, c-format
  msgid "Command line option %s is not understood"
  msgstr ""
  
--#: apt-pkg/contrib/cmndline.cc:124
++#: apt-pkg/contrib/cmndline.cc:125
  #, c-format
  msgid "Command line option %s is not boolean"
  msgstr ""
  
--#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
++#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
  #, c-format
  msgid "Option %s requires an argument."
  msgstr ""
@@@ -2221,603 -2219,609 +2245,573 @@@
  msgid "Option %s: Configuration item specification must have an =<val>."
  msgstr ""
  
--#: apt-pkg/contrib/cmndline.cc:236
++#: apt-pkg/contrib/cmndline.cc:235
  #, c-format
  msgid "Option %s requires an integer argument, not '%s'"
  msgstr ""
  
--#: apt-pkg/contrib/cmndline.cc:267
++#: apt-pkg/contrib/cmndline.cc:266
  #, c-format
  msgid "Option '%s' is too long"
  msgstr ""
  
--#: apt-pkg/contrib/cmndline.cc:300
++#: apt-pkg/contrib/cmndline.cc:298
  #, c-format
  msgid "Sense %s is not understood, try true or false."
  msgstr ""
  
--#: apt-pkg/contrib/cmndline.cc:350
++#: apt-pkg/contrib/cmndline.cc:348
  #, c-format
  msgid "Invalid operation %s"
  msgstr ""
  
--#: apt-pkg/contrib/cdromutl.cc:52
++#: apt-pkg/contrib/cdromutl.cc:56
  #, c-format
  msgid "Unable to stat the mount point %s"
  msgstr ""
  
--#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
--#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
--#: methods/mirror.cc:97
++#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
++#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
++#: methods/mirror.cc:101
  #, c-format
  msgid "Unable to change to %s"
  msgstr ""
  
--#: apt-pkg/contrib/cdromutl.cc:220
++#: apt-pkg/contrib/cdromutl.cc:224
  msgid "Failed to stat the cdrom"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:168
++#: apt-pkg/contrib/fileutl.cc:169
  #, c-format
  msgid "Not using locking for read only lock file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:173
++#: apt-pkg/contrib/fileutl.cc:174
  #, c-format
  msgid "Could not open lock file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:191
++#: apt-pkg/contrib/fileutl.cc:192
  #, c-format
  msgid "Not using locking for nfs mounted lock file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:195
++#: apt-pkg/contrib/fileutl.cc:196
  #, c-format
  msgid "Could not get lock %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:335
++#: apt-pkg/contrib/fileutl.cc:336
  #, c-format
  msgid "List of files can't be created as '%s' is not a directory"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:362
++#: apt-pkg/contrib/fileutl.cc:363
  #, c-format
  msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:380
++#: apt-pkg/contrib/fileutl.cc:381
  #, c-format
  msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:389
++#: apt-pkg/contrib/fileutl.cc:390
  #, c-format
  msgid ""
  "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:679
++#: apt-pkg/contrib/fileutl.cc:691
  #, c-format
  msgid "Waited for %s but it wasn't there"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:691
++#: apt-pkg/contrib/fileutl.cc:703
  #, c-format
  msgid "Sub-process %s received a segmentation fault."
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:693
++#: apt-pkg/contrib/fileutl.cc:705
  #, c-format
  msgid "Sub-process %s received signal %u."
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:697
++#: apt-pkg/contrib/fileutl.cc:709
  #, c-format
  msgid "Sub-process %s returned an error code (%u)"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:699
++#: apt-pkg/contrib/fileutl.cc:711
  #, c-format
  msgid "Sub-process %s exited unexpectedly"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:764
 -#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
++#: apt-pkg/contrib/fileutl.cc:776 apt-pkg/indexcopy.cc:676
  #, c-format
  msgid "Could not open file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:781
++#: apt-pkg/contrib/fileutl.cc:793
  #, c-format
  msgid "Could not open file descriptor %d"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:841
++#: apt-pkg/contrib/fileutl.cc:853
  #, c-format
--msgid "read, still have %lu to read but none left"
++msgid "read, still have %llu to read but none left"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:874
++#: apt-pkg/contrib/fileutl.cc:886
  #, c-format
--msgid "write, still have %lu to write but couldn't"
++msgid "write, still have %llu to write but couldn't"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:1010
++#: apt-pkg/contrib/fileutl.cc:1023
  #, c-format
  msgid "Problem closing the gzip file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:1013
++#: apt-pkg/contrib/fileutl.cc:1026
  #, c-format
  msgid "Problem closing the file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:1018
++#: apt-pkg/contrib/fileutl.cc:1031
  #, c-format
  msgid "Problem renaming the file %s to %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:1029
++#: apt-pkg/contrib/fileutl.cc:1042
  #, c-format
  msgid "Problem unlinking the file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:1042
++#: apt-pkg/contrib/fileutl.cc:1055
  msgid "Problem syncing the file"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:145
++#: apt-pkg/pkgcache.cc:148
  msgid "Empty package cache"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:151
++#: apt-pkg/pkgcache.cc:154
  msgid "The package cache file is corrupted"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:156
++#: apt-pkg/pkgcache.cc:159
  msgid "The package cache file is an incompatible version"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:161
++#: apt-pkg/pkgcache.cc:162
++msgid "The package cache file is corrupted, it is too small"
++msgstr ""
++
++#: apt-pkg/pkgcache.cc:167
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:166
++#: apt-pkg/pkgcache.cc:172
  msgid "The package cache was built for a different architecture"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:299
++#: apt-pkg/pkgcache.cc:305
  msgid "Depends"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:299
++#: apt-pkg/pkgcache.cc:305
  msgid "PreDepends"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:299
++#: apt-pkg/pkgcache.cc:305
  msgid "Suggests"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:300
++#: apt-pkg/pkgcache.cc:306
  msgid "Recommends"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:300
++#: apt-pkg/pkgcache.cc:306
  msgid "Conflicts"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:300
++#: apt-pkg/pkgcache.cc:306
  msgid "Replaces"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:301
++#: apt-pkg/pkgcache.cc:307
  msgid "Obsoletes"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:301
++#: apt-pkg/pkgcache.cc:307
  msgid "Breaks"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:301
++#: apt-pkg/pkgcache.cc:307
  msgid "Enhances"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:312
++#: apt-pkg/pkgcache.cc:318
  msgid "important"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:312
++#: apt-pkg/pkgcache.cc:318
  msgid "required"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:312
++#: apt-pkg/pkgcache.cc:318
  msgid "standard"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:313
++#: apt-pkg/pkgcache.cc:319
  msgid "optional"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:313
++#: apt-pkg/pkgcache.cc:319
  msgid "extra"
  msgstr ""
  
--#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
++#: apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:159
  msgid "Building dependency tree"
  msgstr ""
  
--#: apt-pkg/depcache.cc:126
++#: apt-pkg/depcache.cc:131
  msgid "Candidate versions"
  msgstr ""
  
--#: apt-pkg/depcache.cc:155
++#: apt-pkg/depcache.cc:160
  msgid "Dependency generation"
  msgstr ""
  
--#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
++#: apt-pkg/depcache.cc:180 apt-pkg/depcache.cc:213 apt-pkg/depcache.cc:217
  msgid "Reading state information"
  msgstr ""
  
--#: apt-pkg/depcache.cc:237
++#: apt-pkg/depcache.cc:242
  #, c-format
  msgid "Failed to open StateFile %s"
  msgstr ""
  
--#: apt-pkg/depcache.cc:243
++#: apt-pkg/depcache.cc:248
  #, c-format
  msgid "Failed to write temporary StateFile %s"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:123
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:126
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:210
 -#: apt-pkg/tagfile.cc:189
++#: apt-pkg/tagfile.cc:213
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:92
++#: apt-pkg/sourcelist.cc:96
  #, c-format
  msgid "Malformed line %lu in source list %s ([option] unparseable)"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:95
++#: apt-pkg/sourcelist.cc:99
  #, c-format
  msgid "Malformed line %lu in source list %s ([option] too short)"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:106
++#: apt-pkg/sourcelist.cc:110
  #, c-format
  msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:112
++#: apt-pkg/sourcelist.cc:116
  #, c-format
  msgid "Malformed line %lu in source list %s ([%s] has no key)"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:115
++#: apt-pkg/sourcelist.cc:119
  #, c-format
  msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:128
++#: apt-pkg/sourcelist.cc:132
  #, c-format
  msgid "Malformed line %lu in source list %s (URI)"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:130
++#: apt-pkg/sourcelist.cc:134
  #, c-format
  msgid "Malformed line %lu in source list %s (dist)"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:133
++#: apt-pkg/sourcelist.cc:137
  #, c-format
  msgid "Malformed line %lu in source list %s (URI parse)"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:139
++#: apt-pkg/sourcelist.cc:143
  #, c-format
  msgid "Malformed line %lu in source list %s (absolute dist)"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:146
++#: apt-pkg/sourcelist.cc:150
  #, c-format
  msgid "Malformed line %lu in source list %s (dist parse)"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:244
++#: apt-pkg/sourcelist.cc:248
  #, c-format
  msgid "Opening %s"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
++#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:447
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:281
++#: apt-pkg/sourcelist.cc:285
  #, c-format
  msgid "Malformed line %u in source list %s (type)"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:285
++#: apt-pkg/sourcelist.cc:289
  #, c-format
  msgid "Type '%s' is not known on line %u in source list %s"
  msgstr ""
  
--#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
++#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:770
  #, c-format
  msgid ""
  "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
  "under APT::Immediate-Configure for details. (%d)"
  msgstr ""
  
--#: apt-pkg/packagemanager.cc:456
++#: apt-pkg/packagemanager.cc:432 apt-pkg/packagemanager.cc:462
  #, c-format
--msgid ""
--"This installation run will require temporarily removing the essential "
--"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
--"you really want to do it, activate the APT::Force-LoopBreak option."
++msgid "Could not configure '%s'. "
  msgstr ""
  
--#: apt-pkg/packagemanager.cc:501
++#: apt-pkg/packagemanager.cc:502
  #, c-format
  msgid ""
--"Could not perform immediate configuration on already unpacked '%s'. Please "
--"see man 5 apt.conf under APT::Immediate-Configure for details."
++"This installation run will require temporarily removing the essential "
++"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
++"you really want to do it, activate the APT::Force-LoopBreak option."
  msgstr ""
  
--#: apt-pkg/pkgrecords.cc:32
++#: apt-pkg/pkgrecords.cc:34
  #, c-format
  msgid "Index file type '%s' is not supported"
  msgstr ""
  
- #: apt-pkg/algorithms.cc:250
 -#: apt-pkg/algorithms.cc:247
++#: apt-pkg/algorithms.cc:255
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1186
 -#: apt-pkg/algorithms.cc:1158
++#: apt-pkg/algorithms.cc:1191
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1188
 -#: apt-pkg/algorithms.cc:1160
++#: apt-pkg/algorithms.cc:1193
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1479 apt-pkg/algorithms.cc:1481
 -#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
++#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
  msgid ""
  "Some index files failed to download. They have been ignored, or old ones "
  "used instead."
  msgstr ""
  
--#: apt-pkg/acquire.cc:79
++#: apt-pkg/acquire.cc:81
  #, c-format
  msgid "List directory %spartial is missing."
  msgstr ""
  
--#: apt-pkg/acquire.cc:83
++#: apt-pkg/acquire.cc:85
  #, c-format
  msgid "Archives directory %spartial is missing."
  msgstr ""
  
--#: apt-pkg/acquire.cc:91
++#: apt-pkg/acquire.cc:93
  #, c-format
  msgid "Unable to lock directory %s"
  msgstr ""
  
  #. only show the ETA if it makes sense
  #. two days
--#: apt-pkg/acquire.cc:857
++#: apt-pkg/acquire.cc:864
  #, c-format
  msgid "Retrieving file %li of %li (%s remaining)"
  msgstr ""
  
--#: apt-pkg/acquire.cc:859
++#: apt-pkg/acquire.cc:866
  #, c-format
  msgid "Retrieving file %li of %li"
  msgstr ""
  
--#: apt-pkg/acquire-worker.cc:110
++#: apt-pkg/acquire-worker.cc:112
  #, c-format
  msgid "The method driver %s could not be found."
  msgstr ""
  
--#: apt-pkg/acquire-worker.cc:159
++#: apt-pkg/acquire-worker.cc:161
  #, c-format
  msgid "Method %s did not start correctly"
  msgstr ""
  
--#: apt-pkg/acquire-worker.cc:423
++#: apt-pkg/acquire-worker.cc:425
  #, c-format
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
  
- #: apt-pkg/init.cc:145
 -#: apt-pkg/init.cc:147
++#: apt-pkg/init.cc:151
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr ""
  
- #: apt-pkg/init.cc:161
 -#: apt-pkg/init.cc:163
++#: apt-pkg/init.cc:167
  msgid "Unable to determine a suitable packaging system type"
  msgstr ""
  
--#: apt-pkg/clean.cc:56
++#: apt-pkg/clean.cc:59
  #, c-format
  msgid "Unable to stat %s."
  msgstr ""
  
--#: apt-pkg/srcrecords.cc:44
++#: apt-pkg/srcrecords.cc:47
  msgid "You must put some 'source' URIs in your sources.list"
  msgstr ""
  
--#: apt-pkg/cachefile.cc:84
++#: apt-pkg/cachefile.cc:87
  msgid "The package lists or status file could not be parsed or opened."
  msgstr ""
  
--#: apt-pkg/cachefile.cc:88
++#: apt-pkg/cachefile.cc:91
  msgid "You may want to run apt-get update to correct these problems"
  msgstr ""
  
--#: apt-pkg/cachefile.cc:106
++#: apt-pkg/cachefile.cc:109
  msgid "The list of sources could not be read."
  msgstr ""
  
- #: apt-pkg/policy.cc:355
 -#: apt-pkg/policy.cc:71
++#: apt-pkg/policy.cc:74
+ #, c-format
+ msgid ""
+ "The value '%s' is invalid for APT::Default-Release as such a release is not "
+ "available in the sources"
+ msgstr ""
+ 
 -#: apt-pkg/policy.cc:389
++#: apt-pkg/policy.cc:396
  #, c-format
  msgid "Invalid record in the preferences file %s, no Package header"
  msgstr ""
  
- #: apt-pkg/policy.cc:377
 -#: apt-pkg/policy.cc:411
++#: apt-pkg/policy.cc:418
  #, c-format
  msgid "Did not understand pin type %s"
  msgstr ""
  
- #: apt-pkg/policy.cc:385
 -#: apt-pkg/policy.cc:419
++#: apt-pkg/policy.cc:426
  msgid "No priority (or zero) specified for pin"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:80
++#: apt-pkg/pkgcachegen.cc:83
  msgid "Cache has an incompatible versioning system"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:187
--#, c-format
--msgid "Error occurred while processing %s (NewPackage)"
--msgstr ""
--
--#: apt-pkg/pkgcachegen.cc:204
- #, c-format
- msgid "Error occurred while processing %s (UsePackage1)"
- msgstr ""
- 
- #: apt-pkg/pkgcachegen.cc:242
- #, c-format
- msgid "Error occurred while processing %s (NewFileDesc1)"
- msgstr ""
- 
- #: apt-pkg/pkgcachegen.cc:274
++#. TRANSLATOR: The first placeholder is a package name,
++#. the other two should be copied verbatim as they include debug info
++#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:275
++#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:353
++#: apt-pkg/pkgcachegen.cc:357 apt-pkg/pkgcachegen.cc:374
++#: apt-pkg/pkgcachegen.cc:384 apt-pkg/pkgcachegen.cc:388
++#: apt-pkg/pkgcachegen.cc:392 apt-pkg/pkgcachegen.cc:413
++#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:463
++#: apt-pkg/pkgcachegen.cc:494 apt-pkg/pkgcachegen.cc:508
  #, c-format
- msgid "Error occurred while processing %s (UsePackage2)"
 -msgid "Error occurred while processing %s (UsePackage1)"
++msgid "Error occurred while processing %s (%s%d)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:242
 -#, c-format
 -msgid "Error occurred while processing %s (NewFileDesc1)"
 -msgstr ""
 -
 -#: apt-pkg/pkgcachegen.cc:274
 -#, c-format
 -msgid "Error occurred while processing %s (UsePackage2)"
 -msgstr ""
 -
--#: apt-pkg/pkgcachegen.cc:278
--#, c-format
--msgid "Error occurred while processing %s (NewFileVer1)"
--msgstr ""
--
--#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
--#: apt-pkg/pkgcachegen.cc:313
--#, c-format
--msgid "Error occurred while processing %s (NewVersion%d)"
--msgstr ""
--
--#: apt-pkg/pkgcachegen.cc:309
--#, c-format
--msgid "Error occurred while processing %s (UsePackage3)"
--msgstr ""
--
--#: apt-pkg/pkgcachegen.cc:342
--#, c-format
--msgid "Error occurred while processing %s (NewFileDesc2)"
--msgstr ""
--
--#: apt-pkg/pkgcachegen.cc:348
++#: apt-pkg/pkgcachegen.cc:232
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:351
++#: apt-pkg/pkgcachegen.cc:235
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:354
++#: apt-pkg/pkgcachegen.cc:238
  msgid "Wow, you exceeded the number of descriptions this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:357
++#: apt-pkg/pkgcachegen.cc:241
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:386
--#, c-format
--msgid "Error occurred while processing %s (FindPkg)"
--msgstr ""
--
--#: apt-pkg/pkgcachegen.cc:400
--#, c-format
--msgid "Error occurred while processing %s (CollectFileProvides)"
--msgstr ""
--
--#: apt-pkg/pkgcachegen.cc:406
++#: apt-pkg/pkgcachegen.cc:515
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:960
++#: apt-pkg/pkgcachegen.cc:1080
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:1065
++#: apt-pkg/pkgcachegen.cc:1185
  msgid "Collecting File Provides"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:1243 apt-pkg/pkgcachegen.cc:1250
 -#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
++#: apt-pkg/pkgcachegen.cc:1376 apt-pkg/pkgcachegen.cc:1383
  msgid "IO Error saving source cache"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:135
++#: apt-pkg/acquire-item.cc:139
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:636
++#: apt-pkg/acquire-item.cc:640
  msgid "MD5Sum mismatch"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1850
- #: apt-pkg/acquire-item.cc:1993
 -#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
 -#: apt-pkg/acquire-item.cc:1991
++#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
++#: apt-pkg/acquire-item.cc:2006
  msgid "Hash Sum mismatch"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1388
++#: apt-pkg/acquire-item.cc:1399
  #, c-format
  msgid ""
  "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
  "or malformed file)"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1403
++#: apt-pkg/acquire-item.cc:1415
  #, c-format
  msgid "Unable to find hash sum for '%s' in Release file"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1439
++#: apt-pkg/acquire-item.cc:1450
  msgid "There is no public key available for the following key IDs:\n"
  msgstr ""
  
- #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
- #. the time since then the file is invalid - formated in the same way as in
- #. the download progress display (e.g. 7d 3h 42min 1s)
- #: apt-pkg/acquire-item.cc:1476
 -#: apt-pkg/acquire-item.cc:1477
++#: apt-pkg/acquire-item.cc:1488
  #, c-format
- msgid "Release file expired, ignoring %s (invalid since %s)"
+ msgid ""
+ "Release file for %s is expired (invalid since %s). Updates for this "
+ "repository will not be applied."
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:1497
 -#: apt-pkg/acquire-item.cc:1499
++#: apt-pkg/acquire-item.cc:1510
  #, c-format
  msgid "Conflicting distribution: %s (expected %s but got %s)"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:1530
 -#: apt-pkg/acquire-item.cc:1532
++#: apt-pkg/acquire-item.cc:1543
  #, c-format
  msgid ""
  "A error occurred during the signature verification. The repository is not "
@@@ -2825,427 -2829,418 +2819,442 @@@
  msgstr ""
  
  #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
- #: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545
 -#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
++#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
  #, c-format
  msgid "GPG error: %s: %s"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:1637
 -#: apt-pkg/acquire-item.cc:1639
++#: apt-pkg/acquire-item.cc:1650
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
  "to manually fix this package. (due to missing arch)"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:1696
 -#: apt-pkg/acquire-item.cc:1698
++#: apt-pkg/acquire-item.cc:1709
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
  "to manually fix this package."
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:1755
 -#: apt-pkg/acquire-item.cc:1753
++#: apt-pkg/acquire-item.cc:1768
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:1842
 -#: apt-pkg/acquire-item.cc:1840
++#: apt-pkg/acquire-item.cc:1855
  msgid "Size mismatch"
  msgstr ""
  
--#: apt-pkg/indexrecords.cc:53
++#: apt-pkg/indexrecords.cc:61
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr ""
  
--#: apt-pkg/indexrecords.cc:63
++#: apt-pkg/indexrecords.cc:71
  #, c-format
  msgid "No sections in Release file %s"
  msgstr ""
  
--#: apt-pkg/indexrecords.cc:97
++#: apt-pkg/indexrecords.cc:105
  #, c-format
  msgid "No Hash entry in Release file %s"
  msgstr ""
  
--#: apt-pkg/indexrecords.cc:110
++#: apt-pkg/indexrecords.cc:118
  #, c-format
  msgid "Invalid 'Valid-Until' entry in Release file %s"
  msgstr ""
  
--#: apt-pkg/indexrecords.cc:125
++#: apt-pkg/indexrecords.cc:137
  #, c-format
  msgid "Invalid 'Date' entry in Release file %s"
  msgstr ""
  
--#: apt-pkg/vendorlist.cc:71
++#: apt-pkg/vendorlist.cc:78
  #, c-format
  msgid "Vendor block %s contains no fingerprint"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:525
++#: apt-pkg/cdrom.cc:528
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
  "Mounting CD-ROM\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
++#: apt-pkg/cdrom.cc:537 apt-pkg/cdrom.cc:634
  msgid "Identifying.. "
  msgstr ""
  
--#: apt-pkg/cdrom.cc:562
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
++#: apt-pkg/cdrom.cc:574 apt-pkg/cdrom.cc:850
  msgid "Unmounting CD-ROM...\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:594
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:612
  msgid "Unmounting CD-ROM\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:614
++#: apt-pkg/cdrom.cc:617
  msgid "Waiting for disc...\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:623
++#: apt-pkg/cdrom.cc:626
  msgid "Mounting CD-ROM...\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:642
++#: apt-pkg/cdrom.cc:645
  msgid "Scanning disc for index files..\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:684
++#: apt-pkg/cdrom.cc:687
  #, c-format
  msgid ""
  "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
  "%zu signatures\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:695
++#: apt-pkg/cdrom.cc:698
  msgid ""
  "Unable to locate any package files, perhaps this is not a Debian Disc or the "
  "wrong architecture?"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:722
++#: apt-pkg/cdrom.cc:725
  #, c-format
  msgid "Found label '%s'\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:751
++#: apt-pkg/cdrom.cc:754
  msgid "That is not a valid name, try again.\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:768
++#: apt-pkg/cdrom.cc:771
  #, c-format
  msgid ""
  "This disc is called: \n"
  "'%s'\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:770
++#: apt-pkg/cdrom.cc:773
  msgid "Copying package lists..."
  msgstr ""
  
--#: apt-pkg/cdrom.cc:797
++#: apt-pkg/cdrom.cc:800
  msgid "Writing new source list\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:805
++#: apt-pkg/cdrom.cc:808
  msgid "Source list entries for this disc are:\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909
 -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
++#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:930
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911
 -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
++#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914
 -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
++#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917
 -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
++#: apt-pkg/indexcopy.cc:281 apt-pkg/indexcopy.cc:938
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:537
++#: apt-pkg/indexcopy.cc:540
  #, c-format
  msgid "Skipping nonexistent file %s"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:543
++#: apt-pkg/indexcopy.cc:546
  #, c-format
  msgid "Can't find authentication record for: %s"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:549
++#: apt-pkg/indexcopy.cc:552
  #, c-format
  msgid "Hash mismatch for: %s"
  msgstr ""
  
- #: apt-pkg/cacheset.cc:337
 -#: apt-pkg/indexcopy.cc:677
++#: apt-pkg/indexcopy.cc:680
+ #, c-format
+ msgid "File %s doesn't start with a clearsigned message"
+ msgstr ""
+ 
+ #. TRANSLATOR: %s is the trusted keyring parts directory
 -#: apt-pkg/indexcopy.cc:708
++#: apt-pkg/indexcopy.cc:711
+ #, c-format
+ msgid "No keyring installed in %s."
+ msgstr ""
+ 
 -#: apt-pkg/cacheset.cc:337
++#: apt-pkg/cacheset.cc:342
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr ""
  
--#: apt-pkg/cacheset.cc:340
++#: apt-pkg/cacheset.cc:345
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr ""
  
--#: apt-pkg/cacheset.cc:447
++#: apt-pkg/cacheset.cc:452
  #, c-format
  msgid "Couldn't find task '%s'"
  msgstr ""
  
--#: apt-pkg/cacheset.cc:454
++#: apt-pkg/cacheset.cc:459
  #, c-format
  msgid "Couldn't find any package by regex '%s'"
  msgstr ""
  
--#: apt-pkg/cacheset.cc:467
++#: apt-pkg/cacheset.cc:472
  #, c-format
  msgid "Can't select versions from package '%s' as it is purely virtual"
  msgstr ""
  
--#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
++#: apt-pkg/cacheset.cc:480 apt-pkg/cacheset.cc:488
  #, c-format
  msgid ""
  "Can't select installed nor candidate version from package '%s' as it has "
  "neither of them"
  msgstr ""
  
--#: apt-pkg/cacheset.cc:491
++#: apt-pkg/cacheset.cc:496
  #, c-format
  msgid "Can't select newest version from package '%s' as it is purely virtual"
  msgstr ""
  
--#: apt-pkg/cacheset.cc:499
++#: apt-pkg/cacheset.cc:504
  #, c-format
  msgid "Can't select candidate version from package %s as it has no candidate"
  msgstr ""
  
--#: apt-pkg/cacheset.cc:507
++#: apt-pkg/cacheset.cc:512
  #, c-format
  msgid "Can't select installed version from package %s as it is not installed"
  msgstr ""
  
- #: apt-pkg/edsp.cc:32 apt-pkg/edsp.cc:52
 -#: apt-pkg/deb/dpkgpm.cc:54
++#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
 +msgid "Send scenario to solver"
 +msgstr ""
 +
- #: apt-pkg/edsp.cc:204
++#: apt-pkg/edsp.cc:213
 +msgid "Send request to solver"
 +msgstr ""
 +
- #: apt-pkg/edsp.cc:272
++#: apt-pkg/edsp.cc:281
 +msgid "Prepare for receiving solution"
 +msgstr ""
 +
- #: apt-pkg/edsp.cc:279
++#: apt-pkg/edsp.cc:288
 +msgid "External solver failed without a proper error message"
 +msgstr ""
 +
- #: apt-pkg/edsp.cc:550 apt-pkg/edsp.cc:553 apt-pkg/edsp.cc:558
++#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
 +msgid "Execute external solver"
 +msgstr ""
 +
- #: apt-pkg/deb/dpkgpm.cc:69
++#: apt-pkg/deb/dpkgpm.cc:71
  #, c-format
  msgid "Installing %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:70 apt-pkg/deb/dpkgpm.cc:864
 -#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
++#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:866
  #, c-format
  msgid "Configuring %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:871
 -#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
++#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:873
  #, c-format
  msgid "Removing %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:72
 -#: apt-pkg/deb/dpkgpm.cc:57
++#: apt-pkg/deb/dpkgpm.cc:74
  #, c-format
  msgid "Completely removing %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:73
 -#: apt-pkg/deb/dpkgpm.cc:58
++#: apt-pkg/deb/dpkgpm.cc:75
  #, c-format
  msgid "Noting disappearance of %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:74
 -#: apt-pkg/deb/dpkgpm.cc:59
++#: apt-pkg/deb/dpkgpm.cc:76
  #, c-format
  msgid "Running post-installation trigger %s"
  msgstr ""
  
  #. FIXME: use a better string after freeze
- #: apt-pkg/deb/dpkgpm.cc:670
 -#: apt-pkg/deb/dpkgpm.cc:654
++#: apt-pkg/deb/dpkgpm.cc:672
  #, c-format
  msgid "Directory '%s' missing"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:685 apt-pkg/deb/dpkgpm.cc:705
 -#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
++#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
  #, c-format
  msgid "Could not open file '%s'"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:857
 -#: apt-pkg/deb/dpkgpm.cc:841
++#: apt-pkg/deb/dpkgpm.cc:859
  #, c-format
  msgid "Preparing %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:858
 -#: apt-pkg/deb/dpkgpm.cc:842
++#: apt-pkg/deb/dpkgpm.cc:860
  #, c-format
  msgid "Unpacking %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:863
 -#: apt-pkg/deb/dpkgpm.cc:847
++#: apt-pkg/deb/dpkgpm.cc:865
  #, c-format
  msgid "Preparing to configure %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:865
 -#: apt-pkg/deb/dpkgpm.cc:849
++#: apt-pkg/deb/dpkgpm.cc:867
  #, c-format
  msgid "Installed %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:870
 -#: apt-pkg/deb/dpkgpm.cc:854
++#: apt-pkg/deb/dpkgpm.cc:872
  #, c-format
  msgid "Preparing for removal of %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:872
 -#: apt-pkg/deb/dpkgpm.cc:856
++#: apt-pkg/deb/dpkgpm.cc:874
  #, c-format
  msgid "Removed %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:877
 -#: apt-pkg/deb/dpkgpm.cc:861
++#: apt-pkg/deb/dpkgpm.cc:879
  #, c-format
  msgid "Preparing to completely remove %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:878
 -#: apt-pkg/deb/dpkgpm.cc:862
++#: apt-pkg/deb/dpkgpm.cc:880
  #, c-format
  msgid "Completely removed %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:1098
 -#: apt-pkg/deb/dpkgpm.cc:1082
++#: apt-pkg/deb/dpkgpm.cc:1111
  msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:1129
 -#: apt-pkg/deb/dpkgpm.cc:1113
++#: apt-pkg/deb/dpkgpm.cc:1141
  msgid "Running dpkg"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:1354
 -#: apt-pkg/deb/dpkgpm.cc:1338
++#: apt-pkg/deb/dpkgpm.cc:1320
++msgid "Operation was interrupted before it could finish"
++msgstr ""
++
++#: apt-pkg/deb/dpkgpm.cc:1377
  msgid "No apport report written because MaxReports is reached already"
  msgstr ""
  
  #. check if its not a follow up error
- #: apt-pkg/deb/dpkgpm.cc:1359
 -#: apt-pkg/deb/dpkgpm.cc:1343
++#: apt-pkg/deb/dpkgpm.cc:1382
  msgid "dependency problems - leaving unconfigured"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:1361
 -#: apt-pkg/deb/dpkgpm.cc:1345
++#: apt-pkg/deb/dpkgpm.cc:1384
  msgid ""
  "No apport report written because the error message indicates its a followup "
  "error from a previous failure."
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:1367
 -#: apt-pkg/deb/dpkgpm.cc:1351
++#: apt-pkg/deb/dpkgpm.cc:1390
  msgid ""
  "No apport report written because the error message indicates a disk full "
  "error"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:1373
 -#: apt-pkg/deb/dpkgpm.cc:1357
++#: apt-pkg/deb/dpkgpm.cc:1396
  msgid ""
  "No apport report written because the error message indicates a out of memory "
  "error"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:1380
 -#: apt-pkg/deb/dpkgpm.cc:1364
++#: apt-pkg/deb/dpkgpm.cc:1403
  msgid ""
  "No apport report written because the error message indicates a dpkg I/O error"
  msgstr ""
  
- #: apt-pkg/deb/debsystem.cc:79
 -#: apt-pkg/deb/debsystem.cc:69
++#: apt-pkg/deb/debsystem.cc:84
  #, c-format
  msgid ""
  "Unable to lock the administration directory (%s), is another process using "
  "it?"
  msgstr ""
  
- #: apt-pkg/deb/debsystem.cc:82
 -#: apt-pkg/deb/debsystem.cc:72
++#: apt-pkg/deb/debsystem.cc:87
  #, c-format
  msgid "Unable to lock the administration directory (%s), are you root?"
  msgstr ""
  
  #. TRANSLATORS: the %s contains the recovery command, usually
  #. dpkg --configure -a
- #: apt-pkg/deb/debsystem.cc:98
 -#: apt-pkg/deb/debsystem.cc:88
++#: apt-pkg/deb/debsystem.cc:103
  #, c-format
  msgid ""
  "dpkg was interrupted, you must manually run '%s' to correct the problem. "
  msgstr ""
  
- #: apt-pkg/deb/debsystem.cc:116
 -#: apt-pkg/deb/debsystem.cc:106
++#: apt-pkg/deb/debsystem.cc:121
  msgid "Not locked"
  msgstr ""
  
  #. FIXME: fallback to a default mirror here instead
  #. and provide a config option to define that default
--#: methods/mirror.cc:260
++#: methods/mirror.cc:279
  #, c-format
  msgid "No mirror file '%s' found "
  msgstr ""
  
  #. FIXME: fallback to a default mirror here instead
  #. and provide a config option to define that default
--#: methods/mirror.cc:267
++#: methods/mirror.cc:286
  #, c-format
  msgid "Can not read mirror file '%s'"
  msgstr ""
  
--#: methods/mirror.cc:422
++#: methods/mirror.cc:441
  #, c-format
  msgid "[Mirror: %s]"
  msgstr ""
  
--#: methods/rred.cc:503
++#: methods/rred.cc:509
  #, c-format
  msgid ""
  "Could not patch %s with mmap and with file operation usage - the patch seems "
  "to be corrupt."
  msgstr ""
  
--#: methods/rred.cc:508
++#: methods/rred.cc:514
  #, c-format
  msgid ""
  "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
  "to be corrupt."
  msgstr ""
  
--#: methods/rsh.cc:330
++#: methods/rsh.cc:336
  msgid "Connection closed prematurely"
  msgstr ""