From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 5 Apr 2011 09:41:08 +0000 (+0200)
Subject: merged from the debian-sid branch
X-Git-Tag: 0.9.13.exp1ubuntu1~193
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a70b91850530b48f5a15bee95d80a3941cf6e85c?hp=-c

merged from the debian-sid branch
---

a70b91850530b48f5a15bee95d80a3941cf6e85c
diff --combined apt-pkg/deb/dpkgpm.cc
index 240574d2a,01808be24..e957ce5fd
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -1002,6 -1002,7 +1002,7 @@@ bool pkgDPkgPM::Go(int OutStatusFd
        else
        {
  	 string const nativeArch = _config->Find("APT::Architecture");
+ 	 unsigned long const oldSize = I->Op == Item::Configure ? Size : 0;
  	 for (;I != J && Size < MaxArgBytes; I++)
  	 {
  	    if((*I).Pkg.end() == true)
@@@ -1016,8 -1017,11 +1017,11 @@@
  	       Args[n++] = Packages[pkgcount++];
  	    }
  	    Size += strlen(Args[n-1]);
- 	 }	 
-       }      
+ 	 }
+ 	 // skip configure action if all sheduled packages disappeared
+ 	 if (oldSize == Size)
+ 	    continue;
+       }
        Args[n] = 0;
        J = I;
        
@@@ -1285,7 -1289,7 +1289,7 @@@ void pkgDPkgPM::WriteApportReport(cons
     string::size_type pos;
     FILE *report;
  
 -   if (_config->FindB("Dpkg::ApportFailureReport", false) == false)
 +   if (_config->FindB("Dpkg::ApportFailureReport", true) == false)
     {
        std::clog << "configured to not write apport reports" << std::endl;
        return;
@@@ -1312,28 -1316,16 +1316,28 @@@
     }
  
     // do not report out-of-memory failures 
 -   if(strstr(errormsg, strerror(ENOMEM)) != NULL) {
 +   if(strstr(errormsg, strerror(ENOMEM)) != NULL ||
 +      strstr(errormsg, "Cannot allocate memory") != NULL) {
        std::clog << _("No apport report written because the error message indicates a out of memory error") << std::endl;
        return;
     }
  
 -   // do not report dpkg I/O errors
 -   // XXX - this message is localized, but this only matches the English version.  This is better than nothing.
 -   if(strstr(errormsg, "short read in buffer_copy (")) {
 -      std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl;
 -      return;
 +   // do not report dpkg I/O errors, this is a format string, so we compare
 +   // the prefix and the suffix of the error with the dpkg error message
 +   const char *short_read_error = dgettext("dpkg", "short read in buffer_copy %s");
 +   vector<string> list = VectorizeString(short_read_error, '%');
 +   if (list.size() > 1) 
 +   {
 +      // we need to split %s, VectorizeString only allows char so we need
 +      // to kill the "s" manually
 +      if (list[1].size() > 1) {
 +         list[1].erase(0, 1);
 +         if(strstr(errormsg, list[0].c_str()) && 
 +            strstr(errormsg, list[1].c_str())) {
 +            std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl;
 +            return;
 +         }
 +      }
     }
  
     // get the pkgname and reportfile
diff --combined apt-pkg/depcache.cc
index a30bea3cc,07803d7bf..8cf322464
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@@ -819,8 -819,7 +819,7 @@@ void pkgDepCache::Update(PkgIterator co
  void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser,
                             unsigned long Depth)
  {
-    // Simplifies other routines.
-    if (Pkg.end() == true)
+    if (IsModeChangeOk(ModeKeep, Pkg, Depth, FromUser) == false)
        return;
  
     /* Reject an attempt to keep a non-source broken installed package, those
@@@ -828,25 -827,22 +827,22 @@@
     if (Pkg.State() == PkgIterator::NeedsUnpack && 
         Pkg.CurrentVer().Downloadable() == false)
        return;
-    
-    /** \todo Can this be moved later in the method? */
-    ActionGroup group(*this);
  
     /* We changed the soft state all the time so the UI is a bit nicer
        to use */
     StateCache &P = PkgState[Pkg->ID];
+ 
+    // Check that it is not already kept
+    if (P.Mode == ModeKeep)
+       return;
+ 
     if (Soft == true)
        P.iFlags |= AutoKept;
     else
        P.iFlags &= ~AutoKept;
-    
-    // Check that it is not already kept
-    if (P.Mode == ModeKeep)
-       return;
  
-    // We dont even try to keep virtual packages..
-    if (Pkg->VersionList == 0)
-       return;
+    ActionGroup group(*this);
+ 
  #if 0 // reseting the autoflag here means we lose the 
        // auto-mark information if a user selects a package for removal
        // but changes  his mind then and sets it for keep again
@@@ -883,30 -879,26 +879,26 @@@
  void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge,
                               unsigned long Depth, bool FromUser)
  {
-    // Simplifies other routines.
-    if (Pkg.end() == true)
+    if (IsModeChangeOk(ModeDelete, Pkg, Depth, FromUser) == false)
        return;
  
-    ActionGroup group(*this);
+    StateCache &P = PkgState[Pkg->ID];
  
     // Check that it is not already marked for delete
-    StateCache &P = PkgState[Pkg->ID];
-    P.iFlags &= ~(AutoKept | Purge);
-    if (rPurge == true)
-       P.iFlags |= Purge;
-    
     if ((P.Mode == ModeDelete || P.InstallVer == 0) && 
         (Pkg.Purge() == true || rPurge == false))
        return;
-    
-    // We dont even try to delete virtual packages..
-    if (Pkg->VersionList == 0)
-       return;
  
-    // check if we are allowed to install the package
+    // check if we are allowed to remove the package
     if (IsDeleteOk(Pkg,rPurge,Depth,FromUser) == false)
        return;
  
+    P.iFlags &= ~(AutoKept | Purge);
+    if (rPurge == true)
+       P.iFlags |= Purge;
+ 
+    ActionGroup group(*this);
+ 
     if (DebugMarker == true)
        std::clog << OutputInDepth(Depth) << (rPurge ? "MarkPurge " : "MarkDelete ") << Pkg << " FU=" << FromUser << std::endl;
  
@@@ -927,25 -919,14 +919,15 @@@
  									/*}}}*/
  // DepCache::IsDeleteOk - check if it is ok to remove this package	/*{{{*/
  // ---------------------------------------------------------------------
- /* The default implementation just honors dpkg hold
-    But an application using this library can override this method
-    to control the MarkDelete behaviour */
+ /* The default implementation tries to prevent deletion of install requests.
+    dpkg holds are enforced by the private IsModeChangeOk */
  bool pkgDepCache::IsDeleteOk(PkgIterator const &Pkg,bool rPurge,
  			      unsigned long Depth, bool FromUser)
  {
-    if (FromUser == false && Pkg->SelectedState == pkgCache::State::Hold && _config->FindB("APT::Ignore-Hold",false) == false)
-    {
-       if (DebugMarker == true)
- 	 std::clog << OutputInDepth(Depth) << "Hold prevents MarkDelete of " << Pkg << " FU=" << FromUser << std::endl;
-       return false;
-    }
-    // if the removal is not explictely requested by the user, protect
-    // explicit new-install package from accidental removal by the 
-    // problemresolver
-    else if (FromUser == false && Pkg->CurrentVer == 0)
+    if (FromUser == false && Pkg->CurrentVer == 0)
     {
        StateCache &P = PkgState[Pkg->ID];
 +      // Status == 2 means this applies for new installs only
        if (P.InstallVer != 0 && P.Status == 2 && (P.Flags & Flag::Auto) != Flag::Auto)
        {
  	 if (DebugMarker == true)
@@@ -953,6 -934,61 +935,61 @@@
  	 return false;
        }
     }
+    return true;
+ }
+ 									/*}}}*/
+ // DepCache::IsModeChangeOk - check if it is ok to change the mode	/*{{{*/
+ // ---------------------------------------------------------------------
+ /* this is used by all Mark methods on the very first line to check sanity
+    and prevents mode changes for packages on hold for example.
+    If you want to check Mode specific stuff you can use the virtual public
+    Is<Mode>Ok methods instead */
+ char const* PrintMode(char const mode)
+ {
+ 	 switch (mode)
+ 	 {
+ 	 case pkgDepCache::ModeInstall: return "Install";
+ 	 case pkgDepCache::ModeKeep: return "Keep";
+ 	 case pkgDepCache::ModeDelete: return "Delete";
+ 	 default: return "UNKNOWN";
+ 	 }
+ }
+ bool pkgDepCache::IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg,
+ 				 unsigned long const Depth, bool const FromUser)
+ {
+    // we are not trying to hard…
+    if (unlikely(Depth > 100))
+       return false;
+ 
+    // general sanity
+    if (unlikely(Pkg.end() == true || Pkg->VersionList == 0))
+       return false;
+ 
+    // the user is always right
+    if (FromUser == true)
+       return true;
+ 
+    StateCache &P = PkgState[Pkg->ID];
+ 
+    // if previous state was set by user only user can reset it
+    if ((P.iFlags & Protected) == Protected)
+    {
+       if (unlikely(DebugMarker == true) && P.Mode != mode)
+ 	 std::clog << OutputInDepth(Depth) << "Ignore Mark" << PrintMode(mode)
+ 		   << " of " << Pkg << " as its mode (" << PrintMode(P.Mode)
+ 		   << ") is protected" << std::endl;
+       return false;
+    }
+    // enforce dpkg holds
+    else if (mode != ModeKeep && Pkg->SelectedState == pkgCache::State::Hold &&
+ 	    _config->FindB("APT::Ignore-Hold",false) == false)
+    {
+       if (unlikely(DebugMarker == true) && P.Mode != mode)
+ 	 std::clog << OutputInDepth(Depth) << "Hold prevents Mark" << PrintMode(mode)
+ 		   << " of " << Pkg << std::endl;
+       return false;
+    }
+ 
     return true;
  }
  									/*}}}*/
@@@ -963,19 -999,17 +1000,17 @@@ void pkgDepCache::MarkInstall(PkgIterat
  			      unsigned long Depth, bool FromUser,
  			      bool ForceImportantDeps)
  {
-    if (Depth > 100)
+    if (IsModeChangeOk(ModeInstall, Pkg, Depth, FromUser) == false)
        return;
-    
-    // Simplifies other routines.
-    if (Pkg.end() == true)
+ 
+    StateCache &P = PkgState[Pkg->ID];
+ 
+    // See if there is even any possible instalation candidate
+    if (P.CandidateVer == 0)
        return;
-    
-    ActionGroup group(*this);
  
     /* Check that it is not already marked for install and that it can be 
        installed */
-    StateCache &P = PkgState[Pkg->ID];
-    P.iFlags &= ~AutoKept;
     if ((P.InstPolicyBroken() == false && P.InstBroken() == false) && 
         (P.Mode == ModeInstall ||
  	P.CandidateVer == (Version *)Pkg.CurrentVer()))
@@@ -985,17 -1019,13 +1020,13 @@@
        return;
     }
  
-    // See if there is even any possible instalation candidate
-    if (P.CandidateVer == 0)
-       return;
-    // We dont even try to install virtual packages..
-    if (Pkg->VersionList == 0)
-       return;
- 
     // check if we are allowed to install the package
     if (IsInstallOk(Pkg,AutoInst,Depth,FromUser) == false)
        return;
  
+    ActionGroup group(*this);
+    P.iFlags &= ~AutoKept;
+ 
     /* Target the candidate version and remove the autoflag. We reset the
        autoflag below if this was called recursively. Otherwise the user
        should have the ability to de-auto a package by changing its state */
@@@ -1208,18 -1238,11 +1239,11 @@@
  									/*}}}*/
  // DepCache::IsInstallOk - check if it is ok to install this package	/*{{{*/
  // ---------------------------------------------------------------------
- /* The default implementation just honors dpkg hold
-    But an application using this library can override this method
-    to control the MarkInstall behaviour */
+ /* The default implementation does nothing.
+    dpkg holds are enforced by the private IsModeChangeOk */
  bool pkgDepCache::IsInstallOk(PkgIterator const &Pkg,bool AutoInst,
  			      unsigned long Depth, bool FromUser)
  {
-    if (FromUser == false && Pkg->SelectedState == pkgCache::State::Hold && _config->FindB("APT::Ignore-Hold",false) == false)
-    {
-       if (DebugMarker == true)
- 	 std::clog << OutputInDepth(Depth) << "Hold prevents MarkInstall of " << Pkg << " FU=" << FromUser << std::endl;
-       return false;
-    }
     return true;
  }
  									/*}}}*/
@@@ -1244,11 -1267,6 +1268,6 @@@ void pkgDepCache::SetReInstall(PkgItera
     
     AddStates(Pkg);
     AddSizes(Pkg);
- 
-    if (unlikely(Pkg.CurrentVer().end() == true))
-       return;
- 
-    SetReInstall(Pkg.Group().FindPkg("all"), To);
  }
  									/*}}}*/
  // DepCache::SetCandidateVersion - Change the candidate version		/*{{{*/
diff --combined cmdline/apt-get.cc
index f71b252c8,6ffecd777..cd96b8201
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -764,7 -764,7 +764,7 @@@ struct TryToInstall 
     unsigned long AutoMarkChanged;
     APT::PackageSet doAutoInstallLater;
  
-    TryToInstall(pkgCacheFile &Cache, pkgProblemResolver &PM, bool const &FixBroken) : Cache(&Cache), Fix(&PM),
+    TryToInstall(pkgCacheFile &Cache, pkgProblemResolver *PM, bool const &FixBroken) : Cache(&Cache), Fix(PM),
  			FixBroken(FixBroken), AutoMarkChanged(0) {};
  
     void operator() (pkgCache::VerIterator const &Ver) {
@@@ -782,8 -782,10 +782,10 @@@
  	 ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"),
  		  Pkg.FullName(true).c_str());
        else {
- 	 Fix->Clear(Pkg);
- 	 Fix->Protect(Pkg);
+ 	 if (Fix != NULL) {
+ 	    Fix->Clear(Pkg);
+ 	    Fix->Protect(Pkg);
+ 	 }
  	 Cache->GetDepCache()->MarkInstall(Pkg,false);
  
  	 if (State.Install() == false) {
@@@ -871,16 -873,19 +873,19 @@@ struct TryToRemove 
     bool PurgePkgs;
     unsigned long AutoMarkChanged;
  
-    TryToRemove(pkgCacheFile &Cache, pkgProblemResolver &PM) : Cache(&Cache), Fix(&PM),
+    TryToRemove(pkgCacheFile &Cache, pkgProblemResolver *PM) : Cache(&Cache), Fix(PM),
  				PurgePkgs(_config->FindB("APT::Get::Purge", false)) {};
  
     void operator() (pkgCache::VerIterator const &Ver)
     {
        pkgCache::PkgIterator Pkg = Ver.ParentPkg();
  
-       Fix->Clear(Pkg);
-       Fix->Protect(Pkg);
-       Fix->Remove(Pkg);
+       if (Fix != NULL)
+       {
+ 	 Fix->Clear(Pkg);
+ 	 Fix->Protect(Pkg);
+ 	 Fix->Remove(Pkg);
+       }
  
        if ((Pkg->CurrentVer == 0 && PurgePkgs == false) ||
  	  (PurgePkgs == true && Pkg->CurrentState == pkgCache::State::NotInstalled))
@@@ -1385,10 -1390,10 +1390,10 @@@ bool TryToInstallBuildDep(pkgCache::Pkg
  
     if (Remove == true)
     {
-       TryToRemove RemoveAction(Cache, Fix);
+       TryToRemove RemoveAction(Cache, &Fix);
        RemoveAction(Pkg.VersionList());
     } else if (Cache[Pkg].CandidateVer != 0) {
-       TryToInstall InstallAction(Cache, Fix, BrokenFix);
+       TryToInstall InstallAction(Cache, &Fix, BrokenFix);
        InstallAction(Cache[Pkg].CandidateVerIter(Cache));
        InstallAction.doAutoInstall();
     } else
@@@ -1791,8 -1796,10 +1796,10 @@@ bool DoInstall(CommandLine &CmdL
     bool BrokenFix = false;
     if (Cache->BrokenCount() != 0)
        BrokenFix = true;
-    
-    pkgProblemResolver Fix(Cache);
+ 
+    pkgProblemResolver* Fix = NULL;
+    if (_config->FindB("APT::Get::CallResolver", true) == true)
+       Fix = new pkgProblemResolver(Cache);
  
     static const unsigned short MOD_REMOVE = 1;
     static const unsigned short MOD_INSTALL = 2;
@@@ -1823,6 -1830,8 +1830,8 @@@
     if (_error->PendingError() == true)
     {
        helper.showVirtualPackageErrors(Cache);
+       if (Fix != NULL)
+ 	 delete Fix;
        return false;
     }
  
@@@ -1837,17 -1846,29 +1846,29 @@@
  
        for (unsigned short i = 0; order[i] != 0; ++i)
        {
- 	 if (order[i] == MOD_INSTALL) {
+ 	 if (order[i] == MOD_INSTALL)
  	    InstallAction = std::for_each(verset[MOD_INSTALL].begin(), verset[MOD_INSTALL].end(), InstallAction);
+ 	 else if (order[i] == MOD_REMOVE)
+ 	    RemoveAction = std::for_each(verset[MOD_REMOVE].begin(), verset[MOD_REMOVE].end(), RemoveAction);
+       }
+ 
+       if (Fix != NULL && _config->FindB("APT::Get::AutoSolving", true) == true)
+       {
+          for (unsigned short i = 0; order[i] != 0; ++i)
+          {
+ 	    if (order[i] != MOD_INSTALL)
+ 	       continue;
  	    InstallAction.propergateReleaseCandiateSwitching(helper.selectedByRelease, c0out);
  	    InstallAction.doAutoInstall();
  	 }
- 	 else if (order[i] == MOD_REMOVE)
- 	    RemoveAction = std::for_each(verset[MOD_REMOVE].begin(), verset[MOD_REMOVE].end(), RemoveAction);
        }
  
        if (_error->PendingError() == true)
+       {
+ 	 if (Fix != NULL)
+ 	    delete Fix;
  	 return false;
+       }
  
        /* If we are in the Broken fixing mode we do not attempt to fix the
  	 problems. This is if the user invoked install without -f and gave
@@@ -1856,14 -1877,19 +1877,19 @@@
        {
  	 c1out << _("You might want to run 'apt-get -f install' to correct these:") << endl;
  	 ShowBroken(c1out,Cache,false);
- 
+ 	 if (Fix != NULL)
+ 	    delete Fix;
  	 return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)."));
        }
-    
-       // Call the scored problem resolver
-       Fix.InstallProtect();
-       if (Fix.Resolve(true) == false)
- 	 _error->Discard();
+ 
+       if (Fix != NULL)
+       {
+ 	 // Call the scored problem resolver
+ 	 Fix->InstallProtect();
+ 	 if (Fix->Resolve(true) == false)
+ 	    _error->Discard();
+ 	 delete Fix;
+       }
  
        // Now we check the state of the packages,
        if (Cache->BrokenCount() != 0)
@@@ -2970,10 -2996,7 +2996,10 @@@ bool DownloadChangelog(CacheFile &Cache
        return true;
  
     // error
 -   return _error->Error("changelog download failed");
 +   pkgRecords Recs(CacheFile);
 +   pkgRecords::Parser &rec=Recs.Lookup(Ver.FileList());
 +   string srcpkg = rec.SourcePkg().empty() ? Pkg.Name() : rec.SourcePkg();
 +   return _error->Error("changelog for this version is not (yet) available; try https://launchpad.net/ubuntu/+source/%s/+changelog", srcpkg.c_str());
  }
  									/*}}}*/
  // DisplayFileInPager - Display File with pager        			/*{{{*/
@@@ -3281,7 -3304,10 +3307,10 @@@ int main(int argc,const char *argv[]
     }
  
     // simulate user-friendly if apt-get has no root privileges
-    if (getuid() != 0 && _config->FindB("APT::Get::Simulate") == true)
+    if (getuid() != 0 && _config->FindB("APT::Get::Simulate") == true &&
+ 	(CmdL.FileSize() == 0 ||
+ 	 (strcmp(CmdL.FileList[0], "source") != 0 && strcmp(CmdL.FileList[0], "download") != 0 &&
+ 	  strcmp(CmdL.FileList[0], "changelog") != 0)))
     {
        if (_config->FindB("APT::Get::Show-User-Simulation-Note",true) == true)
  	 cout << _("NOTE: This is only a simulation!\n"
diff --combined debian/changelog
index 1cc7c5ee2,03bbe86d4..346702c21
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,39 +1,52 @@@
++apt (0.8.13.2ubuntu1) UNRELEASED; urgency=low
++
++  * merge fixes from debian-sid, most notable the handling of
++    arch=all architectures in python-apt (LP: #733741)
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Apr 2011 10:40:09 +0200
++
+ apt (0.8.13.2) unstable; urgency=low
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/deb/dpkgpm.cc:
+     - skip --configure if all packages disappeared
+   * apt-pkg/vendor.cc, apt-pkg/vendorlist.cc:
+     - mark them as deprecated as they are unused
+   * apt-pkg/deb/deblistparser.h:
+     - enable StripMultiArch by default for ParseDepends
+   * debian/apt.conf.autoremove:
+     - adapt to new gnumach kernel package naming (Closes: #619337)
+   * doc/apt_preferences.5.xml:
+     - correct typo spotted by Charles Plessy (Closes: #619088)
+     - document ButAutomaticUpgrades together with NotAutomatic
+       as suggested by Charles Plessy (Closes: #619083)
+   * apt-pkg/depcache.cc:
+     - remove pseudo handling leftover from SetReInstall
+     - do not change protected packages in autoinstall (Closes: #618848)
+   * apt-pkg/pkgcachegen.cc:
+     - make "all"->"native" an implementation detail of NewPackage
+       rather than rewrite it in higher methods
+   * apt-pkg/cacheiterator.h:
+     - return "all" instead of native architecture without breaking the abi
+       (too much) by extending enum instead of using bitflags (LP: #733741)
+   * apt-pkg/aptconfiguration.cc:
+     - use dpkg --print-foreign-architectures to get multiarch configuration
+       if non is specified with APT::Architectures (Closes: #612958)
+   * cmdline/apt-get.cc:
+     - do not show simulation notice for non-root commands (Closes: #619072)
+     - be able to disable resolver with APT::Get::CallResolver and disable
+       auto installation with APT::Get::AutoSolving
+   * apt-pkg/deb/deblistparser.cc:
+     - create foo:any provides for all architectures for an allowed package
+ 
+  -- Michael Vogt <mvo@debian.org>  Tue, 05 Apr 2011 09:40:28 +0200
+ 
 +apt (0.8.13.1ubuntu1) natty; urgency=low
 +
 +  * merged fixes from the debian-sid (LP: #744832)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 04 Apr 2011 14:40:51 +0200
 +
  apt (0.8.13.1) unstable; urgency=low
  
    * apt-pkg/acquire-item.cc: Use stat buffer if stat was
@@@ -11,24 -41,6 +54,24 @@@
  
   -- Julian Andres Klode <jak@debian.org>  Sat, 02 Apr 2011 20:55:35 +0200
  
 +apt (0.8.13ubuntu2) natty; urgency=low
 +
 +  * po/makefile:
 +    - add hack to run MSGMERGE again if it segfaults. this is to help
 +      powerpc to bootstrap
 +  * mirror method:
 +    - merge fix from Matt Zimmerman, many thanks (LP: #741098)
 +    - do not crash if the mirror file fails to download
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 24 Mar 2011 18:01:38 +0100
 +
 +apt (0.8.13ubuntu1) natty; urgency=low
 +
 +  * merged from debian/sid, this adds important fixes in the
 +    apt mirror method
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 16 Mar 2011 08:23:19 +0100
 +
  apt (0.8.13) unstable; urgency=low
  
    [ Thorsten Spindler ]
@@@ -50,29 -62,6 +93,29 @@@
  
   -- Michael Vogt <mvo@debian.org>  Wed, 16 Mar 2011 08:04:42 +0100
  
 +apt (0.8.12ubuntu2) unstable; urgency=low
 +
 +  [ Thorsten Spindler ]
 +  * methods/rsh.cc
 +    - fix rsh/ssh option parsing (LP: #678080), thanks to
 +      Ville Mattila 
 +  
 +  [ Michael Vogt ]
 +  * apt-pkg/acquire-item.cc:
 +    - mark pkgAcqIndexTrans as Index-File to avoid asking the
 +      user to insert the CD on each apt-get update
 +  * methods/mirror.cc:
 +    - improve debug output and fix bug in TryNextMirror
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 15:56:54 +0100
 +
 +apt (0.8.12ubuntu1) natty; urgency=low
 +
 +  * merged from debian/sid, this adds important fixes in the udev based
 +    cdrom handling and multiarch handling
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 16:12:22 +0100
 +
  apt (0.8.12) unstable; urgency=low
  
    [ Michael Vogt ]
@@@ -126,23 -115,6 +169,23 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 10 Mar 2011 14:46:48 +0100
  
 +apt (0.8.11.5ubuntu2) natty; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/debindexfile.cc:
 +    - ignore missing deb-src files in /var/lib/apt/lists, thanks
 +      to Thorsten Spindler (LP: #85590)
 +  * apt-pkg/contrib/fileutl.cc, apt-pkg/deb/dpkgpm.cc:
 +    - honor Dpkg::Chroot-Directory in the RunScripts*() methods
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 03 Mar 2011 17:39:30 +0100
 +
 +apt (0.8.11.5ubuntu1) natty; urgency=low
 +
 +  * Merged from debian/sid
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 18 Feb 2011 12:01:19 +0100
 +
  apt (0.8.11.5) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -374,27 -346,6 +417,27 @@@ apt (0.8.10.1) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Mon, 17 Jan 2011 13:41:04 +0100
  
 +apt (0.8.10ubuntu2) UNRELEASED; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - ignore lzma "Cannot allocate memory" errors, thanks to Brian
 +      Murray
 +    - add i18n support for the "short read in buffer_copy %s" handling
 +      from dpkg
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Jan 2011 18:26:05 +0100
 +
 +apt (0.8.10ubuntu1) natty; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * cmdline/apt-cache.cc: Create an error for apt-cache depends
 +    if packages could not found (LP: #647045)
 +  
 +  [ Michael Vogt ]
 +  * merged from debian-sid
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Dec 2010 15:53:49 +0100
 +
  apt (0.8.10) unstable; urgency=low
  
    [ Programs translations ]
@@@ -414,48 -365,6 +457,48 @@@
  
   -- Michael Vogt <mvo@debian.org>  Tue, 30 Nov 2010 10:42:17 +0100
  
 +apt (0.8.9ubuntu4) natty; urgency=low
 +
 +  [ Michael Vogt ]
 +  * cmdline/apt-key:
 +    - set timeout of wget for net-update to 90 seconds (thanks to \sh)
 +
 +  [ Martin Pitt ]
 +  * Revert r1819 and r1820 to disable compressed indexes by default again.
 +    Testing has brought up a few places where this seriously degrades
 +    performance, mostly in applications which iterate through all available
 +    package records, like update-apt-xapian-index or synaptic. See
 +    https://bugs.launchpad.net/ubuntu/+bugs?field.tag=apt-compressed-indexes
 +
 + -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 25 Nov 2010 08:50:37 +0100
 +
 +apt (0.8.9ubuntu3) natty; urgency=low
 +
 +  * methods/http.cc:
 +    - do not hang if Acquire::http::ProxyAutoDetect can not be
 +      executed or returns no data (LP: #654393)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 22 Nov 2010 10:42:50 +0100
 +
 +apt (0.8.9ubuntu2) natty; urgency=low
 +
 +  * drop apt-changelog, apt-get changelog implements all the 
 +    features it provides
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 18 Nov 2010 15:22:40 +0100
 +
 +apt (0.8.9ubuntu1) natty; urgency=low
 +
 +  * re-merged from the debian-sid bzr branch
 +  * merged lp:~mvo/apt/mvo, this brings two new commands:
 +    - apt-get download binary-pkgname to download a deb
 +    - apt-get changelog binary-pkgname to display the changelog
 +  * cmdline/apt-get.cc:
 +    - if the changelog download failed, do not show the generic error
 +      but point to launchpad instead
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 18 Nov 2010 15:02:14 +0100
 +
  apt (0.8.9) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -487,47 -396,6 +530,47 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 18 Nov 2010 09:25:04 +0100
  
 +apt (0.8.8ubuntu3) natty; urgency=low
 +
 +  * cmdline/apt-changelog: Filter out multiple results for a source package,
 +    just take the latest one.
 +  * cmdline/apt-changelog: Read server name from configuration
 +    APT::Changelog::Server instead of hardcoding it. This allows local users
 +    to point to a local changelog mirror, or make this script work for Debian.
 +  * Add debian/apt.conf.changelog: Configuration for apt-changelog with the
 +    server for Ubuntu (changelogs.ubuntu.com). Install it in debian/rules.
 +  * doc/apt-changelog.1.xml: Document the new option.
 +  * test/integration/test-compressed-indexes, test/test-indexes.sh:
 +    - Explicitly disable compressed indexes at the start. This ensures that we
 +      will actually test uncompressed indexes regardless of the internal
 +      default value of Acquire::GzipIndexes.
 +  * apt-pkg/acquire-item.cc: Set Acquire::GzipIndexes to "true" by default, to
 +    store compressed indexes. This feature is now mature enough for general
 +    consumption. Update doc/apt.conf.5.xml accordingly.
 +  * apt-pkg/aptconfiguration.cc: Have Acquire::CompressionTypes::Order default
 +    to preferring "gz", so that compressed indexes will actually work.
 +
 + -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 15 Nov 2010 12:14:15 +0100
 +
 +apt (0.8.8ubuntu2) natty; urgency=low
 +
 +  * Add cmdline/apt-changelog: Script to fetch package changelog from
 +    changelogs.ubuntu.com. Install it in cmdline/makefile and debian/rules.
 +  * Add doc/apt-changelog.1.xml, and install it in debian/rules.
 +
 + -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 09 Nov 2010 11:32:27 +0100
 +
 +apt (0.8.8ubuntu1) natty; urgency=low
 +
 +  * merged from debian-unstable, remainging changes:
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 29 Oct 2010 10:07:09 -0400
 +
  apt (0.8.8) unstable; urgency=low
  
    [ David Kalnischkies ]
@@@ -547,17 -415,6 +590,17 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 28 Oct 2010 21:22:21 +0200
  
 +apt (0.8.7ubuntu1) natty; urgency=low
 +
 +  * merged from debian-unstable, remainging changes:
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 15 Oct 2010 18:31:17 +0200
 +
  apt (0.8.7) unstable; urgency=low
  
    [ Manpages translations ]
@@@ -676,92 -533,6 +719,92 @@@ apt (0.8.4) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Fri, 10 Sep 2010 20:45:15 +0200
  
 +apt (0.8.3ubuntu7) maverick; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/depcache.cc:
 +    - do not remove packages which the user requested for installation
 +      explicitly while satisfying other install requests (Closes: #598669)
 +    Test case: debootstrap, install exim4, run "apt-get install postfix"
 +    This will result in exim4-heavy instead of postfix
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Oct 2010 14:13:38 +0200
 +
 +apt (0.8.3ubuntu6) maverick; urgency=low
 +
 +  [ Michael Vogt ]
 +  * debian/apt.cron.daily:
 +    - source /etc/default/locale (if available) so that the 
 +      apt-get update cron job fetches the right translated package
 +      descriptions (LP: #652951)
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/depcache.cc:
 +    - do not check endpointer packages instead of only those which prevented
 +      NeverAutoRemove settings from having an effect (Closes: #598452)
 +  * cmdline/apt-cache.cc:
 +    - use the TranslatedDescription for searching and not the first
 +      available one as it is maybe not an expected language (Closes: #597925)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 01 Oct 2010 15:25:00 +0200
 +
 +apt (0.8.3ubuntu5) maverick; urgency=low
 +
 +  * debian/apt.dirs:
 +    - add missing /usr/share/apt so that the keyring is installed
 +      into the right place (LP: #620576)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 22 Sep 2010 18:34:18 +0200
 +
 +apt (0.8.3ubuntu4) maverick; urgency=low
 +
 +  * merged lp:~mvo/apt/conflicts-on-virtuals to better deal
 +    with conflicts/breaks against virtual packages (LP: #614993)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 15 Sep 2010 19:48:26 +0200
 +
 +apt (0.8.3ubuntu3) maverick; urgency=low
 +
 +  * merged fixes from debian-sid
 +  
 +  [ Michael Vogt ]
 +  * apt-pkg/contrib/cdromutl.cc:
 +    - if apt-cdrom is used on writable media (like usb-sticks), do
 +      not use the root directory to identify the medium (as all 
 +      changes there change the ident id). Use the .disk directory 
 +      instead 
 +
 +  [ David Kalnischkies ]
 +  * ftparchive/writer.cc:
 +    - null the valid string instead of the date if Valid-Until is not set
 +  * apt-pkg/acquire-item.cc:
 +    - use also unsigned Release files again (Closes: #596189)
 +
 +  [ Christian Perrier ]
 +  * Fix missing space after dot in a message from apt-pkg
 +    Translations unfuzzied. Thanks to Holger Wansing.
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 10 Sep 2010 21:45:49 +0200
 +
 +apt (0.8.3ubuntu2) maverick; urgency=low
 +
 +  * ftparchive/writer.cc:
 +    - write out {Files,Checksum-Sha1,Checksum-Sha256} only if
 +      available LP: #633967. Thanks to Colin Watson
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Sep 2010 15:30:19 +0200
 +
 +apt (0.8.3ubuntu1) maverick; urgency=low
 +
 +  * merged fixes from debian-sid
 +  * debian/rules:
 +    - put ubuntu-archive.gpg back into the package (LP: #620576)
 +  * apt-pkg/init.cc:
 +    - ignore ".distUpgrade" and ".save" files in sources.list.d
 +      (LP: #631770)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Sep 2010 09:27:24 +0200
 +
  apt (0.8.3) unstable; urgency=low
  
    [ Programs translations ]
@@@ -854,69 -625,6 +897,69 @@@ apt (0.8.1) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Fri, 03 Sep 2010 18:36:11 +0200
  
 +apt (0.8.0ubuntu3) maverick; urgency=low
 +
 +  * merged fixes from the debian-sid bzr branch:
 +  
 +  [ Programs translations ]
 +  * Simplified Chinese (Aron Xu). Closes: #594458
 +  * Bulgarian (Damyan Ivanov). Closes: #594627
 +  * Portuguese (Miguel Figueiredo). Closes: #594668
 +  * Korean (Changwoo Ryu). Closes: #594809
 +
 +  [ Manpages translations ]
 +  * Portuguese (Américo Monteiro)
 +
 +  [ David Kalnischkies ]
 +  * cmdline/apt-cache.cc:
 +    - remove useless GetInitialize method
 +  * cmdline/apt-get.cc:
 +    - remove direct calls of ReadMainList and use the wrapper instead
 +      to protect us from useless re-reads and two-times notice display
 +    - remove death code by removing unused GetInitialize
 +  * apt-pkg/depcache.cc:
 +    - now that apt-get purge works on 'rc' packages let the MarkDelete
 +      pass this purge forward to the non-pseudo package for pseudos
 +  * apt-pkg/contrib/fileutl.cc:
 +    - apply SilentlyIgnore also on files without an extension
 +  * apt-pkg/contrib/configuration.cc:
 +    - fix autoremove by using correct config-option name and
 +      don't make faulty assumptions in error handling (Closes: #594689)
 +  * apt-pkg/versionmatch.cc:
 +    - let the pin origin actually work as advertised in the manpage
 +      which means "" are optional and pinning a local archive does
 +      work - even if it is a non-flat archive (Closes: #594435)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 03 Sep 2010 17:05:53 +0200
 +
 +apt (0.8.0ubuntu2) maverick; urgency=low
 +
 +  * merged fixes from the debian-sid bzr branch:
 +  
 +  [ Programs translations ]
 +  * Thai (Theppitak Karoonboonyanan). Closes: #592695
 +  * Russian (Yuri Kozlov). Closes: #594232
 +  * Slovak (Ivan Masár). Closes: #594255
 +  * Swedish (Daniel Nylander). Closes: #594241
 +  * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265
 +  * Italian (Milo Casagrande). Closes: #594238
 +  * Asturian (maacub). Closes: #594303
 +
 +  [ Christian Perrier ]
 +  * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
 +    Closes: #594211
 +
 +  [ David Kalnischkies ]
 +  * show in madison command again also source packages (LP: #614589)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 26 Aug 2010 18:56:23 +0200
 +
 +apt (0.8.0ubuntu1) maverick; urgency=low
 +
 +  * merged from debian/unstable
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 24 Aug 2010 21:39:06 +0200
 +
  apt (0.8.0) unstable; urgency=low
  
    [ Michael Vogt ]
@@@ -959,20 -667,6 +1002,20 @@@ apt (0.8.0~pre2) experimental; urgency=
  
   -- Michael Vogt <mvo@debian.org>  Mon, 23 Aug 2010 19:09:08 +0200
  
 +apt (0.8.0~pre1ubuntu2) maverick; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - enable apport reports again (got lost in the previous merge),
 +      thanks to Matt Zimmerman
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 23 Aug 2010 13:53:09 +0200
 +
 +apt (0.8.0~pre1ubuntu1) maverick; urgency=low
 +
 +  * merged fixes from debian/experimental
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 13 Aug 2010 17:49:40 +0200
 +
  apt (0.8.0~pre1) experimental; urgency=low
  
    [ Programs translations ]
@@@ -1015,56 -709,6 +1058,56 @@@
  
   -- Michael Vogt <mvo@debian.org>  Fri, 13 Aug 2010 17:00:49 +0200
  
 +apt (0.7.26~exp12ubuntu4) maverick; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/contrib/fileutl.cc:
 +    - Add WriteAtomic mode.
 +    - Revert WriteEmpty to old behavior (LP: #613211)
 +  * apt-pkg, methods:
 +    - Convert users of WriteEmpty to WriteAtomic.
 +  * apt-pkg/depcache.cc:
 +    - Only try upgrade for Breaks if there is a newer version, otherwise
 +      handle it as Conflicts (by removing it) (helps for #591882).
 +  
 +  [ Michael Vogt ]
 +  * debian/control:
 +    - Add recommends on gnupg to apt, apt-key uses it.
 +      (changed from debian)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 11 Aug 2010 12:01:30 +0200
 +
 +apt (0.7.26~exp12ubuntu3) maverick; urgency=low
 +
 +  [ Colin Watson ]
 +  * apt-pkg/cdrom.cc:
 +    - fix off-by-one error in DropBinaryArch
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 02 Aug 2010 21:04:18 +0200
 +
 +apt (0.7.26~exp12ubuntu2) maverick; urgency=low
 +
 +  * debian/apt.postinst:
 +    - do not fail if ubuntu-keyring is not installed
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 02 Aug 2010 11:47:59 +0200
 +
 +apt (0.7.26~exp12ubuntu1) maverick; urgency=low
 +
 +  * ABI break upload
 +  * merged from debian/experimental, remaining changes:
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +  * debian/apt.postinst
 +    - drop set_apt_proxy_from_gconf(), no longer needed in maverick
 +  * apt-pkg/pkgcache.cc:
 +    - re-evaluate the architectures cache when the cache is (re)opened
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 30 Jul 2010 19:32:15 +0200
 +
  apt (0.7.26~exp12) experimental; urgency=low
  
    [ Michael Vogt ]
@@@ -1679,174 -1323,28 +1722,174 @@@ apt (0.7.26~exp1) experimental; urgency
  
   -- Michael Vogt <mvo@debian.org>  Thu, 18 Feb 2010 16:11:39 +0100
  
 -apt (0.7.25.3) unstable; urgency=low
 +apt (0.7.25.3ubuntu10) maverick; urgency=low
  
 -  [ Christian Perrier ]
 -  * Italian translation update. Closes: #567532
 +  [ Michael Vogt ]
 +  * debian/apt.conf.ubuntu:
 +    - no longer install (empty) apt.conf.d/01ubuntu
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - make the apt/term.log output unbuffered (thanks to Matt Zimmerman)
 +    - fix FTBFS (LP: #600155)
  
 -  [ David Kalnischkies ]
 -  * apt-pkg/contrib/macros.h:
 -    - install the header system.h with a new name to be able to use
 -      it in other headers (Closes: #567662)
 -  * cmdline/acqprogress.cc:
 -    - Set Mode to Medium so that the correct prefix is used.
 -      Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243)
 -  * ftparchive/writer.cc:
 -    - generate sha1 and sha256 checksums for dsc (Closes: #567343)
 -  * cmdline/apt-get.cc:
 -    - don't mark as manually if in download only (Closes: #468180)
 +  [ Matthias G. ]
 +  * apt-pkg/deb/dpkgpm.cc: 
 +    - Fix segmentation fault when /var/log/apt ist missing. LP: #535509
  
 - -- Michael Vogt <mvo@debian.org>  Mon, 01 Feb 2010 18:41:15 +0100
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 08 Jul 2010 09:37:03 +0200
  
 -apt (0.7.25.2) unstable; urgency=low
 +apt (0.7.25.3ubuntu9) lucid-proposed; urgency=low
  
 -  [ Michael Vogt ]
 +  * debian/apt.postinst:
 +    - do not fail if getent returns nothing useful (LP: #579647)
 +      thanks to Jean-Baptiste Lallement
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 14 May 2010 09:40:50 +0200
 +
 +apt (0.7.25.3ubuntu8) lucid-proposed; urgency=low
 +
 +  [ Loïc Minier ]
 +  * Use https:// in Vcs-Bzr URL.
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/debrecords.cc:
 +    - fix max tag buffer size (LP: #545336, closes: #578959)
 +  * apt-pkg/indexfile.cc:
 +    - If no "_" is found in the language code, try to find a "."
 +      This is required for languages like Esperanto that have no
 +      county associated with them (LP: #560956)
 +      Thanks to "Aisano" for the fix
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 05 May 2010 10:33:46 +0200
 +
 +apt (0.7.25.3ubuntu7) lucid; urgency=low
 +
 +  Cherry pick fixes from the lp:~mvo/apt/mvo branch:
 +
 +  [ Evan Dandrea ]
 +  * Remember hosts with general failures for
 +    https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831).
 +  
 +  [ Michael Vogt ]
 +  * improve debug output for Debug::pkgPackageManager
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Apr 2010 20:30:03 +0200
 +
 +apt (0.7.25.3ubuntu6) lucid; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix crash when pkg.VersionList() is empty (LP: #556056)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 08 Apr 2010 21:13:25 +0200
 +
 +apt (0.7.25.3ubuntu5) lucid; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * cmdline/apt-get.cc:
 +    - try version match in FindSrc first exact than fuzzy (LP: #551178)
 +
 +  [ Jean-Baptiste Lallement ]
 +  * apt-pkg/contrib/strutl.cc:
 +    - always escape '%' (LP: #130289) (Closes: #500560)
 +    - unescape '%' sequence only if followed by 2 hex digit
 +    - username/password are urlencoded in proxy string (RFC 3986)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 31 Mar 2010 21:59:42 +0200
 +
 +apt (0.7.25.3ubuntu4) lucid; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/deb/debversion.cc:
 +    - consider absent of debian revision equivalent to 0 (Closes: #573592)
 +      LP: #540228
 +  * cmdline/apt-get.cc, apt-pkg/cdrom.cc:
 +   - fix memory leaks in error conditions in DoSource()
 +  * apt-pkg/deb/dpkgpm.cc:
 +   - fix error message construction in OpenLog()
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 26 Mar 2010 16:57:49 +0100
 +
 +apt (0.7.25.3ubuntu3) lucid; urgency=low
 +
 +  * apt-pkg/indexfile.cc:
 +    - remove "cs" from languages that need the full langcode when
 +      downloading translations (thanks to Steve Langasek)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 15 Mar 2010 09:42:39 +0100
 +
 +apt (0.7.25.3ubuntu2) lucid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * abicheck/
 +    - add new abitest tester using the ABI Compliance Checker from
 +      http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker
 +  * debian/apt.conf.autoremove:
 +    - add "oldlibs" to the APT::Never-MarkAuto-Sections as its used
 +      for transitional packages
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix backgrounding when dpkg runs (closes: #486222)
 +  * cmdline/apt-mark:
 +    - show error on incorrect aguments (LP: #517917), thanks to
 +      Torsten Spindler
 +  * cmdline/apt-get.cc:
 +    - if apt-get source foo=version or foo/distro can not be found,
 +      error out (LP: #502641)
 +  * apt-pkg/indexfile.cc:
 +    - deal correctly with three letter langcodes (LP: #391409)
 +  * debian/apt.cron.daily:
 +    - do not look into admin users gconf anymore for the http proxy
 +      the user now needs to use the "Apply system-wide" UI in the
 +      gnome-control-center to set it
 +  * debian/apt.postinst:
 +    - add set_apt_proxy_from_gconf() and run that once on upgrade if
 +      there is no proxy configured already system-wide (LP: #432631)
 +      From that point on gnome-control-center will have to warn if
 +      the user makes changes to the proxy settings and does not apply
 +      them system wide
 +
 +  [ Robert Collins ]
 +  * Change the package index Info methods to allow apt-cache policy to be
 +    useful when using several different archives on the same host.
 +    (Closes: #329814, LP: #22354)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 12 Mar 2010 23:10:52 +0100
 +
 +apt (0.7.25.3ubuntu1) lucid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merged with the debian-sid branch
 +  * methods/http.cc:
 +    - add Acquire::http::ProxyAutoDetect configuration that 
 +      can be used to call a external helper to figure out the 
 +      proxy configuration and return it to apt via stdout
 +      (this is a step towards WPAD and zeroconf/avahi support)
 +  
 +  [ Ivan Masár ]
 +  * Slovak translation update. Closes: #568294
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 17 Feb 2010 23:33:32 +0100
 +
 +apt (0.7.25.3) unstable; urgency=low
 +
 +  [ Christian Perrier ]
 +  * Italian translation update. Closes: #567532
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/contrib/macros.h:
 +    - install the header system.h with a new name to be able to use
 +      it in other headers (Closes: #567662)
 +  * cmdline/acqprogress.cc:
 +    - Set Mode to Medium so that the correct prefix is used.
 +      Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243)
 +  * ftparchive/writer.cc:
 +    - generate sha1 and sha256 checksums for dsc (Closes: #567343)
 +  * cmdline/apt-get.cc:
 +    - don't mark as manually if in download only (Closes: #468180)
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 01 Feb 2010 18:41:15 +0100
 +
 +apt (0.7.25.2) unstable; urgency=low
 +
 +  [ Michael Vogt ]
    * apt-pkg/contrib/cdromutl.cc:
      - fix UnmountCdrom() fails, give it a bit more time and try
        the umount again
@@@ -1945,39 -1443,6 +1988,39 @@@ apt (0.7.25.1) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Sat, 09 Jan 2010 21:52:36 +0100
  
 +apt (0.7.25ubuntu4) lucid; urgency=low
 +
 +  * cmdline/apt-cdrom.cc:
 +    - make Acquire::cdrom::AutoDetect default, this can be
 +      turned off with "--no-auto-detect"
 +  * methods/http.cc:
 +    - add cache-control headers even if no cache is given to allow
 +      adding options for intercepting proxies
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 02 Feb 2010 16:58:59 -0800
 +
 +apt (0.7.25ubuntu3) lucid; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - don't mark as manually if in download only (Closes: #468180)
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 01 Feb 2010 18:41:15 +0100
 +
 +apt (0.7.25ubuntu2) lucid; urgency=low
 +
 +  * Change history branch so that it does not break the 
 +    apt ABI for the pkgPackageManager interface
 +    (can be reverted on the next ABI break)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 23 Dec 2009 10:14:16 +0100
 +
 +apt (0.7.25ubuntu1) lucid; urgency=low
 +
 +  * Merged from the mvo branch
 +  * merged from the lp:~mvo/apt/history branch
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 Dec 2009 09:44:08 +0100
 +
  apt (0.7.25) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -2121,29 -1586,6 +2164,29 @@@
  
   -- Michael Vogt <mvo@debian.org>  Tue, 15 Dec 2009 09:21:55 +0100
  
 +apt (0.7.24ubuntu1) lucid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - include df -l output in the apport log as well (thanks to
 +      tjaalton)
 +  * apt-pkg/packagemanager.cc:
 +    - add output about pre-depends configuring when debug::pkgPackageManager
 +      is used
 +  * methods/https.cc:
 +    - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
 +      thanks to Brian Thomason for the patch
 +  * merge lp:~mvo/apt/netrc branch, this adds support for a
 +    /etc/apt/auth.conf that can be used to store username/passwords
 +    in a "netrc" style file (with the extension that it supports "/"
 +    in a machine definition). Based on the maemo git branch.
 +
 +  [ Brian Murray ]
 +  * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
 +    - typo fix (LP: #462328)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Dec 2009 09:27:26 +0100
 +
  apt (0.7.24) unstable; urgency=low
  
    [ Nicolas François ]
@@@ -2213,59 -1655,6 +2256,59 @@@
  
   -- Michael Vogt <mvo@debian.org>  Fri, 25 Sep 2009 19:57:25 +0200
  
 +apt (0.7.23.1ubuntu2) karmic; urgency=low
 +
 +  [ Michael Vogt ]
 +  * debian/control:
 +    - fix Vcr-Bzr header
 +
 +  [ Kees Cook ]
 +  * debian/apt.cron.daily:
 +    - fix quotes for use with "eval", thanks to Lars Ljung (LP: #449535).
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 15 Oct 2009 19:05:19 +0200
 +
 +apt (0.7.23.1ubuntu1) karmic; urgency=low
 +
 +  [ Matt Zimmerman ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - Suppress apport reports on dpkg short reads (these I/O errors are not 
 +      generally indicative of a bug in the packaging)
 +
 +  [ Loïc Minier ]
 +  * cmdline/apt-key:
 +    - Emit a warning if removed keys keyring is missing and skip associated
 +      checks (LP: #218971)
 +
 +  [ Brian Murray ]
 +  * cmdline/apt-get.cc:
 +    - typo fix (LP: #370094)
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - when tcgetattr() returns non-zero skip all pty magic 
 +      (thanks to Simon Richter, closes: #509866)
 +  * apt-inst/contrib/arfile.cc:
 +    - show propper error message for Invalid archive members
 +  * apt-pkg/acquire-worker.cc:
 +    - show error details of failed methods
 +  * apt-pkg/contrib/fileutl.cc:
 +    - if a process aborts with signal, show signal number
 +  * methods/http.cc:
 +    - ignore SIGPIPE, we deal with EPIPE from write in 
 +      HttpMethod::ServerDie() (LP: #385144)
 +  * debian/apt.cron.daily:
 +    - if the timestamp is too far in the future, delete it 
 +      (LP: #135262)
 +  
 +  [ Merge ]
 +  * merged from debian, reverted the libdlopen-udev branch
 +    because its too late in the release process for this now
 +  * not merged the proxy behaviour change from 0.7.23 (that will
 +    be part of lucid)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 23 Sep 2009 18:15:10 +0200
 +
  apt (0.7.23.1) unstable; urgency=low
  
    [ Michael Vogt ]
@@@ -2495,34 -1884,6 +2538,34 @@@ apt (0.7.22) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Wed, 29 Jul 2009 19:16:22 +0200
  
 +apt (0.7.21ubuntu1) karmic; urgency=low
 +
 +  * merged from the debian-sid bzr branch
 +  
 +  [ Christian Perrier ]
 +  * Documentation translations:
 +    - Fix a typo in apt-get(8) French translation. Closes: #525043
 +      Thanks to Guillaume Delacour for spotting it.
 +  * Translations:
 +    - fr.po
 +    - sk.po. Closes: #525857
 +    - ru.po. Closes: #526816
 +    - eu.po. Closes: #528985
 +    - zh_CN.po. Closes: #531390
 +    - fr.po
 +    - it.po. Closes: #531758
 +    - ca.po. Closes: #531921
 +  * Added translations
 +    - ast.po (Asturian by Marcos Alvareez Costales).
 +      Closes: #529007, #529730
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/acquire.cc:
 +    - make the (internal) max pipeline depth of the acquire queue
 +      configurable via Acquire::Max-Pipeline-Depth
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 09 Jun 2009 15:49:07 +0200
 +
  apt (0.7.21) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -2566,183 -1927,64 +2609,183 @@@
  
   -- Michael Vogt <mvo@debian.org>  Tue, 14 Apr 2009 14:12:51 +0200
  
 -apt (0.7.20.2) unstable; urgency=medium
 +apt (0.7.20.2ubuntu7) karmic; urgency=low
  
 -  [ Eugene V. Lyubimkin ]
 -  * Urgency set to medium due to RC bug fix.
 -  * doc/apt.ent, apt-get.8.xml:
 -    - Fix invalid XML entities. (Closes: #514402)
 +  * fix problematic use of tolower() when calculating the version 
 +    hash by using locale independant tolower_ascii() function. 
 +    Thanks to M. Vefa Bicakci (LP: #80248)
 +  * build fixes for g++-4.4
 +  * include dmesg output in apport package failures
 +  * include apt ordering into apport package failures
  
 - -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sat, 07 Feb 2009 16:48:21 +0200
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 24 Apr 2009 10:14:01 +0200
  
 -apt (0.7.20.1) unstable; urgency=low
 +apt (0.7.20.2ubuntu6) jaunty; urgency=low
 +
 +  [ Jamie Strandboge ]
 +  * apt.cron.daily: catch invalid dates due to DST time changes
 +    in the stamp files (LP: #354793)
  
    [ Michael Vogt ]
 -  * apt-pkg/pkgcachegen.cc:
 -    - fix apt-cache search for localized description 
 -      (closes: #512110)
 +  * methods/gpgv.cc:
 +    - properly check for expired and revoked keys (closes: #433091)
 +      LP: #356012
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 08 Apr 2009 22:39:50 +0200
 +
 +apt (0.7.20.2ubuntu5) jaunty; urgency=low
 +
 +  [ Colin Watson ]
 +  * cmdline/acqprogress.cc:
 +    - Call pkgAcquireStatus::Pulse even if quiet, so that we still get
 +      dlstatus messages on the status-fd (LP: #290234).
    
 -  [ Christian Perrier ]
 -  * Translations:
 -    - fr.po: fix spelling error to "défectueux". Thanks to Thomas Péteul.
 +  [ Michael Vogt ]
 +  * debian/apt.cron.daily:
 +    - do not clutter cron mail with bogus gconftool messages 
 +      (LP: #223502)
 +    - merge fix for cache locking from debian (closes: #459344)
 +    - run update-apt-xapian-index (with ionice) to ensure that
 +      the index is up-to-date when synaptic is run (LP: #288797)
  
 - -- Michael Vogt <mvo@debian.org>  Tue, 20 Jan 2009 09:35:05 +0100
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 30 Mar 2009 13:22:28 +0200
  
 -apt (0.7.20) unstable; urgency=low
 +apt (0.7.20.2ubuntu4) jaunty; urgency=low
  
 -  [ Eugene V. Lyubimkin ]
 -  * debian/changelog:
 -    - Fixed place of 'merged install-recommends and install-task branches'
 -      from 0.6.46.1 to 0.7.0. (Closes: #439866)
 -  * buildlib/config.{sub,guess}:
 -    - Renewed. This fixes lintian errors.
 -  * doc/apt.conf.5.xml, debian/apt-transport-https:
 -    - Documented briefly 'Acquire::https' group of options. (Closes: #507398)
 -    - Applied patch from Daniel Burrows to document 'Debug' group of options.
 -      (Closes: #457265)
 -    - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.
 -      (Closes: #438559)
 -    - Mentioned '/* ... */' comments. (Closes: #507601)
 -  * doc/examples/sources.list:
 -    - Removed obsolete commented non-us deb-src entry, replaced it with
 -      'deb-src security.debian.org' one. (Closes: #411298)
 -  * apt-pkg/contrib/mmap.cc:
 -    - Added instruction how to work around MMap error in MMap error message.
 -      (Closes: #385674, 436028)
 -  * COPYING:
 -    - Actualized. Removed obsolete Qt section, added GPLv2 clause.
 -      (Closes: #440049, #509337)
 +  * ftparchive/cachedb.cc:
 +    - when apt-ftparchive clean is used, compact the database
 +      at the end (thanks to cprov)
  
 -  [ Michael Vogt ]
 -  * add option to "apt-get build-dep" to mark the needed 
 -    build-dep packages as automatic installed. 
 -    This is controlled via the value of
 -    APT::Get::Build-Dep-Automatic and is set "false" by default.  
 -    Thanks to Aaron Haviland, closes: #448743
 -  * apt-inst/contrib/arfile.cc:
 -    - support members ending with '/' as well (thanks to Michal Cihr,
 -      closes: #500988)
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 26 Mar 2009 13:43:59 +0100
  
 -  [ Christian Perrier ]
 +apt (0.7.20.2ubuntu3) jaunty; urgency=low
 +
 +  * methods/mirror.cc:
 +    - when download the mirror file and the server is down,
 +      return a propper error message (LP: #278635)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 19 Mar 2009 15:42:15 +0100
 +
 +apt (0.7.20.2ubuntu2) jaunty; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - revert termios patch (LP: #338514)
 +  * cmdline/apt-get.cc
 +    - fix "apt-get source pkg" if there is a binary package and
 +      a source package of the same name but from different 
 +      packages (LP: #330103)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 09 Mar 2009 16:33:28 +0100
 +
 +apt (0.7.20.2ubuntu1) jaunty; urgency=low
 +
 +  [ Christian Perrier ]
 +  * Translations:
 +    - bg.po. Closes: #513211
 +    - zh_TW.po. Closes: #513311
 +    - nb.po. Closes: #513843
 +  
 +  [ Michael Vogt ]
 +  * merged from the debian-sid branch
 +  * [ABI break] merge support for http redirects, thanks to
 +    Jeff Licquia and Anthony Towns
 +  * [ABI break] use int for the package IDs (thanks to Steve Cotton)
 +  * apt-pkg/contrib/strutl.cc:
 +    - fix TimeToStr i18n (LP: #289807)
 +  * debian/apt.conf.autoremove:
 +    - readd "linux-image" (and friends) to the auto-remove
 +     blacklist
 +  * fix some i18n issues (thanks to  Gabor Kelemen)
 +    LP: #263089
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - filter "ENOMEM" errors when creating apport reports 
 +  * cmdline/apt-get.cc:
 +    - fix "apt-get source pkg=ver" if binary name != source name
 +      (LP: #202219)
 +  * apt-pkg/indexrecords.cc:
 +    - fix some i18n issues
 +  * apt-pkg/contrib/strutl.h:
 +    - add new strprintf() function to make i18n strings easier
 +  * apt-pkg/dev/debsystem.cc:
 +    - add missing apti18n.h header
 +  * cmdline/apt-get.cc:
 +    - default to "false" for the "APT::Get::Build-Dep-Automatic"
 +      option (follow debian here)
 +  * apt-pkg/pkgcache.cc:
 +    - do not run "dpkg --configure pkg" if pkg is in trigger-awaited
 +      state (LP: #322955)
 +  * methods/https.cc:
 +    - add Acquire::https::AllowRedirect support
 +    - do not unlink files in partial/ (thanks to robbiew)
 +
 +  [ Dereck Wonnacott ]
 +  * Clarify the --help for 'purge' (LP: #243948)
 +
 +  [ Ian Weisser ]
 +  * /apt-pkg/deb/debsystem.cc:
 +    - add 'sudo' to the error message to "run 'dpkg --configure -a'"
 +      (LP: #52697)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 09 Feb 2009 14:21:05 +0100
 +
 +apt (0.7.20.2) unstable; urgency=medium
 +
 +  [ Eugene V. Lyubimkin ]
 +  * Urgency set to medium due to RC bug fix.
 +  * doc/apt.ent, apt-get.8.xml:
 +    - Fix invalid XML entities. (Closes: #514402)
 +
 + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sat, 07 Feb 2009 16:48:21 +0200
 +
 +apt (0.7.20.1) unstable; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/pkgcachegen.cc:
 +    - fix apt-cache search for localized description 
 +      (closes: #512110)
 +  
 +  [ Christian Perrier ]
 +  * Translations:
 +    - fr.po: fix spelling error to "défectueux". Thanks to Thomas Péteul.
 +
 + -- Michael Vogt <mvo@debian.org>  Tue, 20 Jan 2009 09:35:05 +0100
 +
 +apt (0.7.20) unstable; urgency=low
 +
 +  [ Eugene V. Lyubimkin ]
 +  * debian/changelog:
 +    - Fixed place of 'merged install-recommends and install-task branches'
 +      from 0.6.46.1 to 0.7.0. (Closes: #439866)
 +  * buildlib/config.{sub,guess}:
 +    - Renewed. This fixes lintian errors.
 +  * doc/apt.conf.5.xml, debian/apt-transport-https:
 +    - Documented briefly 'Acquire::https' group of options. (Closes: #507398)
 +    - Applied patch from Daniel Burrows to document 'Debug' group of options.
 +      (Closes: #457265)
 +    - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.
 +      (Closes: #438559)
 +    - Mentioned '/* ... */' comments. (Closes: #507601)
 +  * doc/examples/sources.list:
 +    - Removed obsolete commented non-us deb-src entry, replaced it with
 +      'deb-src security.debian.org' one. (Closes: #411298)
 +  * apt-pkg/contrib/mmap.cc:
 +    - Added instruction how to work around MMap error in MMap error message.
 +      (Closes: #385674, 436028)
 +  * COPYING:
 +    - Actualized. Removed obsolete Qt section, added GPLv2 clause.
 +      (Closes: #440049, #509337)
 +
 +  [ Michael Vogt ]
 +  * add option to "apt-get build-dep" to mark the needed 
 +    build-dep packages as automatic installed. 
 +    This is controlled via the value of
 +    APT::Get::Build-Dep-Automatic and is set "false" by default.  
 +    Thanks to Aaron Haviland, closes: #448743
 +  * apt-inst/contrib/arfile.cc:
 +    - support members ending with '/' as well (thanks to Michal Cihr,
 +      closes: #500988)
 +
 +  [ Christian Perrier ]
    * Translations:
      - Finnish updated. Closes: #508449 
      - Galician updated. Closes: #509151
@@@ -2753,12 -1995,6 +2796,12 @@@
  
   -- Michael Vogt <mvo@debian.org>  Mon, 05 Jan 2009 08:59:20 +0100
  
 +apt (0.7.19ubuntu1) jaunty; urgency=low
 +
 +  * merge from debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 24 Nov 2008 10:52:20 +0100
 +
  apt (0.7.19) unstable; urgency=low
  
    [ Eugene V. Lyubimkin ]
@@@ -3057,90 -2293,6 +3100,90 @@@ apt (0.7.15~exp1) experimental; urgency
    
   -- Michael Vogt <mvo@debian.org>  Tue, 16 Sep 2008 21:27:03 +0200
  
 +apt (0.7.14ubuntu7) jaunty; urgency=low
 +
 +  * cmdline/apt-cache.cc:
 +    - remove the gettext from a string that consists entirely 
 +      of variables (LP: #56792)
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix potential hang when in a backgroud process group
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Oct 2008 21:09:12 +0100
 +
 +apt (0.7.14ubuntu6) intrepid; urgency=low
 +
 +  * debian/apt.conf.autoremove:
 +    - remove "linux-image" (and friends) from the auto-remove
 +      blacklist. we have the kernel fallback infrastructure now
 +      in intrepid (thanks to BenC)
 +  * apt-pkg/indexcopy.cc:
 +    - support having CDs with no Packages file (just a Packages.gz)
 +      by not forcing a verification on non-existing files
 +     (LP: #255545)
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - improve the filtering for duplicated apport reports (thanks
 +      to seb128 for pointing that problem out)
 +    - do not report disk full errors from dpkg via apport
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 07 Aug 2008 16:28:05 +0200
 +
 +apt (0.7.14ubuntu5) intrepid; urgency=low
 +
 +  * fix various -Wall warnings
 +  * make "apt-get build-dep" installed packages marked automatic
 +    by default. This can be changed by setting the value of
 +    APT::Get::Build-Dep-Automatic to false (thanks to Aaron 
 +    Haviland, closes: #44874, LP: #248268)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 06 Aug 2008 14:00:51 +0200
 +
 +apt (0.7.14ubuntu4) intrepid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix uninitialized variable that caused no apport reports
 +      to be written sometimes (thanks to Matt Zimmerman)
 +  * merge patch that enforces stricter https server certificate
 +    checking (thanks to Arnaud Ebalard, closes: #485960)
 +  * allow per-mirror specific https settings
 +    (thanks to Arnaud Ebalard, closes: #485965)
 +  * add doc/examples/apt-https-method-example.cof
 +    (thanks to Arnaud Ebalard, closes: #485964)
 +  * add DPkg::NoTriggers option so that applications that call
 +    apt/aptitude (like the installer) defer trigger processing
 +    (thanks to Joey Hess) 
 +  * document --install-recommends and --no-install-recommends
 +    (thanks to Dereck Wonnacott, LP: #126180)
 +  
 +  [ Dereck Wonnacott ]
 +  * apt-ftparchive might write corrupt Release files (LP: #46439)
 +  * Apply --important option to apt-cache depends (LP: #16947) 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Aug 2008 10:10:49 +0200
 +
 +apt (0.7.14ubuntu3) intrepid; urgency=low
 +
 +  [ Otavio Salvador ]
 +  * Apply patch to avoid truncating of arbitrary files. Thanks to Bryan
 +    Donlan <bdonlan@fushizen.net> for the patch. Closes: #482476
 +  * Avoid using dbus if dbus-daemon isn't running. Closes: #438803
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - improve apt progress reporting, display trigger actions
 +  * apt-pkg/depcache.cc:
 +    - when checking for new important deps, skip critical ones
 +      (LP: #236360)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 03 Jun 2008 17:27:07 +0200
 +
 +apt (0.7.14ubuntu2) intrepid; urgency=low
 +
 +  * debian/control:
 +    - fix FTBFS by adding missing intltool dependency 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 09 May 2008 13:50:22 +0200
 +
  apt (0.7.14) unstable; urgency=low
  
    [ Christian Perrier ]
@@@ -3367,348 -2519,86 +3410,348 @@@ apt (0.7.10) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Mon, 07 Jan 2008 21:40:47 +0100
  
 -apt (0.7.9) unstable; urgency=low
 +apt (0.7.9ubuntu17) hardy-proposed; urgency=low
  
 -  [ Christian Perrier ]
 -  * Add several languages to LINGUAS and, therefore, really ship the relevant
 -    translation:
 -    Arabic, Dzongkha, Khmer, Marathi, Nepali, Thai
 -    Thanks to Theppitak Karoonboonyanan for checking this out. Closes: #448321
 +  * apt-pkg/acquire-item.cc:
 +    - fix signaure removal on transient network failures LP: #220627
 +      (thanks to Scott James Remnant)
  
 -  [ Program translations ]
 -    - Korean updated. Closes: #448430
 -    - Galician updated. Closes: #448497
 -    - Swedish updated.
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 Apr 2008 16:32:49 +0200
  
 -  [ Otavio Salvador ]
 -  * Fix configure script to check for CURL library and headers presense.
 -  * Applied patch from Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
 -    to add backward support for arches that lacks pselect support,
 -    closes: #448406.
 -  * Umount CD-ROM when calling apt-cdrom ident, except when called with
 -    -m, closes: #448521.
 +apt (0.7.9ubuntu16) hardy; urgency=low
  
 - -- Otavio Salvador <otavio@debian.org>  Wed, 31 Oct 2007 13:37:26 -0200
 +  * cmdline/apt-key:
 +    - only check against master-keys in net-update to not break
 +      custom CDs (thanks to Colin Watson)
  
 -apt (0.7.8) unstable; urgency=low
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 08 Apr 2008 14:17:14 +0200
  
 -  * Applied patch from Daniel Leidert <daniel.leidert@wgdd.de> to fix
 -    APT::Acquire::Translation "none" support, closes: #437523.
 -  * Applied patch from Daniel Burrows <dburrows@debian.org> to add support
 -    for the Homepage field (ABI break), closes: #447970.
 -  * Applied patch from Frans Pop <elendil@planet.nl> to fix a trailing
 -    space after cd label, closes: #448187.
 +apt (0.7.9ubuntu15) hardy; urgency=low
  
 - -- Otavio Salvador <otavio@debian.org>  Fri, 26 Oct 2007 18:20:13 -0200
 +  * cmdline/apt-get.cc:
 +    - do two passes when installing tasks, first ignoring dependencies,
 +      then resolving them and run the problemResolver at the end
 +      so that it can correct any missing dependencies. This should
 +      fix livecd building for kubuntu (thanks to Jonathan Riddell 
 +      for reporting the problem)
  
 -apt (0.7.7) unstable; urgency=low
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 13 Mar 2008 23:25:45 +0100
 +
 +apt (0.7.9ubuntu14) hardy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix incorrect help output for -f (LP: #57487)
 +    - run the problemResolver after a task was installed
 +      so that it can correct any missing dependencies
 +  * typo fixes (LP: #107960)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Mar 2008 21:46:07 +0100
 +
 +apt (0.7.9ubuntu13) hardy; urgency=low
 +
 +  [ Lionel Porcheron ]
 +  * debian/apt.cron.daily:
 +    - only call gconftool if gcontool is installed (LP: #194281)
  
    [ Michael Vogt ]
 -  * apt-inst/contrib/extracttar.cc:
 -    - fix fd leak for zero size files (thanks to Bill Broadley for
 -      reporting this bug)
 -  * apt-pkg/acquire-item.cc:
 -    - remove zero size files on I-M-S hit
 -  * methods/https.cc:
 -    - only send LastModified if we actually have a file
 -    - send range request with if-range 
 -    - delete failed downloads
 -    - delete zero size I-M-S hits
 -  * apt-pkg/deb/dpkgpm.{cc,h}:
 -    - merged dpkg-log branch, this lets you specify a 
 -      Dir::Log::Terminal file to log dpkg output to
 -      (ABI break)
 -    - fix parse error when dpkg sends unexpected data
 -  * merged apt--sha256 branch to fully support the new
 -    sha256 checksums in the Packages and Release files
 -    (ABI break)
 -  * apt-pkg/pkgcachegen.cc:
 -    - increase default mmap size
 -  * tests/local-repo:
 -    - added local repository testcase
 -  * apt-pkg/acquire.cc:
 -    - increase MaxPipeDepth for the internal worker<->method
 -      communication to 1000 for the debtorrent backend
 -  * make apt build with g++ 4.3
 -  * fix missing SetExecClose() call when the status-fd is used
 +  * doc/apt_preferences.5.xml:
 +    - fix typo (LP: #150900)
 +  * doc/example/sources.list:
 +    - updated for hardy (LP: #195879)
    * debian/apt.cron.daily:
 -    - move unattended-upgrade before apt-get autoclean
 -  * fix "purge" commandline argument, closes: #133421
 -    (thanks to Julien Danjou for the patch)
 +    - sleep random amount of time (default within 0-30min) before
 +      starting the upate to hit the mirrors less hard
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 04 Mar 2008 15:35:09 +0100
 +
 +apt (0.7.9ubuntu12) hardy; urgency=low
 +
 +  * debian/apt.cron.daily:
 +    - use admin user proxy settings
    * cmdline/apt-get.cc:
 -    - do not change the auto-installed information if a package
 -      is reinstalled
 -  * apt-pkg/acquire-item.cc:
 -    - fix crash in diff acquire code
 -  * cmdline/apt-mark:
 -    - Fix chmoding after have renamed the extended-states file (LP: #140019)
 -      (thanks to Laurent Bigonville)
 -  * apt-pkg/depcache.cc:
 -    - set "APT::Install-Recommends" to true by default (OMG!)
 +    - fix task installation (thanks to Colin Watson)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 21 Feb 2008 15:07:44 +0100
 +
 +apt (0.7.9ubuntu11) hardy; urgency=low
 +
 +  * apt-pkg/algorithms.cc: 
 +    - add APT::Update::Post-Invoke-Success script slot
 +      (LP: #188127)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Jan 2008 12:06:12 +0100
 +
 +apt (0.7.9ubuntu10) hardy; urgency=low
 +
 +  * cmdline/apt-key:
 +    - add "net-update" command that fetches the 
 +      ubuntu-archive-keyring.gpg and add keys from it that are 
 +      signed by the ubuntu-master-keyring.gpg 
 +      (apt-archive-key-signatures spec)
    * debian/apt.cron.daily:
 -    - only run the cron job if apt-get check succeeds (LP: #131719)
 +    - add apt-key net-update to the nightly cron job
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 13 Feb 2008 15:50:28 +0100
 +
 +apt (0.7.9ubuntu9) hardy; urgency=low
 +
 +  * fix FTBFS due to incorrect intltool build-depends
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 11 Feb 2008 16:04:37 +0100
 +
 +apt (0.7.9ubuntu8) hardy; urgency=low
 +
 +  * share/apt-auth-failure.note:
 +    - show update-notifier note if the nightly update fails with a
 +      authentication failure (apt-authentication-reliability spec)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 11 Feb 2008 14:04:56 +0100
 +
 +apt (0.7.9ubuntu7) hardy; urgency=low
 +
 +  * methods/connect.cc:
 +    - remember hosts with Resolve failures or connect Timeouts
 +      see https://wiki.ubuntu.com/NetworklessInstallationFixes
 +  * cmdlines/apt-key:
 +    - fix bug in the new apt-key update code that imports only
 +      keys signed with the master key (thanks to cjwatson)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 08 Feb 2008 11:38:35 +0100
 +
 +apt (0.7.9ubuntu6) hardy; urgency=low
 +
 +  * cmdline/apt-key:
 +    - add support for a master-keyring that contains signing keys
 +      that can be used to sign the archive signing keys. This should
 +      make key-rollover easier.
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - merged patch from Kees Cook to fix anoying upper-case display
 +      on amd64 in sbuild
 +  * apt-pkg/algorithms.cc: 
 +    - add APT::Update::Post-Invoke-Success script slot
 +    - Make the breaks handling use the kill list. This means, that a
 +      Breaks: Pkg (<< version) may put Pkg onto the remove list.
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - add APT::Apport::MaxReports to limit the maximum number
 +      of reports generated in a single run (default to 3)
 +  * apt-pkg/deb/debmetaindex.cc:
 +    - add missing "Release" file uri when apt-get update --print-uris
 +      is run
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 04 Feb 2008 14:28:02 +0100
 +
 +apt (0.7.9ubuntu5) hardy; urgency=low
 +
 +  * Merged apt-authentication-reliabilty branch. This means
 +    that apt will refuse to update and use the old lists if
 +    the authentication of a repository that used to be 
 +    authenticated fails. See
 +    https://wiki.ubuntu.com/AptAuthenticationReliability
 +    for more details.
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 16 Jan 2008 10:36:10 +0100
 +
 +apt (0.7.9ubuntu4) hardy; urgency=low
 +
 +  * apt-pkg/algorithms.cc:
 +    - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to
 +      true, the effect of the compatibility code was to require both of them
 +      to be set to false in order to disable list cleanup; this broke the
 +      installer. Instead, disable list cleanup if either of them is set to
 +      false.
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Wed, 09 Jan 2008 22:34:37 +0000
 +
 +apt (0.7.9ubuntu3) hardy; urgency=low
 +
 +  * merged the apt--DoListUpdate branch, this provides a common interface
 +    for "apt-get update" like operations for the frontends and also provides
 +    hooks to run stuff in APT::Update::{Pre,Post}-Invoke
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 07 Jan 2008 19:02:11 +0100
 +
 +apt (0.7.9ubuntu2) hardy; urgency=low
 +
 +  [ Otavio Salvador ]
 +  * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix building
 +    with newest dpkg-shlibdeps changing the packaging building order and a
 +    patch from Robert Millan <rmh@aybabtu.com> to fix parallel building,
 +    closes: #452862.
 +  * Applied patch from Alexander Winston <alexander.winston@comcast.net>
 +    to use 'min' as symbol for minute, closes: #219034.
 +  * Applied patch from Amos Waterland <apw@us.ibm.com> to allow apt to
 +    work properly in initramfs, closes: #448316.
 +  * Applied patch from Robert Millan <rmh@aybabtu.com> to make apt-key and
 +    apt-get to ignore time conflicts, closes: #451328.
 +  * Applied patch from Peter Eisentraut <peter_e@gmx.net> to fix a
 +    grammatical error ("manual installed" -> "manually installed"),
 +    closes: #438136.
 +  * Fix cron.daily job to not call fail if apt isn't installed, closes:
 +    #443286.
 +  
 +  [ Daniel Burrows ]
 +  * apt-pkg/contrib/configuration.cc:
 +    - if RootDir is set, then FindFile and FindDir will return paths
 +      relative to the directory stored in RootDir, closes: #456457.
 +
 +  [ Christian Perrier ]
 +  * Fix wording for "After unpacking...". Thans to Michael Gilbert
 +    for the patch. Closes: #260825
 +
 +  [ Program translations ]
 +    - Vietnamese updated. Closes: #453774
 +    - Japanese updated. Closes: #456909
 +    - French updated.
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/packagemanager.{cc,h}:
 +    - propergate the Immediate flag to make hitting the 
 +      "E: Internal Error, Could not perform immediate configuration (2)"
 +      harder. (LP: #179247)
 +  * debian/apt.conf.daily:
 +    - print warning if the cache can not be locked (closes: #454561),
 +      thanks to Bastian Kleineidam
 +  * debian/control:
 +    - build against libdb-dev (instead of libdb4.4-dev)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 03 Jan 2008 11:31:45 +0100
 +
 +apt (0.7.9ubuntu1) hardy; urgency=low
 +
 +  * merged from http://bzr.debian.org/apt/apt/debian-sid/, remaining
 +    changes:
 +    - mirror download method (pending merge with debian)
 +    - no pdiff download by default (unsuitable for ubuntu)
 +    - no recommends-by-default yet
 +    - add "Original-Maintainer" field to tagfile
 +    - show warning on apt-get source if the package is maintained
 +      in a VCS (pedinging merge with debian)
 +    - use ubuntu-archive keyring instead of debians one
 +    - support metapackages section for autoremoval
 +    - debian maintainer field change
 +    - send ubuntu string in user-agent
 +  
 +  * Changes from the debian-sid bzr branch (but not uploaded to debian
 +    yet):
 +  
 +  [ Otavio Salvador ]
 +  * Applied patch from Mike O'Connor <stew@vireo.org> to add a manpage to
 +    apt-mark, closes: #430207.
 +  * Applied patch from Andrei Popescu <andreimpopescu@gmail.com> to add a
 +    note about some frontends in apt.8 manpage, closes: #438545.
 +  * Applied patch from Aurelien Jarno <aurel32@debian.org> to avoid CPU
 +    getting crazy when /dev/null is redirected to stdin (which breaks
 +    buildds), closes: #452858.
 +
 +  [ Program translations ]
 +    - Basque updated. Closes: #453088
 +
 +  [ Michael Vogt ]
 +  * debian/rules
 +    - fix https install location
 +  * methods/gpgv.cc:
 +    - remove cruft code that caused timestamp/I-M-S issues
 +  * ftparchive/contents.cc:
 +    - fix error output
 +  * methods/mirror.{cc,h}:
 +    - only update mirror list on IndexFile updates 
 +  * apt-pkg/acquire-item.{cc,h}:
 +    - make the authentication download code more robust against
 +      servers/proxies with broken If-Range implementations
 +  * debian/control:
 +    - build against libdb-dev (instead of libdb4.4-dev)
 +  * merged the apt--DoListUpdate branch, this provides a common interface
 +    for "apt-get update" like operations for the frontends and also provides
 +    hooks to run stuff in APT::Update::{Pre,Post}-Invoke
 +
 +  [ Chris Cheney ]
 +  * ftparchive/contents.cc:
 +    - support lzma data members
 +  * ftparchive/multicompress.cc:
 +    - support lzma output
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 13 Dec 2007 14:46:27 +0100
 +
 +apt (0.7.9) unstable; urgency=low
 +
 +  [ Christian Perrier ]
 +  * Add several languages to LINGUAS and, therefore, really ship the relevant
 +    translation:
 +    Arabic, Dzongkha, Khmer, Marathi, Nepali, Thai
 +    Thanks to Theppitak Karoonboonyanan for checking this out. Closes: #448321
 +
 +  [ Program translations ]
 +    - Korean updated. Closes: #448430
 +    - Galician updated. Closes: #448497
 +    - Swedish updated.
 +
 +  [ Otavio Salvador ]
 +  * Fix configure script to check for CURL library and headers presense.
 +  * Applied patch from Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
 +    to add backward support for arches that lacks pselect support,
 +    closes: #448406.
 +  * Umount CD-ROM when calling apt-cdrom ident, except when called with
 +    -m, closes: #448521.
 +
 + -- Otavio Salvador <otavio@debian.org>  Wed, 31 Oct 2007 13:37:26 -0200
 +
 +apt (0.7.8) unstable; urgency=low
 +
 +  * Applied patch from Daniel Leidert <daniel.leidert@wgdd.de> to fix
 +    APT::Acquire::Translation "none" support, closes: #437523.
 +  * Applied patch from Daniel Burrows <dburrows@debian.org> to add support
 +    for the Homepage field (ABI break), closes: #447970.
 +  * Applied patch from Frans Pop <elendil@planet.nl> to fix a trailing
 +    space after cd label, closes: #448187.
 +
 + -- Otavio Salvador <otavio@debian.org>  Fri, 26 Oct 2007 18:20:13 -0200
 +
 +apt (0.7.7) unstable; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-inst/contrib/extracttar.cc:
 +    - fix fd leak for zero size files (thanks to Bill Broadley for
 +      reporting this bug)
 +  * apt-pkg/acquire-item.cc:
 +    - remove zero size files on I-M-S hit
 +  * methods/https.cc:
 +    - only send LastModified if we actually have a file
 +    - send range request with if-range 
 +    - delete failed downloads
 +    - delete zero size I-M-S hits
 +  * apt-pkg/deb/dpkgpm.{cc,h}:
 +    - merged dpkg-log branch, this lets you specify a 
 +      Dir::Log::Terminal file to log dpkg output to
 +      (ABI break)
 +    - fix parse error when dpkg sends unexpected data
 +  * merged apt--sha256 branch to fully support the new
 +    sha256 checksums in the Packages and Release files
 +    (ABI break)
 +  * apt-pkg/pkgcachegen.cc:
 +    - increase default mmap size
 +  * tests/local-repo:
 +    - added local repository testcase
 +  * apt-pkg/acquire.cc:
 +    - increase MaxPipeDepth for the internal worker<->method
 +      communication to 1000 for the debtorrent backend
 +  * make apt build with g++ 4.3
 +  * fix missing SetExecClose() call when the status-fd is used
 +  * debian/apt.cron.daily:
 +    - move unattended-upgrade before apt-get autoclean
 +  * fix "purge" commandline argument, closes: #133421
 +    (thanks to Julien Danjou for the patch)
 +  * cmdline/apt-get.cc:
 +    - do not change the auto-installed information if a package
 +      is reinstalled
 +  * apt-pkg/acquire-item.cc:
 +    - fix crash in diff acquire code
 +  * cmdline/apt-mark:
 +    - Fix chmoding after have renamed the extended-states file (LP: #140019)
 +      (thanks to Laurent Bigonville)
 +  * apt-pkg/depcache.cc:
 +    - set "APT::Install-Recommends" to true by default (OMG!)
 +  * debian/apt.cron.daily:
 +    - only run the cron job if apt-get check succeeds (LP: #131719)
    
    [ Program translations ]
      - French updated
@@@ -3754,193 -2644,6 +3797,193 @@@
   
   -- Michael Vogt <mvo@debian.org>  Tue, 23 Oct 2007 14:58:03 +0200
  
 +apt (0.7.6ubuntu14.1) gutsy-proposed; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.{cc,h}:
 +    - give up timeslice on EIO error in read from master terminal
 +  * debian/apt.cron.daily:
 +    - only run the cron job if apt-get check succeeds (LP: #131719)
 +
 +  [ Martin Emrich ]  
 +  * apt-pkg/deb/dpkgpm.{cc,h}:
 +    - rewrite dpkgpm.cc to use pselect() instead of select()
 +      to block signals during select() (LP: #134858)
 + 
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Sat, 20 Oct 2007 07:51:12 +0200
 +
 +apt (0.7.6ubuntu14) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix resource leak (LP: #148806) 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 15 Oct 2007 20:57:44 +0200
 +
 +apt (0.7.6ubuntu13) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix crash in WriteApportReport (LP: #144537)
 +  * apt-pkg/acquire-item.cc
 +    - fix disappearing local Packages.gz file (LP: #131166)
 +  * methods/https.cc:
 +    - fix off-by-one error I-M-S handling
 +    - cleanup after I-M-S hit
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 09 Oct 2007 01:48:26 +0200
 +
 +apt (0.7.6ubuntu12) gutsy; urgency=low
 +
 +  [ Michael Vogt ]
 +  * cmdline/apt-mark:
 +    - Fix chmoding after have renamed the extended-states file
 +      (thanks to Laurent Bigonville, LP: #140019)
 +  * apt-pkg/deb/debmetaindex.cc: comparison with string literal results
 +      in unspecified behaviour;
 +  * Reset curl options and timestamp between downloaded files. Thanks to
 +    Ryan Murray <rmurray@debian.org> for the patch
 +
 +  [Paul Sladen]
 +  * Have 'cron.daily/apt' send D-Bus doesn't exist error messages
 +    to the bit bucket.  Thanks to 'dasdda'.  (LP: #115397)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 03 Oct 2007 02:17:45 +0200
 +
 +apt (0.7.6ubuntu11) gutsy; urgency=low
 +
 +  * apt-pkg/contrib/mmap.cc:
 +    - don't fail if msync() returns > 0 (LP: #144001)
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Sat, 22 Sep 2007 21:39:29 +0100
 +
 +apt (0.7.6ubuntu10) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix parse error when dpkg sends unexpected data
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 18 Sep 2007 17:25:09 +0100
 +
 +apt (0.7.6ubuntu9) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix progress reporting precent calculation (LP: #137798)
 +  * make apt build with g++ 4.3
 +  * fix missing SetExecClose() call when the status-fd is used
 +    (LP: #136767)
 +  * debian/apt.cron.daily:
 +    - move unattended-upgrade before apt-get autoclean
 +  * fix "purge" commandline argument, closes LP: #125733
 +    (thanks to Julien Danjou for the patch)
 +  * cmdline/apt-get.cc:
 +    - do not change the auto-installed information if a package
 +      is reinstalled (LP: #139448)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Sep 2007 20:55:00 +0200
 +
 +apt (0.7.6ubuntu8) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.{cc,h}:
 +    - fix bug in dpkg log writing when a signal is caught during
 +      select() (LP: #134858)
 +    - write end marker in the log as well
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 05 Sep 2007 15:03:46 +0200
 +
 +apt (0.7.6ubuntu7) gutsy; urgency=low
 +
 +  * reupload to fix FTBFS
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 16 Aug 2007 19:44:20 +0200
 +
 +apt (0.7.6ubuntu6) gutsy; urgency=low
 +
 +  * dpkg-triggers: Deal properly with new package states.
 +
 + -- Ian Jackson <iwj@ubuntu.com>  Wed, 15 Aug 2007 20:44:37 +0100
 +
 +apt (0.7.6ubuntu5) UNRELEASED; urgency=low
 +
 +  * apt-pkg/acquire-item.cc:
 +    - fix file removal on local repo i-m-s hit (LP: #131166)
 +  * tests/local-repo:
 +    - added regression test for this bug
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Aug 2007 12:34:07 +0200
 +
 +apt (0.7.6ubuntu4) gutsy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - remove YnPrompt when a XS-Vcs- tag is found, improve the
 +      notice (LP: #129575)
 +  * methods/copy.cc:
 +    - take hashes here too
 +  * apt-pkg/acquire-worker.cc:
 +    - only pass on computed hash if we recived one from the method
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 08 Aug 2007 19:30:29 +0200
 +
 +apt (0.7.6ubuntu3) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix packagename extraction when writting apport reports
 +  * apt-pkg/pkgcachegen.cc:
 +    - increase default mmap size (LP: #125640)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Aug 2007 09:52:00 +0200
 +
 +apt (0.7.6ubuntu2) gutsy; urgency=low
 +
 +  * doc/examples/sources.list:
 +    - change example source to gutsy
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - do not break if no /dev/pts is available
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 06 Aug 2007 15:17:57 +0200
 +
 +apt (0.7.6ubuntu1) gutsy; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-inst/contrib/extracttar.cc:
 +    - fix fd leak for zero size files (thanks to Bill Broadley for
 +      reporting this bug)
 +  * apt-pkg/acquire-item.cc:
 +    - remove zero size files on I-M-S hit
 +  * methods/https.cc:
 +    - only send LastModified if we actually have a file
 +    - send range request with if-range 
 +    - delete failed downloads
 +    (thanks to Thom May for his help here)
 +    - delete zero size I-M-S hits
 +  * apt-pkg/deb/dpkgpm.{cc,h}:
 +    - merged dpkg-log branch, this lets you specify a 
 +      Dir::Log::Terminal file to log dpkg output to
 +    (ABI break)
 +    - when writting apport reports, attach the dpkg
 +      terminal log too
 +  * merged apt--sha256 branch to fully support the new
 +    sha256 checksums in the Packages and Release files
 +    (ABI break)
 +  * apt-pkg/pkgcachegen.cc:
 +    - increase default mmap size
 +  * tests/local-repo:
 +    - added local repository testcase
 +  * make apt build with g++ 4.3
 +  * fix missing SetExecClose() call when the status-fd is used
 +  * debian/apt.cron.daily:
 +    - move unattended-upgrade before apt-get autoclean
 +  * fix "purge" commandline argument, closes: #133421
 +    (thanks to Julien Danjou for the patch)
 +  * cmdline/apt-get.cc:
 +    - do not change the auto-installed information if a package
 +      is reinstalled
 +  * cmdline/apt-mark:
 +    - Fix chmoding after have renamed the extended-states file (LP: #140019)
 +      (thanks to Laurent Bigonville)
 +
 +  [ Ian Jackson ]
 +  * dpkg-triggers: Deal properly with new package states.
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 02 Aug 2007 11:55:54 +0200
 +
  apt (0.7.6) unstable; urgency=low
  
    * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong
@@@ -3968,14 -2671,6 +4011,14 @@@ apt (0.7.5) unstable; urgency=lo
  
   -- Otavio Salvador <otavio@ossystems.com.br>  Wed, 25 Jul 2007 20:16:46 -0300
  
 +apt (0.7.4ubuntu1) gutsy; urgency=low
 +
 +  * debian/apt.conf.ubuntu, apt.conf.autoremove:
 +    - Change metapackages to {restricted,universe,multiverse}/metapackages 
 +      in Install-Recommends-Sections and Never-MarkAuto-Sections
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 26 Jul 2007 10:42:29 +0200
 +
  apt (0.7.4) unstable; urgency=low
  
    [ Michael Vogt ]
@@@ -4036,90 -2731,6 +4079,90 @@@ apt (0.7.3) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Sun, 01 Jul 2007 12:31:29 +0200
  
 +apt (0.7.2ubuntu7) gutsy; urgency=low
 +
 +  * fix build-dependencies 
 +  * fixes in the auto-mark code (thanks to Daniel
 +    Burrows)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  9 Jul 2007 19:02:54 +0200
 +
 +apt (0.7.2ubuntu6) gutsy; urgency=low
 +
 +  [ Michael Vogt]
 +  * cmdline/apt-get.cc:
 +    - make the XS-Vcs-$foo warning more copy'n'paste
 +      friendly (thanks to Matt Zimmerman)
 +    - ignore the Vcs-Browser tag (Fixes LP: #121770)
 +  * debian/apt.conf.autoremove:
 +    - added "linux-ubuntu-modules" to APT::NeverAutoRemove
 +
 +  [ Sarah Hobbs ]
 +  * Change metapackages to *metapackages in Install-Recommends-Section
 +    and Never-MarkAuto-Section of debian/apt.conf.autoremove, so that
 +    the Recommends of metapackages in universe and multiverse will get
 +    installed.
 +  * Also make this change in doc/examples/configure-index.
 +  * Added a Build Dependancies of automake, docbook-xsl, xsltproc, xmlto,
 +    docbook to fix FTBFS.
 +  * Added in previous changelog entries, as those who uploaded did not
 +    actually commit to Bzr.
 +
 + -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon, 09 Jul 2007 01:15:57 +1000
 +
 +apt (0.7.2ubuntu5) gutsy; urgency=low
 +
 +  * Rerun autoconf to fix the FTBFS.
 +
 + -- Michael Bienia <geser@ubuntu.com>  Fri, 06 Jul 2007 19:17:33 +0200
 +
 +apt (0.7.2ubuntu4) gutsy; urgency=low
 +
 +  * Rebuild for the libcurl4 -> libcurl3 transition mess.
 +
 + -- Steve Kowalik <stevenk@ubuntu.com>  Fri,  6 Jul 2007 12:44:05 +1000
 +
 +apt (0.7.2ubuntu3) gutsy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix InstallTask code when a pkgRecord ends 
 +      with a single '\n' (thanks to Soren Hansen for reporting)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 27 Jun 2007 13:33:38 +0200
 +
 +apt (0.7.2ubuntu2) gutsy; urgency=low
 +
 +  * fixed compile errors with g++ 4.3 (thanks to 
 +    Daniel Burrows, closes: #429378)
 +  * fix FTFBFS by changing build-depends to
 +    libcurl4-gnutls-dev (closes: #428363)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Jun 2007 13:47:03 +0200
 +
 +apt (0.7.2ubuntu1) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - apport integration added, this means that a apport
 +      report is written on dpkg failures
 +  * cmdline/apt-get.cc:
 +    - merged http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/
 +      this will warn when Vcs- headers are found on apt-get source
 +      (Fixes LP:#115959)
 +  * merged from debian/unstable, remaining changes:
 +    - maintainer field changed
 +    - merged the apt--mirror branch 
 +      http://people.ubuntu.com/~mvo/bzr/apt/apt--mirror/
 +    - apport reporting on package install/upgrade/remove failure
 +    - support for "Originial-Maintainer" field
 +    - merged apt--xs-vcs-bzr branch
 +      (http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/)
 +    - use ubuntu archive keyring by default
 +    - debian/apt.conf.autoremove
 +      + install recommands for section "metapackages"
 +      + do not mark direct dependencies of "metapackages" as autoremoved
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 14 Jun 2007 10:38:36 +0200
 +
  apt (0.7.2-0.1) unstable; urgency=low
  
    * Non-maintainer upload.
@@@ -4213,144 -2824,34 +4256,144 @@@ apt (0.7.1) experimental; urgency=lo
    * apt-pkg/policy.cc:
      - allow multiple packages (thanks to David Foerster)
  
 - -- Michael Vogt <mvo@debian.org>  Wed,  2 May 2007 13:43:44 +0200
 + -- Michael Vogt <mvo@debian.org>  Wed,  2 May 2007 13:43:44 +0200
 +
 +apt (0.7.0) experimental; urgency=low
 +
 +  * Package that contains all the new features
 +  * Removed all #pragma interface/implementation
 +  * Branch that contains all the new features:
 +  * translated package descriptions
 +  * task install support
 +  * automatic dependency removal (thanks to Daniel Burrows)
 +  * merged support for the new dpkg "Breaks" field 
 +    (thanks to Ian Jackson)
 +  * handle network failures more gracefully on "update"
 +  * support for unattended-upgrades (via unattended-upgrades
 +    package)
 +  * added apt-transport-https method
 +  * merged "install-recommends" branch (ABI break): 
 +    - new "--install-recommends"
 +    - install new recommends on "upgrade" if --install-recommends is 
 +      given
 +    - new "--fix-policy" option to install all packages with unmet
 +      important dependencies (usefull with --install-recommends to
 +      see what not-installed recommends are on the system)
 +    - fix of recommended packages display (only show CandidateVersion
 +      fix or-group handling)
 +  * merged "install-task" branch (use with "apt-get install taskname^")
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 12 Jan 2007 20:48:07 +0100
 +
 +apt (0.6.46.4ubuntu10) feisty; urgency=low
 +
 +  * apt-pkg/depcache.cc:
 +    - added "APT::Never-MarkAuto-Section" and consider dependencies 
 +      of packages in this section manual (LP#59893)
 +    - ensure proper permissions in the extended_state file (LP#67037)
 +  * debian/apt.conf.ubuntu:
 +    - added APT::Never-MarkAuto-Section "metapackages" (LP#59893)
 +  * cmdline/apt-get.cc:
 +    - "apt-get install foo" on a already installed package foo will
 +      clean the automatic installed flag (LP#72007)
 +    - do not show packages already marked for removal as auto-installed
 +      (LP#64493)
 +    - applied patch to (optionally) hide the auto-remove information
 +      (thanks to Frode M. Døving) (LP#69148)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Mar 2007 13:32:32 +0100
 +
 +apt (0.6.46.4ubuntu9) feisty; urgency=low
 +
 +  * debian/control:
 +    - set XS-Vcs-Bzr header
 +    - Set Ubuntu maintainer address
 +  * apt-pkg/cdrom.cc:
 +    - only unmount if APT::CDROM::NoMount is false
 +    - only umount if it was mounted by the method before
 +  * cmdline/apt-get.cc:
 +    - fix version output in autoremove list (LP#68941)
 +  * apt-pkg/packagemanager.cc:
 +    - do not spin 100% cpu in FixMissing() (LP#84476)
 +  * apt-pkg/indexfile.cc:
 +    - fix problem overwriting APT::Acquire::Translation
 +  * doc/examples/configure-index:
 +    - document APT::Acquire::Translation
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Mar 2007 15:24:39 +0100
 +
 +apt (0.6.46.4ubuntu8) feisty; urgency=low
 +
 +  * fix segfault in the pkgRecords destructor
 +  * Bump ABI version
 +  * debian/control:
 +    - make the libcurl3-gnutls-dev versionized (LP#86614)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Feb 2007 14:26:33 +0100
 +
 +apt (0.6.46.4ubuntu7) feisty; urgency=low
 +
 +  * Merged the apt--mirror branch. This means that a new 'mirror' 
 +    method is available that will allow dynamic mirror updates.
 +    The sources.list entry looks something like this:
 +    "deb mirror://mirrors.lp.net/get_mirror feisty main restricted"
 +
 +    It also supports error reporting to a configurable url for mirror
 +    problems/failures.
 +  * Bump ABI version
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Feb 2007 11:38:06 +0100
 +
 +apt (0.6.46.4ubuntu6) feisty; urgency=low
 +
 +  * methods/http.cc:
 +    - send apt version in User-Agent
 +  * apt-pkg/deb/debrecords.cc:
 +    - fix SHA1Hash() return value
 +  * apt-pkg/algorithms.cc:
 +    - fix resolver bug on removal triggered by weak-dependencies 
 +      with or-groups
 +    - fix segfault (lp: #76530)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 20 Dec 2006 11:04:36 +0100
 +
 +apt (0.6.46.4ubuntu5) feisty; urgency=low
 +
 +  * added apt-transport-https package to provide a optional
 +    https transport (apt-https spec)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Dec 2006 16:23:43 +0100
  
 -apt (0.7.0) experimental; urgency=low
 +apt (0.6.46.4ubuntu4) feisty; urgency=low
 +  
 +  * apt-pkg/algorithms.cc:
 +    - only increase the score of installed applications if they 
 +      are not obsolete 
  
 -  * Package that contains all the new features
 -  * Removed all #pragma interface/implementation
 -  * Branch that contains all the new features:
 -  * translated package descriptions
 -  * task install support
 -  * automatic dependency removal (thanks to Daniel Burrows)
 -  * merged support for the new dpkg "Breaks" field 
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
 +
 +apt (0.6.46.4ubuntu3) feisty; urgency=low
 +
 +  * apt-pkg/algorithm.cc:
 +    - use clog for all debugging
 +  * apt-pkg/depcache.cc:
 +    - never mark Required package for autoremoval (lp: #75882)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 11:56:05 +0100
 +
 +apt (0.6.46.4ubuntu2) feisty; urgency=low
 +
 +  * apt-pkg/algorithms.cc: add missing call to MarkKeep
 +    so that dist-upgrade isn't broken by unsatisfiable Breaks.
      (thanks to Ian Jackson)
 -  * handle network failures more gracefully on "update"
 -  * support for unattended-upgrades (via unattended-upgrades
 -    package)
 -  * added apt-transport-https method
 -  * merged "install-recommends" branch (ABI break): 
 -    - new "--install-recommends"
 -    - install new recommends on "upgrade" if --install-recommends is 
 -      given
 -    - new "--fix-policy" option to install all packages with unmet
 -      important dependencies (usefull with --install-recommends to
 -      see what not-installed recommends are on the system)
 -    - fix of recommended packages display (only show CandidateVersion
 -      fix or-group handling)
 -  * merged "install-task" branch (use with "apt-get install taskname^")
  
 - -- Michael Vogt <mvo@debian.org>  Fri, 12 Jan 2007 20:48:07 +0100
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Dec 2006 23:07:24 +0100
 +
 +apt (0.6.46.4ubuntu1) feisty; urgency=low
 +
 +  * merged with debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Dec 2006 12:13:14 +0100
  
  apt (0.6.46.4-0.1) unstable; urgency=emergency
    
@@@ -4381,26 -2882,6 +4424,26 @@@ apt (0.6.46.4) unstable; urgency=hig
  
   -- Michael Vogt <mvo@debian.org>  Thu,  7 Dec 2006 10:49:50 +0100
  
 +apt (0.6.46.3ubuntu2) feisty; urgency=low
 +
 +  * apt-pkg/algorithms.cc: add missing call to MarkKeep
 +    so that dist-upgrade isn't broken by unsatisfiable Breaks.
 +
 + -- Ian Jackson <iwj@ubuntu.com>  Thu,  7 Dec 2006 15:46:52 +0000
 +
 +apt (0.6.46.3ubuntu1) feisty; urgency=low
 +
 +  * doc/apt-get.8.xml:
 +    - documented autoremove, thanks to Vladimír Lapá%Gč%@ek 
 +      (lp: #62919)
 +  * fix broken i18n in the dpkg progress reporting, thanks to 
 +    Frans Pop and Steinar Gunderson. (closes: #389261)
 +  * po/en_GB.po:
 +    - typo (lp: #61270)
 +  * add apt-secure.8 to "See also" section
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 23 Nov 2006 07:24:12 +0100
 +
  apt (0.6.46.3-0.2) unstable; urgency=high
  
    * Non-maintainer upload with permission of Michael Vogt.
@@@ -4513,173 -2994,6 +4556,173 @@@ apt (0.6.46) unstable; urgency=lo
    
   -- Michael Vogt <mvo@debian.org>  Thu, 21 Sep 2006 10:25:03 +0200
  
 +apt (0.6.45ubuntu14) edgy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix in the TryInstallTask() code to make sure that all package
 +      there are marked manual install (lp: #61684)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 28 Sep 2006 00:34:20 +0200
 +
 +apt (0.6.45ubuntu13) edgy; urgency=low
 +
 +  * no-changes upload to make apt rebuild against latest g++ and
 +    fix synaptic FTBFS (see bug: #62461 for details)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 26 Sep 2006 22:33:10 +0200
 +
 +apt (0.6.45ubuntu12) edgy; urgency=low
 +
 +  * apt-pkg/depcache.cc:
 +    - fix in the sweep() code, set garbage flag for packages scheduled 
 +      for removal too
 +    - do not change the autoFlag in MarkKeep(), this can lead to suprising
 +      side effects
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 21 Sep 2006 00:58:24 +0200
 +
 +apt (0.6.45ubuntu11) edgy; urgency=low
 +
 +  * removed "installtask" and change it so that tasknames can be given
 +    with "apt-get install taskname^"
 +  * improve the writeStateFile() code
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 20 Sep 2006 14:14:24 +0200
 +
 +apt (0.6.45ubuntu10) edgy; urgency=low
 +
 +  * methods/http.cc:
 +    - check more careful for incorrect proxy settings (closes: #378868)
 +  * methods/gzip.cc:
 +    - don't hang when /var is full (closes: #341537), thanks to
 +      Luis Rodrigo Gallardo Cruz for the patch
 +  * doc/examples/sources.list:
 +    - removed non-us.debian.org from the example (closes: #380030,#316196)
 +  * Merged from Christian Perrier bzr branch:
 +    * ro.po: Updated to 514t. Closes: #388402
 +    * dz.po: Updated to 514t. Closes: #388184
 +    * it.po: Fixed typos. Closes: #387812
 +    * ku.po: New kurdish translation. Closes: #387766
 +    * sk.po: Updated to 514t. Closes: #386851
 +    * ja.po: Updated to 514t. Closes: #386537
 +    * gl.po: Updated to 514t. Closes: #386397
 +    * fr.po: Updated to 516t.
 +    * fi.po: Updated to 512t. Closes: #382702
 +  * share/archive-archive.gpg:
 +    - removed the outdated amd64 and debian-2004 keys
 +  * apt-pkg/tagfile.cc:
 +    - applied patch from Jeroen van Wolffelaar to make the tags
 +      caseinsensitive (closes: #384182)
 +    - reverted MMap use in the tagfile because it does not work 
 +      across pipes (closes: #383487) 
 +  * added "installtask" command
 +  * added new ubuntu specific rewrite rule for "Original-Maintainer"
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Sep 2006 15:07:51 +0200
 +
 +apt (0.6.45ubuntu9) edgy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - if --no-remove is given, do not run the AutoRemove code 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 13 Sep 2006 11:54:20 +0200
 +
 +apt (0.6.45ubuntu8) edgy; urgency=low
 +
 +  * apt-pkg/algorithm.cc:
 +    - fix pkgProblemResolver.InstallProtect() to preserve the auto-install
 +      information (lp: #59457)
 +  * cmdline/apt-get.cc:
 +    - fix typo in autoremove information (lp: #59420)
 +  * install apt-mark to modify the automatically install information for
 +    packages
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  8 Sep 2006 20:07:22 +0200
 +
 +apt (0.6.45ubuntu7) edgy; urgency=low
 +
 +  * apt-pkg/depcache.cc:
 +    - fix a bug in the install-recommends-section code
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Sep 2006 18:22:38 +0200
 +
 +apt (0.6.45ubuntu6) edgy; urgency=low
 +
 +  [Michael Vogt]
 +  * cmdline/apt-get.cc:
 +    - always show auto-removable packages and give a hint how to remove 
 +      them
 +  * debian/apt.conf.ubuntu:
 +    - exlucde linux-image and linux-restricted-modules from ever being 
 +      auto-removed
 +    - added "metapackages" as the section we want to install recommends
 +      by default
 +  * apt-pkg/depcache.cc:
 +    - added support to turn install-recommends selectively on/off by
 +      section
 +  [Ian Jackson]
 +  * Tests pass without code changes!  Except that we need this:
 +  * Bump cache file major version to force rebuild so that Breaks
 +    dependencies are included.
 +  * Don't depend on or suggest any particular dpkg or dpkg-dev versions;
 +    --auto-deconfigure is very very old and dpkg-dev's Breaks support
 +    is more or less orthogonal.
 +  * Initial draft of `Breaks' implementation.  Appears to compile,
 +    but as yet *completely untested*.
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Sep 2006 11:50:52 +0200
 +
 +apt (0.6.45ubuntu5) edgy; urgency=low
 +
 +  * apt-pkg/pkgcachegen.cc:
 +    - increase the APT::Cache-Limit to deal with the increased demand due
 +      to the translated descriptions
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - pass "--auto-deconfigure" to dpkg on install to support the
 +      new "breaks" in dpkg
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 15 Aug 2006 12:06:26 +0200
 +
 +apt (0.6.45ubuntu4) edgy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix in the new --fix-polciy code
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Aug 2006 21:08:11 +0200
 +
 +apt (0.6.45ubuntu3) edgy; urgency=low
 +
 +  * ABI break
 +  * merged latest apt--install-recommends (closes: #559000)
 +  * added "--fix-policy" option to can be used as "--fix-broken" and
 +    will install missing weak depends (recommends, and/or suggests 
 +    depending on the settings)
 +  * merged the apt--ddtp branch
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 11 Aug 2006 12:53:23 +0200
 +
 +apt (0.6.45ubuntu2) edgy; urgency=low
 +
 +  * debian/control:
 +    - switched to libdb4.4 for building (closes: #381019)
 +  * cmdline/apt-get.cc:
 +    - show only the recommends/suggests for the candidate-version, not for all
 +      versions of the package (closes: #257054)
 +    - properly handle recommends/suggests or-groups when printing the list of
 +      suggested/recommends packages (closes: #311619)
 +  * merged "apt--install-recommends" branch:
 +    - added "{no-}install-recommends" commandline option
 +    - added APT::Install-{Recommends,Suggests} option
 +    - currently Install-Recommends defaults to "False" 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  9 Aug 2006 23:38:46 +0200
 +
 +apt (0.6.45ubuntu1) edgy; urgency=low
 +
 +  * merged with debian/unstable
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  1 Aug 2006 15:43:22 +0200
 +
  apt (0.6.45) unstable; urgency=low
  
    * apt-pkg/contrib/sha256.cc:
@@@ -4725,37 -3039,6 +4768,37 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 27 Jul 2006 00:52:05 +0200
  
 +apt (0.6.44.2ubuntu4) edgy; urgency=low
 +
 +  * Make apt-get dselect-upgrade happy again
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 21 Jul 2006 11:03:02 +0200
 +
 +apt (0.6.44.2ubuntu3) edgy; urgency=low
 +
 +  * Close extended_states file after writing it.
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Tue, 18 Jul 2006 00:12:13 +0100
 +
 +apt (0.6.44.2ubuntu2) edgy; urgency=low
 +
 +  * create a empty extended_states file if none exists already
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  4 Jul 2006 09:23:03 +0200
 +
 +apt (0.6.44.2ubuntu1) edgy; urgency=low
 +
 +  * merged with debian/unstable
 +  * merged the "auto-mark" branch to support aptitude like
 +    marking of automatically installed dependencies and added
 +    "apt-get remove --auto-remove" to remove unused auto-installed
 +    packages again
 +  * changed library version from 3.11 to 3.50 to make it clearly 
 +    different from the debian version (we are ABI incompatible because
 +    of the auto-mark patch)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  3 Jul 2006 18:30:46 +0200
 +
  apt (0.6.44.2exp1) experimental; urgency=low
  
    * added support for i18n of the package descriptions
@@@ -4844,26 -3127,6 +4887,26 @@@ apt (0.6.44) unstable; urgency=lo
    
   -- Michael Vogt <mvo@debian.org>  Mon,  8 May 2006 22:28:53 +0200
  
 +apt (0.6.43.3ubuntu3) dapper; urgency=low
 +
 +  * methods/http.cc:
 +    - fix the user-agent string
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 26 May 2006 18:09:32 +0200
 +
 +apt (0.6.43.3ubuntu2) dapper; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 18 Apr 2006 13:24:40 +0200
 +
 +apt (0.6.43.3ubuntu1) dapper; urgency=low
 +
 +  * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in 
 +    the status-fd (ubuntu #28954)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Mar 2006 20:34:46 +0200
 +
  apt (0.6.43.3) unstable; urgency=low
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186:
@@@ -4896,38 -3159,6 +4939,38 @@@
  
   -- Michael Vogt <mvo@debian.org>  Wed, 22 Feb 2006 10:13:04 +0100
  
 +apt (0.6.43.2ubuntu1) dapper; urgency=low
 +
 +  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
 +  * ca.po: Completed to 512t. Closes: #351592
 +    * eu.po: Completed to 512t. Closes: #350483
 +    * ja.po: Completed to 512t. Closes: #349806
 +    * pl.po: Completed to 512t. Closes: #349514
 +    * sk.po: Completed to 512t. Closes: #349474
 +    * gl.po: Completed to 512 strings Closes: #349407
 +    * vi.po: Completed to 512 strings
 +    * sv.po: Completed to 512 strings Closes: #349210
 +    * ru.po: Completed to 512 strings Closes: #349154
 +    * da.po: Completed to 512 strings Closes: #349084
 +    * fr.po: Completed to 512 strings
 +    * LINGUAS: Add Welsh
 +    * *.po: Updated from sources (512 strings)
 +    * vi.po: Completed to 511 strings  Closes: #348968
 +  * apt-pkg/deb/deblistparser.cc:
 +    - don't explode on a DepCompareOp in a Provides line, but warn about
 +      it and ignore it otherwise (thanks to James Troup for reporting it)
 +  * cmdline/apt-get.cc:
 +    - don't lock the lists directory in DoInstall, breaks --print-uri 
 +      (thanks to James Troup for reporting it)
 +  * debian/apt.dirs: create /etc/apt/sources.list.d 
 +  * make apt-cache madison work without deb-src entries (#352583)
 +  * cmdline/apt-get.cc: only run the list-cleaner if a update was 
 +    successfull
 +  * apt-get update errors are only warnings nowdays
 +  * be more careful with the signature file on network failures
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 20 Feb 2006 22:27:48 +0100
 +
  apt (0.6.43.2) unstable; urgency=low
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166:
@@@ -4951,24 -3182,6 +4994,24 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 19 Jan 2006 00:06:33 +0100
  
 +apt (0.6.43.1ubuntu1) dapper; urgency=low
 +
 +  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
 +    - en_GB.po, de.po: fix spaces errors in "Ign " translations
 +      Closes: #347258
 +    - makefile: make update-po a pre-requisite of clean target so
 +	        that POT and PO files are always up-to-date
 +    - sv.po: Completed to 511t. Closes: #346450
 +    - sk.po: Completed to 511t. Closes: #346369
 +    - fr.po: Completed to 511t
 +    - *.po: Updated from sources (511 strings)
 +  * add patch to fix http download corruption problem (thanks to
 +    Petr Vandrovec, closes: #280844, #290694)
 +  * added APT::Periodic::Unattended-Upgrade (requires the package
 +    "unattended-upgrade")
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jan 2006 17:09:31 +0100
 +
  apt (0.6.43.1) unstable; urgency=low
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:
@@@ -4992,19 -3205,6 +5035,19 @@@
  
   -- Michael Vogt <mvo@debian.org>  Fri,  6 Jan 2006 01:17:08 +0100
  
 +apt (0.6.43ubuntu2) dapper; urgency=low
 +
 +  * merged some missing bits that wheren't merged by baz in the previous
 +    upload (*grumble*)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  8 Dec 2005 18:35:58 +0100
 +
 +apt (0.6.43ubuntu1) dapper; urgency=low
 +
 +  * merged with debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Nov 2005 11:36:29 +0100
 +
  apt (0.6.43) unstable; urgency=medium
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:  
@@@ -5025,22 -3225,6 +5068,22 @@@
    
   -- Michael Vogt <mvo@debian.org>  Tue, 29 Nov 2005 00:17:07 +0100
  
 +apt (0.6.42.3ubuntu2) dapper; urgency=low
 +
 +  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131:  
 +    * zh_CN.po: Completed to 507 strings(Closes: #338267)
 +    * gl.po: Completed to 510 strings (Closes: #338356)
 +  * added support for "/etc/apt/sources.list.d" directory 
 +    (closes: #66325)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Nov 2005 15:30:12 +0100
 +
 +apt (0.6.42.3ubuntu1) dapper; urgency=low
 +
 +  * synced with debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Nov 2005 05:05:56 +0100
 +
  apt (0.6.42.3) unstable; urgency=low
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129:
@@@ -5147,80 -3331,6 +5190,80 @@@ apt (0.6.41) unstable; urgency=lo
    
   -- Michael Vogt <mvo@debian.org>  Mon,  5 Sep 2005 22:59:03 +0200
  
 +apt (0.6.40.1ubuntu8) breezy; urgency=low
 +
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62:
 +    - fix for a bad memory/file leak in the mmap code (ubuntu #15603)
 +  * po/de.po, po/fr.po: 
 +    - updated the translations
 +  * po/makefile:
 +    - create a single pot file in each domain dir to make rosetta happy
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 28 Sep 2005 10:16:06 +0200
 +
 +apt (0.6.40.1ubuntu7) breezy; urgency=low
 +
 +  * updated the pot/po files , no code changes
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 27 Sep 2005 18:38:16 +0200
 +
 +apt (0.6.40.1ubuntu6) breezy; urgency=low
 +
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56:
 +    - make it possible for apt to handle a failed MediaChange event and
 +      fall back to other sources (ubuntu #13713)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Sep 2005 22:09:50 +0200
 +
 +apt (0.6.40.1ubuntu5) breezy; urgency=low
 +
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}.
 +    This adds media-change reporting to the apt status-fd (ubuntu #15213)
 +  * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55:
 +    apt-pkg/cdrom.cc:
 +    - unmount the cdrom when apt failed to locate any package files
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 12 Sep 2005 15:44:26 +0200
 +
 +apt (0.6.40.1ubuntu4) breezy; urgency=low
 +
 +  * debian/apt.cron.daily:
 +    - fix a embarrassing typo
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  7 Sep 2005 10:10:37 +0200
 +
 +apt (0.6.40.1ubuntu3) breezy; urgency=low
 +
 +  * debian/apt.cron.daily:
 +    - use the ctime as well when figuring what packages need to
 +      be removed. This fixes the problem that packages copied with    
 +      "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Sep 2005 18:30:46 +0200
 +
 +apt (0.6.40.1ubuntu2) breezy; urgency=low
 +
 +  * improved the support for "error" and "conffile" reporting from
 +    dpkg, added the format to README.progress-reporting
 +  * added README.progress-reporting to the apt-doc package
 +  * Do md5sum checking for file and cdrom method (closes: #319142)
 +  * Change pkgPolicy::Pin from private to protected to let subclasses
 +    access it too (closes: #321799)
 +  * methods/connect.cc:
 +    - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item
 +  * apt-pkg/acquire-item.cc:
 +    - fail early if a FailReason is TmpResolveFailure (avoids hangs during
 +      the install when no network is available)
 +  * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 23 Aug 2005 19:44:55 +0200
 +
 +apt (0.6.40.1ubuntu1) breezy; urgency=low
 +
 +  * Synchronize with Debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  5 Aug 2005 14:20:56 +0200
 +
  apt (0.6.40.1) unstable; urgency=low
  
    * bugfix in the parsing code for the apt<->dpkg communication. apt 
@@@ -5230,12 -3340,6 +5273,12 @@@
  
   -- Michael Vogt <mvo@debian.org>  Fri,  5 Aug 2005 13:24:58 +0200
  
 +apt (0.6.40ubuntu1) breezy; urgency=low
 +
 +  * Synchronize with Debian
 +
 + -- Matt Zimmerman <mdz@ubuntu.com>  Thu,  4 Aug 2005 15:53:22 -0700
 +
  apt (0.6.40) unstable; urgency=low
  
    * Patch from Jordi Mallach to mark some additional strings for translation
@@@ -5251,39 -3355,6 +5294,39 @@@
  
   -- Matt Zimmerman <mdz@debian.org>  Thu, 28 Jul 2005 11:57:32 -0700
  
 +apt (0.6.39ubuntu4) breezy; urgency=low
 +
 +  * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this
 +    before...)
 +
 + -- Matt Zimmerman <mdz@ubuntu.com>  Wed, 29 Jun 2005 08:39:17 -0700
 +
 +apt (0.6.39ubuntu3) breezy; urgency=low
 +
 +  * Fix keyring locations for Ubuntu in apt-key too.
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Wed, 29 Jun 2005 14:45:36 +0100
 +
 +apt (0.6.39ubuntu2) breezy; urgency=low
 +
 +  * Install ubuntu-archive.gpg rather than debian-archive.gpg as
 +    /etc/apt/trusted.gpg.
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Wed, 29 Jun 2005 11:53:34 +0100
 +
 +apt (0.6.39ubuntu1) breezy; urgency=low
 +
 +  * Michael Vogt
 +    - Change debian/bugscript to use #!/bin/bash (Closes: #313402)
 +    - Fix a incorrect example in the man-page (closes: #282918)
 +    - Support architecture-specific extra overrides
 +      (closes: #225947). Thanks to  Anthony Towns for idea and
 +      the patch, thanks to Colin Watson for testing it.
 +    - better report network timeouts from the methods to the acuire code,
 +      only timeout once per sources.list line
 +
 + -- Matt Zimmerman <mdz@ubuntu.com>  Tue, 28 Jun 2005 11:52:24 -0700
 +
  apt (0.6.39) unstable; urgency=low
  
    * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
@@@ -5296,13 -3367,6 +5339,13 @@@
  
   -- Matt Zimmerman <mdz@debian.org>  Tue, 28 Jun 2005 11:51:09 -0700
  
 +apt (0.6.38ubuntu1) breezy; urgency=low
 +
 +  * First release from Ubuntu branch
 +  * Merge with --main--0, switch back to Ubuntu keyring
 +
 + -- Matt Zimmerman <mdz@ubuntu.com>  Sat, 25 Jun 2005 16:52:41 -0700
 +
  apt (0.6.38) unstable; urgency=low
  
    * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround
diff --combined doc/po/apt-doc.pot
index 0720f4c1f,159f86e6a..1c40d9f7c
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@@ -7,13 -7,14 +7,14 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2011-02-14 13:42+0100\n"
++"POT-Creation-Date: 2011-04-05 10:22+0300\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
+ "Language: \n"
  "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=utf-8\n"
- "Content-Transfer-Encoding: ENCODING"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
  
  #. type: TH
  #: apt.8:17
@@@ -966,7 -967,7 +967,7 @@@ msgid "
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 apt-sortpkgs.1.xml:61
++#: 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 ""
  
@@@ -986,12 -987,12 +987,12 @@@ msgid "
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 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 ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 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 ""
  
@@@ -1090,7 -1091,7 +1091,7 @@@ msgid "
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580
++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
  msgid "<option>-a</option>"
  msgstr ""
  
@@@ -1186,12 -1187,12 +1187,12 @@@ msgid "
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
--#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 apt-sortpkgs.1.xml:67
++#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 apt-sortpkgs.1.xml:67
  msgid "&apt-commonoptions;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
--#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 apt.conf.5.xml:1093 apt_preferences.5.xml:649
++#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 apt.conf.5.xml:1093 apt_preferences.5.xml:654
  msgid "Files"
  msgstr ""
  
@@@ -1201,7 -1202,7 +1202,7 @@@ msgid "&file-sourceslist; &file-stateli
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
--#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 sources.list.5.xml:234
++#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661 sources.list.5.xml:234
  msgid "See Also"
  msgstr ""
  
@@@ -1211,7 -1212,7 +1212,7 @@@ msgid "&apt-conf;, &sources-list;, &apt
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
--#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
++#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
  msgid "Diagnostics"
  msgstr ""
  
@@@ -1315,7 -1316,7 +1316,7 @@@ msgid "Options
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 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 ""
  
@@@ -1518,7 -1519,7 +1519,7 @@@ msgid "Just show the contents of the co
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 apt-sortpkgs.1.xml:73
++#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 apt-sortpkgs.1.xml:73
  msgid "&apt-conf;"
  msgstr ""
  
@@@ -2431,31 -2432,31 +2432,37 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-ftparchive.1.xml:529
--msgid "<option>--md5</option>"
++msgid "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:531
  msgid ""
--"Generate MD5 sums. This defaults to on, when turned off the generated index "
--"files will not have MD5Sum fields where possible.  Configuration Item: "
--"<literal>APT::FTPArchive::MD5</literal>"
++"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>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 ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:536
++#: apt-ftparchive.1.xml:539
  msgid "<option>--db</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:538
++#: 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>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:544
++#: 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 "
@@@ -2464,12 -2465,12 +2471,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:550
++#: apt-ftparchive.1.xml:553
  msgid "<option>--delink</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:552
++#: 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 "
@@@ -2478,12 -2479,12 +2485,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:558
++#: apt-ftparchive.1.xml:561
  msgid "<option>--contents</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:560
++#: 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 "
@@@ -2493,12 -2494,12 +2500,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:568
++#: apt-ftparchive.1.xml:571
  msgid "<option>--source-override</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:570
++#: apt-ftparchive.1.xml:573
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: "
@@@ -2506,24 -2507,24 +2513,24 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:574
++#: apt-ftparchive.1.xml:577
  msgid "<option>--readonly</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:576
++#: apt-ftparchive.1.xml:579
  msgid ""
  "Make the caching databases read only.  Configuration Item: "
  "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:580
++#: apt-ftparchive.1.xml:583
  msgid "<option>--arch</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:581
++#: 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 "
@@@ -2532,12 -2533,12 +2539,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:587
++#: apt-ftparchive.1.xml:590
  msgid "<option>APT::FTPArchive::AlwaysStat</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:589
++#: 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 "
@@@ -2551,12 -2552,12 +2558,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:599
++#: apt-ftparchive.1.xml:602
  msgid "<option>APT::FTPArchive::LongDescription</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:601
++#: 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 "
@@@ -2566,12 -2567,12 +2573,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
--#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 sources.list.5.xml:198
++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 sources.list.5.xml:198
  msgid "Examples"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
--#: apt-ftparchive.1.xml:619
++#: apt-ftparchive.1.xml:622
  #, no-wrap
  msgid ""
  "<command>apt-ftparchive</command> packages "
@@@ -2580,14 -2581,14 +2587,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-ftparchive.1.xml:615
++#: apt-ftparchive.1.xml:618
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-ftparchive.1.xml:629
++#: apt-ftparchive.1.xml:632
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -5873,39 -5874,39 +5880,44 @@@ msgstr "
  #: apt_preferences.5.xml:107
  msgid ""
  "to the versions coming from archives which in their "
--"<filename>Release</filename> files are marked as \"NotAutomatic: yes\" like "
--"the debian experimental archive."
++"<filename>Release</filename> files are marked as \"NotAutomatic: yes\" but "
++"<emphasis>not</emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
++"<literal>experimental</literal> archive."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:112
++#: apt_preferences.5.xml:113
  msgid "priority 100"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:113
--msgid "to the version that is already installed (if any)."
++#: apt_preferences.5.xml:114
++msgid ""
++"to the version that is already installed (if any) and to the versions coming "
++"from archives which in their <filename>Release</filename> files are marked "
++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
++"backports archive since <literal>squeeze-backports</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:117
++#: apt_preferences.5.xml:121
  msgid "priority 500"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:118
++#: apt_preferences.5.xml:122
  msgid ""
  "to the versions that are not installed and do not belong to the target "
  "release."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:122
++#: apt_preferences.5.xml:126
  msgid "priority 990"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:123
++#: apt_preferences.5.xml:127
  msgid "to the versions that are not installed and belong to the target release."
  msgstr ""
  
@@@ -5918,24 -5919,24 +5930,25 @@@ msgid "
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:128
++#: apt_preferences.5.xml:132
  msgid ""
  "If the target release has not been specified then APT simply assigns "
  "priority 100 to all installed package versions and priority 500 to all "
--"uninstalled package versions, expect versions coming from archives which in "
++"uninstalled package versions, except versions coming from archives which in "
  "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
--"- these versions get the priority 1."
++"- these versions get the priority 1 or priority 100 if it is additionally "
++"marked as \"ButAutomaticUpgrades: yes\"."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:134
++#: apt_preferences.5.xml:139
  msgid ""
  "APT then applies the following rules, listed in order of precedence, to "
  "determine which version of a package to install."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:137
++#: apt_preferences.5.xml:142
  msgid ""
  "Never downgrade unless the priority of an available version exceeds 1000.  "
  "(\"Downgrading\" is installing a less recent version of a package in place "
@@@ -5945,19 -5946,19 +5958,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:143
++#: apt_preferences.5.xml:148
  msgid "Install the highest priority version."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:144
++#: apt_preferences.5.xml:149
  msgid ""
  "If two or more versions have the same priority, install the most recent one "
  "(that is, the one with the higher version number)."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:147
++#: apt_preferences.5.xml:152
  msgid ""
  "If two or more versions have the same priority and version number but either "
  "the packages differ in some of their metadata or the "
@@@ -5965,7 -5966,7 +5978,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:153
++#: apt_preferences.5.xml:158
  msgid ""
  "In a typical situation, the installed version of a package (priority 100)  "
  "is not as recent as one of the versions available from the sources listed in "
@@@ -5976,7 -5977,7 +5989,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:160
++#: apt_preferences.5.xml:165
  msgid ""
  "More rarely, the installed version of a package is <emphasis>more</emphasis> "
  "recent than any of the other available versions.  The package will not be "
@@@ -5986,7 -5987,7 +5999,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:165
++#: apt_preferences.5.xml:170
  msgid ""
  "Sometimes the installed version of a package is more recent than the version "
  "belonging to the target release, but not as recent as a version belonging to "
@@@ -5998,12 -5999,12 +6011,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:174
++#: apt_preferences.5.xml:179
  msgid "The Effect of APT Preferences"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:176
++#: apt_preferences.5.xml:181
  msgid ""
  "The APT preferences file allows the system administrator to control the "
  "assignment of priorities.  The file consists of one or more multi-line "
@@@ -6012,7 -6013,7 +6025,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:182
++#: apt_preferences.5.xml:187
  msgid ""
  "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
  "specified packages and specified version or version range.  For example, the "
@@@ -6022,7 -6023,7 +6035,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:189
++#: apt_preferences.5.xml:194
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -6031,7 -6032,7 +6044,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:195
++#: apt_preferences.5.xml:200
  msgid ""
  "The general form assigns a priority to all of the package versions in a "
  "given distribution (that is, to all the versions of packages that are listed "
@@@ -6041,7 -6042,7 +6054,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:201
++#: apt_preferences.5.xml:206
  msgid ""
  "This general-form entry in the APT preferences file applies only to groups "
  "of packages.  For example, the following record assigns a high priority to "
@@@ -6049,7 -6050,7 +6062,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:206
++#: apt_preferences.5.xml:211
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6058,7 -6059,7 +6071,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:211
++#: apt_preferences.5.xml:216
  msgid ""
  "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
  "which can be used to match a hostname. The following record will assign a "
@@@ -6067,7 -6068,7 +6080,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:215
++#: apt_preferences.5.xml:220
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6076,7 -6077,7 +6089,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:219
++#: apt_preferences.5.xml:224
  msgid ""
  "This should <emphasis>not</emphasis> be confused with the Origin of a "
  "distribution as specified in a <filename>Release</filename> file.  What "
@@@ -6086,7 -6087,7 +6099,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:224
++#: apt_preferences.5.xml:229
  msgid ""
  "The following record assigns a low priority to all package versions "
  "belonging to any distribution whose Archive name is "
@@@ -6094,7 -6095,7 +6107,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:228
++#: apt_preferences.5.xml:233
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6103,7 -6104,7 +6116,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:233
++#: apt_preferences.5.xml:238
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any distribution whose Codename is "
@@@ -6111,7 -6112,7 +6124,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:237
++#: apt_preferences.5.xml:242
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6120,7 -6121,7 +6133,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:242
++#: apt_preferences.5.xml:247
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@@ -6128,7 -6129,7 +6141,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:247
++#: apt_preferences.5.xml:252
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6137,82 -6138,82 +6150,82 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:258
++#: apt_preferences.5.xml:263
  msgid "How APT Interprets Priorities"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:266
++#: apt_preferences.5.xml:271
  msgid "P &gt; 1000"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:267
++#: apt_preferences.5.xml:272
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
  "package"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:271
++#: apt_preferences.5.xml:276
  msgid "990 &lt; P &lt;=1000"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:272
++#: apt_preferences.5.xml:277
  msgid ""
  "causes a version to be installed even if it does not come from the target "
  "release, unless the installed version is more recent"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:277
++#: apt_preferences.5.xml:282
  msgid "500 &lt; P &lt;=990"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:278
++#: apt_preferences.5.xml:283
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to the target release or the installed version is more recent"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:283
++#: apt_preferences.5.xml:288
  msgid "100 &lt; P &lt;=500"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:284
++#: apt_preferences.5.xml:289
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to some other distribution or the installed version is more recent"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:289
++#: apt_preferences.5.xml:294
  msgid "0 &lt; P &lt;=100"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:290
++#: apt_preferences.5.xml:295
  msgid ""
  "causes a version to be installed only if there is no installed version of "
  "the package"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:294
++#: apt_preferences.5.xml:299
  msgid "P &lt; 0"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:295
++#: apt_preferences.5.xml:300
  msgid "prevents the version from being installed"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:261
++#: apt_preferences.5.xml:266
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -6220,7 -6221,7 +6233,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:300
++#: apt_preferences.5.xml:305
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -6229,14 -6230,14 +6242,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:306
++#: apt_preferences.5.xml:311
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
  "presented earlier:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
--#: apt_preferences.5.xml:310
++#: apt_preferences.5.xml:315
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -6253,12 -6254,12 +6266,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:323
++#: apt_preferences.5.xml:328
  msgid "Then:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:325
++#: apt_preferences.5.xml:330
  msgid ""
  "The most recent available version of the <literal>perl</literal> package "
  "will be installed, so long as that version's version number begins with "
@@@ -6268,7 -6269,7 +6281,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:330
++#: apt_preferences.5.xml:335
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -6276,7 -6277,7 +6289,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:334
++#: apt_preferences.5.xml:339
  msgid ""
  "A version of a package whose origin is not the local system but some other "
  "site listed in &sources-list; and which belongs to an "
@@@ -6285,12 -6286,12 +6298,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:344
++#: apt_preferences.5.xml:349
  msgid "Determination of Package Version and Distribution Properties"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:346
++#: apt_preferences.5.xml:351
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -6298,27 -6299,27 +6311,27 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:358
++#: apt_preferences.5.xml:363
  msgid "the <literal>Package:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:359
++#: apt_preferences.5.xml:364
  msgid "gives the package name"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
  msgid "the <literal>Version:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:363
++#: apt_preferences.5.xml:368
  msgid "gives the version number for the named package"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:350
++#: apt_preferences.5.xml:355
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: "
@@@ -6330,12 -6331,12 +6343,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:379
++#: apt_preferences.5.xml:384
  msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:380
++#: apt_preferences.5.xml:385
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -6346,18 -6347,18 +6359,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:390
++#: apt_preferences.5.xml:395
  #, no-wrap
  msgid "Pin: release a=stable\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:396
++#: apt_preferences.5.xml:401
  msgid "the <literal>Codename:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:397
++#: apt_preferences.5.xml:402
  msgid ""
  "names the codename to which all the packages in the directory tree belong.  "
  "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@@ -6368,13 -6369,13 +6381,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:406
++#: apt_preferences.5.xml:411
  #, no-wrap
  msgid "Pin: release n=&testing-codename;\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:413
++#: apt_preferences.5.xml:418
  msgid ""
  "names the release version.  For example, the packages in the tree might "
  "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@@ -6385,7 -6386,7 +6398,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:422
++#: apt_preferences.5.xml:427
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -6394,12 -6395,12 +6407,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:431
++#: apt_preferences.5.xml:436
  msgid "the <literal>Component:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:432
++#: apt_preferences.5.xml:437
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -6411,18 -6412,18 +6424,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:441
++#: apt_preferences.5.xml:446
  #, no-wrap
  msgid "Pin: release c=main\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:447
++#: apt_preferences.5.xml:452
  msgid "the <literal>Origin:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:448
++#: apt_preferences.5.xml:453
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is "
@@@ -6431,18 -6432,18 +6444,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:454
++#: apt_preferences.5.xml:459
  #, no-wrap
  msgid "Pin: release o=Debian\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:460
++#: apt_preferences.5.xml:465
  msgid "the <literal>Label:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:461
++#: apt_preferences.5.xml:466
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is "
@@@ -6451,13 -6452,13 +6464,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:467
++#: apt_preferences.5.xml:472
  #, no-wrap
  msgid "Pin: release l=Debian\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:368
++#: apt_preferences.5.xml:373
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -6471,7 -6472,7 +6484,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:474
++#: apt_preferences.5.xml:479
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -6486,12 -6487,12 +6499,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:487
++#: apt_preferences.5.xml:492
  msgid "Optional Lines in an APT Preferences Record"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:489
++#: apt_preferences.5.xml:494
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -6499,12 -6500,12 +6512,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:498
++#: apt_preferences.5.xml:503
  msgid "Tracking Stable"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:506
++#: apt_preferences.5.xml:511
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -6519,7 -6520,7 +6532,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:500
++#: apt_preferences.5.xml:505
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -6529,7 -6530,7 +6542,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 apt_preferences.5.xml:627
++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 apt_preferences.5.xml:632
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -6538,7 -6539,7 +6551,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:518
++#: apt_preferences.5.xml:523
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -6547,13 -6548,13 +6560,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:535
++#: apt_preferences.5.xml:540
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/testing\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:529
++#: apt_preferences.5.xml:534
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -6562,12 -6563,12 +6575,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:541
++#: apt_preferences.5.xml:546
  msgid "Tracking Testing or Unstable"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:550
++#: apt_preferences.5.xml:555
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6584,7 -6585,7 +6597,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:543
++#: apt_preferences.5.xml:548
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -6595,7 -6596,7 +6608,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:564
++#: apt_preferences.5.xml:569
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -6604,13 -6605,13 +6617,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:584
++#: apt_preferences.5.xml:589
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:575
++#: apt_preferences.5.xml:580
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -6622,12 -6623,12 +6635,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:591
++#: apt_preferences.5.xml:596
  msgid "Tracking the evolution of a codename release"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:605
++#: apt_preferences.5.xml:610
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package "
@@@ -6649,7 -6650,7 +6662,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:593
++#: apt_preferences.5.xml:598
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -6664,7 -6665,7 +6677,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:622
++#: apt_preferences.5.xml:627
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest version(s) in "
@@@ -6673,13 -6674,13 +6686,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:642
++#: apt_preferences.5.xml:647
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/sid\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:633
++#: apt_preferences.5.xml:638
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -6691,12 -6692,12 +6704,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
--#: apt_preferences.5.xml:651
++#: apt_preferences.5.xml:656
  msgid "&file-preferences;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt_preferences.5.xml:657
++#: apt_preferences.5.xml:662
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr ""
  
diff --combined doc/po/de.po
index 75595df07,75595df07..c75a8dda5
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt-doc 0.7.25.3\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
--"POT-Creation-Date: 2011-02-14 13:42+0100\n"
++"POT-Creation-Date: 2011-04-05 10:22+0300\n"
  "PO-Revision-Date: 2010-09-16 19:04+0100\n"
  "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
  "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@@ -1310,7 -1310,7 +1310,7 @@@ msgstr "
  "pkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 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>"
@@@ -1338,12 -1338,12 +1338,12 @@@ msgstr "
  "srcpkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 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:542 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>"
  
@@@ -1458,7 -1458,7 +1458,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:580
++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
  msgid "<option>-a</option>"
  msgstr "<option>-a</option>"
  
@@@ -1575,14 -1575,14 +1575,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:608 apt-get.8.xml:570
++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
  #: 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:575 apt-key.8.xml:156 apt-mark.8.xml:125
--#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
  msgid "Files"
  msgstr "Dateien"
  
@@@ -1593,9 -1593,9 +1593,9 @@@ 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:624 apt-get.8.xml:585
++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
  #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
--#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
  #: sources.list.5.xml:234
  msgid "See Also"
  msgstr "Siehe auch"
@@@ -1607,7 -1607,7 +1607,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:628 apt-get.8.xml:591
++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
  #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
  msgid "Diagnostics"
  msgstr "Diagnose"
@@@ -1742,7 -1742,7 +1742,7 @@@ msgid "Options
  msgstr "Optionen"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 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>"
  
@@@ -1996,7 -1996,7 +1996,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:625
++#: 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;"
@@@ -3144,27 -3144,27 +3144,49 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-ftparchive.1.xml:529
--msgid "<option>--md5</option>"
--msgstr "<option>--md5</option>"
++msgid ""
++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
++msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:531
--msgid ""
--"Generate MD5 sums. This defaults to on, when turned off the generated index "
--"files will not have MD5Sum fields where possible.  Configuration Item: "
--"<literal>APT::FTPArchive::MD5</literal>"
++#, 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>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 ""
--"Generiert MD5-Summen. Dies ist standardmäßig an, wenn es ausgeschaltet ist, "
--"haben die generierten Indexdateien keine MD5Sum-Felder, sofern dies möglich "
--"ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</literal>"
++"Werte für zusätzliche Metadatenfelder in der Release-Datei werden den "
++"entsprechenden Variablen unter <literal>APT::FTPArchive::Release</literal> "
++"entnommen, z.B. <literal>APT::FTPArchive::Release::Origin</literal>. Die "
++"unterstützten Felder sind: <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:536
++#: 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:538
++#: 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 -3174,7 +3196,7 @@@ msgstr "
  "DB</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:544
++#: 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 -3188,12 +3210,12 @@@ msgstr "
  "Konfigurationselement: <literal>quiet</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:550
++#: 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:552
++#: 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 -3207,12 +3229,12 @@@ msgstr "
  "DeLinkAct</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:558
++#: 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:560
++#: 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 -3228,12 +3250,12 @@@ msgstr "
  "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:568
++#: 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:570
++#: 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 -3244,12 +3266,12 @@@ msgstr "
  "SourceOverride</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:574
++#: 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:576
++#: apt-ftparchive.1.xml:579
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3258,12 -3258,12 +3280,12 @@@ msgstr "
  "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:580
++#: 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:581
++#: 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 -3277,12 +3299,12 @@@ msgstr "
  "Architecture</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:587
++#: 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:589
++#: 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 -3306,12 +3328,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:599
++#: 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:601
++#: 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 -3327,19 +3349,19 @@@ msgstr "
  "werden kann."
  
  #. type: Content of: <refentry><refsect1><title>
--#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
  #: sources.list.5.xml:198
  msgid "Examples"
  msgstr "Beispiele"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
--#: apt-ftparchive.1.xml:619
++#: 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:615
++#: 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 -3349,7 +3371,7 @@@ msgstr "
  ">"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-ftparchive.1.xml:629
++#: apt-ftparchive.1.xml:632
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -7895,32 -7895,32 +7917,50 @@@ msgstr "Priorität 1
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:107
++#, fuzzy
++#| msgid ""
++#| "to the versions coming from archives which in their <filename>Release</"
++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
++#| "experimental archive."
  msgid ""
  "to the versions coming from archives which in their <filename>Release</"
--"filename> files are marked as \"NotAutomatic: yes\" like the debian "
--"experimental archive."
++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
++"<literal>experimental</literal> archive."
  msgstr ""
  "zu den Versionen, die von Archiven kommen, deren <filename>Release</"
  "filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-"
  "Experimental-Archiv."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:112
++#: apt_preferences.5.xml:113
  msgid "priority 100"
  msgstr "Priorität 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:113
--msgid "to the version that is already installed (if any)."
--msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)."
++#: apt_preferences.5.xml:114
++#, fuzzy
++#| msgid ""
++#| "to the versions coming from archives which in their <filename>Release</"
++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
++#| "experimental archive."
++msgid ""
++"to the version that is already installed (if any) and to the versions coming "
++"from archives which in their <filename>Release</filename> files are marked "
++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
++"backports archive since <literal>squeeze-backports</literal>."
++msgstr ""
++"zu den Versionen, die von Archiven kommen, deren <filename>Release</"
++"filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-"
++"Experimental-Archiv."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:117
++#: apt_preferences.5.xml:121
  msgid "priority 500"
  msgstr "Priorität 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:118
++#: apt_preferences.5.xml:122
  msgid ""
  "to the versions that are not installed and do not belong to the target "
  "release."
@@@ -7929,12 -7929,12 +7969,12 @@@ msgstr "
  "gehören."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:122
++#: apt_preferences.5.xml:126
  msgid "priority 990"
  msgstr "Priorität 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:123
++#: apt_preferences.5.xml:127
  msgid ""
  "to the versions that are not installed and belong to the target release."
  msgstr ""
@@@ -7952,13 -7952,13 +7992,21 @@@ msgstr "
  "Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:128
++#: apt_preferences.5.xml:132
++#, fuzzy
++#| msgid ""
++#| "If the target release has not been specified then APT simply assigns "
++#| "priority 100 to all installed package versions and priority 500 to all "
++#| "uninstalled package versions, expect versions coming from archives which "
++#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: "
++#| "yes\" - these versions get the priority 1."
  msgid ""
  "If the target release has not been specified then APT simply assigns "
  "priority 100 to all installed package versions and priority 500 to all "
--"uninstalled package versions, expect versions coming from archives which in "
++"uninstalled package versions, except versions coming from archives which in "
  "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
--"- these versions get the priority 1."
++"- these versions get the priority 1 or priority 100 if it is additionally "
++"marked as \"ButAutomaticUpgrades: yes\"."
  msgstr ""
  "Wenn das Ziel-Release nicht angegeben wurde, dann weist APT einfach allen "
  "installierten Paketversionen eine Priorität von 100 und allen nicht "
@@@ -7967,7 -7967,7 +8015,7 @@@
  "ist – diese Versionen erhalten die Prirität 1."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:134
++#: apt_preferences.5.xml:139
  msgid ""
  "APT then applies the following rules, listed in order of precedence, to "
  "determine which version of a package to install."
@@@ -7977,7 -7977,7 +8025,7 @@@ msgstr "
  "ist."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:137
++#: apt_preferences.5.xml:142
  msgid ""
  "Never downgrade unless the priority of an available version exceeds 1000.  "
  "(\"Downgrading\" is installing a less recent version of a package in place "
@@@ -7993,12 -7993,12 +8041,12 @@@ msgstr "
  "Downgrading eines Paketes riskant sein kann.)"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:143
++#: apt_preferences.5.xml:148
  msgid "Install the highest priority version."
  msgstr "Die Version mit der höchsten Priorität installieren."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:144
++#: apt_preferences.5.xml:149
  msgid ""
  "If two or more versions have the same priority, install the most recent one "
  "(that is, the one with the higher version number)."
@@@ -8007,7 -8007,7 +8055,7 @@@ msgstr "
  "aktuellste installiert (das ist die mit der höheren Versionsnummer)."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:147
++#: apt_preferences.5.xml:152
  msgid ""
  "If two or more versions have the same priority and version number but either "
  "the packages differ in some of their metadata or the <literal>--reinstall</"
@@@ -8019,7 -8019,7 +8067,7 @@@ msgstr "
  "installierte installiert."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:153
++#: apt_preferences.5.xml:158
  msgid ""
  "In a typical situation, the installed version of a package (priority 100)  "
  "is not as recent as one of the versions available from the sources listed in "
@@@ -8035,7 -8035,7 +8083,7 @@@ msgstr "
  "upgrade</command> ausgeführt wird."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:160
++#: apt_preferences.5.xml:165
  msgid ""
  "More rarely, the installed version of a package is <emphasis>more</emphasis> "
  "recent than any of the other available versions.  The package will not be "
@@@ -8049,7 -8049,7 +8097,7 @@@ msgstr "
  "upgrade</command> ausgeführt wird."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:165
++#: apt_preferences.5.xml:170
  msgid ""
  "Sometimes the installed version of a package is more recent than the version "
  "belonging to the target release, but not as recent as a version belonging to "
@@@ -8069,12 -8069,12 +8117,12 @@@ msgstr "
  "hat."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:174
++#: apt_preferences.5.xml:179
  msgid "The Effect of APT Preferences"
  msgstr "Die Auswirkungen von APT-Einstellungen"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:176
++#: apt_preferences.5.xml:181
  msgid ""
  "The APT preferences file allows the system administrator to control the "
  "assignment of priorities.  The file consists of one or more multi-line "
@@@ -8088,7 -8088,7 +8136,7 @@@ msgstr "
  "allgemeine Gestalt."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:182
++#: apt_preferences.5.xml:187
  msgid ""
  "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
  "specified packages and specified version or version range.  For example, the "
@@@ -8104,7 -8104,7 +8152,7 @@@ msgstr "
  "können durch Leerzeichen getrennt werden."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:189
++#: apt_preferences.5.xml:194
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8116,7 -8116,7 +8164,7 @@@ msgstr "
  "Pin-Priority: 1001\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:195
++#: apt_preferences.5.xml:200
  msgid ""
  "The general form assigns a priority to all of the package versions in a "
  "given distribution (that is, to all the versions of packages that are listed "
@@@ -8131,7 -8131,7 +8179,7 @@@ msgstr "
  "ausgebildeten Domänennamen identifiziert wird, eine Priorität zu."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:201
++#: apt_preferences.5.xml:206
  msgid ""
  "This general-form entry in the APT preferences file applies only to groups "
  "of packages.  For example, the following record assigns a high priority to "
@@@ -8142,7 -8142,7 +8190,7 @@@ msgstr "
  "Paketversionen eine hohe Priorität zu, die lokal liegen."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:206
++#: apt_preferences.5.xml:211
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8154,7 -8154,7 +8202,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:211
++#: apt_preferences.5.xml:216
  msgid ""
  "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
  "which can be used to match a hostname. The following record will assign a "
@@@ -8168,7 -8168,7 +8216,7 @@@ msgstr "
  "de.debian.org« identifiziert wird."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:215
++#: apt_preferences.5.xml:220
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8180,7 -8180,7 +8228,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:219
++#: apt_preferences.5.xml:224
  msgid ""
  "This should <emphasis>not</emphasis> be confused with the Origin of a "
  "distribution as specified in a <filename>Release</filename> file.  What "
@@@ -8195,7 -8195,7 +8243,7 @@@ msgstr "
  "oder »Ximian«."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:224
++#: apt_preferences.5.xml:229
  msgid ""
  "The following record assigns a low priority to all package versions "
  "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@@ -8206,7 -8206,7 +8254,7 @@@ msgstr "
  "Priorität zu."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:228
++#: apt_preferences.5.xml:233
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8218,7 -8218,7 +8266,7 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:233
++#: apt_preferences.5.xml:238
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@@ -8229,7 -8229,7 +8277,7 @@@ msgstr "
  "hohe Priorität zu."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:237
++#: apt_preferences.5.xml:242
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8241,7 -8241,7 +8289,7 @@@ msgstr "
  "Pin-Priority: 900\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:242
++#: apt_preferences.5.xml:247
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@@ -8252,7 -8252,7 +8300,7 @@@ msgstr "
  "Nummer »<literal>3.0</literal>« ist, eine hohe Priorität zu."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:247
++#: apt_preferences.5.xml:252
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8264,17 -8264,17 +8312,17 @@@ msgstr "
  "Pin-Priority: 500\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:258
++#: apt_preferences.5.xml:263
  msgid "How APT Interprets Priorities"
  msgstr "Wie APT Prioritäten interpretiert"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:266
++#: apt_preferences.5.xml:271
  msgid "P &gt; 1000"
  msgstr "P &gt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:267
++#: apt_preferences.5.xml:272
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
  "package"
@@@ -8283,12 -8283,12 +8331,12 @@@ msgstr "
  "des Pakets durchführt"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:271
++#: apt_preferences.5.xml:276
  msgid "990 &lt; P &lt;=1000"
  msgstr "990 &lt; P &lt;=1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:272
++#: apt_preferences.5.xml:277
  msgid ""
  "causes a version to be installed even if it does not come from the target "
  "release, unless the installed version is more recent"
@@@ -8297,12 -8297,12 +8345,12 @@@ msgstr "
  "Ziel-Release kommt, außer wenn die installierte Version aktueller ist"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:277
++#: apt_preferences.5.xml:282
  msgid "500 &lt; P &lt;=990"
  msgstr "500 &lt; P &lt;=990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:278
++#: apt_preferences.5.xml:283
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to the target release or the installed version is more recent"
@@@ -8312,12 -8312,12 +8360,12 @@@ msgstr "
  "neuer ist"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:283
++#: apt_preferences.5.xml:288
  msgid "100 &lt; P &lt;=500"
  msgstr "100 &lt; P &lt;=500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:284
++#: apt_preferences.5.xml:289
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to some other distribution or the installed version is more recent"
@@@ -8327,12 -8327,12 +8375,12 @@@ msgstr "
  "installierte Version neuer ist"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:289
++#: apt_preferences.5.xml:294
  msgid "0 &lt; P &lt;=100"
  msgstr "0 &lt; P &lt;=100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:290
++#: apt_preferences.5.xml:295
  msgid ""
  "causes a version to be installed only if there is no installed version of "
  "the package"
@@@ -8341,17 -8341,17 +8389,17 @@@ msgstr "
  "installierte Version des Pakets gibt"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:294
++#: apt_preferences.5.xml:299
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:295
++#: apt_preferences.5.xml:300
  msgid "prevents the version from being installed"
  msgstr "verhindert das Installieren der Version"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:261
++#: apt_preferences.5.xml:266
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -8362,7 -8362,7 +8410,7 @@@ msgstr "
  "(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:300
++#: apt_preferences.5.xml:305
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -8376,7 -8376,7 +8424,7 @@@ msgstr "
  "erste dieser Datensätze die Priorität der Paketversion fest."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:306
++#: apt_preferences.5.xml:311
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
  "presented earlier:"
@@@ -8385,7 -8385,7 +8433,7 @@@ msgstr "
  "bereits gezeigten Datensätze:"
  
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
--#: apt_preferences.5.xml:310
++#: apt_preferences.5.xml:315
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8413,12 -8413,12 +8461,12 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:323
++#: apt_preferences.5.xml:328
  msgid "Then:"
  msgstr "Dann:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:325
++#: apt_preferences.5.xml:330
  msgid ""
  "The most recent available version of the <literal>perl</literal> package "
  "will be installed, so long as that version's version number begins with "
@@@ -8433,7 -8433,7 +8481,7 @@@ msgstr "
  "dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:330
++#: apt_preferences.5.xml:335
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -8444,7 -8444,7 +8492,7 @@@ msgstr "
  "sogar wenn diese Versionen zum Ziel-Release gehören."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:334
++#: apt_preferences.5.xml:339
  msgid ""
  "A version of a package whose origin is not the local system but some other "
  "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@@ -8458,12 -8458,12 +8506,12 @@@ msgstr "
  "Pakets installiert ist."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:344
++#: apt_preferences.5.xml:349
  msgid "Determination of Package Version and Distribution Properties"
  msgstr "Festlegung von Paketversion und Distributions-Eigenschaften"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:346
++#: apt_preferences.5.xml:351
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -8474,27 -8474,27 +8522,27 @@@ msgstr "
  "bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:358
++#: apt_preferences.5.xml:363
  msgid "the <literal>Package:</literal> line"
  msgstr "die <literal>Package:</literal>-Zeile"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:359
++#: apt_preferences.5.xml:364
  msgid "gives the package name"
  msgstr "gibt den Paketnamen an"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
  msgid "the <literal>Version:</literal> line"
  msgstr "die <literal>Version:</literal>-Zeile"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:363
++#: apt_preferences.5.xml:368
  msgid "gives the version number for the named package"
  msgstr "gibt die Versionsnummer für das genannte Paket an"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:350
++#: apt_preferences.5.xml:355
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -8515,12 -8515,12 +8563,12 @@@ msgstr "
  "Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:379
++#: apt_preferences.5.xml:384
  msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
  msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:380
++#: apt_preferences.5.xml:385
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -8537,18 -8537,18 +8585,18 @@@ msgstr "
  "die folgende Zeile benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:390
++#: apt_preferences.5.xml:395
  #, no-wrap
  msgid "Pin: release a=stable\n"
  msgstr "Pin: release a=stable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:396
++#: apt_preferences.5.xml:401
  msgid "the <literal>Codename:</literal> line"
  msgstr "die <literal>Codename:</literal>-Zeile"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:397
++#: apt_preferences.5.xml:402
  msgid ""
  "names the codename to which all the packages in the directory tree belong.  "
  "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@@ -8565,13 -8565,13 +8613,13 @@@ msgstr "
  "anzugeben würde die folgende Zeile benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:406
++#: apt_preferences.5.xml:411
  #, no-wrap
  msgid "Pin: release n=&testing-codename;\n"
  msgstr "Pin: release n=&testing-codename;\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:413
++#: apt_preferences.5.xml:418
  msgid ""
  "names the release version.  For example, the packages in the tree might "
  "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@@ -8587,7 -8587,7 +8635,7 @@@ msgstr "
  "eine der folgenden Zeilen benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:422
++#: apt_preferences.5.xml:427
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -8599,12 -8599,12 +8647,12 @@@ msgstr "
  "Pin: release 3.0\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:431
++#: apt_preferences.5.xml:436
  msgid "the <literal>Component:</literal> line"
  msgstr "die <literal>Component:</literal>-Zeile"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:432
++#: apt_preferences.5.xml:437
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -8622,18 -8622,18 +8670,18 @@@ msgstr "
  "Zeilen benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:441
++#: apt_preferences.5.xml:446
  #, no-wrap
  msgid "Pin: release c=main\n"
  msgstr "Pin: release c=main\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:447
++#: apt_preferences.5.xml:452
  msgid "the <literal>Origin:</literal> line"
  msgstr "die <literal>Origin:</literal>-Zeile"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:448
++#: apt_preferences.5.xml:453
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8645,18 -8645,18 +8693,18 @@@ msgstr "
  "in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:454
++#: apt_preferences.5.xml:459
  #, no-wrap
  msgid "Pin: release o=Debian\n"
  msgstr "Pin: release o=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:460
++#: apt_preferences.5.xml:465
  msgid "the <literal>Label:</literal> line"
  msgstr "die <literal>Label:</literal>-Zeile"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:461
++#: apt_preferences.5.xml:466
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8669,13 -8669,13 +8717,13 @@@ msgstr "
  "die folgende Zeile benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:467
++#: apt_preferences.5.xml:472
  #, no-wrap
  msgid "Pin: release l=Debian\n"
  msgstr "Pin: release l=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:368
++#: apt_preferences.5.xml:373
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -8698,7 -8698,7 +8746,7 @@@ msgstr "
  "APT-Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:474
++#: apt_preferences.5.xml:479
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -8724,12 -8724,12 +8772,12 @@@ msgstr "
  "Distribution heruntergeladen wurde."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:487
++#: apt_preferences.5.xml:492
  msgid "Optional Lines in an APT Preferences Record"
  msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:489
++#: apt_preferences.5.xml:494
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -8740,12 -8740,12 +8788,12 @@@ msgstr "
  "anfangen. Dieses stellt einen Platz für Kommentare bereit."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:498
++#: apt_preferences.5.xml:503
  msgid "Tracking Stable"
  msgstr "Stable verfolgen"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:506
++#: apt_preferences.5.xml:511
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -8769,7 -8769,7 +8817,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:500
++#: apt_preferences.5.xml:505
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -8784,8 -8784,8 +8832,8 @@@ msgstr "
  "Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
--#: apt_preferences.5.xml:627
++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
++#: apt_preferences.5.xml:632
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -8797,7 -8797,7 +8845,7 @@@ msgstr "
  "apt-get dist-upgrade\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:518
++#: apt_preferences.5.xml:523
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -8810,13 -8810,13 +8858,13 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:535
++#: apt_preferences.5.xml:540
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/testing\n"
  msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:529
++#: apt_preferences.5.xml:534
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -8830,12 -8830,12 +8878,12 @@@ msgstr "
  "\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:541
++#: apt_preferences.5.xml:546
  msgid "Tracking Testing or Unstable"
  msgstr "Testing oder Unstable verfolgen"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:550
++#: apt_preferences.5.xml:555
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8863,7 -8863,7 +8911,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:543
++#: apt_preferences.5.xml:548
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -8880,7 -8880,7 +8928,7 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:564
++#: apt_preferences.5.xml:569
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -8893,13 -8893,13 +8941,13 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:584
++#: apt_preferences.5.xml:589
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
  msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:575
++#: apt_preferences.5.xml:580
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -8919,12 -8919,12 +8967,12 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:591
++#: apt_preferences.5.xml:596
  msgid "Tracking the evolution of a codename release"
  msgstr "Die Entwicklung eines Codename-Releases verfolgen"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:605
++#: apt_preferences.5.xml:610
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -8959,7 -8959,7 +9007,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:593
++#: apt_preferences.5.xml:598
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -8985,7 -8985,7 +9033,7 @@@ msgstr "
  "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:622
++#: apt_preferences.5.xml:627
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest version(s) in "
@@@ -8998,13 -8998,13 +9046,13 @@@ msgstr "
  "literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:642
++#: apt_preferences.5.xml:647
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/sid\n"
  msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:633
++#: apt_preferences.5.xml:638
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -9024,12 -9024,12 +9072,12 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><variablelist>
--#: apt_preferences.5.xml:651
++#: apt_preferences.5.xml:656
  msgid "&file-preferences;"
  msgstr "&file-preferences;"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt_preferences.5.xml:657
++#: apt_preferences.5.xml:662
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
@@@ -11097,6 -11097,6 +11145,22 @@@ 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."
  
++#~ msgid "<option>--md5</option>"
++#~ msgstr "<option>--md5</option>"
++
++#~ msgid ""
++#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
++#~ "index files will not have MD5Sum fields where possible.  Configuration "
++#~ "Item: <literal>APT::FTPArchive::MD5</literal>"
++#~ msgstr ""
++#~ "Generiert MD5-Summen. Dies ist standardmäßig an, wenn es ausgeschaltet "
++#~ "ist, haben die generierten Indexdateien keine MD5Sum-Felder, sofern dies "
++#~ "möglich ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</"
++#~ "literal>"
++
++#~ msgid "to the version that is already installed (if any)."
++#~ msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)."
++
  #~ msgid "APT package handling utility -- cache manipulator"
  #~ msgstr ""
  #~ "APT-Werkzeug zur Handhabung von Paketen -- Zwischenspeichermanipulierer"
@@@ -11157,8 -11157,8 +11221,12 @@@
  #~ "Benutzt HTTP, um auf das Archiv auf nonus.debian.org unter dem debian-non-"
  #~ "US-Verzeichnis zuzugreifen."
  
--#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
--#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
++#~ msgid ""
++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
++#~ "free"
++#~ msgstr ""
++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
++#~ "free"
  
  #~ msgid "OPTIONS"
  #~ msgstr "OPTIONEN"
diff --combined doc/po/es.po
index 63e0e8a6e,63e0e8a6e..a9317f4eb
--- 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-02-14 13:42+0100\n"
++"POT-Creation-Date: 2011-04-05 10:22+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:568 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:542 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:542 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>"
  
@@@ -1500,7 -1500,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:580
++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
  msgid "<option>-a</option>"
  msgstr "<option>-a</option>"
  
@@@ -1617,14 -1617,14 +1617,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:608 apt-get.8.xml:570
++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
  #: 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:575 apt-key.8.xml:156 apt-mark.8.xml:125
--#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
  msgid "Files"
  msgstr "Ficheros"
  
@@@ -1635,9 -1635,9 +1635,9 @@@ 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:624 apt-get.8.xml:585
++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
  #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
--#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
  #: sources.list.5.xml:234
  msgid "See Also"
  msgstr "Véase también"
@@@ -1649,7 -1649,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:628 apt-get.8.xml:591
++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
  #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
  msgid "Diagnostics"
  msgstr "Diagnósticos"
@@@ -1784,7 -1784,7 +1784,7 @@@ msgid "Options
  msgstr "Opciones"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 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 -2041,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:625
++#: 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;"
@@@ -3192,28 -3192,28 +3192,49 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-ftparchive.1.xml:529
--msgid "<option>--md5</option>"
--msgstr "<option>--md5</option>"
++msgid ""
++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
++msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:531
--msgid ""
--"Generate MD5 sums. This defaults to on, when turned off the generated index "
--"files will not have MD5Sum fields where possible.  Configuration Item: "
--"<literal>APT::FTPArchive::MD5</literal>"
++#, 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>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 ""
--"Genera una suma de control MD5. Está activado de forma predeterminada, "
--"cuando se desactiva los ficheros de índices generados no tendrán los campos "
--"MD5Sum cuando sea posible. Opción de configuración: <literal>APT::"
--"FTPArchive::MD5</literal>"
++"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:536
++#: 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:538
++#: 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>."
@@@ -3222,7 -3222,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:544
++#: 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 "
@@@ -3236,12 -3236,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:550
++#: 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:552
++#: 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 "
@@@ -3254,12 -3254,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:558
++#: 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:560
++#: 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 "
@@@ -3276,12 -3276,12 +3297,12 @@@ msgstr "
  "Contents</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:568
++#: 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:570
++#: 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</"
@@@ -3292,12 -3292,12 +3313,12 @@@ msgstr "
  "FTPArchive::SourceOverride</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:574
++#: 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:576
++#: apt-ftparchive.1.xml:579
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3306,12 -3306,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:580
++#: 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:581
++#: 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 "
@@@ -3325,12 -3325,12 +3346,12 @@@ msgstr "
  "FTPArchive::Architecture</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:587
++#: 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:589
++#: 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 "
@@@ -3354,12 -3354,12 +3375,12 @@@ msgstr "
  "comprobaciones adicionales son innecesarias."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:599
++#: 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:601
++#: 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 "
@@@ -3375,19 -3375,19 +3396,19 @@@ msgstr "
  "con la orden «generate»."
  
  #. type: Content of: <refentry><refsect1><title>
--#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
  #: sources.list.5.xml:198
  msgid "Examples"
  msgstr "Ejemplos"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
--#: apt-ftparchive.1.xml:619
++#: 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:615
++#: apt-ftparchive.1.xml:618
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3396,7 -3396,7 +3417,7 @@@ msgstr "
  "paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-ftparchive.1.xml:629
++#: apt-ftparchive.1.xml:632
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -7892,32 -7892,32 +7913,50 @@@ msgstr "priority 1
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:107
++#, fuzzy
++#| msgid ""
++#| "to the versions coming from archives which in their <filename>Release</"
++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
++#| "experimental archive."
  msgid ""
  "to the versions coming from archives which in their <filename>Release</"
--"filename> files are marked as \"NotAutomatic: yes\" like the debian "
--"experimental archive."
++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
++"<literal>experimental</literal> archive."
  msgstr ""
  "para las versiones procedentes de archivos que en sus ficheros "
  "<filename>Release</filename> están marcados como «NotAutomatic:yes», como en "
  "el archivo «experimental» de Debian."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:112
++#: apt_preferences.5.xml:113
  msgid "priority 100"
  msgstr "prioridad 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:113
--msgid "to the version that is already installed (if any)."
--msgstr "a la versión instalada (de existir)."
++#: apt_preferences.5.xml:114
++#, fuzzy
++#| msgid ""
++#| "to the versions coming from archives which in their <filename>Release</"
++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
++#| "experimental archive."
++msgid ""
++"to the version that is already installed (if any) and to the versions coming "
++"from archives which in their <filename>Release</filename> files are marked "
++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
++"backports archive since <literal>squeeze-backports</literal>."
++msgstr ""
++"para las versiones procedentes de archivos que en sus ficheros "
++"<filename>Release</filename> están marcados como «NotAutomatic:yes», como en "
++"el archivo «experimental» de Debian."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:117
++#: apt_preferences.5.xml:121
  msgid "priority 500"
  msgstr "prioridad 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:118
++#: apt_preferences.5.xml:122
  msgid ""
  "to the versions that are not installed and do not belong to the target "
  "release."
@@@ -7926,12 -7926,12 +7965,12 @@@ msgstr "
  "objetivo."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:122
++#: apt_preferences.5.xml:126
  msgid "priority 990"
  msgstr "prioridad 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:123
++#: apt_preferences.5.xml:127
  msgid ""
  "to the versions that are not installed and belong to the target release."
  msgstr ""
@@@ -7950,13 -7950,13 +7989,21 @@@ msgstr "
  "Asignar: <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:128
++#: apt_preferences.5.xml:132
++#, fuzzy
++#| msgid ""
++#| "If the target release has not been specified then APT simply assigns "
++#| "priority 100 to all installed package versions and priority 500 to all "
++#| "uninstalled package versions, expect versions coming from archives which "
++#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: "
++#| "yes\" - these versions get the priority 1."
  msgid ""
  "If the target release has not been specified then APT simply assigns "
  "priority 100 to all installed package versions and priority 500 to all "
--"uninstalled package versions, expect versions coming from archives which in "
++"uninstalled package versions, except versions coming from archives which in "
  "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
--"- these versions get the priority 1."
++"- these versions get the priority 1 or priority 100 if it is additionally "
++"marked as \"ButAutomaticUpgrades: yes\"."
  msgstr ""
  "Si no se especifica ninguna distribución objetivo APT asigna prioridad 100 a "
  "todas las versiones de los paquetes instalados y 500 a las versiones no "
@@@ -7965,7 -7965,7 +8012,7 @@@
  "- estas versiones reciben la prioridad 1."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:134
++#: apt_preferences.5.xml:139
  msgid ""
  "APT then applies the following rules, listed in order of precedence, to "
  "determine which version of a package to install."
@@@ -7974,7 -7974,7 +8021,7 @@@ msgstr "
  "determinar qué versión del paquete debe instalar."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:137
++#: apt_preferences.5.xml:142
  msgid ""
  "Never downgrade unless the priority of an available version exceeds 1000.  "
  "(\"Downgrading\" is installing a less recent version of a package in place "
@@@ -7991,12 -7991,12 +8038,12 @@@ msgstr "
  "ser peligroso)."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:143
++#: apt_preferences.5.xml:148
  msgid "Install the highest priority version."
  msgstr "Instala la versión de mayor prioridad."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:144
++#: apt_preferences.5.xml:149
  msgid ""
  "If two or more versions have the same priority, install the most recent one "
  "(that is, the one with the higher version number)."
@@@ -8005,7 -8005,7 +8052,7 @@@ msgstr "
  "(esto es, la que tiene un número de versión mayor)."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:147
++#: apt_preferences.5.xml:152
  msgid ""
  "If two or more versions have the same priority and version number but either "
  "the packages differ in some of their metadata or the <literal>--reinstall</"
@@@ -8016,7 -8016,7 +8063,7 @@@ msgstr "
  "<literal>--reinstall</literal>, se instalará la que no está instalada."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:153
++#: apt_preferences.5.xml:158
  msgid ""
  "In a typical situation, the installed version of a package (priority 100)  "
  "is not as recent as one of the versions available from the sources listed in "
@@@ -8031,7 -8031,7 +8078,7 @@@ msgstr "
  "command> o <command>apt-get upgrade</command>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:160
++#: apt_preferences.5.xml:165
  msgid ""
  "More rarely, the installed version of a package is <emphasis>more</emphasis> "
  "recent than any of the other available versions.  The package will not be "
@@@ -8045,7 -8045,7 +8092,7 @@@ msgstr "
  "upgrade</command>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:165
++#: apt_preferences.5.xml:170
  msgid ""
  "Sometimes the installed version of a package is more recent than the version "
  "belonging to the target release, but not as recent as a version belonging to "
@@@ -8064,12 -8064,12 +8111,12 @@@ msgstr "
  "versión instalada."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:174
++#: apt_preferences.5.xml:179
  msgid "The Effect of APT Preferences"
  msgstr "El efecto de las preferencias sobre APT"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:176
++#: apt_preferences.5.xml:181
  msgid ""
  "The APT preferences file allows the system administrator to control the "
  "assignment of priorities.  The file consists of one or more multi-line "
@@@ -8082,7 -8082,7 +8129,7 @@@ msgstr "
  "registros pueden tener una de estos dos formatos: el específico o el general."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:182
++#: apt_preferences.5.xml:187
  msgid ""
  "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
  "specified packages and specified version or version range.  For example, the "
@@@ -8098,7 -8098,7 +8145,7 @@@ msgstr "
  "separados por espacios."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:189
++#: apt_preferences.5.xml:194
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8110,7 -8110,7 +8157,7 @@@ msgstr "
  "Pin-Priority: 1001\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:195
++#: apt_preferences.5.xml:200
  msgid ""
  "The general form assigns a priority to all of the package versions in a "
  "given distribution (that is, to all the versions of packages that are listed "
@@@ -8125,7 -8125,7 +8172,7 @@@ msgstr "
  "identificado por su nombre de dominio."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:201
++#: apt_preferences.5.xml:206
  msgid ""
  "This general-form entry in the APT preferences file applies only to groups "
  "of packages.  For example, the following record assigns a high priority to "
@@@ -8136,7 -8136,7 +8183,7 @@@ msgstr "
  "prioridad alta a todas las versiones disponibles desde un sitio local."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:206
++#: apt_preferences.5.xml:211
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8148,7 -8148,7 +8195,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:211
++#: apt_preferences.5.xml:216
  msgid ""
  "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
  "which can be used to match a hostname. The following record will assign a "
@@@ -8162,7 -8162,7 +8209,7 @@@ msgstr "
  "debian.org»."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:215
++#: apt_preferences.5.xml:220
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8174,7 -8174,7 +8221,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:219
++#: apt_preferences.5.xml:224
  msgid ""
  "This should <emphasis>not</emphasis> be confused with the Origin of a "
  "distribution as specified in a <filename>Release</filename> file.  What "
@@@ -8189,7 -8189,7 +8236,7 @@@ msgstr "
  "sino el autor o el nombre del proveedor, tales como «Debian» o «Ximian»."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:224
++#: apt_preferences.5.xml:229
  msgid ""
  "The following record assigns a low priority to all package versions "
  "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@@ -8200,7 -8200,7 +8247,7 @@@ msgstr "
  "archivo de paquetes «<literal>unstable</literal>» (inestable)."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:228
++#: apt_preferences.5.xml:233
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8212,7 -8212,7 +8259,7 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:233
++#: apt_preferences.5.xml:238
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@@ -8223,7 -8223,7 +8270,7 @@@ msgstr "
  "«<literal>&testing-codename;</literal>»."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:237
++#: apt_preferences.5.xml:242
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8235,7 -8235,7 +8282,7 @@@ msgstr "
  "Pin-Priority: 900\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:242
++#: apt_preferences.5.xml:247
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@@ -8247,7 -8247,7 +8294,7 @@@ msgstr "
  "«<literal>3.0</literal>»."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:247
++#: apt_preferences.5.xml:252
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8259,17 -8259,17 +8306,17 @@@ msgstr "
  "Pin-Priority: 500\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:258
++#: apt_preferences.5.xml:263
  msgid "How APT Interprets Priorities"
  msgstr "¿Cómo interpreta APT las prioridades?"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:266
++#: apt_preferences.5.xml:271
  msgid "P &gt; 1000"
  msgstr "P &gt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:267
++#: apt_preferences.5.xml:272
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
  "package"
@@@ -8278,12 -8278,12 +8325,12 @@@ msgstr "
  "el sistema."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:271
++#: apt_preferences.5.xml:276
  msgid "990 &lt; P &lt;=1000"
  msgstr "990 &lt; P &lt;=1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:272
++#: apt_preferences.5.xml:277
  msgid ""
  "causes a version to be installed even if it does not come from the target "
  "release, unless the installed version is more recent"
@@@ -8292,12 -8292,12 +8339,12 @@@ msgstr "
  "que la versión instalada sea más reciente."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:277
++#: apt_preferences.5.xml:282
  msgid "500 &lt; P &lt;=990"
  msgstr "500 &lt; P &lt;=990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:278
++#: apt_preferences.5.xml:283
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to the target release or the installed version is more recent"
@@@ -8307,12 -8307,12 +8354,12 @@@ msgstr "
  "más reciente."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:283
++#: apt_preferences.5.xml:288
  msgid "100 &lt; P &lt;=500"
  msgstr "100 &lt; P &lt;=500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:284
++#: apt_preferences.5.xml:289
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to some other distribution or the installed version is more recent"
@@@ -8321,12 -8321,12 +8368,12 @@@ msgstr "
  "perteneciente a otra distribución, o si la versión instalada es más reciente."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:289
++#: apt_preferences.5.xml:294
  msgid "0 &lt; P &lt;=100"
  msgstr "0 &lt; P &lt;=100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:290
++#: apt_preferences.5.xml:295
  msgid ""
  "causes a version to be installed only if there is no installed version of "
  "the package"
@@@ -8334,17 -8334,17 +8381,17 @@@ msgstr "
  "La versión sólo se instala si no hay ninguna versión del paquete instalada."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:294
++#: apt_preferences.5.xml:299
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:295
++#: apt_preferences.5.xml:300
  msgid "prevents the version from being installed"
  msgstr "Evita la instalación de la versión."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:261
++#: apt_preferences.5.xml:266
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -8355,7 -8355,7 +8402,7 @@@ msgstr "
  "siguiente modo: <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:300
++#: apt_preferences.5.xml:305
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -8369,7 -8369,7 +8416,7 @@@ msgstr "
  "versión del paquete."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:306
++#: apt_preferences.5.xml:311
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
  "presented earlier:"
@@@ -8378,7 -8378,7 +8425,7 @@@ msgstr "
  "registros antes mencionados:"
  
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
--#: apt_preferences.5.xml:310
++#: apt_preferences.5.xml:315
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8406,12 -8406,12 +8453,12 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:323
++#: apt_preferences.5.xml:328
  msgid "Then:"
  msgstr "Por ello:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:325
++#: apt_preferences.5.xml:330
  msgid ""
  "The most recent available version of the <literal>perl</literal> package "
  "will be installed, so long as that version's version number begins with "
@@@ -8426,7 -8426,7 +8473,7 @@@ msgstr "
  "la versión 5.8*, desactualizando el paquete."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:330
++#: apt_preferences.5.xml:335
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -8437,7 -8437,7 +8484,7 @@@ msgstr "
  "versiones, incluso sobre los pertenecientes a la distribución objetivo."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:334
++#: apt_preferences.5.xml:339
  msgid ""
  "A version of a package whose origin is not the local system but some other "
  "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@@ -8450,12 -8450,12 +8497,12 @@@ msgstr "
  "hay ninguna versión del paquete ya instalado."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:344
++#: apt_preferences.5.xml:349
  msgid "Determination of Package Version and Distribution Properties"
  msgstr "Determinar la versión del paquete y las propiedades de la distribución"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:346
++#: apt_preferences.5.xml:351
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -8466,27 -8466,27 +8513,27 @@@ msgstr "
  "describen los paquetes disponibles en cada uno de los sitios."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:358
++#: apt_preferences.5.xml:363
  msgid "the <literal>Package:</literal> line"
  msgstr "La línea <literal>Package:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:359
++#: apt_preferences.5.xml:364
  msgid "gives the package name"
  msgstr "indica el nombre del paquete."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
  msgid "the <literal>Version:</literal> line"
  msgstr "La línea <literal>Version:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:363
++#: apt_preferences.5.xml:368
  msgid "gives the version number for the named package"
  msgstr "indica el número de versión del paquete."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:350
++#: apt_preferences.5.xml:355
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -8507,12 -8507,12 +8554,12 @@@ msgstr "
  "de APT: <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:379
++#: apt_preferences.5.xml:384
  msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
  msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:380
++#: apt_preferences.5.xml:385
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -8530,18 -8530,18 +8577,18 @@@ msgstr "
  "línea en el fichero de preferencias de APT:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:390
++#: apt_preferences.5.xml:395
  #, no-wrap
  msgid "Pin: release a=stable\n"
  msgstr "Pin: release a=stable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:396
++#: apt_preferences.5.xml:401
  msgid "the <literal>Codename:</literal> line"
  msgstr "La línea <literal>Codename:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:397
++#: apt_preferences.5.xml:402
  msgid ""
  "names the codename to which all the packages in the directory tree belong.  "
  "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@@ -8560,13 -8560,13 +8607,13 @@@ msgstr "
  "de APT:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:406
++#: apt_preferences.5.xml:411
  #, no-wrap
  msgid "Pin: release n=&testing-codename;\n"
  msgstr "Pin: release n=&testing-codename;\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:413
++#: apt_preferences.5.xml:418
  msgid ""
  "names the release version.  For example, the packages in the tree might "
  "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@@ -8582,7 -8582,7 +8629,7 @@@ msgstr "
  "siguientes línea en el fichero de preferencias de APT:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:422
++#: apt_preferences.5.xml:427
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -8594,12 -8594,12 +8641,12 @@@ msgstr "
  "Pin: release 3.0\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:431
++#: apt_preferences.5.xml:436
  msgid "the <literal>Component:</literal> line"
  msgstr "La línea <literal>Component:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:432
++#: apt_preferences.5.xml:437
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -8618,18 -8618,18 +8665,18 @@@ msgstr "
  "de APT:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:441
++#: apt_preferences.5.xml:446
  #, no-wrap
  msgid "Pin: release c=main\n"
  msgstr "Pin: release c=main\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:447
++#: apt_preferences.5.xml:452
  msgid "the <literal>Origin:</literal> line"
  msgstr "La línea <literal>Origin:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:448
++#: apt_preferences.5.xml:453
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8642,18 -8642,18 +8689,18 @@@ msgstr "
  "mediante la siguiente línea:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:454
++#: apt_preferences.5.xml:459
  #, no-wrap
  msgid "Pin: release o=Debian\n"
  msgstr "Pin: release o=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:460
++#: apt_preferences.5.xml:465
  msgid "the <literal>Label:</literal> line"
  msgstr "La línea <literal>Label:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:461
++#: apt_preferences.5.xml:466
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8666,13 -8666,13 +8713,13 @@@ msgstr "
  "siguiente línea:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:467
++#: apt_preferences.5.xml:472
  #, no-wrap
  msgid "Pin: release l=Debian\n"
  msgstr "Pin: release l=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:368
++#: apt_preferences.5.xml:373
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -8695,7 -8695,7 +8742,7 @@@ msgstr "
  "\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:474
++#: apt_preferences.5.xml:479
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -8720,12 -8720,12 +8767,12 @@@ msgstr "
  "la distribución «<literal>unstable</literal>» (inestable)."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:487
++#: apt_preferences.5.xml:492
  msgid "Optional Lines in an APT Preferences Record"
  msgstr "Líneas opcionales en el registro de preferencias de APT"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:489
++#: apt_preferences.5.xml:494
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -8736,12 -8736,12 +8783,12 @@@ msgstr "
  "Útil para comentarios."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:498
++#: apt_preferences.5.xml:503
  msgid "Tracking Stable"
  msgstr "Seguir la distribución «stable» (estable)"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:506
++#: apt_preferences.5.xml:511
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -8765,7 -8765,7 +8812,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:500
++#: apt_preferences.5.xml:505
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -8780,8 -8780,8 +8827,8 @@@ msgstr "
  "<literal>Debian</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
--#: apt_preferences.5.xml:627
++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
++#: apt_preferences.5.xml:632
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -8793,7 -8793,7 +8840,7 @@@ msgstr "
  "apt-get dist-upgrade\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:518
++#: apt_preferences.5.xml:523
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -8807,13 -8807,13 +8854,13 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:535
++#: apt_preferences.5.xml:540
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/testing\n"
  msgstr "apt-get install <replaceable>paquete</replaceable>/testing\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:529
++#: apt_preferences.5.xml:534
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -8826,12 -8826,12 +8873,12 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:541
++#: apt_preferences.5.xml:546
  msgid "Tracking Testing or Unstable"
  msgstr "Seguir la distribución «testing» (en pruebas) o «unstable» (inestable)"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:550
++#: apt_preferences.5.xml:555
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8859,7 -8859,7 +8906,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:543
++#: apt_preferences.5.xml:548
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -8876,7 -8876,7 +8923,7 @@@ msgstr "
  ">"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:564
++#: apt_preferences.5.xml:569
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -8889,13 -8889,13 +8936,13 @@@ msgstr "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:584
++#: apt_preferences.5.xml:589
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
  msgstr "apt-get install <replaceable>paquete</replaceable>/unstable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:575
++#: apt_preferences.5.xml:580
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -8914,12 -8914,12 +8961,12 @@@ msgstr "
  "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:591
++#: apt_preferences.5.xml:596
  msgid "Tracking the evolution of a codename release"
  msgstr "Seguir la evolución de una publicación por el nombre"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:605
++#: apt_preferences.5.xml:610
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -8953,7 -8953,7 +9000,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:593
++#: apt_preferences.5.xml:598
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -8980,7 -8980,7 +9027,7 @@@ msgstr "
  "\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:622
++#: apt_preferences.5.xml:627
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest version(s) in "
@@@ -8994,13 -8994,13 +9041,13 @@@ msgstr "
  "id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:642
++#: apt_preferences.5.xml:647
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/sid\n"
  msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:633
++#: apt_preferences.5.xml:638
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -9019,12 -9019,12 +9066,12 @@@ msgstr "
  "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><variablelist>
--#: apt_preferences.5.xml:651
++#: apt_preferences.5.xml:656
  msgid "&file-preferences;"
  msgstr "&file-preferences;"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt_preferences.5.xml:657
++#: apt_preferences.5.xml:662
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
@@@ -11048,6 -11048,6 +11095,22 @@@ msgstr "  # apt-get -o dir::cache::arch
  msgid "Which will use the already fetched archives on the disc."
  msgstr "Ésto usará los archivos del disco previamente obtenidos."
  
++#~ msgid "<option>--md5</option>"
++#~ msgstr "<option>--md5</option>"
++
++#~ msgid ""
++#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
++#~ "index files will not have MD5Sum fields where possible.  Configuration "
++#~ "Item: <literal>APT::FTPArchive::MD5</literal>"
++#~ msgstr ""
++#~ "Genera una suma de control MD5. Está activado de forma predeterminada, "
++#~ "cuando se desactiva los ficheros de índices generados no tendrán los "
++#~ "campos MD5Sum cuando sea posible. Opción de configuración: <literal>APT::"
++#~ "FTPArchive::MD5</literal>"
++
++#~ msgid "to the version that is already installed (if any)."
++#~ msgstr "a la versión instalada (de existir)."
++
  #~ msgid "APT package handling utility -- cache manipulator"
  #~ msgstr ""
  #~ "Herramienta para la gestión de paquetes APT -- manipulador de la caché"
@@@ -11107,8 -11107,8 +11170,12 @@@
  #~ "Usa HTTP para acceder al archivo de Debian en «nonus.debian.org», bajo el "
  #~ "directorio debian-non-US."
  
--#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
--#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
++#~ msgid ""
++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
++#~ "free"
++#~ msgstr ""
++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
++#~ "free"
  
  #~ msgid "OPTIONS"
  #~ msgstr "OPCIONES"
diff --combined doc/po/fr.po
index 3c8f1a8ac,33a118036..988828235
--- 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-03-10 11:35+0100\n"
 -"POT-Creation-Date: 2011-02-14 13:42+0100\n"
++"POT-Creation-Date: 2011-04-05 10:22+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:568 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:542 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:542 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>"
  
@@@ -1425,7 -1425,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:580
 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
  msgid "<option>-a</option>"
  msgstr "<option>-a</option>"
  
@@@ -1545,14 -1545,14 +1545,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:608 apt-get.8.xml:570
 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
  #: 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:575 apt-key.8.xml:156 apt-mark.8.xml:125
--#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
  msgid "Files"
  msgstr "Fichiers"
  
@@@ -1563,9 -1563,9 +1563,9 @@@ 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:624 apt-get.8.xml:585
 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
  #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
--#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
  #: sources.list.5.xml:234
  msgid "See Also"
  msgstr "Voir aussi"
@@@ -1577,7 -1577,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:628 apt-get.8.xml:591
 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
  #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
  msgid "Diagnostics"
  msgstr "Diagnostics"
@@@ -1712,7 -1712,7 +1712,7 @@@ msgid "Options
  msgstr "Options"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 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 -1969,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:625
 +#: 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;"
@@@ -3120,49 -3120,28 +3120,49 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-ftparchive.1.xml:529
 -msgid "<option>--md5</option>"
 -msgstr "<option>--md5</option>"
 +msgid ""
 +"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 +msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:531
 -msgid ""
 -"Generate MD5 sums. This defaults to on, when turned off the generated index "
 -"files will not have MD5Sum fields where possible.  Configuration Item: "
 -"<literal>APT::FTPArchive::MD5</literal>"
 +#, 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>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 ""
 -"Créer la somme de contrôle MD5. Cette option est activée par défaut. Quand "
 -"elle est désactivée, les fichiers d'index n'ont pas les champs MD5Sum là où "
 -"c'est possible. Élément de configuration : <literal>APT::FTPArchive::MD5</"
 -"literal>."
 +"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:536
 +#: 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:538
 +#: 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 -3151,7 +3172,7 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:544
 +#: 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 -3166,12 +3187,12 @@@ msgstr "
  "configuration : <literal>quiet</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:550
 +#: 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:552
 +#: 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 -3185,12 +3206,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:558
 +#: 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:560
 +#: 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 -3206,12 +3227,12 @@@ msgstr "
  "de configuration : <literal>APT::FTPArchive::Contents</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:568
 +#: 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:570
 +#: 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 -3222,12 +3243,12 @@@ msgstr "
  "FTPArchive::SourceOverride</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:574
 +#: 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:576
 +#: apt-ftparchive.1.xml:579
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3257,12 -3236,12 +3257,12 @@@ msgstr "
  "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:580
 +#: 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:581
 +#: 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 -3255,12 +3276,12 @@@ msgstr "
  "<literal>APT::FTPArchive::Architecture</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:587
 +#: 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:589
 +#: 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 -3283,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:599
 +#: 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:601
 +#: 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 -3304,19 +3325,19 @@@ msgstr "
  "generate."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:496
 -#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
  #: sources.list.5.xml:198
  msgid "Examples"
  msgstr "Exemples"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
 -#: apt-ftparchive.1.xml:619
 +#: 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:615
 +#: 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 -3325,7 +3346,7 @@@ msgstr "
  "des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:629
 +#: apt-ftparchive.1.xml:632
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -7839,32 -7818,32 +7839,50 @@@ msgstr "priorité 1
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:107
++#, fuzzy
++#| msgid ""
++#| "to the versions coming from archives which in their <filename>Release</"
++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
++#| "experimental archive."
  msgid ""
  "to the versions coming from archives which in their <filename>Release</"
--"filename> files are marked as \"NotAutomatic: yes\" like the debian "
--"experimental archive."
++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
++"<literal>experimental</literal> archive."
  msgstr ""
  "pour les versions issues d'archives dont le fichier <filename>Release</"
  "filename> comporte la mention « NotAutomatic: yes » comme, par exemple, "
  "l'archive « experimental » de Debian."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:112
++#: apt_preferences.5.xml:113
  msgid "priority 100"
  msgstr "une priorité égale à 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:113
--msgid "to the version that is already installed (if any)."
--msgstr "est affectée à la version déjà installée (si elle existe)."
++#: apt_preferences.5.xml:114
++#, fuzzy
++#| msgid ""
++#| "to the versions coming from archives which in their <filename>Release</"
++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
++#| "experimental archive."
++msgid ""
++"to the version that is already installed (if any) and to the versions coming "
++"from archives which in their <filename>Release</filename> files are marked "
++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
++"backports archive since <literal>squeeze-backports</literal>."
++msgstr ""
++"pour les versions issues d'archives dont le fichier <filename>Release</"
++"filename> comporte la mention « NotAutomatic: yes » comme, par exemple, "
++"l'archive « experimental » de Debian."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:117
++#: apt_preferences.5.xml:121
  msgid "priority 500"
  msgstr "une priorité égale à 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:118
++#: apt_preferences.5.xml:122
  msgid ""
  "to the versions that are not installed and do not belong to the target "
  "release."
@@@ -7873,12 -7852,12 +7891,12 @@@ msgstr "
  "pas à la distribution par défaut."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:122
++#: apt_preferences.5.xml:126
  msgid "priority 990"
  msgstr "une priorité égale à 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:123
++#: apt_preferences.5.xml:127
  msgid ""
  "to the versions that are not installed and belong to the target release."
  msgstr ""
@@@ -7897,13 -7876,13 +7915,21 @@@ msgstr "
  "type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:128
++#: apt_preferences.5.xml:132
++#, fuzzy
++#| msgid ""
++#| "If the target release has not been specified then APT simply assigns "
++#| "priority 100 to all installed package versions and priority 500 to all "
++#| "uninstalled package versions, expect versions coming from archives which "
++#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: "
++#| "yes\" - these versions get the priority 1."
  msgid ""
  "If the target release has not been specified then APT simply assigns "
  "priority 100 to all installed package versions and priority 500 to all "
--"uninstalled package versions, expect versions coming from archives which in "
++"uninstalled package versions, except versions coming from archives which in "
  "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
--"- these versions get the priority 1."
++"- these versions get the priority 1 or priority 100 if it is additionally "
++"marked as \"ButAutomaticUpgrades: yes\"."
  msgstr ""
  "Quand aucune distribution par défaut n'a été indiquée, APT affecte "
  "simplement une priorité égale à 100 à toute version installée d'un paquet et "
@@@ -7913,7 -7892,7 +7939,7 @@@
  "priorité égale à 1."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:134
++#: apt_preferences.5.xml:139
  msgid ""
  "APT then applies the following rules, listed in order of precedence, to "
  "determine which version of a package to install."
@@@ -7922,7 -7901,7 +7948,7 @@@ msgstr "
  "qu'il faut installer (par ordre de priorité) :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:137
++#: apt_preferences.5.xml:142
  msgid ""
  "Never downgrade unless the priority of an available version exceeds 1000.  "
  "(\"Downgrading\" is installing a less recent version of a package in place "
@@@ -7938,12 -7917,12 +7964,12 @@@ msgstr "
  "arrière."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:143
++#: apt_preferences.5.xml:148
  msgid "Install the highest priority version."
  msgstr "Installer la version qui possède la priorité la plus haute."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:144
++#: apt_preferences.5.xml:149
  msgid ""
  "If two or more versions have the same priority, install the most recent one "
  "(that is, the one with the higher version number)."
@@@ -7952,7 -7931,7 +7978,7 @@@ msgstr "
  "plus récente (c.-à-d. celle dont le numéro de version est le plus grand)."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:147
++#: apt_preferences.5.xml:152
  msgid ""
  "If two or more versions have the same priority and version number but either "
  "the packages differ in some of their metadata or the <literal>--reinstall</"
@@@ -7964,7 -7943,7 +7990,7 @@@ msgstr "
  "qui n'est pas installée."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:153
++#: apt_preferences.5.xml:158
  msgid ""
  "In a typical situation, the installed version of a package (priority 100)  "
  "is not as recent as one of the versions available from the sources listed in "
@@@ -7979,7 -7958,7 +8005,7 @@@ msgstr "
  "replaceable></command> ou <command>apt-get dist-upgrade</command>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:160
++#: apt_preferences.5.xml:165
  msgid ""
  "More rarely, the installed version of a package is <emphasis>more</emphasis> "
  "recent than any of the other available versions.  The package will not be "
@@@ -7992,7 -7971,7 +8018,7 @@@ msgstr "
  "<command>apt-get upgrade</command> ne provoquent pas de retour en arrière."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:165
++#: apt_preferences.5.xml:170
  msgid ""
  "Sometimes the installed version of a package is more recent than the version "
  "belonging to the target release, but not as recent as a version belonging to "
@@@ -8011,12 -7990,12 +8037,12 @@@ msgstr "
  "priorité que celle de la version installée."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:174
++#: apt_preferences.5.xml:179
  msgid "The Effect of APT Preferences"
  msgstr "Conséquences des préférences"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:176
++#: apt_preferences.5.xml:181
  msgid ""
  "The APT preferences file allows the system administrator to control the "
  "assignment of priorities.  The file consists of one or more multi-line "
@@@ -8029,7 -8008,7 +8055,7 @@@ msgstr "
  "formes, une forme particulière et une forme générale."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:182
++#: apt_preferences.5.xml:187
  msgid ""
  "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
  "specified packages and specified version or version range.  For example, the "
@@@ -8044,7 -8023,7 +8070,7 @@@ msgstr "
  "dont le numéro de version commence par <literal>5.8</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:189
++#: apt_preferences.5.xml:194
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8056,7 -8035,7 +8082,7 @@@ msgstr "
  "Pin-Priority: 1001\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:195
++#: apt_preferences.5.xml:200
  msgid ""
  "The general form assigns a priority to all of the package versions in a "
  "given distribution (that is, to all the versions of packages that are listed "
@@@ -8071,7 -8050,7 +8097,7 @@@ msgstr "
  "un nom complètement qualifié."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:201
++#: apt_preferences.5.xml:206
  msgid ""
  "This general-form entry in the APT preferences file applies only to groups "
  "of packages.  For example, the following record assigns a high priority to "
@@@ -8082,7 -8061,7 +8108,7 @@@ msgstr "
  "priorité haute à toutes les versions disponibles dans le site local."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:206
++#: apt_preferences.5.xml:211
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8094,7 -8073,7 +8120,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:211
++#: apt_preferences.5.xml:216
  msgid ""
  "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
  "which can be used to match a hostname. The following record will assign a "
@@@ -8107,7 -8086,7 +8133,7 @@@ msgstr "
  "serveur identifié par l' nom d'hôte « ftp.de.debian.org »."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:215
++#: apt_preferences.5.xml:220
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8119,7 -8098,7 +8145,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:219
++#: apt_preferences.5.xml:224
  msgid ""
  "This should <emphasis>not</emphasis> be confused with the Origin of a "
  "distribution as specified in a <filename>Release</filename> file.  What "
@@@ -8134,7 -8113,7 +8160,7 @@@ msgstr "
  "mais le nom d'un auteur ou d'un distributeur, comme « Debian » ou « Ximian »."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:224
++#: apt_preferences.5.xml:229
  msgid ""
  "The following record assigns a low priority to all package versions "
  "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@@ -8145,7 -8124,7 +8171,7 @@@ msgstr "
  "<literal>unstable</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:228
++#: apt_preferences.5.xml:233
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8157,7 -8136,7 +8183,7 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:233
++#: apt_preferences.5.xml:238
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@@ -8168,7 -8147,7 +8194,7 @@@ msgstr "
  "<literal>&testing-codename;</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:237
++#: apt_preferences.5.xml:242
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8180,7 -8159,7 +8206,7 @@@ msgstr "
  "Pin-Priority: 900\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:242
++#: apt_preferences.5.xml:247
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@@ -8192,7 -8171,7 +8218,7 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:247
++#: apt_preferences.5.xml:252
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8204,17 -8183,17 +8230,17 @@@ msgstr "
  "Pin-Priority: 500\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:258
++#: apt_preferences.5.xml:263
  msgid "How APT Interprets Priorities"
  msgstr "Méthode d'interprétation des priorités par APT"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:266
++#: apt_preferences.5.xml:271
  msgid "P &gt; 1000"
  msgstr "P &gt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:267
++#: apt_preferences.5.xml:272
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
  "package"
@@@ -8223,12 -8202,12 +8249,12 @@@ msgstr "
  "retour en arrière."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:271
++#: apt_preferences.5.xml:276
  msgid "990 &lt; P &lt;=1000"
  msgstr "990 &lt; P &lt;=1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:272
++#: apt_preferences.5.xml:277
  msgid ""
  "causes a version to be installed even if it does not come from the target "
  "release, unless the installed version is more recent"
@@@ -8238,12 -8217,12 +8264,12 @@@ msgstr "
  "plus récente."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:277
++#: apt_preferences.5.xml:282
  msgid "500 &lt; P &lt;=990"
  msgstr "500 &lt; P &lt;=990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:278
++#: apt_preferences.5.xml:283
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to the target release or the installed version is more recent"
@@@ -8252,12 -8231,12 +8278,12 @@@ msgstr "
  "distribution par défaut ou si la version installée est plus récente."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:283
++#: apt_preferences.5.xml:288
  msgid "100 &lt; P &lt;=500"
  msgstr "100 &lt; P &lt;=500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:284
++#: apt_preferences.5.xml:289
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to some other distribution or the installed version is more recent"
@@@ -8266,29 -8245,29 +8292,29 @@@ msgstr "
  "autre distribution ou si la version installée est plus récente."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:289
++#: apt_preferences.5.xml:294
  msgid "0 &lt; P &lt;=100"
  msgstr "0 &lt; P &lt;=100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:290
++#: apt_preferences.5.xml:295
  msgid ""
  "causes a version to be installed only if there is no installed version of "
  "the package"
  msgstr "la version sera installée si aucune version du paquet n'est installée."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:294
++#: apt_preferences.5.xml:299
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:295
++#: apt_preferences.5.xml:300
  msgid "prevents the version from being installed"
  msgstr "cette priorité empêche l'installation de la version."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:261
++#: apt_preferences.5.xml:266
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -8299,7 -8278,7 +8325,7 @@@ msgstr "
  "<placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:300
++#: apt_preferences.5.xml:305
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -8313,7 -8292,7 +8339,7 @@@ msgstr "
  "trouvée détermine la priorité."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:306
++#: apt_preferences.5.xml:311
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
  "presented earlier:"
@@@ -8322,7 -8301,7 +8348,7 @@@ msgstr "
  "entrées décrites ci-dessous :"
  
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
--#: apt_preferences.5.xml:310
++#: apt_preferences.5.xml:315
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8350,12 -8329,12 +8376,12 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:323
++#: apt_preferences.5.xml:328
  msgid "Then:"
  msgstr "Alors :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:325
++#: apt_preferences.5.xml:330
  msgid ""
  "The most recent available version of the <literal>perl</literal> package "
  "will be installed, so long as that version's version number begins with "
@@@ -8369,7 -8348,7 +8395,7 @@@ msgstr "
  "installée est une version 5.9*, il y aura un retour en arrière."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:330
++#: apt_preferences.5.xml:335
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -8380,7 -8359,7 +8406,7 @@@ msgstr "
  "appartenant à la distribution par défaut."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:334
++#: apt_preferences.5.xml:339
  msgid ""
  "A version of a package whose origin is not the local system but some other "
  "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@@ -8393,13 -8372,13 +8419,13 @@@ msgstr "
  "paquet n'est déjà installée."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:344
++#: apt_preferences.5.xml:349
  msgid "Determination of Package Version and Distribution Properties"
  msgstr ""
  "Détermination de la version des paquets et des propriétés des distributions"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:346
++#: apt_preferences.5.xml:351
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -8410,27 -8389,27 +8436,27 @@@ msgstr "
  "décrivent les paquets disponibles à cet endroit."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:358
++#: apt_preferences.5.xml:363
  msgid "the <literal>Package:</literal> line"
  msgstr "la ligne <literal>Package:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:359
++#: apt_preferences.5.xml:364
  msgid "gives the package name"
  msgstr "donne le nom du paquet"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
  msgid "the <literal>Version:</literal> line"
  msgstr "la ligne <literal>Version:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:363
++#: apt_preferences.5.xml:368
  msgid "gives the version number for the named package"
  msgstr "donne le numéro de version du paquet"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:350
++#: apt_preferences.5.xml:355
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -8451,12 -8430,12 +8477,12 @@@ msgstr "
  "\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:379
++#: apt_preferences.5.xml:384
  msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
  msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:380
++#: apt_preferences.5.xml:385
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -8473,18 -8452,18 +8499,18 @@@ msgstr "
  "préférences demanderait cette ligne :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:390
++#: apt_preferences.5.xml:395
  #, no-wrap
  msgid "Pin: release a=stable\n"
  msgstr "Pin: release a=stable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:396
++#: apt_preferences.5.xml:401
  msgid "the <literal>Codename:</literal> line"
  msgstr "la ligne <literal>Codename:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:397
++#: apt_preferences.5.xml:402
  msgid ""
  "names the codename to which all the packages in the directory tree belong.  "
  "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@@ -8502,13 -8481,13 +8528,13 @@@ msgstr "
  "ligne :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:406
++#: apt_preferences.5.xml:411
  #, no-wrap
  msgid "Pin: release n=&testing-codename;\n"
  msgstr "Pin: release n=&testing-codename;\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:413
++#: apt_preferences.5.xml:418
  msgid ""
  "names the release version.  For example, the packages in the tree might "
  "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@@ -8524,7 -8503,7 +8550,7 @@@ msgstr "
  "préférences demanderait ces lignes :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:422
++#: apt_preferences.5.xml:427
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -8536,12 -8515,12 +8562,12 @@@ msgstr "
  "Pin: release 3.0\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:431
++#: apt_preferences.5.xml:436
  msgid "the <literal>Component:</literal> line"
  msgstr "La ligne <literal>Component:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:432
++#: apt_preferences.5.xml:437
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -8559,18 -8538,18 +8585,18 @@@ msgstr "
  "fichier des préférences demanderait cette ligne :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:441
++#: apt_preferences.5.xml:446
  #, no-wrap
  msgid "Pin: release c=main\n"
  msgstr "Pin: release c=main\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:447
++#: apt_preferences.5.xml:452
  msgid "the <literal>Origin:</literal> line"
  msgstr "La ligne <literal>Origin:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:448
++#: apt_preferences.5.xml:453
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8583,18 -8562,18 +8609,18 @@@ msgstr "
  "ligne :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:454
++#: apt_preferences.5.xml:459
  #, no-wrap
  msgid "Pin: release o=Debian\n"
  msgstr "Pin: release o=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:460
++#: apt_preferences.5.xml:465
  msgid "the <literal>Label:</literal> line"
  msgstr "La ligne <literal>Label:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:461
++#: apt_preferences.5.xml:466
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8607,13 -8586,13 +8633,13 @@@ msgstr "
  "préférences demanderait cette ligne :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:467
++#: apt_preferences.5.xml:472
  #, no-wrap
  msgid "Pin: release l=Debian\n"
  msgstr "Pin: release l=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:368
++#: apt_preferences.5.xml:373
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -8637,7 -8616,7 +8663,7 @@@ msgstr "
  "\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:474
++#: apt_preferences.5.xml:479
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -8662,12 -8641,12 +8688,12 @@@ msgstr "
  "<literal>unstable</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:487
++#: apt_preferences.5.xml:492
  msgid "Optional Lines in an APT Preferences Record"
  msgstr "Lignes facultatives dans le fichier des préférences"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:489
++#: apt_preferences.5.xml:494
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -8678,12 -8657,12 +8704,12 @@@ msgstr "
  "commentaires."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:498
++#: apt_preferences.5.xml:503
  msgid "Tracking Stable"
  msgstr "Méthode pour suivre Stable"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:506
++#: apt_preferences.5.xml:511
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -8707,7 -8686,7 +8733,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:500
++#: apt_preferences.5.xml:505
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -8722,8 -8701,8 +8748,8 @@@ msgstr "
  "literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
--#: apt_preferences.5.xml:627
++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
++#: apt_preferences.5.xml:632
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -8735,7 -8714,7 +8761,7 @@@ msgstr "
  "apt-get dist-upgrade\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:518
++#: apt_preferences.5.xml:523
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -8748,13 -8727,13 +8774,13 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:535
++#: apt_preferences.5.xml:540
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/testing\n"
  msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:529
++#: apt_preferences.5.xml:534
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -8767,12 -8746,12 +8793,12 @@@ msgstr "
  "de relancer la commande.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:541
++#: apt_preferences.5.xml:546
  msgid "Tracking Testing or Unstable"
  msgstr "Méthode pour suivre Testing ou Unstable"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:550
++#: apt_preferences.5.xml:555
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8800,7 -8779,7 +8826,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:543
++#: apt_preferences.5.xml:548
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -8817,7 -8796,7 +8843,7 @@@ msgstr "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:564
++#: apt_preferences.5.xml:569
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -8830,13 -8809,13 +8856,13 @@@ msgstr "
  "type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:584
++#: apt_preferences.5.xml:589
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
  msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:575
++#: apt_preferences.5.xml:580
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -8855,12 -8834,12 +8881,12 @@@ msgstr "
  "installée.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:591
++#: apt_preferences.5.xml:596
  msgid "Tracking the evolution of a codename release"
  msgstr "Suivre l'évolution d'une version par son nom de code"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:605
++#: apt_preferences.5.xml:610
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -8894,7 -8873,7 +8920,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:593
++#: apt_preferences.5.xml:598
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -8918,7 -8897,7 +8944,7 @@@ msgstr "
  "exemples précédents.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:622
++#: apt_preferences.5.xml:627
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest version(s) in "
@@@ -8931,13 -8910,13 +8957,13 @@@ msgstr "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:642
++#: apt_preferences.5.xml:647
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/sid\n"
  msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:633
++#: apt_preferences.5.xml:638
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -8956,12 -8935,12 +8982,12 @@@ msgstr "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><variablelist>
--#: apt_preferences.5.xml:651
++#: apt_preferences.5.xml:656
  msgid "&file-preferences;"
  msgstr "&file-preferences;"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt_preferences.5.xml:657
++#: apt_preferences.5.xml:662
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
@@@ -11007,19 -10986,6 +11033,22 @@@ msgstr "  # apt-get -o dir::cache::arch
  msgid "Which will use the already fetched archives on the disc."
  msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
  
++#~ msgid "to the version that is already installed (if any)."
++#~ msgstr "est affectée à la version déjà installée (si elle existe)."
++
 +#~ msgid "<option>--md5</option>"
 +#~ msgstr "<option>--md5</option>"
 +
 +#~ msgid ""
 +#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
 +#~ "index files will not have MD5Sum fields where possible.  Configuration "
 +#~ "Item: <literal>APT::FTPArchive::MD5</literal>"
 +#~ msgstr ""
 +#~ "Créer la somme de contrôle MD5. Cette option est activée par défaut. "
 +#~ "Quand elle est désactivée, les fichiers d'index n'ont pas les champs "
 +#~ "MD5Sum là où c'est possible. Élément de configuration : <literal>APT::"
 +#~ "FTPArchive::MD5</literal>."
 +
  #~ msgid "APT package handling utility -- cache manipulator"
  #~ msgstr "Gestionnaire de paquets APT - manipulation du cache"
  
diff --combined doc/po/it.po
index 94cc9bb76,94cc9bb76..0735044dd
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@@ -9,7 -9,7 +9,7 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: \n"
--"POT-Creation-Date: 2011-02-14 13:42+0100\n"
++"POT-Creation-Date: 2011-04-05 10:22+0300\n"
  "PO-Revision-Date: 2003-04-26 23:26+0100\n"
  "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
  "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@@ -934,7 -934,7 +934,7 @@@ msgid "
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 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 ""
@@@ -955,12 -955,12 +955,12 @@@ msgid "
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 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 ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 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 ""
  
@@@ -1059,7 -1059,7 +1059,7 @@@ msgid "
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580
++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
  msgid "<option>-a</option>"
  msgstr ""
  
@@@ -1155,14 -1155,14 +1155,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:608 apt-get.8.xml:570
++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
  #: apt-sortpkgs.1.xml:67
  msgid "&apt-commonoptions;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
--#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
  msgid "Files"
  msgstr ""
  
@@@ -1173,9 -1173,9 +1173,9 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
--#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585
++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
  #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
--#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
  #: sources.list.5.xml:234
  msgid "See Also"
  msgstr ""
@@@ -1187,7 -1187,7 +1187,7 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
--#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591
++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
  #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
  msgid "Diagnostics"
  msgstr ""
@@@ -1292,7 -1292,7 +1292,7 @@@ msgid "Options
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 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 ""
  
@@@ -1496,7 -1496,7 +1496,7 @@@ msgid "Just show the contents of the co
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625
++#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
  #: apt-sortpkgs.1.xml:73
  msgid "&apt-conf;"
  msgstr ""
@@@ -2407,31 -2407,31 +2407,38 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-ftparchive.1.xml:529
--msgid "<option>--md5</option>"
++msgid ""
++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:531
  msgid ""
--"Generate MD5 sums. This defaults to on, when turned off the generated index "
--"files will not have MD5Sum fields where possible.  Configuration Item: "
--"<literal>APT::FTPArchive::MD5</literal>"
++"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>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 ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:536
++#: apt-ftparchive.1.xml:539
  msgid "<option>--db</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:538
++#: 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>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:544
++#: 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 "
@@@ -2440,12 -2440,12 +2447,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:550
++#: apt-ftparchive.1.xml:553
  msgid "<option>--delink</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:552
++#: 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 "
@@@ -2454,12 -2454,12 +2461,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:558
++#: apt-ftparchive.1.xml:561
  msgid "<option>--contents</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:560
++#: 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 "
@@@ -2469,12 -2469,12 +2476,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:568
++#: apt-ftparchive.1.xml:571
  msgid "<option>--source-override</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:570
++#: 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</"
@@@ -2482,24 -2482,24 +2489,24 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:574
++#: apt-ftparchive.1.xml:577
  msgid "<option>--readonly</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:576
++#: apt-ftparchive.1.xml:579
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:580
++#: apt-ftparchive.1.xml:583
  msgid "<option>--arch</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:581
++#: 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 "
@@@ -2508,12 -2508,12 +2515,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:587
++#: apt-ftparchive.1.xml:590
  msgid "<option>APT::FTPArchive::AlwaysStat</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:589
++#: 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 "
@@@ -2527,12 -2527,12 +2534,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:599
++#: apt-ftparchive.1.xml:602
  msgid "<option>APT::FTPArchive::LongDescription</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:601
++#: 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 "
@@@ -2542,26 -2542,26 +2549,26 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
--#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
  #: sources.list.5.xml:198
  msgid "Examples"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
--#: apt-ftparchive.1.xml:619
++#: 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 ""
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-ftparchive.1.xml:615
++#: apt-ftparchive.1.xml:618
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-ftparchive.1.xml:629
++#: apt-ftparchive.1.xml:632
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -5833,39 -5833,39 +5840,44 @@@ msgstr "
  #: apt_preferences.5.xml:107
  msgid ""
  "to the versions coming from archives which in their <filename>Release</"
--"filename> files are marked as \"NotAutomatic: yes\" like the debian "
--"experimental archive."
++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
++"<literal>experimental</literal> archive."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:112
++#: apt_preferences.5.xml:113
  msgid "priority 100"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:113
--msgid "to the version that is already installed (if any)."
++#: apt_preferences.5.xml:114
++msgid ""
++"to the version that is already installed (if any) and to the versions coming "
++"from archives which in their <filename>Release</filename> files are marked "
++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
++"backports archive since <literal>squeeze-backports</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:117
++#: apt_preferences.5.xml:121
  msgid "priority 500"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:118
++#: apt_preferences.5.xml:122
  msgid ""
  "to the versions that are not installed and do not belong to the target "
  "release."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:122
++#: apt_preferences.5.xml:126
  msgid "priority 990"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:123
++#: apt_preferences.5.xml:127
  msgid ""
  "to the versions that are not installed and belong to the target release."
  msgstr ""
@@@ -5879,24 -5879,24 +5891,25 @@@ msgid "
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:128
++#: apt_preferences.5.xml:132
  msgid ""
  "If the target release has not been specified then APT simply assigns "
  "priority 100 to all installed package versions and priority 500 to all "
--"uninstalled package versions, expect versions coming from archives which in "
++"uninstalled package versions, except versions coming from archives which in "
  "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
--"- these versions get the priority 1."
++"- these versions get the priority 1 or priority 100 if it is additionally "
++"marked as \"ButAutomaticUpgrades: yes\"."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:134
++#: apt_preferences.5.xml:139
  msgid ""
  "APT then applies the following rules, listed in order of precedence, to "
  "determine which version of a package to install."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:137
++#: apt_preferences.5.xml:142
  msgid ""
  "Never downgrade unless the priority of an available version exceeds 1000.  "
  "(\"Downgrading\" is installing a less recent version of a package in place "
@@@ -5906,19 -5906,19 +5919,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:143
++#: apt_preferences.5.xml:148
  msgid "Install the highest priority version."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:144
++#: apt_preferences.5.xml:149
  msgid ""
  "If two or more versions have the same priority, install the most recent one "
  "(that is, the one with the higher version number)."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:147
++#: apt_preferences.5.xml:152
  msgid ""
  "If two or more versions have the same priority and version number but either "
  "the packages differ in some of their metadata or the <literal>--reinstall</"
@@@ -5926,7 -5926,7 +5939,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:153
++#: apt_preferences.5.xml:158
  msgid ""
  "In a typical situation, the installed version of a package (priority 100)  "
  "is not as recent as one of the versions available from the sources listed in "
@@@ -5936,7 -5936,7 +5949,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:160
++#: apt_preferences.5.xml:165
  msgid ""
  "More rarely, the installed version of a package is <emphasis>more</emphasis> "
  "recent than any of the other available versions.  The package will not be "
@@@ -5945,7 -5945,7 +5958,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:165
++#: apt_preferences.5.xml:170
  msgid ""
  "Sometimes the installed version of a package is more recent than the version "
  "belonging to the target release, but not as recent as a version belonging to "
@@@ -5957,12 -5957,12 +5970,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:174
++#: apt_preferences.5.xml:179
  msgid "The Effect of APT Preferences"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:176
++#: apt_preferences.5.xml:181
  msgid ""
  "The APT preferences file allows the system administrator to control the "
  "assignment of priorities.  The file consists of one or more multi-line "
@@@ -5971,7 -5971,7 +5984,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:182
++#: apt_preferences.5.xml:187
  msgid ""
  "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
  "specified packages and specified version or version range.  For example, the "
@@@ -5981,7 -5981,7 +5994,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:189
++#: apt_preferences.5.xml:194
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -5990,7 -5990,7 +6003,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:195
++#: apt_preferences.5.xml:200
  msgid ""
  "The general form assigns a priority to all of the package versions in a "
  "given distribution (that is, to all the versions of packages that are listed "
@@@ -6000,7 -6000,7 +6013,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:201
++#: apt_preferences.5.xml:206
  msgid ""
  "This general-form entry in the APT preferences file applies only to groups "
  "of packages.  For example, the following record assigns a high priority to "
@@@ -6008,7 -6008,7 +6021,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:206
++#: apt_preferences.5.xml:211
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6017,7 -6017,7 +6030,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:211
++#: apt_preferences.5.xml:216
  msgid ""
  "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
  "which can be used to match a hostname. The following record will assign a "
@@@ -6026,7 -6026,7 +6039,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:215
++#: apt_preferences.5.xml:220
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6035,7 -6035,7 +6048,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:219
++#: apt_preferences.5.xml:224
  msgid ""
  "This should <emphasis>not</emphasis> be confused with the Origin of a "
  "distribution as specified in a <filename>Release</filename> file.  What "
@@@ -6045,7 -6045,7 +6058,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:224
++#: apt_preferences.5.xml:229
  msgid ""
  "The following record assigns a low priority to all package versions "
  "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@@ -6053,7 -6053,7 +6066,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:228
++#: apt_preferences.5.xml:233
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6062,7 -6062,7 +6075,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:233
++#: apt_preferences.5.xml:238
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@@ -6070,7 -6070,7 +6083,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:237
++#: apt_preferences.5.xml:242
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6079,7 -6079,7 +6092,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:242
++#: apt_preferences.5.xml:247
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@@ -6087,7 -6087,7 +6100,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:247
++#: apt_preferences.5.xml:252
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6096,82 -6096,82 +6109,82 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:258
++#: apt_preferences.5.xml:263
  msgid "How APT Interprets Priorities"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:266
++#: apt_preferences.5.xml:271
  msgid "P &gt; 1000"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:267
++#: apt_preferences.5.xml:272
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
  "package"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:271
++#: apt_preferences.5.xml:276
  msgid "990 &lt; P &lt;=1000"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:272
++#: apt_preferences.5.xml:277
  msgid ""
  "causes a version to be installed even if it does not come from the target "
  "release, unless the installed version is more recent"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:277
++#: apt_preferences.5.xml:282
  msgid "500 &lt; P &lt;=990"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:278
++#: apt_preferences.5.xml:283
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to the target release or the installed version is more recent"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:283
++#: apt_preferences.5.xml:288
  msgid "100 &lt; P &lt;=500"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:284
++#: apt_preferences.5.xml:289
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to some other distribution or the installed version is more recent"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:289
++#: apt_preferences.5.xml:294
  msgid "0 &lt; P &lt;=100"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:290
++#: apt_preferences.5.xml:295
  msgid ""
  "causes a version to be installed only if there is no installed version of "
  "the package"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:294
++#: apt_preferences.5.xml:299
  msgid "P &lt; 0"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:295
++#: apt_preferences.5.xml:300
  msgid "prevents the version from being installed"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:261
++#: apt_preferences.5.xml:266
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -6179,7 -6179,7 +6192,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:300
++#: apt_preferences.5.xml:305
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -6188,14 -6188,14 +6201,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:306
++#: apt_preferences.5.xml:311
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
  "presented earlier:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
--#: apt_preferences.5.xml:310
++#: apt_preferences.5.xml:315
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -6212,12 -6212,12 +6225,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:323
++#: apt_preferences.5.xml:328
  msgid "Then:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:325
++#: apt_preferences.5.xml:330
  msgid ""
  "The most recent available version of the <literal>perl</literal> package "
  "will be installed, so long as that version's version number begins with "
@@@ -6227,7 -6227,7 +6240,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:330
++#: apt_preferences.5.xml:335
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -6235,7 -6235,7 +6248,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:334
++#: apt_preferences.5.xml:339
  msgid ""
  "A version of a package whose origin is not the local system but some other "
  "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@@ -6244,12 -6244,12 +6257,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:344
++#: apt_preferences.5.xml:349
  msgid "Determination of Package Version and Distribution Properties"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:346
++#: apt_preferences.5.xml:351
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -6257,27 -6257,27 +6270,27 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:358
++#: apt_preferences.5.xml:363
  msgid "the <literal>Package:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:359
++#: apt_preferences.5.xml:364
  msgid "gives the package name"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
  msgid "the <literal>Version:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:363
++#: apt_preferences.5.xml:368
  msgid "gives the version number for the named package"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:350
++#: apt_preferences.5.xml:355
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -6290,12 -6290,12 +6303,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:379
++#: apt_preferences.5.xml:384
  msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:380
++#: apt_preferences.5.xml:385
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -6306,18 -6306,18 +6319,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:390
++#: apt_preferences.5.xml:395
  #, no-wrap
  msgid "Pin: release a=stable\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:396
++#: apt_preferences.5.xml:401
  msgid "the <literal>Codename:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:397
++#: apt_preferences.5.xml:402
  msgid ""
  "names the codename to which all the packages in the directory tree belong.  "
  "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@@ -6328,13 -6328,13 +6341,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:406
++#: apt_preferences.5.xml:411
  #, no-wrap
  msgid "Pin: release n=&testing-codename;\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:413
++#: apt_preferences.5.xml:418
  msgid ""
  "names the release version.  For example, the packages in the tree might "
  "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@@ -6344,7 -6344,7 +6357,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:422
++#: apt_preferences.5.xml:427
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -6353,12 -6353,12 +6366,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:431
++#: apt_preferences.5.xml:436
  msgid "the <literal>Component:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:432
++#: apt_preferences.5.xml:437
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -6369,18 -6369,18 +6382,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:441
++#: apt_preferences.5.xml:446
  #, no-wrap
  msgid "Pin: release c=main\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:447
++#: apt_preferences.5.xml:452
  msgid "the <literal>Origin:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:448
++#: apt_preferences.5.xml:453
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -6389,18 -6389,18 +6402,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:454
++#: apt_preferences.5.xml:459
  #, no-wrap
  msgid "Pin: release o=Debian\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:460
++#: apt_preferences.5.xml:465
  msgid "the <literal>Label:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:461
++#: apt_preferences.5.xml:466
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -6409,13 -6409,13 +6422,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:467
++#: apt_preferences.5.xml:472
  #, no-wrap
  msgid "Pin: release l=Debian\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:368
++#: apt_preferences.5.xml:373
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -6429,7 -6429,7 +6442,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:474
++#: apt_preferences.5.xml:479
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -6444,12 -6444,12 +6457,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:487
++#: apt_preferences.5.xml:492
  msgid "Optional Lines in an APT Preferences Record"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:489
++#: apt_preferences.5.xml:494
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -6457,12 -6457,12 +6470,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:498
++#: apt_preferences.5.xml:503
  msgid "Tracking Stable"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:506
++#: apt_preferences.5.xml:511
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -6477,7 -6477,7 +6490,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:500
++#: apt_preferences.5.xml:505
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -6487,8 -6487,8 +6500,8 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
--#: apt_preferences.5.xml:627
++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
++#: apt_preferences.5.xml:632
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -6497,7 -6497,7 +6510,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:518
++#: apt_preferences.5.xml:523
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -6506,13 -6506,13 +6519,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:535
++#: apt_preferences.5.xml:540
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/testing\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:529
++#: apt_preferences.5.xml:534
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -6521,12 -6521,12 +6534,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:541
++#: apt_preferences.5.xml:546
  msgid "Tracking Testing or Unstable"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:550
++#: apt_preferences.5.xml:555
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6543,7 -6543,7 +6556,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:543
++#: apt_preferences.5.xml:548
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -6554,7 -6554,7 +6567,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:564
++#: apt_preferences.5.xml:569
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -6563,13 -6563,13 +6576,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:584
++#: apt_preferences.5.xml:589
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:575
++#: apt_preferences.5.xml:580
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -6581,12 -6581,12 +6594,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:591
++#: apt_preferences.5.xml:596
  msgid "Tracking the evolution of a codename release"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:605
++#: apt_preferences.5.xml:610
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -6606,7 -6606,7 +6619,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:593
++#: apt_preferences.5.xml:598
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -6621,7 -6621,7 +6634,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:622
++#: apt_preferences.5.xml:627
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest version(s) in "
@@@ -6630,13 -6630,13 +6643,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:642
++#: apt_preferences.5.xml:647
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/sid\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:633
++#: apt_preferences.5.xml:638
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -6648,12 -6648,12 +6661,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
--#: apt_preferences.5.xml:651
++#: apt_preferences.5.xml:656
  msgid "&file-preferences;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt_preferences.5.xml:657
++#: apt_preferences.5.xml:662
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr ""
  
diff --combined doc/po/ja.po
index 3a0db1bbf,3a0db1bbf..0f88e5e85
--- 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-02-14 13:42+0100\n"
++"POT-Creation-Date: 2011-04-05 10:22+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:568 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:542 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:542 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>"
  
@@@ -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:580
++#: 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:608 apt-get.8.xml:570
++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
  #: apt-sortpkgs.1.xml:67
  msgid "&apt-commonoptions;"
  msgstr "&apt-commonoptions;"
@@@ -1635,7 -1635,7 +1635,7 @@@
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
--#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
  msgid "Files"
  msgstr "ファイル"
  
@@@ -1647,9 -1647,9 +1647,9 @@@ 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:624 apt-get.8.xml:585
++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
  #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
--#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
  #: sources.list.5.xml:234
  msgid "See Also"
  msgstr "関連項目"
@@@ -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:628 apt-get.8.xml:591
++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
  #: apt-mark.8.xml:135 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:536 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:625
++#: 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;"
@@@ -3286,29 -3286,29 +3286,49 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-ftparchive.1.xml:529
--msgid "<option>--md5</option>"
--msgstr "<option>--md5</option>"
++msgid ""
++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
++msgstr ""
  
--# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:531
--msgid ""
--"Generate MD5 sums. This defaults to on, when turned off the generated index "
--"files will not have MD5Sum fields where possible.  Configuration Item: "
--"<literal>APT::FTPArchive::MD5</literal>"
++#, 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>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 ""
--"MD5 sum を生成します。デフォルトで on になっており、off にすると生成したイン"
--"デックスファイルに MD5Sum フィールドがありません。設定項目 - <literal>APT::"
--"FTPArchive::MD5</literal>"
++"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:536
++#: 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:538
++#: 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>."
@@@ -3318,7 -3318,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:544
++#: 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 "
@@@ -3331,13 -3331,13 +3351,13 @@@ msgstr "
  "<literal>quiet</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:550
++#: 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:552
++#: 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 "
@@@ -3350,13 -3350,13 +3370,13 @@@ msgstr "
  "<literal>APT::FTPArchive::DeLinkAct</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:558
++#: 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:560
++#: 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 "
@@@ -3371,13 -3371,13 +3391,13 @@@ msgstr "
  "<literal>APT::FTPArchive::Contents</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:568
++#: 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:570
++#: 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</"
@@@ -3387,13 -3387,13 +3407,13 @@@ msgstr "
  "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:574
++#: 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:576
++#: apt-ftparchive.1.xml:579
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3402,13 -3402,13 +3422,13 @@@ msgstr "
  "FTPArchive::ReadOnlyDB</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:580
++#: 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:581
++#: apt-ftparchive.1.xml:584
  #, fuzzy
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
@@@ -3422,12 -3422,12 +3442,12 @@@ msgstr "
  "literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:587
++#: 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:589
++#: 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 "
@@@ -3441,12 -3441,12 +3461,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:599
++#: 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:601
++#: apt-ftparchive.1.xml:604
  #, fuzzy
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
@@@ -3462,14 -3462,14 +3482,14 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
--#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
  #: 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:619
++#: 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 ""
@@@ -3478,7 -3478,7 +3498,7 @@@
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
--#: apt-ftparchive.1.xml:615
++#: apt-ftparchive.1.xml:618
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3488,7 -3488,7 +3508,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
--#: apt-ftparchive.1.xml:629
++#: apt-ftparchive.1.xml:632
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -7854,31 -7854,31 +7874,35 @@@ msgstr "priority 1
  #: apt_preferences.5.xml:107
  msgid ""
  "to the versions coming from archives which in their <filename>Release</"
--"filename> files are marked as \"NotAutomatic: yes\" like the debian "
--"experimental archive."
++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
++"<literal>experimental</literal> archive."
  msgstr ""
  
  # type: <tag></tag>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:112
++#: apt_preferences.5.xml:113
  msgid "priority 100"
  msgstr "priority 100"
  
--# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:113
--msgid "to the version that is already installed (if any)."
--msgstr "(あるならば) 既にインストールされているバージョン。"
++#: apt_preferences.5.xml:114
++msgid ""
++"to the version that is already installed (if any) and to the versions coming "
++"from archives which in their <filename>Release</filename> files are marked "
++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
++"backports archive since <literal>squeeze-backports</literal>."
++msgstr ""
  
  # type: <tag></tag>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:117
++#: apt_preferences.5.xml:121
  msgid "priority 500"
  msgstr "priority 500"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:118
++#: apt_preferences.5.xml:122
  msgid ""
  "to the versions that are not installed and do not belong to the target "
  "release."
@@@ -7886,13 -7886,13 +7910,13 @@@ msgstr "インストールされておã
  
  # type: <tag></tag>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:122
++#: apt_preferences.5.xml:126
  msgid "priority 990"
  msgstr "priority 990"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:123
++#: apt_preferences.5.xml:127
  msgid ""
  "to the versions that are not installed and belong to the target release."
  msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。"
@@@ -7911,14 -7911,14 +7935,15 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:128
++#: apt_preferences.5.xml:132
  #, fuzzy
  msgid ""
  "If the target release has not been specified then APT simply assigns "
  "priority 100 to all installed package versions and priority 500 to all "
--"uninstalled package versions, expect versions coming from archives which in "
++"uninstalled package versions, except versions coming from archives which in "
  "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
--"- these versions get the priority 1."
++"- these versions get the priority 1 or priority 100 if it is additionally "
++"marked as \"ButAutomaticUpgrades: yes\"."
  msgstr ""
  "ターゲットリリースが指定されていなければ、APT は単純にインストールしている"
  "パッケージのバージョンには 100 を、インストールしていないパッケージのバージョ"
@@@ -7926,7 -7926,7 +7951,7 @@@
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:134
++#: apt_preferences.5.xml:139
  msgid ""
  "APT then applies the following rules, listed in order of precedence, to "
  "determine which version of a package to install."
@@@ -7936,7 -7936,7 +7961,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:137
++#: apt_preferences.5.xml:142
  msgid ""
  "Never downgrade unless the priority of an available version exceeds 1000.  "
  "(\"Downgrading\" is installing a less recent version of a package in place "
@@@ -7952,13 -7952,13 +7977,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:143
++#: apt_preferences.5.xml:148
  msgid "Install the highest priority version."
  msgstr "最も高い優先度のバージョンをインストールします。"
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:144
++#: apt_preferences.5.xml:149
  msgid ""
  "If two or more versions have the same priority, install the most recent one "
  "(that is, the one with the higher version number)."
@@@ -7968,7 -7968,7 +7993,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:147
++#: apt_preferences.5.xml:152
  msgid ""
  "If two or more versions have the same priority and version number but either "
  "the packages differ in some of their metadata or the <literal>--reinstall</"
@@@ -7980,7 -7980,7 +8005,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:153
++#: apt_preferences.5.xml:158
  msgid ""
  "In a typical situation, the installed version of a package (priority 100)  "
  "is not as recent as one of the versions available from the sources listed in "
@@@ -7996,7 -7996,7 +8021,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:160
++#: apt_preferences.5.xml:165
  msgid ""
  "More rarely, the installed version of a package is <emphasis>more</emphasis> "
  "recent than any of the other available versions.  The package will not be "
@@@ -8010,7 -8010,7 +8035,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:165
++#: apt_preferences.5.xml:170
  msgid ""
  "Sometimes the installed version of a package is more recent than the version "
  "belonging to the target release, but not as recent as a version belonging to "
@@@ -8030,13 -8030,13 +8055,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:174
++#: apt_preferences.5.xml:179
  msgid "The Effect of APT Preferences"
  msgstr "APT 設定の効果"
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:176
++#: apt_preferences.5.xml:181
  msgid ""
  "The APT preferences file allows the system administrator to control the "
  "assignment of priorities.  The file consists of one or more multi-line "
@@@ -8049,7 -8049,7 +8074,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:182
++#: apt_preferences.5.xml:187
  msgid ""
  "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
  "specified packages and specified version or version range.  For example, the "
@@@ -8064,7 -8064,7 +8089,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:189
++#: apt_preferences.5.xml:194
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8078,7 -8078,7 +8103,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:195
++#: apt_preferences.5.xml:200
  msgid ""
  "The general form assigns a priority to all of the package versions in a "
  "given distribution (that is, to all the versions of packages that are listed "
@@@ -8093,7 -8093,7 +8118,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:201
++#: apt_preferences.5.xml:206
  msgid ""
  "This general-form entry in the APT preferences file applies only to groups "
  "of packages.  For example, the following record assigns a high priority to "
@@@ -8105,7 -8105,7 +8130,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:206
++#: apt_preferences.5.xml:211
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8118,7 -8118,7 +8143,7 @@@ msgstr "
  "\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:211
++#: apt_preferences.5.xml:216
  msgid ""
  "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
  "which can be used to match a hostname. The following record will assign a "
@@@ -8128,7 -8128,7 +8153,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:215
++#: apt_preferences.5.xml:220
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8141,7 -8141,7 +8166,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:219
++#: apt_preferences.5.xml:224
  #, fuzzy
  msgid ""
  "This should <emphasis>not</emphasis> be confused with the Origin of a "
@@@ -8158,7 -8158,7 +8183,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:224
++#: apt_preferences.5.xml:229
  msgid ""
  "The following record assigns a low priority to all package versions "
  "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@@ -8169,7 -8169,7 +8194,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:228
++#: apt_preferences.5.xml:233
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8183,7 -8183,7 +8208,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:233
++#: apt_preferences.5.xml:238
  #, fuzzy
  msgid ""
  "The following record assigns a high priority to all package versions "
@@@ -8195,7 -8195,7 +8220,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:237
++#: apt_preferences.5.xml:242
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8208,7 -8208,7 +8233,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:242
++#: apt_preferences.5.xml:247
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@@ -8220,7 -8220,7 +8245,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:247
++#: apt_preferences.5.xml:252
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8234,18 -8234,18 +8259,18 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:258
++#: apt_preferences.5.xml:263
  msgid "How APT Interprets Priorities"
  msgstr "APT が優先度に割り込む方法"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:266
++#: apt_preferences.5.xml:271
  msgid "P &gt; 1000"
  msgstr "P &gt; 1000"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:267
++#: apt_preferences.5.xml:272
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
  "package"
@@@ -8253,13 -8253,13 +8278,13 @@@ msgstr "
  "パッケージがダウングレードしても、このバージョンのパッケージをインストール"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:271
++#: apt_preferences.5.xml:276
  msgid "990 &lt; P &lt;=1000"
  msgstr "990 &lt; P &lt;=1000"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:272
++#: apt_preferences.5.xml:277
  msgid ""
  "causes a version to be installed even if it does not come from the target "
  "release, unless the installed version is more recent"
@@@ -8268,13 -8268,13 +8293,13 @@@ msgstr "
  "含まれなくても、このバージョンのパッケージをインストール"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:277
++#: apt_preferences.5.xml:282
  msgid "500 &lt; P &lt;=990"
  msgstr "500 &lt; P &lt;=990"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:278
++#: apt_preferences.5.xml:283
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to the target release or the installed version is more recent"
@@@ -8283,13 -8283,13 +8308,13 @@@ msgstr "
  "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:283
++#: apt_preferences.5.xml:288
  msgid "100 &lt; P &lt;=500"
  msgstr "100 &lt; P &lt;=500"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:284
++#: apt_preferences.5.xml:289
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to some other distribution or the installed version is more recent"
@@@ -8299,13 -8299,13 +8324,13 @@@ msgstr "
  "ル"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:289
++#: apt_preferences.5.xml:294
  msgid "0 &lt; P &lt;=100"
  msgstr "0 &lt; P &lt;=100"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:290
++#: apt_preferences.5.xml:295
  msgid ""
  "causes a version to be installed only if there is no installed version of "
  "the package"
@@@ -8314,19 -8314,19 +8339,19 @@@ msgstr "
  "ンストール"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:294
++#: apt_preferences.5.xml:299
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:295
++#: apt_preferences.5.xml:300
  msgid "prevents the version from being installed"
  msgstr "このバージョンのインストール禁止"
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:261
++#: apt_preferences.5.xml:266
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -8338,7 -8338,7 +8363,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:300
++#: apt_preferences.5.xml:305
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -8352,7 -8352,7 +8377,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:306
++#: apt_preferences.5.xml:311
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
  "presented earlier:"
@@@ -8362,7 -8362,7 +8387,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
--#: apt_preferences.5.xml:310
++#: apt_preferences.5.xml:315
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8392,13 -8392,13 +8417,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:323
++#: apt_preferences.5.xml:328
  msgid "Then:"
  msgstr "すると、以下のように動作します。"
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:325
++#: apt_preferences.5.xml:330
  msgid ""
  "The most recent available version of the <literal>perl</literal> package "
  "will be installed, so long as that version's version number begins with "
@@@ -8413,7 -8413,7 +8438,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:330
++#: apt_preferences.5.xml:335
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -8425,7 -8425,7 +8450,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:334
++#: apt_preferences.5.xml:339
  msgid ""
  "A version of a package whose origin is not the local system but some other "
  "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@@ -8439,13 -8439,13 +8464,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:344
++#: apt_preferences.5.xml:349
  msgid "Determination of Package Version and Distribution Properties"
  msgstr "パッケージのバージョンとディストリビューションプロパティの決定"
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:346
++#: apt_preferences.5.xml:351
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -8456,30 -8456,30 +8481,30 @@@ msgstr "
  "filename> ファイルを提供します。"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:358
++#: apt_preferences.5.xml:363
  msgid "the <literal>Package:</literal> line"
  msgstr "<literal>Package:</literal> 行"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:359
++#: apt_preferences.5.xml:364
  msgid "gives the package name"
  msgstr "パッケージ名"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
  msgid "the <literal>Version:</literal> line"
  msgstr "<literal>Version:</literal> 行"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:363
++#: apt_preferences.5.xml:368
  msgid "gives the version number for the named package"
  msgstr "その名前のパッケージのバージョン番号"
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:350
++#: apt_preferences.5.xml:355
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -8499,13 -8499,13 +8524,13 @@@ msgstr "
  "type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:379
++#: apt_preferences.5.xml:384
  msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
  msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:380
++#: apt_preferences.5.xml:385
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -8522,19 -8522,19 +8547,19 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:390
++#: apt_preferences.5.xml:395
  #, no-wrap
  msgid "Pin: release a=stable\n"
  msgstr "Pin: release a=stable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:396
++#: apt_preferences.5.xml:401
  msgid "the <literal>Codename:</literal> line"
  msgstr "<literal>Codename:</literal> 行"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:397
++#: apt_preferences.5.xml:402
  #, fuzzy
  msgid ""
  "names the codename to which all the packages in the directory tree belong.  "
@@@ -8552,14 -8552,14 +8577,14 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:406
++#: apt_preferences.5.xml:411
  #, no-wrap
  msgid "Pin: release n=&testing-codename;\n"
  msgstr "Pin: release n=&testing-codename;\n"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:413
++#: apt_preferences.5.xml:418
  msgid ""
  "names the release version.  For example, the packages in the tree might "
  "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@@ -8575,7 -8575,7 +8600,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:422
++#: apt_preferences.5.xml:427
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -8588,13 -8588,13 +8613,13 @@@ msgstr "
  "\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:431
++#: apt_preferences.5.xml:436
  msgid "the <literal>Component:</literal> line"
  msgstr "<literal>Component:</literal> 行"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:432
++#: apt_preferences.5.xml:437
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -8612,19 -8612,19 +8637,19 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:441
++#: apt_preferences.5.xml:446
  #, no-wrap
  msgid "Pin: release c=main\n"
  msgstr "Pin: release c=main\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:447
++#: apt_preferences.5.xml:452
  msgid "the <literal>Origin:</literal> line"
  msgstr "<literal>Origin:</literal> 行"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:448
++#: apt_preferences.5.xml:453
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8637,7 -8637,7 +8662,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:454
++#: apt_preferences.5.xml:459
  #, no-wrap
  msgid "Pin: release o=Debian\n"
  msgstr ""
@@@ -8645,13 -8645,13 +8670,13 @@@
  "\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:460
++#: apt_preferences.5.xml:465
  msgid "the <literal>Label:</literal> line"
  msgstr "<literal>Label:</literal> 行"
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:461
++#: apt_preferences.5.xml:466
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8664,7 -8664,7 +8689,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:467
++#: apt_preferences.5.xml:472
  #, no-wrap
  msgid "Pin: release l=Debian\n"
  msgstr ""
@@@ -8673,7 -8673,7 +8698,7 @@@
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:368
++#: apt_preferences.5.xml:373
  #, fuzzy
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
@@@ -8697,7 -8697,7 +8722,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:474
++#: apt_preferences.5.xml:479
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -8723,13 -8723,13 +8748,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:487
++#: apt_preferences.5.xml:492
  msgid "Optional Lines in an APT Preferences Record"
  msgstr "APT 設定レコードのオプション行"
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:489
++#: apt_preferences.5.xml:494
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -8740,13 -8740,13 +8765,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:498
++#: apt_preferences.5.xml:503
  msgid "Tracking Stable"
  msgstr "安定版の追跡"
  
  # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:506
++#: apt_preferences.5.xml:511
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -8772,7 -8772,7 +8797,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:500
++#: apt_preferences.5.xml:505
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -8788,8 -8788,8 +8813,8 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
--#: apt_preferences.5.xml:627
++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
++#: apt_preferences.5.xml:632
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -8802,7 -8802,7 +8827,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:518
++#: apt_preferences.5.xml:523
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -8815,14 -8815,14 +8840,14 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:535
++#: apt_preferences.5.xml:540
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/testing\n"
  msgstr "apt-get install <replaceable>package</replaceable>/testing\n"
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:529
++#: apt_preferences.5.xml:534
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -8836,13 -8836,13 +8861,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:541
++#: apt_preferences.5.xml:546
  msgid "Tracking Testing or Unstable"
  msgstr "テスト版や不安定版の追跡"
  
  # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:550
++#: apt_preferences.5.xml:555
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8871,7 -8871,7 +8896,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:543
++#: apt_preferences.5.xml:548
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -8889,7 -8889,7 +8914,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:564
++#: apt_preferences.5.xml:569
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -8902,14 -8902,14 +8927,14 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:584
++#: apt_preferences.5.xml:589
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
  msgstr "apt-get install <replaceable>package</replaceable>/unstable\n"
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:575
++#: apt_preferences.5.xml:580
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -8928,13 -8928,13 +8953,13 @@@ msgstr "
  "\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:591
++#: apt_preferences.5.xml:596
  msgid "Tracking the evolution of a codename release"
  msgstr "コード名リリースの進化の追跡"
  
  # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:605
++#: apt_preferences.5.xml:610
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -8968,7 -8968,7 +8993,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:593
++#: apt_preferences.5.xml:598
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -8992,7 -8992,7 +9017,7 @@@ msgstr "
  "id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:622
++#: apt_preferences.5.xml:627
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest version(s) in "
@@@ -9005,14 -9005,14 +9030,14 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:642
++#: apt_preferences.5.xml:647
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/sid\n"
  msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:633
++#: apt_preferences.5.xml:638
  #, fuzzy
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
@@@ -9032,13 -9032,13 +9057,13 @@@ msgstr "
  
  # type: Content of: <refentry><refnamediv><refname>
  #. type: Content of: <refentry><refsect1><variablelist>
--#: apt_preferences.5.xml:651
++#: apt_preferences.5.xml:656
  msgid "&file-preferences;"
  msgstr "&file-preferences;"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
--#: apt_preferences.5.xml:657
++#: apt_preferences.5.xml:662
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
@@@ -10742,6 -10742,6 +10767,23 @@@ msgstr "  # apt-get -o dir::cache::arch
  msgid "Which will use the already fetched archives on the disc."
  msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。"
  
++#~ msgid "<option>--md5</option>"
++#~ msgstr "<option>--md5</option>"
++
++# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
++#~ msgid ""
++#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
++#~ "index files will not have MD5Sum fields where possible.  Configuration "
++#~ "Item: <literal>APT::FTPArchive::MD5</literal>"
++#~ msgstr ""
++#~ "MD5 sum を生成します。デフォルトで on になっており、off にすると生成したイ"
++#~ "ンデックスファイルに MD5Sum フィールドがありません。設定項目 - "
++#~ "<literal>APT::FTPArchive::MD5</literal>"
++
++# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
++#~ msgid "to the version that is already installed (if any)."
++#~ msgstr "(あるならば) 既にインストールされているバージョン。"
++
  # type: Content of: <refentry><refnamediv><refpurpose>
  #~ msgid "APT package handling utility -- cache manipulator"
  #~ msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作ツール"
@@@ -10803,8 -10803,8 +10845,12 @@@
  #~ "nonus.debian.org のアーカイブに HTTP アクセスし、debian-non-US ディレクト"
  #~ "リ以下を使用します。"
  
--#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
--#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
++#~ msgid ""
++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
++#~ "free"
++#~ msgstr ""
++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
++#~ "free"
  
  # type: SH
  #~ msgid "OPTIONS"
diff --combined doc/po/pl.po
index 7c98ac229,7c98ac229..83615be50
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@@ -10,7 -10,7 +10,7 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: apt 0.7.25.3\n"
--"POT-Creation-Date: 2011-02-14 13:42+0100\n"
++"POT-Creation-Date: 2011-04-05 10:22+0300\n"
  "PO-Revision-Date: 2010-03-18 22:00+0100\n"
  "Last-Translator: Robert Luberda <robert@debian.org>\n"
  "Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@@ -1363,7 -1363,7 +1363,7 @@@ msgstr "
  "<literal>Dir::Cache::pkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 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>"
@@@ -1391,12 -1391,12 +1391,12 @@@ msgstr "
  "Cache::srcpkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 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:542 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>"
  
@@@ -1534,7 -1534,7 +1534,7 @@@ msgstr "
  "konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580
++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
  msgid "<option>-a</option>"
  msgstr "<option>-a</option>"
  
@@@ -1660,14 -1660,14 +1660,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:608 apt-get.8.xml:570
++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
  #: 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:575 apt-key.8.xml:156 apt-mark.8.xml:125
--#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
  msgid "Files"
  msgstr "Pliki"
  
@@@ -1678,9 -1678,9 +1678,9 @@@ 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:624 apt-get.8.xml:585
++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
  #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
--#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
  #: sources.list.5.xml:234
  msgid "See Also"
  msgstr "Zobacz także"
@@@ -1693,7 -1693,7 +1693,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:628 apt-get.8.xml:591
++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
  #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
  msgid "Diagnostics"
  msgstr "Diagnostyka"
@@@ -1842,7 -1842,7 +1842,7 @@@ msgid "Options
  msgstr "Opcje"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 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>"
  
@@@ -2105,7 -2105,7 +2105,7 @@@ msgid "Just show the contents of the co
  msgstr "Wyświetla zawartość przestrzeni konfiguracji."
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625
++#: 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;"
@@@ -3094,25 -3094,25 +3094,32 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-ftparchive.1.xml:529
--msgid "<option>--md5</option>"
--msgstr "<option>--md5</option>"
++msgid ""
++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
++msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:531
  msgid ""
--"Generate MD5 sums. This defaults to on, when turned off the generated index "
--"files will not have MD5Sum fields where possible.  Configuration Item: "
--"<literal>APT::FTPArchive::MD5</literal>"
++"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>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 ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:536
++#: 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:538
++#: apt-ftparchive.1.xml:541
  #, fuzzy
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
@@@ -3123,7 -3123,7 +3130,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:544
++#: 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 "
@@@ -3137,13 -3137,13 +3144,13 @@@ msgstr "
  "pliku konfiguracyjnym: <literal>quiet</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:550
++#: 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:552
++#: apt-ftparchive.1.xml:555
  #, fuzzy
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
@@@ -3157,12 -3157,12 +3164,12 @@@ msgstr "
  "<literal>APT::Cache::Generate</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:558
++#: 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:560
++#: 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 "
@@@ -3172,13 -3172,13 +3179,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:568
++#: 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:570
++#: apt-ftparchive.1.xml:573
  #, fuzzy
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
@@@ -3190,13 -3190,13 +3197,13 @@@ msgstr "
  "konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:574
++#: 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:576
++#: apt-ftparchive.1.xml:579
  #, fuzzy
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
@@@ -3206,14 -3206,14 +3213,14 @@@ msgstr "
  "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:580
++#: apt-ftparchive.1.xml:583
  #, fuzzy
  #| msgid "<option>-a</option>"
  msgid "<option>--arch</option>"
  msgstr "<option>-a</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:581
++#: apt-ftparchive.1.xml:584
  #, fuzzy
  #| msgid ""
  #| "If the command is either <literal>install</literal> or <literal>remove</"
@@@ -3233,13 -3233,13 +3240,13 @@@ msgstr "
  "AutomaticRemove</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:587
++#: apt-ftparchive.1.xml:590
  #, fuzzy
  msgid "<option>APT::FTPArchive::AlwaysStat</option>"
  msgstr "<option>--version</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:589
++#: 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 "
@@@ -3253,13 -3253,13 +3260,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:599
++#: apt-ftparchive.1.xml:602
  #, fuzzy
  msgid "<option>APT::FTPArchive::LongDescription</option>"
  msgstr "<option>--version</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:601
++#: 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 "
@@@ -3269,19 -3269,19 +3276,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
--#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
  #: sources.list.5.xml:198
  msgid "Examples"
  msgstr "Przykłady"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
--#: apt-ftparchive.1.xml:619
++#: 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>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-ftparchive.1.xml:615
++#: apt-ftparchive.1.xml:618
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3289,7 -3289,7 +3296,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><para>
--#: apt-ftparchive.1.xml:629
++#: apt-ftparchive.1.xml:632
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -7100,39 -7100,39 +7107,44 @@@ msgstr "priorytet 100
  #: apt_preferences.5.xml:107
  msgid ""
  "to the versions coming from archives which in their <filename>Release</"
--"filename> files are marked as \"NotAutomatic: yes\" like the debian "
--"experimental archive."
++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
++"<literal>experimental</literal> archive."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:112
++#: apt_preferences.5.xml:113
  msgid "priority 100"
  msgstr "priorytet 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:113
--msgid "to the version that is already installed (if any)."
++#: apt_preferences.5.xml:114
++msgid ""
++"to the version that is already installed (if any) and to the versions coming "
++"from archives which in their <filename>Release</filename> files are marked "
++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
++"backports archive since <literal>squeeze-backports</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:117
++#: apt_preferences.5.xml:121
  msgid "priority 500"
  msgstr "priorytet 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:118
++#: apt_preferences.5.xml:122
  msgid ""
  "to the versions that are not installed and do not belong to the target "
  "release."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:122
++#: apt_preferences.5.xml:126
  msgid "priority 990"
  msgstr "priorytet 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:123
++#: apt_preferences.5.xml:127
  msgid ""
  "to the versions that are not installed and belong to the target release."
  msgstr ""
@@@ -7146,24 -7146,24 +7158,25 @@@ msgid "
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:128
++#: apt_preferences.5.xml:132
  msgid ""
  "If the target release has not been specified then APT simply assigns "
  "priority 100 to all installed package versions and priority 500 to all "
--"uninstalled package versions, expect versions coming from archives which in "
++"uninstalled package versions, except versions coming from archives which in "
  "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
--"- these versions get the priority 1."
++"- these versions get the priority 1 or priority 100 if it is additionally "
++"marked as \"ButAutomaticUpgrades: yes\"."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:134
++#: apt_preferences.5.xml:139
  msgid ""
  "APT then applies the following rules, listed in order of precedence, to "
  "determine which version of a package to install."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:137
++#: apt_preferences.5.xml:142
  msgid ""
  "Never downgrade unless the priority of an available version exceeds 1000.  "
  "(\"Downgrading\" is installing a less recent version of a package in place "
@@@ -7173,19 -7173,19 +7186,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:143
++#: apt_preferences.5.xml:148
  msgid "Install the highest priority version."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:144
++#: apt_preferences.5.xml:149
  msgid ""
  "If two or more versions have the same priority, install the most recent one "
  "(that is, the one with the higher version number)."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:147
++#: apt_preferences.5.xml:152
  msgid ""
  "If two or more versions have the same priority and version number but either "
  "the packages differ in some of their metadata or the <literal>--reinstall</"
@@@ -7193,7 -7193,7 +7206,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:153
++#: apt_preferences.5.xml:158
  msgid ""
  "In a typical situation, the installed version of a package (priority 100)  "
  "is not as recent as one of the versions available from the sources listed in "
@@@ -7203,7 -7203,7 +7216,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:160
++#: apt_preferences.5.xml:165
  msgid ""
  "More rarely, the installed version of a package is <emphasis>more</emphasis> "
  "recent than any of the other available versions.  The package will not be "
@@@ -7212,7 -7212,7 +7225,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:165
++#: apt_preferences.5.xml:170
  msgid ""
  "Sometimes the installed version of a package is more recent than the version "
  "belonging to the target release, but not as recent as a version belonging to "
@@@ -7224,12 -7224,12 +7237,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:174
++#: apt_preferences.5.xml:179
  msgid "The Effect of APT Preferences"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:176
++#: apt_preferences.5.xml:181
  msgid ""
  "The APT preferences file allows the system administrator to control the "
  "assignment of priorities.  The file consists of one or more multi-line "
@@@ -7238,7 -7238,7 +7251,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:182
++#: apt_preferences.5.xml:187
  msgid ""
  "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
  "specified packages and specified version or version range.  For example, the "
@@@ -7248,7 -7248,7 +7261,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:189
++#: apt_preferences.5.xml:194
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -7260,7 -7260,7 +7273,7 @@@ msgstr "
  "Pin-Priority: 1001\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:195
++#: apt_preferences.5.xml:200
  msgid ""
  "The general form assigns a priority to all of the package versions in a "
  "given distribution (that is, to all the versions of packages that are listed "
@@@ -7270,7 -7270,7 +7283,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:201
++#: apt_preferences.5.xml:206
  msgid ""
  "This general-form entry in the APT preferences file applies only to groups "
  "of packages.  For example, the following record assigns a high priority to "
@@@ -7278,7 -7278,7 +7291,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:206
++#: apt_preferences.5.xml:211
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -7290,7 -7290,7 +7303,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:211
++#: apt_preferences.5.xml:216
  msgid ""
  "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
  "which can be used to match a hostname. The following record will assign a "
@@@ -7299,7 -7299,7 +7312,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:215
++#: apt_preferences.5.xml:220
  #, fuzzy, no-wrap
  #| msgid ""
  #| "Package: *\n"
@@@ -7315,7 -7315,7 +7328,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:219
++#: apt_preferences.5.xml:224
  msgid ""
  "This should <emphasis>not</emphasis> be confused with the Origin of a "
  "distribution as specified in a <filename>Release</filename> file.  What "
@@@ -7325,7 -7325,7 +7338,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:224
++#: apt_preferences.5.xml:229
  msgid ""
  "The following record assigns a low priority to all package versions "
  "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@@ -7333,7 -7333,7 +7346,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:228
++#: apt_preferences.5.xml:233
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -7345,7 -7345,7 +7358,7 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:233
++#: apt_preferences.5.xml:238
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@@ -7353,7 -7353,7 +7366,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:237
++#: apt_preferences.5.xml:242
  #, fuzzy, no-wrap
  #| msgid ""
  #| "Package: *\n"
@@@ -7369,7 -7369,7 +7382,7 @@@ msgstr "
  "Pin-Priority: 900\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:242
++#: apt_preferences.5.xml:247
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@@ -7377,7 -7377,7 +7390,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:247
++#: apt_preferences.5.xml:252
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -7389,17 -7389,17 +7402,17 @@@ msgstr "
  "Pin-Priority: 500\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:258
++#: apt_preferences.5.xml:263
  msgid "How APT Interprets Priorities"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:266
++#: apt_preferences.5.xml:271
  msgid "P &gt; 1000"
  msgstr "P &gt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:267
++#: apt_preferences.5.xml:272
  #, fuzzy
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
@@@ -7409,12 -7409,12 +7422,12 @@@ msgstr "
  "pakietu nie jest jeszcze zainstalowana"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:271
++#: apt_preferences.5.xml:276
  msgid "990 &lt; P &lt;=1000"
  msgstr "990 &lt; P &lt;=1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:272
++#: apt_preferences.5.xml:277
  #, fuzzy
  msgid ""
  "causes a version to be installed even if it does not come from the target "
@@@ -7424,12 -7424,12 +7437,12 @@@ msgstr "
  "pakietu nie jest jeszcze zainstalowana"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:277
++#: apt_preferences.5.xml:282
  msgid "500 &lt; P &lt;=990"
  msgstr "500 &lt; P &lt;=990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:278
++#: apt_preferences.5.xml:283
  #, fuzzy
  msgid ""
  "causes a version to be installed unless there is a version available "
@@@ -7439,12 -7439,12 +7452,12 @@@ msgstr "
  "pakietu nie jest jeszcze zainstalowana"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:283
++#: apt_preferences.5.xml:288
  msgid "100 &lt; P &lt;=500"
  msgstr "100 &lt; P &lt;=500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:284
++#: apt_preferences.5.xml:289
  #, fuzzy
  msgid ""
  "causes a version to be installed unless there is a version available "
@@@ -7454,12 -7454,12 +7467,12 @@@ msgstr "
  "pakietu nie jest jeszcze zainstalowana"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:289
++#: apt_preferences.5.xml:294
  msgid "0 &lt; P &lt;=100"
  msgstr "0 &lt; P &lt;=100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:290
++#: apt_preferences.5.xml:295
  msgid ""
  "causes a version to be installed only if there is no installed version of "
  "the package"
@@@ -7468,17 -7468,17 +7481,17 @@@ msgstr "
  "pakietu nie jest jeszcze zainstalowana"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:294
++#: apt_preferences.5.xml:299
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:295
++#: apt_preferences.5.xml:300
  msgid "prevents the version from being installed"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:261
++#: apt_preferences.5.xml:266
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -7486,7 -7486,7 +7499,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:300
++#: apt_preferences.5.xml:305
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -7495,14 -7495,14 +7508,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:306
++#: apt_preferences.5.xml:311
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
  "presented earlier:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
--#: apt_preferences.5.xml:310
++#: apt_preferences.5.xml:315
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -7530,12 -7530,12 +7543,12 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:323
++#: apt_preferences.5.xml:328
  msgid "Then:"
  msgstr "Wtedy:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:325
++#: apt_preferences.5.xml:330
  msgid ""
  "The most recent available version of the <literal>perl</literal> package "
  "will be installed, so long as that version's version number begins with "
@@@ -7545,7 -7545,7 +7558,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:330
++#: apt_preferences.5.xml:335
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -7553,7 -7553,7 +7566,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:334
++#: apt_preferences.5.xml:339
  msgid ""
  "A version of a package whose origin is not the local system but some other "
  "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@@ -7562,12 -7562,12 +7575,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:344
++#: apt_preferences.5.xml:349
  msgid "Determination of Package Version and Distribution Properties"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:346
++#: apt_preferences.5.xml:351
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -7575,27 -7575,27 +7588,27 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:358
++#: apt_preferences.5.xml:363
  msgid "the <literal>Package:</literal> line"
  msgstr "linia <literal>Package:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:359
++#: apt_preferences.5.xml:364
  msgid "gives the package name"
  msgstr "podaje nazwę pakietu"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
  msgid "the <literal>Version:</literal> line"
  msgstr "linia <literal>Version:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:363
++#: apt_preferences.5.xml:368
  msgid "gives the version number for the named package"
  msgstr "podaje numer wersji danego pakietu"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:350
++#: apt_preferences.5.xml:355
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -7608,12 -7608,12 +7621,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:379
++#: apt_preferences.5.xml:384
  msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
  msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:380
++#: apt_preferences.5.xml:385
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -7624,18 -7624,18 +7637,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:390
++#: apt_preferences.5.xml:395
  #, no-wrap
  msgid "Pin: release a=stable\n"
  msgstr "Pin: release a=stable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:396
++#: apt_preferences.5.xml:401
  msgid "the <literal>Codename:</literal> line"
  msgstr "linia <literal>Codename:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:397
++#: apt_preferences.5.xml:402
  msgid ""
  "names the codename to which all the packages in the directory tree belong.  "
  "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@@ -7646,14 -7646,14 +7659,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:406
++#: apt_preferences.5.xml:411
  #, fuzzy, no-wrap
  #| msgid "Pin: release a=stable\n"
  msgid "Pin: release n=&testing-codename;\n"
  msgstr "Pin: release a=stable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:413
++#: apt_preferences.5.xml:418
  msgid ""
  "names the release version.  For example, the packages in the tree might "
  "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@@ -7663,7 -7663,7 +7676,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:422
++#: apt_preferences.5.xml:427
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -7675,12 -7675,12 +7688,12 @@@ msgstr "
  "Pin: release 3.0\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:431
++#: apt_preferences.5.xml:436
  msgid "the <literal>Component:</literal> line"
  msgstr "linia <literal>Component:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:432
++#: apt_preferences.5.xml:437
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -7691,18 -7691,18 +7704,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:441
++#: apt_preferences.5.xml:446
  #, no-wrap
  msgid "Pin: release c=main\n"
  msgstr "Pin: release c=main\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:447
++#: apt_preferences.5.xml:452
  msgid "the <literal>Origin:</literal> line"
  msgstr "linia <literal>Origin:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:448
++#: apt_preferences.5.xml:453
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -7711,18 -7711,18 +7724,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:454
++#: apt_preferences.5.xml:459
  #, no-wrap
  msgid "Pin: release o=Debian\n"
  msgstr "Pin: release o=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:460
++#: apt_preferences.5.xml:465
  msgid "the <literal>Label:</literal> line"
  msgstr "linia <literal>Label:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:461
++#: apt_preferences.5.xml:466
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -7731,13 -7731,13 +7744,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:467
++#: apt_preferences.5.xml:472
  #, no-wrap
  msgid "Pin: release l=Debian\n"
  msgstr "Pin: release l=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:368
++#: apt_preferences.5.xml:373
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -7751,7 -7751,7 +7764,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:474
++#: apt_preferences.5.xml:479
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -7766,12 -7766,12 +7779,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:487
++#: apt_preferences.5.xml:492
  msgid "Optional Lines in an APT Preferences Record"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:489
++#: apt_preferences.5.xml:494
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -7779,12 -7779,12 +7792,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:498
++#: apt_preferences.5.xml:503
  msgid "Tracking Stable"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:506
++#: apt_preferences.5.xml:511
  #, fuzzy, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -7808,7 -7808,7 +7821,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:500
++#: apt_preferences.5.xml:505
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -7818,8 -7818,8 +7831,8 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
--#: apt_preferences.5.xml:627
++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
++#: apt_preferences.5.xml:632
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -7831,7 -7831,7 +7844,7 @@@ msgstr "
  "apt-get dist-upgrade\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:518
++#: apt_preferences.5.xml:523
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -7840,13 -7840,13 +7853,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:535
++#: apt_preferences.5.xml:540
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/testing\n"
  msgstr "apt-get install <replaceable>pakiet</replaceable>/testing\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:529
++#: apt_preferences.5.xml:534
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -7855,12 -7855,12 +7868,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:541
++#: apt_preferences.5.xml:546
  msgid "Tracking Testing or Unstable"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:550
++#: apt_preferences.5.xml:555
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -7888,7 -7888,7 +7901,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:543
++#: apt_preferences.5.xml:548
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -7899,7 -7899,7 +7912,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:564
++#: apt_preferences.5.xml:569
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -7908,13 -7908,13 +7921,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:584
++#: apt_preferences.5.xml:589
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
  msgstr "apt-get install <replaceable>pakiet</replaceable>/unstable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:575
++#: apt_preferences.5.xml:580
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -7926,12 -7926,12 +7939,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:591
++#: apt_preferences.5.xml:596
  msgid "Tracking the evolution of a codename release"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:605
++#: apt_preferences.5.xml:610
  #, fuzzy, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -7965,7 -7965,7 +7978,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:593
++#: apt_preferences.5.xml:598
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -7980,7 -7980,7 +7993,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:622
++#: apt_preferences.5.xml:627
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest version(s) in "
@@@ -7989,13 -7989,13 +8002,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:642
++#: apt_preferences.5.xml:647
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/sid\n"
  msgstr "apt-get install <replaceable>pakiet</replaceable>/sid\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:633
++#: apt_preferences.5.xml:638
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -8007,12 -8007,12 +8020,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
--#: apt_preferences.5.xml:651
++#: apt_preferences.5.xml:656
  msgid "&file-preferences;"
  msgstr "&file-preferences;"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt_preferences.5.xml:657
++#: apt_preferences.5.xml:662
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
@@@ -10054,6 -10054,6 +10067,9 @@@ msgstr "  # apt-get -o dir::cache::arch
  msgid "Which will use the already fetched archives on the disc."
  msgstr "Które użyje pobranych uprzednio archiwów z dysku."
  
++#~ msgid "<option>--md5</option>"
++#~ msgstr "<option>--md5</option>"
++
  #
  #~ msgid "APT package handling utility -- cache manipulator"
  #~ msgstr "Narzędzie zarządzania pakietami APT -- manipulator bufora"
@@@ -10085,8 -10085,8 +10101,12 @@@
  #~ "Użycie HTTP do uzyskania dostępu do archiwum na komputerze  nonus.debian."
  #~ "org, w katalogu debian-non-US."
  
--#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
--#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
++#~ msgid ""
++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
++#~ "free"
++#~ msgstr ""
++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
++#~ "free"
  
  #~ msgid "OPTIONS"
  #~ msgstr "OPCJE"
diff --combined doc/po/pt.po
index ca1252475,ca1252475..93d7ad3af
--- 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-02-14 13:42+0100\n"
++"POT-Creation-Date: 2011-04-05 10:22+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:568 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:542 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:542 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>"
  
@@@ -1451,7 -1451,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:580
++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
  msgid "<option>-a</option>"
  msgstr "<option>-a</option>"
  
@@@ -1568,14 -1568,14 +1568,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:608 apt-get.8.xml:570
++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
  #: 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:575 apt-key.8.xml:156 apt-mark.8.xml:125
--#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
  msgid "Files"
  msgstr "Ficheiros"
  
@@@ -1586,9 -1586,9 +1586,9 @@@ 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:624 apt-get.8.xml:585
++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
  #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
--#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
  #: sources.list.5.xml:234
  msgid "See Also"
  msgstr "Veja também"
@@@ -1600,7 -1600,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:628 apt-get.8.xml:591
++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
  #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
  msgid "Diagnostics"
  msgstr "Diagnóstico"
@@@ -1735,7 -1735,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:536 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 -1988,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:625
++#: 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;"
@@@ -3131,27 -3131,27 +3131,49 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-ftparchive.1.xml:529
--msgid "<option>--md5</option>"
--msgstr "<option>--md5</option>"
++msgid ""
++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
++msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:531
--msgid ""
--"Generate MD5 sums. This defaults to on, when turned off the generated index "
--"files will not have MD5Sum fields where possible.  Configuration Item: "
--"<literal>APT::FTPArchive::MD5</literal>"
++#, 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>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 ""
--"Gera sumários MD5. A predefinição é ligado, quando desligado os ficheiros "
--"índice gerados não terão campos MD5Sum onde possíveis. Item de Configuração: "
--"<literal>APT::FTPArchive::MD5</literal>"
++"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:536
++#: 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:538
++#: 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>."
@@@ -3160,7 -3160,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:544
++#: 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 "
@@@ -3174,12 -3174,12 +3196,12 @@@ msgstr "
  "<literal>quiet</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:550
++#: 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:552
++#: 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 "
@@@ -3192,12 -3192,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:558
++#: 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:560
++#: 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 "
@@@ -3213,12 -3213,12 +3235,12 @@@ msgstr "
  "de Configuração: <literal>APT::FTPArchive::Contents</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:568
++#: 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:570
++#: 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</"
@@@ -3229,12 -3229,12 +3251,12 @@@ msgstr "
  "SourceOverride</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:574
++#: 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:576
++#: apt-ftparchive.1.xml:579
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3243,12 -3243,12 +3265,12 @@@ msgstr "
  "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:580
++#: 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:581
++#: 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 "
@@@ -3262,12 -3262,12 +3284,12 @@@ msgstr "
  "FTPArchive::Architecture</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:587
++#: 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:589
++#: 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 "
@@@ -3291,12 -3291,12 +3313,12 @@@ msgstr "
  "as verificações extras serão desnecessárias."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:599
++#: 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:601
++#: 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 "
@@@ -3311,19 -3311,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:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
  #: sources.list.5.xml:198
  msgid "Examples"
  msgstr "Examples"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
--#: apt-ftparchive.1.xml:619
++#: 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:615
++#: apt-ftparchive.1.xml:618
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3332,7 -3332,7 +3354,7 @@@ msgstr "
  "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-ftparchive.1.xml:629
++#: apt-ftparchive.1.xml:632
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -7787,32 -7787,32 +7809,50 @@@ msgstr "priority 1
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:107
++#, fuzzy
++#| msgid ""
++#| "to the versions coming from archives which in their <filename>Release</"
++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
++#| "experimental archive."
  msgid ""
  "to the versions coming from archives which in their <filename>Release</"
--"filename> files are marked as \"NotAutomatic: yes\" like the debian "
--"experimental archive."
++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
++"<literal>experimental</literal> archive."
  msgstr ""
  "para as versões vindas de arquivos cujos ficheiros <filename>Release</"
  "filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo "
  "experimental da debian."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:112
++#: apt_preferences.5.xml:113
  msgid "priority 100"
  msgstr "priority 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:113
--msgid "to the version that is already installed (if any)."
--msgstr "para a versão que já está instalada (se alguma)."
++#: apt_preferences.5.xml:114
++#, fuzzy
++#| msgid ""
++#| "to the versions coming from archives which in their <filename>Release</"
++#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
++#| "experimental archive."
++msgid ""
++"to the version that is already installed (if any) and to the versions coming "
++"from archives which in their <filename>Release</filename> files are marked "
++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
++"backports archive since <literal>squeeze-backports</literal>."
++msgstr ""
++"para as versões vindas de arquivos cujos ficheiros <filename>Release</"
++"filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo "
++"experimental da debian."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:117
++#: apt_preferences.5.xml:121
  msgid "priority 500"
  msgstr "priority 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:118
++#: apt_preferences.5.xml:122
  msgid ""
  "to the versions that are not installed and do not belong to the target "
  "release."
@@@ -7821,12 -7821,12 +7861,12 @@@ msgstr "
  "destinado."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:122
++#: apt_preferences.5.xml:126
  msgid "priority 990"
  msgstr "priority 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:123
++#: apt_preferences.5.xml:127
  msgid ""
  "to the versions that are not installed and belong to the target release."
  msgstr ""
@@@ -7844,13 -7844,13 +7884,21 @@@ msgstr "
  "<placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:128
++#: apt_preferences.5.xml:132
++#, fuzzy
++#| msgid ""
++#| "If the target release has not been specified then APT simply assigns "
++#| "priority 100 to all installed package versions and priority 500 to all "
++#| "uninstalled package versions, expect versions coming from archives which "
++#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: "
++#| "yes\" - these versions get the priority 1."
  msgid ""
  "If the target release has not been specified then APT simply assigns "
  "priority 100 to all installed package versions and priority 500 to all "
--"uninstalled package versions, expect versions coming from archives which in "
++"uninstalled package versions, except versions coming from archives which in "
  "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
--"- these versions get the priority 1."
++"- these versions get the priority 1 or priority 100 if it is additionally "
++"marked as \"ButAutomaticUpgrades: yes\"."
  msgstr ""
  "Se o lançamento de destino não foi especificado, então o APT simplesmente "
  "atribui prioridade 100 a todas as versões de pacotes instalados e prioridade "
@@@ -7859,7 -7859,7 +7907,7 @@@
  "marcados como \"NotAutomatic: yes\" - estas versões ficam com prioridade 1."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:134
++#: apt_preferences.5.xml:139
  msgid ""
  "APT then applies the following rules, listed in order of precedence, to "
  "determine which version of a package to install."
@@@ -7868,7 -7868,7 +7916,7 @@@ msgstr "
  "para determinar qual versão de um pacote deve instalar."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:137
++#: apt_preferences.5.xml:142
  msgid ""
  "Never downgrade unless the priority of an available version exceeds 1000.  "
  "(\"Downgrading\" is installing a less recent version of a package in place "
@@@ -7884,12 -7884,12 +7932,12 @@@ msgstr "
  "arriscado.)"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:143
++#: apt_preferences.5.xml:148
  msgid "Install the highest priority version."
  msgstr "Instala a versão de prioridade mais alta."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:144
++#: apt_preferences.5.xml:149
  msgid ""
  "If two or more versions have the same priority, install the most recent one "
  "(that is, the one with the higher version number)."
@@@ -7898,7 -7898,7 +7946,7 @@@ msgstr "
  "(isto é, aquela com o número de versão mais alto)."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:147
++#: apt_preferences.5.xml:152
  msgid ""
  "If two or more versions have the same priority and version number but either "
  "the packages differ in some of their metadata or the <literal>--reinstall</"
@@@ -7909,7 -7909,7 +7957,7 @@@ msgstr "
  "reinstall</literal> é fornecida, instala a que foi desinstalada."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:153
++#: apt_preferences.5.xml:158
  msgid ""
  "In a typical situation, the installed version of a package (priority 100)  "
  "is not as recent as one of the versions available from the sources listed in "
@@@ -7924,7 -7924,7 +7972,7 @@@ msgstr "
  "replaceable></command> ou <command>apt-get upgrade</command>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:160
++#: apt_preferences.5.xml:165
  msgid ""
  "More rarely, the installed version of a package is <emphasis>more</emphasis> "
  "recent than any of the other available versions.  The package will not be "
@@@ -7938,7 -7938,7 +7986,7 @@@ msgstr "
  "get upgrade</command>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:165
++#: apt_preferences.5.xml:170
  msgid ""
  "Sometimes the installed version of a package is more recent than the version "
  "belonging to the target release, but not as recent as a version belonging to "
@@@ -7957,12 -7957,12 +8005,12 @@@ msgstr "
  "prioridade mais alta que a versão instalada."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:174
++#: apt_preferences.5.xml:179
  msgid "The Effect of APT Preferences"
  msgstr "O Efeito das Preferências do APT"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:176
++#: apt_preferences.5.xml:181
  msgid ""
  "The APT preferences file allows the system administrator to control the "
  "assignment of priorities.  The file consists of one or more multi-line "
@@@ -7975,7 -7975,7 +8023,7 @@@ msgstr "
  "um ou dois formatos, um formato específico e um formato geral."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:182
++#: apt_preferences.5.xml:187
  msgid ""
  "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
  "specified packages and specified version or version range.  For example, the "
@@@ -7991,7 -7991,7 +8039,7 @@@ msgstr "
  "espaços."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:189
++#: apt_preferences.5.xml:194
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8003,7 -8003,7 +8051,7 @@@ msgstr "
  "Pin-Priority: 1001\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:195
++#: apt_preferences.5.xml:200
  msgid ""
  "The general form assigns a priority to all of the package versions in a "
  "given distribution (that is, to all the versions of packages that are listed "
@@@ -8018,7 -8018,7 +8066,7 @@@ msgstr "
  "nome de domínio totalmente qualificado do site."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:201
++#: apt_preferences.5.xml:206
  msgid ""
  "This general-form entry in the APT preferences file applies only to groups "
  "of packages.  For example, the following record assigns a high priority to "
@@@ -8030,7 -8030,7 +8078,7 @@@ msgstr "
  "local."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:206
++#: apt_preferences.5.xml:211
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8042,7 -8042,7 +8090,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:211
++#: apt_preferences.5.xml:216
  msgid ""
  "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
  "which can be used to match a hostname. The following record will assign a "
@@@ -8055,7 -8055,7 +8103,7 @@@ msgstr "
  "servidor identificadas pelo nome de máquina \"ftp.de.debian.org\""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:215
++#: apt_preferences.5.xml:220
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8067,7 -8067,7 +8115,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:219
++#: apt_preferences.5.xml:224
  msgid ""
  "This should <emphasis>not</emphasis> be confused with the Origin of a "
  "distribution as specified in a <filename>Release</filename> file.  What "
@@@ -8082,7 -8082,7 +8130,7 @@@ msgstr "
  "como \"Debian\" ou \"Ximian\"."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:224
++#: apt_preferences.5.xml:229
  msgid ""
  "The following record assigns a low priority to all package versions "
  "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@@ -8093,7 -8093,7 +8141,7 @@@ msgstr "
  "\"<literal>unstable</literal>\"."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:228
++#: apt_preferences.5.xml:233
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8105,7 -8105,7 +8153,7 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:233
++#: apt_preferences.5.xml:238
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@@ -8116,7 -8116,7 +8164,7 @@@ msgstr "
  "\"<literal>&testing-codename;</literal>\"."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:237
++#: apt_preferences.5.xml:242
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8128,7 -8128,7 +8176,7 @@@ msgstr "
  "Pin-Priority: 900\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:242
++#: apt_preferences.5.xml:247
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@@ -8140,7 -8140,7 +8188,7 @@@ msgstr "
  "\"."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:247
++#: apt_preferences.5.xml:252
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8152,17 -8152,17 +8200,17 @@@ msgstr "
  "Pin-Priority: 500\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:258
++#: apt_preferences.5.xml:263
  msgid "How APT Interprets Priorities"
  msgstr "Como o APT Interpreta as Prioridades"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:266
++#: apt_preferences.5.xml:271
  msgid "P &gt; 1000"
  msgstr "P &gt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:267
++#: apt_preferences.5.xml:272
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
  "package"
@@@ -8171,12 -8171,12 +8219,12 @@@ msgstr "
  "na versão do pacote (downgrade)"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:271
++#: apt_preferences.5.xml:276
  msgid "990 &lt; P &lt;=1000"
  msgstr "990 &lt; P &lt;=1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:272
++#: apt_preferences.5.xml:277
  msgid ""
  "causes a version to be installed even if it does not come from the target "
  "release, unless the installed version is more recent"
@@@ -8185,12 -8185,12 +8233,12 @@@ msgstr "
  "destino, a menos que a versão instalada seja mais recente"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:277
++#: apt_preferences.5.xml:282
  msgid "500 &lt; P &lt;=990"
  msgstr "500 &lt; P &lt;=990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:278
++#: apt_preferences.5.xml:283
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to the target release or the installed version is more recent"
@@@ -8200,12 -8200,12 +8248,12 @@@ msgstr "
  "mais recente"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:283
++#: apt_preferences.5.xml:288
  msgid "100 &lt; P &lt;=500"
  msgstr "100 &lt; P &lt;=500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:284
++#: apt_preferences.5.xml:289
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to some other distribution or the installed version is more recent"
@@@ -8215,12 -8215,12 +8263,12 @@@ msgstr "
  "recente"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:289
++#: apt_preferences.5.xml:294
  msgid "0 &lt; P &lt;=100"
  msgstr "0 &lt; P &lt;=100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:290
++#: apt_preferences.5.xml:295
  msgid ""
  "causes a version to be installed only if there is no installed version of "
  "the package"
@@@ -8229,17 -8229,17 +8277,17 @@@ msgstr "
  "instalada do pacote"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:294
++#: apt_preferences.5.xml:299
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:295
++#: apt_preferences.5.xml:300
  msgid "prevents the version from being installed"
  msgstr "previne a instalação da versão"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:261
++#: apt_preferences.5.xml:266
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -8250,7 -8250,7 +8298,7 @@@ msgstr "
  "(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:300
++#: apt_preferences.5.xml:305
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -8264,7 -8264,7 +8312,7 @@@ msgstr "
  "determina a prioridade da versão de pacote."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:306
++#: apt_preferences.5.xml:311
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
  "presented earlier:"
@@@ -8273,7 -8273,7 +8321,7 @@@ msgstr "
  "registos apresentados atrás:"
  
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
--#: apt_preferences.5.xml:310
++#: apt_preferences.5.xml:315
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8301,12 -8301,12 +8349,12 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:323
++#: apt_preferences.5.xml:328
  msgid "Then:"
  msgstr "Então:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:325
++#: apt_preferences.5.xml:330
  msgid ""
  "The most recent available version of the <literal>perl</literal> package "
  "will be installed, so long as that version's version number begins with "
@@@ -8321,7 -8321,7 +8369,7 @@@ msgstr "
  "downgrade ao <literal>perl</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:330
++#: apt_preferences.5.xml:335
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -8332,7 -8332,7 +8380,7 @@@ msgstr "
  "versões, mesmo versões que pertencem ao lançamento de destino."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:334
++#: apt_preferences.5.xml:339
  msgid ""
  "A version of a package whose origin is not the local system but some other "
  "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@@ -8345,12 -8345,12 +8393,12 @@@ msgstr "
  "instalação e se nenhuma versão do pacote já estiver instalada."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:344
++#: apt_preferences.5.xml:349
  msgid "Determination of Package Version and Distribution Properties"
  msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:346
++#: apt_preferences.5.xml:351
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -8361,27 -8361,27 +8409,27 @@@ msgstr "
  "descrever os pacotes disponíveis nessa localização."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:358
++#: apt_preferences.5.xml:363
  msgid "the <literal>Package:</literal> line"
  msgstr "a linha <literal>Package:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:359
++#: apt_preferences.5.xml:364
  msgid "gives the package name"
  msgstr "fornece o nome do pacote"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
  msgid "the <literal>Version:</literal> line"
  msgstr "a linha <literal>Version:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:363
++#: apt_preferences.5.xml:368
  msgid "gives the version number for the named package"
  msgstr "fornece o número de versão do pacote nomeado"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:350
++#: apt_preferences.5.xml:355
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -8402,12 -8402,12 +8450,12 @@@ msgstr "
  "definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:379
++#: apt_preferences.5.xml:384
  msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
  msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:380
++#: apt_preferences.5.xml:385
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -8424,18 -8424,18 +8472,18 @@@ msgstr "
  "requerer a linha:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:390
++#: apt_preferences.5.xml:395
  #, no-wrap
  msgid "Pin: release a=stable\n"
  msgstr "Pin: release a=stable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:396
++#: apt_preferences.5.xml:401
  msgid "the <literal>Codename:</literal> line"
  msgstr "a linha <literal>Codename:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:397
++#: apt_preferences.5.xml:402
  msgid ""
  "names the codename to which all the packages in the directory tree belong.  "
  "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@@ -8452,13 -8452,13 +8500,13 @@@ msgstr "
  "preferências do APT requer a linha:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:406
++#: apt_preferences.5.xml:411
  #, no-wrap
  msgid "Pin: release n=&testing-codename;\n"
  msgstr "Pin: release n=&testing-codename;\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:413
++#: apt_preferences.5.xml:418
  msgid ""
  "names the release version.  For example, the packages in the tree might "
  "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@@ -8474,7 -8474,7 +8522,7 @@@ msgstr "
  "seguintes linhas:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:422
++#: apt_preferences.5.xml:427
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -8486,12 -8486,12 +8534,12 @@@ msgstr "
  "Pin: release 3.0\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:431
++#: apt_preferences.5.xml:436
  msgid "the <literal>Component:</literal> line"
  msgstr "a linha <literal>Component:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:432
++#: apt_preferences.5.xml:437
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -8509,18 -8509,18 +8557,18 @@@ msgstr "
  "a linha:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:441
++#: apt_preferences.5.xml:446
  #, no-wrap
  msgid "Pin: release c=main\n"
  msgstr "Pin: release c=main\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:447
++#: apt_preferences.5.xml:452
  msgid "the <literal>Origin:</literal> line"
  msgstr "a linha <literal>Origin:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:448
++#: apt_preferences.5.xml:453
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8533,18 -8533,18 +8581,18 @@@ msgstr "
  "linha:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:454
++#: apt_preferences.5.xml:459
  #, no-wrap
  msgid "Pin: release o=Debian\n"
  msgstr "Pin: release o=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:460
++#: apt_preferences.5.xml:465
  msgid "the <literal>Label:</literal> line"
  msgstr "a linha <literal>Label:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:461
++#: apt_preferences.5.xml:466
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8557,13 -8557,13 +8605,13 @@@ msgstr "
  "linha:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:467
++#: apt_preferences.5.xml:472
  #, no-wrap
  msgid "Pin: release l=Debian\n"
  msgstr "Pin: release l=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:368
++#: apt_preferences.5.xml:373
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -8586,7 -8586,7 +8634,7 @@@ msgstr "
  "APT: <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:474
++#: apt_preferences.5.xml:479
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -8611,12 -8611,12 +8659,12 @@@ msgstr "
  "literal> da distribuição <literal>unstable</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:487
++#: apt_preferences.5.xml:492
  msgid "Optional Lines in an APT Preferences Record"
  msgstr "Linhas Opcionais num Registo de Preferências do APT"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:489
++#: apt_preferences.5.xml:494
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -8627,12 -8627,12 +8675,12 @@@ msgstr "
  "literal>. Isto disponibiliza um espaço para comentários."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:498
++#: apt_preferences.5.xml:503
  msgid "Tracking Stable"
  msgstr "Acompanhando Stable"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:506
++#: apt_preferences.5.xml:511
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -8656,7 -8656,7 +8704,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:500
++#: apt_preferences.5.xml:505
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -8672,8 -8672,8 +8720,8 @@@ msgstr "
  "\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
--#: apt_preferences.5.xml:627
++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
++#: apt_preferences.5.xml:632
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -8685,7 -8685,7 +8733,7 @@@ msgstr "
  "apt-get dist-upgrade\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:518
++#: apt_preferences.5.xml:523
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -8698,13 -8698,13 +8746,13 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:535
++#: apt_preferences.5.xml:540
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/testing\n"
  msgstr "apt-get install <replaceable>pacote</replaceable>/testing\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:529
++#: apt_preferences.5.xml:534
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -8717,12 -8717,12 +8765,12 @@@ msgstr "
  "outra vez. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:541
++#: apt_preferences.5.xml:546
  msgid "Tracking Testing or Unstable"
  msgstr "Acompanhando Testing ou Unstable"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:550
++#: apt_preferences.5.xml:555
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8750,7 -8750,7 +8798,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:543
++#: apt_preferences.5.xml:548
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -8767,7 -8767,7 +8815,7 @@@ msgstr "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:564
++#: apt_preferences.5.xml:569
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -8780,13 -8780,13 +8828,13 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:584
++#: apt_preferences.5.xml:589
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
  msgstr "apt-get install <replaceable>pacote</replaceable>/unstable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:575
++#: apt_preferences.5.xml:580
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -8805,12 -8805,12 +8853,12 @@@ msgstr "
  "versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:591
++#: apt_preferences.5.xml:596
  msgid "Tracking the evolution of a codename release"
  msgstr "Acompanhando a evolução de um nome de código de lançamento"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:605
++#: apt_preferences.5.xml:610
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -8844,7 -8844,7 +8892,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:593
++#: apt_preferences.5.xml:598
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -8870,7 -8870,7 +8918,7 @@@ msgstr "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:622
++#: apt_preferences.5.xml:627
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest version(s) in "
@@@ -8883,13 -8883,13 +8931,13 @@@ msgstr "
  "codename;</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:642
++#: apt_preferences.5.xml:647
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/sid\n"
  msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:633
++#: apt_preferences.5.xml:638
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -8908,12 -8908,12 +8956,12 @@@ msgstr "
  "instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><variablelist>
--#: apt_preferences.5.xml:651
++#: apt_preferences.5.xml:656
  msgid "&file-preferences;"
  msgstr "&file-preferences;"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt_preferences.5.xml:657
++#: apt_preferences.5.xml:662
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
@@@ -10930,6 -10930,6 +10978,21 @@@ msgstr "  # apt-get -o dir::cache::arch
  msgid "Which will use the already fetched archives on the disc."
  msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
  
++#~ msgid "<option>--md5</option>"
++#~ msgstr "<option>--md5</option>"
++
++#~ msgid ""
++#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
++#~ "index files will not have MD5Sum fields where possible.  Configuration "
++#~ "Item: <literal>APT::FTPArchive::MD5</literal>"
++#~ msgstr ""
++#~ "Gera sumários MD5. A predefinição é ligado, quando desligado os ficheiros "
++#~ "índice gerados não terão campos MD5Sum onde possíveis. Item de "
++#~ "Configuração: <literal>APT::FTPArchive::MD5</literal>"
++
++#~ msgid "to the version that is already installed (if any)."
++#~ msgstr "para a versão que já está instalada (se alguma)."
++
  #~ msgid "APT package handling utility -- cache manipulator"
  #~ msgstr ""
  #~ "Utilitário de manuseamento de pacotes do APT -- manipulador de cache"
@@@ -10989,8 -10989,8 +11052,12 @@@
  #~ "Usa HTTP para aceder ao arquivo em nonus.debian.org, sob o directório "
  #~ "debian-non-US."
  
--#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
--#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
++#~ msgid ""
++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
++#~ "free"
++#~ msgstr ""
++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
++#~ "free"
  
  #~ msgid "OPTIONS"
  #~ msgstr "OPÇÕES"
diff --combined doc/po/pt_BR.po
index 0b98064b9,0b98064b9..ebf4bd68e
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@@ -9,7 -9,7 +9,7 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: apt\n"
--"POT-Creation-Date: 2011-02-14 13:42+0100\n"
++"POT-Creation-Date: 2011-04-05 10:22+0300\n"
  "PO-Revision-Date: 2004-09-20 17:02+0000\n"
  "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
  "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@@ -984,7 -984,7 +984,7 @@@ msgid "
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 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 ""
@@@ -1005,12 -1005,12 +1005,12 @@@ msgid "
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 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 ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 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 ""
  
@@@ -1109,7 -1109,7 +1109,7 @@@ msgid "
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580
++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
  msgid "<option>-a</option>"
  msgstr ""
  
@@@ -1205,14 -1205,14 +1205,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:608 apt-get.8.xml:570
++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
  #: apt-sortpkgs.1.xml:67
  msgid "&apt-commonoptions;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
--#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
++#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
  msgid "Files"
  msgstr ""
  
@@@ -1223,9 -1223,9 +1223,9 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
--#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585
++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
  #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
--#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
  #: sources.list.5.xml:234
  #, fuzzy
  msgid "See Also"
@@@ -1238,7 -1238,7 +1238,7 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
--#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591
++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
  #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
  msgid "Diagnostics"
  msgstr ""
@@@ -1343,7 -1343,7 +1343,7 @@@ msgid "Options
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 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 ""
  
@@@ -1548,7 -1548,7 +1548,7 @@@ msgid "Just show the contents of the co
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625
++#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
  #: apt-sortpkgs.1.xml:73
  #, fuzzy
  msgid "&apt-conf;"
@@@ -2466,31 -2466,31 +2466,38 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-ftparchive.1.xml:529
--msgid "<option>--md5</option>"
++msgid ""
++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:531
  msgid ""
--"Generate MD5 sums. This defaults to on, when turned off the generated index "
--"files will not have MD5Sum fields where possible.  Configuration Item: "
--"<literal>APT::FTPArchive::MD5</literal>"
++"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>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 ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:536
++#: apt-ftparchive.1.xml:539
  msgid "<option>--db</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:538
++#: 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>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:544
++#: 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 "
@@@ -2499,12 -2499,12 +2506,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:550
++#: apt-ftparchive.1.xml:553
  msgid "<option>--delink</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:552
++#: 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 "
@@@ -2513,12 -2513,12 +2520,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:558
++#: apt-ftparchive.1.xml:561
  msgid "<option>--contents</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:560
++#: 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 "
@@@ -2528,12 -2528,12 +2535,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:568
++#: apt-ftparchive.1.xml:571
  msgid "<option>--source-override</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:570
++#: 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</"
@@@ -2541,24 -2541,24 +2548,24 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:574
++#: apt-ftparchive.1.xml:577
  msgid "<option>--readonly</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:576
++#: apt-ftparchive.1.xml:579
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:580
++#: apt-ftparchive.1.xml:583
  msgid "<option>--arch</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:581
++#: 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 "
@@@ -2567,12 -2567,12 +2574,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:587
++#: apt-ftparchive.1.xml:590
  msgid "<option>APT::FTPArchive::AlwaysStat</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:589
++#: 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 "
@@@ -2586,12 -2586,12 +2593,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:599
++#: apt-ftparchive.1.xml:602
  msgid "<option>APT::FTPArchive::LongDescription</option>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:601
++#: 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 "
@@@ -2601,27 -2601,27 +2608,27 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
--#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
  #: sources.list.5.xml:198
  #, fuzzy
  msgid "Examples"
  msgstr "Exemplos"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
--#: apt-ftparchive.1.xml:619
++#: 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 ""
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-ftparchive.1.xml:615
++#: apt-ftparchive.1.xml:618
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-ftparchive.1.xml:629
++#: apt-ftparchive.1.xml:632
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -5950,30 -5950,30 +5957,34 @@@ msgstr "prioridade 100
  #: apt_preferences.5.xml:107
  msgid ""
  "to the versions coming from archives which in their <filename>Release</"
--"filename> files are marked as \"NotAutomatic: yes\" like the debian "
--"experimental archive."
++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
++"<literal>experimental</literal> archive."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:112
++#: apt_preferences.5.xml:113
  #, fuzzy
  msgid "priority 100"
  msgstr "prioridade 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:113
--#, fuzzy
--msgid "to the version that is already installed (if any)."
--msgstr "para a instância que já esteja instalada (caso exista)."
++#: apt_preferences.5.xml:114
++msgid ""
++"to the version that is already installed (if any) and to the versions coming "
++"from archives which in their <filename>Release</filename> files are marked "
++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
++"backports archive since <literal>squeeze-backports</literal>."
++msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:117
++#: apt_preferences.5.xml:121
  #, fuzzy
  msgid "priority 500"
  msgstr "prioridade 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:118
++#: apt_preferences.5.xml:122
  #, fuzzy
  msgid ""
  "to the versions that are not installed and do not belong to the target "
@@@ -5982,13 -5982,13 +5993,13 @@@ msgstr "
  "para as instâncias que não estã instaladas e que não pertencem a versão alvo."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:122
++#: apt_preferences.5.xml:126
  #, fuzzy
  msgid "priority 990"
  msgstr "prioridade 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:123
++#: apt_preferences.5.xml:127
  #, fuzzy
  msgid ""
  "to the versions that are not installed and belong to the target release."
@@@ -6008,21 -6008,21 +6019,22 @@@ msgstr "
  "Atribuirá :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:128
++#: apt_preferences.5.xml:132
  #, fuzzy
  msgid ""
  "If the target release has not been specified then APT simply assigns "
  "priority 100 to all installed package versions and priority 500 to all "
--"uninstalled package versions, expect versions coming from archives which in "
++"uninstalled package versions, except versions coming from archives which in "
  "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
--"- these versions get the priority 1."
++"- these versions get the priority 1 or priority 100 if it is additionally "
++"marked as \"ButAutomaticUpgrades: yes\"."
  msgstr ""
  "Caso nenhuma versão alvo tenha sido especificada, o APT simplesmente irá "
  "atribuir a prioridade 100 para todas as instâncias de pacotes instaladas e a "
  "prioridade 500 para todas as instâncias de pacotes não instaladas."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:134
++#: apt_preferences.5.xml:139
  #, fuzzy
  msgid ""
  "APT then applies the following rules, listed in order of precedence, to "
@@@ -6032,7 -6032,7 +6044,7 @@@ msgstr "
  "determinar qual instância de um pacote instalar."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:137
++#: apt_preferences.5.xml:142
  #, fuzzy
  msgid ""
  "Never downgrade unless the priority of an available version exceeds 1000.  "
@@@ -6049,13 -6049,13 +6061,13 @@@ msgstr "
  "\"downgrade\" pode ser arriscado.)"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:143
++#: apt_preferences.5.xml:148
  #, fuzzy
  msgid "Install the highest priority version."
  msgstr "Instala a instância de prioridade mais alta."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:144
++#: apt_preferences.5.xml:149
  #, fuzzy
  msgid ""
  "If two or more versions have the same priority, install the most recent one "
@@@ -6065,7 -6065,7 +6077,7 @@@ msgstr "
  "mais recente (ou seja, aquela com o maior número de versão)."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:147
++#: apt_preferences.5.xml:152
  #, fuzzy
  msgid ""
  "If two or more versions have the same priority and version number but either "
@@@ -6077,7 -6077,7 +6089,7 @@@ msgstr "
  "<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:153
++#: apt_preferences.5.xml:158
  #, fuzzy
  msgid ""
  "In a typical situation, the installed version of a package (priority 100)  "
@@@ -6094,7 -6094,7 +6106,7 @@@ msgstr "
  "forem executados."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:160
++#: apt_preferences.5.xml:165
  #, fuzzy
  msgid ""
  "More rarely, the installed version of a package is <emphasis>more</emphasis> "
@@@ -6109,7 -6109,7 +6121,7 @@@ msgstr "
  "upgrade</command> forem executados."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:165
++#: apt_preferences.5.xml:170
  #, fuzzy
  msgid ""
  "Sometimes the installed version of a package is more recent than the version "
@@@ -6129,13 -6129,13 +6141,13 @@@ msgstr "
  "disponíveis possuir uma prioridade maior do que a versão instalada."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:174
++#: apt_preferences.5.xml:179
  #, fuzzy
  msgid "The Effect of APT Preferences"
  msgstr "O Efeito das Preferências do APT"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:176
++#: apt_preferences.5.xml:181
  #, fuzzy
  msgid ""
  "The APT preferences file allows the system administrator to control the "
@@@ -6149,7 -6149,7 +6161,7 @@@ msgstr "
  "das duas formas, uma forma específica e uma forma geral."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:182
++#: apt_preferences.5.xml:187
  #, fuzzy
  msgid ""
  "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
@@@ -6165,7 -6165,7 +6177,7 @@@ msgstr "
  "com \"<literal>5.8</literal>\"."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:189
++#: apt_preferences.5.xml:194
  #, fuzzy, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -6178,7 -6178,7 +6190,7 @@@ msgstr "
  "Pin-Priority: 1001\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:195
++#: apt_preferences.5.xml:200
  #, fuzzy
  msgid ""
  "The general form assigns a priority to all of the package versions in a "
@@@ -6194,7 -6194,7 +6206,7 @@@ msgstr "
  "identificado pelo nome de domínio totalmente qualificado do site Internet."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:201
++#: apt_preferences.5.xml:206
  #, fuzzy
  msgid ""
  "This general-form entry in the APT preferences file applies only to groups "
@@@ -6207,7 -6207,7 +6219,7 @@@ msgstr "
  "no site local."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:206
++#: apt_preferences.5.xml:211
  #, fuzzy, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6220,7 -6220,7 +6232,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:211
++#: apt_preferences.5.xml:216
  msgid ""
  "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
  "which can be used to match a hostname. The following record will assign a "
@@@ -6229,7 -6229,7 +6241,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:215
++#: apt_preferences.5.xml:220
  #, fuzzy, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6242,7 -6242,7 +6254,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:219
++#: apt_preferences.5.xml:224
  #, fuzzy
  msgid ""
  "This should <emphasis>not</emphasis> be confused with the Origin of a "
@@@ -6259,7 -6259,7 +6271,7 @@@ msgstr "
  "como \"Debian\" ou \"Ximian\"."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:224
++#: apt_preferences.5.xml:229
  #, fuzzy
  msgid ""
  "The following record assigns a low priority to all package versions "
@@@ -6271,7 -6271,7 +6283,7 @@@ msgstr "
  "\"<literal>unstable</literal>\"."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:228
++#: apt_preferences.5.xml:233
  #, fuzzy, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6284,7 -6284,7 +6296,7 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:233
++#: apt_preferences.5.xml:238
  #, fuzzy
  msgid ""
  "The following record assigns a high priority to all package versions "
@@@ -6296,7 -6296,7 +6308,7 @@@ msgstr "
  "\"<literal>unstable</literal>\"."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:237
++#: apt_preferences.5.xml:242
  #, fuzzy, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6309,7 -6309,7 +6321,7 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:242
++#: apt_preferences.5.xml:247
  #, fuzzy
  msgid ""
  "The following record assigns a high priority to all package versions "
@@@ -6322,7 -6322,7 +6334,7 @@@ msgstr "
  "literal>\"."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:247
++#: apt_preferences.5.xml:252
  #, fuzzy, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6335,19 -6335,19 +6347,19 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:258
++#: apt_preferences.5.xml:263
  #, fuzzy
  msgid "How APT Interprets Priorities"
  msgstr "Como o APT Interpreta Prioridades"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:266
++#: apt_preferences.5.xml:271
  #, fuzzy
  msgid "P &gt; 1000"
  msgstr "P &gt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:267
++#: apt_preferences.5.xml:272
  #, fuzzy
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
@@@ -6357,13 -6357,13 +6369,13 @@@ msgstr "
  "dowgrade do pacote"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:271
++#: apt_preferences.5.xml:276
  #, fuzzy
  msgid "990 &lt; P &lt;=1000"
  msgstr "990 &lt; P &lt;=1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:272
++#: apt_preferences.5.xml:277
  #, fuzzy
  msgid ""
  "causes a version to be installed even if it does not come from the target "
@@@ -6373,13 -6373,13 +6385,13 @@@ msgstr "
  "versão alvo, a menos que a versão instalada seja mais recente"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:277
++#: apt_preferences.5.xml:282
  #, fuzzy
  msgid "500 &lt; P &lt;=990"
  msgstr "500 &lt; P &lt;=990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:278
++#: apt_preferences.5.xml:283
  #, fuzzy
  msgid ""
  "causes a version to be installed unless there is a version available "
@@@ -6389,13 -6389,13 +6401,13 @@@ msgstr "
  "disponível pertencente a versão alvo ou a versão instalada seja mais recente"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:283
++#: apt_preferences.5.xml:288
  #, fuzzy
  msgid "100 &lt; P &lt;=500"
  msgstr "100 &lt; P &lt;=500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:284
++#: apt_preferences.5.xml:289
  #, fuzzy
  msgid ""
  "causes a version to be installed unless there is a version available "
@@@ -6406,13 -6406,13 +6418,13 @@@ msgstr "
  "seja mais recente"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:289
++#: apt_preferences.5.xml:294
  #, fuzzy
  msgid "0 &lt; P &lt;=100"
  msgstr "0 &lt;= P &lt;=100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:290
++#: apt_preferences.5.xml:295
  #, fuzzy
  msgid ""
  "causes a version to be installed only if there is no installed version of "
@@@ -6422,19 -6422,19 +6434,19 @@@ msgstr "
  "instalada do pacote"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:294
++#: apt_preferences.5.xml:299
  #, fuzzy
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:295
++#: apt_preferences.5.xml:300
  #, fuzzy
  msgid "prevents the version from being installed"
  msgstr "impede a versão de ser instalada"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:261
++#: apt_preferences.5.xml:266
  #, fuzzy
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
@@@ -6446,7 -6446,7 +6458,7 @@@ msgstr "
  "seguir (a grosso modo):"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:300
++#: apt_preferences.5.xml:305
  #, fuzzy
  msgid ""
  "If any specific-form records match an available package version then the "
@@@ -6462,7 -6462,7 +6474,7 @@@ msgstr "
  "determinará a prioridade da versão do pacote."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:306
++#: apt_preferences.5.xml:311
  #, fuzzy
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
@@@ -6472,7 -6472,7 +6484,7 @@@ msgstr "
  "registros apresentados anteriormente :"
  
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
--#: apt_preferences.5.xml:310
++#: apt_preferences.5.xml:315
  #, fuzzy, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -6501,12 -6501,12 +6513,12 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:323
++#: apt_preferences.5.xml:328
  msgid "Then:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:325
++#: apt_preferences.5.xml:330
  #, fuzzy
  msgid ""
  "The most recent available version of the <literal>perl</literal> package "
@@@ -6522,7 -6522,7 +6534,7 @@@ msgstr "
  "será feito um downgrade do <literal>perl</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:330
++#: apt_preferences.5.xml:335
  #, fuzzy
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
@@@ -6534,7 -6534,7 +6546,7 @@@ msgstr "
  "mesmo versões pertencentes a versão alvo."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:334
++#: apt_preferences.5.xml:339
  #, fuzzy
  msgid ""
  "A version of a package whose origin is not the local system but some other "
@@@ -6549,13 -6549,13 +6561,13 @@@ msgstr "
  "instalada."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:344
++#: apt_preferences.5.xml:349
  #, fuzzy
  msgid "Determination of Package Version and Distribution Properties"
  msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:346
++#: apt_preferences.5.xml:351
  #, fuzzy
  msgid ""
  "The locations listed in the &sources-list; file should provide "
@@@ -6567,31 -6567,31 +6579,31 @@@ msgstr "
  "os pacotes disponíveis nessas localidades."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:358
++#: apt_preferences.5.xml:363
  #, fuzzy
  msgid "the <literal>Package:</literal> line"
  msgstr "a linha <literal>Package:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:359
++#: apt_preferences.5.xml:364
  #, fuzzy
  msgid "gives the package name"
  msgstr "informa o nome do pacote"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
++#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
  #, fuzzy
  msgid "the <literal>Version:</literal> line"
  msgstr "a linha <literal>Version:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:363
++#: apt_preferences.5.xml:368
  #, fuzzy
  msgid "gives the version number for the named package"
  msgstr "informa o número de versão do pacote"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:350
++#: apt_preferences.5.xml:355
  #, fuzzy
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
@@@ -6613,13 -6613,13 +6625,13 @@@ msgstr "
  "do APT :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:379
++#: apt_preferences.5.xml:384
  #, fuzzy
  msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
  msgstr "a linha <literal>Archive:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:380
++#: apt_preferences.5.xml:385
  #, fuzzy
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
@@@ -6637,7 -6637,7 +6649,7 @@@ msgstr "
  "requerer a linha :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:390
++#: apt_preferences.5.xml:395
  #, fuzzy, no-wrap
  msgid "Pin: release a=stable\n"
  msgstr ""
@@@ -6645,13 -6645,13 +6657,13 @@@
  "Pin: release a=stable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:396
++#: apt_preferences.5.xml:401
  #, fuzzy
  msgid "the <literal>Codename:</literal> line"
  msgstr "a linha <literal>Component:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:397
++#: apt_preferences.5.xml:402
  #, fuzzy
  msgid ""
  "names the codename to which all the packages in the directory tree belong.  "
@@@ -6669,7 -6669,7 +6681,7 @@@ msgstr "
  "requerer a linha :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:406
++#: apt_preferences.5.xml:411
  #, fuzzy, no-wrap
  msgid "Pin: release n=&testing-codename;\n"
  msgstr ""
@@@ -6677,7 -6677,7 +6689,7 @@@
  "Pin: release a=stable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:413
++#: apt_preferences.5.xml:418
  #, fuzzy
  msgid ""
  "names the release version.  For example, the packages in the tree might "
@@@ -6694,7 -6694,7 +6706,7 @@@ msgstr "
  "das linhas a seguir."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:422
++#: apt_preferences.5.xml:427
  #, fuzzy, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -6707,13 -6707,13 +6719,13 @@@ msgstr "
  "Pin: release 3.0\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:431
++#: apt_preferences.5.xml:436
  #, fuzzy
  msgid "the <literal>Component:</literal> line"
  msgstr "a linha <literal>Component:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:432
++#: apt_preferences.5.xml:437
  #, fuzzy
  msgid ""
  "names the licensing component associated with the packages in the directory "
@@@ -6732,7 -6732,7 +6744,7 @@@ msgstr "
  "requerer a linha :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:441
++#: apt_preferences.5.xml:446
  #, fuzzy, no-wrap
  msgid "Pin: release c=main\n"
  msgstr ""
@@@ -6740,13 -6740,13 +6752,13 @@@
  "Pin: release c=main\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:447
++#: apt_preferences.5.xml:452
  #, fuzzy
  msgid "the <literal>Origin:</literal> line"
  msgstr "a linha <literal>Origin:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:448
++#: apt_preferences.5.xml:453
  #, fuzzy
  msgid ""
  "names the originator of the packages in the directory tree of the "
@@@ -6760,7 -6760,7 +6772,7 @@@ msgstr "
  "requerer a linha :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:454
++#: apt_preferences.5.xml:459
  #, fuzzy, no-wrap
  msgid "Pin: release o=Debian\n"
  msgstr ""
@@@ -6768,13 -6768,13 +6780,13 @@@
  "Pin: release o=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:460
++#: apt_preferences.5.xml:465
  #, fuzzy
  msgid "the <literal>Label:</literal> line"
  msgstr "a linha <literal>Label:</literal>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:461
++#: apt_preferences.5.xml:466
  #, fuzzy
  msgid ""
  "names the label of the packages in the directory tree of the "
@@@ -6787,7 -6787,7 +6799,7 @@@ msgstr "
  "arquivo de preferências do APT iria requerer a linha :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:467
++#: apt_preferences.5.xml:472
  #, fuzzy, no-wrap
  msgid "Pin: release l=Debian\n"
  msgstr ""
@@@ -6795,7 -6795,7 +6807,7 @@@
  "Pin: release l=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:368
++#: apt_preferences.5.xml:373
  #, fuzzy
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
@@@ -6819,7 -6819,7 +6831,7 @@@ msgstr "
  "do APT :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:474
++#: apt_preferences.5.xml:479
  #, fuzzy
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
@@@ -6845,13 -6845,13 +6857,13 @@@ msgstr "
  "<literal>unstable</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:487
++#: apt_preferences.5.xml:492
  #, fuzzy
  msgid "Optional Lines in an APT Preferences Record"
  msgstr "Linhas Opcionais em um Registro de Preferências do APT"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:489
++#: apt_preferences.5.xml:494
  #, fuzzy
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
@@@ -6863,13 -6863,13 +6875,13 @@@ msgstr "
  "</literal>. Isto oferece um local para inserir comentários."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:498
++#: apt_preferences.5.xml:503
  #, fuzzy
  msgid "Tracking Stable"
  msgstr "Acompanhando a Stable"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:506
++#: apt_preferences.5.xml:511
  #, fuzzy, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -6894,7 -6894,7 +6906,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:500
++#: apt_preferences.5.xml:505
  #, fuzzy
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
@@@ -6910,8 -6910,8 +6922,8 @@@ msgstr "
  "outras distribuições <literal>Debian</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
--#: apt_preferences.5.xml:627
++#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
++#: apt_preferences.5.xml:632
  #, fuzzy, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -6924,7 -6924,7 +6936,7 @@@ msgstr "
  "apt-get dist-upgrade\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:518
++#: apt_preferences.5.xml:523
  #, fuzzy
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
@@@ -6937,7 -6937,7 +6949,7 @@@ msgstr "
  "ulítma(s) versão(ôes) <literal>stable</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:535
++#: apt_preferences.5.xml:540
  #, fuzzy, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/testing\n"
  msgstr ""
@@@ -6945,7 -6945,7 +6957,7 @@@
  "apt-get install <replaceable>pacote</replaceable>/testing\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:529
++#: apt_preferences.5.xml:534
  #, fuzzy
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
@@@ -6958,13 -6958,13 +6970,13 @@@ msgstr "
  "atualizado novamente a menos que esse comando seja executado novamente."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:541
++#: apt_preferences.5.xml:546
  #, fuzzy
  msgid "Tracking Testing or Unstable"
  msgstr "Acompanhando a Testing"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:550
++#: apt_preferences.5.xml:555
  #, fuzzy, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6993,7 -6993,7 +7005,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:543
++#: apt_preferences.5.xml:548
  #, fuzzy
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
@@@ -7010,7 -7010,7 +7022,7 @@@ msgstr "
  "versões de pacotes de outras distribuições <literal>Debian</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:564
++#: apt_preferences.5.xml:569
  #, fuzzy
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
@@@ -7023,7 -7023,7 +7035,7 @@@ msgstr "
  "(s) última(s) versão(ões) <literal>testing</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:584
++#: apt_preferences.5.xml:589
  #, fuzzy, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
  msgstr ""
@@@ -7031,7 -7031,7 +7043,7 @@@
  "apt-get install <replaceable>pacote</replaceable>/unstable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:575
++#: apt_preferences.5.xml:580
  #, fuzzy
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
@@@ -7051,12 -7051,12 +7063,12 @@@ msgstr "
  "recente que a versão instalada."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:591
++#: apt_preferences.5.xml:596
  msgid "Tracking the evolution of a codename release"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:605
++#: apt_preferences.5.xml:610
  #, fuzzy, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -7086,7 -7086,7 +7098,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:593
++#: apt_preferences.5.xml:598
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -7101,7 -7101,7 +7113,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:622
++#: apt_preferences.5.xml:627
  #, fuzzy
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
@@@ -7114,7 -7114,7 +7126,7 @@@ msgstr "
  "ulítma(s) versão(ôes) <literal>stable</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:642
++#: apt_preferences.5.xml:647
  #, fuzzy, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/sid\n"
  msgstr ""
@@@ -7122,7 -7122,7 +7134,7 @@@
  "apt-get install <replaceable>pacote</replaceable>/testing\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:633
++#: apt_preferences.5.xml:638
  #, fuzzy
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
@@@ -7142,13 -7142,13 +7154,13 @@@ msgstr "
  "recente que a versão instalada."
  
  #. type: Content of: <refentry><refsect1><variablelist>
--#: apt_preferences.5.xml:651
++#: apt_preferences.5.xml:656
  #, fuzzy
  msgid "&file-preferences;"
  msgstr "apt_preferences"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt_preferences.5.xml:657
++#: apt_preferences.5.xml:662
  #, fuzzy
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@@ -8562,6 -8562,6 +8574,10 @@@ msgstr "
  msgid "Which will use the already fetched archives on the disc."
  msgstr ""
  
++#, fuzzy
++#~ msgid "to the version that is already installed (if any)."
++#~ msgstr "para a instância que já esteja instalada (caso exista)."
++
  #, fuzzy
  #~ msgid ""
  #~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
diff --combined po/apt-all.pot
index 0479bf303,4634bf64c..ee139b2e7
--- 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: 2010-10-29 10:12-0400\n"
 -"POT-Creation-Date: 2011-01-12 17:42+0100\n"
++"POT-Creation-Date: 2011-04-05 10:32+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -90,82 -90,82 +90,80 @@@ msgstr "
  msgid "Total space accounted for: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
++#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1142
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr ""
  
--#: cmdline/apt-cache.cc:1273
--msgid "You must give at least one search pattern"
++#: cmdline/apt-cache.cc:591 cmdline/apt-cache.cc:1377
++#: cmdline/apt-cache.cc:1379 cmdline/apt-cache.cc:1456
++msgid "No packages found"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
--#: cmdline/apt-cache.cc:1508
--msgid "No packages found"
++#: cmdline/apt-cache.cc:1221
++msgid "You must give at least one search pattern"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440
++#: cmdline/apt-cache.cc:1451 apt-pkg/cacheset.cc:440
  #, c-format
  msgid "Unable to locate package %s"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1533
++#: cmdline/apt-cache.cc:1481
  msgid "Package files:"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
++#: cmdline/apt-cache.cc:1488 cmdline/apt-cache.cc:1579
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1554
++#: cmdline/apt-cache.cc:1502
  msgid "Pinned packages:"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
++#: cmdline/apt-cache.cc:1514 cmdline/apt-cache.cc:1559
  msgid "(not found)"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1575
++#: cmdline/apt-cache.cc:1522
  msgid "  Installed: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:1576
++#: cmdline/apt-cache.cc:1523
  msgid "  Candidate: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
++#: cmdline/apt-cache.cc:1541 cmdline/apt-cache.cc:1549
  msgid "(none)"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1615
++#: cmdline/apt-cache.cc:1556
  msgid "  Package pin: "
  msgstr ""
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1624
++#: cmdline/apt-cache.cc:1565
  msgid "  Version table:"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1678 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
- #: cmdline/apt-get.cc:2758 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2793 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:3106 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s compiled on %s %s\n"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1745
++#: cmdline/apt-cache.cc:1685
  msgid ""
  "Usage: apt-cache [options] command\n"
--"       apt-cache [options] add file1 [file2 ...]\n"
  "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
  "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
  "\n"
--"apt-cache is a low-level tool used to manipulate APT's binary\n"
--"cache files, and query information from them\n"
++"apt-cache is a low-level tool used to query information\n"
++"from APT's binary cache files\n"
  "\n"
  "Commands:\n"
--"   add - Add a package file to the source cache\n"
  "   gencaches - Build both the package and source cache\n"
  "   showpkg - Show some general information for a single package\n"
  "   showsrc - Show source records\n"
@@@ -250,7 -250,7 +248,7 @@@ msgid "
  "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
  msgstr ""
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1148
  #, c-format
  msgid "Unable to write to %s"
  msgstr ""
@@@ -369,97 -369,97 +367,92 @@@ msgstr "
  msgid "Unable to get a cursor"
  msgstr ""
  
--#: ftparchive/writer.cc:73
++#: ftparchive/writer.cc:78
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr ""
  
--#: ftparchive/writer.cc:78
++#: ftparchive/writer.cc:83
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr ""
  
--#: ftparchive/writer.cc:134
++#: ftparchive/writer.cc:139
  msgid "E: "
  msgstr ""
  
--#: ftparchive/writer.cc:136
++#: ftparchive/writer.cc:141
  msgid "W: "
  msgstr ""
  
--#: ftparchive/writer.cc:143
++#: ftparchive/writer.cc:148
  msgid "E: Errors apply to file "
  msgstr ""
  
--#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
++#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to resolve %s"
  msgstr ""
  
--#: ftparchive/writer.cc:174
++#: ftparchive/writer.cc:179
  msgid "Tree walking failed"
  msgstr ""
  
--#: ftparchive/writer.cc:201
++#: ftparchive/writer.cc:206
  #, c-format
  msgid "Failed to open %s"
  msgstr ""
  
--#: ftparchive/writer.cc:260
++#: ftparchive/writer.cc:265
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr ""
  
--#: ftparchive/writer.cc:268
++#: ftparchive/writer.cc:273
  #, c-format
  msgid "Failed to readlink %s"
  msgstr ""
  
--#: ftparchive/writer.cc:272
++#: ftparchive/writer.cc:277
  #, c-format
  msgid "Failed to unlink %s"
  msgstr ""
  
--#: ftparchive/writer.cc:279
++#: ftparchive/writer.cc:284
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr ""
  
--#: ftparchive/writer.cc:289
++#: ftparchive/writer.cc:294
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr ""
  
--#: ftparchive/writer.cc:393
++#: ftparchive/writer.cc:398
  msgid "Archive had no package field"
  msgstr ""
  
--#: ftparchive/writer.cc:401 ftparchive/writer.cc:688
++#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr ""
  
--#: ftparchive/writer.cc:464 ftparchive/writer.cc:793
++#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr ""
  
--#: ftparchive/writer.cc:698
++#: ftparchive/writer.cc:713
  #, c-format
  msgid "  %s has no source override entry\n"
  msgstr ""
  
--#: ftparchive/writer.cc:702
++#: ftparchive/writer.cc:717
  #, c-format
  msgid "  %s has no binary override entry either\n"
  msgstr ""
  
--#: ftparchive/contents.cc:321
--#, c-format
--msgid "Internal error, could not locate member %s"
--msgstr ""
--
--#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
++#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
  msgid "realloc - Failed to allocate memory"
  msgstr ""
  
@@@ -488,63 -488,63 +481,63 @@@ msgstr "
  msgid "Failed to read the override file %s"
  msgstr ""
  
--#: ftparchive/multicompress.cc:72
++#: ftparchive/multicompress.cc:67
  #, c-format
  msgid "Unknown compression algorithm '%s'"
  msgstr ""
  
--#: ftparchive/multicompress.cc:102
++#: ftparchive/multicompress.cc:97
  #, c-format
  msgid "Compressed output %s needs a compression set"
  msgstr ""
  
--#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
++#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
  msgid "Failed to create IPC pipe to subprocess"
  msgstr ""
  
--#: ftparchive/multicompress.cc:195
++#: ftparchive/multicompress.cc:191
  msgid "Failed to create FILE*"
  msgstr ""
  
--#: ftparchive/multicompress.cc:198
++#: ftparchive/multicompress.cc:194
  msgid "Failed to fork"
  msgstr ""
  
--#: ftparchive/multicompress.cc:212
++#: ftparchive/multicompress.cc:208
  msgid "Compress child"
  msgstr ""
  
--#: ftparchive/multicompress.cc:235
++#: ftparchive/multicompress.cc:231
  #, c-format
  msgid "Internal error, failed to create %s"
  msgstr ""
  
--#: ftparchive/multicompress.cc:286
++#: ftparchive/multicompress.cc:282
  msgid "Failed to create subprocess IPC"
  msgstr ""
  
--#: ftparchive/multicompress.cc:321
++#: ftparchive/multicompress.cc:319
  msgid "Failed to exec compressor "
  msgstr ""
  
--#: ftparchive/multicompress.cc:360
++#: ftparchive/multicompress.cc:358
  msgid "decompressor"
  msgstr ""
  
--#: ftparchive/multicompress.cc:403
++#: ftparchive/multicompress.cc:401
  msgid "IO to subprocess/file failed"
  msgstr ""
  
--#: ftparchive/multicompress.cc:455
++#: ftparchive/multicompress.cc:453
  msgid "Failed to read while computing MD5"
  msgstr ""
  
--#: ftparchive/multicompress.cc:472
++#: ftparchive/multicompress.cc:470
  #, c-format
  msgid "Problem unlinking %s"
  msgstr ""
  
--#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
++#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
  #, c-format
  msgid "Failed to rename %s to %s"
  msgstr ""
@@@ -592,99 -592,94 +585,94 @@@ msgstr "
  msgid " or"
  msgstr ""
  
--#: cmdline/apt-get.cc:392
++#: cmdline/apt-get.cc:390
  msgid "The following NEW packages will be installed:"
  msgstr ""
  
--#: cmdline/apt-get.cc:420
++#: cmdline/apt-get.cc:416
  msgid "The following packages will be REMOVED:"
  msgstr ""
  
--#: cmdline/apt-get.cc:442
++#: cmdline/apt-get.cc:438
  msgid "The following packages have been kept back:"
  msgstr ""
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:459
  msgid "The following packages will be upgraded:"
  msgstr ""
  
--#: cmdline/apt-get.cc:488
++#: cmdline/apt-get.cc:480
  msgid "The following packages will be DOWNGRADED:"
  msgstr ""
  
--#: cmdline/apt-get.cc:508
++#: cmdline/apt-get.cc:500
  msgid "The following held packages will be changed:"
  msgstr ""
  
- #: cmdline/apt-get.cc:561
 -#: cmdline/apt-get.cc:563
++#: cmdline/apt-get.cc:555
  #, c-format
  msgid "%s (due to %s) "
  msgstr ""
  
- #: cmdline/apt-get.cc:569
 -#: cmdline/apt-get.cc:571
++#: cmdline/apt-get.cc:563
  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:603
 -#: cmdline/apt-get.cc:605
++#: cmdline/apt-get.cc:594
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr ""
  
- #: cmdline/apt-get.cc:607
 -#: cmdline/apt-get.cc:609
++#: cmdline/apt-get.cc:598
  #, c-format
  msgid "%lu reinstalled, "
  msgstr ""
  
- #: cmdline/apt-get.cc:609
 -#: cmdline/apt-get.cc:611
++#: cmdline/apt-get.cc:600
  #, c-format
  msgid "%lu downgraded, "
  msgstr ""
  
- #: cmdline/apt-get.cc:611
 -#: cmdline/apt-get.cc:613
++#: cmdline/apt-get.cc:602
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:615
 -#: cmdline/apt-get.cc:617
++#: cmdline/apt-get.cc:606
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:635
 -#: cmdline/apt-get.cc:639
++#: cmdline/apt-get.cc:628
  #, c-format
  msgid "Note, selecting '%s' for task '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:641
 -#: cmdline/apt-get.cc:645
++#: cmdline/apt-get.cc:634
  #, c-format
  msgid "Note, selecting '%s' for regex '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:648
- #, c-format
- msgid "Selected version '%s' (%s) for '%s'\n"
- msgstr ""
- 
- #: cmdline/apt-get.cc:658
 -#: cmdline/apt-get.cc:662
++#: cmdline/apt-get.cc:651
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:669
 -#: cmdline/apt-get.cc:673
++#: cmdline/apt-get.cc:662
  msgid " [Installed]"
  msgstr ""
  
- #: cmdline/apt-get.cc:678
 -#: cmdline/apt-get.cc:682
++#: cmdline/apt-get.cc:671
  msgid " [Not candidate version]"
  msgstr ""
  
- #: cmdline/apt-get.cc:680
 -#: cmdline/apt-get.cc:684
++#: cmdline/apt-get.cc:673
  msgid "You should explicitly select one to install."
  msgstr ""
  
- #: cmdline/apt-get.cc:683
 -#: cmdline/apt-get.cc:687
++#: cmdline/apt-get.cc:676
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -692,167 -687,177 +680,177 @@@
  "is only available from another source\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:701
 -#: cmdline/apt-get.cc:705
++#: cmdline/apt-get.cc:694
  msgid "However the following packages replace it:"
  msgstr ""
  
- #: cmdline/apt-get.cc:713
 -#: cmdline/apt-get.cc:717
++#: cmdline/apt-get.cc:706
  #, c-format
  msgid "Package '%s' has no installation candidate"
  msgstr ""
  
- #: cmdline/apt-get.cc:724
 -#: cmdline/apt-get.cc:728
++#: cmdline/apt-get.cc:717
  #, c-format
  msgid "Virtual packages like '%s' can't be removed\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:755
 -#: cmdline/apt-get.cc:759
++#: cmdline/apt-get.cc:748
  #, c-format
  msgid "Note, selecting '%s' instead of '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:785
 -#: cmdline/apt-get.cc:789
++#: cmdline/apt-get.cc:778
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:789
 -#: cmdline/apt-get.cc:793
++#: cmdline/apt-get.cc:782
  #, c-format
  msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:799
 -#: cmdline/apt-get.cc:803
++#: cmdline/apt-get.cc:794
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:804
 -#: cmdline/apt-get.cc:808
++#: cmdline/apt-get.cc:799
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:823 cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2027
++#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2080
  #, c-format
  msgid "%s set to manually installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:863
 -#: cmdline/apt-get.cc:853
++#: cmdline/apt-get.cc:844
+ #, c-format
+ msgid "Selected version '%s' (%s) for '%s'\n"
+ msgstr ""
+ 
 -#: cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:849
+ #, c-format
+ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+ msgstr ""
+ 
 -#: cmdline/apt-get.cc:898
++#: cmdline/apt-get.cc:893
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:938
 -#: cmdline/apt-get.cc:973
++#: cmdline/apt-get.cc:971
  msgid "Correcting dependencies..."
  msgstr ""
  
- #: cmdline/apt-get.cc:941
 -#: cmdline/apt-get.cc:976
++#: cmdline/apt-get.cc:974
  msgid " failed."
  msgstr ""
  
- #: cmdline/apt-get.cc:944
 -#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:977
  msgid "Unable to correct dependencies"
  msgstr ""
  
- #: cmdline/apt-get.cc:947
 -#: cmdline/apt-get.cc:982
++#: cmdline/apt-get.cc:980
  msgid "Unable to minimize the upgrade set"
  msgstr ""
  
- #: cmdline/apt-get.cc:949
 -#: cmdline/apt-get.cc:984
++#: cmdline/apt-get.cc:982
  msgid " Done"
  msgstr ""
  
- #: cmdline/apt-get.cc:953
 -#: cmdline/apt-get.cc:988
++#: cmdline/apt-get.cc:986
  msgid "You might want to run 'apt-get -f install' to correct these."
  msgstr ""
  
- #: cmdline/apt-get.cc:956
 -#: cmdline/apt-get.cc:991
++#: cmdline/apt-get.cc:989
  msgid "Unmet dependencies. Try using -f."
  msgstr ""
  
- #: cmdline/apt-get.cc:981
 -#: cmdline/apt-get.cc:1016
++#: cmdline/apt-get.cc:1014
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr ""
  
- #: cmdline/apt-get.cc:985
 -#: cmdline/apt-get.cc:1020
++#: cmdline/apt-get.cc:1018
  msgid "Authentication warning overridden.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:992
 -#: cmdline/apt-get.cc:1027
++#: cmdline/apt-get.cc:1025
  msgid "Install these packages without verification [y/N]? "
  msgstr ""
  
- #: cmdline/apt-get.cc:994
 -#: cmdline/apt-get.cc:1029
++#: cmdline/apt-get.cc:1027
  msgid "Some packages could not be authenticated"
  msgstr ""
  
- #: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:1166
 -#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199
++#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
  msgid "There are problems and -y was used without --force-yes"
  msgstr ""
  
- #: cmdline/apt-get.cc:1044
 -#: cmdline/apt-get.cc:1079
++#: cmdline/apt-get.cc:1077
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  
- #: cmdline/apt-get.cc:1053
 -#: cmdline/apt-get.cc:1088
++#: cmdline/apt-get.cc:1086
  msgid "Packages need to be removed but remove is disabled."
  msgstr ""
  
- #: cmdline/apt-get.cc:1064
 -#: cmdline/apt-get.cc:1099
++#: cmdline/apt-get.cc:1097
  msgid "Internal error, Ordering didn't finish"
  msgstr ""
  
- #: cmdline/apt-get.cc:1104
 -#: cmdline/apt-get.cc:1137
++#: cmdline/apt-get.cc:1135
  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:1111
 -#: cmdline/apt-get.cc:1144
++#: cmdline/apt-get.cc:1142
  #, 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:1116
 -#: cmdline/apt-get.cc:1149
++#: cmdline/apt-get.cc:1147
  #, 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:1123
 -#: cmdline/apt-get.cc:1156
++#: cmdline/apt-get.cc:1154
  #, 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:1128
 -#: cmdline/apt-get.cc:1161
++#: cmdline/apt-get.cc:1159
  #, c-format
  msgid "After this operation, %sB disk space will be freed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1143 cmdline/apt-get.cc:1146 cmdline/apt-get.cc:2332
- #: cmdline/apt-get.cc:2335
 -#: cmdline/apt-get.cc:1176 cmdline/apt-get.cc:1179 cmdline/apt-get.cc:2367
 -#: cmdline/apt-get.cc:2370
++#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2484
++#: cmdline/apt-get.cc:2487
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1156
 -#: cmdline/apt-get.cc:1189
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr ""
  
- #: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1192
 -#: cmdline/apt-get.cc:1205 cmdline/apt-get.cc:1225
++#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  
- #: cmdline/apt-get.cc:1174
 -#: cmdline/apt-get.cc:1207
++#: cmdline/apt-get.cc:1205
  msgid "Yes, do as I say!"
  msgstr ""
  
- #: cmdline/apt-get.cc:1176
 -#: cmdline/apt-get.cc:1209
++#: cmdline/apt-get.cc:1207
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -860,46 -865,46 +858,46 @@@
  " ?] "
  msgstr ""
  
- #: cmdline/apt-get.cc:1182 cmdline/apt-get.cc:1201
 -#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234
++#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
  msgid "Abort."
  msgstr ""
  
- #: cmdline/apt-get.cc:1197
 -#: cmdline/apt-get.cc:1230
++#: cmdline/apt-get.cc:1228
  msgid "Do you want to continue [Y/n]? "
  msgstr ""
  
- #: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:2392 apt-pkg/algorithms.cc:1462
 -#: cmdline/apt-get.cc:1302 cmdline/apt-get.cc:2427 apt-pkg/algorithms.cc:1470
++#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2544 apt-pkg/algorithms.cc:1427
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1287
 -#: cmdline/apt-get.cc:1320
++#: cmdline/apt-get.cc:1318
  msgid "Some files failed to download"
  msgstr ""
  
- #: cmdline/apt-get.cc:1288 cmdline/apt-get.cc:2401
 -#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436
++#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2553
  msgid "Download complete and in download only mode"
  msgstr ""
  
- #: cmdline/apt-get.cc:1294
 -#: cmdline/apt-get.cc:1327
++#: cmdline/apt-get.cc:1325
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
  msgstr ""
  
- #: cmdline/apt-get.cc:1298
 -#: cmdline/apt-get.cc:1331
++#: cmdline/apt-get.cc:1329
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr ""
  
- #: cmdline/apt-get.cc:1303
 -#: cmdline/apt-get.cc:1336
++#: cmdline/apt-get.cc:1334
  msgid "Unable to correct missing packages."
  msgstr ""
  
- #: cmdline/apt-get.cc:1304
 -#: cmdline/apt-get.cc:1337
++#: cmdline/apt-get.cc:1335
  msgid "Aborting install."
  msgstr ""
  
- #: cmdline/apt-get.cc:1332
 -#: cmdline/apt-get.cc:1365
++#: cmdline/apt-get.cc:1363
  msgid ""
  "The following package disappeared from your system as\n"
  "all files have been overwritten by other packages:"
@@@ -909,56 -914,35 +907,35 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: cmdline/apt-get.cc:1336
 -#: cmdline/apt-get.cc:1369
++#: cmdline/apt-get.cc:1367
  msgid "Note: This is done automatic and on purpose by dpkg."
  msgstr ""
  
- #: cmdline/apt-get.cc:1466
 -#: cmdline/apt-get.cc:1499
++#: cmdline/apt-get.cc:1497
  #, c-format
  msgid "Ignore unavailable target release '%s' of package '%s'"
  msgstr ""
  
- #: cmdline/apt-get.cc:1498
 -#: cmdline/apt-get.cc:1531
++#: cmdline/apt-get.cc:1529
  #, c-format
  msgid "Picking '%s' as source package instead of '%s'\n"
  msgstr ""
  
  #. if (VerTag.empty() == false && Last == 0)
- #: cmdline/apt-get.cc:1536
 -#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1567
  #, c-format
  msgid "Ignore unavailable version '%s' of package '%s'"
  msgstr ""
  
- #: cmdline/apt-get.cc:1552
 -#: cmdline/apt-get.cc:1585
++#: cmdline/apt-get.cc:1583
  msgid "The update command takes no arguments"
  msgstr ""
  
- #: cmdline/apt-get.cc:1618
 -#: cmdline/apt-get.cc:1647
++#: cmdline/apt-get.cc:1645
  msgid "We are not supposed to delete stuff, can't start AutoRemover"
  msgstr ""
  
- #: cmdline/apt-get.cc:1666
- msgid ""
- "The following package was automatically installed and is no longer required:"
- msgid_plural ""
- "The following packages were automatically installed and are no longer "
- "required:"
- msgstr[0] ""
- msgstr[1] ""
- 
- #: cmdline/apt-get.cc:1670
- #, c-format
- msgid "%lu package was automatically installed and is no longer required.\n"
- msgid_plural ""
- "%lu packages were automatically installed and are no longer required.\n"
- msgstr[0] ""
- msgstr[1] ""
- 
- #: cmdline/apt-get.cc:1672
- msgid "Use 'apt-get autoremove' to remove them."
- msgstr ""
- 
- #: cmdline/apt-get.cc:1677
 -#: cmdline/apt-get.cc:1699
++#: cmdline/apt-get.cc:1740
  msgid ""
  "Hmm, seems like the AutoRemover destroyed something which really\n"
  "shouldn't happen. Please file a bug report against apt."
@@@ -974,29 -958,50 +951,50 @@@ msgstr "
  #. "that package should be filed.") << endl;
  #. }
  #.
- #: cmdline/apt-get.cc:1680 cmdline/apt-get.cc:1822
 -#: cmdline/apt-get.cc:1702 cmdline/apt-get.cc:1858
++#: cmdline/apt-get.cc:1743 cmdline/apt-get.cc:1913
  msgid "The following information may help to resolve the situation:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1684
 -#: cmdline/apt-get.cc:1706
++#: cmdline/apt-get.cc:1747
  msgid "Internal Error, AutoRemover broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1703
 -#: cmdline/apt-get.cc:1713
++#: cmdline/apt-get.cc:1754
+ msgid ""
+ "The following package was automatically installed and is no longer required:"
+ msgid_plural ""
+ "The following packages were automatically installed and are no longer "
+ "required:"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
 -#: cmdline/apt-get.cc:1717
++#: cmdline/apt-get.cc:1758
+ #, c-format
+ msgid "%lu package was automatically installed and is no longer required.\n"
+ msgid_plural ""
+ "%lu packages were automatically installed and are no longer required.\n"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
 -#: cmdline/apt-get.cc:1719
++#: cmdline/apt-get.cc:1760
+ msgid "Use 'apt-get autoremove' to remove them."
+ msgstr ""
+ 
 -#: cmdline/apt-get.cc:1738
++#: cmdline/apt-get.cc:1779
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1792
 -#: cmdline/apt-get.cc:1828
++#: cmdline/apt-get.cc:1878
  msgid "You might want to run 'apt-get -f install' to correct these:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1795
 -#: cmdline/apt-get.cc:1831
++#: cmdline/apt-get.cc:1882
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
  msgstr ""
  
- #: cmdline/apt-get.cc:1807
 -#: cmdline/apt-get.cc:1843
++#: cmdline/apt-get.cc:1898
  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"
@@@ -1004,69 -1009,69 +1002,74 @@@
  "or been moved out of Incoming."
  msgstr ""
  
- #: cmdline/apt-get.cc:1825
 -#: cmdline/apt-get.cc:1861
++#: cmdline/apt-get.cc:1916
  msgid "Broken packages"
  msgstr ""
  
- #: cmdline/apt-get.cc:1854
 -#: cmdline/apt-get.cc:1889
++#: cmdline/apt-get.cc:1942
  msgid "The following extra packages will be installed:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1944
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2032
  msgid "Suggested packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1945
 -#: cmdline/apt-get.cc:1980
++#: cmdline/apt-get.cc:2033
  msgid "Recommended packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1987
 -#: cmdline/apt-get.cc:2022
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Couldn't find package %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1994
 -#: cmdline/apt-get.cc:2029
++#: cmdline/apt-get.cc:2082
  #, c-format
  msgid "%s set to automatically installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2015
 -#: cmdline/apt-get.cc:2050
++#: cmdline/apt-get.cc:2103
  msgid "Calculating upgrade... "
  msgstr ""
  
- #: cmdline/apt-get.cc:2018 methods/ftp.cc:707 methods/connect.cc:111
 -#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111
++#: cmdline/apt-get.cc:2106 methods/ftp.cc:707 methods/connect.cc:111
  msgid "Failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:2023
 -#: cmdline/apt-get.cc:2058
++#: cmdline/apt-get.cc:2111
  msgid "Done"
  msgstr ""
  
- #: cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2098
 -#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133
++#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2186
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2155
 -#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190
++#: cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2243
  msgid "Unable to lock the download directory"
  msgstr ""
  
- #: cmdline/apt-get.cc:2198
 -#: cmdline/apt-get.cc:2233
++#: cmdline/apt-get.cc:2294
++#, c-format
++msgid "Downloading %s %s"
++msgstr ""
++
++#: cmdline/apt-get.cc:2350
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  
- #: cmdline/apt-get.cc:2238 cmdline/apt-get.cc:2519
 -#: cmdline/apt-get.cc:2273 cmdline/apt-get.cc:2554
++#: cmdline/apt-get.cc:2390 cmdline/apt-get.cc:2671
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2254
 -#: cmdline/apt-get.cc:2289
++#: cmdline/apt-get.cc:2406
  #, c-format
  msgid ""
  "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
  "%s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2259
 -#: cmdline/apt-get.cc:2294
++#: cmdline/apt-get.cc:2411
  #, c-format
  msgid ""
  "Please use:\n"
@@@ -1074,115 -1079,115 +1077,120 @@@
  "to retrieve the latest (possibly unreleased) updates to the package.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2310
 -#: cmdline/apt-get.cc:2345
++#: cmdline/apt-get.cc:2462
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2345
 -#: cmdline/apt-get.cc:2380
++#: cmdline/apt-get.cc:2497
  #, 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:2353
 -#: cmdline/apt-get.cc:2388
++#: cmdline/apt-get.cc:2505
  #, 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:2358
 -#: cmdline/apt-get.cc:2393
++#: cmdline/apt-get.cc:2510
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2364
 -#: cmdline/apt-get.cc:2399
++#: cmdline/apt-get.cc:2516
  #, c-format
  msgid "Fetch source %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2397
 -#: cmdline/apt-get.cc:2432
++#: cmdline/apt-get.cc:2549
  msgid "Failed to fetch some archives."
  msgstr ""
  
- #: cmdline/apt-get.cc:2427
 -#: cmdline/apt-get.cc:2462
++#: cmdline/apt-get.cc:2579
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2439
 -#: cmdline/apt-get.cc:2474
++#: cmdline/apt-get.cc:2591
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2440
 -#: cmdline/apt-get.cc:2475
++#: cmdline/apt-get.cc:2592
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2457
 -#: cmdline/apt-get.cc:2492
++#: cmdline/apt-get.cc:2609
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2477
 -#: cmdline/apt-get.cc:2512
++#: cmdline/apt-get.cc:2629
  msgid "Child process failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:2493
 -#: cmdline/apt-get.cc:2528
++#: cmdline/apt-get.cc:2645
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  
- #: cmdline/apt-get.cc:2524
 -#: cmdline/apt-get.cc:2559
++#: cmdline/apt-get.cc:2676
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2544
 -#: cmdline/apt-get.cc:2579
++#: cmdline/apt-get.cc:2696
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2595
 -#: cmdline/apt-get.cc:2630
++#: cmdline/apt-get.cc:2747
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr ""
  
- #: cmdline/apt-get.cc:2648
 -#: cmdline/apt-get.cc:2683
++#: cmdline/apt-get.cc:2800
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
  "package %s can satisfy version requirements"
  msgstr ""
  
- #: cmdline/apt-get.cc:2684
 -#: cmdline/apt-get.cc:2719
++#: cmdline/apt-get.cc:2836
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  
- #: cmdline/apt-get.cc:2711
 -#: cmdline/apt-get.cc:2746
++#: cmdline/apt-get.cc:2863
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2727
 -#: cmdline/apt-get.cc:2762
++#: cmdline/apt-get.cc:2879
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr ""
  
- #: cmdline/apt-get.cc:2732
 -#: cmdline/apt-get.cc:2767
++#: cmdline/apt-get.cc:2884
  msgid "Failed to process build dependencies"
  msgstr ""
  
- #: cmdline/apt-get.cc:2763
 -#: cmdline/apt-get.cc:2798
++#: cmdline/apt-get.cc:2977 cmdline/apt-get.cc:2989
++#, c-format
++msgid "Changelog for %s (%s)"
++msgstr ""
++
++#: cmdline/apt-get.cc:3111
  msgid "Supported modules:"
  msgstr ""
  
- #: cmdline/apt-get.cc:2804
 -#: cmdline/apt-get.cc:2839
++#: cmdline/apt-get.cc:3152
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1208,6 -1213,6 +1216,8 @@@
  "   check - Verify that there are no broken dependencies\n"
  "   markauto - Mark the given packages as automatically installed\n"
  "   unmarkauto - Mark the given packages as manually installed\n"
++"   changelog - Download and display the changelog for the given package\n"
++"   download - Download the binary package into the current directory\n"
  "\n"
  "Options:\n"
  "  -h  This help text.\n"
@@@ -1228,7 -1233,7 +1238,7 @@@
  "                       This APT has Super Cow Powers.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2960
 -#: cmdline/apt-get.cc:2995
++#: cmdline/apt-get.cc:3316
  msgid ""
  "NOTE: This is only a simulation!\n"
  "      apt-get needs root privileges for real execution.\n"
@@@ -1236,33 -1241,33 +1246,33 @@@
  "      so don't depend on the relevance to the real current situation!"
  msgstr ""
  
- #: cmdline/acqprogress.cc:55
+ #: cmdline/acqprogress.cc:57
  msgid "Hit "
  msgstr ""
  
- #: cmdline/acqprogress.cc:79
+ #: cmdline/acqprogress.cc:81
  msgid "Get:"
  msgstr ""
  
- #: cmdline/acqprogress.cc:110
+ #: cmdline/acqprogress.cc:112
  msgid "Ign "
  msgstr ""
  
- #: cmdline/acqprogress.cc:114
+ #: cmdline/acqprogress.cc:116
  msgid "Err "
  msgstr ""
  
- #: cmdline/acqprogress.cc:135
+ #: cmdline/acqprogress.cc:137
  #, c-format
  msgid "Fetched %sB in %s (%sB/s)\n"
  msgstr ""
  
- #: cmdline/acqprogress.cc:225
+ #: cmdline/acqprogress.cc:227
  #, c-format
  msgid " [Working]"
  msgstr ""
  
- #: cmdline/acqprogress.cc:271
+ #: cmdline/acqprogress.cc:283
  #, c-format
  msgid ""
  "Media change: please insert the disc labeled\n"
@@@ -1330,7 -1335,7 +1340,7 @@@ msgstr "
  msgid "Failed to exec gzip "
  msgstr ""
  
--#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
++#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
  msgid "Corrupted archive"
  msgstr ""
  
@@@ -1338,7 -1343,7 +1348,7 @@@
  msgid "Tar checksum failed, archive corrupted"
  msgstr ""
  
--#: apt-inst/contrib/extracttar.cc:296
++#: apt-inst/contrib/extracttar.cc:300
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr ""
@@@ -1446,28 -1451,28 +1456,28 @@@ msgstr "
  msgid "The path is too long"
  msgstr ""
  
--#: apt-inst/extract.cc:414
++#: apt-inst/extract.cc:412
  #, c-format
  msgid "Overwrite package match with no version for %s"
  msgstr ""
  
--#: apt-inst/extract.cc:431
++#: apt-inst/extract.cc:429
  #, c-format
  msgid "File %s/%s overwrites the one in the package %s"
  msgstr ""
  
  #. Only warn if there are no sources.list.d.
  #. Only warn if there is no sources.list file.
--#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179
- #: apt-pkg/contrib/fileutl.cc:311 apt-pkg/sourcelist.cc:204
- #: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:103
- #: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
 -#: apt-pkg/contrib/fileutl.cc:329 apt-pkg/sourcelist.cc:204
 -#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100
 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
--#: methods/mirror.cc:87
++#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:180
++#: 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:106
++#: apt-pkg/init.cc:114 apt-pkg/clean.cc:33 apt-pkg/policy.cc:302
++#: methods/mirror.cc:91
  #, c-format
  msgid "Unable to read %s"
  msgstr ""
  
--#: apt-inst/extract.cc:491
++#: apt-inst/extract.cc:489
  #, c-format
  msgid "Unable to stat %s"
  msgstr ""
@@@ -1491,9 -1496,9 +1501,9 @@@ msgstr "
  msgid "The info and temp directories need to be on the same filesystem"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
--#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
--#: apt-pkg/pkgcachegen.cc:1326
++#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1047
++#: apt-pkg/pkgcachegen.cc:1151 apt-pkg/pkgcachegen.cc:1157
++#: apt-pkg/pkgcachegen.cc:1303
  msgid "Reading package lists"
  msgstr ""
  
@@@ -1566,51 -1571,51 +1576,57 @@@ msgstr "
  msgid "Error parsing MD5. Offset %lu"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
++#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
  #, c-format
  msgid "This is not a valid DEB archive, missing '%s' member"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:50
++#. 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
  #, c-format
  msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:110
++#: apt-inst/deb/debfile.cc:113
  #, c-format
  msgid "Couldn't change to %s"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:140
--msgid "Internal error, could not locate member"
++#: apt-inst/deb/debfile.cc:154
++#, c-format
++msgid "Internal error, could not locate member %s"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:173
++#: apt-inst/deb/debfile.cc:189
  msgid "Failed to locate a valid control file"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:258
++#: apt-inst/deb/debfile.cc:274
  msgid "Unparsable control file"
  msgstr ""
  
--#: methods/bzip2.cc:65
++#: methods/bzip2.cc:60 methods/gzip.cc:52
++msgid "Empty files can't be valid archives"
++msgstr ""
++
++#: methods/bzip2.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr ""
  
--#: methods/bzip2.cc:109
++#: methods/bzip2.cc:108
  #, c-format
  msgid "Read error from %s process"
  msgstr ""
  
--#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43
--#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486
--#: methods/rred.cc:495
++#: 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
  msgid "Failed to stat"
  msgstr ""
  
--#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99
--#: methods/rred.cc:492
++#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
++#: methods/rred.cc:530
  msgid "Failed to set modification time"
  msgstr ""
  
@@@ -1638,7 -1643,7 +1654,7 @@@ msgstr "
  msgid "Disk not found."
  msgstr ""
  
--#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
++#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
  msgid "File not found"
  msgstr ""
  
@@@ -1690,7 -1695,7 +1706,7 @@@ msgstr "
  msgid "TYPE failed, server said: %s"
  msgstr ""
  
--#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
++#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
  msgid "Connection timeout"
  msgstr ""
  
@@@ -1698,11 -1703,11 +1714,11 @@@
  msgid "Server closed the connection"
  msgstr ""
  
- #: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:784 methods/rsh.cc:190
 -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:802 methods/rsh.cc:190
++#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
  msgid "Read error"
  msgstr ""
  
--#: methods/ftp.cc:351 methods/rsh.cc:197
++#: methods/ftp.cc:351 methods/rsh.cc:198
  msgid "A response overflowed the buffer."
  msgstr ""
  
@@@ -1710,7 -1715,7 +1726,7 @@@
  msgid "Protocol corruption"
  msgstr ""
  
- #: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:826 methods/rsh.cc:232
 -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:844 methods/rsh.cc:232
++#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
  msgid "Write error"
  msgstr ""
  
@@@ -1764,7 -1769,7 +1780,7 @@@ msgstr "
  msgid "Unable to accept connection"
  msgstr ""
  
--#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302
++#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr ""
  
@@@ -1773,7 -1778,7 +1789,7 @@@
  msgid "Unable to fetch file, server said '%s'"
  msgstr ""
  
--#: methods/ftp.cc:897 methods/rsh.cc:321
++#: methods/ftp.cc:897 methods/rsh.cc:322
  msgid "Data socket timed out"
  msgstr ""
  
@@@ -1823,7 -1828,7 +1839,7 @@@ 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:424
++#: methods/connect.cc:149 methods/rsh.cc:425
  #, c-format
  msgid "Connecting to %s"
  msgstr ""
@@@ -1942,7 -1947,7 +1958,7 @@@ msgstr "
  msgid "Error reading from server"
  msgstr ""
  
--#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281
++#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:283
  msgid "Failed to truncate file"
  msgstr ""
  
@@@ -1980,21 -1985,21 +1996,21 @@@ msgstr "
  msgid "Unable to synchronize mmap"
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:300
++#: apt-pkg/contrib/mmap.cc:302
  #, 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:399
++#: apt-pkg/contrib/mmap.cc:401
  #, 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:402
++#: apt-pkg/contrib/mmap.cc:404
  msgid ""
  "Unable to increase size of the MMap as automatic growing is disabled by user."
  msgstr ""
@@@ -2023,7 -2028,7 +2039,7 @@@ msgstr "
  msgid "%lis"
  msgstr ""
  
--#: apt-pkg/contrib/strutl.cc:1119
++#: apt-pkg/contrib/strutl.cc:1138
  #, c-format
  msgid "Selection %s not found"
  msgstr ""
@@@ -2139,108 -2144,113 +2155,129 @@@ msgstr "
  msgid "Invalid operation %s"
  msgstr ""
  
--#: apt-pkg/contrib/cdromutl.cc:52
++#: apt-pkg/contrib/cdromutl.cc:53
  #, 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/contrib/cdromutl.cc:176 apt-pkg/contrib/cdromutl.cc:210
  #: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
--#: methods/mirror.cc:93
++#: methods/mirror.cc:97
  #, c-format
  msgid "Unable to change to %s"
  msgstr ""
  
--#: apt-pkg/contrib/cdromutl.cc:217
++#: apt-pkg/contrib/cdromutl.cc:218
  msgid "Failed to stat the cdrom"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:154
++#: apt-pkg/contrib/fileutl.cc:168
  #, c-format
  msgid "Not using locking for read only lock file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:159
++#: apt-pkg/contrib/fileutl.cc:173
  #, c-format
  msgid "Could not open lock file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:177
++#: apt-pkg/contrib/fileutl.cc:191
  #, c-format
  msgid "Not using locking for nfs mounted lock file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:181
++#: apt-pkg/contrib/fileutl.cc:195
  #, c-format
  msgid "Could not get lock %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:643
 -#: apt-pkg/contrib/fileutl.cc:321
++#: apt-pkg/contrib/fileutl.cc:335
+ #, c-format
+ msgid "List of files can't be created as '%s' is not a directory"
+ msgstr ""
+ 
 -#: apt-pkg/contrib/fileutl.cc:661
++#: apt-pkg/contrib/fileutl.cc:362
++#, c-format
++msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
++msgstr ""
++
++#: apt-pkg/contrib/fileutl.cc:380
++#, c-format
++msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
++msgstr ""
++
++#: apt-pkg/contrib/fileutl.cc:389
++#, c-format
++msgid ""
++"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
++msgstr ""
++
++#: apt-pkg/contrib/fileutl.cc:679
  #, c-format
  msgid "Waited for %s but it wasn't there"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:655
 -#: apt-pkg/contrib/fileutl.cc:673
++#: apt-pkg/contrib/fileutl.cc:691
  #, c-format
  msgid "Sub-process %s received a segmentation fault."
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:657
 -#: apt-pkg/contrib/fileutl.cc:675
++#: apt-pkg/contrib/fileutl.cc:693
  #, c-format
  msgid "Sub-process %s received signal %u."
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:661
 -#: apt-pkg/contrib/fileutl.cc:679
++#: apt-pkg/contrib/fileutl.cc:697
  #, c-format
  msgid "Sub-process %s returned an error code (%u)"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:663
 -#: apt-pkg/contrib/fileutl.cc:681
++#: apt-pkg/contrib/fileutl.cc:699
  #, c-format
  msgid "Sub-process %s exited unexpectedly"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:728
 -#: apt-pkg/contrib/fileutl.cc:746
++#: apt-pkg/contrib/fileutl.cc:764
  #, c-format
  msgid "Could not open file %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:745
 -#: apt-pkg/contrib/fileutl.cc:763
++#: apt-pkg/contrib/fileutl.cc:781
  #, c-format
  msgid "Could not open file descriptor %d"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:805
 -#: apt-pkg/contrib/fileutl.cc:823
++#: apt-pkg/contrib/fileutl.cc:841
  #, c-format
  msgid "read, still have %lu to read but none left"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:838
 -#: apt-pkg/contrib/fileutl.cc:856
++#: apt-pkg/contrib/fileutl.cc:874
  #, c-format
  msgid "write, still have %lu to write but couldn't"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:967
 -#: apt-pkg/contrib/fileutl.cc:985
++#: apt-pkg/contrib/fileutl.cc:1010
  #, c-format
  msgid "Problem closing the gzip file %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:970
 -#: apt-pkg/contrib/fileutl.cc:988
++#: apt-pkg/contrib/fileutl.cc:1013
  #, c-format
  msgid "Problem closing the file %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:975
 -#: apt-pkg/contrib/fileutl.cc:993
++#: apt-pkg/contrib/fileutl.cc:1018
  #, c-format
  msgid "Problem renaming the file %s to %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:986
 -#: apt-pkg/contrib/fileutl.cc:1004
++#: apt-pkg/contrib/fileutl.cc:1029
  #, c-format
  msgid "Problem unlinking the file %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:999
 -#: apt-pkg/contrib/fileutl.cc:1017
++#: apt-pkg/contrib/fileutl.cc:1042
  msgid "Problem syncing the file"
  msgstr ""
  
@@@ -2321,37 -2331,37 +2358,32 @@@ msgstr "
  msgid "extra"
  msgstr ""
  
- #: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153
+ #: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
  msgid "Building dependency tree"
  msgstr ""
  
- #: apt-pkg/depcache.cc:125
+ #: apt-pkg/depcache.cc:126
  msgid "Candidate versions"
  msgstr ""
  
- #: apt-pkg/depcache.cc:154
+ #: apt-pkg/depcache.cc:155
  msgid "Dependency generation"
  msgstr ""
  
- #: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211
+ #: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
  msgid "Reading state information"
  msgstr ""
  
- #: apt-pkg/depcache.cc:236
+ #: apt-pkg/depcache.cc:237
  #, c-format
  msgid "Failed to open StateFile %s"
  msgstr ""
  
- #: apt-pkg/depcache.cc:242
+ #: apt-pkg/depcache.cc:243
  #, c-format
  msgid "Failed to write temporary StateFile %s"
  msgstr ""
  
- #: apt-pkg/depcache.cc:921
 -#: apt-pkg/depcache.cc:922
--#, c-format
--msgid "Internal error, group '%s' has no installable pseudo package"
--msgstr ""
--
  #: apt-pkg/tagfile.cc:102
  #, c-format
  msgid "Unable to parse package file %s (1)"
@@@ -2432,14 -2442,14 +2464,14 @@@ msgstr "
  msgid "Type '%s' is not known on line %u in source list %s"
  msgstr ""
  
--#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
++#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:593
  #, 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:452
++#: apt-pkg/packagemanager.cc:445
  #, c-format
  msgid ""
  "This installation run will require temporarily removing the essential "
@@@ -2447,7 -2457,7 +2479,7 @@@
  "you really want to do it, activate the APT::Force-LoopBreak option."
  msgstr ""
  
--#: apt-pkg/packagemanager.cc:495
++#: apt-pkg/packagemanager.cc:485
  #, c-format
  msgid ""
  "Could not perform immediate configuration on already unpacked '%s'. Please "
@@@ -2459,25 -2469,25 +2491,25 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr ""
  
--#: apt-pkg/algorithms.cc:292
++#: apt-pkg/algorithms.cc:249
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1210
 -#: apt-pkg/algorithms.cc:1218
++#: apt-pkg/algorithms.cc:1175
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1212
 -#: apt-pkg/algorithms.cc:1220
++#: apt-pkg/algorithms.cc:1177
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1488 apt-pkg/algorithms.cc:1490
 -#: apt-pkg/algorithms.cc:1496 apt-pkg/algorithms.cc:1498
++#: apt-pkg/algorithms.cc:1453 apt-pkg/algorithms.cc:1455
  msgid ""
--"Some index files failed to download, they have been ignored, or old ones "
++"Some index files failed to download. They have been ignored, or old ones "
  "used instead."
  msgstr ""
  
@@@ -2518,17 -2528,17 +2550,17 @@@ msgstr "
  msgid "Method %s did not start correctly"
  msgstr ""
  
--#: apt-pkg/acquire-worker.cc:413
++#: apt-pkg/acquire-worker.cc:424
  #, c-format
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
  
- #: apt-pkg/init.cc:146
 -#: apt-pkg/init.cc:143
++#: apt-pkg/init.cc:149
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr ""
  
- #: apt-pkg/init.cc:162
 -#: apt-pkg/init.cc:159
++#: apt-pkg/init.cc:165
  msgid "Unable to determine a suitable packaging system type"
  msgstr ""
  
@@@ -2553,17 -2563,17 +2585,17 @@@ msgstr "
  msgid "The list of sources could not be read."
  msgstr ""
  
--#: apt-pkg/policy.cc:344
++#: apt-pkg/policy.cc:339
  #, c-format
  msgid "Invalid record in the preferences file %s, no Package header"
  msgstr ""
  
--#: apt-pkg/policy.cc:366
++#: apt-pkg/policy.cc:361
  #, c-format
  msgid "Did not understand pin type %s"
  msgstr ""
  
--#: apt-pkg/policy.cc:374
++#: apt-pkg/policy.cc:369
  msgid "No priority (or zero) specified for pin"
  msgstr ""
  
@@@ -2571,155 -2581,155 +2603,167 @@@
  msgid "Cache has an incompatible versioning system"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:198
++#: apt-pkg/pkgcachegen.cc:187
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:215
++#: apt-pkg/pkgcachegen.cc:204
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:253
++#: apt-pkg/pkgcachegen.cc:242
  #, c-format
  msgid "Error occurred while processing %s (NewFileDesc1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:285
++#: apt-pkg/pkgcachegen.cc:274
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:289
++#: apt-pkg/pkgcachegen.cc:278
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
--#: apt-pkg/pkgcachegen.cc:324
++#: 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:320
++#: apt-pkg/pkgcachegen.cc:309
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:353
++#: apt-pkg/pkgcachegen.cc:342
  #, c-format
  msgid "Error occurred while processing %s (NewFileDesc2)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:360
++#: apt-pkg/pkgcachegen.cc:348
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:363
++#: apt-pkg/pkgcachegen.cc:351
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:366
++#: apt-pkg/pkgcachegen.cc:354
  msgid "Wow, you exceeded the number of descriptions this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:369
++#: apt-pkg/pkgcachegen.cc:357
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:398
++#: apt-pkg/pkgcachegen.cc:386
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:412
++#: apt-pkg/pkgcachegen.cc:400
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:418
++#: apt-pkg/pkgcachegen.cc:406
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:982
++#: apt-pkg/pkgcachegen.cc:959
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:1087
++#: apt-pkg/pkgcachegen.cc:1064
  msgid "Collecting File Provides"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
++#: apt-pkg/pkgcachegen.cc:1242 apt-pkg/pkgcachegen.cc:1249
  msgid "IO Error saving source cache"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:136
++#: apt-pkg/acquire-item.cc:135
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:484
++#: apt-pkg/acquire-item.cc:628
  msgid "MD5Sum mismatch"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574
--#: apt-pkg/acquire-item.cc:1717
++#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778
++#: apt-pkg/acquire-item.cc:1921
  msgid "Hash Sum mismatch"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1244
++#: apt-pkg/acquire-item.cc:1346
++#, 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:1361
++#, c-format
++msgid "Unable to find hash sum for '%s' in Release file"
++msgstr ""
++
++#: apt-pkg/acquire-item.cc:1397
  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:1281
++#: apt-pkg/acquire-item.cc:1434
  #, c-format
  msgid "Release file expired, ignoring %s (invalid since %s)"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1302
++#: apt-pkg/acquire-item.cc:1455
  #, c-format
  msgid "Conflicting distribution: %s (expected %s but got %s)"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1328
++#: apt-pkg/acquire-item.cc:1488
  #, c-format
  msgid ""
  "A error occurred during the signature verification. The repository is not "
  "updated and the previous index files will be used. GPG error: %s: %s\n"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1337
++#: apt-pkg/acquire-item.cc:1497
  #, c-format
  msgid "GPG error: %s: %s"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1365
++#: apt-pkg/acquire-item.cc:1569
  #, 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:1424
++#: apt-pkg/acquire-item.cc:1628
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
  "manually fix this package."
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1479
++#: apt-pkg/acquire-item.cc:1683
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1566
++#: apt-pkg/acquire-item.cc:1770
  msgid "Size mismatch"
  msgstr ""
  
@@@ -2728,27 -2738,27 +2772,27 @@@
  msgid "Unable to parse Release file %s"
  msgstr ""
  
--#: apt-pkg/indexrecords.cc:60
++#: apt-pkg/indexrecords.cc:63
  #, c-format
  msgid "No sections in Release file %s"
  msgstr ""
  
--#: apt-pkg/indexrecords.cc:94
++#: apt-pkg/indexrecords.cc:97
  #, c-format
  msgid "No Hash entry in Release file %s"
  msgstr ""
  
--#: apt-pkg/indexrecords.cc:107
++#: apt-pkg/indexrecords.cc:110
  #, c-format
  msgid "Invalid 'Valid-Until' entry in Release file %s"
  msgstr ""
  
--#: apt-pkg/indexrecords.cc:122
++#: apt-pkg/indexrecords.cc:125
  #, c-format
  msgid "Invalid 'Date' entry in Release file %s"
  msgstr ""
  
--#: apt-pkg/vendorlist.cc:66
++#: apt-pkg/vendorlist.cc:71
  #, c-format
  msgid "Vendor block %s contains no fingerprint"
  msgstr ""
@@@ -2836,22 -2846,22 +2880,22 @@@ msgstr "
  msgid "Source list entries for this disc are:\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908
++#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910
++#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913
++#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916
++#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2923,12 -2933,12 +2967,12 @@@ msgstr "
  msgid "Installing %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823
++#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:828
  #, c-format
  msgid "Configuring %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830
++#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:835
  #, c-format
  msgid "Removing %s"
  msgstr ""
@@@ -2949,92 -2959,92 +2993,99 @@@ msgid "Running post-installation trigge
  msgstr ""
  
  #. FIXME: use a better string after freeze
--#: apt-pkg/deb/dpkgpm.cc:646
++#: apt-pkg/deb/dpkgpm.cc:651
  #, c-format
  msgid "Directory '%s' missing"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675
++#: apt-pkg/deb/dpkgpm.cc:666 apt-pkg/deb/dpkgpm.cc:680
  #, c-format
  msgid "Could not open file '%s'"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:816
++#: apt-pkg/deb/dpkgpm.cc:821
  #, c-format
  msgid "Preparing %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:817
++#: apt-pkg/deb/dpkgpm.cc:822
  #, c-format
  msgid "Unpacking %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:822
++#: apt-pkg/deb/dpkgpm.cc:827
  #, c-format
  msgid "Preparing to configure %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:824
++#: apt-pkg/deb/dpkgpm.cc:829
  #, c-format
  msgid "Installed %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:829
++#: apt-pkg/deb/dpkgpm.cc:834
  #, c-format
  msgid "Preparing for removal of %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:831
++#: apt-pkg/deb/dpkgpm.cc:836
  #, c-format
  msgid "Removed %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:836
++#: apt-pkg/deb/dpkgpm.cc:841
  #, c-format
  msgid "Preparing to completely remove %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:837
++#: apt-pkg/deb/dpkgpm.cc:842
  #, c-format
  msgid "Completely removed %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:1043
++#: apt-pkg/deb/dpkgpm.cc:1062
  msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:1074
++#: apt-pkg/deb/dpkgpm.cc:1093
  msgid "Running dpkg"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:1277
++#: apt-pkg/deb/dpkgpm.cc:1301
  msgid "No apport report written because MaxReports is reached already"
  msgstr ""
  
  #. check if its not a follow up error
--#: apt-pkg/deb/dpkgpm.cc:1282
++#: apt-pkg/deb/dpkgpm.cc:1306
  msgid "dependency problems - leaving unconfigured"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:1284
++#: apt-pkg/deb/dpkgpm.cc:1308
  msgid ""
  "No apport report written because the error message indicates its a followup "
  "error from a previous failure."
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:1290
++#: apt-pkg/deb/dpkgpm.cc:1314
  msgid ""
  "No apport report written because the error message indicates a disk full "
  "error"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:1296
++#: apt-pkg/deb/dpkgpm.cc:1321
  msgid ""
  "No apport report written because the error message indicates a out of memory "
  "error"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:1303
++#. do not report dpkg I/O errors, this is a format string, so we compare
++#. the prefix and the suffix of the error with the dpkg error message
++#: apt-pkg/deb/dpkgpm.cc:1327
++#, c-format
++msgid "short read in buffer_copy %s"
++msgstr ""
++
++#: apt-pkg/deb/dpkgpm.cc:1337
  msgid ""
  "No apport report written because the error message indicates a dpkg I/O error"
  msgstr ""
@@@ -3065,30 -3075,30 +3116,37 @@@ msgstr "
  
  #. FIXME: fallback to a default mirror here instead
  #. and provide a config option to define that default
--#: methods/mirror.cc:200
++#: methods/mirror.cc:256
  #, c-format
  msgid "No mirror file '%s' found "
  msgstr ""
  
--#: methods/mirror.cc:343
++#. FIXME: fallback to a default mirror here instead
++#. and provide a config option to define that default
++#: methods/mirror.cc:263
++#, c-format
++msgid "Can not read mirror file '%s'"
++msgstr ""
++
++#: methods/mirror.cc:407
  #, c-format
  msgid "[Mirror: %s]"
  msgstr ""
  
--#: methods/rred.cc:465
++#: methods/rred.cc:503
  #, c-format
  msgid ""
  "Could not patch %s with mmap and with file operation usage - the patch seems "
  "to be corrupt."
  msgstr ""
  
--#: methods/rred.cc:470
++#: methods/rred.cc:508
  #, c-format
  msgid ""
  "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
  "to be corrupt."
  msgstr ""
  
--#: methods/rsh.cc:329
++#: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr ""