From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 22 May 2012 14:07:49 +0000 (+0200)
Subject: merged (and resolved a bunch of conflicts) of the debian-sid branch
X-Git-Tag: 0.9.13.exp1ubuntu1~73
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/800694cbf33e206935dc9e6e8fa6e9a036b8efad?hp=-c

merged (and resolved a bunch of conflicts) of the debian-sid branch
---

800694cbf33e206935dc9e6e8fa6e9a036b8efad
diff --combined apt-pkg/deb/dpkgpm.cc
index 653e14190,296426c80..7e937a85b
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -29,6 -29,7 +29,6 @@@
  #include <sys/wait.h>
  #include <signal.h>
  #include <errno.h>
 -#include <string.h>
  #include <stdio.h>
  #include <string.h>
  #include <algorithm>
@@@ -424,7 -425,7 +424,7 @@@ void pkgDPkgPM::DoStdin(int master
     unsigned char input_buf[256] = {0,}; 
     ssize_t len = read(0, input_buf, sizeof(input_buf));
     if (len)
-       write(master, input_buf, len);
+       FileFd::Write(master, input_buf, len);
     else
        d->stdin_is_dev_null = true;
  }
@@@ -450,7 -451,7 +450,7 @@@ void pkgDPkgPM::DoTerminalPty(int maste
     }  
     if(len <= 0) 
        return;
-    write(1, term_buf, len);
+    FileFd::Write(1, term_buf, len);
     if(d->term_out)
        fwrite(term_buf, len, sizeof(char), d->term_out);
  }
@@@ -525,7 -526,7 +525,7 @@@ void pkgDPkgPM::ProcessDpkgStatusLine(i
  	     << ":" << s
  	     << endl;
        if(OutStatusFd > 0)
- 	 write(OutStatusFd, status.str().c_str(), status.str().size());
+ 	 FileFd::Write(OutStatusFd, status.str().c_str(), status.str().size());
        if (Debug == true)
  	 std::clog << "send: '" << status.str() << "'" << endl;
  
@@@ -549,7 -550,7 +549,7 @@@
  	     << ":" << list[3]
  	     << endl;
        if(OutStatusFd > 0)
- 	 write(OutStatusFd, status.str().c_str(), status.str().size());
+ 	 FileFd::Write(OutStatusFd, status.str().c_str(), status.str().size());
        if (Debug == true)
  	 std::clog << "send: '" << status.str() << "'" << endl;
        pkgFailures++;
@@@ -563,7 -564,7 +563,7 @@@
  	     << ":" << list[3]
  	     << endl;
        if(OutStatusFd > 0)
- 	 write(OutStatusFd, status.str().c_str(), status.str().size());
+ 	 FileFd::Write(OutStatusFd, status.str().c_str(), status.str().size());
        if (Debug == true)
  	 std::clog << "send: '" << status.str() << "'" << endl;
        return;
@@@ -591,7 -592,7 +591,7 @@@
  	     << ":" << s
  	     << endl;
        if(OutStatusFd > 0)
- 	 write(OutStatusFd, status.str().c_str(), status.str().size());
+ 	 FileFd::Write(OutStatusFd, status.str().c_str(), status.str().size());
        if (Debug == true)
  	 std::clog << "send: '" << status.str() << "'" << endl;
     }
@@@ -862,6 -863,8 +862,8 @@@ static int racy_pselect(int nfds, fd_se
  */
  bool pkgDPkgPM::Go(int OutStatusFd)
  {
+    pkgPackageManager::SigINTStop = false;
+ 
     // Generate the base argument list for dpkg
     std::vector<const char *> Args;
     unsigned long StartSize = 0;
@@@ -907,7 -910,7 +909,7 @@@
        dup2(nullfd, STDIN_FILENO);
        dup2(nullfd, STDOUT_FILENO);
        dup2(nullfd, STDERR_FILENO);
-       execv(Args[0], (char**) &Args[0]);
+       execvp(Args[0], (char**) &Args[0]);
        _error->WarningE("dpkgGo", "Can't detect if dpkg supports multi-arch!");
        _exit(2);
     }
@@@ -1053,7 -1056,8 +1055,8 @@@
        }
  
        int fd[2];
-       pipe(fd);
+       if (pipe(fd) != 0)
+ 	 return _error->Errno("pipe","Failed to create IPC pipe to dpkg");
  
  #define ADDARG(X) Args.push_back(X); Size += strlen(X)
  #define ADDARGC(X) Args.push_back(X); Size += sizeof(X) - 1
@@@ -1234,7 -1238,7 +1237,7 @@@
  		<< (PackagesDone/float(PackagesTotal)*100.0) 
  		<< ":" << _("Running dpkg")
  		<< endl;
- 	 write(OutStatusFd, status.str().c_str(), status.str().size());
+ 	 FileFd::Write(OutStatusFd, status.str().c_str(), status.str().size());
        }
        Child = ExecFork();
              
@@@ -1431,9 -1435,8 +1434,8 @@@
  }
  
  void SigINT(int sig) {
-    if (_config->FindB("APT::Immediate-Configure-All",false)) 
-       pkgPackageManager::SigINTStop = true;
- } 
+    pkgPackageManager::SigINTStop = true;
+ }
  									/*}}}*/
  // pkgDpkgPM::Reset - Dump the contents of the command list		/*{{{*/
  // ---------------------------------------------------------------------
@@@ -1448,11 -1451,17 +1450,17 @@@ void pkgDPkgPM::Reset(
  /* */
  void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) 
  {
+    // If apport doesn't exist or isn't installed do nothing
+    // This e.g. prevents messages in 'universes' without apport
+    pkgCache::PkgIterator apportPkg = Cache.FindPkg("apport");
+    if (apportPkg.end() == true || apportPkg->CurrentVer == 0)
+       return;
+ 
     string pkgname, reportfile, srcpkgname, pkgver, arch;
     string::size_type pos;
     FILE *report;
  
 -   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;
@@@ -1479,49 -1488,18 +1487,49 @@@
     }
  
     // do not report out-of-memory failures 
 -   if(strstr(errormsg, strerror(ENOMEM)) != NULL) {
 +   if(strstr(errormsg, strerror(ENOMEM)) != NULL ||
 +      strstr(errormsg, "failed to 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;
 +   // do not report bugs regarding inaccessible local files
 +   if(strstr(errormsg, strerror(ENOENT)) != NULL ||
 +      strstr(errormsg, "cannot access archive") != NULL) {
 +      std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl;
 +      return;
 +   }
 +
 +   // do not report errors encountered when decompressing packages
 +   if(strstr(errormsg, "--fsys-tarfile returned error exit status 2") != NULL) {
 +      std::clog << _("No apport report written because the error message indicates an issue on the local system") << 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
 +   vector<string> io_errors;
 +   io_errors.push_back(string("failed to read on buffer copy for %s"));
 +   io_errors.push_back(string("failed in write on buffer copy for %s"));
 +   io_errors.push_back(string("short read on buffer copy for %s"));
 +
 +   for (vector<string>::iterator I = io_errors.begin(); I != io_errors.end(); I++)
 +   {
 +      vector<string> list = VectorizeString(dgettext("dpkg", (*I).c_str()), '%');
 +      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
     pkgname = flNotDir(pkgpath);
     pos = pkgname.find('_');
@@@ -1566,7 -1544,7 +1574,7 @@@
  	 if(strstr(strbuf,"Package:") == strbuf)
  	 {
  	    char pkgname[255], version[255];
- 	    if(sscanf(strbuf, "Package: %s %s", pkgname, version) == 2)
+ 	    if(sscanf(strbuf, "Package: %254s %254s", pkgname, version) == 2)
  	       if(strcmp(pkgver.c_str(), version) == 0)
  	       {
  		  fclose(report);
@@@ -1608,24 -1586,6 +1616,24 @@@
        fprintf(report, "DpkgTerminalLog:\n");
        log = fopen(logfile_name.c_str(),"r");
        if(log != NULL)
 +      {
 +	 while( fgets(buf, sizeof(buf), log) != NULL)
 +	    fprintf(report, " %s", buf);
 +         fprintf(report, " \n");
 +	 fclose(log);
 +      }
 +   }
 +
 +   // attach history log it if we have it
 +   string histfile_name = _config->FindFile("Dir::Log::History");
 +   if (!histfile_name.empty())
 +   {
 +      FILE *log = NULL;
 +      char buf[1024];
 +
 +      fprintf(report, "DpkgHistoryLog:\n");
 +      log = fopen(histfile_name.c_str(),"r");
 +      if(log != NULL)
        {
  	 while( fgets(buf, sizeof(buf), log) != NULL)
  	    fprintf(report, " %s", buf);
@@@ -1637,7 -1597,10 +1645,10 @@@
     const char *ops_str[] = {"Install", "Configure","Remove","Purge"};
     fprintf(report, "AptOrdering:\n");
     for (vector<Item>::iterator I = List.begin(); I != List.end(); ++I)
-       fprintf(report, " %s: %s\n", (*I).Pkg.Name(), ops_str[(*I).Op]);
+       if ((*I).Pkg != NULL)
+          fprintf(report, " %s: %s\n", (*I).Pkg.Name(), ops_str[(*I).Op]);
+       else
+          fprintf(report, " %s: %s\n", "NULL", ops_str[(*I).Op]);
  
     // attach dmesg log (to learn about segfaults)
     if (FileExists("/bin/dmesg"))
diff --combined apt-pkg/depcache.cc
index fdfd1c713,2656e9b42..56194e244
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@@ -871,7 -871,6 +871,7 @@@ bool pkgDepCache::IsDeleteOk(PkgIterato
     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)
@@@ -964,6 -963,13 +964,13 @@@ struct CompareProviders 
  	 else if ((B->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
  	    return true;
        }
+       if ((A->Flags & pkgCache::Flag::Important) != (B->Flags & pkgCache::Flag::Important))
+       {
+ 	 if ((A->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important)
+ 	    return false;
+ 	 else if ((B->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important)
+ 	    return true;
+       }
        // higher priority seems like a good idea
        if (AV->Priority != BV->Priority)
  	 return AV->Priority < BV->Priority;
@@@ -1146,9 -1152,8 +1153,8 @@@ bool pkgDepCache::MarkInstall(PkgIterat
        }
  
        /* This bit is for processing the possibilty of an install/upgrade
-          fixing the problem */
-       if (Start->Type != Dep::DpkgBreaks &&
- 	  (DepState[Start->ID] & DepCVer) == DepCVer)
+          fixing the problem for "positive" dependencies */
+       if (Start.IsNegative() == false && (DepState[Start->ID] & DepCVer) == DepCVer)
        {
  	 APT::VersionList verlist;
  	 pkgCache::VerIterator Cand = PkgState[Start.TargetPkg()->ID].CandidateVerIter(*this);
@@@ -1159,7 -1164,7 +1165,7 @@@
  	    pkgCache::VerIterator V = Prv.OwnerVer();
  	    pkgCache::VerIterator Cand = PkgState[Prv.OwnerPkg()->ID].CandidateVerIter(*this);
  	    if (Cand.end() == true || V != Cand ||
- 		VS().CheckDep(Cand.VerStr(), Start->CompareOp, Start.TargetVer()) == false)
+ 		VS().CheckDep(Prv.ProvideVersion(), Start->CompareOp, Start.TargetVer()) == false)
  	       continue;
  	    verlist.insert(Cand);
  	 }
@@@ -1192,13 -1197,13 +1198,13 @@@
  	 }
  	 continue;
        }
- 
-       /* For conflicts we just de-install the package and mark as auto,
-          Conflicts may not have or groups.  For dpkg's Breaks we try to
-          upgrade the package. */
-       if (Start.IsNegative() == true)
+       /* Negative dependencies have no or-group
+ 	 If the dependency isn't versioned, we try if an upgrade might solve the problem.
+ 	 Otherwise we remove the offender if needed */
+       else if (Start.IsNegative() == true && Start->Type != pkgCache::Dep::Obsoletes)
        {
  	 SPtrArray<Version *> List = Start.AllTargets();
+ 	 pkgCache::PkgIterator TrgPkg = Start.TargetPkg();
  	 for (Version **I = List; *I != 0; I++)
  	 {
  	    VerIterator Ver(*this,*I);
@@@ -1209,15 -1214,17 +1215,17 @@@
  	    if (PkgState[Pkg->ID].InstallVer == 0)
  	       continue;
  
- 	    if (PkgState[Pkg->ID].CandidateVer != *I &&
- 		Start->Type == Dep::DpkgBreaks &&
+ 	    if ((Start->Version != 0 || TrgPkg != Pkg) &&
+ 		PkgState[Pkg->ID].CandidateVer != PkgState[Pkg->ID].InstallVer &&
+ 		PkgState[Pkg->ID].CandidateVer != *I &&
  		MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps) == true)
  	       continue;
- 	    else if (MarkDelete(Pkg,false,Depth + 1, false) == false)
+ 	    else if ((Start->Type == pkgCache::Dep::Conflicts || Start->Type == pkgCache::Dep::DpkgBreaks) &&
+ 		     MarkDelete(Pkg,false,Depth + 1, false) == false)
  	       break;
  	 }
  	 continue;
-       }      
+       }
     }
  
     return Dep.end() == true;
@@@ -1642,6 -1649,7 +1650,7 @@@ bool pkgDepCache::MarkRequired(InRootSe
     {
        if(!(PkgState[p->ID].Flags & Flag::Auto) ||
  	  (p->Flags & Flag::Essential) ||
+ 	  (p->Flags & Flag::Important) ||
  	  userFunc.InRootSet(p) ||
  	  // be nice even then a required package violates the policy (#583517)
  	  // and do the full mark process also for required packages
diff --combined apt-pkg/init.cc
index 4c15858a1,76278921f..4818174ac
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@@ -24,7 -24,7 +24,7 @@@
  
  #define Stringfy_(x) # x
  #define Stringfy(x)  Stringfy_(x)
- const char *pkgVersion = VERSION;
+ const char *pkgVersion = PACKAGE_VERSION;
  const char *pkgLibVersion = Stringfy(APT_PKG_MAJOR) "."
                              Stringfy(APT_PKG_MINOR) "." 
                              Stringfy(APT_PKG_RELEASE);
@@@ -92,7 -92,6 +92,7 @@@ bool pkgInitConfig(Configuration &Cnf
     Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
     Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$");
     Cnf.Set("Dir::Ignore-Files-Silently::", "\\.orig$");
 +   Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$");
  
     // Default cdrom mount point
     Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/");
diff --combined apt-pkg/packagemanager.cc
index cefb760af,46fc499c6..80369dd1a
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@@ -25,9 -25,10 +25,10 @@@
  #include <apt-pkg/configuration.h>
  #include <apt-pkg/sptr.h>
  
- #include <apti18n.h>
  #include <iostream>
  #include <fcntl.h>
+ 
+ #include <apti18n.h>
  									/*}}}*/
  using namespace std;
  
@@@ -183,8 -184,7 +184,7 @@@ bool pkgPackageManager::CreateOrderList
  	 continue;
        
        // Mark the package and its dependends for immediate configuration
-       if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential ||
- 	   (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) &&
+       if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) &&
  	  NoImmConfigure == false) || ImmConfigureAll)
        {
  	 if(Debug && !ImmConfigureAll)
@@@ -338,7 -338,7 +338,7 @@@ bool pkgPackageManager::SmartConfigure(
        however if there is a loop (A depends on B, B depends on A) this will not 
        be the case, so check for dependencies before configuring. */
     bool Bad = false, Changed = false;
 -   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
 +   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000);
     unsigned int i=0;
     do
     {
@@@ -523,7 -523,8 +523,8 @@@ bool pkgPackageManager::EarlyRemove(Pkg
  
     // Essential packages get special treatment
     bool IsEssential = false;
-    if ((Pkg->Flags & pkgCache::Flag::Essential) != 0)
+    if ((Pkg->Flags & pkgCache::Flag::Essential) != 0 ||
+        (Pkg->Flags & pkgCache::Flag::Important) != 0)
        IsEssential = true;
  
     /* Check for packages that are the dependents of essential packages and 
@@@ -533,7 -534,8 +534,8 @@@
        for (DepIterator D = Pkg.RevDependsList(); D.end() == false &&
  	   IsEssential == false; ++D)
  	 if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
- 	    if ((D.ParentPkg()->Flags & pkgCache::Flag::Essential) != 0)
+ 	    if ((D.ParentPkg()->Flags & pkgCache::Flag::Essential) != 0 ||
+ 	        (D.ParentPkg()->Flags & pkgCache::Flag::Important) != 0)
  	       IsEssential = true;
     }
  
@@@ -600,8 -602,8 +602,8 @@@ bool pkgPackageManager::SmartUnPack(Pkg
        This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured),
        or by the ConfigureAll call at the end of the for loop in OrderInstall. */
     bool Changed = false;
 -   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
 +   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000);
-    unsigned int i=0;
+    unsigned int i = 0;
     do 
     {
        Changed = false;
@@@ -783,7 -785,7 +785,7 @@@
  			   VerIterator V(Cache,*I);
  			   PkgIterator P = V.ParentPkg();
  			   // we are checking for installation as an easy 'protection' against or-groups and (unchosen) providers
- 			   if (P->CurrentVer == 0 || P != Pkg || (P.CurrentVer() != V && Cache[P].InstallVer != V))
+ 			   if (P != Pkg || (P.CurrentVer() != V && Cache[P].InstallVer != V))
  			      continue;
  			   circle = true;
  			   break;
diff --combined cmdline/apt-get.cc
index 7c7e94eba,c996017b8..1c6d39824
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -713,11 -713,32 +713,32 @@@ public
  	}
  
  	virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) {
- 		APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::NEWEST);
- 		if (verset.empty() == false)
- 			return *(verset.begin());
- 		if (ShowError == true)
- 			ioprintf(out, _("Virtual packages like '%s' can't be removed\n"), Pkg.FullName(true).c_str());
+ 		if (Pkg->ProvidesList != 0)
+ 		{
+ 			APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::NEWEST);
+ 			if (verset.empty() == false)
+ 				return *(verset.begin());
+ 			if (ShowError == true)
+ 				ioprintf(out, _("Virtual packages like '%s' can't be removed\n"), Pkg.FullName(true).c_str());
+ 		}
+ 		else
+ 		{
+ 			pkgCache::GrpIterator Grp = Pkg.Group();
+ 			pkgCache::PkgIterator P = Grp.PackageList();
+ 			for (; P.end() != true; P = Grp.NextPkg(P))
+ 			{
+ 				if (P == Pkg)
+ 					continue;
+ 				if (P->CurrentVer != 0) {
+ 					// TRANSLATORS: Note, this is not an interactive question
+ 					ioprintf(c1out,_("Package '%s' is not installed, so not removed. Did you mean '%s'?\n"),
+ 						 Pkg.FullName(true).c_str(), P.FullName(true).c_str());
+ 					break;
+ 				}
+ 			}
+ 			if (P.end() == true)
+ 				ioprintf(c1out,_("Package '%s' is not installed, so not removed\n"),Pkg.FullName(true).c_str());
+ 		}
  		return pkgCache::VerIterator(Cache, 0);
  	}
  
@@@ -904,7 -925,23 +925,23 @@@ struct TryToRemove 
        if ((Pkg->CurrentVer == 0 && PurgePkgs == false) ||
  	  (PurgePkgs == true && Pkg->CurrentState == pkgCache::State::NotInstalled))
        {
- 	 ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.FullName(true).c_str());
+ 	 pkgCache::GrpIterator Grp = Pkg.Group();
+ 	 pkgCache::PkgIterator P = Grp.PackageList();
+ 	 for (; P.end() != true; P = Grp.NextPkg(P))
+ 	 {
+ 	    if (P == Pkg)
+ 	       continue;
+ 	    if (P->CurrentVer != 0 || (PurgePkgs == true && P->CurrentState != pkgCache::State::NotInstalled))
+ 	    {
+ 	       // TRANSLATORS: Note, this is not an interactive question
+ 	       ioprintf(c1out,_("Package '%s' is not installed, so not removed. Did you mean '%s'?\n"),
+ 			Pkg.FullName(true).c_str(), P.FullName(true).c_str());
+ 	       break;
+ 	    }
+ 	 }
+ 	 if (P.end() == true)
+ 	    ioprintf(c1out,_("Package '%s' is not installed, so not removed\n"),Pkg.FullName(true).c_str());
+ 
  	 // MarkInstall refuses to install packages on hold
  	 Pkg->SelectedState = pkgCache::State::Hold;
        }
@@@ -1378,7 -1415,7 +1415,7 @@@ bool InstallPackages(CacheFile &Cache,b
  	"all files have been overwritten by other packages:",
  	"The following packages disappeared from your system as\n"
  	"all files have been overwritten by other packages:", disappearedPkgs.size()), disappear, "");
-    c0out << _("Note: This is done automatic and on purpose by dpkg.") << std::endl;
+    c0out << _("Note: This is done automatically and on purpose by dpkg.") << std::endl;
  
     return true;
  }
@@@ -1642,10 -1679,13 +1679,13 @@@ bool DoUpdate(CommandLine &CmdL
         ListUpdate(Stat, *List);
  
     // Rebuild the cache.
-    pkgCacheFile::RemoveCaches();
-    if (Cache.BuildCaches() == false)
-       return false;
-    
+    if (_config->FindB("pkgCacheFile::Generate", true) == true)
+    {
+       pkgCacheFile::RemoveCaches();
+       if (Cache.BuildCaches() == false)
+ 	 return false;
+    }
+ 
     return true;
  }
  									/*}}}*/
@@@ -1674,12 -1714,13 +1714,13 @@@ bool DoAutomaticRemove(CacheFile &Cache
     bool smallList = (hideAutoRemove == false &&
  		strcasecmp(_config->Find("APT::Get::HideAutoRemove","").c_str(),"small") == 0);
  
-    string autoremovelist, autoremoveversions;
     unsigned long autoRemoveCount = 0;
     APT::PackageSet tooMuch;
+    APT::PackageList autoRemoveList;
     // look over the cache to see what can be removed
-    for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg)
+    for (unsigned J = 0; J < Cache->Head().PackageCount; ++J)
     {
+       pkgCache::PkgIterator Pkg(Cache,Cache.List[J]);
        if (Cache[Pkg].Garbage)
        {
  	 if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install())
@@@ -1696,6 -1737,8 +1737,8 @@@
  	 }
  	 else
  	 {
+ 	    if (hideAutoRemove == false && Cache[Pkg].Delete() == false)
+ 	       autoRemoveList.insert(Pkg);
  	    // if the package is a new install and already garbage we don't need to
  	    // install it in the first place, so nuke it instead of show it
  	    if (Cache[Pkg].Install() == true && Pkg.CurrentVer() == 0)
@@@ -1705,16 -1748,8 +1748,8 @@@
  	       Cache->MarkDelete(Pkg, false);
  	    }
  	    // only show stuff in the list that is not yet marked for removal
- 	    else if(hideAutoRemove == false && Cache[Pkg].Delete() == false) 
- 	    {
+ 	    else if(hideAutoRemove == false && Cache[Pkg].Delete() == false)
  	       ++autoRemoveCount;
- 	       // we don't need to fill the strings if we don't need them
- 	       if (smallList == false)
- 	       {
- 		 autoremovelist += Pkg.FullName(true) + " ";
- 		 autoremoveversions += string(Cache[Pkg].CandVersion) + "\n";
- 	       }
- 	    }
  	 }
        }
     }
@@@ -1749,14 -1784,7 +1784,7 @@@
  		    std::clog << "Save " << Pkg << " as another installed garbage package depends on it" << std::endl;
  		 Cache->MarkInstall(Pkg, false);
  		 if (hideAutoRemove == false)
- 		 {
  		    ++autoRemoveCount;
- 		    if (smallList == false)
- 		    {
- 		       autoremovelist += Pkg.FullName(true) + " ";
- 		       autoremoveversions += string(Cache[Pkg].CandVersion) + "\n";
- 		    }
- 		 }
  		 tooMuch.erase(Pkg);
  		 Changed = true;
  		 break;
@@@ -1766,6 -1794,18 +1794,18 @@@
        } while (Changed == true);
     }
  
+    std::string autoremovelist, autoremoveversions;
+    if (smallList == false && autoRemoveCount != 0)
+    {
+       for (APT::PackageList::const_iterator Pkg = autoRemoveList.begin(); Pkg != autoRemoveList.end(); ++Pkg)
+       {
+ 	 if (Cache[Pkg].Garbage == false)
+ 	    continue;
+ 	 autoremovelist += Pkg.FullName(true) + " ";
+ 	 autoremoveversions += string(Cache[Pkg].CandVersion) + "\n";
+       }
+    }
+ 
     // Now see if we had destroyed anything (if we had done anything)
     if (Cache->BrokenCount() != 0)
     {
@@@ -1789,7 -1829,7 +1829,7 @@@
        else
  	 ioprintf(c1out, P_("%lu package was automatically installed and is no longer required.\n",
  	          "%lu packages were automatically installed and are no longer required.\n", autoRemoveCount), autoRemoveCount);
-       c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl;
+       c1out << P_("Use 'apt-get autoremove' to remove it.", "Use 'apt-get autoremove' to remove them.", autoRemoveCount) << std::endl;
     }
     return true;
  }
@@@ -2456,7 -2496,7 +2496,7 @@@ bool DoSource(CommandLine &CmdL
  		  Src.c_str(), vcs.c_str(), uri.c_str());
  	 if(vcs == "Bzr") 
  	    ioprintf(c1out,_("Please use:\n"
 -			     "bzr get %s\n"
 +			     "bzr branch %s\n"
  			     "to retrieve the latest (possibly unreleased) "
  			     "updates to the package.\n"),
  		     uri.c_str());
@@@ -2749,8 -2789,18 +2789,18 @@@ bool DoBuildDep(CommandLine &CmdL
              
        // Process the build-dependencies
        vector<pkgSrcRecords::Parser::BuildDepRec> BuildDeps;
-       if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only", false), StripMultiArch) == false)
-       	return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str());
+       // FIXME: Can't specify architecture to use for [wildcard] matching, so switch default arch temporary
+       if (hostArch.empty() == false)
+       {
+ 	 std::string nativeArch = _config->Find("APT::Architecture");
+ 	 _config->Set("APT::Architecture", hostArch);
+ 	 bool Success = Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only", false), StripMultiArch);
+ 	 _config->Set("APT::Architecture", nativeArch);
+ 	 if (Success == false)
+ 	    return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str());
+       }
+       else if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only", false), StripMultiArch) == false)
+ 	    return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str());
     
        // Also ensure that build-essential packages are present
        Configuration::Item const *Opts = _config->Tree("APT::Build-Essential");
@@@ -2863,7 -2913,7 +2913,7 @@@
  	       if ((BADVER(Ver)) == false)
  	       {
  		  string forbidden;
 -		  if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All)
 +		  if (Ver->MultiArch == pkgCache::Version::None)
  		  {
  		     if (colon == string::npos)
  		     {
@@@ -2878,7 -2928,7 +2928,7 @@@
  			forbidden = "Multi-Arch: same";
  		     // :native gets the buildArch
  		  }
 -		  else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign)
 +		  else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign || Ver->MultiArch == pkgCache::Version::All)
  		  {
  		     if (colon != string::npos)
  			forbidden = "Multi-Arch: foreign";
@@@ -3154,10 -3204,7 +3204,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        			/*{{{*/
@@@ -3261,7 -3308,7 +3311,7 @@@ bool DoMoo(CommandLine &CmdL
  /* */
  bool ShowHelp(CommandLine &CmdL)
  {
-    ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+    ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
  	    COMMON_ARCH,__DATE__,__TIME__);
  	    
     if (_config->FindB("version") == true)
diff --combined configure.in
index 3e9692a53,d574c18e5..e27825dc8
--- a/configure.in
+++ b/configure.in
@@@ -17,11 -17,15 +17,15 @@@ AC_INIT(configure.in
  AC_CONFIG_AUX_DIR(buildlib)
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
- dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.8.16~exp12ubuntu7")
  PACKAGE="apt"
 -PACKAGE_VERSION="0.9.4"
++PACKAGE_VERSION="0.9.5ubuntu1~20120522"
+ PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
+ AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
+ AC_DEFINE_UNQUOTED(PACKAGE_MAIL,"$PACKAGE_MAIL")
  AC_SUBST(PACKAGE)
+ AC_SUBST(PACKAGE_VERSION)
+ AC_SUBST(PACKAGE_MAIL)
  
  dnl Check the archs, we want the target type.
  AC_CANONICAL_SYSTEM
@@@ -87,9 -91,21 +91,21 @@@ AC_CHECK_LIB(curl, curl_easy_init
  
  AC_SUBST(BDBLIB)
  
+ HAVE_ZLIB=no
  AC_CHECK_LIB(z, gzopen,
- 	[AC_CHECK_HEADER(zlib.h, [], AC_MSG_ERROR([failed: zlib.h not found]))],
+ 	[AC_CHECK_HEADER(zlib.h, [HAVE_ZLIB=yes], AC_MSG_ERROR([failed: zlib.h not found]))],
  	AC_MSG_ERROR([failed: Need libz]))
+ AC_SUBST(HAVE_ZLIB)
+ if test "x$HAVE_ZLIB" = "xyes"; then
+ 	AC_DEFINE(HAVE_ZLIB)
+ fi
+ 
+ HAVE_BZ2=no
+ AC_CHECK_LIB(bz2, BZ2_bzopen,[AC_CHECK_HEADER(bzlib.h, [HAVE_BZ2=yes], [])], [])
+ AC_SUBST(HAVE_BZ2)
+ if test "x$HAVE_BZ2" = "xyes"; then
+ 	AC_DEFINE(HAVE_BZ2)
+ fi
  
  dnl Converts the ARCH to be something singular for this general CPU family
  dnl This is often the dpkg architecture string.
@@@ -103,12 -119,6 +119,6 @@@ f
  AC_MSG_RESULT($archset)
  AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset")
  
- dnl We use C99 types if at all possible
- AC_CACHE_CHECK([for C99 integer types],apt_cv_c9x_ints,[
-     AC_TRY_COMPILE([#include <inttypes.h>],
-                    [uint8_t Foo1;uint16_t Foo2;uint32_t Foo3;],
- 		   apt_cv_c9x_ints=yes,apt_cv_c9x_ints=no)])
- 
  dnl Single Unix Spec statvfs
  AC_CHECK_FUNC(statvfs,[HAVE_STATVFS=yes])
  AC_SUBST(HAVE_STATVFS)
@@@ -128,46 -138,9 +138,9 @@@ dnl We should use the real timegm funct
  AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM))
  AC_SUBST(HAVE_TIMEGM)
  
- dnl Check the sizes etc. of the architecture
- dnl This is stupid, it should just use the AC macros like it does below
- dnl Cross compilers can either get a real C library or preload the cache
- dnl with their size values.
- changequote(,)
- archline="`awk \" ! /^#|^\\\$/ {if (match(\\\"$archset\\\",\\\$1)) {print; exit}}\" $srcdir/buildlib/sizetable | cut -f 2- -d ' '`"
- if test "x$archline" != "x"; then
-    changequote([,])
-    set $archline
-    if test "$1" = "little"; then
-       ac_cv_c_bigendian=no
-    else
-       ac_cv_c_bigendian=yes
-    fi
-    size_char=$2
-    size_int=$3
-    size_short=$4
-    size_long=$5
- fi
- 
- dnl I wonder what AC_C_BIGENDIAN does if you cross compile...
- dnl This is probably bogus, as above we only care if we have to build our own
- dnl C9x types.
- if test "$cross_compiling" = "yes" -a "x$archline" = "x"; then
-   AC_MSG_ERROR(When cross compiling, architecture must be present in sizetable)
- fi
+ dnl Check the architecture
  AC_C_BIGENDIAN
  
- dnl We do not need this if we have inttypes!
- HAVE_C9X=yes
- if test x"$apt_cv_c9x_ints" = x"no"; then
-    AC_CHECK_SIZEOF(char,$size_char)
-    AC_CHECK_SIZEOF(int,$size_int)
-    AC_CHECK_SIZEOF(short,$size_short)
-    AC_CHECK_SIZEOF(long,$size_long)
-   
-    HAVE_C9X=
-    AC_SUBST(HAVE_C9X)
- fi
- 
  dnl HP-UX sux..
  AC_MSG_CHECKING(for missing socklen_t)
  AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[
@@@ -218,4 -191,4 +191,4 @@@ f
  AC_SUBST(USE_NLS)
  AC_PATH_PROG(BASH, bash)
  
- AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile,make -s dirs)
+ AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile:doc/Doxyfile.in,make -s dirs)
diff --combined debian/changelog
index c82c73d0e,568590edb..5a21fb8b4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,149 -1,411 +1,570 @@@
++apt (0.9.5ubuntu1) UNRELEASED; urgency=low
++
++  * merged from debian, 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
++    - APT::pkgPackageManager::MaxLoopCount set to 5000
++    - apport pkgfailure handling
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 May 2012 15:57:26 +0200
++
+ apt (0.9.5) UNRELEASED; urgency=low
+ 
+   [ Chris Leick ]
+   * proofreading of the manpage pot
+   * German manpage translation update (Closes: #673294)
+ 
+   [ David Kalnischkies ]
+   * buildlib/podomain.mak:
+     - ensure that all sources end up in the srclist so that we don't
+       forget to extract half of the translation strings
+   * buildlib/inttypes.h.in:
+     - remove inttypes.h compatibility as providing such a c99 types
+       compatibility conflicts with the usage of c99 type long long
+   * apt-pkg/contrib/mmap.cc:
+     - have a dummy SyncToFd around in case of ReadOnly access to a
+       compressed file as we otherwise on Close() do not delete[] the
+       char buffer but munmap() it… (Closes: #673815)
+   * debian/control:
+     - moving debiandoc-sgml to Build-Depends-Indep was one step too much
+       for the buildds as we still build two sgml files in arch:any
+   * debian/rules:
+     - move internal-solver as 'apt' to his friend dump-solver in
+       /usr/lib/apt/solvers to avoid writing a manpage for it
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 21 May 2012 15:10:49 +0200
+ 
+ apt (0.9.4) unstable; urgency=low
+ 
+   [ David Kalnischkies ]
+   * methods/http.cc:
+     - after many years of pointless discussions disable http/1.1 pipelining
+       by default as many webservers and proxies seem to be unable to conform
+       to specification must's (rfc2616 section 8.1.2.2) (LP: #996151)
+     - add spaces around PACKAGE_VERSION to fix FTBFS with -std=c++11
+   * apt-pkg/pkgcachegen.cc:
+     - make IsDuplicatedDescription static so that it is really private
+       as we don't need a symbol for it as it is not in a header
+   * Makefile, buildlib/*.mak:
+     - reshuffle dependencies so that parallel building seems to work
+     - separate manpages from the rest of the doc building
+   * prepare-release:
+     - apt-inst version isn't apt versions, so don't override variable
+   * debian/rules:
+     - apt-utils packages manpages, so it should depend on build-doc
+     - make apt and apt-utils packages depend on manpages instead of full doc
+   * debian/control:
+     - move doxygen and debiandoc-sgml to Build-Depends-Indep as docs
+       are no longer build in the same target as the manpages
+   * apt-pkg/acquire-methods.cc:
+     - factor out into private Dequeue() to fix access to deleted pointer
+   * apt-pkg/contrib/fileutl.cc:
+     - ensure that we close compressed fds, wait for forks and such even if
+       the FileFd itself is set to not autoclose the given Fd
+   * cmdline/apt-get.cc:
+     - use the host architecture, not the build architecture for matching
+       of [architecture restrictions] in Build-Depends (Closes: #672927)
+   * doc/makefile:
+     - build manpages with the correct l10n.gentext.default.language setting
+       to get the correct section titles provided by docbook
+   * doc/po/de.po:
+     - updated german manpage translation by Chris Leick, thanks!
+   * apt-pkg/packagemanager.cc:
+     - do not run into loop on new-pre-depends-breaks (Closes: #673536)
+   * doc/*.xml:
+     - add a few translator notes and reword some paragraphs to ensure that
+       translators and users alike can better understand them (Closes: #669409)
+     - in <term> mark all options with <option> and mark <term><option>
+       as untranslated for po4a removing ~200 unless "translateable" strings
+   * apt-pkg/aptconfiguration.cc:
+     - longcode Translation files are saved with encoded underscore,
+       so make sure to pick these files up as well for Acquire::Languages
+   * ftparchive/writer.cc:
+     - include Contents-* files in Release files (Closes: #673647)
+ 
+   [ Michael Vogt ]
+   * merged updated de.po, thanks to Holger Wansing (closes: #672466)
+   
+   [ Raphael Geissert ]
+   * apt-pkg/acquire*.cc:
+     - handle redirections in the worker with the right method instead of
+       in the method the redirection occured in (Closes: #668111)
+   * methods/http.cc:
+     - forbid redirects to change protocol
+   * methods/mirror.cc:
+     - generate an equal sign also for the first arch (Closes: #669142)
+ 
+   [ Marius Vollmer ]
+   * apt-pkg/algorithms.cc:
+     - fix memory leak of Flags in pkgSimulate by a proper destructor
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon, 21 May 2012 12:29:05 +0200
+ 
+ apt (0.9.3) unstable; urgency=low
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/contrib/strutl.cc:
+     - remove the message size limit from ioprintf and strprintf
+   * apt-pkg/contrib/configuration.cc:
+     - add a more versatile Dump() method
+     - normalize a bit by replacing // and /./ with / in FindFile
+     - /dev/null is a special absolute path as it has no subdirectories
+   * apt-pkg/acquire-worker.cc:
+     - use Dump() to generate the configuration message for sending
+   * cmdline/apt-config.cc:
+     - make it possible to limit dump to a subtree
+     - implement --empty and --format option for dump
+   * apt-pkg/cdrom.cc:
+     - use Dump() to generate the configuration output
+   * apt-pkg/depcache.cc:
+     - clearly separate 'positive' and 'negative' dependencies and
+       their upgrade-resolution tries in MarkInstall and especially don't
+       treat Conflicts differently compared to Breaks here
+     - provider is only a possible solution if the provides has the right
+       version (or none as we have no versioned provides in debian) and not
+       if the version of the provider matches
+   * edsp/edspsystem.cc:
+     - check with RealFileExists for scenario file as otherwise a directory
+       like one provided with RootDir triggers the usage of EDSP
+   * debian/libapt-inst1.5.symbols:
+     - use the correct library name the symbols header
+   * apt-pkg/pkgcachegen.cc:
+     - check if NewDescription allocation has failed and error out accordingly
+     - check if we work on a valid description in IsDuplicateDescription as
+       we end up working on dangling pointers otherwise which segfaults on
+       s390x and ppc64 (Closes: #669427)
+   * apt-pkg/deb/deblistparser.cc:
+     - check length and containing chars for a given description md5sum
+   * ensure that apti18n.h is included last as advertised (Closes: #671623)
+   * apt-pkg/acquire-worker.cc:
+     - revert the use of FileFd::Write in OutFdReady as we don't want error
+       reports about EAGAIN here as we retry later. Thanks to YOSHINO Yoshihito
+       for the report. (Closes: #671721)
+   * apt-pkg/contrib/fileutl.cc:
+     - check that the fd which are closed are valid
+     - ensure that we do init d only once and especially not with its own
+       content as this causes some "interesting" hickups resulting in segfaults
+       as it seems (Closes: #554387, #670979)
+     - collect zombie (de)compressor processes on reopen
+     - ensure that in error conditions the Fail flag is set
+     - ensure that d is set before accessing it
+   * apt-pkg/aptconfiguration.cc:
+     - use NULL instead of "" for no (un)compress parameters
+   * apt-pkg/algorithms.cc:
+     - factor out of ListUpdate a AcquireUpdate to be able to provide your
+       own pkgAcquire fetcher to the wrapper
+   * apt-inst/deb/debfile.h:
+     - readd 'md5.h' to the uncleaned header includes to make qapt build
+       against us again unchanged to unblock transition (Closes: #669163)
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 11 May 2012 17:16:22 +0200
+ 
+ apt (0.9.2) unstable; urgency=low
+ 
+   [ Michael Vogt ]
+   * apt-inst/contrib/extracttar.cc:
+     - ensure that in StartGzip the InFd is set to "AutoClose" to ensure
+       that the pipe is closed when InFd is closed. This fixes a Fd leak
+       (LP: #985452)
+ 
+   [ David Kalnischkies ]
+    * apt-pkg/deb/deblistparser.cc:
+     - only treat the native apt as essential by default (Closes: #669377)
+   * apt-pkg/contrib/fileutl.cc:
+     - redirect stderr from compressors to /dev/null
+   * apt-pkg/aptconfiguration.cc:
+     - if the compressor is not installed, but we link against it's
+       library accept it as a CompressionType (Closes: #669328)
+   * apt-pkg/contrib/sha2_internal.cc:
+     - do not use the input data directly but memcpy it instead as
+       it could be unaligned as in the http-transport which causes
+       a sigbus error on sparc (Closes: #669061)
+   * apt-pkg/cacheset.cc:
+     - actually return to the fallback modifier if we have detected we
+       should for packagenames which look like modifiers (Closes: #669591)
+ 
+   [ Adam Conrad ]
+   * Set FD_CLOEXEC on history.log's FD (Closes: #610069, LP: #636010)
+ 
+   [ Thorsten Spindler ]
+   * apt-pkg/deb/dpkgpm.cc:
+     - do not crash if (*I).Pkg is NULL (LP: #939867)
+ 
+   [ Malcolm Scott ]
+   * apt-pkg/packagemanager.cc:
+     - iterate over all pre-depends or-group member instead of looping
+       endlessly over the first member in SmartUnpack (LP: #985852)
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 20 Apr 2012 11:26:16 +0200
+ 
+ apt (0.9.1) unstable; urgency=low
+ 
+   [ David Kalnischkies ]
+   * cmdline/apt-get.cc:
+     - if pkgCacheFile::Generate is disabled in 'update' don't
+       remove the caches (and don't try to open them)
+   * apt-pkg/packagemanager.cc:
+     - init counter in SmartConfigure so that the loop-breaker isn't
+       triggered at random… (Closes: #669060)
+ 
+   [ Christian Perrier ]
+   * Fix typo in apt-get(8). Closes: #664833
+   * Replace "argument" by "paramètre" in French translation.
+     Merci, les Titeps!
+   * Drop hardcoded "en.html" suffix in apt-secure manpage.
+     Thanks to David Prevot.
+   
+  -- Michael Vogt <mvo@debian.org>  Tue, 17 Apr 2012 09:49:31 +0200
+ 
+ apt (0.9.0) unstable; urgency=low
+ 
+   * upload to debian/unstable
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon, 16 Apr 2012 15:53:17 +0200
+ 
+ apt (0.9.0~exp1) experimental; urgency=low
+ 
+   [ Michael Vogt ]
+   * apt-pkg/packagemanager.cc:
+     - fix inconsistent clog/cout usage in the debug output
+     - add APT::pkgPackageManager::MaxLoopCount to ensure that the
+       ordering code does not get into a endless loop when it flip-flops
+       between two states
+   * update libapt-inst1.4 to libapt-inst1.5 because of the cleanup 
+     performed
+   * prepare debian/unstable upload, if there are no issues with this
+     upload it will directly go into unstable as 0.9.0  
+ 
+   [ David Kalnischkies ]
+   * do not update po and pot files in the process of the build as this
+     causes timestamp changes for the mo files which therefore can't
+     be refcounted by dpkg for your M-A: same packages
+     (Closes: #659333, LP: #924628)
+   * apt-inst/database.{cc,h}, apt-inst/deb/dpkgdb.{cc,h}:
+     - drop instead of fix as it is only needed if you want to reimplement dpkg
+       and comes straight from the beginning of last decade (Closes: #663372)
+   * apt-inst/deb/debfile.cc:
+     - {Extract,Merge}Control() is another instance of "lets reimplement dpkg"
+       so shot of this code before someone ends up using this…
+   * debian/libapt-pkg4.12:
+     - update symbols file
+   * debian/apt-utils.install:
+     - ship the ftparchive, apt-extractemplates and apt-sortpkgs locales
+       in the apt-utils package instead of the apt package
+   * apt-pkg/packagemanager.cc:
+     - recheck all dependencies if we changed a package in SmartConfigure
+       as this could break an earlier dependency (LP: #940396)
+     - recheck dependencies in SmartUnpack after a change, too
+   * apt-pkg/acquire-worker.cc:
+     - check return of write() as gcc recommends
+   * apt-pkg/acquire.cc:
+     - check return of write() as gcc recommends
+   * apt-pkg/cdrom.cc:
+     - check return of chdir() and link() as gcc recommends
+   * apt-pkg/clean.cc:
+     - check return of chdir() as gcc recommends
+   * apt-pkg/contrib/netrc.cc:
+     - check return of asprintf() as gcc recommends
+   * methods/rred.cc:
+     - check return of writev() as gcc recommends
+   * methods/mirror.cc:
+     - check return of chdir() as gcc recommends
+   * apt-pkg/deb/dpkgpm.cc:
+     - check return of write() a gcc recommends
+   * apt-inst/deb/debfile.cc:
+     - check return of chdir() as gcc recommends
+   * apt-inst/deb/dpkgdb.cc:
+     - check return of chdir() as gcc recommends
+   * methods/makefile:
+     - do not link rred against libz anymore as FileFd handles all
+       this transparently now
+   * debian/control:
+     - bump Standards-Version to 3.9.3 (no changes needed)
+     - add libbz2-dev as new build-dependency
+     - remove the libz-dev alternative from zlib1g-dev build-dependency
+     - suggest xz-utils instead of bzip2 and lzma
+   * doc/apt-get.8.xml:
+     - typofix: respect → respecting, thanks Mike Erickson! (Closes: #664833)
+   * debian/rules:
+     - do not sed in configure.in to set the version-number
+   * prepare-release:
+     - add as a small script to lazy check and prepare releases
+   * doc/*:
+     - move the command synopsis out of each manpage into apt-verbatim.ent
+       as they are a hell to translate and just single out the parameters
+       which can be translated to apt.ent
+   * apt-pkg/aptconfiguration.cc:
+     - if present, prefer xz binary over lzma
+     - if we have zlib builtin insert add a dummy gzip compressor for FileFD
+     - do the same for bz2 builtin if available
+   * methods/bzip2.cc:
+     - remove it as the functionality for all compressors can be
+       provided by gzip.cc now with the usage of FileFD
+   * apt-pkg/contrib/fileutl.cc:
+     - use libz2 library for (de)compression instead of the bzip2 binary as
+       the first is a dependency of dpkg and the later just priority:optional
+       so we gain 'easier' access to bz2-compressed Translation files this way
+   * cmdline/apt-get.cc:
+     - print list of autoremoves in alphabetical order (Closes: #639008)
+ 
+   [ Bogdan Purcareata ]
+   * doc/apt-get.8.xml:
+     - add 'download' to the usage line (Closes: #649340)
+   * cmdline/apt-get.cc:
+     - distinguish information about 'apt-get autoremove' based on the
+       number of auto-removed packages both before and after the list
+       of packages (Closes: #665833)
+ 
+   [ Steve Langasek ]
+   * don't treat build-depends-indep as cross-build-dependencies; we should
+     always install the host arch versions.  LP: #968828.
+ 
+   [ Paolo Rotolo ]
+   * Fix string from automatic to automatically (LP: #967393).
+ 
+  -- Michael Vogt <mvo@debian.org>  Thu, 12 Apr 2012 12:40:39 +0200
+ 
+ apt (0.8.16~exp13) experimental; urgency=low
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/acquire-item.cc:
+     - remove 'old' InRelease file if we can't get a new one before
+       proceeding with Release.gpg to avoid the false impression of a still
+       trusted repository by a (still present) old InRelease file.
+       Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214)
+     - add Debug::pkgAcqArchive::NoQueue to disable package downloading
+   * apt-pkg/deb/dpkgpm.cc:
+     - chroot if needed before dpkg --assert-multi-arch
+     - ensure that dpkg binary doesn't have the chroot-directory prefixed
+     - call dpkg --assert-multi-arch with execvp instead of execv
+     - save the universe by not printing messages about apport if a package
+       with this name is not installed (Closes: #619646)
+     - handle a SIGINT in all modes as a break after the currently running
+       dpkg transaction instead of ignoring it completely
+   * apt-pkg/depcache.cc:
+     - if a M-A:same package is marked for reinstall, mark all it's installed
+       silbings for reinstallation as well (LP: #859188)
+   * apt-pkg/contrib/configuration.cc:
+     - do not stop parent transversal in FindDir if the value is empty
+   * methods/http{s,}.cc:
+     - if a file without an extension is requested send an 'Accept: text/*'
+       header to avoid that the server chooses unsupported compressed files
+       in a content-negotation attempt (Closes: #657560)
+     - remove the arbitrary MAXLEN limit for response lines (Closes: #658346)
+   * apt-pkg/aptconfiguration.cc:
+     - chroot if needed before calling dpkg --print-foreign-architectures
+     - ensure that architectures are not added multiple times
+   * cmdline/apt-mark.cc:
+     - detect if dpkg has multiarch support before calling --set-selections
+     - correctly ignore already (un)hold packages
+   * apt-pkg/cachefile.cc:
+     - clean up lost atomic cachefiles with 'clean' (Closes: #650513)
+   * apt-pkg/indexrecords.cc:
+     - do not create empty Entries as a sideeffect of Lookup()
+   * apt-pkg/acquire-item.cc:
+     - drop support for i18n/Index file (introduced in 0.8.11) and use
+       the Release file instead to get the Translations (Closes: #649314)
+     - use pdiff for Translation-* files if available (Closes: #657902)
+   * ftparchive/writer.cc:
+     - add 'Translation-*' to the default patterns
+   * cmdline/apt-get.cc:
+     - if a package can't be removed as it is not installed, suggest to
+       the user an (installed) multiarch silbing with 'Did you mean?'
+     - improve 'error' message for packages which are only referenced
+       e.g. in a Depends line and are now requested for removal
+   * cmdline/apt-cache.cc:
+     - correct --pre-depends option by using dash consistently (LP: #940837)
+   * apt-pkg/packagemanager.cc:
+     - do not try to a void a breaks if the broken package pre-depends
+       on the breaker, but let dpkg auto-deconfigure it
+   * apt-pkg/contrib/fileutl.cc:
+     - do not warn about the ignoring of directories (Closes: #662762)
+ 
+   [ Steve Langasek ]
+   * cmdline/apt-get.cc:
+     - for cross-build-dependencies M-A: none should be DEB_HOST_ARCH,
+       not DEB_BUILD_ARCH (Closes: #646288)
+ 
+   [ Colin Watson ]
+   * apt-pkg/algorithms.cc:
+     - don't break out of the main-resolver loop for Breaks to deal with all
+       of them in a single iteration (Closes: #657695, LP: #922485)
+     - use a signed int instead of short for score calculation as upgrades
+       become so big now that it can overflow (Closes: #657732, LP: #917173)
+   * Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to
+     handle compressed files again (LP: #924182, closes: #658096)
+ 
+   [ Michael Vogt ]
+   * apt-pkg/deb/dpkgpm.cc:
+     - fix crash when a package is in removed but residual config state
+       (LP: #923807)
+   * apt-pkg/contrib/fileutl.h:
+     - fix compat with FileFd::OpenDescriptor() in ReadOnlyGzip mode
+   * apt-pkg/packagemanager.cc:
+     - fix bug in predepends handling - ensure that packages that needs
+       unpackaging are unpacked before they are configured (LP: #927993)
+ 
+   [ Julian Andres Klode ]
+   * apt-pkg/deb/deblistparser.cc:
+     - Set the Essential flag on APT instead of only Important
+   * apt-pkg/packagemanager.cc:
+     - Do not use immediate configuration for packages with the Important flag
+   * Treat the Important flag like the Essential flag with those differences:
+     - No Immediate configuration (see above)
+     - Not automatically installed during dist-upgrade
+     - No higher score for installation ordering
+ 
+  -- Michael Vogt <mvo@debian.org>  Tue, 06 Mar 2012 18:12:57 +0100
+ 
 +apt (0.8.16~exp12ubuntu10) precise-proposed; urgency=low
 +
 +  [ Malcolm Scott ]
 +  * apt-pkg/packagemanager.cc:
 +    - Fix a regression in the pre-depend handling: where a pre-depend option
 +      other than the first specified is already installed, apt-get enters an
 +      infinite loop (LP: #985852)
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/packagemanager.cc:
 +    - add APT::pkgPackageManager::MaxLoopCount to ensure that the
 +      ordering code does not get into a endless loop when it flip-flops
 +      between two states
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/cacheset.cc:
 +    - actually return to the fallback modifier if we have detected we
 +      should for packagenames which look like modifiers (Closes: #669591)
 +      LP: #982716
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 20 Apr 2012 11:10:12 +0200
 +
 +apt (0.8.16~exp12ubuntu9) precise-proposed; urgency=low
 +
 +  * apt-inst/contrib/extracttar.cc:
 +    - ensure that in StartGzip the InFd is set to "AutoClose" to ensure
 +      that the pipe is closed when InFd is closed. This fixes a Fd leak
 +      (LP: #985452)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 19 Apr 2012 11:38:43 +0200
 +
 +apt (0.8.16~exp12ubuntu8) precise; urgency=low
 +
 +  * Set FD_CLOEXEC on history.log's FD (Closes: #610069, LP: #636010)
 +
 + -- Adam Conrad <adconrad@ubuntu.com>  Thu, 12 Apr 2012 16:26:20 -0600
 +
 +apt (0.8.16~exp12ubuntu7) precise; urgency=low
 +
 +  * clean up obsolete conffile /etc/apt/apt.conf.d/01ubuntu, which was
 +    dropped in maverick.
 +  * Build-depend on gettext:any for cross-building support.
 +  * Don't treat build-depends-indep as cross-build-dependencies; we should
 +    always install the host arch versions.  LP: #968828.
 +  * Makefile, po/makefile:  make sure our pot generation datestamp doesn't
 +    change at build time, since this makes translations fail to be
 +    co-installable with multiarch.  Based on a patch by David Kalnischkies.
 +    Closes: #659333, LP: #924628.
 +  * For cross-build-dependencies, Architecture: all packages should be
 +    treated as implicitly Multi-Arch: foreign, because either they *are*
 +    M-A: foreign when used as a build-dependency, or they need to be updated
 +    to not be Architecture: all; and since cross-build-deps are new
 +    functionality in apt, we can safely make this change without breaking
 +    existing systems.  Closes: #666772.
 +
 + -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 05 Apr 2012 18:00:23 -0700
 +
 +apt (0.8.16~exp12ubuntu6) precise; urgency=low
 +
 +  * cherry pick from
 +    http://bzr.debian.org/bzr/bzr/apt/apt/debian-experimental2/:
 +    * apt-pkg/packagemanager.cc:
 +      - fix bug in predepends handling - ensure that packages that needs
 +        unpackaging are unpacked before they are configured (LP: #927993)
 +    * apt-pkg/packagemanager.cc:
 +      - do not try to a void a breaks if the broken package pre-depends
 +        on the breaker, but let dpkg auto-deconfigure it
 +    * apt-pkg/packagemanager.cc:
 +      - recheck all dependencies if we changed a package in SmartConfigure
 +        as this could break an earlier dependency (LP: #940396)
 +    * recheck dependencies in SmartUnpack after a change, too
 +    * add Debug::pkgAcqArchive::NoQueue to disable package downloading
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 15 Mar 2012 19:46:08 +0100
 +
 +apt (0.8.16~exp12ubuntu5) precise; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merged from the debian-sid branch, most notably:
 +    - Correct fi translation for hash sum mismatches (LP: #420403)
 +      Thanks to Jani Uusitalo
 +    - remove 'old' InRelease file if we can't get a new one before
 +      proceeding with Release.gpg to avoid the false impression of a still
 +      trusted repository by a (still present) old InRelease file.
 +      Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 06 Mar 2012 17:52:50 +0100
 +
 +apt (0.8.16~exp12ubuntu4) precise; urgency=low
 +
 +  * apt-pkg/contrib/fileutl.h:
 +    - fix compatibility with FileFd::OpenDescriptor() in ReadOnlyGzip mode
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 14 Feb 2012 10:06:28 +0100
 +
 +apt (0.8.16~exp12ubuntu3) precise; urgency=low
 +
 +  * Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to
 +    handle compressed files again (LP: #924182).
 +
 + -- Colin Watson <cjwatson@ubuntu.com>  Tue, 31 Jan 2012 11:19:46 +0000
 +
 +apt (0.8.16~exp12ubuntu2) precise; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - chroot if needed before dpkg --assert-multi-arch
 +    - ensure that dpkg binary doesn't have the chroot-directory prefixed
 +  * apt-pkg/depcache.cc:
 +    - if a M-A:same package is marked for reinstall, mark all it's installed
 +      silbings for reinstallation as well (LP: #859188)
 +  * apt-pkg/contrib/configuration.cc:
 +    - do not stop parent transversal in FindDir if the value is empty
 +  * methods/http{s,}.cc:
 +    - if a file without an extension is requested send an 'Accept: text/*'
 +      header to avoid that the server chooses unsupported compressed files
 +      in a content-negotation attempt (Closes: #657560)
 +  * apt-pkg/aptconfiguration.cc:
 +    - chroot if needed before calling dpkg --print-foreign-architectures
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix crash when a package is in removed but residual config state
 +      (LP: #923807)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 30 Jan 2012 21:03:12 +0100
 +
 +apt (0.8.16~exp12ubuntu1) precise; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merge from debian/experimental:
 +    - new ABI
 +
 +  [ Steve Langasek ]
 +  * apt-pkg/algorithms.cc: iterate Breaks the same way as Conflicts, so that
 +    we resolve virtual package Breaks more effectively.  Thanks to Colin
 +    Watson for the patch.  Closes: #657695, LP: #922485.
 +  * apt-pkg/algorithms.{cc,h}: use an int to represent resolver scores, not
 +    a signed short, because large upgrades can result in an overflow for
 +    core packages.  Thanks again to Colin Watson.  Closes: #657732,
 +    LP: #917173.
 +  * Multi-Arch: none build-deps should be DEB_HOST_ARCH, not DEB_BUILD_ARCH.
 +    Closes: #646288.
 +
 + -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 29 Jan 2012 00:44:16 +0000
 +
  apt (0.8.16~exp12) experimental; urgency=low
  
    [ Michael Vogt ]
@@@ -201,6 -463,10 +622,10 @@@ apt (0.8.16~exp10) experimental; urgenc
    * apt-pkg/contrib/fileutl.h:
      - store the offset in the internal fd before calculate size of
        the zlib-handled file to jump back to this place again
 -  * apt-pkg/aptconfiguration.cc:
 -    - parse dpkg --print-foreign-architectures correctly in
 -      case archs are separated by newline instead of space, too.
 -      (Closes: #655590)
++  [ David Kalnischkies ]
++  [ Michael Vogt ]
++  * apt-pkg/contrib/fileutl.h:
++    - fix segfault triggered by the python-apt testsuite
  
    [ Michael Vogt ]
    * apt-pkg/contrib/fileutl.h:
@@@ -234,8 -500,7 +659,8 @@@ apt (0.8.16~exp9) experimental; urgency
      - use Lists instead of Sets if input order should be preserved for
        commands accepting lists of packages, e.g. policy (Closes: #625960)
    * apt-pkg/depcache.cc:
-     - prefer native providers over foreigns even if the chain is foreign.
+     - prefer native providers over foreigns even if the chain is foreign
 +      LP: #850264.
    * cmdline/apt-get.cc:
      - ignore foreign architectures if we check if a provides has only one
        resolver as it's basically the same for the user, so no need to choose
@@@ -333,198 -598,15 +758,198 @@@ apt (0.8.16~exp6) experimental; urgency
  
   -- Michael Vogt <mvo@debian.org>  Wed, 14 Sep 2011 21:06:51 +0200
  
 +apt (0.8.16~exp5ubuntu14.2.1) UNRELEASED; urgency=low
 +
 +  [ Daniel Hahler ]
 +  * doc/apt-key.8.xml: Ubuntu specific documentation changes (LP: #445903)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 20 Oct 2011 10:58:20 +0200
 +
 +apt (0.8.16~exp5ubuntu14.2) precise; urgency=low
 +
 +  * Call update-apt-xapian-index with -u on all arches in
 +    cron.daily to make it behave slightly more pleasantly.
 +
 + -- Adam Conrad <adconrad@ubuntu.com>  Mon, 09 Jan 2012 07:41:03 -0700
 +
 +apt (0.8.16~exp5ubuntu14.1) precise; urgency=low
 +
 +  * apt-pkg/edsp.cc:
 +    - fix FTBFS
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 19 Oct 2011 17:56:49 +0200
 +
 +apt (0.8.16~exp5ubuntu14) precise; urgency=low
 +  
 +  [ David Kalnischkies ]  
 +  * apt-pkg/pkgcachegen.cc:
 +    - refactor MergeList by creating -Group, -Package and -Version specialist
 +    - share description list between "same" versions (LP: #868977)
 +      This also means that descriptions are shared across archives now.
 +  * apt-pkg/pkgcache.cc:
 +    - always prefer "en" over "" for "en"-language regardless of cache-order
 +      (LP: #868977)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 19 Oct 2011 16:22:31 +0200
 +
 +apt (0.8.16~exp5ubuntu13) oneiric; urgency=low
 +
 +  [ Adam Conrad ]
 +  * On armel, call update-apt-xapian-index with '-u' to keep the CPU
 +    and I/O usage low.  We would do this on all arches, but there's a
 +    regression risk here, but that's better than killing slow systems.
 +  
 +  [ Michael Vogt ]
 +  * cmdline/apt-key:
 +    - fix apt-key net-update, thanks to Marc Deslauriers and 
 +      Adam Conrad for the code review (LP: #857472)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 06 Oct 2011 16:14:41 +0200
 +
 +apt (0.8.16~exp5ubuntu12) oneiric; urgency=low
 +
 +  [ David Kalnischkies ]  
 +  * apt-pkg/deb/deblistparser.cc:
 +    - fix crash when the dynamic mmap needs to be remapped during
 +      LoadReleaseInfo (LP: #854090)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Sep 2011 13:31:11 +0200
 +
 +apt (0.8.16~exp5ubuntu11) oneiric; urgency=low
 +
 +  [ Colin Watson ]
 +  * ftparchive/cachedb.cc:
 +    - fix buffersize in bytes2hex
 +  
 +  [ Marc Deslauriers ]
 +  * SECURITY UPDATE: Disable apt-key net-update for now, as validation
 +    code is insecure.
 +    - cmdline/apt-key: exit immediately out of net_update().
 +    - CVE number pending
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 22 Sep 2011 17:30:45 +0200
 +
 +apt (0.8.16~exp5ubuntu10) oneiric; urgency=low
 +
 +  * methods/https.cc:
 +    - cleanup broken downloads properly (just like http)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 20 Sep 2011 18:26:13 +0200
 +
 +apt (0.8.16~exp5ubuntu9) oneiric; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
 +    - fix fetching translated package descriptions (including the newly
 +      stripped out english ones) by adding OptionalSubIndexTarget
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/acquire-item.cc:
 +    - if no Release.gpg file is found try to verify with hashes,
 +      but do not fail if a hash can't be found
 +  * apt-pkg/indexrecords.cc:
 +    - fix Acquire::Max-ValidTime option by interpreting it really
 +      as seconds as specified in the manpage and not as days
 +    - add an Acquire::Min-ValidTime option (Closes: #640122)
 +  * doc/apt.conf.5.xml:
 +    - reword Acquire::Max-ValidTime documentation to make clear
 +      that it doesn't provide the new Min-ValidTime functionality
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 16 Sep 2011 09:50:16 +0200
 +
 +apt (0.8.16~exp5ubuntu8) oneiric; urgency=low
 +
 +  * cherry pick r1825 from lp:~mvo/apt/mvo:
 +    * apt-pkg/contrib/configuration.cc:
 +    - fix double delete (LP: #848907)
 +    - ignore only the invalid regexp instead of all options
 +
 +  * cherry pick r2165 from lp:~donkult/apt/sid:
 +    [ David Kalnischkies ]
 +    * cmdline/apt-get.cc:
 +      - output list of virtual package providers to c1out in -q=1
 +        instead of /dev/null to unbreak sbuild (LP: #816155)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Sep 2011 18:23:09 +0200
 +
 +apt (0.8.16~exp5ubuntu7) oneiric; urgency=low
 +
 +  [ Michael Vogt ]
 +  * cherry pick revision 2173 from lp:~donkult/apt/sid
 +  
 +  [ David Kalnischkies ]
 +  - M-A:same lockstep unpack should operate on installed
 +    packages first (LP: #835625)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Sep 2011 09:03:33 +0200
 +
 +apt (0.8.16~exp5ubuntu6) oneiric; urgency=low
 +
 +  [ Michael Vogt 
 +  * merged lp:~jr/ubuntu/oneiric/apt/bzr-get-rename, thanks to
 +    Jonathan Riddell
 +  
 +  [ David Kalnischkies ]
 +  * lots of cppcheck fixes
 +  * apt-pkg/packagemanager.cc, apt-pkg/pkgcache.cc:
 +    - ignore "self"-conflicts for all architectures of a package
 +      instead of just for the architecture of the package locked at
 +      in the ordering of installations too (Closes: #802901)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 17 Aug 2011 11:32:58 +0200
 +
 +apt (0.8.16~exp5ubuntu5) oneiric; urgency=low
 +
 +  * debian/control:
 +    - fix VCS location
 +  * methods/mirror.cc:
 +    - include the architecture(s) in the query string as well so 
 +      that the server can make better decisions
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 11 Aug 2011 18:03:19 +0200
 +
 +apt (0.8.16~exp5ubuntu4) oneiric; urgency=low
 +
 +  * Merge change from Robert Collins to upgrade ubuntu-keyring recommends
 +    to a hard dependency to match Debian behaviour and fix LP: #816606
 +
 + -- Adam Conrad <adconrad@ubuntu.com>  Tue, 09 Aug 2011 14:48:24 -0600
 +
 +apt (0.8.16~exp5ubuntu3) oneiric; urgency=low
 +
 +  * apt-pkg/acquire.cc:
 +    - fix potential divide-by-zero (LP: #823277)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 09 Aug 2011 15:56:44 +0200
 +
 +apt (0.8.16~exp5ubuntu2) oneiric; urgency=low
 +
 +  * test/integration/test-hashsum-verification:
 +    - add regression test for hashsum verification
 +  * apt-pkg/acquire-item.cc:
 +    - if no Release.gpg file is found, still load the hashes for
 +      verification (closes: #636314) and add test
 +  * apt-pkg/pkgcachegen.cc:
 +    - fix incorrect comparision when checking sources.list freshness
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 09 Aug 2011 09:22:14 +0200
 +
 +apt (0.8.16~exp5ubuntu1) oneiric; urgency=low
 +
 +  * merged new version from debian/experimental, this includes
 +    a ABI break and two new library packages
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 08 Aug 2011 14:30:07 +0200
 +
  apt (0.8.16~exp5) experimental; urgency=low
  
 -  * merged the latest debian-sid fixes
    * apt-pkg/makefile:
      - install sha256.h compat header
    * apt-pkg/pkgcachegen.{cc,h}:
      - use ref-to-ptr semantic in NewDepends() to ensure that the   
        libapt does not segfault if the cache is remapped in between
        (LP: #812862)
 +      (LP: #812862)
      - fix crash when P.Arch() was used but the cache got remapped
    * apt-pkg/acquire-item.{cc,h}:
      - do not check for a "Package" tag in optional index targets
@@@ -633,6 -715,16 +1058,16 @@@ apt (0.8.16~exp1) experimental; urgency
  
   -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 12:40:31 +0200
  
+ apt (0.8.15.11) UNRELEASED; urgency=low
+ 
+   * Fix typo in apt-get(8). Closes: #664833
+   * Replace "argument" by "paramètre" in French translation.
+     Merci, les Titeps!
+   * Drop hardcoded "en.html" suffix in apt-secure manpage.
+     Thanks to David Prevot.
+ 
+  -- Christian Perrier <bubulle@debian.org>  Tue, 27 Mar 2012 20:31:38 +0200
+ 
  apt (0.8.15.10) unstable; urgency=high
  
    [ David Kalnischkies ]
@@@ -640,10 -732,6 +1075,10 @@@
      - show a debug why a package was kept by ResolveByKeep()
    * doc/manpage-style.xml:
      - put <brackets> around email addresses
 +  * apt-pkg/aptconfiguration.cc:
 +    - parse dpkg --print-foreign-architectures correctly in
 +      case archs are separated by newline instead of space, too.
 +      (Closes: #655590)
    * doc/po/de.po:
      - apply typo-fix from Michael Basse, thanks! (LP: #900770)
    * apt-pkg/acquire-item.cc:
@@@ -665,10 -753,10 +1100,10 @@@
    * Polish (Michał Kułach). Closes: #656908
    * Danish (Joe Hansen). Closes: #658643
    * French: replace "étiquetage" by "épinglage" for "pinning"
-   
+ 
    [ Michael Vogt ]
 -  * merged patch from lp:~uusijani/apt/uusi-branch:
 -     Correct fi translation for hash sum mismatches (lp:420403)
 +  * merged patch from lp:~uusijani/apt/uusi-branch: 
 +     Correct fi translation for hash sum mismatches (LP: #420403)
       Thanks to Jani Uusitalo
  
   -- Michael Vogt <mvo@debian.org>  Tue, 06 Mar 2012 14:14:26 +0100
@@@ -796,14 -884,6 +1231,14 @@@ apt (0.8.15.6) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Mon, 15 Aug 2011 09:20:35 +0200
  
 +apt (0.8.15.5ubuntu1) oneiric; urgency=low
 +
 +  * apt-pkg/pkgcachegen.{cc,h}:
 +    - fix crash when P.Arch() was used but the cache got remapped
 +      (LP: #812862)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 01 Aug 2011 15:18:50 +0200
 +
  apt (0.8.15.5) unstable; urgency=low
  
    [ David Kalnischkies ]
@@@ -812,28 -892,6 +1247,28 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 28 Jul 2011 16:49:15 +0200
  
 +apt (0.8.15.4ubuntu2) oneiric; urgency=low
 +
 +  * apt-pkg/contrib/fileutl.{cc,h}:
 +    - add GetModificationTime() helper
 +  * apt-pkg/pkgcachegen.cc:
 +    - regenerate the cache if the sources.list changes to ensure
 +      that changes in the ordering there will be honored by apt
 +  * apt-pkg/sourcelist.{cc,h}:
 +    - add pkgSourceList::GetLastModifiedTime() helper
 +  * apt-pkg/pkgcachegen.{cc,h}:
 +    - use ref-to-ptr semantic in NewDepends() to ensure that the   
 +      libapt does not segfault if the cache is remapped in between
 +      (LP: #812862)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 29 Jul 2011 18:25:22 +0200
 +
 +apt (0.8.15.4ubuntu1) oneiric; urgency=low
 +
 +  * merged from debian-sid
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 26 Jul 2011 13:19:49 +0200
 +
  apt (0.8.15.4) unstable; urgency=low
  
    [ David Miller ]
@@@ -898,39 -956,6 +1333,39 @@@ apt (0.8.15.3) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Mon, 25 Jul 2011 15:04:43 +0200
  
 +apt (0.8.15.2ubuntu2) oneiric; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix missing download progress in apt-get download
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 22 Jul 2011 13:20:49 +0200
 +
 +apt (0.8.15.2ubuntu1) oneiric; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/acquire-item.cc:
 +    - improve error message for a expired Release file
 +  * apt-pkg/algorithms.cc:
 +    - Hold back packages that would enter "policy-broken" state on upgrade
 +      when doing a "apt-get upgrade"
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/pkgcachegen.cc:
 +    - fallback to memory if file is not writeable even if access()
 +      told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591)
 +  * doc/sources.list.5.xml:
 +    - document available [options] for sources.list entries (Closes: 632441)
 +  * doc/apt.conf.5.xml:
 +    - document APT::Architectures list (Closes: #612102)
 +  * cmdline/apt-get.cc:
 +    - restore all important dependencies for garbage packages (LP: #806274)
 +  * apt-pkg/init.cc:
 +    - use CndSet in pkgInitConfig (Closes: #629617)
 +  * apt-pkg/depcache.cc:
 +    - change default of APT::AutoRemove::SuggestsImportant to true
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 15 Jul 2011 10:16:45 +0200
 +
  apt (0.8.15.2) unstable; urgency=high
  
    * fix from David Kalnischkies for the InRelease gpg verification 
@@@ -938,36 -963,18 +1373,36 @@@
  
   -- Michael Vogt <mvo@debian.org>  Tue, 12 Jul 2011 11:54:47 +0200
  
 -apt (0.8.15.1) unstable; urgency=low
 +apt (0.8.15.1ubuntu2) oneiric; urgency=low
  
 -  [ David Kalnischkies ]
 -  * doc/makefile:
 -    - create doxygen directory to avoid depending on magic (Closes: #628799)
 -  * cmdline/apt-key:
 -    - explicitly state that net-update is not supported if no url is set
 -    - require to be root for add, rm, update and net-update
 -    - clarify update vs. net-update in different distros (Closes: #632043)
 -  * debian/apt.symbols:
 -    - forgot 'mips' in the list for all architecture dependent symbols
 -    - comment out gcc-4.5 specific symbols as gcc-4.6 is now default
 +  [ Brian Murray ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +   - do not report errors encountered when decompressing packages
 +  
 +  [ Michael Vogt ]
 +  * fix from David Kalnischkies for the InRelease gpg verification 
 +    code (LP: #784473)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 13 Jul 2011 14:42:02 +0200
 +
 +apt (0.8.15.1ubuntu1) oneiric; urgency=low
 +
 +  * merge from debian/sid
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Jun 2011 09:16:12 +0100
 +
 +apt (0.8.15.1) unstable; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * doc/makefile:
 +    - create doxygen directory to avoid depending on magic (Closes: #628799)
 +  * cmdline/apt-key:
 +    - explicitly state that net-update is not supported if no url is set
 +    - require to be root for add, rm, update and net-update
 +    - clarify update vs. net-update in different distros (Closes: #632043)
 +  * debian/apt.symbols:
 +    - forgot 'mips' in the list for all architecture dependent symbols
 +    - comment out gcc-4.5 specific symbols as gcc-4.6 is now default
      - the symbol for PrintStatus() is architecture dependent
    * apt-pkg/policy.cc:
      - do not segfault in pinning if a package with this name doesn't exist.
@@@ -979,17 -986,6 +1414,17 @@@
  
   -- Michael Vogt <mvo@debian.org>  Thu, 30 Jun 2011 10:05:36 +0200
  
 +apt (0.8.15ubuntu1) oneiric; 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>  Wed, 29 Jun 2011 09:03:39 +0100
 +
  apt (0.8.15) unstable; urgency=low
  
    [ Julian Andres Klode ]
@@@ -1278,101 -1274,6 +1713,101 @@@ apt (0.8.14.2) UNRELEASED; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Mon, 16 May 2011 14:57:52 +0200
  
 +apt (0.8.14.1ubuntu8) UNRELEASED; urgency=low
 +
 +  [ Michael Vogt ]
 +  * debian/apt.conf.changelog:
 +    - add missing ";", thanks to Julian Andres Klode
 +
 +  [ Brian Murray ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - updated allocate memory string
 +    - cannot access archive string is lowercase
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - resolve issue where AptOrdering is included in DpkgTerminalLog in apport
 +      attachments
 +
 + -- Brian Murray <brian@ubuntu.com>  Wed, 15 Jun 2011 14:00:43 -0700
 +
 +apt (0.8.14.1ubuntu7) oneiric; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/deblistparser.cc:
 +    - include all known languages when building the apt cache
 +      (LP: #794907)
 +  * apt-pkg/deb/debindexfile.cc:
 +    - remove some no longer valid checks for "TranslationsAvailable()"
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Jun 2011 13:56:25 +0200
 +
 +apt (0.8.14.1ubuntu6) oneiric; urgency=low
 +
 +  [ Brian Murray ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - prevent reporting of package installation failures due to inaccessible
 +      local files (LP: #791102, #790040)
 +    - include /var/log/apt/history.log in apport-package reports so we know
 +      the context for the package management request
 +    
 +  [ Michael Vogt ]
 +  * methods/mirror.cc:
 +    - ignore lines starting with "#" in the mirror file
 +    - ignore non http urls in the mirrors
 +    - append the dist (e.g. sid, wheezy) as a query string when
 +      asking for a suitable mirror 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Jun 2011 15:55:07 +0200
 +
 +apt (0.8.14.1ubuntu5) oneiric; urgency=low
 +
 +  * apt-pkg/acquire-item.cc:
 +    - do not reject empty Packages files when checking them for
 +      correctness
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 31 May 2011 10:41:30 +0200
 +
 +apt (0.8.14.1ubuntu4) oneiric; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/acquire-item.cc:
 +    - Reject files known to be invalid (LP: #346386) (Closes: #627642)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 30 May 2011 17:12:27 +0200
 +
 +apt (0.8.14.1ubuntu3) oneiric; urgency=low
 +
 +  * Rebuild with recent binutils. LP: #774175.
 +
 + -- Matthias Klose <doko@ubuntu.com>  Mon, 23 May 2011 19:15:34 +0200
 +
 +apt (0.8.14.1ubuntu2) oneiric; urgency=low
 +
 +  * debian/rules:
 +    - build in verbose mode by default (thanks to Matthias Klose)
 +  * debian/control:
 +    - add  temporary build-dependency on gcc-4.6 (>= 4.6.0-6ubuntu2)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 03 May 2011 13:58:10 +0200
 +
 +apt (0.8.14.1ubuntu1) oneiric; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merged from the debian-sid bzr branch
 +  
 +  [ Julian Andres Klode ]
 +  * apt-pkg/depcache.cc:
 +    - Really release action groups only once (Closes: #622744)
 +    - Make purge work again for config-files (LP: #244598) (Closes: #150831)
 +  * debian/apt.cron.daily:
 +    - Check power after wait, patch by manuel-soto (LP: #705269)
 +  * debian/control:
 +    - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
 +      unpacked if a library is too old and thus break upgrades
 +  * doc/apt-key.8.xml:
 +    - Document apt-key net-update (LP: #192810)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 29 Apr 2011 17:55:20 +0200
 +
  apt (0.8.14.1) unstable; urgency=low
  
    * apt-pkg/acquire-item.cc:
@@@ -1415,42 -1316,6 +1850,42 @@@ apt (0.8.14) unstable; urgency=lo
  
   -- Julian Andres Klode <jak@debian.org>  Fri, 15 Apr 2011 14:28:15 +0200
  
 +apt (0.8.13.2ubuntu3) natty-proposed; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - stop reporting of apport-package bug reports regarding
 +      dpkg I/O errors (LP: #767776)
 +
 + -- Brian Murray <brian@ubuntu.com>  Wed, 20 Apr 2011 15:05:12 -0700
 +
 +apt (0.8.13.2ubuntu2) natty; urgency=low
 +
 +  [ Michael Vogt ]
 +  * debian/apt.cron.daily:
 +    - run unattended-upgrades even if there was a error during
 +      the apt-get update (LP: #676295)
 +  
 +  [ Julian Andres Klode ]
 +  * apt-pkg/indexcopy.cc:
 +    - Use RealFileExists() instead of FileExists(), allows amongst other
 +      things a directory named Sources to exist on a CD-ROM (LP: #750694).
 +  
 +  [ David Kalnischkies  ]
 +  * apt-pkg/pkgcache.cc:
 +    - use the native Architecture stored in the cache header instead of
 +      loading it from configuration as suggested by Julian Andres Klode
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 07 Apr 2011 12:52:21 +0200
 +
 +apt (0.8.13.2ubuntu1) natty; urgency=low
 +
 +  * merge fixes from debian-sid, most notable the handling of
 +    arch=all architectures in python-apt (LP: #733741)
 +  * apt-pkg/aptconfiguration.cc:
 +    - fix comparing for a empty string
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Apr 2011 13:19:56 +0200
 +
  apt (0.8.13.2) unstable; urgency=low
  
    [ David Kalnischkies ]
@@@ -1487,12 -1352,6 +1922,12 @@@
  
   -- 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
@@@ -1500,24 -1359,6 +1935,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 ]
@@@ -1539,29 -1380,6 +1974,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 ]
@@@ -1615,23 -1433,6 +2050,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 ]
@@@ -1863,27 -1664,6 +2298,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 ]
@@@ -1903,48 -1683,6 +2338,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 ]
@@@ -1976,47 -1714,6 +2411,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 ]
@@@ -2036,17 -1733,6 +2471,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 ]
@@@ -2165,147 -1851,61 +2600,147 @@@ apt (0.8.4) unstable; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Fri, 10 Sep 2010 20:45:15 +0200
  
 -apt (0.8.3) unstable; urgency=low
 +apt (0.8.3ubuntu7) maverick; urgency=low
  
 -  [ Programs translations ]
 -  * German (Holger Wansing). Closes: #596141
 +  [ 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
  
 -  [ Manpages translations ]
 -  * Japanese (KURASAWA Nozomu). Closes: #595862
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Oct 2010 14:13:38 +0200
 +
 +apt (0.8.3ubuntu6) maverick; urgency=low
  
    [ Michael Vogt ]
 -  * apt-pkg/indexcopy.cc:
 -    - only use trusted.gpg.d directory if it exists
 -    - do not replace /dev/null when running in APT::CDROM::NoAct
 -      mode (LP: #612666), thanks to Colin Watson
 +  * 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 ]
 -  * ftparchive/apt-ftparchive.cc:
 -    - ensure that BinDirectory as well as Tree settings get
 -      the correct default FileMode setting (Closes: #595922)
 +  * 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 <mvo@debian.org>  Tue, 07 Sep 2010 15:28:41 +0200
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 01 Oct 2010 15:25:00 +0200
  
 -apt (0.8.2) unstable; urgency=low
 +apt (0.8.3ubuntu5) maverick; urgency=low
  
 -  [ Manpages translations ]
 -  * Spanish (Omar Campagne). Closes: #595557
 +  * debian/apt.dirs:
 +    - add missing /usr/share/apt so that the keyring is installed
 +      into the right place (LP: #620576)
  
 -  [ David Kalnischkies ]
 -  * apt-pkg/versionmatch.cc:
 -    - do not accept 'Pin: origin "' (missing closing ") as a valid
 -      way to pin a local archive: either "" or none…
 -  * apt-pkg/deb/dpkgpm.cc:
 -    - create Dir::Log if needed to support /var/log as tmpfs or similar,
 -      inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239)
 -  * apt-pkg/indexcopy.cc:
 -    - support really still the APT::GPGV::TrustedKeyring setting,
 -      as it breaks d-i badly otherwise (Closes: #595428)
 -  * cmdline/apt-key:
 -    - support also Dir::Etc::Trusted so that apt-key works in the same
 -      way as the library part which works with the trusted files
 -  * methods/{gzip,bzip2}.cc:
 -    - empty files can never be valid archives (Closes: #595691)
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 22 Sep 2010 18:34:18 +0200
  
 - -- Michael Vogt <mvo@debian.org>  Mon, 06 Sep 2010 18:10:06 +0200
 +apt (0.8.3ubuntu4) maverick; urgency=low
  
 -apt (0.8.1) unstable; urgency=low
 +  * merged lp:~mvo/apt/conflicts-on-virtuals to better deal
 +    with conflicts/breaks against virtual packages (LP: #614993)
  
 -  [ 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
 -  * Simplified Chinese (Aron Xu). Closes: #594458
 + -- 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 ]
 +  * German (Holger Wansing). Closes: #596141
 +
 +  [ Manpages translations ]
 +  * Japanese (KURASAWA Nozomu). Closes: #595862
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/indexcopy.cc:
 +    - only use trusted.gpg.d directory if it exists
 +    - do not replace /dev/null when running in APT::CDROM::NoAct
 +      mode (LP: #612666), thanks to Colin Watson
 +
 +  [ David Kalnischkies ]
 +  * ftparchive/apt-ftparchive.cc:
 +    - ensure that BinDirectory as well as Tree settings get
 +      the correct default FileMode setting (Closes: #595922)
 +
 + -- Michael Vogt <mvo@debian.org>  Tue, 07 Sep 2010 15:28:41 +0200
 +
 +apt (0.8.2) unstable; urgency=low
 +
 +  [ Manpages translations ]
 +  * Spanish (Omar Campagne). Closes: #595557
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/versionmatch.cc:
 +    - do not accept 'Pin: origin "' (missing closing ") as a valid
 +      way to pin a local archive: either "" or none…
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - create Dir::Log if needed to support /var/log as tmpfs or similar,
 +      inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239)
 +  * apt-pkg/indexcopy.cc:
 +    - support really still the APT::GPGV::TrustedKeyring setting,
 +      as it breaks d-i badly otherwise (Closes: #595428)
 +  * cmdline/apt-key:
 +    - support also Dir::Etc::Trusted so that apt-key works in the same
 +      way as the library part which works with the trusted files
 +  * methods/{gzip,bzip2}.cc:
 +    - empty files can never be valid archives (Closes: #595691)
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 06 Sep 2010 18:10:06 +0200
 +
 +apt (0.8.1) unstable; urgency=low
 +
 +  [ 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
 +  * Simplified Chinese (Aron Xu). Closes: #594458
    * Bulgarian (Damyan Ivanov). Closes: #594627
    * Portuguese (Miguel Figueiredo). Closes: #594668
    * Korean (Changwoo Ryu). Closes: #594809
@@@ -2343,69 -1943,6 +2778,69 @@@
  
   -- 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 ]
@@@ -2448,20 -1985,6 +2883,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 ]
@@@ -2504,56 -2027,6 +2939,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 ]
@@@ -3168,233 -2641,87 +3603,233 @@@ 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 ]
 -  * apt-pkg/contrib/cdromutl.cc:
 -    - fix UnmountCdrom() fails, give it a bit more time and try
 -      the umount again
 -  * apt-pkg/cdrom.cc:
 -    - fix crash in pkgUdevCdromDevices
 -  * methods/cdrom.cc:
 -    - fixes in multi cdrom setup code (closes: #549312)
 -    - add new "Acquire::cdrom::AutoDetect" config that enables/disables
 -      the dlopen of libudev for automatic cdrom detection. Off by default
 -      currently, feedback/testing welcome
 -  * cmdline/apt-cdrom.cc:
 -    - add new --auto-detect option that uses libudev to figure out
 -      the cdrom/mount-point
 -  * cmdline/apt-mark:
 -    - merge fix from Gene Cash that supports markauto for
 -      packages that are not in the extended_states file yet
 -      (closes: #534920)
 -  * ftparchive/writer.{cc,h}:
 -    - merge crash fix for apt-ftparchive on hurd, thanks to
 -      Samuel Thibault for the patch (closes: #566664)
 +  * debian/apt.postinst:
 +    - do not fail if getent returns nothing useful (LP: #579647)
 +      thanks to Jean-Baptiste Lallement
  
 -  [ David Kalnischkies ]
 -  * apt-pkg/contrib/fileutl.cc:
 -    - Fix the newly introduced method GetListOfFilesInDir to not
 -      accept every file if no extension is enforced
 -      (= restore old behaviour). (Closes: #565213)
 -  * apt-pkg/policy.cc:
 -    - accept also partfiles with "pref" file extension as valid
 -  * apt-pkg/contrib/configuration.cc:
 -    - accept also partfiles with "conf" file extension as valid
 -  * doc/apt.conf.5.xml:
 -    - reorder description and split out syntax
 -    - add partfile name convention (Closes: #558348)
 -  * doc/apt_preferences.conf.5.xml:
 -    - describe partfile name convention also here
 -  * apt-pkg/deb/dpkgpm.cc:
 -    - don't segfault if term.log file can't be opened.
 -      Thanks Sam Brightman for the patch! (Closes: #475770)
 -  * doc/*:
 -    - replace the per language addendum with a global addendum
 -    - add a explanation why translations include (maybe) english
 -      parts to the new global addendum (Closes: #561636)
 -  * apt-pkg/contrib/strutl.cc:
 -    - fix malloc asseration fail with ja_JP.eucJP locale in
 -      apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884)
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 14 May 2010 09:40:50 +0200
  
 -  [ Christian Perrier ]
 -  * French translation update
 +apt (0.7.25.3ubuntu8) lucid-proposed; urgency=low
  
 - -- Michael Vogt <mvo@debian.org>  Wed, 27 Jan 2010 16:16:10 +0100
 +  [ Loïc Minier ]
 +  * Use https:// in Vcs-Bzr URL.
  
 -apt (0.7.25.1) unstable; urgency=low
 +  [ 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
  
 -  [ Christian Perrier ]
 -  * French manpage translation update
 -  * Russian translation update by Yuri Kozlov
 -    Closes: #564171
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 05 May 2010 10:33:46 +0200
  
 -  [Chris Leick]
 +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
 +  * apt-pkg/cdrom.cc:
 +    - fix crash in pkgUdevCdromDevices
 +  * methods/cdrom.cc:
 +    - fixes in multi cdrom setup code (closes: #549312)
 +    - add new "Acquire::cdrom::AutoDetect" config that enables/disables
 +      the dlopen of libudev for automatic cdrom detection. Off by default
 +      currently, feedback/testing welcome
 +  * cmdline/apt-cdrom.cc:
 +    - add new --auto-detect option that uses libudev to figure out
 +      the cdrom/mount-point
 +  * cmdline/apt-mark:
 +    - merge fix from Gene Cash that supports markauto for
 +      packages that are not in the extended_states file yet
 +      (closes: #534920)
 +  * ftparchive/writer.{cc,h}:
 +    - merge crash fix for apt-ftparchive on hurd, thanks to
 +      Samuel Thibault for the patch (closes: #566664)
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/contrib/fileutl.cc:
 +    - Fix the newly introduced method GetListOfFilesInDir to not
 +      accept every file if no extension is enforced
 +      (= restore old behaviour). (Closes: #565213)
 +  * apt-pkg/policy.cc:
 +    - accept also partfiles with "pref" file extension as valid
 +  * apt-pkg/contrib/configuration.cc:
 +    - accept also partfiles with "conf" file extension as valid
 +  * doc/apt.conf.5.xml:
 +    - reorder description and split out syntax
 +    - add partfile name convention (Closes: #558348)
 +  * doc/apt_preferences.conf.5.xml:
 +    - describe partfile name convention also here
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - don't segfault if term.log file can't be opened.
 +      Thanks Sam Brightman for the patch! (Closes: #475770)
 +  * doc/*:
 +    - replace the per language addendum with a global addendum
 +    - add a explanation why translations include (maybe) english
 +      parts to the new global addendum (Closes: #561636)
 +  * apt-pkg/contrib/strutl.cc:
 +    - fix malloc asseration fail with ja_JP.eucJP locale in
 +      apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884)
 +
 +  [ Christian Perrier ]
 +  * French translation update
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 27 Jan 2010 16:16:10 +0100
 +
 +apt (0.7.25.1) unstable; urgency=low
 +
 +  [ Christian Perrier ]
 +  * French manpage translation update
 +  * Russian translation update by Yuri Kozlov
 +    Closes: #564171
 +
 +  [Chris Leick]
    * spot & fix various typos in all manpages
    * German manpage translation update
  
@@@ -3434,39 -2761,6 +3869,39 @@@
  
   -- 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 ]
@@@ -3610,29 -2904,6 +4045,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 ]
@@@ -3702,59 -2973,6 +4137,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 ]
@@@ -3984,34 -3202,6 +4419,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 ]
@@@ -4055,139 -3245,20 +4490,139 @@@
  
   -- 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 
 +  * 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).
 +  
 +  [ 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 <michael.vogt@ubuntu.com>  Mon, 30 Mar 2009 13:22:28 +0200
 +
 +apt (0.7.20.2ubuntu4) jaunty; urgency=low
 +
 +  * ftparchive/cachedb.cc:
 +    - when apt-ftparchive clean is used, compact the database
 +      at the end (thanks to cprov)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 26 Mar 2009 13:43:59 +0100
 +
 +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 ]
@@@ -4242,12 -3313,6 +4677,12 @@@ apt (0.7.20) unstable; urgency=lo
  
   -- 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 ]
@@@ -4546,90 -3611,6 +4981,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 ]
@@@ -4856,581 -3837,132 +5291,581 @@@ 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
  
 -  [ 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
 -    - Basque updated. Closes: #436425
 -    - Fix the zh_CN translator's name in debian/changelog for 0.7.2
 -      Closes: #423272
 -    - Vietnamese updated. Closes: #440611
 -    - Danish updated. Closes: #441102
 -    - Thai added. Closes: #442833
 -    - Swedish updated.
 -    - Galician updated. Closes: #446626
 +apt (0.7.9ubuntu14) hardy; urgency=low
  
 -  [ Otavio Salvador ]
 -  * Add hash support to copy method. Thanks Anders Kaseorg by the patch
 -    (closes: #436055)
 -  * Reset curl options and timestamp between downloaded files. Thanks to
 -    Ryan Murray <rmurray@debian.org> for the patch (closes: #437150)
 -  * Add support to apt-key to export keys to stdout. Thanks to "Dwayne
 -    C. Litzenberger" <dlitz@dlitz.net> for the patch (closes: #441942)
 -  * Fix compilation warnings:
 -    - apt-pkg/indexfile.cc: conversion from string constant to 'char*';
 -    - apt-pkg/acquire-item.cc: likewise;
 -    - apt-pkg/cdrom.cc: '%lu' expects 'long unsigned int', but argument
 -      has type 'size_t';
 -    - apt-pkg/deb/dpkgpm.cc: initialization order and conversion from
 -      string constant to 'char*';
 -    - methods/gpgv.cc: conversion from string constant to 'char*';
 -    - methods/ftp.cc: likewise;
 -    - cmdline/apt-extracttemplates.cc: likewise;
 -    - apt-pkg/deb/debmetaindex.cc: comparison with string literal results
 -      in unspecified behaviour;
 -  * cmdline/apt-get.cc: adds 'autoremove' as a valid comment to usage
 -    statement of apt-get (closes: #445468).
 -  * cmdline/apt-get.cc: really applies Julien Danjou <acid@debian.org>
 -    patch to add 'purge' command line argument (closes: #133421).
 +  * 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)
  
 -  [ Ian Jackson ]
 -  * dpkg-triggers: Deal properly with new package states.
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Mar 2008 21:46:07 +0100
  
 -  [ Colin Watson ]
 -  * apt-pkg/contrib/mmap.cc:
 -    - don't fail if msync() returns > 0
 - 
 - -- Michael Vogt <mvo@debian.org>  Tue, 23 Oct 2007 14:58:03 +0200
 +apt (0.7.9ubuntu13) hardy; urgency=low
  
 -apt (0.7.6) unstable; urgency=low
 +  [ Lionel Porcheron ]
 +  * debian/apt.cron.daily:
 +    - only call gconftool if gcontool is installed (LP: #194281)
 +
 +  [ Michael Vogt ]
 +  * doc/apt_preferences.5.xml:
 +    - fix typo (LP: #150900)
 +  * doc/example/sources.list:
 +    - updated for hardy (LP: #195879)
 +  * debian/apt.cron.daily:
 +    - 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:
 +    - 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:
 +    - 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
 +    - Basque updated. Closes: #436425
 +    - Fix the zh_CN translator's name in debian/changelog for 0.7.2
 +      Closes: #423272
 +    - Vietnamese updated. Closes: #440611
 +    - Danish updated. Closes: #441102
 +    - Thai added. Closes: #442833
 +    - Swedish updated.
 +    - Galician updated. Closes: #446626
 +
 +  [ Otavio Salvador ]
 +  * Add hash support to copy method. Thanks Anders Kaseorg by the patch
 +    (closes: #436055)
 +  * Reset curl options and timestamp between downloaded files. Thanks to
 +    Ryan Murray <rmurray@debian.org> for the patch (closes: #437150)
 +  * Add support to apt-key to export keys to stdout. Thanks to "Dwayne
 +    C. Litzenberger" <dlitz@dlitz.net> for the patch (closes: #441942)
 +  * Fix compilation warnings:
 +    - apt-pkg/indexfile.cc: conversion from string constant to 'char*';
 +    - apt-pkg/acquire-item.cc: likewise;
 +    - apt-pkg/cdrom.cc: '%lu' expects 'long unsigned int', but argument
 +      has type 'size_t';
 +    - apt-pkg/deb/dpkgpm.cc: initialization order and conversion from
 +      string constant to 'char*';
 +    - methods/gpgv.cc: conversion from string constant to 'char*';
 +    - methods/ftp.cc: likewise;
 +    - cmdline/apt-extracttemplates.cc: likewise;
 +    - apt-pkg/deb/debmetaindex.cc: comparison with string literal results
 +      in unspecified behaviour;
 +  * cmdline/apt-get.cc: adds 'autoremove' as a valid comment to usage
 +    statement of apt-get (closes: #445468).
 +  * cmdline/apt-get.cc: really applies Julien Danjou <acid@debian.org>
 +    patch to add 'purge' command line argument (closes: #133421).
 +
 +  [ Ian Jackson ]
 +  * dpkg-triggers: Deal properly with new package states.
 +
 +  [ Colin Watson ]
 +  * apt-pkg/contrib/mmap.cc:
 +    - don't fail if msync() returns > 0
 + 
 + -- 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
      directory downloading on non-linux architectures (closes: #435597)
@@@ -5457,14 -3989,6 +5892,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 ]
@@@ -5525,90 -4049,6 +5960,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.
@@@ -5702,144 -4142,34 +6137,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
    
@@@ -5870,26 -4200,6 +6305,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.
@@@ -6002,173 -4312,6 +6437,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:
@@@ -6214,37 -4357,6 +6649,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
@@@ -6333,26 -4445,6 +6768,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:
@@@ -6385,38 -4477,6 +6820,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:
@@@ -6440,24 -4500,6 +6875,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:
@@@ -6481,19 -4523,6 +6916,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:  
@@@ -6514,22 -4543,6 +6949,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:
@@@ -6636,80 -4649,6 +7071,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 
@@@ -6719,12 -4658,6 +7154,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
@@@ -6740,39 -4673,6 +7175,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
@@@ -6785,13 -4685,6 +7220,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 debian/control
index 841a35183,bb1bb9aae..93df24a3a
--- a/debian/control
+++ b/debian/control
@@@ -1,27 -1,26 +1,27 @@@
  Source: apt
  Section: admin
  Priority: important
 -Maintainer: APT Development Team <deity@lists.debian.org>
 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 +XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
  Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
   Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
   Julian Andres Klode <jak@debian.org>
- Standards-Version: 3.9.2
+ Standards-Version: 3.9.3
  Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
 - gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0),
 - zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml,
 - po4a (>= 0.34-2), autotools-dev, autoconf, automake, debiandoc-sgml
 -Build-Depends-Indep: doxygen
 + gettext:any (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0),
 + zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml,
 + po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
  Build-Conflicts: autoconf2.13, automake1.4
 -Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
 -Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/
 +Vcs-Bzr: lp:~ubuntu-core-dev/apt/ubuntu
 +Vcs-Browser: http://code.launchpad.net/apt/ubuntu
  
  Package: apt
  Architecture: any
 -Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg
 +Pre-Depends: dpkg (>= 1.15.7.2)
 +Depends: ubuntu-keyring, ${shlibs:Depends}, ${misc:Depends}, gnupg
  Replaces: manpages-pl (<< 20060617-3~)
  Conflicts: python-apt (<< 0.7.93.2~)
- Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
+ Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt
  Description: commandline package manager
   This package provides commandline tools for searching and
   managing as well as querying information about packages
@@@ -58,7 -57,7 +58,7 @@@ Description: package managment runtime 
      http, rsh as well as an interface to add more transports like
      https (apt-transport-https) and debtorrent (apt-transport-debtorrent).
  
- Package: libapt-inst1.4
+ Package: libapt-inst1.5
  Architecture: any
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
@@@ -82,7 -81,7 +82,7 @@@ Architecture: an
  Multi-Arch: same
  Priority: optional
  Pre-Depends: ${misc:Pre-Depends}
- Depends: ${libapt-pkg-name} (= ${binary:Version}), ${libapt-inst-name} (= ${binary:Version}), ${misc:Depends}, zlib1g-dev | zlib-dev
+ Depends: ${libapt-pkg-name} (= ${binary:Version}), ${libapt-inst-name} (= ${binary:Version}), ${misc:Depends}, zlib1g-dev
  Section: libdevel
  Description: development files for APT's libapt-pkg and libapt-inst
   This package contains the header files and libraries for
@@@ -104,6 -103,7 +104,7 @@@ Description: documentation for APT deve
  Package: apt-utils
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
+ Suggests: xz-utils
  Description: package managment related utility programs
   This package contains some less used commandline utilities related
   to package managment with APT.
diff --combined debian/rules
index dcd4fc361,ee001fe12..27effcfb0
--- a/debian/rules
+++ b/debian/rules
@@@ -3,9 -3,6 +3,9 @@@
  # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
  # Some lines taken from debmake, by Christoph Lameter.
  
 +# build in verbose mode by default to make it easy to diangose issues
 +export NOISY=1
 +
  export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
  export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
  export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@@ -37,9 -34,6 +37,6 @@@ build
  
  PKG=apt
  DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
- APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed -e 's/\+.*$$//')
- APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
- APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g')
  
  # Determine the build directory to use
  BASE=.
@@@ -56,19 -50,8 +53,8 @@@ ifeq ($(words $(BLD)),0
  override BLD := ./build
  endif
  
- # Rebuild configure.in to have the correct version from the change log
- ifneq ($(APT_DEBVER),$(APT_CONFVER))
- ifneq ($(APT_DEBVER),)
- .PHONY: configure.in
- configure.in:
- 	sed -e 's/$(APT_CONFVER)/$(APT_DEBVER)/' $@ > $@.$$$$ && mv $@.$$$$ $@
- endif
- else
- configure.in:
- endif
- 
  # APT Programs in apt-utils
- APT_UTILS=ftparchive sortpkgs extracttemplates internal-solver
+ APT_UTILS=ftparchive sortpkgs extracttemplates
  
  # Uncomment this to turn on verbose mode.
  #export DH_VERBOSE=1
@@@ -84,7 -67,8 +70,8 @@@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJ
  export DPKG_GENSYMBOLS_CHECK_LEVEL=0
  
  build: build/build-stamp
- build-doc: build/build-doc-stamp
+ build-doc: build-manpages build/build-doc-stamp
+ build-manpages: build/build-manpages-stamp
  
  # Note that this is unconditionally done first as part of loading environment.mak
  # The true is needed to force make to reload environment.mak after running
@@@ -114,11 -98,16 +101,16 @@@ els
  endif
  	touch $@
  
- build/build-doc-stamp: build/configure-stamp
+ build/build-doc-stamp: build/build-manpages-stamp build/configure-stamp
  	# Add here commands to compile the package.
  	$(MAKE) doc
  	touch $@
  
+ build/build-manpages-stamp: build/configure-stamp
+ 	# Add here commands to compile the package.
+ 	$(MAKE) manpages
+ 	touch $@
+ 
  clean:
  	dh_testdir
  
@@@ -184,7 -173,7 +176,7 @@@ apt-doc: build-do
  
  binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https
  apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list
- apt: build build-doc
+ apt: build build-manpages
  	dh_testdir -p$@
  	dh_testroot -p$@
  	dh_prep -p$@
@@@ -193,8 -182,6 +185,8 @@@
  # apt install
  #
  	cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
 +	cp debian/apt.conf.changelog debian/$@/etc/apt/apt.conf.d/20changelog
 +	cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
  
  	# make rosetta happy and remove pot files in po/ (but leave stuff
  	# in po/domains/* untouched) and cp *.po into each domain dir
@@@ -204,7 -191,7 +196,7 @@@
  	dh_install -p$@ --sourcedir=$(BLD)
  
  	# Remove the bits that are in apt-utils
- 	rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS) dump-solver)
+ 	rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS) dump-solver internal-solver)
  
  	# https has its own package
  	rm debian/$@/usr/lib/apt/methods/https
@@@ -250,7 -237,7 +242,7 @@@ libapt-pkg-dev: build debian/libapt-pkg
  	dh_builddeb -p$@
  
  apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates
- apt-utils: build
+ apt-utils: build build-manpages
  	dh_testdir -p$@
  	dh_testroot -p$@
  	dh_prep -p$@
@@@ -258,6 -245,7 +250,7 @@@
  
  	cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/
  	cp $(BLD)/bin/apt-dump-solver debian/$@/usr/lib/apt/solvers/dump
+ 	cp $(BLD)/bin/apt-internal-solver debian/$@/usr/lib/apt/solvers/apt
  
  	dh_install -p$@ --sourcedir=$(BLD)
  	dh_link -p$@
diff --combined doc/apt-key.8.xml
index 7530ba382,cdb307b64..3ff53b1cd
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@@ -11,8 -11,15 +11,15 @@@
  ]>
  
  <refentry>
-  &apt-docinfo;
-  
+  <refentryinfo>
+    &apt-author.jgunthorpe;
+    &apt-author.team;
+    &apt-email;
+    &apt-product;
+    <!-- The last update date -->
+    <date>2012-05-21T00:00:00Z</date>
+  </refentryinfo>
+ 
   <refmeta>
     <refentrytitle>apt-key</refentrytitle>
     <manvolnum>8</manvolnum>
@@@ -25,15 -32,7 +32,7 @@@
      <refpurpose>APT key management utility</refpurpose>
   </refnamediv>
  
-  <!-- Arguments -->
-  <refsynopsisdiv>
-    <cmdsynopsis>
-       <command>apt-key</command>
-       <arg><option>--keyring <replaceable>filename</replaceable></option></arg>
-       <arg><replaceable>command</replaceable></arg>
-       <arg rep="repeat"><option><replaceable>arguments</replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
+  &synopsis-command-apt-key;
  
   <refsect1><title>Description</title>
     <para>
@@@ -45,19 -44,19 +44,19 @@@
  
  <refsect1><title>Commands</title>
     <variablelist>
-      <varlistentry><term>add <replaceable>filename</replaceable></term>
+      <varlistentry><term><option>add</option> <option>&synopsis-param-filename;</option></term>
       <listitem>
       <para>
- 
-        Add a new key to the list of trusted keys.  The key is read
-        from <replaceable>filename</replaceable>, or standard input if
-        <replaceable>filename</replaceable> is <literal>-</literal>.
+        Add a new key to the list of trusted keys.
+        The key is read from the filename given with the parameter
+        &synopsis-param-filename; or if the filename is <literal>-</literal>
+        from standard input.
       </para>
  
       </listitem>
       </varlistentry>
  
-      <varlistentry><term>del <replaceable>keyid</replaceable></term>
+      <varlistentry><term><option>del</option> <option>&synopsis-param-keyid;</option></term>
       <listitem>
       <para>
  
@@@ -68,18 -67,18 +67,18 @@@
       </listitem>
       </varlistentry>
  
-      <varlistentry><term>export <replaceable>keyid</replaceable></term>
+      <varlistentry><term><option>export</option> <option>&synopsis-param-keyid;</option></term>
       <listitem>
       <para>
  
-         Output the key <replaceable>keyid</replaceable> to standard output.
+         Output the key &synopsis-param-keyid; to standard output.
  
       </para>
  
       </listitem>
       </varlistentry>
  
-      <varlistentry><term>exportall</term>
+      <varlistentry><term><option>exportall</option></term>
       <listitem>
       <para>
  
@@@ -90,7 -89,7 +89,7 @@@
       </listitem>
       </varlistentry>
  
-      <varlistentry><term>list</term>
+      <varlistentry><term><option>list</option></term>
       <listitem>
       <para>
  
@@@ -101,7 -100,7 +100,7 @@@
       </listitem>
       </varlistentry>
       
- 	 <varlistentry><term>finger</term>
+      <varlistentry><term><option>finger</option></term>
       <listitem>
       <para>
  
@@@ -112,7 -111,7 +111,7 @@@
       </listitem>
       </varlistentry>
       
- 	 <varlistentry><term>adv</term>
+      <varlistentry><term><option>adv</option></term>
       <listitem>
       <para>
  
@@@ -124,21 -123,21 +123,21 @@@
       </listitem>
       </varlistentry>
  
-      <varlistentry><term>update</term>
+      <varlistentry><term><option>update</option></term>
       <listitem>
       <para>
  
         Update the local keyring with the archive keyring and remove from
         the local keyring the archive keys which are no longer valid.
         The archive keyring is shipped in the <literal>archive-keyring</literal> package of your
 -       distribution, e.g. the <literal>debian-archive-keyring</literal> package in Debian.
 +       distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in Ubuntu.
  
       </para>
  
       </listitem>
       </varlistentry>
       
-      <varlistentry><term>net-update</term>
+      <varlistentry><term><option>net-update</option></term>
       <listitem>
       <para>
  
@@@ -161,7 -160,7 +160,7 @@@
   <refsect1><title>Options</title>
  <para>Note that options need to be defined before the commands described in the previous section.</para>
     <variablelist>
-       <varlistentry><term>--keyring <replaceable>filename</replaceable></term>
+       <varlistentry><term><option>--keyring</option> <option>&synopsis-param-filename;</option></term>
        <listitem><para>With this option it is possible to specify a specific keyring
        file the command should operate on. The default is that a command is executed
        on the <filename>trusted.gpg</filename> file as well as on all parts in the
@@@ -181,12 -180,12 +180,12 @@@
       <listitem><para>Local trust database of archive keys.</para></listitem>
       </varlistentry>
  
 -     <varlistentry><term><filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename></term>
 -     <listitem><para>Keyring of Debian archive trusted keys.</para></listitem>
 +     <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename></term>
 +     <listitem><para>Keyring of Ubuntu archive trusted keys.</para></listitem>
       </varlistentry>
  
 -     <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename></term>
 -     <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
 +     <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename></term>
 +     <listitem><para>Keyring of Ubuntu archive removed trusted keys.</para></listitem>
       </varlistentry>
  
     </variablelist>
diff --combined doc/po/apt-doc.pot
index fff943e35,af4018272..68da38ba0
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@@ -1,13 -1,13 +1,14 @@@
  # SOME DESCRIPTIVE TITLE
  # Copyright (C) YEAR Free Software Foundation, Inc.
--# This file is distributed under the same license as the PACKAGE package.
++# This file is distributed under the same license as the apt package.
  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  #
  #, fuzzy
  msgid ""
  msgstr ""
--"Project-Id-Version: PACKAGE VERSION\n"
- "POT-Creation-Date: 2011-11-10 16:42+0100\n"
 -"POT-Creation-Date: 2012-05-21 13:37+0300\n"
++"Project-Id-Version: apt 0.9.5ubuntu1~20120522\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:59+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"
@@@ -126,32 -126,7 +127,7 @@@ msgid "apt was written by the APT team 
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:2
- msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
- msgstr ""
- 
- #. type: Plain text
- #: apt.ent:16
- #, no-wrap
- msgid ""
- "<!-- Boiler plate docinfo section -->\n"
- "<!ENTITY apt-docinfo \"\n"
- " <refentryinfo>\n"
- "   <address><email>apt@packages.debian.org</email></address>\n"
- "   <author>\n"
- "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
- "     <contrib></contrib>\n"
- "   </author>\n"
- "   <copyright><year>1998-2001</year> <holder>Jason "
- "Gunthorpe</holder></copyright>\n"
- "   <date>28 October 2008</date>\n"
- "   <productname>Linux</productname>\n"
- " </refentryinfo>\n"
- "\">\n"
- msgstr ""
- 
- #. type: Plain text
- #: apt.ent:23
+ #: apt.ent:7
  #, no-wrap
  msgid ""
  "<!ENTITY apt-author.team \"\n"
@@@ -163,7 -138,7 +139,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:29
+ #: apt.ent:13
  #, no-wrap
  msgid ""
  "<!ENTITY apt-qapage \"\n"
@@@ -174,7 -149,7 +150,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:40
+ #: apt.ent:24
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Bug reporting section -->\n"
@@@ -190,7 -165,7 +166,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:48
+ #: apt.ent:32
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Author section -->\n"
@@@ -204,7 -179,7 +180,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:58
+ #: apt.ent:42
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -219,7 -194,7 +195,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:66
+ #: apt.ent:50
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -232,7 -207,7 +208,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:78
+ #: apt.ent:62
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -252,7 -227,7 +228,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:90
+ #: apt.ent:74
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -272,7 -247,7 +248,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:101
+ #: apt.ent:85
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -289,7 -264,7 +265,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:107
+ #: apt.ent:91
  #, no-wrap
  msgid ""
  "<!ENTITY file-aptconf \"\n"
@@@ -301,7 -276,7 +277,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:113
+ #: apt.ent:97
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@@ -313,7 -288,7 +289,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:119
+ #: apt.ent:103
  #, no-wrap
  msgid ""
  "<!ENTITY file-cachearchives \"\n"
@@@ -325,20 -300,21 +301,21 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:125
+ #: apt.ent:109
  #, no-wrap
  msgid ""
  "     "
  "<varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
  "     <listitem><para>Storage area for package files in transit.\n"
- "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit "
- "partial). </para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Cache::Archives</literal> "
+ "(<filename>partial</filename> will be implicitly "
+ "appended). </para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:135
+ #: apt.ent:119
  #, no-wrap
  msgid ""
  "<!ENTITY file-preferences \"\n"
@@@ -354,7 -330,7 +331,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:141
+ #: apt.ent:125
  #, no-wrap
  msgid ""
  "     "
@@@ -367,7 -343,7 +344,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:147
+ #: apt.ent:131
  #, no-wrap
  msgid ""
  "<!ENTITY file-sourceslist \"\n"
@@@ -379,7 -355,7 +356,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:153
+ #: apt.ent:137
  #, no-wrap
  msgid ""
  "     "
@@@ -392,7 -368,7 +369,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:160
+ #: apt.ent:144
  #, no-wrap
  msgid ""
  "<!ENTITY file-statelists \"\n"
@@@ -406,20 -382,21 +383,21 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:166
+ #: apt.ent:150
  #, no-wrap
  msgid ""
  "     "
  "<varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
  "     <listitem><para>Storage area for state information in transit.\n"
- "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit "
- "partial).</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::State::Lists</literal> "
+ "(<filename>partial</filename> will be implicitly "
+ "appended).</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:172
+ #: apt.ent:156
  #, no-wrap
  msgid ""
  "<!ENTITY file-trustedgpg \"\n"
@@@ -432,7 -409,7 +410,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:179
+ #: apt.ent:163
  #, no-wrap
  msgid ""
  "     "
@@@ -447,7 -424,7 +425,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:187
+ #: apt.ent:171
  #, no-wrap
  msgid ""
  "<!ENTITY file-extended_states \"\n"
@@@ -461,7 -438,7 +439,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:191
+ #: apt.ent:175
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is the section header for the following paragraphs - "
@@@ -472,7 -449,7 +450,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:200
+ #: apt.ent:184
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is a placeholder. You should write here who has "
@@@ -491,7 -468,7 +469,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:210
+ #: apt.ent:195
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: As a translation is allowed to have 20% of "
@@@ -510,26 -487,130 +488,130 @@@
  "\">\n"
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cache.8.xml:16
+ #. type: Plain text
+ #: apt.ent:198
  msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
- "February 2011</date>"
+ "<!-- TRANSLATOR: used as in -o=config_string "
+ "e.g. -o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
+ "\"config_string\">"
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cache.8.xml:25 apt-cache.8.xml:32
- msgid "apt-cache"
+ #. type: Plain text
+ #: apt.ent:201
+ msgid ""
+ "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+ "synopsis-config-file \"config_file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:204
+ msgid ""
+ "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release "
+ "e.g. -t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+ "\"target_release\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:207
+ msgid ""
+ "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+ "synopsis-architecture \"architecture\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:210
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+ "--> <!ENTITY synopsis-pkg \"pkg\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:213
+ msgid ""
+ "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> "
+ "<!ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:216
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+ "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:219
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+ "awesome --> <!ENTITY synopsis-regex \"regex\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:222
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+ "-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:225
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory "
+ "e.g. apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+ "\"temporary_directory\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:228
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+ "synopsis-filename \"filename\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:231
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:234
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-override "
+ "\"override-file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:237
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+ "\"pathprefix\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:240
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "generate section --> <!ENTITY synopsis-section \"section\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:243
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
  msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
- #: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26 apt-key.8.xml:18 apt-mark.8.xml:26 apt-secure.8.xml:18
+ #: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26 apt-key.8.xml:25 apt-mark.8.xml:26 apt-secure.8.xml:25
  msgid "8"
  msgstr ""
  
  #. type: Content of: <refentry><refmeta><refmiscinfo>
- #: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27 apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27 apt-key.8.xml:19 apt-mark.8.xml:27 apt-secure.8.xml:19 apt-sortpkgs.1.xml:27 apt.conf.5.xml:33 apt_preferences.5.xml:26 sources.list.5.xml:27
+ #: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27 apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27 apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26 apt-sortpkgs.1.xml:27 apt.conf.5.xml:32 apt_preferences.5.xml:26 sources.list.5.xml:27
  msgid "APT"
  msgstr ""
  
@@@ -538,40 -619,13 +620,13 @@@
  msgid "query the APT cache"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cache.8.xml:39
- msgid ""
- "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
- "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
- "<arg>search <arg "
- "choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>depends <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>pkgnames <arg "
- "choice=\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty "
- "<arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>xvcg <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>policy <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> "
- "</group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121 apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36
+ #: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38 apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38 apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50 apt-sortpkgs.1.xml:38 apt.conf.5.xml:41 apt_preferences.5.xml:36 sources.list.5.xml:36
  msgid "Description"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:65
+ #: apt-cache.8.xml:39
  msgid ""
  "<command>apt-cache</command> performs a variety of operations on APT's "
  "package cache. <command>apt-cache</command> does not manipulate the state of "
@@@ -580,32 -634,26 +635,26 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:70 apt-get.8.xml:127
+ #: apt-cache.8.xml:44 apt-get.8.xml:44
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given, "
  "one of the commands below must be present."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:74
- msgid "gencaches"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:75
+ #: apt-cache.8.xml:49
  msgid ""
- "<literal>gencaches</literal> performs the same operation as <command>apt-get "
- "check</command>. It builds the source and package caches from the sources in "
- "&sources-list; and from <filename>/var/lib/dpkg/status</filename>."
+ "<literal>gencaches</literal> creates APT's package cache. This is done "
+ "implicitly by all commands needing this cache if it is missing or outdated."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:81
- msgid "showpkg <replaceable>pkg(s)</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163 apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208 apt-cache.8.xml:226 apt-cache.8.xml:238
+ msgid "&synopsis-pkg;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:82
+ #: apt-cache.8.xml:54
  msgid ""
  "<literal>showpkg</literal> displays information about the packages listed on "
  "the command line. Remaining arguments are package names. The available "
@@@ -619,7 -667,7 +668,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-cache.8.xml:94
+ #: apt-cache.8.xml:66
  #, no-wrap
  msgid ""
  "Package: libreadline2\n"
@@@ -635,7 -683,7 +684,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:106
+ #: apt-cache.8.xml:78
  msgid ""
  "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
  "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@@ -646,27 -694,22 +695,22 @@@
  "best to consult the apt source code."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:115
- msgid "stats"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:115
+ #: apt-cache.8.xml:87
  msgid ""
  "<literal>stats</literal> displays some statistics about the cache.  No "
  "further arguments are expected. Statistics reported are:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:118
+ #: apt-cache.8.xml:90
  msgid ""
  "<literal>Total package names</literal> is the number of package names found "
  "in the cache."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:122
+ #: apt-cache.8.xml:94
  msgid ""
  "<literal>Normal packages</literal> is the number of regular, ordinary "
  "package names; these are packages that bear a one-to-one correspondence "
@@@ -675,7 -718,7 +719,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:128
+ #: apt-cache.8.xml:100
  msgid ""
  "<literal>Pure virtual packages</literal> is the number of packages that "
  "exist only as a virtual package name; that is, packages only \"provide\" the "
@@@ -686,7 -729,7 +730,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:136
+ #: apt-cache.8.xml:108
  msgid ""
  "<literal>Single virtual packages</literal> is the number of packages with "
  "only one package providing a particular virtual package. For example, in the "
@@@ -695,7 -738,7 +739,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:142
+ #: apt-cache.8.xml:114
  msgid ""
  "<literal>Mixed virtual packages</literal> is the number of packages that "
  "either provide a particular virtual package or have the virtual package name "
@@@ -705,7 -748,7 +749,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:149
+ #: apt-cache.8.xml:121
  msgid ""
  "<literal>Missing</literal> is the number of package names that were "
  "referenced in a dependency but were not provided by any package. Missing "
@@@ -715,7 -758,7 +759,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:156
+ #: apt-cache.8.xml:128
  msgid ""
  "<literal>Total distinct</literal> versions is the number of package versions "
  "found in the cache; this value is therefore at least equal to the number of "
@@@ -725,81 -768,56 +769,56 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:163
+ #: apt-cache.8.xml:135
  msgid ""
  "<literal>Total dependencies</literal> is the number of dependency "
  "relationships claimed by all of the packages in the cache."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:170
- msgid "showsrc <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:171
+ #: apt-cache.8.xml:143
  msgid ""
  "<literal>showsrc</literal> displays all the source package records that "
  "match the given package names. All versions are shown, as well as all "
  "records that declare the name to be a Binary."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:176 apt-config.8.xml:87
- msgid "dump"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:177
+ #: apt-cache.8.xml:149
  msgid ""
  "<literal>dump</literal> shows a short listing of every package in the "
  "cache. It is primarily for debugging."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:181
- msgid "dumpavail"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:182
+ #: apt-cache.8.xml:154
  msgid ""
  "<literal>dumpavail</literal> prints out an available list to stdout. This is "
  "suitable for use with &dpkg; and is used by the &dselect; method."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:186
- msgid "unmet"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:187
+ #: apt-cache.8.xml:159
  msgid ""
  "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
  "package cache."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:191
- msgid "show <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:192
+ #: apt-cache.8.xml:164
  msgid ""
  "<literal>show</literal> performs a function similar to <command>dpkg "
  "--print-avail</command>; it displays the package records for the named "
  "packages."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:197
- msgid "search <replaceable>regex [ regex ... ]</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:169
+ msgid "&synopsis-regex;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:198
+ #: apt-cache.8.xml:170
  msgid ""
  "<literal>search</literal> performs a full text search on all available "
  "package lists for the POSIX regex pattern given, see "
@@@ -814,43 -832,33 +833,33 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:211
+ #: apt-cache.8.xml:183
  msgid ""
  "Separate arguments can be used to specify multiple search patterns that are "
  "and'ed together."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:215
- msgid "depends <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:216
+ #: apt-cache.8.xml:188
  msgid ""
  "<literal>depends</literal> shows a listing of each dependency a package has "
  "and all the possible other packages that can fulfill that dependency."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:220
- msgid "rdepends <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:221
+ #: apt-cache.8.xml:193
  msgid ""
  "<literal>rdepends</literal> shows a listing of each reverse dependency a "
  "package has."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:225
- msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+ #: apt-cache.8.xml:197
+ msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:226
+ #: apt-cache.8.xml:198
  msgid ""
  "This command prints the name of each package APT knows. The optional "
  "argument is a prefix match to filter the name list. The output is suitable "
@@@ -860,20 -868,15 +869,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:231
+ #: apt-cache.8.xml:203
  msgid ""
  "Note that a package which APT knows of is not necessarily available to "
  "download, installable or installed, e.g. virtual packages are also listed in "
  "the generated list."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:236
- msgid "dotty <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:237
+ #: apt-cache.8.xml:209
  msgid ""
  "<literal>dotty</literal> takes a list of packages on the command line and "
  "generates output suitable for use by dotty from the <ulink "
@@@ -886,7 -889,7 +890,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:246
+ #: apt-cache.8.xml:218
  msgid ""
  "The resulting nodes will have several shapes; normal packages are boxes, "
  "pure provides are triangles, mixed provides are diamonds, missing packages "
@@@ -895,17 -898,12 +899,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:251
+ #: apt-cache.8.xml:223
  msgid "Caution, dotty cannot graph larger sets of packages."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:254
- msgid "xvcg <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:255
+ #: apt-cache.8.xml:227
  msgid ""
  "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
  "url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG "
@@@ -913,12 -911,12 +912,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:259
- msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
+ #: apt-cache.8.xml:231
+ msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:260
+ #: apt-cache.8.xml:232
  msgid ""
  "<literal>policy</literal> is meant to help debug issues relating to the "
  "preferences file. With no arguments it will print out the priorities of each "
@@@ -926,13 -924,8 +925,8 @@@
  "selection of the named package."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:266
- msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:267
+ #: apt-cache.8.xml:239
  msgid ""
  "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
  "to mimic the output format and a subset of the functionality of the Debian "
@@@ -943,41 -936,21 +937,21 @@@
  "(<literal>APT::Architecture</literal>)."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126 apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
+ #. type: Content of: <refentry><refsect1><title>
+ #: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52 apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 apt-sortpkgs.1.xml:48
  msgid "options"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>-p</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>--pkg-cache</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:283
+ #: apt-cache.8.xml:255
  msgid ""
  "Select the file to store the package cache. The package cache is the primary "
  "cache used by all operations.  Configuration Item: "
  "<literal>Dir::Cache::pkgcache</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404 apt-sortpkgs.1.xml:61
- msgid "<option>-s</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:288
- msgid "<option>--src-cache</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:289
+ #: apt-cache.8.xml:261
  msgid ""
  "Select the file to store the source cache. The source is used only by "
  "<literal>gencaches</literal> and it stores a parsed version of the package "
@@@ -986,18 -959,8 +960,8 @@@
  "Item: <literal>Dir::Cache::srcpkgcache</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
- msgid "<option>-q</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
- msgid "<option>--quiet</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:297
+ #: apt-cache.8.xml:269
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quietness up to a maximum of 2. You can also use "
@@@ -1005,66 -968,16 +969,16 @@@
  "configuration file.  Configuration Item: <literal>quiet</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>-i</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>--important</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:304
+ #: apt-cache.8.xml:276
  msgid ""
  "Print only important dependencies; for use with unmet and depends. Causes "
  "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
  "<literal>APT::Cache::Important</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:309
- msgid "<option>--no-pre-depends</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:310
- msgid "<option>--no-depends</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:311
- msgid "<option>--no-recommends</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:312
- msgid "<option>--no-suggests</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:313
- msgid "<option>--no-conflicts</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:314
- msgid "<option>--no-breaks</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:315
- msgid "<option>--no-replaces</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:316
- msgid "<option>--no-enhances</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:317
+ #: apt-cache.8.xml:289
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
  "print all dependencies. This can be tweaked with these flags which will omit "
@@@ -1073,35 -986,15 +987,15 @@@
  "e.g. <literal>APT::Cache::ShowRecommends</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
- msgid "<option>-f</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323
- msgid "<option>--full</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:324
+ #: apt-cache.8.xml:296
  msgid ""
  "Print full package records when searching.  Configuration Item: "
  "<literal>APT::Cache::ShowFull</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 apt-get.8.xml:452
- msgid "<option>-a</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:328
- msgid "<option>--all-versions</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:329
+ #: apt-cache.8.xml:301
  msgid ""
  "Print full records for all available versions. This is the default; to turn "
  "it off, use <option>--no-all-versions</option>.  If "
@@@ -1111,18 -1004,8 +1005,8 @@@
  "Configuration Item: <literal>APT::Cache::AllVersions</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>-g</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>--generate</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:338
+ #: apt-cache.8.xml:310
  msgid ""
  "Perform automatic package cache regeneration, rather than use the cache as "
  "it is. This is the default; to turn it off, use "
@@@ -1130,56 -1013,31 +1014,31 @@@
  "<literal>APT::Cache::Generate</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343
- msgid "<option>--names-only</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343 apt-cdrom.8.xml:142
- msgid "<option>-n</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:344
+ #: apt-cache.8.xml:316
  msgid ""
  "Only search on the package names, not the long descriptions.  Configuration "
  "Item: <literal>APT::Cache::NamesOnly</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:348
- msgid "<option>--all-names</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:349
+ #: apt-cache.8.xml:321
  msgid ""
  "Make <literal>pkgnames</literal> print all names, including virtual packages "
  "and missing dependencies.  Configuration Item: "
  "<literal>APT::Cache::AllNames</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:354
- msgid "<option>--recurse</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:355
+ #: apt-cache.8.xml:327
  msgid ""
  "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
  "that all packages mentioned are printed once.  Configuration Item: "
  "<literal>APT::Cache::RecurseDepends</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:360
- msgid "<option>--installed</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:362
+ #: apt-cache.8.xml:334
  msgid ""
  "Limit the output of <literal>depends</literal> and "
  "<literal>rdepends</literal> to packages which are currently installed.  "
@@@ -1187,71 -1045,49 +1046,49 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:596 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+ #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104 apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514 apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
  msgid "&apt-commonoptions;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:372 apt-get.8.xml:601 apt-key.8.xml:175 apt-mark.8.xml:144 apt.conf.5.xml:1110 apt_preferences.5.xml:697
+ #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126 apt.conf.5.xml:1118 apt_preferences.5.xml:698
  msgid "Files"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:374
+ #: apt-cache.8.xml:346
  msgid "&file-sourceslist; &file-statelists;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:611 apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704 sources.list.5.xml:255
+ #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:255
  msgid "See Also"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:380
+ #: apt-cache.8.xml:352
  msgid "&apt-conf;, &sources-list;, &apt-get;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:617 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+ #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
  msgid "Diagnostics"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:385
+ #: apt-cache.8.xml:357
  msgid ""
  "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
  "on error."
  msgstr ""
  
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cdrom.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "February 2004</date>"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cdrom.8.xml:24 apt-cdrom.8.xml:31
- msgid "apt-cdrom"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-cdrom.8.xml:32
  msgid "APT CDROM management utility"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cdrom.8.xml:38
- msgid ""
- "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
- "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
- "<arg>add</arg> <arg>ident</arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:51
+ #: apt-cdrom.8.xml:38
  msgid ""
  "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
  "available sources. <command>apt-cdrom</command> takes care of determining "
@@@ -1260,20 -1096,15 +1097,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:58
+ #: apt-cdrom.8.xml:45
  msgid ""
  "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
  "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
  "must be inserted and scanned separately to account for possible mis-burns."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:68
- msgid "add"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:69
+ #: apt-cdrom.8.xml:56
  msgid ""
  "<literal>add</literal> is used to add a new disc to the source list. It will "
  "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@@ -1283,27 -1114,22 +1115,22 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:77
+ #: apt-cdrom.8.xml:64
  msgid ""
  "APT uses a CDROM ID to track which disc is currently in the drive and "
  "maintains a database of these IDs in "
  "<filename>&statedir;/cdroms.list</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:84
- msgid "ident"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:85
+ #: apt-cdrom.8.xml:72
  msgid ""
  "A debugging tool to report the identity of the current disc as well as the "
  "stored file name"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:64
+ #: apt-cdrom.8.xml:51
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present.  <placeholder "
@@@ -1311,71 -1137,36 +1138,36 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cdrom.8.xml:94 apt-key.8.xml:161
+ #: apt-cdrom.8.xml:81 apt-key.8.xml:160
  msgid "Options"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
- msgid "<option>-d</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98
- msgid "<option>--cdrom</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:99
+ #: apt-cdrom.8.xml:86
  msgid ""
  "Mount point; specify the location to mount the cdrom. This mount point must "
  "be listed in <filename>/etc/fstab</filename> and properly configured.  "
  "Configuration Item: <literal>Acquire::cdrom::mount</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>-r</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>--rename</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:108
+ #: apt-cdrom.8.xml:95
  msgid ""
  "Rename a disc; change the label of a disk or override the disks given "
  "label. This option will cause <command>apt-cdrom</command> to prompt for a "
  "new label.  Configuration Item: <literal>APT::CDROM::Rename</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116 apt-get.8.xml:375
- msgid "<option>-m</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116
- msgid "<option>--no-mount</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:117
+ #: apt-cdrom.8.xml:104
  msgid ""
  "No mounting; prevent <command>apt-cdrom</command> from mounting and "
  "unmounting the mount point.  Configuration Item: "
  "<literal>APT::CDROM::NoMount</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:124
- msgid "<option>--fast</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:125
+ #: apt-cdrom.8.xml:112
  msgid ""
  "Fast Copy; Assume the package files are valid and do not check every "
  "package. This option should be used only if <command>apt-cdrom</command> has "
@@@ -1383,36 -1174,16 +1175,16 @@@
  "Item: <literal>APT::CDROM::Fast</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:134
- msgid "<option>--thorough</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:135
+ #: apt-cdrom.8.xml:122
  msgid ""
  "Thorough Package Scan; This option may be needed with some old Debian "
  "1.1/1.2 discs that have Package files in strange places. It takes much "
  "longer to scan the CD but will pick them all up."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:143 apt-get.8.xml:406
- msgid "<option>--just-print</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:144 apt-get.8.xml:408
- msgid "<option>--recon</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:145 apt-get.8.xml:409
- msgid "<option>--no-act</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:146
+ #: apt-cdrom.8.xml:133
  msgid ""
  "No Changes; Do not change the &sources-list; file and do not write index "
  "files. Everything is still checked however.  Configuration Item: "
@@@ -1420,46 -1191,24 +1192,24 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:159
+ #: apt-cdrom.8.xml:146
  msgid "&apt-conf;, &apt-get;, &sources-list;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:164
+ #: apt-cdrom.8.xml:151
  msgid ""
  "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
  "on error."
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-config.8.xml:16 apt-extracttemplates.1.xml:16 apt-sortpkgs.1.xml:16 sources.list.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
- "February 2004</date>"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-config.8.xml:25 apt-config.8.xml:32
- msgid "apt-config"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-config.8.xml:33
  msgid "APT Configuration Query program"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-config.8.xml:39
- msgid ""
- "<command>apt-config</command> <arg><option>-hv</option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
- "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:51
+ #: apt-config.8.xml:39
  msgid ""
  "<command>apt-config</command> is an internal program used by various "
  "portions of the APT suite to provide consistent configurability. It accesses "
@@@ -1468,19 -1217,14 +1218,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+ #: apt-config.8.xml:44 apt-ftparchive.1.xml:54
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-config.8.xml:61
- msgid "shell"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:63
+ #: apt-config.8.xml:51
  msgid ""
  "shell is used to access the configuration information from a shell "
  "script. It is given pairs of arguments, the first being a shell variable and "
@@@ -1490,7 -1234,7 +1235,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-config.8.xml:71
+ #: apt-config.8.xml:59
  #, no-wrap
  msgid ""
  "OPTS=\"-f\"\n"
@@@ -1499,14 -1243,14 +1244,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:76
+ #: apt-config.8.xml:64
  msgid ""
  "This will set the shell environment variable $OPTS to the value of "
  "MyApp::options with a default of <option>-f</option>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:80
+ #: apt-config.8.xml:68
  msgid ""
  "The configuration item may be postfixed with a /[fdbi]. f returns file "
  "names, d returns directories, b returns true or false and i returns an "
@@@ -1514,27 -1258,46 +1259,46 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:89
+ #: apt-config.8.xml:77
  msgid "Just show the contents of the configuration space."
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:90
+ msgid ""
+ "Include options which have an empty value. This is the default, so use "
+ "--no-empty to remove them from the output."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-config.8.xml:95
+ msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:96
+ msgid ""
+ "Defines the output of each config option. &percnt;t will be replaced with "
+ "the name of the option, &percnt;f with the complete optionname and &percnt;v "
+ "with the value of the option.  Use uppercase letters and special characters "
+ "in the value will be encoded to ensure that it can e.g. be savely used in a "
+ "quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
+ "by a newline, &percnt;N by a tab. A &percnt; can be printed by using "
+ "&percnt;&percnt;."
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 apt-sortpkgs.1.xml:73
+ #: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608 apt-sortpkgs.1.xml:64
  msgid "&apt-conf;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:112
+ #: apt-config.8.xml:115
  msgid ""
  "<command>apt-config</command> returns zero on normal operation, decimal 100 "
  "on error."
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-extracttemplates.1.xml:25 apt-extracttemplates.1.xml:32
- msgid "apt-extracttemplates"
- msgstr ""
- 
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
  msgid "1"
@@@ -1545,17 -1308,8 +1309,8 @@@ msgstr "
  msgid "Utility to extract DebConf config and templates from Debian packages"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-extracttemplates.1.xml:39
- msgid ""
- "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
- "<arg><option>-t=<replaceable>temporary "
- "directory</replaceable></option></arg> <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>file</replaceable></arg>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:47
+ #: apt-extracttemplates.1.xml:39
  msgid ""
  "<command>apt-extracttemplates</command> will take one or more Debian package "
  "files as input and write out (to a temporary directory) all associated "
@@@ -1565,32 -1319,22 +1320,22 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:52
+ #: apt-extracttemplates.1.xml:44
  msgid "package version template-file config-script"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:53
+ #: apt-extracttemplates.1.xml:45
  msgid ""
  "template-file and config-script are written to the temporary directory "
- "specified by the -t or --tempdir "
- "(<literal>APT::ExtractTemplates::TempDir</literal>)  directory, with "
+ "specified by the <option>-t</option> or <option>--tempdir</option> "
+ "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
  "filenames of the form <filename>package.template.XXXX</filename> and "
  "<filename>package.config.XXXX</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63 apt-get.8.xml:530
- msgid "<option>-t</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63
- msgid "<option>--tempdir</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-extracttemplates.1.xml:65
+ #: apt-extracttemplates.1.xml:58
  msgid ""
  "Temporary directory in which to write extracted debconf template files and "
  "config scripts.  Configuration Item: "
@@@ -1598,23 -1342,10 +1343,10 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:82
+ #: apt-extracttemplates.1.xml:75
  msgid ""
  "<command>apt-extracttemplates</command> returns zero on normal operation, "
- "decimal 100 on error."
- msgstr ""
- 
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-ftparchive.1.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
- "August 2009</date>"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-ftparchive.1.xml:25 apt-ftparchive.1.xml:32
- msgid "apt-ftparchive"
+ "decimal 100 on error."
  msgstr ""
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
@@@ -1622,33 -1353,8 +1354,8 @@@
  msgid "Utility to generate index files"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-ftparchive.1.xml:39
- msgid ""
- "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
- "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
- "<arg><option>--readonly</option></arg> "
- "<arg><option>--contents</option></arg> <arg><option>--arch "
- "<replaceable>architecture</replaceable></option></arg> <arg><option>-o "
- "<replaceable>config</replaceable>=<replaceable>string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
- "choice=\"req\"> <arg>packages<arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>sources<arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>contents <arg "
- "choice=\"plain\"><replaceable>path</replaceable></arg></arg> <arg>release "
- "<arg choice=\"plain\"><replaceable>path</replaceable></arg></arg> "
- "<arg>generate <arg "
- "choice=\"plain\"><replaceable>config-file</replaceable></arg> <arg "
- "choice=\"plain\" "
- "rep=\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean "
- "<arg choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> "
- "</group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:60
+ #: apt-ftparchive.1.xml:39
  msgid ""
  "<command>apt-ftparchive</command> is the command line tool that generates "
  "the index files that APT uses to access a distribution source. The index "
@@@ -1657,7 -1363,7 +1364,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:64
+ #: apt-ftparchive.1.xml:43
  msgid ""
  "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
  "program, incorporating its entire functionality via the "
@@@ -1667,7 -1373,7 +1374,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:70
+ #: apt-ftparchive.1.xml:49
  msgid ""
  "Internally <command>apt-ftparchive</command> can make use of binary "
  "databases to cache the contents of a .deb file and it does not rely on any "
@@@ -1676,13 -1382,8 +1383,8 @@@
  "output files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:79
- msgid "packages"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:81
+ #: apt-ftparchive.1.xml:60
  msgid ""
  "The packages command generates a package file from a directory tree. It "
  "takes the given directory and recursively searches it for .deb files, "
@@@ -1691,17 -1392,12 +1393,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+ #: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
  msgid "The option <option>--db</option> can be used to specify a binary caching DB."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:89
- msgid "sources"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:91
+ #: apt-ftparchive.1.xml:70
  msgid ""
  "The <literal>sources</literal> command generates a source index file from a "
  "directory tree.  It takes the given directory and recursively searches it "
@@@ -1710,20 -1406,15 +1407,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:96
+ #: apt-ftparchive.1.xml:75
  msgid ""
  "If an override file is specified then a source override file will be looked "
  "for with an extension of .src. The --source-override option can be used to "
  "change the source override file that will be used."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:101
- msgid "contents"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:103
+ #: apt-ftparchive.1.xml:82
  msgid ""
  "The <literal>contents</literal> command generates a contents file from a "
  "directory tree. It takes the given directory and recursively searches it for "
@@@ -1733,13 -1424,8 +1425,8 @@@
  "separated by a comma in the output."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:113
- msgid "release"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:115
+ #: apt-ftparchive.1.xml:94
  msgid ""
  "The <literal>release</literal> command generates a Release file from a "
  "directory tree. It recursively searches the given directory for uncompressed "
@@@ -1755,7 -1441,7 +1442,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:125
+ #: apt-ftparchive.1.xml:104
  msgid ""
  "Values for the additional metadata fields in the Release file are taken from "
  "the corresponding variables under "
@@@ -1768,13 -1454,8 +1455,8 @@@
  "<literal>Components</literal>, <literal>Description</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:136
- msgid "generate"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:138
+ #: apt-ftparchive.1.xml:117
  msgid ""
  "The <literal>generate</literal> command is designed to be runnable from a "
  "cron script and builds indexes according to the given config file. The "
@@@ -1783,25 -1464,20 +1465,20 @@@
  "maintaining the required settings."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:145 apt-get.8.xml:298
- msgid "clean"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:147
+ #: apt-ftparchive.1.xml:126
  msgid ""
  "The <literal>clean</literal> command tidies the databases used by the given "
  "configuration file by removing any records that are no longer necessary."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:153
+ #: apt-ftparchive.1.xml:132
  msgid "The Generate Configuration"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:155
+ #: apt-ftparchive.1.xml:134
  msgid ""
  "The <literal>generate</literal> command uses a configuration file to "
  "describe the archives that are going to be generated. It follows the typical "
@@@ -1812,17 -1488,17 +1489,17 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:163
+ #: apt-ftparchive.1.xml:142
  msgid "The generate configuration has 4 separate sections, each described below."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:165
+ #: apt-ftparchive.1.xml:144
  msgid "Dir Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:167
+ #: apt-ftparchive.1.xml:146
  msgid ""
  "The <literal>Dir</literal> section defines the standard directories needed "
  "to locate the files required during the generation process. These "
@@@ -1830,71 -1506,46 +1507,46 @@@
  "to produce a complete an absolute path."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:172
- msgid "ArchiveDir"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:174
+ #: apt-ftparchive.1.xml:153
  msgid ""
  "Specifies the root of the FTP archive, in a standard Debian configuration "
  "this is the directory that contains the <filename>ls-LR</filename> and dist "
  "nodes."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:179
- msgid "OverrideDir"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:181
+ #: apt-ftparchive.1.xml:160
  msgid "Specifies the location of the override files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:184
- msgid "CacheDir"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:186
+ #: apt-ftparchive.1.xml:165
  msgid "Specifies the location of the cache files"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:189
- msgid "FileListDir"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:191
+ #: apt-ftparchive.1.xml:170
  msgid ""
  "Specifies the location of the file list files, if the "
  "<literal>FileList</literal> setting is used below."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:197
+ #: apt-ftparchive.1.xml:176
  msgid "Default Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:199
+ #: apt-ftparchive.1.xml:178
  msgid ""
  "The <literal>Default</literal> section specifies default values, and "
  "settings that control the operation of the generator. Other sections may "
  "override these defaults with a per-section setting."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:203
- msgid "Packages::Compress"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:205
+ #: apt-ftparchive.1.xml:184
  msgid ""
  "Sets the default compression schemes to use for the Package index files. It "
  "is a string that contains a space separated list of at least one of: '.' (no "
@@@ -1902,136 -1553,86 +1554,86 @@@
  "'. gzip'."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:211
- msgid "Packages::Extensions"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:213
+ #: apt-ftparchive.1.xml:192
  msgid ""
  "Sets the default list of file extensions that are package files.  This "
  "defaults to '.deb'."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:217
- msgid "Sources::Compress"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:219
+ #: apt-ftparchive.1.xml:198
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Sources files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:223
- msgid "Sources::Extensions"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:225
+ #: apt-ftparchive.1.xml:204
  msgid ""
  "Sets the default list of file extensions that are source files.  This "
  "defaults to '.dsc'."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:229
- msgid "Contents::Compress"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:231
+ #: apt-ftparchive.1.xml:210
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Contents files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:235
- msgid "Translation::Compress"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:237
+ #: apt-ftparchive.1.xml:216
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Translation-en master file."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:241
- msgid "DeLinkLimit"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:243
+ #: apt-ftparchive.1.xml:222
  msgid ""
  "Specifies the number of kilobytes to delink (and replace with hard links) "
  "per run. This is used in conjunction with the per-section "
  "<literal>External-Links</literal> setting."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:248
- msgid "FileMode"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:250
+ #: apt-ftparchive.1.xml:229
  msgid ""
  "Specifies the mode of all created index files. It defaults to 0644. All "
  "index files are set to this mode with no regard to the umask."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
- msgid "LongDescription"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+ #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
  msgid ""
  "Sets if long descriptions should be included in the Packages file or split "
  "out into a master Translation-en file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:263
+ #: apt-ftparchive.1.xml:242
  msgid "TreeDefault Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:265
+ #: apt-ftparchive.1.xml:244
  msgid ""
  "Sets defaults specific to <literal>Tree</literal> sections. All of these "
  "variables are substitution variables and have the strings $(DIST), "
  "$(SECTION) and $(ARCH) replaced with their respective values."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:270
- msgid "MaxContentsChange"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:272
+ #: apt-ftparchive.1.xml:251
  msgid ""
  "Sets the number of kilobytes of contents files that are generated each "
  "day. The contents files are round-robined so that over several days they "
  "will all be rebuilt."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:277
- msgid "ContentsAge"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:279
+ #: apt-ftparchive.1.xml:258
  msgid ""
  "Controls the number of days a contents file is allowed to be checked without "
  "changing. If this limit is passed the mtime of the contents file is "
@@@ -2041,87 -1642,52 +1643,52 @@@
  "new file anyhow. The default is 10, the units are in days."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:288
- msgid "Directory"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:290
+ #: apt-ftparchive.1.xml:269
  msgid ""
  "Sets the top of the .deb directory tree. Defaults to "
  "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:294
- msgid "SrcDirectory"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:296
+ #: apt-ftparchive.1.xml:275
  msgid ""
  "Sets the top of the source package directory tree. Defaults to "
  "<filename>$(DIST)/$(SECTION)/source/</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
- msgid "Packages"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:302
+ #: apt-ftparchive.1.xml:281
  msgid ""
  "Sets the output Packages file. Defaults to "
  "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
- msgid "Sources"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:308
+ #: apt-ftparchive.1.xml:287
  msgid ""
  "Sets the output Sources file. Defaults to "
  "<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:312
- msgid "Translation"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:314
+ #: apt-ftparchive.1.xml:293
  msgid ""
  "Set the output Translation-en master file with the long descriptions if they "
  "should be not included in the Packages file. Defaults to "
  "<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:319
- msgid "InternalPrefix"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:321
+ #: apt-ftparchive.1.xml:300
  msgid ""
  "Sets the path prefix that causes a symlink to be considered an internal link "
  "instead of an external link. Defaults to "
  "<filename>$(DIST)/$(SECTION)/</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
- msgid "Contents"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:328
+ #: apt-ftparchive.1.xml:307
  msgid ""
  "Sets the output Contents file. Defaults to "
  "<filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes "
@@@ -2130,48 -1696,28 +1697,28 @@@
  "package files together automatically."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:335
- msgid "Contents::Header"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:337
+ #: apt-ftparchive.1.xml:316
  msgid "Sets header file to prepend to the contents output."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
- msgid "BinCacheDB"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:342
+ #: apt-ftparchive.1.xml:321
  msgid ""
  "Sets the binary cache database to use for this section. Multiple sections "
  "can share the same database."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:346
- msgid "FileList"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:348
+ #: apt-ftparchive.1.xml:327
  msgid ""
  "Specifies that instead of walking the directory tree, "
  "<command>apt-ftparchive</command> should read the list of files from the "
  "given file. Relative files names are prefixed with the archive directory."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:353
- msgid "SourceFileList"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:355
+ #: apt-ftparchive.1.xml:334
  msgid ""
  "Specifies that instead of walking the directory tree, "
  "<command>apt-ftparchive</command> should read the list of files from the "
@@@ -2180,12 -1726,12 +1727,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:363
+ #: apt-ftparchive.1.xml:342
  msgid "Tree Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:365
+ #: apt-ftparchive.1.xml:344
  msgid ""
  "The <literal>Tree</literal> section defines a standard Debian file tree "
  "which consists of a base directory, then multiple sections in that base "
@@@ -2195,7 -1741,7 +1742,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:370
+ #: apt-ftparchive.1.xml:349
  msgid ""
  "The <literal>Tree</literal> section takes a scope tag which sets the "
  "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@@ -2204,7 -1750,7 +1751,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:375
+ #: apt-ftparchive.1.xml:354
  msgid ""
  "All of the settings defined in the <literal>TreeDefault</literal> section "
  "can be use in a <literal>Tree</literal> section as well as three new "
@@@ -2212,7 -1758,7 +1759,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt-ftparchive.1.xml:381
+ #: apt-ftparchive.1.xml:360
  #, no-wrap
  msgid ""
  "for i in Sections do \n"
@@@ -2222,90 -1768,60 +1769,60 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:378
+ #: apt-ftparchive.1.xml:357
  msgid ""
  "When processing a <literal>Tree</literal> section "
  "<command>apt-ftparchive</command> performs an operation similar to: "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:387
- msgid "Sections"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:389
+ #: apt-ftparchive.1.xml:368
  msgid ""
  "This is a space separated list of sections which appear under the "
  "distribution, typically this is something like <literal>main contrib "
  "non-free</literal>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
- msgid "Architectures"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:396
+ #: apt-ftparchive.1.xml:375
  msgid ""
  "This is a space separated list of all the architectures that appear under "
  "search section. The special architecture 'source' is used to indicate that "
  "this tree has a source archive."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
- msgid "BinOverride"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:409
+ #: apt-ftparchive.1.xml:388
  msgid ""
  "Sets the binary override file. The override file contains section, priority "
  "and maintainer address information."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
- msgid "SrcOverride"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:415
+ #: apt-ftparchive.1.xml:394
  msgid ""
  "Sets the source override file. The override file contains section "
  "information."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
- msgid "ExtraOverride"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+ #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
  msgid "Sets the binary extra override file."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
- msgid "SrcExtraOverride"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+ #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
  msgid "Sets the source extra override file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:431
+ #: apt-ftparchive.1.xml:410
  msgid "BinDirectory Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:433
+ #: apt-ftparchive.1.xml:412
  msgid ""
  "The <literal>bindirectory</literal> section defines a binary directory tree "
  "with no special structure. The scope tag specifies the location of the "
@@@ -2315,64 -1831,54 +1832,54 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:441
+ #: apt-ftparchive.1.xml:420
  msgid "Sets the Packages file output."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:446
+ #: apt-ftparchive.1.xml:425
  msgid ""
  "Sets the Sources file output. At least one of <literal>Packages</literal> or "
  "<literal>Sources</literal> is required."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:452
+ #: apt-ftparchive.1.xml:431
  msgid "Sets the Contents file output. (optional)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:457
+ #: apt-ftparchive.1.xml:436
  msgid "Sets the binary override file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:462
+ #: apt-ftparchive.1.xml:441
  msgid "Sets the source override file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:477
+ #: apt-ftparchive.1.xml:456
  msgid "Sets the cache DB."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:480
- msgid "PathPrefix"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:482
+ #: apt-ftparchive.1.xml:461
  msgid "Appends a path to all the output paths."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:485
- msgid "FileList, SourceFileList"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:487
+ #: apt-ftparchive.1.xml:466
  msgid "Specifies the file list file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:494
+ #: apt-ftparchive.1.xml:473
  msgid "The Binary Override File"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:495
+ #: apt-ftparchive.1.xml:474
  msgid ""
  "The binary override file is fully compatible with &dpkg-scanpackages;. It "
  "contains 4 fields separated by spaces. The first field is the package name, "
@@@ -2382,19 -1888,19 +1889,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:501
+ #: apt-ftparchive.1.xml:480
  #, no-wrap
  msgid "old [// oldn]* => new"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:503
+ #: apt-ftparchive.1.xml:482
  #, no-wrap
  msgid "new"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:500
+ #: apt-ftparchive.1.xml:479
  msgid ""
  "The general form of the maintainer field is: <placeholder "
  "type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
@@@ -2405,12 -1911,12 +1912,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:511
+ #: apt-ftparchive.1.xml:490
  msgid "The Source Override File"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:513
+ #: apt-ftparchive.1.xml:492
  msgid ""
  "The source override file is fully compatible with &dpkg-scansources;. It "
  "contains 2 fields separated by spaces. The first fields is the source "
@@@ -2418,25 -1924,20 +1925,20 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:518
+ #: apt-ftparchive.1.xml:497
  msgid "The Extra Override File"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:520
+ #: apt-ftparchive.1.xml:499
  msgid ""
  "The extra override file allows any arbitrary tag to be added or replaced in "
  "the output. It has 3 columns, the first is the package, the second is the "
  "tag and the remainder of the line is the new value."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:529
- msgid "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:531
+ #: apt-ftparchive.1.xml:510
  msgid ""
  "Generate the given checksum. These options default to on, when turned off "
  "the generated index files will not have the checksum fields where possible.  "
@@@ -2451,20 -1952,15 +1953,15 @@@
  "<literal>SHA256</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:540
- msgid "<option>--db</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:542
+ #: apt-ftparchive.1.xml:521
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
  "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:548
+ #: apt-ftparchive.1.xml:527
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -2472,13 -1968,8 +1969,8 @@@
  "file.  Configuration Item: <literal>quiet</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:554
- msgid "<option>--delink</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:556
+ #: apt-ftparchive.1.xml:535
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
  "then this option actually enables delinking of the files. It defaults to on "
@@@ -2486,13 -1977,8 +1978,8 @@@
  "Item: <literal>APT::FTPArchive::DeLinkAct</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:562
- msgid "<option>--contents</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:564
+ #: apt-ftparchive.1.xml:543
  msgid ""
  "Perform contents generation. When this option is set and package indexes are "
  "being generated with a cache DB then the file listing will also be extracted "
@@@ -2501,38 -1987,23 +1988,23 @@@
  "Configuration Item: <literal>APT::FTPArchive::Contents</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:572
- msgid "<option>--source-override</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:574
+ #: apt-ftparchive.1.xml:553
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: "
  "<literal>APT::FTPArchive::SourceOverride</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:578
- msgid "<option>--readonly</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:580
+ #: apt-ftparchive.1.xml:559
  msgid ""
  "Make the caching databases read only.  Configuration Item: "
  "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:584
- msgid "<option>--arch</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:585
+ #: apt-ftparchive.1.xml:564
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
  "commands only package files matching <literal>*_arch.deb</literal> or "
@@@ -2540,13 -2011,8 +2012,8 @@@
  "path.  Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:591
- msgid "<option>APT::FTPArchive::AlwaysStat</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:593
+ #: apt-ftparchive.1.xml:572
  msgid ""
  "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
  "packages are recompiled and/or republished with the same version again, this "
@@@ -2559,13 -2025,8 +2026,8 @@@
  "are useless."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:603
- msgid "<option>APT::FTPArchive::LongDescription</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:605
+ #: apt-ftparchive.1.xml:584
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
  "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@@ -2575,12 -2036,12 +2037,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544 sources.list.5.xml:214
+ #: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:214
  msgid "Examples"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
- #: apt-ftparchive.1.xml:623
+ #: apt-ftparchive.1.xml:602
  #, no-wrap
  msgid ""
  "<command>apt-ftparchive</command> packages "
@@@ -2589,74 -2050,26 +2051,26 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:619
+ #: apt-ftparchive.1.xml:598
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:633
+ #: apt-ftparchive.1.xml:612
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-get.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
- "November 2008</date>"
- msgstr ""
- 
- #. type: <heading></heading>
- #: apt-get.8.xml:25 apt-get.8.xml:32 guide.sgml:96
- msgid "apt-get"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-get.8.xml:33
  msgid "APT package handling utility -- command-line interface"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-get.8.xml:39
- msgid ""
- "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
- "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
- "<option>-t=</option> <arg choice='plain'> "
- "<replaceable>target_release</replaceable> </arg> </arg> <arg> "
- "<option>-a=</option> <arg choice='plain'> "
- "<replaceable>default_architecture</replaceable> </arg> </arg> <group "
- "choice=\"req\"> <arg choice='plain'>update</arg> <arg "
- "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
- "choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group "
- "choice='req'> <arg choice='plain'> "
- "=<replaceable>pkg_version_number</replaceable> </arg> <arg choice='plain'> "
- "/<replaceable>target_release</replaceable> </arg> </group> </arg> </arg> "
- "</arg> <arg choice='plain'>remove <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>purge <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>source <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
- "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
- "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> "
- "</group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
- "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
- "</group> </arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:122
+ #: apt-get.8.xml:39
  msgid ""
  "<command>apt-get</command> is the command-line tool for handling packages, "
  "and may be considered the user's \"back-end\" to other tools using the APT "
@@@ -2664,13 -2077,8 +2078,8 @@@
  "&aptitude;, &synaptic; and &wajig;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:131 apt-key.8.xml:127
- msgid "update"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:132
+ #: apt-get.8.xml:49
  msgid ""
  "<literal>update</literal> is used to resynchronize the package index files "
  "from their sources. The indexes of available packages are fetched from the "
@@@ -2684,13 -2092,8 +2093,8 @@@
  "advance."
  msgstr ""
  
- #. type: <tag></tag>
- #: apt-get.8.xml:143 guide.sgml:121
- msgid "upgrade"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:144
+ #: apt-get.8.xml:61
  msgid ""
  "<literal>upgrade</literal> is used to install the newest versions of all "
  "packages currently installed on the system from the sources enumerated in "
@@@ -2705,13 -2108,8 +2109,8 @@@
  "available."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:156
- msgid "dselect-upgrade"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:157
+ #: apt-get.8.xml:74
  msgid ""
  "<literal>dselect-upgrade</literal> is used in conjunction with the "
  "traditional Debian packaging front-end, "
@@@ -2721,13 -2119,8 +2120,8 @@@
  "removal of old and the installation of new packages)."
  msgstr ""
  
- #. type: <tag></tag>
- #: apt-get.8.xml:166 guide.sgml:140
- msgid "dist-upgrade"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:167
+ #: apt-get.8.xml:84
  msgid ""
  "<literal>dist-upgrade</literal> in addition to performing the function of "
  "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@@ -2740,13 -2133,8 +2134,8 @@@
  "for a mechanism for overriding the general settings for individual packages."
  msgstr ""
  
- #. type: <tag></tag>
- #: apt-get.8.xml:179 guide.sgml:131
- msgid "install"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:181
+ #: apt-get.8.xml:98
  msgid ""
  "<literal>install</literal> is followed by one or more packages desired for "
  "installation or upgrading.  Each package is a package name, not a fully "
@@@ -2762,7 -2150,7 +2151,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:199
+ #: apt-get.8.xml:116
  msgid ""
  "A specific version of a package can be selected for installation by "
  "following the package name with an equals and the version of the package to "
@@@ -2773,14 -2161,14 +2162,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:206
+ #: apt-get.8.xml:123
  msgid ""
  "Both of the version selection mechanisms can downgrade packages and must be "
  "used with care."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:209
+ #: apt-get.8.xml:126
  msgid ""
  "This is also the target to use if you want to upgrade one or more "
  "already-installed packages without upgrading every package you have on your "
@@@ -2792,14 -2180,14 +2181,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:220
+ #: apt-get.8.xml:137
  msgid ""
  "Finally, the &apt-preferences; mechanism allows you to create an alternative "
  "installation policy for individual packages."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:224
+ #: apt-get.8.xml:141
  msgid ""
  "If no package matches the given expression and the expression contains one "
  "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@@ -2810,13 -2198,8 +2199,8 @@@
  "expression."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:233
- msgid "remove"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:234
+ #: apt-get.8.xml:151
  msgid ""
  "<literal>remove</literal> is identical to <literal>install</literal> except "
  "that packages are removed instead of installed. Note the removing a package "
@@@ -2825,38 -2208,28 +2209,28 @@@
  "installed instead of removed."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:241
- msgid "purge"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:242
+ #: apt-get.8.xml:159
  msgid ""
  "<literal>purge</literal> is identical to <literal>remove</literal> except "
  "that packages are removed and purged (any configuration files are deleted "
  "too)."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:246
- msgid "source"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:247
+ #: apt-get.8.xml:164
  msgid ""
  "<literal>source</literal> causes <command>apt-get</command> to fetch source "
  "packages. APT will examine the available packages to decide which source "
  "package to fetch. It will then find and download into the current directory "
- "the newest available version of that source package while respect the "
+ "the newest available version of that source package while respecting the "
  "default release, set with the option "
  "<literal>APT::Default-Release</literal>, the <option>-t</option> option or "
  "per package with the <literal>pkg/release</literal> syntax, if possible."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:255
+ #: apt-get.8.xml:172
  msgid ""
  "Source packages are tracked separately from binary packages via "
  "<literal>deb-src</literal> type lines in the &sources-list; file. This means "
@@@ -2867,7 -2240,7 +2241,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:262
+ #: apt-get.8.xml:179
  msgid ""
  "If the <option>--compile</option> option is specified then the package will "
  "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@@ -2877,7 -2250,7 +2251,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:269
+ #: apt-get.8.xml:186
  msgid ""
  "A specific source version can be retrieved by postfixing the source name "
  "with an equals and then the version to fetch, similar to the mechanism used "
@@@ -2887,54 -2260,39 +2261,39 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:275
+ #: apt-get.8.xml:192
  msgid ""
  "Note that source packages are not tracked like binary packages, they exist "
  "only in the current directory and are similar to downloading source tar "
  "balls."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:280
- msgid "build-dep"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:281
+ #: apt-get.8.xml:198
  msgid ""
  "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
  "attempt to satisfy the build dependencies for a source package. By default "
- "the dependencies are satisfied to build the package nativly. If desired a "
+ "the dependencies are satisfied to build the package natively. If desired a "
  "host-architecture can be specified with the "
  "<option>--host-architecture</option> option instead."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:287
- msgid "check"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:288
+ #: apt-get.8.xml:205
  msgid ""
  "<literal>check</literal> is a diagnostic tool; it updates the package cache "
  "and checks for broken dependencies."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:292
- msgid "download"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:293
+ #: apt-get.8.xml:210
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
  "current directory."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:299
+ #: apt-get.8.xml:216
  msgid ""
  "<literal>clean</literal> clears out the local repository of retrieved "
  "package files. It removes everything but the lock file from "
@@@ -2945,13 -2303,8 +2304,8 @@@
  "from time to time to free up disk space."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:308
- msgid "autoclean"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:309
+ #: apt-get.8.xml:226
  msgid ""
  "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
  "local repository of retrieved package files. The difference is that it only "
@@@ -2962,80 -2315,52 +2316,52 @@@
  "being erased if it is set to off."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:318
- msgid "autoremove"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:319
+ #: apt-get.8.xml:236
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
  "automatically installed to satisfy dependencies for other packages and are "
  "now no longer needed."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:323
- msgid "changelog"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:324
+ #: apt-get.8.xml:241
  msgid ""
  "<literal>changelog</literal> downloads a package changelog and displays it "
  "through <command>sensible-pager</command>. The server name and base "
  "directory is defined in the <literal>APT::Changelogs::Server</literal> "
- "variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
- "Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
- "Ubuntu).  By default it displays the changelog for the version that is "
+ "variable (e. g. <ulink "
+ "url=\"http://packages.debian.org/changelogs\">packages.debian.org/changelogs</ulink> "
+ "for Debian or <ulink "
+ "url=\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+ "for Ubuntu).  By default it displays the changelog for the version that is "
  "installed.  However, you can specify the same options as for the "
  "<option>install</option> command."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:346
- msgid "<option>--no-install-recommends</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:347
+ #: apt-get.8.xml:264
  msgid ""
  "Do not consider recommended packages as a dependency for installing.  "
  "Configuration Item: <literal>APT::Install-Recommends</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:351
- msgid "<option>--install-suggests</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:352
+ #: apt-get.8.xml:269
  msgid ""
  "Consider suggested packages as a dependency for installing.  Configuration "
  "Item: <literal>APT::Install-Suggests</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:356
- msgid "<option>--download-only</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:357
+ #: apt-get.8.xml:274
  msgid ""
  "Download only; package files are only retrieved, not unpacked or installed.  "
  "Configuration Item: <literal>APT::Get::Download-Only</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:361
- msgid "<option>--fix-broken</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:362
+ #: apt-get.8.xml:279
  msgid ""
  "Fix; attempt to correct a system with broken dependencies in place. This "
  "option, when used with install/remove, can omit any packages to permit APT "
@@@ -3050,18 -2375,8 +2376,8 @@@
  "Item: <literal>APT::Get::Fix-Broken</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:375
- msgid "<option>--ignore-missing</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:376
- msgid "<option>--fix-missing</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:377
+ #: apt-get.8.xml:294
  msgid ""
  "Ignore missing packages; If packages cannot be retrieved or fail the "
  "integrity check after retrieval (corrupted package files), hold back those "
@@@ -3072,13 -2387,8 +2388,8 @@@
  "Configuration Item: <literal>APT::Get::Fix-Missing</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:387
- msgid "<option>--no-download</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:388
+ #: apt-get.8.xml:305
  msgid ""
  "Disables downloading of packages. This is best used with "
  "<option>--ignore-missing</option> to force APT to use only the .debs it has "
@@@ -3087,7 -2397,7 +2398,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:395
+ #: apt-get.8.xml:312
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -3098,18 -2408,8 +2409,8 @@@
  "<literal>quiet</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:405
- msgid "<option>--simulate</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:407
- msgid "<option>--dry-run</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:410
+ #: apt-get.8.xml:327
  msgid ""
  "No action; perform a simulation of events that would occur but do not "
  "actually change the system.  Configuration Item: "
@@@ -3117,7 -2417,7 +2418,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:414
+ #: apt-get.8.xml:331
  msgid ""
  "Simulation run as user will deactivate locking "
  "(<literal>Debug::NoLocking</literal>)  automatic. Also a notice will be "
@@@ -3129,7 -2429,7 +2430,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:420
+ #: apt-get.8.xml:337
  msgid ""
  "Simulate prints out a series of lines each one representing a dpkg "
  "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@@ -3137,23 -2437,8 +2438,8 @@@
  "that are of no consequence (rare)."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:427
- msgid "<option>-y</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:427
- msgid "<option>--yes</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:428
- msgid "<option>--assume-yes</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:429
+ #: apt-get.8.xml:346
  msgid ""
  "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
  "non-interactively. If an undesirable situation, such as changing a held "
@@@ -3162,97 -2447,47 +2448,47 @@@
  "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>--assume-no</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:437
+ #: apt-get.8.xml:354
  msgid ""
  "Automatic \"no\" to all prompts.  Configuration Item: "
  "<literal>APT::Get::Assume-No</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:441
- msgid "<option>-u</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:441
- msgid "<option>--show-upgraded</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:442
+ #: apt-get.8.xml:359
  msgid ""
  "Show upgraded packages; Print out a list of all packages that are to be "
  "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:447
- msgid "<option>-V</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:447
- msgid "<option>--verbose-versions</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:448
+ #: apt-get.8.xml:365
  msgid ""
  "Show full versions for upgraded and installed packages.  Configuration Item: "
  "<literal>APT::Get::Show-Versions</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:453
- msgid "<option>--host-architecture</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:454
+ #: apt-get.8.xml:371
  msgid ""
  "This option controls the architecture packages are built for by "
  "<command>apt-get source --compile</command> and how cross-builddependencies "
- "are satisfied. By default is not set which means that the host architecture "
- "is the same as the build architecture (which is defined by "
- "<literal>APT::Architecture</literal>)  Configuration Item: "
+ "are satisfied. By default is it not set which means that the host "
+ "architecture is the same as the build architecture (which is defined by "
+ "<literal>APT::Architecture</literal>).  Configuration Item: "
  "<literal>APT::Get::Host-Architecture</literal>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:462
- msgid "<option>-b</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:462
- msgid "<option>--compile</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:463
- msgid "<option>--build</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:464
+ #: apt-get.8.xml:381
  msgid ""
  "Compile source packages after downloading them.  Configuration Item: "
  "<literal>APT::Get::Compile</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:468
- msgid "<option>--ignore-hold</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:469
+ #: apt-get.8.xml:386
  msgid ""
  "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
  "hold placed on a package. This may be useful in conjunction with "
@@@ -3260,13 -2495,8 +2496,8 @@@
  "holds.  Configuration Item: <literal>APT::Ignore-Hold</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:475
- msgid "<option>--no-upgrade</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:476
+ #: apt-get.8.xml:393
  msgid ""
  "Do not upgrade packages; When used in conjunction with "
  "<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
@@@ -3274,27 -2504,18 +2505,18 @@@
  "installed.  Configuration Item: <literal>APT::Get::Upgrade</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:482
- msgid "<option>--only-upgrade</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:483
+ #: apt-get.8.xml:400
  msgid ""
  "Do not install new packages; When used in conjunction with "
- "<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
- "packages on the command line from being upgraded if they are not already "
- "installed.  Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:489
- msgid "<option>--force-yes</option>"
+ "<literal>install</literal>, <literal>only-upgrade</literal> will install "
+ "upgrades for already installed packages only and ignore requests to install "
+ "new packages.  Configuration Item: "
+ "<literal>APT::Get::Only-Upgrade</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:490
+ #: apt-get.8.xml:408
  msgid ""
  "Force yes; This is a dangerous option that will cause apt to continue "
  "without prompting if it is doing something potentially harmful. It should "
@@@ -3303,13 -2524,8 +2525,8 @@@
  "Configuration Item: <literal>APT::Get::force-yes</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:497
- msgid "<option>--print-uris</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:498
+ #: apt-get.8.xml:416
  msgid ""
  "Instead of fetching the files to install their URIs are printed. Each URI "
  "will have the path, the destination file name, the size and the expected md5 "
@@@ -3321,13 -2537,8 +2538,8 @@@
  "<literal>APT::Get::Print-URIs</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:508
- msgid "<option>--purge</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:509
+ #: apt-get.8.xml:427
  msgid ""
  "Use purge instead of remove for anything that would be removed.  An asterisk "
  "(\"*\") will be displayed next to packages which are scheduled to be "
@@@ -3336,25 -2547,15 +2548,15 @@@
  "<literal>APT::Get::Purge</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:516
- msgid "<option>--reinstall</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:517
+ #: apt-get.8.xml:435
  msgid ""
  "Re-Install packages that are already installed and at the newest version.  "
  "Configuration Item: <literal>APT::Get::ReInstall</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:521
- msgid "<option>--list-cleanup</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:522
+ #: apt-get.8.xml:440
  msgid ""
  "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
  "it off. When on <command>apt-get</command> will automatically manage the "
@@@ -3364,18 -2565,8 +2566,8 @@@
  "<literal>APT::Get::List-Cleanup</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:531
- msgid "<option>--target-release</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:532
- msgid "<option>--default-release</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:533
+ #: apt-get.8.xml:451
  msgid ""
  "This option controls the default input to the policy engine, it creates a "
  "default pin at priority 990 using the specified release string.  This "
@@@ -3389,13 -2580,8 +2581,8 @@@
  "manual page."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:546
- msgid "<option>--trivial-only</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:548
+ #: apt-get.8.xml:466
  msgid ""
  "Only perform operations that are 'trivial'. Logically this can be considered "
  "related to <option>--assume-yes</option>, where "
@@@ -3404,25 -2590,15 +2591,15 @@@
  "<literal>APT::Get::Trivial-Only</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:554
- msgid "<option>--no-remove</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:555
+ #: apt-get.8.xml:473
  msgid ""
  "If any packages are to be removed apt-get immediately aborts without "
  "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:560
- msgid "<option>--auto-remove</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:561
+ #: apt-get.8.xml:479
  msgid ""
  "If the command is either <literal>install</literal> or "
  "<literal>remove</literal>, then this option acts like running "
@@@ -3430,13 -2606,8 +2607,8 @@@
  "packages. Configuration Item: <literal>APT::Get::AutomaticRemove</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:567
- msgid "<option>--only-source</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:568
+ #: apt-get.8.xml:486
  msgid ""
  "Only has meaning for the <literal>source</literal> and "
  "<literal>build-dep</literal> commands.  Indicates that the given source "
@@@ -3447,23 -2618,8 +2619,8 @@@
  "<literal>APT::Get::Only-Source</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:578
- msgid "<option>--diff-only</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:578
- msgid "<option>--dsc-only</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:578
- msgid "<option>--tar-only</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:579
+ #: apt-get.8.xml:497
  msgid ""
  "Download only the diff, dsc, or tar file of a source archive.  Configuration "
  "Item: <literal>APT::Get::Diff-Only</literal>, "
@@@ -3471,25 -2627,15 +2628,15 @@@
  "<literal>APT::Get::Tar-Only</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:584
- msgid "<option>--arch-only</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:585
+ #: apt-get.8.xml:503
  msgid ""
  "Only process architecture-dependent build-dependencies.  Configuration Item: "
  "<literal>APT::Get::Arch-Only</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:589
- msgid "<option>--allow-unauthenticated</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:590
+ #: apt-get.8.xml:508
  msgid ""
  "Ignore if packages can't be authenticated and don't prompt about it.  This "
  "is useful for tools like pbuilder.  Configuration Item: "
@@@ -3497,14 -2643,14 +2644,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-get.8.xml:603
+ #: apt-get.8.xml:521
  msgid ""
  "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
  "&file-statelists;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:612
+ #: apt-get.8.xml:530
  msgid ""
  "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
  "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, "
@@@ -3512,53 -2658,19 +2659,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:618
+ #: apt-get.8.xml:536
  msgid ""
  "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
  "error."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:621
- msgid "ORIGINAL AUTHORS"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:622
- msgid "&apt-author.jgunthorpe;"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:625
- msgid "CURRENT AUTHORS"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:627
- msgid "&apt-author.team;"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-key.8.xml:17 apt-key.8.xml:24
- msgid "apt-key"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-key.8.xml:25
+ #: apt-key.8.xml:32
  msgid "APT key management utility"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-key.8.xml:31
- msgid ""
- "<command>apt-key</command> <arg><option>--keyring "
- "<replaceable>filename</replaceable></option></arg> "
- "<arg><replaceable>command</replaceable></arg> <arg "
- "rep=\"repeat\"><option><replaceable>arguments</replaceable></option></arg>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:40
+ #: apt-key.8.xml:39
  msgid ""
  "<command>apt-key</command> is used to manage the list of keys used by apt to "
  "authenticate packages.  Packages which have been authenticated using these "
@@@ -3566,102 -2678,62 +2679,62 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-key.8.xml:46
+ #: apt-key.8.xml:45
  msgid "Commands"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:48
- msgid "add <replaceable>filename</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:52
+ #: apt-key.8.xml:50
  msgid ""
- "Add a new key to the list of trusted keys.  The key is read from "
- "<replaceable>filename</replaceable>, or standard input if "
- "<replaceable>filename</replaceable> is <literal>-</literal>."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:60
- msgid "del <replaceable>keyid</replaceable>"
+ "Add a new key to the list of trusted keys.  The key is read from the "
+ "filename given with the parameter &synopsis-param-filename; or if the "
+ "filename is <literal>-</literal> from standard input."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:64
+ #: apt-key.8.xml:63
  msgid "Remove a key from the list of trusted keys."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:71
- msgid "export <replaceable>keyid</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:75
- msgid "Output the key <replaceable>keyid</replaceable> to standard output."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:82
- msgid "exportall"
+ #: apt-key.8.xml:74
+ msgid "Output the key &synopsis-param-keyid; to standard output."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:86
+ #: apt-key.8.xml:85
  msgid "Output all trusted keys to standard output."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:93
- msgid "list"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:97
+ #: apt-key.8.xml:96
  msgid "List trusted keys."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:104
- msgid "finger"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:108
+ #: apt-key.8.xml:107
  msgid "List fingerprints of trusted keys."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:115
- msgid "adv"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:119
+ #: apt-key.8.xml:118
  msgid ""
  "Pass advanced options to gpg. With adv --recv-key you can download the "
  "public key."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
  msgid ""
  "Update the local keyring with the archive keyring and remove from the local "
  "keyring the archive keys which are no longer valid.  The archive keyring is "
  "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
 +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
 +"Ubuntu."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:141
- msgid "net-update"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:145
+ #: apt-key.8.xml:144
  msgid ""
  "Work similar to the <command>update</command> command above, but get the "
  "archive keyring from an URI instead and validate it against a master key.  "
@@@ -3672,107 -2744,77 +2745,77 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:162
+ #: apt-key.8.xml:161
  msgid ""
  "Note that options need to be defined before the commands described in the "
  "previous section."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:164
- msgid "--keyring <replaceable>filename</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:165
+ #: apt-key.8.xml:164
  msgid ""
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
  "<filename>trusted.gpg</filename> file as well as on all parts in the "
- "<filename>trusted.gpg.d</filename> directory, through "
+ "<filename>trusted.gpg.d</filename> directory, though "
  "<filename>trusted.gpg</filename> is the primary keyring which means that "
  "e.g. new keys are added to this one."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-key.8.xml:178
+ #: apt-key.8.xml:177
  msgid "&file-trustedgpg;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:180
+ #: apt-key.8.xml:179
  msgid "<filename>/etc/apt/trustdb.gpg</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:181
+ #: apt-key.8.xml:180
  msgid "Local trust database of archive keys."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:184
+ #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 +msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:185
+ #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
 +msgid "Keyring of Ubuntu archive trusted keys."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:188
+ #: apt-key.8.xml:187
 -msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 +msgid "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:189
+ #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
 +msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:198
+ #: apt-key.8.xml:197
  msgid "&apt-get;, &apt-secure;"
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-mark.8.xml:16
- msgid ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
- "April 2011</date>"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-mark.8.xml:25 apt-mark.8.xml:32
- msgid "apt-mark"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-mark.8.xml:33
  msgid "mark/unmark a package as being automatically-installed"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-mark.8.xml:39
- msgid ""
- "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
- "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
- "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
- "choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
- "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> "
- "</group> <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:57
+ #: apt-mark.8.xml:39
  msgid ""
  "<command>apt-mark</command> will change whether a package has been marked as "
  "being automatically installed."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:61
+ #: apt-mark.8.xml:43
  msgid ""
  "When you request that a package is installed, and as a result other packages "
  "are installed to satisfy its dependencies, the dependencies are marked as "
@@@ -3781,39 -2823,24 +2824,24 @@@
  "removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:69
- msgid "auto"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:70
+ #: apt-mark.8.xml:52
  msgid ""
  "<literal>auto</literal> is used to mark a package as being automatically "
  "installed, which will cause the package to be removed when no more manually "
  "installed packages depend on this package."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:77
- msgid "manual"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:78
+ #: apt-mark.8.xml:60
  msgid ""
  "<literal>manual</literal> is used to mark a package as being manually "
  "installed, which will prevent the package from being automatically removed "
  "if no other packages depend on it."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:85
- msgid "hold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:86
+ #: apt-mark.8.xml:68
  msgid ""
  "<literal>hold</literal> is used to mark a package as hold back, which will "
  "prevent the package from being automatically installed, upgraded or "
@@@ -3822,25 -2849,15 +2850,15 @@@
  "and not effected by the <option>--filename</option> option."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:95
- msgid "unhold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:96
+ #: apt-mark.8.xml:78
  msgid ""
  "<literal>unhold</literal> is used to cancel a previously set hold on a "
  "package to allow all actions again."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:101
- msgid "showauto"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:102
+ #: apt-mark.8.xml:84
  msgid ""
  "<literal>showauto</literal> is used to print a list of automatically "
  "installed packages with each package on a new line.  All automatically "
@@@ -3848,79 -2865,60 +2866,60 @@@
  "given only those which are automatically installed will be shown."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:109
- msgid "showmanual"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:110
+ #: apt-mark.8.xml:92
  msgid ""
  "<literal>showmanual</literal> can be used in the same way as "
  "<literal>showauto</literal> except that it will print a list of manually "
  "installed packages instead."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:116
- msgid "showhold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:117
+ #: apt-mark.8.xml:99
  msgid ""
  "<literal>showhold</literal> is used to print a list of packages on hold in "
  "the same way as for the other show commands."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:130
- msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:131
- msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+ #: apt-mark.8.xml:112 apt-mark.8.xml:113
+ msgid "<replaceable>&synopsis-filename;</replaceable>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:134
+ #: apt-mark.8.xml:115
  msgid ""
- "Read/Write package stats from "
- "<filename><replaceable>FILENAME</replaceable></filename> instead of the "
- "default location, which is <filename>extended_status</filename> in the "
- "directory defined by the Configuration Item: <literal>Dir::State</literal>."
+ "Read/Write package stats from the filename given with the parameter "
+ "<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+ "of from the default location, which is <filename>extended_status</filename> "
+ "in the directory defined by the Configuration Item: "
+ "<literal>Dir::State</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-mark.8.xml:146
+ #: apt-mark.8.xml:128
  msgid "  &file-extended_states;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:151
+ #: apt-mark.8.xml:133
  msgid "&apt-get;,&aptitude;,&apt-conf;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:155
+ #: apt-mark.8.xml:137
  msgid ""
  "<command>apt-mark</command> returns zero on normal operation, non-zero on "
  "error."
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-secure.8.xml:17 apt-secure.8.xml:39
- msgid "apt-secure"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-secure.8.xml:40
+ #: apt-secure.8.xml:47
  msgid "Archive authentication support for APT"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:45
+ #: apt-secure.8.xml:52
  msgid ""
  "Starting with version 0.6, <command>apt</command> contains code that does "
  "signature checking of the Release file for all archives. This ensures that "
@@@ -3929,7 -2927,7 +2928,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:53
+ #: apt-secure.8.xml:60
  msgid ""
  "If a package comes from a archive without a signature or with a signature "
  "that apt does not have a key for that package is considered untrusted and "
@@@ -3939,19 -2937,19 +2938,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:62
+ #: apt-secure.8.xml:69
  msgid ""
  "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
  "authentication feature."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:67
+ #: apt-secure.8.xml:74
  msgid "Trusted archives"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:70
+ #: apt-secure.8.xml:77
  msgid ""
  "The chain of trust from an apt archive to the end user is made up of "
  "different steps. <command>apt-secure</command> is the last step in this "
@@@ -3962,7 -2960,7 +2961,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:78
+ #: apt-secure.8.xml:85
  msgid ""
  "apt-secure does not review signatures at a package level. If you require "
  "tools to do this you should look at <command>debsig-verify</command> and "
@@@ -3971,7 -2969,7 +2970,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:85
+ #: apt-secure.8.xml:92
  msgid ""
  "The chain of trust in Debian starts when a maintainer uploads a new package "
  "or a new version of a package to the Debian archive. This upload in order to "
@@@ -3982,7 -2980,7 +2981,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:95
+ #: apt-secure.8.xml:102
  msgid ""
  "Once the uploaded package is verified and included in the archive, the "
  "maintainer signature is stripped off, an MD5 sum of the package is computed "
@@@ -3993,7 -2991,7 +2992,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:105
+ #: apt-secure.8.xml:112
  msgid ""
  "Any end user can check the signature of the Release file, extract the MD5 "
  "sum of a package from it and compare it with the MD5 sum of the package he "
@@@ -4003,14 -3001,14 +3002,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:112
+ #: apt-secure.8.xml:119
  msgid ""
  "Notice that this is distinct from checking signatures on a per package "
  "basis. It is designed to prevent two possible attacks:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:117
+ #: apt-secure.8.xml:124
  msgid ""
  "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
  "checking, a malicious agent can introduce himself in the package download "
@@@ -4020,7 -3018,7 +3019,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:125
+ #: apt-secure.8.xml:132
  msgid ""
  "<literal>Mirror network compromise</literal>.  Without signature checking, a "
  "malicious agent can compromise a mirror host and modify the files in it to "
@@@ -4029,7 -3027,7 +3028,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:132
+ #: apt-secure.8.xml:139
  msgid ""
  "However, it does not defend against a compromise of the Debian master server "
  "itself (which signs the packages) or against a compromise of the key used to "
@@@ -4038,12 -3036,12 +3037,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:138
+ #: apt-secure.8.xml:145
  msgid "User configuration"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:140
+ #: apt-secure.8.xml:147
  msgid ""
  "<command>apt-key</command> is the program that manages the list of keys used "
  "by apt. It can be used to add or remove keys although an installation of "
@@@ -4052,7 -3050,7 +3051,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:147
+ #: apt-secure.8.xml:154
  msgid ""
  "In order to add a new key you need to first download it (you should make "
  "sure you are using a trusted communication channel when retrieving it), add "
@@@ -4063,19 -3061,19 +3062,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:156
+ #: apt-secure.8.xml:163
  msgid "Archive configuration"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:158
+ #: apt-secure.8.xml:165
  msgid ""
  "If you want to provide archive signatures in an archive under your "
  "maintenance you have to:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:163
+ #: apt-secure.8.xml:170
  msgid ""
  "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
  "already. You can do this by running <command>apt-ftparchive "
@@@ -4083,7 -3081,7 +3082,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:168
+ #: apt-secure.8.xml:175
  msgid ""
  "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg "
  "--clearsign -o InRelease Release</command> and <command>gpg -abs -o "
@@@ -4091,7 -3089,7 +3090,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:172
+ #: apt-secure.8.xml:179
  msgid ""
  "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
  "know what key they need to import in order to authenticate the files in the "
@@@ -4099,7 -3097,7 +3098,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:179
+ #: apt-secure.8.xml:186
  msgid ""
  "Whenever the contents of the archive changes (new packages are added or "
  "removed) the archive maintainer has to follow the first two steps previously "
@@@ -4107,17 -3105,17 +3106,17 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:187
+ #: apt-secure.8.xml:194
  msgid ""
  "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
  "&debsign; &debsig-verify;, &gpg;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:191
+ #: apt-secure.8.xml:198
  msgid ""
  "For more background information you might want to review the <ulink "
- "url=\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html\">Debian "
+ "url=\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
  "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
  "(available also in the harden-doc package) and the <ulink "
  "url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
@@@ -4125,38 -3123,24 +3124,24 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:204
+ #: apt-secure.8.xml:211
  msgid "Manpage Authors"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:206
+ #: apt-secure.8.xml:213
  msgid ""
  "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
  "Jones, Colin Walters, Florian Weimer and Michael Vogt."
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-sortpkgs.1.xml:25 apt-sortpkgs.1.xml:32
- msgid "apt-sortpkgs"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-sortpkgs.1.xml:33
  msgid "Utility to sort package index files"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-sortpkgs.1.xml:39
- msgid ""
- "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:48
+ #: apt-sortpkgs.1.xml:39
  msgid ""
  "<command>apt-sortpkgs</command> will take an index file (Source index or "
  "Package index) and sort the records so that they are ordered by the package "
@@@ -4165,56 -3149,46 +3150,46 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:54
+ #: apt-sortpkgs.1.xml:45
  msgid "All output is sent to stdout, the input must be a seekable file."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-sortpkgs.1.xml:61
- msgid "<option>--source</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-sortpkgs.1.xml:63
+ #: apt-sortpkgs.1.xml:54
  msgid ""
  "Use Source index field ordering.  Configuration Item: "
  "<literal>APT::SortPkgs::Source</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:77
+ #: apt-sortpkgs.1.xml:68
  msgid ""
  "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
  "100 on error."
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt.conf.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; <author> "
- "<firstname>Daniel</firstname> <surname>Burrows</surname> <contrib>Initial "
- "documentation of Debug::*.</contrib> <email>dburrows@debian.org</email> "
- "</author> &apt-email; &apt-product; <date>16 January 2010</date>"
+ #. type: Content of: <refentry><refentryinfo><author><contrib>
+ #: apt.conf.5.xml:20
+ msgid "Initial documentation of Debug::*."
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt.conf.5.xml:31 apt.conf.5.xml:38
- msgid "apt.conf"
+ #. type: Content of: <refentry><refentryinfo><author><email>
+ #: apt.conf.5.xml:21
+ msgid "dburrows@debian.org"
  msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
- #: apt.conf.5.xml:32 apt_preferences.5.xml:25 sources.list.5.xml:26
+ #: apt.conf.5.xml:31 apt_preferences.5.xml:25 sources.list.5.xml:26
  msgid "5"
  msgstr ""
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt.conf.5.xml:39
+ #: apt.conf.5.xml:38
  msgid "Configuration file for APT"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:43
+ #: apt.conf.5.xml:42
  msgid ""
  "<filename>apt.conf</filename> is the main configuration file for the APT "
  "suite of tools, but by far not the only place changes to options can be "
@@@ -4223,21 -3197,21 +3198,21 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><para>
- #: apt.conf.5.xml:48
+ #: apt.conf.5.xml:47
  msgid ""
  "When an APT tool starts up it will read the configuration files in the "
  "following order:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:50
+ #: apt.conf.5.xml:49
  msgid ""
  "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
  "any)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:52
+ #: apt.conf.5.xml:51
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
  "order which have either no or \"<literal>conf</literal>\" as filename "
@@@ -4249,24 -3223,24 +3224,24 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:59
+ #: apt.conf.5.xml:58
  msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:61
+ #: apt.conf.5.xml:60
  msgid ""
  "the command line options are applied to override the configuration "
  "directives or to load even more configuration files."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:65
+ #: apt.conf.5.xml:64
  msgid "Syntax"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:66
+ #: apt.conf.5.xml:65
  msgid ""
  "The configuration file is organized in a tree with options organized into "
  "functional groups. Option specification is given with a double colon "
@@@ -4276,7 -3250,7 +3251,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:72
+ #: apt.conf.5.xml:71
  msgid ""
  "Syntactically the configuration language is modeled after what the ISC tools "
  "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@@ -4292,7 -3266,7 +3267,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:86
+ #: apt.conf.5.xml:85
  #, no-wrap
  msgid ""
  "APT {\n"
@@@ -4304,7 -3278,7 +3279,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:94
+ #: apt.conf.5.xml:93
  msgid ""
  "with newlines placed to make it more readable. Lists can be created by "
  "opening a scope and including a single string enclosed in quotes followed by "
@@@ -4313,13 -3287,13 +3288,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:99
+ #: apt.conf.5.xml:98
  #, no-wrap
  msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:102
+ #: apt.conf.5.xml:101
  msgid ""
  "In general the sample configuration file in "
  "<filename>&docdir;examples/apt.conf</filename> &configureindex; is a good "
@@@ -4327,14 -3301,14 +3302,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:106
+ #: apt.conf.5.xml:105
  msgid ""
  "The names of the configuration items are not case-sensitive. So in the "
  "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:109
+ #: apt.conf.5.xml:108
  msgid ""
  "Names for the configuration items are optional if a list is defined as it "
  "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example "
@@@ -4344,7 -3318,7 +3319,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:114
+ #: apt.conf.5.xml:113
  msgid ""
  "Two specials are allowed, <literal>#include</literal> (which is deprecated "
  "and not supported by alternative implementations) and "
@@@ -4356,7 -3330,7 +3331,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:122
+ #: apt.conf.5.xml:121
  msgid ""
  "The #clear command is the only way to delete a list or a complete scope.  "
  "Reopening a scope or the ::-style described below will "
@@@ -4366,23 -3340,23 +3341,23 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:127
+ #: apt.conf.5.xml:126
  msgid ""
  "All of the APT tools take a -o option which allows an arbitrary "
  "configuration directive to be specified on the command line. The syntax is a "
  "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
- "followed by an equals sign then the new value of the option. Lists can be "
- "appended too by adding a trailing :: to the list name. (As you might "
+ "followed by an equals sign then the new value of the option. To append a new "
+ "element to a list, add a trailing :: to the name of the list. (As you might "
  "suspect: The scope syntax can't be used on the command line.)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:134
+ #: apt.conf.5.xml:133
  msgid ""
  "Note that you can use :: only for appending one item per line to a list and "
  "that you should not use it in combination with the scope syntax.  (The scope "
  "syntax implicit insert ::) Using both syntaxes together will trigger a bug "
- "which some users unfortunately relay on: An option with the unusual name "
+ "which some users unfortunately depend on: An option with the unusual name "
  "\"<literal>::</literal>\" which acts like every other option with a "
  "name. These introduces many problems including that a user who writes "
  "multiple lines in this <emphasis>wrong</emphasis> syntax in the hope to "
@@@ -4394,24 -3368,19 +3369,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:146
+ #: apt.conf.5.xml:145
  msgid "The APT Group"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:147
+ #: apt.conf.5.xml:146
  msgid ""
  "This group of options controls general APT behavior as well as holding the "
  "options for all of the tools."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:151
- msgid "Architecture"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:152
+ #: apt.conf.5.xml:151
  msgid ""
  "System Architecture; sets the architecture to use when fetching files and "
  "parsing package lists. The internal default is the architecture apt was "
@@@ -4419,23 -3388,20 +3389,20 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:158
+ #: apt.conf.5.xml:157
  msgid ""
  "All Architectures the system supports. Processors implementing the "
- "<literal>amd64</literal> are e.g. also able to execute binaries compiled for "
- "<literal>i386</literal>; This list is use when fetching files and parsing "
- "package lists. The internal default is always the native architecture "
- "(<literal>APT::Architecture</literal>)  and all foreign architectures it can "
- "retrieve by calling <command>dpkg --print-foreign-architectures</command>."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:165
- msgid "Default-Release"
+ "<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
+ "set are e.g. also able to execute binaries compiled for the "
+ "<literal>i386</literal> (<literal>x86</literal>) instruction set; This list "
+ "is use when fetching files and parsing package lists. The internal default "
+ "is always the native architecture (<literal>APT::Architecture</literal>)  "
+ "and all foreign architectures it can retrieve by calling <command>dpkg "
+ "--print-foreign-architectures</command>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:166
+ #: apt.conf.5.xml:167
  msgid ""
  "Default release to install packages from if more than one version "
  "available. Contains release name, codename or release version. Examples: "
@@@ -4443,25 -3409,15 +3410,15 @@@
  "'4.0', '5.0*'. See also &apt-preferences;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:171
- msgid "Ignore-Hold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:172
+ #: apt.conf.5.xml:173
  msgid ""
  "Ignore Held packages; This global option causes the problem resolver to "
  "ignore held packages in its decision making."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:176
- msgid "Clean-Installed"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:177
+ #: apt.conf.5.xml:178
  msgid ""
  "Defaults to on. When turned on the autoclean feature will remove any "
  "packages which can no longer be downloaded from the cache. If turned off "
@@@ -4469,13 -3425,8 +3426,8 @@@
  "but note that APT provides no direct means to reinstall them."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:183
- msgid "Immediate-Configure"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:184
+ #: apt.conf.5.xml:185
  msgid ""
  "Defaults to on which will cause APT to install essential and important "
  "packages as fast as possible in the install/upgrade operation. This is done "
@@@ -4507,13 -3458,8 +3459,8 @@@
  "work on improving or correcting the upgrade process."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:206
- msgid "Force-LoopBreak"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:207
+ #: apt.conf.5.xml:208
  msgid ""
  "Never Enable this option unless you -really- know what you are doing. It "
  "permits APT to temporarily remove an essential package to break a "
@@@ -4523,90 -3469,60 +3470,60 @@@
  "anything that those packages depend on."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:215
- msgid "Cache-Start, Cache-Grow and Cache-Limit"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:216
+ #: apt.conf.5.xml:217
  msgid ""
  "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
  "the 'available' information. <literal>Cache-Start</literal> acts as a hint "
  "to which size the Cache will grow and is therefore the amount of memory APT "
  "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
- "that these amount of space need to be available for APT otherwise it will "
- "likely fail ungracefully, so for memory restricted devices these value "
- "should be lowered while on systems with a lot of configured sources this "
- "might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
- "default of 1048576 (~1 MB) how much the Cache size will be increased in the "
- "event the space defined by <literal>Cache-Start</literal> is not "
- "enough. These value will be applied again and again until either the cache "
- "is big enough to store all information or the size of the cache reaches the "
+ "that this amount of space needs to be available for APT otherwise it will "
+ "likely fail ungracefully, so for memory restricted devices this value should "
+ "be lowered while on systems with a lot of configured sources it should be "
+ "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
+ "of 1048576 (~1 MB) how much the Cache size will be increased in the event "
+ "the space defined by <literal>Cache-Start</literal> is not enough. These "
+ "value will be applied again and again until either the cache is big enough "
+ "to store all information or the size of the cache reaches the "
  "<literal>Cache-Limit</literal>.  The default of "
  "<literal>Cache-Limit</literal> is 0 which stands for no limit.  If "
  "<literal>Cache-Grow</literal> is set to 0 the automatic grow of the cache is "
  "disabled."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:231
- msgid "Build-Essential"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:232
+ #: apt.conf.5.xml:233
  msgid "Defines which package(s) are considered essential build dependencies."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:235
- msgid "Get"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:236
+ #: apt.conf.5.xml:237
  msgid ""
  "The Get subsection controls the &apt-get; tool, please see its documentation "
  "for more information about the options here."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:240
- msgid "Cache"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:241
+ #: apt.conf.5.xml:242
  msgid ""
  "The Cache subsection controls the &apt-cache; tool, please see its "
  "documentation for more information about the options here."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:245
- msgid "CDROM"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:246
+ #: apt.conf.5.xml:247
  msgid ""
  "The CDROM subsection controls the &apt-cdrom; tool, please see its "
  "documentation for more information about the options here."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:252
+ #: apt.conf.5.xml:253
  msgid "The Acquire Group"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:257
- msgid "Check-Valid-Until"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:258
+ #: apt.conf.5.xml:259
  msgid ""
  "Security related option defaulting to true as an expiring validation for a "
  "Release file prevents longtime replay attacks and can e.g. also help users "
@@@ -4617,69 -3533,49 +3534,49 @@@
  "<literal>Max-ValidTime</literal> option can be used."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:268
- msgid "Max-ValidTime"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:269
+ #: apt.conf.5.xml:270
  msgid ""
  "Seconds the Release file should be considered valid after it was created "
  "(indicated by the <literal>Date</literal> header).  If the Release file "
  "itself includes a <literal>Valid-Until</literal> header the earlier date of "
  "the two is used as the expiration date.  The default value is "
- "<literal>0</literal> which stands for \"for ever\".  Archive specific "
+ "<literal>0</literal> which stands for \"for ever valid\".  Archive specific "
  "settings can be made by appending the label of the archive to the option "
  "name."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:279
- msgid "Min-ValidTime"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:280
+ #: apt.conf.5.xml:281
  msgid ""
  "Minimum of seconds the Release file should be considered valid after it was "
  "created (indicated by the <literal>Date</literal> header).  Use this if you "
  "need to use a seldomly updated (local) mirror of a more regular updated "
- "archive with a <literal>Valid-Until</literal> header instead of competely "
+ "archive with a <literal>Valid-Until</literal> header instead of completely "
  "disabling the expiration date checking.  Archive specific settings can and "
  "should be used by appending the label of the archive to the option name."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:290
- msgid "PDiffs"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:291
+ #: apt.conf.5.xml:292
  msgid ""
  "Try to download deltas called <literal>PDiffs</literal> for Packages or "
  "Sources files instead of downloading whole ones. True by default."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:294
+ #: apt.conf.5.xml:295
  msgid ""
  "Two sub-options to limit the use of PDiffs are also available: With "
  "<literal>FileLimit</literal> can be specified how many PDiff files are "
- "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+ "downloaded at most to update a file. <literal>SizeLimit</literal> on the "
  "other hand is the maximum percentage of the size of all patches compared to "
  "the size of the targeted file. If one of these limits is exceeded the "
  "complete file is downloaded instead of the patches."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:303
- msgid "Queue-Mode"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:304
+ #: apt.conf.5.xml:305
  msgid ""
  "Queuing mode; <literal>Queue-Mode</literal> can be one of "
  "<literal>host</literal> or <literal>access</literal> which determines how "
@@@ -4688,37 -3584,22 +3585,22 @@@
  "means that one connection per URI type will be opened."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:311
- msgid "Retries"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:312
+ #: apt.conf.5.xml:313
  msgid ""
  "Number of retries to perform. If this is non-zero APT will retry failed "
  "files the given number of times."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:316
- msgid "Source-Symlinks"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:317
+ #: apt.conf.5.xml:318
  msgid ""
  "Use symlinks for source archives. If set to true then source archives will "
  "be symlinked when possible instead of copying. True is the default."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:321 sources.list.5.xml:160
- msgid "http"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:322
+ #: apt.conf.5.xml:323
  msgid ""
  "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
  "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@@ -4730,7 -3611,7 +3612,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:330
+ #: apt.conf.5.xml:331
  msgid ""
  "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
  "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@@ -4744,7 -3625,7 +3626,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:340 apt.conf.5.xml:404
+ #: apt.conf.5.xml:341 apt.conf.5.xml:407
  msgid ""
  "The option <literal>timeout</literal> sets the timeout timer used by the "
  "method, this applies to all things including connection timeout and data "
@@@ -4752,20 -3633,27 +3634,27 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:343
+ #: apt.conf.5.xml:344
  msgid ""
- "One setting is provided to control the pipeline depth in cases where the "
- "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
- "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
- "indicating how many outstanding requests APT should send. A value of zero "
- "MUST be specified if the remote host does not properly linger on TCP "
- "connections - otherwise data corruption will occur. Hosts which require this "
- "are in violation of RFC 2068."
+ "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+ "enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial "
+ "e.g. on high-latency connections. It specifies how many requests are send in "
+ "a pipeline.  Previous APT versions had a default of 10 for this setting, but "
+ "the default value is now 0 (= disabled) to avoid problems with the "
+ "ever-growing amount of webservers and proxies which choose to not conform to "
+ "the HTTP/1.1 specification."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:351
  msgid ""
+ "<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
+ "redirects, which is enabled by default."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:354
+ msgid ""
  "The used bandwidth can be limited with "
  "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
  "kilobyte. The default value is 0 which deactivates the limit and tries uses "
@@@ -4774,20 -3662,15 +3663,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:356
+ #: apt.conf.5.xml:359
  msgid ""
  "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
  "User-Agent for the http download method as some proxies allow access for "
  "clients only if the client uses a known identifier."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:362
- msgid "https"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:363
+ #: apt.conf.5.xml:366
  msgid ""
  "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
  "options are the same as for <literal>http</literal> method and will also "
@@@ -4797,7 -3680,7 +3681,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:369
+ #: apt.conf.5.xml:372
  msgid ""
  "<literal>CaInfo</literal> suboption specifies place of file that holds info "
  "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@@ -4818,13 -3701,8 +3702,8 @@@
  "option."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:387 sources.list.5.xml:171
- msgid "ftp"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:388
+ #: apt.conf.5.xml:391
  msgid ""
  "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
  "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@@ -4844,7 -3722,7 +3723,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:407
+ #: apt.conf.5.xml:410
  msgid ""
  "Several settings are provided to control passive mode. Generally it is safe "
  "to leave passive mode on, it works in nearly every environment.  However "
@@@ -4854,7 -3732,7 +3733,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:414
+ #: apt.conf.5.xml:417
  msgid ""
  "It is possible to proxy FTP over HTTP by setting the "
  "<envar>ftp_proxy</envar> environment variable to a http url - see the "
@@@ -4864,7 -3742,7 +3743,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:419
+ #: apt.conf.5.xml:422
  msgid ""
  "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
  "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@@ -4873,19 -3751,14 +3752,14 @@@
  "that most FTP servers do not support RFC2428."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:426 sources.list.5.xml:153
- msgid "cdrom"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:432
+ #: apt.conf.5.xml:435
  #, no-wrap
  msgid "/cdrom/::Mount \"foo\";"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:427
+ #: apt.conf.5.xml:430
  msgid ""
  "CDROM URIs; the only setting for CDROM URIs is the mount point, "
  "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@@ -4897,26 -3770,16 +3771,16 @@@
  "can be specified using UMount."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:437
- msgid "gpgv"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:438
+ #: apt.conf.5.xml:441
  msgid ""
  "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
  "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
  "passed to gpgv."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:443
- msgid "CompressionTypes"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:449
+ #: apt.conf.5.xml:452
  #, no-wrap
  msgid ""
  "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@@ -4924,7 -3787,7 +3788,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:444
+ #: apt.conf.5.xml:447
  msgid ""
  "List of compression types which are understood by the acquire methods.  "
  "Files like <filename>Packages</filename> can be available in various "
@@@ -4936,19 -3799,19 +3800,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:454
+ #: apt.conf.5.xml:457
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order:: \"gz\";"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:457
+ #: apt.conf.5.xml:460
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:450
+ #: apt.conf.5.xml:453
  msgid ""
  "Also the <literal>Order</literal> subgroup can be used to define in which "
  "order the acquire system will try to download the compressed files. The "
@@@ -4965,13 -3828,13 +3829,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:461
+ #: apt.conf.5.xml:464
  #, no-wrap
  msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:459
+ #: apt.conf.5.xml:462
  msgid ""
  "Note that at run time the "
  "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@@ -4986,20 -3849,15 +3850,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:466
+ #: apt.conf.5.xml:469
  msgid ""
  "The special type <literal>uncompressed</literal> can be used to give "
  "uncompressed files a preference, but note that most archives don't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:471
- msgid "GzipIndexes"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:473
+ #: apt.conf.5.xml:476
  msgid ""
  "When downloading <literal>gzip</literal> compressed indexes (Packages, "
  "Sources, or Translations), keep them gzip compressed locally instead of "
@@@ -5007,13 -3865,8 +3866,8 @@@
  "CPU requirements when building the local package caches. False by default."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:480
- msgid "Languages"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:481
+ #: apt.conf.5.xml:484
  msgid ""
  "The Languages subsection controls which <filename>Translation</filename> "
  "files are downloaded and in which order APT tries to display the "
@@@ -5026,13 -3879,13 +3880,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
- #: apt.conf.5.xml:497
+ #: apt.conf.5.xml:500
  #, no-wrap
  msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:487
+ #: apt.conf.5.xml:490
  msgid ""
  "The default list includes \"environment\" and "
  "\"en\". \"<literal>environment</literal>\" has a special meaning here: It "
@@@ -5054,8 -3907,18 +3908,18 @@@
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:501
+ msgid ""
+ "Note: To prevent problems resulting from APT being executed in different "
+ "environments (e.g. by different users or by other programs) all Translation "
+ "files which are found in <filename>/var/lib/apt/lists/</filename> will be "
+ "added to the end of the list (after an implicit "
+ "\"<literal>none</literal>\")."
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:253
+ #: apt.conf.5.xml:254
  msgid ""
  "The <literal>Acquire</literal> group of options controls the download of "
  "packages and the URI handlers.  <placeholder type=\"variablelist\" "
@@@ -5063,24 -3926,24 +3927,24 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:504
+ #: apt.conf.5.xml:512
  msgid "Directories"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:506
+ #: apt.conf.5.xml:514
  msgid ""
  "The <literal>Dir::State</literal> section has directories that pertain to "
  "local state information. <literal>lists</literal> is the directory to place "
  "downloaded package lists in and <literal>status</literal> is the name of the "
  "dpkg status file.  <literal>preferences</literal> is the name of the APT "
- "preferences file.  <literal>Dir::State</literal> contains the default "
- "directory to prefix on all sub items if they do not start with "
- "<filename>/</filename> or <filename>./</filename>."
+ "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
+ "contains the default directory to prefix on all sub items if they do not "
+ "start with <filename>/</filename> or <filename>./</filename>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:513
+ #: apt.conf.5.xml:521
  msgid ""
  "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
  "information, such as the two package caches <literal>srcpkgcache</literal> "
@@@ -5093,7 -3956,7 +3957,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:522
+ #: apt.conf.5.xml:530
  msgid ""
  "<literal>Dir::Etc</literal> contains the location of configuration files, "
  "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@@ -5103,7 -3966,7 +3967,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:528
+ #: apt.conf.5.xml:536
  msgid ""
  "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
  "in lexical order from the directory specified. After this is done then the "
@@@ -5111,7 -3974,7 +3975,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:532
+ #: apt.conf.5.xml:540
  msgid ""
  "Binary programs are pointed to by "
  "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@@ -5123,7 -3986,7 +3987,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:540
+ #: apt.conf.5.xml:548
  msgid ""
  "The configuration item <literal>RootDir</literal> has a special meaning.  If "
  "set, all paths in <literal>Dir::</literal> will be relative to "
@@@ -5136,7 -3999,7 +4000,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:553
+ #: apt.conf.5.xml:561
  msgid ""
  "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
  "which files APT should silently ignore while parsing the files in the "
@@@ -5147,25 -4010,20 +4011,20 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:562
+ #: apt.conf.5.xml:570
  msgid "APT in DSelect"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:564
+ #: apt.conf.5.xml:572
  msgid ""
  "When APT is used as a &dselect; method several configuration directives "
  "control the default behaviour. These are in the <literal>DSelect</literal> "
  "section."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:568
- msgid "Clean"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:569
+ #: apt.conf.5.xml:577
  msgid ""
  "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
  "and never.  always and prompt will remove all packages from the cache after "
@@@ -5176,68 -4034,48 +4035,48 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:578
+ #: apt.conf.5.xml:586
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the install phase."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:582
- msgid "Updateoptions"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:583
+ #: apt.conf.5.xml:591
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the update phase."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:587
- msgid "PromptAfterUpdate"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:588
+ #: apt.conf.5.xml:596
  msgid ""
  "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
  "The default is to prompt only on error."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:594
+ #: apt.conf.5.xml:602
  msgid "How APT calls dpkg"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:595
+ #: apt.conf.5.xml:603
  msgid ""
  "Several configuration directives control how APT invokes &dpkg;. These are "
  "in the <literal>DPkg</literal> section."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:600
+ #: apt.conf.5.xml:608
  msgid ""
  "This is a list of options to pass to dpkg. The options must be specified "
  "using the list notation and each list item is passed as a single argument to "
  "&dpkg;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:605
- msgid "Pre-Invoke"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:605
- msgid "Post-Invoke"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:606
+ #: apt.conf.5.xml:614
  msgid ""
  "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -5245,13 -4083,8 +4084,8 @@@
  "fail APT will abort."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:612
- msgid "Pre-Install-Pkgs"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:613
+ #: apt.conf.5.xml:621
  msgid ""
  "This is a list of shell commands to run before invoking dpkg. Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -5261,7 -4094,7 +4095,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:619
+ #: apt.conf.5.xml:627
  msgid ""
  "Version 2 of this protocol dumps more information, including the protocol "
  "version, the APT configuration space and the packages, files and versions "
@@@ -5271,37 -4104,27 +4105,27 @@@
  "<literal>Pre-Install-Pkgs</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:626
- msgid "Run-Directory"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:627
+ #: apt.conf.5.xml:635
  msgid ""
  "APT chdirs to this directory before invoking dpkg, the default is "
  "<filename>/</filename>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:631
- msgid "Build-options"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:632
+ #: apt.conf.5.xml:640
  msgid ""
  "These options are passed to &dpkg-buildpackage; when compiling packages, the "
  "default is to disable signing and produce all binaries."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt.conf.5.xml:637
+ #: apt.conf.5.xml:645
  msgid "dpkg trigger usage (and related options)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:638
+ #: apt.conf.5.xml:646
  msgid ""
  "APT can call dpkg in a way so it can make aggressive use of triggers over "
  "multiple calls of dpkg. Without further options dpkg will use triggers only "
@@@ -5316,7 -4139,7 +4140,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
- #: apt.conf.5.xml:653
+ #: apt.conf.5.xml:661
  #, no-wrap
  msgid ""
  "DPkg::NoTriggers \"true\";\n"
@@@ -5326,7 -4149,7 +4150,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:647
+ #: apt.conf.5.xml:655
  msgid ""
  "Note that it is not guaranteed that APT will support these options or that "
  "these options will not cause (big) trouble in the future. If you have "
@@@ -5339,13 -4162,8 +4163,8 @@@
  "would be <placeholder type=\"literallayout\" id=\"0\"/>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:659
- msgid "DPkg::NoTriggers"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:660
+ #: apt.conf.5.xml:668
  msgid ""
  "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
  "call).  See &dpkg; if you are interested in what this actually means. In "
@@@ -5356,13 -4174,8 +4175,8 @@@
  "dpkg - now apt will add these flag also to the unpack and remove calls."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:667
- msgid "PackageManager::Configure"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:668
+ #: apt.conf.5.xml:676
  msgid ""
  "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
  "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@@ -5378,13 -4191,8 +4192,8 @@@
  "could be unbootable!"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:678
- msgid "DPkg::ConfigurePending"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:679
+ #: apt.conf.5.xml:687
  msgid ""
  "If this option is set apt will call <command>dpkg --configure "
  "--pending</command> to let dpkg handle all required configurations and "
@@@ -5395,13 -4203,8 +4204,8 @@@
  "the last run."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:685
- msgid "DPkg::TriggersPending"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:686
+ #: apt.conf.5.xml:694
  msgid ""
  "Useful for <literal>smart</literal> configuration as a package which has "
  "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@@ -5410,13 -4213,8 +4214,8 @@@
  "triggers, not only the triggers needed to configure this package."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:691
- msgid "PackageManager::UnpackAll"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:692
+ #: apt.conf.5.xml:700
  msgid ""
  "As the configuration can be deferred to be done at the end by dpkg it can be "
  "tried to order the unpack series only by critical needs, e.g. by "
@@@ -5427,13 -4225,8 +4226,8 @@@
  "really useful."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:699
- msgid "OrderList::Score::Immediate"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:707
+ #: apt.conf.5.xml:715
  #, no-wrap
  msgid ""
  "OrderList::Score {\n"
@@@ -5445,7 -4238,7 +4239,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:700
+ #: apt.conf.5.xml:708
  msgid ""
  "Essential packages (and there dependencies) should be configured immediately "
  "after unpacking. It will be a good idea to do this quite early in the "
@@@ -5459,12 -4252,12 +4253,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:720
+ #: apt.conf.5.xml:728
  msgid "Periodic and Archives options"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:721
+ #: apt.conf.5.xml:729
  msgid ""
  "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
  "of options configure behavior of apt periodic updates, which is done by "
@@@ -5473,12 -4266,12 +4267,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:729
+ #: apt.conf.5.xml:737
  msgid "Debug options"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:731
+ #: apt.conf.5.xml:739
  msgid ""
  "Enabling options in the <literal>Debug::</literal> section will cause "
  "debugging information to be sent to the standard error stream of the program "
@@@ -5489,7 -4282,7 +4283,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:742
+ #: apt.conf.5.xml:750
  msgid ""
  "<literal>Debug::pkgProblemResolver</literal> enables output about the "
  "decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@@ -5497,7 -4290,7 +4291,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:750
+ #: apt.conf.5.xml:758
  msgid ""
  "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
  "used to run some operations (for instance, <literal>apt-get -s "
@@@ -5505,7 -4298,7 +4299,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:759
+ #: apt.conf.5.xml:767
  msgid ""
  "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
  "time that <literal>apt</literal> invokes &dpkg;."
@@@ -5515,203 -4308,118 +4309,118 @@@ msgstr "
  #. 	   motivating example, except I haven't a clue why you'd want
  #. 	   to do this. 
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:767
+ #: apt.conf.5.xml:775
  msgid ""
  "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
  "in CDROM IDs."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:777
+ #: apt.conf.5.xml:785
  msgid "A full list of debugging options to apt follows."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:782
- msgid "<literal>Debug::Acquire::cdrom</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:786
+ #: apt.conf.5.xml:794
  msgid "Print information related to accessing <literal>cdrom://</literal> sources."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:793
- msgid "<literal>Debug::Acquire::ftp</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:797
+ #: apt.conf.5.xml:805
  msgid "Print information related to downloading packages using FTP."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:804
- msgid "<literal>Debug::Acquire::http</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:808
+ #: apt.conf.5.xml:816
  msgid "Print information related to downloading packages using HTTP."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:815
- msgid "<literal>Debug::Acquire::https</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:819
+ #: apt.conf.5.xml:827
  msgid "Print information related to downloading packages using HTTPS."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:826
- msgid "<literal>Debug::Acquire::gpgv</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:830
+ #: apt.conf.5.xml:838
  msgid ""
  "Print information related to verifying cryptographic signatures using "
  "<literal>gpg</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:837
- msgid "<literal>Debug::aptcdrom</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:841
+ #: apt.conf.5.xml:849
  msgid ""
  "Output information about the process of accessing collections of packages "
  "stored on CD-ROMs."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:848
- msgid "<literal>Debug::BuildDeps</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:851
+ #: apt.conf.5.xml:859
  msgid "Describes the process of resolving build-dependencies in &apt-get;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:858
- msgid "<literal>Debug::Hashes</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:861
+ #: apt.conf.5.xml:869
  msgid ""
  "Output each cryptographic hash that is generated by the "
  "<literal>apt</literal> libraries."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:868
- msgid "<literal>Debug::IdentCDROM</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:871
+ #: apt.conf.5.xml:879
  msgid ""
  "Do not include information from <literal>statfs</literal>, namely the number "
  "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
  "a CD-ROM."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:879
- msgid "<literal>Debug::NoLocking</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:882
+ #: apt.conf.5.xml:890
  msgid ""
  "Disable all file locking.  For instance, this will allow two instances of "
  "<quote><literal>apt-get update</literal></quote> to run at the same time."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:890
- msgid "<literal>Debug::pkgAcquire</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:894
+ #: apt.conf.5.xml:902
  msgid "Log when items are added to or removed from the global download queue."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:901
- msgid "<literal>Debug::pkgAcquire::Auth</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:904
+ #: apt.conf.5.xml:912
  msgid ""
  "Output status messages and errors related to verifying checksums and "
  "cryptographic signatures of downloaded files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:911
- msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:914
+ #: apt.conf.5.xml:922
  msgid ""
  "Output information about downloading and applying package index list diffs, "
  "and errors relating to package index list diffs."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:922
- msgid "<literal>Debug::pkgAcquire::RRed</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:926
+ #: apt.conf.5.xml:934
  msgid ""
  "Output information related to patching apt package lists when downloading "
  "index diffs instead of full indices."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:933
- msgid "<literal>Debug::pkgAcquire::Worker</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:937
+ #: apt.conf.5.xml:945
  msgid "Log all interactions with the sub-processes that actually perform downloads."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:944
- msgid "<literal>Debug::pkgAutoRemove</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:948
+ #: apt.conf.5.xml:956
  msgid ""
  "Log events related to the automatically-installed status of packages and to "
  "the removal of unused packages."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:955
- msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:958
+ #: apt.conf.5.xml:966
  msgid ""
  "Generate debug messages describing which packages are being automatically "
  "installed to resolve dependencies.  This corresponds to the initial "
@@@ -5720,13 -4428,8 +4429,8 @@@
  "<literal>Debug::pkgProblemResolver</literal> for that."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:969
- msgid "<literal>Debug::pkgDepCache::Marker</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:972
+ #: apt.conf.5.xml:980
  msgid ""
  "Generate debug messages describing which package is marked as "
  "keep/install/remove while the ProblemResolver does his work.  Each addition "
@@@ -5743,138 -4446,82 +4447,82 @@@
  "section the package appears in."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:991
- msgid "<literal>Debug::pkgInitConfig</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:994
+ #: apt.conf.5.xml:1002
  msgid "Dump the default configuration to standard error on startup."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1001
- msgid "<literal>Debug::pkgDPkgPM</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1004
+ #: apt.conf.5.xml:1012
  msgid ""
  "When invoking &dpkg;, output the precise command line with which it is being "
  "invoked, with arguments separated by a single space character."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1012
- msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1015
+ #: apt.conf.5.xml:1023
  msgid ""
  "Output all the data received from &dpkg; on the status file descriptor and "
  "any errors encountered while parsing it."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1022
- msgid "<literal>Debug::pkgOrderList</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1026
+ #: apt.conf.5.xml:1034
  msgid ""
  "Generate a trace of the algorithm that decides the order in which "
  "<literal>apt</literal> should pass packages to &dpkg;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1034
- msgid "<literal>Debug::pkgPackageManager</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1038
+ #: apt.conf.5.xml:1046
  msgid "Output status messages tracing the steps performed when invoking &dpkg;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1045
- msgid "<literal>Debug::pkgPolicy</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1049
+ #: apt.conf.5.xml:1057
  msgid "Output the priority of each package list on startup."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1055
- msgid "<literal>Debug::pkgProblemResolver</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1059
+ #: apt.conf.5.xml:1067
  msgid ""
  "Trace the execution of the dependency resolver (this applies only to what "
  "happens when a complex dependency problem is encountered)."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1067
- msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1070
+ #: apt.conf.5.xml:1078
  msgid ""
  "Display a list of all installed packages with their calculated score used by "
  "the pkgProblemResolver. The description of the package is the same as "
  "described in <literal>Debug::pkgDepCache::Marker</literal>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1078
- msgid "<literal>Debug::sourceList</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1082
+ #: apt.conf.5.xml:1090
  msgid ""
  "Print information about the vendors read from "
  "<filename>/etc/apt/vendors.list</filename>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1105
+ #: apt.conf.5.xml:1113
  msgid ""
  "&configureindex; is a configuration file showing example values for all "
  "possible options."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt.conf.5.xml:1112
+ #: apt.conf.5.xml:1120
  msgid "&file-aptconf;"
  msgstr ""
  
  #.  ? reading apt.conf 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1117
+ #: apt.conf.5.xml:1125
  msgid "&apt-cache;, &apt-config;, &apt-preferences;."
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt_preferences.5.xml:16
- msgid "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt_preferences.5.xml:24 apt_preferences.5.xml:31
- msgid "apt_preferences"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt_preferences.5.xml:32
  msgid "Preference control file for APT"
@@@ -6294,93 -4941,94 +4942,94 @@@ msgid "
  "Pin-Priority: 990\n"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:290
- msgid "Package"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:296
- msgid "*"
+ #. type: Content of: <refentry><refsect1><refsect2><para>
+ #: apt_preferences.5.xml:291
+ msgid ""
+ "If a regular expression occurs in a <literal>Package</literal> field, the "
+ "behavior is the same as if this regular expression were replaced with a list "
+ "of all package names it matches. It is undecided whether this will change in "
+ "the future, thus you should always list wild-card pins first, so later "
+ "specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+ "Package field is not considered a glob() expression in itself."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:306
+ #: apt_preferences.5.xml:307
  msgid "How APT Interprets Priorities"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:314
+ #: apt_preferences.5.xml:315
  msgid "P &gt; 1000"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:315
+ #: apt_preferences.5.xml:316
  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:319
+ #: apt_preferences.5.xml:320
  msgid "990 &lt; P &lt;=1000"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:320
+ #: apt_preferences.5.xml:321
  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:325
+ #: apt_preferences.5.xml:326
  msgid "500 &lt; P &lt;=990"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:326
+ #: apt_preferences.5.xml:327
  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:331
+ #: apt_preferences.5.xml:332
  msgid "100 &lt; P &lt;=500"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:332
+ #: apt_preferences.5.xml:333
  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:337
+ #: apt_preferences.5.xml:338
  msgid "0 &lt; P &lt;=100"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:338
+ #: apt_preferences.5.xml:339
  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:342
+ #: apt_preferences.5.xml:343
  msgid "P &lt; 0"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:343
+ #: apt_preferences.5.xml:344
  msgid "prevents the version from being installed"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:309
+ #: apt_preferences.5.xml:310
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -6388,7 -5036,7 +5037,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:348
+ #: apt_preferences.5.xml:349
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -6397,14 -5045,14 +5046,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:354
+ #: apt_preferences.5.xml:355
  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:358
+ #: apt_preferences.5.xml:359
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -6421,12 -5069,12 +5070,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:371
+ #: apt_preferences.5.xml:372
  msgid "Then:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:373
+ #: apt_preferences.5.xml:374
  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 "
@@@ -6436,7 -5084,7 +5085,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:378
+ #: apt_preferences.5.xml:379
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -6444,7 -5092,7 +5093,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:382
+ #: apt_preferences.5.xml:383
  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 "
@@@ -6453,12 -5101,12 +5102,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:392
+ #: apt_preferences.5.xml:393
  msgid "Determination of Package Version and Distribution Properties"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:394
+ #: apt_preferences.5.xml:395
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -6466,27 -5114,27 +5115,27 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:406
+ #: apt_preferences.5.xml:407
  msgid "the <literal>Package:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:407
+ #: apt_preferences.5.xml:408
  msgid "gives the package name"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+ #: apt_preferences.5.xml:411 apt_preferences.5.xml:461
  msgid "the <literal>Version:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:411
+ #: apt_preferences.5.xml:412
  msgid "gives the version number for the named package"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:398
+ #: apt_preferences.5.xml:399
  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>: "
@@@ -6498,12 -5146,12 +5147,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:427
+ #: apt_preferences.5.xml:428
  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:428
+ #: apt_preferences.5.xml:429
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -6514,18 -5162,18 +5163,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:438
+ #: apt_preferences.5.xml:439
  #, no-wrap
  msgid "Pin: release a=stable\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:444
+ #: apt_preferences.5.xml:445
  msgid "the <literal>Codename:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:445
+ #: apt_preferences.5.xml:446
  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 "
@@@ -6536,13 -5184,13 +5185,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:454
+ #: apt_preferences.5.xml:455
  #, 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:461
+ #: apt_preferences.5.xml:462
  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 "
@@@ -6553,7 -5201,7 +5202,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:470
+ #: apt_preferences.5.xml:471
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -6562,12 -5210,12 +5211,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:479
+ #: apt_preferences.5.xml:480
  msgid "the <literal>Component:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:480
+ #: apt_preferences.5.xml:481
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -6579,18 -5227,18 +5228,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:489
+ #: apt_preferences.5.xml:490
  #, no-wrap
  msgid "Pin: release c=main\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:495
+ #: apt_preferences.5.xml:496
  msgid "the <literal>Origin:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:496
+ #: apt_preferences.5.xml:497
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is "
@@@ -6599,18 -5247,18 +5248,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:502
+ #: apt_preferences.5.xml:503
  #, no-wrap
  msgid "Pin: release o=Debian\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:508
+ #: apt_preferences.5.xml:509
  msgid "the <literal>Label:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:509
+ #: apt_preferences.5.xml:510
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is "
@@@ -6619,13 -5267,13 +5268,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:515
+ #: apt_preferences.5.xml:516
  #, no-wrap
  msgid "Pin: release l=Debian\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:416
+ #: apt_preferences.5.xml:417
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -6639,7 -5287,7 +5288,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:522
+ #: apt_preferences.5.xml:523
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -6654,12 -5302,12 +5303,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:535
+ #: apt_preferences.5.xml:536
  msgid "Optional Lines in an APT Preferences Record"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:537
+ #: apt_preferences.5.xml:538
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -6667,12 -5315,12 +5316,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:546
+ #: apt_preferences.5.xml:547
  msgid "Tracking Stable"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:554
+ #: apt_preferences.5.xml:555
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -6687,7 -5335,7 +5336,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:548
+ #: apt_preferences.5.xml:549
  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 "
@@@ -6697,7 -5345,7 +5346,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:571 apt_preferences.5.xml:617 apt_preferences.5.xml:675
+ #: apt_preferences.5.xml:572 apt_preferences.5.xml:618 apt_preferences.5.xml:676
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -6706,7 -5354,7 +5355,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:566
+ #: apt_preferences.5.xml:567
  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 "
@@@ -6715,13 -5363,13 +5364,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:583
+ #: apt_preferences.5.xml:584
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/testing\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:577
+ #: apt_preferences.5.xml:578
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -6730,12 -5378,12 +5379,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:589
+ #: apt_preferences.5.xml:590
  msgid "Tracking Testing or Unstable"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:598
+ #: apt_preferences.5.xml:599
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6752,7 -5400,7 +5401,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:591
+ #: apt_preferences.5.xml:592
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -6763,7 -5411,7 +5412,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:612
+ #: apt_preferences.5.xml:613
  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 "
@@@ -6772,13 -5420,13 +5421,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:632
+ #: apt_preferences.5.xml:633
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:623
+ #: apt_preferences.5.xml:624
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -6790,12 -5438,12 +5439,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:639
+ #: apt_preferences.5.xml:640
  msgid "Tracking the evolution of a codename release"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:653
+ #: apt_preferences.5.xml:654
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package "
@@@ -6817,7 -5465,7 +5466,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:641
+ #: apt_preferences.5.xml:642
  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 "
@@@ -6832,7 -5480,7 +5481,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:670
+ #: apt_preferences.5.xml:671
  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 "
@@@ -6841,13 -5489,13 +5490,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:690
+ #: apt_preferences.5.xml:691
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/sid\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:681
+ #: apt_preferences.5.xml:682
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -6859,20 -5507,15 +5508,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt_preferences.5.xml:699
+ #: apt_preferences.5.xml:700
  msgid "&file-preferences;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt_preferences.5.xml:705
+ #: apt_preferences.5.xml:706
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: sources.list.5.xml:25 sources.list.5.xml:32
- msgid "sources.list"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: sources.list.5.xml:33
  msgid "Package resource list for APT"
@@@ -6999,7 -5642,7 +5643,7 @@@ msgid "
  "square brackets. It can consist of multiple settings in the form "
  "<literal><replaceable>setting</replaceable>=<replaceable>value</replaceable></literal>.  "
  "Multiple settings are separated by spaces. The following settings are "
- "supported by APT, note through that unsupported settings will be ignored "
+ "supported by APT, note though that unsupported settings will be ignored "
  "silently:"
  msgstr ""
  
@@@ -7016,12 -5659,12 +5660,12 @@@ msgstr "
  #: sources.list.5.xml:121
  msgid ""
  "<literal>trusted=yes</literal> can be set to indicate that packages from "
- "this source are always authenificated even if the "
+ "this source are always authenticated even if the "
  "<filename>Release</filename> file is not signed or the signature can't be "
  "checked. This disables parts of &apt-secure; and should therefore only be "
  "used in a local and trusted context. <literal>trusted=no</literal> is the "
- "opposite which handles even correctly authenificated sources as not "
- "authenificated."
+ "opposite which handles even correctly authenticated sources as not "
+ "authenticated."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -7066,6 -5709,11 +5710,11 @@@ msgid "
  "archives."
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:153
+ msgid "cdrom"
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #: sources.list.5.xml:155
  msgid ""
@@@ -7074,6 -5722,11 +5723,11 @@@
  "list."
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:160
+ msgid "http"
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #: sources.list.5.xml:162
  msgid ""
@@@ -7085,6 -5738,11 +5739,11 @@@
  "method of authentication."
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:171
+ msgid "ftp"
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #: sources.list.5.xml:173
  msgid ""
@@@ -7404,6 -6062,11 +6063,11 @@@ msgid "
  "packages for installation."
  msgstr ""
  
+ #. type: <heading></heading>
+ #: guide.sgml:96
+ msgid "apt-get"
+ msgstr ""
+ 
  #. type: <p></p>
  #: guide.sgml:102
  msgid ""
@@@ -7440,6 -6103,11 +6104,11 @@@ msgstr "
  msgid "Once updated there are several commands that can be used:"
  msgstr ""
  
+ #. type: <tag></tag>
+ #: guide.sgml:121
+ msgid "upgrade"
+ msgstr ""
+ 
  #. type: <p></p>
  #: guide.sgml:131
  msgid ""
@@@ -7452,6 -6120,11 +6121,11 @@@
  "<tt>apt-get install</tt> can be used to force these packages to install."
  msgstr ""
  
+ #. type: <tag></tag>
+ #: guide.sgml:131
+ msgid "install"
+ msgstr ""
+ 
  #. type: <p></p>
  #: guide.sgml:140
  msgid ""
@@@ -7464,6 -6137,11 +6138,11 @@@
  "anything other than its arguments are changed."
  msgstr ""
  
+ #. type: <tag></tag>
+ #: guide.sgml:140
+ msgid "dist-upgrade"
+ msgstr ""
+ 
  #. type: <p></p>
  #: guide.sgml:149
  msgid ""
diff --combined doc/po/de.po
index 9a3415051,c7da79418..2b718b77d
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@@ -7,8 -7,8 +7,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt-doc 0.8.15-9\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
- "PO-Revision-Date: 2011-11-13 11:21+0100\n"
 -"POT-Creation-Date: 2012-05-21 13:37+0300\n"
++"POT-Creation-Date: 2012-05-22 15:47+0300\n"
+ "PO-Revision-Date: 2012-05-21 23:18+0100\n"
  "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
  "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
  "Language: de\n"
@@@ -119,7 -119,7 +119,7 @@@ msgid "
  "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
  "B<reportbug>(1)  command."
  msgstr ""
- "Siehe auch E<lt>http://bugs.debian.org/aptE<gt>. Wenn Sie einen Fehler in "
+ "siehe auch E<lt>http://bugs.debian.org/aptE<gt>. Wenn Sie einen Fehler in "
  "B<apt> berichten möchten, sehen Sie sich bitte I</usr/share/doc/debian/bug-"
  "reporting.txt> oder den Befehl B<reportbug>(1) an."
  
@@@ -135,44 -135,7 +135,7 @@@ msgid "apt was written by the APT team 
  msgstr "APT wurde vom APT-Team E<lt>apt@packages.debian.orgE<gt> geschrieben."
  
  #. type: Plain text
- #: apt.ent:2
- msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
- msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
- 
- #. type: Plain text
- #: apt.ent:16
- #, no-wrap
- msgid ""
- "<!-- Boiler plate docinfo section -->\n"
- "<!ENTITY apt-docinfo \"\n"
- " <refentryinfo>\n"
- "   <address><email>apt@packages.debian.org</email></address>\n"
- "   <author>\n"
- "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
- "     <contrib></contrib>\n"
- "   </author>\n"
- "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
- "   <date>28 October 2008</date>\n"
- "   <productname>Linux</productname>\n"
- " </refentryinfo>\n"
- "\">\n"
- msgstr ""
- "<!-- Vorformatierter Textblock docinfo-Abschnitt -->\n"
- "<!ENTITY apt-docinfo \"\n"
- " <refentryinfo>\n"
- "   <address><email>apt@packages.debian.org</email></address>\n"
- "   <author>\n"
- "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
- "     <contrib></contrib>\n"
- "   </author>\n"
- "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
- "   <date>28. Oktober 2008</date>\n"
- "   <productname>Linux</productname>\n"
- " </refentryinfo>\n"
- "\">\n"
- 
- #. type: Plain text
- #: apt.ent:23
+ #: apt.ent:7
  #, no-wrap
  msgid ""
  "<!ENTITY apt-author.team \"\n"
@@@ -190,7 -153,7 +153,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:29
+ #: apt.ent:13
  #, no-wrap
  msgid ""
  "<!ENTITY apt-qapage \"\n"
@@@ -206,7 -169,7 +169,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:40
+ #: apt.ent:24
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Bug reporting section -->\n"
@@@ -232,7 -195,7 +195,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:48
+ #: apt.ent:32
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Author section -->\n"
@@@ -252,7 -215,7 +215,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:58
+ #: apt.ent:42
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -270,13 -233,13 +233,13 @@@ msgstr "
  "<!ENTITY apt-commonoptions \"\n"
  "     <varlistentry><term><option>-h</option></term>\n"
  "     <term><option>--help</option></term>\n"
- "     <listitem><para>Ein kurze Aufrufzusammenfassung zeigen.\n"
+ "     <listitem><para>eine kurze Aufrufzusammenfassung zeigen\n"
  "     </para>\n"
  "     </listitem>\n"
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:66
+ #: apt.ent:50
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -290,13 -253,13 +253,13 @@@ msgstr "
  "     <varlistentry>\n"
  "      <term><option>-v</option></term>\n"
  "      <term><option>--version</option></term>\n"
- "      <listitem><para>Die Version des Programms anzeigen.\n"
+ "      <listitem><para>die Version des Programms anzeigen\n"
  "     </para>\n"
  "     </listitem>\n"
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:78
+ #: apt.ent:62
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -314,7 -277,7 +277,7 @@@ msgstr "
  "     <varlistentry>\n"
  "      <term><option>-c</option></term>\n"
  "      <term><option>--config-file</option></term>\n"
- "     <listitem><para>Konfigurationsdatei; Gibt eine Konfigurationssdatei zum Benutzen an.\n"
+ "     <listitem><para>Konfigurationsdatei; gibt eine Konfigurationssdatei zum Benutzen an.\n"
  "     Das Programm wird die Vorgabe-Konfigurationsdatei und dann diese\n"
  "     Konfigurationsdatei lesen. Falls Konfigurationseinstellungen vor der\n"
  "     Vorgabe-Konfiguration ausgewertet werden müssen, geben Sie eine Datei\n"
@@@ -325,7 -288,7 +288,7 @@@
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:90
+ #: apt.ent:74
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -343,7 -306,7 +306,7 @@@ msgstr "
  "     <varlistentry>\n"
  "      <term><option>-o</option></term>\n"
  "      <term><option>--option</option></term>\n"
- "     <listitem><para>Eine Konfigurationsoption setzen; Dies wird eine beliebige\n"
+ "     <listitem><para>eine Konfigurationsoption setzen; Dies wird eine beliebige\n"
  "       Konfigurationsoption setzen. Die Syntax lautet <option>-o Foo::Bar=bar</option>.\n"
  "      <option>-o</option> und <option>--option</option> kann mehrfach benutzt\n"
  "       werden, um verschiedene Optionen zu setzen.\n"
@@@ -353,7 -316,7 +316,7 @@@
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:101
+ #: apt.ent:85
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -379,7 -342,7 +342,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:107
+ #: apt.ent:91
  #, no-wrap
  msgid ""
  "<!ENTITY file-aptconf \"\n"
@@@ -395,7 -358,7 +358,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:113
+ #: apt.ent:97
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@@ -411,7 -374,7 +374,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:119
+ #: apt.ent:103
  #, no-wrap
  msgid ""
  "<!ENTITY file-cachearchives \"\n"
@@@ -426,24 -389,25 +389,25 @@@ msgstr "
  "     Konfigurationselement: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
  "     </varlistentry>\n"
  
+ # FIXME s/appended)./appended.)/
  #. type: Plain text
- #: apt.ent:125
+ #: apt.ent:109
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
  "     <listitem><para>Storage area for package files in transit.\n"
- "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
  "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
  "     <listitem><para>Speicherbereich für Paketdateien auf dem Transportweg.\n"
- "     Konfigurationselement: <literal>Dir::Cache::Archives</literal> (implizit teilweise). </para></listitem>\n"
+ "     Konfigurationselement: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> wird implizit angehängt.)</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:135
+ #: apt.ent:119
  #, no-wrap
  msgid ""
  "<!ENTITY file-preferences \"\n"
@@@ -466,7 -430,7 +430,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:141
+ #: apt.ent:125
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@@ -482,7 -446,7 +446,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:147
+ #: apt.ent:131
  #, no-wrap
  msgid ""
  "<!ENTITY file-sourceslist \"\n"
@@@ -498,7 -462,7 +462,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:153
+ #: apt.ent:137
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@@ -514,7 -478,7 +478,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:160
+ #: apt.ent:144
  #, no-wrap
  msgid ""
  "<!ENTITY file-statelists \"\n"
@@@ -531,24 -495,25 +495,25 @@@ msgstr "
  "     Konfigurationselement: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
  "     </varlistentry>\n"
  
+ # FIXME s/appended)./appended.)/
  #. type: Plain text
- #: apt.ent:166
+ #: apt.ent:150
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
  "     <listitem><para>Storage area for state information in transit.\n"
- "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
  "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
  "     <listitem><para>Speicherbereich für Statusinformationen auf dem Transportweg.\n"
- "     Konfigurationselement: <literal>Dir::State::Lists</literal> (implizit teilweise).</para></listitem>\n"
+ "     Konfigurationselement: <literal>Dir::State::Lists</literal> (<filename>partial</filename> wird implizit angehängt.)</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:172
+ #: apt.ent:156
  #, no-wrap
  msgid ""
  "<!ENTITY file-trustedgpg \"\n"
@@@ -565,7 -530,7 +530,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:179
+ #: apt.ent:163
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@@ -584,7 -549,7 +549,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:187
+ #: apt.ent:171
  #, no-wrap
  msgid ""
  "<!ENTITY file-extended_states \"\n"
@@@ -597,14 -562,14 +562,14 @@@
  msgstr ""
  "<!ENTITY file-extended_states \"\n"
  "      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
- "      <listitem><para>Statusliste automatisch installierter Pakete.\n"
+ "      <listitem><para>Statusliste automatisch installierter Pakete\n"
  "      Konfigurationselement: <literal>Dir::State::extended_states</literal>.\n"
  "      </para></listitem>\n"
  "      </varlistentry>\n"
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:191
+ #: apt.ent:175
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@@ -613,7 -578,7 +578,7 @@@
  msgstr "<!ENTITY translation-title \"ÜBERSETZUNG\">\n"
  
  #. type: Plain text
- #: apt.ent:200
+ #: apt.ent:184
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@@ -633,7 -598,7 +598,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:210
+ #: apt.ent:195
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@@ -653,32 -618,133 +618,133 @@@ msgstr "
  "     die Übersetzung hinter dem Originalinhalt hinterherhängt.\n"
  "\">\n"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cache.8.xml:16
+ #. type: Plain text
+ #: apt.ent:198
  msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
- "February 2011</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
- "<date>04. Februar 2011</date>"
+ "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+ "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+ msgstr "<!ENTITY synopsis-config-string \"Konfigurationszeichenkette\">"
+ 
+ #. type: Plain text
+ #: apt.ent:201
+ msgid ""
+ "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+ "synopsis-config-file \"config_file\">"
+ msgstr "<!ENTITY synopsis-config-file \"Konfigurationsdatei\">"
+ 
+ #. type: Plain text
+ #: apt.ent:204
+ msgid ""
+ "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+ "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+ "\"target_release\">"
+ msgstr "<!ENTITY synopsis-target-release \"Ziel-Release\">"
+ 
+ #. type: Plain text
+ #: apt.ent:207
+ msgid ""
+ "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+ "synopsis-architecture \"architecture\">"
+ msgstr "<!ENTITY synopsis-architecture \"Architektur\">"
+ 
+ #. type: Plain text
+ #: apt.ent:210
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+ "--> <!ENTITY synopsis-pkg \"pkg\">"
+ msgstr "<!ENTITY synopsis-pkg \"Paket\">"
+ 
+ #. type: Plain text
+ #: apt.ent:213
+ msgid ""
+ "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+ "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+ msgstr "<!ENTITY synopsis-pkg-ver-number \"Paketversionsnummer\">"
+ 
+ #. type: Plain text
+ #: apt.ent:216
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+ "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+ msgstr "<!ENTITY synopsis-prefix \"Präfix\">"
+ 
+ #. type: Plain text
+ #: apt.ent:219
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+ "awesome --> <!ENTITY synopsis-regex \"regex\">"
+ msgstr "<!ENTITY synopsis-regex \"regulärer_Ausdruck\">"
+ 
+ #. type: Plain text
+ #: apt.ent:222
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+ "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+ msgstr "<!ENTITY synopsis-cdrom-mount \"CD-ROM-Einhängepunkt\">"
+ 
+ #. type: Plain text
+ #: apt.ent:225
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+ "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+ "\"temporary_directory\">"
+ msgstr "<!ENTITY synopsis-tmp-directory \"temporäres_Verzeichnis\">"
+ 
+ #. type: Plain text
+ #: apt.ent:228
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+ "synopsis-filename \"filename\">"
+ msgstr "<!ENTITY synopsis-filename \"Dateiname\">"
+ 
+ #. type: Plain text
+ #: apt.ent:231
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
+ msgstr "<!ENTITY synopsis-path \"Pfad\">"
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cache.8.xml:25 apt-cache.8.xml:32
- msgid "apt-cache"
- msgstr "apt-cache"
+ #. type: Plain text
+ #: apt.ent:234
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-override "
+ "\"override-file\">"
+ msgstr "<!ENTITY synopsis-override \"Überschreibungsdatei\">"
+ 
+ #. type: Plain text
+ #: apt.ent:237
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+ "\"pathprefix\">"
+ msgstr "<!ENTITY synopsis-pathprefix \"Pfadpräfix\">"
+ 
+ #. type: Plain text
+ #: apt.ent:240
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "generate section --> <!ENTITY synopsis-section \"section\">"
+ msgstr "<!ENTITY synopsis-section \"Abschnitt\">"
+ 
+ #. type: Plain text
+ #: apt.ent:243
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+ msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">"
  
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26
- #: apt-key.8.xml:18 apt-mark.8.xml:26 apt-secure.8.xml:18
+ #: apt-key.8.xml:25 apt-mark.8.xml:26 apt-secure.8.xml:25
  msgid "8"
  msgstr "8"
  
  #. type: Content of: <refentry><refmeta><refmiscinfo>
  #: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27
  #: apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27
- #: apt-key.8.xml:19 apt-mark.8.xml:27 apt-secure.8.xml:19
- #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:33 apt_preferences.5.xml:26
+ #: apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26
+ #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:32 apt_preferences.5.xml:26
  #: sources.list.5.xml:27
  msgid "APT"
  msgstr "APT"
@@@ -688,61 -754,17 +754,17 @@@
  msgid "query the APT cache"
  msgstr "den APT-Zwischenspeicher abfragen"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cache.8.xml:39
- msgid ""
- "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
- "<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
- "arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
- "arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
- "arg> </group>"
- msgstr ""
- "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
- "o=<replaceable>Konfigurationszeichenkette</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group "
- "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg>showsrc <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
- "<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
- "<arg>search <arg choice=\"plain\"><replaceable>regulärer_Ausdruck</"
- "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>Paket</replaceable></arg></arg> <arg>depends <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
- "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
- "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
- "\"><replaceable>Präfix</replaceable></arg></arg> <arg>dotty <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
- "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
- "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>Pakete</replaceable></arg></arg> <arg>madison <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>Pakete</replaceable></arg></arg> </"
- "group>"
- 
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
- #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
- #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
- #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+ #: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+ #: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+ #: apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50
+ #: apt-sortpkgs.1.xml:38 apt.conf.5.xml:41 apt_preferences.5.xml:36
  #: sources.list.5.xml:36
  msgid "Description"
  msgstr "Beschreibung"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:65
+ #: apt-cache.8.xml:39
  msgid ""
  "<command>apt-cache</command> performs a variety of operations on APT's "
  "package cache. <command>apt-cache</command> does not manipulate the state of "
@@@ -755,7 -777,7 +777,7 @@@ msgstr "
  "und Generieren von interessanten Ausgaben der Paket-Metadaten bereit."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:70 apt-get.8.xml:120
+ #: apt-cache.8.xml:44 apt-get.8.xml:44
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given, "
  "one of the commands below must be present."
@@@ -763,30 -785,25 +785,25 @@@ msgstr "
  "Sofern nicht die <option>-h</option>-, oder <option>--help</option>-Option "
  "angegeben ist, muss einer der unten aufgeführten Befehle vorkommen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:74
- msgid "gencaches"
- msgstr "gencaches"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:75
+ #: apt-cache.8.xml:49
  msgid ""
- "<literal>gencaches</literal> performs the same operation as <command>apt-get "
- "check</command>. It builds the source and package caches from the sources in "
- "&sources-list; and from <filename>/var/lib/dpkg/status</filename>."
+ "<literal>gencaches</literal> creates APT's package cache. This is done "
+ "implicitly by all commands needing this cache if it is missing or outdated."
  msgstr ""
- "<literal>gencaches</literal> führt die gleichen Operationen wie <command>apt-"
- "get check</command> durch. Es bildet die Quellen- und Paketzwischenspeicher "
- "aus den Quellen in &sources-list; und von <filename>/var/lib/dpkg/status</"
- "filename>."
+ "<literal>gencaches</literal> erzeugt den Paketzwischenspeicher von APT. Dies "
+ "wird implizit durch alle Befehle erledigt, die diesen Zwischenspeicher "
+ "benötigen, falls er fehlt oder veraltet ist."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:81
- msgid "showpkg <replaceable>pkg(s)</replaceable>"
- msgstr "showpkg <replaceable>Paket(e)</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+ #: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
+ #: apt-cache.8.xml:226 apt-cache.8.xml:238
+ msgid "&synopsis-pkg;"
+ msgstr "&synopsis-pkg;"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:82
+ #: apt-cache.8.xml:54
  msgid ""
  "<literal>showpkg</literal> displays information about the packages listed on "
  "the command line. Remaining arguments are package names. The available "
@@@ -810,7 -827,7 +827,7 @@@ msgstr "
  "Ausgabe ähnlich der folgenden erzeugen:"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-cache.8.xml:94
+ #: apt-cache.8.xml:66
  #, no-wrap
  msgid ""
  "Package: libreadline2\n"
@@@ -836,7 -853,7 +853,7 @@@ msgstr "
  "Reverse Provides: \n"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:106
+ #: apt-cache.8.xml:78
  msgid ""
  "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
  "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@@ -853,13 -870,8 +870,8 @@@ msgstr "
  "und ncurses3.0 (und ldso) installiert sein. Für die spezielle Bedeutung der "
  "restlichen Ausgabe ist es am besten, den apt-Quelltext zu konsultieren."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:115
- msgid "stats"
- msgstr "stats"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:115
+ #: apt-cache.8.xml:87
  msgid ""
  "<literal>stats</literal> displays some statistics about the cache.  No "
  "further arguments are expected. Statistics reported are:"
@@@ -868,7 -880,7 +880,7 @@@ msgstr "
  "Es werden keine weiteren Argumente erwartet. Berichtete Statistiken sind:"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:118
+ #: apt-cache.8.xml:90
  msgid ""
  "<literal>Total package names</literal> is the number of package names found "
  "in the cache."
@@@ -877,7 -889,7 +889,7 @@@ msgstr "
  "Zwischenspeicher gefundenen Pakete."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:122
+ #: apt-cache.8.xml:94
  msgid ""
  "<literal>Normal packages</literal> is the number of regular, ordinary "
  "package names; these are packages that bear a one-to-one correspondence "
@@@ -891,7 -903,7 +903,7 @@@ msgstr "
  "Kategorie."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:128
+ #: apt-cache.8.xml:100
  msgid ""
  "<literal>Pure virtual packages</literal> is the number of packages that "
  "exist only as a virtual package name; that is, packages only \"provide\" the "
@@@ -908,7 -920,7 +920,7 @@@ msgstr "
  "bereit, aber es gibt kein Paket mit dem Namen »mail-transport-agent«."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:136
+ #: apt-cache.8.xml:108
  msgid ""
  "<literal>Single virtual packages</literal> is the number of packages with "
  "only one package providing a particular virtual package. For example, in the "
@@@ -921,7 -933,7 +933,7 @@@ msgstr "
  "aber nur ein Paket, xless, stellt »X11-text-viewer« bereit."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:142
+ #: apt-cache.8.xml:114
  msgid ""
  "<literal>Mixed virtual packages</literal> is the number of packages that "
  "either provide a particular virtual package or have the virtual package name "
@@@ -934,7 -946,7 +946,7 @@@ msgstr "
  "tatsächliches Paket, wird aber auch vom Paket debconf-tiny bereitgestellt."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:149
+ #: apt-cache.8.xml:121
  msgid ""
  "<literal>Missing</literal> is the number of package names that were "
  "referenced in a dependency but were not provided by any package. Missing "
@@@ -950,7 -962,7 +962,7 @@@ msgstr "
  "Breaks-Angaben Bezug genommen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:156
+ #: apt-cache.8.xml:128
  msgid ""
  "<literal>Total distinct</literal> versions is the number of package versions "
  "found in the cache; this value is therefore at least equal to the number of "
@@@ -966,7 -978,7 +978,7 @@@ msgstr "
  "sein."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:163
+ #: apt-cache.8.xml:135
  msgid ""
  "<literal>Total dependencies</literal> is the number of dependency "
  "relationships claimed by all of the packages in the cache."
@@@ -974,13 -986,8 +986,8 @@@ msgstr "
  "<literal>Total dependencies</literal> ist die Anzahl der "
  "Abhängigkeitsbeziehungen, den alle Pakete im Zwischenspeicher beanspruchen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:170
- msgid "showsrc <replaceable>pkg(s)</replaceable>"
- msgstr "showsrc <replaceable>Paket(e)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:171
+ #: apt-cache.8.xml:143
  msgid ""
  "<literal>showsrc</literal> displays all the source package records that "
  "match the given package names. All versions are shown, as well as all "
@@@ -990,13 -997,8 +997,8 @@@ msgstr "
  "angegebenen Paketnamen entsprechen. Alle Versionen werden ebenso angezeigt, "
  "wie alle Datensätze, die den Namen für ein Programm deklarieren."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:176 apt-config.8.xml:87
- msgid "dump"
- msgstr "dump"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:177
+ #: apt-cache.8.xml:149
  msgid ""
  "<literal>dump</literal> shows a short listing of every package in the cache. "
  "It is primarily for debugging."
@@@ -1004,13 -1006,8 +1006,8 @@@ msgstr "
  "<literal>dump</literal> zeigt einen kurzen Programmausdruck von jedem Paket "
  "im Zwischenspeicher. Es dient in erster Linie der Fehlersuche."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:181
- msgid "dumpavail"
- msgstr "dumpavail"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:182
+ #: apt-cache.8.xml:154
  msgid ""
  "<literal>dumpavail</literal> prints out an available list to stdout. This is "
  "suitable for use with &dpkg; and is used by the &dselect; method."
@@@ -1019,13 -1016,8 +1016,8 @@@ msgstr "
  "ist geeignet für die Benutzung mit &dpkg; und wird für die &dselect;-Methode "
  "benutzt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:186
- msgid "unmet"
- msgstr "unmet"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:187
+ #: apt-cache.8.xml:159
  msgid ""
  "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
  "package cache."
@@@ -1033,13 -1025,8 +1025,8 @@@ msgstr "
  "<literal>unmet</literal> zeigt die Zusammenfassung aller unerfüllten "
  "Abhängigkeiten im Paketzwischenspeicher."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:191
- msgid "show <replaceable>pkg(s)</replaceable>"
- msgstr "show <replaceable>Paket(e)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:192
+ #: apt-cache.8.xml:164
  msgid ""
  "<literal>show</literal> performs a function similar to <command>dpkg --print-"
  "avail</command>; it displays the package records for the named packages."
@@@ -1048,13 -1035,13 +1035,13 @@@ msgstr "
  "avail</command> ähnlich ist. Es zeigt die Paketdatensätze für die genannten "
  "Pakete."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:197
- msgid "search <replaceable>regex [ regex ... ]</replaceable>"
- msgstr "search <replaceable>regex [ regex … ]</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:169
+ msgid "&synopsis-regex;"
+ msgstr "&synopsis-regex;"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:198
+ #: apt-cache.8.xml:170
  msgid ""
  "<literal>search</literal> performs a full text search on all available "
  "package lists for the POSIX regex pattern given, see "
@@@ -1079,7 -1066,7 +1066,7 @@@ msgstr "
  "Beschreibung nicht durchsucht, sondern nur der Paketname."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:211
+ #: apt-cache.8.xml:183
  msgid ""
  "Separate arguments can be used to specify multiple search patterns that are "
  "and'ed together."
@@@ -1087,13 -1074,8 +1074,8 @@@ msgstr "
  "Separate Argumente können benutzt werden, um mehrere Suchmuster anzugeben, "
  "die »und«-verknüpft werden."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:215
- msgid "depends <replaceable>pkg(s)</replaceable>"
- msgstr "depends <replaceable>Paket(e)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:216
+ #: apt-cache.8.xml:188
  msgid ""
  "<literal>depends</literal> shows a listing of each dependency a package has "
  "and all the possible other packages that can fulfill that dependency."
@@@ -1102,13 -1084,8 +1084,8 @@@ msgstr "
  "Paket hat und alle möglichen anderen Pakete, die die Abhängigkeit erfüllen "
  "können."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:220
- msgid "rdepends <replaceable>pkg(s)</replaceable>"
- msgstr "rdepends <replaceable>Paket(e)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:221
+ #: apt-cache.8.xml:193
  msgid ""
  "<literal>rdepends</literal> shows a listing of each reverse dependency a "
  "package has."
@@@ -1117,12 -1094,12 +1094,12 @@@ msgstr "
  "Rückwärtsabhängigkeit, die ein Paket hat."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:225
- msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
- msgstr "pkgnames <replaceable>[ Präfix ]</replaceable>"
+ #: apt-cache.8.xml:197
+ msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
+ msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:226
+ #: apt-cache.8.xml:198
  msgid ""
  "This command prints the name of each package APT knows. The optional "
  "argument is a prefix match to filter the name list. The output is suitable "
@@@ -1137,7 -1114,7 +1114,7 @@@ msgstr "
  "besten mit der <option>--generate</option>-Option benutzt."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:231
+ #: apt-cache.8.xml:203
  msgid ""
  "Note that a package which APT knows of is not necessarily available to "
  "download, installable or installed, e.g. virtual packages are also listed in "
@@@ -1147,13 -1124,8 +1124,8 @@@ msgstr "
  "Herunterladen verfügbar, installierbar oder installiert ist, virtuelle "
  "Pakete sind z.B. auch in der generierten Liste aufgeführt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:236
- msgid "dotty <replaceable>pkg(s)</replaceable>"
- msgstr "dotty <replaceable>Paket(e)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:237
+ #: apt-cache.8.xml:209
  msgid ""
  "<literal>dotty</literal> takes a list of packages on the command line and "
  "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@@ -1175,7 -1147,7 +1147,7 @@@ msgstr "
  "GivenOnly</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:246
+ #: apt-cache.8.xml:218
  msgid ""
  "The resulting nodes will have several shapes; normal packages are boxes, "
  "pure provides are triangles, mixed provides are diamonds, missing packages "
@@@ -1189,19 -1161,14 +1161,14 @@@ msgstr "
  "depends, grüne Linien sind Konflikte."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:251
+ #: apt-cache.8.xml:223
  msgid "Caution, dotty cannot graph larger sets of packages."
  msgstr ""
  "Vorsicht, dotty kann keine größeren Zusammenstellungen von Paketen grafisch "
  "darstellen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:254
- msgid "xvcg <replaceable>pkg(s)</replaceable>"
- msgstr "xvcg <replaceable>Paket(e)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:255
+ #: apt-cache.8.xml:227
  msgid ""
  "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
  "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@@ -1211,12 -1178,12 +1178,12 @@@ msgstr "
  "ulink>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:259
- msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
- msgstr "policy <replaceable>[ Paket(e) ]</replaceable>"
+ #: apt-cache.8.xml:231
+ msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
+ msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:260
+ #: apt-cache.8.xml:232
  msgid ""
  "<literal>policy</literal> is meant to help debug issues relating to the "
  "preferences file. With no arguments it will print out the priorities of each "
@@@ -1228,13 -1195,8 +1195,8 @@@ msgstr "
  "die Prioritäten von jeder Quelle aus. Ansonsten gibt es umfangreiche "
  "Informationen über die Prioritätenauswahl der genannten Pakete aus."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:266
- msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
- msgstr "madison <replaceable>[ Paket(e) ]</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:267
+ #: apt-cache.8.xml:239
  msgid ""
  "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
  "to mimic the output format and a subset of the functionality of the Debian "
@@@ -1252,48 -1214,27 +1214,27 @@@ msgstr "
  "Architektur anzeigen, für die APT Paketlisten heruntergeladen hat "
  "(<literal>APT::Architecture</literal>)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
- #: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
- #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+ #. type: Content of: <refentry><refsect1><title>
+ #: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+ #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+ #: apt-sortpkgs.1.xml:48
  msgid "options"
  msgstr "Optionen"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>-p</option>"
- msgstr "<option>-p</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>--pkg-cache</option>"
- msgstr "<option>--pkg-cache</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:283
+ #: apt-cache.8.xml:255
  msgid ""
  "Select the file to store the package cache. The package cache is the primary "
  "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
  "pkgcache</literal>."
  msgstr ""
- "Wählt die Datei zum Speichern des Paketzwischenspeichers. Der "
+ "wählt die Datei zum Speichern des Paketzwischenspeichers. Der "
  "Paketzwischenspeicher ist der primäre Zwischenspeicher, der von allen "
  "Operationen benutzt wird. Konfigurationselement: <literal>Dir::Cache::"
  "pkgcache</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:288
- msgid "<option>--src-cache</option>"
- msgstr "<option>--src-cache</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:289
+ #: apt-cache.8.xml:261
  msgid ""
  "Select the file to store the source cache. The source is used only by "
  "<literal>gencaches</literal> and it stores a parsed version of the package "
@@@ -1301,7 -1242,7 +1242,7 @@@
  "cache is used to avoid reparsing all of the package files.  Configuration "
  "Item: <literal>Dir::Cache::srcpkgcache</literal>."
  msgstr ""
- "Wählt die Datei zum Speichern des Quellenzwischenspeichers. Die Quelle wird "
+ "wählt die Datei zum Speichern des Quellenzwischenspeichers. Die Quelle wird "
  "nur von <literal>gencaches</literal> benutzt und sie speichert eine "
  "ausgewertete Version der Paketinformationen von entfernt liegenden Quellen. "
  "Wenn der Paketzwischenspeicher gebildet wird, wird der "
@@@ -1309,103 -1250,36 +1250,36 @@@
  "Paketdateien zu vermeiden. Konfigurationselement: <literal>Dir::Cache::"
  "srcpkgcache</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:545 apt-get.8.xml:383
- msgid "<option>--quiet</option>"
- msgstr "<option>--quiet</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:297
+ #: apt-cache.8.xml:269
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quietness up to a maximum of 2. You can also use "
  "<option>-q=#</option> to set the quietness level, overriding the "
  "configuration file.  Configuration Item: <literal>quiet</literal>."
  msgstr ""
- "Still; erzeugt eine Ausgabe, die für Protokollierung geeignet ist und "
+ "still; erzeugt eine Ausgabe, die für Protokollierung geeignet ist und "
  "Fortschrittsanzeiger weglässt. Mehr »q«s unterdrücken mehr Ausgaben, bis zu "
  "einem Maximum von 2. Sie können außerdem <option>-q=#</option> benutzen, um "
  "die Stillestufe zu setzen, was die Konfigurationsdatei überschreibt. "
  "Konfigurationselement: <literal>quiet</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>-i</option>"
- msgstr "<option>-i</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>--important</option>"
- msgstr "<option>--important</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:304
+ #: apt-cache.8.xml:276
  msgid ""
  "Print only important dependencies; for use with unmet and depends. Causes "
  "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
  "<literal>APT::Cache::Important</literal>."
  msgstr ""
- "Nur wichtige Abhängigkeiten ausgeben. Zur Benutzung mit unmet und depends. "
+ "nur wichtige Abhängigkeiten ausgeben. Zur Benutzung mit unmet und depends. "
  "Veranlasst, dass nur Depends- und Pre-Depends-Beziehungen ausgegeben werden. "
  "Konfigurationselement: <literal>APT::Cache::Important</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:309
- msgid "<option>--no-pre-depends</option>"
- msgstr "<option>--no-pre-depends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:310
- msgid "<option>--no-depends</option>"
- msgstr "<option>--no-depends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:311
- msgid "<option>--no-recommends</option>"
- msgstr "<option>--no-recommends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:312
- msgid "<option>--no-suggests</option>"
- msgstr "<option>--no-suggests</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:313
- msgid "<option>--no-conflicts</option>"
- msgstr "<option>--no-conflicts</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:314
- msgid "<option>--no-breaks</option>"
- msgstr "<option>--no-breaks</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:315
- msgid "<option>--no-replaces</option>"
- msgstr "<option>--no-replaces</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:316
- msgid "<option>--no-enhances</option>"
- msgstr "<option>--no-enhances</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:317
- #, fuzzy
- #| msgid ""
- #| "Per default the <literal>depends</literal> and <literal>rdepends</"
- #| "literal> print all dependencies. This can be tweaked with these flags "
- #| "which will omit the specified dependency type.  Configuration Item: "
- #| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
- #| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
+ #: apt-cache.8.xml:289
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
- "print all dependencies. This can be twicked with these flags which will omit "
+ "print all dependencies. This can be tweaked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
@@@ -1417,37 -1291,17 +1291,17 @@@ msgstr "
  "Show<replaceable>Abhängigkeitstyp</replaceable></literal> z.B. <literal>APT::"
  "Cache::ShowRecommends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
- msgid "<option>-f</option>"
- msgstr "<option>-f</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323
- msgid "<option>--full</option>"
- msgstr "<option>--full</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:324
+ #: apt-cache.8.xml:296
  msgid ""
  "Print full package records when searching.  Configuration Item: "
  "<literal>APT::Cache::ShowFull</literal>."
  msgstr ""
- "Gibt die vollständigen Paketdatensätze beim Suchen aus. "
+ "gibt die vollständigen Paketdatensätze beim Suchen aus. "
  "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:583
- msgid "<option>-a</option>"
- msgstr "<option>-a</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:328
- msgid "<option>--all-versions</option>"
- msgstr "<option>--all-versions</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:329
+ #: apt-cache.8.xml:301
  msgid ""
  "Print full records for all available versions. This is the default; to turn "
  "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@@ -1456,143 -1310,108 +1310,108 @@@
  "applicable to the <literal>show</literal> command.  Configuration Item: "
  "<literal>APT::Cache::AllVersions</literal>."
  msgstr ""
- "Gibt die vollständigen Datensätze für alle verfügbaren Versionen aus. Dies "
+ "gibt die vollständigen Datensätze für alle verfügbaren Versionen aus. Dies "
  "ist die Vorgabe. Um sie auszuschalten, benutzen Sie <option>--no-all-"
  "versions</option>. Wenn <option>--no-all-versions</option> angegeben ist, "
  "wird nur die Anwärterversion angezeigt (die, die zur Installation ausgewählt "
  "würde). Diese Option ist nur für den <literal>show</literal>-Befehl "
  "anwendbar. Konfigurationselement: <literal>APT::Cache::AllVersions</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>-g</option>"
- msgstr "<option>-g</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>--generate</option>"
- msgstr "<option>--generate</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:338
+ #: apt-cache.8.xml:310
  msgid ""
  "Perform automatic package cache regeneration, rather than use the cache as "
  "it is. This is the default; to turn it off, use <option>--no-generate</"
  "option>.  Configuration Item: <literal>APT::Cache::Generate</literal>."
  msgstr ""
- "Führt das Neuerstellen des Paketzwischenspeichers aus, anstatt den "
+ "führt das Neuerstellen des Paketzwischenspeichers aus, anstatt den "
  "Zwischenspeicher so zu benutzen, wie er ist. Das ist die Vorgabe. Um sie "
  "auszuschalten benutzen Sie <option>--no-generate</option>. "
  "Konfigurationselement: <literal>APT::Cache::Generate</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343
- msgid "<option>--names-only</option>"
- msgstr "<option>--names-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343 apt-cdrom.8.xml:142
- msgid "<option>-n</option>"
- msgstr "<option>-n</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:344
+ #: apt-cache.8.xml:316
  msgid ""
  "Only search on the package names, not the long descriptions.  Configuration "
  "Item: <literal>APT::Cache::NamesOnly</literal>."
  msgstr ""
- "Durchsucht nur die Paketnamen, nicht die Langbeschreibungen. "
+ "durchsucht nur die Paketnamen, nicht die Langbeschreibungen. "
  "Konfigurationselement: <literal>APT::Cache::NamesOnly</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:348
- msgid "<option>--all-names</option>"
- msgstr "<option>--all-names</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:349
+ #: apt-cache.8.xml:321
  msgid ""
  "Make <literal>pkgnames</literal> print all names, including virtual packages "
  "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
  "AllNames</literal>."
  msgstr ""
- "Lässt <literal>pkgnames</literal> alle Namen, einschließlich virtueller "
+ "lässt <literal>pkgnames</literal> alle Namen, einschließlich virtueller "
  "Pakete und fehlender Abhängigkeiten, ausgeben. Konfigurationselement: "
  "<literal>APT::Cache::AllNames</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:354
- msgid "<option>--recurse</option>"
- msgstr "<option>--recurse</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:355
+ #: apt-cache.8.xml:327
  msgid ""
  "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
  "that all packages mentioned are printed once.  Configuration Item: "
  "<literal>APT::Cache::RecurseDepends</literal>."
  msgstr ""
- "Macht <literal>depends</literal> und <literal>rdepends</literal> rekursiv, "
+ "macht <literal>depends</literal> und <literal>rdepends</literal> rekursiv, "
  "so dass alle erwähnten Pakete einmal ausgegeben werden. "
  "Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:360
- msgid "<option>--installed</option>"
- msgstr "<option>--installed</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:362
+ #: apt-cache.8.xml:334
  msgid ""
  "Limit the output of <literal>depends</literal> and <literal>rdepends</"
  "literal> to packages which are currently installed.  Configuration Item: "
  "<literal>APT::Cache::Installed</literal>."
  msgstr ""
- "Begrenzt die Ausgabe von <literal>depends</literal> und <literal>rdepends</"
+ "begrenzt die Ausgabe von <literal>depends</literal> und <literal>rdepends</"
  "literal> auf Pakete, die aktuell installiert sind. Konfigurationselement: "
  "<literal>APT::Cache::Installed</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
- #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
- #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+ #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
+ #: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+ #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
  msgid "&apt-commonoptions;"
  msgstr "&apt-commonoptions;"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
- #: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+ #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+ #: apt.conf.5.xml:1118 apt_preferences.5.xml:698
  msgid "Files"
  msgstr "Dateien"
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:374
+ #: apt-cache.8.xml:346
  msgid "&file-sourceslist; &file-statelists;"
  msgstr "&file-sourceslist; &file-statelists;"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
- #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
- #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
- #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
- #: sources.list.5.xml:234
+ #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+ #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+ #: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+ #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
+ #: sources.list.5.xml:255
  msgid "See Also"
  msgstr "Siehe auch"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:380
+ #: apt-cache.8.xml:352
  msgid "&apt-conf;, &sources-list;, &apt-get;"
  msgstr "&apt-conf;, &sources-list;, &apt-get;"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
- #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
- #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+ #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+ #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+ #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
  msgid "Diagnostics"
  msgstr "Diagnose"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:385
+ #: apt-cache.8.xml:357
  msgid ""
  "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -1600,42 -1419,13 +1419,13 @@@ msgstr "
  "<command>apt-cache</command> gibt bei normalen Operationen 0 zurück, dezimal "
  "100 bei Fehlern."
  
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cdrom.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "February 2004</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
- "<date>14. Februar 2004</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cdrom.8.xml:24 apt-cdrom.8.xml:31
- msgid "apt-cdrom"
- msgstr "apt-cdrom"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-cdrom.8.xml:32
  msgid "APT CDROM management utility"
  msgstr "APT-CDROM-Verwaltungswerkzeug"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cdrom.8.xml:38
- msgid ""
- "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
- "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
- "<arg>add</arg> <arg>ident</arg> </group>"
- msgstr ""
- "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
- "<arg><option>-d=<replaceable>CD-ROM-Einhängepunkt</replaceable></option></"
- "arg><arg><option>-o=<replaceable>Konfigurationszeichenkette</replaceable></"
- "option></arg><arg><option>-c=<replaceable>Datei</replaceable></option></"
- "arg><group><arg>hinzufügen</arg><arg>Identifikation</arg></group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:51
+ #: apt-cdrom.8.xml:38
  msgid ""
  "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
  "available sources. <command>apt-cdrom</command> takes care of determining "
@@@ -1648,7 -1438,7 +1438,7 @@@ msgstr "
  "mehrere mögliche Fehlbrennungen und prüft die Indexdateien."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:58
+ #: apt-cdrom.8.xml:45
  msgid ""
  "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
  "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@@ -1659,13 -1449,8 +1449,8 @@@ msgstr "
  "Medium in einer Zusammenstellung aus mehreren CDs einzeln eingelegt und "
  "gescannt werden, um auf mögliche Fehlbrennungen zu testen."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:68
- msgid "add"
- msgstr "add"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:69
+ #: apt-cdrom.8.xml:56
  msgid ""
  "<literal>add</literal> is used to add a new disc to the source list. It will "
  "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@@ -1680,7 -1465,7 +1465,7 @@@ msgstr "
  "Verzeichnis hat, werden Sie nach einem aussagekräftigen Titel gefragt."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:77
+ #: apt-cdrom.8.xml:64
  msgid ""
  "APT uses a CDROM ID to track which disc is currently in the drive and "
  "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@@ -1690,22 -1475,17 +1475,17 @@@ msgstr "
  "Laufwerk ist und verwaltet eine Datenbank mit diesen IDs in "
  "<filename>&statedir;/cdroms.list</filename>"
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:84
- msgid "ident"
- msgstr "ident"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:85
+ #: apt-cdrom.8.xml:72
  msgid ""
  "A debugging tool to report the identity of the current disc as well as the "
  "stored file name"
  msgstr ""
- "Ein Fehlersuchwerkzeug, um die Identität des aktuellen Mediums sowie den "
- "gespeicherten Dateinamen zu berichten."
+ "ein Fehlersuchwerkzeug, um die Identität des aktuellen Mediums sowie den "
+ "gespeicherten Dateinamen zu berichten"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:64
+ #: apt-cdrom.8.xml:51
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present.  <placeholder type=\"variablelist"
@@@ -1716,142 -1496,87 +1496,87 @@@ msgstr "
  "<placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cdrom.8.xml:94 apt-key.8.xml:158
+ #: apt-cdrom.8.xml:81 apt-key.8.xml:160
  msgid "Options"
  msgstr "Optionen"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
- msgid "<option>-d</option>"
- msgstr "<option>-d</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98
- msgid "<option>--cdrom</option>"
- msgstr "<option>--cdrom</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:99
+ #: apt-cdrom.8.xml:86
  msgid ""
  "Mount point; specify the location to mount the cdrom. This mount point must "
  "be listed in <filename>/etc/fstab</filename> and properly configured.  "
  "Configuration Item: <literal>Acquire::cdrom::mount</literal>."
  msgstr ""
- "Einhängepunkt. Gibt den Ort an, an dem die CD-ROM eingehängt wird. Dieser "
+ "Einhängepunkt; gibt den Ort an, an dem die CD-ROM eingehängt wird. Dieser "
  "Einhängepunkt muss in <filename>/etc/fstab</filename> eingetragen und "
  "angemessen konfiguriert sein. Konfigurationselement: <literal>Acquire::"
  "cdrom::mount</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>-r</option>"
- msgstr "<option>-r</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>--rename</option>"
- msgstr "<option>--rename</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:108
+ #: apt-cdrom.8.xml:95
  msgid ""
  "Rename a disc; change the label of a disk or override the disks given label. "
  "This option will cause <command>apt-cdrom</command> to prompt for a new "
  "label.  Configuration Item: <literal>APT::CDROM::Rename</literal>."
  msgstr ""
- "Ein Medium umbenennen. Ändert den Namen eines Mediums oder überschreibt den "
+ "ein Medium umbenennen. Ändert den Namen eines Mediums oder überschreibt den "
  "Namen, der dem Medium gegeben wurde. Diese Option wird <command>apt-cdrom</"
  "command> veranlassen, nach einem neuen Namen zu fragen. "
  "Konfigurationselement: <literal>APT::CDROM::Rename</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116 apt-get.8.xml:364
- msgid "<option>-m</option>"
- msgstr "<option>-m</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116
- msgid "<option>--no-mount</option>"
- msgstr "<option>--no-mount</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:117
+ #: apt-cdrom.8.xml:104
  msgid ""
  "No mounting; prevent <command>apt-cdrom</command> from mounting and "
  "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
  "NoMount</literal>."
  msgstr ""
- "Kein Einhängen. Hindert <command>apt-cdrom</command> am Ein- und Aushängen "
+ "kein Einhängen; hindert <command>apt-cdrom</command> am Ein- und Aushängen "
  "des Einhängepunkts. Konfigurationselement: <literal>APT::CDROM::NoMount</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:124
- msgid "<option>--fast</option>"
- msgstr "<option>--fast</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:125
+ #: apt-cdrom.8.xml:112
  msgid ""
  "Fast Copy; Assume the package files are valid and do not check every "
  "package. This option should be used only if <command>apt-cdrom</command> has "
  "been run on this disc before and did not detect any errors.  Configuration "
  "Item: <literal>APT::CDROM::Fast</literal>."
  msgstr ""
- "Schnelle Kopie. Unterstellt, dass die Paketdateien gültig sind und prüft "
+ "schnelle Kopie; unterstellt, dass die Paketdateien gültig sind und prüft "
  "nicht jedes Paket. Diese Option sollte nur benutzt werden, wenn <command>apt-"
  "cdrom</command> vorher für dieses Medium ausgeführt wurde und keine Fehler "
  "festgestellt hat. Konfigurationselement: <literal>APT::CDROM::Fast</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:134
- msgid "<option>--thorough</option>"
- msgstr "<option>--thorough</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:135
+ #: apt-cdrom.8.xml:122
  msgid ""
  "Thorough Package Scan; This option may be needed with some old Debian "
  "1.1/1.2 discs that have Package files in strange places. It takes much "
  "longer to scan the CD but will pick them all up."
  msgstr ""
- "Gründliche Paketdurchsuchung. Diese Option könnte für einige alte "
+ "gründliche Paketdurchsuchung. Diese Option könnte für einige alte "
  "Debian-1.1/1.2-Medien nötig sein, die Paketdateien an seltsamen Orten haben. "
  "Dies verlängert das Durchsuchen des Mediums deutlich, nimmt aber alle auf."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:143 apt-get.8.xml:395
- msgid "<option>--just-print</option>"
- msgstr "<option>--just-print</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:144 apt-get.8.xml:397
- msgid "<option>--recon</option>"
- msgstr "<option>--recon</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:145 apt-get.8.xml:398
- msgid "<option>--no-act</option>"
- msgstr "<option>--no-act</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:146
+ #: apt-cdrom.8.xml:133
  msgid ""
  "No Changes; Do not change the &sources-list; file and do not write index "
  "files. Everything is still checked however.  Configuration Item: "
  "<literal>APT::CDROM::NoAct</literal>."
  msgstr ""
- "Keine Änderungen. Die &sources-list;-Datei nicht ändern und keine "
+ "keine Änderungen. Die &sources-list;-Datei nicht ändern und keine "
  "Indexdateien schreiben. Alles wird jedoch immer noch geprüft. "
  "Konfigurationselement: <literal>APT::CDROM::NoAct</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:159
+ #: apt-cdrom.8.xml:146
  msgid "&apt-conf;, &apt-get;, &sources-list;"
  msgstr "&apt-conf;, &apt-get;, &sources-list;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:164
+ #: apt-cdrom.8.xml:151
  msgid ""
  "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -1859,42 -1584,13 +1584,13 @@@ msgstr "
  "<command>apt-cdrom</command> gibt bei normalen Operationen 0 zurück, dezimal "
  "100 bei Fehlern."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-config.8.xml:16 apt-extracttemplates.1.xml:16 apt-sortpkgs.1.xml:16
- #: sources.list.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
- "February 2004</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
- "<date>29. Februar 2004</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-config.8.xml:25 apt-config.8.xml:32
- msgid "apt-config"
- msgstr "apt-config"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-config.8.xml:33
  msgid "APT Configuration Query program"
  msgstr "APT-Konfigurationsabfrageprogramm"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-config.8.xml:39
- msgid ""
- "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>shell</arg> <arg>dump</arg> </group>"
- msgstr ""
- "<command>apt-config</command><arg><option>-hv</option></arg><arg><option>-"
- "o=<replaceable>Konfigurationszeichenkette</replaceable></option></"
- "arg><arg><option>-c=<replaceable>Datei</replaceable></option></arg><group "
- "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:51
+ #: apt-config.8.xml:39
  msgid ""
  "<command>apt-config</command> is an internal program used by various "
  "portions of the APT suite to provide consistent configurability. It accesses "
@@@ -1908,7 -1604,7 +1604,7 @@@ msgstr "
  "Anwendungen zu benutzen ist."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+ #: apt-config.8.xml:44 apt-ftparchive.1.xml:54
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present."
@@@ -1916,13 -1612,8 +1612,8 @@@ msgstr "
  "Außer, wenn die <option>-h</option>- oder <option>--help</option>-Option "
  "angegeben wurde, muss einer der Befehle unterhalb vorkommen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-config.8.xml:61
- msgid "shell"
- msgstr "shell"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:63
+ #: apt-config.8.xml:51
  msgid ""
  "shell is used to access the configuration information from a shell script. "
  "It is given pairs of arguments, the first being a shell variable and the "
@@@ -1937,7 -1628,7 +1628,7 @@@ msgstr "
  "auf. In einen Shellskript sollte es wie folgt benutzt werden:"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-config.8.xml:71
+ #: apt-config.8.xml:59
  #, no-wrap
  msgid ""
  "OPTS=\"-f\"\n"
@@@ -1949,7 -1640,7 +1640,7 @@@ msgstr "
  "eval $RES\n"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:76
+ #: apt-config.8.xml:64
  msgid ""
  "This will set the shell environment variable $OPTS to the value of MyApp::"
  "options with a default of <option>-f</option>."
@@@ -1958,7 -1649,7 +1649,7 @@@ msgstr "
  "mit einer Vorgabe von <option>-f</option> setzen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:80
+ #: apt-config.8.xml:68
  msgid ""
  "The configuration item may be postfixed with a /[fdbi]. f returns file "
  "names, d returns directories, b returns true or false and i returns an "
@@@ -1970,18 -1661,52 +1661,52 @@@ msgstr "
  "intern geprüft."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:89
+ #: apt-config.8.xml:77
  msgid "Just show the contents of the configuration space."
  msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
  
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:90
+ msgid ""
+ "Include options which have an empty value. This is the default, so use --no-"
+ "empty to remove them from the output."
+ msgstr ""
+ "schließt Optionen ein, die einen leeren Wert haben. Dies ist die Vorgabe, "
+ "benutzen Sie daher --no-empty, um sie aus der Ausgabe zu entfernen."
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-config.8.xml:95
+ msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
+ msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:96
+ msgid ""
+ "Defines the output of each config option. &percnt;t will be replaced with "
+ "the name of the option, &percnt;f with the complete optionname and &percnt;v "
+ "with the value of the option.  Use uppercase letters and special characters "
+ "in the value will be encoded to ensure that it can e.g. be savely used in a "
+ "quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
+ "by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
+ "&percnt;."
+ msgstr ""
+ "definiert die Ausgabe jeder Option. &percnt;t wird durch den Namen der "
+ "Option ersetzt, &percnt;f durch den kompletten Optionsnamen und &percnt;v "
+ "durch den Wert der Option. Benutzen Sie im Wert, der Kodiert wird, "
+ "großgeschriebene Buchstaben und Sonderzeichen, um sicherzustellen, dass er z."
+ "B. in einer maskierten Zeichenkette, wie sie RFC822 definiert, sicher "
+ "verwandt werden kann. &percnt;n wird zusätzlich durch einen Zeilenumbruch "
+ "ersetzt, &percnt;N durch einen Tabulator. Ein &percnt; kann mittels &percnt;"
+ "&percnt; ausgegeben werden."
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
- #: apt-sortpkgs.1.xml:73
+ #: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
+ #: apt-sortpkgs.1.xml:64
  msgid "&apt-conf;"
  msgstr "&apt-conf;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:112
+ #: apt-config.8.xml:115
  msgid ""
  "<command>apt-config</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -1989,11 -1714,6 +1714,6 @@@ msgstr "
  "<command>apt-config</command> gibt bei normalen Operationen 0 zurück, "
  "dezimal 100 bei Fehlern."
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-extracttemplates.1.xml:25 apt-extracttemplates.1.xml:32
- msgid "apt-extracttemplates"
- msgstr "apt-extracttemplates"
- 
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
  msgid "1"
@@@ -2006,21 -1726,8 +1726,8 @@@ msgstr "
  "Hilfsprogramm zum Extrahieren der DebConf-Konfiguration und Schablonen von "
  "Debian-Paketen"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-extracttemplates.1.xml:39
- msgid ""
- "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
- "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
- "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
- "arg>"
- msgstr ""
- "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
- "<arg><option>-t=<replaceable>temporäres Verzeichnis</replaceable></option></"
- "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>Datei</replaceable></"
- "arg>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:47
+ #: apt-extracttemplates.1.xml:39
  msgid ""
  "<command>apt-extracttemplates</command> will take one or more Debian package "
  "files as input and write out (to a temporary directory) all associated "
@@@ -2036,47 -1743,38 +1743,38 @@@ msgstr "
  "generiert:"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:52
+ #: apt-extracttemplates.1.xml:44
  msgid "package version template-file config-script"
  msgstr "Paket Version Schablonendatei Konfigurationsskript"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:53
+ #: apt-extracttemplates.1.xml:45
  msgid ""
  "template-file and config-script are written to the temporary directory "
- "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
- "literal>)  directory, with filenames of the form <filename>package.template."
- "XXXX</filename> and <filename>package.config.XXXX</filename>"
+ "specified by the <option>-t</option> or <option>--tempdir</option> "
+ "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+ "filenames of the form <filename>package.template.XXXX</filename> and "
+ "<filename>package.config.XXXX</filename>"
  msgstr ""
  "Schablonendatei und Konfigurationsskript werden in das temporäre Verzeichnis "
- "geschrieben, das durch »-t« oder »--tempdir« (<literal>APT::"
- "ExtractTemplates::TempDir</literal>) Verzeichnis mit Dateinamen der Form "
- "<filename>package. template.XXXX</filename> und <filename>package.config."
- "XXXX</filename> angegeben wurde"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
- msgid "<option>-t</option>"
- msgstr "<option>-t</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63
- msgid "<option>--tempdir</option>"
- msgstr "<option>--tempdir</option>"
+ "geschrieben, das durch das Verzeichnis <option>-t</option> oder <option>--"
+ "tempdir</option> (<literal>APT::ExtractTemplates::TempDir</literal>) mit "
+ "Dateinamen der Form <filename>package. template.XXXX</filename> und "
+ "<filename>package.config.XXXX</filename> angegeben wurde."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-extracttemplates.1.xml:65
+ #: apt-extracttemplates.1.xml:58
  msgid ""
  "Temporary directory in which to write extracted debconf template files and "
  "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
  "TempDir</literal>"
  msgstr ""
- "Temporäres Verzeichnis, in das die extrahierten DebConf-Schablonendateien "
+ "temporäres Verzeichnis, in das die extrahierten DebConf-Schablonendateien "
  "und Konfigurationsdateien geschrieben werden. Konfigurationselement: "
  "<literal>APT::ExtractTemplates::TempDir</literal>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:82
+ #: apt-extracttemplates.1.xml:75
  msgid ""
  "<command>apt-extracttemplates</command> returns zero on normal operation, "
  "decimal 100 on error."
@@@ -2084,71 -1782,13 +1782,13 @@@ msgstr "
  "<command>apt-extracttemplates</command> gibt bei normalen Operationen 0 "
  "zurück, dezimal 100 bei Fehlern."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-ftparchive.1.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
- "August 2009</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
- "<date>17. August 2009</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-ftparchive.1.xml:25 apt-ftparchive.1.xml:32
- msgid "apt-ftparchive"
- msgstr "apt-ftparchive"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-ftparchive.1.xml:33
  msgid "Utility to generate index files"
  msgstr "Hilfsprogramm zum Generieren von Indexdateien"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-ftparchive.1.xml:39
- msgid ""
- "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
- "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
- "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
- "arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
- "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
- "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
- "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
- "replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
- "arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
- "arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
- "replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
- "\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
- msgstr ""
- "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
- "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
- "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
- "arg> <arg><option>--arch <replaceable>Architektur</replaceable></option></"
- "arg> <arg><option>-o <replaceable>Konfiguration</"
- "replaceable>=<replaceable>Zeichenkette</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group "
- "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>Pfad</replaceable></arg><arg><replaceable>überschreiben</"
- "replaceable><arg><replaceable>Pfad-Präfix</replaceable></arg></arg></arg> "
- "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>Pfad</"
- "replaceable></arg><arg><replaceable>überschreiben</"
- "replaceable><arg><replaceable>Pfad-Präfix</replaceable></arg></arg></arg> "
- "<arg>contents <arg choice=\"plain\"><replaceable>Pfad</replaceable></arg></"
- "arg> <arg>release <arg choice=\"plain\"><replaceable>Pfad</replaceable></"
- "arg></arg> <arg>generate <arg choice=\"plain"
- "\"><replaceable>Konfigurationsdatei</replaceable></arg> <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>Abschnitt</replaceable></arg></arg> "
- "<arg>clean <arg choice=\"plain\"><replaceable>Konfigurationsdatei</"
- "replaceable></arg></arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:60
+ #: apt-ftparchive.1.xml:39
  msgid ""
  "<command>apt-ftparchive</command> is the command line tool that generates "
  "the index files that APT uses to access a distribution source. The index "
@@@ -2161,7 -1801,7 +1801,7 @@@ msgstr "
  "Inhalts dieser Stelle generiert werden."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:64
+ #: apt-ftparchive.1.xml:43
  msgid ""
  "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
  "program, incorporating its entire functionality via the <literal>packages</"
@@@ -2175,7 -1815,7 +1815,7 @@@ msgstr "
  "für ein komplettes Archiv zu »skripten«."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:70
+ #: apt-ftparchive.1.xml:49
  msgid ""
  "Internally <command>apt-ftparchive</command> can make use of binary "
  "databases to cache the contents of a .deb file and it does not rely on any "
@@@ -2190,13 -1830,8 +1830,8 @@@ msgstr "
  "Dateiänderungsprüfungen durchgeführt und die gewünschten gepackten "
  "Ausgabedateien erzeugt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:79
- msgid "packages"
- msgstr "packages"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:81
+ #: apt-ftparchive.1.xml:60
  msgid ""
  "The packages command generates a package file from a directory tree. It "
  "takes the given directory and recursively searches it for .deb files, "
@@@ -2209,20 -1844,15 +1844,15 @@@ msgstr "
  "Befehl entspricht etwa &dpkg-scanpackages;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+ #: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
  msgid ""
  "The option <option>--db</option> can be used to specify a binary caching DB."
  msgstr ""
  "Die Option <option>--db</option> kann benutzt werden, um eine Datenbank zum "
  "Zwischenspeichern von Programmen anzugeben."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:89
- msgid "sources"
- msgstr "sources"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:91
+ #: apt-ftparchive.1.xml:70
  msgid ""
  "The <literal>sources</literal> command generates a source index file from a "
  "directory tree.  It takes the given directory and recursively searches it "
@@@ -2235,7 -1865,7 +1865,7 @@@ msgstr "
  "stdout ausgibt. Dieser Befehl entspricht etwa &dpkg-scansources;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:96
+ #: apt-ftparchive.1.xml:75
  msgid ""
  "If an override file is specified then a source override file will be looked "
  "for with an extension of .src. The --source-override option can be used to "
@@@ -2246,13 -1876,8 +1876,8 @@@ msgstr "
  "kann benutzt werden, um die Quellen-Override-Datei, die benutzt wird, zu "
  "ändern."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:101
- msgid "contents"
- msgstr "contents"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:103
+ #: apt-ftparchive.1.xml:82
  msgid ""
  "The <literal>contents</literal> command generates a contents file from a "
  "directory tree. It takes the given directory and recursively searches it "
@@@ -2269,13 -1894,8 +1894,8 @@@ msgstr "
  "die gleiche Datei besitzen, dann befindet sich jedes Paket durch Komma "
  "getrennt in der Ausgabe."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:113
- msgid "release"
- msgstr "release"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:115
+ #: apt-ftparchive.1.xml:94
  msgid ""
  "The <literal>release</literal> command generates a Release file from a "
  "directory tree. It recursively searches the given directory for uncompressed "
@@@ -2302,7 -1922,7 +1922,7 @@@ msgstr "
  "enthält."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:125
+ #: apt-ftparchive.1.xml:104
  msgid ""
  "Values for the additional metadata fields in the Release file are taken from "
  "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@@ -2322,13 -1942,8 +1942,8 @@@ msgstr "
  "literal>, <literal>Architectures</literal>, <literal>Components</literal>, "
  "<literal>Description</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:136
- msgid "generate"
- msgstr "generate"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:138
+ #: apt-ftparchive.1.xml:117
  msgid ""
  "The <literal>generate</literal> command is designed to be runnable from a "
  "cron script and builds indexes according to the given config file. The "
@@@ -2343,13 -1958,8 +1958,8 @@@ msgstr "
  "Verzeichnissen gebildet wurden, ebenso wie sie eine einfache Möglichkeit zur "
  "Verwaltung der erforderlichen Einstellungen bereitstellt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:145 apt-get.8.xml:287
- msgid "clean"
- msgstr "clean"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:147
+ #: apt-ftparchive.1.xml:126
  msgid ""
  "The <literal>clean</literal> command tidies the databases used by the given "
  "configuration file by removing any records that are no longer necessary."
@@@ -2359,12 -1969,12 +1969,12 @@@ msgstr "
  "Datensätze entfernt."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:153
+ #: apt-ftparchive.1.xml:132
  msgid "The Generate Configuration"
  msgstr "Die Generate-Konfiguration"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:155
+ #: apt-ftparchive.1.xml:134
  msgid ""
  "The <literal>generate</literal> command uses a configuration file to "
  "describe the archives that are going to be generated. It follows the typical "
@@@ -2382,7 -1992,7 +1992,7 @@@ msgstr "
  "wenn die Markierung »scope« behandelt wird."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:163
+ #: apt-ftparchive.1.xml:142
  msgid ""
  "The generate configuration has 4 separate sections, each described below."
  msgstr ""
@@@ -2390,12 -2000,12 +2000,12 @@@
  "unterhalb beschrieben"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:165
+ #: apt-ftparchive.1.xml:144
  msgid "Dir Section"
  msgstr "Dir-Abschnitt"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:167
+ #: apt-ftparchive.1.xml:146
  msgid ""
  "The <literal>Dir</literal> section defines the standard directories needed "
  "to locate the files required during the generation process. These "
@@@ -2408,63 -2018,43 +2018,43 @@@ msgstr "
  "späteren Abschnitten definiert werden, vorangestellt, um einen vollständigen "
  "absoluten Pfad zu bilden."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:172
- msgid "ArchiveDir"
- msgstr "ArchiveDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:174
+ #: apt-ftparchive.1.xml:153
  msgid ""
  "Specifies the root of the FTP archive, in a standard Debian configuration "
  "this is the directory that contains the <filename>ls-LR</filename> and dist "
  "nodes."
  msgstr ""
- "Gibt die Wurzel des FTP-Archivs an. In einer Debian-Standardkonfiguration "
+ "gibt die Wurzel des FTP-Archivs an. In einer Debian-Standardkonfiguration "
  "ist das das Verzeichnis, das die <filename>ls-LR</filename>- und dist-Knoten "
  "enthält."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:179
- msgid "OverrideDir"
- msgstr "OverrideDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:181
+ #: apt-ftparchive.1.xml:160
  msgid "Specifies the location of the override files."
- msgstr "Gibt den Ort der Override-Dateien an"
- 
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:184
- msgid "CacheDir"
- msgstr "CacheDir"
+ msgstr "gibt den Ort der Override-Dateien an"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:186
+ #: apt-ftparchive.1.xml:165
  msgid "Specifies the location of the cache files"
- msgstr "Gibt den Ort der Zwischenspeicherdateien an"
- 
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:189
- msgid "FileListDir"
- msgstr "FileListDir"
+ msgstr "gibt den Ort der Zwischenspeicherdateien an"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:191
+ #: apt-ftparchive.1.xml:170
  msgid ""
  "Specifies the location of the file list files, if the <literal>FileList</"
  "literal> setting is used below."
  msgstr ""
- "Gibt den Ort der Dateilistendateien an, wenn die <literal>FileList</literal> "
+ "gibt den Ort der Dateilistendateien an, wenn die <literal>FileList</literal> "
  "unterhalb gesetzt ist."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:197
+ #: apt-ftparchive.1.xml:176
  msgid "Default Section"
- msgstr "Vorgabe-Abschnitt"
+ msgstr "Default-Abschnitt"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:199
+ #: apt-ftparchive.1.xml:178
  msgid ""
  "The <literal>Default</literal> section specifies default values, and "
  "settings that control the operation of the generator. Other sections may "
@@@ -2474,46 -2064,31 +2064,31 @@@ msgstr "
  "Einstellungen, die den Betrieb des Generators steuern. Andere Abschnitte "
  "können diese Vorgaben mit einer Einstellung pro Abschnitt überschreiben."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:203
- msgid "Packages::Compress"
- msgstr "Packages::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:205
+ #: apt-ftparchive.1.xml:184
  msgid ""
  "Sets the default compression schemes to use for the Package index files. It "
  "is a string that contains a space separated list of at least one of: '.' (no "
  "compression), 'gzip' and 'bzip2'. The default for all compression schemes is "
  "'. gzip'."
  msgstr ""
- "Setzt das Vorgabe-Kompressionsschema, das für die Package-Indexdateien "
+ "setzt das Vorgabe-Kompressionsschema, das für die Package-Indexdateien "
  "benutzt wird. Es ist eine Zeichenkette, die eine durch Leerzeichen getrennte "
  "Liste mit mindestens einem der folgenden Dinge enthält: ».« (keine "
  "Kompression), »gzip« und »bzip2«. Die Vorgabe für alle Kompressionsschemata "
  "ist ». gzip«."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:211
- msgid "Packages::Extensions"
- msgstr "Packages::Extensions"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:213
+ #: apt-ftparchive.1.xml:192
  msgid ""
  "Sets the default list of file extensions that are package files.  This "
  "defaults to '.deb'."
  msgstr ""
- "Setzt die Vorgabeliste von Dateierweiterungen, die Paketdateien sind. "
+ "setzt die Vorgabeliste von Dateierweiterungen, die Paketdateien sind. "
  "Vorgabe ist ».deb«."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:217
- msgid "Sources::Compress"
- msgstr "Sources::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:219
+ #: apt-ftparchive.1.xml:198
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Sources files."
@@@ -2521,27 -2096,17 +2096,17 @@@ msgstr "
  "Dies ist <literal>Packages::Compress</literal> ähnlich, außer dass es die "
  "Kompression der Quelldateien steuert."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:223
- msgid "Sources::Extensions"
- msgstr "Sources::Extensions"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:225
+ #: apt-ftparchive.1.xml:204
  msgid ""
  "Sets the default list of file extensions that are source files.  This "
  "defaults to '.dsc'."
  msgstr ""
- "Setzt die Vorgabeliste von Dateierweiterungen, die Quelldateien sind. "
+ "setzt die Vorgabeliste von Dateierweiterungen, die Quelldateien sind. "
  "Vorgabe ist ».dsc«."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:229
- msgid "Contents::Compress"
- msgstr "Contents::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:231
+ #: apt-ftparchive.1.xml:210
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Contents files."
@@@ -2549,13 -2114,8 +2114,8 @@@ msgstr "
  "Dies ist <literal>Packages::Compress</literal> ähnlich, außer dass es die "
  "Kompression der Inhaltsdateien steuert."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:235
- msgid "Translation::Compress"
- msgstr "Translation::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:237
+ #: apt-ftparchive.1.xml:216
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Translation-en master file."
@@@ -2563,89 -2123,64 +2123,64 @@@ msgstr "
  "Dies ist <literal>Packages::Compress</literal> ähnlich, außer dass es die "
  "Kompression der Translation-en-Hauptdatei steuert."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:241
- msgid "DeLinkLimit"
- msgstr "DeLinkLimit"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:243
+ #: apt-ftparchive.1.xml:222
  msgid ""
  "Specifies the number of kilobytes to delink (and replace with hard links) "
  "per run. This is used in conjunction with the per-section <literal>External-"
  "Links</literal> setting."
  msgstr ""
- "Gibt die Anzahl von Kilobytes an, die pro Durchlauf delinkt (und durch "
+ "gibt die Anzahl von Kilobytes an, die pro Durchlauf delinkt (und durch "
  "Hardlinks ersetzt) werden sollen. Dies wird in Verbindung mit der "
  "<literal>External-Links</literal>-Einstellung pro Abschnitt benutzt."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:248
- msgid "FileMode"
- msgstr "FileMode"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:250
+ #: apt-ftparchive.1.xml:229
  msgid ""
  "Specifies the mode of all created index files. It defaults to 0644. All "
  "index files are set to this mode with no regard to the umask."
  msgstr ""
- "Gibt die Rechte für alle erstellten Indexdateien an. Vorgabe ist 0644. Alle "
+ "gibt die Rechte für alle erstellten Indexdateien an. Vorgabe ist 0644. Alle "
  "Indexdateien werden ohne Beachtung von umask auf diese Rechte gesetzt."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
- msgid "LongDescription"
- msgstr "LongDescription"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+ #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
  msgid ""
  "Sets if long descriptions should be included in the Packages file or split "
  "out into a master Translation-en file."
  msgstr ""
- "Gesetzt, falls lange Beschreibungen in die Package-Datei eingeschlossen "
- "werden oder in eine Translation-en-Hauptdatei unterteilt werden sollen."
+ "gesetzt, falls lange Beschreibungen in die Package-Datei eingeschlossen "
+ "werden oder in eine Translation-en-Hauptdatei unterteilt werden sollen"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:263
+ #: apt-ftparchive.1.xml:242
  msgid "TreeDefault Section"
  msgstr "TreeDefault-Abschnitt"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:265
+ #: apt-ftparchive.1.xml:244
  msgid ""
  "Sets defaults specific to <literal>Tree</literal> sections. All of these "
  "variables are substitution variables and have the strings $(DIST), "
  "$(SECTION) and $(ARCH) replaced with their respective values."
  msgstr ""
- "Setzt Vorgaben speziell für <literal>Tree</literal>-Abschnitte. All diese "
+ "setzt Vorgaben speziell für <literal>Tree</literal>-Abschnitte. All diese "
  "Variablen sind Platzhaltervariablen und haben die Zeichenketten $(DIST), "
  "$(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:270
- msgid "MaxContentsChange"
- msgstr "MaxContentsChange"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:272
+ #: apt-ftparchive.1.xml:251
  msgid ""
  "Sets the number of kilobytes of contents files that are generated each day. "
  "The contents files are round-robined so that over several days they will all "
  "be rebuilt."
  msgstr ""
- "Setzt die Anzahl der Kilobytes der Inhaltdateien, die jeden Tag generiert "
+ "setzt die Anzahl der Kilobytes der Inhaltdateien, die jeden Tag generiert "
  "werden. Die Inhaltdateien werden reihum ersetzt, so dass sie über mehrere "
  "Tage alle neu gebildet werden."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:277
- msgid "ContentsAge"
- msgstr "ContentsAge"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:279
+ #: apt-ftparchive.1.xml:258
  msgid ""
  "Controls the number of days a contents file is allowed to be checked without "
  "changing. If this limit is passed the mtime of the contents file is updated. "
@@@ -2654,7 -2189,7 +2189,7 @@@
  "is allowed in hopes that new .debs will be installed, requiring a new file "
  "anyhow. The default is 10, the units are in days."
  msgstr ""
- "Steuert die Anzahl der Tage, die eine Inhaltsdatei erlaubt ist ohne Änderung "
+ "steuert die Anzahl der Tage, die eine Inhaltsdatei erlaubt ist ohne Änderung "
  "geprüft zu werden. Wenn die Grenze überschritten ist, wird die mtime der "
  "Inhaltsdatei aktualisiert. Dieser Fall kann auftreten, wenn die Package-"
  "Datei auf einem Weg geändert wurde, der nicht in einer neuen Inhaltsdatei "
@@@ -2662,178 -2197,123 +2197,123 @@@
  "erlaubt, in der Hoffnung dass neue .debs installiert werden, die sowieso "
  "eine neue Datei benötigen. Die Vorgabe ist 10, die Einheiten sind Tage."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:288
- msgid "Directory"
- msgstr "Directory"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:290
+ #: apt-ftparchive.1.xml:269
  msgid ""
  "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
  "$(SECTION)/binary-$(ARCH)/</filename>"
  msgstr ""
- "Setzt den Beginn des .deb-Verzeichnisbaumes. Vorgabe ist <filename>$(DIST)/"
+ "setzt den Beginn des .deb-Verzeichnisbaumes. Vorgabe ist <filename>$(DIST)/"
  "$(SECTION)/binary-$(ARCH)/</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:294
- msgid "SrcDirectory"
- msgstr "SrcDirectory"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:296
+ #: apt-ftparchive.1.xml:275
  msgid ""
  "Sets the top of the source package directory tree. Defaults to <filename>"
  "$(DIST)/$(SECTION)/source/</filename>"
  msgstr ""
- "Setzt den Beginn des Quellpaketverzeichnisbaumes. Vorgabe ist <filename>"
+ "setzt den Beginn des Quellpaketverzeichnisbaumes. Vorgabe ist <filename>"
  "$(DIST)/$(SECTION)/source/</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
- msgid "Packages"
- msgstr "Packages"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:302
+ #: apt-ftparchive.1.xml:281
  msgid ""
  "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "binary-$(ARCH)/Packages</filename>"
  msgstr ""
- "Setzt die Ausgabe-Packages-Datei. Vorgabe ist <filename>$(DIST)/$(SECTION)/"
+ "setzt die Ausgabe-Packages-Datei. Vorgabe ist <filename>$(DIST)/$(SECTION)/"
  "binary-$(ARCH)/Packages</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
- msgid "Sources"
- msgstr "Sources"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:308
+ #: apt-ftparchive.1.xml:287
  msgid ""
  "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "source/Sources</filename>"
  msgstr ""
- "Setzt die Ausgabe-Quelldatei. Vorgabe ist <filename>$(DIST)/$(SECTION)/"
+ "setzt die Ausgabe-Quelldatei. Vorgabe ist <filename>$(DIST)/$(SECTION)/"
  "source/Sources</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:312
- msgid "Translation"
- msgstr "Übersetzung"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:314
+ #: apt-ftparchive.1.xml:293
  msgid ""
  "Set the output Translation-en master file with the long descriptions if they "
  "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
  "$(SECTION)/i18n/Translation-en</filename>"
  msgstr ""
- "Setzt die Ausgabe der Translation-en-Hauptdatei mit den langen "
+ "setzt die Ausgabe der Translation-en-Hauptdatei mit den langen "
  "Beschreibungen falls Sie nicht in der Packages-Datei enthalten sind. Vorgabe "
  "ist <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:319
- msgid "InternalPrefix"
- msgstr "InternalPrefix"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:321
+ #: apt-ftparchive.1.xml:300
  msgid ""
  "Sets the path prefix that causes a symlink to be considered an internal link "
  "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
  "filename>"
  msgstr ""
- "Setzt die Pfad-Präfix, die bewirkt, dass ein symbolischer Verweis wie ein "
+ "setzt die Pfad-Präfix, die bewirkt, dass ein symbolischer Verweis wie ein "
  "interner anstatt wie ein externer Verweis behandelt wird. Vorgabe ist "
  "<filename>$(DIST)/$(SECTION)/</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
- msgid "Contents"
- msgstr "Contents"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:328
+ #: apt-ftparchive.1.xml:307
  msgid ""
  "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
  "</filename>. If this setting causes multiple Packages files to map onto a "
  "single Contents file (such as the default)  then <command>apt-ftparchive</"
  "command> will integrate those package files together automatically."
  msgstr ""
- "Setzt die Ausgabe-Contens-Datei. Vorgabe ist <filename>$(DIST)/Contents-"
+ "setzt die Ausgabe-Contens-Datei. Vorgabe ist <filename>$(DIST)/Contents-"
  "$(ARCH)</filename>. Wenn diese Einstellung bewirkt, dass mehrere Packages-"
  "Dateien auf einer einzelnen Inhaltsdatei abgebildet werden (so wie es "
  "Vorgabe ist), dann wird <command>apt-ftparchive</command> diese Dateien "
  "automatisch integrieren."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:335
- msgid "Contents::Header"
- msgstr "Contents::Header"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:337
+ #: apt-ftparchive.1.xml:316
  msgid "Sets header file to prepend to the contents output."
- msgstr "Setzt die Kopfdatendatei, um sie der Inhaltsausgabe voranzustellen."
- 
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
- msgid "BinCacheDB"
- msgstr "BinCacheDB"
+ msgstr "setzt die Kopfdatendatei, um sie der Inhaltsausgabe voranzustellen."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:342
+ #: apt-ftparchive.1.xml:321
  msgid ""
  "Sets the binary cache database to use for this section. Multiple sections "
  "can share the same database."
  msgstr ""
- "Setzt die Programmzwischenspeicherdatenbank zur Benutzung in diesem "
+ "setzt die Programmzwischenspeicherdatenbank zur Benutzung in diesem "
  "Abschnitt. Mehrere Abschnitte können sich die gleiche Datenbank teilen."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:346
- msgid "FileList"
- msgstr "FileList"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:348
+ #: apt-ftparchive.1.xml:327
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
  "Relative files names are prefixed with the archive directory."
  msgstr ""
- "Gibt an, dass <command>apt-ftparchive</command> die Liste der Dateien aus "
+ "gibt an, dass <command>apt-ftparchive</command> die Liste der Dateien aus "
  "der vorgegebenen Datei liest, anstatt den Verzeichnisbaum zu durchlaufen. "
  "Relativen Dateinamen wird das Archivverzeichnis vorangestellt."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:353
- msgid "SourceFileList"
- msgstr "SourceFileList"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:355
+ #: apt-ftparchive.1.xml:334
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
  "Relative files names are prefixed with the archive directory.  This is used "
  "when processing source indexes."
  msgstr ""
- "Gibt an, dass <command>apt-ftparchive</command> die Liste der Dateien aus "
+ "gibt an, dass <command>apt-ftparchive</command> die Liste der Dateien aus "
  "der vorgegebenen Datei liest, anstatt den Verzeichnisbaum zu durchlaufen. "
  "Relativen Dateinamen wird das Archivverzeichnis vorangestellt. Dies wird "
  "benutzt, wenn Quellindizes verarbeitet werden."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:363
+ #: apt-ftparchive.1.xml:342
  msgid "Tree Section"
  msgstr "Tree-Abschnitt"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:365
+ #: apt-ftparchive.1.xml:344
  msgid ""
  "The <literal>Tree</literal> section defines a standard Debian file tree "
  "which consists of a base directory, then multiple sections in that base "
@@@ -2848,7 -2328,7 +2328,7 @@@ msgstr "
  "<literal>Directory</literal>-Ersetzungsvariable definiert."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:370
+ #: apt-ftparchive.1.xml:349
  msgid ""
  "The <literal>Tree</literal> section takes a scope tag which sets the "
  "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@@ -2862,7 -2342,7 +2342,7 @@@ msgstr "
  "codename;</filename>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:375
+ #: apt-ftparchive.1.xml:354
  msgid ""
  "All of the settings defined in the <literal>TreeDefault</literal> section "
  "can be use in a <literal>Tree</literal> section as well as three new "
@@@ -2873,7 -2353,7 +2353,7 @@@ msgstr "
  "Variablen benutzt werden."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt-ftparchive.1.xml:381
+ #: apt-ftparchive.1.xml:360
  #, no-wrap
  msgid ""
  "for i in Sections do \n"
@@@ -2887,7 -2367,7 +2367,7 @@@ msgstr "
  "     "
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:378
+ #: apt-ftparchive.1.xml:357
  msgid ""
  "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
  "command> performs an operation similar to: <placeholder type=\"programlisting"
@@@ -2897,13 -2377,8 +2377,8 @@@ msgstr "
  "<command>apt-ftparchive</command> eine Operation aus, die folgender ähnelt:"
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:387
- msgid "Sections"
- msgstr "Abschnitte"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:389
+ #: apt-ftparchive.1.xml:368
  msgid ""
  "This is a space separated list of sections which appear under the "
  "distribution, typically this is something like <literal>main contrib non-"
@@@ -2913,13 -2388,8 +2388,8 @@@ msgstr "
  "der Distribution erscheint, typischerweise etwas wie <literal>main contrib "
  "non-free</literal>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:394
- msgid "Architectures"
- msgstr "Architekturen"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:396
+ #: apt-ftparchive.1.xml:375
  msgid ""
  "This is a space separated list of all the architectures that appear under "
  "search section. The special architecture 'source' is used to indicate that "
@@@ -2929,61 -2399,42 +2399,42 @@@ msgstr "
  "unter dem Suchabschnitt erscheinen. Die spezielle Architektur »source« wird "
  "benutzt, um anzugeben, dass dieser Baum ein Quellarchiv besitzt."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
- msgid "BinOverride"
- msgstr "BinOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:409
+ #: apt-ftparchive.1.xml:388
  msgid ""
  "Sets the binary override file. The override file contains section, priority "
  "and maintainer address information."
  msgstr ""
- "Setzt die Programm-Override-Datei. Die Override-Datei enthält Abschnitt, "
+ "setzt die Programm-Override-Datei. Die Override-Datei enthält Abschnitt, "
  "Priorität und Adressinformationen des Betreuers."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
- msgid "SrcOverride"
- msgstr "SrcOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:415
+ #: apt-ftparchive.1.xml:394
  msgid ""
  "Sets the source override file. The override file contains section "
  "information."
  msgstr ""
- "Setzt die Quell-Override-Datei. Die Override-Datei enthält "
+ "setzt die Quell-Override-Datei. Die Override-Datei enthält "
  "Abschnittsinformationen."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
- msgid "ExtraOverride"
- msgstr "ExtraOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+ #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
  msgid "Sets the binary extra override file."
- msgstr "Setzt die zusätzliche Programm-Override-Datei."
- 
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
- msgid "SrcExtraOverride"
- msgstr "SrcExtraOverride"
+ msgstr "setzt die zusätzliche Programm-Override-Datei"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+ #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
  msgid "Sets the source extra override file."
- msgstr "Setzt die zusätzliche Quell-Override-Datei."
+ msgstr "setzt die zusätzliche Quell-Override-Datei"
  
+ # FIXME <literal>?
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:431
+ #: apt-ftparchive.1.xml:410
  msgid "BinDirectory Section"
  msgstr "BinDirectory-Abschnitt"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:433
+ #: apt-ftparchive.1.xml:412
  msgid ""
  "The <literal>bindirectory</literal> section defines a binary directory tree "
  "with no special structure. The scope tag specifies the location of the "
@@@ -2998,66 -2449,56 +2449,56 @@@ msgstr "
  "<literal>Abschnitt</literal><literal>Architektur</literal> ähnlich."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:441
+ #: apt-ftparchive.1.xml:420
  msgid "Sets the Packages file output."
- msgstr "Setzt die Packages-Dateiausgabe."
+ msgstr "setzt die Packages-Dateiausgabe"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:446
+ #: apt-ftparchive.1.xml:425
  msgid ""
  "Sets the Sources file output. At least one of <literal>Packages</literal> or "
  "<literal>Sources</literal> is required."
  msgstr ""
- "Setzt die Sources-Dateiausgabe. Entweder <literal>Packages</literal> oder "
+ "setzt die Sources-Dateiausgabe. Entweder <literal>Packages</literal> oder "
  "<literal>Sources</literal> ist erforderlich."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:452
+ #: apt-ftparchive.1.xml:431
  msgid "Sets the Contents file output. (optional)"
- msgstr "Setzt die Contents-Dateiausgabe. (optional)"
+ msgstr "setzt die Contents-Dateiausgabe (optional)"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:457
+ #: apt-ftparchive.1.xml:436
  msgid "Sets the binary override file."
- msgstr "Setzt die Programm-Override-Datei."
+ msgstr "setzt die Programm-Override-Datei"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:462
+ #: apt-ftparchive.1.xml:441
  msgid "Sets the source override file."
- msgstr "Setzt die Quell-Override-Datei."
+ msgstr "setzt die Quell-Override-Datei"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:477
+ #: apt-ftparchive.1.xml:456
  msgid "Sets the cache DB."
- msgstr "Setzt die Zwischenspeicherdatenbank."
- 
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:480
- msgid "PathPrefix"
- msgstr "PathPrefix"
+ msgstr "setzt die Zwischenspeicherdatenbank"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:482
+ #: apt-ftparchive.1.xml:461
  msgid "Appends a path to all the output paths."
- msgstr "Hängt einen Pfad an alle Ausgabepfade an."
- 
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:485
- msgid "FileList, SourceFileList"
- msgstr "FileList, SourceFileList"
+ msgstr "hängt einen Pfad an alle Ausgabepfade an"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:487
+ #: apt-ftparchive.1.xml:466
  msgid "Specifies the file list file."
- msgstr "Gibt die Dateilistendatei an."
+ msgstr "gibt die Dateilistendatei an"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:494
+ #: apt-ftparchive.1.xml:473
  msgid "The Binary Override File"
- msgstr "Die Programm-Override-Datei "
+ msgstr "Die Programm-Override-Datei"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:495
+ #: apt-ftparchive.1.xml:474
  msgid ""
  "The binary override file is fully compatible with &dpkg-scanpackages;. It "
  "contains 4 fields separated by spaces. The first field is the package name, "
@@@ -3072,19 -2513,19 +2513,19 @@@ msgstr "
  "und das letzte Feld ist das Betreuerumsetzungsfeld."
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:501
+ #: apt-ftparchive.1.xml:480
  #, no-wrap
  msgid "old [// oldn]* => new"
  msgstr "alt [// oldn]* => neu"
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:503
+ #: apt-ftparchive.1.xml:482
  #, no-wrap
  msgid "new"
  msgstr "neu"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:500
+ #: apt-ftparchive.1.xml:479
  msgid ""
  "The general form of the maintainer field is: <placeholder type="
  "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@@ -3101,12 -2542,12 +2542,12 @@@ msgstr "
  "bedingungslos."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:511
+ #: apt-ftparchive.1.xml:490
  msgid "The Source Override File"
  msgstr "Die Quell-Override-Datei"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:513
+ #: apt-ftparchive.1.xml:492
  msgid ""
  "The source override file is fully compatible with &dpkg-scansources;. It "
  "contains 2 fields separated by spaces. The first fields is the source "
@@@ -3117,12 -2558,12 +2558,12 @@@ msgstr "
  "Quellpaketname, das zweite ist der Abschnitt, dem er zugeordnet ist."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:518
+ #: apt-ftparchive.1.xml:497
  msgid "The Extra Override File"
  msgstr "Die zusätzlich Override-Datei"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:520
+ #: apt-ftparchive.1.xml:499
  msgid ""
  "The extra override file allows any arbitrary tag to be added or replaced in "
  "the output. It has 3 columns, the first is the package, the second is the "
@@@ -3133,37 -2574,18 +2574,18 @@@ msgstr "
  "erste ist das Paket, die zweite ist die Markierung und der Rest der Zeile "
  "ist der neue Wert."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:529
- msgid ""
- "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
- msgstr ""
- "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:531
- #, fuzzy
- #| msgid ""
- #| "Generate the given checksum. These options default to on, when turned off "
- #| "the generated index files will not have the checksum fields where "
- #| "possible.  Configuration Items: <literal>APT::FTPArchive::"
- #| "<replaceable>Checksum</replaceable></literal> and <literal>APT::"
- #| "FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</"
- #| "replaceable></literal> where <literal><replaceable>Index</replaceable></"
- #| "literal> can be <literal>Packages</literal>, <literal>Sources</literal> "
- #| "or <literal>Release</literal> and <literal><replaceable>Checksum</"
- #| "replaceable></literal> can be <literal>MD5</literal>, <literal>SHA1</"
- #| "literal> or <literal>SHA256</literal>."
+ #: apt-ftparchive.1.xml:510
  msgid ""
  "Generate the given checksum. These options default to on, when turned off "
  "the generated index files will not have the checksum fields where possible.  "
  "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>."
+ "<literal><replaceable>Index</replaceable></literal> can be "
+ "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+ "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+ "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
  msgstr ""
  "erzeugt die vorgegebene Prüfsumme. Diese Optionen sind standardmäßig "
  "aktiviert. Wenn sie deaktiviert sind, werden die erzeugten Indexdateien nach "
@@@ -3177,61 -2599,46 +2599,46 @@@
  "<literal>MD5</literal>, <literal>SHA1</literal> oder <literal>SHA256</"
  "literal> sein kann."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:541
+ #: apt-ftparchive.1.xml:521
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
  "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
  msgstr ""
- "Benutzt eine Programmzwischenspeicherdatenbank. Dies hat keine Auswirkung "
+ "benutzt eine Programmzwischenspeicherdatenbank. Dies hat keine Auswirkung "
  "auf den »generate«-Befehl. Konfigurationselement: <literal>APT::FTPArchive::"
  "DB</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:547
+ #: apt-ftparchive.1.xml:527
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
  "<option>-q=#</option> to set the quiet level, overriding the configuration "
  "file.  Configuration Item: <literal>quiet</literal>."
  msgstr ""
- "Still; erzeugt eine Ausgabe, die für Protokollierung geeignet ist und "
+ "still; erzeugt eine Ausgabe, die für Protokollierung geeignet ist und "
  "Fortschrittsanzeiger weglässt. Mehr »q«s unterdrücken mehr Ausgaben, bis zu "
  "einem Maximum von 2. Sie können außerdem <option>-q=#</option> benutzen, um "
  "die Stillestufe zu setzen, was die Konfigurationsdatei überschreibt. "
  "Konfigurationselement: <literal>quiet</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:555
+ #: apt-ftparchive.1.xml:535
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
  "then this option actually enables delinking of the files. It defaults to on "
  "and can be turned off with <option>--no-delink</option>.  Configuration "
  "Item: <literal>APT::FTPArchive::DeLinkAct</literal>."
  msgstr ""
- "Führt Delinking aus. Wenn die <literal>External-Links</literal>-Einstellung "
+ "führt Delinking aus. Wenn die <literal>External-Links</literal>-Einstellung "
  "benutzt wird, schaltet diese Option das Delinking zu Dateien ein. "
  "Standardmäßig ist es an und kann mit <option>--no-delink</option> "
  "ausgeschaltet werden. Konfigurationselement: <literal>APT::FTPArchive::"
  "DeLinkAct</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:563
+ #: apt-ftparchive.1.xml:543
  msgid ""
  "Perform contents generation. When this option is set and package indexes are "
  "being generated with a cache DB then the file listing will also be extracted "
@@@ -3239,69 -2646,49 +2646,49 @@@
  "option also allows the creation of any Contents files. The default is on.  "
  "Configuration Item: <literal>APT::FTPArchive::Contents</literal>."
  msgstr ""
- "Führt Inhaltsgenerierung durch. Wenn diese Option gesetzt ist und "
+ "führt Inhaltsgenerierung durch. Wenn diese Option gesetzt ist und "
  "Paketindizes mit einer Zwischenspeicherdatenbank generiert werden, dann wird "
  "die Dateiliste auch extrahiert und für spätere Benutzung in der Datenbank "
  "gespeichert. Wenn der »generate«-Befehl benutzt wird, erlaubt diese Option "
  "außerdem die Erzeugung beliebiger Contents-Dateien. Die Vorgabe ist an. "
  "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:573
+ #: apt-ftparchive.1.xml:553
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
  "literal>."
  msgstr ""
- "Wählt die Quell-Override-Datei, die mit dem <literal>sources</literal>-"
+ "wählt die Quell-Override-Datei, die mit dem <literal>sources</literal>-"
  "Befehl benutzt wird. Konfigurationselement: <literal>APT::FTPArchive::"
  "SourceOverride</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:579
+ #: apt-ftparchive.1.xml:559
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
  msgstr ""
- "Gibt der Zwischenspeicherdatenbank nur Lesezugriff. Konfigurationselement: "
+ "gibt der Zwischenspeicherdatenbank nur Lesezugriff. Konfigurationselement: "
  "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:584
+ #: apt-ftparchive.1.xml:564
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
  "commands only package files matching <literal>*_arch.deb</literal> or "
  "<literal>*_all.deb</literal> instead of all package files in the given "
  "path.  Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
  msgstr ""
- "In den Befehlen <literal>packages</literal> und <literal>contents</literal> "
- "nur Paketdateien akzeptieren, die auf <literal>*_arch.deb</literal> oder "
- "<literal>*_all.deb</literal> passen, anstatt aller Paketdateien im "
- "angegebenen Pfad. Konfigurationselement: <literal>APT::FTPArchive::"
- "Architecture</literal>."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:590
- msgid "<option>APT::FTPArchive::AlwaysStat</option>"
- msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
+ "akzeptiert in den Befehlen <literal>packages</literal> und "
+ "<literal>contents</literal> nur Paketdateien, die auf <literal>*_arch.deb</"
+ "literal> oder <literal>*_all.deb</literal> passen, anstatt aller "
+ "Paketdateien im angegebenen Pfad. Konfigurationselement: <literal>APT::"
+ "FTPArchive::Architecture</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:592
+ #: apt-ftparchive.1.xml:572
  msgid ""
  "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
  "packages are recompiled and/or republished with the same version again, this "
@@@ -3324,13 -2711,8 +2711,8 @@@ msgstr "
  "Versionsnummer hochzuladen, so dass theoretisch niemand dieses Probleme "
  "haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:604
+ #: apt-ftparchive.1.xml:584
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
  "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@@ -3346,19 -2728,19 +2728,19 @@@ msgstr "
  "werden kann."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
- #: sources.list.5.xml:198
+ #: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
+ #: sources.list.5.xml:214
  msgid "Examples"
  msgstr "Beispiele"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
- #: apt-ftparchive.1.xml:622
+ #: apt-ftparchive.1.xml:602
  #, no-wrap
  msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:618
+ #: apt-ftparchive.1.xml:598
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3368,7 -2750,7 +2750,7 @@@ msgstr "
  ">"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:632
+ #: apt-ftparchive.1.xml:612
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -3376,118 -2758,13 +2758,13 @@@ msgstr "
  "<command>apt-ftparchive</command> gibt bei normalen Operationen 0 zurück, "
  "dezimal 100 bei Fehlern."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-get.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
- "November 2008</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>8. "
- "November 2008</date>"
- 
- #. type: <heading></heading>
- #: apt-get.8.xml:25 apt-get.8.xml:32 guide.sgml:96
- msgid "apt-get"
- msgstr "apt-get"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-get.8.xml:33
  msgid "APT package handling utility -- command-line interface"
  msgstr "APT-Werkzeug für den Umgang mit Paketen -- Befehlszeilenschnittstelle"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-get.8.xml:39
- #, fuzzy
- #| msgid ""
- #| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- #| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
- #| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
- #| "<arg> <option>-t=</option> <arg choice='plain'> "
- #| "<replaceable>target_release</replaceable> </arg> </arg> <arg> <option>-"
- #| "a=</option> <arg choice='plain'> <replaceable>default_architecture</"
- #| "replaceable> </arg> </arg> <group choice=\"req\"> <arg "
- #| "choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
- #| "choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
- #| "arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
- #| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
- #| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- #| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
- #| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- #| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
- #| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
- #| "<group choice='req'> <arg choice='plain'> "
- #| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
- #| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- #| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
- #| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- #| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- #| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- #| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- #| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
- #| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
- #| "help</arg> </group> </arg> </group>"
- msgid ""
- "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
- "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
- "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
- "replaceable> </arg> </arg> <group choice=\"req\"> <arg "
- "choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
- "choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
- "<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
- "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
- "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
- "arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
- "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
- "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
- "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
- "</group> </arg> </group>"
- msgstr ""
- "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- "<option>-o= <replaceable>Konfigurationszeichenkette</replaceable> </option> "
- "</arg> <arg> <option>-c= <replaceable>Konfigurationsdatei</replaceable> </"
- "option> </arg> <arg> <option>-t=</option> <arg choice='plain'> "
- "<replaceable>Ziel-Release</replaceable> </arg> </arg> <arg> <option>-a=</"
- "option> <arg choice='plain'> <replaceable>Vorgabearchitektur</replaceable> </"
- "arg> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
- "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
- "choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable> <arg> <group "
- "choice='req'> <arg choice='plain'> =<replaceable>Paket-Versionsnummer</"
- "replaceable> </arg> <arg choice='plain'> /<replaceable>Ziel-Release</"
- "replaceable> </arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></"
- "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>Paket</replaceable></arg></arg> <arg choice='plain'>source "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable> <arg> "
- "<group choice='req'> <arg choice='plain'> =<replaceable>Paket-"
- "Versionsnummer</replaceable> </arg> <arg choice='plain'> /<replaceable>Ziel-"
- "Release</replaceable> </arg> </group> </arg> </arg> </arg> <arg "
- "choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>Paket</replaceable></arg></arg> <arg choice='plain'>check</"
- "arg> <arg choice='plain'>clean</arg> <arg choice='plain'>autoclean</arg> "
- "<arg choice='plain'>autoremove</arg> <arg choice='plain'> <group "
- "choice='req'> <arg choice='plain'>-v</arg> <arg choice='plain'>--version</"
- "arg> </group> </arg> <arg choice='plain'> <group choice='req'> <arg "
- "choice='plain'>-h</arg> <arg choice='plain'>--help</arg> </group> </arg> </"
- "group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:115
+ #: apt-get.8.xml:39
  msgid ""
  "<command>apt-get</command> is the command-line tool for handling packages, "
  "and may be considered the user's \"back-end\" to other tools using the APT "
@@@ -3499,13 -2776,8 +2776,8 @@@ msgstr "
  "die APT-Bibliothek benutzen. Es existieren mehrere "
  "Oberflächenschnittstellen, wie &dselect;, &aptitude;, &synaptic; und &wajig;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:124 apt-key.8.xml:127
- msgid "update"
- msgstr "update"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:125
+ #: apt-get.8.xml:49
  msgid ""
  "<literal>update</literal> is used to resynchronize the package index files "
  "from their sources. The indexes of available packages are fetched from the "
@@@ -3528,13 -2800,8 +2800,8 @@@ msgstr "
  "bewusst, dass die Gesamtfortschrittsanzeige nicht richtig sein wird, da die "
  "Größe der Pakete nicht im voraus bekannt ist."
  
- #. type: <tag></tag>
- #: apt-get.8.xml:136 guide.sgml:121
- msgid "upgrade"
- msgstr "upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:137
+ #: apt-get.8.xml:61
  msgid ""
  "<literal>upgrade</literal> is used to install the newest versions of all "
  "packages currently installed on the system from the sources enumerated in "
@@@ -3559,13 -2826,8 +2826,8 @@@ msgstr "
  "muss ein <literal>update</literal> durchgeführt werden, so dass <command>apt-"
  "get</command> die neuen Versionen der verfügbaren Pakete kennt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:149
- msgid "dselect-upgrade"
- msgstr "dselect-upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:150
+ #: apt-get.8.xml:74
  msgid ""
  "<literal>dselect-upgrade</literal> is used in conjunction with the "
  "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@@ -3581,13 -2843,8 +2843,8 @@@ msgstr "
  "diesen Status zu realisieren (zum Beispiel das Entfernen von alten und "
  "Installieren von neuen Paketen)."
  
- #. type: <tag></tag>
- #: apt-get.8.xml:159 guide.sgml:140
- msgid "dist-upgrade"
- msgstr "dist-upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:160
+ #: apt-get.8.xml:84
  msgid ""
  "<literal>dist-upgrade</literal> in addition to performing the function of "
  "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@@ -3610,13 -2867,8 +2867,8 @@@ msgstr "
  "abgerufen werden. Siehe auch &apt-preferences; für einen Mechanismus zum "
  "überschreiben der allgemeinen Einstellungen für einzelne Pakete."
  
- #. type: <tag></tag>
- #: apt-get.8.xml:172 guide.sgml:131
- msgid "install"
- msgstr "install"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:174
+ #: apt-get.8.xml:98
  msgid ""
  "<literal>install</literal> is followed by one or more packages desired for "
  "installation or upgrading.  Each package is a package name, not a fully "
@@@ -3645,7 -2897,7 +2897,7 @@@ msgstr "
  "vom Konfliktauflösungssystem von apt-get getroffen wurden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:192
+ #: apt-get.8.xml:116
  msgid ""
  "A specific version of a package can be selected for installation by "
  "following the package name with an equals and the version of the package to "
@@@ -3663,7 -2915,7 +2915,7 @@@ msgstr "
  "ausgewählt werden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:199
+ #: apt-get.8.xml:123
  msgid ""
  "Both of the version selection mechanisms can downgrade packages and must be "
  "used with care."
@@@ -3672,7 -2924,7 +2924,7 @@@ msgstr "
  "durchführen und müssen mit Vorsicht gehandhabt werden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:202
+ #: apt-get.8.xml:126
  msgid ""
  "This is also the target to use if you want to upgrade one or more already-"
  "installed packages without upgrading every package you have on your system. "
@@@ -3693,7 -2945,7 +2945,7 @@@ msgstr "
  "heruntergeladen und installiert."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:213
+ #: apt-get.8.xml:137
  msgid ""
  "Finally, the &apt-preferences; mechanism allows you to create an alternative "
  "installation policy for individual packages."
@@@ -3702,7 -2954,7 +2954,7 @@@ msgstr "
  "alternative Installationsrichtlinie für eigene Pakete zu erzeugen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:217
+ #: apt-get.8.xml:141
  msgid ""
  "If no package matches the given expression and the expression contains one "
  "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@@ -3721,13 -2973,8 +2973,8 @@@ msgstr "
  "nicht gewünscht wird, hängen Sie an den regulären Ausdruck ein »^«- oder »$«-"
  "Zeichen, um genauere reguläre Ausdruck zu erstellen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:226
- msgid "remove"
- msgstr "remove"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:227
+ #: apt-get.8.xml:151
  msgid ""
  "<literal>remove</literal> is identical to <literal>install</literal> except "
  "that packages are removed instead of installed. Note the removing a package "
@@@ -3741,13 -2988,8 +2988,8 @@@ msgstr "
  "belässt. Wenn ein Pluszeichen an den Paketnamen angehängt wird (ohne "
  "Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:234
- msgid "purge"
- msgstr "purge"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:235
+ #: apt-get.8.xml:159
  msgid ""
  "<literal>purge</literal> is identical to <literal>remove</literal> except "
  "that packages are removed and purged (any configuration files are deleted "
@@@ -3757,18 -2999,13 +2999,13 @@@ msgstr "
  "Ausnahme, dass Pakete entfernt und vollständig gelöscht werden (jegliche "
  "Konfigurationsdateien werden mitgelöscht)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:239
- msgid "source"
- msgstr "source"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:240
+ #: apt-get.8.xml:164
  msgid ""
  "<literal>source</literal> causes <command>apt-get</command> to fetch source "
  "packages. APT will examine the available packages to decide which source "
  "package to fetch. It will then find and download into the current directory "
- "the newest available version of that source package while respect the "
+ "the newest available version of that source package while respecting the "
  "default release, set with the option <literal>APT::Default-Release</"
  "literal>, the <option>-t</option> option or per package with the "
  "<literal>pkg/release</literal> syntax, if possible."
@@@ -3783,7 -3020,7 +3020,7 @@@ msgstr "
  "wurde, wenn möglich."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:248
+ #: apt-get.8.xml:172
  msgid ""
  "Source packages are tracked separately from binary packages via <literal>deb-"
  "src</literal> type lines in the &sources-list; file. This means that you "
@@@ -3799,19 -3036,13 +3036,13 @@@ msgstr "
  "installiert haben oder installieren könnten."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:255
- #, fuzzy
- #| msgid ""
- #| "If the <option>--compile</option> option is specified then the package "
- #| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
- #| "command> for the architecture as defined by the <command>--host-"
- #| "architecture</command> option.  If <option>--download-only</option> is "
- #| "specified then the source package will not be unpacked."
+ #: apt-get.8.xml:179
  msgid ""
  "If the <option>--compile</option> option is specified then the package will "
- "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
- "<option>--download-only</option> is specified then the source package will "
- "not be unpacked."
+ "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+ "the architecture as defined by the <command>--host-architecture</command> "
+ "option.  If <option>--download-only</option> is specified then the source "
+ "package will not be unpacked."
  msgstr ""
  "Falls die Option <option>--compile</option> angegeben ist, dann wird das "
  "Paket unter Benutzung von <command>dpkg-buildpackage</command> für die "
@@@ -3820,7 -3051,7 +3051,7 @@@
  "angegeben ist, wird das Quellpaket nicht entpackt."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:260
+ #: apt-get.8.xml:186
  msgid ""
  "A specific source version can be retrieved by postfixing the source name "
  "with an equals and then the version to fetch, similar to the mechanism used "
@@@ -3832,11 -3063,11 +3063,11 @@@ msgstr "
  "Gleichheitszeichens vor den Paketnamen und dann der Version zum "
  "Herunterladen erhalten werde, ähnlich dem Mechanismus, der für Paketdateien "
  "benutzt wird. Dies ermöglicht exakte Übereinstimmung von Quellpaketname und -"
- "Version und impliziert das Einschalten der<literal>APT::Get::Only-Source</"
+ "Version und impliziert das Einschalten der <literal>APT::Get::Only-Source</"
  "literal>-Option."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:266
+ #: apt-get.8.xml:192
  msgid ""
  "Note that source packages are not tracked like binary packages, they exist "
  "only in the current directory and are similar to downloading source tar "
@@@ -3846,23 -3077,14 +3077,14 @@@ msgstr "
  "werden, sie existieren nur im aktuellen Verzeichnis und sind "
  "heruntergeladenen Tarballs ähnlich."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:271
- msgid "build-dep"
- msgstr "build-dep"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:272
- #, fuzzy
- #| msgid ""
- #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
- #| "an attempt to satisfy the build dependencies for a source package. By "
- #| "default the dependencies are satisfied to build the package natively. If "
- #| "desired a host-architecture can be specified with the <option>--host-"
- #| "architecture</option> option instead."
+ #: apt-get.8.xml:198
  msgid ""
  "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
- "attempt to satisfy the build dependencies for a source package."
+ "attempt to satisfy the build dependencies for a source package. By default "
+ "the dependencies are satisfied to build the package natively. If desired a "
+ "host-architecture can be specified with the <option>--host-architecture</"
+ "option> option instead."
  msgstr ""
  "<literal>build-dep</literal> veranlasst apt-get, Pakete zu installieren/"
  "entfernen, um zu versuchen, die Bau-Abhängigkeiten eines Quellpakets zu "
@@@ -3871,13 -3093,8 +3093,8 @@@
  "Rechnerarchitektur mit der Option <option>--host-architecture</option> "
  "angegeben werden."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:276
- msgid "check"
- msgstr "check"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:277
+ #: apt-get.8.xml:205
  msgid ""
  "<literal>check</literal> is a diagnostic tool; it updates the package cache "
  "and checks for broken dependencies."
@@@ -3885,26 -3102,17 +3102,17 @@@ msgstr "
  "<literal>check</literal> ist ein Diagnosewerkzeug. Es aktualisiert den "
  "Paketzwischenspeicher und prüft, ob beschädigte Abhängigkeiten vorliegen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:281
- msgid "download"
- msgstr "download"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:282
- #, fuzzy
- #| msgid ""
- #| "<literal>download</literal> will download the given binary package into "
- #| "the current directory."
+ #: apt-get.8.xml:210
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
- "current directoy."
+ "current directory."
  msgstr ""
  "<literal>download</literal> wird das angegebene Binärpaket in das aktuelle "
  "Verzeichnis herunterladen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:288
+ #: apt-get.8.xml:216
  msgid ""
  "<literal>clean</literal> clears out the local repository of retrieved "
  "package files. It removes everything but the lock file from "
@@@ -3920,15 -3128,10 +3128,10 @@@ msgstr "
  "partial/</filename>. Wenn APT als eine &dselect;-Methode benutzt wird, wird "
  "<literal>clean</literal> automatisch ausgeführt. Diejenigen, die Dselect "
  "nicht benutzen, werden <literal>apt-get clean</literal> wahrscheinlich von "
- "Zeit zu Zeit ausführen, um Plattenplatz freizugeben."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:297
- msgid "autoclean"
- msgstr "autoclean"
+ "Zeit zu Zeit ausführen, um Plattenplatz freizugeben."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:298
+ #: apt-get.8.xml:226
  msgid ""
  "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
  "local repository of retrieved package files. The difference is that it only "
@@@ -3947,103 -3150,70 +3150,70 @@@ msgstr "
  "Installed</literal> wird installierte Pakete vor der Löschung bewahren, wenn "
  "sie auf »off« gesetzt ist."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:307
- msgid "autoremove"
- msgstr "autoremove"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:308
- #, fuzzy
- #| msgid ""
- #| "<literal>autoremove</literal> is used to remove packages that were "
- #| "automatically installed to satisfy dependencies for other packages and "
- #| "are now no longer needed."
+ #: apt-get.8.xml:236
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
- "automatically installed to satisfy dependencies for some package and that "
- "are no more needed."
+ "automatically installed to satisfy dependencies for other packages and are "
+ "now no longer needed."
  msgstr ""
  "<literal>autoremove</literal> wird benutzt, um Pakete zu entfernen, die "
  "automatisch installiert wurden, um Abhängigkeiten für andere Pakete zu "
  "erfüllen und die nicht mehr benötigt werden."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:312
- msgid "changelog"
- msgstr "changelog"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:313
+ #: apt-get.8.xml:241
  msgid ""
  "<literal>changelog</literal> downloads a package changelog and displays it "
  "through <command>sensible-pager</command>. The server name and base "
  "directory is defined in the <literal>APT::Changelogs::Server</literal> "
- "variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
- "Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
- "Ubuntu).  By default it displays the changelog for the version that is "
+ "variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+ "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+ "changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+ "for Ubuntu).  By default it displays the changelog for the version that is "
  "installed.  However, you can specify the same options as for the "
  "<option>install</option> command."
  msgstr ""
  "<literal>changelog</literal> lädt ein Changelog eines Pakets herunter und "
  "zeigt es mit <command>sensible-pager</command> an. Der Servername und das "
  "Basisverzeichnis sind in der Variable <literal>APT::Changelogs::Server</"
- "literal> definiert (z.B. <ulink>http://packages.debian.org/changelogs</"
- "ulink> für Debian oder <ulink>http://changelogs.ubuntu.com/changelogs</"
- "ulink> für Ubuntu). Standardmäßig zeigt es das Changelog für die "
+ "literal> definiert (z.B. <ulink url=\"http://packages.debian.org/changelogs"
+ "\">packages.debian.org/changelogs</ulink> für Debian oder <ulink url="
+ "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+ "changelogs</ulink> für Ubuntu). Standardmäßig zeigt es das Changelog für die "
  "installierte Version. Sie können jedoch die gleichen Optionen wie für den "
  "Befehl <option>install</option> angeben."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:335
- msgid "<option>--no-install-recommends</option>"
- msgstr "<option>--no-install-recommends</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:336
+ #: apt-get.8.xml:264
  msgid ""
  "Do not consider recommended packages as a dependency for installing.  "
  "Configuration Item: <literal>APT::Install-Recommends</literal>."
  msgstr ""
- "Empfohlene Pakete nicht als Abhängigkeit für die Installation betrachten. "
+ "betrachtet empfohlene Pakete nicht als Abhängigkeit für die Installation. "
  "Konfigurationselement: <literal>APT::Install-Recommends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:340
- msgid "<option>--install-suggests</option>"
- msgstr "<option>--install-suggests</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:341
+ #: apt-get.8.xml:269
  msgid ""
  "Consider suggested packages as a dependency for installing.  Configuration "
  "Item: <literal>APT::Install-Suggests</literal>."
  msgstr ""
- "Empfohlene Pakete als Abhängigkeit für die Installation betrachten. "
+ "betrachtet empfohlene Pakete als Abhängigkeit für die Installation. "
  "Konfigurationselement: <literal>APT::Install-Suggests</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:345
- msgid "<option>--download-only</option>"
- msgstr "<option>--download-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:346
+ #: apt-get.8.xml:274
  msgid ""
  "Download only; package files are only retrieved, not unpacked or installed.  "
  "Configuration Item: <literal>APT::Get::Download-Only</literal>."
  msgstr ""
- "Nur herunterladen; Paketdateien werden nur heruntergeladen, nicht entpackt "
+ "nur herunterladen; Paketdateien werden nur heruntergeladen, nicht entpackt "
  "oder installiert. Konfigurationselement: <literal>APT::Get::Download-Only</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:350
- msgid "<option>--fix-broken</option>"
- msgstr "<option>--fix-broken</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:351
+ #: apt-get.8.xml:279
  msgid ""
  "Fix; attempt to correct a system with broken dependencies in place. This "
  "option, when used with install/remove, can omit any packages to permit APT "
@@@ -4057,7 -3227,7 +3227,7 @@@
  "option> may produce an error in some situations.  Configuration Item: "
  "<literal>APT::Get::Fix-Broken</literal>."
  msgstr ""
- "Beheben; Versucht ein System von vorhandenen beschädigten Abhängigkeiten zu "
+ "beheben; versucht ein System von vorhandenen beschädigten Abhängigkeiten zu "
  "korrigieren. Diese Option kann, wenn sie mit »install«/»remove« benutzt "
  "wird, einige Pakete weglassen, um es APT zu erlauben, eine wahrscheinliche "
  "Lösung herzuleiten. Falls Pakete angegeben wurden, müssen diese das Problem "
@@@ -4071,18 -3241,8 +3241,8 @@@
  "benutzen, könnte das in einigen Situationen zu Fehlern führen. "
  "Konfigurationselement: <literal>APT::Get::Fix-Broken</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:364
- msgid "<option>--ignore-missing</option>"
- msgstr "<option>--ignore-missing</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:365
- msgid "<option>--fix-missing</option>"
- msgstr "<option>--fix-missing</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:366
+ #: apt-get.8.xml:294
  msgid ""
  "Ignore missing packages; If packages cannot be retrieved or fail the "
  "integrity check after retrieval (corrupted package files), hold back those "
@@@ -4092,7 -3252,7 +3252,7 @@@
  "it could not be downloaded then it will be silently held back.  "
  "Configuration Item: <literal>APT::Get::Fix-Missing</literal>."
  msgstr ""
- "Fehlende Pakete ignorieren; Wenn Pakete nicht heruntergeladen werden können "
+ "ignoriert fehlende Pakete; Wenn Pakete nicht heruntergeladen werden können "
  "oder die Integritätsprüfung nach dem Herunterladen fehlschlägt (fehlerhafte "
  "Paketdateien), werden diese Pakete zurückgehalten und das Ergebnis "
  "verarbeitet. Die Benutzung dieser Option zusammen mit <option>-f</option> "
@@@ -4102,25 -3262,20 +3262,20 @@@
  "zurückgehalten. Konfigurationselement: <literal>APT::Get::Fix-Missing</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:376
- msgid "<option>--no-download</option>"
- msgstr "<option>--no-download</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:377
+ #: apt-get.8.xml:305
  msgid ""
  "Disables downloading of packages. This is best used with <option>--ignore-"
  "missing</option> to force APT to use only the .debs it has already "
  "downloaded.  Configuration Item: <literal>APT::Get::Download</literal>."
  msgstr ""
- "Schaltet das Herunterladen von Paketen aus. Dies wird am besten mit "
+ "schaltet das Herunterladen von Paketen aus. Dies wird am besten mit "
  "<option>--ignore-missing</option> benutzt, um APT zu zwingen, nur die .debs "
  "zu benutzten, die es bereits heruntergeladenen hat. Konfigurationselement: "
  "<literal>APT::Get::Download</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:384
+ #: apt-get.8.xml:312
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -4130,7 -3285,7 +3285,7 @@@
  "may decided to do something you did not expect.  Configuration Item: "
  "<literal>quiet</literal>."
  msgstr ""
- "Still; erzeugt eine Ausgabe, die für Protokollierung geeignet ist und "
+ "still; erzeugt eine Ausgabe, die für Protokollierung geeignet ist und "
  "Fortschrittsanzeiger weglässt. Mehr »q«s unterdrücken mehr Ausgaben, bis zu "
  "einem Maximum von 2. Sie können außerdem <option>-q=#</option> benutzen, um "
  "die Stillestufe zu setzen, was die Konfigurationsdatei überschreibt. "
@@@ -4139,29 -3294,19 +3294,19 @@@
  "benutzen, da APT entscheiden könnte, etwas zu tun, das Sie nicht erwarten. "
  "Konfigurationselement: <literal>quiet</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:394
- msgid "<option>--simulate</option>"
- msgstr "<option>--simulate</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:396
- msgid "<option>--dry-run</option>"
- msgstr "<option>--dry-run</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:399
+ #: apt-get.8.xml:327
  msgid ""
  "No action; perform a simulation of events that would occur but do not "
  "actually change the system.  Configuration Item: <literal>APT::Get::"
  "Simulate</literal>."
  msgstr ""
- "Keine Aktion; führt eine Simulation von Ereignissen aus, die eintreten "
+ "keine Aktion; führt eine Simulation von Ereignissen aus, die eintreten "
  "würden, aber das aktuelle System nicht verändern. Konfigurationselement: "
  "<literal>APT::Get::Simulate</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:403
+ #: apt-get.8.xml:331
  msgid ""
  "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
  "literal>)  automatic. Also a notice will be displayed indicating that this "
@@@ -4179,7 -3324,7 +3324,7 @@@ msgstr "
  "Warnungen von <literal>apt-get</literal> wissen, was er tut)."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:409
+ #: apt-get.8.xml:337
  msgid ""
  "Simulate prints out a series of lines each one representing a dpkg "
  "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@@ -4191,23 -3336,8 +3336,8 @@@ msgstr "
  "(Inst). Eckige Klammern zeigen beschädigte Pakete an und ein leeres Paar "
  "eckiger Klammern bedeutet Unterbrechungen, die keine Folgen haben (selten)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>-y</option>"
- msgstr "<option>-y</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>--yes</option>"
- msgstr "<option>--yes</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:417
- msgid "<option>--assume-yes</option>"
- msgstr "<option>--assume-yes</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:418
+ #: apt-get.8.xml:346
  msgid ""
  "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
  "non-interactively. If an undesirable situation, such as changing a held "
@@@ -4215,141 -3345,112 +3345,112 @@@
  "essential package occurs then <literal>apt-get</literal> will abort.  "
  "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
  msgstr ""
- "Automatisches »Ja« auf Anfragen; Versucht »Ja« auf alle Anfragen zu "
+ "automatisches »Ja« auf Anfragen; Versucht »Ja« auf alle Anfragen zu "
  "antworten und ohne Eingaben zu laufen. Wenn eine unerwünschte Situation "
  "eintritt, wie ein gehaltenes Paket zu ändern, ein nicht authentifiziert "
  "Paket zu installieren oder ein essentielles Paket zu entfernen, dann wird "
  "<literal>apt-get</literal> abgebrochen. Konfigurationselement: <literal>APT::"
  "Get::Assume-Yes</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>-u</option>"
- msgstr "<option>-u</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>--show-upgraded</option>"
- msgstr "<option>--show-upgraded</option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:354
+ msgid ""
+ "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+ "Assume-No</literal>."
+ msgstr ""
+ "automatisches »Nein« auf alle Anfragen. Konfigurationselement: <literal>APT::"
+ "Get::Assume-No</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:426
+ #: apt-get.8.xml:359
  msgid ""
  "Show upgraded packages; Print out a list of all packages that are to be "
  "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
  msgstr ""
- "Zeigt Pakete, von denen ein Upgrade durchgeführt werden soll; Gibt eine "
+ "zeigt Pakete, von denen ein Upgrade durchgeführt werden soll; Gibt eine "
  "Liste aller Pakete aus, von denen ein Upgrade gemacht wurde. "
  "Konfigurationselement: <literal>APT::Get::Show-Upgraded</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>-V</option>"
- msgstr "<option>-V</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>--verbose-versions</option>"
- msgstr "<option>--verbose-versions</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:432
+ #: apt-get.8.xml:365
  msgid ""
  "Show full versions for upgraded and installed packages.  Configuration Item: "
  "<literal>APT::Get::Show-Versions</literal>."
  msgstr ""
- "Zeigt vollständige Versionen für Pakete, von denen ein Upgrade durchgeführt "
+ "zeigt vollständige Versionen für Pakete, von denen ein Upgrade durchgeführt "
  "oder die installiert wurden. Konfigurationselement: <literal>APT::Get::Show-"
  "Versions</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>-b</option>"
- msgstr "<option>-b</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>--compile</option>"
- msgstr "<option>--compile</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:437
- msgid "<option>--build</option>"
- msgstr "<option>--build</option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:371
+ msgid ""
+ "This option controls the architecture packages are built for by <command>apt-"
+ "get source --compile</command> and how cross-builddependencies are "
+ "satisfied. By default is it not set which means that the host architecture "
+ "is the same as the build architecture (which is defined by <literal>APT::"
+ "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
+ "Architecture</literal>"
+ msgstr ""
+ "Diese Option steuert, wie die Architekturpakete durch <command>apt-get "
+ "source --compile</command> gebaut und wie Cross-Bau-Abhängigkeiten erfüllt "
+ "werden. Standardmäßig ist sie nicht gesetze, was bedeutet, dass die "
+ "Rechnerarchitektur die gleiche wie die Bau-Architektur ist (die durch "
+ "<literal>APT::Architecture</literal>) definiert wird). "
+ "Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:438
+ #: apt-get.8.xml:381
  msgid ""
  "Compile source packages after downloading them.  Configuration Item: "
  "<literal>APT::Get::Compile</literal>."
  msgstr ""
- "Kompiliert Quellpakete, nachdem sie heruntergeladen wurden. "
+ "kompiliert Quellpakete, nachdem sie heruntergeladen wurden. "
  "Konfigurationselement: <literal>APT::Get::Compile</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:442
- msgid "<option>--ignore-hold</option>"
- msgstr "<option>--ignore-hold</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:443
+ #: apt-get.8.xml:386
  msgid ""
  "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
  "hold placed on a package. This may be useful in conjunction with "
  "<literal>dist-upgrade</literal> to override a large number of undesired "
  "holds.  Configuration Item: <literal>APT::Ignore-Hold</literal>."
  msgstr ""
- "Ignoriert zurückhalten des Paketes; Dies veranlasst <command>apt-get</"
+ "ignoriert zurückhalten des Paketes; Dies veranlasst <command>apt-get</"
  "command>, ein für das Paket gesetztes »Halten« zu ignorieren. Dies kann "
  "zusammen mit <literal>dist-upgrade</literal> nützlich sein, um eine große "
  "Anzahl ungewünschter »Halten« zu überschreiben. Konfigurationselement: "
  "<literal>APT::Ignore-Hold</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:449
- msgid "<option>--no-upgrade</option>"
- msgstr "<option>--no-upgrade</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:450
+ #: apt-get.8.xml:393
  msgid ""
  "Do not upgrade packages; When used in conjunction with <literal>install</"
  "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
  "line from being upgraded if they are already installed.  Configuration Item: "
  "<literal>APT::Get::Upgrade</literal>."
  msgstr ""
- "Kein Upgrade von Paketen durchführen; Wenn es zusammen mit <literal>install</"
+ "kein Upgrade von Paketen durchführen; Wenn es zusammen mit <literal>install</"
  "literal> benutzt wird, wird <literal>no-upgrade</literal> auf der "
  "Befehlszeile ein Upgrade von Paketen verhindern, wenn sie bereits "
  "installiert sind. Konfigurationselement: <literal>APT::Get::Upgrade</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:456
- msgid "<option>--only-upgrade</option>"
- msgstr "<option>--only-upgrade</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:457
+ #: apt-get.8.xml:400
  msgid ""
  "Do not install new packages; When used in conjunction with <literal>install</"
- "literal>, <literal>only-upgrade</literal> will prevent packages on the "
- "command line from being upgraded if they are not already installed.  "
+ "literal>, <literal>only-upgrade</literal> will install upgrades for already "
+ "installed packages only and ignore requests to install new packages.  "
  "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
  msgstr ""
- "Kein Upgrade von Paketen durchführen; Wenn es zusammen mit <literal>install</"
- "literal> benutzt wird, wird <literal>only-upgrade</literal> auf der "
- "Befehlszeile ein Upgrade von Paketen verhindern, wenn sie bereits "
- "installiert sind. Konfigurationselement: <literal>APT::Get::Only-Upgrade</"
+ "keine neuen Pakete installieren. Wenn es zusammen mit <literal>install</"
+ "literal> benutzt wird, wird <literal>only-upgrade</literal> nur Upgrades für "
+ "bereits installierte Pakete installieren und Anfragen zur Installation neuer "
+ "Pakete ignorieren. Konfigurationselement: <literal>APT::Get::Only-Upgrade</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:463
- msgid "<option>--force-yes</option>"
- msgstr "<option>--force-yes</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:464
+ #: apt-get.8.xml:408
  msgid ""
  "Force yes; This is a dangerous option that will cause apt to continue "
  "without prompting if it is doing something potentially harmful. It should "
@@@ -4357,19 -3458,14 +3458,14 @@@
  "literal> can potentially destroy your system! Configuration Item: "
  "<literal>APT::Get::force-yes</literal>."
  msgstr ""
- "»Ja« erzwingen; Dies ist eine gefährliche Option, die APT veranlasst, ohne "
+ "erzwingt »Ja«; Dies ist eine gefährliche Option, die APT veranlasst, ohne "
  "Nachfrage fortzufahren, wenn es etwas möglicherweise schädliches tut. Es "
  "sollte nicht benutzt werden, außer in ganz besonderen Situationen. "
  "<literal>force-yes</literal> zu benutzen, kann möglicherweise ihr System "
  "zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:471
- msgid "<option>--print-uris</option>"
- msgstr "<option>--print-uris</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:472
+ #: apt-get.8.xml:416
  msgid ""
  "Instead of fetching the files to install their URIs are printed. Each URI "
  "will have the path, the destination file name, the size and the expected md5 "
@@@ -4390,13 -3486,8 +3486,8 @@@ msgstr "
  "komprimierte Dateien zu dekomprimieren. Konfigurationselement: <literal>APT::"
  "Get::Print-URIs</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:482
- msgid "<option>--purge</option>"
- msgstr "<option>--purge</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:483
+ #: apt-get.8.xml:427
  msgid ""
  "Use purge instead of remove for anything that would be removed.  An asterisk "
  "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@@ -4408,27 -3499,17 +3499,17 @@@ msgstr "
  "sind. <option>remove --purge</option> entspricht dem Befehl <option>purge</"
  "option>. Konfigurationselement: <literal>APT::Get::Purge</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:490
- msgid "<option>--reinstall</option>"
- msgstr "<option>--reinstall</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:491
+ #: apt-get.8.xml:435
  msgid ""
  "Re-Install packages that are already installed and at the newest version.  "
  "Configuration Item: <literal>APT::Get::ReInstall</literal>."
  msgstr ""
- "Paket erneut installieren, die bereits installiert und in der neuesten "
- "Version sind. Konfigurationselement: <literal>APT::Get::ReInstall</literal>."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:495
- msgid "<option>--list-cleanup</option>"
- msgstr "<option>--list-cleanup</option>"
+ "installiert Pakete erneut, die bereits installiert sind und die neueste "
+ "Version haben. Konfigurationselement: <literal>APT::Get::ReInstall</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:496
+ #: apt-get.8.xml:440
  msgid ""
  "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
  "it off. When on <command>apt-get</command> will automatically manage the "
@@@ -4445,18 -3526,8 +3526,8 @@@ msgstr "
  "Grund zum Ausschalten der Option dar. Konfigurationselement: <literal>APT::"
  "Get::List-Cleanup</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:505
- msgid "<option>--target-release</option>"
- msgstr "<option>--target-release</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:506
- msgid "<option>--default-release</option>"
- msgstr "<option>--default-release</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:507
+ #: apt-get.8.xml:451
  msgid ""
  "This option controls the default input to the policy engine, it creates a "
  "default pin at priority 990 using the specified release string.  This "
@@@ -4480,32 -3551,22 +3551,22 @@@ msgstr "
  "Konfigurationselement: <literal>APT::Default-Release</literal>; Lesen Sie "
  "auch die &apt-preferences;-Handbuchseite."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:520
- msgid "<option>--trivial-only</option>"
- msgstr "<option>--trivial-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:522
+ #: apt-get.8.xml:466
  msgid ""
  "Only perform operations that are 'trivial'. Logically this can be considered "
  "related to <option>--assume-yes</option>, where <option>--assume-yes</"
  "option> will answer yes to any prompt, <option>--trivial-only</option> will "
  "answer no.  Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
  msgstr ""
- "Nur Operationen ausführen, die »trivial« sind. Logischerweise kann dies in "
+ "führt nur Operationen aus, die »trivial« sind. Logischerweise kann dies in "
  "Betracht bezogen auf <option>--assume-yes</option> sein, wobei <option>--"
  "assume-yes</option> auf jede Frage mit »Ja« und <option>--trivial-only</"
  "option> mit »Nein« antworten wird. Konfigurationselement: <literal>APT::Get::"
  "Trivial-Only</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:528
- msgid "<option>--no-remove</option>"
- msgstr "<option>--no-remove</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:529
+ #: apt-get.8.xml:473
  msgid ""
  "If any packages are to be removed apt-get immediately aborts without "
  "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@@ -4513,13 -3574,8 +3574,8 @@@ msgstr "
  "Wenn irgendwelche Pakete entfernt werden sollen, bricht apt-get sofort ohne "
  "Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:534
- msgid "<option>--auto-remove</option>"
- msgstr "<option>--auto-remove</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:535
+ #: apt-get.8.xml:479
  msgid ""
  "If the command is either <literal>install</literal> or <literal>remove</"
  "literal>, then this option acts like running <literal>autoremove</literal> "
@@@ -4532,13 -3588,8 +3588,8 @@@ msgstr "
  "Abhhängigkeitspakete. Konfigurationselement: <literal>APT::Get::"
  "AutomaticRemove</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:541
- msgid "<option>--only-source</option>"
- msgstr "<option>--only-source</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:542
+ #: apt-get.8.xml:486
  msgid ""
  "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
  "literal> commands.  Indicates that the given source names are not to be "
@@@ -4548,7 -3599,7 +3599,7 @@@
  "corresponding source package.  Configuration Item: <literal>APT::Get::Only-"
  "Source</literal>."
  msgstr ""
- "Hat nur eine Bedeutung für die Befehle <literal>source</literal> und "
+ "hat nur eine Bedeutung für die Befehle <literal>source</literal> und "
  "<literal>build-dep</literal>. Zeigt an, dass die angegebenen Quellnamen "
  "nicht durch die Programmtabelle ermittelt werden. Dies bedeutet, das dieser "
  "Befehl, wenn diese Option angegeben ist, nur Quellpaketnamen als Argumente "
@@@ -4556,65 -3607,40 +3607,40 @@@
  "entsprechenden Quellpaketen zu suchen. Konfigurationselement: <literal>APT::"
  "Get::Only-Source</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--diff-only</option>"
- msgstr "<option>--diff-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--dsc-only</option>"
- msgstr "<option>--dsc-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--tar-only</option>"
- msgstr "<option>--tar-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:553
+ #: apt-get.8.xml:497
  msgid ""
  "Download only the diff, dsc, or tar file of a source archive.  Configuration "
  "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
  "literal>, and <literal>APT::Get::Tar-Only</literal>."
  msgstr ""
- "Nur die diff-, dsc-, oder tar-Dateien eines Quellarchivs herunterladen. "
+ "lädt nur die diff-, dsc-, oder tar-Dateien eines Quellarchivs herunter. "
  "Konfigurationselemente: <literal>APT::Get::Diff-Only</literal>, "
  "<literal>APT::Get::Dsc-Only</literal> und <literal>APT::Get::Tar-Only</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:558
- msgid "<option>--arch-only</option>"
- msgstr "<option>--arch-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:559
+ #: apt-get.8.xml:503
  msgid ""
  "Only process architecture-dependent build-dependencies.  Configuration Item: "
  "<literal>APT::Get::Arch-Only</literal>."
  msgstr ""
- "Nur architekturabhängige Bauabhängigkeiten verarbeiten. "
+ "verarbeitet nur architekturabhängige Bauabhängigkeiten. "
  "Konfigurationselement: <literal>APT::Get::Arch-Only</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:563
- msgid "<option>--allow-unauthenticated</option>"
- msgstr "<option>--allow-unauthenticated</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:564
+ #: apt-get.8.xml:508
  msgid ""
  "Ignore if packages can't be authenticated and don't prompt about it.  This "
  "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
  "AllowUnauthenticated</literal>."
  msgstr ""
- "Ignorieren, wenn Pakete nicht authentifiziert werden können und nicht danach "
+ "Ignoriert, wenn Pakete nicht authentifiziert werden können und nicht danach "
  "fragen. Dies ist für Werkzeuge wie pbuilder nützlich. Konfigurationselement: "
  "<literal>APT::Get::AllowUnauthenticated</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-get.8.xml:577
+ #: apt-get.8.xml:521
  msgid ""
  "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
  "&file-statelists;"
@@@ -4623,18 -3649,18 +3649,18 @@@ msgstr "
  "&file-statelists;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:586
+ #: apt-get.8.xml:530
  msgid ""
  "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
  "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
  "preferences;, the APT Howto."
  msgstr ""
  "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
- "&apt-config;, &apt-secure;, Die APT-Benutzeranleitung in &guidesdir;, &apt-"
+ "&apt-config;, &apt-secure;, die APT-Benutzeranleitung in &guidesdir;, &apt-"
  "preferences;, das APT-Howto."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:592
+ #: apt-get.8.xml:536
  msgid ""
  "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
  "error."
@@@ -4642,51 -3668,13 +3668,13 @@@ msgstr "
  "<command>apt-get</command> gibt bei normalen Operationen 0 zurück, dezimal "
  "100 bei Fehlern."
  
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:595
- msgid "ORIGINAL AUTHORS"
- msgstr "ORIGINALAUTOREN"
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:596
- msgid "&apt-author.jgunthorpe;"
- msgstr "&apt-author.jgunthorpe;"
- 
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:599
- msgid "CURRENT AUTHORS"
- msgstr "AKTUELLE AUTOREN"
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:601
- msgid "&apt-author.team;"
- msgstr "&apt-author.team;"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-key.8.xml:17 apt-key.8.xml:24
- msgid "apt-key"
- msgstr "apt-key"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-key.8.xml:25
+ #: apt-key.8.xml:32
  msgid "APT key management utility"
  msgstr "APT-Schlüsselverwaltungsdienstprogramm"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-key.8.xml:31
- msgid ""
- "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
- "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
- "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
- "arg>"
- msgstr ""
- "<command>apt-key</command> <arg><option>--keyring <replaceable>Dateiname</"
- "replaceable></option></arg> <arg><replaceable>Befehl</replaceable></arg> "
- "<arg rep=\"repeat\"><option><replaceable>Argumente</replaceable></option></"
- "arg>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:40
+ #: apt-key.8.xml:39
  msgid ""
  "<command>apt-key</command> is used to manage the list of keys used by apt to "
  "authenticate packages.  Packages which have been authenticated using these "
@@@ -4698,121 -3686,80 +3686,87 @@@ msgstr "
  "vertrauenswürdig betrachtet."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-key.8.xml:46
+ #: apt-key.8.xml:45
  msgid "Commands"
  msgstr "Befehle"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:48
- msgid "add <replaceable>filename</replaceable>"
- msgstr "add <replaceable>Dateiname</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:52
+ #: apt-key.8.xml:50
  msgid ""
- "Add a new key to the list of trusted keys.  The key is read from "
- "<replaceable>filename</replaceable>, or standard input if "
- "<replaceable>filename</replaceable> is <literal>-</literal>."
+ "Add a new key to the list of trusted keys.  The key is read from the "
+ "filename given with the parameter &synopsis-param-filename; or if the "
+ "filename is <literal>-</literal> from standard input."
  msgstr ""
- "Einen neuen Schlüssel zur Liste der vertrauenswürdigen Schlüssel hinzufügen. "
- "Der Schlüssel wird aus <replaceable>Dateiname</replaceable> gelesen oder, "
- "wenn <replaceable>Dateiname</replaceable> <literal>-</literal> ist, von der "
- "Standardeingabe."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:60
- msgid "del <replaceable>keyid</replaceable>"
- msgstr "del <replaceable>Schlüssel-ID</replaceable>"
+ "fügt einen neuen Schlüssel zur Liste der vertrauenswürdigen Schlüssel hinzu. "
+ "Der Schlüssel wird aus &synopsis-param-filename; gelesen oder, wenn der "
+ "Dateiname <literal>-</literal> ist, von der Standardeingabe."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:64
+ #: apt-key.8.xml:63
  msgid "Remove a key from the list of trusted keys."
  msgstr ""
- "Einen Schlüssel von der Liste der vertrauenswürdigen Schlüssel entfernen."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:71
- msgid "export <replaceable>keyid</replaceable>"
- msgstr "export <replaceable>Schlüssel-ID</replaceable>"
+ "entfernt einen Schlüssel von der Liste der vertrauenswürdigen Schlüssel."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:75
- msgid "Output the key <replaceable>keyid</replaceable> to standard output."
- msgstr ""
- "Den Schlüssel <replaceable>Schlüssel-ID</replaceable> auf der "
- "Standardausgabe ausgeben."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:82
- msgid "exportall"
- msgstr "exportall"
+ #: apt-key.8.xml:74
+ msgid "Output the key &synopsis-param-keyid; to standard output."
+ msgstr "gibt den Schlüssel &synopsis-param-keyid; auf der Standardausgabe aus."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:86
+ #: apt-key.8.xml:85
  msgid "Output all trusted keys to standard output."
- msgstr "Alle vertrauenswürdigen Schlüssel auf der Standardausgabe ausgeben."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:93
- msgid "list"
- msgstr "list"
+ msgstr "gibt alle vertrauenswürdigen Schlüssel auf der Standardausgabe aus."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:97
+ #: apt-key.8.xml:96
  msgid "List trusted keys."
- msgstr "Vertrauenswürdige Schlüssel auflisten."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:104
- msgid "finger"
- msgstr "finger"
+ msgstr "listet vertrauenswürdige Schlüssel auf."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:108
+ #: apt-key.8.xml:107
  msgid "List fingerprints of trusted keys."
- msgstr "Fingerabdrücke vertrauenswürdiger Schlüssel auflisten."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:115
- msgid "adv"
- msgstr "adv"
+ msgstr "listet Fingerabdrücke vertrauenswürdiger Schlüssel auf."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:119
+ #: apt-key.8.xml:118
  msgid ""
  "Pass advanced options to gpg. With adv --recv-key you can download the "
  "public key."
  msgstr ""
- "Erweitere Optionen an gpg weiterleiten. Mit adv --recv-key können Sie den "
+ "leitet erweitere Optionen an gpg weiter. Mit adv --recv-key können Sie den "
  "öffentlichen Schlüssel herunterladen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
++#, fuzzy
++#| msgid ""
++#| "Update the local keyring with the archive keyring and remove from the "
++#| "local keyring the archive keys which are no longer valid.  The archive "
++#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
++#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
++#| "package in Debian."
  msgid ""
- "Update the local keyring with the keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
+ "Update the local keyring with the archive keyring and remove from the local "
+ "keyring the archive keys which are no longer valid.  The archive keyring is "
+ "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
++"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
++"Ubuntu."
  msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:140
- msgid "net-update"
- msgstr "net-update"
+ "aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und "
+ "entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen "
+ "Schlüsselbund. Der Archivschlüsselbund wird im Paket <literal>archive-"
+ "keyring</literal> Ihrer Distribution mitgeliefert, z.B. dem Paket "
+ "<literal>debian-archive-keyring</literal> in Debian."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:144
- #, fuzzy
- #| msgid ""
- #| "Work similar to the <command>update</command> command above, but get the "
- #| "archive keyring from an URI instead and validate it against a master "
- #| "key.  This requires an installed &wget; and an APT build configured to "
- #| "have a server to fetch from and a master keyring to validate.  APT in "
- #| "Debian does not support this command and relies on <command>update</"
- #| "command> instead, but Ubuntu's APT does."
- msgid ""
- "Update the local keyring with the keys of a key server and removes from the "
- "keyring the archive keys which are no longer valid. This requires an "
- "installed wget and an APT build configured to have a server to fetch from. "
- "APT in Debian does not support this command, but Ubuntu's APT does."
+ msgid ""
+ "Work similar to the <command>update</command> command above, but get the "
+ "archive keyring from an URI instead and validate it against a master key.  "
+ "This requires an installed &wget; and an APT build configured to have a "
+ "server to fetch from and a master keyring to validate.  APT in Debian does "
+ "not support this command and relies on <command>update</command> instead, "
+ "but Ubuntu's APT does."
  msgstr ""
  "funktioniert ähnlich dem vorhergehenden Befehl <command>update</command>, "
  "bezieht aber den Archivschlüsselbund stattdessen von einer URI und bestätigt "
@@@ -4823,7 -3770,7 +3777,7 @@@
  "Ubuntu funktioniert dies aber."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:159
+ #: apt-key.8.xml:161
  msgid ""
  "Note that options need to be defined before the commands described in the "
  "previous section."
@@@ -4831,26 -3778,13 +3785,13 @@@ msgstr "
  "Beachten Sie, dass Optionen vor den im vorherigen Abschnitt beschriebenen "
  "Befehlen definiert sein müssen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:161
- msgid "--keyring <replaceable>filename</replaceable>"
- msgstr "--keyring <replaceable>Dateiname</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:162
- #, fuzzy
- #| msgid ""
- #| "With this option it is possible to specify a specific keyring file the "
- #| "command should operate on. The default is that a command is executed on "
- #| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
- #| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
- #| "gpg</filename> is the primary keyring which means that e.g. new keys are "
- #| "added to this one."
+ #: apt-key.8.xml:164
  msgid ""
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
  "<filename>trusted.gpg</filename> file as well as on all parts in the "
- "<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</"
  "filename> is the primary keyring which means that e.g. new keys are added to "
  "this one."
  msgstr ""
@@@ -4862,63 -3796,48 +3803,57 @@@
  "Schlüssel werden zu diesem hinzugefügt."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-key.8.xml:175
+ #: apt-key.8.xml:177
  msgid "&file-trustedgpg;"
  msgstr "&file-trustedgpg;"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:177
+ #: apt-key.8.xml:179
  msgid "<filename>/etc/apt/trustdb.gpg</filename>"
  msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:178
+ #: apt-key.8.xml:180
  msgid "Local trust database of archive keys."
- msgstr "Lokale Datenbank vertrauenswürdiger Archivschlüssel."
+ msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
++#, fuzzy
++#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
++msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:182
- msgid "Keyring of Debian archive trusted keys."
- msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs."
+ #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
++#, fuzzy
++#| msgid "Keyring of Debian archive trusted keys."
++msgid "Keyring of Ubuntu archive trusted keys."
+ msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:185
+ #: apt-key.8.xml:187
++#, fuzzy
++#| msgid ""
++#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  msgid ""
--"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
++"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
++#, fuzzy
++#| msgid "Keyring of Debian archive removed trusted keys."
++msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr ""
- "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs."
+ "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:195
+ #: apt-key.8.xml:197
  msgid "&apt-get;, &apt-secure;"
  msgstr "&apt-get;, &apt-secure;"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-mark.8.xml:16
- msgid ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
- "April 2011</date>"
- msgstr ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21. "
- "April 2011</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-mark.8.xml:25 apt-mark.8.xml:32
- msgid "apt-mark"
- msgstr "apt-mark"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-mark.8.xml:33
  msgid "mark/unmark a package as being automatically-installed"
@@@ -4926,27 -3845,8 +3861,8 @@@ msgstr "
  "ein Paket als automatisch installiert markieren oder diese Markierung "
  "entfernen"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-mark.8.xml:39
- msgid ""
- "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
- "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
- "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
- "\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
- "\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
- "arg> </group>"
- msgstr ""
- "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
- "f=<replaceable>DATEINAME</replaceable></option></arg> <group choice=\"plain"
- "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
- "\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
- "\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg> </"
- "arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:57
+ #: apt-mark.8.xml:39
  msgid ""
  "<command>apt-mark</command> will change whether a package has been marked as "
  "being automatically installed."
@@@ -4955,7 -3855,7 +3871,7 @@@ msgstr "
  "installiert markiert ist."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:61
+ #: apt-mark.8.xml:43
  msgid ""
  "When you request that a package is installed, and as a result other packages "
  "are installed to satisfy its dependencies, the dependencies are marked as "
@@@ -4970,13 -3870,8 +3886,8 @@@ msgstr "
  "abhängen, werden sie z.B durch <command>apt-get</command> oder "
  "<command>aptitude</command> entfernt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:69
- msgid "auto"
- msgstr "auto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:70
+ #: apt-mark.8.xml:52
  msgid ""
  "<literal>auto</literal> is used to mark a package as being automatically "
  "installed, which will cause the package to be removed when no more manually "
@@@ -4986,13 -3881,8 +3897,8 @@@ msgstr "
  "installiert zu markieren, was veranlasst, dass das Paket entfernt wird, wenn "
  "keine manuell installierten Pakete von ihm abhängen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:77
- msgid "manual"
- msgstr "manual"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:78
+ #: apt-mark.8.xml:60
  msgid ""
  "<literal>manual</literal> is used to mark a package as being manually "
  "installed, which will prevent the package from being automatically removed "
@@@ -5002,13 -3892,8 +3908,8 @@@ msgstr "
  "zu markieren, was verhindert, dass das Paket automatisch entfernt wird, wenn "
  "kein anderes Paket von ihm abhängt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:85
- msgid "hold"
- msgstr "hold"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:86
+ #: apt-mark.8.xml:68
  msgid ""
  "<literal>hold</literal> is used to mark a package as hold back, which will "
  "prevent the package from being automatically installed, upgraded or "
@@@ -5023,13 -3908,8 +3924,8 @@@ msgstr "
  "daher durch &dpkg; verwaltet und nicht durch die Option <option>--filename</"
  "option>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:95
- msgid "unhold"
- msgstr "unhold"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:96
+ #: apt-mark.8.xml:78
  msgid ""
  "<literal>unhold</literal> is used to cancel a previously set hold on a "
  "package to allow all actions again."
@@@ -5037,13 -3917,8 +3933,8 @@@ msgstr "
  "<literal>unhold</literal> wird benutzt, um ein vorher gesetztes »hold« auf "
  "ein Paket aufzuheben, um alle Aktionen wieder zu erlauben."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:101
- msgid "showauto"
- msgstr "showauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:102
+ #: apt-mark.8.xml:84
  msgid ""
  "<literal>showauto</literal> is used to print a list of automatically "
  "installed packages with each package on a new line.  All automatically "
@@@ -5056,13 -3931,8 +3947,8 @@@ msgstr "
  "aufgelistet. Falls Pakete angegeben sind, werden nur diejenigen angezeigt, "
  "die automatisch installiert wurden."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:109
- msgid "showmanual"
- msgstr "showmanual"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:110
+ #: apt-mark.8.xml:92
  msgid ""
  "<literal>showmanual</literal> can be used in the same way as "
  "<literal>showauto</literal> except that it will print a list of manually "
@@@ -5072,13 -3942,8 +3958,8 @@@ msgstr "
  "<literal>showauto</literal> benutzt werden, mit der Ausnahme, dass es "
  "stattdessen eine Liste manuell installierter Pakete ausgibt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:116
- msgid "showhold"
- msgstr "showhold"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:117
+ #: apt-mark.8.xml:99
  msgid ""
  "<literal>showhold</literal> is used to print a list of packages on hold in "
  "the same way as for the other show commands."
@@@ -5086,47 -3951,39 +3967,39 @@@ msgstr "
  "<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter "
  "Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:130
- msgid ""
- "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
- msgstr ""
- "<option>-f=<filename><replaceable>DATEINAME</replaceable></filename></option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:131
- msgid ""
- "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
- "option>"
- msgstr ""
- "<option>--file=<filename><replaceable>DATEINAME</replaceable></filename></"
- "option>"
+ # FIXME not translatable
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+ #: apt-mark.8.xml:112 apt-mark.8.xml:113
+ msgid "<replaceable>&synopsis-filename;</replaceable>"
+ msgstr "<replaceable>&synopsis-filename;</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:134
+ #: apt-mark.8.xml:115
  msgid ""
- "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
- "filename> instead of the default location, which is "
- "<filename>extended_status</filename> in the directory defined by the "
- "Configuration Item: <literal>Dir::State</literal>."
+ "Read/Write package stats from the filename given with the parameter "
+ "<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+ "of from the default location, which is <filename>extended_status</filename> "
+ "in the directory defined by the Configuration Item: <literal>Dir::State</"
+ "literal>."
  msgstr ""
- "Paketstatus von <filename><replaceable>DATEINAME</replaceable></filename> "
- "lesen/schreiben, anstatt vom Standardort, der <filename>extended_status</"
- "filename> im von Konfigurationselement <literal>Dir::State</literal> "
- "definierten Verzeichnis, ist."
+ "schreibt/liest Paketstatus von dem Dateinamen, der mit dem Parameter "
+ "<filename><replaceable>&synopsis-filename;</replaceable></filename>, anstatt "
+ "vom Standardort, der <filename>extended_status</filename> im von "
+ "Konfigurationselement <literal>Dir::State</literal> definierten Verzeichnis, "
+ "ist."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-mark.8.xml:146
+ #: apt-mark.8.xml:128
  msgid "  &file-extended_states;"
  msgstr "  &file-extended_states;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:151
+ #: apt-mark.8.xml:133
  msgid "&apt-get;,&aptitude;,&apt-conf;"
  msgstr "&apt-get;,&aptitude;,&apt-conf;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:155
+ #: apt-mark.8.xml:137
  msgid ""
  "<command>apt-mark</command> returns zero on normal operation, non-zero on "
  "error."
@@@ -5134,18 -3991,13 +4007,13 @@@ msgstr "
  "<command>apt-mark</command> gibt bei normalen Operationen Null zurück, bei "
  "Fehlern nicht Null."
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-secure.8.xml:17 apt-secure.8.xml:39
- msgid "apt-secure"
- msgstr "apt-secure"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-secure.8.xml:40
+ #: apt-secure.8.xml:47
  msgid "Archive authentication support for APT"
  msgstr "Archivauthentifizierungsunterstützung für APT"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:45
+ #: apt-secure.8.xml:52
  msgid ""
  "Starting with version 0.6, <command>apt</command> contains code that does "
  "signature checking of the Release file for all archives. This ensures that "
@@@ -5158,7 -4010,7 +4026,7 @@@ msgstr "
  "auf den Signierschlüssel der Release-Datei haben."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:53
+ #: apt-secure.8.xml:60
  msgid ""
  "If a package comes from a archive without a signature or with a signature "
  "that apt does not have a key for that package is considered untrusted and "
@@@ -5174,7 -4026,7 +4042,7 @@@ msgstr "
  "dem Herunterladen von Paketen von dort erzwingen."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:62
+ #: apt-secure.8.xml:69
  msgid ""
  "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
  "authentication feature."
@@@ -5183,12 -4035,12 +4051,12 @@@ msgstr "
  "neue Authentifizierungsfunktion."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:67
+ #: apt-secure.8.xml:74
  msgid "Trusted archives"
  msgstr "Vertrauenswürdige Archive"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:70
+ #: apt-secure.8.xml:77
  msgid ""
  "The chain of trust from an apt archive to the end user is made up of "
  "different steps. <command>apt-secure</command> is the last step in this "
@@@ -5206,7 -4058,7 +4074,7 @@@ msgstr "
  "sicherstellt."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:78
+ #: apt-secure.8.xml:85
  msgid ""
  "apt-secure does not review signatures at a package level. If you require "
  "tools to do this you should look at <command>debsig-verify</command> and "
@@@ -5219,7 -4071,7 +4087,7 @@@ msgstr "
  "(bereitgestellt von den Paketen debsig-verify beziehungsweise devscripts)."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:85
+ #: apt-secure.8.xml:92
  msgid ""
  "The chain of trust in Debian starts when a maintainer uploads a new package "
  "or a new version of a package to the Debian archive. This upload in order to "
@@@ -5237,7 -4089,7 +4105,7 @@@ msgstr "
  "sicherzustellen."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:95
+ #: apt-secure.8.xml:102
  msgid ""
  "Once the uploaded package is verified and included in the archive, the "
  "maintainer signature is stripped off, an MD5 sum of the package is computed "
@@@ -5255,7 -4107,7 +4123,7 @@@ msgstr "
  "Schlüsselbund."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:105
+ #: apt-secure.8.xml:112
  msgid ""
  "Any end user can check the signature of the Release file, extract the MD5 "
  "sum of a package from it and compare it with the MD5 sum of the package he "
@@@ -5270,7 -4122,7 +4138,7 @@@ msgstr "
  "auch die Signatur der Release-Datei geprüft."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:112
+ #: apt-secure.8.xml:119
  msgid ""
  "Notice that this is distinct from checking signatures on a per package "
  "basis. It is designed to prevent two possible attacks:"
@@@ -5279,7 -4131,7 +4147,7 @@@ msgstr "
  "ist. Es wurde entworfen, um zwei mögliche Angriffe zu verhindern:"
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:117
+ #: apt-secure.8.xml:124
  msgid ""
  "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
  "checking, a malicious agent can introduce himself in the package download "
@@@ -5295,7 -4147,7 +4163,7 @@@ msgstr "
  "oder DNS-Manipulationsangriffe) erfolgen."
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:125
+ #: apt-secure.8.xml:132
  msgid ""
  "<literal>Mirror network compromise</literal>.  Without signature checking, a "
  "malicious agent can compromise a mirror host and modify the files in it to "
@@@ -5308,7 -4160,7 +4176,7 @@@ msgstr "
  "Pakete von diesem Rechner herunterladen."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:132
+ #: apt-secure.8.xml:139
  msgid ""
  "However, it does not defend against a compromise of the Debian master server "
  "itself (which signs the packages) or against a compromise of the key used to "
@@@ -5321,12 -4173,12 +4189,12 @@@ msgstr "
  "Fall kann dieser Mechanismus eine Signatur pro Paket ergänzen."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:138
+ #: apt-secure.8.xml:145
  msgid "User configuration"
  msgstr "Benutzerkonfiguration"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:140
+ #: apt-secure.8.xml:147
  msgid ""
  "<command>apt-key</command> is the program that manages the list of keys used "
  "by apt. It can be used to add or remove keys although an installation of "
@@@ -5340,7 -4192,7 +4208,7 @@@ msgstr "
  "den Debian-Paketdepots benutzt werden."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:147
+ #: apt-secure.8.xml:154
  msgid ""
  "In order to add a new key you need to first download it (you should make "
  "sure you are using a trusted communication channel when retrieving it), add "
@@@ -5358,12 -4210,12 +4226,12 @@@ msgstr "
  "herunterladen und prüfen kann."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:156
+ #: apt-secure.8.xml:163
  msgid "Archive configuration"
  msgstr "Archivkonfiguration"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:158
+ #: apt-secure.8.xml:165
  msgid ""
  "If you want to provide archive signatures in an archive under your "
  "maintenance you have to:"
@@@ -5372,29 -4224,29 +4240,29 @@@ msgstr "
  "stellen möchten, müssen Sie:"
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:163
+ #: apt-secure.8.xml:170
  msgid ""
  "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
  "already. You can do this by running <command>apt-ftparchive release</"
  "command> (provided in apt-utils)."
  msgstr ""
- "<emphasis>Erzeugen einer Release-Datei der obersten Stufe</emphasis>, wenn "
+ "<emphasis>erzeugt einer Release-Datei der obersten Stufe</emphasis>, wenn "
  "sie nicht bereits existiert. Sie können dies erledigen, indem Sie "
  "<command>apt-ftparchive release</command> (aus apt-utils) ausführen."
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:168
+ #: apt-secure.8.xml:175
  msgid ""
  "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
  "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
  "gpg Release</command>."
  msgstr ""
- "<emphasis>Es signieren</emphasis>. Sie können dies tun, indem Sie "
+ "<emphasis>Signieren Sie es</emphasis>. Sie können dies tun, indem Sie "
  "<command>gpg --clearsign -o InRelease Release</command> und <command>gpg -"
  "abs -o Release.gpg Release</command> ausführen."
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:172
+ #: apt-secure.8.xml:179
  msgid ""
  "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
  "know what key they need to import in order to authenticate the files in the "
@@@ -5405,7 -4257,7 +4273,7 @@@ msgstr "
  "Dateien im Archiv zu authentifizieren."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:179
+ #: apt-secure.8.xml:186
  msgid ""
  "Whenever the contents of the archive changes (new packages are added or "
  "removed) the archive maintainer has to follow the first two steps previously "
@@@ -5416,7 -4268,7 +4284,7 @@@ msgstr "
  "Schritten folgen."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:187
+ #: apt-secure.8.xml:194
  msgid ""
  "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
  "&debsign; &debsig-verify;, &gpg;"
@@@ -5425,14 -4277,14 +4293,14 @@@ msgstr "
  "&debsign; &debsig-verify;, &gpg;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:191
+ #: apt-secure.8.xml:198
  msgid ""
  "For more background information you might want to review the <ulink url="
- "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
- "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
- "Manual (available also in the harden-doc package) and the <ulink url="
- "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
- "Distribution HOWTO</ulink> by V. Alex Brennen."
+ "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+ "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+ "(available also in the harden-doc package) and the <ulink url=\"http://www."
+ "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
+ "ulink> by V. Alex Brennen."
  msgstr ""
  "Um weitere Hintergrundinformationen zu erhalten, können Sie die  <ulink url="
  "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.de.html\">Die "
@@@ -5442,12 -4294,12 +4310,12 @@@
  ">Strong Distribution HOWTO</ulink> von V. Alex Brennen lesen."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:204
+ #: apt-secure.8.xml:211
  msgid "Manpage Authors"
  msgstr "Autoren der Handbuchseite"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:206
+ #: apt-secure.8.xml:213
  msgid ""
  "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
  "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@@ -5455,32 -4307,13 +4323,13 @@@ msgstr "
  "Diese Handbuchseite basiert auf der Arbeit von Javier Fernández-Sanguino "
  "Peña, Isaac Jones, Colin Walters, Florian Weimer und Michael Vogt."
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-sortpkgs.1.xml:25 apt-sortpkgs.1.xml:32
- msgid "apt-sortpkgs"
- msgstr "apt-sortpkgs"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-sortpkgs.1.xml:33
  msgid "Utility to sort package index files"
  msgstr "Werkzeug zum Sortieren von Paketindexdateien"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-sortpkgs.1.xml:39
- msgid ""
- "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
- msgstr ""
- "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
- "<arg><option>-o=<replaceable>Konfigurationszeichenkette</replaceable></"
- "option></arg> <arg><option>-c=<replaceable>Datei</replaceable></option></"
- "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>Datei</replaceable></"
- "arg>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:48
+ #: apt-sortpkgs.1.xml:39
  msgid ""
  "<command>apt-sortpkgs</command> will take an index file (Source index or "
  "Package index) and sort the records so that they are ordered by the package "
@@@ -5492,19 -4325,14 +4341,14 @@@ msgstr "
  "die internen Felder jedes Datensatzes gemäß interner Sortierregeln sortieren."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:54
+ #: apt-sortpkgs.1.xml:45
  msgid "All output is sent to stdout, the input must be a seekable file."
  msgstr ""
  "Alle Ausgaben werden an stdout gesendet, die Eingabe muss eine durchsuchbare "
  "Datei sein."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-sortpkgs.1.xml:61
- msgid "<option>--source</option>"
- msgstr "<option>--source</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-sortpkgs.1.xml:63
+ #: apt-sortpkgs.1.xml:54
  msgid ""
  "Use Source index field ordering.  Configuration Item: <literal>APT::"
  "SortPkgs::Source</literal>."
@@@ -5513,7 -4341,7 +4357,7 @@@ msgstr "
  "SortPkgs::Source</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:77
+ #: apt-sortpkgs.1.xml:68
  msgid ""
  "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -5521,37 -4349,28 +4365,28 @@@ msgstr "
  "<command>apt-sortpkgs</command> gibt bei normalen Operationen 0 zurück, "
  "dezimal 100 bei Fehlern."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt.conf.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
- "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
- "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
- "&apt-product; <date>16 January 2010</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
- "firstname> <surname>Burrows</surname> <contrib>Erste Dokumentation von "
- "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
- "&apt-product; <date>16. Januar 2010</date>"
+ #. type: Content of: <refentry><refentryinfo><author><contrib>
+ #: apt.conf.5.xml:20
+ msgid "Initial documentation of Debug::*."
+ msgstr "ursprüngliche Dokumentation von Debug::*."
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt.conf.5.xml:31 apt.conf.5.xml:38
- msgid "apt.conf"
- msgstr "apt.conf"
+ #. type: Content of: <refentry><refentryinfo><author><email>
+ #: apt.conf.5.xml:21
+ msgid "dburrows@debian.org"
+ msgstr "dburrows@debian.org"
  
  #. type: Content of: <refentry><refmeta><manvolnum>
- #: apt.conf.5.xml:32 apt_preferences.5.xml:25 sources.list.5.xml:26
+ #: apt.conf.5.xml:31 apt_preferences.5.xml:25 sources.list.5.xml:26
  msgid "5"
  msgstr "5"
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt.conf.5.xml:39
+ #: apt.conf.5.xml:38
  msgid "Configuration file for APT"
  msgstr "Konfigurationsdatei für APT"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:43
+ #: apt.conf.5.xml:42
  msgid ""
  "<filename>apt.conf</filename> is the main configuration file for the APT "
  "suite of tools, but by far not the only place changes to options can be "
@@@ -5565,7 -4384,7 +4400,7 @@@ msgstr "
  "benutzt, um eine einheitliche Umgebung bereitzustellen."
  
  #. type: Content of: <refentry><refsect1><orderedlist><para>
- #: apt.conf.5.xml:48
+ #: apt.conf.5.xml:47
  msgid ""
  "When an APT tool starts up it will read the configuration files in the "
  "following order:"
@@@ -5574,7 -4393,7 +4409,7 @@@ msgstr "
  "folgenden Reihenfolge lesen:"
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:50
+ #: apt.conf.5.xml:49
  msgid ""
  "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
  "any)"
@@@ -5583,23 -4402,15 +4418,15 @@@ msgstr "
  "angegeben wird (falls gesetzt)"
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:52
- #, fuzzy
- #| msgid ""
- #| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
- #| "order which have either no or \"<literal>conf</literal>\" as filename "
- #| "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
- #| "and period (.) characters.  Otherwise APT will print a notice that it has "
- #| "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
- #| "Ignore-Files-Silently</literal> configuration list - in this case it will "
- #| "be silently ignored."
+ #: apt.conf.5.xml:51
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
- "order which have no or \"<literal>conf</literal>\" as filename extension and "
- "which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
- "characters.  Otherwise APT will print a notice that it has ignored a file if "
- "the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
- "literal> configuration list - in this case it will be silently ignored."
+ "order which have either no or \"<literal>conf</literal>\" as filename "
+ "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+ "and period (.) characters.  Otherwise APT will print a notice that it has "
+ "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+ "Ignore-Files-Silently</literal> configuration list - in this case it will be "
+ "silently ignored."
  msgstr ""
  "alle Dateien in <literal>Dir::Etc::Parts</literal> in aufsteigender "
  "alphanumerischer Reihenfolge, die entweder keine oder »<literal>conf</"
@@@ -5611,7 -4422,7 +4438,7 @@@
  "sie stillschweigend ignoriert."
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:59
+ #: apt.conf.5.xml:58
  msgid ""
  "the main configuration file specified by <literal>Dir::Etc::main</literal>"
  msgstr ""
@@@ -5619,7 -4430,7 +4446,7 @@@
  "angegeben wird"
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:61
+ #: apt.conf.5.xml:60
  msgid ""
  "the command line options are applied to override the configuration "
  "directives or to load even more configuration files."
@@@ -5628,12 -4439,12 +4455,12 @@@ msgstr "
  "zu überschreiben oder um sogar mehrere Konfigurationsdateien zu laden."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:65
+ #: apt.conf.5.xml:64
  msgid "Syntax"
  msgstr "Syntax"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:66
+ #: apt.conf.5.xml:65
  msgid ""
  "The configuration file is organized in a tree with options organized into "
  "functional groups. Option specification is given with a double colon "
@@@ -5648,7 -4459,7 +4475,7 @@@ msgstr "
  "das Werkzeug Get. Optionen werden nicht von ihren Elterngruppe geerbt."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:72
+ #: apt.conf.5.xml:71
  msgid ""
  "Syntactically the configuration language is modeled after what the ISC tools "
  "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@@ -5677,7 -4488,7 +4504,7 @@@ msgstr "
  "geschweiften Klammern geöffnet werden, wie:"
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:86
+ #: apt.conf.5.xml:85
  #, no-wrap
  msgid ""
  "APT {\n"
@@@ -5695,7 -4506,7 +4522,7 @@@ msgstr "
  "};\n"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:94
+ #: apt.conf.5.xml:93
  msgid ""
  "with newlines placed to make it more readable. Lists can be created by "
  "opening a scope and including a single string enclosed in quotes followed by "
@@@ -5708,13 -4519,13 +4535,13 @@@ msgstr "
  "jeweils getrennt durch ein Semikolon."
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:99
+ #: apt.conf.5.xml:98
  #, no-wrap
  msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
  msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:102
+ #: apt.conf.5.xml:101
  msgid ""
  "In general the sample configuration file in <filename>&docdir;examples/apt."
  "conf</filename> &configureindex; is a good guide for how it should look."
@@@ -5724,7 -4535,7 +4551,7 @@@ msgstr "
  "aussehen könnte."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:106
+ #: apt.conf.5.xml:105
  msgid ""
  "The names of the configuration items are not case-sensitive. So in the "
  "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@@ -5734,7 -4545,7 +4561,7 @@@ msgstr "
  "<literal>dpkg::pre-install-pkgs</literal> benutzen."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:109
+ #: apt.conf.5.xml:108
  msgid ""
  "Names for the configuration items are optional if a list is defined as it "
  "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@@ -5742,15 -4553,15 +4569,15 @@@
  "list. If you specify a name you can override the option as every other "
  "option by reassigning a new value to the option."
  msgstr ""
- "Namen für die Konfigurationsdatei sind optional, wenn eine Liste, wie sie im "
- "Beispiel <literal>DPkg::Pre-Install-Pkgs</literal> oberhalb gesehen werden "
- "kann, definiert ist. Wenn Sie keinen neuen Namen angeben, wird ein neuer "
- "Eintrag der Liste lediglich eine neue Option hinzufügen. Wenn Sie einen "
- "Namen eingeben, können Sie die Option, wie jede andere Option, "
+ "Namen für die Konfigurationselemente sind optional, wenn eine Liste, wie sie "
+ "im Beispiel <literal>DPkg::Pre-Install-Pkgs</literal> oberhalb gesehen "
+ "werden kann, definiert ist. Wenn Sie keinen neuen Namen angeben, wird ein "
+ "neuer Eintrag der Liste lediglich eine neue Option hinzufügen. Wenn Sie "
+ "einen Namen eingeben, können Sie die Option, wie jede andere Option, "
  "überschreiben, indem Sie der Option erneut einen neuen Wert zuweisen."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:114
+ #: apt.conf.5.xml:113
  msgid ""
  "Two specials are allowed, <literal>#include</literal> (which is deprecated "
  "and not supported by alternative implementations) and <literal>#clear</"
@@@ -5770,7 -4581,7 +4597,7 @@@ msgstr "
  "(Beachten Sie, dass diese Zeilen auch mit einem Semikolon enden müssen.)"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:122
+ #: apt.conf.5.xml:121
  msgid ""
  "The #clear command is the only way to delete a list or a complete scope.  "
  "Reopening a scope or the ::-style described below will <emphasis>not</"
@@@ -5786,31 -4597,31 +4613,31 @@@ msgstr "
  "überschrieben, sondern nur bereinigt werden."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:127
+ #: apt.conf.5.xml:126
  msgid ""
  "All of the APT tools take a -o option which allows an arbitrary "
  "configuration directive to be specified on the command line. The syntax is a "
  "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
- "followed by an equals sign then the new value of the option. Lists can be "
- "appended too by adding a trailing :: to the list name. (As you might "
+ "followed by an equals sign then the new value of the option. To append a new "
+ "element to a list, add a trailing :: to the name of the list. (As you might "
  "suspect: The scope syntax can't be used on the command line.)"
  msgstr ""
  "Alle APT-Werkzeuge bringen eine Option -o mit, die es einer beliebigen "
- "Installationsdirektiven erlaubt, auf der Befehlszeile angegeben zu werden. "
+ "Konfigurationsdirektiven erlaubt, auf der Befehlszeile angegeben zu werden. "
  "Die Syntax ist ein vollständiger Optionsname (<literal>APT::Get::Assume-Yes</"
  "literal> zum Beispiel), gefolgt von einem Gleichheitszeichen und dann dem "
- "neuen Wert der Option. Listen können ebenfalls durch Anhängen von "
- "abschließenden :: zur Namensliste hinzugefügt werden. (Wenn Ihnen das "
- "merkwürdig vorkommt: Die Geltungsbereichs-Syntax kann nicht auf der "
- "Befehlszeile benutzt werden.)"
+ "neuen Wert der Option. Um ein neues Element an eine Liste anzuhängen, fügen "
+ "Sie ein führendes :: an den Namen der Liste. (Wenn Ihnen das merkwürdig "
+ "vorkommt: Die Geltungsbereichs-Syntax kann nicht auf der Befehlszeile "
+ "benutzt werden.)"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:134
+ #: apt.conf.5.xml:133
  msgid ""
  "Note that you can use :: only for appending one item per line to a list and "
  "that you should not use it in combination with the scope syntax.  (The scope "
  "syntax implicit insert ::) Using both syntaxes together will trigger a bug "
- "which some users unfortunately relay on: An option with the unusual name "
+ "which some users unfortunately depend on: An option with the unusual name "
  "\"<literal>::</literal>\" which acts like every other option with a name. "
  "These introduces many problems including that a user who writes multiple "
  "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
@@@ -5824,9 -4635,9 +4651,9 @@@ msgstr "
  "eine Liste anzuhängen und dass Sie es nicht nicht in Verbindung mit einer "
  "Geltungsbereichs-Syntax benutzen sollten. (Die Geltungsbereichssysyntax fügt "
  "implizit :: ein) Die Benutzung der Syntax von beiden zusammen wird einen "
- "Fehler auslösen, den einige Anwender ungünstigerweise weitergeben an eine "
- "Option mit dem unüblichen Namen »<literal>::</literal>«, der wie jede andere "
- "Option mit einem Namen agiert. Dies leitet viele Probleme ein, "
+ "Fehler auslösen, auf den sich einige Anwender ungünstigerweise verlassen: "
+ "eine Option mit dem unüblichen Namen »<literal>::</literal>«, die sich wie "
+ "jede andere Option mit einem Namen verhält. Dies leitet viele Probleme ein, "
  "einschließlich, dass der Anwender, der mehrere Zeilen in dieser "
  "<emphasis>falschen</emphasis> Syntax in der Hoffnung etwas an die Liste "
  "anzuhängen schreibt, das Gegenteil von nur der letzten Zuweisung zu diese "
@@@ -5836,12 -4647,12 +4663,12 @@@
  "sich APT nicht explizit darüber beklagt."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:146
+ #: apt.conf.5.xml:145
  msgid "The APT Group"
  msgstr "Die APT-Gruppe"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:147
+ #: apt.conf.5.xml:146
  msgid ""
  "This group of options controls general APT behavior as well as holding the "
  "options for all of the tools."
@@@ -5849,29 -4660,41 +4676,41 @@@ msgstr "
  "Diese Gruppe von Optionen steuert das allgemeine Verhalten von APT, ebenso "
  "wie es die Optionen für alle Werkzeuge enthält."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:151
- msgid "Architecture"
- msgstr "Architecture"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:152
+ #: apt.conf.5.xml:151
  msgid ""
  "System Architecture; sets the architecture to use when fetching files and "
  "parsing package lists. The internal default is the architecture apt was "
  "compiled for."
  msgstr ""
- "Systemarchitektur; Setzt die Architektur die benutzt wird, wenn Dateien "
+ "Systemarchitektur; setzt die Architektur die benutzt wird, wenn Dateien "
  "heruntergeladen und Paketlisten ausgewertet werden. Die interne Vorgabe ist "
  "die Architektur für die APT kompiliert wurde."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:157
- msgid "Default-Release"
- msgstr "Default-Release"
+ msgid ""
+ "All Architectures the system supports. Processors implementing the "
+ "<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
+ "set are e.g. also able to execute binaries compiled for the <literal>i386</"
+ "literal> (<literal>x86</literal>) instruction set; This list is use when "
+ "fetching files and parsing package lists. The internal default is always the "
+ "native architecture (<literal>APT::Architecture</literal>)  and all foreign "
+ "architectures it can retrieve by calling <command>dpkg --print-foreign-"
+ "architectures</command>."
+ msgstr ""
+ "alle Architekturen, die das System unterstützt. Prozessoren, die "
+ "<literal>amd64</literal>-Befehlssätze implementieren (auch <literal>x86-64</"
+ "literal> genannt) sind beispielsweise ebenso in der Lage, Programme "
+ "auszuführen, die für <literal>i386</literal>-Befehlssätzt (<literal>x86</"
+ "literal>) kompiliert wurden. Diese Liste wird benutzt, wenn Dateien "
+ "abgerufen und Paketlisten ausgewertet werden. Die interne Vorgabe ist immer "
+ "die native Architektur (<literal>APT::Architecture</literal>) und alle "
+ "fremden Architekturen, die durch Aufruf von <command>dpkg --print-foreign-"
+ "architectures</command> abgefragt werden können."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:158
+ #: apt.conf.5.xml:167
  msgid ""
  "Default release to install packages from if more than one version available. "
  "Contains release name, codename or release version. Examples: 'stable', "
@@@ -5883,47 -4706,32 +4722,32 @@@ msgstr "
  "Beispiele: »stable«, »testing, »unstable«, »&stable-codename;«, »&testing-"
  "codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:163
- msgid "Ignore-Hold"
- msgstr "Ignore-Hold"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:164
+ #: apt.conf.5.xml:173
  msgid ""
  "Ignore Held packages; This global option causes the problem resolver to "
  "ignore held packages in its decision making."
  msgstr ""
- "Halten von Paketen ignorieren; Diese globale Option veranlasst den "
+ "Halten von Paketen ignorieren. Diese globale Option veranlasst den "
  "Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:168
- msgid "Clean-Installed"
- msgstr "Clean-Installed"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:169
+ #: apt.conf.5.xml:178
  msgid ""
  "Defaults to on. When turned on the autoclean feature will remove any "
  "packages which can no longer be downloaded from the cache. If turned off "
  "then packages that are locally installed are also excluded from cleaning - "
  "but note that APT provides no direct means to reinstall them."
  msgstr ""
- "Standardmäßig auf on (ein). Wenn es auf on gesetzt wird, wird die "
+ "standardmäßig auf on (ein). Wenn es auf on gesetzt wird, wird die "
  "automatische Bereinigungsfunktion alle Pakete entfernen, die nicht länger "
  "aus dem Zwischenspeicher heruntergeladen werden können. Wenn es auf off "
  "gesetzt wird, dann werden außerden die Pakete, die lokal installiert sind, "
  "vom Bereinigen ausgeschlossen – beachten Sie jedoch, dass APT keine direkten "
  "Möglichkeiten bereitstellt, um sie erneut zu installieren."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:175
- msgid "Immediate-Configure"
- msgstr "Immediate-Configure"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:176
+ #: apt.conf.5.xml:185
  msgid ""
  "Defaults to on which will cause APT to install essential and important "
  "packages as fast as possible in the install/upgrade operation. This is done "
@@@ -5954,7 -4762,7 +4778,7 @@@
  "distribution and to the APT team with the buglink below so they can work on "
  "improving or correcting the upgrade process."
  msgstr ""
- "Standardmäßig »on«, wodurch APT veranlasst wird, »essential«- oder "
+ "standardmäßig »on«, wodurch APT veranlasst wird, »essential«- oder "
  "»important«-Pakete so schnell wie möglich in der »install«-/»upgrade«-"
  "Operation zu installieren. Dies wird getan, um den Effekt eines "
  "gescheiterterten &dpkg;-Aufrufs zu begrenzen: Wenn diese Option "
@@@ -5990,13 -4798,8 +4814,8 @@@
  "nachstehendem Fehlerverweis, so dass es am Verbessern oder Korrigieren des "
  "Upgrade-Prozesses arbeiten kann."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:198
- msgid "Force-LoopBreak"
- msgstr "Force-LoopBreak"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:199
+ #: apt.conf.5.xml:208
  msgid ""
  "Never Enable this option unless you -really- know what you are doing. It "
  "permits APT to temporarily remove an essential package to break a Conflicts/"
@@@ -6013,29 -4816,25 +4832,25 @@@ msgstr "
  "funktionieren, wenn die essentiellen Pakete nicht tar, gzip, libc, dpkg, "
  "bash oder etwas, was davon abhängt, sind."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:207
- msgid "Cache-Start, Cache-Grow and Cache-Limit"
- msgstr "Cache-Start, Cache-Grow und Cache-Limit"
- 
+ # FIXME s/These value/This value/
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:208
+ #: apt.conf.5.xml:217
  msgid ""
  "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
  "the 'available' information. <literal>Cache-Start</literal> acts as a hint "
  "to which size the Cache will grow and is therefore the amount of memory APT "
  "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
- "that these amount of space need to be available for APT otherwise it will "
- "likely fail ungracefully, so for memory restricted devices these value "
- "should be lowered while on systems with a lot of configured sources this "
- "might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
- "default of 1048576 (~1 MB) how much the Cache size will be increased in the "
- "event the space defined by <literal>Cache-Start</literal> is not enough. "
- "These value will be applied again and again until either the cache is big "
- "enough to store all information or the size of the cache reaches the "
- "<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
- "literal> is 0 which stands for no limit.  If <literal>Cache-Grow</literal> "
- "is set to 0 the automatic grow of the cache is disabled."
+ "that this amount of space needs to be available for APT otherwise it will "
+ "likely fail ungracefully, so for memory restricted devices this value should "
+ "be lowered while on systems with a lot of configured sources it should be "
+ "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
+ "of 1048576 (~1 MB) how much the Cache size will be increased in the event "
+ "the space defined by <literal>Cache-Start</literal> is not enough. These "
+ "value will be applied again and again until either the cache is big enough "
+ "to store all information or the size of the cache reaches the <literal>Cache-"
+ "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
+ "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
+ "automatic grow of the cache is disabled."
  msgstr ""
  "APT benutzt seit Version 0.7.26 eine Zwischenspeicherdatei für "
  "Speicherabbilder mit veränderlicher Größe um »verfügbare« Informationen zu "
@@@ -6045,7 -4844,7 +4860,7 @@@
  "MB). Beachten Sie, dass diese Speichermenge für APT verfügbar sein muss, da "
  "es sonst unschön scheitert. Für Geräte mit eingeschränktem Speicher sollten "
  "diese Werte vermindert werden, während sie für Systeme mit vielen "
- "konfigurierten Quellen erhöht werden könnten. <literal>Cache-Grow</literal> "
+ "konfigurierten Quellen erhöht werden sollte. <literal>Cache-Grow</literal> "
  "definiert in Byte mit einer Vorgabe von 1048576 (~1 MB) um wieviel die Größe "
  "des Zwischenspeichers vergößert werden soll, falls der durch <literal>Cache-"
  "Start</literal> vorreservierte nicht ausreicht. Dieser Wert wird wieder und "
@@@ -6055,25 -4854,15 +4870,15 @@@
  "was bedeutet, dass es kein Limit gibt. Falls <literal>Cache-Grow</literal> "
  "auf 0 gesetzt ist, kann der Zwischenspeicher nicht automatisch wachsen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:223
- msgid "Build-Essential"
- msgstr "Build-Essential"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:224
+ #: apt.conf.5.xml:233
  msgid "Defines which package(s) are considered essential build dependencies."
  msgstr ""
- "Definiert, welche(s) Paket(e) als essentielle Bauabhängigkeiten betrachtet "
- "werde."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:227
- msgid "Get"
- msgstr "Get"
+ "definiert, welche(s) Paket(e) als essentielle Bauabhängigkeiten betrachtet "
+ "werden."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:228
+ #: apt.conf.5.xml:237
  msgid ""
  "The Get subsection controls the &apt-get; tool, please see its documentation "
  "for more information about the options here."
@@@ -6082,13 -4871,8 +4887,8 @@@ msgstr "
  "dessen Dokumentation, um weitere Informationen über die Optionen hier zu "
  "erhalten."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:232
- msgid "Cache"
- msgstr "Cache"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:233
+ #: apt.conf.5.xml:242
  msgid ""
  "The Cache subsection controls the &apt-cache; tool, please see its "
  "documentation for more information about the options here."
@@@ -6097,13 -4881,8 +4897,8 @@@ msgstr "
  "dessen Dokumentation, um weitere Informationen über die Optionen hier zu "
  "erhalten."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:237
- msgid "CDROM"
- msgstr "CD-ROM"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:238
+ #: apt.conf.5.xml:247
  msgid ""
  "The CDROM subsection controls the &apt-cdrom; tool, please see its "
  "documentation for more information about the options here."
@@@ -6113,17 -4892,12 +4908,12 @@@ msgstr "
  "erhalten."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:244
+ #: apt.conf.5.xml:253
  msgid "The Acquire Group"
  msgstr "Die Erwerbgruppe"
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:249
- msgid "Check-Valid-Until"
- msgstr "Check-Valid-Until"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:250
+ #: apt.conf.5.xml:259
  msgid ""
  "Security related option defaulting to true as an expiring validation for a "
  "Release file prevents longtime replay attacks and can e.g. also help users "
@@@ -6133,98 -4907,83 +4923,83 @@@
  "header, but if they don't or a stricter value is volitional the following "
  "<literal>Max-ValidTime</literal> option can be used."
  msgstr ""
- "Sicherheitsbezogene Option wird als »true« vorgegeben, da eine verfallende "
- "Überprüfung für eine Release-Datei langzeitige Wiederholungsangriffe "
- "verhindert und zum Beispiel Anwendern auch helfen kann, länger nicht "
- "aktualisierte Spiegel zu erkennen – diese Funktion hängt jedoch von der "
- "Richtigkeit der Zeiteinstellung auf dem Anwendersystem ab. Archivbetreuer "
- "sind aufgefordert Release-Dateien mit der Kopfzeile <literal>Valid-Until</"
- "literal> zu erstellen. Falls sie das nicht tun oder ein strengerer Wert "
- "gewollt ist, kann die Option <literal>Max-ValidTime</literal> benutzt werden."
- 
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:260
- msgid "Max-ValidTime"
- msgstr "Max-ValidTime"
+ "Die sicherheitsbezogene Option wird als »true« vorgegeben, da eine "
+ "verfallende Überprüfung für eine Release-Datei langzeitige "
+ "Wiederholungsangriffe verhindert und zum Beispiel Anwendern auch helfen "
+ "kann, länger nicht aktualisierte Spiegel zu erkennen – diese Funktion hängt "
+ "jedoch von der Richtigkeit der Zeiteinstellung auf dem Anwendersystem ab. "
+ "Archivbetreuer sind aufgefordert Release-Dateien mit der Kopfzeile "
+ "<literal>Valid-Until</literal> zu erstellen. Falls sie das nicht tun oder "
+ "ein strengerer Wert gewollt ist, kann die Option <literal>Max-ValidTime</"
+ "literal> benutzt werden."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:261
- #, fuzzy
- #| msgid ""
- #| "Seconds the Release file should be considered valid after it was created "
- #| "(indicated by the <literal>Date</literal> header).  If the Release file "
- #| "itself includes a <literal>Valid-Until</literal> header the earlier date "
- #| "of the two is used as the expiration date.  The default value is "
- #| "<literal>0</literal> which stands for \"for ever\".  Archive specific "
- #| "settings can be made by appending the label of the archive to the option "
- #| "name."
- msgid ""
- "Seconds the Release file should be considered valid after it was created. "
- "The default is \"for ever\" (0) if the Release file of the archive doesn't "
- "include a <literal>Valid-Until</literal> header.  If it does then this date "
- "is the default. The date from the Release file or the date specified by the "
- "creation time of the Release file (<literal>Date</literal> header) plus the "
- "seconds specified with this options are used to check if the validation of a "
- "file has expired by using the earlier date of the two. Archive specific "
- "settings can be made by appending the label of the archive to the option "
- "name."
+ #: apt.conf.5.xml:270
+ msgid ""
+ "Seconds the Release file should be considered valid after it was created "
+ "(indicated by the <literal>Date</literal> header).  If the Release file "
+ "itself includes a <literal>Valid-Until</literal> header the earlier date of "
+ "the two is used as the expiration date.  The default value is <literal>0</"
+ "literal> which stands for \"for ever valid\".  Archive specific settings can "
+ "be made by appending the label of the archive to the option name."
  msgstr ""
  "Sekunden, die die Release-Datei als gültig betrachtet werden sollte, nachdem "
  "sie erzeugt wurde (angezeigt durch die Kopfzeile <literal>Date</literal>). "
  "Falls die Release-Datei selbst eine <literal>Valid-Until</literal>-Kopfzeile "
- "enhält, wird der frühere von beiden Terminen als Verfallsdatum benutzt. "
- "Vorgabewert ist <literal>0</literal>, was »für immer« bedeutet. "
+ "enthält, wird das frühere der beiden Daten als Ablaufdatum verwandt. Vorgabe "
+ "ist <literal>0</literal>, was für »für immer gültig« steht. "
  "Archivspezifische Einstellungen können durch Anhängen des Archivetiketts an "
- "die Option »name« vorgenommen werden."
+ "den Optionsnamen vorgenommen werden."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:273
- msgid "PDiffs"
- msgstr "PDiffs"
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:281
+ msgid ""
+ "Minimum of seconds the Release file should be considered valid after it was "
+ "created (indicated by the <literal>Date</literal> header).  Use this if you "
+ "need to use a seldomly updated (local) mirror of a more regular updated "
+ "archive with a <literal>Valid-Until</literal> header instead of completely "
+ "disabling the expiration date checking.  Archive specific settings can and "
+ "should be used by appending the label of the archive to the option name."
+ msgstr ""
+ "minimale Anzahl der Sekunden, die die Release-Datei als gültig betrachtet "
+ "werden sollte, nachdem sie erzeugt wurde (angezeigt durch die Kopfzeile "
+ "<literal>Date</literal>). Benutzen Sie dies, falls Sie einen selten "
+ "aktualisierten (lokalen) Spiegel eines regelmäßiger aktualisierten Archivs "
+ "mit einer <literal>Valid-Until</literal>-Kopfzeile haben, anstatt die "
+ "Überprüfung des Ablaufdatum komplett zu deaktivieren. Archivspezifische "
+ "Einstellungen können und sollten durch Anhängen des Archivetiketts an den "
+ "Optionsnamen vorgenommen werden."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:274
+ #: apt.conf.5.xml:292
  msgid ""
  "Try to download deltas called <literal>PDiffs</literal> for Packages or "
  "Sources files instead of downloading whole ones. True by default."
  msgstr ""
- "Versuchen, Deltas, die <literal>PDiffs</literal> genannt werden, für Paket- "
+ "versucht Deltas, die <literal>PDiffs</literal> genannt werden, für Paket- "
  "oder Quelldateien herunterzuladen, statt der kompletten Dateien. Vorgabe ist "
  "True."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:277
- #, fuzzy
- #| msgid ""
- #| "Two sub-options to limit the use of PDiffs are also available: With "
- #| "<literal>FileLimit</literal> can be specified how many PDiff files are "
- #| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
- #| "other hand is the maximum percentage of the size of all patches compared "
- #| "to the size of the targeted file. If one of these limits is exceeded the "
- #| "complete file is downloaded instead of the patches."
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:295
  msgid ""
  "Two sub-options to limit the use of PDiffs are also available: With "
  "<literal>FileLimit</literal> can be specified how many PDiff files are "
- "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
- "other hand is the maximum precentage of the size of all patches compared to "
+ "downloaded at most to update a file. <literal>SizeLimit</literal> on the "
+ "other hand is the maximum percentage of the size of all patches compared to "
  "the size of the targeted file. If one of these limits is exceeded the "
  "complete file is downloaded instead of the patches."
  msgstr ""
  "Es sind außerdem zwei Unteroptionen verfügbar, um die Benutzung von PDiffs "
  "zu begrenzen: Mit <literal>FileLimit</literal> kann angegeben werden, wie "
  "viele PDiff-Dateien höchstens heruntergeladen werden, um eine Datei zu "
- "reparieren. Andererseits gibt <literal>SizeLimit</literal> die maximale "
+ "aktualisieren. Andererseits gibt <literal>SizeLimit</literal> die maximale "
  "Prozentzahl der Größe aller Patches im Vergleich zur Zieldatei an. Wenn eine "
  "dieser Begrenzungen überschritten wird, wird die komplette Datei anstelle "
  "der Patche heruntergeladen."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
- msgid "Queue-Mode"
- msgstr "Queue-Mode"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:305
  msgid ""
  "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
  "literal> or <literal>access</literal> which determines how APT parallelizes "
@@@ -6239,13 -4998,8 +5014,8 @@@ msgstr "
  "geöffnet wird, <literal>access</literal> bedeutet, dass eine Verbindung pro "
  "URI-Art geöffnet wird."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:294
- msgid "Retries"
- msgstr "Retries"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:295
+ #: apt.conf.5.xml:313
  msgid ""
  "Number of retries to perform. If this is non-zero APT will retry failed "
  "files the given number of times."
@@@ -6253,28 -5007,18 +5023,18 @@@ msgstr "
  "Anzahl der auszuführenden erneuten Versuche. Wenn dies nicht Null ist, wird "
  "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:299
- msgid "Source-Symlinks"
- msgstr "Source-Symlinks"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:300
+ #: apt.conf.5.xml:318
  msgid ""
  "Use symlinks for source archives. If set to true then source archives will "
  "be symlinked when possible instead of copying. True is the default."
  msgstr ""
- "Symbolische Verweise für Quellarchive benutzen. Wenn dies auf true gesetzt "
+ "benutzt symbolische Verweise für Quellarchive. Falls dies auf true gesetzt "
  "ist, werden Quellarchive, wenn möglich, symbolisch verknüpft, anstatt "
  "kopiert zu werden. True ist die Vorgabe."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:304 sources.list.5.xml:144
- msgid "http"
- msgstr "http"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:305
+ #: apt.conf.5.xml:323
  msgid ""
  "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
  "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@@ -6292,7 -5036,7 +5052,7 @@@ msgstr "
  "die Umgebungsvariable <envar>http_proxy</envar> benutzt."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:313
+ #: apt.conf.5.xml:331
  msgid ""
  "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
  "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@@ -6318,7 -5062,7 +5078,7 @@@ msgstr "
  "unterstützt keine dieser Optionen."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:323 apt.conf.5.xml:387
+ #: apt.conf.5.xml:341 apt.conf.5.xml:407
  msgid ""
  "The option <literal>timeout</literal> sets the timeout timer used by the "
  "method, this applies to all things including connection timeout and data "
@@@ -6329,27 -5073,36 +5089,36 @@@ msgstr "
  "Dinge, einschließlich Verbindungs- und Datenzeitüberschreitungen, angewandt."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:326
- msgid ""
- "One setting is provided to control the pipeline depth in cases where the "
- "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
- "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
- "indicating how many outstanding requests APT should send. A value of zero "
- "MUST be specified if the remote host does not properly linger on TCP "
- "connections - otherwise data corruption will occur. Hosts which require this "
- "are in violation of RFC 2068."
- msgstr ""
- "Eine Einstellung wird bereitgestellt, um die Tiefe der Warteschlange in "
- "Fällen zu steuern, in denen der andere Server nicht RFC-konform oder "
- "fehlerhaft (so wie Squid 2.0.2) ist. <literal>Acquire::http::Pipeline-Depth</"
- "literal> kann ein Wert von 0 bis 5 sein, der anzeigt, wie viele ausstehende "
- "Anfragen APT senden soll. Ein Wert von Null MUSS angegeben werden, falls der "
- "andere Server nicht ordnungsgemäß auf TCP-Verbindungen wartet – anderenfalls "
- "werden fehlerhafte Daten erscheinen. Rechner, die dies erfordern, verstoßen "
- "gegen RFC 2068."
+ #: apt.conf.5.xml:344
+ msgid ""
+ "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+ "enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
+ "g. on high-latency connections. It specifies how many requests are send in a "
+ "pipeline.  Previous APT versions had a default of 10 for this setting, but "
+ "the default value is now 0 (= disabled) to avoid problems with the ever-"
+ "growing amount of webservers and proxies which choose to not conform to the "
+ "HTTP/1.1 specification."
+ msgstr ""
+ "Die Einstellung <literal>Acquire::http::Pipeline-Depth</literal> kann "
+ "verwandt werden, um HTTP-Weiterleitung zu aktivieren (RFC 2616 Abschnitt "
+ "8.1.2.2), was z.B. bei Verbindungen mit hoher Latenz vorteilhaft sein kann. "
+ "Sie gibt an, wieviele Anfragen in eine Weiterleitung gesandt werden. Frühere "
+ "APT-Versionen hatten eine Vorgabe von 10 für diese Einstellung, aber der "
+ "Vorgabewert ist nun 0 (=deaktiviert), um Probleme mit der immer weiter "
+ "anwachsenden Zahl von Webservern und Proxies zu vermeiden, die nicht der "
+ "HTTP/1.1-Spezifikation entsprechen."
+ 
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:351
+ msgid ""
+ "<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
+ "redirects, which is enabled by default."
+ msgstr ""
+ "<literal>Acquire::http::AllowRedirect</literal> steuert, ob APT Umleitungen "
+ "folgen wird, was standardmäßig aktiviert ist."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:334
+ #: apt.conf.5.xml:354
  msgid ""
  "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
  "literal> which accepts integer values in kilobyte. The default value is 0 "
@@@ -6365,7 -5118,7 +5134,7 @@@ msgstr "
  "deaktiviert.)"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:339
+ #: apt.conf.5.xml:359
  msgid ""
  "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
  "User-Agent for the http download method as some proxies allow access for "
@@@ -6376,13 -5129,8 +5145,8 @@@ msgstr "
  "einige Proxys den Clients nur dann Zugriff gewähren, wenn der Client einen "
  "bekannten Bezeichner verwendet."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:345
- msgid "https"
- msgstr "https"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:346
+ #: apt.conf.5.xml:366
  msgid ""
  "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
  "options are the same as for <literal>http</literal> method and will also "
@@@ -6397,7 -5145,7 +5161,7 @@@ msgstr "
  "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:352
+ #: apt.conf.5.xml:372
  msgid ""
  "<literal>CaInfo</literal> suboption specifies place of file that holds info "
  "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@@ -6435,13 -5183,8 +5199,8 @@@ msgstr "
  "Zeichenketten »TLSv1« oder »SSLv3« enthalten. <literal>&lt;host&gt;::"
  "SslForceVersion</literal> ist die entsprechende per-Host-Option."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:370 sources.list.5.xml:155
- msgid "ftp"
- msgstr "ftp"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:371
+ #: apt.conf.5.xml:391
  msgid ""
  "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
  "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@@ -6460,7 -5203,7 +5219,7 @@@
  msgstr ""
  "FTP-URIs; ftp::Proxy ist der zu benutzende Standard-FTP-Proxy. Er wird "
  "standardmäßig in der Form <literal>ftp://[[Anwender][:Passwort]@]Host[:Port]/"
- "</literal> angegeben. pro-Host-Proxys kann außerdem in der Form "
+ "</literal> angegeben. per-Host-Proxys kann außerdem in der Form "
  "<literal>ftp::Proxy::&lt;host&gt;</literal> angegeben werden. Hierbei "
  "bedeutet das spezielle Schlüsselwort <literal>DIRECT</literal>, dass keine "
  "Proxys benutzt werden. Falls keine der obigen Einstellungen angegeben wurde, "
@@@ -6476,7 -5219,7 +5235,7 @@@
  "entsprechenden URI-Bestandteil genommen."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:390
+ #: apt.conf.5.xml:410
  msgid ""
  "Several settings are provided to control passive mode. Generally it is safe "
  "to leave passive mode on, it works in nearly every environment.  However "
@@@ -6493,21 -5236,21 +5252,21 @@@ msgstr "
  "Beispielskonfiguration, um Beispiele zu erhalten)."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:397
+ #: apt.conf.5.xml:417
  msgid ""
  "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
  "envar> environment variable to a http url - see the discussion of the http "
  "method above for syntax. You cannot set this in the configuration file and "
  "it is not recommended to use FTP over HTTP due to its low efficiency."
  msgstr ""
- "Es ist möglich FTP über HTTP zu leiten, indem die Umgebungsvariable "
+ "Es ist möglich, FTP über HTTP zu leiten, indem die Umgebungsvariable "
  "<envar>ftp_proxy</envar> auf eine HTTP-Url gesetzt wird – lesen Sie die "
  "Besprechung der HTTP-Methode oberhalb bezüglich der Syntax. Sie können dies "
  "nicht in der Konfigurationsdatei setzen und es wird wegen der geringen "
  "Effizienz nicht empfohlen FTP über HTTP zu benutzen."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:402
+ #: apt.conf.5.xml:422
  msgid ""
  "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
  "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@@ -6522,19 -5265,14 +5281,14 @@@ msgstr "
  "Benutzung selbst auf IPv4-Verbindungen. Beachten Sie, dass die wenigsten FTP-"
  "Server RFC2428 unterstützen."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:409 sources.list.5.xml:137
- msgid "cdrom"
- msgstr "cdrom"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:415
+ #: apt.conf.5.xml:435
  #, no-wrap
  msgid "/cdrom/::Mount \"foo\";"
  msgstr "/cdrom/::Mount \"foo\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:410
+ #: apt.conf.5.xml:430
  msgid ""
  "CDROM URIs; the only setting for CDROM URIs is the mount point, "
  "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@@ -6555,13 -5293,8 +5309,8 @@@ msgstr "
  "einzufügen. Der abschließende Schrägstrich ist wichtig. Aushängebefehle "
  "können per UMount angegeben werden."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:420
- msgid "gpgv"
- msgstr "gpgv"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:421
+ #: apt.conf.5.xml:441
  msgid ""
  "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
  "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@@ -6571,19 -5304,14 +5320,14 @@@ msgstr "
  "Parameter an gpgv weiterzuleiten. <literal>gpgv::Options</literal> "
  "Zusätzliche Parameter werden an gpgv weitergeleitet."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:426
- msgid "CompressionTypes"
- msgstr "CompressionTypes"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:432
+ #: apt.conf.5.xml:452
  #, no-wrap
  msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
  msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:427
+ #: apt.conf.5.xml:447
  msgid ""
  "List of compression types which are understood by the acquire methods.  "
  "Files like <filename>Packages</filename> can be available in various "
@@@ -6593,9 -5321,9 +5337,9 @@@
  "the fly or the used method can be changed. The syntax for this is: "
  "<placeholder type=\"synopsis\" id=\"0\"/>"
  msgstr ""
- "Die List der Kompressionstypen die von den »aquire«-Methoden verstanden "
+ "Liste der Kompressionstypen die von den »acquire«-Methoden verstanden "
  "werden. Dateien wie <filename>Packages</filename> können in verschiedenen "
- "Kompressionsformaten verfügbar sein. Standardmäßig können die »aquire«-"
+ "Kompressionsformaten verfügbar sein. Standardmäßig können die »acquire«-"
  "Methoden <command>bzip2</command>-, <command>lzma</command>- und "
  "<command>gzip</command>-komprimierte Dateien dekomprimieren. Mit dieser "
  "Einstellung können spontan weiter Formate hinzugefügt oder die benutzte "
@@@ -6603,19 -5331,19 +5347,19 @@@
  "\"synopsis\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:437
+ #: apt.conf.5.xml:457
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order:: \"gz\";"
  msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:440
+ #: apt.conf.5.xml:460
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:433
+ #: apt.conf.5.xml:453
  msgid ""
  "Also the <literal>Order</literal> subgroup can be used to define in which "
  "order the acquire system will try to download the compressed files. The "
@@@ -6631,8 -5359,8 +5375,8 @@@
  "<literal>bz2</literal> explicit to the list as it will be added automatic."
  msgstr ""
  "Außerdem kann die Untergruppe <literal>Order</literal> benutzt werden, um zu "
- "definieren, in welcher Reihenfolge das »aquire«-System die komprimierten "
- "Dateien herunterzuladen versucht. Das »aquire«-System wird die erste "
+ "definieren, in welcher Reihenfolge das »acquire«-System die komprimierten "
+ "Dateien herunterzuladen versucht. Das »acquire«-System wird die erste "
  "versuchen und mit dem nächsten Kompressionstyp in dieser Liste bei einem "
  "Fehler fortfahren. Um daher einen nach dem anderen Typ vorzuziehen, fügen "
  "Sie einfach den bevorzugten Typ zuerst in die Liste – noch nicht "
@@@ -6646,32 -5374,20 +5390,20 @@@
  "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:444
+ #: apt.conf.5.xml:464
  #, no-wrap
  msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
  msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:442
- #, fuzzy
- #| msgid ""
- #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
- #| "replaceable></literal> will be checked: If this setting exists the method "
- #| "will only be used if this file exists, e.g. for the bzip2 method (the "
- #| "inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
- #| "also that list entries specified on the command line will be added at the "
- #| "end of the list specified in the configuration files, but before the "
- #| "default entries. To prefer a type in this case over the ones specified in "
- #| "the configuration files you can set the option direct - not in list "
- #| "style.  This will not override the defined list, it will only prefix the "
- #| "list with this type."
+ #: apt.conf.5.xml:462
  msgid ""
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
  "will only be used if this file exists, e.g. for the bzip2 method (the "
- "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
- "that list entries specified on the command line will be added at the end of "
- "the list specified in the configuration files, but before the default "
+ "inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+ "also that list entries specified on the command line will be added at the "
+ "end of the list specified in the configuration files, but before the default "
  "entries. To prefer a type in this case over the ones specified in the "
  "configuration files you can set the option direct - not in list style.  This "
  "will not override the defined list, it will only prefix the list with this "
@@@ -6690,16 -5406,10 +5422,10 @@@ msgstr "
  "wird diesen Typ nur vor die Liste setzen."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:449
- #, fuzzy
- #| msgid ""
- #| "The special type <literal>uncompressed</literal> can be used to give "
- #| "uncompressed files a preference, but note that most archives don't "
- #| "provide uncompressed files so this is mostly only useable for local "
- #| "mirrors."
+ #: apt.conf.5.xml:469
  msgid ""
  "The special type <literal>uncompressed</literal> can be used to give "
- "uncompressed files a preference, but note that most archives doesn't provide "
+ "uncompressed files a preference, but note that most archives don't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
  "Der besondere Typ <literal>uncompressed</literal> kann benutzt werden, um "
@@@ -6707,13 -5417,8 +5433,8 @@@
  "die meisten Archive keine unkomprimierten Dateien bereitstellen, so dass "
  "dies meist nur für lokale Spiegel benutzt werden kann."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:454
- msgid "GzipIndexes"
- msgstr "GzipIndexes"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:456
+ #: apt.conf.5.xml:476
  msgid ""
  "When downloading <literal>gzip</literal> compressed indexes (Packages, "
  "Sources, or Translations), keep them gzip compressed locally instead of "
@@@ -6726,13 -5431,8 +5447,8 @@@ msgstr "
  "CPU-Ressourcen bei der Erstellung des lokalen Paket-Caches. Vorgabe ist "
  "False."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:463
- msgid "Languages"
- msgstr "Sprachen"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:464
+ #: apt.conf.5.xml:484
  msgid ""
  "The Languages subsection controls which <filename>Translation</filename> "
  "files are downloaded and in which order APT tries to display the Description-"
@@@ -6754,13 -5454,13 +5470,13 @@@ msgstr "
  "hier unmögliche Werte einsetzen."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
- #: apt.conf.5.xml:480
+ #: apt.conf.5.xml:500
  #, no-wrap
  msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
  msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:470
+ #: apt.conf.5.xml:490
  msgid ""
  "The default list includes \"environment\" and \"en\". "
  "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@@ -6801,8 -5501,22 +5517,22 @@@ msgstr "
  "französischen Lokalisierung benutzt wird. In einer solchen Umgebung wäre die "
  "Reihenfolge »fr, de, en«. <placeholder type=\"programlisting\" id=\"0\"/>"
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:501
+ msgid ""
+ "Note: To prevent problems resulting from APT being executed in different "
+ "environments (e.g. by different users or by other programs) all Translation "
+ "files which are found in <filename>/var/lib/apt/lists/</filename> will be "
+ "added to the end of the list (after an implicit \"<literal>none</literal>\")."
+ msgstr ""
+ "Hinweis: Um Problemen vorzubeugen, die daher kommen, dass APT in "
+ "unterschiedlichen Umgebungen ausgeführt wird (z.B. durch verschiedene "
+ "Benutzer oder durch andere Programme) werden alle Übersetzungsdateien, die "
+ "in <filename>/var/lib/apt/lists/</filename> gefunden werden, an das Ende der "
+ "Liste hinzugefügt (nach einem impliziten »<literal>none</literal>«)."
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:245
+ #: apt.conf.5.xml:254
  msgid ""
  "The <literal>Acquire</literal> group of options controls the download of "
  "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@@ -6812,32 -5526,32 +5542,32 @@@ msgstr "
  "id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:487
+ #: apt.conf.5.xml:512
  msgid "Directories"
  msgstr "Verzeichnisse"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:489
+ #: apt.conf.5.xml:514
  msgid ""
  "The <literal>Dir::State</literal> section has directories that pertain to "
  "local state information. <literal>lists</literal> is the directory to place "
  "downloaded package lists in and <literal>status</literal> is the name of the "
  "dpkg status file.  <literal>preferences</literal> is the name of the APT "
- "preferences file.  <literal>Dir::State</literal> contains the default "
- "directory to prefix on all sub items if they do not start with <filename>/</"
- "filename> or <filename>./</filename>."
+ "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
+ "contains the default directory to prefix on all sub items if they do not "
+ "start with <filename>/</filename> or <filename>./</filename>."
  msgstr ""
  "Der <literal>Dir::State</literal>-Abschnitt hat Verzeichnisse, die zu "
  "lokalen Statusinformationen gehören. <literal>lists</literal> ist das "
  "Verzeichnis, in das heruntergeladene Paketlisten platziert werden und "
  "<literal>status</literal> ist der Name der Dpkg-Statusdatei. "
- "<literal>preferences</literal> ist der Name der APT-Einstellungsdatei. "
- "<literal>Dir::State</literal> enthält das Standardverzeichnis, das allen "
- "Unterelementen vorangestellt wird, falls sie nicht mit <filename>/</"
- "filename> oder <filename>./</filename> beginnen."
+ "<literal>preferences</literal> ist der Name der APT-<filename>preferences</"
+ "filename>-Datei. <literal>Dir::State</literal> enthält das "
+ "Standardverzeichnis, das allen Unterelementen vorangestellt wird, falls sie "
+ "nicht mit <filename>/</filename> oder <filename>./</filename> beginnen."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:496
+ #: apt.conf.5.xml:521
  msgid ""
  "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
  "information, such as the two package caches <literal>srcpkgcache</literal> "
@@@ -6855,12 -5569,12 +5585,12 @@@ msgstr "
  "<literal>Dir::Cache::archives</literal>. Die Generierung von "
  "Zwischenspeichern kann ausgeschaltet werden, indem ihre Namen leer gelassen "
  "werden. Dies wird den Start verlangsamen, aber Plattenplatz sparen. Es ist "
- "vermutlich vorzuziehen, statt des »pkgcache«s den »srcpkgcache« "
+ "vermutlich vorzuziehen, statt des »srcpkgcache«s den »pkgcache« "
  "auszuschalten. Wie <literal>Dir::State</literal> ist das Standardverzeichnis "
  "in <literal>Dir::Cache</literal> enthalten."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:505
+ #: apt.conf.5.xml:530
  msgid ""
  "<literal>Dir::Etc</literal> contains the location of configuration files, "
  "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@@ -6875,7 -5589,7 +5605,7 @@@ msgstr "
  "Konfigurationsdatei erfolgt)."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:511
+ #: apt.conf.5.xml:536
  msgid ""
  "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
  "in lexical order from the directory specified. After this is done then the "
@@@ -6887,7 -5601,7 +5617,7 @@@ msgstr "
  "geladen."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:515
+ #: apt.conf.5.xml:540
  msgid ""
  "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
  "Bin::Methods</literal> specifies the location of the method handlers and "
@@@ -6905,7 -5619,7 +5635,7 @@@ msgstr "
  "Programms an."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:523
+ #: apt.conf.5.xml:548
  msgid ""
  "The configuration item <literal>RootDir</literal> has a special meaning.  If "
  "set, all paths in <literal>Dir::</literal> will be relative to "
@@@ -6925,7 -5639,7 +5655,7 @@@ msgstr "
  "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:536
+ #: apt.conf.5.xml:561
  msgid ""
  "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
  "which files APT should silently ignore while parsing the files in the "
@@@ -6939,16 -5653,16 +5669,16 @@@ msgstr "
  "stillschweigend ignorieren sollte. Standardmäßig werden Dateien, die auf "
  "<literal>.disabled</literal>, <literal>~</literal>, <literal>.bak</literal> "
  "oder <literal>.dpkg-[a-z]+</literal> endenn stillschweigend ignoriert. Wie "
- "bei den letzten Vorgabwerten gesehen, kann die Syntax für reguläre Ausdrücke "
- "verwandt werden."
+ "beim letzten Vorgabewert gesehen, kann die Syntax für reguläre Ausdrücke für "
+ "diese Muster verwandt werden."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:545
+ #: apt.conf.5.xml:570
  msgid "APT in DSelect"
  msgstr "APT in DSelect"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:547
+ #: apt.conf.5.xml:572
  msgid ""
  "When APT is used as a &dselect; method several configuration directives "
  "control the default behaviour. These are in the <literal>DSelect</literal> "
@@@ -6958,13 -5672,8 +5688,8 @@@ msgstr "
  "Konfigurationsdirektiven das Standardverhalten. Diese stehen im Abschnitt "
  "<literal>DSelect</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:551
- msgid "Clean"
- msgstr "Clean"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:552
+ #: apt.conf.5.xml:577
  msgid ""
  "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
  "and never.  always and prompt will remove all packages from the cache after "
@@@ -6982,7 -5691,7 +5707,7 @@@ msgstr "
  "führt diese Aktion vor dem Herunterladen neuer Pakete durch."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:561
+ #: apt.conf.5.xml:586
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the install phase."
@@@ -6990,13 -5699,8 +5715,8 @@@ msgstr "
  "Die Inhalte dieser Variablen werden als Befehlszeilenoptionen an &apt-get; "
  "übermittelt, wenn es für die Installationsphase durchlaufen wird."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:565
- msgid "Updateoptions"
- msgstr "Updateoptions"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:566
+ #: apt.conf.5.xml:591
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the update phase."
@@@ -7004,13 -5708,8 +5724,8 @@@ msgstr "
  "Die Inhalte dieser Variable werden als Befehlszeilenoptionen an &apt-get; "
  "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:570
- msgid "PromptAfterUpdate"
- msgstr "PromptAfterUpdate"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:571
+ #: apt.conf.5.xml:596
  msgid ""
  "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
  "The default is to prompt only on error."
@@@ -7019,12 -5718,12 +5734,12 @@@ msgstr "
  "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:577
+ #: apt.conf.5.xml:602
  msgid "How APT calls dpkg"
  msgstr "Wie APT Dpkg aufruft"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:578
+ #: apt.conf.5.xml:603
  msgid ""
  "Several configuration directives control how APT invokes &dpkg;. These are "
  "in the <literal>DPkg</literal> section."
@@@ -7033,7 -5732,7 +5748,7 @@@ msgstr "
  "stehen im Abschnitt <literal>DPkg</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:583
+ #: apt.conf.5.xml:608
  msgid ""
  "This is a list of options to pass to dpkg. The options must be specified "
  "using the list notation and each list item is passed as a single argument to "
@@@ -7043,18 -5742,8 +5758,8 @@@ msgstr "
  "Optionen müssen unter Benutzung der Listenschreibweise angegeben werden und "
  "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Pre-Invoke"
- msgstr "Pre-Invoke"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Post-Invoke"
- msgstr "Post-Invoke"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:589
+ #: apt.conf.5.xml:614
  msgid ""
  "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -7067,13 -5756,8 +5772,8 @@@ msgstr "
  "mit <filename>/bin/sh</filename> aufgerufen, sollte einer fehlschlagen, wird "
  "APT abgebrochen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:595
- msgid "Pre-Install-Pkgs"
- msgstr "Pre-Install-Pkgs"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:596
+ #: apt.conf.5.xml:621
  msgid ""
  "This is a list of shell commands to run before invoking dpkg. Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -7090,7 -5774,7 +5790,7 @@@ msgstr "
  "pro Zeile."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:602
+ #: apt.conf.5.xml:627
  msgid ""
  "Version 2 of this protocol dumps more information, including the protocol "
  "version, the APT configuration space and the packages, files and versions "
@@@ -7105,13 -5789,8 +5805,8 @@@ msgstr "
  "<literal>cmd</literal> ist ein Befehl, der an <literal>Pre-Install-Pkgs</"
  "literal> gegeben wird."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:609
- msgid "Run-Directory"
- msgstr "Run-Directory"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:610
+ #: apt.conf.5.xml:635
  msgid ""
  "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
  "</filename>."
@@@ -7119,13 -5798,8 +5814,8 @@@ msgstr "
  "APT wechselt mit chdir in dieses Verzeichnis, bevor Dpkg aufgerufen wird, "
  "die Vorgabe ist <filename>/</filename>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:614
- msgid "Build-options"
- msgstr "Build-options"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:615
+ #: apt.conf.5.xml:640
  msgid ""
  "These options are passed to &dpkg-buildpackage; when compiling packages, the "
  "default is to disable signing and produce all binaries."
@@@ -7135,12 -5809,12 +5825,12 @@@ msgstr "
  "Programme werden erstellt."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt.conf.5.xml:620
+ #: apt.conf.5.xml:645
  msgid "dpkg trigger usage (and related options)"
- msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)"
+ msgstr "Dpkd-Trigger-Benutzung (und zugehörige Optionen)"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:621
+ #: apt.conf.5.xml:646
  msgid ""
  "APT can call dpkg in a way so it can make aggressive use of triggers over "
  "multiple calls of dpkg. Without further options dpkg will use triggers only "
@@@ -7167,7 -5841,7 +5857,7 @@@ msgstr "
  "konfiguriert werden."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
- #: apt.conf.5.xml:636
+ #: apt.conf.5.xml:661
  #, no-wrap
  msgid ""
  "DPkg::NoTriggers \"true\";\n"
@@@ -7181,7 -5855,7 +5871,7 @@@ msgstr "
  "DPkg::TriggersPending \"true\";"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:630
+ #: apt.conf.5.xml:655
  msgid ""
  "Note that it is not guaranteed that APT will support these options or that "
  "these options will not cause (big) trouble in the future. If you have "
@@@ -7205,13 -5879,8 +5895,8 @@@ msgstr "
  "Sie z.B. <command>dpkg --audit</command>. Eine defensive Optionenkombination "
  "wäre <placeholder type=\"literallayout\" id=\"0\"/>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:642
- msgid "DPkg::NoTriggers"
- msgstr "DPkg::NoTriggers"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:643
+ #: apt.conf.5.xml:668
  msgid ""
  "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
  "call).  See &dpkg; if you are interested in what this actually means. In "
@@@ -7221,7 -5890,7 +5906,7 @@@
  "Previously these option only append --no-triggers to the configure calls to "
  "dpkg - now apt will add these flag also to the unpack and remove calls."
  msgstr ""
- "Die keine-Trigger-Markierung zu allen Dpkg-Aufrufen hinzufügen (ausgenommen "
+ "fügt die keine-Trigger-Markierung zu allen Dpkg-Aufrufen hinzu (ausgenommen "
  "den ConfigurePending-Aufruf). Siehe &dpkg;, wenn Sie interessiert sind, was "
  "dies tatsächlich bedeutet. In Kürze: Dpkg wird die Trigger nicht ausführen, "
  "dann ist diese Markierung vorhanden, außer sie wird explizit aufgerufen, um "
@@@ -7231,13 -5900,8 +5916,8 @@@
  "an die Konfigurationsaufrufe für Dpkg an – nun wird APT diese Markierung "
  "außerdem an die »unpack«- und »remove«-Aufrufe anhängen."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:650
- msgid "PackageManager::Configure"
- msgstr "PackageManager::Configure"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:651
+ #: apt.conf.5.xml:676
  msgid ""
  "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
  "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@@ -7265,13 -5929,8 +5945,8 @@@ msgstr "
  "anderenfalls in einem nicht konfigurierten Status enden könnte, der nicht "
  "mehr startbar sein könnte."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:661
- msgid "DPkg::ConfigurePending"
- msgstr "DPkg::ConfigurePending"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:662
+ #: apt.conf.5.xml:687
  msgid ""
  "If this option is set apt will call <command>dpkg --configure --pending</"
  "command> to let dpkg handle all required configurations and triggers. This "
@@@ -7289,13 -5948,8 +5964,8 @@@ msgstr "
  "könnten Sie diese Option außer in allen außer der letzten Ausführung "
  "deaktivieren."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:668
- msgid "DPkg::TriggersPending"
- msgstr "DPkg::TriggersPending"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:669
+ #: apt.conf.5.xml:694
  msgid ""
  "Useful for <literal>smart</literal> configuration as a package which has "
  "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@@ -7303,20 -5957,15 +5973,15 @@@
  "for Pre-Dependencies (see debbugs #526774). Note that this will process all "
  "triggers, not only the triggers needed to configure this package."
  msgstr ""
- "Nützlich für <literal>smart</literal>-Konfiguration, da ein Paket mit "
+ "nützlich für <literal>smart</literal>-Konfiguration, da ein Paket mit "
  "ausstehenden Triggern nicht als <literal>installed</literal> angesehen wird "
  "und Dpkg es als aktuell entpackt betrachtet, was ein Hemmschuh für Pre-"
  "Dependencies ist (siehe Debian-Fehler #526774). Beachten Sie, dass dies alle "
  "Trigger ausführt, nicht nur die Trigger, die zum Konfigurieren dieses Pakets "
  "benötigt werden."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:674
- msgid "PackageManager::UnpackAll"
- msgstr "PackageManager::UnpackAll"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:675
+ #: apt.conf.5.xml:700
  msgid ""
  "As the configuration can be deferred to be done at the end by dpkg it can be "
  "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@@ -7334,13 -5983,8 +5999,8 @@@ msgstr "
  "literal>-Methode nicht benutzt, so dass diese Methode sehr experimentell ist "
  "und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:682
- msgid "OrderList::Score::Immediate"
- msgstr "OrderList::Score::Immediate"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:690
+ #: apt.conf.5.xml:715
  #, no-wrap
  msgid ""
  "OrderList::Score {\n"
@@@ -7358,7 -6002,7 +6018,7 @@@ msgstr "
  "};"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:683
+ #: apt.conf.5.xml:708
  msgid ""
  "Essential packages (and there dependencies) should be configured immediately "
  "after unpacking. It will be a good idea to do this quite early in the "
@@@ -7382,12 -6026,12 +6042,12 @@@ msgstr "
  "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:703
+ #: apt.conf.5.xml:728
  msgid "Periodic and Archives options"
  msgstr "Periodische- und Archivoptionen"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:704
+ #: apt.conf.5.xml:729
  msgid ""
  "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
  "of options configure behavior of apt periodic updates, which is done by "
@@@ -7401,12 -6045,12 +6061,12 @@@ msgstr "
  "Dokumentation dieser Optionen zu erhalten."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:712
+ #: apt.conf.5.xml:737
  msgid "Debug options"
  msgstr "Fehlersuchoptionen"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:714
+ #: apt.conf.5.xml:739
  msgid ""
  "Enabling options in the <literal>Debug::</literal> section will cause "
  "debugging information to be sent to the standard error stream of the program "
@@@ -7424,7 -6068,7 +6084,7 @@@ msgstr "
  "könnten es sein:"
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:725
+ #: apt.conf.5.xml:750
  msgid ""
  "<literal>Debug::pkgProblemResolver</literal> enables output about the "
  "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@@ -7435,7 -6079,7 +6095,7 @@@ msgstr "
  "getroffenen Entscheidungen ein."
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:733
+ #: apt.conf.5.xml:758
  msgid ""
  "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
  "used to run some operations (for instance, <literal>apt-get -s install</"
@@@ -7446,7 -6090,7 +6106,7 @@@ msgstr "
  "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen."
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:742
+ #: apt.conf.5.xml:767
  msgid ""
  "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
  "time that <literal>apt</literal> invokes &dpkg;."
@@@ -7458,7 -6102,7 +6118,7 @@@ msgstr "
  #. 	   motivating example, except I haven't a clue why you'd want
  #. 	   to do this. 
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:750
+ #: apt.conf.5.xml:775
  msgid ""
  "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
  "in CDROM IDs."
@@@ -7467,233 -6111,148 +6127,148 @@@ msgstr "
  "Daten in CD-ROM-IDs aus."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:760
+ #: apt.conf.5.xml:785
  msgid "A full list of debugging options to apt follows."
  msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:765
- msgid "<literal>Debug::Acquire::cdrom</literal>"
- msgstr "<literal>Debug::Acquire::cdrom</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:769
+ #: apt.conf.5.xml:794
  msgid ""
  "Print information related to accessing <literal>cdrom://</literal> sources."
  msgstr ""
- "Gibt Informationen aus, die sich auf Zugriffe von <literal>cdrom://</"
+ "gibt Informationen aus, die sich auf Zugriffe von <literal>cdrom://</"
  "literal>-Quellen beziehen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:776
- msgid "<literal>Debug::Acquire::ftp</literal>"
- msgstr "<literal>Debug::Acquire::ftp</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:780
+ #: apt.conf.5.xml:805
  msgid "Print information related to downloading packages using FTP."
  msgstr ""
- "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
+ "gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
  "beziehen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:787
- msgid "<literal>Debug::Acquire::http</literal>"
- msgstr "<literal>Debug::Acquire::http</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:791
+ #: apt.conf.5.xml:816
  msgid "Print information related to downloading packages using HTTP."
  msgstr ""
- "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
+ "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
  "beziehen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:798
- msgid "<literal>Debug::Acquire::https</literal>"
- msgstr "<literal>Debug::Acquire::https</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:802
+ #: apt.conf.5.xml:827
  msgid "Print information related to downloading packages using HTTPS."
  msgstr ""
- "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
+ "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
  "beziehen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:809
- msgid "<literal>Debug::Acquire::gpgv</literal>"
- msgstr "<literal>Debug::Acquire::gpgv</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:813
+ #: apt.conf.5.xml:838
  msgid ""
  "Print information related to verifying cryptographic signatures using "
  "<literal>gpg</literal>."
  msgstr ""
- "Gibt Informationen aus, die sich auf das Prüfen kryptografischer Signaturen "
+ "gibt Informationen aus, die sich auf das Prüfen kryptografischer Signaturen "
  "mittels <literal>gpg</literal> beziehen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:820
- msgid "<literal>Debug::aptcdrom</literal>"
- msgstr "<literal>Debug::aptcdrom</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:824
+ #: apt.conf.5.xml:849
  msgid ""
  "Output information about the process of accessing collections of packages "
  "stored on CD-ROMs."
  msgstr ""
- "Informationen über den Zugriffsprozess auf Paketsammlungen ausgeben, die auf "
+ "gibt Informationen über den Zugriffsprozess auf Paketsammlungen aus, die auf "
  "CD-ROMs gespeichert sind."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:831
- msgid "<literal>Debug::BuildDeps</literal>"
- msgstr "<literal>Debug::BuildDeps</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:834
+ #: apt.conf.5.xml:859
  msgid "Describes the process of resolving build-dependencies in &apt-get;."
  msgstr ""
- "Beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:841
- msgid "<literal>Debug::Hashes</literal>"
- msgstr "<literal>Debug::Hashes</literal>"
+ "beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:844
+ #: apt.conf.5.xml:869
  msgid ""
  "Output each cryptographic hash that is generated by the <literal>apt</"
  "literal> libraries."
  msgstr ""
- "Jeden kryptografischen Hash ausgeben, der von den <literal>apt</literal>-"
+ "gibt jeden kryptografischen Hash aus, der von den <literal>apt</literal>-"
  "Bibliotheken generiert wurde."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:851
- msgid "<literal>Debug::IdentCDROM</literal>"
- msgstr "<literal>Debug::IdentCDROM</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:854
+ #: apt.conf.5.xml:879
  msgid ""
  "Do not include information from <literal>statfs</literal>, namely the number "
  "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
  "a CD-ROM."
  msgstr ""
- "Keine Informationen von <literal>statfs</literal> einschließen, und zwar die "
+ "schließt keine Informationen von <literal>statfs</literal> ein, und zwar die "
  "Anzahl der benutzten und freien Blöcke auf dem CD-ROM-Dateisystem, wenn eine "
  "ID für eine CD-ROM generiert wird."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:862
- msgid "<literal>Debug::NoLocking</literal>"
- msgstr "<literal>Debug::NoLocking</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:865
+ #: apt.conf.5.xml:890
  msgid ""
  "Disable all file locking.  For instance, this will allow two instances of "
  "<quote><literal>apt-get update</literal></quote> to run at the same time."
  msgstr ""
- "Jegliches Sperren von Dateien ausschalten. Dies wird zum Beispiel erlauben, "
+ "schaltet jegliches Sperren von Dateien aus. Dies wird zum Beispiel erlauben, "
  "dass zwei Instanzen von <quote><literal>apt-get update</literal></quote> zur "
  "gleichen Zeit laufen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:873
- msgid "<literal>Debug::pkgAcquire</literal>"
- msgstr "<literal>Debug::pkgAcquire</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:877
+ #: apt.conf.5.xml:902
  msgid "Log when items are added to or removed from the global download queue."
  msgstr ""
- "Protokollieren, wenn Elemente aus der globalen Warteschlange zum "
+ "protokolliert, wenn Elemente aus der globalen Warteschlange zum "
  "Herunterladen hinzugefügt oder entfernt werden."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:884
- msgid "<literal>Debug::pkgAcquire::Auth</literal>"
- msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:887
+ #: apt.conf.5.xml:912
  msgid ""
  "Output status messages and errors related to verifying checksums and "
  "cryptographic signatures of downloaded files."
  msgstr ""
- "Statusmeldungen und Fehler ausgeben, die sich auf das Prüfen von Prüfsummen "
+ "gibt Statusmeldungen und Fehler aus, die sich auf das Prüfen von Prüfsummen "
  "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:894
- msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
- msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:897
+ #: apt.conf.5.xml:922
  msgid ""
  "Output information about downloading and applying package index list diffs, "
  "and errors relating to package index list diffs."
  msgstr ""
- "Informationen über das Herunterladen und Anwenden von Paketindexlisten-Diffs "
- "und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:905
- msgid "<literal>Debug::pkgAcquire::RRed</literal>"
- msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
+ "gibt Informationen über das Herunterladen und Anwenden von Paketindexlisten-"
+ "Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, aus."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:909
+ #: apt.conf.5.xml:934
  msgid ""
  "Output information related to patching apt package lists when downloading "
  "index diffs instead of full indices."
  msgstr ""
- "Informationen ausgeben, die sich auf das Patchen von Paketlisten von APT "
+ "gibt Informationen aus, die sich auf das Patchen von Paketlisten von APT "
  "beziehen, wenn Index-Diffs anstelle vollständiger Indizes heruntergeladen "
  "werden."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:916
- msgid "<literal>Debug::pkgAcquire::Worker</literal>"
- msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:920
+ #: apt.conf.5.xml:945
  msgid ""
  "Log all interactions with the sub-processes that actually perform downloads."
  msgstr ""
- "Alle Interaktionen mit Unterprozessen protokollieren, die aktuell Downloads "
+ "protokolliert alle Interaktionen mit Unterprozessen, die aktuell Downloads "
  "durchführen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:927
- msgid "<literal>Debug::pkgAutoRemove</literal>"
- msgstr "<literal>Debug::pkgAutoRemove</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:931
+ #: apt.conf.5.xml:956
  msgid ""
  "Log events related to the automatically-installed status of packages and to "
  "the removal of unused packages."
  msgstr ""
- "Alle Ereignisse protokollieren, die sich auf den automatisch-installiert-"
+ "protokolliert alle Ereignisse, die sich auf den automatisch-installiert-"
  "Status von Paketen und auf das Entfernen von nicht benutzten Paketen "
  "beziehen."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:938
- msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
- msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:941
+ #: apt.conf.5.xml:966
  msgid ""
  "Generate debug messages describing which packages are being automatically "
  "installed to resolve dependencies.  This corresponds to the initial auto-"
@@@ -7701,20 -6260,15 +6276,15 @@@
  "to the full <literal>apt</literal> dependency resolver; see <literal>Debug::"
  "pkgProblemResolver</literal> for that."
  msgstr ""
- "Fehlersuchmeldungen generieren, die beschreiben, welche Pakete automatisch "
+ "generiert Fehlersuchmeldungen, die beschreiben, welche Pakete automatisch "
  "installiert werden, um Abhängigkeiten aufzulösen. Dies entspricht dem "
  "anfangs durchgeführten auto-install-Durchlauf, z.B. in <literal>apt-get "
  "install</literal> und nicht dem vollständigen <literal>apt</literal>-"
  "Abhängigkeitsauflöser. Lesen Sie dafür <literal>Debug::pkgProblemResolver</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:952
- msgid "<literal>Debug::pkgDepCache::Marker</literal>"
- msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:955
+ #: apt.conf.5.xml:980
  msgid ""
  "Generate debug messages describing which package is marked as keep/install/"
  "remove while the ProblemResolver does his work.  Each addition or deletion "
@@@ -7729,7 -6283,7 +6299,7 @@@
  "there is none or if it is the same version as the installed.  "
  "<literal>section</literal> is the name of the section the package appears in."
  msgstr ""
- "Generiert Fehlersuchmeldungen, die beschreiben, welches Paket als "
+ "generiert Fehlersuchmeldungen, die beschreiben, welches Paket als "
  "»keep«/»install«/»remove« markiert ist, während der ProblemResolver seine "
  "Arbeit verrichtet. Jedes Hinzufügen oder Löschen kann zusätzliche Aktionen "
  "auslösen. Sie werden nach zwei eingerückten Leerzeichen unter dem "
@@@ -7745,132 -6299,87 +6315,87 @@@
  "<literal>section</literal> ist der Name des Abschnitts, in dem das Paket "
  "erscheint."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:974
- msgid "<literal>Debug::pkgInitConfig</literal>"
- msgstr "<literal>Debug::pkgInitConfig</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:977
+ #: apt.conf.5.xml:1002
  msgid "Dump the default configuration to standard error on startup."
  msgstr ""
- "Die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe ausgeben."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:984
- msgid "<literal>Debug::pkgDPkgPM</literal>"
- msgstr "<literal>Debug::pkgDPkgPM</literal>"
+ "gibt die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe aus."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:987
+ #: apt.conf.5.xml:1012
  msgid ""
  "When invoking &dpkg;, output the precise command line with which it is being "
  "invoked, with arguments separated by a single space character."
  msgstr ""
- "Wenn &dpkg; aufgerufen wird, Ausgabe der genauen Befehlszeile mit der es "
+ "gibt, wenn &dpkg; aufgerufen wird, die genauen Befehlszeile mit der es "
  "aufgerufen wurde, mit Argumenten, die durch einzelne Leerzeichen getrennt "
- "sind."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:995
- msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
- msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
+ "sind, aus."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:998
+ #: apt.conf.5.xml:1023
  msgid ""
  "Output all the data received from &dpkg; on the status file descriptor and "
  "any errors encountered while parsing it."
  msgstr ""
- "Alle von &dpkg; empfangenen Daten über einen Status-Datei-Deskriptor und "
- "alle während deren Auswertung gefundenen Fehler ausgeben."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1005
- msgid "<literal>Debug::pkgOrderList</literal>"
- msgstr "<literal>Debug::pkgOrderList</literal>"
+ "gibt alle von &dpkg; empfangenen Daten über einen Status-Datei-Deskriptor "
+ "und alle während deren Auswertung gefundenen Fehler aus."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1009
+ #: apt.conf.5.xml:1034
  msgid ""
  "Generate a trace of the algorithm that decides the order in which "
  "<literal>apt</literal> should pass packages to &dpkg;."
  msgstr ""
- "Eine Aufzeichnung des Algorithmus generieren, der über die Reihenfolge "
+ "generiert eine Aufzeichnung des Algorithmus, der über die Reihenfolge "
  "entscheidet, in der <literal>apt</literal> Pakete an &dpkg; weiterleiten "
  "soll."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1017
- msgid "<literal>Debug::pkgPackageManager</literal>"
- msgstr "<literal>Debug::pkgPackageManager</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1021
+ #: apt.conf.5.xml:1046
  msgid ""
  "Output status messages tracing the steps performed when invoking &dpkg;."
  msgstr ""
- "Statusmeldungen ausgeben, die die Schritte nachverfolgen, die beim Aufruf "
+ "gibt Statusmeldungen aus, die die Schritte nachverfolgen, die beim Aufruf "
  "von &dpkg; ausgeführt werden."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1028
- msgid "<literal>Debug::pkgPolicy</literal>"
- msgstr "<literal>Debug::pkgPolicy</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1032
+ #: apt.conf.5.xml:1057
  msgid "Output the priority of each package list on startup."
- msgstr "Die Priorität jeder Paketliste beim Start ausgeben."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1038
- msgid "<literal>Debug::pkgProblemResolver</literal>"
- msgstr "<literal>Debug::pkgProblemResolver</literal>"
+ msgstr "gibt die Priorität jeder Paketliste beim Start aus."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1042
+ #: apt.conf.5.xml:1067
  msgid ""
  "Trace the execution of the dependency resolver (this applies only to what "
  "happens when a complex dependency problem is encountered)."
  msgstr ""
- "Die Ausführung des Abhängigkeitenverfolgers aufzeichnen (dies wird nur auf "
- "das angewandt, was geschieht, wenn ein komplexes Abhängigkeitsproblem "
+ "verfolgt die Ausführung des Abhängigkeitsauflösers (dies wird nur auf das "
+ "angewandt, was geschieht, wenn ein komplexes Abhängigkeitsproblem "
  "aufgetreten ist)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1050
- msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
- msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1053
+ #: apt.conf.5.xml:1078
  msgid ""
  "Display a list of all installed packages with their calculated score used by "
  "the pkgProblemResolver. The description of the package is the same as "
  "described in <literal>Debug::pkgDepCache::Marker</literal>"
  msgstr ""
- "Eine Liste aller installierten Pakete mit ihren berechneten Bewertungen, die "
- "vom pkgProblemResolver benutzt werden, ausgeben. Die Beschreibung des Pakets "
- "ist die gleiche, wie in <literal>Debug::pkgDepCache::Marker</literal> "
- "beschrieben."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1061
- msgid "<literal>Debug::sourceList</literal>"
- msgstr "<literal>Debug::sourceList</literal>"
+ "gibt eine Liste aller installierten Pakete mit ihren berechneten "
+ "Bewertungen, die vom pkgProblemResolver benutzt werden, aus. Die "
+ "Beschreibung des Pakets ist die gleiche, wie in <literal>Debug::pkgDepCache::"
+ "Marker</literal> beschrieben."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1065
+ #: apt.conf.5.xml:1090
  msgid ""
  "Print information about the vendors read from <filename>/etc/apt/vendors."
  "list</filename>."
  msgstr ""
- "Die Informationen über die in <filename>/etc/apt/vendors.list</filename> "
- "gelesenen Anbieter ausgeben."
+ "gibt die Informationen über die in <filename>/etc/apt/vendors.list</"
+ "filename> gelesenen Anbieter aus."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1088
+ #: apt.conf.5.xml:1113
  msgid ""
  "&configureindex; is a configuration file showing example values for all "
  "possible options."
@@@ -7879,29 -6388,16 +6404,16 @@@ msgstr "
  "möglichen Optionen zeigen."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt.conf.5.xml:1095
+ #: apt.conf.5.xml:1120
  msgid "&file-aptconf;"
  msgstr "&file-aptconf;"
  
  #.  ? reading apt.conf 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1100
+ #: apt.conf.5.xml:1125
  msgid "&apt-cache;, &apt-config;, &apt-preferences;."
  msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt_preferences.5.xml:16
- msgid ""
- "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
- msgstr ""
- "&apt-author.team; &apt-email; &apt-product; <date>16. Februar 2010</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt_preferences.5.xml:24 apt_preferences.5.xml:31
- msgid "apt_preferences"
- msgstr "apt_preferences"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt_preferences.5.xml:32
  msgid "Preference control file for APT"
@@@ -7984,21 -6480,11 +6496,11 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt_preferences.5.xml:70
- #, fuzzy
- #| msgid ""
- #| "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
- #| "directory are parsed in alphanumeric ascending order and need to obey the "
- #| "following naming convention: The files have either no or \"<literal>pref</"
- #| "literal>\" as filename extension and only contain alphanumeric, hyphen "
- #| "(-), underscore (_) and period (.) characters.  Otherwise APT will print "
- #| "a notice that it has ignored a file if the file doesn't match a pattern "
- #| "in the <literal>Dir::Ignore-Files-Silently</literal> configuration list - "
- #| "in this case it will be silently ignored."
  msgid ""
  "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
  "directory are parsed in alphanumeric ascending order and need to obey the "
- "following naming convention: The files have no or \"<literal>pref</literal>"
- "\" as filename extension and which only contain alphanumeric, hyphen (-), "
+ "following naming convention: The files have either no or \"<literal>pref</"
+ "literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
  "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
  "that it has ignored a file if the file doesn't match a pattern in the "
  "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@@ -8180,7 -6666,7 +6682,7 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #: apt_preferences.5.xml:148
  msgid "Install the highest priority version."
- msgstr "Die Version mit der höchsten Priorität installieren."
+ msgstr "installiert die Version mit der höchsten Priorität."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
  #: apt_preferences.5.xml:149
@@@ -8455,18 -6941,11 +6957,11 @@@ msgstr "Reguläre Ausdrücke und glob()
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
  #: apt_preferences.5.xml:264
- #, fuzzy
- #| msgid ""
- #| "APT also supports pinning by glob() expressions and regular expressions "
- #| "surrounded by /. For example, the following example assigns the priority "
- #| "500 to all packages from experimental where the name starts with gnome "
- #| "(as a glob()-like expression) or contains the word kde (as a POSIX "
- #| "extended regular expression surrounded by slashes)."
  msgid ""
  "APT also supports pinning by glob() expressions and regular expressions "
  "surrounded by /. For example, the following example assigns the priority 500 "
  "to all packages from experimental where the name starts with gnome (as a glob"
- "()-like expression or contains the word kde (as a POSIX extended regular "
+ "()-like expression) or contains the word kde (as a POSIX extended regular "
  "expression surrounded by slashes)."
  msgstr ""
  "APT unterstützt außerdem Pinning mittels glob()-Ausdrücken und regulären "
@@@ -8490,14 -6969,9 +6985,9 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
  #: apt_preferences.5.xml:279
- #, fuzzy
- #| msgid ""
- #| "The rule for those expressions is that they can occur anywhere where a "
- #| "string can occur. Thus, the following pin assigns the priority 990 to all "
- #| "packages from a release starting with karmic."
  msgid ""
  "The rule for those expressions is that they can occur anywhere where a "
- "string can occur. Those, the following pin assigns the priority 990 to all "
+ "string can occur. Thus, the following pin assigns the priority 990 to all "
  "packages from a release starting with karmic."
  msgstr ""
  "Die Regel für diese Ausdrücke ist, dass sie überall dort auftreten können, "
@@@ -8516,28 -6990,36 +7006,36 @@@ msgstr "
  "Pin: release n=karmic*\n"
  "Pin-Priority: 990\n"
  
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:290
- msgid "Package"
- msgstr "Package"
- 
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:296
- msgid "*"
- msgstr "*"
+ #. type: Content of: <refentry><refsect1><refsect2><para>
+ #: apt_preferences.5.xml:291
+ msgid ""
+ "If a regular expression occurs in a <literal>Package</literal> field, the "
+ "behavior is the same as if this regular expression were replaced with a list "
+ "of all package names it matches. It is undecided whether this will change in "
+ "the future, thus you should always list wild-card pins first, so later "
+ "specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+ "Package field is not considered a glob() expression in itself."
+ msgstr ""
+ "Falls ein regulärer Ausdruck in einem <literal>Package</literal>-Feld "
+ "vorkommt, ist das Verhalten dasselbe, als wenn der reguläre Ausdruck durch "
+ "eine Liste aller Paketnamen ersetzt würde, auf die er passt. Es ist noch "
+ "nicht entschieden, wie sich dies in Zukunft ändern wird, daher sollten Sie "
+ "immer zuerst Platzhalter-Pins auflisten, so dass es später spezielle Pins "
+ "außer Kraft setzen können. Das Muster »<literal>*</literal>« in einem "
+ "»Package«-Feld wird selbst nicht als ein glob()-Ausdruck angesehen."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:306
+ #: apt_preferences.5.xml:307
  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:314
+ #: apt_preferences.5.xml:315
  msgid "P &gt; 1000"
  msgstr "P &gt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:315
+ #: apt_preferences.5.xml:316
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
  "package"
@@@ -8546,12 -7028,12 +7044,12 @@@ msgstr "
  "des Pakets durchführt"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:319
+ #: apt_preferences.5.xml:320
  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:320
+ #: apt_preferences.5.xml:321
  msgid ""
  "causes a version to be installed even if it does not come from the target "
  "release, unless the installed version is more recent"
@@@ -8560,12 -7042,12 +7058,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:325
+ #: apt_preferences.5.xml:326
  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:326
+ #: apt_preferences.5.xml:327
  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"
@@@ -8575,12 -7057,12 +7073,12 @@@ msgstr "
  "neuer ist"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:331
+ #: apt_preferences.5.xml:332
  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:332
+ #: apt_preferences.5.xml:333
  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"
@@@ -8590,12 -7072,12 +7088,12 @@@ msgstr "
  "installierte Version neuer ist"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:337
+ #: apt_preferences.5.xml:338
  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:338
+ #: apt_preferences.5.xml:339
  msgid ""
  "causes a version to be installed only if there is no installed version of "
  "the package"
@@@ -8604,17 -7086,17 +7102,17 @@@ msgstr "
  "installierte Version des Pakets gibt"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:342
+ #: apt_preferences.5.xml:343
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:343
+ #: apt_preferences.5.xml:344
  msgid "prevents the version from being installed"
  msgstr "verhindert das Installieren der Version"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:309
+ #: apt_preferences.5.xml:310
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -8625,7 -7107,7 +7123,7 @@@ msgstr "
  "(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:348
+ #: apt_preferences.5.xml:349
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -8639,7 -7121,7 +7137,7 @@@ msgstr "
  "erste dieser Datensätze die Priorität der Paketversion fest."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:354
+ #: apt_preferences.5.xml:355
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
  "presented earlier:"
@@@ -8648,7 -7130,7 +7146,7 @@@ msgstr "
  "bereits gezeigten Datensätze:"
  
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
- #: apt_preferences.5.xml:358
+ #: apt_preferences.5.xml:359
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8676,12 -7158,12 +7174,12 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:371
+ #: apt_preferences.5.xml:372
  msgid "Then:"
  msgstr "Dann:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:373
+ #: apt_preferences.5.xml:374
  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 "
@@@ -8696,7 -7178,7 +7194,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:378
+ #: apt_preferences.5.xml:379
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -8707,7 -7189,7 +7205,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:382
+ #: apt_preferences.5.xml:383
  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</"
@@@ -8721,12 -7203,12 +7219,12 @@@ msgstr "
  "Pakets installiert ist."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:392
+ #: apt_preferences.5.xml:393
  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:394
+ #: apt_preferences.5.xml:395
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -8737,27 -7219,27 +7235,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:406
+ #: apt_preferences.5.xml:407
  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:407
+ #: apt_preferences.5.xml:408
  msgid "gives the package name"
  msgstr "gibt den Paketnamen an"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+ #: apt_preferences.5.xml:411 apt_preferences.5.xml:461
  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:411
+ #: apt_preferences.5.xml:412
  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:398
+ #: apt_preferences.5.xml:399
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -8778,12 -7260,12 +7276,12 @@@ msgstr "
  "<placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:427
+ #: apt_preferences.5.xml:428
  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:428
+ #: apt_preferences.5.xml:429
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -8800,18 -7282,18 +7298,18 @@@ msgstr "
  "die folgende Zeile benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:438
+ #: apt_preferences.5.xml:439
  #, 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:444
+ #: apt_preferences.5.xml:445
  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:445
+ #: apt_preferences.5.xml:446
  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 "
@@@ -8828,13 -7310,13 +7326,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:454
+ #: apt_preferences.5.xml:455
  #, 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:461
+ #: apt_preferences.5.xml:462
  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 "
@@@ -8850,7 -7332,7 +7348,7 @@@ msgstr "
  "eine der folgenden Zeilen benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:470
+ #: apt_preferences.5.xml:471
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -8862,12 -7344,12 +7360,12 @@@ msgstr "
  "Pin: release 3.0\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:479
+ #: apt_preferences.5.xml:480
  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:480
+ #: apt_preferences.5.xml:481
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -8885,18 -7367,18 +7383,18 @@@ msgstr "
  "Zeilen benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:489
+ #: apt_preferences.5.xml:490
  #, 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:495
+ #: apt_preferences.5.xml:496
  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:496
+ #: apt_preferences.5.xml:497
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8908,18 -7390,18 +7406,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:502
+ #: apt_preferences.5.xml:503
  #, 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:508
+ #: apt_preferences.5.xml:509
  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:509
+ #: apt_preferences.5.xml:510
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8932,13 -7414,13 +7430,13 @@@ msgstr "
  "die folgende Zeile benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:515
+ #: apt_preferences.5.xml:516
  #, 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:416
+ #: apt_preferences.5.xml:417
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -8961,7 -7443,7 +7459,7 @@@ msgstr "
  "APT-Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:522
+ #: apt_preferences.5.xml:523
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -8987,12 -7469,12 +7485,12 @@@ msgstr "
  "Distribution heruntergeladen wurde."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:535
+ #: apt_preferences.5.xml:536
  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:537
+ #: apt_preferences.5.xml:538
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -9003,12 -7485,12 +7501,12 @@@ msgstr "
  "anfangen. Dieses stellt einen Platz für Kommentare bereit."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:546
+ #: apt_preferences.5.xml:547
  msgid "Tracking Stable"
  msgstr "Stable verfolgen"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:554
+ #: apt_preferences.5.xml:555
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -9032,7 -7514,7 +7530,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:548
+ #: apt_preferences.5.xml:549
  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 "
@@@ -9047,8 -7529,8 +7545,8 @@@ msgstr "
  "Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:571 apt_preferences.5.xml:617
- #: apt_preferences.5.xml:675
+ #: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+ #: apt_preferences.5.xml:676
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -9060,7 -7542,7 +7558,7 @@@ msgstr "
  "apt-get dist-upgrade\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:566
+ #: apt_preferences.5.xml:567
  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 "
@@@ -9073,13 -7555,13 +7571,13 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:583
+ #: apt_preferences.5.xml:584
  #, 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:577
+ #: apt_preferences.5.xml:578
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -9093,12 -7575,12 +7591,12 @@@ msgstr "
  "\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:589
+ #: apt_preferences.5.xml:590
  msgid "Tracking Testing or Unstable"
  msgstr "Testing oder Unstable verfolgen"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:598
+ #: apt_preferences.5.xml:599
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -9126,7 -7608,7 +7624,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:591
+ #: apt_preferences.5.xml:592
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -9143,7 -7625,7 +7641,7 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:612
+ #: apt_preferences.5.xml:613
  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 "
@@@ -9156,13 -7638,13 +7654,13 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:632
+ #: apt_preferences.5.xml:633
  #, 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:623
+ #: apt_preferences.5.xml:624
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -9182,12 -7664,12 +7680,12 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:639
+ #: apt_preferences.5.xml:640
  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:653
+ #: apt_preferences.5.xml:654
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -9222,7 -7704,7 +7720,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:641
+ #: apt_preferences.5.xml:642
  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 "
@@@ -9248,7 -7730,7 +7746,7 @@@ msgstr "
  "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:670
+ #: apt_preferences.5.xml:671
  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 "
@@@ -9261,13 -7743,13 +7759,13 @@@ msgstr "
  "literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:690
+ #: apt_preferences.5.xml:691
  #, 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:681
+ #: apt_preferences.5.xml:682
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -9287,20 -7769,15 +7785,15 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt_preferences.5.xml:699
+ #: apt_preferences.5.xml:700
  msgid "&file-preferences;"
  msgstr "&file-preferences;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt_preferences.5.xml:705
+ #: apt_preferences.5.xml:706
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: sources.list.5.xml:25 sources.list.5.xml:32
- msgid "sources.list"
- msgstr "sources.list"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: sources.list.5.xml:33
  msgid "Package resource list for APT"
@@@ -9411,9 -7888,8 +7904,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><literallayout>
  #: sources.list.5.xml:81
- #, fuzzy, no-wrap
- #| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
- msgid "deb uri distribution [component1] [component2] [...]"
+ #, no-wrap
+ msgid "deb [ options ] uri distribution [component1] [component2] [...]"
  msgstr "deb [ Optionen ] URI Distribution [Komponente1] [Komponente2] […]"
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -9485,6 -7961,58 +7977,58 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:112
  msgid ""
+ "<literal>options</literal> is always optional and needs to be surounded by "
+ "square brackets. It can consist of multiple settings in the form "
+ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+ "replaceable></literal>.  Multiple settings are separated by spaces. The "
+ "following settings are supported by APT, note though that unsupported "
+ "settings will be ignored silently:"
+ msgstr ""
+ "<literal>options</literal> ist immer optional und muss in eckige Klammern "
+ "eingeschlossen werden. Es kann aus mehreren Einstellungen in der Form "
+ "<literal><replaceable>Einstellung</replaceable>=<replaceable>Wert</"
+ "replaceable></literal> bestehen. Mehrere Einstellungen werden durch "
+ "Leerzeichen getrennt. Die folgenden Einstellungen werden von APT "
+ "unterstützt. Beachten Sie allerdings, dass nicht unterstützte Einstellungen "
+ "stillschweigend ignoriert werden."
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:117
+ msgid ""
+ "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+ "replaceable>,…</literal> can be used to specify for which architectures "
+ "packages information should be downloaded. If this option is not set all "
+ "architectures defined by the <literal>APT::Architectures</literal> option "
+ "will be downloaded."
+ msgstr ""
+ "<literal>arch=<replaceable>Architektur1</replaceable>,"
+ "<replaceable>Architektur2</replaceable>, …</literal> kann benutzt werden, um "
+ "anzugeben, für welche Architekturen Paketinformationen heruntergeladen "
+ "werden sollen. Falls diese Option nicht gesetzt ist, werden alle durch die "
+ "Option <literal>APT::Architectures</literal> definierten Architekturen "
+ "heruntergeladen."
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:121
+ msgid ""
+ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+ "this source are always authenticated even if the <filename>Release</"
+ "filename> file is not signed or the signature can't be checked. This "
+ "disables parts of &apt-secure; and should therefore only be used in a local "
+ "and trusted context. <literal>trusted=no</literal> is the opposite which "
+ "handles even correctly authenticated sources as not authenticated."
+ msgstr ""
+ "<literal>trusted=yes</literal> kann gesetzt werden, um anzuzeigen, dass "
+ "Pakete aus dieser Quelle immer authentifiziert sind, sogar, falls die Datei "
+ "<filename>Release</filename> nicht signiert ist oder die Signatur nicht "
+ "geprüft werden kann. Dies deaktiviert Teile von &apt-secure; und sollte "
+ "daher nur in lokalem und vertrauenswürdigem Kontext benutzt werden. "
+ "<literal>trusted=no</literal> ist das Gegenteil davon. Es handhabt sogar "
+ "korrekt authentifizierte Quellen als nicht authentifiziert."
+ 
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:128
+ msgid ""
  "It is important to list sources in order of preference, with the most "
  "preferred source listed first. Typically this will result in sorting by "
  "speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@@ -9497,12 -8025,12 +8041,12 @@@ msgstr "
  "Rechnern, zum Beispiel)."
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:117
+ #: sources.list.5.xml:133
  msgid "Some examples:"
  msgstr "Einige Beispiele:"
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:119
+ #: sources.list.5.xml:135
  #, no-wrap
  msgid ""
  "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@@ -9514,17 -8042,17 +8058,17 @@@ msgstr "
  "   "
  
  #. type: Content of: <refentry><refsect1><title>
- #: sources.list.5.xml:125
+ #: sources.list.5.xml:141
  msgid "URI specification"
  msgstr "URI-Beschreibung"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:130
+ #: sources.list.5.xml:146
  msgid "file"
  msgstr "file"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:132
+ #: sources.list.5.xml:148
  msgid ""
  "The file scheme allows an arbitrary directory in the file system to be "
  "considered an archive. This is useful for NFS mounts and local mirrors or "
@@@ -9534,8 -8062,13 +8078,13 @@@ msgstr "
  "Archiv betrachtet zu werden. Dies ist nützlich für eingehängtes NFS und "
  "lokale Spiegel oder Archive."
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:153
+ msgid "cdrom"
+ msgstr "cdrom"
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:139
+ #: sources.list.5.xml:155
  msgid ""
  "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
  "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@@ -9544,8 -8077,13 +8093,13 @@@ msgstr "
  "zu benutzen. Benutzen Sie das Programm &apt-cdrom;, um CD-ROM-Einträge in "
  "der Quellenliste zu erstellen."
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:160
+ msgid "http"
+ msgstr "http"
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:146
+ #: sources.list.5.xml:162
  msgid ""
  "The http scheme specifies an HTTP server for the archive. If an environment "
  "variable <envar>http_proxy</envar> is set with the format http://server:"
@@@ -9561,8 -8099,13 +8115,13 @@@ msgstr "
  "Zeichenkette mit dem Format http://Anwender:Passwort@Server:Port/ benutzt. "
  "Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:171
+ msgid "ftp"
+ msgstr "ftp"
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:157
+ #: sources.list.5.xml:173
  msgid ""
  "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
  "is highly configurable; for more information see the &apt-conf; manual page. "
@@@ -9582,12 -8125,12 +8141,12 @@@ msgstr "
  "Konfigurationsdatei HTTP benutzen, werden ignoriert."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:166
+ #: sources.list.5.xml:182
  msgid "copy"
  msgstr "copy"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:168
+ #: sources.list.5.xml:184
  msgid ""
  "The copy scheme is identical to the file scheme except that packages are "
  "copied into the cache directory instead of used directly at their location.  "
@@@ -9599,17 -8142,17 +8158,17 @@@ msgstr "
  "Platte benutzen, um Dateien mit APT umherzukopieren."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "rsh"
  msgstr "rsh"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "ssh"
  msgstr "ssh"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:175
+ #: sources.list.5.xml:191
  msgid ""
  "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
  "user and access the files. It is a good idea to do prior arrangements with "
@@@ -9625,12 -8168,12 +8184,12 @@@ msgstr "
  "aus der Ferne durchzuführen."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:183
+ #: sources.list.5.xml:199
  msgid "more recognizable URI types"
  msgstr "weitere erkennbare URI-Typen"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:185
+ #: sources.list.5.xml:201
  msgid ""
  "APT can be extended with more methods shipped in other optional packages "
  "which should follow the nameing scheme <literal>apt-transport-"
@@@ -9652,7 -8195,7 +8211,7 @@@ msgstr "
  "citerefentry>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:127
+ #: sources.list.5.xml:143
  msgid ""
  "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
  "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@@ -9661,7 -8204,7 +8220,7 @@@ msgstr "
  "»ssh«, »rsh«. <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:199
+ #: sources.list.5.xml:215
  msgid ""
  "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
  "stable/main, stable/contrib, and stable/non-free."
@@@ -9670,94 -8213,115 +8229,115 @@@ msgstr "
  "jason/debian für stable/main, stable/contrib und stable/non-free."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:201
+ #: sources.list.5.xml:217
  #, no-wrap
  msgid "deb file:/home/jason/debian stable main contrib non-free"
  msgstr "deb file:/home/jason/debian stable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:203
+ #: sources.list.5.xml:219
  msgid "As above, except this uses the unstable (development) distribution."
  msgstr ""
- "Wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution "
+ "wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution "
  "benutzt."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:204
+ #: sources.list.5.xml:220
  #, no-wrap
  msgid "deb file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb file:/home/jason/debian unstable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:206
+ #: sources.list.5.xml:222
  msgid "Source line for the above"
  msgstr "Quellzeile für obiges"
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:207
+ #: sources.list.5.xml:223
  #, no-wrap
  msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:209
+ #: sources.list.5.xml:225
+ msgid ""
+ "The first line gets package information for the architectures in "
+ "<literal>APT::Architectures</literal> while the second always retrieves "
+ "<literal>amd64</literal> and <literal>armel</literal>."
+ msgstr ""
+ "Die erste Zeile bekommt Paketinformationen für die Architekturen in "
+ "<literal>APT::Architectures</literal>, während die zweite immer "
+ "<literal>amd64</literal> und <literal>armel</literal> holt."
+ 
+ #. type: Content of: <refentry><refsect1><literallayout>
+ #: sources.list.5.xml:227
+ #, no-wrap
+ msgid ""
+ "deb http://ftp.debian.org/debian &stable-codename; main\n"
+ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ msgstr ""
+ "deb http://ftp.debian.org/debian &stable-codename; main\n"
+ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ 
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:230
  msgid ""
  "Uses HTTP to access the archive at archive.debian.org, and uses only the "
  "hamm/main area."
  msgstr ""
- "Benutzt HTTP, um auf das Archiv auf archive.debian.org zuzugreifen und nur "
+ "benutzt HTTP, um auf das Archiv auf archive.debian.org zuzugreifen und nur "
  "den hamm/main-Bereich zu benutzen."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:211
+ #: sources.list.5.xml:232
  #, no-wrap
  msgid "deb http://archive.debian.org/debian-archive hamm main"
  msgstr "deb http://archive.debian.org/debian-archive hamm main"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:213
+ #: sources.list.5.xml:234
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the &stable-codename;/contrib area."
  msgstr ""
- "Benutzt FTP, um auf das Archiv auf archive.debian.org unter dem debian-"
+ "benutzt FTP, um auf das Archiv auf archive.debian.org unter dem debian-"
  "Verzeichnis zuzugreifen und nur den &stable-codename;/contrib-Bereich zu "
  "benutzen."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:215
+ #: sources.list.5.xml:236
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:217
+ #: sources.list.5.xml:238
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the unstable/contrib area. If this line appears as "
  "well as the one in the previous example in <filename>sources.list</filename> "
  "a single FTP session will be used for both resource lines."
  msgstr ""
- "Benutzt FTP, um auf das Archiv auf ftp.debian.org unter dem debian-"
+ "benutzt FTP, um auf das Archiv auf ftp.debian.org unter dem debian-"
  "Verzeichnis zuzugreifen und nur den unstable/contrib-Bereich zu benutzen. "
  "Falls diese Zeile zusammen mit der aus dem vorherigen Beispiel in der Datei "
  "<filename>sources.list</filename> auftaucht, wird eine einzelne FTP-Sitzung "
  "für beide Quellzeilen benutzt."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:221
+ #: sources.list.5.xml:242
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian unstable contrib"
  msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: sources.list.5.xml:230
+ #: sources.list.5.xml:251
  #, no-wrap
  msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
  msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:223
+ #: sources.list.5.xml:244
  msgid ""
  "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
  "directory, and uses only files found under <filename>unstable/binary-i386</"
@@@ -9767,7 -8331,7 +8347,7 @@@
  "archives are not structured like this] <placeholder type=\"literallayout\" "
  "id=\"0\"/>"
  msgstr ""
- "Benutzt HTTP, um auf das Archiv auf ftp.tlh.debian.org unter dem universe-"
+ "benutzt HTTP, um auf das Archiv auf ftp.tlh.debian.org unter dem universe-"
  "Verzeichnis zuzugreifen und benutzt nur Dateien, die unter "
  "<filename>unstable/binary-i386</filename> auf i386-Maschinen, "
  "<filename>unstable/binary-amd64</filename> auf amd64 und so weiter für "
@@@ -9777,7 -8341,7 +8357,7 @@@
  "type=\"literallayout\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:235
+ #: sources.list.5.xml:256
  msgid "&apt-cache; &apt-conf;"
  msgstr "&apt-cache; &apt-conf;"
  
@@@ -9969,6 -8533,11 +8549,11 @@@ msgstr "
  "Algorithmen bereitstellt, die bei der Auswahl von Paketen zur Installation "
  "helfen."
  
+ #. type: <heading></heading>
+ #: guide.sgml:96
+ msgid "apt-get"
+ msgstr "apt-get"
+ 
  #. type: <p></p>
  #: guide.sgml:102
  msgid ""
@@@ -10020,6 -8589,11 +8605,11 @@@ msgstr "
  msgid "Once updated there are several commands that can be used:"
  msgstr "Einmal aktualisiert stehen mehrere Befehl zur Benutzung zur Verfügung:"
  
+ #. type: <tag></tag>
+ #: guide.sgml:121
+ msgid "upgrade"
+ msgstr "upgrade"
+ 
  #. type: <p></p>
  #: guide.sgml:131
  msgid ""
@@@ -10042,6 -8616,11 +8632,11 @@@ msgstr "
  "tt> können benutzt werden, um die Installation von diesen Paketen zu "
  "erzwingen."
  
+ #. type: <tag></tag>
+ #: guide.sgml:131
+ msgid "install"
+ msgstr "install"
+ 
  #. type: <p></p>
  #: guide.sgml:140
  msgid ""
@@@ -10062,6 -8641,11 +8657,11 @@@ msgstr "
  "aufzulösen, wird eine Zusammenfassung ausgeben und nach einer Bestätigung "
  "fragen, wenn sich etwas anderes als dessen Argumente ändert."
  
+ #. type: <tag></tag>
+ #: guide.sgml:140
+ msgid "dist-upgrade"
+ msgstr "dist-upgrade"
+ 
  #. type: <p></p>
  #: guide.sgml:149
  msgid ""
@@@ -11087,7 -9671,8 +9687,8 @@@ msgstr "
  " APT\n"
  " {\n"
  "   /* Dies ist nicht nötig, falls die beiden Maschinen die gleiche\n"
- "      Architektur haben. Es teilt dem fernen APT mit, welche Architektur       die Zielmaschine hat */\n"
+ "      Architektur haben. Es teilt dem fernen APT mit, welche Architektur die\n"
+ "      Zielmaschine hat */\n"
  "   Architecture \"i386\";\n"
  "   \n"
  "   Get::Download-Only \"true\";\n"
@@@ -11333,119 -9918,3 +9934,3 @@@ msgstr "  # apt-get -o dir::cache::arch
  #: offline.sgml:234
  msgid "Which will use the already fetched archives on the disc."
  msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
- 
- #~ msgid "<option>--host-architecture</option>"
- #~ msgstr "<option>--host-architecture</option>"
- 
- #~ msgid ""
- #~ "This option controls the architecture packages are built for by "
- #~ "<command>apt-get source --compile</command> and how cross-"
- #~ "builddependencies are satisfied. By default is it not set which means "
- #~ "that the host architecture is the same as the build architecture (which "
- #~ "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
- #~ "<literal>APT::Get::Host-Architecture</literal>"
- #~ msgstr ""
- #~ "Diese Option steuert, wie die Architekturpakete durch <command>apt-get "
- #~ "source --compile</command> gebaut und wie Cross-Bau-Abhängigkeiten "
- #~ "erfüllt werden. Standardmäßig ist sie nicht gesetze, was bedeutet, dass "
- #~ "die Rechnerarchitektur die gleiche wie die Bau-Architektur ist (die durch "
- #~ "<literal>APT::Architecture</literal>) definiert wird). "
- #~ "Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>"
- 
- #~ msgid ""
- #~ "Update the local keyring with the archive keyring and remove from the "
- #~ "local keyring the archive keys which are no longer valid.  The archive "
- #~ "keyring is shipped in the <literal>archive-keyring</literal> package of "
- #~ "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
- #~ "package in Debian."
- #~ msgstr ""
- #~ "Aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und "
- #~ "entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem "
- #~ "lokalen Schlüsselbund. Der Archivschlüsselbund wird im Paket "
- #~ "<literal>archive-keyring</literal> Ihrer Distribution mitgeliefert, z.B. "
- #~ "dem Paket <literal>debian-archive-keyring</literal> in Debian."
- 
- #~ msgid ""
- #~ "All Architectures the system supports. Processors implementing the "
- #~ "<literal>amd64</literal> are e.g. also able to execute binaries compiled "
- #~ "for <literal>i386</literal>; This list is use when fetching files and "
- #~ "parsing package lists. The internal default is always the native "
- #~ "architecture (<literal>APT::Architecture</literal>)  and all foreign "
- #~ "architectures it can retrieve by calling <command>dpkg --print-foreign-"
- #~ "architectures</command>."
- #~ msgstr ""
- #~ "Alle Architekturen, die das System unterstützt. Prozessoren, die "
- #~ "<literal>amd64</literal> implementieren sind beispielsweise ebenso in der "
- #~ "Lage, Programme auszuführen, die für <literal>i386</literal> kompiliert "
- #~ "wurden. Diese Liste wird benutzt, wenn Dateien abgerufen und Paketlisten "
- #~ "ausgewertet werden. Die interne Vorgabe ist immer die native Architektur "
- #~ "(<literal>APT::Architecture</literal>) und alle fremden Architekturen, "
- #~ "die durch Aufruf von <command>dpkg --print-foreign-architectures</"
- #~ "command> abgefragt werden können."
- 
- #~ msgid "Min-ValidTime"
- #~ msgstr "Min-ValidTime"
- 
- #~ msgid ""
- #~ "Minimum of seconds the Release file should be considered valid after it "
- #~ "was created (indicated by the <literal>Date</literal> header).  Use this "
- #~ "if you need to use a seldomly updated (local) mirror of a more regular "
- #~ "updated archive with a <literal>Valid-Until</literal> header instead of "
- #~ "completely disabling the expiration date checking.  Archive specific "
- #~ "settings can and should be used by appending the label of the archive to "
- #~ "the option name."
- #~ msgstr ""
- #~ "Minimale Anzahl der Sekunden, die die Release-Datei als gültig betrachtet "
- #~ "werden sollte, nachdem sie erzeugt wurde (angezeigt durch die Kopfzeile "
- #~ "<literal>Date</literal>). Benutzen Sie dies, falls Sie einen selten "
- #~ "aktualisierten (lokalen) Spiegel eines regelmäßiger aktualisierten "
- #~ "Archivs mit einer <literal>Valid-Until</literal>-Kopfzeile haben, anstatt "
- #~ "die Überprüfung des Ablaufdatum komplett zu deaktivieren. "
- #~ "Archivspezifische Einstellungen können und sollten durch Anhängen des "
- #~ "Archivetiketts an die Option »name« vorgenommen werden."
- 
- #~ msgid ""
- #~ "<literal>options</literal> is always optional and needs to be surounded "
- #~ "by square brackets. It can consist of multiple settings in the form "
- #~ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
- #~ "replaceable></literal>.  Multiple settings are separated by spaces. The "
- #~ "following settings are supported by APT, note though that unsupported "
- #~ "settings will be ignored silently:"
- #~ msgstr ""
- #~ "<literal>options</literal> ist immer optional und muss in eckige Klammern "
- #~ "eingeschlossen werden. Es kann aus mehreren Einstellungen in der Form "
- #~ "<literal><replaceable>Einstellung</replaceable>=<replaceable>Wert</"
- #~ "replaceable></literal> bestehen. Mehrere Einstellungen werden durch "
- #~ "Leerzeichen getrennt. Die folgenden Einstellungen werden von APT "
- #~ "unterstützt. Beachten Sie allerdings, dass nicht unterstützte "
- #~ "Einstellungen stillschweigend ignoriert werden."
- 
- #~ msgid ""
- #~ "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
- #~ "replaceable>,…</literal> can be used to specify for which architectures "
- #~ "packages information should be downloaded. If this option is not set all "
- #~ "architectures defined by the <literal>APT::Architectures</literal> option "
- #~ "will be downloaded."
- #~ msgstr ""
- #~ "<literal>arch=<replaceable>Architektur1</replaceable>,"
- #~ "<replaceable>Architektur2</replaceable>, …</literal> kann benutzt werden, "
- #~ "um anzugeben, für welche Architekturen Paketinformationen heruntergeladen "
- #~ "werden sollen. Falls diese Option nicht gesetzt ist, werden alle durch "
- #~ "die Option <literal>APT::Architectures</literal> definierten "
- #~ "Architekturen heruntergeladen."
- 
- #~ msgid ""
- #~ "The first line gets package information for the architectures in "
- #~ "<literal>APT::Architectures</literal> while the second always retrieves "
- #~ "<literal>amd64</literal> and <literal>armel</literal>."
- #~ msgstr ""
- #~ "Die erste Zeile bekommt Paketinformationen für die Architekturen in "
- #~ "<literal>APT::Architectures</literal>, während die zweite immer "
- #~ "<literal>amd64</literal> und <literal>armel</literal> holt."
- 
- #~ msgid ""
- #~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
- #~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
- #~ msgstr ""
- #~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
- #~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
diff --combined doc/po/es.po
index 35b8d0af7,c5611aff6..28d9e9135
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@@ -36,7 -36,7 +36,8 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: apt 0.7.25\n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
 -"POT-Creation-Date: 2012-05-21 13:35+0300\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:47+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"
@@@ -167,44 -167,7 +168,7 @@@ msgid "apt was written by the APT team 
  msgstr "El equipo APT E<lt>apt@packages.debian.orgE<gt> escribió apt."
  
  #. type: Plain text
- #: apt.ent:2
- msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
- msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
- 
- #. type: Plain text
- #: apt.ent:16
- #, no-wrap
- msgid ""
- "<!-- Boiler plate docinfo section -->\n"
- "<!ENTITY apt-docinfo \"\n"
- " <refentryinfo>\n"
- "   <address><email>apt@packages.debian.org</email></address>\n"
- "   <author>\n"
- "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
- "     <contrib></contrib>\n"
- "   </author>\n"
- "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
- "   <date>28 October 2008</date>\n"
- "   <productname>Linux</productname>\n"
- " </refentryinfo>\n"
- "\">\n"
- msgstr ""
- "<!-- Boiler plate docinfo section -->\n"
- "<!ENTITY apt-docinfo \"\n"
- " <refentryinfo>\n"
- "   <address><email>apt@packages.debian.org</email></address>\n"
- "   <author>\n"
- "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
- "     <contrib></contrib>\n"
- "   </author>\n"
- "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
- "   <date>28 de Octubre de 2008</date>\n"
- "   <productname>Linux</productname>\n"
- " </refentryinfo>\n"
- "\">\n"
- 
- #. type: Plain text
- #: apt.ent:23
+ #: apt.ent:7
  #, no-wrap
  msgid ""
  "<!ENTITY apt-author.team \"\n"
@@@ -222,7 -185,7 +186,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:29
+ #: apt.ent:13
  #, no-wrap
  msgid ""
  "<!ENTITY apt-qapage \"\n"
@@@ -238,7 -201,7 +202,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:40
+ #: apt.ent:24
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Bug reporting section -->\n"
@@@ -264,7 -227,7 +228,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:48
+ #: apt.ent:32
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Author section -->\n"
@@@ -284,7 -247,7 +248,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:58
+ #: apt.ent:42
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -308,7 -271,7 +272,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:66
+ #: apt.ent:50
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -328,7 -291,7 +292,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:78
+ #: apt.ent:62
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -359,7 -322,7 +323,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:90
+ #: apt.ent:74
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -387,7 -350,7 +351,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:101
+ #: apt.ent:85
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -414,7 -377,7 +378,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:107
+ #: apt.ent:91
  #, no-wrap
  msgid ""
  "<!ENTITY file-aptconf \"\n"
@@@ -430,7 -393,7 +394,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:113
+ #: apt.ent:97
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@@ -446,7 -409,7 +410,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:119
+ #: apt.ent:103
  #, no-wrap
  msgid ""
  "<!ENTITY file-cachearchives \"\n"
@@@ -462,12 -425,18 +426,18 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:125
- #, no-wrap
+ #: apt.ent:109
+ #, fuzzy, no-wrap
+ #| msgid ""
+ #| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+ #| "     <listitem><para>Storage area for package files in transit.\n"
+ #| "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+ #| "     </varlistentry>\n"
+ #| "\">\n"
  msgid ""
  "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
  "     <listitem><para>Storage area for package files in transit.\n"
- "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
@@@ -478,7 -447,7 +448,7 @@@
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:135
+ #: apt.ent:119
  #, no-wrap
  msgid ""
  "<!ENTITY file-preferences \"\n"
@@@ -501,7 -470,7 +471,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:141
+ #: apt.ent:125
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@@ -517,7 -486,7 +487,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:147
+ #: apt.ent:131
  #, no-wrap
  msgid ""
  "<!ENTITY file-sourceslist \"\n"
@@@ -533,7 -502,7 +503,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:153
+ #: apt.ent:137
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@@ -549,7 -518,7 +519,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:160
+ #: apt.ent:144
  #, no-wrap
  msgid ""
  "<!ENTITY file-statelists \"\n"
@@@ -567,12 -536,18 +537,18 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:166
- #, no-wrap
+ #: apt.ent:150
+ #, fuzzy, no-wrap
+ #| msgid ""
+ #| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+ #| "     <listitem><para>Storage area for state information in transit.\n"
+ #| "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+ #| "     </varlistentry>\n"
+ #| "\">\n"
  msgid ""
  "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
  "     <listitem><para>Storage area for state information in transit.\n"
- "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
@@@ -583,7 -558,7 +559,7 @@@
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:172
+ #: apt.ent:156
  #, no-wrap
  msgid ""
  "<!ENTITY file-trustedgpg \"\n"
@@@ -600,7 -575,7 +576,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:179
+ #: apt.ent:163
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@@ -619,7 -594,7 +595,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:187
+ #: apt.ent:171
  #, no-wrap
  msgid ""
  "<!ENTITY file-extended_states \"\n"
@@@ -639,7 -614,7 +615,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:191
+ #: apt.ent:175
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@@ -651,7 -626,7 +627,7 @@@ msgstr "
  "<!ENTITY translation-title \"TRADUCCIÓN\">\n"
  
  #. type: Plain text
- #: apt.ent:200
+ #: apt.ent:184
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@@ -675,7 -650,7 +651,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:210
+ #: apt.ent:195
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@@ -700,36 -675,133 +676,133 @@@ msgstr "
  "     la traducción no está actualizada con respecto al documento original.\n"
  "\">\n"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cache.8.xml:16
- #, fuzzy
- #| msgid ""
- #| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
- #| "<date>14 February 2004</date>"
+ #. type: Plain text
+ #: apt.ent:198
  msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
- "February 2011</date>"
+ "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+ "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
  msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "de Febrero de 2004</date>"
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cache.8.xml:25 apt-cache.8.xml:32
- msgid "apt-cache"
- msgstr "apt-cache"
+ #. type: Plain text
+ #: apt.ent:201
+ msgid ""
+ "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+ "synopsis-config-file \"config_file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:204
+ msgid ""
+ "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+ "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+ "\"target_release\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:207
+ msgid ""
+ "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+ "synopsis-architecture \"architecture\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:210
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+ "--> <!ENTITY synopsis-pkg \"pkg\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:213
+ msgid ""
+ "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+ "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:216
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+ "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:219
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+ "awesome --> <!ENTITY synopsis-regex \"regex\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:222
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+ "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:225
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+ "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+ "\"temporary_directory\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:228
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+ "synopsis-filename \"filename\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:231
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:234
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-override "
+ "\"override-file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:237
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+ "\"pathprefix\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:240
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "generate section --> <!ENTITY synopsis-section \"section\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:243
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+ msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26
- #: apt-key.8.xml:18 apt-mark.8.xml:26 apt-secure.8.xml:18
+ #: apt-key.8.xml:25 apt-mark.8.xml:26 apt-secure.8.xml:25
  msgid "8"
  msgstr "8"
  
  #. type: Content of: <refentry><refmeta><refmiscinfo>
  #: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27
  #: apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27
- #: apt-key.8.xml:19 apt-mark.8.xml:27 apt-secure.8.xml:19
- #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:33 apt_preferences.5.xml:26
+ #: apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26
+ #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:32 apt_preferences.5.xml:26
  #: sources.list.5.xml:27
  msgid "APT"
  msgstr "APT"
@@@ -739,85 -811,17 +812,17 @@@
  msgid "query the APT cache"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cache.8.xml:39
- #, fuzzy
- #| msgid ""
- #| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
- #| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- #| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
- #| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
- #| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- #| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
- #| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
- #| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
- #| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- #| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- #| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
- #| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
- #| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
- #| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- #| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
- #| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
- #| "group>"
- msgid ""
- "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
- "<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
- "arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
- "arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
- "arg> </group>"
- msgstr ""
- "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
- "o=<replaceable>cadena-de-configuración</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>fichero</replaceable></option></arg> <group "
- "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>fichero</replaceable></arg></arg> <arg>gencaches</arg> "
- "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquete</"
- "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>paquete</replaceable></arg></arg> <arg>stats</arg> "
- "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
- "choice=\"plain\"><replaceable>exp_regular</replaceable></arg></arg> "
- "<arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable></replaceable></"
- "arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>paquete</replaceable></arg></arg> <arg>rdepends <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg></arg> "
- "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefijo</replaceable></"
- "arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>paquete</replaceable></arg></arg> <arg>xvcg <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg></arg> "
- "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquetes</"
- "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>paquetes</replaceable></arg></arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
- #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
- #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
- #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+ #: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+ #: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+ #: apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50
+ #: apt-sortpkgs.1.xml:38 apt.conf.5.xml:41 apt_preferences.5.xml:36
  #: sources.list.5.xml:36
  msgid "Description"
  msgstr "Descripción"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:65
+ #: apt-cache.8.xml:39
  msgid ""
  "<command>apt-cache</command> performs a variety of operations on APT's "
  "package cache. <command>apt-cache</command> does not manipulate the state of "
@@@ -830,7 -834,7 +835,7 @@@ msgstr "
  "genera información interesante a partir de los metadatos del paquete."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:70 apt-get.8.xml:120
+ #: apt-cache.8.xml:44 apt-get.8.xml:44
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given, "
  "one of the commands below must be present."
@@@ -838,30 -842,22 +843,22 @@@ msgstr "
  "A menos que se use la opción <option>-h</option> o <option>--help</option>, "
  "una de las siguientes órdenes debe estar presente."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:74
- msgid "gencaches"
- msgstr "gencaches"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:75
+ #: apt-cache.8.xml:49
  msgid ""
- "<literal>gencaches</literal> performs the same operation as <command>apt-get "
- "check</command>. It builds the source and package caches from the sources in "
- "&sources-list; and from <filename>/var/lib/dpkg/status</filename>."
+ "<literal>gencaches</literal> creates APT's package cache. This is done "
+ "implicitly by all commands needing this cache if it is missing or outdated."
  msgstr ""
- "<literal>gencaches</literal> realiza la misma operación que <command>apt-get "
- "check</command>. Genera las caches de los paquetes fuente y de los paquetes "
- "binarios a partir de la lista de fuentes en &sources-list; y a partir de "
- "<filename>/var/lib/dpkg/status</filename>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:81
- msgid "showpkg <replaceable>pkg(s)</replaceable>"
- msgstr "showpkg <replaceable>paquete(s)</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+ #: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
+ #: apt-cache.8.xml:226 apt-cache.8.xml:238
+ msgid "&synopsis-pkg;"
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:82
+ #: apt-cache.8.xml:54
  msgid ""
  "<literal>showpkg</literal> displays information about the packages listed on "
  "the command line. Remaining arguments are package names. The available "
@@@ -885,7 -881,7 +882,7 @@@ msgstr "
  "siguiente:"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-cache.8.xml:94
+ #: apt-cache.8.xml:66
  #, no-wrap
  msgid ""
  "Package: libreadline2\n"
@@@ -911,7 -907,7 +908,7 @@@ msgstr "
  "Reverse Provides: \n"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:106
+ #: apt-cache.8.xml:78
  msgid ""
  "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
  "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@@ -929,13 -925,8 +926,8 @@@ msgstr "
  "altdev no tienen que estarlo. Para el significado específico del resto de la "
  "salida lo mejor es consultar el código fuente de apt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:115
- msgid "stats"
- msgstr "stats"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:115
+ #: apt-cache.8.xml:87
  msgid ""
  "<literal>stats</literal> displays some statistics about the cache.  No "
  "further arguments are expected. Statistics reported are:"
@@@ -944,7 -935,7 +936,7 @@@ msgstr "
  "necesita ningún argumento adicional. Las estadísticas que muestra son:"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:118
+ #: apt-cache.8.xml:90
  msgid ""
  "<literal>Total package names</literal> is the number of package names found "
  "in the cache."
@@@ -953,7 -944,7 +945,7 @@@ msgstr "
  "encontrados en la caché."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:122
+ #: apt-cache.8.xml:94
  msgid ""
  "<literal>Normal packages</literal> is the number of regular, ordinary "
  "package names; these are packages that bear a one-to-one correspondence "
@@@ -966,7 -957,7 +958,7 @@@ msgstr "
  "dependencias. La mayoría de los paquetes pertenecen a este grupo."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:128
+ #: apt-cache.8.xml:100
  msgid ""
  "<literal>Pure virtual packages</literal> is the number of packages that "
  "exist only as a virtual package name; that is, packages only \"provide\" the "
@@@ -984,7 -975,7 +976,7 @@@ msgstr "
  "agent»."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:136
+ #: apt-cache.8.xml:108
  msgid ""
  "<literal>Single virtual packages</literal> is the number of packages with "
  "only one package providing a particular virtual package. For example, in the "
@@@ -997,7 -988,7 +989,7 @@@ msgstr "
  "pero sólo un paquete, xless, proporciona «X11-text-viewer»."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:142
+ #: apt-cache.8.xml:114
  msgid ""
  "<literal>Mixed virtual packages</literal> is the number of packages that "
  "either provide a particular virtual package or have the virtual package name "
@@@ -1011,7 -1002,7 +1003,7 @@@ msgstr "
  "paquete debconf-tiny."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:149
+ #: apt-cache.8.xml:121
  msgid ""
  "<literal>Missing</literal> is the number of package names that were "
  "referenced in a dependency but were not provided by any package. Missing "
@@@ -1027,7 -1018,7 +1019,7 @@@ msgstr "
  "«Conflicts» o «Breaks» de la descripción de los paquetes."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:156
+ #: apt-cache.8.xml:128
  msgid ""
  "<literal>Total distinct</literal> versions is the number of package versions "
  "found in the cache; this value is therefore at least equal to the number of "
@@@ -1042,7 -1033,7 +1034,7 @@@ msgstr "
  "valor puede ser considerablemente mayor que el número total de paquetes."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:163
+ #: apt-cache.8.xml:135
  msgid ""
  "<literal>Total dependencies</literal> is the number of dependency "
  "relationships claimed by all of the packages in the cache."
@@@ -1050,13 -1041,8 +1042,8 @@@ msgstr "
  "<literal>Total de dependencias</literal> es el número total de relaciones de "
  "dependencia de todos los paquetes de la caché."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:170
- msgid "showsrc <replaceable>pkg(s)</replaceable>"
- msgstr "showsrc <replaceable>paquete(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:171
+ #: apt-cache.8.xml:143
  msgid ""
  "<literal>showsrc</literal> displays all the source package records that "
  "match the given package names. All versions are shown, as well as all "
@@@ -1067,13 -1053,8 +1054,8 @@@ msgstr "
  "todas las versiones, así como todos los campos cuyo nombre manifiesta que "
  "son binarios."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:176 apt-config.8.xml:87
- msgid "dump"
- msgstr "dump"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:177
+ #: apt-cache.8.xml:149
  msgid ""
  "<literal>dump</literal> shows a short listing of every package in the cache. "
  "It is primarily for debugging."
@@@ -1081,13 -1062,8 +1063,8 @@@ msgstr "
  "<literal>dump</literal> muestra una pequeña lista de todos los paquetes en "
  "la caché. Fundamentalmente para depuración."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:181
- msgid "dumpavail"
- msgstr "dumpavail"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:182
+ #: apt-cache.8.xml:154
  msgid ""
  "<literal>dumpavail</literal> prints out an available list to stdout. This is "
  "suitable for use with &dpkg; and is used by the &dselect; method."
@@@ -1096,13 -1072,8 +1073,8 @@@ msgstr "
  "paquetes disponibles. Esta lista es apropiada para su uso con &dpkg; y, "
  "además, la usa el método &dselect;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:186
- msgid "unmet"
- msgstr "unmet"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:187
+ #: apt-cache.8.xml:159
  msgid ""
  "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
  "package cache."
@@@ -1110,13 -1081,8 +1082,8 @@@ msgstr "
  "<literal>unmet</literal> muestra un resumen de todas las dependencias no "
  "satisfechas en la caché de paquetes."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:191
- msgid "show <replaceable>pkg(s)</replaceable>"
- msgstr "show <replaceable>paquete(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:192
+ #: apt-cache.8.xml:164
  msgid ""
  "<literal>show</literal> performs a function similar to <command>dpkg --print-"
  "avail</command>; it displays the package records for the named packages."
@@@ -1124,13 -1090,13 +1091,13 @@@ msgstr "
  "<literal>show</literal> realiza una función similar a <command>dpkg --print-"
  "avail</command>, muestra los campos del paquete para los paquetes nombrados."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:197
- msgid "search <replaceable>regex [ regex ... ]</replaceable>"
- msgstr "search <replaceable>exp-regular [exp-regular ...]</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:169
+ msgid "&synopsis-regex;"
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:198
+ #: apt-cache.8.xml:170
  msgid ""
  "<literal>search</literal> performs a full text search on all available "
  "package lists for the POSIX regex pattern given, see "
@@@ -1155,7 -1121,7 +1122,7 @@@ msgstr "
  "sólo se busca en el nombre de los paquetes, no en la descripción larga."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:211
+ #: apt-cache.8.xml:183
  msgid ""
  "Separate arguments can be used to specify multiple search patterns that are "
  "and'ed together."
@@@ -1163,13 -1129,8 +1130,8 @@@ msgstr "
  "Se pueden usar argumentos separados para especificar varios patrones de "
  "búsqueda que se juntarán mediante una «Y lógica»."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:215
- msgid "depends <replaceable>pkg(s)</replaceable>"
- msgstr "depends <replaceable>paquete(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:216
+ #: apt-cache.8.xml:188
  msgid ""
  "<literal>depends</literal> shows a listing of each dependency a package has "
  "and all the possible other packages that can fulfill that dependency."
@@@ -1177,13 -1138,8 +1139,8 @@@ msgstr "
  "<literal>depends</literal> muestra una lista de todas la dependencias de un "
  "paquete y de todos los demás paquetes que la pueden satisfacer."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:220
- msgid "rdepends <replaceable>pkg(s)</replaceable>"
- msgstr "rdepends <replaceable>paquete(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:221
+ #: apt-cache.8.xml:193
  msgid ""
  "<literal>rdepends</literal> shows a listing of each reverse dependency a "
  "package has."
@@@ -1191,12 -1147,14 +1148,14 @@@ msgstr "
  "<literal>rdepends</literal> muestra las dependencias inversas de un paquete."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:225
- msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+ #: apt-cache.8.xml:197
+ #, fuzzy
+ #| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+ msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
  msgstr "pkgnames <replaceable>[ prefijo ]</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:226
+ #: apt-cache.8.xml:198
  msgid ""
  "This command prints the name of each package APT knows. The optional "
  "argument is a prefix match to filter the name list. The output is suitable "
@@@ -1212,7 -1170,7 +1171,7 @@@ msgstr "
  "generate</option>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:231
+ #: apt-cache.8.xml:203
  msgid ""
  "Note that a package which APT knows of is not necessarily available to "
  "download, installable or installed, e.g. virtual packages are also listed in "
@@@ -1222,13 -1180,8 +1181,8 @@@ msgstr "
  "disponible para descargar, instalar o instalado, por ejemplo: los paquetes "
  "virtuales también aparecen en la lista generada."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:236
- msgid "dotty <replaceable>pkg(s)</replaceable>"
- msgstr "dotty <replaceable>paquete(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:237
+ #: apt-cache.8.xml:209
  msgid ""
  "<literal>dotty</literal> takes a list of packages on the command line and "
  "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@@ -1249,7 -1202,7 +1203,7 @@@ msgstr "
  "active la opción <literal>APT::Cache::GivenOnly</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:246
+ #: apt-cache.8.xml:218
  msgid ""
  "The resulting nodes will have several shapes; normal packages are boxes, "
  "pure provides are triangles, mixed provides are diamonds, missing packages "
@@@ -1264,17 -1217,12 +1218,12 @@@ msgstr "
  "líneas verdes son conflictos."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:251
+ #: apt-cache.8.xml:223
  msgid "Caution, dotty cannot graph larger sets of packages."
  msgstr "Tenga cuidado, dotty no puede dibujar grandes conjuntos de paquetes."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:254
- msgid "xvcg <replaceable>pkg(s)</replaceable>"
- msgstr "xvcg <replaceable>paquete(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:255
+ #: apt-cache.8.xml:227
  msgid ""
  "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
  "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@@ -1284,12 -1232,14 +1233,14 @@@ msgstr "
  "ulink>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:259
- msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
- msgstr "policy <replaceable>[ paquete(s) ]</replaceable>"
+ #: apt-cache.8.xml:231
+ #, fuzzy
+ #| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
+ msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
+ msgstr "madison <replaceable>[ paquete(s) ]</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:260
+ #: apt-cache.8.xml:232
  msgid ""
  "<literal>policy</literal> is meant to help debug issues relating to the "
  "preferences file. With no arguments it will print out the priorities of each "
@@@ -1301,13 -1251,8 +1252,8 @@@ msgstr "
  "prioridades de cada fuente. De forma alternativa, muestra una información "
  "detallada acerca de la prioridad de selección del paquete nombrado."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:266
- msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
- msgstr "madison <replaceable>[ paquete(s) ]</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:267
+ #: apt-cache.8.xml:239
  msgid ""
  "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
  "to mimic the output format and a subset of the functionality of the Debian "
@@@ -1325,25 -1270,15 +1271,15 @@@ msgstr "
  "información para la arquitectura para la que APT obtuvo las listas de "
  "paquetes (<literal>APT::Architecture</literal>)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
- #: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
- #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+ #. type: Content of: <refentry><refsect1><title>
+ #: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+ #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+ #: apt-sortpkgs.1.xml:48
  msgid "options"
  msgstr "Opciones"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>-p</option>"
- msgstr "<option>-p</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>--pkg-cache</option>"
- msgstr "<option>--pkg-cache</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:283
+ #: apt-cache.8.xml:255
  msgid ""
  "Select the file to store the package cache. The package cache is the primary "
  "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@@ -1353,19 -1288,8 +1289,8 @@@ msgstr "
  "es la caché primaria usada para todas las operaciones. Opción de "
  "configuración: <literal>Dir::Cache::pkgcache</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:288
- msgid "<option>--src-cache</option>"
- msgstr "<option>--src-cache</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:289
+ #: apt-cache.8.xml:261
  msgid ""
  "Select the file to store the source cache. The source is used only by "
  "<literal>gencaches</literal> and it stores a parsed version of the package "
@@@ -1379,18 -1303,8 +1304,8 @@@ msgstr "
  "la caché fuente se usa para evitar analizar todos los ficheros de paquetes. "
  "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: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:545 apt-get.8.xml:383
- msgid "<option>--quiet</option>"
- msgstr "<option>--quiet</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:297
+ #: apt-cache.8.xml:269
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quietness up to a maximum of 2. You can also use "
@@@ -1403,18 -1317,8 +1318,8 @@@ msgstr "
  "el nivel de silencio, ignorando el fichero de configuración. Opción de "
  "configuración: <literal>quiet</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>-i</option>"
- msgstr "<option>-i</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>--important</option>"
- msgstr "<option>--important</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:304
+ #: apt-cache.8.xml:276
  msgid ""
  "Print only important dependencies; for use with unmet and depends. Causes "
  "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@@ -1424,48 -1328,8 +1329,8 @@@ msgstr "
  "Hace que sólo se muestren las dependencias y pre-dependencias. Opción de "
  "configuración: <literal>APT::Cache::Important</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:309
- msgid "<option>--no-pre-depends</option>"
- msgstr "<option>--no-pre-depends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:310
- msgid "<option>--no-depends</option>"
- msgstr "<option>--no-depends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:311
- msgid "<option>--no-recommends</option>"
- msgstr "<option>--no-recommends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:312
- msgid "<option>--no-suggests</option>"
- msgstr "<option>--no-suggests</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:313
- msgid "<option>--no-conflicts</option>"
- msgstr "<option>--no-conflicts</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:314
- msgid "<option>--no-breaks</option>"
- msgstr "<option>--no-breaks</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:315
- msgid "<option>--no-replaces</option>"
- msgstr "<option>--no-replaces</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:316
- msgid "<option>--no-enhances</option>"
- msgstr "<option>--no-enhances</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:317
+ #: apt-cache.8.xml:289
  #, fuzzy
  #| msgid ""
  #| "Per default the <literal>depends</literal> and <literal>rdepends</"
@@@ -1475,7 -1339,7 +1340,7 @@@
  #| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
- "print all dependencies. This can be twicked with these flags which will omit "
+ "print all dependencies. This can be tweaked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
@@@ -1487,18 -1351,8 +1352,8 @@@ msgstr "
  "Show<replaceable>Tipo-de Dependencia</replaceable></literal>. Por ejemplo, "
  "<literal>APT::Cache::ShowRecommends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
- msgid "<option>-f</option>"
- msgstr "<option>-f</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323
- msgid "<option>--full</option>"
- msgstr "<option>--full</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:324
+ #: apt-cache.8.xml:296
  msgid ""
  "Print full package records when searching.  Configuration Item: "
  "<literal>APT::Cache::ShowFull</literal>."
@@@ -1506,18 -1360,8 +1361,8 @@@ msgstr "
  "Muestra todos los campos de información cuando se realiza una búsqueda. "
  "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:583
- msgid "<option>-a</option>"
- msgstr "<option>-a</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:328
- msgid "<option>--all-versions</option>"
- msgstr "<option>--all-versions</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:329
+ #: apt-cache.8.xml:301
  msgid ""
  "Print full records for all available versions. This is the default; to turn "
  "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@@ -1533,18 -1377,8 +1378,8 @@@ msgstr "
  "opción sólo se aplica a la orden <literal>show</literal>. Opción de "
  "configuración: <literal>APT::Cache::AllVersions</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>-g</option>"
- msgstr "<option>-g</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>--generate</option>"
- msgstr "<option>--generate</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:338
+ #: apt-cache.8.xml:310
  msgid ""
  "Perform automatic package cache regeneration, rather than use the cache as "
  "it is. This is the default; to turn it off, use <option>--no-generate</"
@@@ -1555,18 -1389,8 +1390,8 @@@ msgstr "
  "<option>--no-generate</option>. Opción de configuración: <literal>APT::"
  "Cache::Generate</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343
- msgid "<option>--names-only</option>"
- msgstr "<option>--names-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343 apt-cdrom.8.xml:142
- msgid "<option>-n</option>"
- msgstr "<option>-n</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:344
+ #: apt-cache.8.xml:316
  msgid ""
  "Only search on the package names, not the long descriptions.  Configuration "
  "Item: <literal>APT::Cache::NamesOnly</literal>."
@@@ -1574,13 -1398,8 +1399,8 @@@ msgstr "
  "Sólo busca en los nombres de paquetes, no en las descripciones largas. "
  "Opción de configuración: <literal>APT::Cache::NamesOnly</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:348
- msgid "<option>--all-names</option>"
- msgstr "<option>--all-names</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:349
+ #: apt-cache.8.xml:321
  msgid ""
  "Make <literal>pkgnames</literal> print all names, including virtual packages "
  "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@@ -1590,13 -1409,8 +1410,8 @@@ msgstr "
  "los paquetes virtuales y las dependencias no encontradas. Opción de "
  "configuración: <literal>APT::Cache::AllNames</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:354
- msgid "<option>--recurse</option>"
- msgstr "<option>--recurse</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:355
+ #: apt-cache.8.xml:327
  msgid ""
  "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
  "that all packages mentioned are printed once.  Configuration Item: "
@@@ -1606,13 -1420,8 +1421,8 @@@ msgstr "
  "recursivos de modo que todos los paquetes mencionados se muestran sólo una "
  "vez. Opción de configuración <literal>APT::Cache::RecurseDepends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:360
- msgid "<option>--installed</option>"
- msgstr "<option>--installed</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:362
+ #: apt-cache.8.xml:334
  msgid ""
  "Limit the output of <literal>depends</literal> and <literal>rdepends</"
  "literal> to packages which are currently installed.  Configuration Item: "
@@@ -1623,46 -1432,46 +1433,46 @@@ msgstr "
  "Cache::Installed</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
- #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
- #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+ #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
+ #: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+ #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
  msgid "&apt-commonoptions;"
  msgstr "&apt-commonoptions;"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
- #: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+ #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+ #: apt.conf.5.xml:1118 apt_preferences.5.xml:698
  msgid "Files"
  msgstr "Ficheros"
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:374
+ #: apt-cache.8.xml:346
  msgid "&file-sourceslist; &file-statelists;"
  msgstr "&file-sourceslist; &file-statelists;"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
- #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
- #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
- #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
- #: sources.list.5.xml:234
+ #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+ #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+ #: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+ #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
+ #: sources.list.5.xml:255
  msgid "See Also"
  msgstr "Véase también"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:380
+ #: apt-cache.8.xml:352
  msgid "&apt-conf;, &sources-list;, &apt-get;"
  msgstr "&apt-conf;, &sources-list;, &apt-get;"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
- #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
- #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+ #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+ #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+ #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
  msgid "Diagnostics"
  msgstr "Diagnósticos"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:385
+ #: apt-cache.8.xml:357
  msgid ""
  "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -1670,42 -1479,13 +1480,13 @@@ msgstr "
  "<command>apt-cache</command> devuelve cero si no hay ningún error, y el "
  "valor 100 en caso de error."
  
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cdrom.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "February 2004</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "de Febrero de 2004</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cdrom.8.xml:24 apt-cdrom.8.xml:31
- msgid "apt-cdrom"
- msgstr "apt-cdrom"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-cdrom.8.xml:32
  msgid "APT CDROM management utility"
  msgstr "Herramienta de APT para la gestión de discos ópticos"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cdrom.8.xml:38
- msgid ""
- "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
- "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
- "<arg>add</arg> <arg>ident</arg> </group>"
- msgstr ""
- "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
- "<arg><option>-d=<replaceable>punto-de-montaje</replaceable></option></arg> "
- "<arg><option>-o=<replaceable>cadena-de-configuración</replaceable></option></"
- "arg> <arg><option>-c=<replaceable>fichero</replaceable></option></arg> "
- "<group> <arg>add</arg> <arg>ident</arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:51
+ #: apt-cdrom.8.xml:38
  msgid ""
  "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
  "available sources. <command>apt-cdrom</command> takes care of determining "
@@@ -1718,7 -1498,7 +1499,7 @@@ msgstr "
  "los ficheros de índice."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:58
+ #: apt-cdrom.8.xml:45
  msgid ""
  "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
  "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@@ -1729,13 -1509,8 +1510,8 @@@ msgstr "
  "cada disco de un conjunto de discos por separado, para poder detectar los "
  "posibles errores de grabación."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:68
- msgid "add"
- msgstr "add"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:69
+ #: apt-cdrom.8.xml:56
  msgid ""
  "<literal>add</literal> is used to add a new disc to the source list. It will "
  "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@@ -1750,7 -1525,7 +1526,7 @@@ msgstr "
  "título descriptivo."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:77
+ #: apt-cdrom.8.xml:64
  msgid ""
  "APT uses a CDROM ID to track which disc is currently in the drive and "
  "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@@ -1760,13 -1535,8 +1536,8 @@@ msgstr "
  "en la unidad lectora y mantiene una lista de estos identificadores en "
  "<filename>&statedir;/cdroms.list</filename>"
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:84
- msgid "ident"
- msgstr "ident"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:85
+ #: apt-cdrom.8.xml:72
  msgid ""
  "A debugging tool to report the identity of the current disc as well as the "
  "stored file name"
@@@ -1775,7 -1545,7 +1546,7 @@@ msgstr "
  "así como del nombre del fichero guardado."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:64
+ #: apt-cdrom.8.xml:51
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present.  <placeholder type=\"variablelist"
@@@ -1786,22 -1556,12 +1557,12 @@@ msgstr "
  "option>. <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cdrom.8.xml:94 apt-key.8.xml:158
+ #: apt-cdrom.8.xml:81 apt-key.8.xml:160
  msgid "Options"
  msgstr "Opciones"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
- msgid "<option>-d</option>"
- msgstr "<option>-d</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98
- msgid "<option>--cdrom</option>"
- msgstr "<option>--cdrom</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:99
+ #: apt-cdrom.8.xml:86
  msgid ""
  "Mount point; specify the location to mount the cdrom. This mount point must "
  "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@@ -1812,18 -1572,8 +1573,8 @@@ msgstr "
  "correctamente configurado. Opción de configuración: <literal>Acquire::cdrom::"
  "mount</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>-r</option>"
- msgstr "<option>-r</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>--rename</option>"
- msgstr "<option>--rename</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:108
+ #: apt-cdrom.8.xml:95
  msgid ""
  "Rename a disc; change the label of a disk or override the disks given label. "
  "This option will cause <command>apt-cdrom</command> to prompt for a new "
@@@ -1834,18 -1584,8 +1585,8 @@@ msgstr "
  "etiqueta nueva. Opción de configuración: <literal>APT::CDROM::Rename</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116 apt-get.8.xml:364
- msgid "<option>-m</option>"
- msgstr "<option>-m</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116
- msgid "<option>--no-mount</option>"
- msgstr "<option>--no-mount</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:117
+ #: apt-cdrom.8.xml:104
  msgid ""
  "No mounting; prevent <command>apt-cdrom</command> from mounting and "
  "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@@ -1854,13 -1594,8 +1595,8 @@@ msgstr "
  "No montar. Evita que <command>apt-cdrom</command> monte y desmonte el punto "
  "de montaje. Opción de configuración: <literal>APT::CDROM::NoMount</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:124
- msgid "<option>--fast</option>"
- msgstr "<option>--fast</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:125
+ #: apt-cdrom.8.xml:112
  msgid ""
  "Fast Copy; Assume the package files are valid and do not check every "
  "package. This option should be used only if <command>apt-cdrom</command> has "
@@@ -1872,13 -1607,8 +1608,8 @@@ msgstr "
  "command> comprobó el disco anteriormente y no detectó ningún error. Opción "
  "de configuración: <literal>APT::CDROM::Fast</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:134
- msgid "<option>--thorough</option>"
- msgstr "<option>--thorough</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:135
+ #: apt-cdrom.8.xml:122
  msgid ""
  "Thorough Package Scan; This option may be needed with some old Debian "
  "1.1/1.2 discs that have Package files in strange places. It takes much "
@@@ -1889,23 -1619,8 +1620,8 @@@ msgstr "
  "en lugares extraños. El análisis del disco óptico lleva mucho más tiempo, "
  "pero encontrará todo el contenido."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:143 apt-get.8.xml:395
- msgid "<option>--just-print</option>"
- msgstr "<option>--just-print</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:144 apt-get.8.xml:397
- msgid "<option>--recon</option>"
- msgstr "<option>--recon</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:145 apt-get.8.xml:398
- msgid "<option>--no-act</option>"
- msgstr "<option>--no-act</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:146
+ #: apt-cdrom.8.xml:133
  msgid ""
  "No Changes; Do not change the &sources-list; file and do not write index "
  "files. Everything is still checked however.  Configuration Item: "
@@@ -1916,12 -1631,12 +1632,12 @@@ msgstr "
  "CDROM::NoAct</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:159
+ #: apt-cdrom.8.xml:146
  msgid "&apt-conf;, &apt-get;, &sources-list;"
  msgstr "&apt-conf;, &apt-get;, &sources-list;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:164
+ #: apt-cdrom.8.xml:151
  msgid ""
  "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -1929,42 -1644,13 +1645,13 @@@ msgstr "
  "<command>apt-cdrom</command> devuelve cero si no hay ningún error y el valor "
  "100 en caso de error."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-config.8.xml:16 apt-extracttemplates.1.xml:16 apt-sortpkgs.1.xml:16
- #: sources.list.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
- "February 2004</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
- "de Febrero de 2004</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-config.8.xml:25 apt-config.8.xml:32
- msgid "apt-config"
- msgstr "apt-config"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-config.8.xml:33
  msgid "APT Configuration Query program"
  msgstr "Programa para consultar la configuración de APT"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-config.8.xml:39
- msgid ""
- "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>shell</arg> <arg>dump</arg> </group>"
- msgstr ""
- "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
- "o=<replaceable>cadena-de-configuración</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>fichero</replaceable></option></arg> <group "
- "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:51
+ #: apt-config.8.xml:39
  msgid ""
  "<command>apt-config</command> is an internal program used by various "
  "portions of the APT suite to provide consistent configurability. It accesses "
@@@ -1978,7 -1664,7 +1665,7 @@@ msgstr "
  "sencillo de usar por aplicaciones con scripts."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+ #: apt-config.8.xml:44 apt-ftparchive.1.xml:54
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present."
@@@ -1987,13 -1673,8 +1674,8 @@@ msgstr "
  "proporcione una de las opciones <option>-h</option> o <option>--help</"
  "option>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-config.8.xml:61
- msgid "shell"
- msgstr "shell"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:63
+ #: apt-config.8.xml:51
  msgid ""
  "shell is used to access the configuration information from a shell script. "
  "It is given pairs of arguments, the first being a shell variable and the "
@@@ -2009,7 -1690,7 +1691,7 @@@ msgstr "
  "manera en un script:"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-config.8.xml:71
+ #: apt-config.8.xml:59
  #, no-wrap
  msgid ""
  "OPTS=\"-f\"\n"
@@@ -2021,7 -1702,7 +1703,7 @@@ msgstr "
  "eval $RES\n"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:76
+ #: apt-config.8.xml:64
  msgid ""
  "This will set the shell environment variable $OPTS to the value of MyApp::"
  "options with a default of <option>-f</option>."
@@@ -2030,7 -1711,7 +1712,7 @@@ msgstr "
  "valor de MyApp::Opciones, y con <option>-f</option> por omisión."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:80
+ #: apt-config.8.xml:68
  msgid ""
  "The configuration item may be postfixed with a /[fdbi]. f returns file "
  "names, d returns directories, b returns true or false and i returns an "
@@@ -2043,18 -1724,42 +1725,42 @@@ msgstr "
  "internamente."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:89
+ #: apt-config.8.xml:77
  msgid "Just show the contents of the configuration space."
  msgstr "Sólo muestra el contenido del espacio de configuración."
  
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:90
+ msgid ""
+ "Include options which have an empty value. This is the default, so use --no-"
+ "empty to remove them from the output."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-config.8.xml:95
+ msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:96
+ msgid ""
+ "Defines the output of each config option. &percnt;t will be replaced with "
+ "the name of the option, &percnt;f with the complete optionname and &percnt;v "
+ "with the value of the option.  Use uppercase letters and special characters "
+ "in the value will be encoded to ensure that it can e.g. be savely used in a "
+ "quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
+ "by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
+ "&percnt;."
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
- #: apt-sortpkgs.1.xml:73
+ #: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
+ #: apt-sortpkgs.1.xml:64
  msgid "&apt-conf;"
  msgstr "&apt-conf;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:112
+ #: apt-config.8.xml:115
  msgid ""
  "<command>apt-config</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -2062,11 -1767,6 +1768,6 @@@ msgstr "
  "<command>apt-config</command> devuelve cero si no hay ningún error, y el "
  "valor 100 en caso de error."
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-extracttemplates.1.xml:25 apt-extracttemplates.1.xml:32
- msgid "apt-extracttemplates"
- msgstr "apt-extracttemplates"
- 
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
  msgid "1"
@@@ -2079,21 -1779,8 +1780,8 @@@ msgstr "
  "Herramienta para extraer la configuración de DebConf y las plantillas de los "
  "paquetes de Debian"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-extracttemplates.1.xml:39
- msgid ""
- "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
- "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
- "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
- "arg>"
- msgstr ""
- "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
- "<arg><option>-t=<replaceable>directorio-temporal</replaceable></option></"
- "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>fichero</"
- "replaceable></arg>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:47
+ #: apt-extracttemplates.1.xml:39
  msgid ""
  "<command>apt-extracttemplates</command> will take one or more Debian package "
  "files as input and write out (to a temporary directory) all associated "
@@@ -2108,17 -1795,25 +1796,25 @@@ msgstr "
  "plantillas, se generará una salida de una línea con el formato:"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:52
+ #: apt-extracttemplates.1.xml:44
  msgid "package version template-file config-script"
  msgstr "paquete versión fichero-de-plantilla script-de-configuración"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:53
+ #: apt-extracttemplates.1.xml:45
+ #, fuzzy
+ #| msgid ""
+ #| "template-file and config-script are written to the temporary directory "
+ #| "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
+ #| "TempDir</literal>)  directory, with filenames of the form "
+ #| "<filename>package.template.XXXX</filename> and <filename>package.config."
+ #| "XXXX</filename>"
  msgid ""
  "template-file and config-script are written to the temporary directory "
- "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
- "literal>)  directory, with filenames of the form <filename>package.template."
- "XXXX</filename> and <filename>package.config.XXXX</filename>"
+ "specified by the <option>-t</option> or <option>--tempdir</option> "
+ "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+ "filenames of the form <filename>package.template.XXXX</filename> and "
+ "<filename>package.config.XXXX</filename>"
  msgstr ""
  "El fichero de plantilla y el script de configuración se escribirán en el "
  "directorio temporal definido mediante la opción «-t» o «--"
@@@ -2126,18 -1821,8 +1822,8 @@@
  "los ficheros tendrán la forma <filename>paquete.template.XXXX</filename> y "
  "<filename>paquete.config.XXXX</filename>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
- msgid "<option>-t</option>"
- msgstr "<option>-t</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63
- msgid "<option>--tempdir</option>"
- msgstr "<option>--tempdir</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-extracttemplates.1.xml:65
+ #: apt-extracttemplates.1.xml:58
  msgid ""
  "Temporary directory in which to write extracted debconf template files and "
  "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@@ -2148,7 -1833,7 +1834,7 @@@ msgstr "
  "<literal>APT::ExtractTemplates::TempDir</literal>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:82
+ #: apt-extracttemplates.1.xml:75
  msgid ""
  "<command>apt-extracttemplates</command> returns zero on normal operation, "
  "decimal 100 on error."
@@@ -2156,71 -1841,13 +1842,13 @@@ msgstr "
  "<command>apt-extracttemplates</command> devuelve cero si no hay ningún "
  "error, y el valor 100 en caso de error."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-ftparchive.1.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
- "August 2009</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
- "de Agosto de 2009</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-ftparchive.1.xml:25 apt-ftparchive.1.xml:32
- msgid "apt-ftparchive"
- msgstr "apt-ftparchive"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-ftparchive.1.xml:33
  msgid "Utility to generate index files"
  msgstr "Herramienta para generar ficheros de índice"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-ftparchive.1.xml:39
- msgid ""
- "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
- "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
- "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
- "arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
- "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
- "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
- "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
- "replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
- "arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
- "arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
- "replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
- "\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
- msgstr ""
- "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
- "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
- "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
- "arg> <arg><option>--arch <replaceable>arquitectura</replaceable></option></"
- "arg> <arg><option>-o <replaceable>configuración</"
- "replaceable>=<replaceable>cadena</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>fichero</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>packages<arg choice=\"plain\" rep=\"repeat\"><replaceable>ruta</"
- "replaceable></arg><arg><replaceable>fichero-alternativo</"
- "replaceable><arg><replaceable>prefijo-ruta</replaceable></arg></arg></arg> "
- "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>ruta</"
- "replaceable></arg><arg><replaceable>fichero-alternativo</"
- "replaceable><arg><replaceable>prefijo-ruta</replaceable></arg></arg></arg> "
- "<arg>contents <arg choice=\"plain\"><replaceable>ruta</replaceable></arg></"
- "arg> <arg>release <arg choice=\"plain\"><replaceable>ruta</replaceable></"
- "arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>fichero-"
- "configuración</replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>sección</replaceable></arg></arg> <arg>clean <arg choice="
- "\"plain\"><replaceable>fichero-configuración</replaceable></arg></arg> </"
- "group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:60
+ #: apt-ftparchive.1.xml:39
  msgid ""
  "<command>apt-ftparchive</command> is the command line tool that generates "
  "the index files that APT uses to access a distribution source. The index "
@@@ -2233,7 -1860,7 +1861,7 @@@ msgstr "
  "de origen basado en el contenido de ese sitio."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:64
+ #: apt-ftparchive.1.xml:43
  msgid ""
  "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
  "program, incorporating its entire functionality via the <literal>packages</"
@@@ -2248,7 -1875,7 +1876,7 @@@ msgstr "
  "«script» para el proceso de generación de un archivo completo."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:70
+ #: apt-ftparchive.1.xml:49
  msgid ""
  "Internally <command>apt-ftparchive</command> can make use of binary "
  "databases to cache the contents of a .deb file and it does not rely on any "
@@@ -2262,13 -1889,8 +1890,8 @@@ msgstr "
  "generación completa, automáticamente realiza comprobaciones de cambios en "
  "los ficheros y genera los ficheros de salida comprimidos deseados."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:79
- msgid "packages"
- msgstr "packages"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:81
+ #: apt-ftparchive.1.xml:60
  msgid ""
  "The packages command generates a package file from a directory tree. It "
  "takes the given directory and recursively searches it for .deb files, "
@@@ -2281,20 -1903,15 +1904,15 @@@ msgstr "
  "orden es casi un equivalente de &dpkg-scanpackages;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+ #: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
  msgid ""
  "The option <option>--db</option> can be used to specify a binary caching DB."
  msgstr ""
  "La opción <option>--db</option> se puede usar para especificar una base de "
- "datos binaria para la caché (registro de paquetes)."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:89
- msgid "sources"
- msgstr "sources"
+ "datos binaria para la caché (registro de paquetes)."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:91
+ #: apt-ftparchive.1.xml:70
  msgid ""
  "The <literal>sources</literal> command generates a source index file from a "
  "directory tree.  It takes the given directory and recursively searches it "
@@@ -2308,7 -1925,7 +1926,7 @@@ msgstr "
  "scansources;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:96
+ #: apt-ftparchive.1.xml:75
  msgid ""
  "If an override file is specified then a source override file will be looked "
  "for with an extension of .src. The --source-override option can be used to "
@@@ -2318,13 -1935,8 +1936,8 @@@ msgstr "
  "alternativo con la extensión «.src». Puede usar la opción --source-override "
  "para cambiar el fichero de fuentes alternativo que se usará."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:101
- msgid "contents"
- msgstr "contents"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:103
+ #: apt-ftparchive.1.xml:82
  msgid ""
  "The <literal>contents</literal> command generates a contents file from a "
  "directory tree. It takes the given directory and recursively searches it "
@@@ -2341,13 -1953,8 +1954,8 @@@ msgstr "
  "varios paquetes tienen el mismo fichero, entonces cada paquete se separará "
  "por una coma en la salida."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:113
- msgid "release"
- msgstr "release"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:115
+ #: apt-ftparchive.1.xml:94
  msgid ""
  "The <literal>release</literal> command generates a Release file from a "
  "directory tree. It recursively searches the given directory for uncompressed "
@@@ -2362,7 -1969,7 +1970,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:125
+ #: apt-ftparchive.1.xml:104
  msgid ""
  "Values for the additional metadata fields in the Release file are taken from "
  "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@@ -2382,13 -1989,8 +1990,8 @@@ msgstr "
  "<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:136
- msgid "generate"
- msgstr "generate"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:138
+ #: apt-ftparchive.1.xml:117
  msgid ""
  "The <literal>generate</literal> command is designed to be runnable from a "
  "cron script and builds indexes according to the given config file. The "
@@@ -2403,13 -2005,8 +2006,8 @@@ msgstr "
  "directorios, así como proporcionar una forma sencilla de mantener la "
  "configuración necesaria."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:145 apt-get.8.xml:287
- msgid "clean"
- msgstr "clean"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:147
+ #: apt-ftparchive.1.xml:126
  msgid ""
  "The <literal>clean</literal> command tidies the databases used by the given "
  "configuration file by removing any records that are no longer necessary."
@@@ -2419,12 -2016,12 +2017,12 @@@ msgstr "
  "necesarios."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:153
+ #: apt-ftparchive.1.xml:132
  msgid "The Generate Configuration"
  msgstr "La configuración de «generate»"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:155
+ #: apt-ftparchive.1.xml:134
  msgid ""
  "The <literal>generate</literal> command uses a configuration file to "
  "describe the archives that are going to be generated. It follows the typical "
@@@ -2442,7 -2039,7 +2040,7 @@@ msgstr "
  "etiqueta."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:163
+ #: apt-ftparchive.1.xml:142
  msgid ""
  "The generate configuration has 4 separate sections, each described below."
  msgstr ""
@@@ -2450,12 -2047,12 +2048,12 @@@
  "describen a continuación."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:165
+ #: apt-ftparchive.1.xml:144
  msgid "Dir Section"
  msgstr "Sección Dir"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:167
+ #: apt-ftparchive.1.xml:146
  msgid ""
  "The <literal>Dir</literal> section defines the standard directories needed "
  "to locate the files required during the generation process. These "
@@@ -2467,13 -2064,8 +2065,8 @@@ msgstr "
  "estos directorios se les añaden ciertas rutas relativas definidas en "
  "secciones posteriores para producir una ruta absoluta."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:172
- msgid "ArchiveDir"
- msgstr "Sección ArchiveDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:174
+ #: apt-ftparchive.1.xml:153
  msgid ""
  "Specifies the root of the FTP archive, in a standard Debian configuration "
  "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@@ -2483,33 -2075,18 +2076,18 @@@ msgstr "
  "es el directorio que contiene el <filename>ls-LR</filename> y los nodos "
  "«dist»."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:179
- msgid "OverrideDir"
- msgstr "Sección OverrideDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:181
+ #: apt-ftparchive.1.xml:160
  msgid "Specifies the location of the override files."
  msgstr "Define la ubicación de los ficheros alternativos."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:184
- msgid "CacheDir"
- msgstr "Sección CacheDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:186
+ #: apt-ftparchive.1.xml:165
  msgid "Specifies the location of the cache files"
  msgstr "Define la ubicación de los ficheros de la caché."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:189
- msgid "FileListDir"
- msgstr "Sección FileListDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:191
+ #: apt-ftparchive.1.xml:170
  msgid ""
  "Specifies the location of the file list files, if the <literal>FileList</"
  "literal> setting is used below."
@@@ -2518,12 -2095,12 +2096,12 @@@ msgstr "
  "posteriormente el valor <literal>FileList</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:197
+ #: apt-ftparchive.1.xml:176
  msgid "Default Section"
  msgstr "Sección Default"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:199
+ #: apt-ftparchive.1.xml:178
  msgid ""
  "The <literal>Default</literal> section specifies default values, and "
  "settings that control the operation of the generator. Other sections may "
@@@ -2533,13 -2110,8 +2111,8 @@@ msgstr "
  "los ajustes que controlan la operación del generador. Otras secciones pueden "
  "sobrescribir estos valores predeterminados con un valor de la sección."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:203
- msgid "Packages::Compress"
- msgstr "Packages::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:205
+ #: apt-ftparchive.1.xml:184
  msgid ""
  "Sets the default compression schemes to use for the Package index files. It "
  "is a string that contains a space separated list of at least one of: '.' (no "
@@@ -2552,13 -2124,8 +2125,8 @@@ msgstr "
  "«gzip» y «bzip2». El valor predeterminado para todos los esquemas de "
  "compresión es «. gzip»."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:211
- msgid "Packages::Extensions"
- msgstr "Packages::Extensions"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:213
+ #: apt-ftparchive.1.xml:192
  msgid ""
  "Sets the default list of file extensions that are package files.  This "
  "defaults to '.deb'."
@@@ -2566,13 -2133,8 +2134,8 @@@ msgstr "
  "Define la lista predeterminada de extensiones de fichero que son ficheros de "
  "paquete. El valor predeterminado es «.deb»."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:217
- msgid "Sources::Compress"
- msgstr "Sources::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:219
+ #: apt-ftparchive.1.xml:198
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Sources files."
@@@ -2580,13 -2142,8 +2143,8 @@@ msgstr "
  "Esta opción es similar a <literal>Packages::Compress</literal> excepto que "
  "controla la compresión para los ficheros «Sources»."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:223
- msgid "Sources::Extensions"
- msgstr "Sources::Extensions"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:225
+ #: apt-ftparchive.1.xml:204
  msgid ""
  "Sets the default list of file extensions that are source files.  This "
  "defaults to '.dsc'."
@@@ -2594,13 -2151,8 +2152,8 @@@ msgstr "
  "Define la lista predeterminada de las extensiones de fichero que son "
  "ficheros de fuentes. El valor predeterminado es «.dsc»."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:229
- msgid "Contents::Compress"
- msgstr "Contents::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:231
+ #: apt-ftparchive.1.xml:210
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Contents files."
@@@ -2608,13 -2160,8 +2161,8 @@@ msgstr "
  "Esta opción es similar a <literal>Packages::Compress</literal> excepto que "
  "controla la compresión para los ficheros «Contents»."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:235
- msgid "Translation::Compress"
- msgstr "Translation::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:237
+ #: apt-ftparchive.1.xml:216
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Translation-en master file."
@@@ -2622,13 -2169,8 +2170,8 @@@ msgstr "
  "Esta opción es similar a <literal>Packages::Compress</literal> excepto que "
  "controla la compresión para el fichero maestro Translation-en."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:241
- msgid "DeLinkLimit"
- msgstr "DeLinkLimit"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:243
+ #: apt-ftparchive.1.xml:222
  msgid ""
  "Specifies the number of kilobytes to delink (and replace with hard links) "
  "per run. This is used in conjunction with the per-section <literal>External-"
@@@ -2638,13 -2180,8 +2181,8 @@@ msgstr "
  "por ejecución. Se usa junto al valor <literal>External-Links</literal> de "
  "cada sección."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:248
- msgid "FileMode"
- msgstr "FileMode"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:250
+ #: apt-ftparchive.1.xml:229
  msgid ""
  "Specifies the mode of all created index files. It defaults to 0644. All "
  "index files are set to this mode with no regard to the umask."
@@@ -2653,13 -2190,8 +2191,8 @@@ msgstr "
  "predeterminado es 0644. Todos los ficheros de índice se ajustan a este modo "
  "sin tener en cuenta la máscara de usuario («umask»)."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
- msgid "LongDescription"
- msgstr "LongDescription"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+ #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
  msgid ""
  "Sets if long descriptions should be included in the Packages file or split "
  "out into a master Translation-en file."
@@@ -2669,12 -2201,12 +2202,12 @@@ msgstr "
  "en»."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:263
+ #: apt-ftparchive.1.xml:242
  msgid "TreeDefault Section"
  msgstr "Sección TreeDefault"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:265
+ #: apt-ftparchive.1.xml:244
  msgid ""
  "Sets defaults specific to <literal>Tree</literal> sections. All of these "
  "variables are substitution variables and have the strings $(DIST), "
@@@ -2684,13 -2216,8 +2217,8 @@@ msgstr "
  "Todas estas variables son variables de sustitución y reemplazan las cadenas "
  "$(DIST), $(SECTION) y $(ARCH) con sus valores respectivos."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:270
- msgid "MaxContentsChange"
- msgstr "MaxContentsChange"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:272
+ #: apt-ftparchive.1.xml:251
  msgid ""
  "Sets the number of kilobytes of contents files that are generated each day. "
  "The contents files are round-robined so that over several days they will all "
@@@ -2700,13 -2227,8 +2228,8 @@@ msgstr "
  "cada día. Los ficheros de contenido están en una cola «round-robin», de modo "
  "que durante varios días todos se regenerarán."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:277
- msgid "ContentsAge"
- msgstr "ContentsAge"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:279
+ #: apt-ftparchive.1.xml:258
  msgid ""
  "Controls the number of days a contents file is allowed to be checked without "
  "changing. If this limit is passed the mtime of the contents file is updated. "
@@@ -2724,13 -2246,8 +2247,8 @@@ msgstr "
  "un fichero nuevo de todos modos. El valor predeterminado es diez, las "
  "unidades usadas son días."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:288
- msgid "Directory"
- msgstr "Directory"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:290
+ #: apt-ftparchive.1.xml:269
  msgid ""
  "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
  "$(SECTION)/binary-$(ARCH)/</filename>"
@@@ -2738,13 -2255,8 +2256,8 @@@ msgstr "
  "Define la raíz del directorio «.deb». El valor predeterminado es <filename>"
  "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:294
- msgid "SrcDirectory"
- msgstr "SrcDirectory"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:296
+ #: apt-ftparchive.1.xml:275
  msgid ""
  "Sets the top of the source package directory tree. Defaults to <filename>"
  "$(DIST)/$(SECTION)/source/</filename>"
@@@ -2752,13 -2264,8 +2265,8 @@@ msgstr "
  "Define la raíz del directorio de los paquetes de fuentes. El valor "
  "predeterminado es <filename>$(DIST)/$(SECTION)/source/</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
- msgid "Packages"
- msgstr "Packages"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:302
+ #: apt-ftparchive.1.xml:281
  msgid ""
  "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "binary-$(ARCH)/Packages</filename>"
@@@ -2766,13 -2273,8 +2274,8 @@@ msgstr "
  "Define el fichero «Packages» de salida. El valor predeterminado es <filename>"
  "$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
- msgid "Sources"
- msgstr "Sources"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:308
+ #: apt-ftparchive.1.xml:287
  msgid ""
  "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "source/Sources</filename>"
@@@ -2780,13 -2282,8 +2283,8 @@@ msgstr "
  "Define el fichero «Sources» de salida. El valor predeterminado es <filename>"
  "$(DIST)/$(SECTION)/source/Sources</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:312
- msgid "Translation"
- msgstr "Translation"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:314
+ #: apt-ftparchive.1.xml:293
  msgid ""
  "Set the output Translation-en master file with the long descriptions if they "
  "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@@ -2797,13 -2294,8 +2295,8 @@@ msgstr "
  "valor predeterminado es <filename>$(DIST)/$(SECTION)/i18n/Translation-en</"
  "filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:319
- msgid "InternalPrefix"
- msgstr "InternalPrefix"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:321
+ #: apt-ftparchive.1.xml:300
  msgid ""
  "Sets the path prefix that causes a symlink to be considered an internal link "
  "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@@ -2813,13 -2305,8 +2306,8 @@@ msgstr "
  "un enlace interno en lugar de un enlace externo. El valor predeterminado es "
  "<filename>$(DIST)/$(SECTION)/</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
- msgid "Contents"
- msgstr "Contents"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:328
+ #: apt-ftparchive.1.xml:307
  msgid ""
  "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
  "</filename>. If this setting causes multiple Packages files to map onto a "
@@@ -2832,24 -2319,14 +2320,14 @@@ msgstr "
  "predeterminado), <command>apt-ftparchive</command> integrará automáticamente "
  "esos ficheros de paquete juntos."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:335
- msgid "Contents::Header"
- msgstr "Contents::Header"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:337
+ #: apt-ftparchive.1.xml:316
  msgid "Sets header file to prepend to the contents output."
  msgstr ""
  "Define el fichero de cabecera a añadir al fichero «Contents» de salida."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
- msgid "BinCacheDB"
- msgstr "BinCacheDB"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:342
+ #: apt-ftparchive.1.xml:321
  msgid ""
  "Sets the binary cache database to use for this section. Multiple sections "
  "can share the same database."
@@@ -2857,13 -2334,8 +2335,8 @@@ msgstr "
  "Define la base de datos binaria de la caché para usar en esta sección. "
  "Varias secciones pueden compartir la misma base de datos."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:346
- msgid "FileList"
- msgstr "FileList"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:348
+ #: apt-ftparchive.1.xml:327
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
@@@ -2874,13 -2346,8 +2347,8 @@@ msgstr "
  "árbol de directorios. A los nombres de los ficheros relativos se les añade "
  "como prefijo el directorio del archivo."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:353
- msgid "SourceFileList"
- msgstr "SourceFileList"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:355
+ #: apt-ftparchive.1.xml:334
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
@@@ -2894,12 -2361,12 +2362,12 @@@ msgstr "
  "índices de fuentes."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:363
+ #: apt-ftparchive.1.xml:342
  msgid "Tree Section"
  msgstr "Sección Tree"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:365
+ #: apt-ftparchive.1.xml:344
  msgid ""
  "The <literal>Tree</literal> section defines a standard Debian file tree "
  "which consists of a base directory, then multiple sections in that base "
@@@ -2914,7 -2381,7 +2382,7 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:370
+ #: apt-ftparchive.1.xml:349
  msgid ""
  "The <literal>Tree</literal> section takes a scope tag which sets the "
  "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@@ -2927,7 -2394,7 +2395,7 @@@ msgstr "
  "valor como <filename>dists/&stable-codename;</filename>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:375
+ #: apt-ftparchive.1.xml:354
  msgid ""
  "All of the settings defined in the <literal>TreeDefault</literal> section "
  "can be use in a <literal>Tree</literal> section as well as three new "
@@@ -2938,7 -2405,7 +2406,7 @@@ msgstr "
  "variables."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt-ftparchive.1.xml:381
+ #: apt-ftparchive.1.xml:360
  #, no-wrap
  msgid ""
  "for i in Sections do \n"
@@@ -2952,7 -2419,7 +2420,7 @@@ msgstr "
  "     "
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:378
+ #: apt-ftparchive.1.xml:357
  msgid ""
  "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
  "command> performs an operation similar to: <placeholder type=\"programlisting"
@@@ -2962,13 -2429,8 +2430,8 @@@ msgstr "
  "ftparchive</command> realiza una operación similar a la siguiente: "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:387
- msgid "Sections"
- msgstr "Secciones"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:389
+ #: apt-ftparchive.1.xml:368
  msgid ""
  "This is a space separated list of sections which appear under the "
  "distribution, typically this is something like <literal>main contrib non-"
@@@ -2978,13 -2440,8 +2441,8 @@@ msgstr "
  "distribución, generalmente es similar a <literal>main contrib non-free</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:394
- msgid "Architectures"
- msgstr "Arquitecturas"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:396
+ #: apt-ftparchive.1.xml:375
  msgid ""
  "This is a space separated list of all the architectures that appear under "
  "search section. The special architecture 'source' is used to indicate that "
@@@ -2994,13 -2451,8 +2452,8 @@@ msgstr "
  "bajo la sección de búsqueda. La arquitectura especial «source» se usa para "
  "indicar que este árbol tiene un fichero de fuentes."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
- msgid "BinOverride"
- msgstr "BinOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:409
+ #: apt-ftparchive.1.xml:388
  msgid ""
  "Sets the binary override file. The override file contains section, priority "
  "and maintainer address information."
@@@ -3008,13 -2460,8 +2461,8 @@@ msgstr "
  "Define el fichero binario alternativo. Éste contiene la información sobre la "
  "sección, la prioridad y la dirección del mantenedor."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
- msgid "SrcOverride"
- msgstr "SrcOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:415
+ #: apt-ftparchive.1.xml:394
  msgid ""
  "Sets the source override file. The override file contains section "
  "information."
@@@ -3022,33 -2469,23 +2470,23 @@@ msgstr "
  "Define el fichero de fuentes alternativo. Éste contiene la información sobre "
  "la sección."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
- msgid "ExtraOverride"
- msgstr "ExtraOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+ #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
  msgid "Sets the binary extra override file."
  msgstr "Define el fichero binario alternativo adicional."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
- msgid "SrcExtraOverride"
- msgstr "SrcExtraOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+ #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
  msgid "Sets the source extra override file."
  msgstr "Define el fichero de fuentes alternativo adicional."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:431
+ #: apt-ftparchive.1.xml:410
  msgid "BinDirectory Section"
  msgstr "Sección BinDirectory"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:433
+ #: apt-ftparchive.1.xml:412
  msgid ""
  "The <literal>bindirectory</literal> section defines a binary directory tree "
  "with no special structure. The scope tag specifies the location of the "
@@@ -3063,12 -2500,12 +2501,12 @@@ msgstr "
  "<literal>Section</literal><literal>Architecture</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:441
+ #: apt-ftparchive.1.xml:420
  msgid "Sets the Packages file output."
  msgstr "Define el fichero «Packages» de salida."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:446
+ #: apt-ftparchive.1.xml:425
  msgid ""
  "Sets the Sources file output. At least one of <literal>Packages</literal> or "
  "<literal>Sources</literal> is required."
@@@ -3077,52 -2514,42 +2515,42 @@@ msgstr "
  "<literal>Packages</literal> o <literal>Sources</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:452
+ #: apt-ftparchive.1.xml:431
  msgid "Sets the Contents file output. (optional)"
  msgstr "Define el fichero «Contents» de salida. (Opcional)"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:457
+ #: apt-ftparchive.1.xml:436
  msgid "Sets the binary override file."
  msgstr "Define el fichero binario alternativo."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:462
+ #: apt-ftparchive.1.xml:441
  msgid "Sets the source override file."
  msgstr "Define el fichero de fuentes alternativo."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:477
+ #: apt-ftparchive.1.xml:456
  msgid "Sets the cache DB."
  msgstr "Define la base de datos de la caché."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:480
- msgid "PathPrefix"
- msgstr "PathPrefix"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:482
+ #: apt-ftparchive.1.xml:461
  msgid "Appends a path to all the output paths."
  msgstr "Añade una ruta a todas las rutas de salida."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:485
- msgid "FileList, SourceFileList"
- msgstr "FileList, SourceFileList"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:487
+ #: apt-ftparchive.1.xml:466
  msgid "Specifies the file list file."
  msgstr "Define el fichero de la lista de ficheros."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:494
+ #: apt-ftparchive.1.xml:473
  msgid "The Binary Override File"
  msgstr "El fichero binario alternativo"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:495
+ #: apt-ftparchive.1.xml:474
  msgid ""
  "The binary override file is fully compatible with &dpkg-scanpackages;. It "
  "contains 4 fields separated by spaces. The first field is the package name, "
@@@ -3137,19 -2564,19 +2565,19 @@@ msgstr "
  "de permutación del mantenedor."
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:501
+ #: apt-ftparchive.1.xml:480
  #, no-wrap
  msgid "old [// oldn]* => new"
  msgstr "antigua [// antigua-n]* => nueva"
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:503
+ #: apt-ftparchive.1.xml:482
  #, no-wrap
  msgid "new"
  msgstr "nueva"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:500
+ #: apt-ftparchive.1.xml:479
  msgid ""
  "The general form of the maintainer field is: <placeholder type="
  "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@@ -3166,12 -2593,12 +2594,12 @@@ msgstr "
  "segunda forma sustituye de forma incondicional el campo del mantenedor."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:511
+ #: apt-ftparchive.1.xml:490
  msgid "The Source Override File"
  msgstr "El fichero de fuentes alternativo"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:513
+ #: apt-ftparchive.1.xml:492
  msgid ""
  "The source override file is fully compatible with &dpkg-scansources;. It "
  "contains 2 fields separated by spaces. The first fields is the source "
@@@ -3182,12 -2609,12 +2610,12 @@@ msgstr "
  "nombre del paquete fuente, el segundo es la sección a la que se asignará."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:518
+ #: apt-ftparchive.1.xml:497
  msgid "The Extra Override File"
  msgstr "El fichero alternativo adicional"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:520
+ #: apt-ftparchive.1.xml:499
  msgid ""
  "The extra override file allows any arbitrary tag to be added or replaced in "
  "the output. It has 3 columns, the first is the package, the second is the "
@@@ -3197,14 -2624,8 +2625,8 @@@ msgstr "
  "cualquier etiqueta arbitraria. Tiene tres columnas, la primera es el "
  "paquete, la segunda es la etiqueta y el resto de la línea es el nuevo valor."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:529
- msgid ""
- "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:531
+ #: apt-ftparchive.1.xml:510
  #, fuzzy
  #| msgid ""
  #| "Values for the additional metadata fields in the Release file are taken "
@@@ -3221,10 -2642,10 +2643,10 @@@ msgid "
  "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>."
+ "<literal><replaceable>Index</replaceable></literal> can be "
+ "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+ "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+ "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
  msgstr ""
  "Los valores para los campos de metadatos adicionales en el fichero «Release» "
  "se toman de las variables correspondientes en <literal>APT::FTPArchive::"
@@@ -3235,13 -2656,8 +2657,8 @@@
  "<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:539
- msgid "<option>--db</option>"
- msgstr "<option>--db</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:541
+ #: apt-ftparchive.1.xml:521
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
  "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@@ -3250,7 -2666,7 +2667,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:547
+ #: apt-ftparchive.1.xml:527
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -3263,13 -2679,8 +2680,8 @@@ msgstr "
  "q=#</option> para ajustar el nivel de silencio, ignorando el fichero de "
  "configuración. Opción de configuración: <literal>quiet</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:555
+ #: apt-ftparchive.1.xml:535
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
  "then this option actually enables delinking of the files. It defaults to on "
@@@ -3281,13 -2692,8 +2693,8 @@@ msgstr "
  "predeterminada y se puede desactivar mediante <option>--no-delink</option>. "
  "Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:563
+ #: apt-ftparchive.1.xml:543
  msgid ""
  "Perform contents generation. When this option is set and package indexes are "
  "being generated with a cache DB then the file listing will also be extracted "
@@@ -3303,13 -2709,8 +2710,8 @@@ msgstr "
  "forma predeterminada. Opción de configuración: <literal>APT::FTPArchive::"
  "Contents</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:573
+ #: apt-ftparchive.1.xml:553
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@@ -3319,13 -2720,8 +2721,8 @@@ msgstr "
  "<literal>sources</literal>. Opción de configuración: <literal>APT::"
  "FTPArchive::SourceOverride</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:579
+ #: apt-ftparchive.1.xml:559
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3333,13 -2729,8 +2730,8 @@@ msgstr "
  "Define los permisos de las bases de datos de la caché como sólo lectura. "
  "Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:584
+ #: apt-ftparchive.1.xml:564
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
  "commands only package files matching <literal>*_arch.deb</literal> or "
@@@ -3352,13 -2743,8 +2744,8 @@@ msgstr "
  "de paquete en la ruta dada. Elemento de configuración: <literal>APT::"
  "FTPArchive::Architecture</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:592
+ #: apt-ftparchive.1.xml:572
  msgid ""
  "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
  "packages are recompiled and/or republished with the same version again, this "
@@@ -3381,13 -2767,8 +2768,8 @@@ msgstr "
  "que en teoría nadie debería tener problemas y por ello todas estas "
  "comprobaciones adicionales son innecesarias."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:604
+ #: apt-ftparchive.1.xml:584
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
  "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@@ -3403,19 -2784,19 +2785,19 @@@ msgstr "
  "con la orden «generate»."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
- #: sources.list.5.xml:198
+ #: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
+ #: sources.list.5.xml:214
  msgid "Examples"
  msgstr "Ejemplos"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
- #: apt-ftparchive.1.xml:622
+ #: apt-ftparchive.1.xml:602
  #, no-wrap
  msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  msgstr "<command>apt-ftparchive</command> packages <replaceable>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:618
+ #: apt-ftparchive.1.xml:598
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3424,7 -2805,7 +2806,7 @@@ msgstr "
  "paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:632
+ #: apt-ftparchive.1.xml:612
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -3432,116 -2813,14 +2814,14 @@@ msgstr "
  "<command>apt-ftparchive</command> devuelve cero si no hay ningún error, y el "
  "valor 100 en caso de error."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-get.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
- "November 2008</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
- "de Noviembre de 2008</date>"
- 
- #. type: <heading></heading>
- #: apt-get.8.xml:25 apt-get.8.xml:32 guide.sgml:96
- msgid "apt-get"
- msgstr "apt-get"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-get.8.xml:33
  msgid "APT package handling utility -- command-line interface"
  msgstr ""
  "Herramienta de gestión de paquetes APT -- interfaz para la línea de órdenes"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-get.8.xml:39
- #, fuzzy
- #| msgid ""
- #| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- #| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
- #| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
- #| "<arg> <option>-t=</option> <arg choice='plain'> "
- #| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
- #| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
- #| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
- #| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
- #| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
- #| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
- #| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- #| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
- #| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- #| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
- #| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
- #| "<group choice='req'> <arg choice='plain'> "
- #| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
- #| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- #| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
- #| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- #| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- #| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- #| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- #| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
- #| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
- #| "help</arg> </group> </arg> </group>"
- msgid ""
- "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
- "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
- "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
- "replaceable> </arg> </arg> <group choice=\"req\"> <arg "
- "choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
- "choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
- "<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
- "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
- "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
- "arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
- "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
- "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
- "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
- "</group> </arg> </group>"
- msgstr ""
- "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- "<option>-o= <replaceable>cadena-de-configuración</replaceable> </option> </"
- "arg> <arg> <option>-c= <replaceable>fichero-de-configuración</replaceable> </"
- "option> </arg> <arg> <option>-t=</option> <arg choice='plain'> "
- "<replaceable>nombre-de-la-versión-objetivo</replaceable> </arg> </arg> "
- "<group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
- "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
- "choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable> <arg> <group "
- "choice='req'> <arg choice='plain'> =<replaceable>versión-del-paquete</"
- "replaceable> </arg> <arg choice='plain'> /<replaceable>nombre-de-la-versión-"
- "objetivo</replaceable> </arg> </group> </arg> </arg> </arg> <arg "
- "choice='plain'>remove <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>paquete</replaceable></arg></arg> <arg choice='plain'>purge "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></"
- "arg></arg> <arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>paquete</replaceable> <arg> <group choice='req'> <arg "
- "choice='plain'> =<replaceable>versión-del-paquete</replaceable> </arg> <arg "
- "choice='plain'> /<replaceable>nombre-de-la-versión-objetivo</replaceable> </"
- "arg> </group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg></arg> <arg "
- "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
- "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
- "</group> </arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:115
+ #: apt-get.8.xml:39
  msgid ""
  "<command>apt-get</command> is the command-line tool for handling packages, "
  "and may be considered the user's \"back-end\" to other tools using the APT "
@@@ -3554,13 -2833,8 +2834,8 @@@ msgstr "
  "varias interfaces de «alto nivel», tales como &dselect;, &aptitude;, "
  "&synaptic; y &wajig;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:124 apt-key.8.xml:127
- msgid "update"
- msgstr "update"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:125
+ #: apt-get.8.xml:49
  msgid ""
  "<literal>update</literal> is used to resynchronize the package index files "
  "from their sources. The indexes of available packages are fetched from the "
@@@ -3583,13 -2857,8 +2858,8 @@@ msgstr "
  "indicador de progreso será incorrecto, ya que se desconoce de antemano el "
  "tamaño de los archivos de paquete."
  
- #. type: <tag></tag>
- #: apt-get.8.xml:136 guide.sgml:121
- msgid "upgrade"
- msgstr "upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:137
+ #: apt-get.8.xml:61
  msgid ""
  "<literal>upgrade</literal> is used to install the newest versions of all "
  "packages currently installed on the system from the sources enumerated in "
@@@ -3613,13 -2882,8 +2883,8 @@@ msgstr "
  "<literal>update</literal> antes para que <command>apt-get</command> sepa que "
  "hay nuevas versiones disponibles."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:149
- msgid "dselect-upgrade"
- msgstr "dselect-upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:150
+ #: apt-get.8.xml:74
  msgid ""
  "<literal>dselect-upgrade</literal> is used in conjunction with the "
  "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@@ -3635,13 -2899,8 +2900,8 @@@ msgstr "
  "necesarias para que los cambios se lleven a cabo (por ejemplo, borrar "
  "paquetes antiguos e instalar las nuevas versiones)."
  
- #. type: <tag></tag>
- #: apt-get.8.xml:159 guide.sgml:140
- msgid "dist-upgrade"
- msgstr "dist-upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:160
+ #: apt-get.8.xml:84
  msgid ""
  "<literal>dist-upgrade</literal> in addition to performing the function of "
  "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@@ -3663,13 -2922,8 +2923,8 @@@ msgstr "
  "paquetes. También puede consultar &apt-preferences; si quiere invalidar este "
  "comportamiento para paquetes individuales."
  
- #. type: <tag></tag>
- #: apt-get.8.xml:172 guide.sgml:131
- msgid "install"
- msgstr "install"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:174
+ #: apt-get.8.xml:98
  msgid ""
  "<literal>install</literal> is followed by one or more packages desired for "
  "installation or upgrading.  Each package is a package name, not a fully "
@@@ -3697,7 -2951,7 +2952,7 @@@ msgstr "
  "conflictos de apt-get."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:192
+ #: apt-get.8.xml:116
  msgid ""
  "A specific version of a package can be selected for installation by "
  "following the package name with an equals and the version of the package to "
@@@ -3715,7 -2969,7 +2970,7 @@@ msgstr "
  "(stable, testing, unstable)."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:199
+ #: apt-get.8.xml:123
  msgid ""
  "Both of the version selection mechanisms can downgrade packages and must be "
  "used with care."
@@@ -3724,7 -2978,7 +2979,7 @@@ msgstr "
  "anterior de los paquetes y se debe usar con cuidado."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:202
+ #: apt-get.8.xml:126
  msgid ""
  "This is also the target to use if you want to upgrade one or more already-"
  "installed packages without upgrading every package you have on your system. "
@@@ -3744,7 -2998,7 +2999,7 @@@ msgstr "
  "instalarán."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:213
+ #: apt-get.8.xml:137
  msgid ""
  "Finally, the &apt-preferences; mechanism allows you to create an alternative "
  "installation policy for individual packages."
@@@ -3753,7 -3007,7 +3008,7 @@@ msgstr "
  "paquetes individuales."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:217
+ #: apt-get.8.xml:141
  msgid ""
  "If no package matches the given expression and the expression contains one "
  "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@@ -3772,13 -3026,8 +3027,8 @@@ msgstr "
  "comportamiento deseado, debe anclar la expresión regular con un «^» o un "
  "«$», o bien crear una expresión regular más específica."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:226
- msgid "remove"
- msgstr "remove"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:227
+ #: apt-get.8.xml:151
  msgid ""
  "<literal>remove</literal> is identical to <literal>install</literal> except "
  "that packages are removed instead of installed. Note the removing a package "
@@@ -3793,13 -3042,8 +3043,8 @@@ msgstr "
  "del paquete (sin ningún espacio en blanco entre los dos), el paquete en "
  "cuestión será instalado en vez de eliminado."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:234
- msgid "purge"
- msgstr "purge"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:235
+ #: apt-get.8.xml:159
  msgid ""
  "<literal>purge</literal> is identical to <literal>remove</literal> except "
  "that packages are removed and purged (any configuration files are deleted "
@@@ -3809,18 -3053,13 +3054,13 @@@ msgstr "
  "diferencia de que los paquetes se eliminarán y purgarán (se eliminará "
  "también cualquier fichero de configuración)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:239
- msgid "source"
- msgstr "source"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:240
+ #: apt-get.8.xml:164
  msgid ""
  "<literal>source</literal> causes <command>apt-get</command> to fetch source "
  "packages. APT will examine the available packages to decide which source "
  "package to fetch. It will then find and download into the current directory "
- "the newest available version of that source package while respect the "
+ "the newest available version of that source package while respecting the "
  "default release, set with the option <literal>APT::Default-Release</"
  "literal>, the <option>-t</option> option or per package with the "
  "<literal>pkg/release</literal> syntax, if possible."
@@@ -3834,7 -3073,7 +3074,7 @@@ msgstr "
  "release</literal>, si es posible."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:248
+ #: apt-get.8.xml:172
  msgid ""
  "Source packages are tracked separately from binary packages via <literal>deb-"
  "src</literal> type lines in the &sources-list; file. This means that you "
@@@ -3850,7 -3089,7 +3090,7 @@@ msgstr "
  "instalada o de la que podría instalar."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:255
+ #: apt-get.8.xml:179
  #, fuzzy
  #| msgid ""
  #| "If the <option>--compile</option> option is specified then the package "
@@@ -3859,9 -3098,10 +3099,10 @@@
  #| "source package will not be unpacked."
  msgid ""
  "If the <option>--compile</option> option is specified then the package will "
- "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
- "<option>--download-only</option> is specified then the source package will "
- "not be unpacked."
+ "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+ "the architecture as defined by the <command>--host-architecture</command> "
+ "option.  If <option>--download-only</option> is specified then the source "
+ "package will not be unpacked."
  msgstr ""
  "Si se especifica la opción <option>--compile</option> el paquete se "
  "compilará en un binario «.deb» usando <command>dpkg-buildpackage</command>, "
@@@ -3869,7 -3109,7 +3110,7 @@@
  "desempaquetará."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:260
+ #: apt-get.8.xml:186
  msgid ""
  "A specific source version can be retrieved by postfixing the source name "
  "with an equals and then the version to fetch, similar to the mechanism used "
@@@ -3884,7 -3124,7 +3125,7 @@@ msgstr "
  "activando implícitamente la opción <literal>APT::Get::Only-Source</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:266
+ #: apt-get.8.xml:192
  msgid ""
  "Note that source packages are not tracked like binary packages, they exist "
  "only in the current directory and are similar to downloading source tar "
@@@ -3894,32 -3134,25 +3135,25 @@@ msgstr "
  "sólo existen en el directorio actual y es parecido a descargar los paquetes "
  "tar comprimidos con las fuentes."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:271
- msgid "build-dep"
- msgstr "build-dep"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:272
+ #: apt-get.8.xml:198
  #, fuzzy
  #| msgid ""
  #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
  #| "an attempt to satisfy the build dependencies for a source package."
  msgid ""
  "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
- "attempt to satisfy the build dependencies for a source package."
+ "attempt to satisfy the build dependencies for a source package. By default "
+ "the dependencies are satisfied to build the package natively. If desired a "
+ "host-architecture can be specified with the <option>--host-architecture</"
+ "option> option instead."
  msgstr ""
  "<literal>build-dep</literal> hace que apt-get instale/desinstale paquetes en "
  "un intento de satisfacer las dependencias de compilación de un paquete "
  "fuente."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:276
- msgid "check"
- msgstr "check"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:277
+ #: apt-get.8.xml:205
  msgid ""
  "<literal>check</literal> is a diagnostic tool; it updates the package cache "
  "and checks for broken dependencies."
@@@ -3927,20 -3160,15 +3161,15 @@@ msgstr "
  "<literal>check</literal> es una herramienta de diagnóstico, actualiza la "
  "caché de paquetes y revisa la existencia de dependencias rotas."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:281
- msgid "download"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:282
+ #: apt-get.8.xml:210
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
- "current directoy."
+ "current directory."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:288
+ #: apt-get.8.xml:216
  msgid ""
  "<literal>clean</literal> clears out the local repository of retrieved "
  "package files. It removes everything but the lock file from "
@@@ -3958,13 -3186,8 +3187,8 @@@ msgstr "
  "no usa dselect es probable que desee ejecutar <literal>apt-get clean</"
  "literal> de vez en cuando para liberar algo de espacio en disco."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:297
- msgid "autoclean"
- msgstr "autoclean"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:298
+ #: apt-get.8.xml:226
  msgid ""
  "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
  "local repository of retrieved package files. The difference is that it only "
@@@ -3982,13 -3205,8 +3206,8 @@@ msgstr "
  "opción de configuración <literal>APT::Clean-Installed</literal> está "
  "desactivada impedirá que se borren los paquetes instalados."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:307
- msgid "autoremove"
- msgstr "autoremove"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:308
+ #: apt-get.8.xml:236
  #, fuzzy
  #| msgid ""
  #| "<literal>autoremove</literal> is used to remove packages that were "
@@@ -3996,38 -3214,29 +3215,29 @@@
  #| "are no more needed."
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
- "automatically installed to satisfy dependencies for some package and that "
- "are no more needed."
+ "automatically installed to satisfy dependencies for other packages and are "
+ "now no longer needed."
  msgstr ""
  "<literal>autoremove</literal> se usa para desinstalar paquetes que se "
  "instalaron automáticamente para satisfacer las dependencias de algún "
  "paquete, pero que ya no son necesarios."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:312
- msgid "changelog"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:313
+ #: apt-get.8.xml:241
  msgid ""
  "<literal>changelog</literal> downloads a package changelog and displays it "
  "through <command>sensible-pager</command>. The server name and base "
  "directory is defined in the <literal>APT::Changelogs::Server</literal> "
- "variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
- "Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
- "Ubuntu).  By default it displays the changelog for the version that is "
+ "variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+ "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+ "changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+ "for Ubuntu).  By default it displays the changelog for the version that is "
  "installed.  However, you can specify the same options as for the "
  "<option>install</option> command."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:335
- msgid "<option>--no-install-recommends</option>"
- msgstr "<option>--no-install-recommends</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:336
+ #: apt-get.8.xml:264
  msgid ""
  "Do not consider recommended packages as a dependency for installing.  "
  "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@@ -4035,15 -3244,8 +3245,8 @@@ msgstr "
  "No considera los paquetes recomendados como dependencia al instalar. Opción "
  "de configuración: <literal>APT::Install-Recommends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:340
- #, fuzzy
- #| msgid "<option>--no-suggests</option>"
- msgid "<option>--install-suggests</option>"
- msgstr "<option>--no-suggests</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:341
+ #: apt-get.8.xml:269
  #, fuzzy
  #| msgid ""
  #| "Do not consider recommended packages as a dependency for installing.  "
@@@ -4055,13 -3257,8 +3258,8 @@@ msgstr "
  "No considera los paquetes recomendados como dependencia al instalar. Opción "
  "de configuración: <literal>APT::Install-Recommends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:345
- msgid "<option>--download-only</option>"
- msgstr "<option>--download-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:346
+ #: apt-get.8.xml:274
  msgid ""
  "Download only; package files are only retrieved, not unpacked or installed.  "
  "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@@ -4069,13 -3266,8 +3267,8 @@@ msgstr "
  "Sólo descarga los ficheros de los paquetes, no los desempaqueta ni los "
  "instala. Opción de configuración: <literal>APT::Get::Download-Only</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:350
- msgid "<option>--fix-broken</option>"
- msgstr "<option>--fix-broken</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:351
+ #: apt-get.8.xml:279
  msgid ""
  "Fix; attempt to correct a system with broken dependencies in place. This "
  "option, when used with install/remove, can omit any packages to permit APT "
@@@ -4102,18 -3294,8 +3295,8 @@@ msgstr "
  "producir un error en algunas situaciones. Opción de configuración: "
  "<literal>APT::Get::Fix-Broken</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:364
- msgid "<option>--ignore-missing</option>"
- msgstr "<option>--ignore-missing</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:365
- msgid "<option>--fix-missing</option>"
- msgstr "<option>--fix-missing</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:366
+ #: apt-get.8.xml:294
  msgid ""
  "Ignore missing packages; If packages cannot be retrieved or fail the "
  "integrity check after retrieval (corrupted package files), hold back those "
@@@ -4132,13 -3314,8 +3315,8 @@@ msgstr "
  "descargar, se le retendrá silenciosamente. Opción de configuración: "
  "<literal>APT::Get::Fix-Missing</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:376
- msgid "<option>--no-download</option>"
- msgstr "<option>--no-download</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:377
+ #: apt-get.8.xml:305
  msgid ""
  "Disables downloading of packages. This is best used with <option>--ignore-"
  "missing</option> to force APT to use only the .debs it has already "
@@@ -4150,7 -3327,7 +3328,7 @@@ msgstr "
  "<literal>APT::Get::Download</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:384
+ #: apt-get.8.xml:312
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -4170,18 -3347,8 +3348,8 @@@ msgstr "
  "APT realice algo que usted no espera. Opción de configuración: "
  "<literal>quiet</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:394
- msgid "<option>--simulate</option>"
- msgstr "<option>--simulate</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:396
- msgid "<option>--dry-run</option>"
- msgstr "<option>--dry-run</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:399
+ #: apt-get.8.xml:327
  msgid ""
  "No action; perform a simulation of events that would occur but do not "
  "actually change the system.  Configuration Item: <literal>APT::Get::"
@@@ -4192,7 -3359,7 +3360,7 @@@ msgstr "
  "Simulate</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:403
+ #: apt-get.8.xml:331
  msgid ""
  "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
  "literal>)  automatic. Also a notice will be displayed indicating that this "
@@@ -4210,7 -3377,7 +3378,7 @@@ msgstr "
  "avisos de <literal>apt-get</literal>)."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:409
+ #: apt-get.8.xml:337
  msgid ""
  "Simulate prints out a series of lines each one representing a dpkg "
  "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@@ -4223,23 -3390,8 +3391,8 @@@ msgstr "
  "dependencias rotas, si no hay nada entre ellos significa que no hay ningún "
  "problema (poco probable)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>-y</option>"
- msgstr "<option>-y</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>--yes</option>"
- msgstr "<option>--yes</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:417
- msgid "<option>--assume-yes</option>"
- msgstr "<option>--assume-yes</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:418
+ #: apt-get.8.xml:346
  msgid ""
  "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
  "non-interactively. If an undesirable situation, such as changing a held "
@@@ -4254,18 -3406,21 +3407,21 @@@ msgstr "
  "sin autenticar o desinstalar un paquete esencial. Opción de configuración: "
  "<literal>APT::Get::Assume-Yes</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>-u</option>"
- msgstr "<option>-u</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>--show-upgraded</option>"
- msgstr "<option>--show-upgraded</option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:354
+ #, fuzzy
+ #| msgid ""
+ #| "Compile source packages after downloading them.  Configuration Item: "
+ #| "<literal>APT::Get::Compile</literal>."
+ msgid ""
+ "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+ "Assume-No</literal>."
+ msgstr ""
+ "Descarga los paquetes fuente y luego los compila. Opción de configuración: "
+ "<literal>APT::Get::Compile</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:426
+ #: apt-get.8.xml:359
  msgid ""
  "Show upgraded packages; Print out a list of all packages that are to be "
  "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@@ -4273,18 -3428,8 +3429,8 @@@ msgstr "
  "Muestra los paquetes que se van a actualizar. Opción de configuración: "
  "<literal>APT::Get::Show-Upgraded</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>-V</option>"
- msgstr "<option>-V</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>--verbose-versions</option>"
- msgstr "<option>--verbose-versions</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:432
+ #: apt-get.8.xml:365
  msgid ""
  "Show full versions for upgraded and installed packages.  Configuration Item: "
  "<literal>APT::Get::Show-Versions</literal>."
@@@ -4292,23 -3437,19 +3438,19 @@@ msgstr "
  "Muestra las versiones completas para los paquetes actualizados e instalados. "
  "Opción de configuración: <literal>APT::Get::Show-Versions</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>-b</option>"
- msgstr "<option>-b</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>--compile</option>"
- msgstr "<option>--compile</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:437
- msgid "<option>--build</option>"
- msgstr "<option>--build</option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:371
+ msgid ""
+ "This option controls the architecture packages are built for by <command>apt-"
+ "get source --compile</command> and how cross-builddependencies are "
+ "satisfied. By default is it not set which means that the host architecture "
+ "is the same as the build architecture (which is defined by <literal>APT::"
+ "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
+ "Architecture</literal>"
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:438
+ #: apt-get.8.xml:381
  msgid ""
  "Compile source packages after downloading them.  Configuration Item: "
  "<literal>APT::Get::Compile</literal>."
@@@ -4316,13 -3457,8 +3458,8 @@@ msgstr "
  "Descarga los paquetes fuente y luego los compila. Opción de configuración: "
  "<literal>APT::Get::Compile</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:442
- msgid "<option>--ignore-hold</option>"
- msgstr "<option>--ignore-hold</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:443
+ #: apt-get.8.xml:386
  msgid ""
  "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
  "hold placed on a package. This may be useful in conjunction with "
@@@ -4335,13 -3471,8 +3472,8 @@@ msgstr "
  "retenidos de manera no deseada. Opción de configuración: <literal>APT::"
  "Ignore-Hold</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:449
- msgid "<option>--no-upgrade</option>"
- msgstr "<option>--no-upgrade</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:450
+ #: apt-get.8.xml:393
  msgid ""
  "Do not upgrade packages; When used in conjunction with <literal>install</"
  "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@@ -4353,17 -3484,18 +3485,18 @@@ msgstr "
  "en la línea de órdenes si ya están instalados. Opción de configuración: "
  "<literal>APT::Get::Upgrade</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:456
- msgid "<option>--only-upgrade</option>"
- msgstr "<option>--only-upgrade</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:457
+ #: apt-get.8.xml:400
+ #, fuzzy
+ #| msgid ""
+ #| "Do not install new packages; When used in conjunction with "
+ #| "<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
+ #| "packages on the command line from being upgraded if they are not already "
+ #| "installed.  Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
  msgid ""
  "Do not install new packages; When used in conjunction with <literal>install</"
- "literal>, <literal>only-upgrade</literal> will prevent packages on the "
- "command line from being upgraded if they are not already installed.  "
+ "literal>, <literal>only-upgrade</literal> will install upgrades for already "
+ "installed packages only and ignore requests to install new packages.  "
  "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
  msgstr ""
  "No instala paquetes nuevos. Cuando se usa junto a <literal>install</"
@@@ -4371,13 -3503,8 +3504,8 @@@
  "paquetes listados en la línea de órdenes si no están ya instalados. Opción "
  "de configuración: <literal>APT::Get::Only-Upgrade</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:463
- msgid "<option>--force-yes</option>"
- msgstr "<option>--force-yes</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:464
+ #: apt-get.8.xml:408
  msgid ""
  "Force yes; This is a dangerous option that will cause apt to continue "
  "without prompting if it is doing something potentially harmful. It should "
@@@ -4392,13 -3519,8 +3520,8 @@@ msgstr "
  "destruir su sistema! Opción de configuración: <literal>APT::Get::force-yes</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:471
- msgid "<option>--print-uris</option>"
- msgstr "<option>--print-uris</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:472
+ #: apt-get.8.xml:416
  msgid ""
  "Instead of fetching the files to install their URIs are printed. Each URI "
  "will have the path, the destination file name, the size and the expected md5 "
@@@ -4419,13 -3541,8 +3542,8 @@@ msgstr "
  "usuario descomprimir cualquier fichero comprimido. Opción de configuración: "
  "<literal>APT::Get::Print-URIs</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:482
- msgid "<option>--purge</option>"
- msgstr "<option>--purge</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:483
+ #: apt-get.8.xml:427
  msgid ""
  "Use purge instead of remove for anything that would be removed.  An asterisk "
  "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@@ -4438,13 -3555,8 +3556,8 @@@ msgstr "
  "<option>purge</option>. Opción de configuración: <literal>APT::Get::Purge</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:490
- msgid "<option>--reinstall</option>"
- msgstr "<option>--reinstall</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:491
+ #: apt-get.8.xml:435
  msgid ""
  "Re-Install packages that are already installed and at the newest version.  "
  "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@@ -4453,13 -3565,8 +3566,8 @@@ msgstr "
  "disponible del paquete. Opción de configuración: <literal>APT::Get::"
  "ReInstall</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:495
- msgid "<option>--list-cleanup</option>"
- msgstr "<option>--list-cleanup</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:496
+ #: apt-get.8.xml:440
  msgid ""
  "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
  "it off. When on <command>apt-get</command> will automatically manage the "
@@@ -4476,18 -3583,8 +3584,8 @@@ msgstr "
  "frecuentemente cambios en la lista de fuentes. Opción de configuración: "
  "<literal>APT::Get::List-Cleanup</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:505
- msgid "<option>--target-release</option>"
- msgstr "<option>--target-release</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:506
- msgid "<option>--default-release</option>"
- msgstr "<option>--default-release</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:507
+ #: apt-get.8.xml:451
  msgid ""
  "This option controls the default input to the policy engine, it creates a "
  "default pin at priority 990 using the specified release string.  This "
@@@ -4510,13 -3607,8 +3608,8 @@@ msgstr "
  "Opción de configuración: <literal>APT::Default-Release</literal>. Vea "
  "también la página del manual de &apt-preferences;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:520
- msgid "<option>--trivial-only</option>"
- msgstr "<option>--trivial-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:522
+ #: apt-get.8.xml:466
  msgid ""
  "Only perform operations that are 'trivial'. Logically this can be considered "
  "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@@ -4529,13 -3621,8 +3622,8 @@@ msgstr "
  "only</option> responderá negativamente. Opción de configuración: "
  "<literal>APT::Get::Trivial-Only</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:528
- msgid "<option>--no-remove</option>"
- msgstr "<option>--no-remove</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:529
+ #: apt-get.8.xml:473
  msgid ""
  "If any packages are to be removed apt-get immediately aborts without "
  "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@@ -4543,13 -3630,8 +3631,8 @@@ msgstr "
  "Si se va a desinstalar algún paquete, apt-get terminará inmediatamente sin "
  "preguntar. Opción de configuración: <literal>APT::Get::Remove</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:534
- msgid "<option>--auto-remove</option>"
- msgstr "<option>--auto-remove</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:535
+ #: apt-get.8.xml:479
  msgid ""
  "If the command is either <literal>install</literal> or <literal>remove</"
  "literal>, then this option acts like running <literal>autoremove</literal> "
@@@ -4561,13 -3643,8 +3644,8 @@@ msgstr "
  "paquetes que son dependencia de otro, pero que estén en desuso. Opción de "
  "configuración: <literal>APT::Get::AutomaticRemove</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:541
- msgid "<option>--only-source</option>"
- msgstr "<option>--only-source</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:542
+ #: apt-get.8.xml:486
  msgid ""
  "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
  "literal> commands.  Indicates that the given source names are not to be "
@@@ -4586,23 -3663,8 +3664,8 @@@ msgstr "
  "correspondiente. Opción de configuración: <literal>APT::Get::Only-Source</"
  "literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--diff-only</option>"
- msgstr "<option>--diff-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--dsc-only</option>"
- msgstr "<option>--dsc-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--tar-only</option>"
- msgstr "<option>--tar-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:553
+ #: apt-get.8.xml:497
  msgid ""
  "Download only the diff, dsc, or tar file of a source archive.  Configuration "
  "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@@ -4612,13 -3674,8 +3675,8 @@@ msgstr "
  "configuración: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::"
  "Dsc-Only</literal> y <literal>APT::Get::Tar-Only</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:558
- msgid "<option>--arch-only</option>"
- msgstr "<option>--arch-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:559
+ #: apt-get.8.xml:503
  msgid ""
  "Only process architecture-dependent build-dependencies.  Configuration Item: "
  "<literal>APT::Get::Arch-Only</literal>."
@@@ -4626,13 -3683,8 +3684,8 @@@ msgstr "
  "Procesa sólo las dependencias de construcción dependientes de la "
  "arquitectura. Opción de configuración: <literal>APT::Get::Arch-Only</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:563
- msgid "<option>--allow-unauthenticated</option>"
- msgstr "<option>--allow-unauthenticated</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:564
+ #: apt-get.8.xml:508
  msgid ""
  "Ignore if packages can't be authenticated and don't prompt about it.  This "
  "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@@ -4643,7 -3695,7 +3696,7 @@@ msgstr "
  "configuración: <literal>APT::Get::AllowUnauthenticated</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-get.8.xml:577
+ #: apt-get.8.xml:521
  msgid ""
  "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
  "&file-statelists;"
@@@ -4652,7 -3704,7 +3705,7 @@@ msgstr "
  "&file-statelists;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:586
+ #: apt-get.8.xml:530
  msgid ""
  "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
  "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@@ -4663,59 -3715,21 +3716,21 @@@ msgstr "
  "preferences;, el Cómo de APT."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:592
+ #: apt-get.8.xml:536
  msgid ""
  "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
  "error."
- msgstr ""
- "<command>apt-get</command> devuelve cero si no hay ningún error, y el valor "
- "100 en caso de error."
- 
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:595
- msgid "ORIGINAL AUTHORS"
- msgstr "AUTORES ORIGINALES"
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:596
- msgid "&apt-author.jgunthorpe;"
- msgstr "&apt-author.jgunthorpe;"
- 
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:599
- msgid "CURRENT AUTHORS"
- msgstr "AUTORES ACTUALES"
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:601
- msgid "&apt-author.team;"
- msgstr "&apt-author.team;"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-key.8.xml:17 apt-key.8.xml:24
- msgid "apt-key"
- msgstr "apt-key"
+ msgstr ""
+ "<command>apt-get</command> devuelve cero si no hay ningún error, y el valor "
+ "100 en caso de error."
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-key.8.xml:25
+ #: apt-key.8.xml:32
  msgid "APT key management utility"
  msgstr "Herramienta para gestionar las claves de APT"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-key.8.xml:31
- msgid ""
- "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
- "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
- "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
- "arg>"
- msgstr ""
- "<command>apt-key</command> <arg><option>--keyring <replaceable>nombre-de-"
- "fichero</replaceable></option></arg> <arg><replaceable>orden</replaceable></"
- "arg> <arg rep=\"repeat\"><option><replaceable>argumentis</replaceable></"
- "option></arg>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:40
+ #: apt-key.8.xml:39
  msgid ""
  "<command>apt-key</command> is used to manage the list of keys used by apt to "
  "authenticate packages.  Packages which have been authenticated using these "
@@@ -4726,86 -3740,58 +3741,58 @@@ msgstr "
  "claves se consideran de confianza."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-key.8.xml:46
+ #: apt-key.8.xml:45
  msgid "Commands"
  msgstr "Órdenes"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:48
- msgid "add <replaceable>filename</replaceable>"
- msgstr "add <replaceable>nombre-de-fichero</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:52
+ #: apt-key.8.xml:50
+ #, fuzzy
+ #| msgid ""
+ #| "Add a new key to the list of trusted keys.  The key is read from "
+ #| "<replaceable>filename</replaceable>, or standard input if "
+ #| "<replaceable>filename</replaceable> is <literal>-</literal>."
  msgid ""
- "Add a new key to the list of trusted keys.  The key is read from "
- "<replaceable>filename</replaceable>, or standard input if "
- "<replaceable>filename</replaceable> is <literal>-</literal>."
+ "Add a new key to the list of trusted keys.  The key is read from the "
+ "filename given with the parameter &synopsis-param-filename; or if the "
+ "filename is <literal>-</literal> from standard input."
  msgstr ""
  "Añade una nueva clave a la lista de claves de confianza. Puede introducir la "
  "clave mediante un fichero (<replaceable>nombre-de-fichero</replaceable>) o "
  "por la entrada estándar si <replaceable>nombre-de-fichero</replaceable> es "
  "<literal>-</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:60
- msgid "del <replaceable>keyid</replaceable>"
- msgstr "del <replaceable>identificador-de-la-clave</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:64
+ #: apt-key.8.xml:63
  msgid "Remove a key from the list of trusted keys."
  msgstr "Elimina una clave de la lista de claves de confianza."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:71
- msgid "export <replaceable>keyid</replaceable>"
- msgstr "export <replaceable>identificador-de-la-clave</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:75
- msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+ #: apt-key.8.xml:74
+ #, fuzzy
+ #| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+ msgid "Output the key &synopsis-param-keyid; to standard output."
  msgstr ""
  "Devuelve la clave identificada por el <replaceable>identificador-de-la-"
  "clave</replaceable> por la salida estándar."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:82
- msgid "exportall"
- msgstr "exportall"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:86
+ #: apt-key.8.xml:85
  msgid "Output all trusted keys to standard output."
  msgstr "Devuelve todas las claves de confianza por la salida estándar."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:93
- msgid "list"
- msgstr "list"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:97
+ #: apt-key.8.xml:96
  msgid "List trusted keys."
  msgstr "Lista las claves de confianza."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:104
- msgid "finger"
- msgstr "finger"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:108
+ #: apt-key.8.xml:107
  msgid "List fingerprints of trusted keys."
  msgstr "Lista las huellas digitales de las claves de confianza."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:115
- msgid "adv"
- msgstr "adv"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:119
+ #: apt-key.8.xml:118
  msgid ""
  "Pass advanced options to gpg. With adv --recv-key you can download the "
  "public key."
@@@ -4814,32 -3800,28 +3801,28 @@@ msgstr "
  "«adv --recv-key»."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
  msgid ""
- "Update the local keyring with the keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
+ "Update the local keyring with the archive keyring and remove from the local "
+ "keyring the archive keys which are no longer valid.  The archive keyring is "
+ "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
++"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
++"Ubuntu."
  msgstr ""
- "Actualiza el registro de claves local con el registro de claves del archivo "
- "Debian, y elimina del registro las claves del archivo que ya no son válidas."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:140
- #, fuzzy
- #| msgid "update"
- msgid "net-update"
- msgstr "update"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:144
  msgid ""
- "Update the local keyring with the keys of a key server and removes from the "
- "keyring the archive keys which are no longer valid. This requires an "
- "installed wget and an APT build configured to have a server to fetch from. "
- "APT in Debian does not support this command, but Ubuntu's APT does."
+ "Work similar to the <command>update</command> command above, but get the "
+ "archive keyring from an URI instead and validate it against a master key.  "
+ "This requires an installed &wget; and an APT build configured to have a "
+ "server to fetch from and a master keyring to validate.  APT in Debian does "
+ "not support this command and relies on <command>update</command> instead, "
+ "but Ubuntu's APT does."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:159
+ #: apt-key.8.xml:161
  msgid ""
  "Note that options need to be defined before the commands described in the "
  "previous section."
@@@ -4847,13 -3829,8 +3830,8 @@@ msgstr "
  "Tenga en cuenta que las opciones se deben definir antes de las órdenes "
  "descritas en el sección anterior."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:161
- msgid "--keyring <replaceable>filename</replaceable>"
- msgstr "--keyring <replaceable>nombre-de-fichero</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:162
+ #: apt-key.8.xml:164
  #, fuzzy
  #| msgid ""
  #| "With this option it is possible to specify a specific keyring file the "
@@@ -4866,7 -3843,7 +3844,7 @@@ msgid "
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
  "<filename>trusted.gpg</filename> file as well as on all parts in the "
- "<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</"
  "filename> is the primary keyring which means that e.g. new keys are added to "
  "this one."
  msgstr ""
@@@ -4878,99 -3855,54 +3856,63 @@@
  "esto es, por ejemplo, que las claves nuevas se añaden a este fichero."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-key.8.xml:175
+ #: apt-key.8.xml:177
  msgid "&file-trustedgpg;"
  msgstr "&file-trustedgpg;"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:177
+ #: apt-key.8.xml:179
  msgid "<filename>/etc/apt/trustdb.gpg</filename>"
  msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:178
+ #: apt-key.8.xml:180
  msgid "Local trust database of archive keys."
  msgstr "Base de datos local de las claves de confianza de archivos Debian"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
++#, fuzzy
++#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
++msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:182
- msgid "Keyring of Debian archive trusted keys."
+ #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
++#, fuzzy
++#| msgid "Keyring of Debian archive trusted keys."
++msgid "Keyring of Ubuntu archive trusted keys."
  msgstr "Registro de las claves de confianza del archivo de Debian."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:185
+ #: apt-key.8.xml:187
++#, fuzzy
++#| msgid ""
++#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  msgid ""
--"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
++"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
++#, fuzzy
++#| msgid "Keyring of Debian archive removed trusted keys."
++msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr "Registro de las claves de confianza eliminadas del archivo de Debian."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:195
+ #: apt-key.8.xml:197
  msgid "&apt-get;, &apt-secure;"
  msgstr "&apt-get;, &apt-secure;"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-mark.8.xml:16
- #, fuzzy
- #| msgid ""
- #| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
- #| "August 2009</date>"
- msgid ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
- "April 2011</date>"
- msgstr ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 de "
- "Agosto de 2009</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-mark.8.xml:25 apt-mark.8.xml:32
- msgid "apt-mark"
- msgstr "apt-mark"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-mark.8.xml:33
  msgid "mark/unmark a package as being automatically-installed"
  msgstr "Marca o desmarca un paquete como instalado automáticamente"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-mark.8.xml:39
- #, fuzzy
- #| msgid ""
- #| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
- #| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
- #| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
- #| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
- #| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
- #| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
- msgid ""
- "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
- "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
- "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
- "\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
- "\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
- "arg> </group>"
- msgstr ""
- " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
- "f=<replaceable>nombre-de-fichero</replaceable></option></arg> <group choice="
- "\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
- "\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg> </"
- "arg> <arg choice=\"plain\">showauto</arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:57
+ #: apt-mark.8.xml:39
  msgid ""
  "<command>apt-mark</command> will change whether a package has been marked as "
  "being automatically installed."
@@@ -4979,7 -3911,7 +3921,7 @@@ msgstr "
  "o no."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:61
+ #: apt-mark.8.xml:43
  msgid ""
  "When you request that a package is installed, and as a result other packages "
  "are installed to satisfy its dependencies, the dependencies are marked as "
@@@ -4994,15 -3926,8 +3936,8 @@@ msgstr "
  "manualmente, <command>apt-get</command> o <command>aptitude</command> los "
  "eliminará."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:69
- #, fuzzy
- #| msgid "markauto"
- msgid "auto"
- msgstr "markauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:70
+ #: apt-mark.8.xml:52
  #, fuzzy
  #| msgid ""
  #| "<literal>markauto</literal> is used to mark a package as being "
@@@ -5017,13 -3942,8 +3952,8 @@@ msgstr "
  "automáticamente, lo que provocará que el paquete se elimine cuando ningún "
  "paquete instalado manualmente dependa de este paquete."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:77
- msgid "manual"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:78
+ #: apt-mark.8.xml:60
  #, fuzzy
  #| msgid ""
  #| "<literal>unmarkauto</literal> is used to mark a package as being manually "
@@@ -5038,13 -3958,8 +3968,8 @@@ msgstr "
  "manualmente, lo que impedirá la eliminación automática de este paquete si "
  "ningún otro depende de él."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:85
- msgid "hold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:86
+ #: apt-mark.8.xml:68
  msgid ""
  "<literal>hold</literal> is used to mark a package as hold back, which will "
  "prevent the package from being automatically installed, upgraded or "
@@@ -5053,13 -3968,8 +3978,8 @@@
  "effected by the <option>--filename</option> option."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:95
- msgid "unhold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:96
+ #: apt-mark.8.xml:78
  #, fuzzy
  #| msgid ""
  #| "<literal>showauto</literal> is used to print a list of automatically "
@@@ -5071,13 -3981,8 +3991,8 @@@ msgstr "
  "<literal>showauto</literal> se usa para mostrar una lista de paquetes "
  "instalados automáticamente, un paquete por línea."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:101
- msgid "showauto"
- msgstr "showauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:102
+ #: apt-mark.8.xml:84
  #, fuzzy
  #| msgid ""
  #| "<literal>showauto</literal> is used to print a list of automatically "
@@@ -5091,30 -3996,16 +4006,16 @@@ msgstr "
  "<literal>showauto</literal> se usa para mostrar una lista de paquetes "
  "instalados automáticamente, un paquete por línea."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:109
- #, fuzzy
- #| msgid "showauto"
- msgid "showmanual"
- msgstr "showauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:110
+ #: apt-mark.8.xml:92
  msgid ""
  "<literal>showmanual</literal> can be used in the same way as "
  "<literal>showauto</literal> except that it will print a list of manually "
  "installed packages instead."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:116
- #, fuzzy
- #| msgid "showauto"
- msgid "showhold"
- msgstr "showauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:117
+ #: apt-mark.8.xml:99
  #, fuzzy
  #| msgid ""
  #| "<literal>showauto</literal> is used to print a list of automatically "
@@@ -5126,30 -4017,27 +4027,27 @@@ msgstr "
  "<literal>showauto</literal> se usa para mostrar una lista de paquetes "
  "instalados automáticamente, un paquete por línea."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:130
- msgid ""
- "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
- msgstr ""
- "<option>-f=<filename><replaceable>NOMBRE-DE-FICHERO</replaceable></"
- "filename></option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:131
- msgid ""
- "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
- "option>"
- msgstr ""
- "<option>--file=<filename><replaceable>nombre-de-fichero</replaceable></"
- "filename></option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+ #: apt-mark.8.xml:112 apt-mark.8.xml:113
+ #, fuzzy
+ #| msgid "xvcg <replaceable>pkg(s)</replaceable>"
+ msgid "<replaceable>&synopsis-filename;</replaceable>"
+ msgstr "xvcg <replaceable>paquete(s)</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:134
- msgid ""
- "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
- "filename> instead of the default location, which is "
- "<filename>extended_status</filename> in the directory defined by the "
- "Configuration Item: <literal>Dir::State</literal>."
+ #: apt-mark.8.xml:115
+ #, fuzzy
+ #| msgid ""
+ #| "Read/Write package stats from <filename><replaceable>FILENAME</"
+ #| "replaceable></filename> instead of the default location, which is "
+ #| "<filename>extended_status</filename> in the directory defined by the "
+ #| "Configuration Item: <literal>Dir::State</literal>."
+ msgid ""
+ "Read/Write package stats from the filename given with the parameter "
+ "<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+ "of from the default location, which is <filename>extended_status</filename> "
+ "in the directory defined by the Configuration Item: <literal>Dir::State</"
+ "literal>."
  msgstr ""
  "Escribe y lee las estadísticas de los paquetes desde "
  "<filename><replaceable>nombre-de-fichero</replaceable></filename> en lugar "
@@@ -5158,17 -4046,17 +4056,17 @@@
  "State</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-mark.8.xml:146
+ #: apt-mark.8.xml:128
  msgid "  &file-extended_states;"
  msgstr "  &file-extended_states;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:151
+ #: apt-mark.8.xml:133
  msgid "&apt-get;,&aptitude;,&apt-conf;"
  msgstr "&apt-get;,&aptitude;,&apt-conf;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:155
+ #: apt-mark.8.xml:137
  msgid ""
  "<command>apt-mark</command> returns zero on normal operation, non-zero on "
  "error."
@@@ -5176,18 -4064,13 +4074,13 @@@ msgstr "
  "<command>apt-mark</command> devuelve cero si no hay ningún error, y el valor "
  "100 en caso de error."
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-secure.8.xml:17 apt-secure.8.xml:39
- msgid "apt-secure"
- msgstr "apt-secure"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-secure.8.xml:40
+ #: apt-secure.8.xml:47
  msgid "Archive authentication support for APT"
  msgstr "Compatibilidad con la autenticación en el archivo para APT"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:45
+ #: apt-secure.8.xml:52
  msgid ""
  "Starting with version 0.6, <command>apt</command> contains code that does "
  "signature checking of the Release file for all archives. This ensures that "
@@@ -5200,7 -4083,7 +4093,7 @@@ msgstr "
  "sin acceso a la clave con la que se firmó el fichero «Release»."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:53
+ #: apt-secure.8.xml:60
  msgid ""
  "If a package comes from a archive without a signature or with a signature "
  "that apt does not have a key for that package is considered untrusted and "
@@@ -5215,7 -4098,7 +4108,7 @@@ msgstr "
  "verificar todas las fuentes antes de descargar paquetes desde ellas."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:62
+ #: apt-secure.8.xml:69
  msgid ""
  "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
  "authentication feature."
@@@ -5224,12 -4107,12 +4117,12 @@@ msgstr "
  "pueden usar esta nueva funcionalidad de autenticación."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:67
+ #: apt-secure.8.xml:74
  msgid "Trusted archives"
  msgstr "Archivos de confianza"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:70
+ #: apt-secure.8.xml:77
  msgid ""
  "The chain of trust from an apt archive to the end user is made up of "
  "different steps. <command>apt-secure</command> is the last step in this "
@@@ -5246,7 -4129,7 +4139,7 @@@ msgstr "
  "asegurar que la integridad del archivo es correcta."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:78
+ #: apt-secure.8.xml:85
  msgid ""
  "apt-secure does not review signatures at a package level. If you require "
  "tools to do this you should look at <command>debsig-verify</command> and "
@@@ -5259,7 -4142,7 +4152,7 @@@ msgstr "
  "devscripts respectivamente)."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:85
+ #: apt-secure.8.xml:92
  msgid ""
  "The chain of trust in Debian starts when a maintainer uploads a new package "
  "or a new version of a package to the Debian archive. This upload in order to "
@@@ -5277,7 -4160,7 +4170,7 @@@ msgstr "
  "del propietario de la clave."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:95
+ #: apt-secure.8.xml:102
  msgid ""
  "Once the uploaded package is verified and included in the archive, the "
  "maintainer signature is stripped off, an MD5 sum of the package is computed "
@@@ -5295,7 -4178,7 +4188,7 @@@ msgstr "
  "registro de claves de Debian."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:105
+ #: apt-secure.8.xml:112
  msgid ""
  "Any end user can check the signature of the Release file, extract the MD5 "
  "sum of a package from it and compare it with the MD5 sum of the package he "
@@@ -5310,7 -4193,7 +4203,7 @@@ msgstr "
  "MD5 y la firma del fichero «Release»."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:112
+ #: apt-secure.8.xml:119
  msgid ""
  "Notice that this is distinct from checking signatures on a per package "
  "basis. It is designed to prevent two possible attacks:"
@@@ -5319,7 -4202,7 +4212,7 @@@ msgstr "
  "individualmente. Se diseñó para prevenir dos posible ataques:"
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:117
+ #: apt-secure.8.xml:124
  msgid ""
  "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
  "checking, a malicious agent can introduce himself in the package download "
@@@ -5335,7 -4218,7 +4228,7 @@@ msgstr "
  "ataques de envenenamiento de arp o de DNS)."
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:125
+ #: apt-secure.8.xml:132
  msgid ""
  "<literal>Mirror network compromise</literal>.  Without signature checking, a "
  "malicious agent can compromise a mirror host and modify the files in it to "
@@@ -5348,7 -4231,7 +4241,7 @@@ msgstr "
  "usuarios que descarguen paquetes de dicha réplica."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:132
+ #: apt-secure.8.xml:139
  msgid ""
  "However, it does not defend against a compromise of the Debian master server "
  "itself (which signs the packages) or against a compromise of the key used to "
@@@ -5361,12 -4244,12 +4254,12 @@@ msgstr "
  "una firma por paquete."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:138
+ #: apt-secure.8.xml:145
  msgid "User configuration"
  msgstr "Configuración de usuario"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:140
+ #: apt-secure.8.xml:147
  msgid ""
  "<command>apt-key</command> is the program that manages the list of keys used "
  "by apt. It can be used to add or remove keys although an installation of "
@@@ -5380,7 -4263,7 +4273,7 @@@ msgstr "
  "paquetes de Debian."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:147
+ #: apt-secure.8.xml:154
  #, fuzzy
  #| msgid ""
  #| "In order to add a new key you need to first download it (you should make "
@@@ -5404,12 -4287,12 +4297,12 @@@ msgstr "
  "<filename>Release.gpg</filename> de los archivos que estén configurados."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:156
+ #: apt-secure.8.xml:163
  msgid "Archive configuration"
  msgstr "Configuración del archivo"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:158
+ #: apt-secure.8.xml:165
  msgid ""
  "If you want to provide archive signatures in an archive under your "
  "maintenance you have to:"
@@@ -5418,7 -4301,7 +4311,7 @@@ msgstr "
  "que:"
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:163
+ #: apt-secure.8.xml:170
  msgid ""
  "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
  "already. You can do this by running <command>apt-ftparchive release</"
@@@ -5429,7 -4312,7 +4322,7 @@@ msgstr "
  "utils)."
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:168
+ #: apt-secure.8.xml:175
  #, fuzzy
  #| msgid ""
  #| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"
@@@ -5443,7 -4326,7 +4336,7 @@@ msgstr "
  "Release.gpg Release</command>."
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:172
+ #: apt-secure.8.xml:179
  msgid ""
  "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
  "know what key they need to import in order to authenticate the files in the "
@@@ -5454,7 -4337,7 +4347,7 @@@ msgstr "
  "del archivo."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:179
+ #: apt-secure.8.xml:186
  msgid ""
  "Whenever the contents of the archive changes (new packages are added or "
  "removed) the archive maintainer has to follow the first two steps previously "
@@@ -5465,7 -4348,7 +4358,7 @@@ msgstr "
  "explicados anteriormente."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:187
+ #: apt-secure.8.xml:194
  msgid ""
  "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
  "&debsign; &debsig-verify;, &gpg;"
@@@ -5474,14 -4357,22 +4367,22 @@@ msgstr "
  "&debsign; &debsig-verify;, &gpg;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:191
+ #: apt-secure.8.xml:198
+ #, fuzzy
+ #| msgid ""
+ #| "For more background information you might want to review the <ulink url="
+ #| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
+ #| "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
+ #| "Manual (available also in the harden-doc package) and the <ulink url="
+ #| "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
+ #| "Distribution HOWTO</ulink> by V. Alex Brennen."
  msgid ""
  "For more background information you might want to review the <ulink url="
- "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
- "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
- "Manual (available also in the harden-doc package) and the <ulink url="
- "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
- "Distribution HOWTO</ulink> by V. Alex Brennen."
+ "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+ "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+ "(available also in the harden-doc package) and the <ulink url=\"http://www."
+ "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
+ "ulink> by V. Alex Brennen."
  msgstr ""
  "Para más información puede que quiera revisar el capítulo de la <ulink url="
  "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
@@@ -5491,12 -4382,12 +4392,12 @@@
  "una Distribución</ulink> de V. Alex Brennen."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:204
+ #: apt-secure.8.xml:211
  msgid "Manpage Authors"
  msgstr "Autores de la página del manual"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:206
+ #: apt-secure.8.xml:213
  msgid ""
  "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
  "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@@ -5504,31 -4395,13 +4405,13 @@@ msgstr "
  "Esta página del manual se basa en el trabajo de Javier Fernández-Sanguino "
  "Peña, Isaac Jones, Colin Walters, Florian Weimer y Michael Vogt."
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-sortpkgs.1.xml:25 apt-sortpkgs.1.xml:32
- msgid "apt-sortpkgs"
- msgstr "apt-sortpkgs"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-sortpkgs.1.xml:33
  msgid "Utility to sort package index files"
  msgstr "Herramienta para ordenar los ficheros de índice de paquetes"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-sortpkgs.1.xml:39
- msgid ""
- "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
- msgstr ""
- "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
- "<arg><option>-o=<replaceable>cadena-de-configuración</replaceable></option></"
- "arg> <arg><option>-c=<replaceable>fichero</replaceable></option></arg> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>fichero</replaceable></arg>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:48
+ #: apt-sortpkgs.1.xml:39
  msgid ""
  "<command>apt-sortpkgs</command> will take an index file (Source index or "
  "Package index) and sort the records so that they are ordered by the package "
@@@ -5541,19 -4414,14 +4424,14 @@@ msgstr "
  "acuerdo a las reglas de ordenación internas."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:54
+ #: apt-sortpkgs.1.xml:45
  msgid "All output is sent to stdout, the input must be a seekable file."
  msgstr ""
  "Toda la salida se muestra por la salida estándar, la entrada debe ser un "
  "fichero ubicable."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-sortpkgs.1.xml:61
- msgid "<option>--source</option>"
- msgstr "<option>--source</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-sortpkgs.1.xml:63
+ #: apt-sortpkgs.1.xml:54
  msgid ""
  "Use Source index field ordering.  Configuration Item: <literal>APT::"
  "SortPkgs::Source</literal>."
@@@ -5562,7 -4430,7 +4440,7 @@@ msgstr "
  "SortPkgs::Source</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:77
+ #: apt-sortpkgs.1.xml:68
  msgid ""
  "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -5570,37 -4438,28 +4448,28 @@@ msgstr "
  "<command>apt-sortpkgs</command> devuelve cero si no hay ningún error, y el "
  "valor 100 en caso de error."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt.conf.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
- "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
- "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
- "&apt-product; <date>16 January 2010</date>"
+ #. type: Content of: <refentry><refentryinfo><author><contrib>
+ #: apt.conf.5.xml:20
+ msgid "Initial documentation of Debug::*."
  msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
- "firstname> <surname>Burrows</surname> <contrib>Documentación inicial de "
- "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
- "&apt-product; <date>16 de Enero de 2009</date>"
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt.conf.5.xml:31 apt.conf.5.xml:38
- msgid "apt.conf"
- msgstr "apt.conf"
+ #. type: Content of: <refentry><refentryinfo><author><email>
+ #: apt.conf.5.xml:21
+ msgid "dburrows@debian.org"
+ msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
- #: apt.conf.5.xml:32 apt_preferences.5.xml:25 sources.list.5.xml:26
+ #: apt.conf.5.xml:31 apt_preferences.5.xml:25 sources.list.5.xml:26
  msgid "5"
  msgstr "5"
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt.conf.5.xml:39
+ #: apt.conf.5.xml:38
  msgid "Configuration file for APT"
  msgstr "Fichero de configuración de APT"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:43
+ #: apt.conf.5.xml:42
  msgid ""
  "<filename>apt.conf</filename> is the main configuration file for the APT "
  "suite of tools, but by far not the only place changes to options can be "
@@@ -5614,7 -4473,7 +4483,7 @@@ msgstr "
  "órdenes común para ofrecer un entorno uniforme."
  
  #. type: Content of: <refentry><refsect1><orderedlist><para>
- #: apt.conf.5.xml:48
+ #: apt.conf.5.xml:47
  msgid ""
  "When an APT tool starts up it will read the configuration files in the "
  "following order:"
@@@ -5623,7 -4482,7 +4492,7 @@@ msgstr "
  "en el siguiente orden:"
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:50
+ #: apt.conf.5.xml:49
  msgid ""
  "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
  "any)"
@@@ -5632,7 -4491,7 +4501,7 @@@ msgstr "
  "existir)."
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:52
+ #: apt.conf.5.xml:51
  #, fuzzy
  #| msgid ""
  #| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
@@@ -5641,11 -4500,12 +4510,12 @@@
  #| "period (.) characters - otherwise they will be silently ignored."
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
- "order which have no or \"<literal>conf</literal>\" as filename extension and "
- "which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
- "characters.  Otherwise APT will print a notice that it has ignored a file if "
- "the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
- "literal> configuration list - in this case it will be silently ignored."
+ "order which have either no or \"<literal>conf</literal>\" as filename "
+ "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+ "and period (.) characters.  Otherwise APT will print a notice that it has "
+ "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+ "Ignore-Files-Silently</literal> configuration list - in this case it will be "
+ "silently ignored."
  msgstr ""
  "Todos los ficheros en <literal>Dir::Etc::Parts</literal> en orden "
  "alfanumérico ascendente que no tienen extensión o la extensión "
@@@ -5654,7 -4514,7 +4524,7 @@@
  "silenciosamente."
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:59
+ #: apt.conf.5.xml:58
  msgid ""
  "the main configuration file specified by <literal>Dir::Etc::main</literal>"
  msgstr ""
@@@ -5662,7 -4522,7 +4532,7 @@@
  "literal>."
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:61
+ #: apt.conf.5.xml:60
  msgid ""
  "the command line options are applied to override the configuration "
  "directives or to load even more configuration files."
@@@ -5671,12 -4531,12 +4541,12 @@@ msgstr "
  "configuración o para cargar más ficheros de configuración."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:65
+ #: apt.conf.5.xml:64
  msgid "Syntax"
  msgstr "Sintaxis"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:66
+ #: apt.conf.5.xml:65
  msgid ""
  "The configuration file is organized in a tree with options organized into "
  "functional groups. Option specification is given with a double colon "
@@@ -5691,7 -4551,7 +4561,7 @@@ msgstr "
  "APT. Las opciones no se heredan de sus grupos paternos."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:72
+ #: apt.conf.5.xml:71
  msgid ""
  "Syntactically the configuration language is modeled after what the ISC tools "
  "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@@ -5719,7 -4579,7 +4589,7 @@@ msgstr "
  "se puede abrir con llaves, como:"
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:86
+ #: apt.conf.5.xml:85
  #, no-wrap
  msgid ""
  "APT {\n"
@@@ -5737,7 -4597,7 +4607,7 @@@ msgstr "
  "};\n"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:94
+ #: apt.conf.5.xml:93
  msgid ""
  "with newlines placed to make it more readable. Lists can be created by "
  "opening a scope and including a single string enclosed in quotes followed by "
@@@ -5749,13 -4609,13 +4619,13 @@@ msgstr "
  "una separada por un punto y coma."
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:99
+ #: apt.conf.5.xml:98
  #, no-wrap
  msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
  msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:102
+ #: apt.conf.5.xml:101
  msgid ""
  "In general the sample configuration file in <filename>&docdir;examples/apt."
  "conf</filename> &configureindex; is a good guide for how it should look."
@@@ -5765,7 -4625,7 +4635,7 @@@ msgstr "
  "entender su aspecto."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:106
+ #: apt.conf.5.xml:105
  msgid ""
  "The names of the configuration items are not case-sensitive. So in the "
  "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@@ -5775,7 -4635,7 +4645,7 @@@ msgstr "
  "<literal>dpkg::pre-install-pkgs</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:109
+ #: apt.conf.5.xml:108
  msgid ""
  "Names for the configuration items are optional if a list is defined as it "
  "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@@ -5790,7 -4650,7 +4660,7 @@@ msgstr "
  "opción como cualquier otra opción reasignando un nuevo valor a la opción."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:114
+ #: apt.conf.5.xml:113
  msgid ""
  "Two specials are allowed, <literal>#include</literal> (which is deprecated "
  "and not supported by alternative implementations) and <literal>#clear</"
@@@ -5810,7 -4670,7 +4680,7 @@@ msgstr "
  "necesitan acabar con punto y coma)."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:122
+ #: apt.conf.5.xml:121
  msgid ""
  "The #clear command is the only way to delete a list or a complete scope.  "
  "Reopening a scope or the ::-style described below will <emphasis>not</"
@@@ -5825,13 -4685,21 +4695,21 @@@ msgstr "
  "valor, las listas y los ámbitos no se pueden redefinir, sólo eliminar."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:127
+ #: apt.conf.5.xml:126
+ #, fuzzy
+ #| msgid ""
+ #| "All of the APT tools take a -o option which allows an arbitrary "
+ #| "configuration directive to be specified on the command line. The syntax "
+ #| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
+ #| "instance) followed by an equals sign then the new value of the option. "
+ #| "Lists can be appended too by adding a trailing :: to the list name. (As "
+ #| "you might suspect: The scope syntax can't be used on the command line.)"
  msgid ""
  "All of the APT tools take a -o option which allows an arbitrary "
  "configuration directive to be specified on the command line. The syntax is a "
  "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
- "followed by an equals sign then the new value of the option. Lists can be "
- "appended too by adding a trailing :: to the list name. (As you might "
+ "followed by an equals sign then the new value of the option. To append a new "
+ "element to a list, add a trailing :: to the name of the list. (As you might "
  "suspect: The scope syntax can't be used on the command line.)"
  msgstr ""
  "Todas las herramientas de APT permiten la opción -o como una directriz "
@@@ -5843,12 -4711,26 +4721,26 @@@
  "sintaxis de los ámbitos en la línea de órdenes)."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:134
+ #: apt.conf.5.xml:133
+ #, fuzzy
+ #| msgid ""
+ #| "Note that you can use :: only for appending one item per line to a list "
+ #| "and that you should not use it in combination with the scope syntax.  "
+ #| "(The scope syntax implicit insert ::) Using both syntaxes together will "
+ #| "trigger a bug which some users unfortunately relay on: An option with the "
+ #| "unusual name \"<literal>::</literal>\" which acts like every other option "
+ #| "with a name. These introduces many problems including that a user who "
+ #| "writes multiple lines in this <emphasis>wrong</emphasis> syntax in the "
+ #| "hope to append to a list will gain the opposite as only the last "
+ #| "assignment for this option \"<literal>::</literal>\" will be used. "
+ #| "Upcoming APT versions will raise errors and will stop working if they "
+ #| "encounter this misuse, so please correct such statements now as long as "
+ #| "APT doesn't complain explicit about them."
  msgid ""
  "Note that you can use :: only for appending one item per line to a list and "
  "that you should not use it in combination with the scope syntax.  (The scope "
  "syntax implicit insert ::) Using both syntaxes together will trigger a bug "
- "which some users unfortunately relay on: An option with the unusual name "
+ "which some users unfortunately depend on: An option with the unusual name "
  "\"<literal>::</literal>\" which acts like every other option with a name. "
  "These introduces many problems including that a user who writes multiple "
  "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
@@@ -5873,12 -4755,12 +4765,12 @@@ msgstr "
  "APT no se queja explícitamente de ellos."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:146
+ #: apt.conf.5.xml:145
  msgid "The APT Group"
  msgstr "El grupo APT"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:147
+ #: apt.conf.5.xml:146
  msgid ""
  "This group of options controls general APT behavior as well as holding the "
  "options for all of the tools."
@@@ -5886,13 -4768,8 +4778,8 @@@ msgstr "
  "Este grupo de opciones controla el comportamiento general de APT así como "
  "mantiene las opciones para todas las herramientas."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:151
- msgid "Architecture"
- msgstr "Arquitectura"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:152
+ #: apt.conf.5.xml:151
  msgid ""
  "System Architecture; sets the architecture to use when fetching files and "
  "parsing package lists. The internal default is the architecture apt was "
@@@ -5902,13 -4779,21 +4789,21 @@@ msgstr "
  "ficheros y analizar las listas de paquetes. El valor predeterminado es la "
  "arquitectura para la que apt se compiló."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:157
- msgid "Default-Release"
- msgstr "Default-Release"
+ msgid ""
+ "All Architectures the system supports. Processors implementing the "
+ "<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
+ "set are e.g. also able to execute binaries compiled for the <literal>i386</"
+ "literal> (<literal>x86</literal>) instruction set; This list is use when "
+ "fetching files and parsing package lists. The internal default is always the "
+ "native architecture (<literal>APT::Architecture</literal>)  and all foreign "
+ "architectures it can retrieve by calling <command>dpkg --print-foreign-"
+ "architectures</command>."
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:158
+ #: apt.conf.5.xml:167
  msgid ""
  "Default release to install packages from if more than one version available. "
  "Contains release name, codename or release version. Examples: 'stable', "
@@@ -5921,13 -4806,8 +4816,8 @@@ msgstr "
  "«testing», «unstable», «&stable-codename;», «&testing-codename;», «4.0», "
  "«5.0*». Vea también &apt-preferences;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:163
- msgid "Ignore-Hold"
- msgstr "Ignore-Hold"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:164
+ #: apt.conf.5.xml:173
  msgid ""
  "Ignore Held packages; This global option causes the problem resolver to "
  "ignore held packages in its decision making."
@@@ -5935,13 -4815,8 +4825,8 @@@ msgstr "
  "Ignora paquetes retenidos, esta opción global causa que el solucionador de "
  "problemas ignore los paquetes retenidos en la toma de decisiones."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:168
- msgid "Clean-Installed"
- msgstr "Clean-Installed"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:169
+ #: apt.conf.5.xml:178
  msgid ""
  "Defaults to on. When turned on the autoclean feature will remove any "
  "packages which can no longer be downloaded from the cache. If turned off "
@@@ -5954,13 -4829,8 +4839,8 @@@ msgstr "
  "excluidos de la limpieza - tenga en cuenta que APT no proporciona ningún "
  "mecanismo directo para reinstalarlos."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:175
- msgid "Immediate-Configure"
- msgstr "Immediate-Configure"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:176
+ #: apt.conf.5.xml:185
  msgid ""
  "Defaults to on which will cause APT to install essential and important "
  "packages as fast as possible in the install/upgrade operation. This is done "
@@@ -6023,13 -4893,8 +4903,8 @@@ msgstr "
  "de fallo a continuación para que así puedan mejorar o corregir el proceso de "
  "actualización."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:198
- msgid "Force-LoopBreak"
- msgstr "Force-LoopBreak"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:199
+ #: apt.conf.5.xml:208
  msgid ""
  "Never Enable this option unless you -really- know what you are doing. It "
  "permits APT to temporarily remove an essential package to break a Conflicts/"
@@@ -6045,29 -4910,42 +4920,42 @@@ msgstr "
  "Esta opción funcionará si el paquete esencial no es ni tar, ni gzip, ni "
  "libc, ni dpkg, ni bash, ni cualquier otro del que dependan estos paquetes."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:207
- msgid "Cache-Start, Cache-Grow and Cache-Limit"
- msgstr "Cache-Start, Cache-Grow y Cache-Limit"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:208
+ #: apt.conf.5.xml:217
+ #, fuzzy
+ #| msgid ""
+ #| "APT uses since version 0.7.26 a resizable memory mapped cache file to "
+ #| "store the 'available' information. <literal>Cache-Start</literal> acts as "
+ #| "a hint to which size the Cache will grow and is therefore the amount of "
+ #| "memory APT will request at startup. The default value is 20971520 bytes "
+ #| "(~20 MB). Note that these amount of space need to be available for APT "
+ #| "otherwise it will likely fail ungracefully, so for memory restricted "
+ #| "devices these value should be lowered while on systems with a lot of "
+ #| "configured sources this might be increased.  <literal>Cache-Grow</"
+ #| "literal> defines in byte with the default of 1048576 (~1 MB) how much the "
+ #| "Cache size will be increased in the event the space defined by "
+ #| "<literal>Cache-Start</literal> is not enough. These value will be applied "
+ #| "again and again until either the cache is big enough to store all "
+ #| "information or the size of the cache reaches the <literal>Cache-Limit</"
+ #| "literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
+ #| "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
+ #| "automatic grow of the cache is disabled."
  msgid ""
  "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
  "the 'available' information. <literal>Cache-Start</literal> acts as a hint "
  "to which size the Cache will grow and is therefore the amount of memory APT "
  "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
- "that these amount of space need to be available for APT otherwise it will "
- "likely fail ungracefully, so for memory restricted devices these value "
- "should be lowered while on systems with a lot of configured sources this "
- "might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
- "default of 1048576 (~1 MB) how much the Cache size will be increased in the "
- "event the space defined by <literal>Cache-Start</literal> is not enough. "
- "These value will be applied again and again until either the cache is big "
- "enough to store all information or the size of the cache reaches the "
- "<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
- "literal> is 0 which stands for no limit.  If <literal>Cache-Grow</literal> "
- "is set to 0 the automatic grow of the cache is disabled."
+ "that this amount of space needs to be available for APT otherwise it will "
+ "likely fail ungracefully, so for memory restricted devices this value should "
+ "be lowered while on systems with a lot of configured sources it should be "
+ "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
+ "of 1048576 (~1 MB) how much the Cache size will be increased in the event "
+ "the space defined by <literal>Cache-Start</literal> is not enough. These "
+ "value will be applied again and again until either the cache is big enough "
+ "to store all information or the size of the cache reaches the <literal>Cache-"
+ "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
+ "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
+ "automatic grow of the cache is disabled."
  msgstr ""
  "A partir de la versión 0.7.26, APT usa un fichero de caché mapeado («mapped "
  "cache file») redimensionable para almacenar la información disponible. "
@@@ -6087,24 -4965,14 +4975,14 @@@
  "<literal>Cache-Grow</literal> con un valor de cero se desactivará el "
  "crecimiento automático del cache."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:223
- msgid "Build-Essential"
- msgstr "Build-Essential"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:224
+ #: apt.conf.5.xml:233
  msgid "Defines which package(s) are considered essential build dependencies."
  msgstr ""
  "Define qué paquete(s) se consideran dependencias de creación esenciales."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:227
- msgid "Get"
- msgstr "Get"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:228
+ #: apt.conf.5.xml:237
  msgid ""
  "The Get subsection controls the &apt-get; tool, please see its documentation "
  "for more information about the options here."
@@@ -6112,13 -4980,8 +4990,8 @@@ msgstr "
  "La subsección Get controla la herramienta &apt-get;, por favor, consulte la "
  "documentación para más información sobre esta opción."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:232
- msgid "Cache"
- msgstr "Cache"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:233
+ #: apt.conf.5.xml:242
  msgid ""
  "The Cache subsection controls the &apt-cache; tool, please see its "
  "documentation for more information about the options here."
@@@ -6126,13 -4989,8 +4999,8 @@@ msgstr "
  "La subsección Cache controla la herramienta &apt-cache;, por favor, consulte "
  "la documentación para más información sobre esta opción."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:237
- msgid "CDROM"
- msgstr "CDROM"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:238
+ #: apt.conf.5.xml:247
  msgid ""
  "The CDROM subsection controls the &apt-cdrom; tool, please see its "
  "documentation for more information about the options here."
@@@ -6141,17 -4999,12 +5009,12 @@@ msgstr "
  "la documentación para más información sobre esta opción."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:244
+ #: apt.conf.5.xml:253
  msgid "The Acquire Group"
  msgstr "El grupo Acquire"
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:249
- msgid "Check-Valid-Until"
- msgstr "Check-Valid-Until"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:250
+ #: apt.conf.5.xml:259
  msgid ""
  "Security related option defaulting to true as an expiring validation for a "
  "Release file prevents longtime replay attacks and can e.g. also help users "
@@@ -6170,13 -5023,8 +5033,8 @@@ msgstr "
  "se hace, o si un valor más estricto es opcional, se puede usar la opción "
  "<literal>Max-ValidTime</literal>."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:260
- msgid "Max-ValidTime"
- msgstr "Max-ValidTime"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:261
+ #: apt.conf.5.xml:270
  #, fuzzy
  #| msgid ""
  #| "Seconds the Release file should be considered valid after it was created. "
@@@ -6189,15 -5037,12 +5047,12 @@@
  #| "of the two. Archive specific settings can be made by appending the label "
  #| "of the archive to the option name."
  msgid ""
- "Seconds the Release file should be considered valid after it was created. "
- "The default is \"for ever\" (0) if the Release file of the archive doesn't "
- "include a <literal>Valid-Until</literal> header.  If it does then this date "
- "is the default. The date from the Release file or the date specified by the "
- "creation time of the Release file (<literal>Date</literal> header) plus the "
- "seconds specified with this options are used to check if the validation of a "
- "file has expired by using the earlier date of the two. Archive specific "
- "settings can be made by appending the label of the archive to the option "
- "name."
+ "Seconds the Release file should be considered valid after it was created "
+ "(indicated by the <literal>Date</literal> header).  If the Release file "
+ "itself includes a <literal>Valid-Until</literal> header the earlier date of "
+ "the two is used as the expiration date.  The default value is <literal>0</"
+ "literal> which stands for \"for ever valid\".  Archive specific settings can "
+ "be made by appending the label of the archive to the option name."
  msgstr ""
  "Los segundos que el fichero «Release» se considerará válido después de su "
  "creación. El valor predeterminado es «para siempre» (cero) si el fichero "
@@@ -6211,13 -5056,41 +5066,41 @@@
  "específicas al archivo añadiendo la etiqueta del archivo al nombre de la "
  "opción."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:273
- msgid "PDiffs"
- msgstr "PDiffs"
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:281
+ #, fuzzy
+ #| msgid ""
+ #| "Seconds the Release file should be considered valid after it was created. "
+ #| "The default is \"for ever\" (0) if the Release file of the archive "
+ #| "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+ #| "this date is the default. The date from the Release file or the date "
+ #| "specified by the creation time of the Release file (<literal>Date</"
+ #| "literal> header) plus the seconds specified with this options are used to "
+ #| "check if the validation of a file has expired by using the earlier date "
+ #| "of the two. Archive specific settings can be made by appending the label "
+ #| "of the archive to the option name."
+ msgid ""
+ "Minimum of seconds the Release file should be considered valid after it was "
+ "created (indicated by the <literal>Date</literal> header).  Use this if you "
+ "need to use a seldomly updated (local) mirror of a more regular updated "
+ "archive with a <literal>Valid-Until</literal> header instead of completely "
+ "disabling the expiration date checking.  Archive specific settings can and "
+ "should be used by appending the label of the archive to the option name."
+ msgstr ""
+ "Los segundos que el fichero «Release» se considerará válido después de su "
+ "creación. El valor predeterminado es «para siempre» (cero) si el fichero "
+ "«Release» del archivo no incluye una cabecera <literal>Valid-Until</"
+ "literal>. Si lo incluye, el valor predeterminado es esta fecha. La fecha del "
+ "fichero «Release» o la fecha definida por la hora de creación del fichero "
+ "«Release» (cabecera <literal>Date</literal>), a lo que se añaden los "
+ "segundos definidos con estas opciones, se usan para comprobar si la validez "
+ "de un fichero a expirado, usando la fecha más antigua de las dos "
+ "anteriormente mencionadas. Se pueden definir opciones de configuración "
+ "específicas al archivo añadiendo la etiqueta del archivo al nombre de la "
+ "opción."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:274
+ #: apt.conf.5.xml:292
  msgid ""
  "Try to download deltas called <literal>PDiffs</literal> for Packages or "
  "Sources files instead of downloading whole ones. True by default."
@@@ -6227,7 -5100,7 +5110,7 @@@ msgstr "
  "predeterminada"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:277
+ #: apt.conf.5.xml:295
  #, fuzzy
  #| msgid ""
  #| "Two sub-options to limit the use of PDiffs are also available: With "
@@@ -6239,8 -5112,8 +5122,8 @@@
  msgid ""
  "Two sub-options to limit the use of PDiffs are also available: With "
  "<literal>FileLimit</literal> can be specified how many PDiff files are "
- "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
- "other hand is the maximum precentage of the size of all patches compared to "
+ "downloaded at most to update a file. <literal>SizeLimit</literal> on the "
+ "other hand is the maximum percentage of the size of all patches compared to "
  "the size of the targeted file. If one of these limits is exceeded the "
  "complete file is downloaded instead of the patches."
  msgstr ""
@@@ -6251,13 -5124,8 +5134,8 @@@
  "parches comparados con el tamaño del fichero destino. Si se supera uno de "
  "estos límites, se descargará el fichero completo en lugar de los parches."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
- msgid "Queue-Mode"
- msgstr "Queue-Mode"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:305
  msgid ""
  "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
  "literal> or <literal>access</literal> which determines how APT parallelizes "
@@@ -6271,13 -5139,8 +5149,8 @@@ msgstr "
  "una conexión por máquina de destino, <literal>access</literal> significa que "
  "se abrirá una conexión por cada tipo de URI."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:294
- msgid "Retries"
- msgstr "Retries"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:295
+ #: apt.conf.5.xml:313
  msgid ""
  "Number of retries to perform. If this is non-zero APT will retry failed "
  "files the given number of times."
@@@ -6285,13 -5148,8 +5158,8 @@@ msgstr "
  "El número de reintentos a realizar. Si es distinto de cero APT volverá a "
  "intentar obtener los ficheros fallidos el número de veces proporcionado."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:299
- msgid "Source-Symlinks"
- msgstr "Source-Symlinks"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:300
+ #: apt.conf.5.xml:318
  msgid ""
  "Use symlinks for source archives. If set to true then source archives will "
  "be symlinked when possible instead of copying. True is the default."
@@@ -6300,13 -5158,8 +5168,8 @@@ msgstr "
  "fuente se enlazarán cuando sea posible, en vez de copiarse. Es «true» de "
  "forma predeterminada."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:304 sources.list.5.xml:144
- msgid "http"
- msgstr "http"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:305
+ #: apt.conf.5.xml:323
  msgid ""
  "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
  "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@@ -6324,7 -5177,7 +5187,7 @@@ msgstr "
  "definir ninguna de las opciones anteriores."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:313
+ #: apt.conf.5.xml:331
  msgid ""
  "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
  "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@@ -6349,7 -5202,7 +5212,7 @@@ msgstr "
  "grandes. Aviso: Squid 2.0.2 no permite usar ninguna de estas opciones."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:323 apt.conf.5.xml:387
+ #: apt.conf.5.xml:341 apt.conf.5.xml:407
  msgid ""
  "The option <literal>timeout</literal> sets the timeout timer used by the "
  "method, this applies to all things including connection timeout and data "
@@@ -6360,26 -5213,26 +5223,26 @@@ msgstr "
  "realizar la conexión y para recibir datos."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:326
- msgid ""
- "One setting is provided to control the pipeline depth in cases where the "
- "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
- "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
- "indicating how many outstanding requests APT should send. A value of zero "
- "MUST be specified if the remote host does not properly linger on TCP "
- "connections - otherwise data corruption will occur. Hosts which require this "
- "are in violation of RFC 2068."
- msgstr ""
- "Se ofrece una opción para controlar la profundidad de la tubería en casos en "
- "que el servidor remoto no cumpla con la RFC o tenga fallos (como pasa con "
- "Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth</literal> puede ser un "
- "valor entre 0 y 5, e indica cuántas peticiones sin resolver puede enviar "
- "APT. DEBE especificar si la máquina remota no retrasa apropiadamente las "
- "conexiones TCP, de otro modo los datos se corromperán. Las máquinas que "
- "necesitan esto violan la RFC 2068."
+ #: apt.conf.5.xml:344
+ msgid ""
+ "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+ "enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
+ "g. on high-latency connections. It specifies how many requests are send in a "
+ "pipeline.  Previous APT versions had a default of 10 for this setting, but "
+ "the default value is now 0 (= disabled) to avoid problems with the ever-"
+ "growing amount of webservers and proxies which choose to not conform to the "
+ "HTTP/1.1 specification."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:351
+ msgid ""
+ "<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
+ "redirects, which is enabled by default."
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:334
+ #: apt.conf.5.xml:354
  msgid ""
  "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
  "literal> which accepts integer values in kilobyte. The default value is 0 "
@@@ -6394,7 -5247,7 +5257,7 @@@ msgstr "
  "implícitamente la descarga simultánea desde varios servidores)."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:339
+ #: apt.conf.5.xml:359
  msgid ""
  "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
  "User-Agent for the http download method as some proxies allow access for "
@@@ -6404,13 -5257,8 +5267,8 @@@ msgstr "
  "«User-Agent» distinto para la descarga http ya que algunos proxys sólo "
  "permiten el acceso para clientes que usan un identificador conocido."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:345
- msgid "https"
- msgstr "https"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:346
+ #: apt.conf.5.xml:366
  msgid ""
  "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
  "options are the same as for <literal>http</literal> method and will also "
@@@ -6425,7 -5273,7 +5283,7 @@@ msgstr "
  "opción <literal>Pipeline-Depth</literal> no se puede usar por ahora."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:352
+ #: apt.conf.5.xml:372
  msgid ""
  "<literal>CaInfo</literal> suboption specifies place of file that holds info "
  "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@@ -6461,13 -5309,8 +5319,8 @@@ msgstr "
  "ser «TLSv1» o «SSLv3». <literal>&lt;host&gt;::SslForceVersion</literal> "
  "corresponde a la opción por máquina."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:370 sources.list.5.xml:155
- msgid "ftp"
- msgstr "ftp"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:371
+ #: apt.conf.5.xml:391
  msgid ""
  "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
  "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@@ -6501,7 -5344,7 +5354,7 @@@ msgstr "
  "URI."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:390
+ #: apt.conf.5.xml:410
  msgid ""
  "Several settings are provided to control passive mode. Generally it is safe "
  "to leave passive mode on, it works in nearly every environment.  However "
@@@ -6517,7 -5360,7 +5370,7 @@@ msgstr "
  "fichero de configuración de muestra para ver algunos ejemplos)."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:397
+ #: apt.conf.5.xml:417
  msgid ""
  "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
  "envar> environment variable to a http url - see the discussion of the http "
@@@ -6531,7 -5374,7 +5384,7 @@@ msgstr "
  "de http debido a su poca eficiencia."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:402
+ #: apt.conf.5.xml:422
  msgid ""
  "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
  "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@@ -6546,19 -5389,14 +5399,14 @@@ msgstr "
  "IPv4. Tenga en cuenta que la mayoría de los servidores de FTP no son "
  "compatibles con la RFC 2428."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:409 sources.list.5.xml:137
- msgid "cdrom"
- msgstr "cdrom"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:415
+ #: apt.conf.5.xml:435
  #, no-wrap
  msgid "/cdrom/::Mount \"foo\";"
  msgstr "/cdrom/::Mount \"algo\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:410
+ #: apt.conf.5.xml:430
  msgid ""
  "CDROM URIs; the only setting for CDROM URIs is the mount point, "
  "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@@ -6579,13 -5417,8 +5427,8 @@@ msgstr "
  "cdrom. Es importante dejar una barra al final. Puede especificar órdenes "
  "para desmontar usando UMount."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:420
- msgid "gpgv"
- msgstr "gpgv"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:421
+ #: apt.conf.5.xml:441
  msgid ""
  "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
  "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@@ -6595,19 -5428,14 +5438,14 @@@ msgstr "
  "adicionales a gpgv. <literal>gpgv::Options</literal> Parámetros adicionales "
  "introducidos a gpgv."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:426
- msgid "CompressionTypes"
- msgstr "CompressionTypes"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:432
+ #: apt.conf.5.xml:452
  #, no-wrap
  msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
  msgstr "Acquire::CompressionTypes::<replaceable>extensión-del-fichero</replaceable> \"<replaceable>nombre-del-método</replaceable>\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:427
+ #: apt.conf.5.xml:447
  msgid ""
  "List of compression types which are understood by the acquire methods.  "
  "Files like <filename>Packages</filename> can be available in various "
@@@ -6627,19 -5455,19 +5465,19 @@@ msgstr "
  "\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:437
+ #: apt.conf.5.xml:457
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order:: \"gz\";"
  msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:440
+ #: apt.conf.5.xml:460
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:433
+ #: apt.conf.5.xml:453
  msgid ""
  "Also the <literal>Order</literal> subgroup can be used to define in which "
  "order the acquire system will try to download the compressed files. The "
@@@ -6670,13 -5498,13 +5508,13 @@@ msgstr "
  "lista ya que se añadirá de forma automática."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:444
+ #: apt.conf.5.xml:464
  #, no-wrap
  msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
  msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:442
+ #: apt.conf.5.xml:462
  #, fuzzy
  #| msgid ""
  #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
@@@ -6693,9 -5521,9 +5531,9 @@@ msgid "
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
  "will only be used if this file exists, e.g. for the bzip2 method (the "
- "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
- "that list entries specified on the command line will be added at the end of "
- "the list specified in the configuration files, but before the default "
+ "inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+ "also that list entries specified on the command line will be added at the "
+ "end of the list specified in the configuration files, but before the default "
  "entries. To prefer a type in this case over the ones specified in the "
  "configuration files you can set the option direct - not in list style.  This "
  "will not override the defined list, it will only prefix the list with this "
@@@ -6714,20 -5542,15 +5552,15 @@@ msgstr "
  "lista definida, sólo añadirá este tipo  al principio de la lista."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:449
+ #: apt.conf.5.xml:469
  msgid ""
  "The special type <literal>uncompressed</literal> can be used to give "
- "uncompressed files a preference, but note that most archives doesn't provide "
+ "uncompressed files a preference, but note that most archives don't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:454
- msgid "GzipIndexes"
- msgstr "GzipIndexes"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:456
+ #: apt.conf.5.xml:476
  msgid ""
  "When downloading <literal>gzip</literal> compressed indexes (Packages, "
  "Sources, or Translations), keep them gzip compressed locally instead of "
@@@ -6740,13 -5563,8 +5573,8 @@@ msgstr "
  "a costa de mayores requerimientos del procesador al generar los almacenes de "
  "paquetes locales. El valor predeterminado es «false»."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:463
- msgid "Languages"
- msgstr "Languages"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:464
+ #: apt.conf.5.xml:484
  msgid ""
  "The Languages subsection controls which <filename>Translation</filename> "
  "files are downloaded and in which order APT tries to display the Description-"
@@@ -6767,13 -5585,13 +5595,13 @@@ msgstr "
  "informarse de cuales están disponibles antes de definir valores imposibles."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
- #: apt.conf.5.xml:480
+ #: apt.conf.5.xml:500
  #, no-wrap
  msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
  msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; }"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:470
+ #: apt.conf.5.xml:490
  msgid ""
  "The default list includes \"environment\" and \"en\". "
  "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@@ -6814,8 -5632,17 +5642,17 @@@ msgstr "
  "(«environment») sería «fr, de, en». <placeholder type=\"programlisting\" id="
  "\"0\"/>"
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:501
+ msgid ""
+ "Note: To prevent problems resulting from APT being executed in different "
+ "environments (e.g. by different users or by other programs) all Translation "
+ "files which are found in <filename>/var/lib/apt/lists/</filename> will be "
+ "added to the end of the list (after an implicit \"<literal>none</literal>\")."
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:245
+ #: apt.conf.5.xml:254
  msgid ""
  "The <literal>Acquire</literal> group of options controls the download of "
  "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@@ -6824,20 -5651,29 +5661,29 @@@ msgstr "
  "paquetes y los gestores de URI. <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:487
+ #: apt.conf.5.xml:512
  msgid "Directories"
  msgstr "Directorios"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:489
+ #: apt.conf.5.xml:514
+ #, fuzzy
+ #| msgid ""
+ #| "The <literal>Dir::State</literal> section has directories that pertain to "
+ #| "local state information. <literal>lists</literal> is the directory to "
+ #| "place downloaded package lists in and <literal>status</literal> is the "
+ #| "name of the dpkg status file.  <literal>preferences</literal> is the name "
+ #| "of the APT preferences file.  <literal>Dir::State</literal> contains the "
+ #| "default directory to prefix on all sub items if they do not start with "
+ #| "<filename>/</filename> or <filename>./</filename>."
  msgid ""
  "The <literal>Dir::State</literal> section has directories that pertain to "
  "local state information. <literal>lists</literal> is the directory to place "
  "downloaded package lists in and <literal>status</literal> is the name of the "
  "dpkg status file.  <literal>preferences</literal> is the name of the APT "
- "preferences file.  <literal>Dir::State</literal> contains the default "
- "directory to prefix on all sub items if they do not start with <filename>/</"
- "filename> or <filename>./</filename>."
+ "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
+ "contains the default directory to prefix on all sub items if they do not "
+ "start with <filename>/</filename> or <filename>./</filename>."
  msgstr ""
  "La sección <literal>Dir::State</literal> contiene directorios que afectan a "
  "la información de estado local. <literal>lists</literal> es el directorio en "
@@@ -6849,7 -5685,7 +5695,7 @@@
  "empiecen con <filename>/</filename> ó <filename>./</filename>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:496
+ #: apt.conf.5.xml:521
  msgid ""
  "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
  "information, such as the two package caches <literal>srcpkgcache</literal> "
@@@ -6871,7 -5707,7 +5717,7 @@@ msgstr "
  "predeterminado está en <literal>Dir::Cache</literal>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:505
+ #: apt.conf.5.xml:530
  msgid ""
  "<literal>Dir::Etc</literal> contains the location of configuration files, "
  "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@@ -6887,7 -5723,7 +5733,7 @@@ msgstr "
  "<envar>APT_CONFIG</envar>)."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:511
+ #: apt.conf.5.xml:536
  msgid ""
  "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
  "in lexical order from the directory specified. After this is done then the "
@@@ -6898,7 -5734,7 +5744,7 @@@ msgstr "
  "Al finalizar este proceso carga el fichero de configuración principal."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:515
+ #: apt.conf.5.xml:540
  msgid ""
  "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
  "Bin::Methods</literal> specifies the location of the method handlers and "
@@@ -6915,7 -5751,7 +5761,7 @@@ msgstr "
  "literal> especifican la ubicación de sus respectivos programas."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:523
+ #: apt.conf.5.xml:548
  msgid ""
  "The configuration item <literal>RootDir</literal> has a special meaning.  If "
  "set, all paths in <literal>Dir::</literal> will be relative to "
@@@ -6936,7 -5772,7 +5782,7 @@@ msgstr "
  "staging/var/lib/dpkg/status</filename>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:536
+ #: apt.conf.5.xml:561
  msgid ""
  "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
  "which files APT should silently ignore while parsing the files in the "
@@@ -6954,12 -5790,12 +5800,12 @@@ msgstr "
  "de expresiones regulares."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:545
+ #: apt.conf.5.xml:570
  msgid "APT in DSelect"
  msgstr "APT con DSelect"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:547
+ #: apt.conf.5.xml:572
  msgid ""
  "When APT is used as a &dselect; method several configuration directives "
  "control the default behaviour. These are in the <literal>DSelect</literal> "
@@@ -6969,13 -5805,8 +5815,8 @@@ msgstr "
  "predeterminado cuando APT se usa como método de &dselect;. Éstas se "
  "encuentran en la sección <literal>DSelect</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:551
- msgid "Clean"
- msgstr "Clean"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:552
+ #: apt.conf.5.xml:577
  msgid ""
  "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
  "and never.  always and prompt will remove all packages from the cache after "
@@@ -6993,7 -5824,7 +5834,7 @@@ msgstr "
  "descargar los paquetes nuevos."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:561
+ #: apt.conf.5.xml:586
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the install phase."
@@@ -7001,13 -5832,8 +5842,8 @@@ msgstr "
  "Los contenidos de esta variable se introducen a &apt-get; como opciones de "
  "la línea de ordenes al ejecutar la fase de instalación."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:565
- msgid "Updateoptions"
- msgstr "Updateoptions"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:566
+ #: apt.conf.5.xml:591
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the update phase."
@@@ -7015,13 -5841,8 +5851,8 @@@ msgstr "
  "Los contenidos de esta variable se introducen a &apt-get; como opciones de "
  "la línea de ordenes al ejecutar la fase de actualización."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:570
- msgid "PromptAfterUpdate"
- msgstr "PromptAfterUpdate"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:571
+ #: apt.conf.5.xml:596
  msgid ""
  "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
  "The default is to prompt only on error."
@@@ -7031,12 -5852,12 +5862,12 @@@ msgstr "
  "preguntará en caso de error."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:577
+ #: apt.conf.5.xml:602
  msgid "How APT calls dpkg"
  msgstr "Cómo invoca APT a dpkg"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:578
+ #: apt.conf.5.xml:603
  msgid ""
  "Several configuration directives control how APT invokes &dpkg;. These are "
  "in the <literal>DPkg</literal> section."
@@@ -7045,7 -5866,7 +5876,7 @@@ msgstr "
  "se encuentran en la sección <literal>DPkg</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:583
+ #: apt.conf.5.xml:608
  msgid ""
  "This is a list of options to pass to dpkg. The options must be specified "
  "using the list notation and each list item is passed as a single argument to "
@@@ -7053,20 -5874,10 +5884,10 @@@
  msgstr ""
  "Es una lista de opciones que se introducen a dpkg. Las opciones se deben "
  "especificar usando la notación de lista y cada elemento de la lista se "
- "introduce a &dpkg; como un sólo argumento."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Pre-Invoke"
- msgstr "Pre-Invoke"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Post-Invoke"
- msgstr "Post-Invoke"
+ "introduce a &dpkg; como un sólo argumento."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:589
+ #: apt.conf.5.xml:614
  msgid ""
  "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -7078,13 -5889,8 +5899,8 @@@ msgstr "
  "notación de lista. Las órdenes se ejecutarán en orden usando <filename>/bin/"
  "sh</filename>, y APT finalizará en caso de fallo."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:595
- msgid "Pre-Install-Pkgs"
- msgstr "Pre-Install-Pkgs"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:596
+ #: apt.conf.5.xml:621
  msgid ""
  "This is a list of shell commands to run before invoking dpkg. Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -7100,7 -5906,7 +5916,7 @@@ msgstr "
  "instalar, uno por línea."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:602
+ #: apt.conf.5.xml:627
  msgid ""
  "Version 2 of this protocol dumps more information, including the protocol "
  "version, the APT configuration space and the packages, files and versions "
@@@ -7115,13 -5921,8 +5931,8 @@@ msgstr "
  "<literal>cmd</literal> es una orden que se pasa a <literal>Pre-Install-Pkgs</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:609
- msgid "Run-Directory"
- msgstr "Run-Directory"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:610
+ #: apt.conf.5.xml:635
  msgid ""
  "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
  "</filename>."
@@@ -7129,13 -5930,8 +5940,8 @@@ msgstr "
  "APT cambia a este directorio antes de invocar a dpkg, el valor "
  "predeterminado es <filename>/</filename>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:614
- msgid "Build-options"
- msgstr "Build-options"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:615
+ #: apt.conf.5.xml:640
  msgid ""
  "These options are passed to &dpkg-buildpackage; when compiling packages, the "
  "default is to disable signing and produce all binaries."
@@@ -7145,12 -5941,12 +5951,12 @@@ msgstr "
  "paquetes y a producir todos los binarios."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt.conf.5.xml:620
+ #: apt.conf.5.xml:645
  msgid "dpkg trigger usage (and related options)"
  msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:621
+ #: apt.conf.5.xml:646
  #, fuzzy
  #| msgid ""
  #| "APT can call dpkg in a way so it can make aggressive use of triggers over "
@@@ -7189,7 -5985,7 +5995,7 @@@ msgstr "
  "mientras se están configurando todos los paquetes."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
- #: apt.conf.5.xml:636
+ #: apt.conf.5.xml:661
  #, no-wrap
  msgid ""
  "DPkg::NoTriggers \"true\";\n"
@@@ -7203,7 -5999,7 +6009,7 @@@ msgstr "
  "DPkg::TriggersPending \"true\";"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:630
+ #: apt.conf.5.xml:655
  msgid ""
  "Note that it is not guaranteed that APT will support these options or that "
  "these options will not cause (big) trouble in the future. If you have "
@@@ -7226,13 -6022,8 +6032,8 @@@ msgstr "
  "command>. Una combinación de opciones defensivas sería <placeholder type="
  "\"literallayout\" id=\"0\"/>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:642
- msgid "DPkg::NoTriggers"
- msgstr "DPkg::NoTriggers"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:643
+ #: apt.conf.5.xml:668
  msgid ""
  "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
  "call).  See &dpkg; if you are interested in what this actually means. In "
@@@ -7252,13 -6043,8 +6053,8 @@@ msgstr "
  "triggers» a las llamadas de la configuración para dpkg, ahora apt también "
  "añadirá esta opción a las llamadas de desempaquetado y borrado."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:650
- msgid "PackageManager::Configure"
- msgstr "PackageManager::Configure"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:651
+ #: apt.conf.5.xml:676
  msgid ""
  "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
  "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@@ -7286,13 -6072,8 +6082,8 @@@ msgstr "
  "mal configurado qué podría derivar en la imposibilidad de arrancar el "
  "sistema. "
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:661
- msgid "DPkg::ConfigurePending"
- msgstr "DPkg::ConfigurePending"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:662
+ #: apt.conf.5.xml:687
  msgid ""
  "If this option is set apt will call <command>dpkg --configure --pending</"
  "command> to let dpkg handle all required configurations and triggers. This "
@@@ -7309,13 -6090,8 +6100,8 @@@ msgstr "
  "veces seguidas, por ejemplo: en un instalador. En estas situaciones podría "
  "desactivar esta opción en todas las ejecuciones menos la última."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:668
- msgid "DPkg::TriggersPending"
- msgstr "DPkg::TriggersPending"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:669
+ #: apt.conf.5.xml:694
  msgid ""
  "Useful for <literal>smart</literal> configuration as a package which has "
  "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@@ -7330,13 -6106,8 +6116,8 @@@ msgstr "
  "cuenta que esto procesará todos los disparadores, no sólo los disparadores "
  "necesarios para configurar este paquete."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:674
- msgid "PackageManager::UnpackAll"
- msgstr "PackageManager::UnpackAll"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:675
+ #: apt.conf.5.xml:700
  msgid ""
  "As the configuration can be deferred to be done at the end by dpkg it can be "
  "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@@ -7355,13 -6126,8 +6136,8 @@@ msgstr "
  "ya que este método es experimental y necesita más mejoras antes de llegar a "
  "ser realmente útil."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:682
- msgid "OrderList::Score::Immediate"
- msgstr "OrderList::Score::Immediate"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:690
+ #: apt.conf.5.xml:715
  #, no-wrap
  msgid ""
  "OrderList::Score {\n"
@@@ -7379,7 -6145,7 +6155,7 @@@ msgstr "
  "};"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:683
+ #: apt.conf.5.xml:708
  msgid ""
  "Essential packages (and there dependencies) should be configured immediately "
  "after unpacking. It will be a good idea to do this quite early in the "
@@@ -7404,12 -6170,12 +6180,12 @@@ msgstr "
  "\"literallayout\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:703
+ #: apt.conf.5.xml:728
  msgid "Periodic and Archives options"
  msgstr "Las opciones «Periodic» y «Archives»"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:704
+ #: apt.conf.5.xml:729
  msgid ""
  "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
  "of options configure behavior of apt periodic updates, which is done by "
@@@ -7423,12 -6189,12 +6199,12 @@@ msgstr "
  "documentación de estas opciones."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:712
+ #: apt.conf.5.xml:737
  msgid "Debug options"
  msgstr "Opciones de depuración"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:714
+ #: apt.conf.5.xml:739
  msgid ""
  "Enabling options in the <literal>Debug::</literal> section will cause "
  "debugging information to be sent to the standard error stream of the program "
@@@ -7445,7 -6211,7 +6221,7 @@@ msgstr "
  "para un usuario normal, aunque unas cuantas sí son:"
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:725
+ #: apt.conf.5.xml:750
  msgid ""
  "<literal>Debug::pkgProblemResolver</literal> enables output about the "
  "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@@ -7456,7 -6222,7 +6232,7 @@@ msgstr "
  "purge</literal>."
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:733
+ #: apt.conf.5.xml:758
  msgid ""
  "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
  "used to run some operations (for instance, <literal>apt-get -s install</"
@@@ -7467,7 -6233,7 +6243,7 @@@ msgstr "
  "<literal>apt-get -s install</literal>) como un usuario normal."
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:742
+ #: apt.conf.5.xml:767
  msgid ""
  "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
  "time that <literal>apt</literal> invokes &dpkg;."
@@@ -7479,7 -6245,7 +6255,7 @@@ msgstr "
  #. 	   motivating example, except I haven't a clue why you'd want
  #. 	   to do this. 
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:750
+ #: apt.conf.5.xml:775
  msgid ""
  "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
  "in CDROM IDs."
@@@ -7488,66 -6254,41 +6264,41 @@@ msgstr "
  "statfs en los identificadores de los CDROM."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:760
+ #: apt.conf.5.xml:785
  msgid "A full list of debugging options to apt follows."
  msgstr ""
  "A continuación, se muestra la lista completa de las opciones de depuración "
  "de apt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:765
- msgid "<literal>Debug::Acquire::cdrom</literal>"
- msgstr "<literal>Debug::Acquire::cdrom</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:769
+ #: apt.conf.5.xml:794
  msgid ""
  "Print information related to accessing <literal>cdrom://</literal> sources."
  msgstr ""
  "Muestra la información relacionada al acceso de las fuentes de "
  "<literal>cdrom://</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:776
- msgid "<literal>Debug::Acquire::ftp</literal>"
- msgstr "<literal>Debug::Acquire::ftp</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:780
+ #: apt.conf.5.xml:805
  msgid "Print information related to downloading packages using FTP."
  msgstr ""
  "Muestra la información relacionada con la descarga de paquetes mediante FTP."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:787
- msgid "<literal>Debug::Acquire::http</literal>"
- msgstr "<literal>Debug::Acquire::http</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:791
+ #: apt.conf.5.xml:816
  msgid "Print information related to downloading packages using HTTP."
  msgstr ""
  "Muestra la información relacionada con la descarga de paquetes mediante HTTP."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:798
- msgid "<literal>Debug::Acquire::https</literal>"
- msgstr "<literal>Debug::Acquire::https</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:802
+ #: apt.conf.5.xml:827
  msgid "Print information related to downloading packages using HTTPS."
  msgstr ""
  "Muestra la información relacionada con la descarga de paquetes mediante "
  "HTTPS."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:809
- msgid "<literal>Debug::Acquire::gpgv</literal>"
- msgstr "<literal>Debug::Acquire::gpgv</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:813
+ #: apt.conf.5.xml:838
  msgid ""
  "Print information related to verifying cryptographic signatures using "
  "<literal>gpg</literal>."
@@@ -7555,13 -6296,8 +6306,8 @@@ msgstr "
  "Muestra la información relacionada con la comprobación de las firmas "
  "criptográficas mediante <literal>gpg</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:820
- msgid "<literal>Debug::aptcdrom</literal>"
- msgstr "<literal>Debug::aptcdrom</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:824
+ #: apt.conf.5.xml:849
  msgid ""
  "Output information about the process of accessing collections of packages "
  "stored on CD-ROMs."
@@@ -7569,25 -6305,15 +6315,15 @@@ msgstr "
  "Muestra la información sobre el proceso de acceso a las colecciones de "
  "paquetes almacenadas en CD-ROM."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:831
- msgid "<literal>Debug::BuildDeps</literal>"
- msgstr "<literal>Debug::BuildDeps</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:834
+ #: apt.conf.5.xml:859
  msgid "Describes the process of resolving build-dependencies in &apt-get;."
  msgstr ""
  "Describe el proceso de resolución de dependencias de compilación en &apt-"
  "get;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:841
- msgid "<literal>Debug::Hashes</literal>"
- msgstr "<literal>Debug::Hashes</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:844
+ #: apt.conf.5.xml:869
  msgid ""
  "Output each cryptographic hash that is generated by the <literal>apt</"
  "literal> libraries."
@@@ -7595,13 -6321,8 +6331,8 @@@ msgstr "
  "Muestra los «hashes» criptográficos que generan las bibliotecas de "
  "<literal>apt</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:851
- msgid "<literal>Debug::IdentCDROM</literal>"
- msgstr "<literal>Debug::IdentCDROM</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:854
+ #: apt.conf.5.xml:879
  msgid ""
  "Do not include information from <literal>statfs</literal>, namely the number "
  "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@@ -7611,13 -6332,8 +6342,8 @@@ msgstr "
  "libres y usados del sistema de ficheros del CD-ROM, cuando se genera un "
  "identificador de un CD-ROM."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:862
- msgid "<literal>Debug::NoLocking</literal>"
- msgstr "<literal>Debug::NoLocking</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:865
+ #: apt.conf.5.xml:890
  msgid ""
  "Disable all file locking.  For instance, this will allow two instances of "
  "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@@ -7626,25 -6342,15 +6352,15 @@@ msgstr "
  "ejecutar dos instancias de <quote><literal>apt-get update</literal></quote> "
  "a la vez."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:873
- msgid "<literal>Debug::pkgAcquire</literal>"
- msgstr "<literal>Debug::pkgAcquire</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:877
+ #: apt.conf.5.xml:902
  msgid "Log when items are added to or removed from the global download queue."
  msgstr ""
  "Registra los elementos que se añaden o se borran de la cola de descarga "
  "global."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:884
- msgid "<literal>Debug::pkgAcquire::Auth</literal>"
- msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:887
+ #: apt.conf.5.xml:912
  msgid ""
  "Output status messages and errors related to verifying checksums and "
  "cryptographic signatures of downloaded files."
@@@ -7653,13 -6359,8 +6369,8 @@@ msgstr "
  "comprobación de las sumas de verificación y las firmas criptográficas de los "
  "ficheros descargados."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:894
- msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
- msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:897
+ #: apt.conf.5.xml:922
  msgid ""
  "Output information about downloading and applying package index list diffs, "
  "and errors relating to package index list diffs."
@@@ -7667,13 -6368,8 +6378,8 @@@ msgstr "
  "Muestra la información de la descarga y la aplicación de los diffs de la "
  "lista de índices de paquetes, y los errores relacionados con éstos."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:905
- msgid "<literal>Debug::pkgAcquire::RRed</literal>"
- msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:909
+ #: apt.conf.5.xml:934
  msgid ""
  "Output information related to patching apt package lists when downloading "
  "index diffs instead of full indices."
@@@ -7682,26 -6378,16 +6388,16 @@@ msgstr "
  "paquetes de apt cuando se descargan los diffs de los índices en lugar de los "
  "índices completos."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:916
- msgid "<literal>Debug::pkgAcquire::Worker</literal>"
- msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:920
+ #: apt.conf.5.xml:945
  msgid ""
  "Log all interactions with the sub-processes that actually perform downloads."
  msgstr ""
  "Registra todas las interacciones de los sub-procesos que están realizando "
  "descargas."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:927
- msgid "<literal>Debug::pkgAutoRemove</literal>"
- msgstr "<literal>Debug::pkgAutoRemove</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:931
+ #: apt.conf.5.xml:956
  msgid ""
  "Log events related to the automatically-installed status of packages and to "
  "the removal of unused packages."
@@@ -7709,13 -6395,8 +6405,8 @@@ msgstr "
  "Registra los eventos relacionados con el estado «instalado automáticamente» "
  "de los paquetes y con la eliminación de los paquetes sin usar."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:938
- msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
- msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:941
+ #: apt.conf.5.xml:966
  msgid ""
  "Generate debug messages describing which packages are being automatically "
  "installed to resolve dependencies.  This corresponds to the initial auto-"
@@@ -7729,13 -6410,8 +6420,8 @@@ msgstr "
  "install</literal> y no el solucionador completo de dependencias de "
  "<literal>apt</literal>. Véase <literal>Debug::pkgProblemResolver</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:952
- msgid "<literal>Debug::pkgDepCache::Marker</literal>"
- msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:955
+ #: apt.conf.5.xml:980
  msgid ""
  "Generate debug messages describing which package is marked as keep/install/"
  "remove while the ProblemResolver does his work.  Each addition or deletion "
@@@ -7764,25 -6440,15 +6450,15 @@@ msgstr "
  "misma versión que la instalada. <literal>sección</literal> es el nombre de "
  "la sección en la que aparece el paquete."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:974
- msgid "<literal>Debug::pkgInitConfig</literal>"
- msgstr "<literal>Debug::pkgInitConfig</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:977
+ #: apt.conf.5.xml:1002
  msgid "Dump the default configuration to standard error on startup."
  msgstr ""
  "Vuelca la configuración predeterminada a la salida estándar durante al "
  "iniciarse."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:984
- msgid "<literal>Debug::pkgDPkgPM</literal>"
- msgstr "<literal>Debug::pkgDPkgPM</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:987
+ #: apt.conf.5.xml:1012
  msgid ""
  "When invoking &dpkg;, output the precise command line with which it is being "
  "invoked, with arguments separated by a single space character."
@@@ -7790,13 -6456,8 +6466,8 @@@ msgstr "
  "Cuando se invoca a &dpkg; muestra la línea de órdenes exacta con la que se "
  "invocó, con los argumentos separados por un espacio."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:995
- msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
- msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:998
+ #: apt.conf.5.xml:1023
  msgid ""
  "Output all the data received from &dpkg; on the status file descriptor and "
  "any errors encountered while parsing it."
@@@ -7804,13 -6465,8 +6475,8 @@@ msgstr "
  "Muestra todos los datos recibidos de &dpkg; en el descriptor del fichero de "
  "estado y cualquier error encontrado durante el análisis."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1005
- msgid "<literal>Debug::pkgOrderList</literal>"
- msgstr "<literal>Debug::pkgOrderList</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1009
+ #: apt.conf.5.xml:1034
  msgid ""
  "Generate a trace of the algorithm that decides the order in which "
  "<literal>apt</literal> should pass packages to &dpkg;."
@@@ -7818,36 -6474,21 +6484,21 @@@ msgstr "
  "Genera una traza del algoritmo que decide el orden en el que <literal>apt</"
  "literal> debería entregar los paquetes a &dpkg;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1017
- msgid "<literal>Debug::pkgPackageManager</literal>"
- msgstr "<literal>Debug::pkgPackageManager</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1021
+ #: apt.conf.5.xml:1046
  msgid ""
  "Output status messages tracing the steps performed when invoking &dpkg;."
  msgstr ""
  "Muestra los mensajes de estado siguiendo los pasos realizados al invocar a "
  "&dpkg;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1028
- msgid "<literal>Debug::pkgPolicy</literal>"
- msgstr "<literal>Debug::pkgPolicy</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1032
+ #: apt.conf.5.xml:1057
  msgid "Output the priority of each package list on startup."
  msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1038
- msgid "<literal>Debug::pkgProblemResolver</literal>"
- msgstr "<literal>Debug::pkgProblemResolver</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1042
+ #: apt.conf.5.xml:1067
  msgid ""
  "Trace the execution of the dependency resolver (this applies only to what "
  "happens when a complex dependency problem is encountered)."
@@@ -7855,13 -6496,8 +6506,8 @@@ msgstr "
  "Muestra la ejecución del solucionador de dependencias (esto se aplica sólo a "
  "lo que ocurre cuando se encuentra un problema de dependencias complejo)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1050
- msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
- msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1053
+ #: apt.conf.5.xml:1078
  msgid ""
  "Display a list of all installed packages with their calculated score used by "
  "the pkgProblemResolver. The description of the package is the same as "
@@@ -7871,13 -6507,8 +6517,8 @@@ msgstr "
  "calculadas y usadas por pkgProblemResolver. La descripción del paquete es la "
  "misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1061
- msgid "<literal>Debug::sourceList</literal>"
- msgstr "<literal>Debug::sourceList</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1065
+ #: apt.conf.5.xml:1090
  msgid ""
  "Print information about the vendors read from <filename>/etc/apt/vendors."
  "list</filename>."
@@@ -7886,7 -6517,7 +6527,7 @@@ msgstr "
  "vendors.list</filename>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1088
+ #: apt.conf.5.xml:1113
  msgid ""
  "&configureindex; is a configuration file showing example values for all "
  "possible options."
@@@ -7895,29 -6526,16 +6536,16 @@@ msgstr "
  "valores de ejemplo para todas las opciones posibles."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt.conf.5.xml:1095
+ #: apt.conf.5.xml:1120
  msgid "&file-aptconf;"
  msgstr "&file-aptconf;"
  
  #.  ? reading apt.conf 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1100
+ #: apt.conf.5.xml:1125
  msgid "&apt-cache;, &apt-config;, &apt-preferences;."
  msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt_preferences.5.xml:16
- msgid ""
- "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
- msgstr ""
- "&apt-author.team; &apt-email; &apt-product; <date>16 de Febrero 2010</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt_preferences.5.xml:24 apt_preferences.5.xml:31
- msgid "apt_preferences"
- msgstr "apt_preferences"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt_preferences.5.xml:32
  msgid "Preference control file for APT"
@@@ -8010,8 -6628,8 +6638,8 @@@ msgstr "
  msgid ""
  "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
  "directory are parsed in alphanumeric ascending order and need to obey the "
- "following naming convention: The files have no or \"<literal>pref</literal>"
- "\" as filename extension and which only contain alphanumeric, hyphen (-), "
+ "following naming convention: The files have either no or \"<literal>pref</"
+ "literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
  "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
  "that it has ignored a file if the file doesn't match a pattern in the "
  "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@@ -8479,7 -7097,7 +7107,7 @@@ msgid "
  "APT also supports pinning by glob() expressions and regular expressions "
  "surrounded by /. For example, the following example assigns the priority 500 "
  "to all packages from experimental where the name starts with gnome (as a glob"
- "()-like expression or contains the word kde (as a POSIX extended regular "
+ "()-like expression) or contains the word kde (as a POSIX extended regular "
  "expression surrounded by slashes)."
  msgstr ""
  
@@@ -8503,7 -7121,7 +7131,7 @@@ msgstr "
  #: apt_preferences.5.xml:279
  msgid ""
  "The rule for those expressions is that they can occur anywhere where a "
- "string can occur. Those, the following pin assigns the priority 990 to all "
+ "string can occur. Thus, the following pin assigns the priority 990 to all "
  "packages from a release starting with karmic."
  msgstr ""
  
@@@ -8523,30 -7141,29 +7151,29 @@@ msgstr "
  "Pin: release a=unstable\n"
  "Pin-Priority: 50\n"
  
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:290
- #, fuzzy
- #| msgid "Packages"
- msgid "Package"
- msgstr "Packages"
- 
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:296
- msgid "*"
+ #. type: Content of: <refentry><refsect1><refsect2><para>
+ #: apt_preferences.5.xml:291
+ msgid ""
+ "If a regular expression occurs in a <literal>Package</literal> field, the "
+ "behavior is the same as if this regular expression were replaced with a list "
+ "of all package names it matches. It is undecided whether this will change in "
+ "the future, thus you should always list wild-card pins first, so later "
+ "specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+ "Package field is not considered a glob() expression in itself."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:306
+ #: apt_preferences.5.xml:307
  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:314
+ #: apt_preferences.5.xml:315
  msgid "P &gt; 1000"
  msgstr "P &gt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:315
+ #: apt_preferences.5.xml:316
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
  "package"
@@@ -8555,12 -7172,12 +7182,12 @@@ msgstr "
  "el sistema."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:319
+ #: apt_preferences.5.xml:320
  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:320
+ #: apt_preferences.5.xml:321
  msgid ""
  "causes a version to be installed even if it does not come from the target "
  "release, unless the installed version is more recent"
@@@ -8569,12 -7186,12 +7196,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:325
+ #: apt_preferences.5.xml:326
  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:326
+ #: apt_preferences.5.xml:327
  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"
@@@ -8584,12 -7201,12 +7211,12 @@@ msgstr "
  "más reciente."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:331
+ #: apt_preferences.5.xml:332
  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:332
+ #: apt_preferences.5.xml:333
  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"
@@@ -8598,12 -7215,12 +7225,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:337
+ #: apt_preferences.5.xml:338
  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:338
+ #: apt_preferences.5.xml:339
  msgid ""
  "causes a version to be installed only if there is no installed version of "
  "the package"
@@@ -8611,17 -7228,17 +7238,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:342
+ #: apt_preferences.5.xml:343
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:343
+ #: apt_preferences.5.xml:344
  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:309
+ #: apt_preferences.5.xml:310
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -8632,7 -7249,7 +7259,7 @@@ msgstr "
  "siguiente modo: <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:348
+ #: apt_preferences.5.xml:349
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -8646,7 -7263,7 +7273,7 @@@ msgstr "
  "versión del paquete."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:354
+ #: apt_preferences.5.xml:355
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
  "presented earlier:"
@@@ -8655,7 -7272,7 +7282,7 @@@ msgstr "
  "registros antes mencionados:"
  
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
- #: apt_preferences.5.xml:358
+ #: apt_preferences.5.xml:359
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8683,12 -7300,12 +7310,12 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:371
+ #: apt_preferences.5.xml:372
  msgid "Then:"
  msgstr "Por ello:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:373
+ #: apt_preferences.5.xml:374
  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 "
@@@ -8703,7 -7320,7 +7330,7 @@@ msgstr "
  "la versión 5.8*, desactualizando el paquete."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:378
+ #: apt_preferences.5.xml:379
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -8714,7 -7331,7 +7341,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:382
+ #: apt_preferences.5.xml:383
  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</"
@@@ -8727,12 -7344,12 +7354,12 @@@ msgstr "
  "hay ninguna versión del paquete ya instalado."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:392
+ #: apt_preferences.5.xml:393
  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:394
+ #: apt_preferences.5.xml:395
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -8743,27 -7360,27 +7370,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:406
+ #: apt_preferences.5.xml:407
  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:407
+ #: apt_preferences.5.xml:408
  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:410 apt_preferences.5.xml:460
+ #: apt_preferences.5.xml:411 apt_preferences.5.xml:461
  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:411
+ #: apt_preferences.5.xml:412
  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:398
+ #: apt_preferences.5.xml:399
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -8784,12 -7401,12 +7411,12 @@@ msgstr "
  "de APT: <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:427
+ #: apt_preferences.5.xml:428
  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:428
+ #: apt_preferences.5.xml:429
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -8807,18 -7424,18 +7434,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:438
+ #: apt_preferences.5.xml:439
  #, 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:444
+ #: apt_preferences.5.xml:445
  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:445
+ #: apt_preferences.5.xml:446
  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 "
@@@ -8837,13 -7454,13 +7464,13 @@@ msgstr "
  "de APT:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:454
+ #: apt_preferences.5.xml:455
  #, 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:461
+ #: apt_preferences.5.xml:462
  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 "
@@@ -8859,7 -7476,7 +7486,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:470
+ #: apt_preferences.5.xml:471
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -8871,12 -7488,12 +7498,12 @@@ msgstr "
  "Pin: release 3.0\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:479
+ #: apt_preferences.5.xml:480
  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:480
+ #: apt_preferences.5.xml:481
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -8895,18 -7512,18 +7522,18 @@@ msgstr "
  "de APT:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:489
+ #: apt_preferences.5.xml:490
  #, 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:495
+ #: apt_preferences.5.xml:496
  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:496
+ #: apt_preferences.5.xml:497
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8919,18 -7536,18 +7546,18 @@@ msgstr "
  "mediante la siguiente línea:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:502
+ #: apt_preferences.5.xml:503
  #, 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:508
+ #: apt_preferences.5.xml:509
  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:509
+ #: apt_preferences.5.xml:510
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8943,13 -7560,13 +7570,13 @@@ msgstr "
  "siguiente línea:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:515
+ #: apt_preferences.5.xml:516
  #, 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:416
+ #: apt_preferences.5.xml:417
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -8972,7 -7589,7 +7599,7 @@@ msgstr "
  "\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:522
+ #: apt_preferences.5.xml:523
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -8997,12 -7614,12 +7624,12 @@@ msgstr "
  "la distribución «<literal>unstable</literal>» (inestable)."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:535
+ #: apt_preferences.5.xml:536
  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:537
+ #: apt_preferences.5.xml:538
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -9013,12 -7630,12 +7640,12 @@@ msgstr "
  "Útil para comentarios."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:546
+ #: apt_preferences.5.xml:547
  msgid "Tracking Stable"
  msgstr "Seguir la distribución «stable» (estable)"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:554
+ #: apt_preferences.5.xml:555
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -9042,7 -7659,7 +7669,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:548
+ #: apt_preferences.5.xml:549
  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 "
@@@ -9057,8 -7674,8 +7684,8 @@@ msgstr "
  "<literal>Debian</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:571 apt_preferences.5.xml:617
- #: apt_preferences.5.xml:675
+ #: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+ #: apt_preferences.5.xml:676
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -9070,7 -7687,7 +7697,7 @@@ msgstr "
  "apt-get dist-upgrade\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:566
+ #: apt_preferences.5.xml:567
  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 "
@@@ -9084,13 -7701,13 +7711,13 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:583
+ #: apt_preferences.5.xml:584
  #, 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:577
+ #: apt_preferences.5.xml:578
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -9103,12 -7720,12 +7730,12 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:589
+ #: apt_preferences.5.xml:590
  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:598
+ #: apt_preferences.5.xml:599
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -9136,7 -7753,7 +7763,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:591
+ #: apt_preferences.5.xml:592
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -9153,7 -7770,7 +7780,7 @@@ msgstr "
  ">"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:612
+ #: apt_preferences.5.xml:613
  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 "
@@@ -9166,13 -7783,13 +7793,13 @@@ msgstr "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:632
+ #: apt_preferences.5.xml:633
  #, 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:623
+ #: apt_preferences.5.xml:624
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -9191,12 -7808,12 +7818,12 @@@ msgstr "
  "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:639
+ #: apt_preferences.5.xml:640
  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:653
+ #: apt_preferences.5.xml:654
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -9230,7 -7847,7 +7857,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:641
+ #: apt_preferences.5.xml:642
  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 "
@@@ -9257,7 -7874,7 +7884,7 @@@ msgstr "
  "\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:670
+ #: apt_preferences.5.xml:671
  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 "
@@@ -9271,13 -7888,13 +7898,13 @@@ msgstr "
  "id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:690
+ #: apt_preferences.5.xml:691
  #, 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:681
+ #: apt_preferences.5.xml:682
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -9296,20 -7913,15 +7923,15 @@@ msgstr "
  "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt_preferences.5.xml:699
+ #: apt_preferences.5.xml:700
  msgid "&file-preferences;"
  msgstr "&file-preferences;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt_preferences.5.xml:705
+ #: apt_preferences.5.xml:706
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: sources.list.5.xml:25 sources.list.5.xml:32
- msgid "sources.list"
- msgstr "sources.list"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: sources.list.5.xml:33
  msgid "Package resource list for APT"
@@@ -9437,7 -8049,7 +8059,7 @@@ msgstr "
  #: sources.list.5.xml:81
  #, fuzzy, no-wrap
  #| msgid "deb uri distribution [component1] [component2] [...]"
- msgid "deb uri distribution [component1] [component2] [...]"
+ msgid "deb [ options ] uri distribution [component1] [component2] [...]"
  msgstr "deb uri distribución [componente1] [componente2] [...]"
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -9508,6 -8120,38 +8130,38 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:112
  msgid ""
+ "<literal>options</literal> is always optional and needs to be surounded by "
+ "square brackets. It can consist of multiple settings in the form "
+ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+ "replaceable></literal>.  Multiple settings are separated by spaces. The "
+ "following settings are supported by APT, note though that unsupported "
+ "settings will be ignored silently:"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:117
+ msgid ""
+ "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+ "replaceable>,…</literal> can be used to specify for which architectures "
+ "packages information should be downloaded. If this option is not set all "
+ "architectures defined by the <literal>APT::Architectures</literal> option "
+ "will be downloaded."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:121
+ msgid ""
+ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+ "this source are always authenticated even if the <filename>Release</"
+ "filename> file is not signed or the signature can't be checked. This "
+ "disables parts of &apt-secure; and should therefore only be used in a local "
+ "and trusted context. <literal>trusted=no</literal> is the opposite which "
+ "handles even correctly authenticated sources as not authenticated."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:128
+ msgid ""
  "It is important to list sources in order of preference, with the most "
  "preferred source listed first. Typically this will result in sorting by "
  "speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@@ -9519,12 -8163,12 +8173,12 @@@ msgstr "
  "seguidos por servidores de Internet distantes, por ejemplo)."
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:117
+ #: sources.list.5.xml:133
  msgid "Some examples:"
  msgstr "Algunos ejemplos:"
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:119
+ #: sources.list.5.xml:135
  #, no-wrap
  msgid ""
  "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@@ -9536,17 -8180,17 +8190,17 @@@ msgstr "
  "   "
  
  #. type: Content of: <refentry><refsect1><title>
- #: sources.list.5.xml:125
+ #: sources.list.5.xml:141
  msgid "URI specification"
  msgstr "Especificación de la URI"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:130
+ #: sources.list.5.xml:146
  msgid "file"
  msgstr "file"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:132
+ #: sources.list.5.xml:148
  msgid ""
  "The file scheme allows an arbitrary directory in the file system to be "
  "considered an archive. This is useful for NFS mounts and local mirrors or "
@@@ -9556,8 -8200,13 +8210,13 @@@ msgstr "
  "ficheros como un archivo de paquetes adicional. Esto es útil para "
  "particiones montadas mediante NFS y réplicas o archivos de paquetes locales."
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:153
+ msgid "cdrom"
+ msgstr "cdrom"
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:139
+ #: sources.list.5.xml:155
  msgid ""
  "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
  "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@@ -9566,8 -8215,13 +8225,13 @@@ msgstr "
  "programa &apt-cdrom; para añadir entradas de un disco óptico a «sources."
  "list»."
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:160
+ msgid "http"
+ msgstr "http"
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:146
+ #: sources.list.5.xml:162
  msgid ""
  "The http scheme specifies an HTTP server for the archive. If an environment "
  "variable <envar>http_proxy</envar> is set with the format http://server:"
@@@ -9583,8 -8237,13 +8247,13 @@@ msgstr "
  "usar la cadena de caracteres «http://usuario:contraseña@servidor:puerto/». "
  "Tenga en cuenta que este método de autenticación no es seguro."
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:171
+ msgid "ftp"
+ msgstr "ftp"
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:157
+ #: sources.list.5.xml:173
  msgid ""
  "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
  "is highly configurable; for more information see the &apt-conf; manual page. "
@@@ -9603,12 -8262,12 +8272,12 @@@ msgstr "
  "ignorarán proxies ftp definidos en el fichero de configuración que usen http."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:166
+ #: sources.list.5.xml:182
  msgid "copy"
  msgstr "copy"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:168
+ #: sources.list.5.xml:184
  msgid ""
  "The copy scheme is identical to the file scheme except that packages are "
  "copied into the cache directory instead of used directly at their location.  "
@@@ -9619,17 -8278,17 +8288,17 @@@ msgstr "
  "Esto es útil para gente que use discos zip con APT."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "rsh"
  msgstr "rsh"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "ssh"
  msgstr "ssh"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:175
+ #: sources.list.5.xml:191
  msgid ""
  "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
  "user and access the files. It is a good idea to do prior arrangements with "
@@@ -9644,12 -8303,12 +8313,12 @@@ msgstr "
  "command> y <command>dd</command> para realizar la transferencia de ficheros."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:183
+ #: sources.list.5.xml:199
  msgid "more recognizable URI types"
  msgstr "Otros tipos de URI reconocidos."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:185
+ #: sources.list.5.xml:201
  msgid ""
  "APT can be extended with more methods shipped in other optional packages "
  "which should follow the nameing scheme <literal>apt-transport-"
@@@ -9670,7 -8329,7 +8339,7 @@@ msgstr "
  "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:127
+ #: sources.list.5.xml:143
  msgid ""
  "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
  "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@@ -9679,7 -8338,7 +8348,7 @@@ msgstr "
  "<placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:199
+ #: sources.list.5.xml:215
  msgid ""
  "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
  "stable/main, stable/contrib, and stable/non-free."
@@@ -9688,36 -8347,59 +8357,59 @@@ msgstr "
  "«stable/main», «stable/contrib», y «stable/non-free»."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:201
+ #: sources.list.5.xml:217
  #, no-wrap
  msgid "deb file:/home/jason/debian stable main contrib non-free"
  msgstr "deb file:/home/jason/debian stable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:203
+ #: sources.list.5.xml:219
  msgid "As above, except this uses the unstable (development) distribution."
  msgstr ""
  "Como arriba, excepto que usa la distribución «unstable» (en desarrollo)."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:204
+ #: sources.list.5.xml:220
  #, no-wrap
  msgid "deb file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb file:/home/jason/debian unstable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:206
+ #: sources.list.5.xml:222
  msgid "Source line for the above"
  msgstr "Línea para obtener el código fuente desde la ubicación anterior."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:207
+ #: sources.list.5.xml:223
  #, no-wrap
  msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:209
+ #: sources.list.5.xml:225
+ msgid ""
+ "The first line gets package information for the architectures in "
+ "<literal>APT::Architectures</literal> while the second always retrieves "
+ "<literal>amd64</literal> and <literal>armel</literal>."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><literallayout>
+ #: sources.list.5.xml:227
+ #, fuzzy, no-wrap
+ #| msgid ""
+ #| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+ #| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+ #| "   "
+ msgid ""
+ "deb http://ftp.debian.org/debian &stable-codename; main\n"
+ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ msgstr ""
+ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+ "   "
+ 
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:230
  msgid ""
  "Uses HTTP to access the archive at archive.debian.org, and uses only the "
  "hamm/main area."
@@@ -9726,13 -8408,13 +8418,13 @@@ msgstr "
  "sólo la sección «hamm/main»."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:211
+ #: sources.list.5.xml:232
  #, no-wrap
  msgid "deb http://archive.debian.org/debian-archive hamm main"
  msgstr "deb http://archive.debian.org/debian-archive hamm main"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:213
+ #: sources.list.5.xml:234
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the &stable-codename;/contrib area."
@@@ -9741,13 -8423,13 +8433,13 @@@ msgstr "
  "directorio «debian», y usa sólo la sección «&stable-codename;/contrib»."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:215
+ #: sources.list.5.xml:236
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:217
+ #: sources.list.5.xml:238
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the unstable/contrib area. If this line appears as "
@@@ -9760,20 -8442,20 +8452,20 @@@ msgstr "
  "filename>, se usará sólo una sesión FTP para ambas."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:221
+ #: sources.list.5.xml:242
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian unstable contrib"
  msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: sources.list.5.xml:230
+ #: sources.list.5.xml:251
  #, fuzzy, no-wrap
  #| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
  msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
  msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:223
+ #: sources.list.5.xml:244
  #, fuzzy
  #| msgid ""
  #| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@@ -9801,7 -8483,7 +8493,7 @@@ msgstr "
  "estructura.) <placeholder type=\"literallayout\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:235
+ #: sources.list.5.xml:256
  msgid "&apt-cache; &apt-conf;"
  msgstr "&apt-cache; &apt-conf;"
  
@@@ -9987,6 -8669,11 +8679,11 @@@ msgstr "
  "asistir en la resolución de problemas de dependencias mediante un número de "
  "algoritmos automáticos que ayudan en la selección de paquetes a instalar."
  
+ #. type: <heading></heading>
+ #: guide.sgml:96
+ msgid "apt-get"
+ msgstr "apt-get"
+ 
  #. type: <p></p>
  #: guide.sgml:102
  msgid ""
@@@ -10038,6 -8725,11 +8735,11 @@@ msgstr "
  msgid "Once updated there are several commands that can be used:"
  msgstr "Puede usar varias órdenes después de actualizar:"
  
+ #. type: <tag></tag>
+ #: guide.sgml:121
+ msgid "upgrade"
+ msgstr "upgrade"
+ 
  #. type: <p></p>
  #: guide.sgml:131
  msgid ""
@@@ -10058,6 -8750,11 +8760,11 @@@ msgstr "
  "prgn> o <tt>apt-get install</tt> para forzar la instalación de tales "
  "paquetes."
  
+ #. type: <tag></tag>
+ #: guide.sgml:131
+ msgid "install"
+ msgstr "install"
+ 
  #. type: <p></p>
  #: guide.sgml:140
  msgid ""
@@@ -10077,6 -8774,11 +8784,11 @@@ msgstr "
  "dependencias con los paquetes listados, y mostrará un resumen al pedir una "
  "confirmación en caso de modificar cualquiera de los argumentos introducidos."
  
+ #. type: <tag></tag>
+ #: guide.sgml:140
+ msgid "dist-upgrade"
+ msgstr "dist-upgrade"
+ 
  #. type: <p></p>
  #: guide.sgml:149
  msgid ""
@@@ -11327,14 -10029,188 +10039,188 @@@ msgid "Which will use the already fetch
  msgstr "Ésto usará los archivos del disco previamente obtenidos."
  
  #, fuzzy
- #~| msgid "<option>--recurse</option>"
- #~ msgid "<option>--host-architecture</option>"
- #~ msgstr "<option>--recurse</option>"
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>17 August 2009</date>"
+ #~ msgid "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 de Agosto de 2009</date>"
+ 
+ #~ msgid "ORIGINAL AUTHORS"
+ #~ msgstr "AUTORES ORIGINALES"
+ 
+ #~ msgid "&apt-author.jgunthorpe;"
+ #~ msgstr "&apt-author.jgunthorpe;"
+ 
+ #~ msgid "CURRENT AUTHORS"
+ #~ msgstr "AUTORES ACTUALES"
+ 
+ #~ msgid "&apt-author.team;"
+ #~ msgstr "&apt-author.team;"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>17 August 2009</date>"
+ #~ msgid "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 de Agosto de 2009</date>"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+ #~| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
+ #~| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+ #~| "email; &apt-product; <date>16 January 2010</date>"
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+ #~ "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
+ #~ "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+ #~ "email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+ #~ "firstname> <surname>Burrows</surname> <contrib>Documentación inicial de "
+ #~ "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+ #~ "email; &apt-product; <date>16 de Enero de 2009</date>"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
+ #~ msgid "&apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.team; &apt-email; &apt-product; <date>16 de Febrero 2010</"
+ #~ "date>"
+ 
+ #~ msgid ""
+ #~ "<!-- Boiler plate docinfo section -->\n"
+ #~ "<!ENTITY apt-docinfo \"\n"
+ #~ " <refentryinfo>\n"
+ #~ "   <address><email>apt@packages.debian.org</email></address>\n"
+ #~ "   <author>\n"
+ #~ "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+ #~ "     <contrib></contrib>\n"
+ #~ "   </author>\n"
+ #~ "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+ #~ "copyright>\n"
+ #~ "   <date>28 October 2008</date>\n"
+ #~ "   <productname>Linux</productname>\n"
+ #~ " </refentryinfo>\n"
+ #~ "\">\n"
+ #~ msgstr ""
+ #~ "<!-- Boiler plate docinfo section -->\n"
+ #~ "<!ENTITY apt-docinfo \"\n"
+ #~ " <refentryinfo>\n"
+ #~ "   <address><email>apt@packages.debian.org</email></address>\n"
+ #~ "   <author>\n"
+ #~ "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+ #~ "     <contrib></contrib>\n"
+ #~ "   </author>\n"
+ #~ "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+ #~ "copyright>\n"
+ #~ "   <date>28 de Octubre de 2008</date>\n"
+ #~ "   <productname>Linux</productname>\n"
+ #~ " </refentryinfo>\n"
+ #~ "\">\n"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>14 February 2004</date>"
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>2012-05-21T05:49:00+01:00</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>14 de Febrero de 2004</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>14 February 2004</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>14 de Febrero de 2004</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>29 February 2004</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>29 de Febrero de 2004</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 August 2009</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 de Agosto de 2009</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>08 November 2008</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>08 de Noviembre de 2008</date>"
  
  #, fuzzy
- #~| msgid "Max-ValidTime"
- #~ msgid "Min-ValidTime"
- #~ msgstr "Max-ValidTime"
+ #~| msgid ""
+ #~| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>9 August 2009</date>"
+ #~ msgid ""
+ #~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>21 April 2011</date>"
+ #~ msgstr ""
+ #~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+ #~ "de Agosto de 2009</date>"
+ 
+ #~ msgid ""
+ #~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
+ #~ "get check</command>. It builds the source and package caches from the "
+ #~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</"
+ #~ "filename>."
+ #~ msgstr ""
+ #~ "<literal>gencaches</literal> realiza la misma operación que <command>apt-"
+ #~ "get check</command>. Genera las caches de los paquetes fuente y de los "
+ #~ "paquetes binarios a partir de la lista de fuentes en &sources-list; y a "
+ #~ "partir de <filename>/var/lib/dpkg/status</filename>."
+ 
+ #~ msgid ""
+ #~ "One setting is provided to control the pipeline depth in cases where the "
+ #~ "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
+ #~ "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
+ #~ "5 indicating how many outstanding requests APT should send. A value of "
+ #~ "zero MUST be specified if the remote host does not properly linger on TCP "
+ #~ "connections - otherwise data corruption will occur. Hosts which require "
+ #~ "this are in violation of RFC 2068."
+ #~ msgstr ""
+ #~ "Se ofrece una opción para controlar la profundidad de la tubería en casos "
+ #~ "en que el servidor remoto no cumpla con la RFC o tenga fallos (como pasa "
+ #~ "con Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth</literal> puede "
+ #~ "ser un valor entre 0 y 5, e indica cuántas peticiones sin resolver puede "
+ #~ "enviar APT. DEBE especificar si la máquina remota no retrasa "
+ #~ "apropiadamente las conexiones TCP, de otro modo los datos se corromperán. "
+ #~ "Las máquinas que necesitan esto violan la RFC 2068."
+ 
+ #~ msgid "add <replaceable>filename</replaceable>"
+ #~ msgstr "add <replaceable>nombre-de-fichero</replaceable>"
+ 
+ #~ msgid "del <replaceable>keyid</replaceable>"
+ #~ msgstr "del <replaceable>identificador-de-la-clave</replaceable>"
+ 
+ #~ msgid "export <replaceable>keyid</replaceable>"
+ #~ msgstr "export <replaceable>identificador-de-la-clave</replaceable>"
+ 
+ #~ msgid ""
+ #~ "Update the local keyring with the keyring of Debian archive keys and "
+ #~ "removes from the keyring the archive keys which are no longer valid."
+ #~ msgstr ""
+ #~ "Actualiza el registro de claves local con el registro de claves del "
+ #~ "archivo Debian, y elimina del registro las claves del archivo que ya no "
+ #~ "son válidas."
+ 
+ #~ msgid "--keyring <replaceable>filename</replaceable>"
+ #~ msgstr "--keyring <replaceable>nombre-de-fichero</replaceable>"
  
  #, fuzzy
  #~| msgid ""
@@@ -11348,13 -10224,15 +10234,15 @@@
  #~| "using the earlier date of the two. Archive specific settings can be made "
  #~| "by appending the label of the archive to the option name."
  #~ msgid ""
- #~ "Minimum of seconds the Release file should be considered valid after it "
- #~ "was created (indicated by the <literal>Date</literal> header).  Use this "
- #~ "if you need to use a seldomly updated (local) mirror of a more regular "
- #~ "updated archive with a <literal>Valid-Until</literal> header instead of "
- #~ "completely disabling the expiration date checking.  Archive specific "
- #~ "settings can and should be used by appending the label of the archive to "
- #~ "the option name."
+ #~ "Seconds the Release file should be considered valid after it was created. "
+ #~ "The default is \"for ever\" (0) if the Release file of the archive "
+ #~ "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+ #~ "this date is the default. The date from the Release file or the date "
+ #~ "specified by the creation time of the Release file (<literal>Date</"
+ #~ "literal> header) plus the seconds specified with this options are used to "
+ #~ "check if the validation of a file has expired by using the earlier date "
+ #~ "of the two. Archive specific settings can be made by appending the label "
+ #~ "of the archive to the option name."
  #~ msgstr ""
  #~ "Los segundos que el fichero «Release» se considerará válido después de su "
  #~ "creación. El valor predeterminado es «para siempre» (cero) si el fichero "
@@@ -11368,22 -10246,6 +10256,6 @@@
  #~ "específicas al archivo añadiendo la etiqueta del archivo al nombre de la "
  #~ "opción."
  
- #, fuzzy
- #~| msgid ""
- #~| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
- #~| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
- #~| "   "
- #~ msgid ""
- #~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
- #~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
- #~ msgstr ""
- #~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
- #~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
- #~ "   "
- 
- #~ 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 "
@@@ -11394,24 -10256,9 +10266,9 @@@
  #~ "campos MD5Sum cuando sea posible. Opción de configuración: <literal>APT::"
  #~ "FTPArchive::MD5</literal>"
  
- #~ msgid "unmarkauto"
- #~ msgstr "unmarkauto"
- 
- #~ msgid "<option>-h</option>"
- #~ msgstr "<option>-h</option>"
- 
- #~ msgid "<option>--help</option>"
- #~ msgstr "<option>--help</option>"
- 
  #~ msgid "Show a short usage summary."
  #~ msgstr "Muestra un breve resumen de uso."
  
- #~ msgid "<option>-v</option>"
- #~ msgstr "<option>-v</option>"
- 
- #~ msgid "<option>--version</option>"
- #~ msgstr "<option>--version</option>"
- 
  #~ msgid "Show the program version."
  #~ msgstr "Muestra la versión del programa."
  
@@@ -11446,9 -10293,6 +10303,6 @@@
  #~ "en la salida estándar un fichero «Release» que contiene un resumen MD5 y "
  #~ "SHA1 para cada fichero."
  
- #~ msgid "<option>--install-recommends</option>"
- #~ msgstr "<option>--install-recommends</option>"
- 
  #~ msgid "Also install recommended packages."
  #~ msgstr "También instala los paquetes recomendados."
  
@@@ -11505,9 -10349,6 +10359,6 @@@
  #~ "configuración: <literal>Dir::State</literal> define la ruta del fichero "
  #~ "<filename>extended_states</filename>."
  
- #~ msgid "Cache-Limit"
- #~ msgstr "Cache-Limit"
- 
  #~ msgid ""
  #~ "APT uses a fixed size memory mapped cache file to store the 'available' "
  #~ "information. This sets the size of that cache (in bytes)."
@@@ -11530,9 -10371,6 +10381,6 @@@
  #~ "especificada en una línea que empiece con <literal>Pin-Priority: "
  #~ "release ...</literal>."
  
- #~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
- #~ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
- 
  #~ msgid "Keyring of local trusted keys, new keys will be added here."
  #~ msgstr ""
  #~ "El registro local de las claves de confianza. Las claves nuevas se "
diff --combined doc/po/fr.po
index 6183ae072,5881fd38c..cf2b4bcf9
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@@ -9,7 -9,7 +9,8 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: \n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
 -"POT-Creation-Date: 2012-05-21 13:35+0300\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:47+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"
@@@ -143,44 -143,7 +144,7 @@@ msgstr "
  "orgE<gt>."
  
  #. type: Plain text
- #: apt.ent:2
- msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
- msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
- 
- #. type: Plain text
- #: apt.ent:16
- #, no-wrap
- msgid ""
- "<!-- Boiler plate docinfo section -->\n"
- "<!ENTITY apt-docinfo \"\n"
- " <refentryinfo>\n"
- "   <address><email>apt@packages.debian.org</email></address>\n"
- "   <author>\n"
- "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
- "     <contrib></contrib>\n"
- "   </author>\n"
- "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
- "   <date>28 October 2008</date>\n"
- "   <productname>Linux</productname>\n"
- " </refentryinfo>\n"
- "\">\n"
- msgstr ""
- "<!-- Boiler plate docinfo section -->\n"
- "<!ENTITY apt-docinfo \"\n"
- " <refentryinfo>\n"
- "   <address><email>apt@packages.debian.org</email></address>\n"
- "   <author>\n"
- "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
- "     <contrib></contrib>\n"
- "   </author>\n"
- "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
- "   <date>28 Octobre 2008</date>\n"
- "   <productname>Linux</productname>\n"
- " </refentryinfo>\n"
- "\">\n"
- 
- #. type: Plain text
- #: apt.ent:23
+ #: apt.ent:7
  #, no-wrap
  msgid ""
  "<!ENTITY apt-author.team \"\n"
@@@ -198,7 -161,7 +162,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:29
+ #: apt.ent:13
  #, no-wrap
  msgid ""
  "<!ENTITY apt-qapage \"\n"
@@@ -214,7 -177,7 +178,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:40
+ #: apt.ent:24
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Bug reporting section -->\n"
@@@ -240,7 -203,7 +204,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:48
+ #: apt.ent:32
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Author section -->\n"
@@@ -260,7 -223,7 +224,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:58
+ #: apt.ent:42
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -284,7 -247,7 +248,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:66
+ #: apt.ent:50
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -304,7 -267,7 +268,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:78
+ #: apt.ent:62
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -331,7 -294,7 +295,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:90
+ #: apt.ent:74
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -359,7 -322,7 +323,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:101
+ #: apt.ent:85
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -385,7 -348,7 +349,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:107
+ #: apt.ent:91
  #, no-wrap
  msgid ""
  "<!ENTITY file-aptconf \"\n"
@@@ -401,7 -364,7 +365,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:113
+ #: apt.ent:97
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@@ -417,7 -380,7 +381,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:119
+ #: apt.ent:103
  #, no-wrap
  msgid ""
  "<!ENTITY file-cachearchives \"\n"
@@@ -433,12 -396,18 +397,18 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:125
- #, no-wrap
+ #: apt.ent:109
+ #, fuzzy, no-wrap
+ #| msgid ""
+ #| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+ #| "     <listitem><para>Storage area for package files in transit.\n"
+ #| "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+ #| "     </varlistentry>\n"
+ #| "\">\n"
  msgid ""
  "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
  "     <listitem><para>Storage area for package files in transit.\n"
- "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
@@@ -449,7 -418,7 +419,7 @@@
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:135
+ #: apt.ent:119
  #, no-wrap
  msgid ""
  "<!ENTITY file-preferences \"\n"
@@@ -470,7 -439,7 +440,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:141
+ #: apt.ent:125
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@@ -486,7 -455,7 +456,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:147
+ #: apt.ent:131
  #, no-wrap
  msgid ""
  "<!ENTITY file-sourceslist \"\n"
@@@ -502,7 -471,7 +472,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:153
+ #: apt.ent:137
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@@ -518,7 -487,7 +488,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:160
+ #: apt.ent:144
  #, no-wrap
  msgid ""
  "<!ENTITY file-statelists \"\n"
@@@ -535,12 -504,18 +505,18 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:166
- #, no-wrap
+ #: apt.ent:150
+ #, fuzzy, no-wrap
+ #| msgid ""
+ #| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+ #| "     <listitem><para>Storage area for state information in transit.\n"
+ #| "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+ #| "     </varlistentry>\n"
+ #| "\">\n"
  msgid ""
  "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
  "     <listitem><para>Storage area for state information in transit.\n"
- "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
@@@ -551,7 -526,7 +527,7 @@@
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:172
+ #: apt.ent:156
  #, no-wrap
  msgid ""
  "<!ENTITY file-trustedgpg \"\n"
@@@ -567,7 -542,7 +543,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:179
+ #: apt.ent:163
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@@ -585,7 -560,7 +561,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:187
+ #: apt.ent:171
  #, no-wrap
  msgid ""
  "<!ENTITY file-extended_states \"\n"
@@@ -604,7 -579,7 +580,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:191
+ #: apt.ent:175
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@@ -613,7 -588,7 +589,7 @@@
  msgstr "<!ENTITY translation-title \"TRADUCTEURS\">\n"
  
  #. type: Plain text
- #: apt.ent:200
+ #: apt.ent:184
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@@ -631,7 -606,7 +607,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:210
+ #: apt.ent:195
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@@ -651,32 -626,133 +627,133 @@@ msgstr "
  "     traduction est légèrement en retard sur le contenu d'origine.\n"
  "\">\n"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cache.8.xml:16
+ #. type: Plain text
+ #: apt.ent:198
+ msgid ""
+ "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+ "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:201
+ msgid ""
+ "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+ "synopsis-config-file \"config_file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:204
+ msgid ""
+ "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+ "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+ "\"target_release\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:207
+ msgid ""
+ "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+ "synopsis-architecture \"architecture\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:210
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+ "--> <!ENTITY synopsis-pkg \"pkg\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:213
+ msgid ""
+ "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+ "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:216
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+ "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:219
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+ "awesome --> <!ENTITY synopsis-regex \"regex\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:222
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+ "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:225
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+ "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+ "\"temporary_directory\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:228
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+ "synopsis-filename \"filename\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:231
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:234
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-override "
+ "\"override-file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:237
  msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
- "February 2011</date>"
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+ "\"pathprefix\">"
  msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>4 "
- "février 2011</date>"
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cache.8.xml:25 apt-cache.8.xml:32
- msgid "apt-cache"
- msgstr "apt-cache"
+ #. type: Plain text
+ #: apt.ent:240
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "generate section --> <!ENTITY synopsis-section \"section\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:243
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+ msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26
- #: apt-key.8.xml:18 apt-mark.8.xml:26 apt-secure.8.xml:18
+ #: apt-key.8.xml:25 apt-mark.8.xml:26 apt-secure.8.xml:25
  msgid "8"
  msgstr "8"
  
  #. type: Content of: <refentry><refmeta><refmiscinfo>
  #: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27
  #: apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27
- #: apt-key.8.xml:19 apt-mark.8.xml:27 apt-secure.8.xml:19
- #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:33 apt_preferences.5.xml:26
+ #: apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26
+ #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:32 apt_preferences.5.xml:26
  #: sources.list.5.xml:27
  msgid "APT"
  msgstr "APT"
@@@ -686,59 -762,17 +763,17 @@@
  msgid "query the APT cache"
  msgstr "recherche dans le cache d'APT"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cache.8.xml:39
- msgid ""
- "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
- "<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
- "arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
- "arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
- "arg> </group>"
- msgstr ""
- "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
- "o=<replaceable>option de configuration</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>fichier</replaceable></option></arg> <group "
- "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg>showsrc <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></"
- "arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
- "<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
- "arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</"
- "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>paquet</replaceable></arg></arg> <arg>rdepends <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> "
- "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
- "arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</"
- "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>paquets</replaceable></arg></arg> <arg>madison <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>paquets</replaceable></arg></arg> </"
- "group>"
- 
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
- #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
- #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
- #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+ #: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+ #: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+ #: apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50
+ #: apt-sortpkgs.1.xml:38 apt.conf.5.xml:41 apt_preferences.5.xml:36
  #: sources.list.5.xml:36
  msgid "Description"
  msgstr "Description"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:65
+ #: apt-cache.8.xml:39
  msgid ""
  "<command>apt-cache</command> performs a variety of operations on APT's "
  "package cache. <command>apt-cache</command> does not manipulate the state of "
@@@ -751,7 -785,7 +786,7 @@@ msgstr "
  "desquelles il extrait les informations intéressantes."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:70 apt-get.8.xml:120
+ #: apt-cache.8.xml:44 apt-get.8.xml:44
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given, "
  "one of the commands below must be present."
@@@ -759,30 -793,22 +794,22 @@@ msgstr "
  "À moins que l'option <option>-h</option> ou <option>--help</option> ne soit "
  "donnée, l'une des commandes suivantes doit être présente."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:74
- msgid "gencaches"
- msgstr "gencaches"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:75
+ #: apt-cache.8.xml:49
  msgid ""
- "<literal>gencaches</literal> performs the same operation as <command>apt-get "
- "check</command>. It builds the source and package caches from the sources in "
- "&sources-list; and from <filename>/var/lib/dpkg/status</filename>."
+ "<literal>gencaches</literal> creates APT's package cache. This is done "
+ "implicitly by all commands needing this cache if it is missing or outdated."
  msgstr ""
- "La commande <literal>gencaches</literal> fait la même chose que <command>apt-"
- "get check</command>. Elle construit les caches des sources et des paquets à "
- "partir des sources répertoriées dans &sources-list; et dans <filename>/var/"
- "lib/dpkg/status</filename>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:81
- msgid "showpkg <replaceable>pkg(s)</replaceable>"
- msgstr "showpkg <replaceable>paquet(s)</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+ #: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
+ #: apt-cache.8.xml:226 apt-cache.8.xml:238
+ msgid "&synopsis-pkg;"
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:82
+ #: apt-cache.8.xml:54
  msgid ""
  "<literal>showpkg</literal> displays information about the packages listed on "
  "the command line. Remaining arguments are package names. The available "
@@@ -806,7 -832,7 +833,7 @@@ msgstr "
  "résultat :"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-cache.8.xml:94
+ #: apt-cache.8.xml:66
  #, no-wrap
  msgid ""
  "Package: libreadline2\n"
@@@ -832,7 -858,7 +859,7 @@@ msgstr "
  "Reverse Provides: \n"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:106
+ #: apt-cache.8.xml:78
  msgid ""
  "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
  "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@@ -850,13 -876,8 +877,8 @@@ msgstr "
  "l'être. Pour connaître le sens de la fin de chaîne, il est préférable de "
  "consulter le code source d'APT."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:115
- msgid "stats"
- msgstr "stats"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:115
+ #: apt-cache.8.xml:87
  msgid ""
  "<literal>stats</literal> displays some statistics about the cache.  No "
  "further arguments are expected. Statistics reported are:"
@@@ -866,7 -887,7 +888,7 @@@ msgstr "
  "rapportées :"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:118
+ #: apt-cache.8.xml:90
  msgid ""
  "<literal>Total package names</literal> is the number of package names found "
  "in the cache."
@@@ -875,7 -896,7 +897,7 @@@ msgstr "
  "le cache."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:122
+ #: apt-cache.8.xml:94
  msgid ""
  "<literal>Normal packages</literal> is the number of regular, ordinary "
  "package names; these are packages that bear a one-to-one correspondence "
@@@ -888,7 -909,7 +910,7 @@@ msgstr "
  "dépendance. La majorité des paquets appartient à cette catégorie."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:128
+ #: apt-cache.8.xml:100
  msgid ""
  "<literal>Pure virtual packages</literal> is the number of packages that "
  "exist only as a virtual package name; that is, packages only \"provide\" the "
@@@ -906,7 -927,7 +928,7 @@@ msgstr "
  "n'existe aucun paquet nommé « mail-transport-agent »."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:136
+ #: apt-cache.8.xml:108
  msgid ""
  "<literal>Single virtual packages</literal> is the number of packages with "
  "only one package providing a particular virtual package. For example, in the "
@@@ -919,7 -940,7 +941,7 @@@ msgstr "
  "le paquet « xless » remplit « X11-text-viewer »."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:142
+ #: apt-cache.8.xml:114
  msgid ""
  "<literal>Mixed virtual packages</literal> is the number of packages that "
  "either provide a particular virtual package or have the virtual package name "
@@@ -932,7 -953,7 +954,7 @@@ msgstr "
  "« debconf » est un paquet réel et il est aussi fourni par « debconf-tiny »."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:149
+ #: apt-cache.8.xml:121
  msgid ""
  "<literal>Missing</literal> is the number of package names that were "
  "referenced in a dependency but were not provided by any package. Missing "
@@@ -947,7 -968,7 +969,7 @@@ msgstr "
  "Habituellement on les trouve dans les champs « Conflicts » ou « Breaks »."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:156
+ #: apt-cache.8.xml:128
  msgid ""
  "<literal>Total distinct</literal> versions is the number of package versions "
  "found in the cache; this value is therefore at least equal to the number of "
@@@ -962,7 -983,7 +984,7 @@@ msgstr "
  "considérablement plus grande que le nombre total de paquets."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:163
+ #: apt-cache.8.xml:135
  msgid ""
  "<literal>Total dependencies</literal> is the number of dependency "
  "relationships claimed by all of the packages in the cache."
@@@ -970,13 -991,8 +992,8 @@@ msgstr "
  "<literal>Total dependencies</literal> est le nombre de relations de "
  "dépendances déclarées par tous les paquets présents dans le cache."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:170
- msgid "showsrc <replaceable>pkg(s)</replaceable>"
- msgstr "showsrc <replaceable>paquet(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:171
+ #: apt-cache.8.xml:143
  msgid ""
  "<literal>showsrc</literal> displays all the source package records that "
  "match the given package names. All versions are shown, as well as all "
@@@ -986,13 -1002,8 +1003,8 @@@ msgstr "
  "correspondent aux noms donnés. Toutes les versions sont affichées et toutes "
  "les entrées qui déclarent que ces noms correspondent à des paquets binaires."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:176 apt-config.8.xml:87
- msgid "dump"
- msgstr "dump"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:177
+ #: apt-cache.8.xml:149
  msgid ""
  "<literal>dump</literal> shows a short listing of every package in the cache. "
  "It is primarily for debugging."
@@@ -1000,13 -1011,8 +1012,8 @@@ msgstr "
  "La commande <literal>dump</literal> affiche un court résumé sur chaque "
  "paquet du cache. Elle est d'abord destinée au débogage."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:181
- msgid "dumpavail"
- msgstr "dumpavail"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:182
+ #: apt-cache.8.xml:154
  msgid ""
  "<literal>dumpavail</literal> prints out an available list to stdout. This is "
  "suitable for use with &dpkg; and is used by the &dselect; method."
@@@ -1015,13 -1021,8 +1022,8 @@@ msgstr "
  "liste des paquets disponibles. Elle convient à une utilisation avec &dpkg; "
  "et la méthode &dselect; s'en sert."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:186
- msgid "unmet"
- msgstr "unmet"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:187
+ #: apt-cache.8.xml:159
  msgid ""
  "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
  "package cache."
@@@ -1029,13 -1030,8 +1031,8 @@@ msgstr "
  "La commande <literal>unmet</literal> affiche un résumé concernant toutes les "
  "dépendances absentes dans le cache de paquets."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:191
- msgid "show <replaceable>pkg(s)</replaceable>"
- msgstr "show <replaceable>paquet(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:192
+ #: apt-cache.8.xml:164
  msgid ""
  "<literal>show</literal> performs a function similar to <command>dpkg --print-"
  "avail</command>; it displays the package records for the named packages."
@@@ -1044,13 -1040,13 +1041,13 @@@ msgstr "
  "avail</command> ; elle affiche des informations sur les paquets donnés en "
  "argument."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:197
- msgid "search <replaceable>regex [ regex ... ]</replaceable>"
- msgstr "search <replaceable>expression [ expression ... ]</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:169
+ msgid "&synopsis-regex;"
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:198
+ #: apt-cache.8.xml:170
  msgid ""
  "<literal>search</literal> performs a full text search on all available "
  "package lists for the POSIX regex pattern given, see "
@@@ -1073,7 -1069,7 +1070,7 @@@ msgstr "
  "seulement dans les noms de paquets."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:211
+ #: apt-cache.8.xml:183
  msgid ""
  "Separate arguments can be used to specify multiple search patterns that are "
  "and'ed together."
@@@ -1081,13 -1077,8 +1078,8 @@@ msgstr "
  "On peut utiliser des arguments distincts pour indiquer des expressions "
  "rationnelles différentes sur lesquelles seront réalisées un « et » logique."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:215
- msgid "depends <replaceable>pkg(s)</replaceable>"
- msgstr "depends <replaceable>paquet(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:216
+ #: apt-cache.8.xml:188
  msgid ""
  "<literal>depends</literal> shows a listing of each dependency a package has "
  "and all the possible other packages that can fulfill that dependency."
@@@ -1096,13 -1087,8 +1088,8 @@@ msgstr "
  "dépendances d'un paquet et la liste de tous les paquets possibles qui "
  "satisfont ces dépendances."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:220
- msgid "rdepends <replaceable>pkg(s)</replaceable>"
- msgstr "rdepends <replaceable>paquet(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:221
+ #: apt-cache.8.xml:193
  msgid ""
  "<literal>rdepends</literal> shows a listing of each reverse dependency a "
  "package has."
@@@ -1111,12 -1097,14 +1098,14 @@@ msgstr "
  "dépendances inverses d'un paquet."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:225
- msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+ #: apt-cache.8.xml:197
+ #, fuzzy
+ #| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+ msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
  msgstr "pkgnames <replaceable>[ préfixe ]</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:226
+ #: apt-cache.8.xml:198
  msgid ""
  "This command prints the name of each package APT knows. The optional "
  "argument is a prefix match to filter the name list. The output is suitable "
@@@ -1131,7 -1119,7 +1120,7 @@@ msgstr "
  "l'option <option>--generate</option>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:231
+ #: apt-cache.8.xml:203
  msgid ""
  "Note that a package which APT knows of is not necessarily available to "
  "download, installable or installed, e.g. virtual packages are also listed in "
@@@ -1141,13 -1129,8 +1130,8 @@@ msgstr "
  "installable ou installé. Par exemple, les paquets virtuels sont également "
  "affichés dans la liste créée."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:236
- msgid "dotty <replaceable>pkg(s)</replaceable>"
- msgstr "dotty <replaceable>paquet(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:237
+ #: apt-cache.8.xml:209
  msgid ""
  "<literal>dotty</literal> takes a list of packages on the command line and "
  "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@@ -1169,7 -1152,7 +1153,7 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:246
+ #: apt-cache.8.xml:218
  msgid ""
  "The resulting nodes will have several shapes; normal packages are boxes, "
  "pure provides are triangles, mixed provides are diamonds, missing packages "
@@@ -1184,19 -1167,14 +1168,14 @@@ msgstr "
  "conflits."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:251
+ #: apt-cache.8.xml:223
  msgid "Caution, dotty cannot graph larger sets of packages."
  msgstr ""
  "Attention, dotty ne peut pas représenter des ensembles très grands de "
  "paquets."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:254
- msgid "xvcg <replaceable>pkg(s)</replaceable>"
- msgstr "xvcg <replaceable>paquet(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:255
+ #: apt-cache.8.xml:227
  msgid ""
  "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
  "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@@ -1206,12 -1184,14 +1185,14 @@@ msgstr "
  "ulink>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:259
- msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
- msgstr "policy <replaceable>[ paquet(s) ]</replaceable>"
+ #: apt-cache.8.xml:231
+ #, fuzzy
+ #| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
+ msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
+ msgstr "madison <replaceable>[ paquet(s) ]</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:260
+ #: apt-cache.8.xml:232
  msgid ""
  "<literal>policy</literal> is meant to help debug issues relating to the "
  "preferences file. With no arguments it will print out the priorities of each "
@@@ -1223,13 -1203,8 +1204,8 @@@ msgstr "
  "source. Sinon, elle affiche des informations précises sur la priorité du "
  "paquet donné en argument."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:266
- msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
- msgstr "madison <replaceable>[ paquet(s) ]</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:267
+ #: apt-cache.8.xml:239
  msgid ""
  "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
  "to mimic the output format and a subset of the functionality of the Debian "
@@@ -1248,25 -1223,15 +1224,15 @@@ msgstr "
  "Apt a lu la liste des paquets disponibles (<literal>APT::Architecture</"
  "literal>)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
- #: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
- #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+ #. type: Content of: <refentry><refsect1><title>
+ #: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+ #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+ #: apt-sortpkgs.1.xml:48
  msgid "options"
  msgstr "options"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>-p</option>"
- msgstr "<option>-p</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>--pkg-cache</option>"
- msgstr "<option>--pkg-cache</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:283
+ #: apt-cache.8.xml:255
  msgid ""
  "Select the file to store the package cache. The package cache is the primary "
  "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@@ -1276,19 -1241,8 +1242,8 @@@ msgstr "
  "cache primaire utilisé par toutes les opérations. Élément de configuration : "
  "<literal>Dir::Cache::pkgcache</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:288
- msgid "<option>--src-cache</option>"
- msgstr "<option>--src-cache</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:289
+ #: apt-cache.8.xml:261
  msgid ""
  "Select the file to store the source cache. The source is used only by "
  "<literal>gencaches</literal> and it stores a parsed version of the package "
@@@ -1303,18 -1257,8 +1258,8 @@@ msgstr "
  "d'analyser à nouveau tous les paquets. Élément de configuration : "
  "<literal>Dir::Cache::srcpkgcache</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:545 apt-get.8.xml:383
- msgid "<option>--quiet</option>"
- msgstr "<option>--quiet</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:297
+ #: apt-cache.8.xml:269
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quietness up to a maximum of 2. You can also use "
@@@ -1328,18 -1272,8 +1273,8 @@@ msgstr "
  "silence, annulant le fichier de configuration. Élément de configuration : "
  "<literal>quiet</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>-i</option>"
- msgstr "<option>-i</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>--important</option>"
- msgstr "<option>--important</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:304
+ #: apt-cache.8.xml:276
  msgid ""
  "Print only important dependencies; for use with unmet and depends. Causes "
  "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@@ -1349,48 -1283,8 +1284,8 @@@ msgstr "
  "unmet et depends pour n'afficher que les relations Depends et Pre-Depends. "
  "Élément de configuration : <literal>APT::Cache::Important</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:309
- msgid "<option>--no-pre-depends</option>"
- msgstr "<option>--no-pre-depends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:310
- msgid "<option>--no-depends</option>"
- msgstr "<option>--no-depends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:311
- msgid "<option>--no-recommends</option>"
- msgstr "<option>--no-recommends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:312
- msgid "<option>--no-suggests</option>"
- msgstr "<option>--no-suggests</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:313
- msgid "<option>--no-conflicts</option>"
- msgstr "<option>--no-conflicts</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:314
- msgid "<option>--no-breaks</option>"
- msgstr "<option>--no-breaks</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:315
- msgid "<option>--no-replaces</option>"
- msgstr "<option>--no-replaces</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:316
- msgid "<option>--no-enhances</option>"
- msgstr "<option>--no-enhances</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:317
+ #: apt-cache.8.xml:289
  #, fuzzy
  #| msgid ""
  #| "Per default the <literal>depends</literal> and <literal>rdepends</"
@@@ -1400,7 -1294,7 +1295,7 @@@
  #| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
- "print all dependencies. This can be twicked with these flags which will omit "
+ "print all dependencies. This can be tweaked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
@@@ -1411,18 -1305,8 +1306,8 @@@ msgstr "
  "configuration : <literal>APT::Cache::Show<replaceable>TypeDépendance</"
  "replaceable></literal>, p. ex. <literal>APT::Cache::ShowRecommends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
- msgid "<option>-f</option>"
- msgstr "<option>-f</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323
- msgid "<option>--full</option>"
- msgstr "<option>--full</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:324
+ #: apt-cache.8.xml:296
  msgid ""
  "Print full package records when searching.  Configuration Item: "
  "<literal>APT::Cache::ShowFull</literal>."
@@@ -1431,18 -1315,8 +1316,8 @@@ msgstr "
  "recherche. Élément de configuration : <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:583
- msgid "<option>-a</option>"
- msgstr "<option>-a</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:328
- msgid "<option>--all-versions</option>"
- msgstr "<option>--all-versions</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:329
+ #: apt-cache.8.xml:301
  msgid ""
  "Print full records for all available versions. This is the default; to turn "
  "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@@ -1459,18 -1333,8 +1334,8 @@@ msgstr "
  "seulement la commande <literal>show</literal>. Élément de configuration : "
  "<literal>APT::Cache::AllVersions</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>-g</option>"
- msgstr "<option>-g</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>--generate</option>"
- msgstr "<option>--generate</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:338
+ #: apt-cache.8.xml:310
  msgid ""
  "Perform automatic package cache regeneration, rather than use the cache as "
  "it is. This is the default; to turn it off, use <option>--no-generate</"
@@@ -1481,18 -1345,8 +1346,8 @@@ msgstr "
  "défaut), utilisez l'option <option>--no-generate</option>. Élément de "
  "configuration : <literal>APT::Cache::Generate</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343
- msgid "<option>--names-only</option>"
- msgstr "<option>--names-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343 apt-cdrom.8.xml:142
- msgid "<option>-n</option>"
- msgstr "<option>-n</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:344
+ #: apt-cache.8.xml:316
  msgid ""
  "Only search on the package names, not the long descriptions.  Configuration "
  "Item: <literal>APT::Cache::NamesOnly</literal>."
@@@ -1501,13 -1355,8 +1356,8 @@@ msgstr "
  "descriptions longues. Élément de configuration : <literal>APT::Cache::"
  "NamesOnly</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:348
- msgid "<option>--all-names</option>"
- msgstr "<option>--all-names</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:349
+ #: apt-cache.8.xml:321
  msgid ""
  "Make <literal>pkgnames</literal> print all names, including virtual packages "
  "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@@ -1517,13 -1366,8 +1367,8 @@@ msgstr "
  "noms des paquets virtuels et les dépendances manquantes. Élément de "
  "configuration : <literal>APT::Cache::AllNames</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:354
- msgid "<option>--recurse</option>"
- msgstr "<option>--recurse</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:355
+ #: apt-cache.8.xml:327
  msgid ""
  "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
  "that all packages mentioned are printed once.  Configuration Item: "
@@@ -1534,13 -1378,8 +1379,8 @@@ msgstr "
  "mentionnés. Élément de configuration : <literal>APT::Cache::RecurseDepends</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:360
- msgid "<option>--installed</option>"
- msgstr "<option>--installed</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:362
+ #: apt-cache.8.xml:334
  msgid ""
  "Limit the output of <literal>depends</literal> and <literal>rdepends</"
  "literal> to packages which are currently installed.  Configuration Item: "
@@@ -1551,46 -1390,46 +1391,46 @@@ msgstr "
  "Élément de configuration : <literal>APT::Cache::Installed</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
- #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
- #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+ #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
+ #: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+ #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
  msgid "&apt-commonoptions;"
  msgstr "&apt-commonoptions;"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
- #: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+ #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+ #: apt.conf.5.xml:1118 apt_preferences.5.xml:698
  msgid "Files"
  msgstr "Fichiers"
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:374
+ #: apt-cache.8.xml:346
  msgid "&file-sourceslist; &file-statelists;"
  msgstr "&file-sourceslist; &file-statelists;"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
- #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
- #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
- #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
- #: sources.list.5.xml:234
+ #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+ #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+ #: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+ #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
+ #: sources.list.5.xml:255
  msgid "See Also"
  msgstr "Voir aussi"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:380
+ #: apt-cache.8.xml:352
  msgid "&apt-conf;, &sources-list;, &apt-get;"
  msgstr "&apt-conf;, &sources-list;, &apt-get;."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
- #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
- #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+ #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+ #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+ #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
  msgid "Diagnostics"
  msgstr "Diagnostics"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:385
+ #: apt-cache.8.xml:357
  msgid ""
  "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -1598,42 -1437,13 +1438,13 @@@ msgstr "
  "<command>apt-cache</command> retourne zéro après un déroulement normal et le "
  "nombre décimal 100 en cas d'erreur."
  
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cdrom.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "February 2004</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "février 2004</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cdrom.8.xml:24 apt-cdrom.8.xml:31
- msgid "apt-cdrom"
- msgstr "apt-cdrom"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-cdrom.8.xml:32
  msgid "APT CDROM management utility"
  msgstr "Utilitaire de gestion des CD d'APT"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cdrom.8.xml:38
- msgid ""
- "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
- "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
- "<arg>add</arg> <arg>ident</arg> </group>"
- msgstr ""
- "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
- "<arg><option>-d=<replaceable>point de montage du CD</replaceable></option></"
- "arg> <arg><option>-o=<replaceable>option de configuration</replaceable></"
- "option></arg> <arg><option>-c=<replaceable>fichier</replaceable></option></"
- "arg> <group> <arg>add</arg> <arg>ident</arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:51
+ #: apt-cdrom.8.xml:38
  msgid ""
  "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
  "available sources. <command>apt-cdrom</command> takes care of determining "
@@@ -1646,7 -1456,7 +1457,7 @@@ msgstr "
  "gravure et de vérifier les fichiers d'index."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:58
+ #: apt-cdrom.8.xml:45
  msgid ""
  "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
  "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@@ -1657,13 -1467,8 +1468,8 @@@ msgstr "
  "chaque disque d'un ensemble de CD doit être séparément inséré et parcouru "
  "pour prendre en compte de possibles erreurs de gravure."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:68
- msgid "add"
- msgstr "add"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:69
+ #: apt-cdrom.8.xml:56
  msgid ""
  "<literal>add</literal> is used to add a new disc to the source list. It will "
  "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@@ -1678,7 -1483,7 +1484,7 @@@ msgstr "
  "titre descriptif est demandé."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:77
+ #: apt-cdrom.8.xml:64
  msgid ""
  "APT uses a CDROM ID to track which disc is currently in the drive and "
  "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@@ -1688,13 -1493,8 +1494,8 @@@ msgstr "
  "actuellement dans le lecteur et maintient une base de données de ces "
  "identifiants dans <filename>&statedir;/cdroms.list</filename>."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:84
- msgid "ident"
- msgstr "ident"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:85
+ #: apt-cdrom.8.xml:72
  msgid ""
  "A debugging tool to report the identity of the current disc as well as the "
  "stored file name"
@@@ -1703,7 -1503,7 +1504,7 @@@ msgstr "
  "le nom du fichier stocké."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:64
+ #: apt-cdrom.8.xml:51
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present.  <placeholder type=\"variablelist"
@@@ -1714,22 -1514,12 +1515,12 @@@ msgstr "
  "\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cdrom.8.xml:94 apt-key.8.xml:158
+ #: apt-cdrom.8.xml:81 apt-key.8.xml:160
  msgid "Options"
  msgstr "Options"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
- msgid "<option>-d</option>"
- msgstr "<option>-d</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98
- msgid "<option>--cdrom</option>"
- msgstr "<option>--cdrom</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:99
+ #: apt-cdrom.8.xml:86
  msgid ""
  "Mount point; specify the location to mount the cdrom. This mount point must "
  "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@@ -1740,18 -1530,8 +1531,8 @@@ msgstr "
  "correctement configuré. Élément de configuration : <literal>Acquire::cdrom::"
  "mount</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>-r</option>"
- msgstr "<option>-r</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>--rename</option>"
- msgstr "<option>--rename</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:108
+ #: apt-cdrom.8.xml:95
  msgid ""
  "Rename a disc; change the label of a disk or override the disks given label. "
  "This option will cause <command>apt-cdrom</command> to prompt for a new "
@@@ -1762,18 -1542,8 +1543,8 @@@ msgstr "
  "demander un nouveau nom à l'utilisateur. Élément de configuration : "
  "<literal>APT::CDROM::Rename</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116 apt-get.8.xml:364
- msgid "<option>-m</option>"
- msgstr "<option>-m</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116
- msgid "<option>--no-mount</option>"
- msgstr "<option>--no-mount</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:117
+ #: apt-cdrom.8.xml:104
  msgid ""
  "No mounting; prevent <command>apt-cdrom</command> from mounting and "
  "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@@ -1783,13 -1553,8 +1554,8 @@@ msgstr "
  "le point de montage. Élément de configuration : <literal >APT::CDROM::"
  "NoMount</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:124
- msgid "<option>--fast</option>"
- msgstr "<option>--fast</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:125
+ #: apt-cdrom.8.xml:112
  msgid ""
  "Fast Copy; Assume the package files are valid and do not check every "
  "package. This option should be used only if <command>apt-cdrom</command> has "
@@@ -1802,13 -1567,8 +1568,8 @@@ msgstr "
  "aucune erreur. Élément de configuration : <literal>APT::CDROM::Fast</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:134
- msgid "<option>--thorough</option>"
- msgstr "<option>--thorough</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:135
+ #: apt-cdrom.8.xml:122
  msgid ""
  "Thorough Package Scan; This option may be needed with some old Debian "
  "1.1/1.2 discs that have Package files in strange places. It takes much "
@@@ -1819,23 -1579,8 +1580,8 @@@ msgstr "
  "situés dans des endroits inhabituels. Il faudra plus de temps pour parcourir "
  "le CD mais tous les paquets seront repérés."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:143 apt-get.8.xml:395
- msgid "<option>--just-print</option>"
- msgstr "<option>--just-print</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:144 apt-get.8.xml:397
- msgid "<option>--recon</option>"
- msgstr "<option>--recon</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:145 apt-get.8.xml:398
- msgid "<option>--no-act</option>"
- msgstr "<option>--no-act</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:146
+ #: apt-cdrom.8.xml:133
  msgid ""
  "No Changes; Do not change the &sources-list; file and do not write index "
  "files. Everything is still checked however.  Configuration Item: "
@@@ -1846,12 -1591,12 +1592,12 @@@ msgstr "
  "<literal>APT::CDROM::NoAct</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:159
+ #: apt-cdrom.8.xml:146
  msgid "&apt-conf;, &apt-get;, &sources-list;"
  msgstr "&apt-conf;, &apt-get;, &sources-list;."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:164
+ #: apt-cdrom.8.xml:151
  msgid ""
  "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -1859,42 -1604,13 +1605,13 @@@ msgstr "
  "<command>apt-cdrom</command> renvoie zéro après un déroulement normal, et le "
  "nombre décimal 100 en cas d'erreur."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-config.8.xml:16 apt-extracttemplates.1.xml:16 apt-sortpkgs.1.xml:16
- #: sources.list.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
- "February 2004</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
- "février 2004</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-config.8.xml:25 apt-config.8.xml:32
- msgid "apt-config"
- msgstr "apt-config"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-config.8.xml:33
  msgid "APT Configuration Query program"
  msgstr "Programme d'interrogation de la configuration d'APT"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-config.8.xml:39
- msgid ""
- "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>shell</arg> <arg>dump</arg> </group>"
- msgstr ""
- "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
- "o=<replaceable>option de configuration</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>fichier</replaceable></option></arg> <group "
- "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:51
+ #: apt-config.8.xml:39
  msgid ""
  "<command>apt-config</command> is an internal program used by various "
  "portions of the APT suite to provide consistent configurability. It accesses "
@@@ -1908,7 -1624,7 +1625,7 @@@ msgstr "
  "apt.conf</filename>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+ #: apt-config.8.xml:44 apt-ftparchive.1.xml:54
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present."
@@@ -1916,13 -1632,8 +1633,8 @@@ msgstr "
  "À moins que l'option <option>-h</option> ou <option>--help</option> ne soit "
  "donnée, l'une des commandes suivantes doit être présente."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-config.8.xml:61
- msgid "shell"
- msgstr "shell"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:63
+ #: apt-config.8.xml:51
  msgid ""
  "shell is used to access the configuration information from a shell script. "
  "It is given pairs of arguments, the first being a shell variable and the "
@@@ -1938,7 -1649,7 +1650,7 @@@ msgstr "
  "cette commande devrait être utilisée comme suit :"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-config.8.xml:71
+ #: apt-config.8.xml:59
  #, no-wrap
  msgid ""
  "OPTS=\"-f\"\n"
@@@ -1950,7 -1661,7 +1662,7 @@@ msgstr "
  "eval $RES\n"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:76
+ #: apt-config.8.xml:64
  msgid ""
  "This will set the shell environment variable $OPTS to the value of MyApp::"
  "options with a default of <option>-f</option>."
@@@ -1959,7 -1670,7 +1671,7 @@@ msgstr "
  "MyApp::Options ou, par défaut, la valeur -f."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:80
+ #: apt-config.8.xml:68
  msgid ""
  "The configuration item may be postfixed with a /[fdbi]. f returns file "
  "names, d returns directories, b returns true or false and i returns an "
@@@ -1971,18 -1682,42 +1683,42 @@@ msgstr "
  "vérifiée."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:89
+ #: apt-config.8.xml:77
  msgid "Just show the contents of the configuration space."
  msgstr "Affiche seulement le contenu de l'espace de configuration."
  
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:90
+ msgid ""
+ "Include options which have an empty value. This is the default, so use --no-"
+ "empty to remove them from the output."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-config.8.xml:95
+ msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:96
+ msgid ""
+ "Defines the output of each config option. &percnt;t will be replaced with "
+ "the name of the option, &percnt;f with the complete optionname and &percnt;v "
+ "with the value of the option.  Use uppercase letters and special characters "
+ "in the value will be encoded to ensure that it can e.g. be savely used in a "
+ "quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
+ "by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
+ "&percnt;."
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
- #: apt-sortpkgs.1.xml:73
+ #: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
+ #: apt-sortpkgs.1.xml:64
  msgid "&apt-conf;"
  msgstr "&apt-conf;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:112
+ #: apt-config.8.xml:115
  msgid ""
  "<command>apt-config</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -1990,11 -1725,6 +1726,6 @@@ msgstr "
  "<command>apt-config</command> retourne zéro après un déroulement normal, et "
  "le nombre 100 en cas d'erreur."
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-extracttemplates.1.xml:25 apt-extracttemplates.1.xml:32
- msgid "apt-extracttemplates"
- msgstr "apt-extracttemplates"
- 
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
  msgid "1"
@@@ -2007,21 -1737,8 +1738,8 @@@ msgstr "
  "Outil d'extraction des textes et fichiers de configuration pour DebConf "
  "contenu dans un paquet Debian"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-extracttemplates.1.xml:39
- msgid ""
- "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
- "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
- "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
- "arg>"
- msgstr ""
- "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
- "<arg><option>-t=<replaceable>répertoire temporaire</replaceable></option></"
- "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>fichier</"
- "replaceable></arg>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:47
+ #: apt-extracttemplates.1.xml:39
  msgid ""
  "<command>apt-extracttemplates</command> will take one or more Debian package "
  "files as input and write out (to a temporary directory) all associated "
@@@ -2036,17 -1753,25 +1754,25 @@@ msgstr "
  "suivant :"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:52
+ #: apt-extracttemplates.1.xml:44
  msgid "package version template-file config-script"
  msgstr "paquet version guide-de-configuration script-de-configuration"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:53
+ #: apt-extracttemplates.1.xml:45
+ #, fuzzy
+ #| msgid ""
+ #| "template-file and config-script are written to the temporary directory "
+ #| "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
+ #| "TempDir</literal>)  directory, with filenames of the form "
+ #| "<filename>package.template.XXXX</filename> and <filename>package.config."
+ #| "XXXX</filename>"
  msgid ""
  "template-file and config-script are written to the temporary directory "
- "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
- "literal>)  directory, with filenames of the form <filename>package.template."
- "XXXX</filename> and <filename>package.config.XXXX</filename>"
+ "specified by the <option>-t</option> or <option>--tempdir</option> "
+ "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+ "filenames of the form <filename>package.template.XXXX</filename> and "
+ "<filename>package.config.XXXX</filename>"
  msgstr ""
  "Les scripts et guides de configuration sont écrits dans le répertoire "
  "temporaire indiqué par l'option <option>-t</option> ou <option>--tempdir</"
@@@ -2054,18 -1779,8 +1780,8 @@@
  "fichier sont de la forme <filename>package.template.XXXX</filename> ou "
  "<filename>package.config.XXXX</filename>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
- msgid "<option>-t</option>"
- msgstr "<option>-t</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63
- msgid "<option>--tempdir</option>"
- msgstr "<option>--tempdir</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-extracttemplates.1.xml:65
+ #: apt-extracttemplates.1.xml:58
  msgid ""
  "Temporary directory in which to write extracted debconf template files and "
  "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@@ -2076,7 -1791,7 +1792,7 @@@ msgstr "
  "ExtractTemplates::TempDir</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:82
+ #: apt-extracttemplates.1.xml:75
  msgid ""
  "<command>apt-extracttemplates</command> returns zero on normal operation, "
  "decimal 100 on error."
@@@ -2084,71 -1799,13 +1800,13 @@@ msgstr "
  "<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, "
  "le nombre 100 en cas d'erreur."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-ftparchive.1.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
- "August 2009</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
- "août 2009</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-ftparchive.1.xml:25 apt-ftparchive.1.xml:32
- msgid "apt-ftparchive"
- msgstr "apt-ftparchive"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-ftparchive.1.xml:33
  msgid "Utility to generate index files"
  msgstr "Outil de création de fichiers d'index"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-ftparchive.1.xml:39
- msgid ""
- "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
- "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
- "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
- "arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
- "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
- "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
- "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
- "replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
- "arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
- "arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
- "replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
- "\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
- msgstr ""
- "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg><arg> "
- "<option>--md5</option></arg><arg> <option>--delink</option></arg> "
- "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
- "arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
- "arg> <arg><option>-o <replaceable>option de configuration</"
- "replaceable>=<replaceable>chaîne</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>fichier</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>packages<arg choice=\"plain\" rep=\"repeat\"><replaceable>chemin</"
- "replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>préfixe-de-chemin</replaceable></arg></arg></"
- "arg> <arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>chemin</"
- "replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>préfixe-de-chemin</replaceable></arg></arg></"
- "arg> <arg>contents <arg choice=\"plain\"><replaceable>chemin</replaceable></"
- "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>chemin</"
- "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
- "\"><replaceable>fichier-de-configuration</replaceable></arg><arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>section</replaceable></arg></arg> "
- "<arg>clean <arg choice=\"plain\"><replaceable>fichier-de-configuration</"
- "replaceable></arg></arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:60
+ #: apt-ftparchive.1.xml:39
  msgid ""
  "<command>apt-ftparchive</command> is the command line tool that generates "
  "the index files that APT uses to access a distribution source. The index "
@@@ -2160,7 -1817,7 +1818,7 @@@ msgstr "
  "index doit être créé pour un site et basé sur le contenu de ce site."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:64
+ #: apt-ftparchive.1.xml:43
  msgid ""
  "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
  "program, incorporating its entire functionality via the <literal>packages</"
@@@ -2175,7 -1832,7 +1833,7 @@@ msgstr "
  "élaborée pour automatiser le processus de création d'une archive complète."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:70
+ #: apt-ftparchive.1.xml:49
  msgid ""
  "Internally <command>apt-ftparchive</command> can make use of binary "
  "databases to cache the contents of a .deb file and it does not rely on any "
@@@ -2189,13 -1846,8 +1847,8 @@@ msgstr "
  "vérifie les changements dans les fichiers et crée les fichiers compressés "
  "voulus."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:79
- msgid "packages"
- msgstr "packages"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:81
+ #: apt-ftparchive.1.xml:60
  msgid ""
  "The packages command generates a package file from a directory tree. It "
  "takes the given directory and recursively searches it for .deb files, "
@@@ -2209,20 -1861,15 +1862,15 @@@ msgstr "
  "équivalente à &dpkg-scanpackages;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+ #: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
  msgid ""
  "The option <option>--db</option> can be used to specify a binary caching DB."
  msgstr ""
  "On peut se servir de l'option <option>--db</option> pour demander un cache "
  "binaire."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:89
- msgid "sources"
- msgstr "sources"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:91
+ #: apt-ftparchive.1.xml:70
  msgid ""
  "The <literal>sources</literal> command generates a source index file from a "
  "directory tree.  It takes the given directory and recursively searches it "
@@@ -2236,7 -1883,7 +1884,7 @@@ msgstr "
  "équivalente à &dpkg-scansources;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:96
+ #: apt-ftparchive.1.xml:75
  msgid ""
  "If an override file is specified then a source override file will be looked "
  "for with an extension of .src. The --source-override option can be used to "
@@@ -2246,13 -1893,8 +1894,8 @@@ msgstr "
  "extension .src qui est recherché. On peut se servir de l'option --source-"
  "override pour changer de fichier source d'« override »."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:101
- msgid "contents"
- msgstr "contents"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:103
+ #: apt-ftparchive.1.xml:82
  msgid ""
  "The <literal>contents</literal> command generates a contents file from a "
  "directory tree. It takes the given directory and recursively searches it "
@@@ -2269,13 -1911,8 +1912,8 @@@ msgstr "
  "partie du résultat. Quand un fichier appartient à plusieurs paquets, une "
  "virgule sépare les paquets."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:113
- msgid "release"
- msgstr "release"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:115
+ #: apt-ftparchive.1.xml:94
  msgid ""
  "The <literal>release</literal> command generates a Release file from a "
  "directory tree. It recursively searches the given directory for uncompressed "
@@@ -2301,7 -1938,7 +1939,7 @@@ msgstr "
  "SHA1 et SHA256 pour chaque fichier."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:125
+ #: apt-ftparchive.1.xml:104
  msgid ""
  "Values for the additional metadata fields in the Release file are taken from "
  "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@@ -2321,13 -1958,8 +1959,8 @@@ msgstr "
  "<literal>Architectures</literal>, <literal>Components</literal>, "
  "<literal>Description</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:136
- msgid "generate"
- msgstr "generate"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:138
+ #: apt-ftparchive.1.xml:117
  msgid ""
  "The <literal>generate</literal> command is designed to be runnable from a "
  "cron script and builds indexes according to the given config file. The "
@@@ -2340,13 -1972,8 +1973,8 @@@ msgstr "
  "configuration donné. Le langage de configuration fournit un moyen souple de "
  "préciser index et répertoires aussi bien que les paramètres requis."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:145 apt-get.8.xml:287
- msgid "clean"
- msgstr "clean"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:147
+ #: apt-ftparchive.1.xml:126
  msgid ""
  "The <literal>clean</literal> command tidies the databases used by the given "
  "configuration file by removing any records that are no longer necessary."
@@@ -2356,12 -1983,12 +1984,12 @@@ msgstr "
  "sont plus nécessaires."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:153
+ #: apt-ftparchive.1.xml:132
  msgid "The Generate Configuration"
  msgstr "Configuration de la commande generate"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:155
+ #: apt-ftparchive.1.xml:134
  msgid ""
  "The <literal>generate</literal> command uses a configuration file to "
  "describe the archives that are going to be generated. It follows the typical "
@@@ -2378,19 -2005,19 +2006,19 @@@ msgstr "
  "arborescence. Cela n'affecte que l'usage de l'étiquette de visée (scope tag)."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:163
+ #: apt-ftparchive.1.xml:142
  msgid ""
  "The generate configuration has 4 separate sections, each described below."
  msgstr ""
  "Ce fichier de configuration possède quatre sections, décrites ci-dessous."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:165
+ #: apt-ftparchive.1.xml:144
  msgid "Dir Section"
  msgstr "La section Dir"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:167
+ #: apt-ftparchive.1.xml:146
  msgid ""
  "The <literal>Dir</literal> section defines the standard directories needed "
  "to locate the files required during the generation process. These "
@@@ -2402,13 -2029,8 +2030,8 @@@ msgstr "
  "sont précédés de chemins relatifs définis dans les sections suivantes de "
  "manière à produire un chemin absolu et complet."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:172
- msgid "ArchiveDir"
- msgstr "ArchiveDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:174
+ #: apt-ftparchive.1.xml:153
  msgid ""
  "Specifies the root of the FTP archive, in a standard Debian configuration "
  "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@@ -2418,33 -2040,18 +2041,18 @@@ msgstr "
  "classique, c'est le répertoire qui contient le fichier <filename>ls-LR</"
  "filename> et les noeuds des distributions."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:179
- msgid "OverrideDir"
- msgstr "OverrideDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:181
+ #: apt-ftparchive.1.xml:160
  msgid "Specifies the location of the override files."
  msgstr "Indique l'emplacement des fichiers d'« override »."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:184
- msgid "CacheDir"
- msgstr "CacheDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:186
+ #: apt-ftparchive.1.xml:165
  msgid "Specifies the location of the cache files"
  msgstr "Indique l'emplacement des fichiers de cache."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:189
- msgid "FileListDir"
- msgstr "FileListDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:191
+ #: apt-ftparchive.1.xml:170
  msgid ""
  "Specifies the location of the file list files, if the <literal>FileList</"
  "literal> setting is used below."
@@@ -2453,12 -2060,12 +2061,12 @@@ msgstr "
  "sert de la valeur <literal>FileList</literal> définie plus bas)."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:197
+ #: apt-ftparchive.1.xml:176
  msgid "Default Section"
  msgstr "La section Default"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:199
+ #: apt-ftparchive.1.xml:178
  msgid ""
  "The <literal>Default</literal> section specifies default values, and "
  "settings that control the operation of the generator. Other sections may "
@@@ -2468,13 -2075,8 +2076,8 @@@ msgstr "
  "paramètres qui contrôlent la marche du générateur. Ces valeurs peuvent être "
  "annulées dans d'autres sections (paramètrage par section)."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:203
- msgid "Packages::Compress"
- msgstr "Packages::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:205
+ #: apt-ftparchive.1.xml:184
  msgid ""
  "Sets the default compression schemes to use for the Package index files. It "
  "is a string that contains a space separated list of at least one of: '.' (no "
@@@ -2486,13 -2088,8 +2089,8 @@@ msgstr "
  "des valeurs suivantes : « . » (pas de compression), « gzip », « bzip2 ».  "
  "Par défaut, c'est la chaîne « . gzip »."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:211
- msgid "Packages::Extensions"
- msgstr "Packages::Extensions"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:213
+ #: apt-ftparchive.1.xml:192
  msgid ""
  "Sets the default list of file extensions that are package files.  This "
  "defaults to '.deb'."
@@@ -2500,13 -2097,8 +2098,8 @@@ msgstr "
  "Indique la liste par défaut des extensions de fichier qui constituent des "
  "paquets. Par défaut, c'est « .deb »."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:217
- msgid "Sources::Compress"
- msgstr "Sources::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:219
+ #: apt-ftparchive.1.xml:198
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Sources files."
@@@ -2514,13 -2106,8 +2107,8 @@@ msgstr "
  "Identique à <literal>Packages::Compress</literal> mais précise comment sont "
  "compressés les fichiers sources."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:223
- msgid "Sources::Extensions"
- msgstr "Sources::Extensions"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:225
+ #: apt-ftparchive.1.xml:204
  msgid ""
  "Sets the default list of file extensions that are source files.  This "
  "defaults to '.dsc'."
@@@ -2528,13 -2115,8 +2116,8 @@@ msgstr "
  "Indique la liste par défaut des extensions de fichier qui constituent des "
  "fichiers sources. Par défaut, c'est « .dsc »."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:229
- msgid "Contents::Compress"
- msgstr "Contents::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:231
+ #: apt-ftparchive.1.xml:210
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Contents files."
@@@ -2542,13 -2124,8 +2125,8 @@@ msgstr "
  "Identique à <literal>Packages::Compress</literal> mais précise comment sont "
  "compressés les fichiers « Contents »."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:235
- msgid "Translation::Compress"
- msgstr "Translation::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:237
+ #: apt-ftparchive.1.xml:216
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Translation-en master file."
@@@ -2556,13 -2133,8 +2134,8 @@@ msgstr "
  "Identique à <literal>Packages::Compress</literal> mais précise comment est "
  "compressé le fichier maître Translations-en."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:241
- msgid "DeLinkLimit"
- msgstr "DeLinkLimit"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:243
+ #: apt-ftparchive.1.xml:222
  msgid ""
  "Specifies the number of kilobytes to delink (and replace with hard links) "
  "per run. This is used in conjunction with the per-section <literal>External-"
@@@ -2572,13 -2144,8 +2145,8 @@@ msgstr "
  "dur) pour chaque exécution. On s'en sert, pour chaque section, avec le "
  "paramètre <literal>External-Links</literal>."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:248
- msgid "FileMode"
- msgstr "FileMode"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:250
+ #: apt-ftparchive.1.xml:229
  msgid ""
  "Specifies the mode of all created index files. It defaults to 0644. All "
  "index files are set to this mode with no regard to the umask."
@@@ -2587,13 -2154,8 +2155,8 @@@ msgstr "
  "c'est le mode 0644. Tous les fichiers d'index ont ce mode et le masque "
  "utilisateur (umasq) est ignoré."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
- msgid "LongDescription"
- msgstr "LongDescription"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+ #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
  msgid ""
  "Sets if long descriptions should be included in the Packages file or split "
  "out into a master Translation-en file."
@@@ -2602,12 -2164,12 +2165,12 @@@ msgstr "
  "Packages ou déplacées dans un fichier maître Translation-en."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:263
+ #: apt-ftparchive.1.xml:242
  msgid "TreeDefault Section"
  msgstr "La section TreeDefault"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:265
+ #: apt-ftparchive.1.xml:244
  msgid ""
  "Sets defaults specific to <literal>Tree</literal> sections. All of these "
  "variables are substitution variables and have the strings $(DIST), "
@@@ -2618,13 -2180,8 +2181,8 @@@ msgstr "
  "chaînes $(DIST), $(SECTION) et $(ARCH) sont remplacées par leur valeur "
  "respective."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:270
- msgid "MaxContentsChange"
- msgstr "MaxContentsChange"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:272
+ #: apt-ftparchive.1.xml:251
  msgid ""
  "Sets the number of kilobytes of contents files that are generated each day. "
  "The contents files are round-robined so that over several days they will all "
@@@ -2634,13 -2191,8 +2192,8 @@@ msgstr "
  "chaque jour. Les fichiers « Contents » sont choisis selon le système « round-"
  "robin » de manière que, sur plusieurs jours, tous soient reconstruits."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:277
- msgid "ContentsAge"
- msgstr "ContentsAge"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:279
+ #: apt-ftparchive.1.xml:258
  msgid ""
  "Controls the number of days a contents file is allowed to be checked without "
  "changing. If this limit is passed the mtime of the contents file is updated. "
@@@ -2657,13 -2209,8 +2210,8 @@@ msgstr "
  "nouveaux « .deb » seront installés, exigeant un nouveau « Contents ». Par "
  "défaut ce nombre vaut 10, l'unité étant le jour."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:288
- msgid "Directory"
- msgstr "Directory"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:290
+ #: apt-ftparchive.1.xml:269
  msgid ""
  "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
  "$(SECTION)/binary-$(ARCH)/</filename>"
@@@ -2671,13 -2218,8 +2219,8 @@@ msgstr "
  "Indique la racine de l'arborescence des « .deb ». Par défaut, c'est "
  "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:294
- msgid "SrcDirectory"
- msgstr "SrcDirectory"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:296
+ #: apt-ftparchive.1.xml:275
  msgid ""
  "Sets the top of the source package directory tree. Defaults to <filename>"
  "$(DIST)/$(SECTION)/source/</filename>"
@@@ -2685,13 -2227,8 +2228,8 @@@ msgstr "
  "Indique la racine de l'arborescence des paquets source. Par défaut, c'est "
  "<filename>$(DIST)/$(SECTION)/source/</filename>."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
- msgid "Packages"
- msgstr "Packages"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:302
+ #: apt-ftparchive.1.xml:281
  msgid ""
  "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "binary-$(ARCH)/Packages</filename>"
@@@ -2699,13 -2236,8 +2237,8 @@@ msgstr "
  "Indique le fichier « Packages » créé. Par défaut, c'est <filename>$(DIST)/"
  "$(SECTION)/binary-$(ARCH)/Packages</filename>."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
- msgid "Sources"
- msgstr "Sources"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:308
+ #: apt-ftparchive.1.xml:287
  msgid ""
  "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "source/Sources</filename>"
@@@ -2713,13 -2245,8 +2246,8 @@@ msgstr "
  "Indique le fichier « Sources » créé. Par défaut, c'est <filename>$(DIST)/"
  "$(SECTION)/source/Sources</filename>."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:312
- msgid "Translation"
- msgstr "Translation"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:314
+ #: apt-ftparchive.1.xml:293
  msgid ""
  "Set the output Translation-en master file with the long descriptions if they "
  "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@@ -2729,13 -2256,8 +2257,8 @@@ msgstr "
  "longues si elles ne sont pas incluses dans le fichier Packages. Valeur par "
  "défaut : <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:319
- msgid "InternalPrefix"
- msgstr "InternalPrefix"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:321
+ #: apt-ftparchive.1.xml:300
  msgid ""
  "Sets the path prefix that causes a symlink to be considered an internal link "
  "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@@ -2745,13 -2267,8 +2268,8 @@@ msgstr "
  "considéré comme un lien interne plutôt que comme un lien externe. Par "
  "défaut, c'est <filename>$(DIST)/$(SECTION)/</filename>."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
- msgid "Contents"
- msgstr "Contents"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:328
+ #: apt-ftparchive.1.xml:307
  msgid ""
  "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
  "</filename>. If this setting causes multiple Packages files to map onto a "
@@@ -2763,23 -2280,13 +2281,13 @@@ msgstr "
  "fichiers « Packages » se réfèrent à un seul fichier « Contents », "
  "<command>apt-ftparchive</command> les intègre automatiquement."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:335
- msgid "Contents::Header"
- msgstr "Contents::Header"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:337
+ #: apt-ftparchive.1.xml:316
  msgid "Sets header file to prepend to the contents output."
  msgstr "Indique l'en-tête à préfixer au fichier « Contents » créé."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
- msgid "BinCacheDB"
- msgstr "BinCacheDB"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:342
+ #: apt-ftparchive.1.xml:321
  msgid ""
  "Sets the binary cache database to use for this section. Multiple sections "
  "can share the same database."
@@@ -2787,13 -2294,8 +2295,8 @@@ msgstr "
  "Indique la base de données binaire servant de cache pour cette section.  "
  "Différentes sections peuvent partager cette base de données."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:346
- msgid "FileList"
- msgstr "FileList"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:348
+ #: apt-ftparchive.1.xml:327
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
@@@ -2803,13 -2305,8 +2306,8 @@@ msgstr "
  "doit lire la liste de fichiers dans le fichier donné en paramètre. Les noms "
  "relatifs sont préfixés par le répertoire de l'archive."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:353
- msgid "SourceFileList"
- msgstr "SourceFileList"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:355
+ #: apt-ftparchive.1.xml:334
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
@@@ -2822,12 -2319,12 +2320,12 @@@ msgstr "
  "traiter les index de sources."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:363
+ #: apt-ftparchive.1.xml:342
  msgid "Tree Section"
  msgstr "La section Tree"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:365
+ #: apt-ftparchive.1.xml:344
  msgid ""
  "The <literal>Tree</literal> section defines a standard Debian file tree "
  "which consists of a base directory, then multiple sections in that base "
@@@ -2841,7 -2338,7 +2339,7 @@@ msgstr "
  "par la variable de substitution <literal>Directory</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:370
+ #: apt-ftparchive.1.xml:349
  msgid ""
  "The <literal>Tree</literal> section takes a scope tag which sets the "
  "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@@ -2854,7 -2351,7 +2352,7 @@@ msgstr "
  "C'est par exemple : <filename>dists/&stable-codename;</filename>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:375
+ #: apt-ftparchive.1.xml:354
  msgid ""
  "All of the settings defined in the <literal>TreeDefault</literal> section "
  "can be use in a <literal>Tree</literal> section as well as three new "
@@@ -2865,7 -2362,7 +2363,7 @@@ msgstr "
  "trois nouvelles variables suivantes."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt-ftparchive.1.xml:381
+ #: apt-ftparchive.1.xml:360
  #, no-wrap
  msgid ""
  "for i in Sections do \n"
@@@ -2879,7 -2376,7 +2377,7 @@@ msgstr "
  "     "
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:378
+ #: apt-ftparchive.1.xml:357
  msgid ""
  "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
  "command> performs an operation similar to: <placeholder type=\"programlisting"
@@@ -2889,13 -2386,8 +2387,8 @@@ msgstr "
  "ftparchive</command> effectue une opération analogue à : <placeholder type="
  "\"programlisting\" id=\"0\"/>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:387
- msgid "Sections"
- msgstr "Sections"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:389
+ #: apt-ftparchive.1.xml:368
  msgid ""
  "This is a space separated list of sections which appear under the "
  "distribution, typically this is something like <literal>main contrib non-"
@@@ -2905,13 -2397,8 +2398,8 @@@ msgstr "
  "distribution ; classiquement, on trouve <literal>main contrib non-free</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:394
- msgid "Architectures"
- msgstr "Architectures"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:396
+ #: apt-ftparchive.1.xml:375
  msgid ""
  "This is a space separated list of all the architectures that appear under "
  "search section. The special architecture 'source' is used to indicate that "
@@@ -2921,13 -2408,8 +2409,8 @@@ msgstr "
  "appartiennent à chaque section. L'architecture spéciale « source » indique "
  "que l'arborescence est une arborescence de sources."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
- msgid "BinOverride"
- msgstr "BinOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:409
+ #: apt-ftparchive.1.xml:388
  msgid ""
  "Sets the binary override file. The override file contains section, priority "
  "and maintainer address information."
@@@ -2935,13 -2417,8 +2418,8 @@@ msgstr "
  "Indique le fichier binaire d'« override ». Ce fichier contient des "
  "informations sur la section, la priorité et le responsable du paquet."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
- msgid "SrcOverride"
- msgstr "SrcOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:415
+ #: apt-ftparchive.1.xml:394
  msgid ""
  "Sets the source override file. The override file contains section "
  "information."
@@@ -2949,33 -2426,23 +2427,23 @@@ msgstr "
  "Indique le fichier source d'« override ». Ce fichier contient des "
  "informations sur la section."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
- msgid "ExtraOverride"
- msgstr "ExtraOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+ #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
  msgid "Sets the binary extra override file."
  msgstr "Indique un autre fichier d'« override » pour les binaires."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
- msgid "SrcExtraOverride"
- msgstr "SrcExtraOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+ #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
  msgid "Sets the source extra override file."
  msgstr "Indique un autre fichier d'« override » pour les sources."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:431
+ #: apt-ftparchive.1.xml:410
  msgid "BinDirectory Section"
  msgstr "La section BinDirectory"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:433
+ #: apt-ftparchive.1.xml:412
  msgid ""
  "The <literal>bindirectory</literal> section defines a binary directory tree "
  "with no special structure. The scope tag specifies the location of the "
@@@ -2990,12 -2457,12 +2458,12 @@@ msgstr "
  "paramètrage de <literal>Section</literal><literal>Architecture</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:441
+ #: apt-ftparchive.1.xml:420
  msgid "Sets the Packages file output."
  msgstr "Définit le fichier « Packages » créé."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:446
+ #: apt-ftparchive.1.xml:425
  msgid ""
  "Sets the Sources file output. At least one of <literal>Packages</literal> or "
  "<literal>Sources</literal> is required."
@@@ -3004,52 -2471,42 +2472,42 @@@ msgstr "
  "<literal>Packages</literal> ou <literal>Sources</literal> est nécessaire."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:452
+ #: apt-ftparchive.1.xml:431
  msgid "Sets the Contents file output. (optional)"
  msgstr "Définit le fichier « Contents » créé."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:457
+ #: apt-ftparchive.1.xml:436
  msgid "Sets the binary override file."
  msgstr "Définit le fichier d'« override » pour les binaires."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:462
+ #: apt-ftparchive.1.xml:441
  msgid "Sets the source override file."
  msgstr "Définit le fichier d'« override » pour les sources."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:477
+ #: apt-ftparchive.1.xml:456
  msgid "Sets the cache DB."
  msgstr "Définit la base de données cache."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:480
- msgid "PathPrefix"
- msgstr "PathPrefix"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:482
+ #: apt-ftparchive.1.xml:461
  msgid "Appends a path to all the output paths."
  msgstr "Ajoute un chemin à tous les chemins créés."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:485
- msgid "FileList, SourceFileList"
- msgstr "FileList, SourceFileList"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:487
+ #: apt-ftparchive.1.xml:466
  msgid "Specifies the file list file."
  msgstr "Définit le fichier contenant la liste des fichiers."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:494
+ #: apt-ftparchive.1.xml:473
  msgid "The Binary Override File"
  msgstr "Le fichier d'« Override » pour les binaires."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:495
+ #: apt-ftparchive.1.xml:474
  msgid ""
  "The binary override file is fully compatible with &dpkg-scanpackages;. It "
  "contains 4 fields separated by spaces. The first field is the package name, "
@@@ -3064,19 -2521,19 +2522,19 @@@ msgstr "
  "nom du responsable de paquet."
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:501
+ #: apt-ftparchive.1.xml:480
  #, no-wrap
  msgid "old [// oldn]* => new"
  msgstr "old [// oldn]* => new"
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:503
+ #: apt-ftparchive.1.xml:482
  #, no-wrap
  msgid "new"
  msgstr "new"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:500
+ #: apt-ftparchive.1.xml:479
  msgid ""
  "The general form of the maintainer field is: <placeholder type="
  "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@@ -3093,12 -2550,12 +2551,12 @@@ msgstr "
  "deuxième forme remplace inconditionnellement le champ."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:511
+ #: apt-ftparchive.1.xml:490
  msgid "The Source Override File"
  msgstr "Le fichier d'« Override » pour les sources"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:513
+ #: apt-ftparchive.1.xml:492
  msgid ""
  "The source override file is fully compatible with &dpkg-scansources;. It "
  "contains 2 fields separated by spaces. The first fields is the source "
@@@ -3109,12 -2566,12 +2567,12 @@@ msgstr "
  "sa section."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:518
+ #: apt-ftparchive.1.xml:497
  msgid "The Extra Override File"
  msgstr "Le fichier supplémentaire d'« Override »"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:520
+ #: apt-ftparchive.1.xml:499
  msgid ""
  "The extra override file allows any arbitrary tag to be added or replaced in "
  "the output. It has 3 columns, the first is the package, the second is the "
@@@ -3125,14 -2582,8 +2583,8 @@@ msgstr "
  "représente le paquet, la seconde est une étiquette et la troisième en fin de "
  "ligne est la nouvelle valeur."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:529
- msgid ""
- "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:531
+ #: apt-ftparchive.1.xml:510
  #, fuzzy
  #| msgid ""
  #| "Values for the additional metadata fields in the Release file are taken "
@@@ -3149,10 -2600,10 +2601,10 @@@ msgid "
  "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>."
+ "<literal><replaceable>Index</replaceable></literal> can be "
+ "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+ "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+ "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
  msgstr ""
  "La valeur des autres champs de métadonnées du fichier Release sont tirées de "
  "la valeur correspondante dans <literal>APT::FTPArchive::Release</literal>, "
@@@ -3163,13 -2614,8 +2615,8 @@@
  "<literal>Architectures</literal>, <literal>Components</literal>, "
  "<literal>Description</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:541
+ #: apt-ftparchive.1.xml:521
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
  "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@@ -3179,7 -2625,7 +2626,7 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:547
+ #: apt-ftparchive.1.xml:527
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -3193,13 -2639,8 +2640,8 @@@ msgstr "
  "niveau de silence, et annuler le fichier de configuration. Élément de "
  "configuration : <literal>quiet</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:555
+ #: apt-ftparchive.1.xml:535
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
  "then this option actually enables delinking of the files. It defaults to on "
@@@ -3212,13 -2653,8 +2654,8 @@@ msgstr "
  "option>. Élément de configuration : <literal>APT::FTPArchive::DeLinkAct</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:563
+ #: apt-ftparchive.1.xml:543
  msgid ""
  "Perform contents generation. When this option is set and package indexes are "
  "being generated with a cache DB then the file listing will also be extracted "
@@@ -3233,13 -2669,8 +2670,8 @@@ msgstr "
  "la création de fichiers « Contents ». Par défaut, elle est activée. Élément "
  "de configuration : <literal>APT::FTPArchive::Contents</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:573
+ #: apt-ftparchive.1.xml:553
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@@ -3249,13 -2680,8 +2681,8 @@@ msgstr "
  "<literal>sources</literal>. Élément de configuration : <literal>APT::"
  "FTPArchive::SourceOverride</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:579
+ #: apt-ftparchive.1.xml:559
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3263,13 -2689,8 +2690,8 @@@ msgstr "
  "N'autoriser que la lecture pour les bases de données de cache. Élément de "
  "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:584
+ #: apt-ftparchive.1.xml:564
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
  "commands only package files matching <literal>*_arch.deb</literal> or "
@@@ -3282,13 -2703,8 +2704,8 @@@ msgstr "
  "tous les fichiers de paquets du chemin indiqué.Élément de configuration : "
  "<literal>APT::FTPArchive::Architecture</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:592
+ #: apt-ftparchive.1.xml:572
  msgid ""
  "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
  "packages are recompiled and/or republished with the same version again, this "
@@@ -3310,13 -2726,8 +2727,8 @@@ msgstr "
  "versions identiques. En théorie, donc, ces problème ne devraient pas "
  "survenir et l'ensemble de ces contrôles devient inutile."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:604
+ #: apt-ftparchive.1.xml:584
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
  "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@@ -3332,19 -2743,19 +2744,19 @@@ msgstr "
  "generate."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
- #: sources.list.5.xml:198
+ #: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
+ #: sources.list.5.xml:214
  msgid "Examples"
  msgstr "Exemples"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
- #: apt-ftparchive.1.xml:622
+ #: apt-ftparchive.1.xml:602
  #, no-wrap
  msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:618
+ #: apt-ftparchive.1.xml:598
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3353,7 -2764,7 +2765,7 @@@ msgstr "
  "des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:632
+ #: apt-ftparchive.1.xml:612
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -3361,116 -2772,14 +2773,14 @@@ msgstr "
  "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
  "nombre 100 en cas d'erreur."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-get.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
- "November 2008</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
- "Novembre 2008</date>"
- 
- #. type: <heading></heading>
- #: apt-get.8.xml:25 apt-get.8.xml:32 guide.sgml:96
- msgid "apt-get"
- msgstr "apt-get"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-get.8.xml:33
  msgid "APT package handling utility -- command-line interface"
  msgstr ""
  "Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-get.8.xml:39
- #, fuzzy
- #| msgid ""
- #| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- #| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
- #| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
- #| "<arg> <option>-t=</option> <arg choice='plain'> "
- #| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
- #| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
- #| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
- #| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
- #| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
- #| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
- #| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- #| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
- #| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- #| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
- #| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
- #| "<group choice='req'> <arg choice='plain'> "
- #| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
- #| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- #| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
- #| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- #| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- #| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- #| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- #| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
- #| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
- #| "help</arg> </group> </arg> </group>"
- msgid ""
- "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
- "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
- "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
- "replaceable> </arg> </arg> <group choice=\"req\"> <arg "
- "choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
- "choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
- "<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
- "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
- "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
- "arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
- "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
- "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
- "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
- "</group> </arg> </group>"
- msgstr ""
- "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- "<option>-o= <replaceable>options_de_configuration</replaceable> </option> </"
- "arg> <arg> <option>-c= <replaceable>fichier_de_configuration</replaceable> </"
- "option> </arg> <arg> <option>-t=</option> <arg choice='plain'> "
- "<replaceable>nom_version_cible</replaceable> </arg> </arg> <group choice="
- "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
- "<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
- "arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>paquet</replaceable> <arg> <group choice='req'> <arg "
- "choice='plain'> =<replaceable>numéro_version_paquet</replaceable> </arg> "
- "<arg choice='plain'> /<replaceable>nom_version_cible</replaceable> </arg> </"
- "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg "
- "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>paquet</replaceable></arg></arg> <arg choice='plain'>source "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable> <arg> "
- "<group choice='req'> <arg choice='plain'> "
- "=<replaceable>numéro_version_paquet</replaceable> </arg> <arg "
- "choice='plain'> /<replaceable>nom_version_cible</replaceable> </arg> </"
- "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg "
- "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
- "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
- "</group> </arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:115
+ #: apt-get.8.xml:39
  msgid ""
  "<command>apt-get</command> is the command-line tool for handling packages, "
  "and may be considered the user's \"back-end\" to other tools using the APT "
@@@ -3482,13 -2791,8 +2792,8 @@@ msgstr "
  "autres programmes de la bibliothèque APT.  Plusieurs interfaces utilisateur "
  "existent, comme &dselect;, &aptitude;, &synaptic; and &wajig;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:124 apt-key.8.xml:127
- msgid "update"
- msgstr "update"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:125
+ #: apt-get.8.xml:49
  msgid ""
  "<literal>update</literal> is used to resynchronize the package index files "
  "from their sources. The indexes of available packages are fetched from the "
@@@ -3512,13 -2816,8 +2817,8 @@@ msgstr "
  "progression d'ensemble peut être imprécis puisque la taille de ces fichiers "
  "ne peut être connue à l'avance."
  
- #. type: <tag></tag>
- #: apt-get.8.xml:136 guide.sgml:121
- msgid "upgrade"
- msgstr "upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:137
+ #: apt-get.8.xml:61
  msgid ""
  "<literal>upgrade</literal> is used to install the newest versions of all "
  "packages currently installed on the system from the sources enumerated in "
@@@ -3543,13 -2842,8 +2843,8 @@@ msgstr "
  "<literal>update</literal> pour que <command>apt-get</command> connaisse "
  "l'existence de nouvelles versions des paquets."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:149
- msgid "dselect-upgrade"
- msgstr "dselect-upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:150
+ #: apt-get.8.xml:74
  msgid ""
  "<literal>dselect-upgrade</literal> is used in conjunction with the "
  "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@@ -3566,13 -2860,8 +2861,8 @@@ msgstr "
  "réalisation de cet état (par exemple, suppression d'anciens paquets, "
  "installation de nouveaux paquets)."
  
- #. type: <tag></tag>
- #: apt-get.8.xml:159 guide.sgml:140
- msgid "dist-upgrade"
- msgstr "dist-upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:160
+ #: apt-get.8.xml:84
  msgid ""
  "<literal>dist-upgrade</literal> in addition to performing the function of "
  "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@@ -3594,13 -2883,8 +2884,8 @@@ msgstr "
  "sources où récupérer les paquets désirés. Voyez aussi &apt-preferences; pour "
  "un mécanisme de remplacement des paramètres généraux pour certains paquets."
  
- #. type: <tag></tag>
- #: apt-get.8.xml:172 guide.sgml:131
- msgid "install"
- msgstr "install"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:174
+ #: apt-get.8.xml:98
  msgid ""
  "<literal>install</literal> is followed by one or more packages desired for "
  "installation or upgrading.  Each package is a package name, not a fully "
@@@ -3628,7 -2912,7 +2913,7 @@@ msgstr "
  "des conflits d'apt-get."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:192
+ #: apt-get.8.xml:116
  msgid ""
  "A specific version of a package can be selected for installation by "
  "following the package name with an equals and the version of the package to "
@@@ -3645,7 -2929,7 +2930,7 @@@ msgstr "
  "unstable)."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:199
+ #: apt-get.8.xml:123
  msgid ""
  "Both of the version selection mechanisms can downgrade packages and must be "
  "used with care."
@@@ -3655,7 -2939,7 +2940,7 @@@ msgstr "
  "avec précaution."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:202
+ #: apt-get.8.xml:126
  msgid ""
  "This is also the target to use if you want to upgrade one or more already-"
  "installed packages without upgrading every package you have on your system. "
@@@ -3675,7 -2959,7 +2960,7 @@@ msgstr "
  "décrit plus haut) sera récupérée et installée."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:213
+ #: apt-get.8.xml:137
  msgid ""
  "Finally, the &apt-preferences; mechanism allows you to create an alternative "
  "installation policy for individual packages."
@@@ -3684,7 -2968,7 +2969,7 @@@ msgstr "
  "l'installation des paquets."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:217
+ #: apt-get.8.xml:141
  msgid ""
  "If no package matches the given expression and the expression contains one "
  "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@@ -3704,13 -2988,8 +2989,8 @@@ msgstr "
  "un caractère « ^ » ou un caractère « $ », une autre possibilité étant "
  "d'utiliser une expression plus précise."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:226
- msgid "remove"
- msgstr "remove"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:227
+ #: apt-get.8.xml:151
  msgid ""
  "<literal>remove</literal> is identical to <literal>install</literal> except "
  "that packages are removed instead of installed. Note the removing a package "
@@@ -3725,13 -3004,8 +3005,8 @@@ msgstr "
  "(sans espace intermédiaire) au nom du paquet, le paquet est installé au lieu "
  "d'être supprimé."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:234
- msgid "purge"
- msgstr "purge"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:235
+ #: apt-get.8.xml:159
  msgid ""
  "<literal>purge</literal> is identical to <literal>remove</literal> except "
  "that packages are removed and purged (any configuration files are deleted "
@@@ -3741,18 -3015,13 +3016,13 @@@ msgstr "
  "literal> mais les paquets indiqués sont supprimés et purgés (leurs fichiers "
  "de configuration sont également effacés)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:239
- msgid "source"
- msgstr "source"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:240
+ #: apt-get.8.xml:164
  msgid ""
  "<literal>source</literal> causes <command>apt-get</command> to fetch source "
  "packages. APT will examine the available packages to decide which source "
  "package to fetch. It will then find and download into the current directory "
- "the newest available version of that source package while respect the "
+ "the newest available version of that source package while respecting the "
  "default release, set with the option <literal>APT::Default-Release</"
  "literal>, the <option>-t</option> option or per package with the "
  "<literal>pkg/release</literal> syntax, if possible."
@@@ -3767,7 -3036,7 +3037,7 @@@ msgstr "
  "respect the default release\"\"\" me paraît douteux."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:248
+ #: apt-get.8.xml:172
  msgid ""
  "Source packages are tracked separately from binary packages via <literal>deb-"
  "src</literal> type lines in the &sources-list; file. This means that you "
@@@ -3783,7 -3052,7 +3053,7 @@@ msgstr "
  "installé ou que vous voulez installer."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:255
+ #: apt-get.8.xml:179
  #, fuzzy
  #| msgid ""
  #| "If the <option>--compile</option> option is specified then the package "
@@@ -3792,16 -3061,17 +3062,17 @@@
  #| "source package will not be unpacked."
  msgid ""
  "If the <option>--compile</option> option is specified then the package will "
- "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
- "<option>--download-only</option> is specified then the source package will "
- "not be unpacked."
+ "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+ "the architecture as defined by the <command>--host-architecture</command> "
+ "option.  If <option>--download-only</option> is specified then the source "
+ "package will not be unpacked."
  msgstr ""
  "Si l'option <option>--compile</option> est spécifiée, le paquet est compilé "
  "en un binaire .deb avec <command>dpkg-buildpackage</command>. Si <option>--"
  "download-only</option> est spécifié, le source n'est pas décompacté."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:260
+ #: apt-get.8.xml:186
  msgid ""
  "A specific source version can be retrieved by postfixing the source name "
  "with an equals and then the version to fetch, similar to the mechanism used "
@@@ -3816,7 -3086,7 +3087,7 @@@ msgstr "
  "Source</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:266
+ #: apt-get.8.xml:192
  msgid ""
  "Note that source packages are not tracked like binary packages, they exist "
  "only in the current directory and are similar to downloading source tar "
@@@ -3826,32 -3096,25 +3097,25 @@@ msgstr "
  "paquets binaires. Ils ne sont présents que dans le répertoire courant et "
  "sont semblables à des sources téléchargées sous forme d'archives tar."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:271
- msgid "build-dep"
- msgstr "build-dep"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:272
+ #: apt-get.8.xml:198
  #, fuzzy
  #| msgid ""
  #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
  #| "an attempt to satisfy the build dependencies for a source package."
  msgid ""
  "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
- "attempt to satisfy the build dependencies for a source package."
+ "attempt to satisfy the build dependencies for a source package. By default "
+ "the dependencies are satisfied to build the package natively. If desired a "
+ "host-architecture can be specified with the <option>--host-architecture</"
+ "option> option instead."
  msgstr ""
  "Avec la commande <literal>build-dep</literal>, apt-get installe ou supprime "
  "des paquets dans le but de satisfaire les dépendances de construction d'un "
  "paquet source."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:276
- msgid "check"
- msgstr "check"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:277
+ #: apt-get.8.xml:205
  msgid ""
  "<literal>check</literal> is a diagnostic tool; it updates the package cache "
  "and checks for broken dependencies."
@@@ -3859,26 -3122,21 +3123,21 @@@ msgstr "
  "La commande <literal>check</literal> est un outil de diagnostic ; il met à "
  "jour le cache des paquets et cherche les dépendances défectueuses."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:281
- msgid "download"
- msgstr "download"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:282
+ #: apt-get.8.xml:210
  #, fuzzy
  #| msgid ""
  #| "<literal>download</literal> will download the given binary package into "
  #| "the current directory."
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
- "current directoy."
+ "current directory."
  msgstr ""
  "<literal>download</literal> télécharge le fichier binaire indiqué dans le "
  "répertoire courant."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:288
+ #: apt-get.8.xml:216
  msgid ""
  "<literal>clean</literal> clears out the local repository of retrieved "
  "package files. It removes everything but the lock file from "
@@@ -3896,13 -3154,8 +3155,8 @@@ msgstr "
  "n'utilise pas dselect, il faut exécuter <literal>apt-get clean</literal> de "
  "temps en temps si l'on veut libérer de l'espace disque."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:297
- msgid "autoclean"
- msgstr "autoclean"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:298
+ #: apt-get.8.xml:226
  msgid ""
  "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
  "local repository of retrieved package files. The difference is that it only "
@@@ -3920,13 -3173,8 +3174,8 @@@ msgstr "
  "<literal>APT::Clean-Installed</literal> empêche la suppression de paquets "
  "installés."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:307
- msgid "autoremove"
- msgstr "autoremove"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:308
+ #: apt-get.8.xml:236
  #, fuzzy
  #| msgid ""
  #| "<literal>autoremove</literal> is used to remove packages that were "
@@@ -3934,27 -3182,33 +3183,33 @@@
  #| "are no more needed."
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
- "automatically installed to satisfy dependencies for some package and that "
- "are no more needed."
+ "automatically installed to satisfy dependencies for other packages and are "
+ "now no longer needed."
  msgstr ""
  "Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets "
  "installés dans le but de satisfaire les dépendances d'un paquet donné et qui "
  "ne sont plus nécessaires."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:312
- msgid "changelog"
- msgstr "changelog"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:313
+ #: apt-get.8.xml:241
+ #, fuzzy
+ #| msgid ""
+ #| "<literal>changelog</literal> downloads a package changelog and displays "
+ #| "it through <command>sensible-pager</command>. The server name and base "
+ #| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
+ #| "variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
+ #| "Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
+ #| "Ubuntu).  By default it displays the changelog for the version that is "
+ #| "installed.  However, you can specify the same options as for the "
+ #| "<option>install</option> command."
  msgid ""
  "<literal>changelog</literal> downloads a package changelog and displays it "
  "through <command>sensible-pager</command>. The server name and base "
  "directory is defined in the <literal>APT::Changelogs::Server</literal> "
- "variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
- "Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
- "Ubuntu).  By default it displays the changelog for the version that is "
+ "variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+ "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+ "changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+ "for Ubuntu).  By default it displays the changelog for the version that is "
  "installed.  However, you can specify the same options as for the "
  "<option>install</option> command."
  msgstr ""
@@@ -3968,13 -3222,8 +3223,8 @@@
  "il est possible d'utiliser les mêmes options que pour la commande "
  "<option>install</option>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:335
- msgid "<option>--no-install-recommends</option>"
- msgstr "<option>--no-install-recommends</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:336
+ #: apt-get.8.xml:264
  msgid ""
  "Do not consider recommended packages as a dependency for installing.  "
  "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@@ -3982,13 -3231,8 +3232,8 @@@ msgstr "
  "Ne pas considérer les paquets recommandés comme des dépendances à installer. "
  "Élément de configuration : <literal>APT::Install-Recommends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:340
- msgid "<option>--install-suggests</option>"
- msgstr "<option>--install-suggests</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:341
+ #: apt-get.8.xml:269
  msgid ""
  "Consider suggested packages as a dependency for installing.  Configuration "
  "Item: <literal>APT::Install-Suggests</literal>."
@@@ -3996,13 -3240,8 +3241,8 @@@ msgstr "
  "Considérer les paquets suggérés comme des dépendances à installer. Élément "
  "de configuration : <literal>APT::Install-Suggests</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:345
- msgid "<option>--download-only</option>"
- msgstr "<option>--download-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:346
+ #: apt-get.8.xml:274
  msgid ""
  "Download only; package files are only retrieved, not unpacked or installed.  "
  "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@@ -4011,13 -3250,8 +3251,8 @@@ msgstr "
  "ni installés. Élément de configuration : <literal>APT::Get::Download-Only</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:350
- msgid "<option>--fix-broken</option>"
- msgstr "<option>--fix-broken</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:351
+ #: apt-get.8.xml:279
  msgid ""
  "Fix; attempt to correct a system with broken dependencies in place. This "
  "option, when used with install/remove, can omit any packages to permit APT "
@@@ -4044,18 -3278,8 +3279,8 @@@ msgstr "
  "m</option> peut produire une erreur dans certaines situations. Élément de "
  "configuration : <literal>APT::Get::Fix-Broken</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:364
- msgid "<option>--ignore-missing</option>"
- msgstr "<option>--ignore-missing</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:365
- msgid "<option>--fix-missing</option>"
- msgstr "<option>--fix-missing</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:366
+ #: apt-get.8.xml:294
  msgid ""
  "Ignore missing packages; If packages cannot be retrieved or fail the "
  "integrity check after retrieval (corrupted package files), hold back those "
@@@ -4074,13 -3298,8 +3299,8 @@@ msgstr "
  "récupéré, il est mis silencieusement de côté. Élément de configuration : "
  "<literal>APT::Get::Fix-Missing</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:376
- msgid "<option>--no-download</option>"
- msgstr "<option>--no-download</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:377
+ #: apt-get.8.xml:305
  msgid ""
  "Disables downloading of packages. This is best used with <option>--ignore-"
  "missing</option> to force APT to use only the .debs it has already "
@@@ -4092,7 -3311,7 +3312,7 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:384
+ #: apt-get.8.xml:312
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -4113,18 -3332,8 +3333,8 @@@ msgstr "
  "option> : APT pourrait alors exécuter des actions inattendues. Élément de "
  "configuration : <literal>quiet</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:394
- msgid "<option>--simulate</option>"
- msgstr "<option>--simulate</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:396
- msgid "<option>--dry-run</option>"
- msgstr "<option>--dry-run</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:399
+ #: apt-get.8.xml:327
  msgid ""
  "No action; perform a simulation of events that would occur but do not "
  "actually change the system.  Configuration Item: <literal>APT::Get::"
@@@ -4135,7 -3344,7 +3345,7 @@@ msgstr "
  "<literal>APT::Get::Simulate</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:403
+ #: apt-get.8.xml:331
  msgid ""
  "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
  "literal>)  automatic. Also a notice will be displayed indicating that this "
@@@ -4154,7 -3363,7 +3364,7 @@@ msgstr "
  "utile qu'<literal>apt-get</literal> envoie de telles notifications)."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:409
+ #: apt-get.8.xml:337
  msgid ""
  "Simulate prints out a series of lines each one representing a dpkg "
  "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@@ -4166,23 -3375,8 +3376,8 @@@ msgstr "
  "encadrent des paquets endommagés et des crochets n'encadrant rien indiquent "
  "que les dommages n'ont aucune conséquence (rare)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>-y</option>"
- msgstr "<option>-y</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>--yes</option>"
- msgstr "<option>--yes</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:417
- msgid "<option>--assume-yes</option>"
- msgstr "<option>--assume-yes</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:418
+ #: apt-get.8.xml:346
  msgid ""
  "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
  "non-interactively. If an undesirable situation, such as changing a held "
@@@ -4197,18 -3391,21 +3392,21 @@@ msgstr "
  "essentiel, <literal>apt-get</literal> s'interrompt.  Élément de "
  "configuration : <literal>APT::Get::Assume-Yes</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>-u</option>"
- msgstr "<option>-u</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>--show-upgraded</option>"
- msgstr "<option>--show-upgraded</option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:354
+ #, fuzzy
+ #| msgid ""
+ #| "Locations to fetch packages from.  Configuration Item: <literal>Dir::Etc::"
+ #| "SourceList</literal>."
+ msgid ""
+ "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+ "Assume-No</literal>."
+ msgstr ""
+ "Emplacements où aller chercher les paquets. Élément de configuration : "
+ "<literal>Dir::Etc::SourceList</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:426
+ #: apt-get.8.xml:359
  msgid ""
  "Show upgraded packages; Print out a list of all packages that are to be "
  "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@@ -4217,18 -3414,8 +3415,8 @@@ msgstr "
  "mettre à niveau. Élément de configuration : <literal>APT::Get::Show-"
  "Upgraded</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>-V</option>"
- msgstr "<option>-V</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>--verbose-versions</option>"
- msgstr "<option>--verbose-versions</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:432
+ #: apt-get.8.xml:365
  msgid ""
  "Show full versions for upgraded and installed packages.  Configuration Item: "
  "<literal>APT::Get::Show-Versions</literal>."
@@@ -4236,23 -3423,19 +3424,19 @@@ msgstr "
  "Afficher les versions complètes des paquets installés ou mis à niveau.  "
  "Élément de configuration : <literal>APT::Get::Show-Versions</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>-b</option>"
- msgstr "<option>-b</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>--compile</option>"
- msgstr "<option>--compile</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:437
- msgid "<option>--build</option>"
- msgstr "<option>--build</option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:371
+ msgid ""
+ "This option controls the architecture packages are built for by <command>apt-"
+ "get source --compile</command> and how cross-builddependencies are "
+ "satisfied. By default is it not set which means that the host architecture "
+ "is the same as the build architecture (which is defined by <literal>APT::"
+ "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
+ "Architecture</literal>"
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:438
+ #: apt-get.8.xml:381
  msgid ""
  "Compile source packages after downloading them.  Configuration Item: "
  "<literal>APT::Get::Compile</literal>."
@@@ -4260,13 -3443,8 +3444,8 @@@ msgstr "
  "Cette commande compile un paquet source après l'avoir récupéré. Élément de "
  "configuration : <literal>APT::Get::Compile</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:442
- msgid "<option>--ignore-hold</option>"
- msgstr "<option>--ignore-hold</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:443
+ #: apt-get.8.xml:386
  msgid ""
  "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
  "hold placed on a package. This may be useful in conjunction with "
@@@ -4279,13 -3457,8 +3458,8 @@@ msgstr "
  "grand nombre de « hold » indésirables. Élément de configuration : "
  "<literal>APT::Ignore-Hold</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:449
- msgid "<option>--no-upgrade</option>"
- msgstr "<option>--no-upgrade</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:450
+ #: apt-get.8.xml:393
  msgid ""
  "Do not upgrade packages; When used in conjunction with <literal>install</"
  "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@@ -4297,17 -3470,18 +3471,18 @@@ msgstr "
  "commande d'être mis à niveau. Élément de configuration : <literal>APT::Get::"
  "Upgrade</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:456
- msgid "<option>--only-upgrade</option>"
- msgstr "<option>--only-upgrade</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:457
+ #: apt-get.8.xml:400
+ #, fuzzy
+ #| msgid ""
+ #| "Do not install new packages; When used in conjunction with "
+ #| "<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
+ #| "packages on the command line from being upgraded if they are not already "
+ #| "installed.  Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
  msgid ""
  "Do not install new packages; When used in conjunction with <literal>install</"
- "literal>, <literal>only-upgrade</literal> will prevent packages on the "
- "command line from being upgraded if they are not already installed.  "
+ "literal>, <literal>only-upgrade</literal> will install upgrades for already "
+ "installed packages only and ignore requests to install new packages.  "
  "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
  msgstr ""
  "N'install aucun nouveau paquet ; quand elle est utilisée avec "
@@@ -4316,13 -3490,8 +3491,8 @@@
  "sont pas déjà installés. Élément de configuration : <literal>APT::Get::Only-"
  "Upgrade</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:463
- msgid "<option>--force-yes</option>"
- msgstr "<option>--force-yes</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:464
+ #: apt-get.8.xml:408
  msgid ""
  "Force yes; This is a dangerous option that will cause apt to continue "
  "without prompting if it is doing something potentially harmful. It should "
@@@ -4337,13 -3506,8 +3507,8 @@@ msgstr "
  "détruire le système... Élément de configuration : <literal>APT::Get::force-"
  "yes</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:471
- msgid "<option>--print-uris</option>"
- msgstr "<option>--print-uris</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:472
+ #: apt-get.8.xml:416
  msgid ""
  "Instead of fetching the files to install their URIs are printed. Each URI "
  "will have the path, the destination file name, the size and the expected md5 "
@@@ -4364,13 -3528,8 +3529,8 @@@ msgstr "
  "décompresser les fichiers compressés. Élément de configuration : "
  "<literal>APT::Get::Print-URIs</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:482
- msgid "<option>--purge</option>"
- msgstr "<option>--purge</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:483
+ #: apt-get.8.xml:427
  msgid ""
  "Use purge instead of remove for anything that would be removed.  An asterisk "
  "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@@ -4383,13 -3542,8 +3543,8 @@@ msgstr "
  "<option>purge</option>. Élément de configuration : <literal>APT::Get::Purge</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:490
- msgid "<option>--reinstall</option>"
- msgstr "<option>--reinstall</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:491
+ #: apt-get.8.xml:435
  msgid ""
  "Re-Install packages that are already installed and at the newest version.  "
  "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@@ -4397,13 -3551,8 +3552,8 @@@ msgstr "
  "Réinstaller les paquets déjà installés avec leur version la plus récente.  "
  "Élément de configuration : <literal>APT::Get::ReInstall</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:495
- msgid "<option>--list-cleanup</option>"
- msgstr "<option>--list-cleanup</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:496
+ #: apt-get.8.xml:440
  msgid ""
  "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
  "it off. When on <command>apt-get</command> will automatically manage the "
@@@ -4420,18 -3569,8 +3570,8 @@@ msgstr "
  "sources. Élément de configuration : <literal>APT::Get::List-Cleanup</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:505
- msgid "<option>--target-release</option>"
- msgstr "<option>--target-release</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:506
- msgid "<option>--default-release</option>"
- msgstr "<option>--default-release</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:507
+ #: apt-get.8.xml:451
  msgid ""
  "This option controls the default input to the policy engine, it creates a "
  "default pin at priority 990 using the specified release string.  This "
@@@ -4452,13 -3591,8 +3592,8 @@@ msgstr "
  "<option>-t sid</option>.  Élément de configuration : <literal>APT::Default-"
  "Release</literal>.  Voyez aussi la page de manuel d'&apt-preferences;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:520
- msgid "<option>--trivial-only</option>"
- msgstr "<option>--trivial-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:522
+ #: apt-get.8.xml:466
  msgid ""
  "Only perform operations that are 'trivial'. Logically this can be considered "
  "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@@ -4471,13 -3605,8 +3606,8 @@@ msgstr "
  "trivial-only</option> répond non. Élément de configuration : <literal>APT::"
  "Get::Trivial-Only</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:528
- msgid "<option>--no-remove</option>"
- msgstr "<option>--no-remove</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:529
+ #: apt-get.8.xml:473
  msgid ""
  "If any packages are to be removed apt-get immediately aborts without "
  "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@@ -4486,13 -3615,8 +3616,8 @@@ msgstr "
  "doivent être supprimés. Élément de configuration : <literal>APT::Get::"
  "Remove</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:534
- msgid "<option>--auto-remove</option>"
- msgstr "<option>--auto-remove</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:535
+ #: apt-get.8.xml:479
  msgid ""
  "If the command is either <literal>install</literal> or <literal>remove</"
  "literal>, then this option acts like running <literal>autoremove</literal> "
@@@ -4504,13 -3628,8 +3629,8 @@@ msgstr "
  "qu'<literal>autoremove</literal> et supprime les paquets de dépendance "
  "inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:541
- msgid "<option>--only-source</option>"
- msgstr "<option>--only-source</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:542
+ #: apt-get.8.xml:486
  msgid ""
  "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
  "literal> commands.  Indicates that the given source names are not to be "
@@@ -4529,23 -3648,8 +3649,8 @@@ msgstr "
  "correspondants. Élément de configuration : <literal>APT::Get::Only-Source</"
  "literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--diff-only</option>"
- msgstr "<option>--diff-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--dsc-only</option>"
- msgstr "<option>--dsc-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--tar-only</option>"
- msgstr "<option>--tar-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:553
+ #: apt-get.8.xml:497
  msgid ""
  "Download only the diff, dsc, or tar file of a source archive.  Configuration "
  "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@@ -4556,13 -3660,8 +3661,8 @@@ msgstr "
  "<literal>APT::Get::Dsc-Only</literal> et <literal>APT::Get::Tar-Only</"
  "literal>, "
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:558
- msgid "<option>--arch-only</option>"
- msgstr "<option>--arch-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:559
+ #: apt-get.8.xml:503
  msgid ""
  "Only process architecture-dependent build-dependencies.  Configuration Item: "
  "<literal>APT::Get::Arch-Only</literal>."
@@@ -4571,13 -3670,8 +3671,8 @@@ msgstr "
  "l'architecture. Élément de configuration : <literal>APT::Get::Arch-Only</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:563
- msgid "<option>--allow-unauthenticated</option>"
- msgstr "<option>--allow-unauthenticated</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:564
+ #: apt-get.8.xml:508
  msgid ""
  "Ignore if packages can't be authenticated and don't prompt about it.  This "
  "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@@ -4589,7 -3683,7 +3684,7 @@@ msgstr "
  "AllowUnauthenticated</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-get.8.xml:577
+ #: apt-get.8.xml:521
  msgid ""
  "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
  "&file-statelists;"
@@@ -4598,7 -3692,7 +3693,7 @@@ msgstr "
  "&file-statelists;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:586
+ #: apt-get.8.xml:530
  msgid ""
  "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
  "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@@ -4609,59 -3703,21 +3704,21 @@@ msgstr "
  "« HOWTO » d'APT."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:592
+ #: apt-get.8.xml:536
  msgid ""
- "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
- "error."
- msgstr ""
- "<command>apt-get</command> renvoie zéro après une opération normale, le "
- "décimal 100 en cas d'erreur."
- 
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:595
- msgid "ORIGINAL AUTHORS"
- msgstr "AUTEURS D'ORIGINE"
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:596
- msgid "&apt-author.jgunthorpe;"
- msgstr "&apt-author.jgunthorpe;"
- 
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:599
- msgid "CURRENT AUTHORS"
- msgstr "AUTEURS ACTUELS"
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:601
- msgid "&apt-author.team;"
- msgstr "&apt-author.team;"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-key.8.xml:17 apt-key.8.xml:24
- msgid "apt-key"
- msgstr "apt-key"
+ "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
+ "error."
+ msgstr ""
+ "<command>apt-get</command> renvoie zéro après une opération normale, le "
+ "décimal 100 en cas d'erreur."
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-key.8.xml:25
+ #: apt-key.8.xml:32
  msgid "APT key management utility"
  msgstr "Utilitaire de gestion des clés d'APT"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-key.8.xml:31
- msgid ""
- "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
- "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
- "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
- "arg>"
- msgstr ""
- "<command>apt-key</command> <arg><option>--keyring <replaceable>fichier</"
- "replaceable></option></arg> <arg><replaceable>commande</replaceable></arg> "
- "<arg rep=\"repeat\"><option><replaceable>paramètres</replaceable></option></"
- "arg>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:40
+ #: apt-key.8.xml:39
  msgid ""
  "<command>apt-key</command> is used to manage the list of keys used by apt to "
  "authenticate packages.  Packages which have been authenticated using these "
@@@ -4671,83 -3727,55 +3728,55 @@@ msgstr "
  "les paquets. Les paquets authentifiés par ces clés seront réputés fiables."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-key.8.xml:46
+ #: apt-key.8.xml:45
  msgid "Commands"
  msgstr "Commandes"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:48
- msgid "add <replaceable>filename</replaceable>"
- msgstr "add <replaceable>fichier</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:52
+ #: apt-key.8.xml:50
+ #, fuzzy
+ #| msgid ""
+ #| "Add a new key to the list of trusted keys.  The key is read from "
+ #| "<replaceable>filename</replaceable>, or standard input if "
+ #| "<replaceable>filename</replaceable> is <literal>-</literal>."
  msgid ""
- "Add a new key to the list of trusted keys.  The key is read from "
- "<replaceable>filename</replaceable>, or standard input if "
- "<replaceable>filename</replaceable> is <literal>-</literal>."
+ "Add a new key to the list of trusted keys.  The key is read from the "
+ "filename given with the parameter &synopsis-param-filename; or if the "
+ "filename is <literal>-</literal> from standard input."
  msgstr ""
  "Ajouter une clé à la liste des clés fiables. La clé est lue dans "
  "<replaceable>fichier</replaceable>, ou sur l'entrée standard si "
  "<replaceable>fichier</replaceable> est <literal>-</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:60
- msgid "del <replaceable>keyid</replaceable>"
- msgstr "del <replaceable>clé</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:64
+ #: apt-key.8.xml:63
  msgid "Remove a key from the list of trusted keys."
  msgstr "Supprimer une clé de la liste des clés fiables."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:71
- msgid "export <replaceable>keyid</replaceable>"
- msgstr "export <replaceable>clé</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:75
- msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+ #: apt-key.8.xml:74
+ #, fuzzy
+ #| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+ msgid "Output the key &synopsis-param-keyid; to standard output."
  msgstr "Afficher la clé <replaceable>clé</replaceable> sur la sortie standard."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:82
- msgid "exportall"
- msgstr "exportall"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:86
+ #: apt-key.8.xml:85
  msgid "Output all trusted keys to standard output."
  msgstr "Afficher toutes les clés fiables sur la sortie standard."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:93
- msgid "list"
- msgstr "list"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:97
+ #: apt-key.8.xml:96
  msgid "List trusted keys."
  msgstr "Afficher la liste des clés fiables."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:104
- msgid "finger"
- msgstr "finger"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:108
+ #: apt-key.8.xml:107
  msgid "List fingerprints of trusted keys."
  msgstr "Afficher les empreintes des clés fiables."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:115
- msgid "adv"
- msgstr "adv"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:119
+ #: apt-key.8.xml:118
  msgid ""
  "Pass advanced options to gpg. With adv --recv-key you can download the "
  "public key."
@@@ -4756,32 -3784,28 +3785,28 @@@ msgstr "
  "possible de télécharger une clé publique."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
  msgid ""
- "Update the local keyring with the keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
+ "Update the local keyring with the archive keyring and remove from the local "
+ "keyring the archive keys which are no longer valid.  The archive keyring is "
+ "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
++"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
++"Ubuntu."
  msgstr ""
- "Mettre à jour le trousseau de clés local avec le trousseau de clés de "
- "l'archive Debian et supprimer les clés qui y sont périmées."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:140
- #, fuzzy
- #| msgid "update"
- msgid "net-update"
- msgstr "update"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:144
  msgid ""
- "Update the local keyring with the keys of a key server and removes from the "
- "keyring the archive keys which are no longer valid. This requires an "
- "installed wget and an APT build configured to have a server to fetch from. "
- "APT in Debian does not support this command, but Ubuntu's APT does."
+ "Work similar to the <command>update</command> command above, but get the "
+ "archive keyring from an URI instead and validate it against a master key.  "
+ "This requires an installed &wget; and an APT build configured to have a "
+ "server to fetch from and a master keyring to validate.  APT in Debian does "
+ "not support this command and relies on <command>update</command> instead, "
+ "but Ubuntu's APT does."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:159
+ #: apt-key.8.xml:161
  msgid ""
  "Note that options need to be defined before the commands described in the "
  "previous section."
@@@ -4789,13 -3813,8 +3814,8 @@@ msgstr "
  "Veuillez noter que les options doivent être utilisées avant les commandes "
  "décrites dans la section suivante."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:161
- msgid "--keyring <replaceable>filename</replaceable>"
- msgstr "--keyring <replaceable>fichier</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:162
+ #: apt-key.8.xml:164
  #, fuzzy
  #| msgid ""
  #| "With this option it is possible to specify a specific keyring file the "
@@@ -4808,7 -3827,7 +3828,7 @@@ msgid "
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
  "<filename>trusted.gpg</filename> file as well as on all parts in the "
- "<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</"
  "filename> is the primary keyring which means that e.g. new keys are added to "
  "this one."
  msgstr ""
@@@ -4820,99 -3839,54 +3840,63 @@@
  "les nouvelles clés y seront ajoutées."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-key.8.xml:175
+ #: apt-key.8.xml:177
  msgid "&file-trustedgpg;"
  msgstr "&file-trustedgpg;"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:177
+ #: apt-key.8.xml:179
  msgid "<filename>/etc/apt/trustdb.gpg</filename>"
  msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:178
+ #: apt-key.8.xml:180
  msgid "Local trust database of archive keys."
  msgstr "Base de données locale de fiabilité des clés de l'archive."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
++#, fuzzy
++#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
++msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:182
- msgid "Keyring of Debian archive trusted keys."
+ #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
++#, fuzzy
++#| msgid "Keyring of Debian archive trusted keys."
++msgid "Keyring of Ubuntu archive trusted keys."
  msgstr "Trousseau des clés fiables de l'archive Debian."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:185
+ #: apt-key.8.xml:187
++#, fuzzy
++#| msgid ""
++#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  msgid ""
--"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
++"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
++#, fuzzy
++#| msgid "Keyring of Debian archive removed trusted keys."
++msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:195
+ #: apt-key.8.xml:197
  msgid "&apt-get;, &apt-secure;"
  msgstr "&apt-get;, &apt-secure;"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-mark.8.xml:16
- #, fuzzy
- #| msgid ""
- #| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
- #| "August 2009</date>"
- msgid ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
- "April 2011</date>"
- msgstr ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
- "août 2009</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-mark.8.xml:25 apt-mark.8.xml:32
- msgid "apt-mark"
- msgstr "apt-mark"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-mark.8.xml:33
  msgid "mark/unmark a package as being automatically-installed"
  msgstr "Indiquer si un paquet a été installé automatiquement ou non"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-mark.8.xml:39
- #, fuzzy
- #| msgid ""
- #| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
- #| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
- #| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
- #| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
- #| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
- #| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
- msgid ""
- "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
- "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
- "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
- "\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
- "\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
- "arg> </group>"
- msgstr ""
- "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
- "f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"plain\"> "
- "<arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
- "\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg> </"
- "arg> <arg choice=\"plain\">showauto</arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:57
+ #: apt-mark.8.xml:39
  msgid ""
  "<command>apt-mark</command> will change whether a package has been marked as "
  "being automatically installed."
@@@ -4921,7 -3895,7 +3905,7 @@@ msgstr "
  "a été automatiquement installé ou pas."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:61
+ #: apt-mark.8.xml:43
  msgid ""
  "When you request that a package is installed, and as a result other packages "
  "are installed to satisfy its dependencies, the dependencies are marked as "
@@@ -4936,15 -3910,8 +3920,8 @@@ msgstr "
  "supprimés par un appel à <command>apt-get</command> ou <command>aptitude</"
  "command>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:69
- #, fuzzy
- #| msgid "markauto"
- msgid "auto"
- msgstr "markauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:70
+ #: apt-mark.8.xml:52
  #, fuzzy
  #| msgid ""
  #| "<literal>markauto</literal> is used to mark a package as being "
@@@ -4959,13 -3926,8 +3936,8 @@@ msgstr "
  "installé automatiquement. Un tel paquet sera supprimé automatiquement dès "
  "que plus aucun paquet installé manuellement ne dépend de lui."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:77
- msgid "manual"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:78
+ #: apt-mark.8.xml:60
  #, fuzzy
  #| msgid ""
  #| "<literal>unmarkauto</literal> is used to mark a package as being manually "
@@@ -4980,13 -3942,8 +3952,8 @@@ msgstr "
  "manuellement. Un tel paquet ne sera pas supprimé automatiquement, même si "
  "aucun autre paquet n'en dépend."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:85
- msgid "hold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:86
+ #: apt-mark.8.xml:68
  msgid ""
  "<literal>hold</literal> is used to mark a package as hold back, which will "
  "prevent the package from being automatically installed, upgraded or "
@@@ -4995,13 -3952,8 +3962,8 @@@
  "effected by the <option>--filename</option> option."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:95
- msgid "unhold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:96
+ #: apt-mark.8.xml:78
  #, fuzzy
  #| msgid ""
  #| "<literal>showauto</literal> is used to print a list of automatically "
@@@ -5013,13 -3965,8 +3975,8 @@@ msgstr "
  "<literal>showauto</literal>, affiche les paquets installés automatiquement, "
  "un paquet par ligne."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:101
- msgid "showauto"
- msgstr "showauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:102
+ #: apt-mark.8.xml:84
  #, fuzzy
  #| msgid ""
  #| "<literal>showauto</literal> is used to print a list of automatically "
@@@ -5033,30 -3980,16 +3990,16 @@@ msgstr "
  "<literal>showauto</literal>, affiche les paquets installés automatiquement, "
  "un paquet par ligne."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:109
- #, fuzzy
- #| msgid "showauto"
- msgid "showmanual"
- msgstr "showauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:110
+ #: apt-mark.8.xml:92
  msgid ""
  "<literal>showmanual</literal> can be used in the same way as "
  "<literal>showauto</literal> except that it will print a list of manually "
  "installed packages instead."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:116
- #, fuzzy
- #| msgid "showauto"
- msgid "showhold"
- msgstr "showauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:117
+ #: apt-mark.8.xml:99
  #, fuzzy
  #| msgid ""
  #| "<literal>showauto</literal> is used to print a list of automatically "
@@@ -5068,29 -4001,27 +4011,27 @@@ msgstr "
  "<literal>showauto</literal>, affiche les paquets installés automatiquement, "
  "un paquet par ligne."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:130
- msgid ""
- "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
- msgstr ""
- "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:131
- msgid ""
- "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
- "option>"
- msgstr ""
- "<option>--file=<filename><replaceable>FICHIER</replaceable></filename></"
- "option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+ #: apt-mark.8.xml:112 apt-mark.8.xml:113
+ #, fuzzy
+ #| msgid "xvcg <replaceable>pkg(s)</replaceable>"
+ msgid "<replaceable>&synopsis-filename;</replaceable>"
+ msgstr "xvcg <replaceable>paquet(s)</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:134
- msgid ""
- "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
- "filename> instead of the default location, which is "
- "<filename>extended_status</filename> in the directory defined by the "
- "Configuration Item: <literal>Dir::State</literal>."
+ #: apt-mark.8.xml:115
+ #, fuzzy
+ #| msgid ""
+ #| "Read/Write package stats from <filename><replaceable>FILENAME</"
+ #| "replaceable></filename> instead of the default location, which is "
+ #| "<filename>extended_status</filename> in the directory defined by the "
+ #| "Configuration Item: <literal>Dir::State</literal>."
+ msgid ""
+ "Read/Write package stats from the filename given with the parameter "
+ "<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+ "of from the default location, which is <filename>extended_status</filename> "
+ "in the directory defined by the Configuration Item: <literal>Dir::State</"
+ "literal>."
  msgstr ""
  "Lecture/écriture des statistiques d'un paquet dans "
  "<filename><replaceable>FICHIER</replaceable></filename> au lieu du fichier "
@@@ -5098,17 -4029,17 +4039,17 @@@
  "par l'élément de configuration <literal>Dir::State</literal>)."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-mark.8.xml:146
+ #: apt-mark.8.xml:128
  msgid "  &file-extended_states;"
  msgstr "  &file-extended_states;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:151
+ #: apt-mark.8.xml:133
  msgid "&apt-get;,&aptitude;,&apt-conf;"
  msgstr "&apt-get;,&aptitude;,&apt-conf;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:155
+ #: apt-mark.8.xml:137
  msgid ""
  "<command>apt-mark</command> returns zero on normal operation, non-zero on "
  "error."
@@@ -5116,18 -4047,13 +4057,13 @@@ msgstr "
  "<command>apt-mark</command> retourne zéro après un déroulement normal, et un "
  "autre chiffre en cas d'erreur."
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-secure.8.xml:17 apt-secure.8.xml:39
- msgid "apt-secure"
- msgstr "apt-secure"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-secure.8.xml:40
+ #: apt-secure.8.xml:47
  msgid "Archive authentication support for APT"
  msgstr "Gestion de l'authentification d'archive avec APT"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:45
+ #: apt-secure.8.xml:52
  msgid ""
  "Starting with version 0.6, <command>apt</command> contains code that does "
  "signature checking of the Release file for all archives. This ensures that "
@@@ -5140,7 -4066,7 +4076,7 @@@ msgstr "
  "la clé de la signature du fichier Release."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:53
+ #: apt-secure.8.xml:60
  msgid ""
  "If a package comes from a archive without a signature or with a signature "
  "that apt does not have a key for that package is considered untrusted and "
@@@ -5156,7 -4082,7 +4092,7 @@@ msgstr "
  "vérification des sources avant tout téléchargement de paquet."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:62
+ #: apt-secure.8.xml:69
  msgid ""
  "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
  "authentication feature."
@@@ -5165,12 -4091,12 +4101,12 @@@ msgstr "
  "fonction de certification."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:67
+ #: apt-secure.8.xml:74
  msgid "Trusted archives"
  msgstr "Trusted archives"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:70
+ #: apt-secure.8.xml:77
  msgid ""
  "The chain of trust from an apt archive to the end user is made up of "
  "different steps. <command>apt-secure</command> is the last step in this "
@@@ -5187,7 -4113,7 +4123,7 @@@ msgstr "
  "en sorte que l'archive soit fiable."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:78
+ #: apt-secure.8.xml:85
  msgid ""
  "apt-secure does not review signatures at a package level. If you require "
  "tools to do this you should look at <command>debsig-verify</command> and "
@@@ -5200,7 -4126,7 +4136,7 @@@ msgstr "
  "verify et devscripts."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:85
+ #: apt-secure.8.xml:92
  msgid ""
  "The chain of trust in Debian starts when a maintainer uploads a new package "
  "or a new version of a package to the Debian archive. This upload in order to "
@@@ -5218,7 -4144,7 +4154,7 @@@ msgstr "
  "l'identité des propriétaires de la clé."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:95
+ #: apt-secure.8.xml:102
  msgid ""
  "Once the uploaded package is verified and included in the archive, the "
  "maintainer signature is stripped off, an MD5 sum of the package is computed "
@@@ -5235,7 -4161,7 +4171,7 @@@ msgstr "
  "par le serveur FTP. Elle se trouve aussi dans le trousseau Debian."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:105
+ #: apt-secure.8.xml:112
  msgid ""
  "Any end user can check the signature of the Release file, extract the MD5 "
  "sum of a package from it and compare it with the MD5 sum of the package he "
@@@ -5249,7 -4175,7 +4185,7 @@@ msgstr "
  "vérifiée. Maintenant on peut vérifier aussi la signature du fichier Release."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:112
+ #: apt-secure.8.xml:119
  msgid ""
  "Notice that this is distinct from checking signatures on a per package "
  "basis. It is designed to prevent two possible attacks:"
@@@ -5258,7 -4184,7 +4194,7 @@@ msgstr "
  "paquet. Elle vise à empêcher deux types d'attaque possibles :"
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:117
+ #: apt-secure.8.xml:124
  msgid ""
  "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
  "checking, a malicious agent can introduce himself in the package download "
@@@ -5273,7 -4199,7 +4209,7 @@@ msgstr "
  "trafic vers un serveur fourbe (par usurpation d'adresses)."
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:125
+ #: apt-secure.8.xml:132
  msgid ""
  "<literal>Mirror network compromise</literal>.  Without signature checking, a "
  "malicious agent can compromise a mirror host and modify the files in it to "
@@@ -5286,7 -4212,7 +4222,7 @@@ msgstr "
  "paquets de ce miroir propagent du code malveillant."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:132
+ #: apt-secure.8.xml:139
  msgid ""
  "However, it does not defend against a compromise of the Debian master server "
  "itself (which signs the packages) or against a compromise of the key used to "
@@@ -5299,12 -4225,12 +4235,12 @@@ msgstr "
  "signature des paquets."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:138
+ #: apt-secure.8.xml:145
  msgid "User configuration"
  msgstr "Configuration utilisateur"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:140
+ #: apt-secure.8.xml:147
  msgid ""
  "<command>apt-key</command> is the program that manages the list of keys used "
  "by apt. It can be used to add or remove keys although an installation of "
@@@ -5317,7 -4243,7 +4253,7 @@@ msgstr "
  "Debian et les différents répertoires de paquets."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:147
+ #: apt-secure.8.xml:154
  msgid ""
  "In order to add a new key you need to first download it (you should make "
  "sure you are using a trusted communication channel when retrieving it), add "
@@@ -5334,12 -4260,12 +4270,12 @@@ msgstr "
  "l'archive que vous avez configurée."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:156
+ #: apt-secure.8.xml:163
  msgid "Archive configuration"
  msgstr "Configuration d'une archive"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:158
+ #: apt-secure.8.xml:165
  msgid ""
  "If you want to provide archive signatures in an archive under your "
  "maintenance you have to:"
@@@ -5348,7 -4274,7 +4284,7 @@@ msgstr "
  "devez :"
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:163
+ #: apt-secure.8.xml:170
  msgid ""
  "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
  "already. You can do this by running <command>apt-ftparchive release</"
@@@ -5359,7 -4285,7 +4295,7 @@@ msgstr "
  "ftparchive release</command> (fournie dans le paquet apt-utils)."
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:168
+ #: apt-secure.8.xml:175
  msgid ""
  "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
  "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@@ -5370,7 -4296,7 +4306,7 @@@ msgstr "
  "command>."
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:172
+ #: apt-secure.8.xml:179
  msgid ""
  "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
  "know what key they need to import in order to authenticate the files in the "
@@@ -5381,7 -4307,7 +4317,7 @@@ msgstr "
  "authentifier les fichiers de l'archive."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:179
+ #: apt-secure.8.xml:186
  msgid ""
  "Whenever the contents of the archive changes (new packages are added or "
  "removed) the archive maintainer has to follow the first two steps previously "
@@@ -5391,7 -4317,7 +4327,7 @@@ msgstr "
  "les deux premières étapes."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:187
+ #: apt-secure.8.xml:194
  msgid ""
  "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
  "&debsign; &debsig-verify;, &gpg;"
@@@ -5400,14 -4326,22 +4336,22 @@@ msgstr "
  "&debsign; &debsig-verify;, &gpg;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:191
+ #: apt-secure.8.xml:198
+ #, fuzzy
+ #| msgid ""
+ #| "For more background information you might want to review the <ulink url="
+ #| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
+ #| "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
+ #| "Manual (available also in the harden-doc package) and the <ulink url="
+ #| "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
+ #| "Distribution HOWTO</ulink> by V. Alex Brennen."
  msgid ""
  "For more background information you might want to review the <ulink url="
- "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
- "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
- "Manual (available also in the harden-doc package) and the <ulink url="
- "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
- "Distribution HOWTO</ulink> by V. Alex Brennen."
+ "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+ "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+ "(available also in the harden-doc package) and the <ulink url=\"http://www."
+ "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
+ "ulink> by V. Alex Brennen."
  msgstr ""
  "Pour des informations plus complètes, vous pouvez consulter <ulink url="
  "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html\"> "
@@@ -5417,12 -4351,12 +4361,12 @@@
  "Distribution HOWTO</ulink> par V. Alex Brennen."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:204
+ #: apt-secure.8.xml:211
  msgid "Manpage Authors"
  msgstr "Auteurs des pages de manuel"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:206
+ #: apt-secure.8.xml:213
  msgid ""
  "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
  "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@@ -5430,31 -4364,13 +4374,13 @@@ msgstr "
  "Cette page a été écrite à partir des travaux de Javier Fernández-Sanguino "
  "Peña, Isaac Jones, Colin Walters, Florian Weimer et Michael Vogt."
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-sortpkgs.1.xml:25 apt-sortpkgs.1.xml:32
- msgid "apt-sortpkgs"
- msgstr "apt-sortpkgs"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-sortpkgs.1.xml:33
  msgid "Utility to sort package index files"
  msgstr "Outil de tri des index de paquets."
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-sortpkgs.1.xml:39
- msgid ""
- "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
- msgstr ""
- "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
- "<arg><option>-o=<replaceable>option de configuration</replaceable></option></"
- "arg> <arg><option>-c=<replaceable>fichier</replaceable></option></arg> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>fichier</replaceable></arg>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:48
+ #: apt-sortpkgs.1.xml:39
  msgid ""
  "<command>apt-sortpkgs</command> will take an index file (Source index or "
  "Package index) and sort the records so that they are ordered by the package "
@@@ -5467,19 -4383,14 +4393,14 @@@ msgstr "
  "internes."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:54
+ #: apt-sortpkgs.1.xml:45
  msgid "All output is sent to stdout, the input must be a seekable file."
  msgstr ""
  "Le résultat est envoyé sur la sortie standard ; l'entrée doit être un "
  "fichier analysable."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-sortpkgs.1.xml:61
- msgid "<option>--source</option>"
- msgstr "<option>--source</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-sortpkgs.1.xml:63
+ #: apt-sortpkgs.1.xml:54
  msgid ""
  "Use Source index field ordering.  Configuration Item: <literal>APT::"
  "SortPkgs::Source</literal>."
@@@ -5488,7 -4399,7 +4409,7 @@@ msgstr "
  "configuration : <literal>APT::SortPkgs::Source</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:77
+ #: apt-sortpkgs.1.xml:68
  msgid ""
  "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -5496,37 -4407,28 +4417,28 @@@ msgstr "
  "<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 "
  "en cas d'erreur."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt.conf.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
- "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
- "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
- "&apt-product; <date>16 January 2010</date>"
+ #. type: Content of: <refentry><refentryinfo><author><contrib>
+ #: apt.conf.5.xml:20
+ msgid "Initial documentation of Debug::*."
  msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
- "firstname> <surname>Burrows</surname> <contrib>Documentation d'origine de "
- "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
- "&apt-product; <date>16 janvier 2010</date>"
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt.conf.5.xml:31 apt.conf.5.xml:38
- msgid "apt.conf"
- msgstr "apt.conf"
+ #. type: Content of: <refentry><refentryinfo><author><email>
+ #: apt.conf.5.xml:21
+ msgid "dburrows@debian.org"
+ msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
- #: apt.conf.5.xml:32 apt_preferences.5.xml:25 sources.list.5.xml:26
+ #: apt.conf.5.xml:31 apt_preferences.5.xml:25 sources.list.5.xml:26
  msgid "5"
  msgstr "5"
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt.conf.5.xml:39
+ #: apt.conf.5.xml:38
  msgid "Configuration file for APT"
  msgstr "Fichier de configuration pour APT"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:43
+ #: apt.conf.5.xml:42
  msgid ""
  "<filename>apt.conf</filename> is the main configuration file for the APT "
  "suite of tools, but by far not the only place changes to options can be "
@@@ -5541,7 -4443,7 +4453,7 @@@ msgstr "
  "d'utilisation uniforme."
  
  #. type: Content of: <refentry><refsect1><orderedlist><para>
- #: apt.conf.5.xml:48
+ #: apt.conf.5.xml:47
  msgid ""
  "When an APT tool starts up it will read the configuration files in the "
  "following order:"
@@@ -5550,7 -4452,7 +4462,7 @@@ msgstr "
  "configuration dans l'ordre suivant :"
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:50
+ #: apt.conf.5.xml:49
  msgid ""
  "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
  "any)"
@@@ -5559,7 -4461,7 +4471,7 @@@ msgstr "
  "elle existe"
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:52
+ #: apt.conf.5.xml:51
  #, fuzzy
  #| msgid ""
  #| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
@@@ -5571,11 -4473,12 +4483,12 @@@
  #| "be silently ignored."
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
- "order which have no or \"<literal>conf</literal>\" as filename extension and "
- "which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
- "characters.  Otherwise APT will print a notice that it has ignored a file if "
- "the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
- "literal> configuration list - in this case it will be silently ignored."
+ "order which have either no or \"<literal>conf</literal>\" as filename "
+ "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+ "and period (.) characters.  Otherwise APT will print a notice that it has "
+ "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+ "Ignore-Files-Silently</literal> configuration list - in this case it will be "
+ "silently ignored."
  msgstr ""
  "tous les fichiers de <literal>Dir::Etc::Parts</literal> dans l'ordre "
  "alphanumérique ascendant qui ont soit l'extension \"<literal>conf</literal>"
@@@ -5588,14 -4491,14 +4501,14 @@@
  "configuration étant, eux, ignorés silencieusemennt)."
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:59
+ #: apt.conf.5.xml:58
  msgid ""
  "the main configuration file specified by <literal>Dir::Etc::main</literal>"
  msgstr ""
  "le fichier de configuration défini par <literal>Dir::Etc::Main</literal>"
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:61
+ #: apt.conf.5.xml:60
  msgid ""
  "the command line options are applied to override the configuration "
  "directives or to load even more configuration files."
@@@ -5605,12 -4508,12 +4518,12 @@@ msgstr "
  "configuration."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:65
+ #: apt.conf.5.xml:64
  msgid "Syntax"
  msgstr "Syntaxe"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:66
+ #: apt.conf.5.xml:65
  msgid ""
  "The configuration file is organized in a tree with options organized into "
  "functional groups. Option specification is given with a double colon "
@@@ -5625,7 -4528,7 +4538,7 @@@ msgstr "
  "Get. Il n'y a pas d'héritage des options des groupes parents."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:72
+ #: apt.conf.5.xml:71
  msgid ""
  "Syntactically the configuration language is modeled after what the ISC tools "
  "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@@ -5655,7 -4558,7 +4568,7 @@@ msgstr "
  "avec des accolades, comme suit :"
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:86
+ #: apt.conf.5.xml:85
  #, no-wrap
  msgid ""
  "APT {\n"
@@@ -5673,7 -4576,7 +4586,7 @@@ msgstr "
  "};\n"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:94
+ #: apt.conf.5.xml:93
  msgid ""
  "with newlines placed to make it more readable. Lists can be created by "
  "opening a scope and including a single string enclosed in quotes followed by "
@@@ -5684,13 -4587,13 +4597,13 @@@ msgstr "
  "guillemets suivie d'un point virgule pour chaque élément de la liste."
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:99
+ #: apt.conf.5.xml:98
  #, no-wrap
  msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
  msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:102
+ #: apt.conf.5.xml:101
  msgid ""
  "In general the sample configuration file in <filename>&docdir;examples/apt."
  "conf</filename> &configureindex; is a good guide for how it should look."
@@@ -5700,7 -4603,7 +4613,7 @@@ msgstr "
  "configuration."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:106
+ #: apt.conf.5.xml:105
  msgid ""
  "The names of the configuration items are not case-sensitive. So in the "
  "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@@ -5710,7 -4613,7 +4623,7 @@@ msgstr "
  "<literal>dpkg::pre-install-pkgs</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:109
+ #: apt.conf.5.xml:108
  msgid ""
  "Names for the configuration items are optional if a list is defined as it "
  "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@@ -5726,7 -4629,7 +4639,7 @@@ msgstr "
  "réaffectant une valeur."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:114
+ #: apt.conf.5.xml:113
  msgid ""
  "Two specials are allowed, <literal>#include</literal> (which is deprecated "
  "and not supported by alternative implementations) and <literal>#clear</"
@@@ -5746,7 -4649,7 +4659,7 @@@ msgstr "
  "également se terminer avec un point-virgule."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:122
+ #: apt.conf.5.xml:121
  msgid ""
  "The #clear command is the only way to delete a list or a complete scope.  "
  "Reopening a scope or the ::-style described below will <emphasis>not</"
@@@ -5762,13 -4665,21 +4675,21 @@@ msgstr "
  "remplacés mais seulement effacés."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:127
+ #: apt.conf.5.xml:126
+ #, fuzzy
+ #| msgid ""
+ #| "All of the APT tools take a -o option which allows an arbitrary "
+ #| "configuration directive to be specified on the command line. The syntax "
+ #| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
+ #| "instance) followed by an equals sign then the new value of the option. "
+ #| "Lists can be appended too by adding a trailing :: to the list name. (As "
+ #| "you might suspect: The scope syntax can't be used on the command line.)"
  msgid ""
  "All of the APT tools take a -o option which allows an arbitrary "
  "configuration directive to be specified on the command line. The syntax is a "
  "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
- "followed by an equals sign then the new value of the option. Lists can be "
- "appended too by adding a trailing :: to the list name. (As you might "
+ "followed by an equals sign then the new value of the option. To append a new "
+ "element to a list, add a trailing :: to the name of the list. (As you might "
  "suspect: The scope syntax can't be used on the command line.)"
  msgstr ""
  "Tous les outils d'APT possèdent une option <option>-o</option> qui permet de "
@@@ -5780,12 -4691,26 +4701,26 @@@
  "ne peut pas être indiquée à la ligne de commande."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:134
+ #: apt.conf.5.xml:133
+ #, fuzzy
+ #| msgid ""
+ #| "Note that you can use :: only for appending one item per line to a list "
+ #| "and that you should not use it in combination with the scope syntax.  "
+ #| "(The scope syntax implicit insert ::) Using both syntaxes together will "
+ #| "trigger a bug which some users unfortunately relay on: An option with the "
+ #| "unusual name \"<literal>::</literal>\" which acts like every other option "
+ #| "with a name. These introduces many problems including that a user who "
+ #| "writes multiple lines in this <emphasis>wrong</emphasis> syntax in the "
+ #| "hope to append to a list will gain the opposite as only the last "
+ #| "assignment for this option \"<literal>::</literal>\" will be used. "
+ #| "Upcoming APT versions will raise errors and will stop working if they "
+ #| "encounter this misuse, so please correct such statements now as long as "
+ #| "APT doesn't complain explicit about them."
  msgid ""
  "Note that you can use :: only for appending one item per line to a list and "
  "that you should not use it in combination with the scope syntax.  (The scope "
  "syntax implicit insert ::) Using both syntaxes together will trigger a bug "
- "which some users unfortunately relay on: An option with the unusual name "
+ "which some users unfortunately depend on: An option with the unusual name "
  "\"<literal>::</literal>\" which acts like every other option with a name. "
  "These introduces many problems including that a user who writes multiple "
  "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
@@@ -5811,12 -4736,12 +4746,12 @@@ msgstr "
  "tant qu'APT ne s'en plaint pas explicitement."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:146
+ #: apt.conf.5.xml:145
  msgid "The APT Group"
  msgstr "Le groupe APT"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:147
+ #: apt.conf.5.xml:146
  msgid ""
  "This group of options controls general APT behavior as well as holding the "
  "options for all of the tools."
@@@ -5824,13 -4749,8 +4759,8 @@@ msgstr "
  "Ce groupe d'options contrôle le comportement global d'APT et contient "
  "également des options communes à tous les outils."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:151
- msgid "Architecture"
- msgstr "Architecture"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:152
+ #: apt.conf.5.xml:151
  msgid ""
  "System Architecture; sets the architecture to use when fetching files and "
  "parsing package lists. The internal default is the architecture apt was "
@@@ -5840,13 -4760,21 +4770,21 @@@ msgstr "
  "utiliser pour récupérer des fichiers et analyser des listes de paquets. La "
  "valeur interne par défaut est l'architecture pour laquelle APT a été compilé."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:157
- msgid "Default-Release"
- msgstr "Default-Release"
+ msgid ""
+ "All Architectures the system supports. Processors implementing the "
+ "<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
+ "set are e.g. also able to execute binaries compiled for the <literal>i386</"
+ "literal> (<literal>x86</literal>) instruction set; This list is use when "
+ "fetching files and parsing package lists. The internal default is always the "
+ "native architecture (<literal>APT::Architecture</literal>)  and all foreign "
+ "architectures it can retrieve by calling <command>dpkg --print-foreign-"
+ "architectures</command>."
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:158
+ #: apt.conf.5.xml:167
  msgid ""
  "Default release to install packages from if more than one version available. "
  "Contains release name, codename or release version. Examples: 'stable', "
@@@ -5859,13 -4787,8 +4797,8 @@@ msgstr "
  "« &stable-codename; », « &testing-codename; », « 4.0 », « 5.0* ». Voir aussi "
  "&apt-preferences;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:163
- msgid "Ignore-Hold"
- msgstr "Ignore-Hold"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:164
+ #: apt.conf.5.xml:173
  msgid ""
  "Ignore Held packages; This global option causes the problem resolver to "
  "ignore held packages in its decision making."
@@@ -5874,13 -4797,8 +4807,8 @@@ msgstr "
  "résolution de ne pas tenir compte des paquets « gelés » dans sa prise de "
  "décision."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:168
- msgid "Clean-Installed"
- msgstr "Clean-Installed"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:169
+ #: apt.conf.5.xml:178
  msgid ""
  "Defaults to on. When turned on the autoclean feature will remove any "
  "packages which can no longer be downloaded from the cache. If turned off "
@@@ -5893,13 -4811,8 +4821,8 @@@ msgstr "
  "sont aussi exclus du nettoyage - mais notez que APT ne fournit aucun moyen "
  "direct pour les réinstaller."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:175
- msgid "Immediate-Configure"
- msgstr "Immediate-Configure"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:176
+ #: apt.conf.5.xml:185
  msgid ""
  "Defaults to on which will cause APT to install essential and important "
  "packages as fast as possible in the install/upgrade operation. This is done "
@@@ -5962,13 -4875,8 +4885,8 @@@ msgstr "
  "type de problème dans le système de suivi de bogues de la distribution "
  "utilisée afin qu'il soit étudié et corrigé."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:198
- msgid "Force-LoopBreak"
- msgstr "Force-LoopBreak"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:199
+ #: apt.conf.5.xml:208
  msgid ""
  "Never Enable this option unless you -really- know what you are doing. It "
  "permits APT to temporarily remove an essential package to break a Conflicts/"
@@@ -5985,29 -4893,42 +4903,42 @@@ msgstr "
  "si les paquets essentiels ne sont pas tar, gzip, libc, dpkg, bash ou tous "
  "les paquets dont ces paquets dépendent."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:207
- msgid "Cache-Start, Cache-Grow and Cache-Limit"
- msgstr "Cache-Start, Cache-Grow et Cache-Limit"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:208
+ #: apt.conf.5.xml:217
+ #, fuzzy
+ #| msgid ""
+ #| "APT uses since version 0.7.26 a resizable memory mapped cache file to "
+ #| "store the 'available' information. <literal>Cache-Start</literal> acts as "
+ #| "a hint to which size the Cache will grow and is therefore the amount of "
+ #| "memory APT will request at startup. The default value is 20971520 bytes "
+ #| "(~20 MB). Note that these amount of space need to be available for APT "
+ #| "otherwise it will likely fail ungracefully, so for memory restricted "
+ #| "devices these value should be lowered while on systems with a lot of "
+ #| "configured sources this might be increased.  <literal>Cache-Grow</"
+ #| "literal> defines in byte with the default of 1048576 (~1 MB) how much the "
+ #| "Cache size will be increased in the event the space defined by "
+ #| "<literal>Cache-Start</literal> is not enough. These value will be applied "
+ #| "again and again until either the cache is big enough to store all "
+ #| "information or the size of the cache reaches the <literal>Cache-Limit</"
+ #| "literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
+ #| "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
+ #| "automatic grow of the cache is disabled."
  msgid ""
  "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
  "the 'available' information. <literal>Cache-Start</literal> acts as a hint "
  "to which size the Cache will grow and is therefore the amount of memory APT "
  "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
- "that these amount of space need to be available for APT otherwise it will "
- "likely fail ungracefully, so for memory restricted devices these value "
- "should be lowered while on systems with a lot of configured sources this "
- "might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
- "default of 1048576 (~1 MB) how much the Cache size will be increased in the "
- "event the space defined by <literal>Cache-Start</literal> is not enough. "
- "These value will be applied again and again until either the cache is big "
- "enough to store all information or the size of the cache reaches the "
- "<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
- "literal> is 0 which stands for no limit.  If <literal>Cache-Grow</literal> "
- "is set to 0 the automatic grow of the cache is disabled."
+ "that this amount of space needs to be available for APT otherwise it will "
+ "likely fail ungracefully, so for memory restricted devices this value should "
+ "be lowered while on systems with a lot of configured sources it should be "
+ "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
+ "of 1048576 (~1 MB) how much the Cache size will be increased in the event "
+ "the space defined by <literal>Cache-Start</literal> is not enough. These "
+ "value will be applied again and again until either the cache is big enough "
+ "to store all information or the size of the cache reaches the <literal>Cache-"
+ "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
+ "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
+ "automatic grow of the cache is disabled."
  msgstr ""
  "À partir de la version 0.7.26, APT utilise un fichier de cache de taille "
  "variable indexé en mémoire (« resizable memory mapped cache file ») pour "
@@@ -6030,25 -4951,15 +4961,15 @@@
  "la taille maximale du cache). Si <literal>Cache-Grow</literal> est égal à 0, "
  "l'augmentation automatique de la taille du cache est désactivée."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:223
- msgid "Build-Essential"
- msgstr "Build-Essential"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:224
+ #: apt.conf.5.xml:233
  msgid "Defines which package(s) are considered essential build dependencies."
  msgstr ""
  "Cette option définit les paquets qui sont considérés comme faisant partie "
  "des dépendances essentielles pour la construction de paquets."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:227
- msgid "Get"
- msgstr "Get"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:228
+ #: apt.conf.5.xml:237
  msgid ""
  "The Get subsection controls the &apt-get; tool, please see its documentation "
  "for more information about the options here."
@@@ -6057,13 -4968,8 +4978,8 @@@ msgstr "
  "consulter sa documentation pour avoir plus d'informations sur les options en "
  "question."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:232
- msgid "Cache"
- msgstr "Cache"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:233
+ #: apt.conf.5.xml:242
  msgid ""
  "The Cache subsection controls the &apt-cache; tool, please see its "
  "documentation for more information about the options here."
@@@ -6072,13 -4978,8 +4988,8 @@@ msgstr "
  "veuillez consulter sa documentation pour avoir plus d'informations sur les "
  "options en question."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:237
- msgid "CDROM"
- msgstr "CDROM"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:238
+ #: apt.conf.5.xml:247
  msgid ""
  "The CDROM subsection controls the &apt-cdrom; tool, please see its "
  "documentation for more information about the options here."
@@@ -6088,17 -4989,12 +4999,12 @@@ msgstr "
  "options en question."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:244
+ #: apt.conf.5.xml:253
  msgid "The Acquire Group"
  msgstr "Le groupe Acquire"
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:249
- msgid "Check-Valid-Until"
- msgstr "Check-Valid-Until"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:250
+ #: apt.conf.5.xml:259
  msgid ""
  "Security related option defaulting to true as an expiring validation for a "
  "Release file prevents longtime replay attacks and can e.g. also help users "
@@@ -6117,13 -5013,8 +5023,8 @@@ msgstr "
  "Cependant, si cet en-tête est absent, la valeur du paramètre <literal>Max-"
  "ValidTime</literal> est alors utilisée."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:260
- msgid "Max-ValidTime"
- msgstr "Max-ValidTime"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:261
+ #: apt.conf.5.xml:270
  #, fuzzy
  #| msgid ""
  #| "Seconds the Release file should be considered valid after it was created. "
@@@ -6136,15 -5027,12 +5037,12 @@@
  #| "of the two. Archive specific settings can be made by appending the label "
  #| "of the archive to the option name."
  msgid ""
- "Seconds the Release file should be considered valid after it was created. "
- "The default is \"for ever\" (0) if the Release file of the archive doesn't "
- "include a <literal>Valid-Until</literal> header.  If it does then this date "
- "is the default. The date from the Release file or the date specified by the "
- "creation time of the Release file (<literal>Date</literal> header) plus the "
- "seconds specified with this options are used to check if the validation of a "
- "file has expired by using the earlier date of the two. Archive specific "
- "settings can be made by appending the label of the archive to the option "
- "name."
+ "Seconds the Release file should be considered valid after it was created "
+ "(indicated by the <literal>Date</literal> header).  If the Release file "
+ "itself includes a <literal>Valid-Until</literal> header the earlier date of "
+ "the two is used as the expiration date.  The default value is <literal>0</"
+ "literal> which stands for \"for ever valid\".  Archive specific settings can "
+ "be made by appending the label of the archive to the option name."
  msgstr ""
  "Durée (en secondes) pendant laquelle un fichier Release est considéré comme "
  "valable, à partir du moment de sa création. La valeur par défaut est 0 "
@@@ -6157,13 -5045,40 +5055,40 @@@
  "obsolète ou pas. Un réglage spécifique pour une archive donnée peut être "
  "défini en ajoutant l'étiquette de l'archive au nom de l'option."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:273
- msgid "PDiffs"
- msgstr "PDiffs"
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:281
+ #, fuzzy
+ #| msgid ""
+ #| "Seconds the Release file should be considered valid after it was created. "
+ #| "The default is \"for ever\" (0) if the Release file of the archive "
+ #| "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+ #| "this date is the default. The date from the Release file or the date "
+ #| "specified by the creation time of the Release file (<literal>Date</"
+ #| "literal> header) plus the seconds specified with this options are used to "
+ #| "check if the validation of a file has expired by using the earlier date "
+ #| "of the two. Archive specific settings can be made by appending the label "
+ #| "of the archive to the option name."
+ msgid ""
+ "Minimum of seconds the Release file should be considered valid after it was "
+ "created (indicated by the <literal>Date</literal> header).  Use this if you "
+ "need to use a seldomly updated (local) mirror of a more regular updated "
+ "archive with a <literal>Valid-Until</literal> header instead of completely "
+ "disabling the expiration date checking.  Archive specific settings can and "
+ "should be used by appending the label of the archive to the option name."
+ msgstr ""
+ "Durée (en secondes) pendant laquelle un fichier Release est considéré comme "
+ "valable, à partir du moment de sa création. La valeur par défaut est 0 "
+ "(fichier valable indéfiniment) si le fichier Release de l'archive ne "
+ "comporte pas d'en-tête <literal>Valid-Until</literal>. Dans le cas "
+ "contraire, c'est la valeur de cet en-tête qui est la valeur par défaut du "
+ "paramètre. La date du fichier Release ou la date indiquée dans l'en-tête "
+ "<literal>Date</literal>, augmentées du nombre de secondes indiquées sont "
+ "comparées à la date courante pour déterminer si un fichier Release donné est "
+ "obsolète ou pas. Un réglage spécifique pour une archive donnée peut être "
+ "défini en ajoutant l'étiquette de l'archive au nom de l'option."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:274
+ #: apt.conf.5.xml:292
  msgid ""
  "Try to download deltas called <literal>PDiffs</literal> for Packages or "
  "Sources files instead of downloading whole ones. True by default."
@@@ -6173,7 -5088,7 +5098,7 @@@ msgstr "
  "télécharger entièrement. Par défaut à « true »."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:277
+ #: apt.conf.5.xml:295
  #, fuzzy
  #| msgid ""
  #| "Two sub-options to limit the use of PDiffs are also available: With "
@@@ -6185,8 -5100,8 +5110,8 @@@
  msgid ""
  "Two sub-options to limit the use of PDiffs are also available: With "
  "<literal>FileLimit</literal> can be specified how many PDiff files are "
- "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
- "other hand is the maximum precentage of the size of all patches compared to "
+ "downloaded at most to update a file. <literal>SizeLimit</literal> on the "
+ "other hand is the maximum percentage of the size of all patches compared to "
  "the size of the targeted file. If one of these limits is exceeded the "
  "complete file is downloaded instead of the patches."
  msgstr ""
@@@ -6199,13 -5114,8 +5124,8 @@@
  "dépassée, le fichier complet est téléchargé au lieu de télécharger les "
  "fichiers de différences."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
- msgid "Queue-Mode"
- msgstr "Queue-Mode"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:305
  msgid ""
  "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
  "literal> or <literal>access</literal> which determines how APT parallelizes "
@@@ -6220,13 -5130,8 +5140,8 @@@ msgstr "
  "<literal>access</literal> signifie qu'une connexion par type d'URI sera "
  "initiée."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:294
- msgid "Retries"
- msgstr "Retries"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:295
+ #: apt.conf.5.xml:313
  msgid ""
  "Number of retries to perform. If this is non-zero APT will retry failed "
  "files the given number of times."
@@@ -6235,13 -5140,8 +5150,8 @@@ msgstr "
  "récupérer, le nombre donné de fois, les fichiers dont la récupération a "
  "échoué."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:299
- msgid "Source-Symlinks"
- msgstr "Source-Symlinks"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:300
+ #: apt.conf.5.xml:318
  msgid ""
  "Use symlinks for source archives. If set to true then source archives will "
  "be symlinked when possible instead of copying. True is the default."
@@@ -6250,13 -5150,8 +5160,8 @@@ msgstr "
  "« true », cette option crée si possible des liens symboliques vers les "
  "archives de sources au lieu de les copier.  Par défaut à « true »."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:304 sources.list.5.xml:144
- msgid "http"
- msgstr "http"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:305
+ #: apt.conf.5.xml:323
  msgid ""
  "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
  "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@@ -6276,7 -5171,7 +5181,7 @@@ msgstr "
  "options de mandataire HTTP."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:313
+ #: apt.conf.5.xml:331
  msgid ""
  "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
  "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@@ -6301,7 -5196,7 +5206,7 @@@ msgstr "
  "en compte aucune de ces options."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:323 apt.conf.5.xml:387
+ #: apt.conf.5.xml:341 apt.conf.5.xml:407
  msgid ""
  "The option <literal>timeout</literal> sets the timeout timer used by the "
  "method, this applies to all things including connection timeout and data "
@@@ -6312,27 -5207,26 +5217,26 @@@ msgstr "
  "données."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:326
- msgid ""
- "One setting is provided to control the pipeline depth in cases where the "
- "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
- "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
- "indicating how many outstanding requests APT should send. A value of zero "
- "MUST be specified if the remote host does not properly linger on TCP "
- "connections - otherwise data corruption will occur. Hosts which require this "
- "are in violation of RFC 2068."
- msgstr ""
- "Une option de configuration est fournie pour contrôler la profondeur du tube "
- "pour le cas où un serveur distant n'est pas conforme à la RFC ou est bogué "
- "(comme Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth </literal> a une "
- "valeur comprise entre 0 et 5 : elle indique le nombre de requêtes en attente "
- "qui peuvent être émises. Quand la machine distante ne conserve pas "
- "correctement les connexions TCP, la valeur doit égale à 0. Dans le cas "
- "contraire, des données seront corrompues. Les machines qui ont besoin de "
- "cette option ne respectent pas la RFC 2068."
+ #: apt.conf.5.xml:344
+ msgid ""
+ "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+ "enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
+ "g. on high-latency connections. It specifies how many requests are send in a "
+ "pipeline.  Previous APT versions had a default of 10 for this setting, but "
+ "the default value is now 0 (= disabled) to avoid problems with the ever-"
+ "growing amount of webservers and proxies which choose to not conform to the "
+ "HTTP/1.1 specification."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:351
+ msgid ""
+ "<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
+ "redirects, which is enabled by default."
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:334
+ #: apt.conf.5.xml:354
  msgid ""
  "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
  "literal> which accepts integer values in kilobyte. The default value is 0 "
@@@ -6347,7 -5241,7 +5251,7 @@@ msgstr "
  "implicitement le téléchargement simultané depuis plusieurs serveurs."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:339
+ #: apt.conf.5.xml:359
  msgid ""
  "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
  "User-Agent for the http download method as some proxies allow access for "
@@@ -6358,13 -5252,8 +5262,8 @@@ msgstr "
  "ce qui peut par exemple être utile avec certains mandataires HTTP qui "
  "n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:345
- msgid "https"
- msgstr "https"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:346
+ #: apt.conf.5.xml:366
  msgid ""
  "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
  "options are the same as for <literal>http</literal> method and will also "
@@@ -6380,7 -5269,7 +5279,7 @@@ msgstr "
  "encore gérée."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:352
+ #: apt.conf.5.xml:372
  msgid ""
  "<literal>CaInfo</literal> suboption specifies place of file that holds info "
  "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@@ -6411,13 -5300,8 +5310,8 @@@ msgstr "
  "pour la version de SSL à utiliser et peut contenir l'une des chaînes 'TLSv1' "
  "ou 'SSLv3'."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:370 sources.list.5.xml:155
- msgid "ftp"
- msgstr "ftp"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:371
+ #: apt.conf.5.xml:391
  msgid ""
  "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
  "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@@ -6452,7 -5336,7 +5346,7 @@@ msgstr "
  "correspond à l'élément respectif de l'URI."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:390
+ #: apt.conf.5.xml:410
  msgid ""
  "Several settings are provided to control passive mode. Generally it is safe "
  "to leave passive mode on, it works in nearly every environment.  However "
@@@ -6469,7 -5353,7 +5363,7 @@@ msgstr "
  "modèle de fichier de configuration)."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:397
+ #: apt.conf.5.xml:417
  msgid ""
  "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
  "envar> environment variable to a http url - see the discussion of the http "
@@@ -6484,7 -5368,7 +5378,7 @@@ msgstr "
  "efficacité de cette méthode."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:402
+ #: apt.conf.5.xml:422
  msgid ""
  "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
  "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@@ -6499,19 -5383,14 +5393,14 @@@ msgstr "
  "« true », on les utilise même si la connexion est de type IPv4. La plupart "
  "des serveurs FTP ne suivent pas la RFC 2428."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:409 sources.list.5.xml:137
- msgid "cdrom"
- msgstr "cdrom"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:415
+ #: apt.conf.5.xml:435
  #, no-wrap
  msgid "/cdrom/::Mount \"foo\";"
  msgstr "/cdrom/::Mount \"foo\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:410
+ #: apt.conf.5.xml:430
  msgid ""
  "CDROM URIs; the only setting for CDROM URIs is the mount point, "
  "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@@ -6532,13 -5411,8 +5421,8 @@@ msgstr "
  "oblique finale est importante. Les commandes de démontage peuvent être "
  "spécifiées en utilisant <literal>UMount</literal>."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:420
- msgid "gpgv"
- msgstr "gpgv"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:421
+ #: apt.conf.5.xml:441
  msgid ""
  "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
  "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@@ -6548,19 -5422,14 +5432,14 @@@ msgstr "
  "des paramètres à gpgv.  <literal>gpgv::Options</literal> : options "
  "supplémentaires passées à gpgv."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:426
- msgid "CompressionTypes"
- msgstr "CompressionTypes"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:432
+ #: apt.conf.5.xml:452
  #, no-wrap
  msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
  msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:427
+ #: apt.conf.5.xml:447
  msgid ""
  "List of compression types which are understood by the acquire methods.  "
  "Files like <filename>Packages</filename> can be available in various "
@@@ -6580,19 -5449,19 +5459,19 @@@ msgstr "
  "type=\"synopsis\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:437
+ #: apt.conf.5.xml:457
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order:: \"gz\";"
  msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:440
+ #: apt.conf.5.xml:460
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:433
+ #: apt.conf.5.xml:453
  msgid ""
  "Also the <literal>Order</literal> subgroup can be used to define in which "
  "order the acquire system will try to download the compressed files. The "
@@@ -6623,13 -5492,13 +5502,13 @@@ msgstr "
  "<literal>bz2</literal> à liste car il sera ajouté automatiquement."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:444
+ #: apt.conf.5.xml:464
  #, no-wrap
  msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
  msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:442
+ #: apt.conf.5.xml:462
  #, fuzzy
  #| msgid ""
  #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
@@@ -6646,9 -5515,9 +5525,9 @@@ msgid "
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
  "will only be used if this file exists, e.g. for the bzip2 method (the "
- "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
- "that list entries specified on the command line will be added at the end of "
- "the list specified in the configuration files, but before the default "
+ "inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+ "also that list entries specified on the command line will be added at the "
+ "end of the list specified in the configuration files, but before the default "
  "entries. To prefer a type in this case over the ones specified in the "
  "configuration files you can set the option direct - not in list style.  This "
  "will not override the defined list, it will only prefix the list with this "
@@@ -6667,7 -5536,7 +5546,7 @@@ msgstr "
  "elle sera simplement préfixée avec l'option en question."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:449
+ #: apt.conf.5.xml:469
  #, fuzzy
  #| msgid ""
  #| "The special type <literal>uncompressed</literal> can be used to give "
@@@ -6676,7 -5545,7 +5555,7 @@@
  #| "mirrors."
  msgid ""
  "The special type <literal>uncompressed</literal> can be used to give "
- "uncompressed files a preference, but note that most archives doesn't provide "
+ "uncompressed files a preference, but note that most archives don't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
  "Le type spécial <literal>uncompressed</literal> peut servir à donner la "
@@@ -6684,13 -5553,8 +5563,8 @@@
  "archives ne fournissent pas de fichiers non compressés, donc ce réglage est "
  "surtout destiné aux miroirs locaux."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:454
- msgid "GzipIndexes"
- msgstr "GzipIndexes"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:456
+ #: apt.conf.5.xml:476
  msgid ""
  "When downloading <literal>gzip</literal> compressed indexes (Packages, "
  "Sources, or Translations), keep them gzip compressed locally instead of "
@@@ -6704,13 -5568,8 +5578,8 @@@ msgstr "
  "processeur lorsque les caches locaux sont créés. Valeur par défaut : Faux "
  "(« False »)."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:463
- msgid "Languages"
- msgstr "Langues"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:464
+ #: apt.conf.5.xml:484
  msgid ""
  "The Languages subsection controls which <filename>Translation</filename> "
  "files are downloaded and in which order APT tries to display the Description-"
@@@ -6732,13 -5591,13 +5601,13 @@@ msgstr "
  "sur ce qui est disponible avant d'établir des réglages impossibles."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
- #: apt.conf.5.xml:480
+ #: apt.conf.5.xml:500
  #, no-wrap
  msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
  msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:470
+ #: apt.conf.5.xml:490
  msgid ""
  "The default list includes \"environment\" and \"en\". "
  "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@@ -6779,8 -5638,17 +5648,17 @@@ msgstr "
  "dernier cas, l'ordre est alors « de, fr, en ». <placeholder type="
  "\"programlisting\" id=\"0\"/>"
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:501
+ msgid ""
+ "Note: To prevent problems resulting from APT being executed in different "
+ "environments (e.g. by different users or by other programs) all Translation "
+ "files which are found in <filename>/var/lib/apt/lists/</filename> will be "
+ "added to the end of the list (after an implicit \"<literal>none</literal>\")."
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:245
+ #: apt.conf.5.xml:254
  msgid ""
  "The <literal>Acquire</literal> group of options controls the download of "
  "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@@ -6790,20 -5658,29 +5668,29 @@@ msgstr "
  "id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:487
+ #: apt.conf.5.xml:512
  msgid "Directories"
  msgstr "Les répertoires"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:489
+ #: apt.conf.5.xml:514
+ #, fuzzy
+ #| msgid ""
+ #| "The <literal>Dir::State</literal> section has directories that pertain to "
+ #| "local state information. <literal>lists</literal> is the directory to "
+ #| "place downloaded package lists in and <literal>status</literal> is the "
+ #| "name of the dpkg status file.  <literal>preferences</literal> is the name "
+ #| "of the APT preferences file.  <literal>Dir::State</literal> contains the "
+ #| "default directory to prefix on all sub items if they do not start with "
+ #| "<filename>/</filename> or <filename>./</filename>."
  msgid ""
  "The <literal>Dir::State</literal> section has directories that pertain to "
  "local state information. <literal>lists</literal> is the directory to place "
  "downloaded package lists in and <literal>status</literal> is the name of the "
  "dpkg status file.  <literal>preferences</literal> is the name of the APT "
- "preferences file.  <literal>Dir::State</literal> contains the default "
- "directory to prefix on all sub items if they do not start with <filename>/</"
- "filename> or <filename>./</filename>."
+ "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
+ "contains the default directory to prefix on all sub items if they do not "
+ "start with <filename>/</filename> or <filename>./</filename>."
  msgstr ""
  "Les répertoires de la section <literal>Dir::State</literal> concernent le "
  "système local. <literal>lists</literal> est le répertoire où placer les "
@@@ -6815,7 -5692,7 +5702,7 @@@
  "filename>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:496
+ #: apt.conf.5.xml:521
  msgid ""
  "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
  "information, such as the two package caches <literal>srcpkgcache</literal> "
@@@ -6838,7 -5715,7 +5725,7 @@@ msgstr "
  "Cache</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:505
+ #: apt.conf.5.xml:530
  msgid ""
  "<literal>Dir::Etc</literal> contains the location of configuration files, "
  "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@@ -6853,7 -5730,7 +5740,7 @@@ msgstr "
  "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:511
+ #: apt.conf.5.xml:536
  msgid ""
  "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
  "in lexical order from the directory specified. After this is done then the "
@@@ -6864,7 -5741,7 +5751,7 @@@ msgstr "
  "configuration est chargé."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:515
+ #: apt.conf.5.xml:540
  msgid ""
  "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
  "Bin::Methods</literal> specifies the location of the method handlers and "
@@@ -6882,7 -5759,7 +5769,7 @@@ msgstr "
  "programmes correspondants."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:523
+ #: apt.conf.5.xml:548
  msgid ""
  "The configuration item <literal>RootDir</literal> has a special meaning.  If "
  "set, all paths in <literal>Dir::</literal> will be relative to "
@@@ -6904,7 -5781,7 +5791,7 @@@ msgstr "
  "staging/var/lib/dpkg/status</filename>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:536
+ #: apt.conf.5.xml:561
  msgid ""
  "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
  "which files APT should silently ignore while parsing the files in the "
@@@ -6922,12 -5799,12 +5809,12 @@@ msgstr "
  "est possible d'utiliser la syntaxe des expressions rationnelles."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:545
+ #: apt.conf.5.xml:570
  msgid "APT in DSelect"
  msgstr "APT et DSelect"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:547
+ #: apt.conf.5.xml:572
  msgid ""
  "When APT is used as a &dselect; method several configuration directives "
  "control the default behaviour. These are in the <literal>DSelect</literal> "
@@@ -6937,13 -5814,8 +5824,8 @@@ msgstr "
  "contrôlent le comportement par défaut. On les trouve dans la section "
  "<literal>DSelect</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:551
- msgid "Clean"
- msgstr "Clean"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:552
+ #: apt.conf.5.xml:577
  msgid ""
  "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
  "and never.  always and prompt will remove all packages from the cache after "
@@@ -6961,7 -5833,7 +5843,7 @@@ msgstr "
  "supprime avant de récupérer de nouveaux paquets."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:561
+ #: apt.conf.5.xml:586
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the install phase."
@@@ -6969,13 -5841,8 +5851,8 @@@ msgstr "
  "Le contenu de cette variable est passé comme options de ligne de commande à "
  "&apt-get; lors de la phase d'installation."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:565
- msgid "Updateoptions"
- msgstr "UpdateOptions"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:566
+ #: apt.conf.5.xml:591
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the update phase."
@@@ -6983,13 -5850,8 +5860,8 @@@ msgstr "
  "Le contenu de cette variable est passé comme options de ligne de commande à "
  "&apt-get; lors de la phase de mise à jour."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:570
- msgid "PromptAfterUpdate"
- msgstr "PromptAfterUpdate"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:571
+ #: apt.conf.5.xml:596
  msgid ""
  "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
  "The default is to prompt only on error."
@@@ -6999,12 -5861,12 +5871,12 @@@ msgstr "
  "d'erreur que l'on propose à l'utilisateur d'intervenir."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:577
+ #: apt.conf.5.xml:602
  msgid "How APT calls dpkg"
  msgstr "Méthode d'appel de &dpkg; par APT"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:578
+ #: apt.conf.5.xml:603
  msgid ""
  "Several configuration directives control how APT invokes &dpkg;. These are "
  "in the <literal>DPkg</literal> section."
@@@ -7013,7 -5875,7 +5885,7 @@@ msgstr "
  "&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:583
+ #: apt.conf.5.xml:608
  msgid ""
  "This is a list of options to pass to dpkg. The options must be specified "
  "using the list notation and each list item is passed as a single argument to "
@@@ -7023,18 -5885,8 +5895,8 @@@ msgstr "
  "déclarées en utilisant la notation de liste et chaque élément de la liste "
  "est passé comme un seul paramètre à &dpkg;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Pre-Invoke"
- msgstr "Pre-Invoke"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Post-Invoke"
- msgstr "Post-Invoke"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:589
+ #: apt.conf.5.xml:614
  msgid ""
  "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -7046,13 -5898,8 +5908,8 @@@ msgstr "
  "notation de liste. Les commandes sont appelées dans l'ordre, en utilisant "
  "<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:595
- msgid "Pre-Install-Pkgs"
- msgstr "Pre-Install-Pkgs"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:596
+ #: apt.conf.5.xml:621
  msgid ""
  "This is a list of shell commands to run before invoking dpkg. Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -7068,7 -5915,7 +5925,7 @@@ msgstr "
  "qu'il va installer, à raison d'un par ligne."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:602
+ #: apt.conf.5.xml:627
  msgid ""
  "Version 2 of this protocol dumps more information, including the protocol "
  "version, the APT configuration space and the packages, files and versions "
@@@ -7083,13 -5930,8 +5940,8 @@@ msgstr "
  "<literal>cmd</literal> est une commande passée à <literal>Pre-Install-Pkgs</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:609
- msgid "Run-Directory"
- msgstr "Run-Directory"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:610
+ #: apt.conf.5.xml:635
  msgid ""
  "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
  "</filename>."
@@@ -7097,13 -5939,8 +5949,8 @@@ msgstr "
  "APT se place dans ce répertoire avant d'appeler &dpkg; ; par défaut, c'est "
  "le répertoire <filename>/</filename>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:614
- msgid "Build-options"
- msgstr "Build-options"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:615
+ #: apt.conf.5.xml:640
  msgid ""
  "These options are passed to &dpkg-buildpackage; when compiling packages, the "
  "default is to disable signing and produce all binaries."
@@@ -7113,14 -5950,14 +5960,14 @@@ msgstr "
  "créés."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt.conf.5.xml:620
+ #: apt.conf.5.xml:645
  msgid "dpkg trigger usage (and related options)"
  msgstr ""
  "utilisation des actions différées (« triggers ») de dpkg (et options "
  "associées)"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:621
+ #: apt.conf.5.xml:646
  msgid ""
  "APT can call dpkg in a way so it can make aggressive use of triggers over "
  "multiple calls of dpkg. Without further options dpkg will use triggers only "
@@@ -7147,7 -5984,7 +5994,7 @@@ msgstr "
  "configuration des paquets."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
- #: apt.conf.5.xml:636
+ #: apt.conf.5.xml:661
  #, no-wrap
  msgid ""
  "DPkg::NoTriggers \"true\";\n"
@@@ -7161,7 -5998,7 +6008,7 @@@ msgstr "
  "DPkg::TriggersPending \"true\";"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:630
+ #: apt.conf.5.xml:655
  msgid ""
  "Note that it is not guaranteed that APT will support these options or that "
  "these options will not cause (big) trouble in the future. If you have "
@@@ -7184,13 -6021,8 +6031,8 @@@ msgstr "
  "command>. Une combinaison intéressante d'options pourrait être <placeholder "
  "type=\"literallayout\" id=\"0\"/>."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:642
- msgid "DPkg::NoTriggers"
- msgstr "DPkg::NoTriggers"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:643
+ #: apt.conf.5.xml:668
  msgid ""
  "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
  "call).  See &dpkg; if you are interested in what this actually means. In "
@@@ -7211,13 -6043,8 +6053,8 @@@ msgstr "
  "que cela sera désormais utilisé également avec les appels à dpkg avec les "
  "options « unpack » et « remove »."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:650
- msgid "PackageManager::Configure"
- msgstr "PackageManager::Configure"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:651
+ #: apt.conf.5.xml:676
  msgid ""
  "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
  "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@@ -7244,13 -6071,8 +6081,8 @@@ msgstr "
  "activée par défaut pour éviter de placer le système dans un état non "
  "configuré et donc éventuellement non amorçable."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:661
- msgid "DPkg::ConfigurePending"
- msgstr "DPkg::ConfigurePending"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:662
+ #: apt.conf.5.xml:687
  msgid ""
  "If this option is set apt will call <command>dpkg --configure --pending</"
  "command> to let dpkg handle all required configurations and triggers. This "
@@@ -7268,13 -6090,8 +6100,8 @@@ msgstr "
  "d'installation. Dans ce cas, seul le dernier de tous les appels successifs "
  "peut conserver l'option active."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:668
- msgid "DPkg::TriggersPending"
- msgstr "DPkg::TriggersPending"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:669
+ #: apt.conf.5.xml:694
  msgid ""
  "Useful for <literal>smart</literal> configuration as a package which has "
  "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@@ -7291,13 -6108,8 +6118,8 @@@ msgstr "
  "option provoquera la gestion de toutes les actions différées, pas seulement "
  "celles concernant le paquet en cours de traitement."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:674
- msgid "PackageManager::UnpackAll"
- msgstr "PackageManager::UnpackAll"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:675
+ #: apt.conf.5.xml:700
  msgid ""
  "As the configuration can be deferred to be done at the end by dpkg it can be "
  "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@@ -7321,13 -6133,8 +6143,8 @@@ msgstr "
  "est donc conseillé de s'y reporter en cas de doute car le contresens de "
  "traduction n'est pas exclu...)."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:682
- msgid "OrderList::Score::Immediate"
- msgstr "OrderList::Score::Immediate"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:690
+ #: apt.conf.5.xml:715
  #, no-wrap
  msgid ""
  "OrderList::Score {\n"
@@@ -7345,7 -6152,7 +6162,7 @@@ msgstr "
  "};"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:683
+ #: apt.conf.5.xml:708
  msgid ""
  "Essential packages (and there dependencies) should be configured immediately "
  "after unpacking. It will be a good idea to do this quite early in the "
@@@ -7371,12 -6178,12 +6188,12 @@@ msgstr "
  "id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:703
+ #: apt.conf.5.xml:728
  msgid "Periodic and Archives options"
  msgstr "Options « Periodic » et « Archive »"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:704
+ #: apt.conf.5.xml:729
  msgid ""
  "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
  "of options configure behavior of apt periodic updates, which is done by "
@@@ -7388,12 -6195,12 +6205,12 @@@ msgstr "
  "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:712
+ #: apt.conf.5.xml:737
  msgid "Debug options"
  msgstr "Les options de débogage"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:714
+ #: apt.conf.5.xml:739
  msgid ""
  "Enabling options in the <literal>Debug::</literal> section will cause "
  "debugging information to be sent to the standard error stream of the program "
@@@ -7411,7 -6218,7 +6228,7 @@@ msgstr "
  "peuvent tout de même être utiles :"
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:725
+ #: apt.conf.5.xml:750
  msgid ""
  "<literal>Debug::pkgProblemResolver</literal> enables output about the "
  "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@@ -7422,7 -6229,7 +6239,7 @@@ msgstr "
  "upgrade, upgrade, install, remove et purge</literal>."
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:733
+ #: apt.conf.5.xml:758
  msgid ""
  "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
  "used to run some operations (for instance, <literal>apt-get -s install</"
@@@ -7434,7 -6241,7 +6251,7 @@@ msgstr "
  "superutilisateur."
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:742
+ #: apt.conf.5.xml:767
  msgid ""
  "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
  "time that <literal>apt</literal> invokes &dpkg;."
@@@ -7446,7 -6253,7 +6263,7 @@@ msgstr "
  #. 	   motivating example, except I haven't a clue why you'd want
  #. 	   to do this. 
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:750
+ #: apt.conf.5.xml:775
  msgid ""
  "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
  "in CDROM IDs."
@@@ -7455,62 -6262,37 +6272,37 @@@ msgstr "
  "type statfs dans les identifiants de CD."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:760
+ #: apt.conf.5.xml:785
  msgid "A full list of debugging options to apt follows."
  msgstr "Liste complète des options de débogage de APT :"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:765
- msgid "<literal>Debug::Acquire::cdrom</literal>"
- msgstr "<literal>Debug::Acquire::cdrom</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:769
+ #: apt.conf.5.xml:794
  msgid ""
  "Print information related to accessing <literal>cdrom://</literal> sources."
  msgstr ""
  "Affiche les informations concernant les sources de type <literal>cdrom://</"
  "literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:776
- msgid "<literal>Debug::Acquire::ftp</literal>"
- msgstr "<literal>Debug::Acquire::ftp</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:780
+ #: apt.conf.5.xml:805
  msgid "Print information related to downloading packages using FTP."
  msgstr ""
  "Affiche les informations concernant le téléchargement de paquets par FTP."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:787
- msgid "<literal>Debug::Acquire::http</literal>"
- msgstr "<literal>Debug::Acquire::http</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:791
+ #: apt.conf.5.xml:816
  msgid "Print information related to downloading packages using HTTP."
  msgstr ""
  "Affiche les informations concernant le téléchargement de paquets par HTTP."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:798
- msgid "<literal>Debug::Acquire::https</literal>"
- msgstr "<literal>Debug::Acquire::https</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:802
+ #: apt.conf.5.xml:827
  msgid "Print information related to downloading packages using HTTPS."
  msgstr "Print information related to downloading packages using HTTPS."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:809
- msgid "<literal>Debug::Acquire::gpgv</literal>"
- msgstr "<literal>Debug::Acquire::gpgv</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:813
+ #: apt.conf.5.xml:838
  msgid ""
  "Print information related to verifying cryptographic signatures using "
  "<literal>gpg</literal>."
@@@ -7518,13 -6300,8 +6310,8 @@@ msgstr "
  "Affiche les informations relatives à la vérification de signatures "
  "cryptographiques avec <literal>gpg</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:820
- msgid "<literal>Debug::aptcdrom</literal>"
- msgstr "<literal>Debug::aptcdrom</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:824
+ #: apt.conf.5.xml:849
  msgid ""
  "Output information about the process of accessing collections of packages "
  "stored on CD-ROMs."
@@@ -7532,25 -6309,15 +6319,15 @@@ msgstr "
  "Affiche des informations concernant l'accès aux collections de paquets "
  "stockées sur CD."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:831
- msgid "<literal>Debug::BuildDeps</literal>"
- msgstr "<literal>Debug::BuildDeps</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:834
+ #: apt.conf.5.xml:859
  msgid "Describes the process of resolving build-dependencies in &apt-get;."
  msgstr ""
  "Décrit le processus de résolution des dépendances pour la construction de "
  "paquets source ( « build-dependencies » ) par &apt-get;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:841
- msgid "<literal>Debug::Hashes</literal>"
- msgstr "<literal>Debug::Hashes</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:844
+ #: apt.conf.5.xml:869
  msgid ""
  "Output each cryptographic hash that is generated by the <literal>apt</"
  "literal> libraries."
@@@ -7558,13 -6325,8 +6335,8 @@@ msgstr "
  "Affiche toutes les clefs de hachage cryptographiques créées par les "
  "librairies d'<literal>apt</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:851
- msgid "<literal>Debug::IdentCDROM</literal>"
- msgstr "<literal>Debug::IdentCDROM</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:854
+ #: apt.conf.5.xml:879
  msgid ""
  "Do not include information from <literal>statfs</literal>, namely the number "
  "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@@ -7574,13 -6336,8 +6346,8 @@@ msgstr "
  "génération des identifiants de CD, c'est-à-dire le nombre de blocs libres et "
  "utilisés sur le système de fichier du CD."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:862
- msgid "<literal>Debug::NoLocking</literal>"
- msgstr "<literal>Debug::NoLocking</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:865
+ #: apt.conf.5.xml:890
  msgid ""
  "Disable all file locking.  For instance, this will allow two instances of "
  "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@@ -7589,25 -6346,15 +6356,15 @@@ msgstr "
  "deux instances de <quote><literal>apt-get update</literal></quote> en même "
  "temps."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:873
- msgid "<literal>Debug::pkgAcquire</literal>"
- msgstr "<literal>Debug::pkgAcquire</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:877
+ #: apt.conf.5.xml:902
  msgid "Log when items are added to or removed from the global download queue."
  msgstr ""
  "Trace les ajouts et suppressions d'éléments de la queue globale de "
  "téléchargement."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:884
- msgid "<literal>Debug::pkgAcquire::Auth</literal>"
- msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:887
+ #: apt.conf.5.xml:912
  msgid ""
  "Output status messages and errors related to verifying checksums and "
  "cryptographic signatures of downloaded files."
@@@ -7616,13 -6363,8 +6373,8 @@@ msgstr "
  "signatures cryptographiques des fichiers téléchargés, ainsi que les erreurs "
  "éventuelles."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:894
- msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
- msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:897
+ #: apt.conf.5.xml:922
  msgid ""
  "Output information about downloading and applying package index list diffs, "
  "and errors relating to package index list diffs."
@@@ -7631,13 -6373,8 +6383,8 @@@ msgstr "
  "fichiers différentiels des indexes de paquets, ainsi que les erreurs "
  "éventuelles."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:905
- msgid "<literal>Debug::pkgAcquire::RRed</literal>"
- msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:909
+ #: apt.conf.5.xml:934
  msgid ""
  "Output information related to patching apt package lists when downloading "
  "index diffs instead of full indices."
@@@ -7646,26 -6383,16 +6393,16 @@@ msgstr "
  "de paquets d'APT quand ces fichiers de différences sont téléchargés à la "
  "place des fichiers complets."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:916
- msgid "<literal>Debug::pkgAcquire::Worker</literal>"
- msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:920
+ #: apt.conf.5.xml:945
  msgid ""
  "Log all interactions with the sub-processes that actually perform downloads."
  msgstr ""
  "Affiche toutes les interactions avec les processus enfants qui se chargent "
  "effectivement des téléchargements."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:927
- msgid "<literal>Debug::pkgAutoRemove</literal>"
- msgstr "<literal>Debug::pkgAutoRemove</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:931
+ #: apt.conf.5.xml:956
  msgid ""
  "Log events related to the automatically-installed status of packages and to "
  "the removal of unused packages."
@@@ -7673,13 -6400,8 +6410,8 @@@ msgstr "
  "Affiche les changements concernant le marquage des paquets comme installés "
  "automatiquement, et la suppression des paquets inutiles."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:938
- msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
- msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:941
+ #: apt.conf.5.xml:966
  msgid ""
  "Generate debug messages describing which packages are being automatically "
  "installed to resolve dependencies.  This corresponds to the initial auto-"
@@@ -7693,13 -6415,8 +6425,8 @@@ msgstr "
  "get install</literal> et pas le système de résolution de dépendances complet "
  "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:952
- msgid "<literal>Debug::pkgDepCache::Marker</literal>"
- msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:955
+ #: apt.conf.5.xml:980
  msgid ""
  "Generate debug messages describing which package is marked as keep/install/"
  "remove while the ProblemResolver does his work.  Each addition or deletion "
@@@ -7733,25 -6450,15 +6460,15 @@@ msgstr "
  "get install</literal> et pas le système de résolution de dépendances complet "
  "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:974
- msgid "<literal>Debug::pkgInitConfig</literal>"
- msgstr "<literal>Debug::pkgInitConfig</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:977
+ #: apt.conf.5.xml:1002
  msgid "Dump the default configuration to standard error on startup."
  msgstr ""
  "Affiche, au lancement, l'ensemble de la configuration sur la sortie d'erreur "
  "standard."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:984
- msgid "<literal>Debug::pkgDPkgPM</literal>"
- msgstr "<literal>Debug::pkgDPkgPM</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:987
+ #: apt.conf.5.xml:1012
  msgid ""
  "When invoking &dpkg;, output the precise command line with which it is being "
  "invoked, with arguments separated by a single space character."
@@@ -7759,13 -6466,8 +6476,8 @@@ msgstr "
  "Affiche la commande exacte d'invocation de &dpkg; à chaque appel ; les "
  "paramètres sont séparés par des espaces."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:995
- msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
- msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:998
+ #: apt.conf.5.xml:1023
  msgid ""
  "Output all the data received from &dpkg; on the status file descriptor and "
  "any errors encountered while parsing it."
@@@ -7774,13 -6476,8 +6486,8 @@@ msgstr "
  "descripteur de fichier d'état, et les éventuelles erreurs d'analyse de ce "
  "fichier."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1005
- msgid "<literal>Debug::pkgOrderList</literal>"
- msgstr "<literal>Debug::pkgOrderList</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1009
+ #: apt.conf.5.xml:1034
  msgid ""
  "Generate a trace of the algorithm that decides the order in which "
  "<literal>apt</literal> should pass packages to &dpkg;."
@@@ -7788,34 -6485,19 +6495,19 @@@ msgstr "
  "Affiche les étapes de l'algorithme utilisé pour choisir l'ordre dans lequel "
  "<literal>apt</literal> passe les paquets à &dpkg;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1017
- msgid "<literal>Debug::pkgPackageManager</literal>"
- msgstr "<literal>Debug::pkgPackageManager</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1021
+ #: apt.conf.5.xml:1046
  msgid ""
  "Output status messages tracing the steps performed when invoking &dpkg;."
  msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1028
- msgid "<literal>Debug::pkgPolicy</literal>"
- msgstr "<literal>Debug::pkgPolicy</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1032
+ #: apt.conf.5.xml:1057
  msgid "Output the priority of each package list on startup."
  msgstr "Affiche, au lancement, la priorité de chaque liste de paquets."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1038
- msgid "<literal>Debug::pkgProblemResolver</literal>"
- msgstr "<literal>Debug::pkgProblemResolver</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1042
+ #: apt.conf.5.xml:1067
  msgid ""
  "Trace the execution of the dependency resolver (this applies only to what "
  "happens when a complex dependency problem is encountered)."
@@@ -7823,13 -6505,8 +6515,8 @@@ msgstr "
  "Affiche la trace d'exécution du système de résolution de dépendances (ne "
  "concerne que les cas où un problème de dépendances complexe se présente)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1050
- msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
- msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1053
+ #: apt.conf.5.xml:1078
  msgid ""
  "Display a list of all installed packages with their calculated score used by "
  "the pkgProblemResolver. The description of the package is the same as "
@@@ -7839,13 -6516,8 +6526,8 @@@ msgstr "
  "l'outil de résolution de problèmes. La description du paquet est celle qui "
  "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1061
- msgid "<literal>Debug::sourceList</literal>"
- msgstr "<literal>Debug::sourceList</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1065
+ #: apt.conf.5.xml:1090
  msgid ""
  "Print information about the vendors read from <filename>/etc/apt/vendors."
  "list</filename>."
@@@ -7854,7 -6526,7 +6536,7 @@@ msgstr "
  "list</filename>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1088
+ #: apt.conf.5.xml:1113
  msgid ""
  "&configureindex; is a configuration file showing example values for all "
  "possible options."
@@@ -7863,29 -6535,16 +6545,16 @@@ msgstr "
  "exemples pour toutes les options existantes."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt.conf.5.xml:1095
+ #: apt.conf.5.xml:1120
  msgid "&file-aptconf;"
  msgstr "&file-aptconf;"
  
  #.  ? reading apt.conf 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1100
+ #: apt.conf.5.xml:1125
  msgid "&apt-cache;, &apt-config;, &apt-preferences;."
  msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt_preferences.5.xml:16
- msgid ""
- "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
- msgstr ""
- "&apt-author.team; &apt-email; &apt-product; <date>16 février 2010</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt_preferences.5.xml:24 apt_preferences.5.xml:31
- msgid "apt_preferences"
- msgstr "apt_preferences"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt_preferences.5.xml:32
  msgid "Preference control file for APT"
@@@ -7977,8 -6636,8 +6646,8 @@@ msgstr "
  msgid ""
  "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
  "directory are parsed in alphanumeric ascending order and need to obey the "
- "following naming convention: The files have no or \"<literal>pref</literal>"
- "\" as filename extension and which only contain alphanumeric, hyphen (-), "
+ "following naming convention: The files have either no or \"<literal>pref</"
+ "literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
  "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
  "that it has ignored a file if the file doesn't match a pattern in the "
  "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@@ -8444,7 -7103,7 +7113,7 @@@ msgid "
  "APT also supports pinning by glob() expressions and regular expressions "
  "surrounded by /. For example, the following example assigns the priority 500 "
  "to all packages from experimental where the name starts with gnome (as a glob"
- "()-like expression or contains the word kde (as a POSIX extended regular "
+ "()-like expression) or contains the word kde (as a POSIX extended regular "
  "expression surrounded by slashes)."
  msgstr ""
  
@@@ -8468,7 -7127,7 +7137,7 @@@ msgstr "
  #: apt_preferences.5.xml:279
  msgid ""
  "The rule for those expressions is that they can occur anywhere where a "
- "string can occur. Those, the following pin assigns the priority 990 to all "
+ "string can occur. Thus, the following pin assigns the priority 990 to all "
  "packages from a release starting with karmic."
  msgstr ""
  
@@@ -8488,30 -7147,29 +7157,29 @@@ msgstr "
  "Pin: release a=unstable\n"
  "Pin-Priority: 50\n"
  
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:290
- #, fuzzy
- #| msgid "Packages"
- msgid "Package"
- msgstr "Packages"
- 
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:296
- msgid "*"
+ #. type: Content of: <refentry><refsect1><refsect2><para>
+ #: apt_preferences.5.xml:291
+ msgid ""
+ "If a regular expression occurs in a <literal>Package</literal> field, the "
+ "behavior is the same as if this regular expression were replaced with a list "
+ "of all package names it matches. It is undecided whether this will change in "
+ "the future, thus you should always list wild-card pins first, so later "
+ "specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+ "Package field is not considered a glob() expression in itself."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:306
+ #: apt_preferences.5.xml:307
  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:314
+ #: apt_preferences.5.xml:315
  msgid "P &gt; 1000"
  msgstr "P &gt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:315
+ #: apt_preferences.5.xml:316
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
  "package"
@@@ -8520,12 -7178,12 +7188,12 @@@ msgstr "
  "retour en arrière."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:319
+ #: apt_preferences.5.xml:320
  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:320
+ #: apt_preferences.5.xml:321
  msgid ""
  "causes a version to be installed even if it does not come from the target "
  "release, unless the installed version is more recent"
@@@ -8535,12 -7193,12 +7203,12 @@@ msgstr "
  "plus récente."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:325
+ #: apt_preferences.5.xml:326
  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:326
+ #: apt_preferences.5.xml:327
  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"
@@@ -8549,12 -7207,12 +7217,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:331
+ #: apt_preferences.5.xml:332
  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:332
+ #: apt_preferences.5.xml:333
  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"
@@@ -8563,29 -7221,29 +7231,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:337
+ #: apt_preferences.5.xml:338
  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:338
+ #: apt_preferences.5.xml:339
  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:342
+ #: apt_preferences.5.xml:343
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:343
+ #: apt_preferences.5.xml:344
  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:309
+ #: apt_preferences.5.xml:310
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -8596,7 -7254,7 +7264,7 @@@ msgstr "
  "<placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:348
+ #: apt_preferences.5.xml:349
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -8610,7 -7268,7 +7278,7 @@@ msgstr "
  "trouvée détermine la priorité."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:354
+ #: apt_preferences.5.xml:355
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
  "presented earlier:"
@@@ -8619,7 -7277,7 +7287,7 @@@ msgstr "
  "entrées décrites ci-dessous :"
  
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
- #: apt_preferences.5.xml:358
+ #: apt_preferences.5.xml:359
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8647,12 -7305,12 +7315,12 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:371
+ #: apt_preferences.5.xml:372
  msgid "Then:"
  msgstr "Alors :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:373
+ #: apt_preferences.5.xml:374
  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 "
@@@ -8666,7 -7324,7 +7334,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:378
+ #: apt_preferences.5.xml:379
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -8677,7 -7335,7 +7345,7 @@@ msgstr "
  "appartenant à la distribution par défaut."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:382
+ #: apt_preferences.5.xml:383
  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</"
@@@ -8690,13 -7348,13 +7358,13 @@@ msgstr "
  "paquet n'est déjà installée."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:392
+ #: apt_preferences.5.xml:393
  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:394
+ #: apt_preferences.5.xml:395
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -8707,27 -7365,27 +7375,27 @@@ msgstr "
  "décrivent les paquets disponibles à cet endroit."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:406
+ #: apt_preferences.5.xml:407
  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:407
+ #: apt_preferences.5.xml:408
  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:410 apt_preferences.5.xml:460
+ #: apt_preferences.5.xml:411 apt_preferences.5.xml:461
  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:411
+ #: apt_preferences.5.xml:412
  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:398
+ #: apt_preferences.5.xml:399
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -8748,12 -7406,12 +7416,12 @@@ msgstr "
  "\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:427
+ #: apt_preferences.5.xml:428
  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:428
+ #: apt_preferences.5.xml:429
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -8770,18 -7428,18 +7438,18 @@@ msgstr "
  "préférences demanderait cette ligne :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:438
+ #: apt_preferences.5.xml:439
  #, 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:444
+ #: apt_preferences.5.xml:445
  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:445
+ #: apt_preferences.5.xml:446
  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 "
@@@ -8799,13 -7457,13 +7467,13 @@@ msgstr "
  "ligne :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:454
+ #: apt_preferences.5.xml:455
  #, 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:461
+ #: apt_preferences.5.xml:462
  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 "
@@@ -8821,7 -7479,7 +7489,7 @@@ msgstr "
  "préférences demanderait ces lignes :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:470
+ #: apt_preferences.5.xml:471
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -8833,12 -7491,12 +7501,12 @@@ msgstr "
  "Pin: release 3.0\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:479
+ #: apt_preferences.5.xml:480
  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:480
+ #: apt_preferences.5.xml:481
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -8856,18 -7514,18 +7524,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:489
+ #: apt_preferences.5.xml:490
  #, 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:495
+ #: apt_preferences.5.xml:496
  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:496
+ #: apt_preferences.5.xml:497
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8880,18 -7538,18 +7548,18 @@@ msgstr "
  "ligne :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:502
+ #: apt_preferences.5.xml:503
  #, 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:508
+ #: apt_preferences.5.xml:509
  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:509
+ #: apt_preferences.5.xml:510
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8904,13 -7562,13 +7572,13 @@@ msgstr "
  "préférences demanderait cette ligne :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:515
+ #: apt_preferences.5.xml:516
  #, 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:416
+ #: apt_preferences.5.xml:417
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -8934,7 -7592,7 +7602,7 @@@ msgstr "
  "\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:522
+ #: apt_preferences.5.xml:523
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -8959,12 -7617,12 +7627,12 @@@ msgstr "
  "<literal>unstable</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:535
+ #: apt_preferences.5.xml:536
  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:537
+ #: apt_preferences.5.xml:538
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -8975,12 -7633,12 +7643,12 @@@ msgstr "
  "commentaires."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:546
+ #: apt_preferences.5.xml:547
  msgid "Tracking Stable"
  msgstr "Méthode pour suivre Stable"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:554
+ #: apt_preferences.5.xml:555
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -9004,7 -7662,7 +7672,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:548
+ #: apt_preferences.5.xml:549
  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 "
@@@ -9019,8 -7677,8 +7687,8 @@@ msgstr "
  "literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:571 apt_preferences.5.xml:617
- #: apt_preferences.5.xml:675
+ #: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+ #: apt_preferences.5.xml:676
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -9032,7 -7690,7 +7700,7 @@@ msgstr "
  "apt-get dist-upgrade\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:566
+ #: apt_preferences.5.xml:567
  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 "
@@@ -9045,13 -7703,13 +7713,13 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:583
+ #: apt_preferences.5.xml:584
  #, 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:577
+ #: apt_preferences.5.xml:578
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -9064,12 -7722,12 +7732,12 @@@ msgstr "
  "de relancer la commande.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:589
+ #: apt_preferences.5.xml:590
  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:598
+ #: apt_preferences.5.xml:599
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -9097,7 -7755,7 +7765,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:591
+ #: apt_preferences.5.xml:592
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -9114,7 -7772,7 +7782,7 @@@ msgstr "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:612
+ #: apt_preferences.5.xml:613
  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 "
@@@ -9127,13 -7785,13 +7795,13 @@@ msgstr "
  "type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:632
+ #: apt_preferences.5.xml:633
  #, 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:623
+ #: apt_preferences.5.xml:624
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -9152,12 -7810,12 +7820,12 @@@ msgstr "
  "installée.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:639
+ #: apt_preferences.5.xml:640
  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:653
+ #: apt_preferences.5.xml:654
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -9191,7 -7849,7 +7859,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:641
+ #: apt_preferences.5.xml:642
  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 "
@@@ -9215,7 -7873,7 +7883,7 @@@ msgstr "
  "exemples précédents.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:670
+ #: apt_preferences.5.xml:671
  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 "
@@@ -9228,13 -7886,13 +7896,13 @@@ msgstr "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:690
+ #: apt_preferences.5.xml:691
  #, 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:681
+ #: apt_preferences.5.xml:682
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -9253,20 -7911,15 +7921,15 @@@ msgstr "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt_preferences.5.xml:699
+ #: apt_preferences.5.xml:700
  msgid "&file-preferences;"
  msgstr "&file-preferences;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt_preferences.5.xml:705
+ #: apt_preferences.5.xml:706
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: sources.list.5.xml:25 sources.list.5.xml:32
- msgid "sources.list"
- msgstr "sources.list"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: sources.list.5.xml:33
  msgid "Package resource list for APT"
@@@ -9380,7 -8033,7 +8043,7 @@@ msgstr "
  #: sources.list.5.xml:81
  #, fuzzy, no-wrap
  #| msgid "deb uri distribution [component1] [component2] [...]"
- msgid "deb uri distribution [component1] [component2] [...]"
+ msgid "deb [ options ] uri distribution [component1] [component2] [...]"
  msgstr "deb uri distribution [composant1] [composant2] [...]"
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -9451,6 -8104,38 +8114,38 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:112
  msgid ""
+ "<literal>options</literal> is always optional and needs to be surounded by "
+ "square brackets. It can consist of multiple settings in the form "
+ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+ "replaceable></literal>.  Multiple settings are separated by spaces. The "
+ "following settings are supported by APT, note though that unsupported "
+ "settings will be ignored silently:"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:117
+ msgid ""
+ "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+ "replaceable>,…</literal> can be used to specify for which architectures "
+ "packages information should be downloaded. If this option is not set all "
+ "architectures defined by the <literal>APT::Architectures</literal> option "
+ "will be downloaded."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:121
+ msgid ""
+ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+ "this source are always authenticated even if the <filename>Release</"
+ "filename> file is not signed or the signature can't be checked. This "
+ "disables parts of &apt-secure; and should therefore only be used in a local "
+ "and trusted context. <literal>trusted=no</literal> is the opposite which "
+ "handles even correctly authenticated sources as not authenticated."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:128
+ msgid ""
  "It is important to list sources in order of preference, with the most "
  "preferred source listed first. Typically this will result in sorting by "
  "speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@@ -9462,12 -8147,12 +8157,12 @@@ msgstr "
  "les hôtes distants."
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:117
+ #: sources.list.5.xml:133
  msgid "Some examples:"
  msgstr "Exemples :"
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:119
+ #: sources.list.5.xml:135
  #, no-wrap
  msgid ""
  "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@@ -9479,17 -8164,17 +8174,17 @@@ msgstr "
  "   "
  
  #. type: Content of: <refentry><refsect1><title>
- #: sources.list.5.xml:125
+ #: sources.list.5.xml:141
  msgid "URI specification"
  msgstr "Spécification des URI"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:130
+ #: sources.list.5.xml:146
  msgid "file"
  msgstr "file"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:132
+ #: sources.list.5.xml:148
  msgid ""
  "The file scheme allows an arbitrary directory in the file system to be "
  "considered an archive. This is useful for NFS mounts and local mirrors or "
@@@ -9499,8 -8184,13 +8194,13 @@@ msgstr "
  "sein du système de fichier soit considéré comme une archive. On s'en sert "
  "avec les montages NFS, les miroirs et les archives locaux."
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:153
+ msgid "cdrom"
+ msgstr "cdrom"
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:139
+ #: sources.list.5.xml:155
  msgid ""
  "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
  "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@@ -9509,8 -8199,13 +8209,13 @@@ msgstr "
  "avec la possibilité de changer de media. Utilisez le programme &apt-cdrom; "
  "pour créer des entrées dans la liste des sources."
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:160
+ msgid "http"
+ msgstr "http"
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:146
+ #: sources.list.5.xml:162
  msgid ""
  "The http scheme specifies an HTTP server for the archive. If an environment "
  "variable <envar>http_proxy</envar> is set with the format http://server:"
@@@ -9526,8 -8221,13 +8231,13 @@@ msgstr "
  "authentification, on peut utiliser la chaîne http://user:pass@server:port/. "
  "Notez qu'il s'agit d'une méthode d'authentification peu sûre."
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:171
+ msgid "ftp"
+ msgstr "ftp"
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:157
+ #: sources.list.5.xml:173
  msgid ""
  "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
  "is highly configurable; for more information see the &apt-conf; manual page. "
@@@ -9547,12 -8247,12 +8257,12 @@@ msgstr "
  "et qui sont spécifiés dans le fichier de configuration seront ignorés."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:166
+ #: sources.list.5.xml:182
  msgid "copy"
  msgstr "copy"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:168
+ #: sources.list.5.xml:184
  msgid ""
  "The copy scheme is identical to the file scheme except that packages are "
  "copied into the cache directory instead of used directly at their location.  "
@@@ -9564,17 -8264,17 +8274,17 @@@ msgstr "
  "gens qui utilisent un disque zip pour recopier des fichiers avec APT."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "rsh"
  msgstr "rsh"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "ssh"
  msgstr "ssh"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:175
+ #: sources.list.5.xml:191
  msgid ""
  "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
  "user and access the files. It is a good idea to do prior arrangements with "
@@@ -9589,12 -8289,12 +8299,12 @@@ msgstr "
  "commandes standard <command>find</command> et <command>dd</command>."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:183
+ #: sources.list.5.xml:199
  msgid "more recognizable URI types"
  msgstr "plus de types d'URI simples à reconnaître"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:185
+ #: sources.list.5.xml:201
  msgid ""
  "APT can be extended with more methods shipped in other optional packages "
  "which should follow the nameing scheme <literal>apt-transport-"
@@@ -9616,7 -8316,7 +8326,7 @@@ msgstr "
  "citerefentry>)."
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:127
+ #: sources.list.5.xml:143
  msgid ""
  "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
  "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@@ -9625,7 -8325,7 +8335,7 @@@ msgstr "
  "ssh et rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:199
+ #: sources.list.5.xml:215
  msgid ""
  "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
  "stable/main, stable/contrib, and stable/non-free."
@@@ -9634,37 -8334,60 +8344,60 @@@ msgstr "
  "debian pour stable/main, stable/contrib et stable/non-free."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:201
+ #: sources.list.5.xml:217
  #, no-wrap
  msgid "deb file:/home/jason/debian stable main contrib non-free"
  msgstr "deb file:/home/jason/debian stable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:203
+ #: sources.list.5.xml:219
  msgid "As above, except this uses the unstable (development) distribution."
  msgstr ""
  "Comme ci-dessus, excepté que cette ligne utilise la distribution "
  "« unstable » (développement)."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:204
+ #: sources.list.5.xml:220
  #, no-wrap
  msgid "deb file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb file:/home/jason/debian unstable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:206
+ #: sources.list.5.xml:222
  msgid "Source line for the above"
  msgstr "La précédente ligne, mais pour les sources."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:207
+ #: sources.list.5.xml:223
  #, no-wrap
  msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:209
+ #: sources.list.5.xml:225
+ msgid ""
+ "The first line gets package information for the architectures in "
+ "<literal>APT::Architectures</literal> while the second always retrieves "
+ "<literal>amd64</literal> and <literal>armel</literal>."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><literallayout>
+ #: sources.list.5.xml:227
+ #, fuzzy, no-wrap
+ #| msgid ""
+ #| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+ #| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+ #| "   "
+ msgid ""
+ "deb http://ftp.debian.org/debian &stable-codename; main\n"
+ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ msgstr ""
+ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+ "   "
+ 
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:230
  msgid ""
  "Uses HTTP to access the archive at archive.debian.org, and uses only the "
  "hamm/main area."
@@@ -9673,13 -8396,13 +8406,13 @@@ msgstr "
  "n'utiliser que la section hamm/main."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:211
+ #: sources.list.5.xml:232
  #, no-wrap
  msgid "deb http://archive.debian.org/debian-archive hamm main"
  msgstr "deb http://archive.debian.org/debian-archive hamm main"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:213
+ #: sources.list.5.xml:234
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the &stable-codename;/contrib area."
@@@ -9688,13 -8411,13 +8421,13 @@@ msgstr "
  "répertoire debian, et n'utiliser que la section &stable-codename;/contrib."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:215
+ #: sources.list.5.xml:236
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:217
+ #: sources.list.5.xml:238
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the unstable/contrib area. If this line appears as "
@@@ -9707,19 -8430,19 +8440,19 @@@ msgstr "
  "apparaissent, une seule session FTP sera utilisée pour les deux lignes."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:221
+ #: sources.list.5.xml:242
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian unstable contrib"
  msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: sources.list.5.xml:230
+ #: sources.list.5.xml:251
  #, no-wrap
  msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
  msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:223
+ #: sources.list.5.xml:244
  msgid ""
  "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
  "directory, and uses only files found under <filename>unstable/binary-i386</"
@@@ -9739,7 -8462,7 +8472,7 @@@ msgstr "
  "type=\"literallayout\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:235
+ #: sources.list.5.xml:256
  msgid "&apt-cache; &apt-conf;"
  msgstr "&apt-cache; &apt-conf;"
  
@@@ -9932,6 -8655,11 +8665,11 @@@ msgstr "
  "problèmes de dépendances par l'intermédiaire d'un certain nombre "
  "d'algorithmes automatiques qui simplifient le choix des paquets à installer."
  
+ #. type: <heading></heading>
+ #: guide.sgml:96
+ msgid "apt-get"
+ msgstr "apt-get"
+ 
  #. type: <p></p>
  #: guide.sgml:102
  msgid ""
@@@ -9987,6 -8715,11 +8725,11 @@@ msgstr "
  "Une fois cette mise à jour effectuée, plusieurs commandes peuvent être "
  "utilisées :"
  
+ #. type: <tag></tag>
+ #: guide.sgml:121
+ msgid "upgrade"
+ msgstr "upgrade"
+ 
  #. type: <p></p>
  #: guide.sgml:131
  msgid ""
@@@ -10010,6 -8743,11 +8753,11 @@@ msgstr "
  "prgn> ou la commande <tt>apt-get install</tt> peuvet être utilisés pour "
  "forcer l'installation de tels paquets."
  
+ #. type: <tag></tag>
+ #: guide.sgml:131
+ msgid "install"
+ msgstr "install"
+ 
  #. type: <p></p>
  #: guide.sgml:140
  msgid ""
@@@ -10031,6 -8769,11 +8779,11 @@@ msgstr "
  "demander une confirmation si des actions autres que ce qui est demandé à la "
  "ligne de commande sont nécessaires."
  
+ #. type: <tag></tag>
+ #: guide.sgml:140
+ msgid "dist-upgrade"
+ msgstr "dist-upgrade"
+ 
  #. type: <p></p>
  #: guide.sgml:149
  msgid ""
@@@ -11306,14 -10049,187 +10059,187 @@@ msgid "Which will use the already fetch
  msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
  
  #, fuzzy
- #~| msgid "<option>--recurse</option>"
- #~ msgid "<option>--host-architecture</option>"
- #~ msgstr "<option>--recurse</option>"
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>17 August 2009</date>"
+ #~ msgid "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 août 2009</date>"
+ 
+ #~ msgid "ORIGINAL AUTHORS"
+ #~ msgstr "AUTEURS D'ORIGINE"
+ 
+ #~ msgid "&apt-author.jgunthorpe;"
+ #~ msgstr "&apt-author.jgunthorpe;"
+ 
+ #~ msgid "CURRENT AUTHORS"
+ #~ msgstr "AUTEURS ACTUELS"
+ 
+ #~ msgid "&apt-author.team;"
+ #~ msgstr "&apt-author.team;"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>17 August 2009</date>"
+ #~ msgid "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 août 2009</date>"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+ #~| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
+ #~| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+ #~| "email; &apt-product; <date>16 January 2010</date>"
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+ #~ "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
+ #~ "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+ #~ "email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+ #~ "firstname> <surname>Burrows</surname> <contrib>Documentation d'origine de "
+ #~ "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+ #~ "email; &apt-product; <date>16 janvier 2010</date>"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
+ #~ msgid "&apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.team; &apt-email; &apt-product; <date>16 février 2010</date>"
+ 
+ #~ msgid ""
+ #~ "<!-- Boiler plate docinfo section -->\n"
+ #~ "<!ENTITY apt-docinfo \"\n"
+ #~ " <refentryinfo>\n"
+ #~ "   <address><email>apt@packages.debian.org</email></address>\n"
+ #~ "   <author>\n"
+ #~ "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+ #~ "     <contrib></contrib>\n"
+ #~ "   </author>\n"
+ #~ "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+ #~ "copyright>\n"
+ #~ "   <date>28 October 2008</date>\n"
+ #~ "   <productname>Linux</productname>\n"
+ #~ " </refentryinfo>\n"
+ #~ "\">\n"
+ #~ msgstr ""
+ #~ "<!-- Boiler plate docinfo section -->\n"
+ #~ "<!ENTITY apt-docinfo \"\n"
+ #~ " <refentryinfo>\n"
+ #~ "   <address><email>apt@packages.debian.org</email></address>\n"
+ #~ "   <author>\n"
+ #~ "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+ #~ "     <contrib></contrib>\n"
+ #~ "   </author>\n"
+ #~ "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+ #~ "copyright>\n"
+ #~ "   <date>28 Octobre 2008</date>\n"
+ #~ "   <productname>Linux</productname>\n"
+ #~ " </refentryinfo>\n"
+ #~ "\">\n"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>04 February 2011</date>"
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>2012-05-21T05:49:00+01:00</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>4 février 2011</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>14 February 2004</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>14 février 2004</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>29 February 2004</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>29 février 2004</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 August 2009</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 août 2009</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>08 November 2008</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>08 Novembre 2008</date>"
  
  #, fuzzy
- #~| msgid "Max-ValidTime"
- #~ msgid "Min-ValidTime"
- #~ msgstr "Max-ValidTime"
+ #~| msgid ""
+ #~| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>9 August 2009</date>"
+ #~ msgid ""
+ #~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>21 April 2011</date>"
+ #~ msgstr ""
+ #~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+ #~ "août 2009</date>"
+ 
+ #~ msgid ""
+ #~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
+ #~ "get check</command>. It builds the source and package caches from the "
+ #~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</"
+ #~ "filename>."
+ #~ msgstr ""
+ #~ "La commande <literal>gencaches</literal> fait la même chose que "
+ #~ "<command>apt-get check</command>. Elle construit les caches des sources "
+ #~ "et des paquets à partir des sources répertoriées dans &sources-list; et "
+ #~ "dans <filename>/var/lib/dpkg/status</filename>."
+ 
+ #~ msgid ""
+ #~ "One setting is provided to control the pipeline depth in cases where the "
+ #~ "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
+ #~ "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
+ #~ "5 indicating how many outstanding requests APT should send. A value of "
+ #~ "zero MUST be specified if the remote host does not properly linger on TCP "
+ #~ "connections - otherwise data corruption will occur. Hosts which require "
+ #~ "this are in violation of RFC 2068."
+ #~ msgstr ""
+ #~ "Une option de configuration est fournie pour contrôler la profondeur du "
+ #~ "tube pour le cas où un serveur distant n'est pas conforme à la RFC ou est "
+ #~ "bogué (comme Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth </"
+ #~ "literal> a une valeur comprise entre 0 et 5 : elle indique le nombre de "
+ #~ "requêtes en attente qui peuvent être émises. Quand la machine distante ne "
+ #~ "conserve pas correctement les connexions TCP, la valeur doit égale à 0. "
+ #~ "Dans le cas contraire, des données seront corrompues. Les machines qui "
+ #~ "ont besoin de cette option ne respectent pas la RFC 2068."
+ 
+ #~ msgid "add <replaceable>filename</replaceable>"
+ #~ msgstr "add <replaceable>fichier</replaceable>"
+ 
+ #~ msgid "del <replaceable>keyid</replaceable>"
+ #~ msgstr "del <replaceable>clé</replaceable>"
+ 
+ #~ msgid "export <replaceable>keyid</replaceable>"
+ #~ msgstr "export <replaceable>clé</replaceable>"
+ 
+ #~ msgid ""
+ #~ "Update the local keyring with the keyring of Debian archive keys and "
+ #~ "removes from the keyring the archive keys which are no longer valid."
+ #~ msgstr ""
+ #~ "Mettre à jour le trousseau de clés local avec le trousseau de clés de "
+ #~ "l'archive Debian et supprimer les clés qui y sont périmées."
+ 
+ #~ msgid "--keyring <replaceable>filename</replaceable>"
+ #~ msgstr "--keyring <replaceable>fichier</replaceable>"
  
  #, fuzzy
  #~| msgid ""
@@@ -11327,13 -10243,15 +10253,15 @@@
  #~| "using the earlier date of the two. Archive specific settings can be made "
  #~| "by appending the label of the archive to the option name."
  #~ msgid ""
- #~ "Minimum of seconds the Release file should be considered valid after it "
- #~ "was created (indicated by the <literal>Date</literal> header).  Use this "
- #~ "if you need to use a seldomly updated (local) mirror of a more regular "
- #~ "updated archive with a <literal>Valid-Until</literal> header instead of "
- #~ "completely disabling the expiration date checking.  Archive specific "
- #~ "settings can and should be used by appending the label of the archive to "
- #~ "the option name."
+ #~ "Seconds the Release file should be considered valid after it was created. "
+ #~ "The default is \"for ever\" (0) if the Release file of the archive "
+ #~ "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+ #~ "this date is the default. The date from the Release file or the date "
+ #~ "specified by the creation time of the Release file (<literal>Date</"
+ #~ "literal> header) plus the seconds specified with this options are used to "
+ #~ "check if the validation of a file has expired by using the earlier date "
+ #~ "of the two. Archive specific settings can be made by appending the label "
+ #~ "of the archive to the option name."
  #~ msgstr ""
  #~ "Durée (en secondes) pendant laquelle un fichier Release est considéré "
  #~ "comme valable, à partir du moment de sa création. La valeur par défaut "
@@@ -11346,22 -10264,6 +10274,6 @@@
  #~ "est obsolète ou pas. Un réglage spécifique pour une archive donnée peut "
  #~ "être défini en ajoutant l'étiquette de l'archive au nom de l'option."
  
- #, fuzzy
- #~| msgid ""
- #~| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
- #~| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
- #~| "   "
- #~ msgid ""
- #~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
- #~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
- #~ msgstr ""
- #~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
- #~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
- #~ "   "
- 
- #~ 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 "
@@@ -11372,24 -10274,9 +10284,9 @@@
  #~ "MD5Sum là où c'est possible. Élément de configuration : <literal>APT::"
  #~ "FTPArchive::MD5</literal>."
  
- #~ msgid "unmarkauto"
- #~ msgstr "unmarkauto"
- 
- #~ msgid "<option>-h</option>"
- #~ msgstr "<option>-h</option>"
- 
- #~ msgid "<option>--help</option>"
- #~ msgstr "<option>--help</option>"
- 
  #~ msgid "Show a short usage summary."
  #~ msgstr "Affiche un résumé de l'aide"
  
- #~ msgid "<option>-v</option>"
- #~ msgstr "<option>-v</option>"
- 
- #~ msgid "<option>--version</option>"
- #~ msgstr "<option>--version</option>"
- 
  #~ msgid "Show the program version."
  #~ msgstr "Affiche la version du programme."
  
@@@ -11423,9 -10310,6 +10320,6 @@@
  #~ "sur la sortie standard avec un résumé MD5 et un résumé SHA1 pour chaque "
  #~ "fichier."
  
- #~ msgid "<option>--install-recommends</option>"
- #~ msgstr "<option>--install-recommends</option>"
- 
  #~ msgid "Also install recommended packages."
  #~ msgstr "Installer également les paquets recommandés."
  
@@@ -11482,9 -10366,6 +10376,6 @@@
  #~ "<literal>Dir::State</literal> définit le chemin d'accès au fichier "
  #~ "<filename>extended_states</filename>."
  
- #~ msgid "Cache-Limit"
- #~ msgstr "Cache-Limit"
- 
  #~ msgid ""
  #~ "APT uses a fixed size memory mapped cache file to store the 'available' "
  #~ "information. This sets the size of that cache (in bytes)."
@@@ -11554,13 -10435,6 +10445,6 @@@
  #~ msgid "<filename>/etc/apt/sources.list</filename>"
  #~ msgstr "<filename>/etc/apt/sources.list</filename>"
  
- #~ msgid ""
- #~ "Locations to fetch packages from.  Configuration Item: <literal>Dir::Etc::"
- #~ "SourceList</literal>."
- #~ msgstr ""
- #~ "Emplacements où aller chercher les paquets. Élément de configuration : "
- #~ "<literal>Dir::Etc::SourceList</literal>."
- 
  #~ msgid "<filename>&statedir;/lists/</filename>"
  #~ msgstr "<filename>&statedir;/lists/</filename>"
  
diff --combined doc/po/it.po
index 4571690e1,e8e0d5e4e..4f2f266ab
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@@ -9,7 -9,7 +9,8 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: \n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
 -"POT-Creation-Date: 2012-05-21 13:35+0300\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:47+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"
@@@ -128,31 -128,7 +129,7 @@@ msgid "apt was written by the APT team 
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:2
- msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
- msgstr ""
- 
- #. type: Plain text
- #: apt.ent:16
- #, no-wrap
- msgid ""
- "<!-- Boiler plate docinfo section -->\n"
- "<!ENTITY apt-docinfo \"\n"
- " <refentryinfo>\n"
- "   <address><email>apt@packages.debian.org</email></address>\n"
- "   <author>\n"
- "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
- "     <contrib></contrib>\n"
- "   </author>\n"
- "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
- "   <date>28 October 2008</date>\n"
- "   <productname>Linux</productname>\n"
- " </refentryinfo>\n"
- "\">\n"
- msgstr ""
- 
- #. type: Plain text
- #: apt.ent:23
+ #: apt.ent:7
  #, no-wrap
  msgid ""
  "<!ENTITY apt-author.team \"\n"
@@@ -164,7 -140,7 +141,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:29
+ #: apt.ent:13
  #, no-wrap
  msgid ""
  "<!ENTITY apt-qapage \"\n"
@@@ -175,7 -151,7 +152,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:40
+ #: apt.ent:24
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Bug reporting section -->\n"
@@@ -191,7 -167,7 +168,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:48
+ #: apt.ent:32
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Author section -->\n"
@@@ -204,7 -180,7 +181,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:58
+ #: apt.ent:42
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -219,7 -195,7 +196,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:66
+ #: apt.ent:50
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -232,7 -208,7 +209,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:78
+ #: apt.ent:62
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -249,7 -225,7 +226,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:90
+ #: apt.ent:74
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -266,7 -242,7 +243,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:101
+ #: apt.ent:85
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -282,7 -258,7 +259,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:107
+ #: apt.ent:91
  #, no-wrap
  msgid ""
  "<!ENTITY file-aptconf \"\n"
@@@ -293,7 -269,7 +270,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:113
+ #: apt.ent:97
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@@ -304,7 -280,7 +281,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:119
+ #: apt.ent:103
  #, no-wrap
  msgid ""
  "<!ENTITY file-cachearchives \"\n"
@@@ -315,18 -291,18 +292,18 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:125
+ #: apt.ent:109
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
  "     <listitem><para>Storage area for package files in transit.\n"
- "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:135
+ #: apt.ent:119
  #, no-wrap
  msgid ""
  "<!ENTITY file-preferences \"\n"
@@@ -341,7 -317,7 +318,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:141
+ #: apt.ent:125
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@@ -352,7 -328,7 +329,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:147
+ #: apt.ent:131
  #, no-wrap
  msgid ""
  "<!ENTITY file-sourceslist \"\n"
@@@ -363,7 -339,7 +340,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:153
+ #: apt.ent:137
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@@ -374,7 -350,7 +351,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:160
+ #: apt.ent:144
  #, no-wrap
  msgid ""
  "<!ENTITY file-statelists \"\n"
@@@ -386,18 -362,18 +363,18 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:166
+ #: apt.ent:150
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
  "     <listitem><para>Storage area for state information in transit.\n"
- "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:172
+ #: apt.ent:156
  #, no-wrap
  msgid ""
  "<!ENTITY file-trustedgpg \"\n"
@@@ -408,7 -384,7 +385,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:179
+ #: apt.ent:163
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@@ -420,7 -396,7 +397,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:187
+ #: apt.ent:171
  #, no-wrap
  msgid ""
  "<!ENTITY file-extended_states \"\n"
@@@ -433,7 -409,7 +410,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:191
+ #: apt.ent:175
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@@ -442,7 -418,7 +419,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:200
+ #: apt.ent:184
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@@ -456,7 -432,7 +433,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:210
+ #: apt.ent:195
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@@ -471,31 -447,133 +448,133 @@@
  "\">\n"
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cache.8.xml:16
+ #. type: Plain text
+ #: apt.ent:198
  msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
- "February 2011</date>"
+ "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+ "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cache.8.xml:25 apt-cache.8.xml:32
- #, fuzzy
- msgid "apt-cache"
- msgstr "apt-get"
+ #. type: Plain text
+ #: apt.ent:201
+ msgid ""
+ "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+ "synopsis-config-file \"config_file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:204
+ msgid ""
+ "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+ "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+ "\"target_release\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:207
+ msgid ""
+ "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+ "synopsis-architecture \"architecture\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:210
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+ "--> <!ENTITY synopsis-pkg \"pkg\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:213
+ msgid ""
+ "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+ "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:216
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+ "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:219
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+ "awesome --> <!ENTITY synopsis-regex \"regex\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:222
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+ "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:225
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+ "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+ "\"temporary_directory\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:228
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+ "synopsis-filename \"filename\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:231
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:234
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-override "
+ "\"override-file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:237
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+ "\"pathprefix\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:240
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "generate section --> <!ENTITY synopsis-section \"section\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:243
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+ msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26
- #: apt-key.8.xml:18 apt-mark.8.xml:26 apt-secure.8.xml:18
+ #: apt-key.8.xml:25 apt-mark.8.xml:26 apt-secure.8.xml:25
  msgid "8"
  msgstr ""
  
  #. type: Content of: <refentry><refmeta><refmiscinfo>
  #: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27
  #: apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27
- #: apt-key.8.xml:19 apt-mark.8.xml:27 apt-secure.8.xml:19
- #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:33 apt_preferences.5.xml:26
+ #: apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26
+ #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:32 apt_preferences.5.xml:26
  #: sources.list.5.xml:27
  msgid "APT"
  msgstr ""
@@@ -505,41 -583,17 +584,17 @@@
  msgid "query the APT cache"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cache.8.xml:39
- msgid ""
- "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
- "<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
- "arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
- "arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
- "arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
- #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
- #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
- #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+ #: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+ #: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+ #: apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50
+ #: apt-sortpkgs.1.xml:38 apt.conf.5.xml:41 apt_preferences.5.xml:36
  #: sources.list.5.xml:36
  msgid "Description"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:65
+ #: apt-cache.8.xml:39
  msgid ""
  "<command>apt-cache</command> performs a variety of operations on APT's "
  "package cache. <command>apt-cache</command> does not manipulate the state of "
@@@ -548,32 -602,28 +603,28 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:70 apt-get.8.xml:120
+ #: apt-cache.8.xml:44 apt-get.8.xml:44
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given, "
  "one of the commands below must be present."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:74
- msgid "gencaches"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:75
+ #: apt-cache.8.xml:49
  msgid ""
- "<literal>gencaches</literal> performs the same operation as <command>apt-get "
- "check</command>. It builds the source and package caches from the sources in "
- "&sources-list; and from <filename>/var/lib/dpkg/status</filename>."
+ "<literal>gencaches</literal> creates APT's package cache. This is done "
+ "implicitly by all commands needing this cache if it is missing or outdated."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:81
- msgid "showpkg <replaceable>pkg(s)</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+ #: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
+ #: apt-cache.8.xml:226 apt-cache.8.xml:238
+ msgid "&synopsis-pkg;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:82
+ #: apt-cache.8.xml:54
  msgid ""
  "<literal>showpkg</literal> displays information about the packages listed on "
  "the command line. Remaining arguments are package names. The available "
@@@ -587,7 -637,7 +638,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-cache.8.xml:94
+ #: apt-cache.8.xml:66
  #, no-wrap
  msgid ""
  "Package: libreadline2\n"
@@@ -603,7 -653,7 +654,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:106
+ #: apt-cache.8.xml:78
  msgid ""
  "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
  "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@@ -614,27 -664,22 +665,22 @@@
  "best to consult the apt source code."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:115
- msgid "stats"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:115
+ #: apt-cache.8.xml:87
  msgid ""
  "<literal>stats</literal> displays some statistics about the cache.  No "
  "further arguments are expected. Statistics reported are:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:118
+ #: apt-cache.8.xml:90
  msgid ""
  "<literal>Total package names</literal> is the number of package names found "
  "in the cache."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:122
+ #: apt-cache.8.xml:94
  msgid ""
  "<literal>Normal packages</literal> is the number of regular, ordinary "
  "package names; these are packages that bear a one-to-one correspondence "
@@@ -643,7 -688,7 +689,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:128
+ #: apt-cache.8.xml:100
  msgid ""
  "<literal>Pure virtual packages</literal> is the number of packages that "
  "exist only as a virtual package name; that is, packages only \"provide\" the "
@@@ -654,7 -699,7 +700,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:136
+ #: apt-cache.8.xml:108
  msgid ""
  "<literal>Single virtual packages</literal> is the number of packages with "
  "only one package providing a particular virtual package. For example, in the "
@@@ -663,7 -708,7 +709,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:142
+ #: apt-cache.8.xml:114
  msgid ""
  "<literal>Mixed virtual packages</literal> is the number of packages that "
  "either provide a particular virtual package or have the virtual package name "
@@@ -672,7 -717,7 +718,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:149
+ #: apt-cache.8.xml:121
  msgid ""
  "<literal>Missing</literal> is the number of package names that were "
  "referenced in a dependency but were not provided by any package. Missing "
@@@ -682,7 -727,7 +728,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:156
+ #: apt-cache.8.xml:128
  msgid ""
  "<literal>Total distinct</literal> versions is the number of package versions "
  "found in the cache; this value is therefore at least equal to the number of "
@@@ -692,80 -737,55 +738,55 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:163
+ #: apt-cache.8.xml:135
  msgid ""
  "<literal>Total dependencies</literal> is the number of dependency "
  "relationships claimed by all of the packages in the cache."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:170
- msgid "showsrc <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:171
+ #: apt-cache.8.xml:143
  msgid ""
  "<literal>showsrc</literal> displays all the source package records that "
  "match the given package names. All versions are shown, as well as all "
  "records that declare the name to be a Binary."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:176 apt-config.8.xml:87
- msgid "dump"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:177
+ #: apt-cache.8.xml:149
  msgid ""
  "<literal>dump</literal> shows a short listing of every package in the cache. "
  "It is primarily for debugging."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:181
- msgid "dumpavail"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:182
+ #: apt-cache.8.xml:154
  msgid ""
  "<literal>dumpavail</literal> prints out an available list to stdout. This is "
  "suitable for use with &dpkg; and is used by the &dselect; method."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:186
- msgid "unmet"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:187
+ #: apt-cache.8.xml:159
  msgid ""
  "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
  "package cache."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:191
- msgid "show <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:192
+ #: apt-cache.8.xml:164
  msgid ""
  "<literal>show</literal> performs a function similar to <command>dpkg --print-"
  "avail</command>; it displays the package records for the named packages."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:197
- msgid "search <replaceable>regex [ regex ... ]</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:169
+ msgid "&synopsis-regex;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:198
+ #: apt-cache.8.xml:170
  msgid ""
  "<literal>search</literal> performs a full text search on all available "
  "package lists for the POSIX regex pattern given, see "
@@@ -780,43 -800,33 +801,33 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:211
+ #: apt-cache.8.xml:183
  msgid ""
  "Separate arguments can be used to specify multiple search patterns that are "
  "and'ed together."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:215
- msgid "depends <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:216
+ #: apt-cache.8.xml:188
  msgid ""
  "<literal>depends</literal> shows a listing of each dependency a package has "
  "and all the possible other packages that can fulfill that dependency."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:220
- msgid "rdepends <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:221
+ #: apt-cache.8.xml:193
  msgid ""
  "<literal>rdepends</literal> shows a listing of each reverse dependency a "
  "package has."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:225
- msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+ #: apt-cache.8.xml:197
+ msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:226
+ #: apt-cache.8.xml:198
  msgid ""
  "This command prints the name of each package APT knows. The optional "
  "argument is a prefix match to filter the name list. The output is suitable "
@@@ -826,20 -836,15 +837,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:231
+ #: apt-cache.8.xml:203
  msgid ""
  "Note that a package which APT knows of is not necessarily available to "
  "download, installable or installed, e.g. virtual packages are also listed in "
  "the generated list."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:236
- msgid "dotty <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:237
+ #: apt-cache.8.xml:209
  msgid ""
  "<literal>dotty</literal> takes a list of packages on the command line and "
  "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@@ -852,7 -857,7 +858,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:246
+ #: apt-cache.8.xml:218
  msgid ""
  "The resulting nodes will have several shapes; normal packages are boxes, "
  "pure provides are triangles, mixed provides are diamonds, missing packages "
@@@ -861,29 -866,24 +867,24 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:251
+ #: apt-cache.8.xml:223
  msgid "Caution, dotty cannot graph larger sets of packages."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:254
- msgid "xvcg <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:255
+ #: apt-cache.8.xml:227
  msgid ""
  "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
  "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:259
- msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
+ #: apt-cache.8.xml:231
+ msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:260
+ #: apt-cache.8.xml:232
  msgid ""
  "<literal>policy</literal> is meant to help debug issues relating to the "
  "preferences file. With no arguments it will print out the priorities of each "
@@@ -891,13 -891,8 +892,8 @@@
  "selection of the named package."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:266
- msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:267
+ #: apt-cache.8.xml:239
  msgid ""
  "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
  "to mimic the output format and a subset of the functionality of the Debian "
@@@ -908,44 -903,23 +904,23 @@@
  "Architecture</literal>)."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
- #: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
- #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+ #. type: Content of: <refentry><refsect1><title>
+ #: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+ #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+ #: apt-sortpkgs.1.xml:48
  msgid "options"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>-p</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>--pkg-cache</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:283
+ #: apt-cache.8.xml:255
  msgid ""
  "Select the file to store the package cache. The package cache is the primary "
  "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
  "pkgcache</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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 ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:288
- msgid "<option>--src-cache</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:289
+ #: apt-cache.8.xml:261
  msgid ""
  "Select the file to store the source cache. The source is used only by "
  "<literal>gencaches</literal> and it stores a parsed version of the package "
@@@ -954,18 -928,8 +929,8 @@@
  "Item: <literal>Dir::Cache::srcpkgcache</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:545 apt-get.8.xml:383
- msgid "<option>--quiet</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:297
+ #: apt-cache.8.xml:269
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quietness up to a maximum of 2. You can also use "
@@@ -973,103 -937,33 +938,33 @@@
  "configuration file.  Configuration Item: <literal>quiet</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>-i</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>--important</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:304
+ #: apt-cache.8.xml:276
  msgid ""
  "Print only important dependencies; for use with unmet and depends. Causes "
  "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
  "<literal>APT::Cache::Important</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:309
- msgid "<option>--no-pre-depends</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:310
- msgid "<option>--no-depends</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:311
- msgid "<option>--no-recommends</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:312
- msgid "<option>--no-suggests</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:313
- msgid "<option>--no-conflicts</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:314
- msgid "<option>--no-breaks</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:315
- msgid "<option>--no-replaces</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:316
- msgid "<option>--no-enhances</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:317
+ #: apt-cache.8.xml:289
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
- "print all dependencies. This can be twicked with these flags which will omit "
+ "print all dependencies. This can be tweaked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
- msgid "<option>-f</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323
- msgid "<option>--full</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:324
+ #: apt-cache.8.xml:296
  msgid ""
  "Print full package records when searching.  Configuration Item: "
  "<literal>APT::Cache::ShowFull</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
- msgid "<option>-a</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:328
- msgid "<option>--all-versions</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:329
+ #: apt-cache.8.xml:301
  msgid ""
  "Print full records for all available versions. This is the default; to turn "
  "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@@ -1079,74 -973,39 +974,39 @@@
  "<literal>APT::Cache::AllVersions</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>-g</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>--generate</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:338
+ #: apt-cache.8.xml:310
  msgid ""
  "Perform automatic package cache regeneration, rather than use the cache as "
  "it is. This is the default; to turn it off, use <option>--no-generate</"
  "option>.  Configuration Item: <literal>APT::Cache::Generate</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343
- msgid "<option>--names-only</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343 apt-cdrom.8.xml:142
- msgid "<option>-n</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:344
+ #: apt-cache.8.xml:316
  msgid ""
  "Only search on the package names, not the long descriptions.  Configuration "
  "Item: <literal>APT::Cache::NamesOnly</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:348
- msgid "<option>--all-names</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:349
+ #: apt-cache.8.xml:321
  msgid ""
  "Make <literal>pkgnames</literal> print all names, including virtual packages "
  "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
  "AllNames</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:354
- msgid "<option>--recurse</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:355
+ #: apt-cache.8.xml:327
  msgid ""
  "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
  "that all packages mentioned are printed once.  Configuration Item: "
  "<literal>APT::Cache::RecurseDepends</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:360
- msgid "<option>--installed</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:362
+ #: apt-cache.8.xml:334
  msgid ""
  "Limit the output of <literal>depends</literal> and <literal>rdepends</"
  "literal> to packages which are currently installed.  Configuration Item: "
@@@ -1154,80 -1013,58 +1014,58 @@@
  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:611 apt-get.8.xml:570
- #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+ #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
+ #: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+ #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
  msgid "&apt-commonoptions;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
- #: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+ #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+ #: apt.conf.5.xml:1118 apt_preferences.5.xml:698
  msgid "Files"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:374
+ #: apt-cache.8.xml:346
  msgid "&file-sourceslist; &file-statelists;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
- #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
- #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
- #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
- #: sources.list.5.xml:234
+ #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+ #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+ #: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+ #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
+ #: sources.list.5.xml:255
  msgid "See Also"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:380
+ #: apt-cache.8.xml:352
  msgid "&apt-conf;, &sources-list;, &apt-get;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
- #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
- #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+ #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+ #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+ #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
  msgid "Diagnostics"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:385
+ #: apt-cache.8.xml:357
  msgid ""
  "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
  "on error."
  msgstr ""
  
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cdrom.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "February 2004</date>"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cdrom.8.xml:24 apt-cdrom.8.xml:31
- msgid "apt-cdrom"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-cdrom.8.xml:32
  msgid "APT CDROM management utility"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cdrom.8.xml:38
- msgid ""
- "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
- "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
- "<arg>add</arg> <arg>ident</arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:51
+ #: apt-cdrom.8.xml:38
  msgid ""
  "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
  "available sources. <command>apt-cdrom</command> takes care of determining "
@@@ -1236,20 -1073,15 +1074,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:58
+ #: apt-cdrom.8.xml:45
  msgid ""
  "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
  "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
  "must be inserted and scanned separately to account for possible mis-burns."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:68
- msgid "add"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:69
+ #: apt-cdrom.8.xml:56
  msgid ""
  "<literal>add</literal> is used to add a new disc to the source list. It will "
  "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@@ -1259,27 -1091,22 +1092,22 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:77
+ #: apt-cdrom.8.xml:64
  msgid ""
  "APT uses a CDROM ID to track which disc is currently in the drive and "
  "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
  "filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:84
- msgid "ident"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:85
+ #: apt-cdrom.8.xml:72
  msgid ""
  "A debugging tool to report the identity of the current disc as well as the "
  "stored file name"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:64
+ #: apt-cdrom.8.xml:51
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present.  <placeholder type=\"variablelist"
@@@ -1287,71 -1114,36 +1115,36 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cdrom.8.xml:94 apt-key.8.xml:158
+ #: apt-cdrom.8.xml:81 apt-key.8.xml:160
  msgid "Options"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
- msgid "<option>-d</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98
- msgid "<option>--cdrom</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:99
+ #: apt-cdrom.8.xml:86
  msgid ""
  "Mount point; specify the location to mount the cdrom. This mount point must "
  "be listed in <filename>/etc/fstab</filename> and properly configured.  "
  "Configuration Item: <literal>Acquire::cdrom::mount</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>-r</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>--rename</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:108
+ #: apt-cdrom.8.xml:95
  msgid ""
  "Rename a disc; change the label of a disk or override the disks given label. "
  "This option will cause <command>apt-cdrom</command> to prompt for a new "
  "label.  Configuration Item: <literal>APT::CDROM::Rename</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116 apt-get.8.xml:364
- msgid "<option>-m</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116
- msgid "<option>--no-mount</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:117
+ #: apt-cdrom.8.xml:104
  msgid ""
  "No mounting; prevent <command>apt-cdrom</command> from mounting and "
  "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
  "NoMount</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:124
- msgid "<option>--fast</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:125
+ #: apt-cdrom.8.xml:112
  msgid ""
  "Fast Copy; Assume the package files are valid and do not check every "
  "package. This option should be used only if <command>apt-cdrom</command> has "
@@@ -1359,36 -1151,16 +1152,16 @@@
  "Item: <literal>APT::CDROM::Fast</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:134
- msgid "<option>--thorough</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:135
+ #: apt-cdrom.8.xml:122
  msgid ""
  "Thorough Package Scan; This option may be needed with some old Debian "
  "1.1/1.2 discs that have Package files in strange places. It takes much "
  "longer to scan the CD but will pick them all up."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:143 apt-get.8.xml:395
- msgid "<option>--just-print</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:144 apt-get.8.xml:397
- msgid "<option>--recon</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:145 apt-get.8.xml:398
- msgid "<option>--no-act</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:146
+ #: apt-cdrom.8.xml:133
  msgid ""
  "No Changes; Do not change the &sources-list; file and do not write index "
  "files. Everything is still checked however.  Configuration Item: "
@@@ -1396,47 -1168,24 +1169,24 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:159
+ #: apt-cdrom.8.xml:146
  msgid "&apt-conf;, &apt-get;, &sources-list;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:164
+ #: apt-cdrom.8.xml:151
  msgid ""
  "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
  "on error."
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-config.8.xml:16 apt-extracttemplates.1.xml:16 apt-sortpkgs.1.xml:16
- #: sources.list.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
- "February 2004</date>"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-config.8.xml:25 apt-config.8.xml:32
- msgid "apt-config"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-config.8.xml:33
  msgid "APT Configuration Query program"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-config.8.xml:39
- msgid ""
- "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>shell</arg> <arg>dump</arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:51
+ #: apt-config.8.xml:39
  msgid ""
  "<command>apt-config</command> is an internal program used by various "
  "portions of the APT suite to provide consistent configurability. It accesses "
@@@ -1445,19 -1194,14 +1195,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+ #: apt-config.8.xml:44 apt-ftparchive.1.xml:54
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-config.8.xml:61
- msgid "shell"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:63
+ #: apt-config.8.xml:51
  msgid ""
  "shell is used to access the configuration information from a shell script. "
  "It is given pairs of arguments, the first being a shell variable and the "
@@@ -1467,7 -1211,7 +1212,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-config.8.xml:71
+ #: apt-config.8.xml:59
  #, no-wrap
  msgid ""
  "OPTS=\"-f\"\n"
@@@ -1476,14 -1220,14 +1221,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:76
+ #: apt-config.8.xml:64
  msgid ""
  "This will set the shell environment variable $OPTS to the value of MyApp::"
  "options with a default of <option>-f</option>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:80
+ #: apt-config.8.xml:68
  msgid ""
  "The configuration item may be postfixed with a /[fdbi]. f returns file "
  "names, d returns directories, b returns true or false and i returns an "
@@@ -1491,28 -1235,47 +1236,47 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:89
+ #: apt-config.8.xml:77
  msgid "Just show the contents of the configuration space."
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:90
+ msgid ""
+ "Include options which have an empty value. This is the default, so use --no-"
+ "empty to remove them from the output."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-config.8.xml:95
+ msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:96
+ msgid ""
+ "Defines the output of each config option. &percnt;t will be replaced with "
+ "the name of the option, &percnt;f with the complete optionname and &percnt;v "
+ "with the value of the option.  Use uppercase letters and special characters "
+ "in the value will be encoded to ensure that it can e.g. be savely used in a "
+ "quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
+ "by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
+ "&percnt;."
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
- #: apt-sortpkgs.1.xml:73
+ #: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
+ #: apt-sortpkgs.1.xml:64
  msgid "&apt-conf;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:112
+ #: apt-config.8.xml:115
  msgid ""
  "<command>apt-config</command> returns zero on normal operation, decimal 100 "
  "on error."
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-extracttemplates.1.xml:25 apt-extracttemplates.1.xml:32
- msgid "apt-extracttemplates"
- msgstr ""
- 
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
  msgid "1"
@@@ -1523,17 -1286,8 +1287,8 @@@ msgstr "
  msgid "Utility to extract DebConf config and templates from Debian packages"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-extracttemplates.1.xml:39
- msgid ""
- "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
- "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
- "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
- "arg>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:47
+ #: apt-extracttemplates.1.xml:39
  msgid ""
  "<command>apt-extracttemplates</command> will take one or more Debian package "
  "files as input and write out (to a temporary directory) all associated "
@@@ -1543,31 -1297,22 +1298,22 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:52
+ #: apt-extracttemplates.1.xml:44
  msgid "package version template-file config-script"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:53
+ #: apt-extracttemplates.1.xml:45
  msgid ""
  "template-file and config-script are written to the temporary directory "
- "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
- "literal>)  directory, with filenames of the form <filename>package.template."
- "XXXX</filename> and <filename>package.config.XXXX</filename>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
- msgid "<option>-t</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63
- msgid "<option>--tempdir</option>"
+ "specified by the <option>-t</option> or <option>--tempdir</option> "
+ "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+ "filenames of the form <filename>package.template.XXXX</filename> and "
+ "<filename>package.config.XXXX</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-extracttemplates.1.xml:65
+ #: apt-extracttemplates.1.xml:58
  msgid ""
  "Temporary directory in which to write extracted debconf template files and "
  "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@@ -1575,55 -1320,19 +1321,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:82
+ #: apt-extracttemplates.1.xml:75
  msgid ""
  "<command>apt-extracttemplates</command> returns zero on normal operation, "
  "decimal 100 on error."
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-ftparchive.1.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
- "August 2009</date>"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-ftparchive.1.xml:25 apt-ftparchive.1.xml:32
- msgid "apt-ftparchive"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-ftparchive.1.xml:33
  msgid "Utility to generate index files"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-ftparchive.1.xml:39
- msgid ""
- "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
- "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
- "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
- "arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
- "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
- "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
- "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
- "replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
- "arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
- "arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
- "replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
- "\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:60
+ #: apt-ftparchive.1.xml:39
  msgid ""
  "<command>apt-ftparchive</command> is the command line tool that generates "
  "the index files that APT uses to access a distribution source. The index "
@@@ -1632,7 -1341,7 +1342,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:64
+ #: apt-ftparchive.1.xml:43
  msgid ""
  "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
  "program, incorporating its entire functionality via the <literal>packages</"
@@@ -1642,7 -1351,7 +1352,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:70
+ #: apt-ftparchive.1.xml:49
  msgid ""
  "Internally <command>apt-ftparchive</command> can make use of binary "
  "databases to cache the contents of a .deb file and it does not rely on any "
@@@ -1651,13 -1360,8 +1361,8 @@@
  "output files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:79
- msgid "packages"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:81
+ #: apt-ftparchive.1.xml:60
  msgid ""
  "The packages command generates a package file from a directory tree. It "
  "takes the given directory and recursively searches it for .deb files, "
@@@ -1666,18 -1370,13 +1371,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+ #: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
  msgid ""
  "The option <option>--db</option> can be used to specify a binary caching DB."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:89
- msgid "sources"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:91
+ #: apt-ftparchive.1.xml:70
  msgid ""
  "The <literal>sources</literal> command generates a source index file from a "
  "directory tree.  It takes the given directory and recursively searches it "
@@@ -1686,20 -1385,15 +1386,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:96
+ #: apt-ftparchive.1.xml:75
  msgid ""
  "If an override file is specified then a source override file will be looked "
  "for with an extension of .src. The --source-override option can be used to "
  "change the source override file that will be used."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:101
- msgid "contents"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:103
+ #: apt-ftparchive.1.xml:82
  msgid ""
  "The <literal>contents</literal> command generates a contents file from a "
  "directory tree. It takes the given directory and recursively searches it "
@@@ -1709,13 -1403,8 +1404,8 @@@
  "package is separated by a comma in the output."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:113
- msgid "release"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:115
+ #: apt-ftparchive.1.xml:94
  msgid ""
  "The <literal>release</literal> command generates a Release file from a "
  "directory tree. It recursively searches the given directory for uncompressed "
@@@ -1730,7 -1419,7 +1420,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:125
+ #: apt-ftparchive.1.xml:104
  msgid ""
  "Values for the additional metadata fields in the Release file are taken from "
  "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@@ -1742,14 -1431,8 +1432,8 @@@
  "<literal>Description</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:136
- #, fuzzy
- msgid "generate"
- msgstr "Descrizione generale"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:138
+ #: apt-ftparchive.1.xml:117
  msgid ""
  "The <literal>generate</literal> command is designed to be runnable from a "
  "cron script and builds indexes according to the given config file. The "
@@@ -1758,25 -1441,20 +1442,20 @@@
  "maintaining the required settings."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:145 apt-get.8.xml:287
- msgid "clean"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:147
+ #: apt-ftparchive.1.xml:126
  msgid ""
  "The <literal>clean</literal> command tidies the databases used by the given "
  "configuration file by removing any records that are no longer necessary."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:153
+ #: apt-ftparchive.1.xml:132
  msgid "The Generate Configuration"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:155
+ #: apt-ftparchive.1.xml:134
  msgid ""
  "The <literal>generate</literal> command uses a configuration file to "
  "describe the archives that are going to be generated. It follows the typical "
@@@ -1787,18 -1465,18 +1466,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:163
+ #: apt-ftparchive.1.xml:142
  msgid ""
  "The generate configuration has 4 separate sections, each described below."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:165
+ #: apt-ftparchive.1.xml:144
  msgid "Dir Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:167
+ #: apt-ftparchive.1.xml:146
  msgid ""
  "The <literal>Dir</literal> section defines the standard directories needed "
  "to locate the files required during the generation process. These "
@@@ -1806,71 -1484,46 +1485,46 @@@
  "to produce a complete an absolute path."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:172
- msgid "ArchiveDir"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:174
+ #: apt-ftparchive.1.xml:153
  msgid ""
  "Specifies the root of the FTP archive, in a standard Debian configuration "
  "this is the directory that contains the <filename>ls-LR</filename> and dist "
  "nodes."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:179
- msgid "OverrideDir"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:181
+ #: apt-ftparchive.1.xml:160
  msgid "Specifies the location of the override files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:184
- msgid "CacheDir"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:186
+ #: apt-ftparchive.1.xml:165
  msgid "Specifies the location of the cache files"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:189
- msgid "FileListDir"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:191
+ #: apt-ftparchive.1.xml:170
  msgid ""
  "Specifies the location of the file list files, if the <literal>FileList</"
  "literal> setting is used below."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:197
+ #: apt-ftparchive.1.xml:176
  msgid "Default Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:199
+ #: apt-ftparchive.1.xml:178
  msgid ""
  "The <literal>Default</literal> section specifies default values, and "
  "settings that control the operation of the generator. Other sections may "
  "override these defaults with a per-section setting."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:203
- msgid "Packages::Compress"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:205
+ #: apt-ftparchive.1.xml:184
  msgid ""
  "Sets the default compression schemes to use for the Package index files. It "
  "is a string that contains a space separated list of at least one of: '.' (no "
@@@ -1878,136 -1531,86 +1532,86 @@@
  "'. gzip'."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:211
- msgid "Packages::Extensions"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:213
+ #: apt-ftparchive.1.xml:192
  msgid ""
  "Sets the default list of file extensions that are package files.  This "
  "defaults to '.deb'."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:217
- msgid "Sources::Compress"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:219
+ #: apt-ftparchive.1.xml:198
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Sources files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:223
- msgid "Sources::Extensions"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:225
+ #: apt-ftparchive.1.xml:204
  msgid ""
  "Sets the default list of file extensions that are source files.  This "
  "defaults to '.dsc'."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:229
- msgid "Contents::Compress"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:231
+ #: apt-ftparchive.1.xml:210
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Contents files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:235
- msgid "Translation::Compress"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:237
+ #: apt-ftparchive.1.xml:216
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Translation-en master file."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:241
- msgid "DeLinkLimit"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:243
+ #: apt-ftparchive.1.xml:222
  msgid ""
  "Specifies the number of kilobytes to delink (and replace with hard links) "
  "per run. This is used in conjunction with the per-section <literal>External-"
  "Links</literal> setting."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:248
- msgid "FileMode"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:250
+ #: apt-ftparchive.1.xml:229
  msgid ""
  "Specifies the mode of all created index files. It defaults to 0644. All "
  "index files are set to this mode with no regard to the umask."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
- msgid "LongDescription"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+ #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
  msgid ""
  "Sets if long descriptions should be included in the Packages file or split "
  "out into a master Translation-en file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:263
+ #: apt-ftparchive.1.xml:242
  msgid "TreeDefault Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:265
+ #: apt-ftparchive.1.xml:244
  msgid ""
  "Sets defaults specific to <literal>Tree</literal> sections. All of these "
  "variables are substitution variables and have the strings $(DIST), "
  "$(SECTION) and $(ARCH) replaced with their respective values."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:270
- msgid "MaxContentsChange"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:272
+ #: apt-ftparchive.1.xml:251
  msgid ""
  "Sets the number of kilobytes of contents files that are generated each day. "
  "The contents files are round-robined so that over several days they will all "
  "be rebuilt."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:277
- msgid "ContentsAge"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:279
+ #: apt-ftparchive.1.xml:258
  msgid ""
  "Controls the number of days a contents file is allowed to be checked without "
  "changing. If this limit is passed the mtime of the contents file is updated. "
@@@ -2017,87 -1620,52 +1621,52 @@@
  "anyhow. The default is 10, the units are in days."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:288
- msgid "Directory"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:290
+ #: apt-ftparchive.1.xml:269
  msgid ""
  "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
  "$(SECTION)/binary-$(ARCH)/</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:294
- msgid "SrcDirectory"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:296
+ #: apt-ftparchive.1.xml:275
  msgid ""
  "Sets the top of the source package directory tree. Defaults to <filename>"
  "$(DIST)/$(SECTION)/source/</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
- msgid "Packages"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:302
+ #: apt-ftparchive.1.xml:281
  msgid ""
  "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "binary-$(ARCH)/Packages</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
- msgid "Sources"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:308
+ #: apt-ftparchive.1.xml:287
  msgid ""
  "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "source/Sources</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:312
- msgid "Translation"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:314
+ #: apt-ftparchive.1.xml:293
  msgid ""
  "Set the output Translation-en master file with the long descriptions if they "
  "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
  "$(SECTION)/i18n/Translation-en</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:319
- msgid "InternalPrefix"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:321
+ #: apt-ftparchive.1.xml:300
  msgid ""
  "Sets the path prefix that causes a symlink to be considered an internal link "
  "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
  "filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
- msgid "Contents"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:328
+ #: apt-ftparchive.1.xml:307
  msgid ""
  "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
  "</filename>. If this setting causes multiple Packages files to map onto a "
@@@ -2105,48 -1673,28 +1674,28 @@@
  "command> will integrate those package files together automatically."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:335
- msgid "Contents::Header"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:337
+ #: apt-ftparchive.1.xml:316
  msgid "Sets header file to prepend to the contents output."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
- msgid "BinCacheDB"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:342
+ #: apt-ftparchive.1.xml:321
  msgid ""
  "Sets the binary cache database to use for this section. Multiple sections "
  "can share the same database."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:346
- msgid "FileList"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:348
+ #: apt-ftparchive.1.xml:327
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
  "Relative files names are prefixed with the archive directory."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:353
- msgid "SourceFileList"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:355
+ #: apt-ftparchive.1.xml:334
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
@@@ -2155,12 -1703,12 +1704,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:363
+ #: apt-ftparchive.1.xml:342
  msgid "Tree Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:365
+ #: apt-ftparchive.1.xml:344
  msgid ""
  "The <literal>Tree</literal> section defines a standard Debian file tree "
  "which consists of a base directory, then multiple sections in that base "
@@@ -2170,7 -1718,7 +1719,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:370
+ #: apt-ftparchive.1.xml:349
  msgid ""
  "The <literal>Tree</literal> section takes a scope tag which sets the "
  "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@@ -2179,7 -1727,7 +1728,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:375
+ #: apt-ftparchive.1.xml:354
  msgid ""
  "All of the settings defined in the <literal>TreeDefault</literal> section "
  "can be use in a <literal>Tree</literal> section as well as three new "
@@@ -2187,7 -1735,7 +1736,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt-ftparchive.1.xml:381
+ #: apt-ftparchive.1.xml:360
  #, no-wrap
  msgid ""
  "for i in Sections do \n"
@@@ -2197,90 -1745,60 +1746,60 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:378
+ #: apt-ftparchive.1.xml:357
  msgid ""
  "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
  "command> performs an operation similar to: <placeholder type=\"programlisting"
  "\" id=\"0\"/>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:387
- msgid "Sections"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:389
+ #: apt-ftparchive.1.xml:368
  msgid ""
  "This is a space separated list of sections which appear under the "
  "distribution, typically this is something like <literal>main contrib non-"
  "free</literal>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:394
- msgid "Architectures"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:396
+ #: apt-ftparchive.1.xml:375
  msgid ""
  "This is a space separated list of all the architectures that appear under "
  "search section. The special architecture 'source' is used to indicate that "
  "this tree has a source archive."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
- msgid "BinOverride"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:409
+ #: apt-ftparchive.1.xml:388
  msgid ""
  "Sets the binary override file. The override file contains section, priority "
  "and maintainer address information."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
- msgid "SrcOverride"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:415
+ #: apt-ftparchive.1.xml:394
  msgid ""
  "Sets the source override file. The override file contains section "
  "information."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
- msgid "ExtraOverride"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+ #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
  msgid "Sets the binary extra override file."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
- msgid "SrcExtraOverride"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+ #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
  msgid "Sets the source extra override file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:431
+ #: apt-ftparchive.1.xml:410
  msgid "BinDirectory Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:433
+ #: apt-ftparchive.1.xml:412
  msgid ""
  "The <literal>bindirectory</literal> section defines a binary directory tree "
  "with no special structure. The scope tag specifies the location of the "
@@@ -2290,64 -1808,54 +1809,54 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:441
+ #: apt-ftparchive.1.xml:420
  msgid "Sets the Packages file output."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:446
+ #: apt-ftparchive.1.xml:425
  msgid ""
  "Sets the Sources file output. At least one of <literal>Packages</literal> or "
  "<literal>Sources</literal> is required."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:452
+ #: apt-ftparchive.1.xml:431
  msgid "Sets the Contents file output. (optional)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:457
+ #: apt-ftparchive.1.xml:436
  msgid "Sets the binary override file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:462
+ #: apt-ftparchive.1.xml:441
  msgid "Sets the source override file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:477
+ #: apt-ftparchive.1.xml:456
  msgid "Sets the cache DB."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:480
- msgid "PathPrefix"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:482
+ #: apt-ftparchive.1.xml:461
  msgid "Appends a path to all the output paths."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:485
- msgid "FileList, SourceFileList"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:487
+ #: apt-ftparchive.1.xml:466
  msgid "Specifies the file list file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:494
+ #: apt-ftparchive.1.xml:473
  msgid "The Binary Override File"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:495
+ #: apt-ftparchive.1.xml:474
  msgid ""
  "The binary override file is fully compatible with &dpkg-scanpackages;. It "
  "contains 4 fields separated by spaces. The first field is the package name, "
@@@ -2357,19 -1865,19 +1866,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:501
+ #: apt-ftparchive.1.xml:480
  #, no-wrap
  msgid "old [// oldn]* => new"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:503
+ #: apt-ftparchive.1.xml:482
  #, no-wrap
  msgid "new"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:500
+ #: apt-ftparchive.1.xml:479
  msgid ""
  "The general form of the maintainer field is: <placeholder type="
  "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@@ -2380,12 -1888,12 +1889,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:511
+ #: apt-ftparchive.1.xml:490
  msgid "The Source Override File"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:513
+ #: apt-ftparchive.1.xml:492
  msgid ""
  "The source override file is fully compatible with &dpkg-scansources;. It "
  "contains 2 fields separated by spaces. The first fields is the source "
@@@ -2393,52 -1901,41 +1902,41 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:518
+ #: apt-ftparchive.1.xml:497
  msgid "The Extra Override File"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:520
+ #: apt-ftparchive.1.xml:499
  msgid ""
  "The extra override file allows any arbitrary tag to be added or replaced in "
  "the output. It has 3 columns, the first is the package, the second is the "
  "tag and the remainder of the line is the new value."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:529
- msgid ""
- "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:531
+ #: apt-ftparchive.1.xml:510
  msgid ""
  "Generate the given checksum. These options default to on, when turned off "
  "the generated index files will not have the checksum fields where possible.  "
  "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:539
- msgid "<option>--db</option>"
+ "<literal><replaceable>Index</replaceable></literal> can be "
+ "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+ "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+ "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:541
+ #: apt-ftparchive.1.xml:521
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
  "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:547
+ #: apt-ftparchive.1.xml:527
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -2446,13 -1943,8 +1944,8 @@@
  "file.  Configuration Item: <literal>quiet</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:553
- msgid "<option>--delink</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:555
+ #: apt-ftparchive.1.xml:535
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
  "then this option actually enables delinking of the files. It defaults to on "
@@@ -2460,13 -1952,8 +1953,8 @@@
  "Item: <literal>APT::FTPArchive::DeLinkAct</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:561
- msgid "<option>--contents</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:563
+ #: apt-ftparchive.1.xml:543
  msgid ""
  "Perform contents generation. When this option is set and package indexes are "
  "being generated with a cache DB then the file listing will also be extracted "
@@@ -2475,38 -1962,23 +1963,23 @@@
  "Configuration Item: <literal>APT::FTPArchive::Contents</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:571
- msgid "<option>--source-override</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:573
+ #: apt-ftparchive.1.xml:553
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
  "literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:577
- msgid "<option>--readonly</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:579
+ #: apt-ftparchive.1.xml:559
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:583
- msgid "<option>--arch</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:584
+ #: apt-ftparchive.1.xml:564
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
  "commands only package files matching <literal>*_arch.deb</literal> or "
@@@ -2514,13 -1986,8 +1987,8 @@@
  "path.  Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:592
+ #: apt-ftparchive.1.xml:572
  msgid ""
  "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
  "packages are recompiled and/or republished with the same version again, this "
@@@ -2533,13 -2000,8 +2001,8 @@@
  "are useless."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:604
+ #: apt-ftparchive.1.xml:584
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
  "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@@ -2549,83 -2011,38 +2012,38 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
- #: sources.list.5.xml:198
+ #: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
+ #: sources.list.5.xml:214
  msgid "Examples"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
- #: apt-ftparchive.1.xml:622
+ #: apt-ftparchive.1.xml:602
  #, no-wrap
  msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:618
+ #: apt-ftparchive.1.xml:598
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:632
+ #: apt-ftparchive.1.xml:612
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-get.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
- "November 2008</date>"
- msgstr ""
- 
- #. type: <heading></heading>
- #: apt-get.8.xml:25 apt-get.8.xml:32 guide.sgml:96
- #, fuzzy
- msgid "apt-get"
- msgstr "apt-get"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-get.8.xml:33
  msgid "APT package handling utility -- command-line interface"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-get.8.xml:39
- msgid ""
- "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
- "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
- "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
- "replaceable> </arg> </arg> <group choice=\"req\"> <arg "
- "choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
- "choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
- "<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
- "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
- "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
- "arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
- "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
- "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
- "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
- "</group> </arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:115
+ #: apt-get.8.xml:39
  msgid ""
  "<command>apt-get</command> is the command-line tool for handling packages, "
  "and may be considered the user's \"back-end\" to other tools using the APT "
@@@ -2633,14 -2050,8 +2051,8 @@@
  "&aptitude;, &synaptic; and &wajig;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:124 apt-key.8.xml:127
- #, fuzzy
- msgid "update"
- msgstr "upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:125
+ #: apt-get.8.xml:49
  msgid ""
  "<literal>update</literal> is used to resynchronize the package index files "
  "from their sources. The indexes of available packages are fetched from the "
@@@ -2653,14 -2064,8 +2065,8 @@@
  "as the size of the package files cannot be known in advance."
  msgstr ""
  
- #. type: <tag></tag>
- #: apt-get.8.xml:136 guide.sgml:121
- #, fuzzy
- msgid "upgrade"
- msgstr "upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:137
+ #: apt-get.8.xml:61
  msgid ""
  "<literal>upgrade</literal> is used to install the newest versions of all "
  "packages currently installed on the system from the sources enumerated in "
@@@ -2674,14 -2079,8 +2080,8 @@@
  "command> knows that new versions of packages are available."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:149
- #, fuzzy
- msgid "dselect-upgrade"
- msgstr "dist-upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:150
+ #: apt-get.8.xml:74
  msgid ""
  "<literal>dselect-upgrade</literal> is used in conjunction with the "
  "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@@ -2691,14 -2090,8 +2091,8 @@@
  "new packages)."
  msgstr ""
  
- #. type: <tag></tag>
- #: apt-get.8.xml:159 guide.sgml:140
- #, fuzzy
- msgid "dist-upgrade"
- msgstr "dist-upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:160
+ #: apt-get.8.xml:84
  msgid ""
  "<literal>dist-upgrade</literal> in addition to performing the function of "
  "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@@ -2711,14 -2104,8 +2105,8 @@@
  "for a mechanism for overriding the general settings for individual packages."
  msgstr ""
  
- #. type: <tag></tag>
- #: apt-get.8.xml:172 guide.sgml:131
- #, fuzzy
- msgid "install"
- msgstr "install"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:174
+ #: apt-get.8.xml:98
  msgid ""
  "<literal>install</literal> is followed by one or more packages desired for "
  "installation or upgrading.  Each package is a package name, not a fully "
@@@ -2734,7 -2121,7 +2122,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:192
+ #: apt-get.8.xml:116
  msgid ""
  "A specific version of a package can be selected for installation by "
  "following the package name with an equals and the version of the package to "
@@@ -2745,14 -2132,14 +2133,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:199
+ #: apt-get.8.xml:123
  msgid ""
  "Both of the version selection mechanisms can downgrade packages and must be "
  "used with care."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:202
+ #: apt-get.8.xml:126
  msgid ""
  "This is also the target to use if you want to upgrade one or more already-"
  "installed packages without upgrading every package you have on your system. "
@@@ -2764,14 -2151,14 +2152,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:213
+ #: apt-get.8.xml:137
  msgid ""
  "Finally, the &apt-preferences; mechanism allows you to create an alternative "
  "installation policy for individual packages."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:217
+ #: apt-get.8.xml:141
  msgid ""
  "If no package matches the given expression and the expression contains one "
  "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@@ -2782,13 -2169,8 +2170,8 @@@
  "expression."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:226
- msgid "remove"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:227
+ #: apt-get.8.xml:151
  msgid ""
  "<literal>remove</literal> is identical to <literal>install</literal> except "
  "that packages are removed instead of installed. Note the removing a package "
@@@ -2797,38 -2179,28 +2180,28 @@@
  "installed instead of removed."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:234
- msgid "purge"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:235
+ #: apt-get.8.xml:159
  msgid ""
  "<literal>purge</literal> is identical to <literal>remove</literal> except "
  "that packages are removed and purged (any configuration files are deleted "
  "too)."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:239
- msgid "source"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:240
+ #: apt-get.8.xml:164
  msgid ""
  "<literal>source</literal> causes <command>apt-get</command> to fetch source "
  "packages. APT will examine the available packages to decide which source "
  "package to fetch. It will then find and download into the current directory "
- "the newest available version of that source package while respect the "
+ "the newest available version of that source package while respecting the "
  "default release, set with the option <literal>APT::Default-Release</"
  "literal>, the <option>-t</option> option or per package with the "
  "<literal>pkg/release</literal> syntax, if possible."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:248
+ #: apt-get.8.xml:172
  msgid ""
  "Source packages are tracked separately from binary packages via <literal>deb-"
  "src</literal> type lines in the &sources-list; file. This means that you "
@@@ -2838,16 -2210,17 +2211,17 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:255
+ #: apt-get.8.xml:179
  msgid ""
  "If the <option>--compile</option> option is specified then the package will "
- "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
- "<option>--download-only</option> is specified then the source package will "
- "not be unpacked."
+ "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+ "the architecture as defined by the <command>--host-architecture</command> "
+ "option.  If <option>--download-only</option> is specified then the source "
+ "package will not be unpacked."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:260
+ #: apt-get.8.xml:186
  msgid ""
  "A specific source version can be retrieved by postfixing the source name "
  "with an equals and then the version to fetch, similar to the mechanism used "
@@@ -2857,51 -2230,39 +2231,39 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:266
+ #: apt-get.8.xml:192
  msgid ""
  "Note that source packages are not tracked like binary packages, they exist "
  "only in the current directory and are similar to downloading source tar "
  "balls."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:271
- msgid "build-dep"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:272
+ #: apt-get.8.xml:198
  msgid ""
  "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
- "attempt to satisfy the build dependencies for a source package."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:276
- msgid "check"
+ "attempt to satisfy the build dependencies for a source package. By default "
+ "the dependencies are satisfied to build the package natively. If desired a "
+ "host-architecture can be specified with the <option>--host-architecture</"
+ "option> option instead."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:277
+ #: apt-get.8.xml:205
  msgid ""
  "<literal>check</literal> is a diagnostic tool; it updates the package cache "
  "and checks for broken dependencies."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:281
- msgid "download"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:282
+ #: apt-get.8.xml:210
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
- "current directoy."
+ "current directory."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:288
+ #: apt-get.8.xml:216
  msgid ""
  "<literal>clean</literal> clears out the local repository of retrieved "
  "package files. It removes everything but the lock file from "
@@@ -2912,13 -2273,8 +2274,8 @@@
  "disk space."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:297
- msgid "autoclean"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:298
+ #: apt-get.8.xml:226
  msgid ""
  "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
  "local repository of retrieved package files. The difference is that it only "
@@@ -2929,80 -2285,51 +2286,51 @@@
  "is set to off."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:307
- msgid "autoremove"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:308
+ #: apt-get.8.xml:236
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
- "automatically installed to satisfy dependencies for some package and that "
- "are no more needed."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:312
- msgid "changelog"
+ "automatically installed to satisfy dependencies for other packages and are "
+ "now no longer needed."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:313
+ #: apt-get.8.xml:241
  msgid ""
  "<literal>changelog</literal> downloads a package changelog and displays it "
  "through <command>sensible-pager</command>. The server name and base "
  "directory is defined in the <literal>APT::Changelogs::Server</literal> "
- "variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
- "Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
- "Ubuntu).  By default it displays the changelog for the version that is "
+ "variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+ "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+ "changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+ "for Ubuntu).  By default it displays the changelog for the version that is "
  "installed.  However, you can specify the same options as for the "
  "<option>install</option> command."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:335
- msgid "<option>--no-install-recommends</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:336
+ #: apt-get.8.xml:264
  msgid ""
  "Do not consider recommended packages as a dependency for installing.  "
  "Configuration Item: <literal>APT::Install-Recommends</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:340
- msgid "<option>--install-suggests</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:341
+ #: apt-get.8.xml:269
  msgid ""
  "Consider suggested packages as a dependency for installing.  Configuration "
  "Item: <literal>APT::Install-Suggests</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:345
- msgid "<option>--download-only</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:346
+ #: apt-get.8.xml:274
  msgid ""
  "Download only; package files are only retrieved, not unpacked or installed.  "
  "Configuration Item: <literal>APT::Get::Download-Only</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:350
- msgid "<option>--fix-broken</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:351
+ #: apt-get.8.xml:279
  msgid ""
  "Fix; attempt to correct a system with broken dependencies in place. This "
  "option, when used with install/remove, can omit any packages to permit APT "
@@@ -3017,18 -2344,8 +2345,8 @@@
  "<literal>APT::Get::Fix-Broken</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:364
- msgid "<option>--ignore-missing</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:365
- msgid "<option>--fix-missing</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:366
+ #: apt-get.8.xml:294
  msgid ""
  "Ignore missing packages; If packages cannot be retrieved or fail the "
  "integrity check after retrieval (corrupted package files), hold back those "
@@@ -3039,13 -2356,8 +2357,8 @@@
  "Configuration Item: <literal>APT::Get::Fix-Missing</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:376
- msgid "<option>--no-download</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:377
+ #: apt-get.8.xml:305
  msgid ""
  "Disables downloading of packages. This is best used with <option>--ignore-"
  "missing</option> to force APT to use only the .debs it has already "
@@@ -3053,7 -2365,7 +2366,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:384
+ #: apt-get.8.xml:312
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -3064,18 -2376,8 +2377,8 @@@
  "<literal>quiet</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:394
- msgid "<option>--simulate</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:396
- msgid "<option>--dry-run</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:399
+ #: apt-get.8.xml:327
  msgid ""
  "No action; perform a simulation of events that would occur but do not "
  "actually change the system.  Configuration Item: <literal>APT::Get::"
@@@ -3083,7 -2385,7 +2386,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:403
+ #: apt-get.8.xml:331
  msgid ""
  "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
  "literal>)  automatic. Also a notice will be displayed indicating that this "
@@@ -3094,7 -2396,7 +2397,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:409
+ #: apt-get.8.xml:337
  msgid ""
  "Simulate prints out a series of lines each one representing a dpkg "
  "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@@ -3102,23 -2404,8 +2405,8 @@@
  "that are of no consequence (rare)."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>-y</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>--yes</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:417
- msgid "<option>--assume-yes</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:418
+ #: apt-get.8.xml:346
  msgid ""
  "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
  "non-interactively. If an undesirable situation, such as changing a held "
@@@ -3127,69 -2414,47 +2415,47 @@@
  "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>-u</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>--show-upgraded</option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:354
+ msgid ""
+ "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+ "Assume-No</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:426
+ #: apt-get.8.xml:359
  msgid ""
  "Show upgraded packages; Print out a list of all packages that are to be "
  "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>-V</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>--verbose-versions</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:432
+ #: apt-get.8.xml:365
  msgid ""
  "Show full versions for upgraded and installed packages.  Configuration Item: "
  "<literal>APT::Get::Show-Versions</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>-b</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>--compile</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:437
- msgid "<option>--build</option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:371
+ msgid ""
+ "This option controls the architecture packages are built for by <command>apt-"
+ "get source --compile</command> and how cross-builddependencies are "
+ "satisfied. By default is it not set which means that the host architecture "
+ "is the same as the build architecture (which is defined by <literal>APT::"
+ "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
+ "Architecture</literal>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:438
+ #: apt-get.8.xml:381
  msgid ""
  "Compile source packages after downloading them.  Configuration Item: "
  "<literal>APT::Get::Compile</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:442
- msgid "<option>--ignore-hold</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:443
+ #: apt-get.8.xml:386
  msgid ""
  "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
  "hold placed on a package. This may be useful in conjunction with "
@@@ -3197,13 -2462,8 +2463,8 @@@
  "holds.  Configuration Item: <literal>APT::Ignore-Hold</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:449
- msgid "<option>--no-upgrade</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:450
+ #: apt-get.8.xml:393
  msgid ""
  "Do not upgrade packages; When used in conjunction with <literal>install</"
  "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@@ -3211,27 -2471,17 +2472,17 @@@
  "<literal>APT::Get::Upgrade</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:456
- msgid "<option>--only-upgrade</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:457
+ #: apt-get.8.xml:400
  msgid ""
  "Do not install new packages; When used in conjunction with <literal>install</"
- "literal>, <literal>only-upgrade</literal> will prevent packages on the "
- "command line from being upgraded if they are not already installed.  "
+ "literal>, <literal>only-upgrade</literal> will install upgrades for already "
+ "installed packages only and ignore requests to install new packages.  "
  "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:463
- msgid "<option>--force-yes</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:464
+ #: apt-get.8.xml:408
  msgid ""
  "Force yes; This is a dangerous option that will cause apt to continue "
  "without prompting if it is doing something potentially harmful. It should "
@@@ -3240,13 -2490,8 +2491,8 @@@
  "<literal>APT::Get::force-yes</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:471
- msgid "<option>--print-uris</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:472
+ #: apt-get.8.xml:416
  msgid ""
  "Instead of fetching the files to install their URIs are printed. Each URI "
  "will have the path, the destination file name, the size and the expected md5 "
@@@ -3258,13 -2503,8 +2504,8 @@@
  "Print-URIs</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:482
- msgid "<option>--purge</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:483
+ #: apt-get.8.xml:427
  msgid ""
  "Use purge instead of remove for anything that would be removed.  An asterisk "
  "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@@ -3272,25 -2512,15 +2513,15 @@@
  "command.  Configuration Item: <literal>APT::Get::Purge</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:490
- msgid "<option>--reinstall</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:491
+ #: apt-get.8.xml:435
  msgid ""
  "Re-Install packages that are already installed and at the newest version.  "
  "Configuration Item: <literal>APT::Get::ReInstall</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:495
- msgid "<option>--list-cleanup</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:496
+ #: apt-get.8.xml:440
  msgid ""
  "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
  "it off. When on <command>apt-get</command> will automatically manage the "
@@@ -3300,18 -2530,8 +2531,8 @@@
  "Cleanup</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:505
- msgid "<option>--target-release</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:506
- msgid "<option>--default-release</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:507
+ #: apt-get.8.xml:451
  msgid ""
  "This option controls the default input to the policy engine, it creates a "
  "default pin at priority 990 using the specified release string.  This "
@@@ -3324,13 -2544,8 +2545,8 @@@
  "also the &apt-preferences; manual page."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:520
- msgid "<option>--trivial-only</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:522
+ #: apt-get.8.xml:466
  msgid ""
  "Only perform operations that are 'trivial'. Logically this can be considered "
  "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@@ -3338,25 -2553,15 +2554,15 @@@
  "answer no.  Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:528
- msgid "<option>--no-remove</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:529
+ #: apt-get.8.xml:473
  msgid ""
  "If any packages are to be removed apt-get immediately aborts without "
  "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:534
- msgid "<option>--auto-remove</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:535
+ #: apt-get.8.xml:479
  msgid ""
  "If the command is either <literal>install</literal> or <literal>remove</"
  "literal>, then this option acts like running <literal>autoremove</literal> "
@@@ -3364,13 -2569,8 +2570,8 @@@
  "<literal>APT::Get::AutomaticRemove</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:541
- msgid "<option>--only-source</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:542
+ #: apt-get.8.xml:486
  msgid ""
  "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
  "literal> commands.  Indicates that the given source names are not to be "
@@@ -3381,48 -2581,23 +2582,23 @@@
  "Source</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--diff-only</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--dsc-only</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--tar-only</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:553
+ #: apt-get.8.xml:497
  msgid ""
  "Download only the diff, dsc, or tar file of a source archive.  Configuration "
  "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
  "literal>, and <literal>APT::Get::Tar-Only</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:558
- msgid "<option>--arch-only</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:559
+ #: apt-get.8.xml:503
  msgid ""
  "Only process architecture-dependent build-dependencies.  Configuration Item: "
  "<literal>APT::Get::Arch-Only</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:563
- msgid "<option>--allow-unauthenticated</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:564
+ #: apt-get.8.xml:508
  msgid ""
  "Ignore if packages can't be authenticated and don't prompt about it.  This "
  "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@@ -3430,14 -2605,14 +2606,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-get.8.xml:577
+ #: apt-get.8.xml:521
  msgid ""
  "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
  "&file-statelists;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:586
+ #: apt-get.8.xml:530
  msgid ""
  "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
  "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@@ -3445,54 -2620,19 +2621,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:592
+ #: apt-get.8.xml:536
  msgid ""
  "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
  "error."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:595
- msgid "ORIGINAL AUTHORS"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:596
- msgid "&apt-author.jgunthorpe;"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:599
- msgid "CURRENT AUTHORS"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:601
- msgid "&apt-author.team;"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-key.8.xml:17 apt-key.8.xml:24
- #, fuzzy
- msgid "apt-key"
- msgstr "apt-get"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-key.8.xml:25
+ #: apt-key.8.xml:32
  msgid "APT key management utility"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-key.8.xml:31
- msgid ""
- "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
- "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
- "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
- "arg>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:40
+ #: apt-key.8.xml:39
  msgid ""
  "<command>apt-key</command> is used to manage the list of keys used by apt to "
  "authenticate packages.  Packages which have been authenticated using these "
@@@ -3500,210 -2640,144 +2641,144 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-key.8.xml:46
+ #: apt-key.8.xml:45
  msgid "Commands"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:48
- msgid "add <replaceable>filename</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:52
+ #: apt-key.8.xml:50
  msgid ""
- "Add a new key to the list of trusted keys.  The key is read from "
- "<replaceable>filename</replaceable>, or standard input if "
- "<replaceable>filename</replaceable> is <literal>-</literal>."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:60
- msgid "del <replaceable>keyid</replaceable>"
+ "Add a new key to the list of trusted keys.  The key is read from the "
+ "filename given with the parameter &synopsis-param-filename; or if the "
+ "filename is <literal>-</literal> from standard input."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:64
+ #: apt-key.8.xml:63
  msgid "Remove a key from the list of trusted keys."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:71
- msgid "export <replaceable>keyid</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:75
- msgid "Output the key <replaceable>keyid</replaceable> to standard output."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:82
- msgid "exportall"
+ #: apt-key.8.xml:74
+ msgid "Output the key &synopsis-param-keyid; to standard output."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:86
+ #: apt-key.8.xml:85
  msgid "Output all trusted keys to standard output."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:93
- msgid "list"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:97
+ #: apt-key.8.xml:96
  msgid "List trusted keys."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:104
- msgid "finger"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:108
+ #: apt-key.8.xml:107
  msgid "List fingerprints of trusted keys."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:115
- msgid "adv"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:119
+ #: apt-key.8.xml:118
  msgid ""
  "Pass advanced options to gpg. With adv --recv-key you can download the "
  "public key."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
  msgid ""
- "Update the local keyring with the keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
+ "Update the local keyring with the archive keyring and remove from the local "
+ "keyring the archive keys which are no longer valid.  The archive keyring is "
+ "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
++"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
++"Ubuntu."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:140
- #, fuzzy
- msgid "net-update"
- msgstr "upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:144
  msgid ""
- "Update the local keyring with the keys of a key server and removes from the "
- "keyring the archive keys which are no longer valid. This requires an "
- "installed wget and an APT build configured to have a server to fetch from. "
- "APT in Debian does not support this command, but Ubuntu's APT does."
+ "Work similar to the <command>update</command> command above, but get the "
+ "archive keyring from an URI instead and validate it against a master key.  "
+ "This requires an installed &wget; and an APT build configured to have a "
+ "server to fetch from and a master keyring to validate.  APT in Debian does "
+ "not support this command and relies on <command>update</command> instead, "
+ "but Ubuntu's APT does."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:159
+ #: apt-key.8.xml:161
  msgid ""
  "Note that options need to be defined before the commands described in the "
  "previous section."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:161
- msgid "--keyring <replaceable>filename</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:162
+ #: apt-key.8.xml:164
  msgid ""
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
  "<filename>trusted.gpg</filename> file as well as on all parts in the "
- "<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</"
  "filename> is the primary keyring which means that e.g. new keys are added to "
  "this one."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-key.8.xml:175
+ #: apt-key.8.xml:177
  msgid "&file-trustedgpg;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:177
+ #: apt-key.8.xml:179
  msgid "<filename>/etc/apt/trustdb.gpg</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:178
+ #: apt-key.8.xml:180
  msgid "Local trust database of archive keys."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
++msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:182
- msgid "Keyring of Debian archive trusted keys."
+ #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
++msgid "Keyring of Ubuntu archive trusted keys."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:185
+ #: apt-key.8.xml:187
  msgid ""
--"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
++"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
++msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:195
+ #: apt-key.8.xml:197
  msgid "&apt-get;, &apt-secure;"
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-mark.8.xml:16
- msgid ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
- "April 2011</date>"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-mark.8.xml:25 apt-mark.8.xml:32
- msgid "apt-mark"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-mark.8.xml:33
  msgid "mark/unmark a package as being automatically-installed"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-mark.8.xml:39
- msgid ""
- "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
- "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
- "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
- "\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
- "\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
- "arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:57
+ #: apt-mark.8.xml:39
  msgid ""
  "<command>apt-mark</command> will change whether a package has been marked as "
  "being automatically installed."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:61
+ #: apt-mark.8.xml:43
  msgid ""
  "When you request that a package is installed, and as a result other packages "
  "are installed to satisfy its dependencies, the dependencies are marked as "
@@@ -3712,39 -2786,24 +2787,24 @@@
  "removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:69
- msgid "auto"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:70
+ #: apt-mark.8.xml:52
  msgid ""
  "<literal>auto</literal> is used to mark a package as being automatically "
  "installed, which will cause the package to be removed when no more manually "
  "installed packages depend on this package."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:77
- msgid "manual"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:78
+ #: apt-mark.8.xml:60
  msgid ""
  "<literal>manual</literal> is used to mark a package as being manually "
  "installed, which will prevent the package from being automatically removed "
  "if no other packages depend on it."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:85
- msgid "hold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:86
+ #: apt-mark.8.xml:68
  msgid ""
  "<literal>hold</literal> is used to mark a package as hold back, which will "
  "prevent the package from being automatically installed, upgraded or "
@@@ -3753,25 -2812,15 +2813,15 @@@
  "effected by the <option>--filename</option> option."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:95
- msgid "unhold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:96
+ #: apt-mark.8.xml:78
  msgid ""
  "<literal>unhold</literal> is used to cancel a previously set hold on a "
  "package to allow all actions again."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:101
- msgid "showauto"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:102
+ #: apt-mark.8.xml:84
  msgid ""
  "<literal>showauto</literal> is used to print a list of automatically "
  "installed packages with each package on a new line.  All automatically "
@@@ -3779,82 -2828,60 +2829,60 @@@
  "given only those which are automatically installed will be shown."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:109
- msgid "showmanual"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:110
+ #: apt-mark.8.xml:92
  msgid ""
  "<literal>showmanual</literal> can be used in the same way as "
  "<literal>showauto</literal> except that it will print a list of manually "
  "installed packages instead."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:116
- msgid "showhold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:117
+ #: apt-mark.8.xml:99
  msgid ""
  "<literal>showhold</literal> is used to print a list of packages on hold in "
  "the same way as for the other show commands."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:130
- msgid ""
- "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:131
- msgid ""
- "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
- "option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+ #: apt-mark.8.xml:112 apt-mark.8.xml:113
+ msgid "<replaceable>&synopsis-filename;</replaceable>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:134
+ #: apt-mark.8.xml:115
  msgid ""
- "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
- "filename> instead of the default location, which is "
- "<filename>extended_status</filename> in the directory defined by the "
- "Configuration Item: <literal>Dir::State</literal>."
+ "Read/Write package stats from the filename given with the parameter "
+ "<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+ "of from the default location, which is <filename>extended_status</filename> "
+ "in the directory defined by the Configuration Item: <literal>Dir::State</"
+ "literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-mark.8.xml:146
+ #: apt-mark.8.xml:128
  msgid "  &file-extended_states;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:151
+ #: apt-mark.8.xml:133
  msgid "&apt-get;,&aptitude;,&apt-conf;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:155
+ #: apt-mark.8.xml:137
  msgid ""
  "<command>apt-mark</command> returns zero on normal operation, non-zero on "
  "error."
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-secure.8.xml:17 apt-secure.8.xml:39
- msgid "apt-secure"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-secure.8.xml:40
+ #: apt-secure.8.xml:47
  msgid "Archive authentication support for APT"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:45
+ #: apt-secure.8.xml:52
  msgid ""
  "Starting with version 0.6, <command>apt</command> contains code that does "
  "signature checking of the Release file for all archives. This ensures that "
@@@ -3863,7 -2890,7 +2891,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:53
+ #: apt-secure.8.xml:60
  msgid ""
  "If a package comes from a archive without a signature or with a signature "
  "that apt does not have a key for that package is considered untrusted and "
@@@ -3873,19 -2900,19 +2901,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:62
+ #: apt-secure.8.xml:69
  msgid ""
  "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
  "authentication feature."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:67
+ #: apt-secure.8.xml:74
  msgid "Trusted archives"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:70
+ #: apt-secure.8.xml:77
  msgid ""
  "The chain of trust from an apt archive to the end user is made up of "
  "different steps. <command>apt-secure</command> is the last step in this "
@@@ -3896,7 -2923,7 +2924,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:78
+ #: apt-secure.8.xml:85
  msgid ""
  "apt-secure does not review signatures at a package level. If you require "
  "tools to do this you should look at <command>debsig-verify</command> and "
@@@ -3905,7 -2932,7 +2933,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:85
+ #: apt-secure.8.xml:92
  msgid ""
  "The chain of trust in Debian starts when a maintainer uploads a new package "
  "or a new version of a package to the Debian archive. This upload in order to "
@@@ -3916,7 -2943,7 +2944,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:95
+ #: apt-secure.8.xml:102
  msgid ""
  "Once the uploaded package is verified and included in the archive, the "
  "maintainer signature is stripped off, an MD5 sum of the package is computed "
@@@ -3927,7 -2954,7 +2955,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:105
+ #: apt-secure.8.xml:112
  msgid ""
  "Any end user can check the signature of the Release file, extract the MD5 "
  "sum of a package from it and compare it with the MD5 sum of the package he "
@@@ -3937,14 -2964,14 +2965,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:112
+ #: apt-secure.8.xml:119
  msgid ""
  "Notice that this is distinct from checking signatures on a per package "
  "basis. It is designed to prevent two possible attacks:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:117
+ #: apt-secure.8.xml:124
  msgid ""
  "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
  "checking, a malicious agent can introduce himself in the package download "
@@@ -3954,7 -2981,7 +2982,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:125
+ #: apt-secure.8.xml:132
  msgid ""
  "<literal>Mirror network compromise</literal>.  Without signature checking, a "
  "malicious agent can compromise a mirror host and modify the files in it to "
@@@ -3963,7 -2990,7 +2991,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:132
+ #: apt-secure.8.xml:139
  msgid ""
  "However, it does not defend against a compromise of the Debian master server "
  "itself (which signs the packages) or against a compromise of the key used to "
@@@ -3972,12 -2999,12 +3000,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:138
+ #: apt-secure.8.xml:145
  msgid "User configuration"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:140
+ #: apt-secure.8.xml:147
  msgid ""
  "<command>apt-key</command> is the program that manages the list of keys used "
  "by apt. It can be used to add or remove keys although an installation of "
@@@ -3986,7 -3013,7 +3014,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:147
+ #: apt-secure.8.xml:154
  msgid ""
  "In order to add a new key you need to first download it (you should make "
  "sure you are using a trusted communication channel when retrieving it), add "
@@@ -3997,19 -3024,19 +3025,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:156
+ #: apt-secure.8.xml:163
  msgid "Archive configuration"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:158
+ #: apt-secure.8.xml:165
  msgid ""
  "If you want to provide archive signatures in an archive under your "
  "maintenance you have to:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:163
+ #: apt-secure.8.xml:170
  msgid ""
  "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
  "already. You can do this by running <command>apt-ftparchive release</"
@@@ -4017,7 -3044,7 +3045,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:168
+ #: apt-secure.8.xml:175
  msgid ""
  "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
  "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@@ -4025,7 -3052,7 +3053,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:172
+ #: apt-secure.8.xml:179
  msgid ""
  "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
  "know what key they need to import in order to authenticate the files in the "
@@@ -4033,7 -3060,7 +3061,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:179
+ #: apt-secure.8.xml:186
  msgid ""
  "Whenever the contents of the archive changes (new packages are added or "
  "removed) the archive maintainer has to follow the first two steps previously "
@@@ -4041,56 -3068,42 +3069,42 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:187
+ #: apt-secure.8.xml:194
  msgid ""
  "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
  "&debsign; &debsig-verify;, &gpg;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:191
+ #: apt-secure.8.xml:198
  msgid ""
  "For more background information you might want to review the <ulink url="
- "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
- "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
- "Manual (available also in the harden-doc package) and the <ulink url="
- "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
- "Distribution HOWTO</ulink> by V. Alex Brennen."
+ "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+ "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+ "(available also in the harden-doc package) and the <ulink url=\"http://www."
+ "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
+ "ulink> by V. Alex Brennen."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:204
+ #: apt-secure.8.xml:211
  msgid "Manpage Authors"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:206
+ #: apt-secure.8.xml:213
  msgid ""
  "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
  "Jones, Colin Walters, Florian Weimer and Michael Vogt."
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-sortpkgs.1.xml:25 apt-sortpkgs.1.xml:32
- msgid "apt-sortpkgs"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-sortpkgs.1.xml:33
  msgid "Utility to sort package index files"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-sortpkgs.1.xml:39
- msgid ""
- "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:48
+ #: apt-sortpkgs.1.xml:39
  msgid ""
  "<command>apt-sortpkgs</command> will take an index file (Source index or "
  "Package index) and sort the records so that they are ordered by the package "
@@@ -4099,56 -3112,46 +3113,46 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:54
+ #: apt-sortpkgs.1.xml:45
  msgid "All output is sent to stdout, the input must be a seekable file."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-sortpkgs.1.xml:61
- msgid "<option>--source</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-sortpkgs.1.xml:63
+ #: apt-sortpkgs.1.xml:54
  msgid ""
  "Use Source index field ordering.  Configuration Item: <literal>APT::"
  "SortPkgs::Source</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:77
+ #: apt-sortpkgs.1.xml:68
  msgid ""
  "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
  "100 on error."
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt.conf.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
- "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
- "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
- "&apt-product; <date>16 January 2010</date>"
+ #. type: Content of: <refentry><refentryinfo><author><contrib>
+ #: apt.conf.5.xml:20
+ msgid "Initial documentation of Debug::*."
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt.conf.5.xml:31 apt.conf.5.xml:38
- msgid "apt.conf"
+ #. type: Content of: <refentry><refentryinfo><author><email>
+ #: apt.conf.5.xml:21
+ msgid "dburrows@debian.org"
  msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
- #: apt.conf.5.xml:32 apt_preferences.5.xml:25 sources.list.5.xml:26
+ #: apt.conf.5.xml:31 apt_preferences.5.xml:25 sources.list.5.xml:26
  msgid "5"
  msgstr ""
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt.conf.5.xml:39
+ #: apt.conf.5.xml:38
  msgid "Configuration file for APT"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:43
+ #: apt.conf.5.xml:42
  msgid ""
  "<filename>apt.conf</filename> is the main configuration file for the APT "
  "suite of tools, but by far not the only place changes to options can be "
@@@ -4157,50 -3160,51 +3161,51 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><para>
- #: apt.conf.5.xml:48
+ #: apt.conf.5.xml:47
  msgid ""
  "When an APT tool starts up it will read the configuration files in the "
  "following order:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:50
+ #: apt.conf.5.xml:49
  msgid ""
  "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
  "any)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:52
+ #: apt.conf.5.xml:51
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
- "order which have no or \"<literal>conf</literal>\" as filename extension and "
- "which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
- "characters.  Otherwise APT will print a notice that it has ignored a file if "
- "the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
- "literal> configuration list - in this case it will be silently ignored."
+ "order which have either no or \"<literal>conf</literal>\" as filename "
+ "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+ "and period (.) characters.  Otherwise APT will print a notice that it has "
+ "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+ "Ignore-Files-Silently</literal> configuration list - in this case it will be "
+ "silently ignored."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:59
+ #: apt.conf.5.xml:58
  msgid ""
  "the main configuration file specified by <literal>Dir::Etc::main</literal>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:61
+ #: apt.conf.5.xml:60
  msgid ""
  "the command line options are applied to override the configuration "
  "directives or to load even more configuration files."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:65
+ #: apt.conf.5.xml:64
  msgid "Syntax"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:66
+ #: apt.conf.5.xml:65
  msgid ""
  "The configuration file is organized in a tree with options organized into "
  "functional groups. Option specification is given with a double colon "
@@@ -4210,7 -3214,7 +3215,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:72
+ #: apt.conf.5.xml:71
  msgid ""
  "Syntactically the configuration language is modeled after what the ISC tools "
  "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@@ -4226,7 -3230,7 +3231,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:86
+ #: apt.conf.5.xml:85
  #, no-wrap
  msgid ""
  "APT {\n"
@@@ -4238,7 -3242,7 +3243,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:94
+ #: apt.conf.5.xml:93
  msgid ""
  "with newlines placed to make it more readable. Lists can be created by "
  "opening a scope and including a single string enclosed in quotes followed by "
@@@ -4246,27 -3250,27 +3251,27 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:99
+ #: apt.conf.5.xml:98
  #, no-wrap
  msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:102
+ #: apt.conf.5.xml:101
  msgid ""
  "In general the sample configuration file in <filename>&docdir;examples/apt."
  "conf</filename> &configureindex; is a good guide for how it should look."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:106
+ #: apt.conf.5.xml:105
  msgid ""
  "The names of the configuration items are not case-sensitive. So in the "
  "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:109
+ #: apt.conf.5.xml:108
  msgid ""
  "Names for the configuration items are optional if a list is defined as it "
  "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@@ -4276,7 -3280,7 +3281,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:114
+ #: apt.conf.5.xml:113
  msgid ""
  "Two specials are allowed, <literal>#include</literal> (which is deprecated "
  "and not supported by alternative implementations) and <literal>#clear</"
@@@ -4288,7 -3292,7 +3293,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:122
+ #: apt.conf.5.xml:121
  msgid ""
  "The #clear command is the only way to delete a list or a complete scope.  "
  "Reopening a scope or the ::-style described below will <emphasis>not</"
@@@ -4298,23 -3302,23 +3303,23 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:127
+ #: apt.conf.5.xml:126
  msgid ""
  "All of the APT tools take a -o option which allows an arbitrary "
  "configuration directive to be specified on the command line. The syntax is a "
  "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
- "followed by an equals sign then the new value of the option. Lists can be "
- "appended too by adding a trailing :: to the list name. (As you might "
+ "followed by an equals sign then the new value of the option. To append a new "
+ "element to a list, add a trailing :: to the name of the list. (As you might "
  "suspect: The scope syntax can't be used on the command line.)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:134
+ #: apt.conf.5.xml:133
  msgid ""
  "Note that you can use :: only for appending one item per line to a list and "
  "that you should not use it in combination with the scope syntax.  (The scope "
  "syntax implicit insert ::) Using both syntaxes together will trigger a bug "
- "which some users unfortunately relay on: An option with the unusual name "
+ "which some users unfortunately depend on: An option with the unusual name "
  "\"<literal>::</literal>\" which acts like every other option with a name. "
  "These introduces many problems including that a user who writes multiple "
  "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
@@@ -4326,37 -3330,40 +3331,40 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:146
+ #: apt.conf.5.xml:145
  msgid "The APT Group"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:147
+ #: apt.conf.5.xml:146
  msgid ""
  "This group of options controls general APT behavior as well as holding the "
  "options for all of the tools."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:151
- msgid "Architecture"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:152
+ #: apt.conf.5.xml:151
  msgid ""
  "System Architecture; sets the architecture to use when fetching files and "
  "parsing package lists. The internal default is the architecture apt was "
  "compiled for."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:157
- msgid "Default-Release"
+ msgid ""
+ "All Architectures the system supports. Processors implementing the "
+ "<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
+ "set are e.g. also able to execute binaries compiled for the <literal>i386</"
+ "literal> (<literal>x86</literal>) instruction set; This list is use when "
+ "fetching files and parsing package lists. The internal default is always the "
+ "native architecture (<literal>APT::Architecture</literal>)  and all foreign "
+ "architectures it can retrieve by calling <command>dpkg --print-foreign-"
+ "architectures</command>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:158
+ #: apt.conf.5.xml:167
  msgid ""
  "Default release to install packages from if more than one version available. "
  "Contains release name, codename or release version. Examples: 'stable', "
@@@ -4364,25 -3371,15 +3372,15 @@@
  "'5.0*'. See also &apt-preferences;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:163
- msgid "Ignore-Hold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:164
+ #: apt.conf.5.xml:173
  msgid ""
  "Ignore Held packages; This global option causes the problem resolver to "
  "ignore held packages in its decision making."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:168
- msgid "Clean-Installed"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:169
+ #: apt.conf.5.xml:178
  msgid ""
  "Defaults to on. When turned on the autoclean feature will remove any "
  "packages which can no longer be downloaded from the cache. If turned off "
@@@ -4390,13 -3387,8 +3388,8 @@@
  "but note that APT provides no direct means to reinstall them."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:175
- msgid "Immediate-Configure"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:176
+ #: apt.conf.5.xml:185
  msgid ""
  "Defaults to on which will cause APT to install essential and important "
  "packages as fast as possible in the install/upgrade operation. This is done "
@@@ -4428,13 -3420,8 +3421,8 @@@
  "improving or correcting the upgrade process."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:198
- msgid "Force-LoopBreak"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:199
+ #: apt.conf.5.xml:208
  msgid ""
  "Never Enable this option unless you -really- know what you are doing. It "
  "permits APT to temporarily remove an essential package to break a Conflicts/"
@@@ -4444,89 -3431,59 +3432,59 @@@
  "those packages depend on."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:207
- msgid "Cache-Start, Cache-Grow and Cache-Limit"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:208
+ #: apt.conf.5.xml:217
  msgid ""
  "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
  "the 'available' information. <literal>Cache-Start</literal> acts as a hint "
  "to which size the Cache will grow and is therefore the amount of memory APT "
  "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
- "that these amount of space need to be available for APT otherwise it will "
- "likely fail ungracefully, so for memory restricted devices these value "
- "should be lowered while on systems with a lot of configured sources this "
- "might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
- "default of 1048576 (~1 MB) how much the Cache size will be increased in the "
- "event the space defined by <literal>Cache-Start</literal> is not enough. "
- "These value will be applied again and again until either the cache is big "
- "enough to store all information or the size of the cache reaches the "
- "<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
- "literal> is 0 which stands for no limit.  If <literal>Cache-Grow</literal> "
- "is set to 0 the automatic grow of the cache is disabled."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:223
- msgid "Build-Essential"
+ "that this amount of space needs to be available for APT otherwise it will "
+ "likely fail ungracefully, so for memory restricted devices this value should "
+ "be lowered while on systems with a lot of configured sources it should be "
+ "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
+ "of 1048576 (~1 MB) how much the Cache size will be increased in the event "
+ "the space defined by <literal>Cache-Start</literal> is not enough. These "
+ "value will be applied again and again until either the cache is big enough "
+ "to store all information or the size of the cache reaches the <literal>Cache-"
+ "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
+ "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
+ "automatic grow of the cache is disabled."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:224
+ #: apt.conf.5.xml:233
  msgid "Defines which package(s) are considered essential build dependencies."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:227
- msgid "Get"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:228
+ #: apt.conf.5.xml:237
  msgid ""
  "The Get subsection controls the &apt-get; tool, please see its documentation "
  "for more information about the options here."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:232
- msgid "Cache"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:233
+ #: apt.conf.5.xml:242
  msgid ""
  "The Cache subsection controls the &apt-cache; tool, please see its "
  "documentation for more information about the options here."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:237
- msgid "CDROM"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:238
+ #: apt.conf.5.xml:247
  msgid ""
  "The CDROM subsection controls the &apt-cdrom; tool, please see its "
  "documentation for more information about the options here."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:244
+ #: apt.conf.5.xml:253
  msgid "The Acquire Group"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:249
- msgid "Check-Valid-Until"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:250
+ #: apt.conf.5.xml:259
  msgid ""
  "Security related option defaulting to true as an expiring validation for a "
  "Release file prevents longtime replay attacks and can e.g. also help users "
@@@ -4537,55 -3494,48 +3495,48 @@@
  "<literal>Max-ValidTime</literal> option can be used."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:260
- msgid "Max-ValidTime"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:261
+ #: apt.conf.5.xml:270
  msgid ""
- "Seconds the Release file should be considered valid after it was created. "
- "The default is \"for ever\" (0) if the Release file of the archive doesn't "
- "include a <literal>Valid-Until</literal> header.  If it does then this date "
- "is the default. The date from the Release file or the date specified by the "
- "creation time of the Release file (<literal>Date</literal> header) plus the "
- "seconds specified with this options are used to check if the validation of a "
- "file has expired by using the earlier date of the two. Archive specific "
- "settings can be made by appending the label of the archive to the option "
- "name."
+ "Seconds the Release file should be considered valid after it was created "
+ "(indicated by the <literal>Date</literal> header).  If the Release file "
+ "itself includes a <literal>Valid-Until</literal> header the earlier date of "
+ "the two is used as the expiration date.  The default value is <literal>0</"
+ "literal> which stands for \"for ever valid\".  Archive specific settings can "
+ "be made by appending the label of the archive to the option name."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:273
- msgid "PDiffs"
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:281
+ msgid ""
+ "Minimum of seconds the Release file should be considered valid after it was "
+ "created (indicated by the <literal>Date</literal> header).  Use this if you "
+ "need to use a seldomly updated (local) mirror of a more regular updated "
+ "archive with a <literal>Valid-Until</literal> header instead of completely "
+ "disabling the expiration date checking.  Archive specific settings can and "
+ "should be used by appending the label of the archive to the option name."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:274
+ #: apt.conf.5.xml:292
  msgid ""
  "Try to download deltas called <literal>PDiffs</literal> for Packages or "
  "Sources files instead of downloading whole ones. True by default."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:277
+ #: apt.conf.5.xml:295
  msgid ""
  "Two sub-options to limit the use of PDiffs are also available: With "
  "<literal>FileLimit</literal> can be specified how many PDiff files are "
- "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
- "other hand is the maximum precentage of the size of all patches compared to "
+ "downloaded at most to update a file. <literal>SizeLimit</literal> on the "
+ "other hand is the maximum percentage of the size of all patches compared to "
  "the size of the targeted file. If one of these limits is exceeded the "
  "complete file is downloaded instead of the patches."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
- msgid "Queue-Mode"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:305
  msgid ""
  "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
  "literal> or <literal>access</literal> which determines how APT parallelizes "
@@@ -4594,37 -3544,22 +3545,22 @@@
  "connection per URI type will be opened."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:294
- msgid "Retries"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:295
+ #: apt.conf.5.xml:313
  msgid ""
  "Number of retries to perform. If this is non-zero APT will retry failed "
  "files the given number of times."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:299
- msgid "Source-Symlinks"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:300
+ #: apt.conf.5.xml:318
  msgid ""
  "Use symlinks for source archives. If set to true then source archives will "
  "be symlinked when possible instead of copying. True is the default."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:304 sources.list.5.xml:144
- msgid "http"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:305
+ #: apt.conf.5.xml:323
  msgid ""
  "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
  "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@@ -4635,7 -3570,7 +3571,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:313
+ #: apt.conf.5.xml:331
  msgid ""
  "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
  "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@@ -4649,7 -3584,7 +3585,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:323 apt.conf.5.xml:387
+ #: apt.conf.5.xml:341 apt.conf.5.xml:407
  msgid ""
  "The option <literal>timeout</literal> sets the timeout timer used by the "
  "method, this applies to all things including connection timeout and data "
@@@ -4657,19 -3592,26 +3593,26 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:326
+ #: apt.conf.5.xml:344
  msgid ""
- "One setting is provided to control the pipeline depth in cases where the "
- "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
- "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
- "indicating how many outstanding requests APT should send. A value of zero "
- "MUST be specified if the remote host does not properly linger on TCP "
- "connections - otherwise data corruption will occur. Hosts which require this "
- "are in violation of RFC 2068."
+ "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+ "enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
+ "g. on high-latency connections. It specifies how many requests are send in a "
+ "pipeline.  Previous APT versions had a default of 10 for this setting, but "
+ "the default value is now 0 (= disabled) to avoid problems with the ever-"
+ "growing amount of webservers and proxies which choose to not conform to the "
+ "HTTP/1.1 specification."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:334
+ #: apt.conf.5.xml:351
+ msgid ""
+ "<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
+ "redirects, which is enabled by default."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:354
  msgid ""
  "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
  "literal> which accepts integer values in kilobyte. The default value is 0 "
@@@ -4679,20 -3621,15 +3622,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:339
+ #: apt.conf.5.xml:359
  msgid ""
  "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
  "User-Agent for the http download method as some proxies allow access for "
  "clients only if the client uses a known identifier."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:345
- msgid "https"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:346
+ #: apt.conf.5.xml:366
  msgid ""
  "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
  "options are the same as for <literal>http</literal> method and will also "
@@@ -4702,7 -3639,7 +3640,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:352
+ #: apt.conf.5.xml:372
  msgid ""
  "<literal>CaInfo</literal> suboption specifies place of file that holds info "
  "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@@ -4722,13 -3659,8 +3660,8 @@@
  "option."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:370 sources.list.5.xml:155
- msgid "ftp"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:371
+ #: apt.conf.5.xml:391
  msgid ""
  "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
  "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@@ -4747,7 -3679,7 +3680,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:390
+ #: apt.conf.5.xml:410
  msgid ""
  "Several settings are provided to control passive mode. Generally it is safe "
  "to leave passive mode on, it works in nearly every environment.  However "
@@@ -4757,7 -3689,7 +3690,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:397
+ #: apt.conf.5.xml:417
  msgid ""
  "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
  "envar> environment variable to a http url - see the discussion of the http "
@@@ -4766,7 -3698,7 +3699,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:402
+ #: apt.conf.5.xml:422
  msgid ""
  "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
  "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@@ -4775,19 -3707,14 +3708,14 @@@
  "that most FTP servers do not support RFC2428."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:409 sources.list.5.xml:137
- msgid "cdrom"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:415
+ #: apt.conf.5.xml:435
  #, no-wrap
  msgid "/cdrom/::Mount \"foo\";"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:410
+ #: apt.conf.5.xml:430
  msgid ""
  "CDROM URIs; the only setting for CDROM URIs is the mount point, "
  "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@@ -4799,32 -3726,22 +3727,22 @@@
  "can be specified using UMount."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:420
- msgid "gpgv"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:421
+ #: apt.conf.5.xml:441
  msgid ""
  "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
  "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
  "passed to gpgv."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:426
- msgid "CompressionTypes"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:432
+ #: apt.conf.5.xml:452
  #, no-wrap
  msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:427
+ #: apt.conf.5.xml:447
  msgid ""
  "List of compression types which are understood by the acquire methods.  "
  "Files like <filename>Packages</filename> can be available in various "
@@@ -4836,19 -3753,19 +3754,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:437
+ #: apt.conf.5.xml:457
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order:: \"gz\";"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:440
+ #: apt.conf.5.xml:460
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:433
+ #: apt.conf.5.xml:453
  msgid ""
  "Also the <literal>Order</literal> subgroup can be used to define in which "
  "order the acquire system will try to download the compressed files. The "
@@@ -4865,20 -3782,20 +3783,20 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:444
+ #: apt.conf.5.xml:464
  #, no-wrap
  msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:442
+ #: apt.conf.5.xml:462
  msgid ""
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
  "will only be used if this file exists, e.g. for the bzip2 method (the "
- "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
- "that list entries specified on the command line will be added at the end of "
- "the list specified in the configuration files, but before the default "
+ "inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+ "also that list entries specified on the command line will be added at the "
+ "end of the list specified in the configuration files, but before the default "
  "entries. To prefer a type in this case over the ones specified in the "
  "configuration files you can set the option direct - not in list style.  This "
  "will not override the defined list, it will only prefix the list with this "
@@@ -4886,34 -3803,24 +3804,24 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:449
+ #: apt.conf.5.xml:469
  msgid ""
  "The special type <literal>uncompressed</literal> can be used to give "
- "uncompressed files a preference, but note that most archives doesn't provide "
+ "uncompressed files a preference, but note that most archives don't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:454
- msgid "GzipIndexes"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:456
+ #: apt.conf.5.xml:476
  msgid ""
  "When downloading <literal>gzip</literal> compressed indexes (Packages, "
  "Sources, or Translations), keep them gzip compressed locally instead of "
- "unpacking them. This saves quite a lot of disk space at the expense of more "
- "CPU requirements when building the local package caches. False by default."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:463
- msgid "Languages"
+ "unpacking them. This saves quite a lot of disk space at the expense of more "
+ "CPU requirements when building the local package caches. False by default."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:464
+ #: apt.conf.5.xml:484
  msgid ""
  "The Languages subsection controls which <filename>Translation</filename> "
  "files are downloaded and in which order APT tries to display the Description-"
@@@ -4926,13 -3833,13 +3834,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
- #: apt.conf.5.xml:480
+ #: apt.conf.5.xml:500
  #, no-wrap
  msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:470
+ #: apt.conf.5.xml:490
  msgid ""
  "The default list includes \"environment\" and \"en\". "
  "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@@ -4954,32 -3861,41 +3862,41 @@@
  "\"0\"/>"
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:501
+ msgid ""
+ "Note: To prevent problems resulting from APT being executed in different "
+ "environments (e.g. by different users or by other programs) all Translation "
+ "files which are found in <filename>/var/lib/apt/lists/</filename> will be "
+ "added to the end of the list (after an implicit \"<literal>none</literal>\")."
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:245
+ #: apt.conf.5.xml:254
  msgid ""
  "The <literal>Acquire</literal> group of options controls the download of "
  "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:487
+ #: apt.conf.5.xml:512
  msgid "Directories"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:489
+ #: apt.conf.5.xml:514
  msgid ""
  "The <literal>Dir::State</literal> section has directories that pertain to "
  "local state information. <literal>lists</literal> is the directory to place "
  "downloaded package lists in and <literal>status</literal> is the name of the "
  "dpkg status file.  <literal>preferences</literal> is the name of the APT "
- "preferences file.  <literal>Dir::State</literal> contains the default "
- "directory to prefix on all sub items if they do not start with <filename>/</"
- "filename> or <filename>./</filename>."
+ "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
+ "contains the default directory to prefix on all sub items if they do not "
+ "start with <filename>/</filename> or <filename>./</filename>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:496
+ #: apt.conf.5.xml:521
  msgid ""
  "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
  "information, such as the two package caches <literal>srcpkgcache</literal> "
@@@ -4992,7 -3908,7 +3909,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:505
+ #: apt.conf.5.xml:530
  msgid ""
  "<literal>Dir::Etc</literal> contains the location of configuration files, "
  "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@@ -5002,7 -3918,7 +3919,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:511
+ #: apt.conf.5.xml:536
  msgid ""
  "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
  "in lexical order from the directory specified. After this is done then the "
@@@ -5010,7 -3926,7 +3927,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:515
+ #: apt.conf.5.xml:540
  msgid ""
  "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
  "Bin::Methods</literal> specifies the location of the method handlers and "
@@@ -5021,7 -3937,7 +3938,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:523
+ #: apt.conf.5.xml:548
  msgid ""
  "The configuration item <literal>RootDir</literal> has a special meaning.  If "
  "set, all paths in <literal>Dir::</literal> will be relative to "
@@@ -5034,7 -3950,7 +3951,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:536
+ #: apt.conf.5.xml:561
  msgid ""
  "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
  "which files APT should silently ignore while parsing the files in the "
@@@ -5045,26 -3961,21 +3962,21 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:545
+ #: apt.conf.5.xml:570
  #, fuzzy
  msgid "APT in DSelect"
  msgstr "DSelect"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:547
+ #: apt.conf.5.xml:572
  msgid ""
  "When APT is used as a &dselect; method several configuration directives "
  "control the default behaviour. These are in the <literal>DSelect</literal> "
  "section."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:551
- msgid "Clean"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:552
+ #: apt.conf.5.xml:577
  msgid ""
  "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
  "and never.  always and prompt will remove all packages from the cache after "
@@@ -5075,68 -3986,48 +3987,48 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:561
+ #: apt.conf.5.xml:586
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the install phase."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:565
- msgid "Updateoptions"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:566
+ #: apt.conf.5.xml:591
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the update phase."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:570
- msgid "PromptAfterUpdate"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:571
+ #: apt.conf.5.xml:596
  msgid ""
  "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
  "The default is to prompt only on error."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:577
+ #: apt.conf.5.xml:602
  msgid "How APT calls dpkg"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:578
+ #: apt.conf.5.xml:603
  msgid ""
  "Several configuration directives control how APT invokes &dpkg;. These are "
  "in the <literal>DPkg</literal> section."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:583
+ #: apt.conf.5.xml:608
  msgid ""
  "This is a list of options to pass to dpkg. The options must be specified "
  "using the list notation and each list item is passed as a single argument to "
  "&dpkg;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Pre-Invoke"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Post-Invoke"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:589
+ #: apt.conf.5.xml:614
  msgid ""
  "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -5144,13 -4035,8 +4036,8 @@@
  "fail APT will abort."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:595
- msgid "Pre-Install-Pkgs"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:596
+ #: apt.conf.5.xml:621
  msgid ""
  "This is a list of shell commands to run before invoking dpkg. Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -5160,7 -4046,7 +4047,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:602
+ #: apt.conf.5.xml:627
  msgid ""
  "Version 2 of this protocol dumps more information, including the protocol "
  "version, the APT configuration space and the packages, files and versions "
@@@ -5169,37 -4055,27 +4056,27 @@@
  "given to <literal>Pre-Install-Pkgs</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:609
- msgid "Run-Directory"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:610
+ #: apt.conf.5.xml:635
  msgid ""
  "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
  "</filename>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:614
- msgid "Build-options"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:615
+ #: apt.conf.5.xml:640
  msgid ""
  "These options are passed to &dpkg-buildpackage; when compiling packages, the "
  "default is to disable signing and produce all binaries."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt.conf.5.xml:620
+ #: apt.conf.5.xml:645
  msgid "dpkg trigger usage (and related options)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:621
+ #: apt.conf.5.xml:646
  msgid ""
  "APT can call dpkg in a way so it can make aggressive use of triggers over "
  "multiple calls of dpkg. Without further options dpkg will use triggers only "
@@@ -5214,7 -4090,7 +4091,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
- #: apt.conf.5.xml:636
+ #: apt.conf.5.xml:661
  #, no-wrap
  msgid ""
  "DPkg::NoTriggers \"true\";\n"
@@@ -5224,7 -4100,7 +4101,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:630
+ #: apt.conf.5.xml:655
  msgid ""
  "Note that it is not guaranteed that APT will support these options or that "
  "these options will not cause (big) trouble in the future. If you have "
@@@ -5237,13 -4113,8 +4114,8 @@@
  "would be <placeholder type=\"literallayout\" id=\"0\"/>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:642
- msgid "DPkg::NoTriggers"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:643
+ #: apt.conf.5.xml:668
  msgid ""
  "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
  "call).  See &dpkg; if you are interested in what this actually means. In "
@@@ -5254,13 -4125,8 +4126,8 @@@
  "dpkg - now apt will add these flag also to the unpack and remove calls."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:650
- msgid "PackageManager::Configure"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:651
+ #: apt.conf.5.xml:676
  msgid ""
  "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
  "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@@ -5275,13 -4141,8 +4142,8 @@@
  "the system could end in an unconfigured status which could be unbootable!"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:661
- msgid "DPkg::ConfigurePending"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:662
+ #: apt.conf.5.xml:687
  msgid ""
  "If this option is set apt will call <command>dpkg --configure --pending</"
  "command> to let dpkg handle all required configurations and triggers. This "
@@@ -5291,13 -4152,8 +4153,8 @@@
  "you could deactivate this option in all but the last run."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:668
- msgid "DPkg::TriggersPending"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:669
+ #: apt.conf.5.xml:694
  msgid ""
  "Useful for <literal>smart</literal> configuration as a package which has "
  "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@@ -5306,13 -4162,8 +4163,8 @@@
  "triggers, not only the triggers needed to configure this package."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:674
- msgid "PackageManager::UnpackAll"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:675
+ #: apt.conf.5.xml:700
  msgid ""
  "As the configuration can be deferred to be done at the end by dpkg it can be "
  "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@@ -5323,13 -4174,8 +4175,8 @@@
  "really useful."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:682
- msgid "OrderList::Score::Immediate"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:690
+ #: apt.conf.5.xml:715
  #, no-wrap
  msgid ""
  "OrderList::Score {\n"
@@@ -5341,7 -4187,7 +4188,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:683
+ #: apt.conf.5.xml:708
  msgid ""
  "Essential packages (and there dependencies) should be configured immediately "
  "after unpacking. It will be a good idea to do this quite early in the "
@@@ -5355,12 -4201,12 +4202,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:703
+ #: apt.conf.5.xml:728
  msgid "Periodic and Archives options"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:704
+ #: apt.conf.5.xml:729
  msgid ""
  "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
  "of options configure behavior of apt periodic updates, which is done by "
@@@ -5369,12 -4215,12 +4216,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:712
+ #: apt.conf.5.xml:737
  msgid "Debug options"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:714
+ #: apt.conf.5.xml:739
  msgid ""
  "Enabling options in the <literal>Debug::</literal> section will cause "
  "debugging information to be sent to the standard error stream of the program "
@@@ -5385,7 -4231,7 +4232,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:725
+ #: apt.conf.5.xml:750
  msgid ""
  "<literal>Debug::pkgProblemResolver</literal> enables output about the "
  "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@@ -5393,7 -4239,7 +4240,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:733
+ #: apt.conf.5.xml:758
  msgid ""
  "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
  "used to run some operations (for instance, <literal>apt-get -s install</"
@@@ -5401,7 -4247,7 +4248,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:742
+ #: apt.conf.5.xml:767
  msgid ""
  "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
  "time that <literal>apt</literal> invokes &dpkg;."
@@@ -5411,205 -4257,120 +4258,120 @@@ msgstr "
  #. 	   motivating example, except I haven't a clue why you'd want
  #. 	   to do this. 
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:750
+ #: apt.conf.5.xml:775
  msgid ""
  "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
  "in CDROM IDs."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:760
+ #: apt.conf.5.xml:785
  msgid "A full list of debugging options to apt follows."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:765
- msgid "<literal>Debug::Acquire::cdrom</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:769
+ #: apt.conf.5.xml:794
  msgid ""
  "Print information related to accessing <literal>cdrom://</literal> sources."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:776
- msgid "<literal>Debug::Acquire::ftp</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:780
+ #: apt.conf.5.xml:805
  msgid "Print information related to downloading packages using FTP."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:787
- msgid "<literal>Debug::Acquire::http</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:791
+ #: apt.conf.5.xml:816
  msgid "Print information related to downloading packages using HTTP."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:798
- msgid "<literal>Debug::Acquire::https</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:802
+ #: apt.conf.5.xml:827
  msgid "Print information related to downloading packages using HTTPS."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:809
- msgid "<literal>Debug::Acquire::gpgv</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:813
+ #: apt.conf.5.xml:838
  msgid ""
  "Print information related to verifying cryptographic signatures using "
  "<literal>gpg</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:820
- msgid "<literal>Debug::aptcdrom</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:824
+ #: apt.conf.5.xml:849
  msgid ""
  "Output information about the process of accessing collections of packages "
  "stored on CD-ROMs."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:831
- msgid "<literal>Debug::BuildDeps</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:834
+ #: apt.conf.5.xml:859
  msgid "Describes the process of resolving build-dependencies in &apt-get;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:841
- msgid "<literal>Debug::Hashes</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:844
+ #: apt.conf.5.xml:869
  msgid ""
  "Output each cryptographic hash that is generated by the <literal>apt</"
  "literal> libraries."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:851
- msgid "<literal>Debug::IdentCDROM</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:854
+ #: apt.conf.5.xml:879
  msgid ""
  "Do not include information from <literal>statfs</literal>, namely the number "
  "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
  "a CD-ROM."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:862
- msgid "<literal>Debug::NoLocking</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:865
+ #: apt.conf.5.xml:890
  msgid ""
  "Disable all file locking.  For instance, this will allow two instances of "
  "<quote><literal>apt-get update</literal></quote> to run at the same time."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:873
- msgid "<literal>Debug::pkgAcquire</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:877
+ #: apt.conf.5.xml:902
  msgid "Log when items are added to or removed from the global download queue."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:884
- msgid "<literal>Debug::pkgAcquire::Auth</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:887
+ #: apt.conf.5.xml:912
  msgid ""
  "Output status messages and errors related to verifying checksums and "
  "cryptographic signatures of downloaded files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:894
- msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:897
+ #: apt.conf.5.xml:922
  msgid ""
  "Output information about downloading and applying package index list diffs, "
  "and errors relating to package index list diffs."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:905
- msgid "<literal>Debug::pkgAcquire::RRed</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:909
+ #: apt.conf.5.xml:934
  msgid ""
  "Output information related to patching apt package lists when downloading "
  "index diffs instead of full indices."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:916
- msgid "<literal>Debug::pkgAcquire::Worker</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:920
+ #: apt.conf.5.xml:945
  msgid ""
  "Log all interactions with the sub-processes that actually perform downloads."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:927
- msgid "<literal>Debug::pkgAutoRemove</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:931
+ #: apt.conf.5.xml:956
  msgid ""
  "Log events related to the automatically-installed status of packages and to "
  "the removal of unused packages."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:938
- msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:941
+ #: apt.conf.5.xml:966
  msgid ""
  "Generate debug messages describing which packages are being automatically "
  "installed to resolve dependencies.  This corresponds to the initial auto-"
@@@ -5618,13 -4379,8 +4380,8 @@@
  "pkgProblemResolver</literal> for that."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:952
- msgid "<literal>Debug::pkgDepCache::Marker</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:955
+ #: apt.conf.5.xml:980
  msgid ""
  "Generate debug messages describing which package is marked as keep/install/"
  "remove while the ProblemResolver does his work.  Each addition or deletion "
@@@ -5640,140 -4396,83 +4397,83 @@@
  "<literal>section</literal> is the name of the section the package appears in."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:974
- msgid "<literal>Debug::pkgInitConfig</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:977
+ #: apt.conf.5.xml:1002
  msgid "Dump the default configuration to standard error on startup."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:984
- msgid "<literal>Debug::pkgDPkgPM</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:987
+ #: apt.conf.5.xml:1012
  msgid ""
  "When invoking &dpkg;, output the precise command line with which it is being "
  "invoked, with arguments separated by a single space character."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:995
- msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:998
+ #: apt.conf.5.xml:1023
  msgid ""
  "Output all the data received from &dpkg; on the status file descriptor and "
  "any errors encountered while parsing it."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1005
- msgid "<literal>Debug::pkgOrderList</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1009
+ #: apt.conf.5.xml:1034
  msgid ""
  "Generate a trace of the algorithm that decides the order in which "
  "<literal>apt</literal> should pass packages to &dpkg;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1017
- msgid "<literal>Debug::pkgPackageManager</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1021
+ #: apt.conf.5.xml:1046
  msgid ""
  "Output status messages tracing the steps performed when invoking &dpkg;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1028
- msgid "<literal>Debug::pkgPolicy</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1032
+ #: apt.conf.5.xml:1057
  msgid "Output the priority of each package list on startup."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1038
- msgid "<literal>Debug::pkgProblemResolver</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1042
+ #: apt.conf.5.xml:1067
  msgid ""
  "Trace the execution of the dependency resolver (this applies only to what "
  "happens when a complex dependency problem is encountered)."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1050
- msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1053
+ #: apt.conf.5.xml:1078
  msgid ""
  "Display a list of all installed packages with their calculated score used by "
  "the pkgProblemResolver. The description of the package is the same as "
  "described in <literal>Debug::pkgDepCache::Marker</literal>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1061
- msgid "<literal>Debug::sourceList</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1065
+ #: apt.conf.5.xml:1090
  msgid ""
  "Print information about the vendors read from <filename>/etc/apt/vendors."
  "list</filename>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1088
+ #: apt.conf.5.xml:1113
  msgid ""
  "&configureindex; is a configuration file showing example values for all "
  "possible options."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt.conf.5.xml:1095
+ #: apt.conf.5.xml:1120
  msgid "&file-aptconf;"
  msgstr ""
  
  #.  ? reading apt.conf 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1100
+ #: apt.conf.5.xml:1125
  msgid "&apt-cache;, &apt-config;, &apt-preferences;."
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt_preferences.5.xml:16
- msgid ""
- "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt_preferences.5.xml:24 apt_preferences.5.xml:31
- msgid "apt_preferences"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt_preferences.5.xml:32
  msgid "Preference control file for APT"
@@@ -5830,8 -4529,8 +4530,8 @@@ msgstr "
  msgid ""
  "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
  "directory are parsed in alphanumeric ascending order and need to obey the "
- "following naming convention: The files have no or \"<literal>pref</literal>"
- "\" as filename extension and which only contain alphanumeric, hyphen (-), "
+ "following naming convention: The files have either no or \"<literal>pref</"
+ "literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
  "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
  "that it has ignored a file if the file doesn't match a pattern in the "
  "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@@ -6159,7 -4858,7 +4859,7 @@@ msgid "
  "APT also supports pinning by glob() expressions and regular expressions "
  "surrounded by /. For example, the following example assigns the priority 500 "
  "to all packages from experimental where the name starts with gnome (as a glob"
- "()-like expression or contains the word kde (as a POSIX extended regular "
+ "()-like expression) or contains the word kde (as a POSIX extended regular "
  "expression surrounded by slashes)."
  msgstr ""
  
@@@ -6176,7 -4875,7 +4876,7 @@@ msgstr "
  #: apt_preferences.5.xml:279
  msgid ""
  "The rule for those expressions is that they can occur anywhere where a "
- "string can occur. Those, the following pin assigns the priority 990 to all "
+ "string can occur. Thus, the following pin assigns the priority 990 to all "
  "packages from a release starting with karmic."
  msgstr ""
  
@@@ -6189,93 -4888,94 +4889,94 @@@ msgid "
  "Pin-Priority: 990\n"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:290
- msgid "Package"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:296
- msgid "*"
+ #. type: Content of: <refentry><refsect1><refsect2><para>
+ #: apt_preferences.5.xml:291
+ msgid ""
+ "If a regular expression occurs in a <literal>Package</literal> field, the "
+ "behavior is the same as if this regular expression were replaced with a list "
+ "of all package names it matches. It is undecided whether this will change in "
+ "the future, thus you should always list wild-card pins first, so later "
+ "specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+ "Package field is not considered a glob() expression in itself."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:306
+ #: apt_preferences.5.xml:307
  msgid "How APT Interprets Priorities"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:314
+ #: apt_preferences.5.xml:315
  msgid "P &gt; 1000"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:315
+ #: apt_preferences.5.xml:316
  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:319
+ #: apt_preferences.5.xml:320
  msgid "990 &lt; P &lt;=1000"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:320
+ #: apt_preferences.5.xml:321
  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:325
+ #: apt_preferences.5.xml:326
  msgid "500 &lt; P &lt;=990"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:326
+ #: apt_preferences.5.xml:327
  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:331
+ #: apt_preferences.5.xml:332
  msgid "100 &lt; P &lt;=500"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:332
+ #: apt_preferences.5.xml:333
  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:337
+ #: apt_preferences.5.xml:338
  msgid "0 &lt; P &lt;=100"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:338
+ #: apt_preferences.5.xml:339
  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:342
+ #: apt_preferences.5.xml:343
  msgid "P &lt; 0"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:343
+ #: apt_preferences.5.xml:344
  msgid "prevents the version from being installed"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:309
+ #: apt_preferences.5.xml:310
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -6283,7 -4983,7 +4984,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:348
+ #: apt_preferences.5.xml:349
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -6292,14 -4992,14 +4993,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:354
+ #: apt_preferences.5.xml:355
  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:358
+ #: apt_preferences.5.xml:359
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -6316,12 -5016,12 +5017,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:371
+ #: apt_preferences.5.xml:372
  msgid "Then:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:373
+ #: apt_preferences.5.xml:374
  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 "
@@@ -6331,7 -5031,7 +5032,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:378
+ #: apt_preferences.5.xml:379
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -6339,7 -5039,7 +5040,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:382
+ #: apt_preferences.5.xml:383
  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</"
@@@ -6348,12 -5048,12 +5049,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:392
+ #: apt_preferences.5.xml:393
  msgid "Determination of Package Version and Distribution Properties"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:394
+ #: apt_preferences.5.xml:395
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -6361,27 -5061,27 +5062,27 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:406
+ #: apt_preferences.5.xml:407
  msgid "the <literal>Package:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:407
+ #: apt_preferences.5.xml:408
  msgid "gives the package name"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+ #: apt_preferences.5.xml:411 apt_preferences.5.xml:461
  msgid "the <literal>Version:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:411
+ #: apt_preferences.5.xml:412
  msgid "gives the version number for the named package"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:398
+ #: apt_preferences.5.xml:399
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -6394,12 -5094,12 +5095,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:427
+ #: apt_preferences.5.xml:428
  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:428
+ #: apt_preferences.5.xml:429
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -6410,18 -5110,18 +5111,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:438
+ #: apt_preferences.5.xml:439
  #, no-wrap
  msgid "Pin: release a=stable\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:444
+ #: apt_preferences.5.xml:445
  msgid "the <literal>Codename:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:445
+ #: apt_preferences.5.xml:446
  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 "
@@@ -6432,13 -5132,13 +5133,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:454
+ #: apt_preferences.5.xml:455
  #, 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:461
+ #: apt_preferences.5.xml:462
  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 "
@@@ -6448,7 -5148,7 +5149,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:470
+ #: apt_preferences.5.xml:471
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -6457,12 -5157,12 +5158,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:479
+ #: apt_preferences.5.xml:480
  msgid "the <literal>Component:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:480
+ #: apt_preferences.5.xml:481
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -6473,18 -5173,18 +5174,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:489
+ #: apt_preferences.5.xml:490
  #, no-wrap
  msgid "Pin: release c=main\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:495
+ #: apt_preferences.5.xml:496
  msgid "the <literal>Origin:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:496
+ #: apt_preferences.5.xml:497
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -6493,18 -5193,18 +5194,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:502
+ #: apt_preferences.5.xml:503
  #, no-wrap
  msgid "Pin: release o=Debian\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:508
+ #: apt_preferences.5.xml:509
  msgid "the <literal>Label:</literal> line"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:509
+ #: apt_preferences.5.xml:510
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -6513,13 -5213,13 +5214,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:515
+ #: apt_preferences.5.xml:516
  #, no-wrap
  msgid "Pin: release l=Debian\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:416
+ #: apt_preferences.5.xml:417
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -6533,7 -5233,7 +5234,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:522
+ #: apt_preferences.5.xml:523
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -6548,12 -5248,12 +5249,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:535
+ #: apt_preferences.5.xml:536
  msgid "Optional Lines in an APT Preferences Record"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:537
+ #: apt_preferences.5.xml:538
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -6561,12 -5261,12 +5262,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:546
+ #: apt_preferences.5.xml:547
  msgid "Tracking Stable"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:554
+ #: apt_preferences.5.xml:555
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -6581,7 -5281,7 +5282,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:548
+ #: apt_preferences.5.xml:549
  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 "
@@@ -6591,8 -5291,8 +5292,8 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:571 apt_preferences.5.xml:617
- #: apt_preferences.5.xml:675
+ #: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+ #: apt_preferences.5.xml:676
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -6601,7 -5301,7 +5302,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:566
+ #: apt_preferences.5.xml:567
  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 "
@@@ -6610,13 -5310,13 +5311,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:583
+ #: apt_preferences.5.xml:584
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/testing\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:577
+ #: apt_preferences.5.xml:578
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -6625,12 -5325,12 +5326,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:589
+ #: apt_preferences.5.xml:590
  msgid "Tracking Testing or Unstable"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:598
+ #: apt_preferences.5.xml:599
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -6647,7 -5347,7 +5348,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:591
+ #: apt_preferences.5.xml:592
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -6658,7 -5358,7 +5359,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:612
+ #: apt_preferences.5.xml:613
  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 "
@@@ -6667,13 -5367,13 +5368,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:632
+ #: apt_preferences.5.xml:633
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:623
+ #: apt_preferences.5.xml:624
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -6685,12 -5385,12 +5386,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:639
+ #: apt_preferences.5.xml:640
  msgid "Tracking the evolution of a codename release"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:653
+ #: apt_preferences.5.xml:654
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -6710,7 -5410,7 +5411,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:641
+ #: apt_preferences.5.xml:642
  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 "
@@@ -6725,7 -5425,7 +5426,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:670
+ #: apt_preferences.5.xml:671
  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 "
@@@ -6734,13 -5434,13 +5435,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:690
+ #: apt_preferences.5.xml:691
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/sid\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:681
+ #: apt_preferences.5.xml:682
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -6752,20 -5452,15 +5453,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt_preferences.5.xml:699
+ #: apt_preferences.5.xml:700
  msgid "&file-preferences;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt_preferences.5.xml:705
+ #: apt_preferences.5.xml:706
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: sources.list.5.xml:25 sources.list.5.xml:32
- msgid "sources.list"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: sources.list.5.xml:33
  msgid "Package resource list for APT"
@@@ -6841,7 -5536,7 +5537,7 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><literallayout>
  #: sources.list.5.xml:81
  #, no-wrap
- msgid "deb uri distribution [component1] [component2] [...]"
+ msgid "deb [ options ] uri distribution [component1] [component2] [...]"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -6886,6 -5581,38 +5582,38 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:112
  msgid ""
+ "<literal>options</literal> is always optional and needs to be surounded by "
+ "square brackets. It can consist of multiple settings in the form "
+ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+ "replaceable></literal>.  Multiple settings are separated by spaces. The "
+ "following settings are supported by APT, note though that unsupported "
+ "settings will be ignored silently:"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:117
+ msgid ""
+ "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+ "replaceable>,…</literal> can be used to specify for which architectures "
+ "packages information should be downloaded. If this option is not set all "
+ "architectures defined by the <literal>APT::Architectures</literal> option "
+ "will be downloaded."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:121
+ msgid ""
+ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+ "this source are always authenticated even if the <filename>Release</"
+ "filename> file is not signed or the signature can't be checked. This "
+ "disables parts of &apt-secure; and should therefore only be used in a local "
+ "and trusted context. <literal>trusted=no</literal> is the opposite which "
+ "handles even correctly authenticated sources as not authenticated."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:128
+ msgid ""
  "It is important to list sources in order of preference, with the most "
  "preferred source listed first. Typically this will result in sorting by "
  "speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@@ -6893,12 -5620,12 +5621,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:117
+ #: sources.list.5.xml:133
  msgid "Some examples:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:119
+ #: sources.list.5.xml:135
  #, no-wrap
  msgid ""
  "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@@ -6907,32 -5634,42 +5635,42 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: sources.list.5.xml:125
+ #: sources.list.5.xml:141
  msgid "URI specification"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:130
+ #: sources.list.5.xml:146
  msgid "file"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:132
+ #: sources.list.5.xml:148
  msgid ""
  "The file scheme allows an arbitrary directory in the file system to be "
  "considered an archive. This is useful for NFS mounts and local mirrors or "
  "archives."
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:153
+ msgid "cdrom"
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:139
+ #: sources.list.5.xml:155
  msgid ""
  "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
  "Use the &apt-cdrom; program to create cdrom entries in the source list."
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:160
+ msgid "http"
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:146
+ #: sources.list.5.xml:162
  msgid ""
  "The http scheme specifies an HTTP server for the archive. If an environment "
  "variable <envar>http_proxy</envar> is set with the format http://server:"
@@@ -6942,8 -5679,13 +5680,13 @@@
  "authentication."
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:171
+ msgid "ftp"
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:157
+ #: sources.list.5.xml:173
  msgid ""
  "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
  "is highly configurable; for more information see the &apt-conf; manual page. "
@@@ -6955,12 -5697,12 +5698,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:166
+ #: sources.list.5.xml:182
  msgid "copy"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:168
+ #: sources.list.5.xml:184
  msgid ""
  "The copy scheme is identical to the file scheme except that packages are "
  "copied into the cache directory instead of used directly at their location.  "
@@@ -6968,17 -5710,17 +5711,17 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "rsh"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "ssh"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:175
+ #: sources.list.5.xml:191
  msgid ""
  "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
  "user and access the files. It is a good idea to do prior arrangements with "
@@@ -6988,12 -5730,12 +5731,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:183
+ #: sources.list.5.xml:199
  msgid "more recognizable URI types"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:185
+ #: sources.list.5.xml:201
  msgid ""
  "APT can be extended with more methods shipped in other optional packages "
  "which should follow the nameing scheme <literal>apt-transport-"
@@@ -7006,75 -5748,91 +5749,91 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:127
+ #: sources.list.5.xml:143
  msgid ""
  "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
  "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:199
+ #: sources.list.5.xml:215
  msgid ""
  "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
  "stable/main, stable/contrib, and stable/non-free."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:201
+ #: sources.list.5.xml:217
  #, no-wrap
  msgid "deb file:/home/jason/debian stable main contrib non-free"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:203
+ #: sources.list.5.xml:219
  msgid "As above, except this uses the unstable (development) distribution."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:204
+ #: sources.list.5.xml:220
  #, no-wrap
  msgid "deb file:/home/jason/debian unstable main contrib non-free"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:206
+ #: sources.list.5.xml:222
  msgid "Source line for the above"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:207
+ #: sources.list.5.xml:223
  #, no-wrap
  msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:209
+ #: sources.list.5.xml:225
+ msgid ""
+ "The first line gets package information for the architectures in "
+ "<literal>APT::Architectures</literal> while the second always retrieves "
+ "<literal>amd64</literal> and <literal>armel</literal>."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><literallayout>
+ #: sources.list.5.xml:227
+ #, no-wrap
+ msgid ""
+ "deb http://ftp.debian.org/debian &stable-codename; main\n"
+ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:230
  msgid ""
  "Uses HTTP to access the archive at archive.debian.org, and uses only the "
  "hamm/main area."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:211
+ #: sources.list.5.xml:232
  #, no-wrap
  msgid "deb http://archive.debian.org/debian-archive hamm main"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:213
+ #: sources.list.5.xml:234
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the &stable-codename;/contrib area."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:215
+ #: sources.list.5.xml:236
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:217
+ #: sources.list.5.xml:238
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the unstable/contrib area. If this line appears as "
@@@ -7083,19 -5841,19 +5842,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:221
+ #: sources.list.5.xml:242
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian unstable contrib"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: sources.list.5.xml:230
+ #: sources.list.5.xml:251
  #, no-wrap
  msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:223
+ #: sources.list.5.xml:244
  msgid ""
  "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
  "directory, and uses only files found under <filename>unstable/binary-i386</"
@@@ -7107,7 -5865,7 +5866,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:235
+ #: sources.list.5.xml:256
  msgid "&apt-cache; &apt-conf;"
  msgstr ""
  
@@@ -7309,6 -6067,12 +6068,12 @@@ msgstr "
  "con un buon numero di algoritmi automatici, che aiutano a selezionare i "
  "pacchetti da installare."
  
+ #. type: <heading></heading>
+ #: guide.sgml:96
+ #, fuzzy
+ msgid "apt-get"
+ msgstr "apt-get"
+ 
  #. type: <p></p>
  #: guide.sgml:102
  #, fuzzy
@@@ -7362,6 -6126,12 +6127,12 @@@ msgstr "
  msgid "Once updated there are several commands that can be used:"
  msgstr "Dopo aver aggiornato l'elenco si possono usare molti comandi:"
  
+ #. type: <tag></tag>
+ #: guide.sgml:121
+ #, fuzzy
+ msgid "upgrade"
+ msgstr "upgrade"
+ 
  #. type: <p></p>
  #: guide.sgml:131
  #, fuzzy
@@@ -7382,6 -6152,12 +6153,12 @@@ msgstr "
  "altri. Per forzare la loro installazione si può usare <prgn>dselect</prgn> o "
  "<tt>apt-get install</tt>."
  
+ #. type: <tag></tag>
+ #: guide.sgml:131
+ #, fuzzy
+ msgid "install"
+ msgstr "install"
+ 
  #. type: <p></p>
  #: guide.sgml:140
  #, fuzzy
@@@ -7403,6 -6179,12 +6180,12 @@@ msgstr "
  "conferma se si devono modificare altri pacchetti che non siano quelli sulla "
  "linea di comando."
  
+ #. type: <tag></tag>
+ #: guide.sgml:140
+ #, fuzzy
+ msgid "dist-upgrade"
+ msgstr "dist-upgrade"
+ 
  #. type: <p></p>
  #: guide.sgml:149
  #, fuzzy
diff --combined doc/po/ja.po
index 22488b227,dab4f0b02..c0d0d7953
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@@ -7,7 -7,7 +7,8 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: apt 0.7.25.3\n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
 -"POT-Creation-Date: 2012-05-21 13:35+0300\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:47+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"
@@@ -152,44 -152,7 +153,7 @@@ msgstr "
  "apt は APT チーム E<lt>apt@packages.debian.orgE<gt> によって書かれました。"
  
  #. type: Plain text
- #: apt.ent:2
- msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
- msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
- 
- #. type: Plain text
- #: apt.ent:16
- #, no-wrap
- msgid ""
- "<!-- Boiler plate docinfo section -->\n"
- "<!ENTITY apt-docinfo \"\n"
- " <refentryinfo>\n"
- "   <address><email>apt@packages.debian.org</email></address>\n"
- "   <author>\n"
- "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
- "     <contrib></contrib>\n"
- "   </author>\n"
- "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
- "   <date>28 October 2008</date>\n"
- "   <productname>Linux</productname>\n"
- " </refentryinfo>\n"
- "\">\n"
- msgstr ""
- "<!-- Boiler plate docinfo section -->\n"
- "<!ENTITY apt-docinfo \"\n"
- " <refentryinfo>\n"
- "   <address><email>apt@packages.debian.org</email></address>\n"
- "   <author>\n"
- "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
- "     <contrib></contrib>\n"
- "   </author>\n"
- "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
- "   <date>28 October 2008</date>\n"
- "   <productname>Linux</productname>\n"
- " </refentryinfo>\n"
- "\">\n"
- 
- #. type: Plain text
- #: apt.ent:23
+ #: apt.ent:7
  #, no-wrap
  msgid ""
  "<!ENTITY apt-author.team \"\n"
@@@ -207,7 -170,7 +171,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:29
+ #: apt.ent:13
  #, no-wrap
  msgid ""
  "<!ENTITY apt-qapage \"\n"
@@@ -223,7 -186,7 +187,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:40
+ #: apt.ent:24
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Bug reporting section -->\n"
@@@ -249,7 -212,7 +213,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:48
+ #: apt.ent:32
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Author section -->\n"
@@@ -269,7 -232,7 +233,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:58
+ #: apt.ent:42
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -293,7 -256,7 +257,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:66
+ #: apt.ent:50
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -313,7 -276,7 +277,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:78
+ #: apt.ent:62
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -340,7 -303,7 +304,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:90
+ #: apt.ent:74
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -368,7 -331,7 +332,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:101
+ #: apt.ent:85
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -395,7 -358,7 +359,7 @@@ msgstr "
  "\n"
  
  #. type: Plain text
- #: apt.ent:107
+ #: apt.ent:91
  #, no-wrap
  msgid ""
  "<!ENTITY file-aptconf \"\n"
@@@ -411,7 -374,7 +375,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:113
+ #: apt.ent:97
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@@ -427,7 -390,7 +391,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:119
+ #: apt.ent:103
  #, no-wrap
  msgid ""
  "<!ENTITY file-cachearchives \"\n"
@@@ -444,12 -407,18 +408,18 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Plain text
- #: apt.ent:125
- #, no-wrap
+ #: apt.ent:109
+ #, fuzzy, no-wrap
+ #| msgid ""
+ #| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+ #| "     <listitem><para>Storage area for package files in transit.\n"
+ #| "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+ #| "     </varlistentry>\n"
+ #| "\">\n"
  msgid ""
  "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
  "     <listitem><para>Storage area for package files in transit.\n"
- "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
@@@ -461,7 -430,7 +431,7 @@@
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Plain text
- #: apt.ent:135
+ #: apt.ent:119
  #, no-wrap
  msgid ""
  "<!ENTITY file-preferences \"\n"
@@@ -484,7 -453,7 +454,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:141
+ #: apt.ent:125
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@@ -500,7 -469,7 +470,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:147
+ #: apt.ent:131
  #, no-wrap
  msgid ""
  "<!ENTITY file-sourceslist \"\n"
@@@ -516,7 -485,7 +486,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:153
+ #: apt.ent:137
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@@ -533,7 -502,7 +503,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Plain text
- #: apt.ent:160
+ #: apt.ent:144
  #, no-wrap
  msgid ""
  "<!ENTITY file-statelists \"\n"
@@@ -551,12 -520,18 +521,18 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Plain text
- #: apt.ent:166
- #, no-wrap
+ #: apt.ent:150
+ #, fuzzy, no-wrap
+ #| msgid ""
+ #| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+ #| "     <listitem><para>Storage area for state information in transit.\n"
+ #| "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+ #| "     </varlistentry>\n"
+ #| "\">\n"
  msgid ""
  "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
  "     <listitem><para>Storage area for state information in transit.\n"
- "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
@@@ -568,7 -543,7 +544,7 @@@
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Plain text
- #: apt.ent:172
+ #: apt.ent:156
  #, no-wrap
  msgid ""
  "<!ENTITY file-trustedgpg \"\n"
@@@ -585,7 -560,7 +561,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Plain text
- #: apt.ent:179
+ #: apt.ent:163
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@@ -602,7 -577,7 +578,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:187
+ #: apt.ent:171
  #, no-wrap
  msgid ""
  "<!ENTITY file-extended_states \"\n"
@@@ -622,7 -597,7 +598,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:191
+ #: apt.ent:175
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@@ -634,7 -609,7 +610,7 @@@ msgstr "
  "<!ENTITY translation-title \"翻訳\">\n"
  
  #. type: Plain text
- #: apt.ent:200
+ #: apt.ent:184
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@@ -655,7 -630,7 +631,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:210
+ #: apt.ent:195
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@@ -680,37 -655,133 +656,133 @@@ msgstr "
  "     内容を失わないようにこのようにしています。\n"
  "\">\n"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cache.8.xml:16
- #, fuzzy
- #| msgid ""
- #| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
- #| "<date>14 February 2004</date>"
+ #. type: Plain text
+ #: apt.ent:198
  msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
- "February 2011</date>"
+ "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+ "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
  msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "February 2004</date>"
  
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cache.8.xml:25 apt-cache.8.xml:32
- msgid "apt-cache"
- msgstr "apt-cache"
+ #. type: Plain text
+ #: apt.ent:201
+ msgid ""
+ "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+ "synopsis-config-file \"config_file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:204
+ msgid ""
+ "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+ "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+ "\"target_release\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:207
+ msgid ""
+ "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+ "synopsis-architecture \"architecture\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:210
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+ "--> <!ENTITY synopsis-pkg \"pkg\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:213
+ msgid ""
+ "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+ "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:216
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+ "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:219
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+ "awesome --> <!ENTITY synopsis-regex \"regex\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:222
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+ "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:225
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+ "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+ "\"temporary_directory\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:228
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+ "synopsis-filename \"filename\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:231
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:234
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-override "
+ "\"override-file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:237
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+ "\"pathprefix\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:240
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "generate section --> <!ENTITY synopsis-section \"section\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:243
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+ msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26
- #: apt-key.8.xml:18 apt-mark.8.xml:26 apt-secure.8.xml:18
+ #: apt-key.8.xml:25 apt-mark.8.xml:26 apt-secure.8.xml:25
  msgid "8"
  msgstr "8"
  
  #. type: Content of: <refentry><refmeta><refmiscinfo>
  #: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27
  #: apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27
- #: apt-key.8.xml:19 apt-mark.8.xml:27 apt-secure.8.xml:19
- #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:33 apt_preferences.5.xml:26
+ #: apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26
+ #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:32 apt_preferences.5.xml:26
  #: sources.list.5.xml:27
  msgid "APT"
  msgstr "APT"
@@@ -720,87 -791,19 +792,19 @@@
  msgid "query the APT cache"
  msgstr ""
  
- # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cache.8.xml:39
- #, fuzzy
- #| msgid ""
- #| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
- #| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- #| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
- #| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
- #| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- #| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
- #| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
- #| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
- #| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- #| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- #| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
- #| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
- #| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
- #| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- #| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
- #| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
- #| "group>"
- msgid ""
- "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
- "<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
- "arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
- "arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
- "arg> </group>"
- msgstr ""
- "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>add <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
- "replaceable></arg></arg> <arg>gencaches</arg> <arg>showpkg <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>showsrc <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</"
- "arg> <arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
- "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
- "\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </group>"
- 
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
- #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
- #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
- #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+ #: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+ #: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+ #: apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50
+ #: apt-sortpkgs.1.xml:38 apt.conf.5.xml:41 apt_preferences.5.xml:36
  #: sources.list.5.xml:36
  msgid "Description"
  msgstr "説明"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:65
+ #: apt-cache.8.xml:39
  msgid ""
  "<command>apt-cache</command> performs a variety of operations on APT's "
  "package cache. <command>apt-cache</command> does not manipulate the state of "
@@@ -814,7 -817,7 +818,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:70 apt-get.8.xml:120
+ #: apt-cache.8.xml:44 apt-get.8.xml:44
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given, "
  "one of the commands below must be present."
@@@ -822,32 -825,23 +826,23 @@@ msgstr "
  "<option>-h</option> オプションや <option>--help</option> オプションを除き、以"
  "下に挙げるコマンドが必要です。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:74
- msgid "gencaches"
- msgstr "gencaches"
- 
- # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:75
+ #: apt-cache.8.xml:49
  msgid ""
- "<literal>gencaches</literal> performs the same operation as <command>apt-get "
- "check</command>. It builds the source and package caches from the sources in "
- "&sources-list; and from <filename>/var/lib/dpkg/status</filename>."
+ "<literal>gencaches</literal> creates APT's package cache. This is done "
+ "implicitly by all commands needing this cache if it is missing or outdated."
  msgstr ""
- "<literal>gencaches</literal> は、<command>apt-get check</command> と同じ動作"
- "を提供します。これは &sources-list; 内の取得元と <filename>/var/lib/dpkg/"
- "status</filename>から、ソースとパッケージのキャッシュを構築します。"
  
- # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:81
- msgid "showpkg <replaceable>pkg(s)</replaceable>"
- msgstr "showpkg <replaceable>pkg(s)</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+ #: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
+ #: apt-cache.8.xml:226 apt-cache.8.xml:238
+ msgid "&synopsis-pkg;"
+ msgstr ""
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:82
+ #: apt-cache.8.xml:54
  msgid ""
  "<literal>showpkg</literal> displays information about the packages listed on "
  "the command line. Remaining arguments are package names. The available "
@@@ -870,7 -864,7 +865,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-cache.8.xml:94
+ #: apt-cache.8.xml:66
  #, no-wrap
  msgid ""
  "Package: libreadline2\n"
@@@ -898,7 -892,7 +893,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:106
+ #: apt-cache.8.xml:78
  msgid ""
  "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
  "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@@ -916,14 -910,9 +911,9 @@@ msgstr "
  "altdev はインストールする必要はありません。出力の残りの部分の意味については、"
  "apt のソースコードを調べるのが最良でしょう。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:115
- msgid "stats"
- msgstr "stats"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:115
+ #: apt-cache.8.xml:87
  msgid ""
  "<literal>stats</literal> displays some statistics about the cache.  No "
  "further arguments are expected. Statistics reported are:"
@@@ -933,7 -922,7 +923,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:118
+ #: apt-cache.8.xml:90
  msgid ""
  "<literal>Total package names</literal> is the number of package names found "
  "in the cache."
@@@ -943,7 -932,7 +933,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:122
+ #: apt-cache.8.xml:94
  msgid ""
  "<literal>Normal packages</literal> is the number of regular, ordinary "
  "package names; these are packages that bear a one-to-one correspondence "
@@@ -956,7 -945,7 +946,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:128
+ #: apt-cache.8.xml:100
  msgid ""
  "<literal>Pure virtual packages</literal> is the number of packages that "
  "exist only as a virtual package name; that is, packages only \"provide\" the "
@@@ -974,7 -963,7 +964,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:136
+ #: apt-cache.8.xml:108
  msgid ""
  "<literal>Single virtual packages</literal> is the number of packages with "
  "only one package providing a particular virtual package. For example, in the "
@@@ -988,7 -977,7 +978,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:142
+ #: apt-cache.8.xml:114
  msgid ""
  "<literal>Mixed virtual packages</literal> is the number of packages that "
  "either provide a particular virtual package or have the virtual package name "
@@@ -1002,7 -991,7 +992,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:149
+ #: apt-cache.8.xml:121
  msgid ""
  "<literal>Missing</literal> is the number of package names that were "
  "referenced in a dependency but were not provided by any package. Missing "
@@@ -1018,7 -1007,7 +1008,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:156
+ #: apt-cache.8.xml:128
  msgid ""
  "<literal>Total distinct</literal> versions is the number of package versions "
  "found in the cache; this value is therefore at least equal to the number of "
@@@ -1033,7 -1022,7 +1023,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:163
+ #: apt-cache.8.xml:135
  msgid ""
  "<literal>Total dependencies</literal> is the number of dependency "
  "relationships claimed by all of the packages in the cache."
@@@ -1041,15 -1030,9 +1031,9 @@@ msgstr "
  "<literal>依存関係総数</literal>は、キャッシュにあるすべてのパッケージで要求さ"
  "れた依存関係の数です。"
  
- # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:170
- msgid "showsrc <replaceable>pkg(s)</replaceable>"
- msgstr "showsrc <replaceable>pkg(s)</replaceable>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:171
+ #: apt-cache.8.xml:143
  msgid ""
  "<literal>showsrc</literal> displays all the source package records that "
  "match the given package names. All versions are shown, as well as all "
@@@ -1059,14 -1042,9 +1043,9 @@@ msgstr "
  "を、すべて表示します。バイナリになるときの名称を宣言したレコードと同様に、す"
  "べてのバージョンについて表示します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:176 apt-config.8.xml:87
- msgid "dump"
- msgstr "dump"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:177
+ #: apt-cache.8.xml:149
  msgid ""
  "<literal>dump</literal> shows a short listing of every package in the cache. "
  "It is primarily for debugging."
@@@ -1074,14 -1052,9 +1053,9 @@@ msgstr "
  "<literal>dump</literal> は、キャッシュ内のパッケージそれぞれについて、短い一"
  "覧を表示します。主にデバッグ用です。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:181
- msgid "dumpavail"
- msgstr "dumpavail"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:182
+ #: apt-cache.8.xml:154
  msgid ""
  "<literal>dumpavail</literal> prints out an available list to stdout. This is "
  "suitable for use with &dpkg; and is used by the &dselect; method."
@@@ -1089,14 -1062,9 +1063,9 @@@ msgstr "
  "<literal>dumpavail</literal> は、標準出力に利用可能なものの一覧を出力しま"
  "す。 &dpkg; と共に使用すると便利ですし、&dselect; でも使用されます。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:186
- msgid "unmet"
- msgstr "unmet"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:187
+ #: apt-cache.8.xml:159
  msgid ""
  "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
  "package cache."
@@@ -1104,15 -1072,9 +1073,9 @@@ msgstr "
  "<literal>unmet</literal> は、パッケージキャッシュ内にある、不適当な依存関係の"
  "概要を表示します。"
  
- # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:191
- msgid "show <replaceable>pkg(s)</replaceable>"
- msgstr "show <replaceable>pkg(s)</replaceable>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:192
+ #: apt-cache.8.xml:164
  msgid ""
  "<literal>show</literal> performs a function similar to <command>dpkg --print-"
  "avail</command>; it displays the package records for the named packages."
@@@ -1120,14 -1082,14 +1083,14 @@@ msgstr "
  "<literal>show</literal> は、<command>dpkg --print-avail</command> と同様の機"
  "能を実行します。これは、指定したパッケージのパッケージレコードの表示です。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:197
- msgid "search <replaceable>regex [ regex ... ]</replaceable>"
- msgstr "search <replaceable>regex [ regex ... ]</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:169
+ msgid "&synopsis-regex;"
+ msgstr ""
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:198
+ #: apt-cache.8.xml:170
  msgid ""
  "<literal>search</literal> performs a full text search on all available "
  "package lists for the POSIX regex pattern given, see "
@@@ -1152,21 -1114,15 +1115,15 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:211
+ #: apt-cache.8.xml:183
  msgid ""
  "Separate arguments can be used to specify multiple search patterns that are "
  "and'ed together."
  msgstr "空白で区切った引数で、複数の検索パターンの and をとることができます。"
  
- # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:215
- msgid "depends <replaceable>pkg(s)</replaceable>"
- msgstr "depends <replaceable>pkg(s)</replaceable>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:216
+ #: apt-cache.8.xml:188
  msgid ""
  "<literal>depends</literal> shows a listing of each dependency a package has "
  "and all the possible other packages that can fulfill that dependency."
@@@ -1174,15 -1130,9 +1131,9 @@@ msgstr "
  "<literal>depends</literal> は、パッケージが持っている依存関係と、その依存関係"
  "を満たす他のパッケージの一覧を表示します。"
  
- # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:220
- msgid "rdepends <replaceable>pkg(s)</replaceable>"
- msgstr "rdepends <replaceable>pkg(s)</replaceable>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:221
+ #: apt-cache.8.xml:193
  msgid ""
  "<literal>rdepends</literal> shows a listing of each reverse dependency a "
  "package has."
@@@ -1191,13 -1141,15 +1142,15 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:225
- msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+ #: apt-cache.8.xml:197
+ #, fuzzy
+ #| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+ msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
  msgstr "pkgnames <replaceable>[ prefix ]</replaceable>"
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:226
+ #: apt-cache.8.xml:198
  msgid ""
  "This command prints the name of each package APT knows. The optional "
  "argument is a prefix match to filter the name list. The output is suitable "
@@@ -1211,7 -1163,7 +1164,7 @@@ msgstr "
  "generate</option> オプションと共に使用すると非常に便利です。"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:231
+ #: apt-cache.8.xml:203
  msgid ""
  "Note that a package which APT knows of is not necessarily available to "
  "download, installable or installed, e.g. virtual packages are also listed in "
@@@ -1221,15 -1173,9 +1174,9 @@@ msgstr "
  "ル済みである必要がないことに注意してください。つまり、仮想パッケージも生成し"
  "た一覧にあります。"
  
- # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:236
- msgid "dotty <replaceable>pkg(s)</replaceable>"
- msgstr "dotty <replaceable>pkg(s)</replaceable>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:237
+ #: apt-cache.8.xml:209
  msgid ""
  "<literal>dotty</literal> takes a list of packages on the command line and "
  "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@@ -1249,7 -1195,7 +1196,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:246
+ #: apt-cache.8.xml:218
  msgid ""
  "The resulting nodes will have several shapes; normal packages are boxes, "
  "pure provides are triangles, mixed provides are diamonds, missing packages "
@@@ -1263,18 -1209,12 +1210,12 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:251
+ #: apt-cache.8.xml:223
  msgid "Caution, dotty cannot graph larger sets of packages."
  msgstr "注意) dotty は、パッケージのより大きなセットのグラフは描けません。"
  
- # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:254
- msgid "xvcg <replaceable>pkg(s)</replaceable>"
- msgstr "xvcg <replaceable>pkg(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:255
+ #: apt-cache.8.xml:227
  msgid ""
  "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
  "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@@ -1284,13 -1224,15 +1225,15 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:259
- msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
- msgstr "policy <replaceable>[ pkg(s) ]</replaceable>"
+ #: apt-cache.8.xml:231
+ #, fuzzy
+ #| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
+ msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
+ msgstr "madison <replaceable>[ pkg(s) ]</replaceable>"
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:260
+ #: apt-cache.8.xml:232
  msgid ""
  "<literal>policy</literal> is meant to help debug issues relating to the "
  "preferences file. With no arguments it will print out the priorities of each "
@@@ -1301,15 -1243,9 +1244,9 @@@ msgstr "
  "します。引数を指定しなかった場合、取得元ごとの優先順位を表示します。一方、"
  "パッケージ名を指定した場合、優先順の詳細情報を表示します。"
  
- # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:266
- msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
- msgstr "madison <replaceable>[ pkg(s) ]</replaceable>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:267
+ #: apt-cache.8.xml:239
  msgid ""
  "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
  "to mimic the output format and a subset of the functionality of the Debian "
@@@ -1327,26 -1263,16 +1264,16 @@@ msgstr "
  "表示するだけです。"
  
  # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
- #: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
- #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+ #. type: Content of: <refentry><refsect1><title>
+ #: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+ #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+ #: apt-sortpkgs.1.xml:48
  msgid "options"
  msgstr "オプション"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>-p</option>"
- msgstr "<option>-p</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>--pkg-cache</option>"
- msgstr "<option>--pkg-cache</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:283
+ #: apt-cache.8.xml:255
  msgid ""
  "Select the file to store the package cache. The package cache is the primary "
  "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@@ -1356,20 -1282,9 +1283,9 @@@ msgstr "
  "すべての操作で使用される一次キャッシュです。設定項目 - <literal>Dir::Cache::"
  "pkgcache</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:288
- msgid "<option>--src-cache</option>"
- msgstr "<option>--src-cache</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:289
+ #: apt-cache.8.xml:261
  msgid ""
  "Select the file to store the source cache. The source is used only by "
  "<literal>gencaches</literal> and it stores a parsed version of the package "
@@@ -1383,19 -1298,9 +1299,9 @@@ msgstr "
  "シュは、全パッケージファイルを再解析を避ける上で便利です。設定項目 - "
  "<literal>Dir::Cache::srcpkgcache</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:545 apt-get.8.xml:383
- msgid "<option>--quiet</option>"
- msgstr "<option>--quiet</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:297
+ #: apt-cache.8.xml:269
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quietness up to a maximum of 2. You can also use "
@@@ -1407,19 -1312,9 +1313,9 @@@ msgstr "
  "レベルを指定して、設定ファイルを上書きすることもできます。設定項目 - "
  "<literal>quiet</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>-i</option>"
- msgstr "<option>-i</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>--important</option>"
- msgstr "<option>--important</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:304
+ #: apt-cache.8.xml:276
  msgid ""
  "Print only important dependencies; for use with unmet and depends. Causes "
  "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@@ -1429,53 -1324,13 +1325,13 @@@ msgstr "
  "関係と「先行依存」関係のみを表示するためです。設定項目 - <literal>APT::"
  "Cache::Important</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:309
- msgid "<option>--no-pre-depends</option>"
- msgstr "<option>--no-pre-depends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:310
- msgid "<option>--no-depends</option>"
- msgstr "<option>--no-depends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:311
- msgid "<option>--no-recommends</option>"
- msgstr "<option>--no-recommends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:312
- msgid "<option>--no-suggests</option>"
- msgstr "<option>--no-suggests</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:313
- msgid "<option>--no-conflicts</option>"
- msgstr "<option>--no-conflicts</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:314
- msgid "<option>--no-breaks</option>"
- msgstr "<option>--no-breaks</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:315
- msgid "<option>--no-replaces</option>"
- msgstr "<option>--no-replaces</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:316
- msgid "<option>--no-enhances</option>"
- msgstr "<option>--no-enhances</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:317
+ #: apt-cache.8.xml:289
  #, fuzzy
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
- "print all dependencies. This can be twicked with these flags which will omit "
+ "print all dependencies. This can be tweaked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
@@@ -1484,19 -1339,9 +1340,9 @@@ msgstr "
  "ケージを再帰的に一度に表示します。設定項目 - <literal>APT::Cache::"
  "RecurseDepends</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
- msgid "<option>-f</option>"
- msgstr "<option>-f</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323
- msgid "<option>--full</option>"
- msgstr "<option>--full</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:324
+ #: apt-cache.8.xml:296
  msgid ""
  "Print full package records when searching.  Configuration Item: "
  "<literal>APT::Cache::ShowFull</literal>."
@@@ -1504,19 -1349,9 +1350,9 @@@ msgstr "
  "search 時に全パッケージレコードを表示します。設定項目 - <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:583
- msgid "<option>-a</option>"
- msgstr "<option>-a</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:328
- msgid "<option>--all-versions</option>"
- msgstr "<option>--all-versions</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:329
+ #: apt-cache.8.xml:301
  msgid ""
  "Print full records for all available versions. This is the default; to turn "
  "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@@ -1531,19 -1366,9 +1367,9 @@@ msgstr "
  "の際に選択されるもの) だけ表示します。このオプションは、show コマンドでのみ適"
  "用できます。設定項目 - <literal>APT::Cache::AllVersions</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>-g</option>"
- msgstr "<option>-g</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>--generate</option>"
- msgstr "<option>--generate</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:338
+ #: apt-cache.8.xml:310
  msgid ""
  "Perform automatic package cache regeneration, rather than use the cache as "
  "it is. This is the default; to turn it off, use <option>--no-generate</"
@@@ -1554,19 -1379,9 +1380,9 @@@ msgstr "
  "option> を使用してください。設定項目 - <literal>APT::Cache::Generate</"
  "literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343
- msgid "<option>--names-only</option>"
- msgstr "<option>--names-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343 apt-cdrom.8.xml:142
- msgid "<option>-n</option>"
- msgstr "<option>-n</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:344
+ #: apt-cache.8.xml:316
  msgid ""
  "Only search on the package names, not the long descriptions.  Configuration "
  "Item: <literal>APT::Cache::NamesOnly</literal>."
@@@ -1574,14 -1389,9 +1390,9 @@@ msgstr "
  "説明文ではなく、パッケージ名からのみ検索します。設定項目 - <literal>APT::"
  "Cache::NamesOnly</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:348
- msgid "<option>--all-names</option>"
- msgstr "<option>--all-names</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:349
+ #: apt-cache.8.xml:321
  msgid ""
  "Make <literal>pkgnames</literal> print all names, including virtual packages "
  "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@@ -1590,14 -1400,9 +1401,9 @@@ msgstr "
  "<literal>pkgnames</literal> で、仮想パッケージや欠落依存関係を含めた全名称を"
  "表示します。設定項目 - <literal>APT::Cache::AllNames</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:354
- msgid "<option>--recurse</option>"
- msgstr "<option>--recurse</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:355
+ #: apt-cache.8.xml:327
  msgid ""
  "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
  "that all packages mentioned are printed once.  Configuration Item: "
@@@ -1607,14 -1412,9 +1413,9 @@@ msgstr "
  "ケージを再帰的に一度に表示します。設定項目 - <literal>APT::Cache::"
  "RecurseDepends</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:360
- msgid "<option>--installed</option>"
- msgstr "<option>--installed</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:362
+ #: apt-cache.8.xml:334
  msgid ""
  "Limit the output of <literal>depends</literal> and <literal>rdepends</"
  "literal> to packages which are currently installed.  Configuration Item: "
@@@ -1626,51 -1426,51 +1427,51 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
- #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
- #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+ #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
+ #: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+ #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
  msgid "&apt-commonoptions;"
  msgstr "&apt-commonoptions;"
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
- #: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+ #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+ #: apt.conf.5.xml:1118 apt_preferences.5.xml:698
  msgid "Files"
  msgstr "ファイル"
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:374
+ #: apt-cache.8.xml:346
  msgid "&file-sourceslist; &file-statelists;"
  msgstr "&file-sourceslist; &file-statelists;"
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
- #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
- #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
- #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
- #: sources.list.5.xml:234
+ #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+ #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+ #: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+ #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
+ #: sources.list.5.xml:255
  msgid "See Also"
  msgstr "関連項目"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:380
+ #: apt-cache.8.xml:352
  msgid "&apt-conf;, &sources-list;, &apt-get;"
  msgstr "&apt-conf;, &sources-list;, &apt-get;"
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
- #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
- #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+ #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+ #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+ #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
  msgid "Diagnostics"
  msgstr "診断メッセージ"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:385
+ #: apt-cache.8.xml:357
  msgid ""
  "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -1678,46 -1478,15 +1479,15 @@@ msgstr "
  "<command>apt-cache</command> は正常終了時に 0 を返します。エラー時には十進の "
  "100 を返します。"
  
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cdrom.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "February 2004</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "February 2004</date>"
- 
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cdrom.8.xml:24 apt-cdrom.8.xml:31
- msgid "apt-cdrom"
- msgstr "apt-cdrom"
- 
  # type: Content of: <refentry><refnamediv><refpurpose>
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-cdrom.8.xml:32
  msgid "APT CDROM management utility"
  msgstr "APT CDROM 管理ユーティリティ"
  
- # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cdrom.8.xml:38
- msgid ""
- "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
- "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
- "<arg>add</arg> <arg>ident</arg> </group>"
- msgstr ""
- "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
- "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
- "<arg>add</arg> <arg>ident</arg> </group>"
- 
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:51
+ #: apt-cdrom.8.xml:38
  msgid ""
  "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
  "available sources. <command>apt-cdrom</command> takes care of determining "
@@@ -1731,7 -1500,7 +1501,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:58
+ #: apt-cdrom.8.xml:45
  msgid ""
  "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
  "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@@ -1741,13 -1510,8 +1511,8 @@@ msgstr "
  "command> が必要になります。その上、CD セットのディスクを 1 枚づつ、焼き損じを"
  "補正できるか評価しなければなりません。"
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:68
- msgid "add"
- msgstr "add"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:69
+ #: apt-cdrom.8.xml:56
  msgid ""
  "<literal>add</literal> is used to add a new disc to the source list. It will "
  "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@@ -1762,7 -1526,7 +1527,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:77
+ #: apt-cdrom.8.xml:64
  msgid ""
  "APT uses a CDROM ID to track which disc is currently in the drive and "
  "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@@ -1772,14 -1536,9 +1537,9 @@@ msgstr "
  "す。またその ID を、<filename>&statedir;/cdroms.list</filename> 内のデータ"
  "ベースで管理します。"
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:84
- msgid "ident"
- msgstr "ident"
- 
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:85
+ #: apt-cdrom.8.xml:72
  msgid ""
  "A debugging tool to report the identity of the current disc as well as the "
  "stored file name"
@@@ -1789,7 -1548,7 +1549,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:64
+ #: apt-cdrom.8.xml:51
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present.  <placeholder type=\"variablelist"
@@@ -1800,23 -1559,13 +1560,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cdrom.8.xml:94 apt-key.8.xml:158
+ #: apt-cdrom.8.xml:81 apt-key.8.xml:160
  msgid "Options"
  msgstr "オプション"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
- msgid "<option>-d</option>"
- msgstr "<option>-d</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98
- msgid "<option>--cdrom</option>"
- msgstr "<option>--cdrom</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:99
+ #: apt-cdrom.8.xml:86
  msgid ""
  "Mount point; specify the location to mount the cdrom. This mount point must "
  "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@@ -1826,19 -1575,9 +1576,9 @@@ msgstr "
  "は、<filename>/etc/fstab</filename> に正しく設定されている必要があります。設"
  "定項目 - <literal>Acquire::cdrom::mount</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>-r</option>"
- msgstr "<option>-r</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>--rename</option>"
- msgstr "<option>--rename</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:108
+ #: apt-cdrom.8.xml:95
  msgid ""
  "Rename a disc; change the label of a disk or override the disks given label. "
  "This option will cause <command>apt-cdrom</command> to prompt for a new "
@@@ -1848,19 -1587,9 +1588,9 @@@ msgstr "
  "プションにより、<command>apt-cdrom</command> が新しいラベルを入力するよう促し"
  "ます。設定項目 - <literal>APT::CDROM::Rename</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116 apt-get.8.xml:364
- msgid "<option>-m</option>"
- msgstr "<option>-m</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116
- msgid "<option>--no-mount</option>"
- msgstr "<option>--no-mount</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:117
+ #: apt-cdrom.8.xml:104
  msgid ""
  "No mounting; prevent <command>apt-cdrom</command> from mounting and "
  "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@@ -1870,14 -1599,9 +1600,9 @@@ msgstr "
  "アンマウントしないようにします。設定項目 - <literal>APT::CDROM::NoMount</"
  "literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:124
- msgid "<option>--fast</option>"
- msgstr "<option>--fast</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:125
+ #: apt-cdrom.8.xml:112
  msgid ""
  "Fast Copy; Assume the package files are valid and do not check every "
  "package. This option should be used only if <command>apt-cdrom</command> has "
@@@ -1889,14 -1613,9 +1614,9 @@@ msgstr "
  "ており、エラーを検出しなかった場合のみ使用すべきです。設定項目 - "
  "<literal>APT::CDROM::Fast</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:134
- msgid "<option>--thorough</option>"
- msgstr "<option>--thorough</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:135
+ #: apt-cdrom.8.xml:122
  msgid ""
  "Thorough Package Scan; This option may be needed with some old Debian "
  "1.1/1.2 discs that have Package files in strange places. It takes much "
@@@ -1907,24 -1626,9 +1627,9 @@@ msgstr "
  "キャンするのに非常に時間がかかりますが、全パッケージファイルを抽出することが"
  "できます。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:143 apt-get.8.xml:395
- msgid "<option>--just-print</option>"
- msgstr "<option>--just-print</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:144 apt-get.8.xml:397
- msgid "<option>--recon</option>"
- msgstr "<option>--recon</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:145 apt-get.8.xml:398
- msgid "<option>--no-act</option>"
- msgstr "<option>--no-act</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:146
+ #: apt-cdrom.8.xml:133
  msgid ""
  "No Changes; Do not change the &sources-list; file and do not write index "
  "files. Everything is still checked however.  Configuration Item: "
@@@ -1936,13 -1640,13 +1641,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:159
+ #: apt-cdrom.8.xml:146
  msgid "&apt-conf;, &apt-get;, &sources-list;"
  msgstr "&apt-conf;, &apt-get;, &sources-list;"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:164
+ #: apt-cdrom.8.xml:151
  msgid ""
  "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -1950,46 -1654,15 +1655,15 @@@ msgstr "
  "<command>apt-cdrom</command> は正常終了時に 0 を返します。エラー時には十進の "
  "100 を返します。"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-config.8.xml:16 apt-extracttemplates.1.xml:16 apt-sortpkgs.1.xml:16
- #: sources.list.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
- "February 2004</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
- "February 2004</date>"
- 
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-config.8.xml:25 apt-config.8.xml:32
- msgid "apt-config"
- msgstr "apt-config"
- 
  # type: Content of: <refentry><refnamediv><refpurpose>
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-config.8.xml:33
  msgid "APT Configuration Query program"
  msgstr "APT 設定取得プログラム"
  
- # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-config.8.xml:39
- msgid ""
- "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>shell</arg> <arg>dump</arg> </group>"
- msgstr ""
- "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>shell</arg> <arg>dump</arg> </group>"
- 
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:51
+ #: apt-config.8.xml:39
  msgid ""
  "<command>apt-config</command> is an internal program used by various "
  "portions of the APT suite to provide consistent configurability. It accesses "
@@@ -2003,7 -1676,7 +1677,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+ #: apt-config.8.xml:44 apt-ftparchive.1.xml:54
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present."
@@@ -2011,14 -1684,9 +1685,9 @@@ msgstr "
  "<option>-h</option> オプションや <option>--help</option> オプションを除き、以"
  "下に挙げるコマンドが必要です。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-config.8.xml:61
- msgid "shell"
- msgstr "shell"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:63
+ #: apt-config.8.xml:51
  msgid ""
  "shell is used to access the configuration information from a shell script. "
  "It is given pairs of arguments, the first being a shell variable and the "
@@@ -2033,7 -1701,7 +1702,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-config.8.xml:71
+ #: apt-config.8.xml:59
  #, no-wrap
  msgid ""
  "OPTS=\"-f\"\n"
@@@ -2047,7 -1715,7 +1716,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:76
+ #: apt-config.8.xml:64
  msgid ""
  "This will set the shell environment variable $OPTS to the value of MyApp::"
  "options with a default of <option>-f</option>."
@@@ -2057,7 -1725,7 +1726,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:80
+ #: apt-config.8.xml:68
  msgid ""
  "The configuration item may be postfixed with a /[fdbi]. f returns file "
  "names, d returns directories, b returns true or false and i returns an "
@@@ -2069,20 -1737,44 +1738,44 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:89
+ #: apt-config.8.xml:77
  msgid "Just show the contents of the configuration space."
  msgstr "設定箇所の内容を表示するだけです。"
  
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:90
+ msgid ""
+ "Include options which have an empty value. This is the default, so use --no-"
+ "empty to remove them from the output."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-config.8.xml:95
+ msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:96
+ msgid ""
+ "Defines the output of each config option. &percnt;t will be replaced with "
+ "the name of the option, &percnt;f with the complete optionname and &percnt;v "
+ "with the value of the option.  Use uppercase letters and special characters "
+ "in the value will be encoded to ensure that it can e.g. be savely used in a "
+ "quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
+ "by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
+ "&percnt;."
+ 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:628
- #: apt-sortpkgs.1.xml:73
+ #: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
+ #: apt-sortpkgs.1.xml:64
  msgid "&apt-conf;"
  msgstr "&apt-conf;"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:112
+ #: apt-config.8.xml:115
  msgid ""
  "<command>apt-config</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -2090,12 -1782,6 +1783,6 @@@ msgstr "
  "<command>apt-config</command> は正常終了時に 0 を返します。エラー時には十進"
  "の 100 を返します。"
  
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-extracttemplates.1.xml:25 apt-extracttemplates.1.xml:32
- msgid "apt-extracttemplates"
- msgstr "apt-extracttemplates"
- 
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
  msgid "1"
@@@ -2109,23 -1795,9 +1796,9 @@@ msgstr "
  "Debian パッケージから DebConf 設定と DebConf テンプレートを抽出するユーティリ"
  "ティ"
  
- # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-extracttemplates.1.xml:39
- msgid ""
- "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
- "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
- "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
- "arg>"
- msgstr ""
- "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
- "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
- "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
- "arg>"
- 
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:47
+ #: apt-extracttemplates.1.xml:39
  msgid ""
  "<command>apt-extracttemplates</command> will take one or more Debian package "
  "files as input and write out (to a temporary directory) all associated "
@@@ -2140,37 -1812,35 +1813,35 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:52
+ #: apt-extracttemplates.1.xml:44
  msgid "package version template-file config-script"
  msgstr "package version template-file config-script"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:53
+ #: apt-extracttemplates.1.xml:45
+ #, fuzzy
+ #| msgid ""
+ #| "template-file and config-script are written to the temporary directory "
+ #| "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
+ #| "TempDir</literal>)  directory, with filenames of the form "
+ #| "<filename>package.template.XXXX</filename> and <filename>package.config."
+ #| "XXXX</filename>"
  msgid ""
  "template-file and config-script are written to the temporary directory "
- "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
- "literal>)  directory, with filenames of the form <filename>package.template."
- "XXXX</filename> and <filename>package.config.XXXX</filename>"
+ "specified by the <option>-t</option> or <option>--tempdir</option> "
+ "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+ "filenames of the form <filename>package.template.XXXX</filename> and "
+ "<filename>package.config.XXXX</filename>"
  msgstr ""
  "テンプレートファイルや、設定スクリプトは、-t や --tempdir で指定した一時ディ"
  "レクトリ (<literal>APT::ExtractTemplates::TempDir</literal>) に書き出され、"
  "ファイル名は、<filename>package.template.XXXX</filename> や "
  "<filename>package.config.XXXX</filename> と言った形になります。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
- msgid "<option>-t</option>"
- msgstr "<option>-t</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63
- msgid "<option>--tempdir</option>"
- msgstr "<option>--tempdir</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-extracttemplates.1.xml:65
+ #: apt-extracttemplates.1.xml:58
  msgid ""
  "Temporary directory in which to write extracted debconf template files and "
  "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@@ -2181,7 -1851,7 +1852,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:82
+ #: apt-extracttemplates.1.xml:75
  msgid ""
  "<command>apt-extracttemplates</command> returns zero on normal operation, "
  "decimal 100 on error."
@@@ -2189,73 -1859,15 +1860,15 @@@ msgstr "
  "<command>apt-extracttemplates</command> は正常終了時に 0 を返します。エラー時"
  "には十進の 100 を返します。"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-ftparchive.1.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
- "August 2009</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
- "August 2009</date>"
- 
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-ftparchive.1.xml:25 apt-ftparchive.1.xml:32
- msgid "apt-ftparchive"
- msgstr "apt-ftparchive"
- 
  # type: Content of: <refentry><refnamediv><refpurpose>
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-ftparchive.1.xml:33
  msgid "Utility to generate index files"
  msgstr "インデックスファイル生成ユーティリティ"
  
- # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-ftparchive.1.xml:39
- msgid ""
- "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
- "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
- "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
- "arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
- "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
- "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
- "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
- "replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
- "arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
- "arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
- "replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
- "\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
- msgstr ""
- "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
- "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
- "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
- "arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
- "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
- "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
- "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
- "replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
- "arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
- "arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
- "replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
- "\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
- 
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:60
+ #: apt-ftparchive.1.xml:39
  msgid ""
  "<command>apt-ftparchive</command> is the command line tool that generates "
  "the index files that APT uses to access a distribution source. The index "
@@@ -2268,7 -1880,7 +1881,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:64
+ #: apt-ftparchive.1.xml:43
  msgid ""
  "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
  "program, incorporating its entire functionality via the <literal>packages</"
@@@ -2283,7 -1895,7 +1896,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:70
+ #: apt-ftparchive.1.xml:49
  msgid ""
  "Internally <command>apt-ftparchive</command> can make use of binary "
  "databases to cache the contents of a .deb file and it does not rely on any "
@@@ -2296,15 -1908,9 +1909,9 @@@ msgstr "
  "部プログラムにも依存しません。すべて生成する際には、ファイル変更点の検出と希"
  "望した圧縮出力ファイルの作成を自動的に実行します。"
  
- # type: <tag></tag>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:79
- msgid "packages"
- msgstr "packages"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:81
+ #: apt-ftparchive.1.xml:60
  msgid ""
  "The packages command generates a package file from a directory tree. It "
  "takes the given directory and recursively searches it for .deb files, "
@@@ -2318,20 -1924,14 +1925,14 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+ #: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
  msgid ""
  "The option <option>--db</option> can be used to specify a binary caching DB."
  msgstr "<option>--db</option> オプションで、キャッシュ DB を指定できます。"
  
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:89
- msgid "sources"
- msgstr "sources"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:91
+ #: apt-ftparchive.1.xml:70
  msgid ""
  "The <literal>sources</literal> command generates a source index file from a "
  "directory tree.  It takes the given directory and recursively searches it "
@@@ -2345,7 -1945,7 +1946,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:96
+ #: apt-ftparchive.1.xml:75
  msgid ""
  "If an override file is specified then a source override file will be looked "
  "for with an extension of .src. The --source-override option can be used to "
@@@ -2355,14 -1955,9 +1956,9 @@@ msgstr "
  "ルを探します。使用するソースオーバーライドファイルを変更するのには、--source-"
  "override オプションを使用します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:101
- msgid "contents"
- msgstr "contents"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:103
+ #: apt-ftparchive.1.xml:82
  msgid ""
  "The <literal>contents</literal> command generates a contents file from a "
  "directory tree. It takes the given directory and recursively searches it "
@@@ -2378,13 -1973,8 +1974,8 @@@ msgstr "
  "ません。複数のパッケージが同じファイルを持つ場合、パッケージ名をカンマ区切り"
  "で出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:113
- msgid "release"
- msgstr "release"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:115
+ #: apt-ftparchive.1.xml:94
  msgid ""
  "The <literal>release</literal> command generates a Release file from a "
  "directory tree. It recursively searches the given directory for uncompressed "
@@@ -2399,7 -1989,7 +1990,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:125
+ #: apt-ftparchive.1.xml:104
  msgid ""
  "Values for the additional metadata fields in the Release file are taken from "
  "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@@ -2418,14 -2008,9 +2009,9 @@@ msgstr "
  "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:136
- msgid "generate"
- msgstr "generate"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:138
+ #: apt-ftparchive.1.xml:117
  msgid ""
  "The <literal>generate</literal> command is designed to be runnable from a "
  "cron script and builds indexes according to the given config file. The "
@@@ -2438,14 -2023,9 +2024,9 @@@ msgstr "
  "は、必要な設定を維持する簡単な方法を提供すると共に、インデックスファイルをど"
  "のディレクトリから作成するかを指定する、柔軟な方法を提供します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:145 apt-get.8.xml:287
- msgid "clean"
- msgstr "clean"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:147
+ #: apt-ftparchive.1.xml:126
  msgid ""
  "The <literal>clean</literal> command tidies the databases used by the given "
  "configuration file by removing any records that are no longer necessary."
@@@ -2455,13 -2035,13 +2036,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:153
+ #: apt-ftparchive.1.xml:132
  msgid "The Generate Configuration"
  msgstr "Generate 設定"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:155
+ #: apt-ftparchive.1.xml:134
  msgid ""
  "The <literal>generate</literal> command uses a configuration file to "
  "describe the archives that are going to be generated. It follows the typical "
@@@ -2479,7 -2059,7 +2060,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:163
+ #: apt-ftparchive.1.xml:142
  msgid ""
  "The generate configuration has 4 separate sections, each described below."
  msgstr ""
@@@ -2488,13 -2068,13 +2069,13 @@@
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:165
+ #: apt-ftparchive.1.xml:144
  msgid "Dir Section"
  msgstr "Dir セクション"
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:167
+ #: apt-ftparchive.1.xml:146
  msgid ""
  "The <literal>Dir</literal> section defines the standard directories needed "
  "to locate the files required during the generation process. These "
@@@ -2505,15 -2085,9 +2086,9 @@@ msgstr "
  "めに必要な、標準ディレクトリを定義します。このディレクトリは、完全な絶対パス"
  "を生成するため、後のセクションで定義される相対パスの前に結合されます。"
  
- # type: <tag></tag>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:172
- msgid "ArchiveDir"
- msgstr "ArchiveDir"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:174
+ #: apt-ftparchive.1.xml:153
  msgid ""
  "Specifies the root of the FTP archive, in a standard Debian configuration "
  "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@@ -2522,37 -2096,21 +2097,21 @@@ msgstr "
  "FTP アーカイブのルートを指定します。標準的な Debian 設定では、このディレクト"
  "リには <filename>ls-LR</filename> と dist ノードがあります。"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:179
- msgid "OverrideDir"
- msgstr "OverrideDir"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:181
+ #: apt-ftparchive.1.xml:160
  msgid "Specifies the location of the override files."
  msgstr "オーバーライドファイルの場所を指定します。"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:184
- msgid "CacheDir"
- msgstr "CacheDir"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:186
+ #: apt-ftparchive.1.xml:165
  msgid "Specifies the location of the cache files"
  msgstr "キャッシュファイルの場所を指定します。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:189
- msgid "FileListDir"
- msgstr "FileListDir"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:191
+ #: apt-ftparchive.1.xml:170
  msgid ""
  "Specifies the location of the file list files, if the <literal>FileList</"
  "literal> setting is used below."
@@@ -2562,13 -2120,13 +2121,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:197
+ #: apt-ftparchive.1.xml:176
  msgid "Default Section"
  msgstr "Default セクション"
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:199
+ #: apt-ftparchive.1.xml:178
  msgid ""
  "The <literal>Default</literal> section specifies default values, and "
  "settings that control the operation of the generator. Other sections may "
@@@ -2578,15 -2136,9 +2137,9 @@@ msgstr "
  "器の動作を制御する設定も行います。他のセクションでは、ここにあるデフォルト値"
  "を、セクションごとの設定で上書きします。"
  
- # type: <tag></tag>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:203
- msgid "Packages::Compress"
- msgstr "Packages::Compress"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:205
+ #: apt-ftparchive.1.xml:184
  msgid ""
  "Sets the default compression schemes to use for the Package index files. It "
  "is a string that contains a space separated list of at least one of: '.' (no "
@@@ -2597,14 -2149,9 +2150,9 @@@ msgstr "
  "とつは '.' (圧縮なし), 'gzip', 'bzip2' が入る、空白区切りの文字列です。圧縮方"
  "法のデフォルトはすべて '. gzip' です。"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:211
- msgid "Packages::Extensions"
- msgstr "Packages::Extensions"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:213
+ #: apt-ftparchive.1.xml:192
  msgid ""
  "Sets the default list of file extensions that are package files.  This "
  "defaults to '.deb'."
@@@ -2612,14 -2159,9 +2160,9 @@@ msgstr "
  "パッケージファイル拡張子のデフォルト値を列挙します。このデフォルト値は '."
  "deb' です。"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:217
- msgid "Sources::Compress"
- msgstr "Sources::Compress"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:219
+ #: apt-ftparchive.1.xml:198
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Sources files."
@@@ -2627,14 -2169,9 +2170,9 @@@ msgstr "
  "<literal>Packages::Compress</literal> と同様に、Sources ファイルの圧縮方法を"
  "指定します。"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:223
- msgid "Sources::Extensions"
- msgstr "Sources::Extensions"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:225
+ #: apt-ftparchive.1.xml:204
  msgid ""
  "Sets the default list of file extensions that are source files.  This "
  "defaults to '.dsc'."
@@@ -2642,14 -2179,9 +2180,9 @@@ msgstr "
  "ソースファイル拡張子のデフォルト値を列挙します。このデフォルト値は '.dsc' で"
  "す。"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:229
- msgid "Contents::Compress"
- msgstr "Contents::Compress"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:231
+ #: apt-ftparchive.1.xml:210
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Contents files."
@@@ -2657,13 -2189,8 +2190,8 @@@ msgstr "
  "<literal>Packages::Compress</literal> と同様に、Contents ファイルの圧縮方法を"
  "指定します。"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:235
- msgid "Translation::Compress"
- msgstr "Translation::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:237
+ #: apt-ftparchive.1.xml:216
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Translation-en master file."
@@@ -2671,14 -2198,9 +2199,9 @@@ msgstr "
  "<literal>Packages::Compress</literal> と同様に、Translation-en マスターファイ"
  "ルの圧縮を制御します。"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:241
- msgid "DeLinkLimit"
- msgstr "DeLinkLimit"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:243
+ #: apt-ftparchive.1.xml:222
  msgid ""
  "Specifies the number of kilobytes to delink (and replace with hard links) "
  "per run. This is used in conjunction with the per-section <literal>External-"
@@@ -2688,15 -2210,9 +2211,9 @@@ msgstr "
  "指定します。セクションごとの <literal>External-Links</literal> 設定と合わせて"
  "使います。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:248
- msgid "FileMode"
- msgstr "FileMode"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:250
+ #: apt-ftparchive.1.xml:229
  msgid ""
  "Specifies the mode of all created index files. It defaults to 0644. All "
  "index files are set to this mode with no regard to the umask."
@@@ -2704,14 -2220,8 +2221,8 @@@ msgstr "
  "作成したインデックスファイルのモードを指定します。デフォルトは 0644 です。全"
  "インデックスファイルは、umask を無視してこのモードを使用します。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
- msgid "LongDescription"
- msgstr "LongDescription"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+ #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
  msgid ""
  "Sets if long descriptions should be included in the Packages file or split "
  "out into a master Translation-en file."
@@@ -2719,13 -2229,13 +2230,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:263
+ #: apt-ftparchive.1.xml:242
  msgid "TreeDefault Section"
  msgstr "TreeDefault セクション"
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:265
+ #: apt-ftparchive.1.xml:244
  msgid ""
  "Sets defaults specific to <literal>Tree</literal> sections. All of these "
  "variables are substitution variables and have the strings $(DIST), "
@@@ -2735,14 -2245,9 +2246,9 @@@ msgstr "
  "数はすべて置換変数であり、文字列 $(DIST), $(SECTION), $(ARCH) をそれぞれの値"
  "に展開します。"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:270
- msgid "MaxContentsChange"
- msgstr "MaxContentsChange"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:272
+ #: apt-ftparchive.1.xml:251
  msgid ""
  "Sets the number of kilobytes of contents files that are generated each day. "
  "The contents files are round-robined so that over several days they will all "
@@@ -2751,15 -2256,9 +2257,9 @@@ msgstr "
  "日毎に生成する contents ファイルをキロバイト単位で設定します。contents ファイ"
  "ルをラウンドロビンし、数日経つとすべて再生成します。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:277
- msgid "ContentsAge"
- msgstr "ContentsAge"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:279
+ #: apt-ftparchive.1.xml:258
  msgid ""
  "Controls the number of days a contents file is allowed to be checked without "
  "changing. If this limit is passed the mtime of the contents file is updated. "
@@@ -2774,15 -2273,9 +2274,9 @@@ msgstr "
  "とが発生します。新しい .deb ファイルをインストールしたい場合、保留を解除で"
  "き、少なくとも新しいファイルが必要です。デフォルトは 10 で、単位は日です。"
  
- # type: Content of: <refentry><refsect1><refsect2><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:288
- msgid "Directory"
- msgstr "Directory"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:290
+ #: apt-ftparchive.1.xml:269
  msgid ""
  "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
  "$(SECTION)/binary-$(ARCH)/</filename>"
@@@ -2790,15 -2283,9 +2284,9 @@@ msgstr "
  ".deb ディレクトリツリーの先頭を設定します。デフォルトは <filename>$(DIST)/"
  "$(SECTION)/binary-$(ARCH)/</filename> です。"
  
- # type: Content of: <refentry><refsect1><refsect2><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:294
- msgid "SrcDirectory"
- msgstr "SrcDirectory"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:296
+ #: apt-ftparchive.1.xml:275
  msgid ""
  "Sets the top of the source package directory tree. Defaults to <filename>"
  "$(DIST)/$(SECTION)/source/</filename>"
@@@ -2806,15 -2293,9 +2294,9 @@@ msgstr "
  "ソースパッケージディレクトリツリーの先頭を設定します。デフォルトは <filename>"
  "$(DIST)/$(SECTION)/source/</filename> です。"
  
- # type: <tag></tag>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
- msgid "Packages"
- msgstr "Packages"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:302
+ #: apt-ftparchive.1.xml:281
  msgid ""
  "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "binary-$(ARCH)/Packages</filename>"
@@@ -2822,15 -2303,9 +2304,9 @@@ msgstr "
  "Packages ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
  "$(SECTION)/binary-$(ARCH)/Packages</filename> です。"
  
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
- msgid "Sources"
- msgstr "Sources"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:308
+ #: apt-ftparchive.1.xml:287
  msgid ""
  "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "source/Sources</filename>"
@@@ -2838,28 -2313,17 +2314,17 @@@ msgstr "
  "Sources ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
  "$(SECTION)/source/Sources</filename> です。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:312
- msgid "Translation"
- msgstr "Translation"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:314
+ #: apt-ftparchive.1.xml:293
  msgid ""
  "Set the output Translation-en master file with the long descriptions if they "
  "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
  "$(SECTION)/i18n/Translation-en</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:319
- msgid "InternalPrefix"
- msgstr "InternalPrefix"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:321
+ #: apt-ftparchive.1.xml:300
  msgid ""
  "Sets the path prefix that causes a symlink to be considered an internal link "
  "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@@ -2868,15 -2332,9 +2333,9 @@@ msgstr "
  "外部リンクではなく、内部リンクと見なす判断材料となる、パスのプレフィックスを"
  "設定します。デフォルトは、<filename>$(DIST)/$(SECTION)/</filename> です。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
- msgid "Contents"
- msgstr "Contents"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:328
+ #: apt-ftparchive.1.xml:307
  msgid ""
  "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
  "</filename>. If this setting causes multiple Packages files to map onto a "
@@@ -2888,25 -2346,15 +2347,15 @@@ msgstr "
  "Contents ファイルにまとめられる設定 (デフォルト) の場合、<command>apt-"
  "ftparchive</command> は自動でパッケージファイルをまとめます。"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:335
- msgid "Contents::Header"
- msgstr "Contents::Header"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:337
+ #: apt-ftparchive.1.xml:316
  msgid "Sets header file to prepend to the contents output."
  msgstr "contents の出力に付けるヘッダファイルを設定します。"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
- msgid "BinCacheDB"
- msgstr "BinCacheDB"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:342
+ #: apt-ftparchive.1.xml:321
  msgid ""
  "Sets the binary cache database to use for this section. Multiple sections "
  "can share the same database."
@@@ -2914,15 -2362,9 +2363,9 @@@ msgstr "
  "このセクションで使用するバイナリキャッシュデータベースを設定します。複数のセ"
  "クションで同じデータベースを共有できます。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:346
- msgid "FileList"
- msgstr "FileList"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:348
+ #: apt-ftparchive.1.xml:327
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
@@@ -2932,15 -2374,9 +2375,9 @@@ msgstr "
  "み込むファイル一覧ファイルを指定します。相対ファイル名は、アーカイブディレク"
  "トリが先頭につきます。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:353
- msgid "SourceFileList"
- msgstr "SourceFileList"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:355
+ #: apt-ftparchive.1.xml:334
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
@@@ -2953,13 -2389,13 +2390,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:363
+ #: apt-ftparchive.1.xml:342
  msgid "Tree Section"
  msgstr "Tree セクション"
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:365
+ #: apt-ftparchive.1.xml:344
  msgid ""
  "The <literal>Tree</literal> section defines a standard Debian file tree "
  "which consists of a base directory, then multiple sections in that base "
@@@ -2973,7 -2409,7 +2410,7 @@@ msgstr "
  "<literal>Directory</literal> 変数で定義されます。"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:370
+ #: apt-ftparchive.1.xml:349
  msgid ""
  "The <literal>Tree</literal> section takes a scope tag which sets the "
  "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@@ -2987,7 -2423,7 +2424,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:375
+ #: apt-ftparchive.1.xml:354
  msgid ""
  "All of the settings defined in the <literal>TreeDefault</literal> section "
  "can be use in a <literal>Tree</literal> section as well as three new "
@@@ -2998,7 -2434,7 +2435,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt-ftparchive.1.xml:381
+ #: apt-ftparchive.1.xml:360
  #, no-wrap
  msgid ""
  "for i in Sections do \n"
@@@ -3013,7 -2449,7 +2450,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><informalexample>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:378
+ #: apt-ftparchive.1.xml:357
  msgid ""
  "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
  "command> performs an operation similar to: <placeholder type=\"programlisting"
@@@ -3023,15 -2459,9 +2460,9 @@@ msgstr "
  "command> は以下のような操作を行います。<placeholder type=\"programlisting\" "
  "id=\"0\"/>"
  
- # type: Content of: <refentry><refsect1><refsect2><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:387
- msgid "Sections"
- msgstr "Sections"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:389
+ #: apt-ftparchive.1.xml:368
  msgid ""
  "This is a space separated list of sections which appear under the "
  "distribution, typically this is something like <literal>main contrib non-"
@@@ -3040,15 -2470,9 +2471,9 @@@ msgstr "
  "distribution 以下に現れるセクションを、空白区切りで指定したリストです。通常、"
  "<literal>main contrib non-free</literal>のようになります。"
  
- # type: <tag></tag>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:394
- msgid "Architectures"
- msgstr "Architectures"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:396
+ #: apt-ftparchive.1.xml:375
  msgid ""
  "This is a space separated list of all the architectures that appear under "
  "search section. The special architecture 'source' is used to indicate that "
@@@ -3058,15 -2482,9 +2483,9 @@@ msgstr "
  "す。特殊アーキテクチャ 'source' は、ソースアーカイブのツリーであることを示し"
  "ます。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
- msgid "BinOverride"
- msgstr "BinOverride"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:409
+ #: apt-ftparchive.1.xml:388
  msgid ""
  "Sets the binary override file. The override file contains section, priority "
  "and maintainer address information."
@@@ -3074,15 -2492,9 +2493,9 @@@ msgstr "
  "バイナリオーバーライドファイルを設定します。このオーバーライドファイルには、"
  "セクション、優先度、メンテナのアドレスといった情報が含まれています。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
- msgid "SrcOverride"
- msgstr "SrcOverride"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:415
+ #: apt-ftparchive.1.xml:394
  msgid ""
  "Sets the source override file. The override file contains section "
  "information."
@@@ -3090,39 -2502,27 +2503,27 @@@ msgstr "
  "ソースオーバーライドファイルを設定します。このオーバーライドファイルには、セ"
  "クションの情報が含まれています。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
- msgid "ExtraOverride"
- msgstr "ExtraOverride"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+ #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
  msgid "Sets the binary extra override file."
  msgstr "バイナリ特別オーバーライドファイルを設定します。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
- msgid "SrcExtraOverride"
- msgstr "SrcExtraOverride"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+ #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
  msgid "Sets the source extra override file."
  msgstr "ソース特別オーバーライドファイルを設定します。"
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:431
+ #: apt-ftparchive.1.xml:410
  msgid "BinDirectory Section"
  msgstr "BinDirectory セクション"
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:433
+ #: apt-ftparchive.1.xml:412
  msgid ""
  "The <literal>bindirectory</literal> section defines a binary directory tree "
  "with no special structure. The scope tag specifies the location of the "
@@@ -3137,13 -2537,13 +2538,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:441
+ #: apt-ftparchive.1.xml:420
  msgid "Sets the Packages file output."
  msgstr "Packages ファイルの出力先を設定します。"
  
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:446
+ #: apt-ftparchive.1.xml:425
  msgid ""
  "Sets the Sources file output. At least one of <literal>Packages</literal> or "
  "<literal>Sources</literal> is required."
@@@ -3153,59 -2553,49 +2554,49 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:452
+ #: apt-ftparchive.1.xml:431
  msgid "Sets the Contents file output. (optional)"
  msgstr "Contents ファイルの出力先を設定します。(オプション)"
  
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:457
+ #: apt-ftparchive.1.xml:436
  msgid "Sets the binary override file."
  msgstr "バイナリオーバーライドファイルを設定します。"
  
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:462
+ #: apt-ftparchive.1.xml:441
  msgid "Sets the source override file."
  msgstr "ソースオーバーライドファイルを設定します。"
  
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:477
+ #: apt-ftparchive.1.xml:456
  msgid "Sets the cache DB."
  msgstr "キャッシュ DB を設定します。"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:480
- msgid "PathPrefix"
- msgstr "PathPrefix"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:482
+ #: apt-ftparchive.1.xml:461
  msgid "Appends a path to all the output paths."
  msgstr "全出力パスに付加するパス。"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:485
- msgid "FileList, SourceFileList"
- msgstr "FileList, SourceFileList"
- 
  # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:487
+ #: apt-ftparchive.1.xml:466
  msgid "Specifies the file list file."
  msgstr "ファイル一覧ファイルを指定します。"
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:494
+ #: apt-ftparchive.1.xml:473
  msgid "The Binary Override File"
  msgstr "バイナリオーバーライドファイル"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:495
+ #: apt-ftparchive.1.xml:474
  msgid ""
  "The binary override file is fully compatible with &dpkg-scanpackages;. It "
  "contains 4 fields separated by spaces. The first field is the package name, "
@@@ -3220,20 -2610,20 +2611,20 @@@ msgstr "
  "す。"
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:501
+ #: apt-ftparchive.1.xml:480
  #, no-wrap
  msgid "old [// oldn]* => new"
  msgstr "old [// oldn]* => new"
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:503
+ #: apt-ftparchive.1.xml:482
  #, no-wrap
  msgid "new"
  msgstr "new"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:500
+ #: apt-ftparchive.1.xml:479
  msgid ""
  "The general form of the maintainer field is: <placeholder type="
  "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@@ -3251,13 -2641,13 +2642,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:511
+ #: apt-ftparchive.1.xml:490
  msgid "The Source Override File"
  msgstr "ソースオーバーライドファイル"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:513
+ #: apt-ftparchive.1.xml:492
  msgid ""
  "The source override file is fully compatible with &dpkg-scansources;. It "
  "contains 2 fields separated by spaces. The first fields is the source "
@@@ -3269,13 -2659,13 +2660,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:518
+ #: apt-ftparchive.1.xml:497
  msgid "The Extra Override File"
  msgstr "特別オーバーライドファイル"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:520
+ #: apt-ftparchive.1.xml:499
  msgid ""
  "The extra override file allows any arbitrary tag to be added or replaced in "
  "the output. It has 3 columns, the first is the package, the second is the "
@@@ -3284,14 -2674,8 +2675,8 @@@ msgstr "
  "特別オーバーライドファイルは、出力中に任意のタグを追加・置換できるようにしま"
  "す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:529
- msgid ""
- "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:531
+ #: apt-ftparchive.1.xml:510
  #, fuzzy
  #| msgid ""
  #| "Values for the additional metadata fields in the Release file are taken "
@@@ -3308,10 -2692,10 +2693,10 @@@ msgid "
  "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>."
+ "<literal><replaceable>Index</replaceable></literal> can be "
+ "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+ "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+ "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
  msgstr ""
  "Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::"
  "Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::"
@@@ -3321,14 -2705,9 +2706,9 @@@
  "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: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:541
+ #: apt-ftparchive.1.xml:521
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
  "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@@ -3338,7 -2717,7 +2718,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:547
+ #: apt-ftparchive.1.xml:527
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -3350,14 -2729,9 +2730,9 @@@ msgstr "
  "ベルを指定して、設定ファイルを上書きすることもできます。設定項目 - "
  "<literal>quiet</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:555
+ #: apt-ftparchive.1.xml:535
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
  "then this option actually enables delinking of the files. It defaults to on "
@@@ -3369,14 -2743,9 +2744,9 @@@ msgstr "
  "off にするには <option>--no-delink</option> としてください。設定項目 - "
  "<literal>APT::FTPArchive::DeLinkAct</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:563
+ #: apt-ftparchive.1.xml:543
  msgid ""
  "Perform contents generation. When this option is set and package indexes are "
  "being generated with a cache DB then the file listing will also be extracted "
@@@ -3390,14 -2759,9 +2760,9 @@@ msgstr "
  "Contents ファイルも作成できます。デフォルトは on です。設定項目 - "
  "<literal>APT::FTPArchive::Contents</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:573
+ #: apt-ftparchive.1.xml:553
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@@ -3406,14 -2770,9 +2771,9 @@@ msgstr "
  "<literal>sources</literal> コマンドで使用する、ソースオーバーライドファイルを"
  "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:579
+ #: apt-ftparchive.1.xml:559
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3421,14 -2780,9 +2781,9 @@@ msgstr "
  "キャッシュデータベースを読み取り専用にします。設定項目 - <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:584
+ #: apt-ftparchive.1.xml:564
  #, fuzzy
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
@@@ -3441,13 -2795,8 +2796,8 @@@ msgstr "
  "literal> のように動作します。設定項目 - <literal>APT::Get::AutomaticRemove</"
  "literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:592
+ #: apt-ftparchive.1.xml:572
  msgid ""
  "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
  "packages are recompiled and/or republished with the same version again, this "
@@@ -3460,13 -2809,8 +2810,8 @@@
  "are useless."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:604
+ #: apt-ftparchive.1.xml:584
  #, fuzzy
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
@@@ -3482,14 -2826,14 +2827,14 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
- #: sources.list.5.xml:198
+ #: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
+ #: sources.list.5.xml:214
  msgid "Examples"
  msgstr "サンプル"
  
  # type: Content of: <refentry><refsect1><para><programlisting>
  #. type: Content of: <refentry><refsect1><para><programlisting>
- #: apt-ftparchive.1.xml:622
+ #: apt-ftparchive.1.xml:602
  #, no-wrap
  msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  msgstr ""
@@@ -3498,7 -2842,7 +2843,7 @@@
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:618
+ #: apt-ftparchive.1.xml:598
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3508,7 -2852,7 +2853,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:632
+ #: apt-ftparchive.1.xml:612
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -3516,116 -2860,14 +2861,14 @@@ msgstr "
  "<command>apt-ftparchive</command> は正常終了時に 0 を返します。エラー時には十"
  "進の 100 を返します。"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-get.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
- "November 2008</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
- "November 2008</date>"
- 
- # type: Content of: <refentry><refnamediv><refname>
- #. type: <heading></heading>
- #: apt-get.8.xml:25 apt-get.8.xml:32 guide.sgml:96
- msgid "apt-get"
- msgstr "apt-get"
- 
  # type: Content of: <refentry><refnamediv><refpurpose>
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-get.8.xml:33
  msgid "APT package handling utility -- command-line interface"
  msgstr "APT パッケージ操作ユーティリティ -- コマンドラインインターフェース"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-get.8.xml:39
- #, fuzzy
- #| msgid ""
- #| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- #| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
- #| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
- #| "<arg> <option>-t=</option> <arg choice='plain'> "
- #| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
- #| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
- #| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
- #| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
- #| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
- #| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
- #| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- #| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
- #| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- #| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
- #| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
- #| "<group choice='req'> <arg choice='plain'> "
- #| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
- #| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- #| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
- #| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- #| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- #| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- #| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- #| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
- #| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
- #| "help</arg> </group> </arg> </group>"
- msgid ""
- "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
- "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
- "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
- "replaceable> </arg> </arg> <group choice=\"req\"> <arg "
- "choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
- "choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
- "<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
- "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
- "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
- "arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
- "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
- "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
- "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
- "</group> </arg> </group>"
- msgstr ""
- "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
- "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
- "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
- "replaceable> </arg> </arg> <group choice=\"req\"> <arg "
- "choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
- "choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
- "<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
- "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
- "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
- "arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
- "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
- "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
- "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
- "</group> </arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:115
+ #: apt-get.8.xml:39
  msgid ""
  "<command>apt-get</command> is the command-line tool for handling packages, "
  "and may be considered the user's \"back-end\" to other tools using the APT "
@@@ -3637,14 -2879,9 +2880,9 @@@ msgstr "
  "「フロントエンド」インターフェースには、&dselect;, &aptitude;, &synaptic;, "
  "&wajig; などがあります。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:124 apt-key.8.xml:127
- msgid "update"
- msgstr "update"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:125
+ #: apt-get.8.xml:49
  msgid ""
  "<literal>update</literal> is used to resynchronize the package index files "
  "from their sources. The indexes of available packages are fetched from the "
@@@ -3665,15 -2902,9 +2903,9 @@@ msgstr "
  "upgrade</literal> を行う前に常に実行してください。前もってパッケージファイル"
  "のサイズを知ることができないため、全体の進捗メータは正しく表示されません。"
  
- # type: <tag></tag>
- #. type: <tag></tag>
- #: apt-get.8.xml:136 guide.sgml:121
- msgid "upgrade"
- msgstr "upgrade"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:137
+ #: apt-get.8.xml:61
  msgid ""
  "<literal>upgrade</literal> is used to install the newest versions of all "
  "packages currently installed on the system from the sources enumerated in "
@@@ -3695,15 -2926,9 +2927,9 @@@ msgstr "
  "<literal>update</literal> を実行しておき、<command>apt-get</command> にパッ"
  "ケージの新しいバージョンがあることを知らせる必要があります。"
  
- # type: <tag></tag>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:149
- msgid "dselect-upgrade"
- msgstr "dselect-upgrade"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:150
+ #: apt-get.8.xml:74
  msgid ""
  "<literal>dselect-upgrade</literal> is used in conjunction with the "
  "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@@ -3719,15 -2944,9 +2945,9 @@@ msgstr "
  "実行します。(例えば、古いパッケージの削除や新しいパッケージのインストールな"
  "ど)"
  
- # type: <tag></tag>
- #. type: <tag></tag>
- #: apt-get.8.xml:159 guide.sgml:140
- msgid "dist-upgrade"
- msgstr "dist-upgrade"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:160
+ #: apt-get.8.xml:84
  msgid ""
  "<literal>dist-upgrade</literal> in addition to performing the function of "
  "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@@ -3749,15 -2968,9 +2969,9 @@@ msgstr "
  "向けに、一般的な設定を上書きする機構については、&apt-preferences; をご覧くだ"
  "さい。"
  
- # type: <tag></tag>
- #. type: <tag></tag>
- #: apt-get.8.xml:172 guide.sgml:131
- msgid "install"
- msgstr "install"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:174
+ #: apt-get.8.xml:98
  msgid ""
  "<literal>install</literal> is followed by one or more packages desired for "
  "installation or upgrading.  Each package is a package name, not a fully "
@@@ -3784,7 -2997,7 +2998,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:192
+ #: apt-get.8.xml:116
  msgid ""
  "A specific version of a package can be selected for installation by "
  "following the package name with an equals and the version of the package to "
@@@ -3802,7 -3015,7 +3016,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:199
+ #: apt-get.8.xml:123
  msgid ""
  "Both of the version selection mechanisms can downgrade packages and must be "
  "used with care."
@@@ -3811,7 -3024,7 +3025,7 @@@ msgstr "
  "なりません。"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:202
+ #: apt-get.8.xml:126
  msgid ""
  "This is also the target to use if you want to upgrade one or more already-"
  "installed packages without upgrading every package you have on your system. "
@@@ -3831,7 -3044,7 +3045,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:213
+ #: apt-get.8.xml:137
  msgid ""
  "Finally, the &apt-preferences; mechanism allows you to create an alternative "
  "installation policy for individual packages."
@@@ -3841,7 -3054,7 +3055,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:217
+ #: apt-get.8.xml:141
  msgid ""
  "If no package matches the given expression and the expression contains one "
  "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@@ -3857,14 -3070,9 +3071,9 @@@ msgstr "
  "は、'how-lo' や 'lowest' にマッチすることに注意してください。そうしたくなけれ"
  "ば、'^' や '$' を付けるか、もっと詳しい正規表現を指定してください。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:226
- msgid "remove"
- msgstr "remove"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:227
+ #: apt-get.8.xml:151
  msgid ""
  "<literal>remove</literal> is identical to <literal>install</literal> except "
  "that packages are removed instead of installed. Note the removing a package "
@@@ -3878,14 -3086,9 +3087,9 @@@ msgstr "
  "(間に空白を含まずに) 付加されると、識別されたパッケージを、削除ではなくインス"
  "トールします。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:234
- msgid "purge"
- msgstr "purge"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:235
+ #: apt-get.8.xml:159
  msgid ""
  "<literal>purge</literal> is identical to <literal>remove</literal> except "
  "that packages are removed and purged (any configuration files are deleted "
@@@ -3894,20 -3097,14 +3098,14 @@@ msgstr "
  "パッケージが削除かつ完全削除 (すべての設定ファイルも削除) されるのを除き、"
  "<literal>purge</literal> は <literal>remove</literal> と同じです。"
  
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:239
- msgid "source"
- msgstr "source"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:240
+ #: apt-get.8.xml:164
  msgid ""
  "<literal>source</literal> causes <command>apt-get</command> to fetch source "
  "packages. APT will examine the available packages to decide which source "
  "package to fetch. It will then find and download into the current directory "
- "the newest available version of that source package while respect the "
+ "the newest available version of that source package while respecting the "
  "default release, set with the option <literal>APT::Default-Release</"
  "literal>, the <option>-t</option> option or per package with the "
  "<literal>pkg/release</literal> syntax, if possible."
@@@ -3921,7 -3118,7 +3119,7 @@@ msgstr "
  "literal> 構文で指定します。"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:248
+ #: apt-get.8.xml:172
  msgid ""
  "Source packages are tracked separately from binary packages via <literal>deb-"
  "src</literal> type lines in the &sources-list; file. This means that you "
@@@ -3936,7 -3133,7 +3134,7 @@@ msgstr "
  "もっと適切なものを取得します。"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:255
+ #: apt-get.8.xml:179
  #, fuzzy
  #| msgid ""
  #| "If the <option>--compile</option> option is specified then the package "
@@@ -3945,9 -3142,10 +3143,10 @@@
  #| "source package will not be unpacked."
  msgid ""
  "If the <option>--compile</option> option is specified then the package will "
- "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
- "<option>--download-only</option> is specified then the source package will "
- "not be unpacked."
+ "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+ "the architecture as defined by the <command>--host-architecture</command> "
+ "option.  If <option>--download-only</option> is specified then the source "
+ "package will not be unpacked."
  msgstr ""
  "<option>--compile</option> オプションを指定すると、<command>dpkg-"
  "buildpackage</command> を用いてバイナリ .deb パッケージをコンパイルします。"
@@@ -3956,7 -3154,7 +3155,7 @@@
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:260
+ #: apt-get.8.xml:186
  msgid ""
  "A specific source version can be retrieved by postfixing the source name "
  "with an equals and then the version to fetch, similar to the mechanism used "
@@@ -3971,7 -3169,7 +3170,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:266
+ #: apt-get.8.xml:192
  msgid ""
  "Note that source packages are not tracked like binary packages, they exist "
  "only in the current directory and are similar to downloading source tar "
@@@ -3980,33 -3178,26 +3179,26 @@@ msgstr "
  "tar ball はカレントディレクトリにのみダウンロードされ、カレントディレクトリに"
  "展開されることに注意してください。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:271
- msgid "build-dep"
- msgstr "build-dep"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:272
+ #: apt-get.8.xml:198
  #, fuzzy
  #| msgid ""
  #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
  #| "an attempt to satisfy the build dependencies for a source package."
  msgid ""
  "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
- "attempt to satisfy the build dependencies for a source package."
+ "attempt to satisfy the build dependencies for a source package. By default "
+ "the dependencies are satisfied to build the package natively. If desired a "
+ "host-architecture can be specified with the <option>--host-architecture</"
+ "option> option instead."
  msgstr ""
  "<literal>build-dep</literal> は、ソースパッケージの構築依存関係を満たすよう"
  "に、パッケージのインストール・削除を行います。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:276
- msgid "check"
- msgstr "check"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:277
+ #: apt-get.8.xml:205
  msgid ""
  "<literal>check</literal> is a diagnostic tool; it updates the package cache "
  "and checks for broken dependencies."
@@@ -4014,21 -3205,16 +3206,16 @@@ msgstr "
  "<literal>check</literal> は、パッケージキャッシュの更新や壊れた依存関係を"
  "チェックする診断ツールです。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:281
- msgid "download"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:282
+ #: apt-get.8.xml:210
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
- "current directoy."
+ "current directory."
  msgstr ""
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:288
+ #: apt-get.8.xml:216
  msgid ""
  "<literal>clean</literal> clears out the local repository of retrieved "
  "package files. It removes everything but the lock file from "
@@@ -4045,14 -3231,9 +3232,9 @@@ msgstr "
  "ます。dselectを使用しない場合は、ディスクスペースを解放するため、時々 "
  "<literal>apt-get clean</literal> を実行したくなるでしょう。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:297
- msgid "autoclean"
- msgstr "autoclean"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:298
+ #: apt-get.8.xml:226
  msgid ""
  "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
  "local repository of retrieved package files. The difference is that it only "
@@@ -4070,14 -3251,9 +3252,9 @@@ msgstr "
  "に off をセットしていれば、インストール済のパッケージファイルが削除されるのを"
  "防げます。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:307
- msgid "autoremove"
- msgstr "autoremove"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:308
+ #: apt-get.8.xml:236
  #, fuzzy
  #| msgid ""
  #| "<literal>autoremove</literal> is used to remove packages that were "
@@@ -4085,38 -3261,29 +3262,29 @@@
  #| "are no more needed."
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
- "automatically installed to satisfy dependencies for some package and that "
- "are no more needed."
+ "automatically installed to satisfy dependencies for other packages and are "
+ "now no longer needed."
  msgstr ""
  "<literal>autoremove</literal> は、依存関係を満たすために自動的にインストール"
  "され、もう必要なくなったパッケージを削除するのに使用します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:312
- msgid "changelog"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:313
+ #: apt-get.8.xml:241
  msgid ""
  "<literal>changelog</literal> downloads a package changelog and displays it "
  "through <command>sensible-pager</command>. The server name and base "
  "directory is defined in the <literal>APT::Changelogs::Server</literal> "
- "variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
- "Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
- "Ubuntu).  By default it displays the changelog for the version that is "
+ "variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+ "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+ "changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+ "for Ubuntu).  By default it displays the changelog for the version that is "
  "installed.  However, you can specify the same options as for the "
  "<option>install</option> command."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:335
- msgid "<option>--no-install-recommends</option>"
- msgstr "<option>--no-install-recommends</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:336
+ #: apt-get.8.xml:264
  msgid ""
  "Do not consider recommended packages as a dependency for installing.  "
  "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@@ -4124,16 -3291,9 +3292,9 @@@ msgstr "
  "「推奨」パッケージをインストールする依存関係と見なしません。設定項目 - "
  "<literal>APT::Install-Recommends</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:340
- #, fuzzy
- #| msgid "<option>--no-suggests</option>"
- msgid "<option>--install-suggests</option>"
- msgstr "<option>--no-suggests</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:341
+ #: apt-get.8.xml:269
  #, fuzzy
  #| msgid ""
  #| "Do not consider recommended packages as a dependency for installing.  "
@@@ -4145,14 -3305,9 +3306,9 @@@ msgstr "
  "「推奨」パッケージをインストールする依存関係と見なしません。設定項目 - "
  "<literal>APT::Install-Recommends</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:345
- msgid "<option>--download-only</option>"
- msgstr "<option>--download-only</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:346
+ #: apt-get.8.xml:274
  msgid ""
  "Download only; package files are only retrieved, not unpacked or installed.  "
  "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@@ -4160,14 -3315,9 +3316,9 @@@ msgstr "
  "ダウンロードのみ - パッケージファイルの取得のみを行い、展開・インストールを行"
  "いません。設定項目 - <literal>APT::Get::Download-Only</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:350
- msgid "<option>--fix-broken</option>"
- msgstr "<option>--fix-broken</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:351
+ #: apt-get.8.xml:279
  msgid ""
  "Fix; attempt to correct a system with broken dependencies in place. This "
  "option, when used with install/remove, can omit any packages to permit APT "
@@@ -4192,19 -3342,9 +3343,9 @@@ msgstr "
  "ションと同時に使用すると、エラーになる状況があるかもしれません。設定項目 - "
  "<literal>APT::Get::Fix-Broken</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:364
- msgid "<option>--ignore-missing</option>"
- msgstr "<option>--ignore-missing</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:365
- msgid "<option>--fix-missing</option>"
- msgstr "<option>--fix-missing</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:366
+ #: apt-get.8.xml:294
  msgid ""
  "Ignore missing packages; If packages cannot be retrieved or fail the "
  "integrity check after retrieval (corrupted package files), hold back those "
@@@ -4222,14 -3362,9 +3363,9 @@@ msgstr "
  "かった場合に、なにも表示せず保留することになります。設定項目 - <literal>APT::"
  "Get::Fix-Missing</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:376
- msgid "<option>--no-download</option>"
- msgstr "<option>--no-download</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:377
+ #: apt-get.8.xml:305
  msgid ""
  "Disables downloading of packages. This is best used with <option>--ignore-"
  "missing</option> to force APT to use only the .debs it has already "
@@@ -4241,7 -3376,7 +3377,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:384
+ #: apt-get.8.xml:312
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -4259,19 -3394,9 +3395,9 @@@ msgstr "
  "をつけずに -qq を使用するべきではありません。設定項目 - <literal>quiet</"
  "literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:394
- msgid "<option>--simulate</option>"
- msgstr "<option>--simulate</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:396
- msgid "<option>--dry-run</option>"
- msgstr "<option>--dry-run</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:399
+ #: apt-get.8.xml:327
  msgid ""
  "No action; perform a simulation of events that would occur but do not "
  "actually change the system.  Configuration Item: <literal>APT::Get::"
@@@ -4281,7 -3406,7 +3407,7 @@@ msgstr "
  "行いません。設定項目 - <literal>APT::Get::Simulate</literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:403
+ #: apt-get.8.xml:331
  msgid ""
  "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
  "literal>)  automatic. Also a notice will be displayed indicating that this "
@@@ -4299,7 -3424,7 +3425,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:409
+ #: apt-get.8.xml:337
  msgid ""
  "Simulate prints out a series of lines each one representing a dpkg "
  "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@@ -4310,24 -3435,9 +3436,9 @@@ msgstr "
  "(Remv)、展開 (Inst) を表示します。角カッコは壊れたパッケージを表し、(まれに) "
  "空の角カッコは大した問題ではないことを表します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>-y</option>"
- msgstr "<option>-y</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>--yes</option>"
- msgstr "<option>--yes</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:417
- msgid "<option>--assume-yes</option>"
- msgstr "<option>--assume-yes</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:418
+ #: apt-get.8.xml:346
  msgid ""
  "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
  "non-interactively. If an undesirable situation, such as changing a held "
@@@ -4340,19 -3450,23 +3451,23 @@@ msgstr "
  "るような不適切な状況の場合、<literal>apt-get</literal> は処理を中断します。設"
  "定項目 - <literal>APT::Get::Assume-Yes</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>-u</option>"
- msgstr "<option>-u</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>--show-upgraded</option>"
- msgstr "<option>--show-upgraded</option>"
+ # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:354
+ #, fuzzy
+ #| msgid ""
+ #| "Compile source packages after downloading them.  Configuration Item: "
+ #| "<literal>APT::Get::Compile</literal>."
+ msgid ""
+ "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+ "Assume-No</literal>."
+ msgstr ""
+ "ソースパッケージをダウンロード後、コンパイルします。設定項目 - <literal>APT::"
+ "Get::Compile</literal>"
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:426
+ #: apt-get.8.xml:359
  msgid ""
  "Show upgraded packages; Print out a list of all packages that are to be "
  "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@@ -4360,19 -3474,9 +3475,9 @@@ msgstr "
  "更新パッケージ表示 - 更新される全パッケージを一覧表示します。設定項目 - "
  "<literal>APT::Get::Show-Upgraded</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>-V</option>"
- msgstr "<option>-V</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>--verbose-versions</option>"
- msgstr "<option>--verbose-versions</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:432
+ #: apt-get.8.xml:365
  msgid ""
  "Show full versions for upgraded and installed packages.  Configuration Item: "
  "<literal>APT::Get::Show-Versions</literal>."
@@@ -4380,24 -3484,20 +3485,20 @@@ msgstr "
  "更新・インストールするパッケージのバージョンをすべて表示します。設定項目 - "
  "<literal>APT::Get::Show-Versions</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>-b</option>"
- msgstr "<option>-b</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>--compile</option>"
- msgstr "<option>--compile</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:437
- msgid "<option>--build</option>"
- msgstr "<option>--build</option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:371
+ msgid ""
+ "This option controls the architecture packages are built for by <command>apt-"
+ "get source --compile</command> and how cross-builddependencies are "
+ "satisfied. By default is it not set which means that the host architecture "
+ "is the same as the build architecture (which is defined by <literal>APT::"
+ "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
+ "Architecture</literal>"
+ msgstr ""
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:438
+ #: apt-get.8.xml:381
  msgid ""
  "Compile source packages after downloading them.  Configuration Item: "
  "<literal>APT::Get::Compile</literal>."
@@@ -4405,14 -3505,9 +3506,9 @@@ msgstr "
  "ソースパッケージをダウンロード後、コンパイルします。設定項目 - <literal>APT::"
  "Get::Compile</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:442
- msgid "<option>--ignore-hold</option>"
- msgstr "<option>--ignore-hold</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:443
+ #: apt-get.8.xml:386
  msgid ""
  "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
  "hold placed on a package. This may be useful in conjunction with "
@@@ -4424,14 -3519,9 +3520,9 @@@ msgstr "
  "を保留の解除をするのに使用すると便利です。設定項目 - <literal>APT::Ignore-"
  "Hold</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:449
- msgid "<option>--no-upgrade</option>"
- msgstr "<option>--no-upgrade</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:450
+ #: apt-get.8.xml:393
  msgid ""
  "Do not upgrade packages; When used in conjunction with <literal>install</"
  "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@@ -4442,32 -3532,22 +3533,22 @@@ msgstr "
  "<literal>no-upgrade</literal> は、指定したパッケージがすでにインストールして"
  "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:456
- msgid "<option>--only-upgrade</option>"
- msgstr "<option>--only-upgrade</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:457
+ #: apt-get.8.xml:400
  #, fuzzy
  msgid ""
  "Do not install new packages; When used in conjunction with <literal>install</"
- "literal>, <literal>only-upgrade</literal> will prevent packages on the "
- "command line from being upgraded if they are not already installed.  "
+ "literal>, <literal>only-upgrade</literal> will install upgrades for already "
+ "installed packages only and ignore requests to install new packages.  "
  "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
  msgstr ""
  "パッケージ更新なし -  <literal>install</literal> と同時に使用すると、"
  "<literal>no-upgrade</literal> は、指定したパッケージがすでにインストールして"
  "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:463
- msgid "<option>--force-yes</option>"
- msgstr "<option>--force-yes</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:464
+ #: apt-get.8.xml:408
  msgid ""
  "Force yes; This is a dangerous option that will cause apt to continue "
  "without prompting if it is doing something potentially harmful. It should "
@@@ -4480,14 -3560,9 +3561,9 @@@ msgstr "
  "方がいいでしょう。<literal>force-yes</literal> は、あなたのシステムを破壊しか"
  "ねません! 設定項目 - <literal>APT::Get::force-yes</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:471
- msgid "<option>--print-uris</option>"
- msgstr "<option>--print-uris</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:472
+ #: apt-get.8.xml:416
  msgid ""
  "Instead of fetching the files to install their URIs are printed. Each URI "
  "will have the path, the destination file name, the size and the expected md5 "
@@@ -4507,14 -3582,9 +3583,9 @@@ msgstr "
  "の展開はユーザの責任において行ってください。設定項目 - <literal>APT::Get::"
  "Print-URIs</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:482
- msgid "<option>--purge</option>"
- msgstr "<option>--purge</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:483
+ #: apt-get.8.xml:427
  msgid ""
  "Use purge instead of remove for anything that would be removed.  An asterisk "
  "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@@ -4526,14 -3596,9 +3597,9 @@@ msgstr "
  "purge</option> は <option>purge</option> コマンドと等価です。 設定項目 - "
  "<literal>APT::Get::Purge</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:490
- msgid "<option>--reinstall</option>"
- msgstr "<option>--reinstall</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:491
+ #: apt-get.8.xml:435
  msgid ""
  "Re-Install packages that are already installed and at the newest version.  "
  "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@@ -4541,14 -3606,9 +3607,9 @@@ msgstr "
  "すでに最新版がインストールされていても、パッケージを再インストールします。設"
  "定項目 - <literal>APT::Get::ReInstall</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:495
- msgid "<option>--list-cleanup</option>"
- msgstr "<option>--list-cleanup</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:496
+ #: apt-get.8.xml:440
  msgid ""
  "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
  "it off. When on <command>apt-get</command> will automatically manage the "
@@@ -4563,19 -3623,9 +3624,9 @@@ msgstr "
  "filename> の中身を管理します。これを OFF にするのは、取得元リストを頻繁に変更"
  "する時ぐらいでしょう。設定項目 - <literal>APT::Get::List-Cleanup</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:505
- msgid "<option>--target-release</option>"
- msgstr "<option>--target-release</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:506
- msgid "<option>--default-release</option>"
- msgstr "<option>--default-release</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:507
+ #: apt-get.8.xml:451
  msgid ""
  "This option controls the default input to the policy engine, it creates a "
  "default pin at priority 990 using the specified release string.  This "
@@@ -4596,14 -3646,9 +3647,9 @@@ msgstr "
  "option>、<option>-t sid</option> でしょう。設定項目 - <literal>APT::Default-"
  "Release</literal>。&apt-preferences; のマニュアルページもご覧ください。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:520
- msgid "<option>--trivial-only</option>"
- msgstr "<option>--trivial-only</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:522
+ #: apt-get.8.xml:466
  msgid ""
  "Only perform operations that are 'trivial'. Logically this can be considered "
  "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@@ -4615,14 -3660,9 +3661,9 @@@ msgstr "
  "と答えますが、<option>--trivial-only</option> はすべて no と答えます。設定項"
  "目 - <literal>APT::Get::Trivial-Only</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:528
- msgid "<option>--no-remove</option>"
- msgstr "<option>--no-remove</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:529
+ #: apt-get.8.xml:473
  msgid ""
  "If any packages are to be removed apt-get immediately aborts without "
  "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@@ -4630,14 -3670,9 +3671,9 @@@ msgstr "
  "パッケージが削除される状況になったとき、プロンプトを表示せず中断します。設定"
  "項目 - <literal>APT::Get::Remove</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:534
- msgid "<option>--auto-remove</option>"
- msgstr "<option>--auto-remove</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:535
+ #: apt-get.8.xml:479
  msgid ""
  "If the command is either <literal>install</literal> or <literal>remove</"
  "literal>, then this option acts like running <literal>autoremove</literal> "
@@@ -4649,14 -3684,9 +3685,9 @@@ msgstr "
  "literal> のように動作します。設定項目 - <literal>APT::Get::AutomaticRemove</"
  "literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:541
- msgid "<option>--only-source</option>"
- msgstr "<option>--only-source</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:542
+ #: apt-get.8.xml:486
  msgid ""
  "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
  "literal> commands.  Indicates that the given source names are not to be "
@@@ -4673,24 -3703,9 +3704,9 @@@ msgstr "
  "付けなくなる、ということです。設定項目 - <literal>APT::Get::Only-Source</"
  "literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--diff-only</option>"
- msgstr "<option>--diff-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--dsc-only</option>"
- msgstr "<option>--dsc-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--tar-only</option>"
- msgstr "<option>--tar-only</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:553
+ #: apt-get.8.xml:497
  msgid ""
  "Download only the diff, dsc, or tar file of a source archive.  Configuration "
  "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@@ -4700,14 -3715,9 +3716,9 @@@ msgstr "
  "設定項目 - <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Tar-"
  "Only</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:558
- msgid "<option>--arch-only</option>"
- msgstr "<option>--arch-only</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:559
+ #: apt-get.8.xml:503
  msgid ""
  "Only process architecture-dependent build-dependencies.  Configuration Item: "
  "<literal>APT::Get::Arch-Only</literal>."
@@@ -4715,14 -3725,9 +3726,9 @@@ msgstr "
  "構築依存関係の解決を、アーキテクチャに依存したもののみ行います。設定項目 - "
  "<literal>APT::Get::Arch-Only</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:563
- msgid "<option>--allow-unauthenticated</option>"
- msgstr "<option>--allow-unauthenticated</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:564
+ #: apt-get.8.xml:508
  msgid ""
  "Ignore if packages can't be authenticated and don't prompt about it.  This "
  "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@@ -4733,7 -3738,7 +3739,7 @@@ msgstr "
  "literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-get.8.xml:577
+ #: apt-get.8.xml:521
  msgid ""
  "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
  "&file-statelists;"
@@@ -4743,7 -3748,7 +3749,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:586
+ #: apt-get.8.xml:530
  msgid ""
  "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
  "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@@ -4755,7 -3760,7 +3761,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:592
+ #: apt-get.8.xml:536
  msgid ""
  "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
  "error."
@@@ -4763,55 -3768,15 +3769,15 @@@ msgstr "
  "<command>apt-get</command> は正常終了時に 0 を返します。エラー時には十進の "
  "100 を返します。"
  
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:595
- msgid "ORIGINAL AUTHORS"
- msgstr "原著者"
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:596
- msgid "&apt-author.jgunthorpe;"
- msgstr "&apt-author.jgunthorpe;"
- 
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:599
- msgid "CURRENT AUTHORS"
- msgstr "現著者"
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:601
- msgid "&apt-author.team;"
- msgstr "&apt-author.team;"
- 
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-key.8.xml:17 apt-key.8.xml:24
- msgid "apt-key"
- msgstr "apt-key"
- 
  # type: Content of: <refentry><refnamediv><refpurpose>
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-key.8.xml:25
+ #: apt-key.8.xml:32
  msgid "APT key management utility"
  msgstr "APT キー管理ユーティリティ"
  
- # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-key.8.xml:31
- msgid ""
- "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
- "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
- "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
- "arg>"
- msgstr ""
- "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
- "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
- "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
- "arg>"
- 
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:40
+ #: apt-key.8.xml:39
  msgid ""
  "<command>apt-key</command> is used to manage the list of keys used by apt to "
  "authenticate packages.  Packages which have been authenticated using these "
@@@ -4823,94 -3788,61 +3789,61 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt-key.8.xml:46
+ #: apt-key.8.xml:45
  msgid "Commands"
  msgstr "コマンド"
  
- # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:48
- msgid "add <replaceable>filename</replaceable>"
- msgstr "add <replaceable>filename</replaceable>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:52
+ #: apt-key.8.xml:50
+ #, fuzzy
+ #| msgid ""
+ #| "Add a new key to the list of trusted keys.  The key is read from "
+ #| "<replaceable>filename</replaceable>, or standard input if "
+ #| "<replaceable>filename</replaceable> is <literal>-</literal>."
  msgid ""
- "Add a new key to the list of trusted keys.  The key is read from "
- "<replaceable>filename</replaceable>, or standard input if "
- "<replaceable>filename</replaceable> is <literal>-</literal>."
+ "Add a new key to the list of trusted keys.  The key is read from the "
+ "filename given with the parameter &synopsis-param-filename; or if the "
+ "filename is <literal>-</literal> from standard input."
  msgstr ""
  "信頼キー一覧に新しいキーを追加します。このキーは <replaceable>filename</"
  "replaceable> から読み込みますが、<replaceable>filename</replaceable> を "
  "<literal>-</literal> とすると、標準入力から読み込みます。"
  
- # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:60
- msgid "del <replaceable>keyid</replaceable>"
- msgstr "del <replaceable>keyid</replaceable>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:64
+ #: apt-key.8.xml:63
  msgid "Remove a key from the list of trusted keys."
  msgstr "信頼キー一覧からキーを削除します。"
  
- # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:71
- msgid "export <replaceable>keyid</replaceable>"
- msgstr "export <replaceable>keyid</replaceable>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:75
- msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+ #: apt-key.8.xml:74
+ #, fuzzy
+ #| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+ msgid "Output the key &synopsis-param-keyid; to standard output."
  msgstr "キー <replaceable>keyid</replaceable> を標準出力に出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:82
- msgid "exportall"
- msgstr "exportall"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:86
+ #: apt-key.8.xml:85
  msgid "Output all trusted keys to standard output."
  msgstr "信頼するキーをすべて標準出力に出力します。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:93
- msgid "list"
- msgstr "list"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:97
+ #: apt-key.8.xml:96
  msgid "List trusted keys."
  msgstr "信頼キーを一覧表示します。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:104
- msgid "finger"
- msgstr "finger"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:108
+ #: apt-key.8.xml:107
  msgid "List fingerprints of trusted keys."
  msgstr "信頼キーのフィンガープリントを一覧表示します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:115
- msgid "adv"
- msgstr "adv"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:119
+ #: apt-key.8.xml:118
  msgid ""
  "Pass advanced options to gpg. With adv --recv-key you can download the "
  "public key."
@@@ -4918,34 -3850,29 +3851,29 @@@ msgstr "
  "gpg に上級オプションを渡します。adv --recv-key とすると、公開鍵をダウンロード"
  "できます。"
  
- # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
  msgid ""
- "Update the local keyring with the keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
+ "Update the local keyring with the archive keyring and remove from the local "
+ "keyring the archive keys which are no longer valid.  The archive keyring is "
+ "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
++"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
++"Ubuntu."
  msgstr ""
- "Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーをキー"
- "リングから削除します。"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:140
- #, fuzzy
- #| msgid "update"
- msgid "net-update"
- msgstr "update"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:144
  msgid ""
- "Update the local keyring with the keys of a key server and removes from the "
- "keyring the archive keys which are no longer valid. This requires an "
- "installed wget and an APT build configured to have a server to fetch from. "
- "APT in Debian does not support this command, but Ubuntu's APT does."
+ "Work similar to the <command>update</command> command above, but get the "
+ "archive keyring from an URI instead and validate it against a master key.  "
+ "This requires an installed &wget; and an APT build configured to have a "
+ "server to fetch from and a master keyring to validate.  APT in Debian does "
+ "not support this command and relies on <command>update</command> instead, "
+ "but Ubuntu's APT does."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:159
+ #: apt-key.8.xml:161
  msgid ""
  "Note that options need to be defined before the commands described in the "
  "previous section."
@@@ -4953,14 -3880,8 +3881,8 @@@ msgstr "
  "前節で説明したコマンドの前に、このオプションを定義する必要があることに注意し"
  "てください。"
  
- # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:161
- msgid "--keyring <replaceable>filename</replaceable>"
- msgstr "--keyring <replaceable>filename</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:162
+ #: apt-key.8.xml:164
  #, fuzzy
  #| msgid ""
  #| "With this option it is possible to specify a specific keyring file the "
@@@ -4973,7 -3894,7 +3895,7 @@@ msgid "
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
  "<filename>trusted.gpg</filename> file as well as on all parts in the "
- "<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</"
  "filename> is the primary keyring which means that e.g. new keys are added to "
  "this one."
  msgstr ""
@@@ -4984,108 -3905,61 +3906,70 @@@
  "加されます。"
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-key.8.xml:175
+ #: apt-key.8.xml:177
  msgid "&file-trustedgpg;"
  msgstr "&file-trustedgpg;"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:177
+ #: apt-key.8.xml:179
  msgid "<filename>/etc/apt/trustdb.gpg</filename>"
  msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:178
+ #: apt-key.8.xml:180
  msgid "Local trust database of archive keys."
  msgstr "アーカイブキーのローカル信頼データベースです。"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
++#, fuzzy
++#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
++msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:182
- msgid "Keyring of Debian archive trusted keys."
+ #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
++#, fuzzy
++#| msgid "Keyring of Debian archive trusted keys."
++msgid "Keyring of Ubuntu archive trusted keys."
  msgstr "Debian アーカイブ信頼キーのキーリングです。"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:185
+ #: apt-key.8.xml:187
++#, fuzzy
++#| msgid ""
++#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  msgid ""
--"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
++"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
++#, fuzzy
++#| msgid "Keyring of Debian archive removed trusted keys."
++msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr "削除された Debian アーカイブ信頼キーのキーリングです。"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:195
+ #: apt-key.8.xml:197
  msgid "&apt-get;, &apt-secure;"
  msgstr "&apt-get;, &apt-secure;"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-mark.8.xml:16
- #, fuzzy
- #| msgid ""
- #| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
- #| "August 2009</date>"
- msgid ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
- "April 2011</date>"
- msgstr ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
- "August 2009</date>"
- 
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-mark.8.xml:25 apt-mark.8.xml:32
- msgid "apt-mark"
- msgstr "apt-mark"
- 
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-mark.8.xml:33
  msgid "mark/unmark a package as being automatically-installed"
  msgstr "パッケージが自動的にインストールされたかどうかのマークを変更します。"
  
- # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-mark.8.xml:39
- #, fuzzy
- #| msgid ""
- #| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
- #| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
- #| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
- #| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
- #| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
- #| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
- msgid ""
- "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
- "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
- "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
- "\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
- "\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
- "arg> </group>"
- msgstr ""
- "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
- "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
- "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
- "\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
- "arg> <arg choice=\"plain\">showauto</arg> </group>"
- 
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:57
+ #: apt-mark.8.xml:39
  msgid ""
  "<command>apt-mark</command> will change whether a package has been marked as "
  "being automatically installed."
@@@ -5095,7 -3969,7 +3979,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:61
+ #: apt-mark.8.xml:43
  msgid ""
  "When you request that a package is installed, and as a result other packages "
  "are installed to satisfy its dependencies, the dependencies are marked as "
@@@ -5109,16 -3983,9 +3993,9 @@@ msgstr "
  "たパッケージに依存されなくなると、そのパッケージは、例えば <command>apt-get</"
  "command> や <command>aptitude</command> により削除されます。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:69
- #, fuzzy
- #| msgid "markauto"
- msgid "auto"
- msgstr "markauto"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:70
+ #: apt-mark.8.xml:52
  #, fuzzy
  #| msgid ""
  #| "<literal>markauto</literal> is used to mark a package as being "
@@@ -5133,14 -4000,9 +4010,9 @@@ msgstr "
  "マークします。このパッケージに依存する、手動でインストールされたパッケージが"
  "なくなると、このパッケージを削除します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:77
- msgid "manual"
- msgstr ""
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:78
+ #: apt-mark.8.xml:60
  #, fuzzy
  #| msgid ""
  #| "<literal>unmarkauto</literal> is used to mark a package as being manually "
@@@ -5155,13 -4017,8 +4027,8 @@@ msgstr "
  "マークします。このパッケージに依存する他のパッケージがなくなっても、このパッ"
  "ケージを自動的に削除するのを防ぎます。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:85
- msgid "hold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:86
+ #: apt-mark.8.xml:68
  msgid ""
  "<literal>hold</literal> is used to mark a package as hold back, which will "
  "prevent the package from being automatically installed, upgraded or "
@@@ -5170,14 -4027,9 +4037,9 @@@
  "effected by the <option>--filename</option> option."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:95
- msgid "unhold"
- msgstr ""
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:96
+ #: apt-mark.8.xml:78
  #, fuzzy
  #| msgid ""
  #| "<literal>showauto</literal> is used to print a list of automatically "
@@@ -5189,14 -4041,9 +4051,9 @@@ msgstr "
  "<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
  "ケージごとに改行して表示します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:101
- msgid "showauto"
- msgstr "showauto"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:102
+ #: apt-mark.8.xml:84
  #, fuzzy
  #| msgid ""
  #| "<literal>showauto</literal> is used to print a list of automatically "
@@@ -5210,31 -4057,17 +4067,17 @@@ msgstr "
  "<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
  "ケージごとに改行して表示します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:109
- #, fuzzy
- #| msgid "showauto"
- msgid "showmanual"
- msgstr "showauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:110
+ #: apt-mark.8.xml:92
  msgid ""
  "<literal>showmanual</literal> can be used in the same way as "
  "<literal>showauto</literal> except that it will print a list of manually "
  "installed packages instead."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:116
- #, fuzzy
- #| msgid "showauto"
- msgid "showhold"
- msgstr "showauto"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:117
+ #: apt-mark.8.xml:99
  #, fuzzy
  #| msgid ""
  #| "<literal>showauto</literal> is used to print a list of automatically "
@@@ -5246,49 -4079,48 +4089,48 @@@ msgstr "
  "<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
  "ケージごとに改行して表示します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:130
- msgid ""
- "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
- msgstr ""
- "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:131
- msgid ""
- "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
- "option>"
- msgstr ""
- "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
- "option>"
+ # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+ #: apt-mark.8.xml:112 apt-mark.8.xml:113
+ #, fuzzy
+ #| msgid "xvcg <replaceable>pkg(s)</replaceable>"
+ msgid "<replaceable>&synopsis-filename;</replaceable>"
+ msgstr "xvcg <replaceable>pkg(s)</replaceable>"
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:134
- msgid ""
- "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
- "filename> instead of the default location, which is "
- "<filename>extended_status</filename> in the directory defined by the "
- "Configuration Item: <literal>Dir::State</literal>."
+ #: apt-mark.8.xml:115
+ #, fuzzy
+ #| msgid ""
+ #| "Read/Write package stats from <filename><replaceable>FILENAME</"
+ #| "replaceable></filename> instead of the default location, which is "
+ #| "<filename>extended_status</filename> in the directory defined by the "
+ #| "Configuration Item: <literal>Dir::State</literal>."
+ msgid ""
+ "Read/Write package stats from the filename given with the parameter "
+ "<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+ "of from the default location, which is <filename>extended_status</filename> "
+ "in the directory defined by the Configuration Item: <literal>Dir::State</"
+ "literal>."
  msgstr ""
  "デフォルトの場所 (設定項目: <literal>Dir::State</literal> で定義したディレク"
  "トリの <filename>extended_status</filename>) に代えて、<filename>FILENAME</"
  "filename> からパッケージの統計を読み書きします。"
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-mark.8.xml:146
+ #: apt-mark.8.xml:128
  msgid "  &file-extended_states;"
  msgstr "  &file-extended_states;"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:151
+ #: apt-mark.8.xml:133
  msgid "&apt-get;,&aptitude;,&apt-conf;"
  msgstr "&apt-get;,&aptitude;,&apt-conf;"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:155
+ #: apt-mark.8.xml:137
  msgid ""
  "<command>apt-mark</command> returns zero on normal operation, non-zero on "
  "error."
@@@ -5296,21 -4128,15 +4138,15 @@@ msgstr "
  "<command>apt-mark</command> は正常終了時に 0 を返します。エラー時には十進の "
  "100 を返します。"
  
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-secure.8.xml:17 apt-secure.8.xml:39
- msgid "apt-secure"
- msgstr "apt-secure"
- 
  # type: Content of: <refentry><refnamediv><refpurpose>
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-secure.8.xml:40
+ #: apt-secure.8.xml:47
  msgid "Archive authentication support for APT"
  msgstr "APT アーカイブ認証サポート"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:45
+ #: apt-secure.8.xml:52
  msgid ""
  "Starting with version 0.6, <command>apt</command> contains code that does "
  "signature checking of the Release file for all archives. This ensures that "
@@@ -5323,7 -4149,7 +4159,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:53
+ #: apt-secure.8.xml:60
  msgid ""
  "If a package comes from a archive without a signature or with a signature "
  "that apt does not have a key for that package is considered untrusted and "
@@@ -5339,7 -4165,7 +4175,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:62
+ #: apt-secure.8.xml:69
  msgid ""
  "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
  "authentication feature."
@@@ -5349,13 -4175,13 +4185,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:67
+ #: apt-secure.8.xml:74
  msgid "Trusted archives"
  msgstr "信頼済アーカイブ"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:70
+ #: apt-secure.8.xml:77
  msgid ""
  "The chain of trust from an apt archive to the end user is made up of "
  "different steps. <command>apt-secure</command> is the last step in this "
@@@ -5373,7 -4199,7 +4209,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:78
+ #: apt-secure.8.xml:85
  msgid ""
  "apt-secure does not review signatures at a package level. If you require "
  "tools to do this you should look at <command>debsig-verify</command> and "
@@@ -5387,7 -4213,7 +4223,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:85
+ #: apt-secure.8.xml:92
  msgid ""
  "The chain of trust in Debian starts when a maintainer uploads a new package "
  "or a new version of a package to the Debian archive. This upload in order to "
@@@ -5405,7 -4231,7 +4241,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:95
+ #: apt-secure.8.xml:102
  msgid ""
  "Once the uploaded package is verified and included in the archive, the "
  "maintainer signature is stripped off, an MD5 sum of the package is computed "
@@@ -5422,7 -4248,7 +4258,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:105
+ #: apt-secure.8.xml:112
  msgid ""
  "Any end user can check the signature of the Release file, extract the MD5 "
  "sum of a package from it and compare it with the MD5 sum of the package he "
@@@ -5438,7 -4264,7 +4274,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:112
+ #: apt-secure.8.xml:119
  msgid ""
  "Notice that this is distinct from checking signatures on a per package "
  "basis. It is designed to prevent two possible attacks:"
@@@ -5448,7 -4274,7 +4284,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:117
+ #: apt-secure.8.xml:124
  msgid ""
  "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
  "checking, a malicious agent can introduce himself in the package download "
@@@ -5464,7 -4290,7 +4300,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:125
+ #: apt-secure.8.xml:132
  msgid ""
  "<literal>Mirror network compromise</literal>.  Without signature checking, a "
  "malicious agent can compromise a mirror host and modify the files in it to "
@@@ -5477,7 -4303,7 +4313,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:132
+ #: apt-secure.8.xml:139
  msgid ""
  "However, it does not defend against a compromise of the Debian master server "
  "itself (which signs the packages) or against a compromise of the key used to "
@@@ -5490,13 -4316,13 +4326,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:138
+ #: apt-secure.8.xml:145
  msgid "User configuration"
  msgstr "ユーザの設定"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:140
+ #: apt-secure.8.xml:147
  msgid ""
  "<command>apt-key</command> is the program that manages the list of keys used "
  "by apt. It can be used to add or remove keys although an installation of "
@@@ -5510,7 -4336,7 +4346,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:147
+ #: apt-secure.8.xml:154
  #, fuzzy
  #| msgid ""
  #| "In order to add a new key you need to first download it (you should make "
@@@ -5536,13 -4362,13 +4372,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:156
+ #: apt-secure.8.xml:163
  msgid "Archive configuration"
  msgstr "アーカイブの設定"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:158
+ #: apt-secure.8.xml:165
  msgid ""
  "If you want to provide archive signatures in an archive under your "
  "maintenance you have to:"
@@@ -5552,7 -4378,7 +4388,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:163
+ #: apt-secure.8.xml:170
  msgid ""
  "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
  "already. You can do this by running <command>apt-ftparchive release</"
@@@ -5564,7 -4390,7 +4400,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:168
+ #: apt-secure.8.xml:175
  #, fuzzy
  #| msgid ""
  #| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"
@@@ -5579,7 -4405,7 +4415,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:172
+ #: apt-secure.8.xml:179
  msgid ""
  "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
  "know what key they need to import in order to authenticate the files in the "
@@@ -5591,7 -4417,7 +4427,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:179
+ #: apt-secure.8.xml:186
  msgid ""
  "Whenever the contents of the archive changes (new packages are added or "
  "removed) the archive maintainer has to follow the first two steps previously "
@@@ -5602,7 -4428,7 +4438,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:187
+ #: apt-secure.8.xml:194
  msgid ""
  "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
  "&debsign; &debsig-verify;, &gpg;"
@@@ -5612,14 -4438,22 +4448,22 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:191
+ #: apt-secure.8.xml:198
+ #, fuzzy
+ #| msgid ""
+ #| "For more background information you might want to review the <ulink url="
+ #| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
+ #| "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
+ #| "Manual (available also in the harden-doc package) and the <ulink url="
+ #| "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
+ #| "Distribution HOWTO</ulink> by V. Alex Brennen."
  msgid ""
  "For more background information you might want to review the <ulink url="
- "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
- "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
- "Manual (available also in the harden-doc package) and the <ulink url="
- "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
- "Distribution HOWTO</ulink> by V. Alex Brennen."
+ "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+ "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+ "(available also in the harden-doc package) and the <ulink url=\"http://www."
+ "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
+ "ulink> by V. Alex Brennen."
  msgstr ""
  "詳細な背景情報を検証するのなら、Securing Debian Manual (harden-doc パッケージ"
  "にも収録) の <ulink url=\"http://www.debian.org/doc/manuals/securing-debian-"
@@@ -5629,13 -4463,13 +4473,13 @@@
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:204
+ #: apt-secure.8.xml:211
  msgid "Manpage Authors"
  msgstr "マニュアルページ作者"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:206
+ #: apt-secure.8.xml:213
  msgid ""
  "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
  "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@@ -5643,35 -4477,15 +4487,15 @@@ msgstr "
  "このマニュアルページは Javier Fernández-Sanguino Peña, Isaac Jones, Colin "
  "Walters, Florian Weimer, Michael Vogt の作業を元にしています。"
  
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-sortpkgs.1.xml:25 apt-sortpkgs.1.xml:32
- msgid "apt-sortpkgs"
- msgstr "apt-sortpkgs"
- 
  # type: Content of: <refentry><refnamediv><refpurpose>
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-sortpkgs.1.xml:33
  msgid "Utility to sort package index files"
  msgstr "パッケージインデックスファイルのソートユーティリティ"
  
- # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-sortpkgs.1.xml:39
- msgid ""
- "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
- msgstr ""
- "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
- 
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:48
+ #: apt-sortpkgs.1.xml:39
  msgid ""
  "<command>apt-sortpkgs</command> will take an index file (Source index or "
  "Package index) and sort the records so that they are ordered by the package "
@@@ -5684,19 -4498,14 +4508,14 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:54
+ #: apt-sortpkgs.1.xml:45
  msgid "All output is sent to stdout, the input must be a seekable file."
  msgstr ""
  "出力はすべて標準出力に送られ、入力は検索できるファイルでなければなりません。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-sortpkgs.1.xml:61
- msgid "<option>--source</option>"
- msgstr "<option>--source</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-sortpkgs.1.xml:63
+ #: apt-sortpkgs.1.xml:54
  msgid ""
  "Use Source index field ordering.  Configuration Item: <literal>APT::"
  "SortPkgs::Source</literal>."
@@@ -5706,7 -4515,7 +4525,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:77
+ #: apt-sortpkgs.1.xml:68
  msgid ""
  "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -5714,39 -4523,29 +4533,29 @@@ msgstr "
  "<command>apt-sortpkgs</command> は正常終了時に 0 を返します。エラー時には十進"
  "の 100 を返します。"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt.conf.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
- "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
- "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
- "&apt-product; <date>16 January 2010</date>"
+ #. type: Content of: <refentry><refentryinfo><author><contrib>
+ #: apt.conf.5.xml:20
+ msgid "Initial documentation of Debug::*."
  msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
- "firstname> <surname>Burrows</surname> <contrib>Debug::*. の最初のドキュメント"
- "</contrib> <email>dburrows@debian.org</email> </author> &apt-email; &apt-"
- "product; <date>16 January 2010</date>"
  
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt.conf.5.xml:31 apt.conf.5.xml:38
- msgid "apt.conf"
- msgstr "apt.conf"
+ #. type: Content of: <refentry><refentryinfo><author><email>
+ #: apt.conf.5.xml:21
+ msgid "dburrows@debian.org"
+ msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
- #: apt.conf.5.xml:32 apt_preferences.5.xml:25 sources.list.5.xml:26
+ #: apt.conf.5.xml:31 apt_preferences.5.xml:25 sources.list.5.xml:26
  msgid "5"
  msgstr "5"
  
  # type: Content of: <refentry><refnamediv><refpurpose>
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt.conf.5.xml:39
+ #: apt.conf.5.xml:38
  msgid "Configuration file for APT"
  msgstr "APT の設定ファイル"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:43
+ #: apt.conf.5.xml:42
  msgid ""
  "<filename>apt.conf</filename> is the main configuration file for the APT "
  "suite of tools, but by far not the only place changes to options can be "
@@@ -5759,21 -4558,21 +4568,21 @@@ msgstr "
  "ンドラインパーサも使用します。"
  
  #. type: Content of: <refentry><refsect1><orderedlist><para>
- #: apt.conf.5.xml:48
+ #: apt.conf.5.xml:47
  msgid ""
  "When an APT tool starts up it will read the configuration files in the "
  "following order:"
  msgstr "APT ツールの起動時に、設定ファイルを以下の順番で読み込みます。"
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:50
+ #: apt.conf.5.xml:49
  msgid ""
  "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
  "any)"
  msgstr "<envar>APT_CONFIG</envar> 環境変数で指定したファイル (存在する場合)"
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:52
+ #: apt.conf.5.xml:51
  #, fuzzy
  #| msgid ""
  #| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
@@@ -5782,11 -4581,12 +4591,12 @@@
  #| "period (.) characters - otherwise they will be silently ignored."
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
- "order which have no or \"<literal>conf</literal>\" as filename extension and "
- "which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
- "characters.  Otherwise APT will print a notice that it has ignored a file if "
- "the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
- "literal> configuration list - in this case it will be silently ignored."
+ "order which have either no or \"<literal>conf</literal>\" as filename "
+ "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+ "and period (.) characters.  Otherwise APT will print a notice that it has "
+ "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+ "Ignore-Files-Silently</literal> configuration list - in this case it will be "
+ "silently ignored."
  msgstr ""
  "<literal>Dir::Etc::Parts</literal> にあるすべてのファイルを英数字の昇順に。"
  "ファイル名には拡張子がないか、\"<literal>conf</literal>\" となっており、英数"
@@@ -5795,13 -4595,13 +4605,13 @@@
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:59
+ #: apt.conf.5.xml:58
  msgid ""
  "the main configuration file specified by <literal>Dir::Etc::main</literal>"
  msgstr "<literal>Dir::Etc::Main</literal> で指定される、メイン設定ファイル"
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:61
+ #: apt.conf.5.xml:60
  msgid ""
  "the command line options are applied to override the configuration "
  "directives or to load even more configuration files."
@@@ -5810,13 -4610,13 +4620,13 @@@ msgstr "
  "加読み込みができます。"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:65
+ #: apt.conf.5.xml:64
  msgid "Syntax"
  msgstr "構文"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:66
+ #: apt.conf.5.xml:65
  msgid ""
  "The configuration file is organized in a tree with options organized into "
  "functional groups. Option specification is given with a double colon "
@@@ -5831,7 -4631,7 +4641,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:72
+ #: apt.conf.5.xml:71
  msgid ""
  "Syntactically the configuration language is modeled after what the ISC tools "
  "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@@ -5857,7 -4657,7 +4667,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><informalexample><programlisting>
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:86
+ #: apt.conf.5.xml:85
  #, no-wrap
  msgid ""
  "APT {\n"
@@@ -5876,7 -4676,7 +4686,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:94
+ #: apt.conf.5.xml:93
  msgid ""
  "with newlines placed to make it more readable. Lists can be created by "
  "opening a scope and including a single string enclosed in quotes followed by "
@@@ -5888,7 -4688,7 +4698,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><informalexample><programlisting>
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:99
+ #: apt.conf.5.xml:98
  #, no-wrap
  msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
  msgstr ""
@@@ -5897,7 -4697,7 +4707,7 @@@
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:102
+ #: apt.conf.5.xml:101
  msgid ""
  "In general the sample configuration file in <filename>&docdir;examples/apt."
  "conf</filename> &configureindex; is a good guide for how it should look."
@@@ -5906,7 -4706,7 +4716,7 @@@ msgstr "
  "定ファイルのサンプルです。どのように設定するか参考になるでしょう。"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:106
+ #: apt.conf.5.xml:105
  msgid ""
  "The names of the configuration items are not case-sensitive. So in the "
  "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@@ -5915,7 -4715,7 +4725,7 @@@ msgstr "
  "<literal>dpkg::pre-install-pkgs</literal> とできます。"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:109
+ #: apt.conf.5.xml:108
  msgid ""
  "Names for the configuration items are optional if a list is defined as it "
  "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@@ -5931,7 -4731,7 +4741,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:114
+ #: apt.conf.5.xml:113
  msgid ""
  "Two specials are allowed, <literal>#include</literal> (which is deprecated "
  "and not supported by alternative implementations) and <literal>#clear</"
@@@ -5950,7 -4750,7 +4760,7 @@@ msgstr "
  "があることに注意してください)。"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:122
+ #: apt.conf.5.xml:121
  msgid ""
  "The #clear command is the only way to delete a list or a complete scope.  "
  "Reopening a scope or the ::-style described below will <emphasis>not</"
@@@ -5965,13 -4765,21 +4775,21 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:127
+ #: apt.conf.5.xml:126
+ #, fuzzy
+ #| msgid ""
+ #| "All of the APT tools take a -o option which allows an arbitrary "
+ #| "configuration directive to be specified on the command line. The syntax "
+ #| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
+ #| "instance) followed by an equals sign then the new value of the option. "
+ #| "Lists can be appended too by adding a trailing :: to the list name. (As "
+ #| "you might suspect: The scope syntax can't be used on the command line.)"
  msgid ""
  "All of the APT tools take a -o option which allows an arbitrary "
  "configuration directive to be specified on the command line. The syntax is a "
  "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
- "followed by an equals sign then the new value of the option. Lists can be "
- "appended too by adding a trailing :: to the list name. (As you might "
+ "followed by an equals sign then the new value of the option. To append a new "
+ "element to a list, add a trailing :: to the name of the list. (As you might "
  "suspect: The scope syntax can't be used on the command line.)"
  msgstr ""
  "すべての APT ツールで、コマンドラインで任意の設定ディレクティブを指定できる -"
@@@ -5981,12 -4789,26 +4799,26 @@@
  "コープ構文はコマンドラインで使用できません)。"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:134
+ #: apt.conf.5.xml:133
+ #, fuzzy
+ #| msgid ""
+ #| "Note that you can use :: only for appending one item per line to a list "
+ #| "and that you should not use it in combination with the scope syntax.  "
+ #| "(The scope syntax implicit insert ::) Using both syntaxes together will "
+ #| "trigger a bug which some users unfortunately relay on: An option with the "
+ #| "unusual name \"<literal>::</literal>\" which acts like every other option "
+ #| "with a name. These introduces many problems including that a user who "
+ #| "writes multiple lines in this <emphasis>wrong</emphasis> syntax in the "
+ #| "hope to append to a list will gain the opposite as only the last "
+ #| "assignment for this option \"<literal>::</literal>\" will be used. "
+ #| "Upcoming APT versions will raise errors and will stop working if they "
+ #| "encounter this misuse, so please correct such statements now as long as "
+ #| "APT doesn't complain explicit about them."
  msgid ""
  "Note that you can use :: only for appending one item per line to a list and "
  "that you should not use it in combination with the scope syntax.  (The scope "
  "syntax implicit insert ::) Using both syntaxes together will trigger a bug "
- "which some users unfortunately relay on: An option with the unusual name "
+ "which some users unfortunately depend on: An option with the unusual name "
  "\"<literal>::</literal>\" which acts like every other option with a name. "
  "These introduces many problems including that a user who writes multiple "
  "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
@@@ -6009,13 -4831,13 +4841,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:146
+ #: apt.conf.5.xml:145
  msgid "The APT Group"
  msgstr "APT グループ"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:147
+ #: apt.conf.5.xml:146
  msgid ""
  "This group of options controls general APT behavior as well as holding the "
  "options for all of the tools."
@@@ -6023,15 -4845,9 +4855,9 @@@ msgstr "
  "このオプショングループは、ツール全体に影響のある、一般的な APT の振る舞いを制"
  "御します。"
  
- # type: <tag></tag>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:151
- msgid "Architecture"
- msgstr "Architecture"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:152
+ #: apt.conf.5.xml:151
  msgid ""
  "System Architecture; sets the architecture to use when fetching files and "
  "parsing package lists. The internal default is the architecture apt was "
@@@ -6041,14 -4857,21 +4867,21 @@@ msgstr "
  "に使用するアーキテクチャをセットします。内部でのデフォルトは、apt をコンパイ"
  "ルしたアーキテクチャです。"
  
- # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:157
- msgid "Default-Release"
- msgstr "Default-Release"
+ msgid ""
+ "All Architectures the system supports. Processors implementing the "
+ "<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
+ "set are e.g. also able to execute binaries compiled for the <literal>i386</"
+ "literal> (<literal>x86</literal>) instruction set; This list is use when "
+ "fetching files and parsing package lists. The internal default is always the "
+ "native architecture (<literal>APT::Architecture</literal>)  and all foreign "
+ "architectures it can retrieve by calling <command>dpkg --print-foreign-"
+ "architectures</command>."
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:158
+ #: apt.conf.5.xml:167
  msgid ""
  "Default release to install packages from if more than one version available. "
  "Contains release name, codename or release version. Examples: 'stable', "
@@@ -6060,14 -4883,9 +4893,9 @@@ msgstr "
  "'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
  "'4.0', '5.0*'  となります。&apt-preferences; も参照してください。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:163
- msgid "Ignore-Hold"
- msgstr "Ignore-Hold"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:164
+ #: apt.conf.5.xml:173
  msgid ""
  "Ignore Held packages; This global option causes the problem resolver to "
  "ignore held packages in its decision making."
@@@ -6075,15 -4893,9 +4903,9 @@@ msgstr "
  "保留パッケージの無視 - このグローバルオプションは、問題解決器に保留と指定した"
  "パッケージを無視します。"
  
- # type: <tag></tag>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:168
- msgid "Clean-Installed"
- msgstr "Clean-Installed"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:169
+ #: apt.conf.5.xml:178
  msgid ""
  "Defaults to on. When turned on the autoclean feature will remove any "
  "packages which can no longer be downloaded from the cache. If turned off "
@@@ -6096,14 -4908,8 +4918,8 @@@ msgstr "
  "たパッケージの再インストール方法を、直接提供するわけではないことに注意してく"
  "ださい。"
  
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:175
- msgid "Immediate-Configure"
- msgstr "Immediate-Configure"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:176
+ #: apt.conf.5.xml:185
  msgid ""
  "Defaults to on which will cause APT to install essential and important "
  "packages as fast as possible in the install/upgrade operation. This is done "
@@@ -6158,14 -4964,9 +4974,9 @@@ msgstr "
  "改善のため、バグのリンクにあるディストリビューションと APT チームにも、問題の"
  "レポートをおねがいします。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:198
- msgid "Force-LoopBreak"
- msgstr "Force-LoopBreak"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:199
+ #: apt.conf.5.xml:208
  msgid ""
  "Never Enable this option unless you -really- know what you are doing. It "
  "permits APT to temporarily remove an essential package to break a Conflicts/"
@@@ -6182,50 -4983,35 +4993,35 @@@ msgstr "
  "ションは、tar, gzip, libc, dpkg, bash とそれらが依存しているパッケージ以外の"
  "不可欠パッケージで動作します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:207
- msgid "Cache-Start, Cache-Grow and Cache-Limit"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:208
+ #: apt.conf.5.xml:217
  msgid ""
  "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
  "the 'available' information. <literal>Cache-Start</literal> acts as a hint "
  "to which size the Cache will grow and is therefore the amount of memory APT "
  "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
- "that these amount of space need to be available for APT otherwise it will "
- "likely fail ungracefully, so for memory restricted devices these value "
- "should be lowered while on systems with a lot of configured sources this "
- "might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
- "default of 1048576 (~1 MB) how much the Cache size will be increased in the "
- "event the space defined by <literal>Cache-Start</literal> is not enough. "
- "These value will be applied again and again until either the cache is big "
- "enough to store all information or the size of the cache reaches the "
- "<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
- "literal> is 0 which stands for no limit.  If <literal>Cache-Grow</literal> "
- "is set to 0 the automatic grow of the cache is disabled."
+ "that this amount of space needs to be available for APT otherwise it will "
+ "likely fail ungracefully, so for memory restricted devices this value should "
+ "be lowered while on systems with a lot of configured sources it should be "
+ "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
+ "of 1048576 (~1 MB) how much the Cache size will be increased in the event "
+ "the space defined by <literal>Cache-Start</literal> is not enough. These "
+ "value will be applied again and again until either the cache is big enough "
+ "to store all information or the size of the cache reaches the <literal>Cache-"
+ "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
+ "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
+ "automatic grow of the cache is disabled."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:223
- msgid "Build-Essential"
- msgstr "Build-Essential"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:224
+ #: apt.conf.5.xml:233
  msgid "Defines which package(s) are considered essential build dependencies."
  msgstr "構築依存関係で不可欠なパッケージを定義します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:227
- msgid "Get"
- msgstr "Get"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:228
+ #: apt.conf.5.xml:237
  msgid ""
  "The Get subsection controls the &apt-get; tool, please see its documentation "
  "for more information about the options here."
@@@ -6233,14 -5019,9 +5029,9 @@@ msgstr "
  "Get サブセクションは &apt-get; ツールを制御します。このオプションの詳細は "
  "&apt-get; の文書を参照してください。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:232
- msgid "Cache"
- msgstr "Cache"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:233
+ #: apt.conf.5.xml:242
  msgid ""
  "The Cache subsection controls the &apt-cache; tool, please see its "
  "documentation for more information about the options here."
@@@ -6248,14 -5029,9 +5039,9 @@@ msgstr "
  "Cache サブセクションは &apt-cache; ツールを制御します。このオプションの詳細"
  "は &apt-cache; の文書を参照してください。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:237
- msgid "CDROM"
- msgstr "CDROM"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:238
+ #: apt.conf.5.xml:247
  msgid ""
  "The CDROM subsection controls the &apt-cdrom; tool, please see its "
  "documentation for more information about the options here."
@@@ -6265,17 -5041,12 +5051,12 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:244
+ #: apt.conf.5.xml:253
  msgid "The Acquire Group"
  msgstr "Acquire グループ"
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:249
- msgid "Check-Valid-Until"
- msgstr "Check-Valid-Until"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:250
+ #: apt.conf.5.xml:259
  msgid ""
  "Security related option defaulting to true as an expiring validation for a "
  "Release file prevents longtime replay attacks and can e.g. also help users "
@@@ -6286,32 -5057,30 +5067,30 @@@
  "<literal>Max-ValidTime</literal> option can be used."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:260
- msgid "Max-ValidTime"
- msgstr "Max-ValidTime"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:261
+ #: apt.conf.5.xml:270
  msgid ""
- "Seconds the Release file should be considered valid after it was created. "
- "The default is \"for ever\" (0) if the Release file of the archive doesn't "
- "include a <literal>Valid-Until</literal> header.  If it does then this date "
- "is the default. The date from the Release file or the date specified by the "
- "creation time of the Release file (<literal>Date</literal> header) plus the "
- "seconds specified with this options are used to check if the validation of a "
- "file has expired by using the earlier date of the two. Archive specific "
- "settings can be made by appending the label of the archive to the option "
- "name."
+ "Seconds the Release file should be considered valid after it was created "
+ "(indicated by the <literal>Date</literal> header).  If the Release file "
+ "itself includes a <literal>Valid-Until</literal> header the earlier date of "
+ "the two is used as the expiration date.  The default value is <literal>0</"
+ "literal> which stands for \"for ever valid\".  Archive specific settings can "
+ "be made by appending the label of the archive to the option name."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:273
- msgid "PDiffs"
- msgstr "PDiffs"
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:281
+ msgid ""
+ "Minimum of seconds the Release file should be considered valid after it was "
+ "created (indicated by the <literal>Date</literal> header).  Use this if you "
+ "need to use a seldomly updated (local) mirror of a more regular updated "
+ "archive with a <literal>Valid-Until</literal> header instead of completely "
+ "disabling the expiration date checking.  Archive specific settings can and "
+ "should be used by appending the label of the archive to the option name."
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:274
+ #: apt.conf.5.xml:292
  msgid ""
  "Try to download deltas called <literal>PDiffs</literal> for Packages or "
  "Sources files instead of downloading whole ones. True by default."
@@@ -6321,7 -5090,7 +5100,7 @@@ msgstr "
  "ルトでは True です。"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:277
+ #: apt.conf.5.xml:295
  #, fuzzy
  #| msgid ""
  #| "Two sub-options to limit the use of PDiffs are also available: With "
@@@ -6333,8 -5102,8 +5112,8 @@@
  msgid ""
  "Two sub-options to limit the use of PDiffs are also available: With "
  "<literal>FileLimit</literal> can be specified how many PDiff files are "
- "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
- "other hand is the maximum precentage of the size of all patches compared to "
+ "downloaded at most to update a file. <literal>SizeLimit</literal> on the "
+ "other hand is the maximum percentage of the size of all patches compared to "
  "the size of the targeted file. If one of these limits is exceeded the "
  "complete file is downloaded instead of the patches."
  msgstr ""
@@@ -6344,14 -5113,9 +5123,9 @@@
  "パッチサイズの最大パーセンテージを指定します。どちらの制限を超えても、パッチ"
  "をダウンロードする代わりに、完全なファイルをダウンロードします。"
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
- msgid "Queue-Mode"
- msgstr "Queue-Mode"
- 
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:305
  msgid ""
  "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
  "literal> or <literal>access</literal> which determines how APT parallelizes "
@@@ -6364,15 -5128,9 +5138,9 @@@ msgstr "
  "<literal>host</literal> は、ターゲットホストごとに 1 接続を開きます。"
  "<literal>access</literal> は、URI タイプごとに 1 接続を開きます。"
  
- # type: Content of: <refentry><refsect1><refsect2><title>
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:294
- msgid "Retries"
- msgstr "Retries"
- 
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:295
+ #: apt.conf.5.xml:313
  msgid ""
  "Number of retries to perform. If this is non-zero APT will retry failed "
  "files the given number of times."
@@@ -6380,14 -5138,9 +5148,9 @@@ msgstr "
  "リトライの回数を設定します。0 でない場合、APT は失敗したファイルに対して、与"
  "えられた回数だけリトライを行います。"
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:299
- msgid "Source-Symlinks"
- msgstr "Source-Symlinks"
- 
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:300
+ #: apt.conf.5.xml:318
  msgid ""
  "Use symlinks for source archives. If set to true then source archives will "
  "be symlinked when possible instead of copying. True is the default."
@@@ -6396,15 -5149,9 +5159,9 @@@ msgstr "
  "き、可能ならコピーの代わりにシンボリックリンクを張ります。true がデフォルトで"
  "す。"
  
- # type: <tag></tag>
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:304 sources.list.5.xml:144
- msgid "http"
- msgstr "http"
- 
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:305
+ #: apt.conf.5.xml:323
  msgid ""
  "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
  "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@@ -6422,7 -5169,7 +5179,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:313
+ #: apt.conf.5.xml:331
  msgid ""
  "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
  "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@@ -6447,7 -5194,7 +5204,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:323 apt.conf.5.xml:387
+ #: apt.conf.5.xml:341 apt.conf.5.xml:407
  msgid ""
  "The option <literal>timeout</literal> sets the timeout timer used by the "
  "method, this applies to all things including connection timeout and data "
@@@ -6457,28 -5204,27 +5214,27 @@@ msgstr "
  "設定します。これには、接続のタイムアウトとデータのタイムアウトが含まれていま"
  "す。"
  
- # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:326
- msgid ""
- "One setting is provided to control the pipeline depth in cases where the "
- "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
- "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
- "indicating how many outstanding requests APT should send. A value of zero "
- "MUST be specified if the remote host does not properly linger on TCP "
- "connections - otherwise data corruption will occur. Hosts which require this "
- "are in violation of RFC 2068."
- msgstr ""
- "リモートサーバが RFC 準拠でなかったり、(Squid 2.0.2 のように) バグがあったり"
- "したときのために、パイプラインの深さの制御を設定します。<literal>Acquire::"
- "http::Pipeline-Depth</literal> により、APT が送信できるリクエストの回数を 0 "
- "から 5 の値で設定できます。リモートサーバが適切でなく、TCP 接続に時間がかかる"
- "ときは、<emphasis>必ず</emphasis> 0 の値を設定しなければなりません。そうでな"
- "ければデータが破損してしまいます。これが必要なホストは RFC 2068 に違反してい"
- "ます。"
+ #: apt.conf.5.xml:344
+ msgid ""
+ "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+ "enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
+ "g. on high-latency connections. It specifies how many requests are send in a "
+ "pipeline.  Previous APT versions had a default of 10 for this setting, but "
+ "the default value is now 0 (= disabled) to avoid problems with the ever-"
+ "growing amount of webservers and proxies which choose to not conform to the "
+ "HTTP/1.1 specification."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:351
+ msgid ""
+ "<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
+ "redirects, which is enabled by default."
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:334
+ #: apt.conf.5.xml:354
  msgid ""
  "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
  "literal> which accepts integer values in kilobyte. The default value is 0 "
@@@ -6492,7 -5238,7 +5248,7 @@@ msgstr "
  "ロードしなくなることに注意してください)。"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:339
+ #: apt.conf.5.xml:359
  msgid ""
  "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
  "User-Agent for the http download method as some proxies allow access for "
@@@ -6502,14 -5248,8 +5258,8 @@@ msgstr "
  "場合、<literal>Acquire::http::User-Agent</literal> を使用して、http でダウン"
  "ロードするための、異なる User-Agent を設定できます。"
  
- # type: <tag></tag>
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:345
- msgid "https"
- msgstr "https"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:346
+ #: apt.conf.5.xml:366
  msgid ""
  "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
  "options are the same as for <literal>http</literal> method and will also "
@@@ -6524,7 -5264,7 +5274,7 @@@ msgstr "
  "いません。"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:352
+ #: apt.conf.5.xml:372
  msgid ""
  "<literal>CaInfo</literal> suboption specifies place of file that holds info "
  "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@@ -6559,15 -5299,9 +5309,9 @@@ msgstr "
  "を上書きします。'TLSv1' か 'SSLv3' という文字列を指定できます。<literal>&lt;"
  "host&gt;::SslForceVersion</literal> は、対応するホストごとのオプションです。"
  
- # type: <tag></tag>
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:370 sources.list.5.xml:155
- msgid "ftp"
- msgstr "ftp"
- 
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:371
+ #: apt.conf.5.xml:391
  msgid ""
  "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
  "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@@ -6600,7 -5334,7 +5344,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:390
+ #: apt.conf.5.xml:410
  msgid ""
  "Several settings are provided to control passive mode. Generally it is safe "
  "to leave passive mode on, it works in nearly every environment.  However "
@@@ -6616,7 -5350,7 +5360,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:397
+ #: apt.conf.5.xml:417
  msgid ""
  "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
  "envar> environment variable to a http url - see the discussion of the http "
@@@ -6630,7 -5364,7 +5374,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:402
+ #: apt.conf.5.xml:422
  msgid ""
  "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
  "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@@ -6645,21 -5379,15 +5389,15 @@@ msgstr "
  "このコマンドを使用します。ほとんどの FTP サーバは RFC2428 をサポートしていな"
  "いことに注意してください。"
  
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:409 sources.list.5.xml:137
- msgid "cdrom"
- msgstr "cdrom"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:415
+ #: apt.conf.5.xml:435
  #, no-wrap
  msgid "/cdrom/::Mount \"foo\";"
  msgstr "/cdrom/::Mount \"foo\";"
  
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:410
+ #: apt.conf.5.xml:430
  msgid ""
  "CDROM URIs; the only setting for CDROM URIs is the mount point, "
  "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@@ -6679,14 -5407,9 +5417,9 @@@ msgstr "
  "後につけるのが重要です。アンマウントコマンドは UMount で指定することができま"
  "す。"
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:420
- msgid "gpgv"
- msgstr "gpgv"
- 
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:421
+ #: apt.conf.5.xml:441
  msgid ""
  "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
  "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@@ -6696,19 -5419,14 +5429,14 @@@ msgstr "
  "ションです。<literal>gpgv::Options</literal> が gpgv に渡す追加オプションで"
  "す。"
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:426
- msgid "CompressionTypes"
- msgstr "CompressionTypes"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:432
+ #: apt.conf.5.xml:452
  #, no-wrap
  msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
  msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:427
+ #: apt.conf.5.xml:447
  msgid ""
  "List of compression types which are understood by the acquire methods.  "
  "Files like <filename>Packages</filename> can be available in various "
@@@ -6726,19 -5444,19 +5454,19 @@@ msgstr "
  "す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:437
+ #: apt.conf.5.xml:457
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order:: \"gz\";"
  msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:440
+ #: apt.conf.5.xml:460
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:433
+ #: apt.conf.5.xml:453
  msgid ""
  "Also the <literal>Order</literal> subgroup can be used to define in which "
  "order the acquire system will try to download the compressed files. The "
@@@ -6766,13 -5484,13 +5494,13 @@@ msgstr "
  "<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:444
+ #: apt.conf.5.xml:464
  #, no-wrap
  msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
  msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:442
+ #: apt.conf.5.xml:462
  #, fuzzy
  #| msgid ""
  #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
@@@ -6789,9 -5507,9 +5517,9 @@@ msgid "
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
  "will only be used if this file exists, e.g. for the bzip2 method (the "
- "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
- "that list entries specified on the command line will be added at the end of "
- "the list specified in the configuration files, but before the default "
+ "inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+ "also that list entries specified on the command line will be added at the "
+ "end of the list specified in the configuration files, but before the default "
  "entries. To prefer a type in this case over the ones specified in the "
  "configuration files you can set the option direct - not in list style.  This "
  "will not override the defined list, it will only prefix the list with this "
@@@ -6808,21 -5526,15 +5536,15 @@@ msgstr "
  "す。"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:449
+ #: apt.conf.5.xml:469
  msgid ""
  "The special type <literal>uncompressed</literal> can be used to give "
- "uncompressed files a preference, but note that most archives doesn't provide "
+ "uncompressed files a preference, but note that most archives don't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
  
- # type: <tag></tag>
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:454
- msgid "GzipIndexes"
- msgstr "GzipIndexes"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:456
+ #: apt.conf.5.xml:476
  msgid ""
  "When downloading <literal>gzip</literal> compressed indexes (Packages, "
  "Sources, or Translations), keep them gzip compressed locally instead of "
@@@ -6830,13 -5542,8 +5552,8 @@@
  "CPU requirements when building the local package caches. False by default."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:463
- msgid "Languages"
- msgstr "Languages"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:464
+ #: apt.conf.5.xml:484
  msgid ""
  "The Languages subsection controls which <filename>Translation</filename> "
  "files are downloaded and in which order APT tries to display the Description-"
@@@ -6849,13 -5556,13 +5566,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
- #: apt.conf.5.xml:480
+ #: apt.conf.5.xml:500
  #, no-wrap
  msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
  msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:470
+ #: apt.conf.5.xml:490
  msgid ""
  "The default list includes \"environment\" and \"en\". "
  "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@@ -6877,9 -5584,18 +5594,18 @@@
  "\"0\"/>"
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:501
+ msgid ""
+ "Note: To prevent problems resulting from APT being executed in different "
+ "environments (e.g. by different users or by other programs) all Translation "
+ "files which are found in <filename>/var/lib/apt/lists/</filename> will be "
+ "added to the end of the list (after an implicit \"<literal>none</literal>\")."
+ msgstr ""
+ 
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:245
+ #: apt.conf.5.xml:254
  msgid ""
  "The <literal>Acquire</literal> group of options controls the download of "
  "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@@ -6890,21 -5606,30 +5616,30 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:487
+ #: apt.conf.5.xml:512
  msgid "Directories"
  msgstr "ディレクトリ"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:489
+ #: apt.conf.5.xml:514
+ #, fuzzy
+ #| msgid ""
+ #| "The <literal>Dir::State</literal> section has directories that pertain to "
+ #| "local state information. <literal>lists</literal> is the directory to "
+ #| "place downloaded package lists in and <literal>status</literal> is the "
+ #| "name of the dpkg status file.  <literal>preferences</literal> is the name "
+ #| "of the APT preferences file.  <literal>Dir::State</literal> contains the "
+ #| "default directory to prefix on all sub items if they do not start with "
+ #| "<filename>/</filename> or <filename>./</filename>."
  msgid ""
  "The <literal>Dir::State</literal> section has directories that pertain to "
  "local state information. <literal>lists</literal> is the directory to place "
  "downloaded package lists in and <literal>status</literal> is the name of the "
  "dpkg status file.  <literal>preferences</literal> is the name of the APT "
- "preferences file.  <literal>Dir::State</literal> contains the default "
- "directory to prefix on all sub items if they do not start with <filename>/</"
- "filename> or <filename>./</filename>."
+ "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
+ "contains the default directory to prefix on all sub items if they do not "
+ "start with <filename>/</filename> or <filename>./</filename>."
  msgstr ""
  "<literal>Dir::State</literal> セクションは、ローカル状態情報に関するディレク"
  "トリを保持します。<literal>lists</literal> は、ダウンロードしたパッケージ一覧"
@@@ -6916,7 -5641,7 +5651,7 @@@
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:496
+ #: apt.conf.5.xml:521
  msgid ""
  "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
  "information, such as the two package caches <literal>srcpkgcache</literal> "
@@@ -6938,7 -5663,7 +5673,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:505
+ #: apt.conf.5.xml:530
  msgid ""
  "<literal>Dir::Etc</literal> contains the location of configuration files, "
  "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@@ -6953,7 -5678,7 +5688,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:511
+ #: apt.conf.5.xml:536
  msgid ""
  "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
  "in lexical order from the directory specified. After this is done then the "
@@@ -6965,7 -5690,7 +5700,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:515
+ #: apt.conf.5.xml:540
  msgid ""
  "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
  "Bin::Methods</literal> specifies the location of the method handlers and "
@@@ -6983,7 -5708,7 +5718,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:523
+ #: apt.conf.5.xml:548
  msgid ""
  "The configuration item <literal>RootDir</literal> has a special meaning.  If "
  "set, all paths in <literal>Dir::</literal> will be relative to "
@@@ -7003,7 -5728,7 +5738,7 @@@ msgstr "
  "<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:536
+ #: apt.conf.5.xml:561
  msgid ""
  "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
  "which files APT should silently ignore while parsing the files in the "
@@@ -7015,13 -5740,13 +5750,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:545
+ #: apt.conf.5.xml:570
  msgid "APT in DSelect"
  msgstr "DSelect での APT"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:547
+ #: apt.conf.5.xml:572
  msgid ""
  "When APT is used as a &dselect; method several configuration directives "
  "control the default behaviour. These are in the <literal>DSelect</literal> "
@@@ -7030,14 -5755,9 +5765,9 @@@ msgstr "
  "&dselect; 上で APT を使用する際、<literal>DSelect</literal> セクション以下の"
  "設定項目で、デフォルトの動作を制御します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:551
- msgid "Clean"
- msgstr "Clean"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:552
+ #: apt.conf.5.xml:577
  msgid ""
  "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
  "and never.  always and prompt will remove all packages from the cache after "
@@@ -7054,7 -5774,7 +5784,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:561
+ #: apt.conf.5.xml:586
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the install phase."
@@@ -7062,15 -5782,9 +5792,9 @@@ msgstr "
  "この変数の内容は、install 時のコマンドラインオプションと同様に &apt-get; に渡"
  "されます。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:565
- msgid "Updateoptions"
- msgstr "Updateoptions"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:566
+ #: apt.conf.5.xml:591
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the update phase."
@@@ -7078,14 -5792,9 +5802,9 @@@ msgstr "
  "この変数の内容は、update 時のコマンドラインオプションと同様に &apt-get; に渡"
  "されます。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:570
- msgid "PromptAfterUpdate"
- msgstr "PromptAfterUpdate"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:571
+ #: apt.conf.5.xml:596
  msgid ""
  "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
  "The default is to prompt only on error."
@@@ -7095,13 -5804,13 +5814,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:577
+ #: apt.conf.5.xml:602
  msgid "How APT calls dpkg"
  msgstr "APT が dpkg を呼ぶ方法"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:578
+ #: apt.conf.5.xml:603
  msgid ""
  "Several configuration directives control how APT invokes &dpkg;. These are "
  "in the <literal>DPkg</literal> section."
@@@ -7111,7 -5820,7 +5830,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:583
+ #: apt.conf.5.xml:608
  msgid ""
  "This is a list of options to pass to dpkg. The options must be specified "
  "using the list notation and each list item is passed as a single argument to "
@@@ -7120,19 -5829,9 +5839,9 @@@ msgstr "
  "dpkg に渡すオプションのリストです。オプションは、リスト記法を使用して指定しな"
  "ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Pre-Invoke"
- msgstr "Pre-Invoke"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Post-Invoke"
- msgstr "Post-Invoke"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:589
+ #: apt.conf.5.xml:614
  msgid ""
  "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -7144,15 -5843,9 +5853,9 @@@ msgstr "
  "bin/sh</filename> を使用して呼び出され、何か問題があれば APT は異常終了しま"
  "す。"
  
- # type: <tag></tag>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:595
- msgid "Pre-Install-Pkgs"
- msgstr "Pre-Install-Pkgs"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:596
+ #: apt.conf.5.xml:621
  msgid ""
  "This is a list of shell commands to run before invoking dpkg. Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -7168,7 -5861,7 +5871,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:602
+ #: apt.conf.5.xml:627
  msgid ""
  "Version 2 of this protocol dumps more information, including the protocol "
  "version, the APT configuration space and the packages, files and versions "
@@@ -7180,17 -5873,11 +5883,11 @@@ msgstr "
  "ス、パッケージを含む) 詳細情報やファイル、変更されているバージョンを出力しま"
  "す。<literal>DPkg::Tools::options::cmd::Version</literal> に 2 を設定すると、"
  "バージョン 2 を有効にできます。<literal>cmd</literal> は <literal>Pre-"
- "Install-Pkgs</literal> で与えられるコマンドです。"
- 
- # type: Content of: <refentry><refsect1><refsect2><title>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:609
- msgid "Run-Directory"
- msgstr "Run-Directory"
+ "Install-Pkgs</literal> で与えられるコマンドです。"
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:610
+ #: apt.conf.5.xml:635
  msgid ""
  "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
  "</filename>."
@@@ -7198,15 -5885,9 +5895,9 @@@ msgstr "
  "APT は dpkg を呼び出す前にこのディレクトリに移動します。デフォルトは "
  "<filename>/</filename> です。"
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:614
- msgid "Build-options"
- msgstr "Build-options"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:615
+ #: apt.conf.5.xml:640
  msgid ""
  "These options are passed to &dpkg-buildpackage; when compiling packages, the "
  "default is to disable signing and produce all binaries."
@@@ -7215,12 -5896,12 +5906,12 @@@ msgstr "
  "ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt.conf.5.xml:620
+ #: apt.conf.5.xml:645
  msgid "dpkg trigger usage (and related options)"
  msgstr "dpkg トリガの使い方 (および関連オプション)"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:621
+ #: apt.conf.5.xml:646
  msgid ""
  "APT can call dpkg in a way so it can make aggressive use of triggers over "
  "multiple calls of dpkg. Without further options dpkg will use triggers only "
@@@ -7235,7 -5916,7 +5926,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
- #: apt.conf.5.xml:636
+ #: apt.conf.5.xml:661
  #, no-wrap
  msgid ""
  "DPkg::NoTriggers \"true\";\n"
@@@ -7249,7 -5930,7 +5940,7 @@@ msgstr "
  "DPkg::TriggersPending \"true\";"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:630
+ #: apt.conf.5.xml:655
  msgid ""
  "Note that it is not guaranteed that APT will support these options or that "
  "these options will not cause (big) trouble in the future. If you have "
@@@ -7262,13 -5943,8 +5953,8 @@@
  "would be <placeholder type=\"literallayout\" id=\"0\"/>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:642
- msgid "DPkg::NoTriggers"
- msgstr "DPkg::NoTriggers"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:643
+ #: apt.conf.5.xml:668
  msgid ""
  "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
  "call).  See &dpkg; if you are interested in what this actually means. In "
@@@ -7279,14 -5955,8 +5965,8 @@@
  "dpkg - now apt will add these flag also to the unpack and remove calls."
  msgstr ""
  
- # type: <tag></tag>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:650
- msgid "PackageManager::Configure"
- msgstr "PackageManager::Configure"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:651
+ #: apt.conf.5.xml:676
  msgid ""
  "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
  "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@@ -7301,14 -5971,8 +5981,8 @@@
  "the system could end in an unconfigured status which could be unbootable!"
  msgstr ""
  
- # type: Content of: <refentry><refsect1><title>
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:661
- msgid "DPkg::ConfigurePending"
- msgstr "DPkg::ConfigurePending"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:662
+ #: apt.conf.5.xml:687
  msgid ""
  "If this option is set apt will call <command>dpkg --configure --pending</"
  "command> to let dpkg handle all required configurations and triggers. This "
@@@ -7318,13 -5982,8 +5992,8 @@@
  "you could deactivate this option in all but the last run."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:668
- msgid "DPkg::TriggersPending"
- msgstr "DPkg::TriggersPending"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:669
+ #: apt.conf.5.xml:694
  msgid ""
  "Useful for <literal>smart</literal> configuration as a package which has "
  "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@@ -7333,13 -5992,8 +6002,8 @@@
  "triggers, not only the triggers needed to configure this package."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:674
- msgid "PackageManager::UnpackAll"
- msgstr "PackageManager::UnpackAll"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:675
+ #: apt.conf.5.xml:700
  msgid ""
  "As the configuration can be deferred to be done at the end by dpkg it can be "
  "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@@ -7350,13 -6004,8 +6014,8 @@@
  "really useful."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:682
- msgid "OrderList::Score::Immediate"
- msgstr "OrderList::Score::Immediate"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:690
+ #: apt.conf.5.xml:715
  #, no-wrap
  msgid ""
  "OrderList::Score {\n"
@@@ -7374,7 -6023,7 +6033,7 @@@ msgstr "
  "};"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:683
+ #: apt.conf.5.xml:708
  msgid ""
  "Essential packages (and there dependencies) should be configured immediately "
  "after unpacking. It will be a good idea to do this quite early in the "
@@@ -7388,12 -6037,12 +6047,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:703
+ #: apt.conf.5.xml:728
  msgid "Periodic and Archives options"
  msgstr "Periodic オプションと Archives オプション"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:704
+ #: apt.conf.5.xml:729
  msgid ""
  "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
  "of options configure behavior of apt periodic updates, which is done by "
@@@ -7407,12 -6056,12 +6066,12 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:712
+ #: apt.conf.5.xml:737
  msgid "Debug options"
  msgstr "デバッグオプション"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:714
+ #: apt.conf.5.xml:739
  msgid ""
  "Enabling options in the <literal>Debug::</literal> section will cause "
  "debugging information to be sent to the standard error stream of the program "
@@@ -7423,7 -6072,7 +6082,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:725
+ #: apt.conf.5.xml:750
  msgid ""
  "<literal>Debug::pkgProblemResolver</literal> enables output about the "
  "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@@ -7434,7 -6083,7 +6093,7 @@@ msgstr "
  "にします。"
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:733
+ #: apt.conf.5.xml:758
  msgid ""
  "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
  "used to run some operations (for instance, <literal>apt-get -s install</"
@@@ -7445,7 -6094,7 +6104,7 @@@ msgstr "
  "literal>) を行う場合に使用します。"
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:742
+ #: apt.conf.5.xml:767
  msgid ""
  "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
  "time that <literal>apt</literal> invokes &dpkg;."
@@@ -7457,7 -6106,7 +6116,7 @@@ msgstr "
  #. 	   motivating example, except I haven't a clue why you'd want
  #. 	   to do this. 
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:750
+ #: apt.conf.5.xml:775
  msgid ""
  "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
  "in CDROM IDs."
@@@ -7466,72 -6115,42 +6125,42 @@@ msgstr "
  "を無効にします。"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:760
+ #: apt.conf.5.xml:785
  msgid "A full list of debugging options to apt follows."
  msgstr "以下は apt に対するデバッグオプションのすべてです。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:765
- msgid "<literal>Debug::Acquire::cdrom</literal>"
- msgstr "<literal>Debug::Acquire::cdrom</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:769
+ #: apt.conf.5.xml:794
  msgid ""
  "Print information related to accessing <literal>cdrom://</literal> sources."
  msgstr ""
  "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:776
- msgid "<literal>Debug::Acquire::ftp</literal>"
- msgstr "<literal>Debug::Acquire::ftp</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:780
+ #: apt.conf.5.xml:805
  msgid "Print information related to downloading packages using FTP."
  msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:787
- msgid "<literal>Debug::Acquire::http</literal>"
- msgstr "<literal>Debug::Acquire::http</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:791
+ #: apt.conf.5.xml:816
  msgid "Print information related to downloading packages using HTTP."
  msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:798
- msgid "<literal>Debug::Acquire::https</literal>"
- msgstr "<literal>Debug::Acquire::https</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:802
+ #: apt.conf.5.xml:827
  msgid "Print information related to downloading packages using HTTPS."
  msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:809
- msgid "<literal>Debug::Acquire::gpgv</literal>"
- msgstr "<literal>Debug::Acquire::gpgv</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:813
+ #: apt.conf.5.xml:838
  msgid ""
  "Print information related to verifying cryptographic signatures using "
  "<literal>gpg</literal>."
  msgstr ""
  "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:820
- msgid "<literal>Debug::aptcdrom</literal>"
- msgstr "<literal>Debug::aptcdrom</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:824
+ #: apt.conf.5.xml:849
  msgid ""
  "Output information about the process of accessing collections of packages "
  "stored on CD-ROMs."
@@@ -7539,36 -6158,21 +6168,21 @@@ msgstr "
  "CD-ROM にあるパッケージ集合に対して、アクセスするプロセスについての情報を出力"
  "します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:831
- msgid "<literal>Debug::BuildDeps</literal>"
- msgstr "<literal>Debug::BuildDeps</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:834
+ #: apt.conf.5.xml:859
  msgid "Describes the process of resolving build-dependencies in &apt-get;."
  msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:841
- msgid "<literal>Debug::Hashes</literal>"
- msgstr "<literal>Debug::Hashes</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:844
+ #: apt.conf.5.xml:869
  msgid ""
  "Output each cryptographic hash that is generated by the <literal>apt</"
  "literal> libraries."
  msgstr ""
  "<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:851
- msgid "<literal>Debug::IdentCDROM</literal>"
- msgstr "<literal>Debug::IdentCDROM</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:854
+ #: apt.conf.5.xml:879
  msgid ""
  "Do not include information from <literal>statfs</literal>, namely the number "
  "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@@ -7577,13 -6181,8 +6191,8 @@@ msgstr "
  "CD-ROM の ID を生成する際に <literal>statfs</literal> という、CD-ROM ファイル"
  "システムにある使用済・未使用ブロックの数からの情報を含めないようにします。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:862
- msgid "<literal>Debug::NoLocking</literal>"
- msgstr "<literal>Debug::NoLocking</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:865
+ #: apt.conf.5.xml:890
  msgid ""
  "Disable all file locking.  For instance, this will allow two instances of "
  "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@@ -7591,24 -6190,14 +6200,14 @@@ msgstr "
  "ファイルのロックをすべて無効にします。例えば、同時にふたつの "
  "<quote><literal>apt-get update</literal></quote> を実行できるようになります。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:873
- msgid "<literal>Debug::pkgAcquire</literal>"
- msgstr "<literal>Debug::pkgAcquire</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:877
+ #: apt.conf.5.xml:902
  msgid "Log when items are added to or removed from the global download queue."
  msgstr ""
  "グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:884
- msgid "<literal>Debug::pkgAcquire::Auth</literal>"
- msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:887
+ #: apt.conf.5.xml:912
  msgid ""
  "Output status messages and errors related to verifying checksums and "
  "cryptographic signatures of downloaded files."
@@@ -7616,13 -6205,8 +6215,8 @@@ msgstr "
  "ダウンロードしたファイルのチェックサムや暗号署名の確認に関する、状態メッセー"
  "ジやエラーを出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:894
- msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
- msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:897
+ #: apt.conf.5.xml:922
  msgid ""
  "Output information about downloading and applying package index list diffs, "
  "and errors relating to package index list diffs."
@@@ -7630,13 -6214,8 +6224,8 @@@ msgstr "
  "パッケージインデックスリスト差分のダウンロード・適用時の、情報やエラーを出力"
  "します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:905
- msgid "<literal>Debug::pkgAcquire::RRed</literal>"
- msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:909
+ #: apt.conf.5.xml:934
  msgid ""
  "Output information related to patching apt package lists when downloading "
  "index diffs instead of full indices."
@@@ -7644,25 -6223,15 +6233,15 @@@ msgstr "
  "インデックス全体ではなくインデックス差分のダウンロードの際に、apt パッケージ"
  "リストへのパッチ適用に関する情報を出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:916
- msgid "<literal>Debug::pkgAcquire::Worker</literal>"
- msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:920
+ #: apt.conf.5.xml:945
  msgid ""
  "Log all interactions with the sub-processes that actually perform downloads."
  msgstr ""
  "実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:927
- msgid "<literal>Debug::pkgAutoRemove</literal>"
- msgstr "<literal>Debug::pkgAutoRemove</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:931
+ #: apt.conf.5.xml:956
  msgid ""
  "Log events related to the automatically-installed status of packages and to "
  "the removal of unused packages."
@@@ -7670,13 -6239,8 +6249,8 @@@ msgstr "
  "パッケージの自動インストールや、不要パッケージの削除に関するイベントを、ログ"
  "に出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:938
- msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
- msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:941
+ #: apt.conf.5.xml:966
  msgid ""
  "Generate debug messages describing which packages are being automatically "
  "installed to resolve dependencies.  This corresponds to the initial auto-"
@@@ -7690,13 -6254,8 +6264,8 @@@ msgstr "
  "ば <literal>apt-get install</literal> で実行された、初期の自動インストール経"
  "路に対応しています。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:952
- msgid "<literal>Debug::pkgDepCache::Marker</literal>"
- msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:955
+ #: apt.conf.5.xml:980
  msgid ""
  "Generate debug messages describing which package is marked as keep/install/"
  "remove while the ProblemResolver does his work.  Each addition or deletion "
@@@ -7712,23 -6271,13 +6281,13 @@@
  "<literal>section</literal> is the name of the section the package appears in."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:974
- msgid "<literal>Debug::pkgInitConfig</literal>"
- msgstr "<literal>Debug::pkgInitConfig</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:977
+ #: apt.conf.5.xml:1002
  msgid "Dump the default configuration to standard error on startup."
  msgstr "起動時に、標準エラー出力へデフォルト設定を出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:984
- msgid "<literal>Debug::pkgDPkgPM</literal>"
- msgstr "<literal>Debug::pkgDPkgPM</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:987
+ #: apt.conf.5.xml:1012
  msgid ""
  "When invoking &dpkg;, output the precise command line with which it is being "
  "invoked, with arguments separated by a single space character."
@@@ -7736,13 -6285,8 +6295,8 @@@ msgstr "
  "&dpkg; 起動時に、起動した際の正確なコマンドラインを出力します。引数は空白で区"
  "切られます。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:995
- msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
- msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:998
+ #: apt.conf.5.xml:1023
  msgid ""
  "Output all the data received from &dpkg; on the status file descriptor and "
  "any errors encountered while parsing it."
@@@ -7750,13 -6294,8 +6304,8 @@@ msgstr "
  "状態ファイルディスクリプタに、&dpkg; から受信したすべてのデータと、そのデータ"
  "を解析中に発生したエラーを出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1005
- msgid "<literal>Debug::pkgOrderList</literal>"
- msgstr "<literal>Debug::pkgOrderList</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1009
+ #: apt.conf.5.xml:1034
  msgid ""
  "Generate a trace of the algorithm that decides the order in which "
  "<literal>apt</literal> should pass packages to &dpkg;."
@@@ -7764,34 -6303,19 +6313,19 @@@ msgstr "
  "<literal>apt</literal> が &dpkg; にパッケージを渡す順番を決める、アルゴリズム"
  "のトレースを生成します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1017
- msgid "<literal>Debug::pkgPackageManager</literal>"
- msgstr "<literal>Debug::pkgPackageManager</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1021
+ #: apt.conf.5.xml:1046
  msgid ""
  "Output status messages tracing the steps performed when invoking &dpkg;."
  msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1028
- msgid "<literal>Debug::pkgPolicy</literal>"
- msgstr "<literal>Debug::pkgPolicy</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1032
+ #: apt.conf.5.xml:1057
  msgid "Output the priority of each package list on startup."
  msgstr "起動時の各パッケージの優先度を表示します。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1038
- msgid "<literal>Debug::pkgProblemResolver</literal>"
- msgstr "<literal>Debug::pkgProblemResolver</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1042
+ #: apt.conf.5.xml:1067
  msgid ""
  "Trace the execution of the dependency resolver (this applies only to what "
  "happens when a complex dependency problem is encountered)."
@@@ -7799,26 -6323,16 +6333,16 @@@ msgstr "
  "依存関係解決システムの実行内容を追跡します (これは複雑な依存関係の問題に遭遇"
  "した場合にのみ、適用されます)。"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1050
- msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
- msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1053
+ #: apt.conf.5.xml:1078
  msgid ""
  "Display a list of all installed packages with their calculated score used by "
  "the pkgProblemResolver. The description of the package is the same as "
  "described in <literal>Debug::pkgDepCache::Marker</literal>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1061
- msgid "<literal>Debug::sourceList</literal>"
- msgstr "<literal>Debug::sourceList</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1065
+ #: apt.conf.5.xml:1090
  msgid ""
  "Print information about the vendors read from <filename>/etc/apt/vendors."
  "list</filename>."
@@@ -7828,7 -6342,7 +6352,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1088
+ #: apt.conf.5.xml:1113
  msgid ""
  "&configureindex; is a configuration file showing example values for all "
  "possible options."
@@@ -7838,31 -6352,17 +6362,17 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt.conf.5.xml:1095
+ #: apt.conf.5.xml:1120
  msgid "&file-aptconf;"
  msgstr "&file-aptconf;"
  
  # type: Content of: <refentry><refsect1><para>
  #.  ? reading apt.conf 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1100
+ #: apt.conf.5.xml:1125
  msgid "&apt-cache;, &apt-config;, &apt-preferences;."
  msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt_preferences.5.xml:16
- msgid ""
- "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
- msgstr ""
- "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
- 
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt_preferences.5.xml:24 apt_preferences.5.xml:31
- msgid "apt_preferences"
- msgstr "apt_preferences"
- 
  # type: Content of: <refentry><refnamediv><refpurpose>
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt_preferences.5.xml:32
@@@ -7947,8 -6447,8 +6457,8 @@@ msgstr "
  msgid ""
  "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
  "directory are parsed in alphanumeric ascending order and need to obey the "
- "following naming convention: The files have no or \"<literal>pref</literal>"
- "\" as filename extension and which only contain alphanumeric, hyphen (-), "
+ "following naming convention: The files have either no or \"<literal>pref</"
+ "literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
  "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
  "that it has ignored a file if the file doesn't match a pattern in the "
  "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@@ -8413,7 -6913,7 +6923,7 @@@ msgid "
  "APT also supports pinning by glob() expressions and regular expressions "
  "surrounded by /. For example, the following example assigns the priority 500 "
  "to all packages from experimental where the name starts with gnome (as a glob"
- "()-like expression or contains the word kde (as a POSIX extended regular "
+ "()-like expression) or contains the word kde (as a POSIX extended regular "
  "expression surrounded by slashes)."
  msgstr ""
  
@@@ -8439,7 -6939,7 +6949,7 @@@ msgstr "
  #: apt_preferences.5.xml:279
  msgid ""
  "The rule for those expressions is that they can occur anywhere where a "
- "string can occur. Those, the following pin assigns the priority 990 to all "
+ "string can occur. Thus, the following pin assigns the priority 990 to all "
  "packages from a release starting with karmic."
  msgstr ""
  
@@@ -8461,33 -6961,31 +6971,31 @@@ msgstr "
  "Pin-Priority: 50\n"
  "\n"
  
- # type: <tag></tag>
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:290
- #, fuzzy
- #| msgid "Packages"
- msgid "Package"
- msgstr "Packages"
- 
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:296
- msgid "*"
+ #. type: Content of: <refentry><refsect1><refsect2><para>
+ #: apt_preferences.5.xml:291
+ msgid ""
+ "If a regular expression occurs in a <literal>Package</literal> field, the "
+ "behavior is the same as if this regular expression were replaced with a list "
+ "of all package names it matches. It is undecided whether this will change in "
+ "the future, thus you should always list wild-card pins first, so later "
+ "specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+ "Package field is not considered a glob() expression in itself."
  msgstr ""
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:306
+ #: apt_preferences.5.xml:307
  msgid "How APT Interprets Priorities"
  msgstr "APT が優先度に割り込む方法"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:314
+ #: apt_preferences.5.xml:315
  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:315
+ #: apt_preferences.5.xml:316
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
  "package"
@@@ -8495,13 -6993,13 +7003,13 @@@ msgstr "
  "パッケージがダウングレードしても、このバージョンのパッケージをインストール"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:319
+ #: apt_preferences.5.xml:320
  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:320
+ #: apt_preferences.5.xml:321
  msgid ""
  "causes a version to be installed even if it does not come from the target "
  "release, unless the installed version is more recent"
@@@ -8510,13 -7008,13 +7018,13 @@@ msgstr "
  "含まれなくても、このバージョンのパッケージをインストール"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:325
+ #: apt_preferences.5.xml:326
  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:326
+ #: apt_preferences.5.xml:327
  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"
@@@ -8525,13 -7023,13 +7033,13 @@@ msgstr "
  "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:331
+ #: apt_preferences.5.xml:332
  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:332
+ #: apt_preferences.5.xml:333
  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"
@@@ -8541,13 -7039,13 +7049,13 @@@ msgstr "
  "ル"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:337
+ #: apt_preferences.5.xml:338
  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:338
+ #: apt_preferences.5.xml:339
  msgid ""
  "causes a version to be installed only if there is no installed version of "
  "the package"
@@@ -8556,19 -7054,19 +7064,19 @@@ msgstr "
  "ンストール"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:342
+ #: apt_preferences.5.xml:343
  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:343
+ #: apt_preferences.5.xml:344
  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:309
+ #: apt_preferences.5.xml:310
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -8580,7 -7078,7 +7088,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:348
+ #: apt_preferences.5.xml:349
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -8594,7 -7092,7 +7102,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:354
+ #: apt_preferences.5.xml:355
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
  "presented earlier:"
@@@ -8604,7 -7102,7 +7112,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
- #: apt_preferences.5.xml:358
+ #: apt_preferences.5.xml:359
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8634,13 -7132,13 +7142,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:371
+ #: apt_preferences.5.xml:372
  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:373
+ #: apt_preferences.5.xml:374
  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 "
@@@ -8655,7 -7153,7 +7163,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:378
+ #: apt_preferences.5.xml:379
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -8667,7 -7165,7 +7175,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:382
+ #: apt_preferences.5.xml:383
  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</"
@@@ -8681,13 -7179,13 +7189,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:392
+ #: apt_preferences.5.xml:393
  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:394
+ #: apt_preferences.5.xml:395
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -8698,30 -7196,30 +7206,30 @@@ msgstr "
  "filename> ファイルを提供します。"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:406
+ #: apt_preferences.5.xml:407
  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:407
+ #: apt_preferences.5.xml:408
  msgid "gives the package name"
  msgstr "パッケージ名"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+ #: apt_preferences.5.xml:411 apt_preferences.5.xml:461
  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:411
+ #: apt_preferences.5.xml:412
  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:398
+ #: apt_preferences.5.xml:399
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -8741,13 -7239,13 +7249,13 @@@ msgstr "
  "type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:427
+ #: apt_preferences.5.xml:428
  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:428
+ #: apt_preferences.5.xml:429
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -8764,19 -7262,19 +7272,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:438
+ #: apt_preferences.5.xml:439
  #, 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:444
+ #: apt_preferences.5.xml:445
  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:445
+ #: apt_preferences.5.xml:446
  #, fuzzy
  msgid ""
  "names the codename to which all the packages in the directory tree belong.  "
@@@ -8794,14 -7292,14 +7302,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:454
+ #: apt_preferences.5.xml:455
  #, 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:461
+ #: apt_preferences.5.xml:462
  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 "
@@@ -8817,7 -7315,7 +7325,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:470
+ #: apt_preferences.5.xml:471
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -8830,13 -7328,13 +7338,13 @@@ msgstr "
  "\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:479
+ #: apt_preferences.5.xml:480
  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:480
+ #: apt_preferences.5.xml:481
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -8854,19 -7352,19 +7362,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:489
+ #: apt_preferences.5.xml:490
  #, 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:495
+ #: apt_preferences.5.xml:496
  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:496
+ #: apt_preferences.5.xml:497
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8879,7 -7377,7 +7387,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:502
+ #: apt_preferences.5.xml:503
  #, no-wrap
  msgid "Pin: release o=Debian\n"
  msgstr ""
@@@ -8887,13 -7385,13 +7395,13 @@@
  "\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:508
+ #: apt_preferences.5.xml:509
  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:509
+ #: apt_preferences.5.xml:510
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8906,7 -7404,7 +7414,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:515
+ #: apt_preferences.5.xml:516
  #, no-wrap
  msgid "Pin: release l=Debian\n"
  msgstr ""
@@@ -8915,7 -7413,7 +7423,7 @@@
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:416
+ #: apt_preferences.5.xml:417
  #, fuzzy
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
@@@ -8939,7 -7437,7 +7447,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:522
+ #: apt_preferences.5.xml:523
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -8965,13 -7463,13 +7473,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:535
+ #: apt_preferences.5.xml:536
  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:537
+ #: apt_preferences.5.xml:538
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -8982,13 -7480,13 +7490,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:546
+ #: apt_preferences.5.xml:547
  msgid "Tracking Stable"
  msgstr "安定版の追跡"
  
  # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:554
+ #: apt_preferences.5.xml:555
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -9014,7 -7512,7 +7522,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:548
+ #: apt_preferences.5.xml:549
  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 "
@@@ -9030,8 -7528,8 +7538,8 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:571 apt_preferences.5.xml:617
- #: apt_preferences.5.xml:675
+ #: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+ #: apt_preferences.5.xml:676
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -9044,7 -7542,7 +7552,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:566
+ #: apt_preferences.5.xml:567
  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 "
@@@ -9057,14 -7555,14 +7565,14 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:583
+ #: apt_preferences.5.xml:584
  #, 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:577
+ #: apt_preferences.5.xml:578
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -9078,13 -7576,13 +7586,13 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><title>
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:589
+ #: apt_preferences.5.xml:590
  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:598
+ #: apt_preferences.5.xml:599
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -9113,7 -7611,7 +7621,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:591
+ #: apt_preferences.5.xml:592
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -9131,7 -7629,7 +7639,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para>
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:612
+ #: apt_preferences.5.xml:613
  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 "
@@@ -9144,14 -7642,14 +7652,14 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:632
+ #: apt_preferences.5.xml:633
  #, 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:623
+ #: apt_preferences.5.xml:624
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -9170,13 -7668,13 +7678,13 @@@ msgstr "
  "\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:639
+ #: apt_preferences.5.xml:640
  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:653
+ #: apt_preferences.5.xml:654
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -9210,7 -7708,7 +7718,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:641
+ #: apt_preferences.5.xml:642
  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 "
@@@ -9234,7 -7732,7 +7742,7 @@@ msgstr "
  "id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:670
+ #: apt_preferences.5.xml:671
  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 "
@@@ -9247,14 -7745,14 +7755,14 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:690
+ #: apt_preferences.5.xml:691
  #, 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:681
+ #: apt_preferences.5.xml:682
  #, fuzzy
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
@@@ -9274,22 -7772,16 +7782,16 @@@ msgstr "
  
  # type: Content of: <refentry><refnamediv><refname>
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt_preferences.5.xml:699
+ #: apt_preferences.5.xml:700
  msgid "&file-preferences;"
  msgstr "&file-preferences;"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: apt_preferences.5.xml:705
+ #: apt_preferences.5.xml:706
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
- # type: Content of: <refentry><refnamediv><refname>
- #. type: Content of: <refentry><refnamediv><refname>
- #: sources.list.5.xml:25 sources.list.5.xml:32
- msgid "sources.list"
- msgstr "sources.list"
- 
  # type: Content of: <refentry><refnamediv><refpurpose>
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: sources.list.5.xml:33
@@@ -9422,7 -7914,7 +7924,7 @@@ msgstr "
  #: sources.list.5.xml:81
  #, fuzzy, no-wrap
  #| msgid "deb uri distribution [component1] [component2] [...]"
- msgid "deb uri distribution [component1] [component2] [...]"
+ msgid "deb [ options ] uri distribution [component1] [component2] [...]"
  msgstr "deb uri distribution [component1] [component2] [...]"
  
  # type: Content of: <refentry><refsect1><para>
@@@ -9490,10 -7982,42 +7992,42 @@@ msgstr "
  "にアクセスするのに便利です。APT は、帯域の狭いサイトを効率よく扱うのに、異な"
  "るホストへは、接続を並行して行うようにもしています。"
  
- # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:112
  msgid ""
+ "<literal>options</literal> is always optional and needs to be surounded by "
+ "square brackets. It can consist of multiple settings in the form "
+ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+ "replaceable></literal>.  Multiple settings are separated by spaces. The "
+ "following settings are supported by APT, note though that unsupported "
+ "settings will be ignored silently:"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:117
+ msgid ""
+ "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+ "replaceable>,…</literal> can be used to specify for which architectures "
+ "packages information should be downloaded. If this option is not set all "
+ "architectures defined by the <literal>APT::Architectures</literal> option "
+ "will be downloaded."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:121
+ msgid ""
+ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+ "this source are always authenticated even if the <filename>Release</"
+ "filename> file is not signed or the signature can't be checked. This "
+ "disables parts of &apt-secure; and should therefore only be used in a local "
+ "and trusted context. <literal>trusted=no</literal> is the opposite which "
+ "handles even correctly authenticated sources as not authenticated."
+ msgstr ""
+ 
+ # type: Content of: <refentry><refsect1><para>
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:128
+ msgid ""
  "It is important to list sources in order of preference, with the most "
  "preferred source listed first. Typically this will result in sorting by "
  "speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@@ -9506,12 -8030,12 +8040,12 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:117
+ #: sources.list.5.xml:133
  msgid "Some examples:"
  msgstr "例:"
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:119
+ #: sources.list.5.xml:135
  #, no-wrap
  msgid ""
  "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@@ -9524,19 -8048,19 +8058,19 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><title>
- #: sources.list.5.xml:125
+ #: sources.list.5.xml:141
  msgid "URI specification"
  msgstr "URI の仕様"
  
  # type: Content of: <refentry><refsect1><title>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:130
+ #: sources.list.5.xml:146
  msgid "file"
  msgstr "ファイル"
  
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:132
+ #: sources.list.5.xml:148
  msgid ""
  "The file scheme allows an arbitrary directory in the file system to be "
  "considered an archive. This is useful for NFS mounts and local mirrors or "
@@@ -9545,9 -8069,15 +8079,15 @@@ msgstr "
  "file スキームは、システム内の任意のディレクトリを、アーカイブとして扱えるよう"
  "にします。これは NFS マウントやローカルミラーで便利です。"
  
+ # type: Content of: <refentry><refnamediv><refname>
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:153
+ msgid "cdrom"
+ msgstr "cdrom"
+ 
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:139
+ #: sources.list.5.xml:155
  msgid ""
  "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
  "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@@ -9556,9 -8086,15 +8096,15 @@@ msgstr "
  "るようにします。取得元リストに cdrom エントリを追加するには、&apt-cdrom; プロ"
  "グラムを使用してください。"
  
+ # type: <tag></tag>
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:160
+ msgid "http"
+ msgstr "http"
+ 
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:146
+ #: sources.list.5.xml:162
  msgid ""
  "The http scheme specifies an HTTP server for the archive. If an environment "
  "variable <envar>http_proxy</envar> is set with the format http://server:"
@@@ -9573,9 -8109,15 +8119,15 @@@ msgstr "
  "証が必要な HTTP/1.1 プロキシの場合、http://user:pass@server:port/ という形で"
  "指定してください。この認証方法は安全ではないことに注意してください。"
  
+ # type: <tag></tag>
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:171
+ msgid "ftp"
+ msgstr "ftp"
+ 
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:157
+ #: sources.list.5.xml:173
  msgid ""
  "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
  "is highly configurable; for more information see the &apt-conf; manual page. "
@@@ -9594,13 -8136,13 +8146,13 @@@ msgstr "
  "れます。"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:166
+ #: sources.list.5.xml:182
  msgid "copy"
  msgstr "copy"
  
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:168
+ #: sources.list.5.xml:184
  msgid ""
  "The copy scheme is identical to the file scheme except that packages are "
  "copied into the cache directory instead of used directly at their location.  "
@@@ -9611,18 -8153,18 +8163,18 @@@ msgstr "
  "て、APT でコピーを行う場合に便利です。"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "rsh"
  msgstr "rsh"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "ssh"
  msgstr "ssh"
  
  # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:175
+ #: sources.list.5.xml:191
  msgid ""
  "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
  "user and access the files. It is a good idea to do prior arrangements with "
@@@ -9637,12 -8179,12 +8189,12 @@@ msgstr "
  "します。"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:183
+ #: sources.list.5.xml:199
  msgid "more recognizable URI types"
  msgstr "さらに認識できる URI タイプ"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:185
+ #: sources.list.5.xml:201
  msgid ""
  "APT can be extended with more methods shipped in other optional packages "
  "which should follow the nameing scheme <literal>apt-transport-"
@@@ -9656,7 -8198,7 +8208,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:127
+ #: sources.list.5.xml:143
  msgid ""
  "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
  "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@@ -9666,7 -8208,7 +8218,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:199
+ #: sources.list.5.xml:215
  msgid ""
  "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
  "stable/main, stable/contrib, and stable/non-free."
@@@ -9675,38 -8217,61 +8227,61 @@@ msgstr "
  "free 用のローカル (または NFS) アーカイブを使用します。"
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:201
+ #: sources.list.5.xml:217
  #, no-wrap
  msgid "deb file:/home/jason/debian stable main contrib non-free"
  msgstr "deb file:/home/jason/debian stable main contrib non-free"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:203
+ #: sources.list.5.xml:219
  msgid "As above, except this uses the unstable (development) distribution."
  msgstr "上記同様ですが、不安定版 (開発版) を使用します。"
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:204
+ #: sources.list.5.xml:220
  #, no-wrap
  msgid "deb file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb file:/home/jason/debian unstable main contrib non-free"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:206
+ #: sources.list.5.xml:222
  msgid "Source line for the above"
  msgstr "上記のソース行"
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:207
+ #: sources.list.5.xml:223
  #, no-wrap
  msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
  
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:225
+ msgid ""
+ "The first line gets package information for the architectures in "
+ "<literal>APT::Architectures</literal> while the second always retrieves "
+ "<literal>amd64</literal> and <literal>armel</literal>."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><literallayout>
+ #: sources.list.5.xml:227
+ #, fuzzy, no-wrap
+ #| msgid ""
+ #| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+ #| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+ #| "   "
+ msgid ""
+ "deb http://ftp.debian.org/debian &stable-codename; main\n"
+ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ msgstr ""
+ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+ "   "
+ 
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:209
+ #: sources.list.5.xml:230
  msgid ""
  "Uses HTTP to access the archive at archive.debian.org, and uses only the "
  "hamm/main area."
@@@ -9716,14 -8281,14 +8291,14 @@@ msgstr "
  
  # type: <example></example>
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:211
+ #: sources.list.5.xml:232
  #, no-wrap
  msgid "deb http://archive.debian.org/debian-archive hamm main"
  msgstr "deb http://archive.debian.org/debian-archive hamm main"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:213
+ #: sources.list.5.xml:234
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the &stable-codename;/contrib area."
@@@ -9733,14 -8298,14 +8308,14 @@@ msgstr "
  
  # type: <example></example>
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:215
+ #: sources.list.5.xml:236
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:217
+ #: sources.list.5.xml:238
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the unstable/contrib area. If this line appears as "
@@@ -9754,13 -8319,13 +8329,13 @@@ msgstr "
  
  # type: <example></example>
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:221
+ #: sources.list.5.xml:242
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian unstable contrib"
  msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: sources.list.5.xml:230
+ #: sources.list.5.xml:251
  #, fuzzy, no-wrap
  #| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
  msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
@@@ -9768,7 -8333,7 +8343,7 @@@ msgstr "deb http://ftp.de.debian.org/de
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:223
+ #: sources.list.5.xml:244
  #, fuzzy
  #| msgid ""
  #| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@@ -9797,7 -8362,7 +8372,7 @@@ msgstr "
  
  # type: Content of: <refentry><refsect1><para>
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:235
+ #: sources.list.5.xml:256
  msgid "&apt-cache; &apt-conf;"
  msgstr "&apt-cache; &apt-conf;"
  
@@@ -9942,6 -8507,12 +8517,12 @@@ msgid "
  "packages for installation."
  msgstr ""
  
+ # type: Content of: <refentry><refnamediv><refname>
+ #. type: <heading></heading>
+ #: guide.sgml:96
+ msgid "apt-get"
+ msgstr "apt-get"
+ 
  #. type: <p></p>
  #: guide.sgml:102
  msgid ""
@@@ -9983,6 -8554,12 +8564,12 @@@ msgstr "
  msgid "Once updated there are several commands that can be used:"
  msgstr ""
  
+ # type: <tag></tag>
+ #. type: <tag></tag>
+ #: guide.sgml:121
+ msgid "upgrade"
+ msgstr "upgrade"
+ 
  #. type: <p></p>
  #: guide.sgml:131
  msgid ""
@@@ -9995,6 -8572,12 +8582,12 @@@
  "<tt>apt-get install</tt> can be used to force these packages to install."
  msgstr ""
  
+ # type: <tag></tag>
+ #. type: <tag></tag>
+ #: guide.sgml:131
+ msgid "install"
+ msgstr "install"
+ 
  #. type: <p></p>
  #: guide.sgml:140
  msgid ""
@@@ -10007,6 -8590,12 +8600,12 @@@
  "anything other than its arguments are changed."
  msgstr ""
  
+ # type: <tag></tag>
+ #. type: <tag></tag>
+ #: guide.sgml:140
+ msgid "dist-upgrade"
+ msgstr "dist-upgrade"
+ 
  #. type: <p></p>
  #: guide.sgml:149
  msgid ""
@@@ -10986,30 -9575,192 +9585,192 @@@ msgid "Which will use the already fetch
  msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。"
  
  #, fuzzy
- #~| msgid "<option>--recurse</option>"
- #~ msgid "<option>--host-architecture</option>"
- #~ msgstr "<option>--recurse</option>"
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>17 August 2009</date>"
+ #~ msgid "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 August 2009</date>"
+ 
+ #~ msgid "ORIGINAL AUTHORS"
+ #~ msgstr "原著者"
+ 
+ #~ msgid "&apt-author.jgunthorpe;"
+ #~ msgstr "&apt-author.jgunthorpe;"
+ 
+ #~ msgid "CURRENT AUTHORS"
+ #~ msgstr "現著者"
+ 
+ #~ msgid "&apt-author.team;"
+ #~ msgstr "&apt-author.team;"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>17 August 2009</date>"
+ #~ msgid "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 August 2009</date>"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+ #~| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
+ #~| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+ #~| "email; &apt-product; <date>16 January 2010</date>"
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+ #~ "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
+ #~ "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+ #~ "email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+ #~ "firstname> <surname>Burrows</surname> <contrib>Debug::*. の最初のドキュメ"
+ #~ "ント</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
+ #~ "&apt-product; <date>16 January 2010</date>"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
+ #~ msgid "&apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
+ 
+ #~ msgid ""
+ #~ "<!-- Boiler plate docinfo section -->\n"
+ #~ "<!ENTITY apt-docinfo \"\n"
+ #~ " <refentryinfo>\n"
+ #~ "   <address><email>apt@packages.debian.org</email></address>\n"
+ #~ "   <author>\n"
+ #~ "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+ #~ "     <contrib></contrib>\n"
+ #~ "   </author>\n"
+ #~ "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+ #~ "copyright>\n"
+ #~ "   <date>28 October 2008</date>\n"
+ #~ "   <productname>Linux</productname>\n"
+ #~ " </refentryinfo>\n"
+ #~ "\">\n"
+ #~ msgstr ""
+ #~ "<!-- Boiler plate docinfo section -->\n"
+ #~ "<!ENTITY apt-docinfo \"\n"
+ #~ " <refentryinfo>\n"
+ #~ "   <address><email>apt@packages.debian.org</email></address>\n"
+ #~ "   <author>\n"
+ #~ "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+ #~ "     <contrib></contrib>\n"
+ #~ "   </author>\n"
+ #~ "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+ #~ "copyright>\n"
+ #~ "   <date>28 October 2008</date>\n"
+ #~ "   <productname>Linux</productname>\n"
+ #~ " </refentryinfo>\n"
+ #~ "\">\n"
  
  #, fuzzy
- #~| msgid "Max-ValidTime"
- #~ msgid "Min-ValidTime"
- #~ msgstr "Max-ValidTime"
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>14 February 2004</date>"
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>2012-05-21T05:49:00+01:00</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>14 February 2004</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>14 February 2004</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>14 February 2004</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>29 February 2004</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>29 February 2004</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 August 2009</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 August 2009</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>08 November 2008</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>08 November 2008</date>"
  
  #, fuzzy
  #~| msgid ""
- #~| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
- #~| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
- #~| "   "
+ #~| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>9 August 2009</date>"
+ #~ msgid ""
+ #~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>21 April 2011</date>"
+ #~ msgstr ""
+ #~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+ #~ "August 2009</date>"
+ 
+ # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #~ msgid ""
+ #~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
+ #~ "get check</command>. It builds the source and package caches from the "
+ #~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</"
+ #~ "filename>."
+ #~ msgstr ""
+ #~ "<literal>gencaches</literal> は、<command>apt-get check</command> と同じ動"
+ #~ "作を提供します。これは &sources-list; 内の取得元と <filename>/var/lib/"
+ #~ "dpkg/status</filename>から、ソースとパッケージのキャッシュを構築します。"
+ 
+ # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #~ msgid ""
+ #~ "One setting is provided to control the pipeline depth in cases where the "
+ #~ "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
+ #~ "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
+ #~ "5 indicating how many outstanding requests APT should send. A value of "
+ #~ "zero MUST be specified if the remote host does not properly linger on TCP "
+ #~ "connections - otherwise data corruption will occur. Hosts which require "
+ #~ "this are in violation of RFC 2068."
+ #~ msgstr ""
+ #~ "リモートサーバが RFC 準拠でなかったり、(Squid 2.0.2 のように) バグがあった"
+ #~ "りしたときのために、パイプラインの深さの制御を設定します。"
+ #~ "<literal>Acquire::http::Pipeline-Depth</literal> により、APT が送信できる"
+ #~ "リクエストの回数を 0 から 5 の値で設定できます。リモートサーバが適切でな"
+ #~ "く、TCP 接続に時間がかかるときは、<emphasis>必ず</emphasis> 0 の値を設定し"
+ #~ "なければなりません。そうでなければデータが破損してしまいます。これが必要な"
+ #~ "ホストは RFC 2068 に違反しています。"
+ 
+ # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+ #~ msgid "add <replaceable>filename</replaceable>"
+ #~ msgstr "add <replaceable>filename</replaceable>"
+ 
+ # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+ #~ msgid "del <replaceable>keyid</replaceable>"
+ #~ msgstr "del <replaceable>keyid</replaceable>"
+ 
+ # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #~ msgid "export <replaceable>keyid</replaceable>"
+ #~ msgstr "export <replaceable>keyid</replaceable>"
+ 
+ # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #~ msgid ""
- #~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
- #~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ #~ "Update the local keyring with the keyring of Debian archive keys and "
+ #~ "removes from the keyring the archive keys which are no longer valid."
  #~ msgstr ""
- #~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
- #~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
- #~ "   "
+ #~ "Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーを"
+ #~ "キーリングから削除します。"
  
- #~ msgid "<option>--md5</option>"
- #~ msgstr "<option>--md5</option>"
+ # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+ #~ msgid "--keyring <replaceable>filename</replaceable>"
+ #~ msgstr "--keyring <replaceable>filename</replaceable>"
  
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #~ msgid ""
@@@ -11021,25 -9772,10 +9782,10 @@@
  #~ "ンデックスファイルに MD5Sum フィールドがありません。設定項目 - "
  #~ "<literal>APT::FTPArchive::MD5</literal>"
  
- #~ msgid "unmarkauto"
- #~ msgstr "unmarkauto"
- 
- #~ msgid "<option>-h</option>"
- #~ msgstr "<option>-h</option>"
- 
- #~ msgid "<option>--help</option>"
- #~ msgstr "<option>--help</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #~ msgid "Show a short usage summary."
  #~ msgstr "短い使用方法を表示します。"
  
- #~ msgid "<option>-v</option>"
- #~ msgstr "<option>-v</option>"
- 
- #~ msgid "<option>--version</option>"
- #~ msgstr "<option>--version</option>"
- 
  # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #~ msgid "Show the program version."
  #~ msgstr "プログラムのバージョン情報を表示します"
@@@ -11078,9 -9814,6 +9824,6 @@@
  #~ "たファイルを再帰検索します。その後、ファイルごとの MD5 ダイジェストと "
  #~ "SHA1 ダイジェストを含んだ Release ファイルを、標準出力に書き出します。"
  
- #~ msgid "<option>--install-recommends</option>"
- #~ msgstr "<option>--install-recommends</option>"
- 
  #~ msgid "Also install recommended packages."
  #~ msgstr "「推奨」パッケージもインストールします。"
  
diff --combined doc/po/pl.po
index 41eb56684,b5c10af16..f30f24e23
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@@ -10,7 -10,7 +10,8 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: apt 0.7.25.3\n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
 -"POT-Creation-Date: 2012-05-21 13:35+0300\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:47+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"
@@@ -148,44 -148,7 +149,7 @@@ msgstr "
  "apt zostało napisane przez zespół APT E<lt>apt@packages.debian.orgE<gt>."
  
  #. type: Plain text
- #: apt.ent:2
- msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
- msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
- 
- #. type: Plain text
- #: apt.ent:16
- #, no-wrap
- msgid ""
- "<!-- Boiler plate docinfo section -->\n"
- "<!ENTITY apt-docinfo \"\n"
- " <refentryinfo>\n"
- "   <address><email>apt@packages.debian.org</email></address>\n"
- "   <author>\n"
- "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
- "     <contrib></contrib>\n"
- "   </author>\n"
- "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
- "   <date>28 October 2008</date>\n"
- "   <productname>Linux</productname>\n"
- " </refentryinfo>\n"
- "\">\n"
- msgstr ""
- "<!-- Boiler plate docinfo section -->\n"
- "<!ENTITY apt-docinfo \"\n"
- " <refentryinfo>\n"
- "   <address><email>apt@packages.debian.org</email></address>\n"
- "   <author>\n"
- "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
- "     <contrib></contrib>\n"
- "   </author>\n"
- "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
- "   <date>28 października 2008</date>\n"
- "   <productname>Linux</productname>\n"
- " </refentryinfo>\n"
- "\">\n"
- 
- #. type: Plain text
- #: apt.ent:23
+ #: apt.ent:7
  #, no-wrap
  msgid ""
  "<!ENTITY apt-author.team \"\n"
@@@ -203,7 -166,7 +167,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:29
+ #: apt.ent:13
  #, no-wrap
  msgid ""
  "<!ENTITY apt-qapage \"\n"
@@@ -220,7 -183,7 +184,7 @@@ msgstr "
  
  #
  #. type: Plain text
- #: apt.ent:40
+ #: apt.ent:24
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Bug reporting section -->\n"
@@@ -246,7 -209,7 +210,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:48
+ #: apt.ent:32
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Author section -->\n"
@@@ -266,7 -229,7 +230,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:58
+ #: apt.ent:42
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -290,7 -253,7 +254,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:66
+ #: apt.ent:50
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -311,7 -274,7 +275,7 @@@ msgstr "
  
  #
  #. type: Plain text
- #: apt.ent:78
+ #: apt.ent:62
  #, fuzzy, no-wrap
  #| msgid ""
  #| "     <varlistentry>\n"
@@@ -347,7 -310,7 +311,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:90
+ #: apt.ent:74
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -376,7 -339,7 +340,7 @@@ msgstr "
  
  #
  #. type: Plain text
- #: apt.ent:101
+ #: apt.ent:85
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -402,7 -365,7 +366,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:107
+ #: apt.ent:91
  #, no-wrap
  msgid ""
  "<!ENTITY file-aptconf \"\n"
@@@ -418,7 -381,7 +382,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:113
+ #: apt.ent:97
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@@ -434,7 -397,7 +398,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:119
+ #: apt.ent:103
  #, no-wrap
  msgid ""
  "<!ENTITY file-cachearchives \"\n"
@@@ -450,12 -413,18 +414,18 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:125
- #, no-wrap
+ #: apt.ent:109
+ #, fuzzy, no-wrap
+ #| msgid ""
+ #| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+ #| "     <listitem><para>Storage area for package files in transit.\n"
+ #| "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+ #| "     </varlistentry>\n"
+ #| "\">\n"
  msgid ""
  "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
  "     <listitem><para>Storage area for package files in transit.\n"
- "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
@@@ -467,7 -436,7 +437,7 @@@
  
  #
  #. type: Plain text
- #: apt.ent:135
+ #: apt.ent:119
  #, no-wrap
  msgid ""
  "<!ENTITY file-preferences \"\n"
@@@ -491,7 -460,7 +461,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:141
+ #: apt.ent:125
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@@ -507,7 -476,7 +477,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:147
+ #: apt.ent:131
  #, no-wrap
  msgid ""
  "<!ENTITY file-sourceslist \"\n"
@@@ -523,7 -492,7 +493,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:153
+ #: apt.ent:137
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@@ -539,7 -508,7 +509,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:160
+ #: apt.ent:144
  #, no-wrap
  msgid ""
  "<!ENTITY file-statelists \"\n"
@@@ -557,12 -526,18 +527,18 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:166
- #, no-wrap
+ #: apt.ent:150
+ #, fuzzy, no-wrap
+ #| msgid ""
+ #| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+ #| "     <listitem><para>Storage area for state information in transit.\n"
+ #| "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+ #| "     </varlistentry>\n"
+ #| "\">\n"
  msgid ""
  "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
  "     <listitem><para>Storage area for state information in transit.\n"
- "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
@@@ -573,7 -548,7 +549,7 @@@
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:172
+ #: apt.ent:156
  #, no-wrap
  msgid ""
  "<!ENTITY file-trustedgpg \"\n"
@@@ -589,7 -564,7 +565,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:179
+ #: apt.ent:163
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@@ -607,7 -582,7 +583,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:187
+ #: apt.ent:171
  #, fuzzy, no-wrap
  #| msgid ""
  #| "<!ENTITY file-sourceslist \"\n"
@@@ -631,7 -606,7 +607,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:191
+ #: apt.ent:175
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@@ -640,7 -615,7 +616,7 @@@
  msgstr "<!ENTITY translation-title \"TŁUMACZENIE\">\n"
  
  #. type: Plain text
- #: apt.ent:200
+ #: apt.ent:184
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@@ -658,7 -633,7 +634,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:210
+ #: apt.ent:195
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@@ -678,36 -653,133 +654,133 @@@ msgstr "
  "     oryginał zostanie zaktualizowany, a tłumaczenie - nie.\n"
  "\">\n"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cache.8.xml:16
- #, fuzzy
- #| msgid ""
- #| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
- #| "<date>14 February 2004</date>"
+ #. type: Plain text
+ #: apt.ent:198
+ msgid ""
+ "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+ "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:201
+ msgid ""
+ "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+ "synopsis-config-file \"config_file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:204
+ msgid ""
+ "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+ "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+ "\"target_release\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:207
+ msgid ""
+ "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+ "synopsis-architecture \"architecture\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:210
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+ "--> <!ENTITY synopsis-pkg \"pkg\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:213
+ msgid ""
+ "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+ "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:216
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+ "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:219
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+ "awesome --> <!ENTITY synopsis-regex \"regex\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:222
  msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
- "February 2011</date>"
+ "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+ "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
  msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product;          "
- "<date>14 lutego 2004</date>"
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cache.8.xml:25 apt-cache.8.xml:32
- msgid "apt-cache"
- msgstr "apt-cache"
+ #. type: Plain text
+ #: apt.ent:225
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+ "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+ "\"temporary_directory\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:228
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+ "synopsis-filename \"filename\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:231
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:234
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-override "
+ "\"override-file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:237
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+ "\"pathprefix\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:240
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "generate section --> <!ENTITY synopsis-section \"section\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:243
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+ msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26
- #: apt-key.8.xml:18 apt-mark.8.xml:26 apt-secure.8.xml:18
+ #: apt-key.8.xml:25 apt-mark.8.xml:26 apt-secure.8.xml:25
  msgid "8"
  msgstr "8"
  
  #. type: Content of: <refentry><refmeta><refmiscinfo>
  #: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27
  #: apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27
- #: apt-key.8.xml:19 apt-mark.8.xml:27 apt-secure.8.xml:19
- #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:33 apt_preferences.5.xml:26
+ #: apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26
+ #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:32 apt_preferences.5.xml:26
  #: sources.list.5.xml:27
  msgid "APT"
  msgstr "APT"
@@@ -717,86 -789,18 +790,18 @@@
  msgid "query the APT cache"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cache.8.xml:39
- #, fuzzy
- #| msgid ""
- #| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
- #| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- #| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
- #| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
- #| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- #| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
- #| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
- #| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
- #| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- #| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- #| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
- #| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
- #| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
- #| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- #| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
- #| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
- #| "group>"
- msgid ""
- "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
- "<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
- "arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
- "arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
- "arg> </group>"
- msgstr ""
- "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
- "o=<replaceable>opcja_konfiguracji</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>plik</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>add <arg choice=\"plain\" rep=\"repeat\"><replaceable>plik</"
- "replaceable></arg></arg> <arg>gencaches</arg> <arg>showpkg <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg></arg> "
- "<arg>showsrc <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</"
- "replaceable></arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</"
- "arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
- "\"><replaceable>wyrażenie-regularne</replaceable></arg></arg> <arg>show <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg></"
- "arg> <arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</"
- "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pakiet</replaceable></arg></arg> <arg>pkgnames <arg choice="
- "\"plain\"><replaceable>prefiks</replaceable></arg></arg> <arg>dotty <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg></"
- "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</"
- "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pakiety</replaceable></arg></arg> <arg>madison <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pakiety</replaceable></arg></arg> </"
- "group>"
- 
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
- #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
- #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
- #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+ #: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+ #: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+ #: apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50
+ #: apt-sortpkgs.1.xml:38 apt.conf.5.xml:41 apt_preferences.5.xml:36
  #: sources.list.5.xml:36
  msgid "Description"
  msgstr "Opis"
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:65
+ #: apt-cache.8.xml:39
  msgid ""
  "<command>apt-cache</command> performs a variety of operations on APT's "
  "package cache. <command>apt-cache</command> does not manipulate the state of "
@@@ -810,7 -814,7 +815,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:70 apt-get.8.xml:120
+ #: apt-cache.8.xml:44 apt-get.8.xml:44
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given, "
  "one of the commands below must be present."
@@@ -818,32 -822,23 +823,23 @@@ msgstr "
  "Jedno z poniższych poleceń musi być użyte, chyba że została podana opcja "
  "<option>-h</option> albo <option>--help</option>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:74
- msgid "gencaches"
- msgstr "gencaches"
- 
- #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:75
+ #: apt-cache.8.xml:49
  msgid ""
- "<literal>gencaches</literal> performs the same operation as <command>apt-get "
- "check</command>. It builds the source and package caches from the sources in "
- "&sources-list; and from <filename>/var/lib/dpkg/status</filename>."
+ "<literal>gencaches</literal> creates APT's package cache. This is done "
+ "implicitly by all commands needing this cache if it is missing or outdated."
  msgstr ""
- "<literal>gencaches</literal> wykonuje te same operacje, co <command>apt-get "
- "check</command>. Buduje bufor pakietów oraz źródeł pakietów na podstawie "
- "źródeł wymienionych w &sources-list; oraz pliku <filename>/var/lib/dpkg/"
- "status</filename>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:81
- msgid "showpkg <replaceable>pkg(s)</replaceable>"
- msgstr "showpkg <replaceable>pakiet(y)</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+ #: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
+ #: apt-cache.8.xml:226 apt-cache.8.xml:238
+ msgid "&synopsis-pkg;"
+ msgstr ""
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:82
+ #: apt-cache.8.xml:54
  msgid ""
  "<literal>showpkg</literal> displays information about the packages listed on "
  "the command line. Remaining arguments are package names. The available "
@@@ -866,7 -861,7 +862,7 @@@ msgstr "
  "poniższego:"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-cache.8.xml:94
+ #: apt-cache.8.xml:66
  #, no-wrap
  msgid ""
  "Package: libreadline2\n"
@@@ -893,7 -888,7 +889,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:106
+ #: apt-cache.8.xml:78
  msgid ""
  "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
  "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@@ -911,14 -906,9 +907,9 @@@ msgstr "
  "zainstalowane. W celu zrozumienia, co oznaczają pozostałe linie, najlepiej "
  "przejrzeć kod źródłowy programu apt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:115
- msgid "stats"
- msgstr "stats"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:115
+ #: apt-cache.8.xml:87
  msgid ""
  "<literal>stats</literal> displays some statistics about the cache.  No "
  "further arguments are expected. Statistics reported are:"
@@@ -928,7 -918,7 +919,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:118
+ #: apt-cache.8.xml:90
  msgid ""
  "<literal>Total package names</literal> is the number of package names found "
  "in the cache."
@@@ -938,7 -928,7 +929,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:122
+ #: apt-cache.8.xml:94
  msgid ""
  "<literal>Normal packages</literal> is the number of regular, ordinary "
  "package names; these are packages that bear a one-to-one correspondence "
@@@ -952,7 -942,7 +943,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:128
+ #: apt-cache.8.xml:100
  msgid ""
  "<literal>Pure virtual packages</literal> is the number of packages that "
  "exist only as a virtual package name; that is, packages only \"provide\" the "
@@@ -970,7 -960,7 +961,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:136
+ #: apt-cache.8.xml:108
  msgid ""
  "<literal>Single virtual packages</literal> is the number of packages with "
  "only one package providing a particular virtual package. For example, in the "
@@@ -985,7 -975,7 +976,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:142
+ #: apt-cache.8.xml:114
  msgid ""
  "<literal>Mixed virtual packages</literal> is the number of packages that "
  "either provide a particular virtual package or have the virtual package name "
@@@ -1000,7 -990,7 +991,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:149
+ #: apt-cache.8.xml:121
  msgid ""
  "<literal>Missing</literal> is the number of package names that were "
  "referenced in a dependency but were not provided by any package. Missing "
@@@ -1017,7 -1007,7 +1008,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:156
+ #: apt-cache.8.xml:128
  msgid ""
  "<literal>Total distinct</literal> versions is the number of package versions "
  "found in the cache; this value is therefore at least equal to the number of "
@@@ -1034,7 -1024,7 +1025,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:163
+ #: apt-cache.8.xml:135
  msgid ""
  "<literal>Total dependencies</literal> is the number of dependency "
  "relationships claimed by all of the packages in the cache."
@@@ -1042,14 -1032,9 +1033,9 @@@ msgstr "
  "<literal>Całkowite zależności (Total dependencies)</literal> to liczba "
  "więzów zależności wymaganych przez wszystkie pakiety w buforze."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:170
- msgid "showsrc <replaceable>pkg(s)</replaceable>"
- msgstr "showsrc <replaceable>pakiet(y)</replaceable>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:171
+ #: apt-cache.8.xml:143
  msgid ""
  "<literal>showsrc</literal> displays all the source package records that "
  "match the given package names. All versions are shown, as well as all "
@@@ -1059,14 -1044,9 +1045,9 @@@ msgstr "
  "odpowiadają podanym nazwom pakietów. Wyświetlone zostaną wszystkie wersje "
  "tych pakietów oraz pakiety binarne, które są z tych pakietów budowane."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:176 apt-config.8.xml:87
- msgid "dump"
- msgstr "dump"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:177
+ #: apt-cache.8.xml:149
  msgid ""
  "<literal>dump</literal> shows a short listing of every package in the cache. "
  "It is primarily for debugging."
@@@ -1074,14 -1054,9 +1055,9 @@@ msgstr "
  "<literal>dump</literal> pokazuje krótką listę wszystkich pakietów w buforze. "
  "Jest używany głównie w celu odpluskwiania."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:181
- msgid "dumpavail"
- msgstr "dumpavail"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:182
+ #: apt-cache.8.xml:154
  msgid ""
  "<literal>dumpavail</literal> prints out an available list to stdout. This is "
  "suitable for use with &dpkg; and is used by the &dselect; method."
@@@ -1090,14 -1065,9 +1066,9 @@@ msgstr "
  "dostępnych pakietów. Jest to polecenie odpowiednie do użycia z programem "
  "&dpkg;  i jest używane w metodzie &dselect; tego programu."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:186
- msgid "unmet"
- msgstr "unmet"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:187
+ #: apt-cache.8.xml:159
  msgid ""
  "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
  "package cache."
@@@ -1105,14 -1075,9 +1076,9 @@@ msgstr "
  "<literal>unmet</literal> pokazuje podsumowanie wszystkich niespełnionych "
  "zależności w buforze pakietów"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:191
- msgid "show <replaceable>pkg(s)</replaceable>"
- msgstr "show <replaceable>pakiet(y)</replaceable>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:192
+ #: apt-cache.8.xml:164
  msgid ""
  "<literal>show</literal> performs a function similar to <command>dpkg --print-"
  "avail</command>; it displays the package records for the named packages."
@@@ -1120,16 -1085,14 +1086,14 @@@ msgstr "
  "<literal>show</literal>  spełnia funkcje podobne do <command>dpkg --print-"
  "avail</command>; pokazuje szczegółowe informacje o podanych pakietach."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:197
- msgid "search <replaceable>regex [ regex ... ]</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:169
+ msgid "&synopsis-regex;"
  msgstr ""
- "search <replaceable>wyrażenie regularne [ wyrażenie regularne ... ]</"
- "replaceable>"
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:198
+ #: apt-cache.8.xml:170
  msgid ""
  "<literal>search</literal> performs a full text search on all available "
  "package lists for the POSIX regex pattern given, see "
@@@ -1156,7 -1119,7 +1120,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:211
+ #: apt-cache.8.xml:183
  msgid ""
  "Separate arguments can be used to specify multiple search patterns that are "
  "and'ed together."
@@@ -1164,14 -1127,9 +1128,9 @@@ msgstr "
  "Oddzielne argumenty mogą być używane do podania kilku wzorców, które będą "
  "traktowane jakby były połączone spójnikiem logicznym \"i\"."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:215
- msgid "depends <replaceable>pkg(s)</replaceable>"
- msgstr "depends <replaceable>pakiet(y)</replaceable>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:216
+ #: apt-cache.8.xml:188
  msgid ""
  "<literal>depends</literal> shows a listing of each dependency a package has "
  "and all the possible other packages that can fulfill that dependency."
@@@ -1179,14 -1137,9 +1138,9 @@@ msgstr "
  "<literal>depends</literal> wyświetla listę wszystkich zależności danego "
  "pakietu i wszystkie możliwe pakiety, które mogą spełnić te zależności."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:220
- msgid "rdepends <replaceable>pkg(s)</replaceable>"
- msgstr "rdepends <replaceable>pakiet(y)</replaceable>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:221
+ #: apt-cache.8.xml:193
  msgid ""
  "<literal>rdepends</literal> shows a listing of each reverse dependency a "
  "package has."
@@@ -1195,13 -1148,15 +1149,15 @@@ msgstr "
  "danego pakietu."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:225
- msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+ #: apt-cache.8.xml:197
+ #, fuzzy
+ #| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+ msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
  msgstr "pkgnames <replaceable>[ prefiks ]</replaceable>"
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:226
+ #: apt-cache.8.xml:198
  msgid ""
  "This command prints the name of each package APT knows. The optional "
  "argument is a prefix match to filter the name list. The output is suitable "
@@@ -1216,7 -1171,7 +1172,7 @@@ msgstr "
  "używać z opcją <option>--generate</option>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:231
+ #: apt-cache.8.xml:203
  msgid ""
  "Note that a package which APT knows of is not necessarily available to "
  "download, installable or installed, e.g. virtual packages are also listed in "
@@@ -1227,14 -1182,9 +1183,9 @@@ msgstr "
  "Może być np. pakietem wirtualnym, które także są wypisane w wygenerowanej "
  "liście."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:236
- msgid "dotty <replaceable>pkg(s)</replaceable>"
- msgstr "dotty <replaceable>pakiet(y)</replaceable>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:237
+ #: apt-cache.8.xml:209
  msgid ""
  "<literal>dotty</literal> takes a list of packages on the command line and "
  "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@@ -1256,7 -1206,7 +1207,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:246
+ #: apt-cache.8.xml:218
  msgid ""
  "The resulting nodes will have several shapes; normal packages are boxes, "
  "pure provides are triangles, mixed provides are diamonds, missing packages "
@@@ -1271,17 -1221,12 +1222,12 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:251
+ #: apt-cache.8.xml:223
  msgid "Caution, dotty cannot graph larger sets of packages."
  msgstr "Uwaga: dotty nie potrafi narysować większego zbioru pakietów."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:254
- msgid "xvcg <replaceable>pkg(s)</replaceable>"
- msgstr "xvcg <replaceable>pakiet(y)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:255
+ #: apt-cache.8.xml:227
  msgid ""
  "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
  "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@@ -1291,13 -1236,15 +1237,15 @@@ msgstr "
  "ulink>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:259
- msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
- msgstr "policy <replaceable>[ pakiet(y) ]</replaceable>"
+ #: apt-cache.8.xml:231
+ #, fuzzy
+ #| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
+ msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
+ msgstr "madison <replaceable>[ pakiet(y) ]</replaceable>"
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:260
+ #: apt-cache.8.xml:232
  msgid ""
  "<literal>policy</literal> is meant to help debug issues relating to the "
  "preferences file. With no arguments it will print out the priorities of each "
@@@ -1309,14 -1256,9 +1257,9 @@@ msgstr "
  "zostaną informacje o priorytecie każdego źródła. W przeciwnym wypadku, "
  "wypisuje szczegółowe informacje o priorytecie danego pakietu."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:266
- msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
- msgstr "madison <replaceable>[ pakiet(y) ]</replaceable>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:267
+ #: apt-cache.8.xml:239
  msgid ""
  "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
  "to mimic the output format and a subset of the functionality of the Debian "
@@@ -1333,26 -1275,16 +1276,16 @@@ msgstr "
  "informacje tylko dla tych architektur, dla których APT pobrało listy "
  "pakietów (<literal>APT::Architecture</literal>)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
- #: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
- #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+ #. type: Content of: <refentry><refsect1><title>
+ #: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+ #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+ #: apt-sortpkgs.1.xml:48
  msgid "options"
  msgstr "opcje"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>-p</option>"
- msgstr "<option>-p</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>--pkg-cache</option>"
- msgstr "<option>--pkg-cache</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:283
+ #: apt-cache.8.xml:255
  msgid ""
  "Select the file to store the package cache. The package cache is the primary "
  "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@@ -1362,20 -1294,9 +1295,9 @@@ msgstr "
  "buforem używanym we wszystkich operacjach.  Pozycja w pliku konfiguracyjnym: "
  "<literal>Dir::Cache::pkgcache</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:288
- msgid "<option>--src-cache</option>"
- msgstr "<option>--src-cache</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:289
+ #: apt-cache.8.xml:261
  msgid ""
  "Select the file to store the source cache. The source is used only by "
  "<literal>gencaches</literal> and it stores a parsed version of the package "
@@@ -1390,19 -1311,9 +1312,9 @@@ msgstr "
  "wszystkich plików pakietów.  Pozycja w pliku konfiguracyjnym: <literal>Dir::"
  "Cache::srcpkgcache</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:545 apt-get.8.xml:383
- msgid "<option>--quiet</option>"
- msgstr "<option>--quiet</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:297
+ #: apt-cache.8.xml:269
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quietness up to a maximum of 2. You can also use "
@@@ -1415,19 -1326,9 +1327,9 @@@ msgstr "
  "option>,nadpisując tym samym opcję z pliku konfiguracyjnego.  Pozycja w "
  "pliku konfiguracyjnym: <literal>quiet</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>-i</option>"
- msgstr "<option>-i</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>--important</option>"
- msgstr "<option>--important</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:304
+ #: apt-cache.8.xml:276
  msgid ""
  "Print only important dependencies; for use with unmet and depends. Causes "
  "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@@ -1437,65 -1338,9 +1339,9 @@@ msgstr "
  "wypisanie tylko zależności typu Depends i Pre-Depends.  Pozycja w pliku "
  "konfiguracyjnym: <literal>APT::Cache::Important</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:309
- #, fuzzy
- #| msgid "<option>--no-upgrade</option>"
- msgid "<option>--no-pre-depends</option>"
- msgstr "<option>--no-upgrade</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:310
- #, fuzzy
- #| msgid "<option>--no-download</option>"
- msgid "<option>--no-depends</option>"
- msgstr "<option>--no-download</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:311
- #, fuzzy
- #| msgid "<option>--install-recommends</option>"
- msgid "<option>--no-recommends</option>"
- msgstr "<option>--install-recommends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:312
- #, fuzzy
- #| msgid "<option>--no-upgrade</option>"
- msgid "<option>--no-suggests</option>"
- msgstr "<option>--no-upgrade</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:313
- #, fuzzy
- #| msgid "<option>--no-mount</option>"
- msgid "<option>--no-conflicts</option>"
- msgstr "<option>--no-mount</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:314
- #, fuzzy
- #| msgid "<option>--no-act</option>"
- msgid "<option>--no-breaks</option>"
- msgstr "<option>--no-act</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:315
- #, fuzzy
- #| msgid "<option>--no-act</option>"
- msgid "<option>--no-replaces</option>"
- msgstr "<option>--no-act</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:316
- #, fuzzy
- #| msgid "<option>--no-act</option>"
- msgid "<option>--no-enhances</option>"
- msgstr "<option>--no-act</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:317
+ #: apt-cache.8.xml:289
  #, fuzzy
  #| msgid ""
  #| "Make <literal>depends</literal> and <literal>rdepends</literal> recursive "
@@@ -1503,7 -1348,7 +1349,7 @@@
  #| "<literal>APT::Cache::RecurseDepends</literal>."
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
- "print all dependencies. This can be twicked with these flags which will omit "
+ "print all dependencies. This can be tweaked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
@@@ -1513,19 -1358,9 +1359,9 @@@ msgstr "
  "wszystkie wymienione pakiety zostaną wypisane tylko raz. Pozycja w pliku "
  "konfiguracyjnym: <literal>APT::Cache::RecurseDepends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
- msgid "<option>-f</option>"
- msgstr "<option>-f</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323
- msgid "<option>--full</option>"
- msgstr "<option>--full</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:324
+ #: apt-cache.8.xml:296
  msgid ""
  "Print full package records when searching.  Configuration Item: "
  "<literal>APT::Cache::ShowFull</literal>."
@@@ -1533,19 -1368,9 +1369,9 @@@ msgstr "
  "Podczas szukania wypisuj pełną informację o pakiecie. Pozycja w pliku "
  "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:583
- msgid "<option>-a</option>"
- msgstr "<option>-a</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:328
- msgid "<option>--all-versions</option>"
- msgstr "<option>--all-versions</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:329
+ #: apt-cache.8.xml:301
  msgid ""
  "Print full records for all available versions. This is the default; to turn "
  "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@@ -1562,19 -1387,9 +1388,9 @@@ msgstr "
  "literal>.  Pozycja w pliku konfiguracyjnym: <literal>APT::Cache::"
  "AllVersions</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>-g</option>"
- msgstr "<option>-g</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>--generate</option>"
- msgstr "<option>--generate</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:338
+ #: apt-cache.8.xml:310
  msgid ""
  "Perform automatic package cache regeneration, rather than use the cache as "
  "it is. This is the default; to turn it off, use <option>--no-generate</"
@@@ -1585,19 -1400,9 +1401,9 @@@ msgstr "
  "<option>--no-generate</option>. Pozycja w pliku konfiguracyjnym: "
  "<literal>APT::Cache::Generate</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343
- msgid "<option>--names-only</option>"
- msgstr "<option>--names-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343 apt-cdrom.8.xml:142
- msgid "<option>-n</option>"
- msgstr "<option>-n</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:344
+ #: apt-cache.8.xml:316
  msgid ""
  "Only search on the package names, not the long descriptions.  Configuration "
  "Item: <literal>APT::Cache::NamesOnly</literal>."
@@@ -1605,14 -1410,9 +1411,9 @@@ msgstr "
  "Przeszukaj tylko nazwy pakietów, pomijając szczegółowe opisy.  Pozycja w "
  "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:348
- msgid "<option>--all-names</option>"
- msgstr "<option>--all-names</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:349
+ #: apt-cache.8.xml:321
  msgid ""
  "Make <literal>pkgnames</literal> print all names, including virtual packages "
  "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@@ -1623,14 -1423,9 +1424,9 @@@ msgstr "
  "zależności.  Pozycja w pliku konfiguracyjnym: <literal>APT::Cache::AllNames</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:354
- msgid "<option>--recurse</option>"
- msgstr "<option>--recurse</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:355
+ #: apt-cache.8.xml:327
  msgid ""
  "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
  "that all packages mentioned are printed once.  Configuration Item: "
@@@ -1641,14 -1436,9 +1437,9 @@@ msgstr "
  "wszystkie wymienione pakiety zostaną wypisane tylko raz. Pozycja w pliku "
  "konfiguracyjnym: <literal>APT::Cache::RecurseDepends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:360
- msgid "<option>--installed</option>"
- msgstr "<option>--installed</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:362
+ #: apt-cache.8.xml:334
  msgid ""
  "Limit the output of <literal>depends</literal> and <literal>rdepends</"
  "literal> to packages which are currently installed.  Configuration Item: "
@@@ -1659,48 -1449,48 +1450,48 @@@ msgstr "
  "konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
- #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
- #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+ #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
+ #: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+ #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
  msgid "&apt-commonoptions;"
  msgstr "&apt-commonoptions;"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
- #: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+ #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+ #: apt.conf.5.xml:1118 apt_preferences.5.xml:698
  msgid "Files"
  msgstr "Pliki"
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:374
+ #: apt-cache.8.xml:346
  msgid "&file-sourceslist; &file-statelists;"
  msgstr "&file-sourceslist; &file-statelists;"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
- #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
- #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
- #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
- #: sources.list.5.xml:234
+ #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+ #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+ #: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+ #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
+ #: sources.list.5.xml:255
  msgid "See Also"
  msgstr "Zobacz także"
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:380
+ #: apt-cache.8.xml:352
  msgid "&apt-conf;, &sources-list;, &apt-get;"
  msgstr "&apt-conf;, &sources-list;, &apt-get;"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
- #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
- #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+ #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+ #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+ #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
  msgid "Diagnostics"
  msgstr "Diagnostyka"
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:385
+ #: apt-cache.8.xml:357
  msgid ""
  "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -1708,44 -1498,15 +1499,15 @@@ msgstr "
  "<command>apt-cache</command> zwraca zero, gdy zakończyło się pomyślnie, 100 "
  "- w przypadku błędu."
  
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cdrom.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "February 2004</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product;          "
- "<date>14 lutego 2004</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cdrom.8.xml:24 apt-cdrom.8.xml:31
- msgid "apt-cdrom"
- msgstr "apt-cdrom"
- 
  #
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-cdrom.8.xml:32
  msgid "APT CDROM management utility"
  msgstr "Narzędzie APT do zarządzania źródłami typu CDROM"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cdrom.8.xml:38
- msgid ""
- "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
- "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
- "<arg>add</arg> <arg>ident</arg> </group>"
- msgstr ""
- "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
- "<arg><option>-d=<replaceable>punkt montowania CD-ROM-u</replaceable></"
- "option></arg> <arg><option>-o=<replaceable>opcja konfiguracji</replaceable></"
- "option></arg> <arg><option>-c=<replaceable>plik</replaceable></option></arg> "
- "<group> <arg>add</arg> <arg>identyfikator</arg> </group>"
- 
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:51
+ #: apt-cdrom.8.xml:38
  msgid ""
  "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
  "available sources. <command>apt-cdrom</command> takes care of determining "
@@@ -1759,7 -1520,7 +1521,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:58
+ #: apt-cdrom.8.xml:45
  msgid ""
  "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
  "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@@ -1769,14 -1530,9 +1531,9 @@@ msgstr "
  "używanie <command>apt-cdrom</command> jest konieczne. Co więcej, każdy dysk "
  "w wielodyskowym archiwum musi być włożony i zeskanowany oddzielnie."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:68
- msgid "add"
- msgstr "add"
- 
  #
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:69
+ #: apt-cdrom.8.xml:56
  #, fuzzy
  #| msgid ""
  #| "<literal>add</literal> is used to add a new disc to the source list. It "
@@@ -1799,7 -1555,7 +1556,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:77
+ #: apt-cdrom.8.xml:64
  msgid ""
  "APT uses a CDROM ID to track which disc is currently in the drive and "
  "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@@ -1809,14 -1565,9 +1566,9 @@@ msgstr "
  "się w napędzie, oraz przechowuje bazę tych identyfikatorów w pliku "
  "<filename>&statedir;/cdroms.list</filename>"
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:84
- msgid "ident"
- msgstr "ident"
- 
  #
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:85
+ #: apt-cdrom.8.xml:72
  msgid ""
  "A debugging tool to report the identity of the current disc as well as the "
  "stored file name"
@@@ -1826,7 -1577,7 +1578,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:64
+ #: apt-cdrom.8.xml:51
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present.  <placeholder type=\"variablelist"
@@@ -1837,23 -1588,13 +1589,13 @@@ msgstr "
  "\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cdrom.8.xml:94 apt-key.8.xml:158
+ #: apt-cdrom.8.xml:81 apt-key.8.xml:160
  msgid "Options"
  msgstr "Opcje"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
- msgid "<option>-d</option>"
- msgstr "<option>-d</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98
- msgid "<option>--cdrom</option>"
- msgstr "<option>--cdrom</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:99
+ #: apt-cdrom.8.xml:86
  msgid ""
  "Mount point; specify the location to mount the cdrom. This mount point must "
  "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@@ -1864,19 -1605,9 +1606,9 @@@ msgstr "
  "pliku <filename>/etc/fstab</filename>. Pozycja w pliku konfiguracyjnym: "
  "<literal>Acquire::cdrom::mount</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>-r</option>"
- msgstr "<option>-r</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>--rename</option>"
- msgstr "<option>--rename</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:108
+ #: apt-cdrom.8.xml:95
  msgid ""
  "Rename a disc; change the label of a disk or override the disks given label. "
  "This option will cause <command>apt-cdrom</command> to prompt for a new "
@@@ -1887,19 -1618,9 +1619,9 @@@ msgstr "
  "spyta się o nową etykietę.  Pozycja w pliku konfiguracyjnym: <literal>APT::"
  "CDROM::Rename</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116 apt-get.8.xml:364
- msgid "<option>-m</option>"
- msgstr "<option>-m</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116
- msgid "<option>--no-mount</option>"
- msgstr "<option>--no-mount</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:117
+ #: apt-cdrom.8.xml:104
  msgid ""
  "No mounting; prevent <command>apt-cdrom</command> from mounting and "
  "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@@ -1909,14 -1630,9 +1631,9 @@@ msgstr "
  "i odmontowywanie CDROM-u.  Pozycja w pliku konfiguracyjnym: <literal>APT::"
  "CDROM::NoMount</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:124
- msgid "<option>--fast</option>"
- msgstr "<option>--fast</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:125
+ #: apt-cdrom.8.xml:112
  msgid ""
  "Fast Copy; Assume the package files are valid and do not check every "
  "package. This option should be used only if <command>apt-cdrom</command> has "
@@@ -1929,14 -1645,9 +1646,9 @@@ msgstr "
  "na nim żadnych błędów.  Pozycja w pliku konfiguracyjnym: <literal>APT::"
  "CDROM::Fast</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:134
- msgid "<option>--thorough</option>"
- msgstr "<option>--thorough</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:135
+ #: apt-cdrom.8.xml:122
  msgid ""
  "Thorough Package Scan; This option may be needed with some old Debian "
  "1.1/1.2 discs that have Package files in strange places. It takes much "
@@@ -1947,24 -1658,9 +1659,9 @@@ msgstr "
  "w dziwnych miejscach. Indeksowanie całego CD zabiera więcej czasu, ale "
  "znajdzie wszystkie takie pliki."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:143 apt-get.8.xml:395
- msgid "<option>--just-print</option>"
- msgstr "<option>--just-print</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:144 apt-get.8.xml:397
- msgid "<option>--recon</option>"
- msgstr "<option>--recon</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:145 apt-get.8.xml:398
- msgid "<option>--no-act</option>"
- msgstr "<option>--no-act</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:146
+ #: apt-cdrom.8.xml:133
  msgid ""
  "No Changes; Do not change the &sources-list; file and do not write index "
  "files. Everything is still checked however.  Configuration Item: "
@@@ -1976,13 -1672,13 +1673,13 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:159
+ #: apt-cdrom.8.xml:146
  msgid "&apt-conf;, &apt-get;, &sources-list;"
  msgstr "&apt-conf;, &apt-get;, &sources-list;"
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:164
+ #: apt-cdrom.8.xml:151
  msgid ""
  "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -1990,42 -1686,13 +1687,13 @@@ msgstr "
  "<command>apt-cdrom</command> zwraca zero, gdy zakończyło się pomyślnie, 100 "
  "- w przypadku błędu."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-config.8.xml:16 apt-extracttemplates.1.xml:16 apt-sortpkgs.1.xml:16
- #: sources.list.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
- "February 2004</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product;         "
- "<date>29 lutego 2004</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-config.8.xml:25 apt-config.8.xml:32
- msgid "apt-config"
- msgstr "apt-config"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-config.8.xml:33
  msgid "APT Configuration Query program"
  msgstr "Program odpytywania konfiguracji APT"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-config.8.xml:39
- msgid ""
- "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>shell</arg> <arg>dump</arg> </group>"
- msgstr ""
- "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
- "o=<replaceable>opcja konfiguracji</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>plik</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>shell</arg> <arg>dump</arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:51
+ #: apt-config.8.xml:39
  msgid ""
  "<command>apt-config</command> is an internal program used by various "
  "portions of the APT suite to provide consistent configurability. It accesses "
@@@ -2039,7 -1706,7 +1707,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+ #: apt-config.8.xml:44 apt-ftparchive.1.xml:54
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present."
@@@ -2047,13 -1714,8 +1715,8 @@@ msgstr "
  "Jedno z poniższych poleceń musi być użyte, chyba że została podana opcja "
  "<option>-h</option> albo <option>--help</option>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-config.8.xml:61
- msgid "shell"
- msgstr "shell"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:63
+ #: apt-config.8.xml:51
  msgid ""
  "shell is used to access the configuration information from a shell script. "
  "It is given pairs of arguments, the first being a shell variable and the "
@@@ -2068,7 -1730,7 +1731,7 @@@ msgstr "
  "Przykład użycia w skrypcie powłoki:"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-config.8.xml:71
+ #: apt-config.8.xml:59
  #, no-wrap
  msgid ""
  "OPTS=\"-f\"\n"
@@@ -2080,7 -1742,7 +1743,7 @@@ msgstr "
  "eval $RES\n"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:76
+ #: apt-config.8.xml:64
  msgid ""
  "This will set the shell environment variable $OPTS to the value of MyApp::"
  "options with a default of <option>-f</option>."
@@@ -2089,7 -1751,7 +1752,7 @@@ msgstr "
  "zmiennej MojaAplikacja::opcje, z domyślną wartością <option>-f</option>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:80
+ #: apt-config.8.xml:68
  msgid ""
  "The configuration item may be postfixed with a /[fdbi]. f returns file "
  "names, d returns directories, b returns true or false and i returns an "
@@@ -2100,19 -1762,43 +1763,43 @@@ msgstr "
  "jest ujednolicana i weryfikowana."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:89
+ #: apt-config.8.xml:77
  msgid "Just show the contents of the configuration space."
  msgstr "Wyświetla zawartość przestrzeni konfiguracji."
  
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:90
+ msgid ""
+ "Include options which have an empty value. This is the default, so use --no-"
+ "empty to remove them from the output."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-config.8.xml:95
+ msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:96
+ msgid ""
+ "Defines the output of each config option. &percnt;t will be replaced with "
+ "the name of the option, &percnt;f with the complete optionname and &percnt;v "
+ "with the value of the option.  Use uppercase letters and special characters "
+ "in the value will be encoded to ensure that it can e.g. be savely used in a "
+ "quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
+ "by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
+ "&percnt;."
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
- #: apt-sortpkgs.1.xml:73
+ #: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
+ #: apt-sortpkgs.1.xml:64
  msgid "&apt-conf;"
  msgstr "&apt-conf;"
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:112
+ #: apt-config.8.xml:115
  msgid ""
  "<command>apt-config</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -2120,11 -1806,6 +1807,6 @@@ msgstr "
  "<command>apt-config</command> zwraca zero, gdy zakończyło się pomyślnie, 100 "
  "- w przypadku błędu."
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-extracttemplates.1.xml:25 apt-extracttemplates.1.xml:32
- msgid "apt-extracttemplates"
- msgstr "apt-extracttemplates"
- 
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
  msgid "1"
@@@ -2137,20 -1818,8 +1819,8 @@@ msgstr "
  "Narzędzie wyciągające z pakietów Debiana skrypty konfiguracyjne i szablony "
  "DebConf"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-extracttemplates.1.xml:39
- msgid ""
- "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
- "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
- "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
- "arg>"
- msgstr ""
- "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
- "<arg><option>-t=<replaceable>katalog_tymczasowy</replaceable></option></arg> "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>plik</replaceable></arg>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:47
+ #: apt-extracttemplates.1.xml:39
  msgid ""
  "<command>apt-extracttemplates</command> will take one or more Debian package "
  "files as input and write out (to a temporary directory) all associated "
@@@ -2164,17 -1833,25 +1834,25 @@@ msgstr "
  "te skrypty i szablony, zostanie wypisana linia w następującym formacie:"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:52
+ #: apt-extracttemplates.1.xml:44
  msgid "package version template-file config-script"
  msgstr "pakiet wersja plik-template skrypt-config"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:53
+ #: apt-extracttemplates.1.xml:45
+ #, fuzzy
+ #| msgid ""
+ #| "template-file and config-script are written to the temporary directory "
+ #| "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
+ #| "TempDir</literal>)  directory, with filenames of the form "
+ #| "<filename>package.template.XXXX</filename> and <filename>package.config."
+ #| "XXXX</filename>"
  msgid ""
  "template-file and config-script are written to the temporary directory "
- "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
- "literal>)  directory, with filenames of the form <filename>package.template."
- "XXXX</filename> and <filename>package.config.XXXX</filename>"
+ "specified by the <option>-t</option> or <option>--tempdir</option> "
+ "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+ "filenames of the form <filename>package.template.XXXX</filename> and "
+ "<filename>package.config.XXXX</filename>"
  msgstr ""
  "plik-template i skrypt-config są zapisywane w katalogu tymczasowym podanym "
  "jako argument opcji <option>-t</option> lub <option>--tempdir</option> "
@@@ -2182,18 -1859,8 +1860,8 @@@
  "postaci <filename>pakiet.template.XXXX</filename> oraz <filename>pakiet."
  "config.XXXX</filename>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
- msgid "<option>-t</option>"
- msgstr "<option>-t</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63
- msgid "<option>--tempdir</option>"
- msgstr "<option>--tempdir</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-extracttemplates.1.xml:65
+ #: apt-extracttemplates.1.xml:58
  msgid ""
  "Temporary directory in which to write extracted debconf template files and "
  "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@@ -2205,7 -1872,7 +1873,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:82
+ #: apt-extracttemplates.1.xml:75
  msgid ""
  "<command>apt-extracttemplates</command> returns zero on normal operation, "
  "decimal 100 on error."
@@@ -2213,91 -1880,13 +1881,13 @@@ msgstr "
  "<command>apt-extracttemplates</command> zwraca zero, gdy zakończyło się "
  "pomyślnie, 100 - w przypadku błędu."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-ftparchive.1.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
- "August 2009</date>"
- msgstr ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;        "
- "<date>17 sierpnia 2009</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-ftparchive.1.xml:25 apt-ftparchive.1.xml:32
- msgid "apt-ftparchive"
- msgstr "apt-ftparchive"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-ftparchive.1.xml:33
  msgid "Utility to generate index files"
  msgstr "Narzędzie użytkowe do generowania plików indeksu"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-ftparchive.1.xml:39
- #, fuzzy
- #| msgid ""
- #| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
- #| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
- #| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
- #| "arg> <arg><option>-o <replaceable>config</"
- #| "replaceable>=<replaceable>string</replaceable></option></arg> "
- #| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
- #| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
- #| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- #| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
- #| "replaceable></arg><arg><replaceable>override</"
- #| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- #| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
- #| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
- #| "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
- #| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
- #| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
- #| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
- #| "group>"
- msgid ""
- "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
- "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
- "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
- "arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
- "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
- "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
- "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
- "replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
- "arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
- "arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
- "replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
- "\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
- msgstr ""
- "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
- "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
- "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
- "arg> <arg><option>-o <replaceable>opcja_konfiguracji</"
- "replaceable>=<replaceable>łańcuch_znaków</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>plik</replaceable></option></arg> <group choice="
- "\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>ścieżka</replaceable></arg><arg><replaceable>plik_nadpisań</"
- "replaceable><arg><replaceable>prefiks_ścieżki</replaceable></arg></arg></"
- "arg> <arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>ścieżka</"
- "replaceable></arg><arg><replaceable>plik_nadpisań</"
- "replaceable><arg><replaceable>prefiks_ścieżki</replaceable></arg></arg></"
- "arg> <arg>contents <arg choice=\"plain\"><replaceable>ścieżka</replaceable></"
- "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>ścieżka</"
- "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
- "\"><replaceable>plik_konfiguracji</replaceable></arg> <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>sekcja</replaceable></arg></arg> <arg>clean <arg "
- "choice=\"plain\"><replaceable>plik_konfiguracji</replaceable></arg></arg> </"
- "group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:60
+ #: apt-ftparchive.1.xml:39
  msgid ""
  "<command>apt-ftparchive</command> is the command line tool that generates "
  "the index files that APT uses to access a distribution source. The index "
@@@ -2306,7 -1895,7 +1896,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:64
+ #: apt-ftparchive.1.xml:43
  msgid ""
  "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
  "program, incorporating its entire functionality via the <literal>packages</"
@@@ -2316,7 -1905,7 +1906,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:70
+ #: apt-ftparchive.1.xml:49
  msgid ""
  "Internally <command>apt-ftparchive</command> can make use of binary "
  "databases to cache the contents of a .deb file and it does not rely on any "
@@@ -2325,13 -1914,8 +1915,8 @@@
  "output files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:79
- msgid "packages"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:81
+ #: apt-ftparchive.1.xml:60
  msgid ""
  "The packages command generates a package file from a directory tree. It "
  "takes the given directory and recursively searches it for .deb files, "
@@@ -2340,18 -1924,13 +1925,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+ #: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
  msgid ""
  "The option <option>--db</option> can be used to specify a binary caching DB."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:89
- msgid "sources"
- msgstr "sources"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:91
+ #: apt-ftparchive.1.xml:70
  msgid ""
  "The <literal>sources</literal> command generates a source index file from a "
  "directory tree.  It takes the given directory and recursively searches it "
@@@ -2360,20 -1939,15 +1940,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:96
+ #: apt-ftparchive.1.xml:75
  msgid ""
  "If an override file is specified then a source override file will be looked "
  "for with an extension of .src. The --source-override option can be used to "
  "change the source override file that will be used."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:101
- msgid "contents"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:103
+ #: apt-ftparchive.1.xml:82
  msgid ""
  "The <literal>contents</literal> command generates a contents file from a "
  "directory tree. It takes the given directory and recursively searches it "
@@@ -2383,13 -1957,8 +1958,8 @@@
  "package is separated by a comma in the output."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:113
- msgid "release"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:115
+ #: apt-ftparchive.1.xml:94
  msgid ""
  "The <literal>release</literal> command generates a Release file from a "
  "directory tree. It recursively searches the given directory for uncompressed "
@@@ -2404,7 -1973,7 +1974,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:125
+ #: apt-ftparchive.1.xml:104
  msgid ""
  "Values for the additional metadata fields in the Release file are taken from "
  "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@@ -2416,13 -1985,8 +1986,8 @@@
  "<literal>Description</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:136
- msgid "generate"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:138
+ #: apt-ftparchive.1.xml:117
  msgid ""
  "The <literal>generate</literal> command is designed to be runnable from a "
  "cron script and builds indexes according to the given config file. The "
@@@ -2431,26 -1995,21 +1996,21 @@@
  "maintaining the required settings."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:145 apt-get.8.xml:287
- msgid "clean"
- msgstr "clean"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:147
+ #: apt-ftparchive.1.xml:126
  msgid ""
  "The <literal>clean</literal> command tidies the databases used by the given "
  "configuration file by removing any records that are no longer necessary."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:153
+ #: apt-ftparchive.1.xml:132
  #, fuzzy
  msgid "The Generate Configuration"
  msgstr "Plik konfiguracyjny"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:155
+ #: apt-ftparchive.1.xml:134
  msgid ""
  "The <literal>generate</literal> command uses a configuration file to "
  "describe the archives that are going to be generated. It follows the typical "
@@@ -2461,18 -2020,18 +2021,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:163
+ #: apt-ftparchive.1.xml:142
  msgid ""
  "The generate configuration has 4 separate sections, each described below."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:165
+ #: apt-ftparchive.1.xml:144
  msgid "Dir Section"
  msgstr "Dir Section"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:167
+ #: apt-ftparchive.1.xml:146
  msgid ""
  "The <literal>Dir</literal> section defines the standard directories needed "
  "to locate the files required during the generation process. These "
@@@ -2480,71 -2039,46 +2040,46 @@@
  "to produce a complete an absolute path."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:172
- msgid "ArchiveDir"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:174
+ #: apt-ftparchive.1.xml:153
  msgid ""
  "Specifies the root of the FTP archive, in a standard Debian configuration "
  "this is the directory that contains the <filename>ls-LR</filename> and dist "
  "nodes."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:179
- msgid "OverrideDir"
- msgstr "OverrideDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:181
+ #: apt-ftparchive.1.xml:160
  msgid "Specifies the location of the override files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:184
- msgid "CacheDir"
- msgstr "CacheDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:186
+ #: apt-ftparchive.1.xml:165
  msgid "Specifies the location of the cache files"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:189
- msgid "FileListDir"
- msgstr "FileListDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:191
+ #: apt-ftparchive.1.xml:170
  msgid ""
  "Specifies the location of the file list files, if the <literal>FileList</"
  "literal> setting is used below."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:197
+ #: apt-ftparchive.1.xml:176
  msgid "Default Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:199
+ #: apt-ftparchive.1.xml:178
  msgid ""
  "The <literal>Default</literal> section specifies default values, and "
  "settings that control the operation of the generator. Other sections may "
  "override these defaults with a per-section setting."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:203
- msgid "Packages::Compress"
- msgstr "Packages::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:205
+ #: apt-ftparchive.1.xml:184
  msgid ""
  "Sets the default compression schemes to use for the Package index files. It "
  "is a string that contains a space separated list of at least one of: '.' (no "
@@@ -2552,140 -2086,86 +2087,86 @@@
  "'. gzip'."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:211
- msgid "Packages::Extensions"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:213
+ #: apt-ftparchive.1.xml:192
  msgid ""
  "Sets the default list of file extensions that are package files.  This "
  "defaults to '.deb'."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:217
- msgid "Sources::Compress"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:219
+ #: apt-ftparchive.1.xml:198
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Sources files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:223
- msgid "Sources::Extensions"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:225
+ #: apt-ftparchive.1.xml:204
  msgid ""
  "Sets the default list of file extensions that are source files.  This "
  "defaults to '.dsc'."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:229
- msgid "Contents::Compress"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:231
+ #: apt-ftparchive.1.xml:210
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Contents files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:235
- #, fuzzy
- #| msgid "Packages::Compress"
- msgid "Translation::Compress"
- msgstr "Packages::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:237
+ #: apt-ftparchive.1.xml:216
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Translation-en master file."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:241
- msgid "DeLinkLimit"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:243
+ #: apt-ftparchive.1.xml:222
  msgid ""
  "Specifies the number of kilobytes to delink (and replace with hard links) "
  "per run. This is used in conjunction with the per-section <literal>External-"
  "Links</literal> setting."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:248
- msgid "FileMode"
- msgstr "FileMode"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:250
+ #: apt-ftparchive.1.xml:229
  msgid ""
  "Specifies the mode of all created index files. It defaults to 0644. All "
  "index files are set to this mode with no regard to the umask."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
- #, fuzzy
- #| msgid "Description"
- msgid "LongDescription"
- msgstr "Opis"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+ #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
  msgid ""
  "Sets if long descriptions should be included in the Packages file or split "
  "out into a master Translation-en file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:263
+ #: apt-ftparchive.1.xml:242
  msgid "TreeDefault Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:265
+ #: apt-ftparchive.1.xml:244
  msgid ""
  "Sets defaults specific to <literal>Tree</literal> sections. All of these "
  "variables are substitution variables and have the strings $(DIST), "
  "$(SECTION) and $(ARCH) replaced with their respective values."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:270
- msgid "MaxContentsChange"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:272
+ #: apt-ftparchive.1.xml:251
  msgid ""
  "Sets the number of kilobytes of contents files that are generated each day. "
  "The contents files are round-robined so that over several days they will all "
  "be rebuilt."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:277
- msgid "ContentsAge"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:279
+ #: apt-ftparchive.1.xml:258
  msgid ""
  "Controls the number of days a contents file is allowed to be checked without "
  "changing. If this limit is passed the mtime of the contents file is updated. "
@@@ -2695,89 -2175,52 +2176,52 @@@
  "anyhow. The default is 10, the units are in days."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:288
- msgid "Directory"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:290
+ #: apt-ftparchive.1.xml:269
  msgid ""
  "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
  "$(SECTION)/binary-$(ARCH)/</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:294
- msgid "SrcDirectory"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:296
+ #: apt-ftparchive.1.xml:275
  msgid ""
  "Sets the top of the source package directory tree. Defaults to <filename>"
  "$(DIST)/$(SECTION)/source/</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
- msgid "Packages"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:302
+ #: apt-ftparchive.1.xml:281
  msgid ""
  "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "binary-$(ARCH)/Packages</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
- msgid "Sources"
- msgstr "Sources"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:308
+ #: apt-ftparchive.1.xml:287
  msgid ""
  "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "source/Sources</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:312
- #, fuzzy
- #| msgid "Operation"
- msgid "Translation"
- msgstr "Kolejne kroki"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:314
+ #: apt-ftparchive.1.xml:293
  msgid ""
  "Set the output Translation-en master file with the long descriptions if they "
  "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
  "$(SECTION)/i18n/Translation-en</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:319
- msgid "InternalPrefix"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:321
+ #: apt-ftparchive.1.xml:300
  msgid ""
  "Sets the path prefix that causes a symlink to be considered an internal link "
  "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
  "filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
- msgid "Contents"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:328
+ #: apt-ftparchive.1.xml:307
  msgid ""
  "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
  "</filename>. If this setting causes multiple Packages files to map onto a "
@@@ -2785,48 -2228,28 +2229,28 @@@
  "command> will integrate those package files together automatically."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:335
- msgid "Contents::Header"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:337
+ #: apt-ftparchive.1.xml:316
  msgid "Sets header file to prepend to the contents output."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
- msgid "BinCacheDB"
- msgstr "BinCacheDB"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:342
+ #: apt-ftparchive.1.xml:321
  msgid ""
  "Sets the binary cache database to use for this section. Multiple sections "
  "can share the same database."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:346
- msgid "FileList"
- msgstr "FileList"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:348
+ #: apt-ftparchive.1.xml:327
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
  "Relative files names are prefixed with the archive directory."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:353
- msgid "SourceFileList"
- msgstr "SourceFileList"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:355
+ #: apt-ftparchive.1.xml:334
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
@@@ -2835,12 -2258,12 +2259,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:363
+ #: apt-ftparchive.1.xml:342
  msgid "Tree Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:365
+ #: apt-ftparchive.1.xml:344
  msgid ""
  "The <literal>Tree</literal> section defines a standard Debian file tree "
  "which consists of a base directory, then multiple sections in that base "
@@@ -2850,7 -2273,7 +2274,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:370
+ #: apt-ftparchive.1.xml:349
  msgid ""
  "The <literal>Tree</literal> section takes a scope tag which sets the "
  "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@@ -2859,7 -2282,7 +2283,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:375
+ #: apt-ftparchive.1.xml:354
  msgid ""
  "All of the settings defined in the <literal>TreeDefault</literal> section "
  "can be use in a <literal>Tree</literal> section as well as three new "
@@@ -2867,7 -2290,7 +2291,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt-ftparchive.1.xml:381
+ #: apt-ftparchive.1.xml:360
  #, no-wrap
  msgid ""
  "for i in Sections do \n"
@@@ -2881,91 -2304,60 +2305,60 @@@ msgstr "
  "     "
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:378
+ #: apt-ftparchive.1.xml:357
  msgid ""
  "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
  "command> performs an operation similar to: <placeholder type=\"programlisting"
  "\" id=\"0\"/>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:387
- msgid "Sections"
- msgstr "Sections"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:389
+ #: apt-ftparchive.1.xml:368
  msgid ""
  "This is a space separated list of sections which appear under the "
  "distribution, typically this is something like <literal>main contrib non-"
  "free</literal>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:394
- msgid "Architectures"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:396
+ #: apt-ftparchive.1.xml:375
  msgid ""
  "This is a space separated list of all the architectures that appear under "
  "search section. The special architecture 'source' is used to indicate that "
  "this tree has a source archive."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
- #, fuzzy
- msgid "BinOverride"
- msgstr "BinOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:409
+ #: apt-ftparchive.1.xml:388
  msgid ""
  "Sets the binary override file. The override file contains section, priority "
  "and maintainer address information."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
- msgid "SrcOverride"
- msgstr "SrcOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:415
+ #: apt-ftparchive.1.xml:394
  msgid ""
  "Sets the source override file. The override file contains section "
  "information."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
- msgid "ExtraOverride"
- msgstr "ExtraOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+ #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
  msgid "Sets the binary extra override file."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
- msgid "SrcExtraOverride"
- msgstr "SrcExtraOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+ #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
  msgid "Sets the source extra override file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:431
+ #: apt-ftparchive.1.xml:410
  msgid "BinDirectory Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:433
+ #: apt-ftparchive.1.xml:412
  msgid ""
  "The <literal>bindirectory</literal> section defines a binary directory tree "
  "with no special structure. The scope tag specifies the location of the "
@@@ -2975,65 -2367,55 +2368,55 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:441
+ #: apt-ftparchive.1.xml:420
  msgid "Sets the Packages file output."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:446
+ #: apt-ftparchive.1.xml:425
  msgid ""
  "Sets the Sources file output. At least one of <literal>Packages</literal> or "
  "<literal>Sources</literal> is required."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:452
+ #: apt-ftparchive.1.xml:431
  msgid "Sets the Contents file output. (optional)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:457
+ #: apt-ftparchive.1.xml:436
  msgid "Sets the binary override file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:462
+ #: apt-ftparchive.1.xml:441
  msgid "Sets the source override file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:477
+ #: apt-ftparchive.1.xml:456
  msgid "Sets the cache DB."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:480
- msgid "PathPrefix"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:482
+ #: apt-ftparchive.1.xml:461
  msgid "Appends a path to all the output paths."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:485
- msgid "FileList, SourceFileList"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:487
+ #: apt-ftparchive.1.xml:466
  msgid "Specifies the file list file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:494
+ #: apt-ftparchive.1.xml:473
  #, fuzzy
  msgid "The Binary Override File"
  msgstr "Wprowadzenie"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:495
+ #: apt-ftparchive.1.xml:474
  msgid ""
  "The binary override file is fully compatible with &dpkg-scanpackages;. It "
  "contains 4 fields separated by spaces. The first field is the package name, "
@@@ -3043,19 -2425,19 +2426,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:501
+ #: apt-ftparchive.1.xml:480
  #, no-wrap
  msgid "old [// oldn]* => new"
  msgstr "old [// oldn]* => new"
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:503
+ #: apt-ftparchive.1.xml:482
  #, no-wrap
  msgid "new"
  msgstr "new"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:500
+ #: apt-ftparchive.1.xml:479
  msgid ""
  "The general form of the maintainer field is: <placeholder type="
  "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@@ -3066,13 -2448,13 +2449,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:511
+ #: apt-ftparchive.1.xml:490
  #, fuzzy
  msgid "The Source Override File"
  msgstr "Wprowadzenie"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:513
+ #: apt-ftparchive.1.xml:492
  msgid ""
  "The source override file is fully compatible with &dpkg-scansources;. It "
  "contains 2 fields separated by spaces. The first fields is the source "
@@@ -3080,46 -2462,35 +2463,35 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:518
+ #: apt-ftparchive.1.xml:497
  msgid "The Extra Override File"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:520
+ #: apt-ftparchive.1.xml:499
  msgid ""
  "The extra override file allows any arbitrary tag to be added or replaced in "
  "the output. It has 3 columns, the first is the package, the second is the "
  "tag and the remainder of the line is the new value."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:529
- msgid ""
- "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:531
+ #: apt-ftparchive.1.xml:510
  msgid ""
  "Generate the given checksum. These options default to on, when turned off "
  "the generated index files will not have the checksum fields where possible.  "
  "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>."
+ "<literal><replaceable>Index</replaceable></literal> can be "
+ "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+ "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+ "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:541
+ #: apt-ftparchive.1.xml:521
  #, fuzzy
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
@@@ -3130,7 -2501,7 +2502,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:547
+ #: apt-ftparchive.1.xml:527
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -3143,14 -2514,9 +2515,9 @@@ msgstr "
  "option>, nadpisując tym samym opcję z pliku konfiguracyjnego.  Pozycja w "
  "pliku konfiguracyjnym: <literal>quiet</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:555
+ #: apt-ftparchive.1.xml:535
  #, fuzzy
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
@@@ -3163,13 -2529,8 +2530,8 @@@ msgstr "
  "<option>--no-generate</option>. Pozycja w pliku konfiguracyjnym: "
  "<literal>APT::Cache::Generate</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:563
+ #: apt-ftparchive.1.xml:543
  msgid ""
  "Perform contents generation. When this option is set and package indexes are "
  "being generated with a cache DB then the file listing will also be extracted "
@@@ -3178,14 -2539,9 +2540,9 @@@
  "Configuration Item: <literal>APT::FTPArchive::Contents</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:573
+ #: apt-ftparchive.1.xml:553
  #, fuzzy
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
@@@ -3196,14 -2552,9 +2553,9 @@@ msgstr "
  "literal> tylko do pakietów, które są obecnie zainstalowane.  Pozycja w pliku "
  "konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:579
+ #: apt-ftparchive.1.xml:559
  #, fuzzy
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
@@@ -3212,15 -2563,8 +2564,8 @@@ msgstr "
  "Przeszukaj tylko nazwy pakietów, pomijając szczegółowe opisy.  Pozycja w "
  "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:584
+ #: apt-ftparchive.1.xml:564
  #, fuzzy
  #| msgid ""
  #| "If the command is either <literal>install</literal> or <literal>remove</"
@@@ -3239,14 -2583,8 +2584,8 @@@ msgstr "
  "zależności. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
  "AutomaticRemove</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:592
+ #: apt-ftparchive.1.xml:572
  msgid ""
  "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
  "packages are recompiled and/or republished with the same version again, this "
@@@ -3259,14 -2597,8 +2598,8 @@@
  "are useless."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:604
+ #: apt-ftparchive.1.xml:584
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
  "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@@ -3276,19 -2608,19 +2609,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
- #: sources.list.5.xml:198
+ #: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
+ #: sources.list.5.xml:214
  msgid "Examples"
  msgstr "Przykłady"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
- #: apt-ftparchive.1.xml:622
+ #: apt-ftparchive.1.xml:602
  #, no-wrap
  msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  msgstr "<command>apt-ftparchive</command> packages <replaceable>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:618
+ #: apt-ftparchive.1.xml:598
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3296,7 -2628,7 +2629,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:632
+ #: apt-ftparchive.1.xml:612
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -3304,127 -2636,15 +2637,15 @@@ msgstr "
  "<command>apt-ftparchive</command> zwraca zero, gdy zakończyło się pomyślnie, "
  "100 - w przypadku błędu."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-get.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
- "November 2008</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product;          "
- "<date>8 listopada 2008</date>"
- 
- #. type: <heading></heading>
- #: apt-get.8.xml:25 apt-get.8.xml:32 guide.sgml:96
- msgid "apt-get"
- msgstr "apt-get"
- 
  #
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-get.8.xml:33
  msgid "APT package handling utility -- command-line interface"
  msgstr "Narzędzie zarządzania pakietami APT -- interfejs linii poleceń"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-get.8.xml:39
- #, fuzzy
- #| msgid ""
- #| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- #| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
- #| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
- #| "<arg> <option>-t=</option> <group choice='req'> <arg choice='plain'> "
- #| "<replaceable>target_release_name</replaceable> </arg> <arg "
- #| "choice='plain'> <replaceable>target_release_number_expression</"
- #| "replaceable> </arg> <arg choice='plain'> "
- #| "<replaceable>target_release_codename</replaceable> </arg> </group> </arg> "
- #| "<group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
- #| "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
- #| "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
- #| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
- #| "<group choice='req'> <arg choice='plain'> "
- #| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
- #| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
- #| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
- #| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
- #| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
- #| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
- #| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
- #| "<group choice='req'> <arg choice='plain'> "
- #| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
- #| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
- #| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
- #| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg "
- #| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
- #| "arg> <arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- #| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- #| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- #| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
- #| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
- #| "help</arg> </group> </arg> </group>"
- msgid ""
- "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
- "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
- "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
- "replaceable> </arg> </arg> <group choice=\"req\"> <arg "
- "choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
- "choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
- "<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
- "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
- "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
- "arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
- "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
- "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
- "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
- "</group> </arg> </group>"
- msgstr ""
- "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- "<option>-o= <replaceable>opcja_konfiguracji</replaceable> </option> </arg> "
- "<arg> <option>-c= <replaceable>plik_konfiguracyjny</replaceable> </option> </"
- "arg> <arg> <option>-t=</option> <group choice='req'> <arg choice='plain'> "
- "<replaceable>nazwa_wydania</replaceable> </arg> <arg choice='plain'> "
- "<replaceable>wyrażenie_numeru_wydania</replaceable> </arg> <arg "
- "choice='plain'> <replaceable>kod_wydania</replaceable> </arg> </group> </"
- "arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
- "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
- "choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable> <arg> <group "
- "choice='req'> <arg choice='plain'> =<replaceable>numer_wersji_pakietu</"
- "replaceable> </arg> <arg choice='plain'> /<replaceable>nazwa_wydania</"
- "replaceable> </arg> <arg choice='plain'> /<replaceable>kod_wydania</"
- "replaceable> </arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></"
- "arg></arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pakiet</replaceable></arg></arg> <arg choice='plain'>source "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable> <arg> "
- "<group choice='req'> <arg choice='plain'> "
- "=<replaceable>numer_wersji_pakietu</replaceable> </arg> <arg "
- "choice='plain'> /<replaceable>nazwa_wydania</replaceable> </arg> <arg "
- "choice='plain'> /<replaceable>kod_wydania</replaceable> </arg> </group> </"
- "arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>pakiet</replaceable></arg></arg> <arg "
- "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
- "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
- "</group> </arg> </group>"
- 
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:115
+ #: apt-get.8.xml:39
  #, fuzzy
  #| msgid ""
  #| "<command>apt-get</command> is the command-line tool for handling "
@@@ -3443,14 -2663,9 +2664,9 @@@ msgstr "
  "użytkownika, takich jak &dselect;, &aptitude;, &synaptic;, &gnome-apt; oraz "
  "&wajig;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:124 apt-key.8.xml:127
- msgid "update"
- msgstr "update"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:125
+ #: apt-get.8.xml:49
  msgid ""
  "<literal>update</literal> is used to resynchronize the package index files "
  "from their sources. The indexes of available packages are fetched from the "
@@@ -3473,14 -2688,9 +2689,9 @@@ msgstr "
  "całkowitego postępu operacji jest błędny, ponieważ rozmiar plików "
  "<filename>Packages.gz</filename> nie jest wcześniej znany."
  
- #. type: <tag></tag>
- #: apt-get.8.xml:136 guide.sgml:121
- msgid "upgrade"
- msgstr "upgrade"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:137
+ #: apt-get.8.xml:61
  msgid ""
  "<literal>upgrade</literal> is used to install the newest versions of all "
  "packages currently installed on the system from the sources enumerated in "
@@@ -3504,14 -2714,9 +2715,9 @@@ msgstr "
  "get</command> wiedział, że są dostępne nowe wersje pakietów, należy "
  "wcześniej wykonać <literal>update</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:149
- msgid "dselect-upgrade"
- msgstr "dselect-upgrade"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:150
+ #: apt-get.8.xml:74
  msgid ""
  "<literal>dselect-upgrade</literal> is used in conjunction with the "
  "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@@ -3528,14 -2733,9 +2734,9 @@@ msgstr "
  "zrealizowania tych zmian (na przykład: usunięcie starych pakietów i dodanie "
  "nowych)."
  
- #. type: <tag></tag>
- #: apt-get.8.xml:159 guide.sgml:140
- msgid "dist-upgrade"
- msgstr "dist-upgrade"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:160
+ #: apt-get.8.xml:84
  msgid ""
  "<literal>dist-upgrade</literal> in addition to performing the function of "
  "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@@ -3558,14 -2758,9 +2759,9 @@@ msgstr "
  "znajduje się tam opis mechanizmu nadpisywania globalnych ustawień dla "
  "poszczególnych pakietów."
  
- #. type: <tag></tag>
- #: apt-get.8.xml:172 guide.sgml:131
- msgid "install"
- msgstr "install"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:174
+ #: apt-get.8.xml:98
  msgid ""
  "<literal>install</literal> is followed by one or more packages desired for "
  "installation or upgrading.  Each package is a package name, not a fully "
@@@ -3595,7 -2790,7 +2791,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:192
+ #: apt-get.8.xml:116
  msgid ""
  "A specific version of a package can be selected for installation by "
  "following the package name with an equals and the version of the package to "
@@@ -3613,7 -2808,7 +2809,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:199
+ #: apt-get.8.xml:123
  msgid ""
  "Both of the version selection mechanisms can downgrade packages and must be "
  "used with care."
@@@ -3623,7 -2818,7 +2819,7 @@@ msgstr "
  "ostrożnie."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:202
+ #: apt-get.8.xml:126
  msgid ""
  "This is also the target to use if you want to upgrade one or more already-"
  "installed packages without upgrading every package you have on your system. "
@@@ -3644,7 -2839,7 +2840,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:213
+ #: apt-get.8.xml:137
  msgid ""
  "Finally, the &apt-preferences; mechanism allows you to create an alternative "
  "installation policy for individual packages."
@@@ -3654,7 -2849,7 +2850,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:217
+ #: apt-get.8.xml:141
  msgid ""
  "If no package matches the given expression and the expression contains one "
  "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@@ -3674,14 -2869,9 +2870,9 @@@ msgstr "
  "początek lub koniec dopasowania wyrażenia regularnego, używając znaków \"^| "
  "lub \"$\", można też stworzyć bardziej specyficzne wyrażenie regularne."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:226
- msgid "remove"
- msgstr "remove"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:227
+ #: apt-get.8.xml:151
  msgid ""
  "<literal>remove</literal> is identical to <literal>install</literal> except "
  "that packages are removed instead of installed. Note the removing a package "
@@@ -3694,13 -2884,8 +2885,8 @@@ msgstr "
  "zostanie poprzedzona znakiem plusa (bez rozdzielającej spacji), wskazany "
  "pakiet zostanie zainstalowany zamiast zostać usunięty."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:234
- msgid "purge"
- msgstr "purge"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:235
+ #: apt-get.8.xml:159
  msgid ""
  "<literal>purge</literal> is identical to <literal>remove</literal> except "
  "that packages are removed and purged (any configuration files are deleted "
@@@ -3710,19 -2895,14 +2896,14 @@@ msgstr "
  "różnicą, że pakiety są po usunięciu czyszczone (czyli usuwane są również "
  "wszystkie pliki konfiguracyjne)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:239
- msgid "source"
- msgstr "source"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:240
+ #: apt-get.8.xml:164
  msgid ""
  "<literal>source</literal> causes <command>apt-get</command> to fetch source "
  "packages. APT will examine the available packages to decide which source "
  "package to fetch. It will then find and download into the current directory "
- "the newest available version of that source package while respect the "
+ "the newest available version of that source package while respecting the "
  "default release, set with the option <literal>APT::Default-Release</"
  "literal>, the <option>-t</option> option or per package with the "
  "<literal>pkg/release</literal> syntax, if possible."
@@@ -3737,7 -2917,7 +2918,7 @@@ msgstr "
  "wydanie</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:248
+ #: apt-get.8.xml:172
  msgid ""
  "Source packages are tracked separately from binary packages via <literal>deb-"
  "src</literal> type lines in the &sources-list; file. This means that you "
@@@ -3753,7 -2933,7 +2934,7 @@@ msgstr "
  "jest zainstalowana lub możliwa do zainstalowania."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:255
+ #: apt-get.8.xml:179
  #, fuzzy
  #| msgid ""
  #| "If the <option>--compile</option> option is specified then the package "
@@@ -3762,9 -2942,10 +2943,10 @@@
  #| "source package will not be unpacked."
  msgid ""
  "If the <option>--compile</option> option is specified then the package will "
- "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
- "<option>--download-only</option> is specified then the source package will "
- "not be unpacked."
+ "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+ "the architecture as defined by the <command>--host-architecture</command> "
+ "option.  If <option>--download-only</option> is specified then the source "
+ "package will not be unpacked."
  msgstr ""
  "Jeżeli podano opcję <option>--compile</option>, to pakiet źródłowy zostanie "
  "skompilowany do pakietu binarnego .deb za pomocą programu <command>dpkg-"
@@@ -3773,7 -2954,7 +2955,7 @@@
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:260
+ #: apt-get.8.xml:186
  msgid ""
  "A specific source version can be retrieved by postfixing the source name "
  "with an equals and then the version to fetch, similar to the mechanism used "
@@@ -3789,7 -2970,7 +2971,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:266
+ #: apt-get.8.xml:192
  msgid ""
  "Note that source packages are not tracked like binary packages, they exist "
  "only in the current directory and are similar to downloading source tar "
@@@ -3799,34 -2980,27 +2981,27 @@@ msgstr "
  "przechowywane tylko w bieżącym katalogu, mniej więcej tak, jakby zostały "
  "ściągnięte oryginalne źródła programu ze strony jego autorów."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:271
- msgid "build-dep"
- msgstr "build-dep"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:272
+ #: apt-get.8.xml:198
  #, fuzzy
  #| msgid ""
  #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
  #| "an attempt to satisfy the build dependencies for a source package."
  msgid ""
  "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
- "attempt to satisfy the build dependencies for a source package."
+ "attempt to satisfy the build dependencies for a source package. By default "
+ "the dependencies are satisfied to build the package natively. If desired a "
+ "host-architecture can be specified with the <option>--host-architecture</"
+ "option> option instead."
  msgstr ""
  "<literal>build-dep</literal> powoduje, że apt-get zainstaluje/usunie pakiety "
  "tak, żeby spełnić zależności wymagane do zbudowania danego pakietu "
  "źródłowego."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:276
- msgid "check"
- msgstr "check"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:277
+ #: apt-get.8.xml:205
  msgid ""
  "<literal>check</literal> is a diagnostic tool; it updates the package cache "
  "and checks for broken dependencies."
@@@ -3834,21 -3008,16 +3009,16 @@@ msgstr "
  "<literal>check</literal> jest poleceniem diagnostycznym, które odświeża "
  "bufor (cache) pakietów i szuka zepsutych pakietów."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:281
- msgid "download"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:282
+ #: apt-get.8.xml:210
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
- "current directoy."
+ "current directory."
  msgstr ""
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:288
+ #: apt-get.8.xml:216
  msgid ""
  "<literal>clean</literal> clears out the local repository of retrieved "
  "package files. It removes everything but the lock file from "
@@@ -3866,14 -3035,9 +3036,9 @@@ msgstr "
  "dselect, powinny od czasu do czasu uruchamiać <literal>apt-get clean</"
  "literal>, aby zwolnić trochę miejsca na dysku."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:297
- msgid "autoclean"
- msgstr "autoclean"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:298
+ #: apt-get.8.xml:226
  msgid ""
  "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
  "local repository of retrieved package files. The difference is that it only "
@@@ -3892,13 -3056,8 +3057,8 @@@ msgstr "
  "<literal>APT::Clean-Installed</literal> zapobiegnie usuwaniu plików "
  "zawierających zainstalowane pakiety."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:307
- msgid "autoremove"
- msgstr "autoremove"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:308
+ #: apt-get.8.xml:236
  #, fuzzy
  #| msgid ""
  #| "<literal>autoremove</literal> is used to remove packages that were "
@@@ -3906,38 -3065,29 +3066,29 @@@
  #| "are no more needed."
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
- "automatically installed to satisfy dependencies for some package and that "
- "are no more needed."
+ "automatically installed to satisfy dependencies for other packages and are "
+ "now no longer needed."
  msgstr ""
  "<literal>autoremove</literal> jest używane do usuwania pakietów, które  "
  "zostały zainstalowane automatycznie, żeby rozwiązać zależności, i nie są już "
  "potrzebne."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:312
- msgid "changelog"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:313
+ #: apt-get.8.xml:241
  msgid ""
  "<literal>changelog</literal> downloads a package changelog and displays it "
  "through <command>sensible-pager</command>. The server name and base "
  "directory is defined in the <literal>APT::Changelogs::Server</literal> "
- "variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
- "Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
- "Ubuntu).  By default it displays the changelog for the version that is "
+ "variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+ "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+ "changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+ "for Ubuntu).  By default it displays the changelog for the version that is "
  "installed.  However, you can specify the same options as for the "
  "<option>install</option> command."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:335
- msgid "<option>--no-install-recommends</option>"
- msgstr "<option>--no-install-recommends</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:336
+ #: apt-get.8.xml:264
  msgid ""
  "Do not consider recommended packages as a dependency for installing.  "
  "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@@ -3945,15 -3095,8 +3096,8 @@@ msgstr "
  "Nie rozpatruje rekomendowanych pakietów jako zależności do instalacji. "
  "Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:340
- #, fuzzy
- #| msgid "<option>--no-upgrade</option>"
- msgid "<option>--install-suggests</option>"
- msgstr "<option>--no-upgrade</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:341
+ #: apt-get.8.xml:269
  #, fuzzy
  #| msgid ""
  #| "Do not consider recommended packages as a dependency for installing.  "
@@@ -3965,14 -3108,9 +3109,9 @@@ msgstr "
  "Nie rozpatruje rekomendowanych pakietów jako zależności do instalacji. "
  "Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:345
- msgid "<option>--download-only</option>"
- msgstr "<option>--download-only</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:346
+ #: apt-get.8.xml:274
  msgid ""
  "Download only; package files are only retrieved, not unpacked or installed.  "
  "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@@ -3981,14 -3119,9 +3120,9 @@@ msgstr "
  "czy instalowane.  Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
  "Download-Only</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:350
- msgid "<option>--fix-broken</option>"
- msgstr "<option>--fix-broken</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:351
+ #: apt-get.8.xml:279
  msgid ""
  "Fix; attempt to correct a system with broken dependencies in place. This "
  "option, when used with install/remove, can omit any packages to permit APT "
@@@ -4014,19 -3147,9 +3148,9 @@@ msgstr "
  "opcji łącznie z <option>-m</option> może spowodować błąd. Pozycja w pliku "
  "konfiguracyjnym: <literal>APT::Get::Fix-Broken</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:364
- msgid "<option>--ignore-missing</option>"
- msgstr "<option>--ignore-missing</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:365
- msgid "<option>--fix-missing</option>"
- msgstr "<option>--fix-missing</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:366
+ #: apt-get.8.xml:294
  msgid ""
  "Ignore missing packages; If packages cannot be retrieved or fail the "
  "integrity check after retrieval (corrupted package files), hold back those "
@@@ -4044,14 -3167,9 +3168,9 @@@ msgstr "
  "ale nie może zostać pobrany, zostanie pominięty. Pozycja w pliku "
  "konfiguracyjnym: <literal>APT::Get::Fix-Missing</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:376
- msgid "<option>--no-download</option>"
- msgstr "<option>--no-download</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:377
+ #: apt-get.8.xml:305
  msgid ""
  "Disables downloading of packages. This is best used with <option>--ignore-"
  "missing</option> to force APT to use only the .debs it has already "
@@@ -4064,7 -3182,7 +3183,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:384
+ #: apt-get.8.xml:312
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -4083,19 -3201,9 +3202,9 @@@ msgstr "
  "gdyż APT może zadecydować o zrobieniu czegoś, czego użytkownik się nie "
  "spodziewa.  Pozycja w pliku konfiguracyjnym: <literal>quiet</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:394
- msgid "<option>--simulate</option>"
- msgstr "<option>--simulate</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:396
- msgid "<option>--dry-run</option>"
- msgstr "<option>--dry-run</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:399
+ #: apt-get.8.xml:327
  msgid ""
  "No action; perform a simulation of events that would occur but do not "
  "actually change the system.  Configuration Item: <literal>APT::Get::"
@@@ -4106,7 -3214,7 +3215,7 @@@ msgstr "
  "Get::Simulate</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:403
+ #: apt-get.8.xml:331
  msgid ""
  "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
  "literal>)  automatic. Also a notice will be displayed indicating that this "
@@@ -4126,7 -3234,7 +3235,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:409
+ #: apt-get.8.xml:337
  msgid ""
  "Simulate prints out a series of lines each one representing a dpkg "
  "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@@ -4139,24 -3247,9 +3248,9 @@@ msgstr "
  "puste nawiasy kwadratowe oznaczają, że przyczyna zepsucia pakietu nie jest "
  "znana (rzadkość)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>-y</option>"
- msgstr "<option>-y</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>--yes</option>"
- msgstr "<option>--yes</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:417
- msgid "<option>--assume-yes</option>"
- msgstr "<option>--assume-yes</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:418
+ #: apt-get.8.xml:346
  msgid ""
  "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
  "non-interactively. If an undesirable situation, such as changing a held "
@@@ -4171,19 -3264,23 +3265,23 @@@ msgstr "
  "przerwie działanie.  Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
  "Assume-Yes</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>-u</option>"
- msgstr "<option>-u</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>--show-upgraded</option>"
- msgstr "<option>--show-upgraded</option>"
+ #
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:354
+ #, fuzzy
+ #| msgid ""
+ #| "Compile source packages after downloading them.  Configuration Item: "
+ #| "<literal>APT::Get::Compile</literal>."
+ msgid ""
+ "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+ "Assume-No</literal>."
+ msgstr ""
+ "Skompiluj pakiety źródłowe po ich ściągnięciu.  Pozycja w pliku "
+ "konfiguracyjnym: <literal>APT::Get::Compile</literal>."
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:426
+ #: apt-get.8.xml:359
  msgid ""
  "Show upgraded packages; Print out a list of all packages that are to be "
  "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@@ -4192,19 -3289,9 +3290,9 @@@ msgstr "
  "będą uaktualnione. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Show-"
  "Upgraded</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>-V</option>"
- msgstr "<option>-V</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>--verbose-versions</option>"
- msgstr "<option>--verbose-versions</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:432
+ #: apt-get.8.xml:365
  msgid ""
  "Show full versions for upgraded and installed packages.  Configuration Item: "
  "<literal>APT::Get::Show-Versions</literal>."
@@@ -4212,24 -3299,20 +3300,20 @@@ msgstr "
  "Wyświetla pełne wersje aktualizowanych pakietów Pozycja w pliku "
  "konfiguracyjnym: <literal>APT::Get::Show-Versions</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>-b</option>"
- msgstr "<option>-b</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>--compile</option>"
- msgstr "<option>--compile</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:437
- msgid "<option>--build</option>"
- msgstr "<option>--build</option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:371
+ msgid ""
+ "This option controls the architecture packages are built for by <command>apt-"
+ "get source --compile</command> and how cross-builddependencies are "
+ "satisfied. By default is it not set which means that the host architecture "
+ "is the same as the build architecture (which is defined by <literal>APT::"
+ "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
+ "Architecture</literal>"
+ msgstr ""
  
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:438
+ #: apt-get.8.xml:381
  msgid ""
  "Compile source packages after downloading them.  Configuration Item: "
  "<literal>APT::Get::Compile</literal>."
@@@ -4237,14 -3320,9 +3321,9 @@@ msgstr "
  "Skompiluj pakiety źródłowe po ich ściągnięciu.  Pozycja w pliku "
  "konfiguracyjnym: <literal>APT::Get::Compile</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:442
- msgid "<option>--ignore-hold</option>"
- msgstr "<option>--ignore-hold</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:443
+ #: apt-get.8.xml:386
  msgid ""
  "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
  "hold placed on a package. This may be useful in conjunction with "
@@@ -4257,14 -3335,9 +3336,9 @@@ msgstr "
  "dużej liczby niepożądanych wstrzymań.  Pozycja w pliku konfiguracyjnym: "
  "<literal>APT::Ignore-Hold</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:449
- msgid "<option>--no-upgrade</option>"
- msgstr "<option>--no-upgrade</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:450
+ #: apt-get.8.xml:393
  msgid ""
  "Do not upgrade packages; When used in conjunction with <literal>install</"
  "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@@ -4276,16 -3349,9 +3350,9 @@@ msgstr "
  "zainstalowane, nie zostaną zaktualizowane.  Pozycja w pliku konfiguracyjnym: "
  "<literal>APT::Get::Upgrade</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:456
- #, fuzzy
- #| msgid "<option>--no-upgrade</option>"
- msgid "<option>--only-upgrade</option>"
- msgstr "<option>--no-upgrade</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:457
+ #: apt-get.8.xml:400
  #, fuzzy
  #| msgid ""
  #| "Do not upgrade packages; When used in conjunction with <literal>install</"
@@@ -4294,8 -3360,8 +3361,8 @@@
  #| "Configuration Item: <literal>APT::Get::Upgrade</literal>."
  msgid ""
  "Do not install new packages; When used in conjunction with <literal>install</"
- "literal>, <literal>only-upgrade</literal> will prevent packages on the "
- "command line from being upgraded if they are not already installed.  "
+ "literal>, <literal>only-upgrade</literal> will install upgrades for already "
+ "installed packages only and ignore requests to install new packages.  "
  "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
  msgstr ""
  "Nie aktualizuje pakietów. Użyte w połączeniu z <literal>install</literal>, "
@@@ -4303,14 -3369,9 +3370,9 @@@
  "zainstalowane, nie zostaną zaktualizowane.  Pozycja w pliku konfiguracyjnym: "
  "<literal>APT::Get::Upgrade</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:463
- msgid "<option>--force-yes</option>"
- msgstr "<option>--force-yes</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:464
+ #: apt-get.8.xml:408
  msgid ""
  "Force yes; This is a dangerous option that will cause apt to continue "
  "without prompting if it is doing something potentially harmful. It should "
@@@ -4325,14 -3386,9 +3387,9 @@@ msgstr "
  "zniszczyć Twój system! Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
  "force-yes</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:471
- msgid "<option>--print-uris</option>"
- msgstr "<option>--print-uris</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:472
+ #: apt-get.8.xml:416
  msgid ""
  "Instead of fetching the files to install their URIs are printed. Each URI "
  "will have the path, the destination file name, the size and the expected md5 "
@@@ -4353,14 -3409,9 +3410,9 @@@ msgstr "
  "plików. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Print-URIs</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:482
- msgid "<option>--purge</option>"
- msgstr "<option>--purge</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:483
+ #: apt-get.8.xml:427
  msgid ""
  "Use purge instead of remove for anything that would be removed.  An asterisk "
  "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@@ -4373,14 -3424,9 +3425,9 @@@ msgstr "
  "option> jest odpowiednikiem polecenia <option>purge</option>. Pozycja w "
  "pliku konfiguracyjnym: <literal>APT::Get::Purge</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:490
- msgid "<option>--reinstall</option>"
- msgstr "<option>--reinstall</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:491
+ #: apt-get.8.xml:435
  msgid ""
  "Re-Install packages that are already installed and at the newest version.  "
  "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@@ -4388,14 -3434,9 +3435,9 @@@ msgstr "
  "Ponownie instaluje pakiety, których najnowsza wersja już jest zainstalowana "
  "Pozycja w pliku konfiguracyjnym: <literal>APT::Get::ReInstall</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:495
- msgid "<option>--list-cleanup</option>"
- msgstr "<option>--list-cleanup</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:496
+ #: apt-get.8.xml:440
  msgid ""
  "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
  "it off. When on <command>apt-get</command> will automatically manage the "
@@@ -4411,19 -3452,9 +3453,9 @@@ msgstr "
  "wyłączenia mogłyby być częste zmiany w sources.list.  Pozycja w pliku "
  "konfiguracyjnym: <literal>APT::Get::List-Cleanup</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:505
- msgid "<option>--target-release</option>"
- msgstr "<option>--target-release</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:506
- msgid "<option>--default-release</option>"
- msgstr "<option>--default-release</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:507
+ #: apt-get.8.xml:451
  msgid ""
  "This option controls the default input to the policy engine, it creates a "
  "default pin at priority 990 using the specified release string.  This "
@@@ -4445,14 -3476,9 +3477,9 @@@ msgstr "
  "pliku konfiguracyjnym: <literal>APT::Default-Release</literal>; zobacz także "
  "stronę podręcznika &apt-preferences;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:520
- msgid "<option>--trivial-only</option>"
- msgstr "<option>--trivial-only</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:522
+ #: apt-get.8.xml:466
  msgid ""
  "Only perform operations that are 'trivial'. Logically this can be considered "
  "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@@ -4465,14 -3491,9 +3492,9 @@@ msgstr "
  "option> odpowie \"nie\".  Pozycja w pliku konfiguracyjnym: <literal>APT::"
  "Get::Trivial-Only</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:528
- msgid "<option>--no-remove</option>"
- msgstr "<option>--no-remove</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:529
+ #: apt-get.8.xml:473
  msgid ""
  "If any packages are to be removed apt-get immediately aborts without "
  "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@@ -4481,13 -3502,8 +3503,8 @@@ msgstr "
  "działanie.  Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Remove</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:534
- msgid "<option>--auto-remove</option>"
- msgstr "<option>--auto-remove</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:535
+ #: apt-get.8.xml:479
  msgid ""
  "If the command is either <literal>install</literal> or <literal>remove</"
  "literal>, then this option acts like running <literal>autoremove</literal> "
@@@ -4500,14 -3516,9 +3517,9 @@@ msgstr "
  "zależności. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
  "AutomaticRemove</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:541
- msgid "<option>--only-source</option>"
- msgstr "<option>--only-source</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:542
+ #: apt-get.8.xml:486
  msgid ""
  "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
  "literal> commands.  Indicates that the given source names are not to be "
@@@ -4525,24 -3536,9 +3537,9 @@@ msgstr "
  "im pakietów źródłowych. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
  "Only-Source</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--diff-only</option>"
- msgstr "<option>--diff-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--dsc-only</option>"
- msgstr "<option>--dsc-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--tar-only</option>"
- msgstr "<option>--tar-only</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:553
+ #: apt-get.8.xml:497
  msgid ""
  "Download only the diff, dsc, or tar file of a source archive.  Configuration "
  "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@@ -4552,14 -3548,9 +3549,9 @@@ msgstr "
  "konfiguracyjnym:  <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::"
  "Dsc-Only</literal> oraz <literal>APT::Get::Tar-Only</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:558
- msgid "<option>--arch-only</option>"
- msgstr "<option>--arch-only</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:559
+ #: apt-get.8.xml:503
  msgid ""
  "Only process architecture-dependent build-dependencies.  Configuration Item: "
  "<literal>APT::Get::Arch-Only</literal>."
@@@ -4569,13 -3560,8 +3561,8 @@@ msgstr "
  "komputera.  Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Arch-Only</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:563
- msgid "<option>--allow-unauthenticated</option>"
- msgstr "<option>--allow-unauthenticated</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:564
+ #: apt-get.8.xml:508
  msgid ""
  "Ignore if packages can't be authenticated and don't prompt about it.  This "
  "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@@ -4586,7 -3572,7 +3573,7 @@@ msgstr "
  "w pliku konfiguracyjnym: <literal>APT::Get::AllowUnauthenticated</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-get.8.xml:577
+ #: apt-get.8.xml:521
  msgid ""
  "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
  "&file-statelists;"
@@@ -4596,7 -3582,7 +3583,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:586
+ #: apt-get.8.xml:530
  msgid ""
  "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
  "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@@ -4608,7 -3594,7 +3595,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:592
+ #: apt-get.8.xml:536
  msgid ""
  "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
  "error."
@@@ -4616,52 -3602,14 +3603,14 @@@ msgstr "
  "<command>apt-get</command> zwraca zero, gdy zakończyło się pomyślnie, 100 - "
  "w przypadku błędu."
  
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:595
- msgid "ORIGINAL AUTHORS"
- msgstr "AUTORZY ORYGINAŁU"
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:596
- msgid "&apt-author.jgunthorpe;"
- msgstr "&apt-author.jgunthorpe;"
- 
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:599
- msgid "CURRENT AUTHORS"
- msgstr "OBECNI AUTORZY"
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:601
- msgid "&apt-author.team;"
- msgstr "&apt-author.team;"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-key.8.xml:17 apt-key.8.xml:24
- msgid "apt-key"
- msgstr "apt-key"
- 
  #
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-key.8.xml:25
+ #: apt-key.8.xml:32
  msgid "APT key management utility"
  msgstr "Narzędzie zarządzanie kluczami APT"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-key.8.xml:31
- msgid ""
- "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
- "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
- "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
- "arg>"
- msgstr ""
- "<command>apt-key</command> <arg><option>--keyring <replaceable>nazwa_pliku</"
- "replaceable></option></arg> <arg><replaceable>polecenie</replaceable></arg> "
- "<arg rep=\"powtórzenia\"><option><replaceable>argumenty</replaceable></"
- "option></arg>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:40
+ #: apt-key.8.xml:39
  msgid ""
  "<command>apt-key</command> is used to manage the list of keys used by apt to "
  "authenticate packages.  Packages which have been authenticated using these "
@@@ -4673,85 -3621,57 +3622,57 @@@ msgstr "
  "zaufane."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-key.8.xml:46
+ #: apt-key.8.xml:45
  msgid "Commands"
  msgstr "Polecenia"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:48
- msgid "add <replaceable>filename</replaceable>"
- msgstr "add <replaceable>nazwa_pliku</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:52
+ #: apt-key.8.xml:50
+ #, fuzzy
+ #| msgid ""
+ #| "Add a new key to the list of trusted keys.  The key is read from "
+ #| "<replaceable>filename</replaceable>, or standard input if "
+ #| "<replaceable>filename</replaceable> is <literal>-</literal>."
  msgid ""
- "Add a new key to the list of trusted keys.  The key is read from "
- "<replaceable>filename</replaceable>, or standard input if "
- "<replaceable>filename</replaceable> is <literal>-</literal>."
+ "Add a new key to the list of trusted keys.  The key is read from the "
+ "filename given with the parameter &synopsis-param-filename; or if the "
+ "filename is <literal>-</literal> from standard input."
  msgstr ""
  "Dodaje nowy klucz do listy zaufanych kluczy.Klucz jest czytany z podanej "
  "<replaceable>nazwy_pliku</replaceable> lub ze standardowego wejścia, jeśli "
  "zamiast <replaceable>nazwy_pliku</replaceable> podano <literal>-</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:60
- msgid "del <replaceable>keyid</replaceable>"
- msgstr "del <replaceable>id_klucza</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:64
+ #: apt-key.8.xml:63
  msgid "Remove a key from the list of trusted keys."
  msgstr "Usuwa klucz z listy zaufanych kluczy."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:71
- msgid "export <replaceable>keyid</replaceable>"
- msgstr "export <replaceable>id_klucza</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:75
- msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+ #: apt-key.8.xml:74
+ #, fuzzy
+ #| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+ msgid "Output the key &synopsis-param-keyid; to standard output."
  msgstr ""
  "Wyświetla klucz o podanym <replaceable>id_klucza</replaceable> na "
  "standardowe wyjście."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:82
- msgid "exportall"
- msgstr "exportall"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:86
+ #: apt-key.8.xml:85
  msgid "Output all trusted keys to standard output."
  msgstr "Wypisuje na standardowe wyjście wszystkie zaufane klucze."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:93
- msgid "list"
- msgstr "list"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:97
+ #: apt-key.8.xml:96
  msgid "List trusted keys."
  msgstr "Wyświetla listę zaufanych kluczy."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:104
- msgid "finger"
- msgstr "finger"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:108
+ #: apt-key.8.xml:107
  msgid "List fingerprints of trusted keys."
  msgstr "Wyświetla listę odcisków zaufanych kluczy."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:115
- msgid "adv"
- msgstr "adv"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:119
+ #: apt-key.8.xml:118
  msgid ""
  "Pass advanced options to gpg. With adv --recv-key you can download the "
  "public key."
@@@ -4760,32 -3680,28 +3681,28 @@@ msgstr "
  "pobranie klucza publicznego."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
  msgid ""
- "Update the local keyring with the keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
+ "Update the local keyring with the archive keyring and remove from the local "
+ "keyring the archive keys which are no longer valid.  The archive keyring is "
+ "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
++"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
++"Ubuntu."
  msgstr ""
- "Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum "
- "Debiana i usuwa z lokalnej składnicy nieaktualne już klucze archiwów Debiana."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:140
- #, fuzzy
- #| msgid "update"
- msgid "net-update"
- msgstr "update"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:144
  msgid ""
- "Update the local keyring with the keys of a key server and removes from the "
- "keyring the archive keys which are no longer valid. This requires an "
- "installed wget and an APT build configured to have a server to fetch from. "
- "APT in Debian does not support this command, but Ubuntu's APT does."
+ "Work similar to the <command>update</command> command above, but get the "
+ "archive keyring from an URI instead and validate it against a master key.  "
+ "This requires an installed &wget; and an APT build configured to have a "
+ "server to fetch from and a master keyring to validate.  APT in Debian does "
+ "not support this command and relies on <command>update</command> instead, "
+ "but Ubuntu's APT does."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:159
+ #: apt-key.8.xml:161
  msgid ""
  "Note that options need to be defined before the commands described in the "
  "previous section."
@@@ -4793,13 -3709,8 +3710,8 @@@ msgstr "
  "Proszę zauważyć, że poniższe opcje muszą być podane przed poleceniami "
  "opisanymi w poprzednim rozdziale."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:161
- msgid "--keyring <replaceable>filename</replaceable>"
- msgstr "--keyring <replaceable>nazwa_pliku</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:162
+ #: apt-key.8.xml:164
  #, fuzzy
  #| msgid ""
  #| "With this option it is possible to specify a specific keyring file the "
@@@ -4812,7 -3723,7 +3724,7 @@@ msgid "
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
  "<filename>trusted.gpg</filename> file as well as on all parts in the "
- "<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</"
  "filename> is the primary keyring which means that e.g. new keys are added to "
  "this one."
  msgstr ""
@@@ -4823,99 -3734,54 +3735,63 @@@
  "kluczy, co oznacza na przykład to, że nowe klucze będą dodawane właśnie tam."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-key.8.xml:175
+ #: apt-key.8.xml:177
  msgid "&file-trustedgpg;"
  msgstr "&file-trustedgpg;"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:177
+ #: apt-key.8.xml:179
  msgid "<filename>/etc/apt/trustdb.gpg</filename>"
  msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:178
+ #: apt-key.8.xml:180
  msgid "Local trust database of archive keys."
  msgstr "Lokalna składnica zaufanych kluczy archiwum."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
++#, fuzzy
++#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
++msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:182
- msgid "Keyring of Debian archive trusted keys."
+ #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
++#, fuzzy
++#| msgid "Keyring of Debian archive trusted keys."
++msgid "Keyring of Ubuntu archive trusted keys."
  msgstr "Składnica zaufanych kluczy archiwum Debiana."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:185
+ #: apt-key.8.xml:187
++#, fuzzy
++#| msgid ""
++#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  msgid ""
--"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
++"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
++#, fuzzy
++#| msgid "Keyring of Debian archive removed trusted keys."
++msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr "Składnica usuniętych zaufanych kluczy archiwum Debiana."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:195
+ #: apt-key.8.xml:197
  msgid "&apt-get;, &apt-secure;"
  msgstr "&apt-get;, &apt-secure;"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-mark.8.xml:16
- #, fuzzy
- #| msgid ""
- #| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
- #| "August 2009</date>"
- msgid ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
- "April 2011</date>"
- msgstr ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;        "
- "<date>9 sierpnia 2009</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-mark.8.xml:25 apt-mark.8.xml:32
- msgid "apt-mark"
- msgstr "apt-mark"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-mark.8.xml:33
  msgid "mark/unmark a package as being automatically-installed"
  msgstr "Zaznaczanie/odznaczanie pakietu jako zainstalowanego automatycznie."
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-mark.8.xml:39
- #, fuzzy
- #| msgid ""
- #| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
- #| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
- #| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
- #| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
- #| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
- #| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
- msgid ""
- "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
- "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
- "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
- "\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
- "\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
- "arg> </group>"
- msgstr ""
- "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
- "f=<replaceable>NAZWA_PLIKU</replaceable></option></arg> <group choice=\"plain"
- "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
- "\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg> </"
- "arg> <arg choice=\"plain\">showauto</arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:57
+ #: apt-mark.8.xml:39
  msgid ""
  "<command>apt-mark</command> will change whether a package has been marked as "
  "being automatically installed."
@@@ -4924,7 -3790,7 +3800,7 @@@ msgstr "
  "zainstalowany automatycznie."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:61
+ #: apt-mark.8.xml:43
  msgid ""
  "When you request that a package is installed, and as a result other packages "
  "are installed to satisfy its dependencies, the dependencies are marked as "
@@@ -4939,15 -3805,8 +3815,8 @@@ msgstr "
  "pakiet od nich nie zależy), zostaną usunięte przez na przykład <command>apt-"
  "get</command> lub <command>aptitude</command>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:69
- #, fuzzy
- #| msgid "markauto"
- msgid "auto"
- msgstr "markauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:70
+ #: apt-mark.8.xml:52
  #, fuzzy
  #| msgid ""
  #| "<literal>markauto</literal> is used to mark a package as being "
@@@ -4962,13 -3821,8 +3831,8 @@@ msgstr "
  "zainstalowanego automatycznie, co spowoduje jego usunięcie, w sytuacji gdy "
  "żaden inny ręcznie zainstalowany pakiet nie będzie od niego zależał."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:77
- msgid "manual"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:78
+ #: apt-mark.8.xml:60
  #, fuzzy
  #| msgid ""
  #| "<literal>unmarkauto</literal> is used to mark a package as being manually "
@@@ -4983,13 -3837,8 +3847,8 @@@ msgstr "
  "zainstalowanego ręcznie, co go uchroni przed automatycznym usunięciem, w "
  "sytuacji gdy żaden inny pakiet nie będzie od niego zależał."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:85
- msgid "hold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:86
+ #: apt-mark.8.xml:68
  msgid ""
  "<literal>hold</literal> is used to mark a package as hold back, which will "
  "prevent the package from being automatically installed, upgraded or "
@@@ -4998,13 -3847,8 +3857,8 @@@
  "effected by the <option>--filename</option> option."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:95
- msgid "unhold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:96
+ #: apt-mark.8.xml:78
  #, fuzzy
  #| msgid ""
  #| "<literal>showauto</literal> is used to print a list of automatically "
@@@ -5017,13 -3861,8 +3871,8 @@@ msgstr "
  "pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
  "osobnej linii."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:101
- msgid "showauto"
- msgstr "showauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:102
+ #: apt-mark.8.xml:84
  #, fuzzy
  #| msgid ""
  #| "<literal>showauto</literal> is used to print a list of automatically "
@@@ -5038,30 -3877,16 +3887,16 @@@ msgstr "
  "pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
  "osobnej linii."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:109
- #, fuzzy
- #| msgid "showauto"
- msgid "showmanual"
- msgstr "showauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:110
+ #: apt-mark.8.xml:92
  msgid ""
  "<literal>showmanual</literal> can be used in the same way as "
  "<literal>showauto</literal> except that it will print a list of manually "
  "installed packages instead."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:116
- #, fuzzy
- #| msgid "showauto"
- msgid "showhold"
- msgstr "showauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:117
+ #: apt-mark.8.xml:99
  #, fuzzy
  #| msgid ""
  #| "<literal>showauto</literal> is used to print a list of automatically "
@@@ -5074,30 -3899,27 +3909,27 @@@ msgstr "
  "pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
  "osobnej linii."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:130
- msgid ""
- "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
- msgstr ""
- "<option>-f=<filename><replaceable>nazwa-pliku</replaceable></filename></"
- "option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:131
- msgid ""
- "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
- "option>"
- msgstr ""
- "<option>--file=<filename><replaceable>NAZWA_PLIKU</replaceable></filename></"
- "option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+ #: apt-mark.8.xml:112 apt-mark.8.xml:113
+ #, fuzzy
+ #| msgid "xvcg <replaceable>pkg(s)</replaceable>"
+ msgid "<replaceable>&synopsis-filename;</replaceable>"
+ msgstr "xvcg <replaceable>pakiet(y)</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:134
- msgid ""
- "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
- "filename> instead of the default location, which is "
- "<filename>extended_status</filename> in the directory defined by the "
- "Configuration Item: <literal>Dir::State</literal>."
+ #: apt-mark.8.xml:115
+ #, fuzzy
+ #| msgid ""
+ #| "Read/Write package stats from <filename><replaceable>FILENAME</"
+ #| "replaceable></filename> instead of the default location, which is "
+ #| "<filename>extended_status</filename> in the directory defined by the "
+ #| "Configuration Item: <literal>Dir::State</literal>."
+ msgid ""
+ "Read/Write package stats from the filename given with the parameter "
+ "<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+ "of from the default location, which is <filename>extended_status</filename> "
+ "in the directory defined by the Configuration Item: <literal>Dir::State</"
+ "literal>."
  msgstr ""
  "Informacje o stanie pakietów są czytane z (lub zapisywane do) pliku o "
  "podanej <replaceable>NAZWIE_PLIKU</replaceable>. Nie jest wtedy używana "
@@@ -5105,18 -3927,18 +3937,18 @@@
  "określonym w pliku konfiguracyjnym w pozycji<literal>Dir::State</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-mark.8.xml:146
+ #: apt-mark.8.xml:128
  msgid "  &file-extended_states;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:151
+ #: apt-mark.8.xml:133
  msgid "&apt-get;,&aptitude;,&apt-conf;"
  msgstr "&apt-get;,&aptitude;,&apt-conf;"
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:155
+ #: apt-mark.8.xml:137
  msgid ""
  "<command>apt-mark</command> returns zero on normal operation, non-zero on "
  "error."
@@@ -5124,18 -3946,13 +3956,13 @@@ msgstr "
  "<command>apt-mark</command> zwraca zero, gdy zakończyło się pomyślnie, "
  "wartość niezerową - w przypadku błędu."
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-secure.8.xml:17 apt-secure.8.xml:39
- msgid "apt-secure"
- msgstr "apt-secure"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-secure.8.xml:40
+ #: apt-secure.8.xml:47
  msgid "Archive authentication support for APT"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:45
+ #: apt-secure.8.xml:52
  msgid ""
  "Starting with version 0.6, <command>apt</command> contains code that does "
  "signature checking of the Release file for all archives. This ensures that "
@@@ -5144,7 -3961,7 +3971,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:53
+ #: apt-secure.8.xml:60
  msgid ""
  "If a package comes from a archive without a signature or with a signature "
  "that apt does not have a key for that package is considered untrusted and "
@@@ -5154,19 -3971,19 +3981,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:62
+ #: apt-secure.8.xml:69
  msgid ""
  "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
  "authentication feature."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:67
+ #: apt-secure.8.xml:74
  msgid "Trusted archives"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:70
+ #: apt-secure.8.xml:77
  msgid ""
  "The chain of trust from an apt archive to the end user is made up of "
  "different steps. <command>apt-secure</command> is the last step in this "
@@@ -5177,7 -3994,7 +4004,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:78
+ #: apt-secure.8.xml:85
  msgid ""
  "apt-secure does not review signatures at a package level. If you require "
  "tools to do this you should look at <command>debsig-verify</command> and "
@@@ -5186,7 -4003,7 +4013,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:85
+ #: apt-secure.8.xml:92
  msgid ""
  "The chain of trust in Debian starts when a maintainer uploads a new package "
  "or a new version of a package to the Debian archive. This upload in order to "
@@@ -5197,7 -4014,7 +4024,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:95
+ #: apt-secure.8.xml:102
  msgid ""
  "Once the uploaded package is verified and included in the archive, the "
  "maintainer signature is stripped off, an MD5 sum of the package is computed "
@@@ -5208,7 -4025,7 +4035,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:105
+ #: apt-secure.8.xml:112
  msgid ""
  "Any end user can check the signature of the Release file, extract the MD5 "
  "sum of a package from it and compare it with the MD5 sum of the package he "
@@@ -5218,14 -4035,14 +4045,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:112
+ #: apt-secure.8.xml:119
  msgid ""
  "Notice that this is distinct from checking signatures on a per package "
  "basis. It is designed to prevent two possible attacks:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:117
+ #: apt-secure.8.xml:124
  msgid ""
  "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
  "checking, a malicious agent can introduce himself in the package download "
@@@ -5235,7 -4052,7 +4062,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:125
+ #: apt-secure.8.xml:132
  msgid ""
  "<literal>Mirror network compromise</literal>.  Without signature checking, a "
  "malicious agent can compromise a mirror host and modify the files in it to "
@@@ -5244,7 -4061,7 +4071,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:132
+ #: apt-secure.8.xml:139
  msgid ""
  "However, it does not defend against a compromise of the Debian master server "
  "itself (which signs the packages) or against a compromise of the key used to "
@@@ -5253,13 -4070,13 +4080,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:138
+ #: apt-secure.8.xml:145
  #, fuzzy
  msgid "User configuration"
  msgstr "Plik konfiguracyjny"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:140
+ #: apt-secure.8.xml:147
  msgid ""
  "<command>apt-key</command> is the program that manages the list of keys used "
  "by apt. It can be used to add or remove keys although an installation of "
@@@ -5268,7 -4085,7 +4095,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:147
+ #: apt-secure.8.xml:154
  msgid ""
  "In order to add a new key you need to first download it (you should make "
  "sure you are using a trusted communication channel when retrieving it), add "
@@@ -5279,20 -4096,20 +4106,20 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:156
+ #: apt-secure.8.xml:163
  #, fuzzy
  msgid "Archive configuration"
  msgstr "Plik konfiguracyjny"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:158
+ #: apt-secure.8.xml:165
  msgid ""
  "If you want to provide archive signatures in an archive under your "
  "maintenance you have to:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:163
+ #: apt-secure.8.xml:170
  msgid ""
  "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
  "already. You can do this by running <command>apt-ftparchive release</"
@@@ -5300,7 -4117,7 +4127,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:168
+ #: apt-secure.8.xml:175
  msgid ""
  "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
  "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@@ -5308,7 -4125,7 +4135,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:172
+ #: apt-secure.8.xml:179
  msgid ""
  "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
  "know what key they need to import in order to authenticate the files in the "
@@@ -5316,7 -4133,7 +4143,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:179
+ #: apt-secure.8.xml:186
  msgid ""
  "Whenever the contents of the archive changes (new packages are added or "
  "removed) the archive maintainer has to follow the first two steps previously "
@@@ -5324,7 -4141,7 +4151,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:187
+ #: apt-secure.8.xml:194
  msgid ""
  "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
  "&debsign; &debsig-verify;, &gpg;"
@@@ -5333,54 -4150,36 +4160,36 @@@ msgstr "
  "&debsign; &debsig-verify;, &gpg;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:191
+ #: apt-secure.8.xml:198
  msgid ""
  "For more background information you might want to review the <ulink url="
- "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
- "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
- "Manual (available also in the harden-doc package) and the <ulink url="
- "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
- "Distribution HOWTO</ulink> by V. Alex Brennen."
+ "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+ "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+ "(available also in the harden-doc package) and the <ulink url=\"http://www."
+ "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
+ "ulink> by V. Alex Brennen."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:204
+ #: apt-secure.8.xml:211
  msgid "Manpage Authors"
  msgstr "Autorzy strony podręcznika"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:206
+ #: apt-secure.8.xml:213
  msgid ""
  "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
  "Jones, Colin Walters, Florian Weimer and Michael Vogt."
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-sortpkgs.1.xml:25 apt-sortpkgs.1.xml:32
- msgid "apt-sortpkgs"
- msgstr "apt-sortpkgs"
- 
  #
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-sortpkgs.1.xml:33
  msgid "Utility to sort package index files"
  msgstr "Narzędzie użytkowe do sortowania plików indeksu"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-sortpkgs.1.xml:39
- msgid ""
- "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
- msgstr ""
- "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
- "<arg><option>-o=<replaceable>opcja_konfiguracji</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>plik</replaceable></option></arg> <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>plik</replaceable></arg>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:48
+ #: apt-sortpkgs.1.xml:39
  msgid ""
  "<command>apt-sortpkgs</command> will take an index file (Source index or "
  "Package index) and sort the records so that they are ordered by the package "
@@@ -5392,20 -4191,15 +4201,15 @@@ msgstr "
  "zgodnie z wewnętrznymi zasadami sortowania."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:54
+ #: apt-sortpkgs.1.xml:45
  msgid "All output is sent to stdout, the input must be a seekable file."
  msgstr ""
  "Wyjście programu jest wypisywane na standardowe wyjście, wejście musi "
  "pochodzić z pliku."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-sortpkgs.1.xml:61
- msgid "<option>--source</option>"
- msgstr "<option>--source</option>"
- 
  #
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-sortpkgs.1.xml:63
+ #: apt-sortpkgs.1.xml:54
  msgid ""
  "Use Source index field ordering.  Configuration Item: <literal>APT::"
  "SortPkgs::Source</literal>."
@@@ -5415,7 -4209,7 +4219,7 @@@ msgstr "
  
  #
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:77
+ #: apt-sortpkgs.1.xml:68
  msgid ""
  "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -5423,39 -4217,29 +4227,29 @@@ msgstr "
  "<command>apt-sortpkgs</command> zwraca zero, gdy zakończyło się pomyślnie, "
  "100 - w przypadku błędu."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt.conf.5.xml:16
- #, fuzzy
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
- "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
- "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
- "&apt-product; <date>16 January 2010</date>"
+ #. type: Content of: <refentry><refentryinfo><author><contrib>
+ #: apt.conf.5.xml:20
+ msgid "Initial documentation of Debug::*."
  msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
- "firstname> <surname>Burrows</surname> <contrib>Pierwsza dokumentacja Debug::"
- "*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; &apt-"
- "product; <date>18 września 2009</date>"
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt.conf.5.xml:31 apt.conf.5.xml:38
- msgid "apt.conf"
- msgstr "apt.conf"
+ #. type: Content of: <refentry><refentryinfo><author><email>
+ #: apt.conf.5.xml:21
+ msgid "dburrows@debian.org"
+ msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
- #: apt.conf.5.xml:32 apt_preferences.5.xml:25 sources.list.5.xml:26
+ #: apt.conf.5.xml:31 apt_preferences.5.xml:25 sources.list.5.xml:26
  msgid "5"
  msgstr "5"
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt.conf.5.xml:39
+ #: apt.conf.5.xml:38
  #, fuzzy
  msgid "Configuration file for APT"
  msgstr "Plik konfiguracyjny"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:43
+ #: apt.conf.5.xml:42
  msgid ""
  "<filename>apt.conf</filename> is the main configuration file for the APT "
  "suite of tools, but by far not the only place changes to options can be "
@@@ -5464,21 -4248,21 +4258,21 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><para>
- #: apt.conf.5.xml:48
+ #: apt.conf.5.xml:47
  msgid ""
  "When an APT tool starts up it will read the configuration files in the "
  "following order:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:50
+ #: apt.conf.5.xml:49
  msgid ""
  "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
  "any)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:52
+ #: apt.conf.5.xml:51
  #, fuzzy
  #| msgid ""
  #| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
@@@ -5489,11 -4273,12 +4283,12 @@@
  #| "characters.  Otherwise they will be silently ignored."
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
- "order which have no or \"<literal>conf</literal>\" as filename extension and "
- "which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
- "characters.  Otherwise APT will print a notice that it has ignored a file if "
- "the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
- "literal> configuration list - in this case it will be silently ignored."
+ "order which have either no or \"<literal>conf</literal>\" as filename "
+ "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+ "and period (.) characters.  Otherwise APT will print a notice that it has "
+ "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+ "Ignore-Files-Silently</literal> configuration list - in this case it will be "
+ "silently ignored."
  msgstr ""
  "Katalog <filename>/etc/apt/sources.list.d</filename>  umożliwia podzielenie "
  "pliku źródeł na osobne pliki. Format jest dokładnie taki sam, jak w "
@@@ -5503,25 -4288,25 +4298,25 @@@
  "(_), pauzy (-) i kropki (.). Inne pliki zostaną zignorowane."
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:59
+ #: apt.conf.5.xml:58
  msgid ""
  "the main configuration file specified by <literal>Dir::Etc::main</literal>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:61
+ #: apt.conf.5.xml:60
  msgid ""
  "the command line options are applied to override the configuration "
  "directives or to load even more configuration files."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:65
+ #: apt.conf.5.xml:64
  msgid "Syntax"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:66
+ #: apt.conf.5.xml:65
  msgid ""
  "The configuration file is organized in a tree with options organized into "
  "functional groups. Option specification is given with a double colon "
@@@ -5531,7 -4316,7 +4326,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:72
+ #: apt.conf.5.xml:71
  msgid ""
  "Syntactically the configuration language is modeled after what the ISC tools "
  "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@@ -5547,7 -4332,7 +4342,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:86
+ #: apt.conf.5.xml:85
  #, no-wrap
  msgid ""
  "APT {\n"
@@@ -5565,7 -4350,7 +4360,7 @@@ msgstr "
  "};\n"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:94
+ #: apt.conf.5.xml:93
  msgid ""
  "with newlines placed to make it more readable. Lists can be created by "
  "opening a scope and including a single string enclosed in quotes followed by "
@@@ -5573,27 -4358,27 +4368,27 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:99
+ #: apt.conf.5.xml:98
  #, no-wrap
  msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
  msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:102
+ #: apt.conf.5.xml:101
  msgid ""
  "In general the sample configuration file in <filename>&docdir;examples/apt."
  "conf</filename> &configureindex; is a good guide for how it should look."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:106
+ #: apt.conf.5.xml:105
  msgid ""
  "The names of the configuration items are not case-sensitive. So in the "
  "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:109
+ #: apt.conf.5.xml:108
  msgid ""
  "Names for the configuration items are optional if a list is defined as it "
  "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@@ -5603,7 -4388,7 +4398,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:114
+ #: apt.conf.5.xml:113
  msgid ""
  "Two specials are allowed, <literal>#include</literal> (which is deprecated "
  "and not supported by alternative implementations) and <literal>#clear</"
@@@ -5615,7 -4400,7 +4410,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:122
+ #: apt.conf.5.xml:121
  msgid ""
  "The #clear command is the only way to delete a list or a complete scope.  "
  "Reopening a scope or the ::-style described below will <emphasis>not</"
@@@ -5625,23 -4410,23 +4420,23 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:127
+ #: apt.conf.5.xml:126
  msgid ""
  "All of the APT tools take a -o option which allows an arbitrary "
  "configuration directive to be specified on the command line. The syntax is a "
  "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
- "followed by an equals sign then the new value of the option. Lists can be "
- "appended too by adding a trailing :: to the list name. (As you might "
+ "followed by an equals sign then the new value of the option. To append a new "
+ "element to a list, add a trailing :: to the name of the list. (As you might "
  "suspect: The scope syntax can't be used on the command line.)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:134
+ #: apt.conf.5.xml:133
  msgid ""
  "Note that you can use :: only for appending one item per line to a list and "
  "that you should not use it in combination with the scope syntax.  (The scope "
  "syntax implicit insert ::) Using both syntaxes together will trigger a bug "
- "which some users unfortunately relay on: An option with the unusual name "
+ "which some users unfortunately depend on: An option with the unusual name "
  "\"<literal>::</literal>\" which acts like every other option with a name. "
  "These introduces many problems including that a user who writes multiple "
  "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
@@@ -5653,37 -4438,40 +4448,40 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:146
+ #: apt.conf.5.xml:145
  msgid "The APT Group"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:147
+ #: apt.conf.5.xml:146
  msgid ""
  "This group of options controls general APT behavior as well as holding the "
  "options for all of the tools."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:151
- msgid "Architecture"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:152
+ #: apt.conf.5.xml:151
  msgid ""
  "System Architecture; sets the architecture to use when fetching files and "
  "parsing package lists. The internal default is the architecture apt was "
  "compiled for."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:157
- msgid "Default-Release"
- msgstr "Default-Release"
+ msgid ""
+ "All Architectures the system supports. Processors implementing the "
+ "<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
+ "set are e.g. also able to execute binaries compiled for the <literal>i386</"
+ "literal> (<literal>x86</literal>) instruction set; This list is use when "
+ "fetching files and parsing package lists. The internal default is always the "
+ "native architecture (<literal>APT::Architecture</literal>)  and all foreign "
+ "architectures it can retrieve by calling <command>dpkg --print-foreign-"
+ "architectures</command>."
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:158
+ #: apt.conf.5.xml:167
  msgid ""
  "Default release to install packages from if more than one version available. "
  "Contains release name, codename or release version. Examples: 'stable', "
@@@ -5691,26 -4479,15 +4489,15 @@@
  "'5.0*'. See also &apt-preferences;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:163
- msgid "Ignore-Hold"
- msgstr "Ignore-Hold"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:164
+ #: apt.conf.5.xml:173
  msgid ""
  "Ignore Held packages; This global option causes the problem resolver to "
  "ignore held packages in its decision making."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:168
- #, fuzzy
- msgid "Clean-Installed"
- msgstr "B<--installed>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:169
+ #: apt.conf.5.xml:178
  msgid ""
  "Defaults to on. When turned on the autoclean feature will remove any "
  "packages which can no longer be downloaded from the cache. If turned off "
@@@ -5718,13 -4495,8 +4505,8 @@@
  "but note that APT provides no direct means to reinstall them."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:175
- msgid "Immediate-Configure"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:176
+ #: apt.conf.5.xml:185
  msgid ""
  "Defaults to on which will cause APT to install essential and important "
  "packages as fast as possible in the install/upgrade operation. This is done "
@@@ -5756,13 -4528,8 +4538,8 @@@
  "improving or correcting the upgrade process."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:198
- msgid "Force-LoopBreak"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:199
+ #: apt.conf.5.xml:208
  msgid ""
  "Never Enable this option unless you -really- know what you are doing. It "
  "permits APT to temporarily remove an essential package to break a Conflicts/"
@@@ -5772,89 -4539,59 +4549,59 @@@
  "those packages depend on."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:207
- msgid "Cache-Start, Cache-Grow and Cache-Limit"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:208
+ #: apt.conf.5.xml:217
  msgid ""
  "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
  "the 'available' information. <literal>Cache-Start</literal> acts as a hint "
  "to which size the Cache will grow and is therefore the amount of memory APT "
  "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
- "that these amount of space need to be available for APT otherwise it will "
- "likely fail ungracefully, so for memory restricted devices these value "
- "should be lowered while on systems with a lot of configured sources this "
- "might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
- "default of 1048576 (~1 MB) how much the Cache size will be increased in the "
- "event the space defined by <literal>Cache-Start</literal> is not enough. "
- "These value will be applied again and again until either the cache is big "
- "enough to store all information or the size of the cache reaches the "
- "<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
- "literal> is 0 which stands for no limit.  If <literal>Cache-Grow</literal> "
- "is set to 0 the automatic grow of the cache is disabled."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:223
- msgid "Build-Essential"
+ "that this amount of space needs to be available for APT otherwise it will "
+ "likely fail ungracefully, so for memory restricted devices this value should "
+ "be lowered while on systems with a lot of configured sources it should be "
+ "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
+ "of 1048576 (~1 MB) how much the Cache size will be increased in the event "
+ "the space defined by <literal>Cache-Start</literal> is not enough. These "
+ "value will be applied again and again until either the cache is big enough "
+ "to store all information or the size of the cache reaches the <literal>Cache-"
+ "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
+ "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
+ "automatic grow of the cache is disabled."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:224
+ #: apt.conf.5.xml:233
  msgid "Defines which package(s) are considered essential build dependencies."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:227
- msgid "Get"
- msgstr "Get"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:228
+ #: apt.conf.5.xml:237
  msgid ""
  "The Get subsection controls the &apt-get; tool, please see its documentation "
  "for more information about the options here."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:232
- msgid "Cache"
- msgstr "Cache"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:233
+ #: apt.conf.5.xml:242
  msgid ""
  "The Cache subsection controls the &apt-cache; tool, please see its "
  "documentation for more information about the options here."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:237
- msgid "CDROM"
- msgstr "CDROM"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:238
+ #: apt.conf.5.xml:247
  msgid ""
  "The CDROM subsection controls the &apt-cdrom; tool, please see its "
  "documentation for more information about the options here."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:244
+ #: apt.conf.5.xml:253
  msgid "The Acquire Group"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:249
- msgid "Check-Valid-Until"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:250
+ #: apt.conf.5.xml:259
  msgid ""
  "Security related option defaulting to true as an expiring validation for a "
  "Release file prevents longtime replay attacks and can e.g. also help users "
@@@ -5865,55 -4602,48 +4612,48 @@@
  "<literal>Max-ValidTime</literal> option can be used."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:260
- msgid "Max-ValidTime"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:261
+ #: apt.conf.5.xml:270
  msgid ""
- "Seconds the Release file should be considered valid after it was created. "
- "The default is \"for ever\" (0) if the Release file of the archive doesn't "
- "include a <literal>Valid-Until</literal> header.  If it does then this date "
- "is the default. The date from the Release file or the date specified by the "
- "creation time of the Release file (<literal>Date</literal> header) plus the "
- "seconds specified with this options are used to check if the validation of a "
- "file has expired by using the earlier date of the two. Archive specific "
- "settings can be made by appending the label of the archive to the option "
- "name."
+ "Seconds the Release file should be considered valid after it was created "
+ "(indicated by the <literal>Date</literal> header).  If the Release file "
+ "itself includes a <literal>Valid-Until</literal> header the earlier date of "
+ "the two is used as the expiration date.  The default value is <literal>0</"
+ "literal> which stands for \"for ever valid\".  Archive specific settings can "
+ "be made by appending the label of the archive to the option name."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:273
- msgid "PDiffs"
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:281
+ msgid ""
+ "Minimum of seconds the Release file should be considered valid after it was "
+ "created (indicated by the <literal>Date</literal> header).  Use this if you "
+ "need to use a seldomly updated (local) mirror of a more regular updated "
+ "archive with a <literal>Valid-Until</literal> header instead of completely "
+ "disabling the expiration date checking.  Archive specific settings can and "
+ "should be used by appending the label of the archive to the option name."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:274
+ #: apt.conf.5.xml:292
  msgid ""
  "Try to download deltas called <literal>PDiffs</literal> for Packages or "
  "Sources files instead of downloading whole ones. True by default."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:277
+ #: apt.conf.5.xml:295
  msgid ""
  "Two sub-options to limit the use of PDiffs are also available: With "
  "<literal>FileLimit</literal> can be specified how many PDiff files are "
- "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
- "other hand is the maximum precentage of the size of all patches compared to "
+ "downloaded at most to update a file. <literal>SizeLimit</literal> on the "
+ "other hand is the maximum percentage of the size of all patches compared to "
  "the size of the targeted file. If one of these limits is exceeded the "
  "complete file is downloaded instead of the patches."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
- msgid "Queue-Mode"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:305
  msgid ""
  "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
  "literal> or <literal>access</literal> which determines how APT parallelizes "
@@@ -5922,38 -4652,22 +4662,22 @@@
  "connection per URI type will be opened."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:294
- msgid "Retries"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:295
+ #: apt.conf.5.xml:313
  msgid ""
  "Number of retries to perform. If this is non-zero APT will retry failed "
  "files the given number of times."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:299
- #, fuzzy
- msgid "Source-Symlinks"
- msgstr "Sources"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:300
+ #: apt.conf.5.xml:318
  msgid ""
  "Use symlinks for source archives. If set to true then source archives will "
  "be symlinked when possible instead of copying. True is the default."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:304 sources.list.5.xml:144
- msgid "http"
- msgstr "http"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:305
+ #: apt.conf.5.xml:323
  msgid ""
  "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
  "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@@ -5964,7 -4678,7 +4688,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:313
+ #: apt.conf.5.xml:331
  msgid ""
  "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
  "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@@ -5978,7 -4692,7 +4702,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:323 apt.conf.5.xml:387
+ #: apt.conf.5.xml:341 apt.conf.5.xml:407
  msgid ""
  "The option <literal>timeout</literal> sets the timeout timer used by the "
  "method, this applies to all things including connection timeout and data "
@@@ -5986,19 -4700,26 +4710,26 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:326
+ #: apt.conf.5.xml:344
+ msgid ""
+ "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+ "enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
+ "g. on high-latency connections. It specifies how many requests are send in a "
+ "pipeline.  Previous APT versions had a default of 10 for this setting, but "
+ "the default value is now 0 (= disabled) to avoid problems with the ever-"
+ "growing amount of webservers and proxies which choose to not conform to the "
+ "HTTP/1.1 specification."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:351
  msgid ""
- "One setting is provided to control the pipeline depth in cases where the "
- "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
- "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
- "indicating how many outstanding requests APT should send. A value of zero "
- "MUST be specified if the remote host does not properly linger on TCP "
- "connections - otherwise data corruption will occur. Hosts which require this "
- "are in violation of RFC 2068."
+ "<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
+ "redirects, which is enabled by default."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:334
+ #: apt.conf.5.xml:354
  msgid ""
  "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
  "literal> which accepts integer values in kilobyte. The default value is 0 "
@@@ -6008,20 -4729,15 +4739,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:339
+ #: apt.conf.5.xml:359
  msgid ""
  "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
  "User-Agent for the http download method as some proxies allow access for "
  "clients only if the client uses a known identifier."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:345
- msgid "https"
- msgstr "https"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:346
+ #: apt.conf.5.xml:366
  msgid ""
  "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
  "options are the same as for <literal>http</literal> method and will also "
@@@ -6031,7 -4747,7 +4757,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:352
+ #: apt.conf.5.xml:372
  msgid ""
  "<literal>CaInfo</literal> suboption specifies place of file that holds info "
  "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@@ -6051,13 -4767,8 +4777,8 @@@
  "option."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:370 sources.list.5.xml:155
- msgid "ftp"
- msgstr "ftp"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:371
+ #: apt.conf.5.xml:391
  msgid ""
  "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
  "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@@ -6076,7 -4787,7 +4797,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:390
+ #: apt.conf.5.xml:410
  msgid ""
  "Several settings are provided to control passive mode. Generally it is safe "
  "to leave passive mode on, it works in nearly every environment.  However "
@@@ -6086,7 -4797,7 +4807,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:397
+ #: apt.conf.5.xml:417
  msgid ""
  "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
  "envar> environment variable to a http url - see the discussion of the http "
@@@ -6095,7 -4806,7 +4816,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:402
+ #: apt.conf.5.xml:422
  msgid ""
  "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
  "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@@ -6104,19 -4815,14 +4825,14 @@@
  "that most FTP servers do not support RFC2428."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:409 sources.list.5.xml:137
- msgid "cdrom"
- msgstr "cdrom"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:415
+ #: apt.conf.5.xml:435
  #, no-wrap
  msgid "/cdrom/::Mount \"foo\";"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:410
+ #: apt.conf.5.xml:430
  msgid ""
  "CDROM URIs; the only setting for CDROM URIs is the mount point, "
  "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@@ -6128,32 -4834,22 +4844,22 @@@
  "can be specified using UMount."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:420
- msgid "gpgv"
- msgstr "gpgv"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:421
+ #: apt.conf.5.xml:441
  msgid ""
  "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
  "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
  "passed to gpgv."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:426
- msgid "CompressionTypes"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:432
+ #: apt.conf.5.xml:452
  #, no-wrap
  msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:427
+ #: apt.conf.5.xml:447
  msgid ""
  "List of compression types which are understood by the acquire methods.  "
  "Files like <filename>Packages</filename> can be available in various "
@@@ -6165,19 -4861,19 +4871,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:437
+ #: apt.conf.5.xml:457
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order:: \"gz\";"
  msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:440
+ #: apt.conf.5.xml:460
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:433
+ #: apt.conf.5.xml:453
  msgid ""
  "Also the <literal>Order</literal> subgroup can be used to define in which "
  "order the acquire system will try to download the compressed files. The "
@@@ -6194,20 -4890,20 +4900,20 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:444
+ #: apt.conf.5.xml:464
  #, no-wrap
  msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
  msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:442
+ #: apt.conf.5.xml:462
  msgid ""
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
  "will only be used if this file exists, e.g. for the bzip2 method (the "
- "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
- "that list entries specified on the command line will be added at the end of "
- "the list specified in the configuration files, but before the default "
+ "inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+ "also that list entries specified on the command line will be added at the "
+ "end of the list specified in the configuration files, but before the default "
  "entries. To prefer a type in this case over the ones specified in the "
  "configuration files you can set the option direct - not in list style.  This "
  "will not override the defined list, it will only prefix the list with this "
@@@ -6215,20 -4911,15 +4921,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:449
+ #: apt.conf.5.xml:469
  msgid ""
  "The special type <literal>uncompressed</literal> can be used to give "
- "uncompressed files a preference, but note that most archives doesn't provide "
+ "uncompressed files a preference, but note that most archives don't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:454
- msgid "GzipIndexes"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:456
+ #: apt.conf.5.xml:476
  msgid ""
  "When downloading <literal>gzip</literal> compressed indexes (Packages, "
  "Sources, or Translations), keep them gzip compressed locally instead of "
@@@ -6236,13 -4927,8 +4937,8 @@@
  "CPU requirements when building the local package caches. False by default."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:463
- msgid "Languages"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:464
+ #: apt.conf.5.xml:484
  msgid ""
  "The Languages subsection controls which <filename>Translation</filename> "
  "files are downloaded and in which order APT tries to display the Description-"
@@@ -6255,13 -4941,13 +4951,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
- #: apt.conf.5.xml:480
+ #: apt.conf.5.xml:500
  #, no-wrap
  msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:470
+ #: apt.conf.5.xml:490
  msgid ""
  "The default list includes \"environment\" and \"en\". "
  "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@@ -6283,32 -4969,41 +4979,41 @@@
  "\"0\"/>"
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:501
+ msgid ""
+ "Note: To prevent problems resulting from APT being executed in different "
+ "environments (e.g. by different users or by other programs) all Translation "
+ "files which are found in <filename>/var/lib/apt/lists/</filename> will be "
+ "added to the end of the list (after an implicit \"<literal>none</literal>\")."
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:245
+ #: apt.conf.5.xml:254
  msgid ""
  "The <literal>Acquire</literal> group of options controls the download of "
  "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:487
+ #: apt.conf.5.xml:512
  msgid "Directories"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:489
+ #: apt.conf.5.xml:514
  msgid ""
  "The <literal>Dir::State</literal> section has directories that pertain to "
  "local state information. <literal>lists</literal> is the directory to place "
  "downloaded package lists in and <literal>status</literal> is the name of the "
  "dpkg status file.  <literal>preferences</literal> is the name of the APT "
- "preferences file.  <literal>Dir::State</literal> contains the default "
- "directory to prefix on all sub items if they do not start with <filename>/</"
- "filename> or <filename>./</filename>."
+ "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
+ "contains the default directory to prefix on all sub items if they do not "
+ "start with <filename>/</filename> or <filename>./</filename>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:496
+ #: apt.conf.5.xml:521
  msgid ""
  "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
  "information, such as the two package caches <literal>srcpkgcache</literal> "
@@@ -6321,7 -5016,7 +5026,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:505
+ #: apt.conf.5.xml:530
  msgid ""
  "<literal>Dir::Etc</literal> contains the location of configuration files, "
  "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@@ -6331,7 -5026,7 +5036,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:511
+ #: apt.conf.5.xml:536
  msgid ""
  "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
  "in lexical order from the directory specified. After this is done then the "
@@@ -6339,7 -5034,7 +5044,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:515
+ #: apt.conf.5.xml:540
  msgid ""
  "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
  "Bin::Methods</literal> specifies the location of the method handlers and "
@@@ -6350,7 -5045,7 +5055,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:523
+ #: apt.conf.5.xml:548
  msgid ""
  "The configuration item <literal>RootDir</literal> has a special meaning.  If "
  "set, all paths in <literal>Dir::</literal> will be relative to "
@@@ -6363,7 -5058,7 +5068,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:536
+ #: apt.conf.5.xml:561
  msgid ""
  "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
  "which files APT should silently ignore while parsing the files in the "
@@@ -6374,26 -5069,20 +5079,20 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:545
+ #: apt.conf.5.xml:570
  msgid "APT in DSelect"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:547
+ #: apt.conf.5.xml:572
  msgid ""
  "When APT is used as a &dselect; method several configuration directives "
  "control the default behaviour. These are in the <literal>DSelect</literal> "
  "section."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:551
- #, fuzzy
- msgid "Clean"
- msgstr "B<clean>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:552
+ #: apt.conf.5.xml:577
  msgid ""
  "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
  "and never.  always and prompt will remove all packages from the cache after "
@@@ -6404,69 -5093,48 +5103,48 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:561
+ #: apt.conf.5.xml:586
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the install phase."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:565
- #, fuzzy
- msgid "Updateoptions"
- msgstr "opcje"
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:566
+ #: apt.conf.5.xml:591
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the update phase."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:570
- msgid "PromptAfterUpdate"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:571
+ #: apt.conf.5.xml:596
  msgid ""
  "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
  "The default is to prompt only on error."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:577
+ #: apt.conf.5.xml:602
  msgid "How APT calls dpkg"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:578
+ #: apt.conf.5.xml:603
  msgid ""
  "Several configuration directives control how APT invokes &dpkg;. These are "
  "in the <literal>DPkg</literal> section."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:583
+ #: apt.conf.5.xml:608
  msgid ""
  "This is a list of options to pass to dpkg. The options must be specified "
  "using the list notation and each list item is passed as a single argument to "
  "&dpkg;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Pre-Invoke"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Post-Invoke"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:589
+ #: apt.conf.5.xml:614
  msgid ""
  "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -6474,13 -5142,8 +5152,8 @@@
  "fail APT will abort."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:595
- msgid "Pre-Install-Pkgs"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:596
+ #: apt.conf.5.xml:621
  msgid ""
  "This is a list of shell commands to run before invoking dpkg. Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -6490,7 -5153,7 +5163,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:602
+ #: apt.conf.5.xml:627
  msgid ""
  "Version 2 of this protocol dumps more information, including the protocol "
  "version, the APT configuration space and the packages, files and versions "
@@@ -6499,38 -5162,27 +5172,27 @@@
  "given to <literal>Pre-Install-Pkgs</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:609
- msgid "Run-Directory"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:610
+ #: apt.conf.5.xml:635
  msgid ""
  "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
  "</filename>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:614
- #, fuzzy
- msgid "Build-options"
- msgstr "opcje"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:615
+ #: apt.conf.5.xml:640
  msgid ""
  "These options are passed to &dpkg-buildpackage; when compiling packages, the "
  "default is to disable signing and produce all binaries."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt.conf.5.xml:620
+ #: apt.conf.5.xml:645
  msgid "dpkg trigger usage (and related options)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:621
+ #: apt.conf.5.xml:646
  msgid ""
  "APT can call dpkg in a way so it can make aggressive use of triggers over "
  "multiple calls of dpkg. Without further options dpkg will use triggers only "
@@@ -6545,7 -5197,7 +5207,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
- #: apt.conf.5.xml:636
+ #: apt.conf.5.xml:661
  #, no-wrap
  msgid ""
  "DPkg::NoTriggers \"true\";\n"
@@@ -6559,7 -5211,7 +5221,7 @@@ msgstr "
  "DPkg::TriggersPending \"true\";"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:630
+ #: apt.conf.5.xml:655
  msgid ""
  "Note that it is not guaranteed that APT will support these options or that "
  "these options will not cause (big) trouble in the future. If you have "
@@@ -6572,13 -5224,8 +5234,8 @@@
  "would be <placeholder type=\"literallayout\" id=\"0\"/>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:642
- msgid "DPkg::NoTriggers"
- msgstr "DPkg::NoTriggers"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:643
+ #: apt.conf.5.xml:668
  msgid ""
  "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
  "call).  See &dpkg; if you are interested in what this actually means. In "
@@@ -6589,13 -5236,8 +5246,8 @@@
  "dpkg - now apt will add these flag also to the unpack and remove calls."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:650
- msgid "PackageManager::Configure"
- msgstr "PackageManager::Configure"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:651
+ #: apt.conf.5.xml:676
  msgid ""
  "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
  "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@@ -6610,13 -5252,8 +5262,8 @@@
  "the system could end in an unconfigured status which could be unbootable!"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:661
- msgid "DPkg::ConfigurePending"
- msgstr "DPkg::ConfigurePending"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:662
+ #: apt.conf.5.xml:687
  msgid ""
  "If this option is set apt will call <command>dpkg --configure --pending</"
  "command> to let dpkg handle all required configurations and triggers. This "
@@@ -6626,13 -5263,8 +5273,8 @@@
  "you could deactivate this option in all but the last run."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:668
- msgid "DPkg::TriggersPending"
- msgstr "DPkg::TriggersPending"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:669
+ #: apt.conf.5.xml:694
  msgid ""
  "Useful for <literal>smart</literal> configuration as a package which has "
  "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@@ -6641,13 -5273,8 +5283,8 @@@
  "triggers, not only the triggers needed to configure this package."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:674
- msgid "PackageManager::UnpackAll"
- msgstr "PackageManager::UnpackAll"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:675
+ #: apt.conf.5.xml:700
  msgid ""
  "As the configuration can be deferred to be done at the end by dpkg it can be "
  "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@@ -6658,13 -5285,8 +5295,8 @@@
  "really useful."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:682
- msgid "OrderList::Score::Immediate"
- msgstr "OrderList::Score::Immediate"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:690
+ #: apt.conf.5.xml:715
  #, no-wrap
  msgid ""
  "OrderList::Score {\n"
@@@ -6682,7 -5304,7 +5314,7 @@@ msgstr "
  "};"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:683
+ #: apt.conf.5.xml:708
  msgid ""
  "Essential packages (and there dependencies) should be configured immediately "
  "after unpacking. It will be a good idea to do this quite early in the "
@@@ -6696,12 -5318,12 +5328,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:703
+ #: apt.conf.5.xml:728
  msgid "Periodic and Archives options"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:704
+ #: apt.conf.5.xml:729
  msgid ""
  "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
  "of options configure behavior of apt periodic updates, which is done by "
@@@ -6710,13 -5332,13 +5342,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:712
+ #: apt.conf.5.xml:737
  #, fuzzy
  msgid "Debug options"
  msgstr "opcje"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:714
+ #: apt.conf.5.xml:739
  msgid ""
  "Enabling options in the <literal>Debug::</literal> section will cause "
  "debugging information to be sent to the standard error stream of the program "
@@@ -6727,7 -5349,7 +5359,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:725
+ #: apt.conf.5.xml:750
  msgid ""
  "<literal>Debug::pkgProblemResolver</literal> enables output about the "
  "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@@ -6735,7 -5357,7 +5367,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:733
+ #: apt.conf.5.xml:758
  msgid ""
  "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
  "used to run some operations (for instance, <literal>apt-get -s install</"
@@@ -6743,7 -5365,7 +5375,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:742
+ #: apt.conf.5.xml:767
  msgid ""
  "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
  "time that <literal>apt</literal> invokes &dpkg;."
@@@ -6753,7 -5375,7 +5385,7 @@@ msgstr "
  #. 	   motivating example, except I haven't a clue why you'd want
  #. 	   to do this. 
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:750
+ #: apt.conf.5.xml:775
  #, fuzzy
  msgid ""
  "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
@@@ -6763,198 -5385,113 +5395,113 @@@ msgstr "
  "in CDROM IDs."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:760
+ #: apt.conf.5.xml:785
  msgid "A full list of debugging options to apt follows."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:765
- msgid "<literal>Debug::Acquire::cdrom</literal>"
- msgstr "<literal>Debug::Acquire::cdrom</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:769
+ #: apt.conf.5.xml:794
  msgid ""
  "Print information related to accessing <literal>cdrom://</literal> sources."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:776
- msgid "<literal>Debug::Acquire::ftp</literal>"
- msgstr "<literal>Debug::Acquire::ftp</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:780
+ #: apt.conf.5.xml:805
  msgid "Print information related to downloading packages using FTP."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:787
- msgid "<literal>Debug::Acquire::http</literal>"
- msgstr "<literal>Debug::Acquire::http</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:791
+ #: apt.conf.5.xml:816
  msgid "Print information related to downloading packages using HTTP."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:798
- msgid "<literal>Debug::Acquire::https</literal>"
- msgstr "<literal>Debug::Acquire::https</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:802
+ #: apt.conf.5.xml:827
  msgid "Print information related to downloading packages using HTTPS."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:809
- msgid "<literal>Debug::Acquire::gpgv</literal>"
- msgstr "<literal>Debug::Acquire::gpgv</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:813
+ #: apt.conf.5.xml:838
  msgid ""
  "Print information related to verifying cryptographic signatures using "
  "<literal>gpg</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:820
- msgid "<literal>Debug::aptcdrom</literal>"
- msgstr "<literal>Debug::aptcdrom</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:824
+ #: apt.conf.5.xml:849
  msgid ""
  "Output information about the process of accessing collections of packages "
  "stored on CD-ROMs."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:831
- msgid "<literal>Debug::BuildDeps</literal>"
- msgstr "<literal>Debug::BuildDeps</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:834
+ #: apt.conf.5.xml:859
  msgid "Describes the process of resolving build-dependencies in &apt-get;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:841
- msgid "<literal>Debug::Hashes</literal>"
- msgstr "<literal>Debug::Hashes</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:844
+ #: apt.conf.5.xml:869
  msgid ""
  "Output each cryptographic hash that is generated by the <literal>apt</"
  "literal> libraries."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:851
- msgid "<literal>Debug::IdentCDROM</literal>"
- msgstr "<literal>Debug::IdentCDROM</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:854
+ #: apt.conf.5.xml:879
  msgid ""
  "Do not include information from <literal>statfs</literal>, namely the number "
  "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
  "a CD-ROM."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:862
- msgid "<literal>Debug::NoLocking</literal>"
- msgstr "<literal>Debug::NoLocking</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:865
+ #: apt.conf.5.xml:890
  msgid ""
  "Disable all file locking.  For instance, this will allow two instances of "
  "<quote><literal>apt-get update</literal></quote> to run at the same time."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:873
- msgid "<literal>Debug::pkgAcquire</literal>"
- msgstr "<literal>Debug::pkgAcquire</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:877
+ #: apt.conf.5.xml:902
  msgid "Log when items are added to or removed from the global download queue."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:884
- msgid "<literal>Debug::pkgAcquire::Auth</literal>"
- msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:887
+ #: apt.conf.5.xml:912
  msgid ""
  "Output status messages and errors related to verifying checksums and "
  "cryptographic signatures of downloaded files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:894
- msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
- msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:897
+ #: apt.conf.5.xml:922
  msgid ""
  "Output information about downloading and applying package index list diffs, "
  "and errors relating to package index list diffs."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:905
- msgid "<literal>Debug::pkgAcquire::RRed</literal>"
- msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:909
+ #: apt.conf.5.xml:934
  msgid ""
  "Output information related to patching apt package lists when downloading "
  "index diffs instead of full indices."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:916
- msgid "<literal>Debug::pkgAcquire::Worker</literal>"
- msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:920
+ #: apt.conf.5.xml:945
  msgid ""
  "Log all interactions with the sub-processes that actually perform downloads."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:927
- msgid "<literal>Debug::pkgAutoRemove</literal>"
- msgstr "<literal>Debug::pkgAutoRemove</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:931
+ #: apt.conf.5.xml:956
  msgid ""
  "Log events related to the automatically-installed status of packages and to "
  "the removal of unused packages."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:938
- msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
- msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:941
+ #: apt.conf.5.xml:966
  msgid ""
  "Generate debug messages describing which packages are being automatically "
  "installed to resolve dependencies.  This corresponds to the initial auto-"
@@@ -6963,13 -5500,8 +5510,8 @@@
  "pkgProblemResolver</literal> for that."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:952
- msgid "<literal>Debug::pkgDepCache::Marker</literal>"
- msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:955
+ #: apt.conf.5.xml:980
  msgid ""
  "Generate debug messages describing which package is marked as keep/install/"
  "remove while the ProblemResolver does his work.  Each addition or deletion "
@@@ -6985,142 -5517,83 +5527,83 @@@
  "<literal>section</literal> is the name of the section the package appears in."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:974
- msgid "<literal>Debug::pkgInitConfig</literal>"
- msgstr "<literal>Debug::pkgInitConfig</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:977
+ #: apt.conf.5.xml:1002
  msgid "Dump the default configuration to standard error on startup."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:984
- msgid "<literal>Debug::pkgDPkgPM</literal>"
- msgstr "<literal>Debug::pkgDPkgPM</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:987
+ #: apt.conf.5.xml:1012
  msgid ""
  "When invoking &dpkg;, output the precise command line with which it is being "
  "invoked, with arguments separated by a single space character."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:995
- msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
- msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:998
+ #: apt.conf.5.xml:1023
  msgid ""
  "Output all the data received from &dpkg; on the status file descriptor and "
  "any errors encountered while parsing it."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1005
- msgid "<literal>Debug::pkgOrderList</literal>"
- msgstr "<literal>Debug::pkgOrderList</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1009
+ #: apt.conf.5.xml:1034
  msgid ""
  "Generate a trace of the algorithm that decides the order in which "
  "<literal>apt</literal> should pass packages to &dpkg;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1017
- msgid "<literal>Debug::pkgPackageManager</literal>"
- msgstr "<literal>Debug::pkgPackageManager</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1021
+ #: apt.conf.5.xml:1046
  msgid ""
  "Output status messages tracing the steps performed when invoking &dpkg;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1028
- msgid "<literal>Debug::pkgPolicy</literal>"
- msgstr "<literal>Debug::pkgPolicy</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1032
+ #: apt.conf.5.xml:1057
  msgid "Output the priority of each package list on startup."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1038
- msgid "<literal>Debug::pkgProblemResolver</literal>"
- msgstr "<literal>Debug::pkgProblemResolver</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1042
+ #: apt.conf.5.xml:1067
  msgid ""
  "Trace the execution of the dependency resolver (this applies only to what "
  "happens when a complex dependency problem is encountered)."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1050
- msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
- msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1053
+ #: apt.conf.5.xml:1078
  msgid ""
  "Display a list of all installed packages with their calculated score used by "
  "the pkgProblemResolver. The description of the package is the same as "
  "described in <literal>Debug::pkgDepCache::Marker</literal>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1061
- msgid "<literal>Debug::sourceList</literal>"
- msgstr "<literal>Debug::sourceList</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1065
+ #: apt.conf.5.xml:1090
  msgid ""
  "Print information about the vendors read from <filename>/etc/apt/vendors."
  "list</filename>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1088
+ #: apt.conf.5.xml:1113
  msgid ""
  "&configureindex; is a configuration file showing example values for all "
  "possible options."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt.conf.5.xml:1095
+ #: apt.conf.5.xml:1120
  msgid "&file-aptconf;"
  msgstr "&file-aptconf;"
  
  #.  ? reading apt.conf 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1100
+ #: apt.conf.5.xml:1125
  msgid "&apt-cache;, &apt-config;, &apt-preferences;."
  msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt_preferences.5.xml:16
- #, fuzzy
- #| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
- msgid ""
- "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
- msgstr "&apt-author.team; &apt-email; &apt-product; <date>4 maja 2009</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt_preferences.5.xml:24 apt_preferences.5.xml:31
- msgid "apt_preferences"
- msgstr "apt_preferences"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt_preferences.5.xml:32
  msgid "Preference control file for APT"
@@@ -7185,8 -5658,8 +5668,8 @@@ msgstr "
  msgid ""
  "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
  "directory are parsed in alphanumeric ascending order and need to obey the "
- "following naming convention: The files have no or \"<literal>pref</literal>"
- "\" as filename extension and which only contain alphanumeric, hyphen (-), "
+ "following naming convention: The files have either no or \"<literal>pref</"
+ "literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
  "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
  "that it has ignored a file if the file doesn't match a pattern in the "
  "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@@ -7548,7 -6021,7 +6031,7 @@@ msgid "
  "APT also supports pinning by glob() expressions and regular expressions "
  "surrounded by /. For example, the following example assigns the priority 500 "
  "to all packages from experimental where the name starts with gnome (as a glob"
- "()-like expression or contains the word kde (as a POSIX extended regular "
+ "()-like expression) or contains the word kde (as a POSIX extended regular "
  "expression surrounded by slashes)."
  msgstr ""
  
@@@ -7572,7 -6045,7 +6055,7 @@@ msgstr "
  #: apt_preferences.5.xml:279
  msgid ""
  "The rule for those expressions is that they can occur anywhere where a "
- "string can occur. Those, the following pin assigns the priority 990 to all "
+ "string can occur. Thus, the following pin assigns the priority 990 to all "
  "packages from a release starting with karmic."
  msgstr ""
  
@@@ -7592,28 -6065,29 +6075,29 @@@ msgstr "
  "Pin: release a=unstable\n"
  "Pin-Priority: 50\n"
  
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:290
- msgid "Package"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:296
- msgid "*"
+ #. type: Content of: <refentry><refsect1><refsect2><para>
+ #: apt_preferences.5.xml:291
+ msgid ""
+ "If a regular expression occurs in a <literal>Package</literal> field, the "
+ "behavior is the same as if this regular expression were replaced with a list "
+ "of all package names it matches. It is undecided whether this will change in "
+ "the future, thus you should always list wild-card pins first, so later "
+ "specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+ "Package field is not considered a glob() expression in itself."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:306
+ #: apt_preferences.5.xml:307
  msgid "How APT Interprets Priorities"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:314
+ #: apt_preferences.5.xml:315
  msgid "P &gt; 1000"
  msgstr "P &gt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:315
+ #: apt_preferences.5.xml:316
  #, fuzzy
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
@@@ -7623,12 -6097,12 +6107,12 @@@ msgstr "
  "pakietu nie jest jeszcze zainstalowana"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:319
+ #: apt_preferences.5.xml:320
  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:320
+ #: apt_preferences.5.xml:321
  #, fuzzy
  msgid ""
  "causes a version to be installed even if it does not come from the target "
@@@ -7638,12 -6112,12 +6122,12 @@@ msgstr "
  "pakietu nie jest jeszcze zainstalowana"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:325
+ #: apt_preferences.5.xml:326
  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:326
+ #: apt_preferences.5.xml:327
  #, fuzzy
  msgid ""
  "causes a version to be installed unless there is a version available "
@@@ -7653,12 -6127,12 +6137,12 @@@ msgstr "
  "pakietu nie jest jeszcze zainstalowana"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:331
+ #: apt_preferences.5.xml:332
  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:332
+ #: apt_preferences.5.xml:333
  #, fuzzy
  msgid ""
  "causes a version to be installed unless there is a version available "
@@@ -7668,12 -6142,12 +6152,12 @@@ msgstr "
  "pakietu nie jest jeszcze zainstalowana"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:337
+ #: apt_preferences.5.xml:338
  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:338
+ #: apt_preferences.5.xml:339
  msgid ""
  "causes a version to be installed only if there is no installed version of "
  "the package"
@@@ -7682,17 -6156,17 +6166,17 @@@ msgstr "
  "pakietu nie jest jeszcze zainstalowana"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:342
+ #: apt_preferences.5.xml:343
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:343
+ #: apt_preferences.5.xml:344
  msgid "prevents the version from being installed"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:309
+ #: apt_preferences.5.xml:310
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -7700,7 -6174,7 +6184,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:348
+ #: apt_preferences.5.xml:349
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -7709,14 -6183,14 +6193,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:354
+ #: apt_preferences.5.xml:355
  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:358
+ #: apt_preferences.5.xml:359
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -7744,12 -6218,12 +6228,12 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:371
+ #: apt_preferences.5.xml:372
  msgid "Then:"
  msgstr "Wtedy:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:373
+ #: apt_preferences.5.xml:374
  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 "
@@@ -7759,7 -6233,7 +6243,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:378
+ #: apt_preferences.5.xml:379
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -7767,7 -6241,7 +6251,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:382
+ #: apt_preferences.5.xml:383
  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</"
@@@ -7776,12 -6250,12 +6260,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:392
+ #: apt_preferences.5.xml:393
  msgid "Determination of Package Version and Distribution Properties"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:394
+ #: apt_preferences.5.xml:395
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -7789,27 -6263,27 +6273,27 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:406
+ #: apt_preferences.5.xml:407
  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:407
+ #: apt_preferences.5.xml:408
  msgid "gives the package name"
  msgstr "podaje nazwę pakietu"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+ #: apt_preferences.5.xml:411 apt_preferences.5.xml:461
  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:411
+ #: apt_preferences.5.xml:412
  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:398
+ #: apt_preferences.5.xml:399
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -7822,12 -6296,12 +6306,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:427
+ #: apt_preferences.5.xml:428
  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:428
+ #: apt_preferences.5.xml:429
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -7838,18 -6312,18 +6322,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:438
+ #: apt_preferences.5.xml:439
  #, 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:444
+ #: apt_preferences.5.xml:445
  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:445
+ #: apt_preferences.5.xml:446
  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 "
@@@ -7860,14 -6334,14 +6344,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:454
+ #: apt_preferences.5.xml:455
  #, 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:461
+ #: apt_preferences.5.xml:462
  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 "
@@@ -7877,7 -6351,7 +6361,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:470
+ #: apt_preferences.5.xml:471
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -7889,12 -6363,12 +6373,12 @@@ msgstr "
  "Pin: release 3.0\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:479
+ #: apt_preferences.5.xml:480
  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:480
+ #: apt_preferences.5.xml:481
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -7905,18 -6379,18 +6389,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:489
+ #: apt_preferences.5.xml:490
  #, 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:495
+ #: apt_preferences.5.xml:496
  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:496
+ #: apt_preferences.5.xml:497
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -7925,18 -6399,18 +6409,18 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:502
+ #: apt_preferences.5.xml:503
  #, 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:508
+ #: apt_preferences.5.xml:509
  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:509
+ #: apt_preferences.5.xml:510
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -7945,13 -6419,13 +6429,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:515
+ #: apt_preferences.5.xml:516
  #, 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:416
+ #: apt_preferences.5.xml:417
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -7965,7 -6439,7 +6449,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:522
+ #: apt_preferences.5.xml:523
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -7980,12 -6454,12 +6464,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:535
+ #: apt_preferences.5.xml:536
  msgid "Optional Lines in an APT Preferences Record"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:537
+ #: apt_preferences.5.xml:538
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -7993,12 -6467,12 +6477,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:546
+ #: apt_preferences.5.xml:547
  msgid "Tracking Stable"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:554
+ #: apt_preferences.5.xml:555
  #, fuzzy, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -8022,7 -6496,7 +6506,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:548
+ #: apt_preferences.5.xml:549
  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 "
@@@ -8032,8 -6506,8 +6516,8 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:571 apt_preferences.5.xml:617
- #: apt_preferences.5.xml:675
+ #: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+ #: apt_preferences.5.xml:676
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -8045,7 -6519,7 +6529,7 @@@ msgstr "
  "apt-get dist-upgrade\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:566
+ #: apt_preferences.5.xml:567
  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 "
@@@ -8054,13 -6528,13 +6538,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:583
+ #: apt_preferences.5.xml:584
  #, 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:577
+ #: apt_preferences.5.xml:578
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -8069,12 -6543,12 +6553,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:589
+ #: apt_preferences.5.xml:590
  msgid "Tracking Testing or Unstable"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:598
+ #: apt_preferences.5.xml:599
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8102,7 -6576,7 +6586,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:591
+ #: apt_preferences.5.xml:592
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -8113,7 -6587,7 +6597,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:612
+ #: apt_preferences.5.xml:613
  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 "
@@@ -8122,13 -6596,13 +6606,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:632
+ #: apt_preferences.5.xml:633
  #, 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:623
+ #: apt_preferences.5.xml:624
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -8140,12 -6614,12 +6624,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:639
+ #: apt_preferences.5.xml:640
  msgid "Tracking the evolution of a codename release"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:653
+ #: apt_preferences.5.xml:654
  #, fuzzy, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -8179,7 -6653,7 +6663,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:641
+ #: apt_preferences.5.xml:642
  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 "
@@@ -8194,7 -6668,7 +6678,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:670
+ #: apt_preferences.5.xml:671
  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 "
@@@ -8203,13 -6677,13 +6687,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:690
+ #: apt_preferences.5.xml:691
  #, 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:681
+ #: apt_preferences.5.xml:682
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -8221,20 -6695,15 +6705,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt_preferences.5.xml:699
+ #: apt_preferences.5.xml:700
  msgid "&file-preferences;"
  msgstr "&file-preferences;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt_preferences.5.xml:705
+ #: apt_preferences.5.xml:706
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: sources.list.5.xml:25 sources.list.5.xml:32
- msgid "sources.list"
- msgstr "sources.list"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: sources.list.5.xml:33
  msgid "Package resource list for APT"
@@@ -8361,7 -6830,7 +6840,7 @@@ msgstr "
  #: sources.list.5.xml:81
  #, fuzzy, no-wrap
  #| msgid "deb uri distribution [component1] [component2] [...]"
- msgid "deb uri distribution [component1] [component2] [...]"
+ msgid "deb [ options ] uri distribution [component1] [component2] [...]"
  msgstr "deb URI dystrybucja [komponent1] [komponent2] [...]"
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -8434,6 -6903,38 +6913,38 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:112
  msgid ""
+ "<literal>options</literal> is always optional and needs to be surounded by "
+ "square brackets. It can consist of multiple settings in the form "
+ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+ "replaceable></literal>.  Multiple settings are separated by spaces. The "
+ "following settings are supported by APT, note though that unsupported "
+ "settings will be ignored silently:"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:117
+ msgid ""
+ "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+ "replaceable>,…</literal> can be used to specify for which architectures "
+ "packages information should be downloaded. If this option is not set all "
+ "architectures defined by the <literal>APT::Architectures</literal> option "
+ "will be downloaded."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:121
+ msgid ""
+ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+ "this source are always authenticated even if the <filename>Release</"
+ "filename> file is not signed or the signature can't be checked. This "
+ "disables parts of &apt-secure; and should therefore only be used in a local "
+ "and trusted context. <literal>trusted=no</literal> is the opposite which "
+ "handles even correctly authenticated sources as not authenticated."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:128
+ msgid ""
  "It is important to list sources in order of preference, with the most "
  "preferred source listed first. Typically this will result in sorting by "
  "speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@@ -8446,12 -6947,12 +6957,12 @@@ msgstr "
  "komputerami w Internecie)."
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:117
+ #: sources.list.5.xml:133
  msgid "Some examples:"
  msgstr "Kilka przykładów:"
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:119
+ #: sources.list.5.xml:135
  #, fuzzy, no-wrap
  #| msgid ""
  #| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
@@@ -8467,17 -6968,17 +6978,17 @@@ msgstr "
  "   "
  
  #. type: Content of: <refentry><refsect1><title>
- #: sources.list.5.xml:125
+ #: sources.list.5.xml:141
  msgid "URI specification"
  msgstr "Określanie URI"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:130
+ #: sources.list.5.xml:146
  msgid "file"
  msgstr "file"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:132
+ #: sources.list.5.xml:148
  msgid ""
  "The file scheme allows an arbitrary directory in the file system to be "
  "considered an archive. This is useful for NFS mounts and local mirrors or "
@@@ -8487,8 -6988,13 +6998,13 @@@ msgstr "
  "plików. Jest użyteczny dla katalogów montowanych przez NFS i lokalnych kopii "
  "archiwów."
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:153
+ msgid "cdrom"
+ msgstr "cdrom"
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:139
+ #: sources.list.5.xml:155
  msgid ""
  "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
  "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@@ -8497,8 -7003,13 +7013,13 @@@ msgstr "
  "Prosimy używać programu &apt-cdrom; do dodawania takich wpisów w sources."
  "list."
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:160
+ msgid "http"
+ msgstr "http"
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:146
+ #: sources.list.5.xml:162
  msgid ""
  "The http scheme specifies an HTTP server for the archive. If an environment "
  "variable <envar>http_proxy</envar> is set with the format http://server:"
@@@ -8514,8 -7025,13 +7035,13 @@@ msgstr "
  "hasło@serwer:port/. Proszę zauważyć, że taki sposób autoryzacji nie jest "
  "bezpieczny."
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:171
+ msgid "ftp"
+ msgstr "ftp"
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:157
+ #: sources.list.5.xml:173
  msgid ""
  "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
  "is highly configurable; for more information see the &apt-conf; manual page. "
@@@ -8534,12 -7050,12 +7060,12 @@@ msgstr "
  "używające http zostaną zignorowane."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:166
+ #: sources.list.5.xml:182
  msgid "copy"
  msgstr "copy"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:168
+ #: sources.list.5.xml:184
  msgid ""
  "The copy scheme is identical to the file scheme except that packages are "
  "copied into the cache directory instead of used directly at their location.  "
@@@ -8551,17 -7067,17 +7077,17 @@@ msgstr "
  "skopiowania plików przy użyciu APT."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "rsh"
  msgstr "rsh"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "ssh"
  msgstr "ssh"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:175
+ #: sources.list.5.xml:191
  msgid ""
  "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
  "user and access the files. It is a good idea to do prior arrangements with "
@@@ -8577,12 -7093,12 +7103,12 @@@ msgstr "
  "ze zdalnego komputera."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:183
+ #: sources.list.5.xml:199
  msgid "more recognizable URI types"
  msgstr "więcej rozpoznawanych typów URI"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:185
+ #: sources.list.5.xml:201
  msgid ""
  "APT can be extended with more methods shipped in other optional packages "
  "which should follow the nameing scheme <literal>apt-transport-"
@@@ -8604,7 -7120,7 +7130,7 @@@ msgstr "
  "citerefentry>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:127
+ #: sources.list.5.xml:143
  msgid ""
  "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
  "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@@ -8613,7 -7129,7 +7139,7 @@@ msgstr "
  "ssh, rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:199
+ #: sources.list.5.xml:215
  msgid ""
  "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
  "stable/main, stable/contrib, and stable/non-free."
@@@ -8622,36 -7138,59 +7148,59 @@@ msgstr "
  "debian dla zasobów stable/main, stable/contrib i stable/non-free."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:201
+ #: sources.list.5.xml:217
  #, no-wrap
  msgid "deb file:/home/jason/debian stable main contrib non-free"
  msgstr "deb file:/home/jason/debian stable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:203
+ #: sources.list.5.xml:219
  msgid "As above, except this uses the unstable (development) distribution."
  msgstr ""
  "Jak wyżej, z tą różnicą że używa dystrybucji niestabilnej (deweloperskiej)."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:204
+ #: sources.list.5.xml:220
  #, no-wrap
  msgid "deb file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb file:/home/jason/debian unstable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:206
+ #: sources.list.5.xml:222
  msgid "Source line for the above"
  msgstr "Linie źródeł dla powyższego przykładu"
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:207
+ #: sources.list.5.xml:223
  #, no-wrap
  msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:209
+ #: sources.list.5.xml:225
+ msgid ""
+ "The first line gets package information for the architectures in "
+ "<literal>APT::Architectures</literal> while the second always retrieves "
+ "<literal>amd64</literal> and <literal>armel</literal>."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><literallayout>
+ #: sources.list.5.xml:227
+ #, fuzzy, no-wrap
+ #| msgid ""
+ #| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
+ #| "deb http://http.us.debian.org/debian dists/stable-updates/\n"
+ #| "   "
+ msgid ""
+ "deb http://ftp.debian.org/debian &stable-codename; main\n"
+ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ msgstr ""
+ "deb http://http.us.debian.org/debian stable main contrib non-free\n"
+ "deb http://http.us.debian.org/debian dists/stable-updates/\n"
+ "   "
+ 
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:230
  msgid ""
  "Uses HTTP to access the archive at archive.debian.org, and uses only the "
  "hamm/main area."
@@@ -8660,13 -7199,13 +7209,13 @@@ msgstr "
  "org i dystrybucji hamm/main."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:211
+ #: sources.list.5.xml:232
  #, no-wrap
  msgid "deb http://archive.debian.org/debian-archive hamm main"
  msgstr "deb http://archive.debian.org/debian-archive hamm main"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:213
+ #: sources.list.5.xml:234
  #, fuzzy
  #| msgid ""
  #| "Uses FTP to access the archive at ftp.debian.org, under the debian "
@@@ -8679,14 -7218,14 +7228,14 @@@ msgstr "
  "dystrybucji stable/contrib."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:215
+ #: sources.list.5.xml:236
  #, fuzzy, no-wrap
  #| msgid "deb ftp://ftp.debian.org/debian stable contrib"
  msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  msgstr "deb ftp://ftp.debian.org/debian stable contrib"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:217
+ #: sources.list.5.xml:238
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the unstable/contrib area. If this line appears as "
@@@ -8699,20 -7238,20 +7248,20 @@@ msgstr "
  "to pojedyncza sesja FTP będzie użyta w celu uzyskania dostępu do obu zasobów."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:221
+ #: sources.list.5.xml:242
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian unstable contrib"
  msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: sources.list.5.xml:230
+ #: sources.list.5.xml:251
  #, fuzzy, no-wrap
  #| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
  msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
  msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:223
+ #: sources.list.5.xml:244
  #, fuzzy
  #| msgid ""
  #| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@@ -8740,7 -7279,7 +7289,7 @@@ msgstr "
  "<placeholder type=\"literallayout\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:235
+ #: sources.list.5.xml:256
  msgid "&apt-cache; &apt-conf;"
  msgstr "&apt-cache;, &apt-conf;"
  
@@@ -8925,6 -7464,11 +7474,11 @@@ msgstr "
  "obecnie zainstalowane pakiety. ATP próbuje rozwiązać zależności używając "
  "pewnej liczby algorytmów pomagających w wyborze pakietów do zainstalowania."
  
+ #. type: <heading></heading>
+ #: guide.sgml:96
+ msgid "apt-get"
+ msgstr "apt-get"
+ 
  #. type: <p></p>
  #: guide.sgml:102
  msgid ""
@@@ -8976,6 -7520,11 +7530,11 @@@ msgstr "
  msgid "Once updated there are several commands that can be used:"
  msgstr "Po zaktualizowaniu można użyć następnych poleceń:"
  
+ #. type: <tag></tag>
+ #: guide.sgml:121
+ msgid "upgrade"
+ msgstr "upgrade"
+ 
  #. type: <p></p>
  #: guide.sgml:131
  msgid ""
@@@ -8996,6 -7545,11 +7555,11 @@@ msgstr "
  "w konflikcie z innymi pakietami. Można wymusić instalację takich pakietów, "
  "używając do tego <prgn>dselect</prgn> lub <tt>apt-get install</tt>."
  
+ #. type: <tag></tag>
+ #: guide.sgml:131
+ msgid "install"
+ msgstr "install"
+ 
  #. type: <p></p>
  #: guide.sgml:140
  msgid ""
@@@ -9016,6 -7570,11 +7580,11 @@@ msgstr "
  "wypisze podsumowanie i poprosi o potwierdzenie, jeśli zamierza zmienić "
  "cokolwiek innego niż pakiety podane jako jego argumenty."
  
+ #. type: <tag></tag>
+ #: guide.sgml:140
+ msgid "dist-upgrade"
+ msgstr "dist-upgrade"
+ 
  #. type: <p></p>
  #: guide.sgml:149
  msgid ""
@@@ -10270,45 -8829,170 +8839,170 @@@ msgid "Which will use the already fetch
  msgstr "Które użyje pobranych uprzednio archiwów z dysku."
  
  #, fuzzy
- #~| msgid "<option>--recurse</option>"
- #~ msgid "<option>--host-architecture</option>"
- #~ msgstr "<option>--recurse</option>"
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>17 August 2009</date>"
+ #~ msgid "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;        "
+ #~ "<date>17 sierpnia 2009</date>"
+ 
+ #~ msgid "ORIGINAL AUTHORS"
+ #~ msgstr "AUTORZY ORYGINAŁU"
+ 
+ #~ msgid "&apt-author.jgunthorpe;"
+ #~ msgstr "&apt-author.jgunthorpe;"
+ 
+ #~ msgid "CURRENT AUTHORS"
+ #~ msgstr "OBECNI AUTORZY"
+ 
+ #~ msgid "&apt-author.team;"
+ #~ msgstr "&apt-author.team;"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>17 August 2009</date>"
+ #~ msgid "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;        "
+ #~ "<date>17 sierpnia 2009</date>"
+ 
+ #, fuzzy
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+ #~ "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
+ #~ "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+ #~ "email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+ #~ "firstname> <surname>Burrows</surname> <contrib>Pierwsza dokumentacja "
+ #~ "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+ #~ "email; &apt-product; <date>18 września 2009</date>"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
+ #~ msgid "&apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.team; &apt-email; &apt-product; <date>4 maja 2009</date>"
+ 
+ #~ msgid ""
+ #~ "<!-- Boiler plate docinfo section -->\n"
+ #~ "<!ENTITY apt-docinfo \"\n"
+ #~ " <refentryinfo>\n"
+ #~ "   <address><email>apt@packages.debian.org</email></address>\n"
+ #~ "   <author>\n"
+ #~ "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+ #~ "     <contrib></contrib>\n"
+ #~ "   </author>\n"
+ #~ "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+ #~ "copyright>\n"
+ #~ "   <date>28 October 2008</date>\n"
+ #~ "   <productname>Linux</productname>\n"
+ #~ " </refentryinfo>\n"
+ #~ "\">\n"
+ #~ msgstr ""
+ #~ "<!-- Boiler plate docinfo section -->\n"
+ #~ "<!ENTITY apt-docinfo \"\n"
+ #~ " <refentryinfo>\n"
+ #~ "   <address><email>apt@packages.debian.org</email></address>\n"
+ #~ "   <author>\n"
+ #~ "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+ #~ "     <contrib></contrib>\n"
+ #~ "   </author>\n"
+ #~ "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+ #~ "copyright>\n"
+ #~ "   <date>28 października 2008</date>\n"
+ #~ "   <productname>Linux</productname>\n"
+ #~ " </refentryinfo>\n"
+ #~ "\">\n"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>14 February 2004</date>"
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>2012-05-21T05:49:00+01:00</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-"
+ #~ "product;          <date>14 lutego 2004</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>14 February 2004</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-"
+ #~ "product;          <date>14 lutego 2004</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>29 February 2004</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-"
+ #~ "product;         <date>29 lutego 2004</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 August 2009</date>"
+ #~ msgstr ""
+ #~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;        "
+ #~ "<date>17 sierpnia 2009</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>08 November 2008</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-"
+ #~ "product;          <date>8 listopada 2008</date>"
  
  #, fuzzy
  #~| msgid ""
- #~| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
- #~| "deb http://http.us.debian.org/debian dists/stable-updates/\n"
- #~| "   "
+ #~| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>9 August 2009</date>"
+ #~ msgid ""
+ #~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>21 April 2011</date>"
+ #~ msgstr ""
+ #~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;        "
+ #~ "<date>9 sierpnia 2009</date>"
+ 
  #~ msgid ""
- #~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
- #~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ #~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
+ #~ "get check</command>. It builds the source and package caches from the "
+ #~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</"
+ #~ "filename>."
  #~ msgstr ""
- #~ "deb http://http.us.debian.org/debian stable main contrib non-free\n"
- #~ "deb http://http.us.debian.org/debian dists/stable-updates/\n"
- #~ "   "
+ #~ "<literal>gencaches</literal> wykonuje te same operacje, co <command>apt-"
+ #~ "get check</command>. Buduje bufor pakietów oraz źródeł pakietów na "
+ #~ "podstawie źródeł wymienionych w &sources-list; oraz pliku <filename>/var/"
+ #~ "lib/dpkg/status</filename>."
  
- #~ msgid "<option>--md5</option>"
- #~ msgstr "<option>--md5</option>"
+ #~ msgid "add <replaceable>filename</replaceable>"
+ #~ msgstr "add <replaceable>nazwa_pliku</replaceable>"
  
- #~ msgid "unmarkauto"
- #~ msgstr "unmarkauto"
+ #~ msgid "del <replaceable>keyid</replaceable>"
+ #~ msgstr "del <replaceable>id_klucza</replaceable>"
  
- #~ msgid "<option>-h</option>"
- #~ msgstr "<option>-h</option>"
+ #~ msgid "export <replaceable>keyid</replaceable>"
+ #~ msgstr "export <replaceable>id_klucza</replaceable>"
  
- #~ msgid "<option>--help</option>"
- #~ msgstr "<option>--help</option>"
+ #~ msgid ""
+ #~ "Update the local keyring with the keyring of Debian archive keys and "
+ #~ "removes from the keyring the archive keys which are no longer valid."
+ #~ msgstr ""
+ #~ "Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum "
+ #~ "Debiana i usuwa z lokalnej składnicy nieaktualne już klucze archiwów "
+ #~ "Debiana."
+ 
+ #~ msgid "--keyring <replaceable>filename</replaceable>"
+ #~ msgstr "--keyring <replaceable>nazwa_pliku</replaceable>"
  
  #
  #~ msgid "Show a short usage summary."
  #~ msgstr "Wyświetla krótkie informacje na temat użytkowania."
  
- #~ msgid "<option>-v</option>"
- #~ msgstr "<option>-v</option>"
- 
- #~ msgid "<option>--version</option>"
- #~ msgstr "<option>--version</option>"
- 
  #
  #~ msgid "Show the program version."
  #~ msgstr "Wyświetla wersję programu."
@@@ -10328,9 -9012,6 +9022,6 @@@
  #~ "<literal>add</literal> dodaje pliki zawierające indeks nazw pakietów do "
  #~ "bufora.  Ta opcja jest przydatna głównie w celu odpluskwiania."
  
- #~ msgid "<option>--install-recommends</option>"
- #~ msgstr "<option>--install-recommends</option>"
- 
  #~ msgid "Also install recommended packages."
  #~ msgstr "Instaluje również rekomendowane pakiety."
  
@@@ -10373,9 -9054,5 +9064,5 @@@
  #~ "konfiguracyjnym:  <literal>Dir::State</literal> ustawia ścieżkę do pliku "
  #~ "o nazwie <filename>extended_states</filename>."
  
- #, fuzzy
- #~ msgid "Cache-Limit"
- #~ msgstr "Cache"
- 
  #~ msgid "Pin: release n=squeeze\n"
  #~ msgstr "Pin: release n=squeeze\n"
diff --combined doc/po/pt.po
index e298281f8,58e6ca5e2..4c04e78ef
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@@ -6,7 -6,7 +6,8 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: apt 0.8.0~pre1\n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
 -"POT-Creation-Date: 2012-05-21 13:35+0300\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:47+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"
@@@ -137,44 -137,7 +138,7 @@@ msgid "apt was written by the APT team 
  msgstr "apt foi escrito pelo APT team E<lt>apt@packages.debian.orgE<gt>."
  
  #. type: Plain text
- #: apt.ent:2
- msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
- msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
- 
- #. type: Plain text
- #: apt.ent:16
- #, no-wrap
- msgid ""
- "<!-- Boiler plate docinfo section -->\n"
- "<!ENTITY apt-docinfo \"\n"
- " <refentryinfo>\n"
- "   <address><email>apt@packages.debian.org</email></address>\n"
- "   <author>\n"
- "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
- "     <contrib></contrib>\n"
- "   </author>\n"
- "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
- "   <date>28 October 2008</date>\n"
- "   <productname>Linux</productname>\n"
- " </refentryinfo>\n"
- "\">\n"
- msgstr ""
- "<!-- Boiler plate docinfo section -->\n"
- "<!ENTITY apt-docinfo \"\n"
- " <refentryinfo>\n"
- "   <address><email>apt@packages.debian.org</email></address>\n"
- "   <author>\n"
- "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
- "     <contrib></contrib>\n"
- "   </author>\n"
- "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
- "   <date>28 Outubro 2008</date>\n"
- "   <productname>Linux</productname>\n"
- " </refentryinfo>\n"
- "\">\n"
- 
- #. type: Plain text
- #: apt.ent:23
+ #: apt.ent:7
  #, no-wrap
  msgid ""
  "<!ENTITY apt-author.team \"\n"
@@@ -192,7 -155,7 +156,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:29
+ #: apt.ent:13
  #, no-wrap
  msgid ""
  "<!ENTITY apt-qapage \"\n"
@@@ -208,7 -171,7 +172,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:40
+ #: apt.ent:24
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Bug reporting section -->\n"
@@@ -234,7 -197,7 +198,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:48
+ #: apt.ent:32
  #, no-wrap
  msgid ""
  "<!-- Boiler plate Author section -->\n"
@@@ -254,7 -217,7 +218,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:58
+ #: apt.ent:42
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -278,7 -241,7 +242,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:66
+ #: apt.ent:50
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -298,7 -261,7 +262,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:78
+ #: apt.ent:62
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -328,7 -291,7 +292,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:90
+ #: apt.ent:74
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -356,7 -319,7 +320,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:101
+ #: apt.ent:85
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -382,7 -345,7 +346,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:107
+ #: apt.ent:91
  #, no-wrap
  msgid ""
  "<!ENTITY file-aptconf \"\n"
@@@ -398,7 -361,7 +362,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:113
+ #: apt.ent:97
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@@ -414,7 -377,7 +378,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:119
+ #: apt.ent:103
  #, no-wrap
  msgid ""
  "<!ENTITY file-cachearchives \"\n"
@@@ -430,12 -393,18 +394,18 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:125
- #, no-wrap
+ #: apt.ent:109
+ #, fuzzy, no-wrap
+ #| msgid ""
+ #| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+ #| "     <listitem><para>Storage area for package files in transit.\n"
+ #| "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+ #| "     </varlistentry>\n"
+ #| "\">\n"
  msgid ""
  "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
  "     <listitem><para>Storage area for package files in transit.\n"
- "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
@@@ -446,7 -415,7 +416,7 @@@
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:135
+ #: apt.ent:119
  #, no-wrap
  msgid ""
  "<!ENTITY file-preferences \"\n"
@@@ -470,7 -439,7 +440,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:141
+ #: apt.ent:125
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@@ -486,7 -455,7 +456,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:147
+ #: apt.ent:131
  #, no-wrap
  msgid ""
  "<!ENTITY file-sourceslist \"\n"
@@@ -502,7 -471,7 +472,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:153
+ #: apt.ent:137
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@@ -518,7 -487,7 +488,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:160
+ #: apt.ent:144
  #, no-wrap
  msgid ""
  "<!ENTITY file-statelists \"\n"
@@@ -536,12 -505,18 +506,18 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:166
- #, no-wrap
+ #: apt.ent:150
+ #, fuzzy, no-wrap
+ #| msgid ""
+ #| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+ #| "     <listitem><para>Storage area for state information in transit.\n"
+ #| "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+ #| "     </varlistentry>\n"
+ #| "\">\n"
  msgid ""
  "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
  "     <listitem><para>Storage area for state information in transit.\n"
- "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
@@@ -552,7 -527,7 +528,7 @@@
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:172
+ #: apt.ent:156
  #, no-wrap
  msgid ""
  "<!ENTITY file-trustedgpg \"\n"
@@@ -568,7 -543,7 +544,7 @@@ msgstr "
  "     </varlistentry>\n"
  
  #. type: Plain text
- #: apt.ent:179
+ #: apt.ent:163
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@@ -586,7 -561,7 +562,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:187
+ #: apt.ent:171
  #, no-wrap
  msgid ""
  "<!ENTITY file-extended_states \"\n"
@@@ -606,7 -581,7 +582,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:191
+ #: apt.ent:175
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@@ -615,7 -590,7 +591,7 @@@
  msgstr "<!ENTITY translation-title \"TRADUÇÃO\">\n"
  
  #. type: Plain text
- #: apt.ent:200
+ #: apt.ent:184
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@@ -633,7 -608,7 +609,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:210
+ #: apt.ent:195
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@@ -653,36 -628,133 +629,133 @@@ msgstr "
  "     tradução está atrasada relativamente ao conteúdo original.\n"
  "\">\n"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cache.8.xml:16
- #, fuzzy
- #| msgid ""
- #| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
- #| "<date>14 February 2004</date>"
+ #. type: Plain text
+ #: apt.ent:198
+ msgid ""
+ "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+ "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:201
+ msgid ""
+ "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+ "synopsis-config-file \"config_file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:204
+ msgid ""
+ "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+ "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+ "\"target_release\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:207
+ msgid ""
+ "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+ "synopsis-architecture \"architecture\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:210
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+ "--> <!ENTITY synopsis-pkg \"pkg\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:213
+ msgid ""
+ "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+ "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:216
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+ "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:219
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+ "awesome --> <!ENTITY synopsis-regex \"regex\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:222
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+ "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:225
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+ "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+ "\"temporary_directory\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:228
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+ "synopsis-filename \"filename\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:231
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:234
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-override "
+ "\"override-file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:237
  msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
- "February 2011</date>"
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+ "\"pathprefix\">"
  msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "Fevereiro 2004</date>"
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cache.8.xml:25 apt-cache.8.xml:32
- msgid "apt-cache"
- msgstr "apt-cache"
+ #. type: Plain text
+ #: apt.ent:240
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "generate section --> <!ENTITY synopsis-section \"section\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:243
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+ msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26
- #: apt-key.8.xml:18 apt-mark.8.xml:26 apt-secure.8.xml:18
+ #: apt-key.8.xml:25 apt-mark.8.xml:26 apt-secure.8.xml:25
  msgid "8"
  msgstr "8"
  
  #. type: Content of: <refentry><refmeta><refmiscinfo>
  #: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27
  #: apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27
- #: apt-key.8.xml:19 apt-mark.8.xml:27 apt-secure.8.xml:19
- #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:33 apt_preferences.5.xml:26
+ #: apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26
+ #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:32 apt_preferences.5.xml:26
  #: sources.list.5.xml:27
  msgid "APT"
  msgstr "APT"
@@@ -692,85 -764,17 +765,17 @@@
  msgid "query the APT cache"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cache.8.xml:39
- #, fuzzy
- #| msgid ""
- #| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
- #| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- #| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
- #| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
- #| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- #| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
- #| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
- #| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
- #| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- #| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- #| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
- #| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
- #| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
- #| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- #| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
- #| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
- #| "group>"
- msgid ""
- "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
- "<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
- "arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
- "arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
- "arg> </group>"
- msgstr ""
- "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
- "o=<replaceable>string de configuração</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>ficheiro</replaceable></option></arg> <group "
- "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>ficheiro</replaceable></arg></arg> <arg>gencaches</arg> "
- "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</"
- "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pacote</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
- "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
- "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></arg> <arg>depends "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></"
- "arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pacote</replaceable></arg></arg> <arg>pkgnames <arg choice="
- "\"plain\"><replaceable>prefixo</replaceable></arg></arg> <arg>dotty <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></"
- "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</"
- "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pacotes</replaceable></arg></arg> <arg>madison <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pacotes</replaceable></arg></arg> </"
- "group>"
- 
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
- #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
- #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
- #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+ #: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+ #: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+ #: apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50
+ #: apt-sortpkgs.1.xml:38 apt.conf.5.xml:41 apt_preferences.5.xml:36
  #: sources.list.5.xml:36
  msgid "Description"
  msgstr "Descrição"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:65
+ #: apt-cache.8.xml:39
  msgid ""
  "<command>apt-cache</command> performs a variety of operations on APT's "
  "package cache. <command>apt-cache</command> does not manipulate the state of "
@@@ -783,7 -787,7 +788,7 @@@ msgstr "
  "a partir dos metadados do pacote."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:70 apt-get.8.xml:120
+ #: apt-cache.8.xml:44 apt-get.8.xml:44
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given, "
  "one of the commands below must be present."
@@@ -791,29 -795,22 +796,22 @@@ msgstr "
  "A menos que a opção <option>-h</option>, ou <option>--help</option> seja "
  "fornecida, um dos comandos abaixo têm que estar presentes."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:74
- msgid "gencaches"
- msgstr "gencaches"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:75
+ #: apt-cache.8.xml:49
  msgid ""
- "<literal>gencaches</literal> performs the same operation as <command>apt-get "
- "check</command>. It builds the source and package caches from the sources in "
- "&sources-list; and from <filename>/var/lib/dpkg/status</filename>."
+ "<literal>gencaches</literal> creates APT's package cache. This is done "
+ "implicitly by all commands needing this cache if it is missing or outdated."
  msgstr ""
- "<literal>gencaches</literal> executa a mesma operação que o <command>apt-get "
- "check</command>. Constrói as caches de fonte e pacote a partir das fontes em "
- "&sources-list; e a partir de <filename>/var/lib/dpkg/status</filename>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:81
- msgid "showpkg <replaceable>pkg(s)</replaceable>"
- msgstr "showpkg <replaceable>pacote(s)</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+ #: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
+ #: apt-cache.8.xml:226 apt-cache.8.xml:238
+ msgid "&synopsis-pkg;"
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:82
+ #: apt-cache.8.xml:54
  msgid ""
  "<literal>showpkg</literal> displays information about the packages listed on "
  "the command line. Remaining arguments are package names. The available "
@@@ -837,7 -834,7 +835,7 @@@ msgstr "
  "ao seguinte:"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-cache.8.xml:94
+ #: apt-cache.8.xml:66
  #, no-wrap
  msgid ""
  "Package: libreadline2\n"
@@@ -863,7 -860,7 +861,7 @@@ msgstr "
  "Fornecimentos Reversos: \n"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:106
+ #: apt-cache.8.xml:78
  msgid ""
  "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
  "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@@ -881,13 -878,8 +879,8 @@@ msgstr "
  "instalados. Para o significado específico do lembrete da saída é melhor "
  "consultar o código fonte do apt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:115
- msgid "stats"
- msgstr "stats"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:115
+ #: apt-cache.8.xml:87
  msgid ""
  "<literal>stats</literal> displays some statistics about the cache.  No "
  "further arguments are expected. Statistics reported are:"
@@@ -896,7 -888,7 +889,7 @@@ msgstr "
  "são esperados mais argumentos. As estatísticas reportadas são:"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:118
+ #: apt-cache.8.xml:90
  msgid ""
  "<literal>Total package names</literal> is the number of package names found "
  "in the cache."
@@@ -905,7 -897,7 +898,7 @@@ msgstr "
  "encontrados na cache."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:122
+ #: apt-cache.8.xml:94
  msgid ""
  "<literal>Normal packages</literal> is the number of regular, ordinary "
  "package names; these are packages that bear a one-to-one correspondence "
@@@ -918,7 -910,7 +911,7 @@@ msgstr "
  "dependências. A maioria dos pacotes caem nesta categoria."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:128
+ #: apt-cache.8.xml:100
  msgid ""
  "<literal>Pure virtual packages</literal> is the number of packages that "
  "exist only as a virtual package name; that is, packages only \"provide\" the "
@@@ -935,7 -927,7 +928,7 @@@ msgstr "
  "agent\", mas não existe um existe um pacote chamado \"mail-transport-agent\"."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:136
+ #: apt-cache.8.xml:108
  msgid ""
  "<literal>Single virtual packages</literal> is the number of packages with "
  "only one package providing a particular virtual package. For example, in the "
@@@ -948,7 -940,7 +941,7 @@@ msgstr "
  "apenas um pacote, xless, disponibiliza \"X11-text-viewer\"."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:142
+ #: apt-cache.8.xml:114
  msgid ""
  "<literal>Mixed virtual packages</literal> is the number of packages that "
  "either provide a particular virtual package or have the virtual package name "
@@@ -961,7 -953,7 +954,7 @@@ msgstr "
  "é tanto um pacote real, como também disponibilizado pelo pacote debconf-tiny."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:149
+ #: apt-cache.8.xml:121
  msgid ""
  "<literal>Missing</literal> is the number of package names that were "
  "referenced in a dependency but were not provided by any package. Missing "
@@@ -977,7 -969,7 +970,7 @@@ msgstr "
  "declarações de Conflitos ou Breaks."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:156
+ #: apt-cache.8.xml:128
  msgid ""
  "<literal>Total distinct</literal> versions is the number of package versions "
  "found in the cache; this value is therefore at least equal to the number of "
@@@ -992,7 -984,7 +985,7 @@@ msgstr "
  "consideravelmente maior que o número do total de nomes de pacotes."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:163
+ #: apt-cache.8.xml:135
  msgid ""
  "<literal>Total dependencies</literal> is the number of dependency "
  "relationships claimed by all of the packages in the cache."
@@@ -1000,13 -992,8 +993,8 @@@ msgstr "
  "<literal>Total dependencies</literal> é o número de relacionamentos com "
  "dependências reivindicadas por todos os pacotes na cache."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:170
- msgid "showsrc <replaceable>pkg(s)</replaceable>"
- msgstr "showsrc <replaceable>pacote(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:171
+ #: apt-cache.8.xml:143
  msgid ""
  "<literal>showsrc</literal> displays all the source package records that "
  "match the given package names. All versions are shown, as well as all "
@@@ -1017,13 -1004,8 +1005,8 @@@ msgstr "
  "mostradas, assim como todos os registos que declaram o nome como sendo um "
  "Binário."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:176 apt-config.8.xml:87
- msgid "dump"
- msgstr "dump"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:177
+ #: apt-cache.8.xml:149
  msgid ""
  "<literal>dump</literal> shows a short listing of every package in the cache. "
  "It is primarily for debugging."
@@@ -1031,13 -1013,8 +1014,8 @@@ msgstr "
  "<literal>dump</literal> mostra uma listagem curta de todos os pacotes na "
  "cache. É principalmente para depuração."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:181
- msgid "dumpavail"
- msgstr "dumpavail"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:182
+ #: apt-cache.8.xml:154
  msgid ""
  "<literal>dumpavail</literal> prints out an available list to stdout. This is "
  "suitable for use with &dpkg; and is used by the &dselect; method."
@@@ -1046,13 -1023,8 +1024,8 @@@ msgstr "
  "stdout. Isto é apropriado para usar com o &dpkg; e é usado pelo método "
  "&dselect;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:186
- msgid "unmet"
- msgstr "unmet"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:187
+ #: apt-cache.8.xml:159
  msgid ""
  "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
  "package cache."
@@@ -1060,13 -1032,8 +1033,8 @@@ msgstr "
  "<literal>unmet</literal> mostra um sumário de todas as dependências "
  "insatisfeitas na cache do pacote."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:191
- msgid "show <replaceable>pkg(s)</replaceable>"
- msgstr "show <replaceable>pacote(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:192
+ #: apt-cache.8.xml:164
  msgid ""
  "<literal>show</literal> performs a function similar to <command>dpkg --print-"
  "avail</command>; it displays the package records for the named packages."
@@@ -1074,13 -1041,13 +1042,13 @@@ msgstr "
  "<literal>show</literal> executa uma função semelhante ao <command>dpkg --"
  "print-avail</command>; mostra os registos do pacote para os pacotes nomeados."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:197
- msgid "search <replaceable>regex [ regex ... ]</replaceable>"
- msgstr "search <replaceable>regex [ regex ... ]</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:169
+ msgid "&synopsis-regex;"
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:198
+ #: apt-cache.8.xml:170
  msgid ""
  "<literal>search</literal> performs a full text search on all available "
  "package lists for the POSIX regex pattern given, see "
@@@ -1105,7 -1072,7 +1073,7 @@@ msgstr "
  "longa, apenas no nome do pacote."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:211
+ #: apt-cache.8.xml:183
  msgid ""
  "Separate arguments can be used to specify multiple search patterns that are "
  "and'ed together."
@@@ -1113,13 -1080,8 +1081,8 @@@ msgstr "
  "Podem ser usados argumentos separados para especificar múltiplos padrões de "
  "busca os quais são lidados em conjunto."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:215
- msgid "depends <replaceable>pkg(s)</replaceable>"
- msgstr "depends <replaceable>pacote(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:216
+ #: apt-cache.8.xml:188
  msgid ""
  "<literal>depends</literal> shows a listing of each dependency a package has "
  "and all the possible other packages that can fulfill that dependency."
@@@ -1128,13 -1090,8 +1091,8 @@@ msgstr "
  "pacote tem e todos os outros pacotes possíveis que podem satisfazer essa "
  "dependência."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:220
- msgid "rdepends <replaceable>pkg(s)</replaceable>"
- msgstr "rdepends <replaceable>pacote(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:221
+ #: apt-cache.8.xml:193
  msgid ""
  "<literal>rdepends</literal> shows a listing of each reverse dependency a "
  "package has."
@@@ -1143,12 -1100,14 +1101,14 @@@ msgstr "
  "que um pacote tem."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:225
- msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+ #: apt-cache.8.xml:197
+ #, fuzzy
+ #| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+ msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
  msgstr "pkgnames <replaceable>[ prefixo ]</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:226
+ #: apt-cache.8.xml:198
  msgid ""
  "This command prints the name of each package APT knows. The optional "
  "argument is a prefix match to filter the name list. The output is suitable "
@@@ -1163,7 -1122,7 +1123,7 @@@ msgstr "
  "opção <option>--generate</option>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:231
+ #: apt-cache.8.xml:203
  msgid ""
  "Note that a package which APT knows of is not necessarily available to "
  "download, installable or installed, e.g. virtual packages are also listed in "
@@@ -1173,13 -1132,8 +1133,8 @@@ msgstr "
  "para download, instalável ou instalado, por exemplo, os pacotes virtuais "
  "também são listados na lista gerada."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:236
- msgid "dotty <replaceable>pkg(s)</replaceable>"
- msgstr "dotty <replaceable>pacote(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:237
+ #: apt-cache.8.xml:209
  msgid ""
  "<literal>dotty</literal> takes a list of packages on the command line and "
  "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@@ -1200,7 -1154,7 +1155,7 @@@ msgstr "
  "defina a opção <literal>APT::Cache::GivenOnly</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:246
+ #: apt-cache.8.xml:218
  msgid ""
  "The resulting nodes will have several shapes; normal packages are boxes, "
  "pure provides are triangles, mixed provides are diamonds, missing packages "
@@@ -1214,19 -1168,14 +1169,14 @@@ msgstr "
  "verdes são conflitos."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:251
+ #: apt-cache.8.xml:223
  msgid "Caution, dotty cannot graph larger sets of packages."
  msgstr ""
  "Atenção, o dotty não consegue fazer gráficos com grandes conjuntos de "
  "pacotes."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:254
- msgid "xvcg <replaceable>pkg(s)</replaceable>"
- msgstr "xvcg <replaceable>pacote(s)</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:255
+ #: apt-cache.8.xml:227
  msgid ""
  "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
  "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@@ -1236,12 -1185,14 +1186,14 @@@ msgstr "
  "VCG</ulink>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:259
- msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
- msgstr "policy <replaceable>[ pacote(s) ]</replaceable>"
+ #: apt-cache.8.xml:231
+ #, fuzzy
+ #| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
+ msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
+ msgstr "madison <replaceable>[ pacote(s) ]</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:260
+ #: apt-cache.8.xml:232
  msgid ""
  "<literal>policy</literal> is meant to help debug issues relating to the "
  "preferences file. With no arguments it will print out the priorities of each "
@@@ -1253,13 -1204,8 +1205,8 @@@ msgstr "
  "propriedades de cada fonte. Caso contrário escreve informação detalhada "
  "acerca da selecção de prioridade do pacote nomeado."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:266
- msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
- msgstr "madison <replaceable>[ pacote(s) ]</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:267
+ #: apt-cache.8.xml:239
  msgid ""
  "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
  "to mimic the output format and a subset of the functionality of the Debian "
@@@ -1277,25 -1223,15 +1224,15 @@@ msgstr "
  "arquitectura que o APT recolheu listas de pacotes (<literal>APT::"
  "Architecture</literal>)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
- #: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
- #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+ #. type: Content of: <refentry><refsect1><title>
+ #: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+ #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+ #: apt-sortpkgs.1.xml:48
  msgid "options"
  msgstr "opções"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>-p</option>"
- msgstr "<option>-p</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>--pkg-cache</option>"
- msgstr "<option>--pkg-cache</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:283
+ #: apt-cache.8.xml:255
  msgid ""
  "Select the file to store the package cache. The package cache is the primary "
  "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@@ -1305,19 -1241,8 +1242,8 @@@ msgstr "
  "a cache principal usada por todas as operações. Item de Configuração: "
  "<literal>Dir::Cache::pkgcache</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:288
- msgid "<option>--src-cache</option>"
- msgstr "<option>--src-cache</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:289
+ #: apt-cache.8.xml:261
  msgid ""
  "Select the file to store the source cache. The source is used only by "
  "<literal>gencaches</literal> and it stores a parsed version of the package "
@@@ -1331,18 -1256,8 +1257,8 @@@ msgstr "
  "pacote é usada a cache fonte para evitar reanalisar todos os ficheiros do "
  "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: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:545 apt-get.8.xml:383
- msgid "<option>--quiet</option>"
- msgstr "<option>--quiet</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:297
+ #: apt-cache.8.xml:269
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quietness up to a maximum of 2. You can also use "
@@@ -1355,18 -1270,8 +1271,8 @@@ msgstr "
  "nível de serenidade, sobrepondo o ficheiro de configuração. Item de "
  "Configuração: <literal>quiet</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>-i</option>"
- msgstr "<option>-i</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>--important</option>"
- msgstr "<option>--important</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:304
+ #: apt-cache.8.xml:276
  msgid ""
  "Print only important dependencies; for use with unmet and depends. Causes "
  "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@@ -1376,48 -1281,8 +1282,8 @@@ msgstr "
  "Separa apenas relações de Depends e Pre-Depends para serem escritas. Item de "
  "Configuração: <literal>APT::Cache::Important</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:309
- msgid "<option>--no-pre-depends</option>"
- msgstr "<option>--no-pre-depends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:310
- msgid "<option>--no-depends</option>"
- msgstr "<option>--no-depends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:311
- msgid "<option>--no-recommends</option>"
- msgstr "<option>--no-recommends</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:312
- msgid "<option>--no-suggests</option>"
- msgstr "<option>--no-suggests</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:313
- msgid "<option>--no-conflicts</option>"
- msgstr "<option>--no-conflicts</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:314
- msgid "<option>--no-breaks</option>"
- msgstr "<option>--no-breaks</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:315
- msgid "<option>--no-replaces</option>"
- msgstr "<option>--no-replaces</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:316
- msgid "<option>--no-enhances</option>"
- msgstr "<option>--no-enhances</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:317
+ #: apt-cache.8.xml:289
  #, fuzzy
  #| msgid ""
  #| "Per default the <literal>depends</literal> and <literal>rdepends</"
@@@ -1427,7 -1292,7 +1293,7 @@@
  #| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
- "print all dependencies. This can be twicked with these flags which will omit "
+ "print all dependencies. This can be tweaked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
@@@ -1438,18 -1303,8 +1304,8 @@@ msgstr "
  "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
  "ex. <literal>APT::Cache::ShowRecommends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
- msgid "<option>-f</option>"
- msgstr "<option>-f</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323
- msgid "<option>--full</option>"
- msgstr "<option>--full</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:324
+ #: apt-cache.8.xml:296
  msgid ""
  "Print full package records when searching.  Configuration Item: "
  "<literal>APT::Cache::ShowFull</literal>."
@@@ -1457,18 -1312,8 +1313,8 @@@ msgstr "
  "Escreve registos de pacote completos quando procura. Item de Configuração: "
  "<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:583
- msgid "<option>-a</option>"
- msgstr "<option>-a</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:328
- msgid "<option>--all-versions</option>"
- msgstr "<option>--all-versions</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:329
+ #: apt-cache.8.xml:301
  msgid ""
  "Print full records for all available versions. This is the default; to turn "
  "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@@ -1484,18 -1329,8 +1330,8 @@@ msgstr "
  "Esta opção é aplicável apenas ao comando <literal>show</literal>. Item de "
  "Configuração: <literal>APT::Cache::AllVersions</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>-g</option>"
- msgstr "<option>-g</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>--generate</option>"
- msgstr "<option>--generate</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:338
+ #: apt-cache.8.xml:310
  msgid ""
  "Perform automatic package cache regeneration, rather than use the cache as "
  "it is. This is the default; to turn it off, use <option>--no-generate</"
@@@ -1506,18 -1341,8 +1342,8 @@@ msgstr "
  "generate</option>. Item de Configuração: <literal>APT::Cache::Generate</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343
- msgid "<option>--names-only</option>"
- msgstr "<option>--names-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343 apt-cdrom.8.xml:142
- msgid "<option>-n</option>"
- msgstr "<option>-n</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:344
+ #: apt-cache.8.xml:316
  msgid ""
  "Only search on the package names, not the long descriptions.  Configuration "
  "Item: <literal>APT::Cache::NamesOnly</literal>."
@@@ -1525,13 -1350,8 +1351,8 @@@ msgstr "
  "Apenas procura nos nomes dos pacotes, e não nas descrições longas. Item de "
  "Configuração: <literal>APT::Cache::NamesOnly</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:348
- msgid "<option>--all-names</option>"
- msgstr "<option>--all-names</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:349
+ #: apt-cache.8.xml:321
  msgid ""
  "Make <literal>pkgnames</literal> print all names, including virtual packages "
  "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@@ -1541,13 -1361,8 +1362,8 @@@ msgstr "
  "pacotes virtuais e dependências em falta. Item de configuração: "
  "<literal>APT::Cache::AllNames</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:354
- msgid "<option>--recurse</option>"
- msgstr "<option>--recurse</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:355
+ #: apt-cache.8.xml:327
  msgid ""
  "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
  "that all packages mentioned are printed once.  Configuration Item: "
@@@ -1557,13 -1372,8 +1373,8 @@@ msgstr "
  "para que todos os pacotes mencionados sejam escritos uma vez. Item de "
  "Configuração <literal>APT::Cache::RecurseDepends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:360
- msgid "<option>--installed</option>"
- msgstr "<option>--installed</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:362
+ #: apt-cache.8.xml:334
  msgid ""
  "Limit the output of <literal>depends</literal> and <literal>rdepends</"
  "literal> to packages which are currently installed.  Configuration Item: "
@@@ -1574,46 -1384,46 +1385,46 @@@ msgstr "
  "<literal>APT::Cache::Installed</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
- #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
- #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+ #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
+ #: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+ #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
  msgid "&apt-commonoptions;"
  msgstr "&apt-commonoptions;"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
- #: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+ #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+ #: apt.conf.5.xml:1118 apt_preferences.5.xml:698
  msgid "Files"
  msgstr "Ficheiros"
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:374
+ #: apt-cache.8.xml:346
  msgid "&file-sourceslist; &file-statelists;"
  msgstr "&file-sourceslist; &file-statelists;"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
- #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
- #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
- #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
- #: sources.list.5.xml:234
+ #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+ #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+ #: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+ #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
+ #: sources.list.5.xml:255
  msgid "See Also"
  msgstr "Veja também"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:380
+ #: apt-cache.8.xml:352
  msgid "&apt-conf;, &sources-list;, &apt-get;"
  msgstr "&apt-conf;, &sources-list;, &apt-get;"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
- #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
- #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+ #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+ #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+ #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
  msgid "Diagnostics"
  msgstr "Diagnóstico"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:385
+ #: apt-cache.8.xml:357
  msgid ""
  "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -1621,42 -1431,13 +1432,13 @@@ msgstr "
  "<command>apt-cache</command> devolve zero em operação normal, 100 decimal em "
  "erro."
  
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cdrom.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "February 2004</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "Fevereiro 2004</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cdrom.8.xml:24 apt-cdrom.8.xml:31
- msgid "apt-cdrom"
- msgstr "apt-cdrom"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-cdrom.8.xml:32
  msgid "APT CDROM management utility"
  msgstr "Utilitário de gestão de CDROM do APT"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cdrom.8.xml:38
- msgid ""
- "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
- "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
- "<arg>add</arg> <arg>ident</arg> </group>"
- msgstr ""
- "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
- "<arg><option>-d=<replaceable>ponto de montagem do cdrom</replaceable></"
- "option></arg> <arg><option>-o=<replaceable>string de configuração</"
- "replaceable></option></arg> <arg><option>-c=<replaceable>ficheiro</"
- "replaceable></option></arg> <group> <arg>add</arg> <arg>ident</arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:51
+ #: apt-cdrom.8.xml:38
  msgid ""
  "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
  "available sources. <command>apt-cdrom</command> takes care of determining "
@@@ -1669,7 -1450,7 +1451,7 @@@ msgstr "
  "e verificar os ficheiros de índice."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:58
+ #: apt-cdrom.8.xml:45
  msgid ""
  "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
  "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@@ -1680,13 -1461,8 +1462,8 @@@ msgstr "
  "de vários discos tem que ser inserido e sondado separadamente para ter em "
  "conta possíveis falhas."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:68
- msgid "add"
- msgstr "add"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:69
+ #: apt-cdrom.8.xml:56
  msgid ""
  "<literal>add</literal> is used to add a new disc to the source list. It will "
  "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@@ -1701,7 -1477,7 +1478,7 @@@ msgstr "
  "lhe-à pedido um título descritivo."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:77
+ #: apt-cdrom.8.xml:64
  msgid ""
  "APT uses a CDROM ID to track which disc is currently in the drive and "
  "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@@ -1711,13 -1487,8 +1488,8 @@@ msgstr "
  "drive e mantêm uma base de dados desses IDs em <filename>&statedir;/cdroms."
  "list</filename>"
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:84
- msgid "ident"
- msgstr "ident"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:85
+ #: apt-cdrom.8.xml:72
  msgid ""
  "A debugging tool to report the identity of the current disc as well as the "
  "stored file name"
@@@ -1726,7 -1497,7 +1498,7 @@@ msgstr "
  "assim como o nome de ficheiro armazenado"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:64
+ #: apt-cdrom.8.xml:51
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present.  <placeholder type=\"variablelist"
@@@ -1737,22 -1508,12 +1509,12 @@@ msgstr "
  "\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cdrom.8.xml:94 apt-key.8.xml:158
+ #: apt-cdrom.8.xml:81 apt-key.8.xml:160
  msgid "Options"
  msgstr "Opções"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
- msgid "<option>-d</option>"
- msgstr "<option>-d</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98
- msgid "<option>--cdrom</option>"
- msgstr "<option>--cdrom</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:99
+ #: apt-cdrom.8.xml:86
  msgid ""
  "Mount point; specify the location to mount the cdrom. This mount point must "
  "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@@ -1763,18 -1524,8 +1525,8 @@@ msgstr "
  "configurado apropriadamente. Item de configuração: <literal>Acquire::cdrom::"
  "mount</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>-r</option>"
- msgstr "<option>-r</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>--rename</option>"
- msgstr "<option>--rename</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:108
+ #: apt-cdrom.8.xml:95
  msgid ""
  "Rename a disc; change the label of a disk or override the disks given label. "
  "This option will cause <command>apt-cdrom</command> to prompt for a new "
@@@ -1785,18 -1536,8 +1537,8 @@@ msgstr "
  "command> pergunte por uma nova etiqueta. Item de configuração: <literal>APT::"
  "CDROM::Rename</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116 apt-get.8.xml:364
- msgid "<option>-m</option>"
- msgstr "<option>-m</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116
- msgid "<option>--no-mount</option>"
- msgstr "<option>--no-mount</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:117
+ #: apt-cdrom.8.xml:104
  msgid ""
  "No mounting; prevent <command>apt-cdrom</command> from mounting and "
  "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@@ -1806,13 -1547,8 +1548,8 @@@ msgstr "
  "desmontar o ponto de montagem. Item de configuração: <literal>APT::CDROM::"
  "NoMount</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:124
- msgid "<option>--fast</option>"
- msgstr "<option>--fast</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:125
+ #: apt-cdrom.8.xml:112
  msgid ""
  "Fast Copy; Assume the package files are valid and do not check every "
  "package. This option should be used only if <command>apt-cdrom</command> has "
@@@ -1824,13 -1560,8 +1561,8 @@@ msgstr "
  "já foi corrido com este disco e não detectou nenhum erro. Item de "
  "configuração: <literal>APT::CDROM::Fast</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:134
- msgid "<option>--thorough</option>"
- msgstr "<option>--thorough</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:135
+ #: apt-cdrom.8.xml:122
  msgid ""
  "Thorough Package Scan; This option may be needed with some old Debian "
  "1.1/1.2 discs that have Package files in strange places. It takes much "
@@@ -1840,23 -1571,8 +1572,8 @@@ msgstr "
  "discos Debian antigos 1.1/1.2 que têm ficheiros de pacotes em lugares "
  "estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:143 apt-get.8.xml:395
- msgid "<option>--just-print</option>"
- msgstr "<option>--just-print</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:144 apt-get.8.xml:397
- msgid "<option>--recon</option>"
- msgstr "<option>--recon</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:145 apt-get.8.xml:398
- msgid "<option>--no-act</option>"
- msgstr "<option>--no-act</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:146
+ #: apt-cdrom.8.xml:133
  msgid ""
  "No Changes; Do not change the &sources-list; file and do not write index "
  "files. Everything is still checked however.  Configuration Item: "
@@@ -1867,12 -1583,12 +1584,12 @@@ msgstr "
  "configuração: <literal>APT::CDROM::NoAct</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:159
+ #: apt-cdrom.8.xml:146
  msgid "&apt-conf;, &apt-get;, &sources-list;"
  msgstr "&apt-conf;, &apt-get;, &sources-list;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:164
+ #: apt-cdrom.8.xml:151
  msgid ""
  "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -1880,42 -1596,13 +1597,13 @@@ msgstr "
  "<command>apt-cdrom</command> devolve zero em operação normal, 100 decimal em "
  "erro."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-config.8.xml:16 apt-extracttemplates.1.xml:16 apt-sortpkgs.1.xml:16
- #: sources.list.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
- "February 2004</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
- "Fevereiro 2004</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-config.8.xml:25 apt-config.8.xml:32
- msgid "apt-config"
- msgstr "apt-config"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-config.8.xml:33
  msgid "APT Configuration Query program"
  msgstr "Programa de Consulta de Configuração do APT"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-config.8.xml:39
- msgid ""
- "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>shell</arg> <arg>dump</arg> </group>"
- msgstr ""
- "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
- "o=<replaceable>string de configuração</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>ficheiro</replaceable></option></arg> <group "
- "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:51
+ #: apt-config.8.xml:39
  msgid ""
  "<command>apt-config</command> is an internal program used by various "
  "portions of the APT suite to provide consistent configurability. It accesses "
@@@ -1928,7 -1615,7 +1616,7 @@@ msgstr "
  "um modo que é fácil de usar para aplicações em script."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+ #: apt-config.8.xml:44 apt-ftparchive.1.xml:54
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present."
@@@ -1936,13 -1623,8 +1624,8 @@@ msgstr "
  "A menos que a opção <option>-h</option>, ou <option>--help</option> seja "
  "fornecida, um dos comandos abaixo têm que estar presentes."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-config.8.xml:61
- msgid "shell"
- msgstr "shell"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:63
+ #: apt-config.8.xml:51
  msgid ""
  "shell is used to access the configuration information from a shell script. "
  "It is given pairs of arguments, the first being a shell variable and the "
@@@ -1957,7 -1639,7 +1640,7 @@@ msgstr "
  "script shell deverá ser usado como:"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-config.8.xml:71
+ #: apt-config.8.xml:59
  #, no-wrap
  msgid ""
  "OPTS=\"-f\"\n"
@@@ -1969,7 -1651,7 +1652,7 @@@ msgstr "
  "eval $RES\n"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:76
+ #: apt-config.8.xml:64
  msgid ""
  "This will set the shell environment variable $OPTS to the value of MyApp::"
  "options with a default of <option>-f</option>."
@@@ -1978,7 -1660,7 +1661,7 @@@ msgstr "
  "options com uma predefinição de <option>-f</option>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:80
+ #: apt-config.8.xml:68
  msgid ""
  "The configuration item may be postfixed with a /[fdbi]. f returns file "
  "names, d returns directories, b returns true or false and i returns an "
@@@ -1990,18 -1672,42 +1673,42 @@@ msgstr "
  "verificado internamente."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:89
+ #: apt-config.8.xml:77
  msgid "Just show the contents of the configuration space."
  msgstr "Apenas mostra o conteúdo do espaço de configuração."
  
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:90
+ msgid ""
+ "Include options which have an empty value. This is the default, so use --no-"
+ "empty to remove them from the output."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-config.8.xml:95
+ msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:96
+ msgid ""
+ "Defines the output of each config option. &percnt;t will be replaced with "
+ "the name of the option, &percnt;f with the complete optionname and &percnt;v "
+ "with the value of the option.  Use uppercase letters and special characters "
+ "in the value will be encoded to ensure that it can e.g. be savely used in a "
+ "quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
+ "by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
+ "&percnt;."
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
- #: apt-sortpkgs.1.xml:73
+ #: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
+ #: apt-sortpkgs.1.xml:64
  msgid "&apt-conf;"
  msgstr "&apt-conf;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:112
+ #: apt-config.8.xml:115
  msgid ""
  "<command>apt-config</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -2009,11 -1715,6 +1716,6 @@@ msgstr "
  "<command>apt-config</command> devolve zero em operação normal, 100 decimal "
  "em erro."
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-extracttemplates.1.xml:25 apt-extracttemplates.1.xml:32
- msgid "apt-extracttemplates"
- msgstr "apt-extracttemplates"
- 
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
  msgid "1"
@@@ -2026,21 -1727,8 +1728,8 @@@ msgstr "
  "Utilitário para extrair configurações e modelos DebConf a partir de pacotes "
  "Debian"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-extracttemplates.1.xml:39
- msgid ""
- "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
- "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
- "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
- "arg>"
- msgstr ""
- "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
- "<arg><option>-t=<replaceable>directório temporário</replaceable></option></"
- "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>ficheiro</"
- "replaceable></arg>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:47
+ #: apt-extracttemplates.1.xml:39
  msgid ""
  "<command>apt-extracttemplates</command> will take one or more Debian package "
  "files as input and write out (to a temporary directory) all associated "
@@@ -2055,17 -1743,25 +1744,25 @@@ msgstr "
  "gerada uma linha no formato:"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:52
+ #: apt-extracttemplates.1.xml:44
  msgid "package version template-file config-script"
  msgstr "pacote versão ficheiro-modelo script-de-configuração"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:53
+ #: apt-extracttemplates.1.xml:45
+ #, fuzzy
+ #| msgid ""
+ #| "template-file and config-script are written to the temporary directory "
+ #| "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
+ #| "TempDir</literal>)  directory, with filenames of the form "
+ #| "<filename>package.template.XXXX</filename> and <filename>package.config."
+ #| "XXXX</filename>"
  msgid ""
  "template-file and config-script are written to the temporary directory "
- "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
- "literal>)  directory, with filenames of the form <filename>package.template."
- "XXXX</filename> and <filename>package.config.XXXX</filename>"
+ "specified by the <option>-t</option> or <option>--tempdir</option> "
+ "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+ "filenames of the form <filename>package.template.XXXX</filename> and "
+ "<filename>package.config.XXXX</filename>"
  msgstr ""
  "ficheiro-modelo e script-de-configuração são escritos num directório "
  "temporário especificado por  -t ou --tempdir (<literal>APT::"
@@@ -2073,18 -1769,8 +1770,8 @@@
  "formato <filename>pacote.modelo.XXXX</filename> e <filename>pacote."
  "configuração.XXXX</filename>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
- msgid "<option>-t</option>"
- msgstr "<option>-t</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63
- msgid "<option>--tempdir</option>"
- msgstr "<option>--tempdir</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-extracttemplates.1.xml:65
+ #: apt-extracttemplates.1.xml:58
  msgid ""
  "Temporary directory in which to write extracted debconf template files and "
  "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@@ -2095,7 -1781,7 +1782,7 @@@ msgstr "
  "ExtractTemplates::TempDir</literal>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:82
+ #: apt-extracttemplates.1.xml:75
  msgid ""
  "<command>apt-extracttemplates</command> returns zero on normal operation, "
  "decimal 100 on error."
@@@ -2103,71 -1789,13 +1790,13 @@@ msgstr "
  "<command>apt-extracttemplates</command> devolve zero na operação normal, 100 "
  "decimal em erro."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-ftparchive.1.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
- "August 2009</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
- "Agosto 2009</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-ftparchive.1.xml:25 apt-ftparchive.1.xml:32
- msgid "apt-ftparchive"
- msgstr "apt-ftparchive"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-ftparchive.1.xml:33
  msgid "Utility to generate index files"
  msgstr "Utilitário para gerar ficheiros de índice"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-ftparchive.1.xml:39
- msgid ""
- "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
- "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
- "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
- "arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
- "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
- "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
- "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
- "replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
- "arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
- "arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
- "replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
- "\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
- msgstr ""
- "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
- "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
- "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
- "arg> <arg><option>--arch <replaceable>arquitectura</replaceable></option></"
- "arg> <arg><option>-o <replaceable>configuração</"
- "replaceable>=<replaceable>string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>ficheiro</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>packages<arg choice=\"plain\" rep=\"repeat\"><replaceable>caminho</"
- "replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>prefixo-de-caminho</replaceable></arg></arg></"
- "arg> <arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>caminho</"
- "replaceable></arg><arg><replaceable>sobrepor</"
- "replaceable><arg><replaceable>prefixo-de-caminho</replaceable></arg></arg></"
- "arg> <arg>contents <arg choice=\"plain\"><replaceable>caminho</replaceable></"
- "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>caminho</"
- "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
- "\"><replaceable>ficheiro-de-configuração</replaceable></arg> <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>secção</replaceable></arg></arg> "
- "<arg>clean <arg choice=\"plain\"><replaceable>ficheiro-de-configuração</"
- "replaceable></arg></arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:60
+ #: apt-ftparchive.1.xml:39
  msgid ""
  "<command>apt-ftparchive</command> is the command line tool that generates "
  "the index files that APT uses to access a distribution source. The index "
@@@ -2180,7 -1808,7 +1809,7 @@@ msgstr "
  "baseados no conteúdo desse site."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:64
+ #: apt-ftparchive.1.xml:43
  msgid ""
  "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
  "program, incorporating its entire functionality via the <literal>packages</"
@@@ -2195,7 -1823,7 +1824,7 @@@ msgstr "
  "script o processo de geração para um arquivo completo."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:70
+ #: apt-ftparchive.1.xml:49
  msgid ""
  "Internally <command>apt-ftparchive</command> can make use of binary "
  "databases to cache the contents of a .deb file and it does not rely on any "
@@@ -2209,13 -1837,8 +1838,8 @@@ msgstr "
  "geração completa, executa automaticamente verificações de alterações de "
  "ficheiros e constrói os ficheiros comprimidos desejados."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:79
- msgid "packages"
- msgstr "packages"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:81
+ #: apt-ftparchive.1.xml:60
  msgid ""
  "The packages command generates a package file from a directory tree. It "
  "takes the given directory and recursively searches it for .deb files, "
@@@ -2228,20 -1851,15 +1852,15 @@@ msgstr "
  "Este comando é aproximadamente equivalente ao &dpkg-scanpackages;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+ #: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
  msgid ""
  "The option <option>--db</option> can be used to specify a binary caching DB."
  msgstr ""
  "A opção <option>--db</option> pode ser usada para especificar uma base de "
  "dados de cache binária."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:89
- msgid "sources"
- msgstr "sources"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:91
+ #: apt-ftparchive.1.xml:70
  msgid ""
  "The <literal>sources</literal> command generates a source index file from a "
  "directory tree.  It takes the given directory and recursively searches it "
@@@ -2254,7 -1872,7 +1873,7 @@@ msgstr "
  "Este comando é aproximadamente equivalente ao &dpkg-scansources;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:96
+ #: apt-ftparchive.1.xml:75
  msgid ""
  "If an override file is specified then a source override file will be looked "
  "for with an extension of .src. The --source-override option can be used to "
@@@ -2265,13 -1883,8 +1884,8 @@@ msgstr "
  "source-override pode ser usada para alterar o ficheiro de sobreposição de "
  "fonte que irá ser usado."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:101
- msgid "contents"
- msgstr "contents"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:103
+ #: apt-ftparchive.1.xml:82
  msgid ""
  "The <literal>contents</literal> command generates a contents file from a "
  "directory tree. It takes the given directory and recursively searches it "
@@@ -2288,13 -1901,8 +1902,8 @@@ msgstr "
  "múltiplos pacotes possuírem o mesmo ficheiro então cada pacote é separado "
  "por uma vírgula na saída."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:113
- msgid "release"
- msgstr "release"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:115
+ #: apt-ftparchive.1.xml:94
  msgid ""
  "The <literal>release</literal> command generates a Release file from a "
  "directory tree. It recursively searches the given directory for uncompressed "
@@@ -2309,7 -1917,7 +1918,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:125
+ #: apt-ftparchive.1.xml:104
  msgid ""
  "Values for the additional metadata fields in the Release file are taken from "
  "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@@ -2329,13 -1937,8 +1938,8 @@@ msgstr "
  "<literal>Architectures</literal>, <literal>Components</literal>, "
  "<literal>Description</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:136
- msgid "generate"
- msgstr "generate"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:138
+ #: apt-ftparchive.1.xml:117
  msgid ""
  "The <literal>generate</literal> command is designed to be runnable from a "
  "cron script and builds indexes according to the given config file. The "
@@@ -2350,13 -1953,8 +1954,8 @@@ msgstr "
  "de quais directórios, assim como disponibilizar um meio simples de manter as "
  "definições requeridas."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:145 apt-get.8.xml:287
- msgid "clean"
- msgstr "clean"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:147
+ #: apt-ftparchive.1.xml:126
  msgid ""
  "The <literal>clean</literal> command tidies the databases used by the given "
  "configuration file by removing any records that are no longer necessary."
@@@ -2366,12 -1964,12 +1965,12 @@@ msgstr "
  "são necessários."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:153
+ #: apt-ftparchive.1.xml:132
  msgid "The Generate Configuration"
  msgstr "A Configuração do Generate"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:155
+ #: apt-ftparchive.1.xml:134
  msgid ""
  "The <literal>generate</literal> command uses a configuration file to "
  "describe the archives that are going to be generated. It follows the typical "
@@@ -2388,7 -1986,7 +1987,7 @@@ msgstr "
  "árvore. Isto apenas afecta o modo de como a etiqueta scope é manuseada."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:163
+ #: apt-ftparchive.1.xml:142
  msgid ""
  "The generate configuration has 4 separate sections, each described below."
  msgstr ""
@@@ -2396,12 -1994,12 +1995,12 @@@
  "abaixo."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:165
+ #: apt-ftparchive.1.xml:144
  msgid "Dir Section"
  msgstr "Secção Dir"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:167
+ #: apt-ftparchive.1.xml:146
  msgid ""
  "The <literal>Dir</literal> section defines the standard directories needed "
  "to locate the files required during the generation process. These "
@@@ -2413,13 -2011,8 +2012,8 @@@ msgstr "
  "Estes directórios precedem a certos caminhos relativos definidos em secções "
  "posteriores para produzir um caminho completo e absoluto."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:172
- msgid "ArchiveDir"
- msgstr "ArchiveDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:174
+ #: apt-ftparchive.1.xml:153
  msgid ""
  "Specifies the root of the FTP archive, in a standard Debian configuration "
  "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@@ -2428,33 -2021,18 +2022,18 @@@ msgstr "
  "Especifica a raiz do arquivo FTP, numa configuração Debian standard este é o "
  "directório que contém o <filename>ls-LR</filename> e nós da distribuição."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:179
- msgid "OverrideDir"
- msgstr "OverrideDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:181
+ #: apt-ftparchive.1.xml:160
  msgid "Specifies the location of the override files."
  msgstr "Especifica a localização dos ficheiros de sobrepor."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:184
- msgid "CacheDir"
- msgstr "CacheDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:186
+ #: apt-ftparchive.1.xml:165
  msgid "Specifies the location of the cache files"
  msgstr "Especifica a localização dos ficheiros de cache"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:189
- msgid "FileListDir"
- msgstr "FileListDir"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:191
+ #: apt-ftparchive.1.xml:170
  msgid ""
  "Specifies the location of the file list files, if the <literal>FileList</"
  "literal> setting is used below."
@@@ -2463,12 -2041,12 +2042,12 @@@ msgstr "
  "definição <literal>FileList</literal> for usada mais abaixo."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:197
+ #: apt-ftparchive.1.xml:176
  msgid "Default Section"
  msgstr "Secção Default"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:199
+ #: apt-ftparchive.1.xml:178
  msgid ""
  "The <literal>Default</literal> section specifies default values, and "
  "settings that control the operation of the generator. Other sections may "
@@@ -2478,13 -2056,8 +2057,8 @@@ msgstr "
  "definições que controlam a operação do gerador. Outras secções podem "
  "sobrepor estas predefinições em uma definição por-secção."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:203
- msgid "Packages::Compress"
- msgstr "Packages::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:205
+ #: apt-ftparchive.1.xml:184
  msgid ""
  "Sets the default compression schemes to use for the Package index files. It "
  "is a string that contains a space separated list of at least one of: '.' (no "
@@@ -2496,13 -2069,8 +2070,8 @@@ msgstr "
  "pelo menos um de:  '.' (nenhuma compressão), 'gzip' and 'bzip2'. A "
  "predefinição para todos os esquemas de compressão é '. gzip'."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:211
- msgid "Packages::Extensions"
- msgstr "Packages::Extensions"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:213
+ #: apt-ftparchive.1.xml:192
  msgid ""
  "Sets the default list of file extensions that are package files.  This "
  "defaults to '.deb'."
@@@ -2510,13 -2078,8 +2079,8 @@@ msgstr "
  "Define a lista predefinida das extensões de ficheiros que são ficheiros "
  "pacote. A predefinição é '.deb'."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:217
- msgid "Sources::Compress"
- msgstr "Sources::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:219
+ #: apt-ftparchive.1.xml:198
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Sources files."
@@@ -2524,13 -2087,8 +2088,8 @@@ msgstr "
  "Isto é semelhante a <literal>Packages::Compress</literal> excepto que "
  "controla a compressão para os ficheiros das Fontes."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:223
- msgid "Sources::Extensions"
- msgstr "Sources::Extensions"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:225
+ #: apt-ftparchive.1.xml:204
  msgid ""
  "Sets the default list of file extensions that are source files.  This "
  "defaults to '.dsc'."
@@@ -2538,13 -2096,8 +2097,8 @@@ msgstr "
  "Define a lista predefinida das extensões de ficheiros que são ficheiros de "
  "fontes. A predefinição é '.dsc'."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:229
- msgid "Contents::Compress"
- msgstr "Contents::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:231
+ #: apt-ftparchive.1.xml:210
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Contents files."
@@@ -2552,13 -2105,8 +2106,8 @@@ msgstr "
  "Isto é semelhante a <literal>Packages::Compress</literal> excepto que "
  "controla a compressão para os ficheiros de Conteúdos."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:235
- msgid "Translation::Compress"
- msgstr "Translation::Compress"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:237
+ #: apt-ftparchive.1.xml:216
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Translation-en master file."
@@@ -2566,13 -2114,8 +2115,8 @@@ msgstr "
  "Isto é semelhante a <literal>Packages::Compress</literal> excepto que "
  "controla a compressão para o ficheiro mestre Translation-en."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:241
- msgid "DeLinkLimit"
- msgstr "DeLinkLimit"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:243
+ #: apt-ftparchive.1.xml:222
  msgid ""
  "Specifies the number of kilobytes to delink (and replace with hard links) "
  "per run. This is used in conjunction with the per-section <literal>External-"
@@@ -2582,13 -2125,8 +2126,8 @@@ msgstr "
  "por execução. Isto é usado em conjunto com a definição <literal>External-"
  "Links</literal> por secção."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:248
- msgid "FileMode"
- msgstr "FileMode"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:250
+ #: apt-ftparchive.1.xml:229
  msgid ""
  "Specifies the mode of all created index files. It defaults to 0644. All "
  "index files are set to this mode with no regard to the umask."
@@@ -2597,13 -2135,8 +2136,8 @@@ msgstr "
  "0644. Todos os ficheiros índice são definidos para este modo "
  "independentemente do umask."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
- msgid "LongDescription"
- msgstr "LongDescription"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+ #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
  msgid ""
  "Sets if long descriptions should be included in the Packages file or split "
  "out into a master Translation-en file."
@@@ -2612,12 -2145,12 +2146,12 @@@ msgstr "
  "divididas em um ficheiro Translation-en mestre."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:263
+ #: apt-ftparchive.1.xml:242
  msgid "TreeDefault Section"
  msgstr "Secção TreeDefault"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:265
+ #: apt-ftparchive.1.xml:244
  msgid ""
  "Sets defaults specific to <literal>Tree</literal> sections. All of these "
  "variables are substitution variables and have the strings $(DIST), "
@@@ -2627,13 -2160,8 +2161,8 @@@ msgstr "
  "Todas estas variáveis são variáveis de substituição e têm as strings "
  "$(DIST), $(SECTION) e $(ARCH) substituídas pelos seus respectivos valores."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:270
- msgid "MaxContentsChange"
- msgstr "MaxContentsChange"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:272
+ #: apt-ftparchive.1.xml:251
  msgid ""
  "Sets the number of kilobytes of contents files that are generated each day. "
  "The contents files are round-robined so that over several days they will all "
@@@ -2643,13 -2171,8 +2172,8 @@@ msgstr "
  "cada dia. Os ficheiros de conteúdo são re-circulados para que ao fim de "
  "alguns dias todos sejam reconstruídos."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:277
- msgid "ContentsAge"
- msgstr "ContentsAge"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:279
+ #: apt-ftparchive.1.xml:258
  msgid ""
  "Controls the number of days a contents file is allowed to be checked without "
  "changing. If this limit is passed the mtime of the contents file is updated. "
@@@ -2666,13 -2189,8 +2190,8 @@@ msgstr "
  "que novos .debs sejam instalados, requerendo um novo ficheiro de qualquer "
  "modo. A predefinição é 10, as unidades são em dias."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:288
- msgid "Directory"
- msgstr "Directory"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:290
+ #: apt-ftparchive.1.xml:269
  msgid ""
  "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
  "$(SECTION)/binary-$(ARCH)/</filename>"
@@@ -2680,13 -2198,8 +2199,8 @@@ msgstr "
  "Define o topo da árvore de directórios .deb. A predefinição é <filename>"
  "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:294
- msgid "SrcDirectory"
- msgstr "SrcDirectory"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:296
+ #: apt-ftparchive.1.xml:275
  msgid ""
  "Sets the top of the source package directory tree. Defaults to <filename>"
  "$(DIST)/$(SECTION)/source/</filename>"
@@@ -2694,13 -2207,8 +2208,8 @@@ msgstr "
  "Define o topo da árvore de directórios de pacotes fonte. A predefinição é "
  "<filename>$(DIST)/$(SECTION)/source/</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
- msgid "Packages"
- msgstr "Packages"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:302
+ #: apt-ftparchive.1.xml:281
  msgid ""
  "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "binary-$(ARCH)/Packages</filename>"
@@@ -2708,13 -2216,8 +2217,8 @@@ msgstr "
  "Define o ficheiro Packages de saída. A predefinição é <filename>$(DIST)/"
  "$(SECTION)/binary-$(ARCH)/Packages</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
- msgid "Sources"
- msgstr "Sources"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:308
+ #: apt-ftparchive.1.xml:287
  msgid ""
  "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "source/Sources</filename>"
@@@ -2722,13 -2225,8 +2226,8 @@@ msgstr "
  "Define o ficheiro Sources de saída. A predefinição é <filename>$(DIST)/"
  "$(SECTION)/source/Sources</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:312
- msgid "Translation"
- msgstr "Translation"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:314
+ #: apt-ftparchive.1.xml:293
  msgid ""
  "Set the output Translation-en master file with the long descriptions if they "
  "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@@ -2738,13 -2236,8 +2237,8 @@@ msgstr "
  "não deve ser incluído no ficheiro Packages. A predefinição é <filename>"
  "$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:319
- msgid "InternalPrefix"
- msgstr "InternalPrefix"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:321
+ #: apt-ftparchive.1.xml:300
  msgid ""
  "Sets the path prefix that causes a symlink to be considered an internal link "
  "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@@ -2754,13 -2247,8 +2248,8 @@@ msgstr "
  "link interno em vez de um link externo. A predefinição é <filename>$(DIST)/"
  "$(SECTION)/</filename>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
- msgid "Contents"
- msgstr "Contents"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:328
+ #: apt-ftparchive.1.xml:307
  msgid ""
  "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
  "</filename>. If this setting causes multiple Packages files to map onto a "
@@@ -2773,23 -2261,13 +2262,13 @@@ msgstr "
  "então o <command>apt-ftparchive</command> irá automaticamente integrar esses "
  "ficheiros pacotes todos juntos."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:335
- msgid "Contents::Header"
- msgstr "Contents::Header"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:337
+ #: apt-ftparchive.1.xml:316
  msgid "Sets header file to prepend to the contents output."
  msgstr "Define o ficheiro cabeçalho para prefixar a saída de conteúdos."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
- msgid "BinCacheDB"
- msgstr "BinCacheDB"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:342
+ #: apt-ftparchive.1.xml:321
  msgid ""
  "Sets the binary cache database to use for this section. Multiple sections "
  "can share the same database."
@@@ -2797,13 -2275,8 +2276,8 @@@ msgstr "
  "Define a base de dados de cache binária a usar para esta secção. Múltiplas "
  "secções podem partilhar a mesma base de dados."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:346
- msgid "FileList"
- msgstr "FileList"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:348
+ #: apt-ftparchive.1.xml:327
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
@@@ -2814,13 -2287,8 +2288,8 @@@ msgstr "
  "fornecido. Nomes de ficheiros relativos são prefixados com o directório de "
  "arquivo."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:353
- msgid "SourceFileList"
- msgstr "SourceFileList"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:355
+ #: apt-ftparchive.1.xml:334
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
@@@ -2833,12 -2301,12 +2302,12 @@@ msgstr "
  "arquivo. Isto é usado quando se processa índices de fonte."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:363
+ #: apt-ftparchive.1.xml:342
  msgid "Tree Section"
  msgstr "Secção Tree"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:365
+ #: apt-ftparchive.1.xml:344
  msgid ""
  "The <literal>Tree</literal> section defines a standard Debian file tree "
  "which consists of a base directory, then multiple sections in that base "
@@@ -2853,7 -2321,7 +2322,7 @@@ msgstr "
  "<literal>Directory</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:370
+ #: apt-ftparchive.1.xml:349
  msgid ""
  "The <literal>Tree</literal> section takes a scope tag which sets the "
  "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@@ -2866,7 -2334,7 +2335,7 @@@ msgstr "
  "definição tal como <filename>dists/&stable-codename;</filename>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:375
+ #: apt-ftparchive.1.xml:354
  msgid ""
  "All of the settings defined in the <literal>TreeDefault</literal> section "
  "can be use in a <literal>Tree</literal> section as well as three new "
@@@ -2877,7 -2345,7 +2346,7 @@@ msgstr "
  "variáveis."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt-ftparchive.1.xml:381
+ #: apt-ftparchive.1.xml:360
  #, no-wrap
  msgid ""
  "for i in Sections do \n"
@@@ -2891,7 -2359,7 +2360,7 @@@ msgstr "
  "     "
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:378
+ #: apt-ftparchive.1.xml:357
  msgid ""
  "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
  "command> performs an operation similar to: <placeholder type=\"programlisting"
@@@ -2901,13 -2369,8 +2370,8 @@@ msgstr "
  "ftparchive</command> executa uma operação semelhante a: <placeholder type="
  "\"programlisting\" id=\"0\"/>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:387
- msgid "Sections"
- msgstr "Sections"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:389
+ #: apt-ftparchive.1.xml:368
  msgid ""
  "This is a space separated list of sections which appear under the "
  "distribution, typically this is something like <literal>main contrib non-"
@@@ -2917,13 -2380,8 +2381,8 @@@ msgstr "
  "distribuição, tipicamente isto é algo como <literal>main contrib non-free</"
  "literal>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:394
- msgid "Architectures"
- msgstr "Architectures"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:396
+ #: apt-ftparchive.1.xml:375
  msgid ""
  "This is a space separated list of all the architectures that appear under "
  "search section. The special architecture 'source' is used to indicate that "
@@@ -2933,13 -2391,8 +2392,8 @@@ msgstr "
  "sob a secção de buscas. A arquitectura especial 'source' é usada para "
  "indicar que esta árvore tem um arquivo fonte."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
- msgid "BinOverride"
- msgstr "BinOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:409
+ #: apt-ftparchive.1.xml:388
  msgid ""
  "Sets the binary override file. The override file contains section, priority "
  "and maintainer address information."
@@@ -2947,13 -2400,8 +2401,8 @@@ msgstr "
  "Define o ficheiro de sobreposição binário. O ficheiro de sobreposição "
  "informação de secção, prioridade e endereço do responsável."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
- msgid "SrcOverride"
- msgstr "SrcOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:415
+ #: apt-ftparchive.1.xml:394
  msgid ""
  "Sets the source override file. The override file contains section "
  "information."
@@@ -2961,33 -2409,23 +2410,23 @@@ msgstr "
  "Define o ficheiro de sobreposição fonte. O ficheiro de sobreposição "
  "informação de secção."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
- msgid "ExtraOverride"
- msgstr "ExtraOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+ #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
  msgid "Sets the binary extra override file."
  msgstr "Define o ficheiro de sobreposição extra binário."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
- msgid "SrcExtraOverride"
- msgstr "SrcExtraOverride"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+ #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
  msgid "Sets the source extra override file."
  msgstr "Define o ficheiro de sobreposição extra fonte."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:431
+ #: apt-ftparchive.1.xml:410
  msgid "BinDirectory Section"
  msgstr "Secção BinDirectory"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:433
+ #: apt-ftparchive.1.xml:412
  msgid ""
  "The <literal>bindirectory</literal> section defines a binary directory tree "
  "with no special structure. The scope tag specifies the location of the "
@@@ -3002,12 -2440,12 +2441,12 @@@ msgstr "
  "definições <literal>Section</literal><literal>Architecture</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:441
+ #: apt-ftparchive.1.xml:420
  msgid "Sets the Packages file output."
  msgstr "Define a saída do ficheiro Packages."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:446
+ #: apt-ftparchive.1.xml:425
  msgid ""
  "Sets the Sources file output. At least one of <literal>Packages</literal> or "
  "<literal>Sources</literal> is required."
@@@ -3016,52 -2454,42 +2455,42 @@@ msgstr "
  "<literal>Packages</literal> ou <literal>Sources</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:452
+ #: apt-ftparchive.1.xml:431
  msgid "Sets the Contents file output. (optional)"
  msgstr "Define a saída do ficheiro Contents (opcional)"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:457
+ #: apt-ftparchive.1.xml:436
  msgid "Sets the binary override file."
  msgstr "Define o ficheiro de sobreposição binário."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:462
+ #: apt-ftparchive.1.xml:441
  msgid "Sets the source override file."
  msgstr "Define o ficheiro de sobreposição fonte."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:477
+ #: apt-ftparchive.1.xml:456
  msgid "Sets the cache DB."
  msgstr "Define a base de dados de cache."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:480
- msgid "PathPrefix"
- msgstr "PathPrefix"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:482
+ #: apt-ftparchive.1.xml:461
  msgid "Appends a path to all the output paths."
  msgstr "Acrescenta um caminho a todos os caminhos de saída."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:485
- msgid "FileList, SourceFileList"
- msgstr "FileList, SourceFileList"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:487
+ #: apt-ftparchive.1.xml:466
  msgid "Specifies the file list file."
  msgstr "Especifica o ficheiro de lista de ficheiros."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:494
+ #: apt-ftparchive.1.xml:473
  msgid "The Binary Override File"
  msgstr "O Ficheiro Binary Override"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:495
+ #: apt-ftparchive.1.xml:474
  msgid ""
  "The binary override file is fully compatible with &dpkg-scanpackages;. It "
  "contains 4 fields separated by spaces. The first field is the package name, "
@@@ -3076,19 -2504,19 +2505,19 @@@ msgstr "
  "permutação do responsável."
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:501
+ #: apt-ftparchive.1.xml:480
  #, no-wrap
  msgid "old [// oldn]* => new"
  msgstr "old [// oldn]* => new"
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:503
+ #: apt-ftparchive.1.xml:482
  #, no-wrap
  msgid "new"
  msgstr "new"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:500
+ #: apt-ftparchive.1.xml:479
  msgid ""
  "The general form of the maintainer field is: <placeholder type="
  "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@@ -3105,12 -2533,12 +2534,12 @@@ msgstr "
  "formato substitui incondicionalmente o campo do responsável."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:511
+ #: apt-ftparchive.1.xml:490
  msgid "The Source Override File"
  msgstr "O Ficheiro Source Override"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:513
+ #: apt-ftparchive.1.xml:492
  msgid ""
  "The source override file is fully compatible with &dpkg-scansources;. It "
  "contains 2 fields separated by spaces. The first fields is the source "
@@@ -3121,12 -2549,12 +2550,12 @@@ msgstr "
  "nome de pacote fonte, o segundo é a secção onde o atribuir."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:518
+ #: apt-ftparchive.1.xml:497
  msgid "The Extra Override File"
  msgstr "O Ficheiro Extra Override"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:520
+ #: apt-ftparchive.1.xml:499
  msgid ""
  "The extra override file allows any arbitrary tag to be added or replaced in "
  "the output. It has 3 columns, the first is the package, the second is the "
@@@ -3136,14 -2564,8 +2565,8 @@@ msgstr "
  "seja adicionada ou substituída na saída. Tem 3 colunas, a primeira é o "
  "pacote, a segunda é a etiqueta e restante da linha é o novo valor."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:529
- msgid ""
- "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:531
+ #: apt-ftparchive.1.xml:510
  #, fuzzy
  #| msgid ""
  #| "Values for the additional metadata fields in the Release file are taken "
@@@ -3160,10 -2582,10 +2583,10 @@@ msgid "
  "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>."
+ "<literal><replaceable>Index</replaceable></literal> can be "
+ "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+ "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+ "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
  msgstr ""
  "Valores para os campos de metadados adicionais no ficheiro Release são "
  "tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::"
@@@ -3174,13 -2596,8 +2597,8 @@@
  "<literal>Architectures</literal>, <literal>Components</literal>, "
  "<literal>Description</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:541
+ #: apt-ftparchive.1.xml:521
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
  "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@@ -3189,7 -2606,7 +2607,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:547
+ #: apt-ftparchive.1.xml:527
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -3202,13 -2619,8 +2620,8 @@@ msgstr "
  "silêncio, sobrepondo o ficheiro de configuração. Item de Configuração: "
  "<literal>quiet</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:555
+ #: apt-ftparchive.1.xml:535
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
  "then this option actually enables delinking of the files. It defaults to on "
@@@ -3220,13 -2632,8 +2633,8 @@@ msgstr "
  "predefinição é ligada e e pode ser desligada com <option>--no-delink</"
  "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:563
+ #: apt-ftparchive.1.xml:543
  msgid ""
  "Perform contents generation. When this option is set and package indexes are "
  "being generated with a cache DB then the file listing will also be extracted "
@@@ -3241,13 -2648,8 +2649,8 @@@ msgstr "
  "criação de quaisquer ficheiros de Conteúdos. A predefinição é ligado. Item "
  "de Configuração: <literal>APT::FTPArchive::Contents</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:573
+ #: apt-ftparchive.1.xml:553
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@@ -3257,13 -2659,8 +2660,8 @@@ msgstr "
  "<literal>sources</literal>. Item de Configuração: <literal>APT::FTPArchive::"
  "SourceOverride</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:579
+ #: apt-ftparchive.1.xml:559
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3271,13 -2668,8 +2669,8 @@@ msgstr "
  "Torna as bases de dados de cache apenas de leitura. Item de Configuração: "
  "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:584
+ #: apt-ftparchive.1.xml:564
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
  "commands only package files matching <literal>*_arch.deb</literal> or "
@@@ -3290,13 -2682,8 +2683,8 @@@ msgstr "
  "pacotes presentes no caminho fornecido. Item de Configuração: <literal>APT::"
  "FTPArchive::Architecture</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:592
+ #: apt-ftparchive.1.xml:572
  msgid ""
  "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
  "packages are recompiled and/or republished with the same version again, this "
@@@ -3319,13 -2706,8 +2707,8 @@@ msgstr "
  "de versão, portanto em teoria ninguém irá ter estes problemas e então todas "
  "as verificações extras serão desnecessárias."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:604
+ #: apt-ftparchive.1.xml:584
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
  "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@@ -3340,19 -2722,19 +2723,19 @@@ msgstr "
  "<filename>Translation-en</filename> só pode ser criado no comando generate."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
- #: sources.list.5.xml:198
+ #: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
+ #: sources.list.5.xml:214
  msgid "Examples"
  msgstr "Examples"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
- #: apt-ftparchive.1.xml:622
+ #: apt-ftparchive.1.xml:602
  #, no-wrap
  msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:618
+ #: apt-ftparchive.1.xml:598
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3361,7 -2743,7 +2744,7 @@@ msgstr "
  "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:632
+ #: apt-ftparchive.1.xml:612
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -3369,21 -2751,6 +2752,6 @@@ msgstr "
  "<command>apt-ftparchive</command> devolve zero na operação normal, 100 "
  "decimal em erro."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-get.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
- "November 2008</date>"
- msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
- "Novembro 2008</date>"
- 
- #. type: <heading></heading>
- #: apt-get.8.xml:25 apt-get.8.xml:32 guide.sgml:96
- msgid "apt-get"
- msgstr "apt-get"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-get.8.xml:33
  msgid "APT package handling utility -- command-line interface"
@@@ -3391,95 -2758,8 +2759,8 @@@ msgstr "
  "Utilitário de manuseamento de pacotes do APT -- interface de linha de "
  "comandos"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-get.8.xml:39
- #, fuzzy
- #| msgid ""
- #| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- #| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
- #| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
- #| "<arg> <option>-t=</option> <arg choice='plain'> "
- #| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
- #| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
- #| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
- #| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
- #| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
- #| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
- #| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- #| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
- #| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- #| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
- #| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
- #| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
- #| "<group choice='req'> <arg choice='plain'> "
- #| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
- #| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- #| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
- #| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- #| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- #| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- #| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- #| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
- #| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
- #| "help</arg> </group> </arg> </group>"
- msgid ""
- "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
- "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
- "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
- "replaceable> </arg> </arg> <group choice=\"req\"> <arg "
- "choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
- "choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
- "<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
- "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
- "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
- "arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
- "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
- "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
- "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
- "</group> </arg> </group>"
- msgstr ""
- "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- "<option>-o= <replaceable>string_de_configuração</replaceable> </option> </"
- "arg> <arg> <option>-c= <replaceable>ficheiro_de_configuração</replaceable> </"
- "option> </arg> <arg> <option>-t=</option> <arg choice='plain'> "
- "<replaceable>lançamento_de_destino</replaceable> </arg> </arg> <group choice="
- "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
- "<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
- "arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
- "choice='plain'> =<replaceable>número_de_versão_do_pacote</replaceable> </"
- "arg> <arg choice='plain'> /<replaceable>lançamento_de_destino</replaceable> "
- "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pacote</replaceable></arg></arg> <arg choice='plain'>source "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable> <arg> "
- "<group choice='req'> <arg choice='plain'> "
- "=<replaceable>número_de_versão_do_pacote</replaceable> </arg> <arg "
- "choice='plain'> /<replaceable>lançamento_de_destino</replaceable> </arg> </"
- "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></arg> <arg "
- "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
- "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
- "</group> </arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:115
+ #: apt-get.8.xml:39
  msgid ""
  "<command>apt-get</command> is the command-line tool for handling packages, "
  "and may be considered the user's \"back-end\" to other tools using the APT "
@@@ -3491,13 -2771,8 +2772,8 @@@ msgstr "
  "outras ferramentas que usam a biblioteca APT. Existem várias interfaces "
  "\"front-end\" como o &dselect;, &aptitude;, &synaptic; e &wajig;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:124 apt-key.8.xml:127
- msgid "update"
- msgstr "update"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:125
+ #: apt-get.8.xml:49
  msgid ""
  "<literal>update</literal> is used to resynchronize the package index files "
  "from their sources. The indexes of available packages are fetched from the "
@@@ -3520,13 -2795,8 +2796,8 @@@ msgstr "
  "note que a medição do processo total ira estar incorrecta pois o tamanho dos "
  "ficheiros de pacotes não pode ser conhecido com antecedência."
  
- #. type: <tag></tag>
- #: apt-get.8.xml:136 guide.sgml:121
- msgid "upgrade"
- msgstr "upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:137
+ #: apt-get.8.xml:61
  msgid ""
  "<literal>upgrade</literal> is used to install the newest versions of all "
  "packages currently installed on the system from the sources enumerated in "
@@@ -3551,13 -2821,8 +2822,8 @@@ msgstr "
  "para que o <command>apt-get</command> fique a saber que estão disponíveis "
  "novas versões de pacotes."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:149
- msgid "dselect-upgrade"
- msgstr "dselect-upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:150
+ #: apt-get.8.xml:74
  msgid ""
  "<literal>dselect-upgrade</literal> is used in conjunction with the "
  "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@@ -3572,13 -2837,8 +2838,8 @@@ msgstr "
  "dos pacotes disponíveis, e executa as acções necessárias para realizar esse "
  "estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)."
  
- #. type: <tag></tag>
- #: apt-get.8.xml:159 guide.sgml:140
- msgid "dist-upgrade"
- msgstr "dist-upgrade"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:160
+ #: apt-get.8.xml:84
  msgid ""
  "<literal>dist-upgrade</literal> in addition to performing the function of "
  "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@@ -3601,13 -2861,8 +2862,8 @@@ msgstr "
  "de pacotes desejados. Veja também &apt-preferences; para um mecanismo para "
  "sobrepor as definições gerais em pacotes individuais."
  
- #. type: <tag></tag>
- #: apt-get.8.xml:172 guide.sgml:131
- msgid "install"
- msgstr "install"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:174
+ #: apt-get.8.xml:98
  msgid ""
  "<literal>install</literal> is followed by one or more packages desired for "
  "installation or upgrading.  Each package is a package name, not a fully "
@@@ -3635,7 -2890,7 +2891,7 @@@ msgstr "
  "decisões feitas pelo sistema de resolução de conflitos do apt-get."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:192
+ #: apt-get.8.xml:116
  msgid ""
  "A specific version of a package can be selected for installation by "
  "following the package name with an equals and the version of the package to "
@@@ -3652,7 -2907,7 +2908,7 @@@ msgstr "
  "versão da distribuição ou o nome de Arquivo (stable, testing, unstable)."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:199
+ #: apt-get.8.xml:123
  msgid ""
  "Both of the version selection mechanisms can downgrade packages and must be "
  "used with care."
@@@ -3661,7 -2916,7 +2917,7 @@@ msgstr "
  "e devem ser usados com cuidado."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:202
+ #: apt-get.8.xml:126
  msgid ""
  "This is also the target to use if you want to upgrade one or more already-"
  "installed packages without upgrading every package you have on your system. "
@@@ -3681,7 -2936,7 +2937,7 @@@ msgstr "
  "descarregadas e instaladas."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:213
+ #: apt-get.8.xml:137
  msgid ""
  "Finally, the &apt-preferences; mechanism allows you to create an alternative "
  "installation policy for individual packages."
@@@ -3690,7 -2945,7 +2946,7 @@@ msgstr "
  "instalação alternativa para pacotes individuais."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:217
+ #: apt-get.8.xml:141
  msgid ""
  "If no package matches the given expression and the expression contains one "
  "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@@ -3708,13 -2963,8 +2964,8 @@@ msgstr "
  "lo' e 'lowest'. Se isto for indesejável, ancore a expressão regular com a "
  "caractere '^' ou '$', para criar uma expressão regular mais específica."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:226
- msgid "remove"
- msgstr "remove"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:227
+ #: apt-get.8.xml:151
  msgid ""
  "<literal>remove</literal> is identical to <literal>install</literal> except "
  "that packages are removed instead of installed. Note the removing a package "
@@@ -3728,13 -2978,8 +2979,8 @@@ msgstr "
  "mais (+) for acrescentado ao nome do pacote (sem nenhum espaço a separar), o "
  "pacote identificado será instalado em vez de removido."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:234
- msgid "purge"
- msgstr "purge"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:235
+ #: apt-get.8.xml:159
  msgid ""
  "<literal>purge</literal> is identical to <literal>remove</literal> except "
  "that packages are removed and purged (any configuration files are deleted "
@@@ -3744,18 -2989,13 +2990,13 @@@ msgstr "
  "excepção que os pacotes são removidos e purgados (quaisquer ficheiros de "
  "configuração são também apagados)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:239
- msgid "source"
- msgstr "source"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:240
+ #: apt-get.8.xml:164
  msgid ""
  "<literal>source</literal> causes <command>apt-get</command> to fetch source "
  "packages. APT will examine the available packages to decide which source "
  "package to fetch. It will then find and download into the current directory "
- "the newest available version of that source package while respect the "
+ "the newest available version of that source package while respecting the "
  "default release, set with the option <literal>APT::Default-Release</"
  "literal>, the <option>-t</option> option or per package with the "
  "<literal>pkg/release</literal> syntax, if possible."
@@@ -3769,7 -3009,7 +3010,7 @@@ msgstr "
  "<literal>pkg/release</literal>, se possível."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:248
+ #: apt-get.8.xml:172
  msgid ""
  "Source packages are tracked separately from binary packages via <literal>deb-"
  "src</literal> type lines in the &sources-list; file. This means that you "
@@@ -3785,7 -3025,7 +3026,7 @@@ msgstr "
  "instalada ou pode instalar."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:255
+ #: apt-get.8.xml:179
  #, fuzzy
  #| msgid ""
  #| "If the <option>--compile</option> option is specified then the package "
@@@ -3794,9 -3034,10 +3035,10 @@@
  #| "source package will not be unpacked."
  msgid ""
  "If the <option>--compile</option> option is specified then the package will "
- "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
- "<option>--download-only</option> is specified then the source package will "
- "not be unpacked."
+ "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+ "the architecture as defined by the <command>--host-architecture</command> "
+ "option.  If <option>--download-only</option> is specified then the source "
+ "package will not be unpacked."
  msgstr ""
  "Se for especificada a opção <option>--compile</option> então o pacote irá "
  "ser compilado para um binário .deb usando <command>dpkg-buildpackage</"
@@@ -3804,7 -3045,7 +3046,7 @@@
  "pacote fonte não será desempacotado."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:260
+ #: apt-get.8.xml:186
  msgid ""
  "A specific source version can be retrieved by postfixing the source name "
  "with an equals and then the version to fetch, similar to the mechanism used "
@@@ -3819,7 -3060,7 +3061,7 @@@ msgstr "
  "Only-Source</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:266
+ #: apt-get.8.xml:192
  msgid ""
  "Note that source packages are not tracked like binary packages, they exist "
  "only in the current directory and are similar to downloading source tar "
@@@ -3829,31 -3070,24 +3071,24 @@@ msgstr "
  "existem apenas no directório actual e são semelhantes à descarga de tar "
  "balls fonte."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:271
- msgid "build-dep"
- msgstr "build-dep"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:272
+ #: apt-get.8.xml:198
  #, fuzzy
  #| msgid ""
  #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
  #| "an attempt to satisfy the build dependencies for a source package."
  msgid ""
  "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
- "attempt to satisfy the build dependencies for a source package."
+ "attempt to satisfy the build dependencies for a source package. By default "
+ "the dependencies are satisfied to build the package natively. If desired a "
+ "host-architecture can be specified with the <option>--host-architecture</"
+ "option> option instead."
  msgstr ""
  "<literal>build-dep</literal> faz o apt-get instalar/remover pacotes numa "
  "tentativa de satisfazer dependências de compilação para um pacote fonte."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:276
- msgid "check"
- msgstr "check"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:277
+ #: apt-get.8.xml:205
  msgid ""
  "<literal>check</literal> is a diagnostic tool; it updates the package cache "
  "and checks for broken dependencies."
@@@ -3861,20 -3095,15 +3096,15 @@@ msgstr "
  "<literal>check</literal> é uma ferramenta de diagnóstico; actualiza a cache "
  "de pacotes e verifica por dependências quebradas."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:281
- msgid "download"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:282
+ #: apt-get.8.xml:210
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
- "current directoy."
+ "current directory."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:288
+ #: apt-get.8.xml:216
  msgid ""
  "<literal>clean</literal> clears out the local repository of retrieved "
  "package files. It removes everything but the lock file from "
@@@ -3892,13 -3121,8 +3122,8 @@@ msgstr "
  "querer executar <literal>apt-get clean</literal> de tempos a tempos para "
  "libertar espaço do disco."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:297
- msgid "autoclean"
- msgstr "autoclean"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:298
+ #: apt-get.8.xml:226
  msgid ""
  "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
  "local repository of retrieved package files. The difference is that it only "
@@@ -3916,13 -3140,8 +3141,8 @@@ msgstr "
  "configuração <literal>APT::Clean-Installed</literal> irá prevenir que "
  "pacotes instalados sejam apagados se estiver definida para 'off'."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:307
- msgid "autoremove"
- msgstr "autoremove"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:308
+ #: apt-get.8.xml:236
  #, fuzzy
  #| msgid ""
  #| "<literal>autoremove</literal> is used to remove packages that were "
@@@ -3930,38 -3149,29 +3150,29 @@@
  #| "are no more needed."
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
- "automatically installed to satisfy dependencies for some package and that "
- "are no more needed."
+ "automatically installed to satisfy dependencies for other packages and are "
+ "now no longer needed."
  msgstr ""
  "<literal>autoremove</literal> é usado para remover pacotes que foram "
  "instalados automaticamente para satisfazer dependências de algum pacote e "
  "que já não são necessários."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:312
- msgid "changelog"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:313
+ #: apt-get.8.xml:241
  msgid ""
  "<literal>changelog</literal> downloads a package changelog and displays it "
  "through <command>sensible-pager</command>. The server name and base "
  "directory is defined in the <literal>APT::Changelogs::Server</literal> "
- "variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
- "Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
- "Ubuntu).  By default it displays the changelog for the version that is "
+ "variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+ "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+ "changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+ "for Ubuntu).  By default it displays the changelog for the version that is "
  "installed.  However, you can specify the same options as for the "
  "<option>install</option> command."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:335
- msgid "<option>--no-install-recommends</option>"
- msgstr "<option>--no-install-recommends</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:336
+ #: apt-get.8.xml:264
  msgid ""
  "Do not consider recommended packages as a dependency for installing.  "
  "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@@ -3969,15 -3179,8 +3180,8 @@@ msgstr "
  "Não considera pacotes recomendados como dependências para instalação. Item "
  "de Configuração: <literal>APT::Install-Recommends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:340
- #, fuzzy
- #| msgid "<option>--no-suggests</option>"
- msgid "<option>--install-suggests</option>"
- msgstr "<option>--no-suggests</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:341
+ #: apt-get.8.xml:269
  #, fuzzy
  #| msgid ""
  #| "Do not consider recommended packages as a dependency for installing.  "
@@@ -3989,13 -3192,8 +3193,8 @@@ msgstr "
  "Não considera pacotes recomendados como dependências para instalação. Item "
  "de Configuração: <literal>APT::Install-Recommends</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:345
- msgid "<option>--download-only</option>"
- msgstr "<option>--download-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:346
+ #: apt-get.8.xml:274
  msgid ""
  "Download only; package files are only retrieved, not unpacked or installed.  "
  "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@@ -4004,13 -3202,8 +3203,8 @@@ msgstr "
  "desempacotados nem instalados. Item de Configuração: <literal>APT::Get::"
  "Download-Only</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:350
- msgid "<option>--fix-broken</option>"
- msgstr "<option>--fix-broken</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:351
+ #: apt-get.8.xml:279
  msgid ""
  "Fix; attempt to correct a system with broken dependencies in place. This "
  "option, when used with install/remove, can omit any packages to permit APT "
@@@ -4037,18 -3230,8 +3231,8 @@@ msgstr "
  "option> pode produzir um erro em algumas situações. Item de Configuração: "
  "<literal>APT::Get::Fix-Broken</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:364
- msgid "<option>--ignore-missing</option>"
- msgstr "<option>--ignore-missing</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:365
- msgid "<option>--fix-missing</option>"
- msgstr "<option>--fix-missing</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:366
+ #: apt-get.8.xml:294
  msgid ""
  "Ignore missing packages; If packages cannot be retrieved or fail the "
  "integrity check after retrieval (corrupted package files), hold back those "
@@@ -4066,13 -3249,8 +3250,8 @@@ msgstr "
  "de comandos) e não pode ser descarregado estão será retido em silêncio. Item "
  "de Configuração: <literal>APT::Get::Fix-Missing</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:376
- msgid "<option>--no-download</option>"
- msgstr "<option>--no-download</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:377
+ #: apt-get.8.xml:305
  msgid ""
  "Disables downloading of packages. This is best used with <option>--ignore-"
  "missing</option> to force APT to use only the .debs it has already "
@@@ -4083,7 -3261,7 +3262,7 @@@ msgstr "
  "descarregados. Item de Configuração: <literal>APT::Get::Download</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:384
+ #: apt-get.8.xml:312
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -4102,18 -3280,8 +3281,8 @@@ msgstr "
  "pode decidir fazer algo que você não esperava. Item de Configuração: "
  "<literal>quiet</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:394
- msgid "<option>--simulate</option>"
- msgstr "<option>--simulate</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:396
- msgid "<option>--dry-run</option>"
- msgstr "<option>--dry-run</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:399
+ #: apt-get.8.xml:327
  msgid ""
  "No action; perform a simulation of events that would occur but do not "
  "actually change the system.  Configuration Item: <literal>APT::Get::"
@@@ -4124,7 -3292,7 +3293,7 @@@ msgstr "
  "Simulate</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:403
+ #: apt-get.8.xml:331
  msgid ""
  "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
  "literal>)  automatic. Also a notice will be displayed indicating that this "
@@@ -4142,7 -3310,7 +3311,7 @@@ msgstr "
  "get</literal>)."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:409
+ #: apt-get.8.xml:337
  msgid ""
  "Simulate prints out a series of lines each one representing a dpkg "
  "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@@ -4154,23 -3322,8 +3323,8 @@@ msgstr "
  "rectos ([]) indicam pacotes quebrados e conjuntos de parênteses rectos "
  "vazios significam quebras que não têm consequência (raro)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>-y</option>"
- msgstr "<option>-y</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>--yes</option>"
- msgstr "<option>--yes</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:417
- msgid "<option>--assume-yes</option>"
- msgstr "<option>--assume-yes</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:418
+ #: apt-get.8.xml:346
  msgid ""
  "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
  "non-interactively. If an undesirable situation, such as changing a held "
@@@ -4185,18 -3338,21 +3339,21 @@@ msgstr "
  "literal> irá abortar. Item de Configuração: <literal>APT::Get::Assume-Yes</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>-u</option>"
- msgstr "<option>-u</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>--show-upgraded</option>"
- msgstr "<option>--show-upgraded</option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:354
+ #, fuzzy
+ #| msgid ""
+ #| "Compile source packages after downloading them.  Configuration Item: "
+ #| "<literal>APT::Get::Compile</literal>."
+ msgid ""
+ "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+ "Assume-No</literal>."
+ msgstr ""
+ "Compila pacotes fonte após os descarregar. Item de Configuração: "
+ "<literal>APT::Get::Compile</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:426
+ #: apt-get.8.xml:359
  msgid ""
  "Show upgraded packages; Print out a list of all packages that are to be "
  "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@@ -4205,18 -3361,8 +3362,8 @@@ msgstr "
  "prestes a ser actualizados. Item de Configuração: <literal>APT::Get::Show-"
  "Upgraded</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>-V</option>"
- msgstr "<option>-V</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>--verbose-versions</option>"
- msgstr "<option>--verbose-versions</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:432
+ #: apt-get.8.xml:365
  msgid ""
  "Show full versions for upgraded and installed packages.  Configuration Item: "
  "<literal>APT::Get::Show-Versions</literal>."
@@@ -4224,23 -3370,19 +3371,19 @@@ msgstr "
  "Mostra as versões completas para pacotes actualizados e instalados.  Item de "
  "Configuração: <literal>APT::Get::Show-Versions</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>-b</option>"
- msgstr "<option>-b</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>--compile</option>"
- msgstr "<option>--compile</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:437
- msgid "<option>--build</option>"
- msgstr "<option>--build</option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:371
+ msgid ""
+ "This option controls the architecture packages are built for by <command>apt-"
+ "get source --compile</command> and how cross-builddependencies are "
+ "satisfied. By default is it not set which means that the host architecture "
+ "is the same as the build architecture (which is defined by <literal>APT::"
+ "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
+ "Architecture</literal>"
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:438
+ #: apt-get.8.xml:381
  msgid ""
  "Compile source packages after downloading them.  Configuration Item: "
  "<literal>APT::Get::Compile</literal>."
@@@ -4248,13 -3390,8 +3391,8 @@@ msgstr "
  "Compila pacotes fonte após os descarregar. Item de Configuração: "
  "<literal>APT::Get::Compile</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:442
- msgid "<option>--ignore-hold</option>"
- msgstr "<option>--ignore-hold</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:443
+ #: apt-get.8.xml:386
  msgid ""
  "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
  "hold placed on a package. This may be useful in conjunction with "
@@@ -4266,13 -3403,8 +3404,8 @@@ msgstr "
  "upgrade</literal> para sobrepor um grande número de retenções não desejadas. "
  "Item de Configuração: <literal>APT::Ignore-Hold</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:449
- msgid "<option>--no-upgrade</option>"
- msgstr "<option>--no-upgrade</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:450
+ #: apt-get.8.xml:393
  msgid ""
  "Do not upgrade packages; When used in conjunction with <literal>install</"
  "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@@ -4284,17 -3416,18 +3417,18 @@@ msgstr "
  "actualizados na linha de comandos se estes já estiverem instalados. Item de "
  "Configuração: <literal>APT::Get::Upgrade</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:456
- msgid "<option>--only-upgrade</option>"
- msgstr "<option>--only-upgrade</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:457
+ #: apt-get.8.xml:400
+ #, fuzzy
+ #| msgid ""
+ #| "Do not install new packages; When used in conjunction with "
+ #| "<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
+ #| "packages on the command line from being upgraded if they are not already "
+ #| "installed.  Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
  msgid ""
  "Do not install new packages; When used in conjunction with <literal>install</"
- "literal>, <literal>only-upgrade</literal> will prevent packages on the "
- "command line from being upgraded if they are not already installed.  "
+ "literal>, <literal>only-upgrade</literal> will install upgrades for already "
+ "installed packages only and ignore requests to install new packages.  "
  "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
  msgstr ""
  "Não instala pacotes novos; Quando usado em conjunto com <literal>install</"
@@@ -4302,13 -3435,8 +3436,8 @@@
  "actualizados na linha de comandos se estes não estiverem já instalados. Item "
  "de Configuração: <literal>APT::Get::Only-Upgrade</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:463
- msgid "<option>--force-yes</option>"
- msgstr "<option>--force-yes</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:464
+ #: apt-get.8.xml:408
  msgid ""
  "Force yes; This is a dangerous option that will cause apt to continue "
  "without prompting if it is doing something potentially harmful. It should "
@@@ -4322,13 -3450,8 +3451,8 @@@ msgstr "
  "literal> pode destruir potencialmente o seu sistema! Item de Configuração: "
  "<literal>APT::Get::force-yes</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:471
- msgid "<option>--print-uris</option>"
- msgstr "<option>--print-uris</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:472
+ #: apt-get.8.xml:416
  msgid ""
  "Instead of fetching the files to install their URIs are printed. Each URI "
  "will have the path, the destination file name, the size and the expected md5 "
@@@ -4348,13 -3471,8 +3472,8 @@@ msgstr "
  "cabe ao utilizador descomprimir quaisquer ficheiros comprimidos. Item de "
  "Configuração: <literal>APT::Get::Print-URIs</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:482
- msgid "<option>--purge</option>"
- msgstr "<option>--purge</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:483
+ #: apt-get.8.xml:427
  msgid ""
  "Use purge instead of remove for anything that would be removed.  An asterisk "
  "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@@ -4366,13 -3484,8 +3485,8 @@@ msgstr "
  "<option>remove --purge</option> é equivalente ao comando <option>purge</"
  "option>. Item de Configuração: <literal>APT::Get::Purge</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:490
- msgid "<option>--reinstall</option>"
- msgstr "<option>--reinstall</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:491
+ #: apt-get.8.xml:435
  msgid ""
  "Re-Install packages that are already installed and at the newest version.  "
  "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@@ -4380,13 -3493,8 +3494,8 @@@ msgstr "
  "Re-instala pacotes que já estão instalados e na versão mais recente. Item de "
  "Configuração: <literal>APT::Get::ReInstall</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:495
- msgid "<option>--list-cleanup</option>"
- msgstr "<option>--list-cleanup</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:496
+ #: apt-get.8.xml:440
  msgid ""
  "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
  "it off. When on <command>apt-get</command> will automatically manage the "
@@@ -4402,18 -3510,8 +3511,8 @@@ msgstr "
  "desligar isto é no caso de você alterar frequentemente a sua lista de "
  "fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:505
- msgid "<option>--target-release</option>"
- msgstr "<option>--target-release</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:506
- msgid "<option>--default-release</option>"
- msgstr "<option>--default-release</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:507
+ #: apt-get.8.xml:451
  msgid ""
  "This option controls the default input to the policy engine, it creates a "
  "default pin at priority 990 using the specified release string.  This "
@@@ -4435,13 -3533,8 +3534,8 @@@ msgstr "
  "<option>-t sid</option>. Item de Configuração: <literal>APT::Default-"
  "Release</literal>; veja também o manual &apt-preferences;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:520
- msgid "<option>--trivial-only</option>"
- msgstr "<option>--trivial-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:522
+ #: apt-get.8.xml:466
  msgid ""
  "Only perform operations that are 'trivial'. Logically this can be considered "
  "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@@ -4454,13 -3547,8 +3548,8 @@@ msgstr "
  "option> irá responder 'não'. Item de Configuração: <literal>APT::Get::"
  "Trivial-Only</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:528
- msgid "<option>--no-remove</option>"
- msgstr "<option>--no-remove</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:529
+ #: apt-get.8.xml:473
  msgid ""
  "If any packages are to be removed apt-get immediately aborts without "
  "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@@ -4469,13 -3557,8 +3558,8 @@@ msgstr "
  "imediatamente sem aviso. Item de Configuração: <literal>APT::Get::Remove</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:534
- msgid "<option>--auto-remove</option>"
- msgstr "<option>--auto-remove</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:535
+ #: apt-get.8.xml:479
  msgid ""
  "If the command is either <literal>install</literal> or <literal>remove</"
  "literal>, then this option acts like running <literal>autoremove</literal> "
@@@ -4487,13 -3570,8 +3571,8 @@@ msgstr "
  "literal>, removendo os pacotes de dependências não utilizados. Item de "
  "Configuração: <literal>APT::Get::AutomaticRemove</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:541
- msgid "<option>--only-source</option>"
- msgstr "<option>--only-source</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:542
+ #: apt-get.8.xml:486
  msgid ""
  "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
  "literal> commands.  Indicates that the given source names are not to be "
@@@ -4511,23 -3589,8 +3590,8 @@@ msgstr "
  "e procurar o pacote fonte correspondente. Item de Configuração: "
  "<literal>APT::Get::Only-Source</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--diff-only</option>"
- msgstr "<option>--diff-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--dsc-only</option>"
- msgstr "<option>--dsc-only</option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--tar-only</option>"
- msgstr "<option>--tar-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:553
+ #: apt-get.8.xml:497
  msgid ""
  "Download only the diff, dsc, or tar file of a source archive.  Configuration "
  "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@@ -4537,13 -3600,8 +3601,8 @@@ msgstr "
  "Configuração: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-"
  "Only</literal>, e <literal>APT::Get::Tar-Only</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:558
- msgid "<option>--arch-only</option>"
- msgstr "<option>--arch-only</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:559
+ #: apt-get.8.xml:503
  msgid ""
  "Only process architecture-dependent build-dependencies.  Configuration Item: "
  "<literal>APT::Get::Arch-Only</literal>."
@@@ -4551,13 -3609,8 +3610,8 @@@ msgstr "
  "Apenas processa dependências de compilação dependentes da arquitectura. Item "
  "de Configuração: <literal>APT::Get::Arch-Only</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:563
- msgid "<option>--allow-unauthenticated</option>"
- msgstr "<option>--allow-unauthenticated</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:564
+ #: apt-get.8.xml:508
  msgid ""
  "Ignore if packages can't be authenticated and don't prompt about it.  This "
  "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@@ -4568,7 -3621,7 +3622,7 @@@ msgstr "
  "Get::AllowUnauthenticated</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-get.8.xml:577
+ #: apt-get.8.xml:521
  msgid ""
  "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
  "&file-statelists;"
@@@ -4577,7 -3630,7 +3631,7 @@@ msgstr "
  "&file-statelists;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:586
+ #: apt-get.8.xml:530
  msgid ""
  "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
  "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@@ -4588,59 -3641,21 +3642,21 @@@ msgstr "
  "&guidesdir;, &apt-preferences;, o Howto do APT."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:592
+ #: apt-get.8.xml:536
  msgid ""
  "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
- "error."
- msgstr ""
- "<command>apt-get</command> devolve zero na operação normal, 100 decimal em "
- "erro."
- 
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:595
- msgid "ORIGINAL AUTHORS"
- msgstr "AUTORES ORIGINAIS"
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:596
- msgid "&apt-author.jgunthorpe;"
- msgstr "&apt-author.jgunthorpe;"
- 
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:599
- msgid "CURRENT AUTHORS"
- msgstr "AUTORES ACTUAIS"
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:601
- msgid "&apt-author.team;"
- msgstr "&apt-author.team;"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-key.8.xml:17 apt-key.8.xml:24
- msgid "apt-key"
- msgstr "apt-key"
+ "error."
+ msgstr ""
+ "<command>apt-get</command> devolve zero na operação normal, 100 decimal em "
+ "erro."
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-key.8.xml:25
+ #: apt-key.8.xml:32
  msgid "APT key management utility"
  msgstr "Utilitário de gestão de chaves do APT"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-key.8.xml:31
- msgid ""
- "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
- "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
- "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
- "arg>"
- msgstr ""
- "<command>apt-key</command> <arg><option>--keyring <replaceable>nome de "
- "ficheiro</replaceable></option></arg> <arg><replaceable>comando</"
- "replaceable></arg> <arg rep=\"repeat\"><option><replaceable>argumentos</"
- "replaceable></option></arg>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:40
+ #: apt-key.8.xml:39
  msgid ""
  "<command>apt-key</command> is used to manage the list of keys used by apt to "
  "authenticate packages.  Packages which have been authenticated using these "
@@@ -4651,84 -3666,56 +3667,56 @@@ msgstr "
  "estas chaves serão considerados de confiança."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-key.8.xml:46
+ #: apt-key.8.xml:45
  msgid "Commands"
  msgstr "Comandos"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:48
- msgid "add <replaceable>filename</replaceable>"
- msgstr "add <replaceable>nome-de-ficheiro</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:52
+ #: apt-key.8.xml:50
+ #, fuzzy
+ #| msgid ""
+ #| "Add a new key to the list of trusted keys.  The key is read from "
+ #| "<replaceable>filename</replaceable>, or standard input if "
+ #| "<replaceable>filename</replaceable> is <literal>-</literal>."
  msgid ""
- "Add a new key to the list of trusted keys.  The key is read from "
- "<replaceable>filename</replaceable>, or standard input if "
- "<replaceable>filename</replaceable> is <literal>-</literal>."
+ "Add a new key to the list of trusted keys.  The key is read from the "
+ "filename given with the parameter &synopsis-param-filename; or if the "
+ "filename is <literal>-</literal> from standard input."
  msgstr ""
  "Adiciona uma chave nova à lista de chaves de confiança. A chave é lida de "
  "<replaceable>nome de ficheiro</replaceable>, ou entrada standard se "
  "<replaceable>nome de ficheiro</replaceable> for <literal>-</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:60
- msgid "del <replaceable>keyid</replaceable>"
- msgstr "del <replaceable>id de chave</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:64
+ #: apt-key.8.xml:63
  msgid "Remove a key from the list of trusted keys."
  msgstr "Remove uma chave da lista de chaves de confiança."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:71
- msgid "export <replaceable>keyid</replaceable>"
- msgstr "export <replaceable>id de chave</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:75
- msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+ #: apt-key.8.xml:74
+ #, fuzzy
+ #| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+ msgid "Output the key &synopsis-param-keyid; to standard output."
  msgstr ""
  "Escreve o <replaceable>id de chave</replaceable> da chave na saída standard."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:82
- msgid "exportall"
- msgstr "exportall"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:86
+ #: apt-key.8.xml:85
  msgid "Output all trusted keys to standard output."
  msgstr "Escreve todas as chaves de confiança na saída standard."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:93
- msgid "list"
- msgstr "list"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:97
+ #: apt-key.8.xml:96
  msgid "List trusted keys."
  msgstr "Lista as chaves de confiança."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:104
- msgid "finger"
- msgstr "finger"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:108
+ #: apt-key.8.xml:107
  msgid "List fingerprints of trusted keys."
  msgstr "Lista as fingerprints das chaves de confiança."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:115
- msgid "adv"
- msgstr "adv"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:119
+ #: apt-key.8.xml:118
  msgid ""
  "Pass advanced options to gpg. With adv --recv-key you can download the "
  "public key."
@@@ -4737,32 -3724,28 +3725,28 @@@ msgstr "
  "chave pública."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
  msgid ""
- "Update the local keyring with the keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
+ "Update the local keyring with the archive keyring and remove from the local "
+ "keyring the archive keys which are no longer valid.  The archive keyring is "
+ "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
++"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
++"Ubuntu."
  msgstr ""
- "Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e "
- "remove do chaveiro as chaves de arquivo que já não são válidas."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:140
- #, fuzzy
- #| msgid "update"
- msgid "net-update"
- msgstr "update"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:144
  msgid ""
- "Update the local keyring with the keys of a key server and removes from the "
- "keyring the archive keys which are no longer valid. This requires an "
- "installed wget and an APT build configured to have a server to fetch from. "
- "APT in Debian does not support this command, but Ubuntu's APT does."
+ "Work similar to the <command>update</command> command above, but get the "
+ "archive keyring from an URI instead and validate it against a master key.  "
+ "This requires an installed &wget; and an APT build configured to have a "
+ "server to fetch from and a master keyring to validate.  APT in Debian does "
+ "not support this command and relies on <command>update</command> instead, "
+ "but Ubuntu's APT does."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:159
+ #: apt-key.8.xml:161
  msgid ""
  "Note that options need to be defined before the commands described in the "
  "previous section."
@@@ -4770,13 -3753,8 +3754,8 @@@ msgstr "
  "Note que as opções precisam ser definidas antes dos comandos descritos na "
  "secção prévia."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:161
- msgid "--keyring <replaceable>filename</replaceable>"
- msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:162
+ #: apt-key.8.xml:164
  #, fuzzy
  #| msgid ""
  #| "With this option it is possible to specify a specific keyring file the "
@@@ -4789,7 -3767,7 +3768,7 @@@ msgid "
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
  "<filename>trusted.gpg</filename> file as well as on all parts in the "
- "<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</"
  "filename> is the primary keyring which means that e.g. new keys are added to "
  "this one."
  msgstr ""
@@@ -4801,99 -3779,54 +3780,63 @@@
  "chaves são adicionadas a este."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-key.8.xml:175
+ #: apt-key.8.xml:177
  msgid "&file-trustedgpg;"
  msgstr "&file-trustedgpg;"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:177
+ #: apt-key.8.xml:179
  msgid "<filename>/etc/apt/trustdb.gpg</filename>"
  msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:178
+ #: apt-key.8.xml:180
  msgid "Local trust database of archive keys."
  msgstr "Base de dados local de confiança de chaves de arquivos."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
++#, fuzzy
++#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
++msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:182
- msgid "Keyring of Debian archive trusted keys."
+ #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
++#, fuzzy
++#| msgid "Keyring of Debian archive trusted keys."
++msgid "Keyring of Ubuntu archive trusted keys."
  msgstr "Chaveiro das chaves de confiança dos arquivos Debian."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:185
+ #: apt-key.8.xml:187
++#, fuzzy
++#| msgid ""
++#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  msgid ""
--"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
++"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
++#, fuzzy
++#| msgid "Keyring of Debian archive removed trusted keys."
++msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:195
+ #: apt-key.8.xml:197
  msgid "&apt-get;, &apt-secure;"
  msgstr "&apt-get;, &apt-secure;"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-mark.8.xml:16
- #, fuzzy
- #| msgid ""
- #| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
- #| "August 2009</date>"
- msgid ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
- "April 2011</date>"
- msgstr ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
- "Agosto 2009</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-mark.8.xml:25 apt-mark.8.xml:32
- msgid "apt-mark"
- msgstr "apt-mark"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-mark.8.xml:33
  msgid "mark/unmark a package as being automatically-installed"
  msgstr "marca/desmarca um pacote como sendo instalado automaticamente"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-mark.8.xml:39
- #, fuzzy
- #| msgid ""
- #| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
- #| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
- #| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
- #| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
- #| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
- #| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
- msgid ""
- "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
- "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
- "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
- "\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
- "\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
- "arg> </group>"
- msgstr ""
- "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
- "f=<replaceable>NOME DE FICHEIRO</replaceable></option></arg> <group choice="
- "\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
- "\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></arg> </"
- "arg> <arg choice=\"plain\">showauto</arg> </group>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:57
+ #: apt-mark.8.xml:39
  msgid ""
  "<command>apt-mark</command> will change whether a package has been marked as "
  "being automatically installed."
@@@ -4902,7 -3835,7 +3845,7 @@@ msgstr "
  "sendo instalado automaticamente."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:61
+ #: apt-mark.8.xml:43
  msgid ""
  "When you request that a package is installed, and as a result other packages "
  "are installed to satisfy its dependencies, the dependencies are marked as "
@@@ -4917,15 -3850,8 +3860,8 @@@ msgstr "
  "pacote instalado manualmente, eles serão removidos pelo <command>apt-get</"
  "command> ou <command>aptitude</command> (exemplos)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:69
- #, fuzzy
- #| msgid "markauto"
- msgid "auto"
- msgstr "markauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:70
+ #: apt-mark.8.xml:52
  #, fuzzy
  #| msgid ""
  #| "<literal>markauto</literal> is used to mark a package as being "
@@@ -4940,13 -3866,8 +3876,8 @@@ msgstr "
  "instalado automaticamente, o que irá causar a remoção do pacote quando mais "
  "nenhum pacote instalado manualmente depender deste pacote."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:77
- msgid "manual"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:78
+ #: apt-mark.8.xml:60
  #, fuzzy
  #| msgid ""
  #| "<literal>unmarkauto</literal> is used to mark a package as being manually "
@@@ -4961,13 -3882,8 +3892,8 @@@ msgstr "
  "instalado manualmente, o que irá prevenir que o pacote seja removido "
  "automaticamente se nenhum outro pacote depender dele."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:85
- msgid "hold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:86
+ #: apt-mark.8.xml:68
  msgid ""
  "<literal>hold</literal> is used to mark a package as hold back, which will "
  "prevent the package from being automatically installed, upgraded or "
@@@ -4976,13 -3892,8 +3902,8 @@@
  "effected by the <option>--filename</option> option."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:95
- msgid "unhold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:96
+ #: apt-mark.8.xml:78
  #, fuzzy
  #| msgid ""
  #| "<literal>showauto</literal> is used to print a list of automatically "
@@@ -4994,13 -3905,8 +3915,8 @@@ msgstr "
  "<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
  "instalados automaticamente com cada pacote numa linha nova."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:101
- msgid "showauto"
- msgstr "showauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:102
+ #: apt-mark.8.xml:84
  #, fuzzy
  #| msgid ""
  #| "<literal>showauto</literal> is used to print a list of automatically "
@@@ -5014,30 -3920,16 +3930,16 @@@ msgstr "
  "<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
  "instalados automaticamente com cada pacote numa linha nova."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:109
- #, fuzzy
- #| msgid "showauto"
- msgid "showmanual"
- msgstr "showauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:110
+ #: apt-mark.8.xml:92
  msgid ""
  "<literal>showmanual</literal> can be used in the same way as "
  "<literal>showauto</literal> except that it will print a list of manually "
  "installed packages instead."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:116
- #, fuzzy
- #| msgid "showauto"
- msgid "showhold"
- msgstr "showauto"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:117
+ #: apt-mark.8.xml:99
  #, fuzzy
  #| msgid ""
  #| "<literal>showauto</literal> is used to print a list of automatically "
@@@ -5049,30 -3941,27 +3951,27 @@@ msgstr "
  "<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
  "instalados automaticamente com cada pacote numa linha nova."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:130
- msgid ""
- "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
- msgstr ""
- "<option>-f=<filename><replaceable>NOME DE FICHEIRO</replaceable></filename></"
- "option>"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:131
- msgid ""
- "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
- "option>"
- msgstr ""
- "<option>--file=<filename><replaceable>NOME DE FICHEIRO</replaceable></"
- "filename></option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+ #: apt-mark.8.xml:112 apt-mark.8.xml:113
+ #, fuzzy
+ #| msgid "xvcg <replaceable>pkg(s)</replaceable>"
+ msgid "<replaceable>&synopsis-filename;</replaceable>"
+ msgstr "xvcg <replaceable>pacote(s)</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:134
- msgid ""
- "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
- "filename> instead of the default location, which is "
- "<filename>extended_status</filename> in the directory defined by the "
- "Configuration Item: <literal>Dir::State</literal>."
+ #: apt-mark.8.xml:115
+ #, fuzzy
+ #| msgid ""
+ #| "Read/Write package stats from <filename><replaceable>FILENAME</"
+ #| "replaceable></filename> instead of the default location, which is "
+ #| "<filename>extended_status</filename> in the directory defined by the "
+ #| "Configuration Item: <literal>Dir::State</literal>."
+ msgid ""
+ "Read/Write package stats from the filename given with the parameter "
+ "<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+ "of from the default location, which is <filename>extended_status</filename> "
+ "in the directory defined by the Configuration Item: <literal>Dir::State</"
+ "literal>."
  msgstr ""
  "Lê/Escreve o estado de pacote a partir de "
  "<filename><replaceable>NOME_DE_FICHEIRO</replaceable></filename> em vez da "
@@@ -5080,17 -3969,17 +3979,17 @@@
  "directório definido pelo Item de Configuração: <literal>Dir::State</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-mark.8.xml:146
+ #: apt-mark.8.xml:128
  msgid "  &file-extended_states;"
  msgstr "  &file-extended_states;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:151
+ #: apt-mark.8.xml:133
  msgid "&apt-get;,&aptitude;,&apt-conf;"
  msgstr "&apt-get;,&aptitude;,&apt-conf;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:155
+ #: apt-mark.8.xml:137
  msgid ""
  "<command>apt-mark</command> returns zero on normal operation, non-zero on "
  "error."
@@@ -5098,18 -3987,13 +3997,13 @@@ msgstr "
  "<command>apt-mark</command> devolve zero na operação normal, 100 decimal em "
  "erro."
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-secure.8.xml:17 apt-secure.8.xml:39
- msgid "apt-secure"
- msgstr "apt-secure"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-secure.8.xml:40
+ #: apt-secure.8.xml:47
  msgid "Archive authentication support for APT"
  msgstr "Suporte de autenticação de arquivos para o APT"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:45
+ #: apt-secure.8.xml:52
  msgid ""
  "Starting with version 0.6, <command>apt</command> contains code that does "
  "signature checking of the Release file for all archives. This ensures that "
@@@ -5122,7 -4006,7 +4016,7 @@@ msgstr "
  "não têm acesso à chave de assinatura do ficheiro Release."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:53
+ #: apt-secure.8.xml:60
  msgid ""
  "If a package comes from a archive without a signature or with a signature "
  "that apt does not have a key for that package is considered untrusted and "
@@@ -5138,7 -4022,7 +4032,7 @@@ msgstr "
  "verificadas antes de descarregar pacotes delas."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:62
+ #: apt-secure.8.xml:69
  msgid ""
  "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
  "authentication feature."
@@@ -5147,12 -4031,12 +4041,12 @@@ msgstr "
  "nova funcionalidade de autenticação."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:67
+ #: apt-secure.8.xml:74
  msgid "Trusted archives"
  msgstr "Arquivos de confiança"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:70
+ #: apt-secure.8.xml:77
  msgid ""
  "The chain of trust from an apt archive to the end user is made up of "
  "different steps. <command>apt-secure</command> is the last step in this "
@@@ -5169,7 -4053,7 +4063,7 @@@ msgstr "
  "assegurar que a integridade do arquivo está correcta."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:78
+ #: apt-secure.8.xml:85
  msgid ""
  "apt-secure does not review signatures at a package level. If you require "
  "tools to do this you should look at <command>debsig-verify</command> and "
@@@ -5182,7 -4066,7 +4076,7 @@@ msgstr "
  "verify e devscripts respectivamente)."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:85
+ #: apt-secure.8.xml:92
  msgid ""
  "The chain of trust in Debian starts when a maintainer uploads a new package "
  "or a new version of a package to the Debian archive. This upload in order to "
@@@ -5200,7 -4084,7 +4094,7 @@@ msgstr "
  "para assegurar a identidade do dono da chave."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:95
+ #: apt-secure.8.xml:102
  msgid ""
  "Once the uploaded package is verified and included in the archive, the "
  "maintainer signature is stripped off, an MD5 sum of the package is computed "
@@@ -5218,7 -4102,7 +4112,7 @@@ msgstr "
  "Debian."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:105
+ #: apt-secure.8.xml:112
  msgid ""
  "Any end user can check the signature of the Release file, extract the MD5 "
  "sum of a package from it and compare it with the MD5 sum of the package he "
@@@ -5233,7 -4117,7 +4127,7 @@@ msgstr "
  "sumário MD5 e a assinatura do ficheiro Release."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:112
+ #: apt-secure.8.xml:119
  msgid ""
  "Notice that this is distinct from checking signatures on a per package "
  "basis. It is designed to prevent two possible attacks:"
@@@ -5242,7 -4126,7 +4136,7 @@@ msgstr "
  "desenhado para prevenir dois ataques possíveis:"
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:117
+ #: apt-secure.8.xml:124
  msgid ""
  "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
  "checking, a malicious agent can introduce himself in the package download "
@@@ -5257,7 -4141,7 +4151,7 @@@ msgstr "
  "um servidor impostor (através de ataques de fraude de arp ou DNS)."
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:125
+ #: apt-secure.8.xml:132
  msgid ""
  "<literal>Mirror network compromise</literal>.  Without signature checking, a "
  "malicious agent can compromise a mirror host and modify the files in it to "
@@@ -5270,7 -4154,7 +4164,7 @@@ msgstr "
  "descarregam pacotes a partir dessa máquina."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:132
+ #: apt-secure.8.xml:139
  msgid ""
  "However, it does not defend against a compromise of the Debian master server "
  "itself (which signs the packages) or against a compromise of the key used to "
@@@ -5283,12 -4167,12 +4177,12 @@@ msgstr "
  "mecanismo pode complementar uma assinatura por-pacote."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:138
+ #: apt-secure.8.xml:145
  msgid "User configuration"
  msgstr "Configuração do utilizador"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:140
+ #: apt-secure.8.xml:147
  msgid ""
  "<command>apt-key</command> is the program that manages the list of keys used "
  "by apt. It can be used to add or remove keys although an installation of "
@@@ -5302,7 -4186,7 +4196,7 @@@ msgstr "
  "pacotes Debian."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:147
+ #: apt-secure.8.xml:154
  #, fuzzy
  #| msgid ""
  #| "In order to add a new key you need to first download it (you should make "
@@@ -5327,12 -4211,12 +4221,12 @@@ msgstr "
  "arquivos que você configurou."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:156
+ #: apt-secure.8.xml:163
  msgid "Archive configuration"
  msgstr "Configuração de arquivos"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:158
+ #: apt-secure.8.xml:165
  msgid ""
  "If you want to provide archive signatures in an archive under your "
  "maintenance you have to:"
@@@ -5341,7 -4225,7 +4235,7 @@@ msgstr "
  "manutenção, você tem que:"
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:163
+ #: apt-secure.8.xml:170
  msgid ""
  "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
  "already. You can do this by running <command>apt-ftparchive release</"
@@@ -5352,7 -4236,7 +4246,7 @@@ msgstr "
  "command> (disponibilizado no apt-utils)."
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:168
+ #: apt-secure.8.xml:175
  #, fuzzy
  #| msgid ""
  #| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"
@@@ -5366,7 -4250,7 +4260,7 @@@ msgstr "
  "abs -o Release.gpg Release</command>."
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:172
+ #: apt-secure.8.xml:179
  msgid ""
  "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
  "know what key they need to import in order to authenticate the files in the "
@@@ -5377,7 -4261,7 +4271,7 @@@ msgstr "
  "autenticar os ficheiros no arquivo."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:179
+ #: apt-secure.8.xml:186
  msgid ""
  "Whenever the contents of the archive changes (new packages are added or "
  "removed) the archive maintainer has to follow the first two steps previously "
@@@ -5388,7 -4272,7 +4282,7 @@@ msgstr "
  "previamente delineados."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:187
+ #: apt-secure.8.xml:194
  msgid ""
  "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
  "&debsign; &debsig-verify;, &gpg;"
@@@ -5397,14 -4281,22 +4291,22 @@@ msgstr "
  "&debsign; &debsig-verify;, &gpg;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:191
+ #: apt-secure.8.xml:198
+ #, fuzzy
+ #| msgid ""
+ #| "For more background information you might want to review the <ulink url="
+ #| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
+ #| "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
+ #| "Manual (available also in the harden-doc package) and the <ulink url="
+ #| "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
+ #| "Distribution HOWTO</ulink> by V. Alex Brennen."
  msgid ""
  "For more background information you might want to review the <ulink url="
- "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
- "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
- "Manual (available also in the harden-doc package) and the <ulink url="
- "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
- "Distribution HOWTO</ulink> by V. Alex Brennen."
+ "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+ "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+ "(available also in the harden-doc package) and the <ulink url=\"http://www."
+ "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
+ "ulink> by V. Alex Brennen."
  msgstr ""
  "Para mais informação de fundo você deve querer reler a <ulink url=\"http://"
  "www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
@@@ -5414,12 -4306,12 +4316,12 @@@
  "Distribution HOWTO</ulink> de V. Alex Brennen."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:204
+ #: apt-secure.8.xml:211
  msgid "Manpage Authors"
  msgstr "Autores do manual"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:206
+ #: apt-secure.8.xml:213
  msgid ""
  "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
  "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@@ -5427,31 -4319,13 +4329,13 @@@ msgstr "
  "Este manual é baseado no trabalho de Javier Fernández-Sanguino Peña, Isaac "
  "Jones, Colin Walters, Florian Weimer e Michael Vogt."
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-sortpkgs.1.xml:25 apt-sortpkgs.1.xml:32
- msgid "apt-sortpkgs"
- msgstr "apt-sortpkgs"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-sortpkgs.1.xml:33
  msgid "Utility to sort package index files"
  msgstr "Utilitário para organizar ficheiros índice de pacotes"
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-sortpkgs.1.xml:39
- msgid ""
- "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
- msgstr ""
- "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
- "<arg><option>-o=<replaceable>string de configuração</replaceable></option></"
- "arg> <arg><option>-c=<replaceable>ficheiro</replaceable></option></arg> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>ficheiro</replaceable></arg>"
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:48
+ #: apt-sortpkgs.1.xml:39
  msgid ""
  "<command>apt-sortpkgs</command> will take an index file (Source index or "
  "Package index) and sort the records so that they are ordered by the package "
@@@ -5464,19 -4338,14 +4348,14 @@@ msgstr "
  "registo de acordo com as regras de organização internas."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:54
+ #: apt-sortpkgs.1.xml:45
  msgid "All output is sent to stdout, the input must be a seekable file."
  msgstr ""
  "Todas as saídas são enviadas para o stdout, a entrada tem de ser um ficheiro "
  "pesquisável."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-sortpkgs.1.xml:61
- msgid "<option>--source</option>"
- msgstr "<option>--source</option>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-sortpkgs.1.xml:63
+ #: apt-sortpkgs.1.xml:54
  msgid ""
  "Use Source index field ordering.  Configuration Item: <literal>APT::"
  "SortPkgs::Source</literal>."
@@@ -5485,7 -4354,7 +4364,7 @@@ msgstr "
  "SortPkgs::Source</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:77
+ #: apt-sortpkgs.1.xml:68
  msgid ""
  "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -5493,37 -4362,28 +4372,28 @@@ msgstr "
  "<command>apt-sortpkgs</command> devolve zero na operação normal, 100 decimal "
  "em erro."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt.conf.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
- "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
- "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
- "&apt-product; <date>16 January 2010</date>"
+ #. type: Content of: <refentry><refentryinfo><author><contrib>
+ #: apt.conf.5.xml:20
+ msgid "Initial documentation of Debug::*."
  msgstr ""
- "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
- "firstname> <surname>Burrows</surname> <contrib>Documentação inicial do "
- "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
- "&apt-product; <date>16 Janeiro 2010</date>"
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt.conf.5.xml:31 apt.conf.5.xml:38
- msgid "apt.conf"
- msgstr "apt.conf"
+ #. type: Content of: <refentry><refentryinfo><author><email>
+ #: apt.conf.5.xml:21
+ msgid "dburrows@debian.org"
+ msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
- #: apt.conf.5.xml:32 apt_preferences.5.xml:25 sources.list.5.xml:26
+ #: apt.conf.5.xml:31 apt_preferences.5.xml:25 sources.list.5.xml:26
  msgid "5"
  msgstr "5"
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt.conf.5.xml:39
+ #: apt.conf.5.xml:38
  msgid "Configuration file for APT"
  msgstr "Ficheiro de configuração para o APT"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:43
+ #: apt.conf.5.xml:42
  msgid ""
  "<filename>apt.conf</filename> is the main configuration file for the APT "
  "suite of tools, but by far not the only place changes to options can be "
@@@ -5537,7 -4397,7 +4407,7 @@@ msgstr "
  "disponibilizar um ambiente uniforme."
  
  #. type: Content of: <refentry><refsect1><orderedlist><para>
- #: apt.conf.5.xml:48
+ #: apt.conf.5.xml:47
  msgid ""
  "When an APT tool starts up it will read the configuration files in the "
  "following order:"
@@@ -5546,7 -4406,7 +4416,7 @@@ msgstr "
  "seguinte ordem:"
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:50
+ #: apt.conf.5.xml:49
  msgid ""
  "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
  "any)"
@@@ -5555,7 -4415,7 +4425,7 @@@ msgstr "
  "(se existir)"
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:52
+ #: apt.conf.5.xml:51
  #, fuzzy
  #| msgid ""
  #| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
@@@ -5564,11 -4424,12 +4434,12 @@@
  #| "period (.) characters - otherwise they will be silently ignored."
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
- "order which have no or \"<literal>conf</literal>\" as filename extension and "
- "which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
- "characters.  Otherwise APT will print a notice that it has ignored a file if "
- "the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
- "literal> configuration list - in this case it will be silently ignored."
+ "order which have either no or \"<literal>conf</literal>\" as filename "
+ "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+ "and period (.) characters.  Otherwise APT will print a notice that it has "
+ "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+ "Ignore-Files-Silently</literal> configuration list - in this case it will be "
+ "silently ignored."
  msgstr ""
  "todos os ficheiros em <literal>Dir::Etc::Parts</literal> em ordem ascendente "
  "alfanumérica sem extensão ou com \"<literal>conf</literal>\" como extensão "
@@@ -5576,7 -4437,7 +4447,7 @@@
  "underscore (_) e ponto (.) - caso contrário serão ignorados em silêncio."
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:59
+ #: apt.conf.5.xml:58
  msgid ""
  "the main configuration file specified by <literal>Dir::Etc::main</literal>"
  msgstr ""
@@@ -5584,7 -4445,7 +4455,7 @@@
  "main</literal>"
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:61
+ #: apt.conf.5.xml:60
  msgid ""
  "the command line options are applied to override the configuration "
  "directives or to load even more configuration files."
@@@ -5593,12 -4454,12 +4464,12 @@@ msgstr "
  "configuração ou para carregar mais ficheiros de configuração."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:65
+ #: apt.conf.5.xml:64
  msgid "Syntax"
  msgstr "Sintaxe"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:66
+ #: apt.conf.5.xml:65
  msgid ""
  "The configuration file is organized in a tree with options organized into "
  "functional groups. Option specification is given with a double colon "
@@@ -5613,7 -4474,7 +4484,7 @@@ msgstr "
  "ferramenta Get. A opções não herdam dos seus grupos parentes."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:72
+ #: apt.conf.5.xml:71
  msgid ""
  "Syntactically the configuration language is modeled after what the ISC tools "
  "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@@ -5640,7 -4501,7 +4511,7 @@@ msgstr "
  "os caracteres \"/-:._+\". Um novo scope pode ser aberto com chavetas, como:"
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:86
+ #: apt.conf.5.xml:85
  #, no-wrap
  msgid ""
  "APT {\n"
@@@ -5658,7 -4519,7 +4529,7 @@@ msgstr "
  "};\n"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:94
+ #: apt.conf.5.xml:93
  msgid ""
  "with newlines placed to make it more readable. Lists can be created by "
  "opening a scope and including a single string enclosed in quotes followed by "
@@@ -5670,13 -4531,13 +4541,13 @@@ msgstr "
  "separada por um ponto e vírgula (;)."
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:99
+ #: apt.conf.5.xml:98
  #, no-wrap
  msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
  msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:102
+ #: apt.conf.5.xml:101
  msgid ""
  "In general the sample configuration file in <filename>&docdir;examples/apt."
  "conf</filename> &configureindex; is a good guide for how it should look."
@@@ -5685,7 -4546,7 +4556,7 @@@ msgstr "
  "apt.conf</filename> &configureindex; é um bom guia de como deve ficar."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:106
+ #: apt.conf.5.xml:105
  msgid ""
  "The names of the configuration items are not case-sensitive. So in the "
  "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@@ -5695,7 -4556,7 +4566,7 @@@ msgstr "
  "install-pkgs</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:109
+ #: apt.conf.5.xml:108
  msgid ""
  "Names for the configuration items are optional if a list is defined as it "
  "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@@ -5711,7 -4572,7 +4582,7 @@@ msgstr "
  "opção."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:114
+ #: apt.conf.5.xml:113
  msgid ""
  "Two specials are allowed, <literal>#include</literal> (which is deprecated "
  "and not supported by alternative implementations) and <literal>#clear</"
@@@ -5731,7 -4592,7 +4602,7 @@@ msgstr "
  "acabar com um 'ponto e vírgula' (;) .)"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:122
+ #: apt.conf.5.xml:121
  msgid ""
  "The #clear command is the only way to delete a list or a complete scope.  "
  "Reopening a scope or the ::-style described below will <emphasis>not</"
@@@ -5746,13 -4607,21 +4617,21 @@@ msgstr "
  "sobrepostos, apenas limpos."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:127
+ #: apt.conf.5.xml:126
+ #, fuzzy
+ #| msgid ""
+ #| "All of the APT tools take a -o option which allows an arbitrary "
+ #| "configuration directive to be specified on the command line. The syntax "
+ #| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
+ #| "instance) followed by an equals sign then the new value of the option. "
+ #| "Lists can be appended too by adding a trailing :: to the list name. (As "
+ #| "you might suspect: The scope syntax can't be used on the command line.)"
  msgid ""
  "All of the APT tools take a -o option which allows an arbitrary "
  "configuration directive to be specified on the command line. The syntax is a "
  "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
- "followed by an equals sign then the new value of the option. Lists can be "
- "appended too by adding a trailing :: to the list name. (As you might "
+ "followed by an equals sign then the new value of the option. To append a new "
+ "element to a list, add a trailing :: to the name of the list. (As you might "
  "suspect: The scope syntax can't be used on the command line.)"
  msgstr ""
  "Todas as ferramentas do APT recebem uma opção -o que permite uma directiva "
@@@ -5764,12 -4633,26 +4643,26 @@@
  "usada na linha de comandos.)"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:134
+ #: apt.conf.5.xml:133
+ #, fuzzy
+ #| msgid ""
+ #| "Note that you can use :: only for appending one item per line to a list "
+ #| "and that you should not use it in combination with the scope syntax.  "
+ #| "(The scope syntax implicit insert ::) Using both syntaxes together will "
+ #| "trigger a bug which some users unfortunately relay on: An option with the "
+ #| "unusual name \"<literal>::</literal>\" which acts like every other option "
+ #| "with a name. These introduces many problems including that a user who "
+ #| "writes multiple lines in this <emphasis>wrong</emphasis> syntax in the "
+ #| "hope to append to a list will gain the opposite as only the last "
+ #| "assignment for this option \"<literal>::</literal>\" will be used. "
+ #| "Upcoming APT versions will raise errors and will stop working if they "
+ #| "encounter this misuse, so please correct such statements now as long as "
+ #| "APT doesn't complain explicit about them."
  msgid ""
  "Note that you can use :: only for appending one item per line to a list and "
  "that you should not use it in combination with the scope syntax.  (The scope "
  "syntax implicit insert ::) Using both syntaxes together will trigger a bug "
- "which some users unfortunately relay on: An option with the unusual name "
+ "which some users unfortunately depend on: An option with the unusual name "
  "\"<literal>::</literal>\" which acts like every other option with a name. "
  "These introduces many problems including that a user who writes multiple "
  "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
@@@ -5793,12 -4676,12 +4686,12 @@@ msgstr "
  "declarações agora enquanto o APT não se queixa explicitamente acerca delas."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:146
+ #: apt.conf.5.xml:145
  msgid "The APT Group"
  msgstr "O Grupo APT"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:147
+ #: apt.conf.5.xml:146
  msgid ""
  "This group of options controls general APT behavior as well as holding the "
  "options for all of the tools."
@@@ -5806,13 -4689,8 +4699,8 @@@ msgstr "
  "Este grupo de opções controla o comportamento geral do APT assim como mantém "
  "as opções para todas as ferramentas."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:151
- msgid "Architecture"
- msgstr "Architecture"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:152
+ #: apt.conf.5.xml:151
  msgid ""
  "System Architecture; sets the architecture to use when fetching files and "
  "parsing package lists. The internal default is the architecture apt was "
@@@ -5822,13 -4700,21 +4710,21 @@@ msgstr "
  "analisa listas de pacotes. A predefinição interna é a arquitectura para a "
  "qual o APT foi compilado."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:157
- msgid "Default-Release"
- msgstr "Default-Release"
+ msgid ""
+ "All Architectures the system supports. Processors implementing the "
+ "<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
+ "set are e.g. also able to execute binaries compiled for the <literal>i386</"
+ "literal> (<literal>x86</literal>) instruction set; This list is use when "
+ "fetching files and parsing package lists. The internal default is always the "
+ "native architecture (<literal>APT::Architecture</literal>)  and all foreign "
+ "architectures it can retrieve by calling <command>dpkg --print-foreign-"
+ "architectures</command>."
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:158
+ #: apt.conf.5.xml:167
  msgid ""
  "Default release to install packages from if more than one version available. "
  "Contains release name, codename or release version. Examples: 'stable', "
@@@ -5840,13 -4726,8 +4736,8 @@@ msgstr "
  "lançamento. Exemplos: 'stable', 'testing', 'unstable', '&stable-codename;', "
  "'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:163
- msgid "Ignore-Hold"
- msgstr "Ignore-Hold"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:164
+ #: apt.conf.5.xml:173
  msgid ""
  "Ignore Held packages; This global option causes the problem resolver to "
  "ignore held packages in its decision making."
@@@ -5854,13 -4735,8 +4745,8 @@@ msgstr "
  "Ignore Held packages; Esta opção global faz com que ao resolver problemas, "
  "os pacotes segurados sejam ignorados na sua decisão de marcação."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:168
- msgid "Clean-Installed"
- msgstr "Clean-Installed"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:169
+ #: apt.conf.5.xml:178
  msgid ""
  "Defaults to on. When turned on the autoclean feature will remove any "
  "packages which can no longer be downloaded from the cache. If turned off "
@@@ -5873,13 -4749,8 +4759,8 @@@ msgstr "
  "também excluídos da limpeza - mas note que o APT não disponibiliza um meio "
  "directo de os reinstalar."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:175
- msgid "Immediate-Configure"
- msgstr "Immediate-Configure"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:176
+ #: apt.conf.5.xml:185
  msgid ""
  "Defaults to on which will cause APT to install essential and important "
  "packages as fast as possible in the install/upgrade operation. This is done "
@@@ -5942,13 -4813,8 +4823,8 @@@ msgstr "
  "do APT com o link de bug abaixo para que possam trabalhar na melhoria ou "
  "correcção do processo de actualização."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:198
- msgid "Force-LoopBreak"
- msgstr "Force-LoopBreak"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:199
+ #: apt.conf.5.xml:208
  msgid ""
  "Never Enable this option unless you -really- know what you are doing. It "
  "permits APT to temporarily remove an essential package to break a Conflicts/"
@@@ -5964,29 -4830,42 +4840,42 @@@ msgstr "
  "GRAVE BUG. Esta opção deverá funcionar se os pacotes essenciais não forem "
  "tar, gzip, libc, dpkg, bash ou qualquer coisa de que estes dependem."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:207
- msgid "Cache-Start, Cache-Grow and Cache-Limit"
- msgstr "Cache-Start, Cache-Grow e Cache-Limit"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:208
+ #: apt.conf.5.xml:217
+ #, fuzzy
+ #| msgid ""
+ #| "APT uses since version 0.7.26 a resizable memory mapped cache file to "
+ #| "store the 'available' information. <literal>Cache-Start</literal> acts as "
+ #| "a hint to which size the Cache will grow and is therefore the amount of "
+ #| "memory APT will request at startup. The default value is 20971520 bytes "
+ #| "(~20 MB). Note that these amount of space need to be available for APT "
+ #| "otherwise it will likely fail ungracefully, so for memory restricted "
+ #| "devices these value should be lowered while on systems with a lot of "
+ #| "configured sources this might be increased.  <literal>Cache-Grow</"
+ #| "literal> defines in byte with the default of 1048576 (~1 MB) how much the "
+ #| "Cache size will be increased in the event the space defined by "
+ #| "<literal>Cache-Start</literal> is not enough. These value will be applied "
+ #| "again and again until either the cache is big enough to store all "
+ #| "information or the size of the cache reaches the <literal>Cache-Limit</"
+ #| "literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
+ #| "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
+ #| "automatic grow of the cache is disabled."
  msgid ""
  "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
  "the 'available' information. <literal>Cache-Start</literal> acts as a hint "
  "to which size the Cache will grow and is therefore the amount of memory APT "
  "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
- "that these amount of space need to be available for APT otherwise it will "
- "likely fail ungracefully, so for memory restricted devices these value "
- "should be lowered while on systems with a lot of configured sources this "
- "might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
- "default of 1048576 (~1 MB) how much the Cache size will be increased in the "
- "event the space defined by <literal>Cache-Start</literal> is not enough. "
- "These value will be applied again and again until either the cache is big "
- "enough to store all information or the size of the cache reaches the "
- "<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
- "literal> is 0 which stands for no limit.  If <literal>Cache-Grow</literal> "
- "is set to 0 the automatic grow of the cache is disabled."
+ "that this amount of space needs to be available for APT otherwise it will "
+ "likely fail ungracefully, so for memory restricted devices this value should "
+ "be lowered while on systems with a lot of configured sources it should be "
+ "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
+ "of 1048576 (~1 MB) how much the Cache size will be increased in the event "
+ "the space defined by <literal>Cache-Start</literal> is not enough. These "
+ "value will be applied again and again until either the cache is big enough "
+ "to store all information or the size of the cache reaches the <literal>Cache-"
+ "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
+ "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
+ "automatic grow of the cache is disabled."
  msgstr ""
  "O APT usa desde a versão 0.7.26 um ficheiro de cache com mapa de memória de "
  "tamanho ajustável para armazenar a informação disponível. <literal>Cache-"
@@@ -6006,25 -4885,15 +4895,15 @@@
  "<literal>Cache-Grow</literal> for definido para 0, o crescimento automático "
  "da cache é desactivado."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:223
- msgid "Build-Essential"
- msgstr "Build-Essential"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:224
+ #: apt.conf.5.xml:233
  msgid "Defines which package(s) are considered essential build dependencies."
  msgstr ""
  "Define quais pacote(s) são considerados dependências essenciais de "
  "compilação."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:227
- msgid "Get"
- msgstr "Get"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:228
+ #: apt.conf.5.xml:237
  msgid ""
  "The Get subsection controls the &apt-get; tool, please see its documentation "
  "for more information about the options here."
@@@ -6032,13 -4901,8 +4911,8 @@@ msgstr "
  "A subsecção Get controla a ferramenta &apt-get;, por favor veja a sua "
  "documentação para mais informação acerca das opções daqui."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:232
- msgid "Cache"
- msgstr "Cache"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:233
+ #: apt.conf.5.xml:242
  msgid ""
  "The Cache subsection controls the &apt-cache; tool, please see its "
  "documentation for more information about the options here."
@@@ -6046,13 -4910,8 +4920,8 @@@ msgstr "
  "A subsecção Cache controla a ferramenta &apt-cache;, por favor veja a sua "
  "documentação para mais informação acerca das opções daqui."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:237
- msgid "CDROM"
- msgstr "CDROM"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:238
+ #: apt.conf.5.xml:247
  msgid ""
  "The CDROM subsection controls the &apt-cdrom; tool, please see its "
  "documentation for more information about the options here."
@@@ -6061,17 -4920,12 +4930,12 @@@ msgstr "
  "documentação para mais informação acerca das opções de aqui."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:244
+ #: apt.conf.5.xml:253
  msgid "The Acquire Group"
  msgstr "O Grupo Acquire"
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:249
- msgid "Check-Valid-Until"
- msgstr "Check-Valid-Until"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:250
+ #: apt.conf.5.xml:259
  msgid ""
  "Security related option defaulting to true as an expiring validation for a "
  "Release file prevents longtime replay attacks and can e.g. also help users "
@@@ -6091,13 -4945,8 +4955,8 @@@ msgstr "
  "preferir-se um valor mais rigoroso pode-se usar a opção <literal>Max-"
  "ValidTime</literal> seguinte."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:260
- msgid "Max-ValidTime"
- msgstr "Max-ValidTime"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:261
+ #: apt.conf.5.xml:270
  #, fuzzy
  #| msgid ""
  #| "Seconds the Release file should be considered valid after it was created. "
@@@ -6110,15 -4959,12 +4969,12 @@@
  #| "of the two. Archive specific settings can be made by appending the label "
  #| "of the archive to the option name."
  msgid ""
- "Seconds the Release file should be considered valid after it was created. "
- "The default is \"for ever\" (0) if the Release file of the archive doesn't "
- "include a <literal>Valid-Until</literal> header.  If it does then this date "
- "is the default. The date from the Release file or the date specified by the "
- "creation time of the Release file (<literal>Date</literal> header) plus the "
- "seconds specified with this options are used to check if the validation of a "
- "file has expired by using the earlier date of the two. Archive specific "
- "settings can be made by appending the label of the archive to the option "
- "name."
+ "Seconds the Release file should be considered valid after it was created "
+ "(indicated by the <literal>Date</literal> header).  If the Release file "
+ "itself includes a <literal>Valid-Until</literal> header the earlier date of "
+ "the two is used as the expiration date.  The default value is <literal>0</"
+ "literal> which stands for \"for ever valid\".  Archive specific settings can "
+ "be made by appending the label of the archive to the option name."
  msgstr ""
  "Segundos em que o ficheiro Release deve considerado válido após ser criado. "
  "A predefinição é \"para sempre\" (0) se o ficheiro Release do arquivo não "
@@@ -6130,13 -4976,39 +4986,39 @@@
  "Definições específicas do Arquivo podem ser feitas ao adicionar a etiqueta "
  "do arquivo ao nome da opção. "
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:273
- msgid "PDiffs"
- msgstr "PDiffs"
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:281
+ #, fuzzy
+ #| msgid ""
+ #| "Seconds the Release file should be considered valid after it was created. "
+ #| "The default is \"for ever\" (0) if the Release file of the archive "
+ #| "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+ #| "this date is the default. The date from the Release file or the date "
+ #| "specified by the creation time of the Release file (<literal>Date</"
+ #| "literal> header) plus the seconds specified with this options are used to "
+ #| "check if the validation of a file has expired by using the earlier date "
+ #| "of the two. Archive specific settings can be made by appending the label "
+ #| "of the archive to the option name."
+ msgid ""
+ "Minimum of seconds the Release file should be considered valid after it was "
+ "created (indicated by the <literal>Date</literal> header).  Use this if you "
+ "need to use a seldomly updated (local) mirror of a more regular updated "
+ "archive with a <literal>Valid-Until</literal> header instead of completely "
+ "disabling the expiration date checking.  Archive specific settings can and "
+ "should be used by appending the label of the archive to the option name."
+ msgstr ""
+ "Segundos em que o ficheiro Release deve considerado válido após ser criado. "
+ "A predefinição é \"para sempre\" (0) se o ficheiro Release do arquivo não "
+ "conter um cabeçalho <literal>Valid-Until</literal>. Se o tiver então esta "
+ "data é a predefinida. A data do ficheiro Release ou a data especificada pela "
+ "hora de criação do do ficheiro Release (cabeçalho <literal>Date</literal>) "
+ "mais os segundos especificados com esta opção são usados para verificar se a "
+ "validação de um ficheiro já expirou ao usar uma data anterior às duas. "
+ "Definições específicas do Arquivo podem ser feitas ao adicionar a etiqueta "
+ "do arquivo ao nome da opção. "
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:274
+ #: apt.conf.5.xml:292
  msgid ""
  "Try to download deltas called <literal>PDiffs</literal> for Packages or "
  "Sources files instead of downloading whole ones. True by default."
@@@ -6146,7 -5018,7 +5028,7 @@@ msgstr "
  "predefinição."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:277
+ #: apt.conf.5.xml:295
  #, fuzzy
  #| msgid ""
  #| "Two sub-options to limit the use of PDiffs are also available: With "
@@@ -6158,8 -5030,8 +5040,8 @@@
  msgid ""
  "Two sub-options to limit the use of PDiffs are also available: With "
  "<literal>FileLimit</literal> can be specified how many PDiff files are "
- "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
- "other hand is the maximum precentage of the size of all patches compared to "
+ "downloaded at most to update a file. <literal>SizeLimit</literal> on the "
+ "other hand is the maximum percentage of the size of all patches compared to "
  "the size of the targeted file. If one of these limits is exceeded the "
  "complete file is downloaded instead of the patches."
  msgstr ""
@@@ -6170,13 -5042,8 +5052,8 @@@
  "as patches comparadas com o tamanho do ficheiro de destino. Se um destes "
  "limites for excedido, é descarregado o ficheiro completo em vez das patches."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
- msgid "Queue-Mode"
- msgstr "Queue-Mode"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:305
  msgid ""
  "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
  "literal> or <literal>access</literal> which determines how APT parallelizes "
@@@ -6190,13 -5057,8 +5067,8 @@@ msgstr "
  "ligação por máquina destino, <literal>access</literal> significa que será "
  "aberta uma ligação por tipo de URI."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:294
- msgid "Retries"
- msgstr "Retries"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:295
+ #: apt.conf.5.xml:313
  msgid ""
  "Number of retries to perform. If this is non-zero APT will retry failed "
  "files the given number of times."
@@@ -6204,13 -5066,8 +5076,8 @@@ msgstr "
  "Número de tentativas a executar. Se isto for diferente de zero o APT irá "
  "tentar, no número fornecido de vezes, obter ficheiros falhados."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:299
- msgid "Source-Symlinks"
- msgstr "Source-Symlinks"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:300
+ #: apt.conf.5.xml:318
  msgid ""
  "Use symlinks for source archives. If set to true then source archives will "
  "be symlinked when possible instead of copying. True is the default."
@@@ -6219,13 -5076,8 +5086,8 @@@ msgstr "
  "os arquivos fonte serão links simbólicos, quando possível, em vez de cópias. "
  "A predefinição é verdadeiro."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:304 sources.list.5.xml:144
- msgid "http"
- msgstr "http"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:305
+ #: apt.conf.5.xml:323
  msgid ""
  "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
  "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@@ -6242,7 -5094,7 +5104,7 @@@ msgstr "
  "especificada, será usada a variável de ambiente <envar>http_proxy</envar>."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:313
+ #: apt.conf.5.xml:331
  msgid ""
  "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
  "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@@ -6267,7 -5119,7 +5129,7 @@@ msgstr "
  "suporta nenhuma destas opções."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:323 apt.conf.5.xml:387
+ #: apt.conf.5.xml:341 apt.conf.5.xml:407
  msgid ""
  "The option <literal>timeout</literal> sets the timeout timer used by the "
  "method, this applies to all things including connection timeout and data "
@@@ -6278,26 -5130,26 +5140,26 @@@ msgstr "
  "e tempos limite de dados."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:326
- msgid ""
- "One setting is provided to control the pipeline depth in cases where the "
- "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
- "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
- "indicating how many outstanding requests APT should send. A value of zero "
- "MUST be specified if the remote host does not properly linger on TCP "
- "connections - otherwise data corruption will occur. Hosts which require this "
- "are in violation of RFC 2068."
- msgstr ""
- "É disponibilizada uma definição para controlar a profundidade do pipeline em "
- "casos onde o servidor remoto não é compatível com RFC ou é buggy (como o "
- "Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth</literal> pode ser um "
- "valor de 0 a 5 que indica quantos requerimentos pendentes o APT deve enviar. "
- "TEM de ser especificado um valor de 0 se a máquina remota não hesitar "
- "propriamente em ligações TCP - de outro modo irá ocorrer corrupção de dados. "
- "As máquinas que requerem isto estão em violação de RFC 2068."
+ #: apt.conf.5.xml:344
+ msgid ""
+ "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+ "enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
+ "g. on high-latency connections. It specifies how many requests are send in a "
+ "pipeline.  Previous APT versions had a default of 10 for this setting, but "
+ "the default value is now 0 (= disabled) to avoid problems with the ever-"
+ "growing amount of webservers and proxies which choose to not conform to the "
+ "HTTP/1.1 specification."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:351
+ msgid ""
+ "<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
+ "redirects, which is enabled by default."
+ msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:334
+ #: apt.conf.5.xml:354
  msgid ""
  "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
  "literal> which accepts integer values in kilobyte. The default value is 0 "
@@@ -6312,7 -5164,7 +5174,7 @@@ msgstr "
  "múltiplos servidores ao mesmo tempo.)"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:339
+ #: apt.conf.5.xml:359
  msgid ""
  "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
  "User-Agent for the http download method as some proxies allow access for "
@@@ -6323,13 -5175,8 +5185,8 @@@ msgstr "
  "alguns proxies apenas permitem acesso a clientes se o cliente usar um "
  "identificador conhecido."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:345
- msgid "https"
- msgstr "https"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:346
+ #: apt.conf.5.xml:366
  msgid ""
  "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
  "options are the same as for <literal>http</literal> method and will also "
@@@ -6344,7 -5191,7 +5201,7 @@@ msgstr "
  "literal> ainda não é suportada."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:352
+ #: apt.conf.5.xml:372
  msgid ""
  "<literal>CaInfo</literal> suboption specifies place of file that holds info "
  "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@@ -6380,13 -5227,8 +5237,8 @@@ msgstr "
  "predefinida a usar. Pode conter strings 'TLSv1' ou 'SSLv3'. <literal>&lt;"
  "host&gt;::SslForceVersion</literal> é a opção po máquina correspondente."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:370 sources.list.5.xml:155
- msgid "ftp"
- msgstr "ftp"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:371
+ #: apt.conf.5.xml:391
  msgid ""
  "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
  "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@@ -6419,7 -5261,7 +5271,7 @@@ msgstr "
  "$(SITE_PORT)</literal>. Cada uma é tirada do seu componente URI respectivo."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:390
+ #: apt.conf.5.xml:410
  msgid ""
  "Several settings are provided to control passive mode. Generally it is safe "
  "to leave passive mode on, it works in nearly every environment.  However "
@@@ -6435,7 -5277,7 +5287,7 @@@ msgstr "
  "específica (Veja a amostra de ficheiro de configuração para exemplos)."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:397
+ #: apt.conf.5.xml:417
  msgid ""
  "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
  "envar> environment variable to a http url - see the discussion of the http "
@@@ -6449,7 -5291,7 +5301,7 @@@ msgstr "
  "eficiência."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:402
+ #: apt.conf.5.xml:422
  msgid ""
  "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
  "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@@ -6463,19 -5305,14 +5315,14 @@@ msgstr "
  "controle for IPv6. Definir isto para verdadeiro força o seu uso mesmo em "
  "ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:409 sources.list.5.xml:137
- msgid "cdrom"
- msgstr "cdrom"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:415
+ #: apt.conf.5.xml:435
  #, no-wrap
  msgid "/cdrom/::Mount \"foo\";"
  msgstr "/cdrom/::Mount \"foo\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:410
+ #: apt.conf.5.xml:430
  msgid ""
  "CDROM URIs; the only setting for CDROM URIs is the mount point, "
  "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@@ -6495,13 -5332,8 +5342,8 @@@ msgstr "
  "\" id=\"0\"/> dentro do bloco cdrom. É importante ter a barra final. "
  "Comandos para desmontar podem ser especificados usando UMount."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:420
- msgid "gpgv"
- msgstr "gpgv"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:421
+ #: apt.conf.5.xml:441
  msgid ""
  "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
  "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@@ -6511,19 -5343,14 +5353,14 @@@ msgstr "
  "adicionais ao gpgv. <literal>gpgv::Options</literal> Opções adicionais "
  "passadas ao gpgv."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:426
- msgid "CompressionTypes"
- msgstr "CompressionTypes"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:432
+ #: apt.conf.5.xml:452
  #, no-wrap
  msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
  msgstr "Acquire::CompressionTypes::<replaceable>Extensão de Ficheiro</replaceable> \"<replaceable>Nome de método</replaceable>\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:427
+ #: apt.conf.5.xml:447
  msgid ""
  "List of compression types which are understood by the acquire methods.  "
  "Files like <filename>Packages</filename> can be available in various "
@@@ -6542,19 -5369,19 +5379,19 @@@ msgstr "
  "alterado. A sintaxe para isto é: <placeholder type=\"synopsis\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:437
+ #: apt.conf.5.xml:457
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order:: \"gz\";"
  msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:440
+ #: apt.conf.5.xml:460
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:433
+ #: apt.conf.5.xml:453
  msgid ""
  "Also the <literal>Order</literal> subgroup can be used to define in which "
  "order the acquire system will try to download the compressed files. The "
@@@ -6585,13 -5412,13 +5422,13 @@@ msgstr "
  "lista pois será adicionado automaticamente."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:444
+ #: apt.conf.5.xml:464
  #, no-wrap
  msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
  msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:442
+ #: apt.conf.5.xml:462
  #, fuzzy
  #| msgid ""
  #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
@@@ -6608,9 -5435,9 +5445,9 @@@ msgid "
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
  "will only be used if this file exists, e.g. for the bzip2 method (the "
- "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
- "that list entries specified on the command line will be added at the end of "
- "the list specified in the configuration files, but before the default "
+ "inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+ "also that list entries specified on the command line will be added at the "
+ "end of the list specified in the configuration files, but before the default "
  "entries. To prefer a type in this case over the ones specified in the "
  "configuration files you can set the option direct - not in list style.  This "
  "will not override the defined list, it will only prefix the list with this "
@@@ -6628,20 -5455,15 +5465,15 @@@ msgstr "
  "sobrepor a lista definida, irá apenas prefixar a lista com este tipo."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:449
+ #: apt.conf.5.xml:469
  msgid ""
  "The special type <literal>uncompressed</literal> can be used to give "
- "uncompressed files a preference, but note that most archives doesn't provide "
+ "uncompressed files a preference, but note that most archives don't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:454
- msgid "GzipIndexes"
- msgstr "GzipIndexes"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:456
+ #: apt.conf.5.xml:476
  msgid ""
  "When downloading <literal>gzip</literal> compressed indexes (Packages, "
  "Sources, or Translations), keep them gzip compressed locally instead of "
@@@ -6653,13 -5475,8 +5485,8 @@@ msgstr "
  "desempacotar. Isto poupa imenso espaço no disco à custa de mais pedidos à "
  "CPU quando constrói as caches de pacotes locais. Falso por predefinição."
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:463
- msgid "Languages"
- msgstr "Languages"
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:464
+ #: apt.conf.5.xml:484
  msgid ""
  "The Languages subsection controls which <filename>Translation</filename> "
  "files are downloaded and in which order APT tries to display the Description-"
@@@ -6681,13 -5498,13 +5508,13 @@@ msgstr "
  "de definir aqui valores impossíveis."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
- #: apt.conf.5.xml:480
+ #: apt.conf.5.xml:500
  #, no-wrap
  msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
  msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:470
+ #: apt.conf.5.xml:490
  msgid ""
  "The default list includes \"environment\" and \"en\". "
  "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@@ -6726,8 -5543,17 +5553,17 @@@ msgstr "
  "APT não for usado num ambiente em francês, em tal ambiente a ordem deveria "
  "ser \"fr, de, en\".  <placeholder type=\"programlisting\" id=\"0\"/>"
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:501
+ msgid ""
+ "Note: To prevent problems resulting from APT being executed in different "
+ "environments (e.g. by different users or by other programs) all Translation "
+ "files which are found in <filename>/var/lib/apt/lists/</filename> will be "
+ "added to the end of the list (after an implicit \"<literal>none</literal>\")."
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:245
+ #: apt.conf.5.xml:254
  msgid ""
  "The <literal>Acquire</literal> group of options controls the download of "
  "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@@ -6736,20 -5562,29 +5572,29 @@@ msgstr "
  "e os manipuladores de URI. <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:487
+ #: apt.conf.5.xml:512
  msgid "Directories"
  msgstr "Directories"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:489
+ #: apt.conf.5.xml:514
+ #, fuzzy
+ #| msgid ""
+ #| "The <literal>Dir::State</literal> section has directories that pertain to "
+ #| "local state information. <literal>lists</literal> is the directory to "
+ #| "place downloaded package lists in and <literal>status</literal> is the "
+ #| "name of the dpkg status file.  <literal>preferences</literal> is the name "
+ #| "of the APT preferences file.  <literal>Dir::State</literal> contains the "
+ #| "default directory to prefix on all sub items if they do not start with "
+ #| "<filename>/</filename> or <filename>./</filename>."
  msgid ""
  "The <literal>Dir::State</literal> section has directories that pertain to "
  "local state information. <literal>lists</literal> is the directory to place "
  "downloaded package lists in and <literal>status</literal> is the name of the "
  "dpkg status file.  <literal>preferences</literal> is the name of the APT "
- "preferences file.  <literal>Dir::State</literal> contains the default "
- "directory to prefix on all sub items if they do not start with <filename>/</"
- "filename> or <filename>./</filename>."
+ "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
+ "contains the default directory to prefix on all sub items if they do not "
+ "start with <filename>/</filename> or <filename>./</filename>."
  msgstr ""
  "A secção <literal>Dir::State</literal> tem directórios que pertencem à "
  "informação de estado local. <literal>lists</literal> é o directório para "
@@@ -6760,7 -5595,7 +5605,7 @@@
  "com <filename>/</filename> ou <filename>./</filename>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:496
+ #: apt.conf.5.xml:521
  msgid ""
  "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
  "information, such as the two package caches <literal>srcpkgcache</literal> "
@@@ -6781,7 -5616,7 +5626,7 @@@ msgstr "
  "literal> o directório predefinido é contido em <literal>Dir::Cache</literal>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:505
+ #: apt.conf.5.xml:530
  msgid ""
  "<literal>Dir::Etc</literal> contains the location of configuration files, "
  "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@@ -6796,7 -5631,7 +5641,7 @@@ msgstr "
  "ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:511
+ #: apt.conf.5.xml:536
  msgid ""
  "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
  "in lexical order from the directory specified. After this is done then the "
@@@ -6807,7 -5642,7 +5652,7 @@@ msgstr "
  "estar feito então é carregado o ficheiro de configuração principal."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:515
+ #: apt.conf.5.xml:540
  msgid ""
  "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
  "Bin::Methods</literal> specifies the location of the method handlers and "
@@@ -6825,7 -5660,7 +5670,7 @@@ msgstr "
  "respectivos programas."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:523
+ #: apt.conf.5.xml:548
  msgid ""
  "The configuration item <literal>RootDir</literal> has a special meaning.  If "
  "set, all paths in <literal>Dir::</literal> will be relative to "
@@@ -6846,7 -5681,7 +5691,7 @@@ msgstr "
  "procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:536
+ #: apt.conf.5.xml:561
  msgid ""
  "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
  "which files APT should silently ignore while parsing the files in the "
@@@ -6864,12 -5699,12 +5709,12 @@@ msgstr "
  "expressão regular."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:545
+ #: apt.conf.5.xml:570
  msgid "APT in DSelect"
  msgstr "APT em DSelect"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:547
+ #: apt.conf.5.xml:572
  msgid ""
  "When APT is used as a &dselect; method several configuration directives "
  "control the default behaviour. These are in the <literal>DSelect</literal> "
@@@ -6879,13 -5714,8 +5724,8 @@@ msgstr "
  "configuração controlam o comportamento predefinido. Estas estão na secção "
  "<literal>DSelect</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:551
- msgid "Clean"
- msgstr "Clean"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:552
+ #: apt.conf.5.xml:577
  msgid ""
  "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
  "and never.  always and prompt will remove all packages from the cache after "
@@@ -6902,7 -5732,7 +5742,7 @@@ msgstr "
  "descarregar novos pacotes."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:561
+ #: apt.conf.5.xml:586
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the install phase."
@@@ -6910,13 -5740,8 +5750,8 @@@ msgstr "
  "O conteúdo desta variável é passado ao &apt-get; como opções de linha de "
  "comandos quando é corrido para a fase de instalação."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:565
- msgid "Updateoptions"
- msgstr "Updateoptions"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:566
+ #: apt.conf.5.xml:591
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the update phase."
@@@ -6924,13 -5749,8 +5759,8 @@@ msgstr "
  "O conteúdo desta variável é passado ao &apt-get; como opções de linha de "
  "comandos quando é executado para a fase de actualização."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:570
- msgid "PromptAfterUpdate"
- msgstr "PromptAfterUpdate"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:571
+ #: apt.conf.5.xml:596
  msgid ""
  "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
  "The default is to prompt only on error."
@@@ -6939,12 -5759,12 +5769,12 @@@ msgstr "
  "continuar. A predefinição é avisar apenas em caso de erro."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:577
+ #: apt.conf.5.xml:602
  msgid "How APT calls dpkg"
  msgstr "Como o APT chama o dpkg"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:578
+ #: apt.conf.5.xml:603
  msgid ""
  "Several configuration directives control how APT invokes &dpkg;. These are "
  "in the <literal>DPkg</literal> section."
@@@ -6953,28 -5773,18 +5783,18 @@@ msgstr "
  "&dpkg;. Estas estão na secção <literal>DPkg</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:583
+ #: apt.conf.5.xml:608
  msgid ""
  "This is a list of options to pass to dpkg. The options must be specified "
  "using the list notation and each list item is passed as a single argument to "
  "&dpkg;."
  msgstr ""
  "Isto é uma lista de opções para passar ao dpkg. As opções têm de ser "
- "especificadas usando a notação de lista e cada item da lista é passado como "
- "um argumento único ao &dpkg;."
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Pre-Invoke"
- msgstr "Pre-Invoke"
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Post-Invoke"
- msgstr "Post-Invoke"
+ "especificadas usando a notação de lista e cada item da lista é passado como "
+ "um argumento único ao &dpkg;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:589
+ #: apt.conf.5.xml:614
  msgid ""
  "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -6986,13 -5796,8 +5806,8 @@@ msgstr "
  "em notação listada. Os  comandos são invocados em ordem usando <filename>/"
  "bin/sh</filename>, caso algum deles falhe, o APT irá abortar."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:595
- msgid "Pre-Install-Pkgs"
- msgstr "Pre-Install-Pkgs"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:596
+ #: apt.conf.5.xml:621
  msgid ""
  "This is a list of shell commands to run before invoking dpkg. Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -7008,7 -5813,7 +5823,7 @@@ msgstr "
  "deb que vai instalar, um por cada linha."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:602
+ #: apt.conf.5.xml:627
  msgid ""
  "Version 2 of this protocol dumps more information, including the protocol "
  "version, the APT configuration space and the packages, files and versions "
@@@ -7022,13 -5827,8 +5837,8 @@@ msgstr "
  "options::cmd::Version</literal> a 2. <literal>cmd</literal> é um comando "
  "dado ao <literal>Pre-Install-Pkgs</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:609
- msgid "Run-Directory"
- msgstr "Run-Directory"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:610
+ #: apt.conf.5.xml:635
  msgid ""
  "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
  "</filename>."
@@@ -7036,13 -5836,8 +5846,8 @@@ msgstr "
  "O APT muda para este directório (chdir) antes de invocar o dpkg, a "
  "predefinição é <filename>/</filename>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:614
- msgid "Build-options"
- msgstr "Build-options"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:615
+ #: apt.conf.5.xml:640
  msgid ""
  "These options are passed to &dpkg-buildpackage; when compiling packages, the "
  "default is to disable signing and produce all binaries."
@@@ -7051,12 -5846,12 +5856,12 @@@ msgstr "
  "predefinição é desactivar a assinatura e produzir todos os binários."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt.conf.5.xml:620
+ #: apt.conf.5.xml:645
  msgid "dpkg trigger usage (and related options)"
  msgstr "Utilização trigger do dpkg (e opções relacionadas)"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:621
+ #: apt.conf.5.xml:646
  #, fuzzy
  #| msgid ""
  #| "APT can call dpkg in a way so it can make aggressive use of triggers over "
@@@ -7095,7 -5890,7 +5900,7 @@@ msgstr "
  "todos os pacotes."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
- #: apt.conf.5.xml:636
+ #: apt.conf.5.xml:661
  #, no-wrap
  msgid ""
  "DPkg::NoTriggers \"true\";\n"
@@@ -7109,7 -5904,7 +5914,7 @@@ msgstr "
  "DPkg::TriggersPending \"true\";"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:630
+ #: apt.conf.5.xml:655
  msgid ""
  "Note that it is not guaranteed that APT will support these options or that "
  "these options will not cause (big) trouble in the future. If you have "
@@@ -7132,13 -5927,8 +5937,8 @@@ msgstr "
  "combinação de opções defensiva seria <placeholder type=\"literallayout\" id="
  "\"0\"/>"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:642
- msgid "DPkg::NoTriggers"
- msgstr "DPkg::NoTriggers"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:643
+ #: apt.conf.5.xml:668
  msgid ""
  "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
  "call).  See &dpkg; if you are interested in what this actually means. In "
@@@ -7158,13 -5948,8 +5958,8 @@@ msgstr "
  "configure para o dpkg - agora o apt irá adicionar esta bandeira também às "
  "chamadas unpack e remove."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:650
- msgid "PackageManager::Configure"
- msgstr "PackageManager::Configure"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:651
+ #: apt.conf.5.xml:676
  msgid ""
  "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
  "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@@ -7191,13 -5976,8 +5986,8 @@@ msgstr "
  "caso contrário o sistema poderia acabar num estado não configurado o qual "
  "poderia não arrancar!"
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:661
- msgid "DPkg::ConfigurePending"
- msgstr "DPkg::ConfigurePending"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:662
+ #: apt.conf.5.xml:687
  msgid ""
  "If this option is set apt will call <command>dpkg --configure --pending</"
  "command> to let dpkg handle all required configurations and triggers. This "
@@@ -7214,13 -5994,8 +6004,8 @@@ msgstr "
  "vezes numa fila - ex. numa instalação. Nestes cenários você pode desactivar "
  "esta opção em todas excepto na última execução."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:668
- msgid "DPkg::TriggersPending"
- msgstr "DPkg::TriggersPending"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:669
+ #: apt.conf.5.xml:694
  msgid ""
  "Useful for <literal>smart</literal> configuration as a package which has "
  "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@@ -7235,13 -6010,8 +6020,8 @@@ msgstr "
  "processar todos os triggers, e não apenas os triggers necessários para "
  "configurar este pacote."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:674
- msgid "PackageManager::UnpackAll"
- msgstr "PackageManager::UnpackAll"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:675
+ #: apt.conf.5.xml:700
  msgid ""
  "As the configuration can be deferred to be done at the end by dpkg it can be "
  "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@@ -7259,13 -6029,8 +6039,8 @@@ msgstr "
  "<literal>OrderCritical</literal> não foi usado, portanto este método é muito "
  "experimental e necessita de mais melhorias antes de se tornar realmente útil."
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:682
- msgid "OrderList::Score::Immediate"
- msgstr "OrderList::Score::Immediate"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:690
+ #: apt.conf.5.xml:715
  #, no-wrap
  msgid ""
  "OrderList::Score {\n"
@@@ -7283,7 -6048,7 +6058,7 @@@ msgstr "
  "};"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:683
+ #: apt.conf.5.xml:708
  msgid ""
  "Essential packages (and there dependencies) should be configured immediately "
  "after unpacking. It will be a good idea to do this quite early in the "
@@@ -7307,12 -6072,12 +6082,12 @@@ msgstr "
  "predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:703
+ #: apt.conf.5.xml:728
  msgid "Periodic and Archives options"
  msgstr "Opções Periodic e Archives"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:704
+ #: apt.conf.5.xml:729
  msgid ""
  "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
  "of options configure behavior of apt periodic updates, which is done by "
@@@ -7325,12 -6090,12 +6100,12 @@@ msgstr "
  "Veja o cabeçalho deste script para uma breve documentação das suas opções."
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:712
+ #: apt.conf.5.xml:737
  msgid "Debug options"
  msgstr "Opções de depuração"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:714
+ #: apt.conf.5.xml:739
  msgid ""
  "Enabling options in the <literal>Debug::</literal> section will cause "
  "debugging information to be sent to the standard error stream of the program "
@@@ -7347,7 -6112,7 +6122,7 @@@ msgstr "
  "interesse para o utilizador normal, mas algumas podem ter:"
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:725
+ #: apt.conf.5.xml:750
  msgid ""
  "<literal>Debug::pkgProblemResolver</literal> enables output about the "
  "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@@ -7358,7 -6123,7 +6133,7 @@@ msgstr "
  "remove, purge</literal>."
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:733
+ #: apt.conf.5.xml:758
  msgid ""
  "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
  "used to run some operations (for instance, <literal>apt-get -s install</"
@@@ -7369,7 -6134,7 +6144,7 @@@ msgstr "
  "<literal>apt-get -s install</literal>) como um utilizador não root."
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:742
+ #: apt.conf.5.xml:767
  msgid ""
  "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
  "time that <literal>apt</literal> invokes &dpkg;."
@@@ -7381,7 -6146,7 +6156,7 @@@ msgstr "
  #. 	   motivating example, except I haven't a clue why you'd want
  #. 	   to do this. 
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:750
+ #: apt.conf.5.xml:775
  msgid ""
  "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
  "in CDROM IDs."
@@@ -7390,63 -6155,38 +6165,38 @@@ msgstr "
  "IDs de CDROM."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:760
+ #: apt.conf.5.xml:785
  msgid "A full list of debugging options to apt follows."
  msgstr "Segue-se uma lista completa de opções de depuração para o apt."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:765
- msgid "<literal>Debug::Acquire::cdrom</literal>"
- msgstr "<literal>Debug::Acquire::cdrom</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:769
+ #: apt.conf.5.xml:794
  msgid ""
  "Print information related to accessing <literal>cdrom://</literal> sources."
  msgstr ""
  "Escreve informação relacionada com o acesso a fontes de <literal>cdrom://</"
  "literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:776
- msgid "<literal>Debug::Acquire::ftp</literal>"
- msgstr "<literal>Debug::Acquire::ftp</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:780
+ #: apt.conf.5.xml:805
  msgid "Print information related to downloading packages using FTP."
  msgstr ""
  "Escreve informação relacionada com o descarregamento de pacotes usando FTP."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:787
- msgid "<literal>Debug::Acquire::http</literal>"
- msgstr "<literal>Debug::Acquire::http</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:791
+ #: apt.conf.5.xml:816
  msgid "Print information related to downloading packages using HTTP."
  msgstr ""
  "Escreve informação relacionada com o descarregamento de pacotes usando HTTP."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:798
- msgid "<literal>Debug::Acquire::https</literal>"
- msgstr "<literal>Debug::Acquire::https</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:802
+ #: apt.conf.5.xml:827
  msgid "Print information related to downloading packages using HTTPS."
  msgstr ""
  "Escreve informação relacionada com o descarregamento de pacotes usando HTTPS."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:809
- msgid "<literal>Debug::Acquire::gpgv</literal>"
- msgstr "<literal>Debug::Acquire::gpgv</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:813
+ #: apt.conf.5.xml:838
  msgid ""
  "Print information related to verifying cryptographic signatures using "
  "<literal>gpg</literal>."
@@@ -7454,13 -6194,8 +6204,8 @@@ msgstr "
  "Escreve informação relacionada com a verificação de assinaturas "
  "criptográficas usando <literal>gpg</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:820
- msgid "<literal>Debug::aptcdrom</literal>"
- msgstr "<literal>Debug::aptcdrom</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:824
+ #: apt.conf.5.xml:849
  msgid ""
  "Output information about the process of accessing collections of packages "
  "stored on CD-ROMs."
@@@ -7468,24 -6203,14 +6213,14 @@@ msgstr "
  "Escreve informação acerca do processo de aceder a colecções de pacotes "
  "armazenados em CD-ROMs."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:831
- msgid "<literal>Debug::BuildDeps</literal>"
- msgstr "<literal>Debug::BuildDeps</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:834
+ #: apt.conf.5.xml:859
  msgid "Describes the process of resolving build-dependencies in &apt-get;."
  msgstr ""
  "Descreve os processos de resolver dependências de compilação no &apt-get;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:841
- msgid "<literal>Debug::Hashes</literal>"
- msgstr "<literal>Debug::Hashes</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:844
+ #: apt.conf.5.xml:869
  msgid ""
  "Output each cryptographic hash that is generated by the <literal>apt</"
  "literal> libraries."
@@@ -7493,13 -6218,8 +6228,8 @@@ msgstr "
  "Escreve cada hash criptográfico que é gerado pelas bibliotecas do "
  "<literal>apt</literal>."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:851
- msgid "<literal>Debug::IdentCDROM</literal>"
- msgstr "<literal>Debug::IdentCDROM</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:854
+ #: apt.conf.5.xml:879
  msgid ""
  "Do not include information from <literal>statfs</literal>, namely the number "
  "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@@ -7509,13 -6229,8 +6239,8 @@@ msgstr "
  "blocos usados e livres no sistema de ficheiros do CD-ROM, quando gera um ID "
  "para um CD-ROM."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:862
- msgid "<literal>Debug::NoLocking</literal>"
- msgstr "<literal>Debug::NoLocking</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:865
+ #: apt.conf.5.xml:890
  msgid ""
  "Disable all file locking.  For instance, this will allow two instances of "
  "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@@ -7524,25 -6239,15 +6249,15 @@@ msgstr "
  "funcionamento de duas instâncias do <quote><literal>apt-get update</"
  "literal></quote> ao mesmo tempo."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:873
- msgid "<literal>Debug::pkgAcquire</literal>"
- msgstr "<literal>Debug::pkgAcquire</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:877
+ #: apt.conf.5.xml:902
  msgid "Log when items are added to or removed from the global download queue."
  msgstr ""
  "Regista no log quando os items são adicionados ou removidos da fila de "
  "download global."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:884
- msgid "<literal>Debug::pkgAcquire::Auth</literal>"
- msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:887
+ #: apt.conf.5.xml:912
  msgid ""
  "Output status messages and errors related to verifying checksums and "
  "cryptographic signatures of downloaded files."
@@@ -7550,13 -6255,8 +6265,8 @@@ msgstr "
  "Escreve mensagens de estado e erros relacionados com a verificação de "
  "checksums e assinaturas criptográficas dos ficheiros descarregados."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:894
- msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
- msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:897
+ #: apt.conf.5.xml:922
  msgid ""
  "Output information about downloading and applying package index list diffs, "
  "and errors relating to package index list diffs."
@@@ -7565,13 -6265,8 +6275,8 @@@ msgstr "
  "índice do pacote, e erros relacionados com as diffs de lista de índice do "
  "pacote."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:905
- msgid "<literal>Debug::pkgAcquire::RRed</literal>"
- msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:909
+ #: apt.conf.5.xml:934
  msgid ""
  "Output information related to patching apt package lists when downloading "
  "index diffs instead of full indices."
@@@ -7579,26 -6274,16 +6284,16 @@@ msgstr "
  "Escreve informação relacionada com a aplicação de patch na lista de pacotes "
  "do apt quando se descarrega diffs de índice em vez de índices completos."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:916
- msgid "<literal>Debug::pkgAcquire::Worker</literal>"
- msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:920
+ #: apt.conf.5.xml:945
  msgid ""
  "Log all interactions with the sub-processes that actually perform downloads."
  msgstr ""
  "Regista todas as interacções com os sub-processos que realmente executam os "
  "downloads."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:927
- msgid "<literal>Debug::pkgAutoRemove</literal>"
- msgstr "<literal>Debug::pkgAutoRemove</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:931
+ #: apt.conf.5.xml:956
  msgid ""
  "Log events related to the automatically-installed status of packages and to "
  "the removal of unused packages."
@@@ -7606,13 -6291,8 +6301,8 @@@ msgstr "
  "Regista no log eventos relacionados com o estado instalado-automaticamente "
  "de pacotes e com a remoção de pacotes não utilizados."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:938
- msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
- msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:941
+ #: apt.conf.5.xml:966
  msgid ""
  "Generate debug messages describing which packages are being automatically "
  "installed to resolve dependencies.  This corresponds to the initial auto-"
@@@ -7626,13 -6306,8 +6316,8 @@@ msgstr "
  "literal>, e não ao resolvedor de dependências total do <literal>apt</"
  "literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:952
- msgid "<literal>Debug::pkgDepCache::Marker</literal>"
- msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:955
+ #: apt.conf.5.xml:980
  msgid ""
  "Generate debug messages describing which package is marked as keep/install/"
  "remove while the ProblemResolver does his work.  Each addition or deletion "
@@@ -7661,23 -6336,13 +6346,13 @@@ msgstr "
  "que aquela instalada. <literal>section</literal> é o nome da secção onde o "
  "pacote aparece."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:974
- msgid "<literal>Debug::pkgInitConfig</literal>"
- msgstr "<literal>Debug::pkgInitConfig</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:977
+ #: apt.conf.5.xml:1002
  msgid "Dump the default configuration to standard error on startup."
  msgstr "Despeja a configuração predefinida para o erro standard no arranque."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:984
- msgid "<literal>Debug::pkgDPkgPM</literal>"
- msgstr "<literal>Debug::pkgDPkgPM</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:987
+ #: apt.conf.5.xml:1012
  msgid ""
  "When invoking &dpkg;, output the precise command line with which it is being "
  "invoked, with arguments separated by a single space character."
@@@ -7686,13 -6351,8 +6361,8 @@@ msgstr "
  "está a ser invocado, com argumentos separados por um caractere de espaço "
  "único."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:995
- msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
- msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:998
+ #: apt.conf.5.xml:1023
  msgid ""
  "Output all the data received from &dpkg; on the status file descriptor and "
  "any errors encountered while parsing it."
@@@ -7700,13 -6360,8 +6370,8 @@@ msgstr "
  "Escreve todos os dados recebidos do &dpkg; no descritor de ficheiro de "
  "estado e quaisquer erros encontrados enquanto os analisa."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1005
- msgid "<literal>Debug::pkgOrderList</literal>"
- msgstr "<literal>Debug::pkgOrderList</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1009
+ #: apt.conf.5.xml:1034
  msgid ""
  "Generate a trace of the algorithm that decides the order in which "
  "<literal>apt</literal> should pass packages to &dpkg;."
@@@ -7714,36 -6369,21 +6379,21 @@@ msgstr "
  "Gera um rastro do algoritmo que decide a ordem na qual o <literal>apt</"
  "literal> deve passar os pacotes ao &dpkg;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1017
- msgid "<literal>Debug::pkgPackageManager</literal>"
- msgstr "<literal>Debug::pkgPackageManager</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1021
+ #: apt.conf.5.xml:1046
  msgid ""
  "Output status messages tracing the steps performed when invoking &dpkg;."
  msgstr ""
  "Escreve mensagens de estado seguindo os passos executados quando invoca o "
  "&dpkg;."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1028
- msgid "<literal>Debug::pkgPolicy</literal>"
- msgstr "<literal>Debug::pkgPolicy</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1032
+ #: apt.conf.5.xml:1057
  msgid "Output the priority of each package list on startup."
  msgstr "Escreve a prioridade da cada lista de pacote no arranque."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1038
- msgid "<literal>Debug::pkgProblemResolver</literal>"
- msgstr "<literal>Debug::pkgProblemResolver</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1042
+ #: apt.conf.5.xml:1067
  msgid ""
  "Trace the execution of the dependency resolver (this applies only to what "
  "happens when a complex dependency problem is encountered)."
@@@ -7751,13 -6391,8 +6401,8 @@@ msgstr "
  "Rastreia a execução do resolvedor de dependências (isto só se aplica ao que "
  "acontece quando é encontrado um problema de dependências complexo)."
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1050
- msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
- msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1053
+ #: apt.conf.5.xml:1078
  msgid ""
  "Display a list of all installed packages with their calculated score used by "
  "the pkgProblemResolver. The description of the package is the same as "
@@@ -7767,13 -6402,8 +6412,8 @@@ msgstr "
  "calculadas usadas pelo pkgProblemResolver. A descrição do do pacote é a "
  "mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>"
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1061
- msgid "<literal>Debug::sourceList</literal>"
- msgstr "<literal>Debug::sourceList</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1065
+ #: apt.conf.5.xml:1090
  msgid ""
  "Print information about the vendors read from <filename>/etc/apt/vendors."
  "list</filename>."
@@@ -7782,7 -6412,7 +6422,7 @@@ msgstr "
  "vendors.list</filename>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1088
+ #: apt.conf.5.xml:1113
  msgid ""
  "&configureindex; is a configuration file showing example values for all "
  "possible options."
@@@ -7791,29 -6421,16 +6431,16 @@@ msgstr "
  "para todas as opções possíveis."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt.conf.5.xml:1095
+ #: apt.conf.5.xml:1120
  msgid "&file-aptconf;"
  msgstr "&file-aptconf;"
  
  #.  ? reading apt.conf 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1100
+ #: apt.conf.5.xml:1125
  msgid "&apt-cache;, &apt-config;, &apt-preferences;."
  msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt_preferences.5.xml:16
- msgid ""
- "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
- msgstr ""
- "&apt-author.team; &apt-email; &apt-product; <date>16 Fevereiro 2010</date>"
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt_preferences.5.xml:24 apt_preferences.5.xml:31
- msgid "apt_preferences"
- msgstr "apt_preferences"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt_preferences.5.xml:32
  msgid "Preference control file for APT"
@@@ -7906,8 -6523,8 +6533,8 @@@ msgstr "
  msgid ""
  "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
  "directory are parsed in alphanumeric ascending order and need to obey the "
- "following naming convention: The files have no or \"<literal>pref</literal>"
- "\" as filename extension and which only contain alphanumeric, hyphen (-), "
+ "following naming convention: The files have either no or \"<literal>pref</"
+ "literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
  "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
  "that it has ignored a file if the file doesn't match a pattern in the "
  "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@@ -8373,7 -6990,7 +7000,7 @@@ msgid "
  "APT also supports pinning by glob() expressions and regular expressions "
  "surrounded by /. For example, the following example assigns the priority 500 "
  "to all packages from experimental where the name starts with gnome (as a glob"
- "()-like expression or contains the word kde (as a POSIX extended regular "
+ "()-like expression) or contains the word kde (as a POSIX extended regular "
  "expression surrounded by slashes)."
  msgstr ""
  
@@@ -8397,7 -7014,7 +7024,7 @@@ msgstr "
  #: apt_preferences.5.xml:279
  msgid ""
  "The rule for those expressions is that they can occur anywhere where a "
- "string can occur. Those, the following pin assigns the priority 990 to all "
+ "string can occur. Thus, the following pin assigns the priority 990 to all "
  "packages from a release starting with karmic."
  msgstr ""
  
@@@ -8417,30 -7034,29 +7044,29 @@@ msgstr "
  "Pin: release a=unstable\n"
  "Pin-Priority: 50\n"
  
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:290
- #, fuzzy
- #| msgid "Packages"
- msgid "Package"
- msgstr "Packages"
- 
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:296
- msgid "*"
+ #. type: Content of: <refentry><refsect1><refsect2><para>
+ #: apt_preferences.5.xml:291
+ msgid ""
+ "If a regular expression occurs in a <literal>Package</literal> field, the "
+ "behavior is the same as if this regular expression were replaced with a list "
+ "of all package names it matches. It is undecided whether this will change in "
+ "the future, thus you should always list wild-card pins first, so later "
+ "specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+ "Package field is not considered a glob() expression in itself."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:306
+ #: apt_preferences.5.xml:307
  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:314
+ #: apt_preferences.5.xml:315
  msgid "P &gt; 1000"
  msgstr "P &gt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:315
+ #: apt_preferences.5.xml:316
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
  "package"
@@@ -8449,12 -7065,12 +7075,12 @@@ msgstr "
  "na versão do pacote (downgrade)"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:319
+ #: apt_preferences.5.xml:320
  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:320
+ #: apt_preferences.5.xml:321
  msgid ""
  "causes a version to be installed even if it does not come from the target "
  "release, unless the installed version is more recent"
@@@ -8463,12 -7079,12 +7089,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:325
+ #: apt_preferences.5.xml:326
  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:326
+ #: apt_preferences.5.xml:327
  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"
@@@ -8478,12 -7094,12 +7104,12 @@@ msgstr "
  "mais recente"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:331
+ #: apt_preferences.5.xml:332
  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:332
+ #: apt_preferences.5.xml:333
  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"
@@@ -8493,12 -7109,12 +7119,12 @@@ msgstr "
  "recente"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:337
+ #: apt_preferences.5.xml:338
  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:338
+ #: apt_preferences.5.xml:339
  msgid ""
  "causes a version to be installed only if there is no installed version of "
  "the package"
@@@ -8507,17 -7123,17 +7133,17 @@@ msgstr "
  "instalada do pacote"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:342
+ #: apt_preferences.5.xml:343
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:343
+ #: apt_preferences.5.xml:344
  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:309
+ #: apt_preferences.5.xml:310
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -8528,7 -7144,7 +7154,7 @@@ msgstr "
  "(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:348
+ #: apt_preferences.5.xml:349
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -8542,7 -7158,7 +7168,7 @@@ msgstr "
  "determina a prioridade da versão de pacote."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:354
+ #: apt_preferences.5.xml:355
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
  "presented earlier:"
@@@ -8551,7 -7167,7 +7177,7 @@@ msgstr "
  "registos apresentados atrás:"
  
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
- #: apt_preferences.5.xml:358
+ #: apt_preferences.5.xml:359
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8579,12 -7195,12 +7205,12 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:371
+ #: apt_preferences.5.xml:372
  msgid "Then:"
  msgstr "Então:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:373
+ #: apt_preferences.5.xml:374
  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 "
@@@ -8599,7 -7215,7 +7225,7 @@@ msgstr "
  "downgrade ao <literal>perl</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:378
+ #: apt_preferences.5.xml:379
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -8610,7 -7226,7 +7236,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:382
+ #: apt_preferences.5.xml:383
  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</"
@@@ -8623,12 -7239,12 +7249,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:392
+ #: apt_preferences.5.xml:393
  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:394
+ #: apt_preferences.5.xml:395
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -8639,27 -7255,27 +7265,27 @@@ msgstr "
  "descrever os pacotes disponíveis nessa localização."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:406
+ #: apt_preferences.5.xml:407
  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:407
+ #: apt_preferences.5.xml:408
  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:410 apt_preferences.5.xml:460
+ #: apt_preferences.5.xml:411 apt_preferences.5.xml:461
  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:411
+ #: apt_preferences.5.xml:412
  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:398
+ #: apt_preferences.5.xml:399
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -8680,12 -7296,12 +7306,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:427
+ #: apt_preferences.5.xml:428
  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:428
+ #: apt_preferences.5.xml:429
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -8702,18 -7318,18 +7328,18 @@@ msgstr "
  "requerer a linha:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:438
+ #: apt_preferences.5.xml:439
  #, 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:444
+ #: apt_preferences.5.xml:445
  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:445
+ #: apt_preferences.5.xml:446
  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 "
@@@ -8730,13 -7346,13 +7356,13 @@@ msgstr "
  "preferências do APT requer a linha:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:454
+ #: apt_preferences.5.xml:455
  #, 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:461
+ #: apt_preferences.5.xml:462
  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 "
@@@ -8752,7 -7368,7 +7378,7 @@@ msgstr "
  "seguintes linhas:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:470
+ #: apt_preferences.5.xml:471
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -8764,12 -7380,12 +7390,12 @@@ msgstr "
  "Pin: release 3.0\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:479
+ #: apt_preferences.5.xml:480
  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:480
+ #: apt_preferences.5.xml:481
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -8787,18 -7403,18 +7413,18 @@@ msgstr "
  "a linha:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:489
+ #: apt_preferences.5.xml:490
  #, 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:495
+ #: apt_preferences.5.xml:496
  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:496
+ #: apt_preferences.5.xml:497
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8811,18 -7427,18 +7437,18 @@@ msgstr "
  "linha:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:502
+ #: apt_preferences.5.xml:503
  #, 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:508
+ #: apt_preferences.5.xml:509
  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:509
+ #: apt_preferences.5.xml:510
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8835,13 -7451,13 +7461,13 @@@ msgstr "
  "linha:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:515
+ #: apt_preferences.5.xml:516
  #, 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:416
+ #: apt_preferences.5.xml:417
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -8864,7 -7480,7 +7490,7 @@@ msgstr "
  "APT: <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:522
+ #: apt_preferences.5.xml:523
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -8889,12 -7505,12 +7515,12 @@@ msgstr "
  "literal> da distribuição <literal>unstable</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:535
+ #: apt_preferences.5.xml:536
  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:537
+ #: apt_preferences.5.xml:538
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -8905,12 -7521,12 +7531,12 @@@ msgstr "
  "literal>. Isto disponibiliza um espaço para comentários."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:546
+ #: apt_preferences.5.xml:547
  msgid "Tracking Stable"
  msgstr "Acompanhando Stable"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:554
+ #: apt_preferences.5.xml:555
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -8934,7 -7550,7 +7560,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:548
+ #: apt_preferences.5.xml:549
  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 "
@@@ -8950,8 -7566,8 +7576,8 @@@ msgstr "
  "\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:571 apt_preferences.5.xml:617
- #: apt_preferences.5.xml:675
+ #: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+ #: apt_preferences.5.xml:676
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -8963,7 -7579,7 +7589,7 @@@ msgstr "
  "apt-get dist-upgrade\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:566
+ #: apt_preferences.5.xml:567
  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 "
@@@ -8976,13 -7592,13 +7602,13 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:583
+ #: apt_preferences.5.xml:584
  #, 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:577
+ #: apt_preferences.5.xml:578
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -8995,12 -7611,12 +7621,12 @@@ msgstr "
  "outra vez. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:589
+ #: apt_preferences.5.xml:590
  msgid "Tracking Testing or Unstable"
  msgstr "Acompanhando Testing ou Unstable"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:598
+ #: apt_preferences.5.xml:599
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -9028,7 -7644,7 +7654,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:591
+ #: apt_preferences.5.xml:592
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -9045,7 -7661,7 +7671,7 @@@ msgstr "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:612
+ #: apt_preferences.5.xml:613
  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 "
@@@ -9058,13 -7674,13 +7684,13 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:632
+ #: apt_preferences.5.xml:633
  #, 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:623
+ #: apt_preferences.5.xml:624
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -9083,12 -7699,12 +7709,12 @@@ msgstr "
  "versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:639
+ #: apt_preferences.5.xml:640
  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:653
+ #: apt_preferences.5.xml:654
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -9122,7 -7738,7 +7748,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:641
+ #: apt_preferences.5.xml:642
  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 "
@@@ -9148,7 -7764,7 +7774,7 @@@ msgstr "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:670
+ #: apt_preferences.5.xml:671
  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 "
@@@ -9161,13 -7777,13 +7787,13 @@@ msgstr "
  "codename;</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:690
+ #: apt_preferences.5.xml:691
  #, 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:681
+ #: apt_preferences.5.xml:682
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -9186,20 -7802,15 +7812,15 @@@ msgstr "
  "instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt_preferences.5.xml:699
+ #: apt_preferences.5.xml:700
  msgid "&file-preferences;"
  msgstr "&file-preferences;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt_preferences.5.xml:705
+ #: apt_preferences.5.xml:706
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: sources.list.5.xml:25 sources.list.5.xml:32
- msgid "sources.list"
- msgstr "sources.list"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: sources.list.5.xml:33
  msgid "Package resource list for APT"
@@@ -9325,7 -7936,7 +7946,7 @@@ msgstr "
  #: sources.list.5.xml:81
  #, fuzzy, no-wrap
  #| msgid "deb uri distribution [component1] [component2] [...]"
- msgid "deb uri distribution [component1] [component2] [...]"
+ msgid "deb [ options ] uri distribution [component1] [component2] [...]"
  msgstr "deb uri distribuição [componente1] [componente2] [...]"
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -9396,6 -8007,38 +8017,38 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:112
  msgid ""
+ "<literal>options</literal> is always optional and needs to be surounded by "
+ "square brackets. It can consist of multiple settings in the form "
+ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+ "replaceable></literal>.  Multiple settings are separated by spaces. The "
+ "following settings are supported by APT, note though that unsupported "
+ "settings will be ignored silently:"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:117
+ msgid ""
+ "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+ "replaceable>,…</literal> can be used to specify for which architectures "
+ "packages information should be downloaded. If this option is not set all "
+ "architectures defined by the <literal>APT::Architectures</literal> option "
+ "will be downloaded."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:121
+ msgid ""
+ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+ "this source are always authenticated even if the <filename>Release</"
+ "filename> file is not signed or the signature can't be checked. This "
+ "disables parts of &apt-secure; and should therefore only be used in a local "
+ "and trusted context. <literal>trusted=no</literal> is the opposite which "
+ "handles even correctly authenticated sources as not authenticated."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:128
+ msgid ""
  "It is important to list sources in order of preference, with the most "
  "preferred source listed first. Typically this will result in sorting by "
  "speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@@ -9408,12 -8051,12 +8061,12 @@@ msgstr "
  "Internet, por exemplo)."
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:117
+ #: sources.list.5.xml:133
  msgid "Some examples:"
  msgstr "Alguns exemplos:"
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:119
+ #: sources.list.5.xml:135
  #, no-wrap
  msgid ""
  "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@@ -9425,17 -8068,17 +8078,17 @@@ msgstr "
  "   "
  
  #. type: Content of: <refentry><refsect1><title>
- #: sources.list.5.xml:125
+ #: sources.list.5.xml:141
  msgid "URI specification"
  msgstr "Especificação da URI"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:130
+ #: sources.list.5.xml:146
  msgid "file"
  msgstr "file"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:132
+ #: sources.list.5.xml:148
  msgid ""
  "The file scheme allows an arbitrary directory in the file system to be "
  "considered an archive. This is useful for NFS mounts and local mirrors or "
@@@ -9445,8 -8088,13 +8098,13 @@@ msgstr "
  "seja considerado um arquivo. Isto é útil para montagens NFS e mirrors ou "
  "arquivos locais."
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:153
+ msgid "cdrom"
+ msgstr "cdrom"
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:139
+ #: sources.list.5.xml:155
  msgid ""
  "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
  "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@@ -9455,8 -8103,13 +8113,13 @@@ msgstr "
  "media. Use o programa &apt-cdrom; para criar entradas cdrom na lista de "
  "fontes."
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:160
+ msgid "http"
+ msgstr "http"
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:146
+ #: sources.list.5.xml:162
  msgid ""
  "The http scheme specifies an HTTP server for the archive. If an environment "
  "variable <envar>http_proxy</envar> is set with the format http://server:"
@@@ -9472,8 -8125,13 +8135,13 @@@ msgstr "
  "string do formato http://user:pass@server:port/. Note que este não é um "
  "método de autenticação seguro."
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:171
+ msgid "ftp"
+ msgstr "ftp"
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:157
+ #: sources.list.5.xml:173
  msgid ""
  "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
  "is highly configurable; for more information see the &apt-conf; manual page. "
@@@ -9492,12 -8150,12 +8160,12 @@@ msgstr "
  "especificados no ficheiro de configuração serão ignorados."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:166
+ #: sources.list.5.xml:182
  msgid "copy"
  msgstr "copy"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:168
+ #: sources.list.5.xml:184
  msgid ""
  "The copy scheme is identical to the file scheme except that packages are "
  "copied into the cache directory instead of used directly at their location.  "
@@@ -9509,17 -8167,17 +8177,17 @@@ msgstr "
  "com o APT."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "rsh"
  msgstr "rsh"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "ssh"
  msgstr "ssh"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:175
+ #: sources.list.5.xml:191
  msgid ""
  "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
  "user and access the files. It is a good idea to do prior arrangements with "
@@@ -9534,12 -8192,12 +8202,12 @@@ msgstr "
  "para executar as transferências de ficheiros remotos."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:183
+ #: sources.list.5.xml:199
  msgid "more recognizable URI types"
  msgstr "tipos de URI mais reconhecíveis"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:185
+ #: sources.list.5.xml:201
  msgid ""
  "APT can be extended with more methods shipped in other optional packages "
  "which should follow the nameing scheme <literal>apt-transport-"
@@@ -9561,7 -8219,7 +8229,7 @@@ msgstr "
  "<manvolnum>1</manvolnum></citerefentry>."
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:127
+ #: sources.list.5.xml:143
  msgid ""
  "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
  "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@@ -9570,7 -8228,7 +8238,7 @@@ msgstr "
  "ssh, rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:199
+ #: sources.list.5.xml:215
  msgid ""
  "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
  "stable/main, stable/contrib, and stable/non-free."
@@@ -9579,36 -8237,59 +8247,59 @@@ msgstr "
  "para stable/main, stable/contrib, e stable/non-free."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:201
+ #: sources.list.5.xml:217
  #, no-wrap
  msgid "deb file:/home/jason/debian stable main contrib non-free"
  msgstr "deb file:/home/jason/debian stable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:203
+ #: sources.list.5.xml:219
  msgid "As above, except this uses the unstable (development) distribution."
  msgstr ""
  "Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:204
+ #: sources.list.5.xml:220
  #, no-wrap
  msgid "deb file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb file:/home/jason/debian unstable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:206
+ #: sources.list.5.xml:222
  msgid "Source line for the above"
  msgstr "Linha de fonte para o referido acima"
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:207
+ #: sources.list.5.xml:223
  #, no-wrap
  msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:209
+ #: sources.list.5.xml:225
+ msgid ""
+ "The first line gets package information for the architectures in "
+ "<literal>APT::Architectures</literal> while the second always retrieves "
+ "<literal>amd64</literal> and <literal>armel</literal>."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><literallayout>
+ #: sources.list.5.xml:227
+ #, fuzzy, no-wrap
+ #| msgid ""
+ #| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+ #| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+ #| "   "
+ msgid ""
+ "deb http://ftp.debian.org/debian &stable-codename; main\n"
+ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ msgstr ""
+ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+ "   "
+ 
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:230
  msgid ""
  "Uses HTTP to access the archive at archive.debian.org, and uses only the "
  "hamm/main area."
@@@ -9617,13 -8298,13 +8308,13 @@@ msgstr "
  "hamm/main."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:211
+ #: sources.list.5.xml:232
  #, no-wrap
  msgid "deb http://archive.debian.org/debian-archive hamm main"
  msgstr "deb http://archive.debian.org/debian-archive hamm main"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:213
+ #: sources.list.5.xml:234
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the &stable-codename;/contrib area."
@@@ -9632,13 -8313,13 +8323,13 @@@ msgstr "
  "usa apenas a área &stable-codename;/contrib."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:215
+ #: sources.list.5.xml:236
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:217
+ #: sources.list.5.xml:238
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the unstable/contrib area. If this line appears as "
@@@ -9651,20 -8332,20 +8342,20 @@@ msgstr "
  "uma única sessão FTP para ambas linhas de recurso."
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:221
+ #: sources.list.5.xml:242
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian unstable contrib"
  msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: sources.list.5.xml:230
+ #: sources.list.5.xml:251
  #, fuzzy, no-wrap
  #| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
  msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
  msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:223
+ #: sources.list.5.xml:244
  #, fuzzy
  #| msgid ""
  #| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@@ -9692,7 -8373,7 +8383,7 @@@ msgstr "
  "\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:235
+ #: sources.list.5.xml:256
  msgid "&apt-cache; &apt-conf;"
  msgstr "&apt-cache; &apt-conf;"
  
@@@ -9879,6 -8560,11 +8570,11 @@@ msgstr "
  "problemas com dependências ao disponibilizar um número de algoritmos "
  "automáticos que ajudam a seleccionar os pacotes para instalação."
  
+ #. type: <heading></heading>
+ #: guide.sgml:96
+ msgid "apt-get"
+ msgstr "apt-get"
+ 
  #. type: <p></p>
  #: guide.sgml:102
  msgid ""
@@@ -9930,6 -8616,11 +8626,11 @@@ msgstr "
  msgid "Once updated there are several commands that can be used:"
  msgstr "Uma vez actualizado existem vários comandos que podem ser usados:"
  
+ #. type: <tag></tag>
+ #: guide.sgml:121
+ msgid "upgrade"
+ msgstr "upgrade"
+ 
  #. type: <p></p>
  #: guide.sgml:131
  msgid ""
@@@ -9950,6 -8641,11 +8651,11 @@@ msgstr "
  "outro pacote. <prgn>dselect</prgn> ou <tt>apt-get install</tt> podem ser "
  "usados para forçar estes pacotes a instalar."
  
+ #. type: <tag></tag>
+ #: guide.sgml:131
+ msgid "install"
+ msgstr "install"
+ 
  #. type: <p></p>
  #: guide.sgml:140
  msgid ""
@@@ -9969,6 -8665,11 +8675,11 @@@ msgstr "
  "com os pacotes listados e irá escrever um sumário e pedir confirmação se "
  "algo mais que os seus argumentos serão alterados."
  
+ #. type: <tag></tag>
+ #: guide.sgml:140
+ msgid "dist-upgrade"
+ msgstr "dist-upgrade"
+ 
  #. type: <p></p>
  #: guide.sgml:149
  msgid ""
@@@ -11210,14 -9911,187 +9921,187 @@@ msgid "Which will use the already fetch
  msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
  
  #, fuzzy
- #~| msgid "<option>--recurse</option>"
- #~ msgid "<option>--host-architecture</option>"
- #~ msgstr "<option>--recurse</option>"
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>17 August 2009</date>"
+ #~ msgid "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 Agosto 2009</date>"
+ 
+ #~ msgid "ORIGINAL AUTHORS"
+ #~ msgstr "AUTORES ORIGINAIS"
+ 
+ #~ msgid "&apt-author.jgunthorpe;"
+ #~ msgstr "&apt-author.jgunthorpe;"
+ 
+ #~ msgid "CURRENT AUTHORS"
+ #~ msgstr "AUTORES ACTUAIS"
+ 
+ #~ msgid "&apt-author.team;"
+ #~ msgstr "&apt-author.team;"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>17 August 2009</date>"
+ #~ msgid "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 Agosto 2009</date>"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+ #~| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
+ #~| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+ #~| "email; &apt-product; <date>16 January 2010</date>"
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+ #~ "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
+ #~ "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+ #~ "email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+ #~ "firstname> <surname>Burrows</surname> <contrib>Documentação inicial do "
+ #~ "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+ #~ "email; &apt-product; <date>16 Janeiro 2010</date>"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
+ #~ msgid "&apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr ""
+ #~ "&apt-author.team; &apt-email; &apt-product; <date>16 Fevereiro 2010</date>"
+ 
+ #~ msgid ""
+ #~ "<!-- Boiler plate docinfo section -->\n"
+ #~ "<!ENTITY apt-docinfo \"\n"
+ #~ " <refentryinfo>\n"
+ #~ "   <address><email>apt@packages.debian.org</email></address>\n"
+ #~ "   <author>\n"
+ #~ "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+ #~ "     <contrib></contrib>\n"
+ #~ "   </author>\n"
+ #~ "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+ #~ "copyright>\n"
+ #~ "   <date>28 October 2008</date>\n"
+ #~ "   <productname>Linux</productname>\n"
+ #~ " </refentryinfo>\n"
+ #~ "\">\n"
+ #~ msgstr ""
+ #~ "<!-- Boiler plate docinfo section -->\n"
+ #~ "<!ENTITY apt-docinfo \"\n"
+ #~ " <refentryinfo>\n"
+ #~ "   <address><email>apt@packages.debian.org</email></address>\n"
+ #~ "   <author>\n"
+ #~ "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+ #~ "     <contrib></contrib>\n"
+ #~ "   </author>\n"
+ #~ "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+ #~ "copyright>\n"
+ #~ "   <date>28 Outubro 2008</date>\n"
+ #~ "   <productname>Linux</productname>\n"
+ #~ " </refentryinfo>\n"
+ #~ "\">\n"
+ 
+ #, fuzzy
+ #~| msgid ""
+ #~| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>14 February 2004</date>"
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>2012-05-21T05:49:00+01:00</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>14 Fevereiro 2004</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>14 February 2004</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>14 Fevereiro 2004</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>29 February 2004</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>29 Fevereiro 2004</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 August 2009</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>17 Agosto 2009</date>"
+ 
+ #~ msgid ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>08 November 2008</date>"
+ #~ msgstr ""
+ #~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>08 Novembro 2008</date>"
  
  #, fuzzy
- #~| msgid "Max-ValidTime"
- #~ msgid "Min-ValidTime"
- #~ msgstr "Max-ValidTime"
+ #~| msgid ""
+ #~| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
+ #~| "<date>9 August 2009</date>"
+ #~ msgid ""
+ #~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
+ #~ "<date>21 April 2011</date>"
+ #~ msgstr ""
+ #~ "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+ #~ "Agosto 2009</date>"
+ 
+ #~ msgid ""
+ #~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
+ #~ "get check</command>. It builds the source and package caches from the "
+ #~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</"
+ #~ "filename>."
+ #~ msgstr ""
+ #~ "<literal>gencaches</literal> executa a mesma operação que o <command>apt-"
+ #~ "get check</command>. Constrói as caches de fonte e pacote a partir das "
+ #~ "fontes em &sources-list; e a partir de <filename>/var/lib/dpkg/status</"
+ #~ "filename>."
+ 
+ #~ msgid ""
+ #~ "One setting is provided to control the pipeline depth in cases where the "
+ #~ "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
+ #~ "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
+ #~ "5 indicating how many outstanding requests APT should send. A value of "
+ #~ "zero MUST be specified if the remote host does not properly linger on TCP "
+ #~ "connections - otherwise data corruption will occur. Hosts which require "
+ #~ "this are in violation of RFC 2068."
+ #~ msgstr ""
+ #~ "É disponibilizada uma definição para controlar a profundidade do pipeline "
+ #~ "em casos onde o servidor remoto não é compatível com RFC ou é buggy (como "
+ #~ "o Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth</literal> pode ser "
+ #~ "um valor de 0 a 5 que indica quantos requerimentos pendentes o APT deve "
+ #~ "enviar. TEM de ser especificado um valor de 0 se a máquina remota não "
+ #~ "hesitar propriamente em ligações TCP - de outro modo irá ocorrer "
+ #~ "corrupção de dados. As máquinas que requerem isto estão em violação de "
+ #~ "RFC 2068."
+ 
+ #~ msgid "add <replaceable>filename</replaceable>"
+ #~ msgstr "add <replaceable>nome-de-ficheiro</replaceable>"
+ 
+ #~ msgid "del <replaceable>keyid</replaceable>"
+ #~ msgstr "del <replaceable>id de chave</replaceable>"
+ 
+ #~ msgid "export <replaceable>keyid</replaceable>"
+ #~ msgstr "export <replaceable>id de chave</replaceable>"
+ 
+ #~ msgid ""
+ #~ "Update the local keyring with the keyring of Debian archive keys and "
+ #~ "removes from the keyring the archive keys which are no longer valid."
+ #~ msgstr ""
+ #~ "Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e "
+ #~ "remove do chaveiro as chaves de arquivo que já não são válidas."
+ 
+ #~ msgid "--keyring <replaceable>filename</replaceable>"
+ #~ msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>"
  
  #, fuzzy
  #~| msgid ""
@@@ -11231,13 -10105,15 +10115,15 @@@
  #~| "using the earlier date of the two. Archive specific settings can be made "
  #~| "by appending the label of the archive to the option name."
  #~ msgid ""
- #~ "Minimum of seconds the Release file should be considered valid after it "
- #~ "was created (indicated by the <literal>Date</literal> header).  Use this "
- #~ "if you need to use a seldomly updated (local) mirror of a more regular "
- #~ "updated archive with a <literal>Valid-Until</literal> header instead of "
- #~ "completely disabling the expiration date checking.  Archive specific "
- #~ "settings can and should be used by appending the label of the archive to "
- #~ "the option name."
+ #~ "Seconds the Release file should be considered valid after it was created. "
+ #~ "The default is \"for ever\" (0) if the Release file of the archive "
+ #~ "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+ #~ "this date is the default. The date from the Release file or the date "
+ #~ "specified by the creation time of the Release file (<literal>Date</"
+ #~ "literal> header) plus the seconds specified with this options are used to "
+ #~ "check if the validation of a file has expired by using the earlier date "
+ #~ "of the two. Archive specific settings can be made by appending the label "
+ #~ "of the archive to the option name."
  #~ msgstr ""
  #~ "Segundos em que o ficheiro Release deve considerado válido após ser "
  #~ "criado. A predefinição é \"para sempre\" (0) se o ficheiro Release do "
@@@ -11249,22 -10125,6 +10135,6 @@@
  #~ "usar uma data anterior às duas. Definições específicas do Arquivo podem "
  #~ "ser feitas ao adicionar a etiqueta do arquivo ao nome da opção. "
  
- #, fuzzy
- #~| msgid ""
- #~| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
- #~| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
- #~| "   "
- #~ msgid ""
- #~ "deb http://ftp.debian.org/debian &stable-codename; main\n"
- #~ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
- #~ msgstr ""
- #~ "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
- #~ "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
- #~ "   "
- 
- #~ 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 "
@@@ -11274,24 -10134,9 +10144,9 @@@
  #~ "índice gerados não terão campos MD5Sum onde possíveis. Item de "
  #~ "Configuração: <literal>APT::FTPArchive::MD5</literal>"
  
- #~ msgid "unmarkauto"
- #~ msgstr "unmarkauto"
- 
- #~ msgid "<option>-h</option>"
- #~ msgstr "<option>-h</option>"
- 
- #~ msgid "<option>--help</option>"
- #~ msgstr "<option>--help</option>"
- 
  #~ msgid "Show a short usage summary."
  #~ msgstr "Mostra um curto sumário de utilização."
  
- #~ msgid "<option>-v</option>"
- #~ msgstr "<option>-v</option>"
- 
- #~ msgid "<option>--version</option>"
- #~ msgstr "<option>--version</option>"
- 
  #~ msgid "Show the program version."
  #~ msgstr "Mostra a versão do programa."
  
@@@ -11326,9 -10171,6 +10181,6 @@@
  #~ "ficheiro Release contendo um sumário MD5 e um sumário SHA1 por cada "
  #~ "ficheiro."
  
- #~ msgid "<option>--install-recommends</option>"
- #~ msgstr "<option>--install-recommends</option>"
- 
  #~ msgid "Also install recommended packages."
  #~ msgstr "Também instala pacotes recomendados."
  
@@@ -11385,9 -10227,6 +10237,6 @@@
  #~ "<literal>Dir::State</literal> que define o caminho para o ficheiro "
  #~ "<filename>extended_states</filename>."
  
- #~ msgid "Cache-Limit"
- #~ msgstr "Cache-Limit"
- 
  #~ msgid ""
  #~ "APT uses a fixed size memory mapped cache file to store the 'available' "
  #~ "information. This sets the size of that cache (in bytes)."
diff --combined doc/po/pt_BR.po
index 488350186,12eb7b0a0..db3d0b541
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@@ -9,7 -9,7 +9,8 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: apt\n"
- "POT-Creation-Date: 2011-06-08 16:54+0300\n"
 -"POT-Creation-Date: 2012-05-21 13:35+0300\n"
++"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
++"POT-Creation-Date: 2012-05-22 15:47+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"
@@@ -144,38 -144,7 +145,7 @@@ msgstr "
  " </RefSect1>\n"
  
  #. type: Plain text
- #: apt.ent:2
- msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
- msgstr ""
- 
- #. type: Plain text
- #: apt.ent:16
- #, fuzzy, no-wrap
- msgid ""
- "<!-- Boiler plate docinfo section -->\n"
- "<!ENTITY apt-docinfo \"\n"
- " <refentryinfo>\n"
- "   <address><email>apt@packages.debian.org</email></address>\n"
- "   <author>\n"
- "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
- "     <contrib></contrib>\n"
- "   </author>\n"
- "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
- "   <date>28 October 2008</date>\n"
- "   <productname>Linux</productname>\n"
- " </refentryinfo>\n"
- "\">\n"
- msgstr ""
- "\n"
- " <docinfo>\n"
- "   <address><email>apt@packages.debian.org</></address>\n"
- "   <author><firstname>Jason</> <surname>Gunthorpe</></>\n"
- "   <copyright><year>1998-2001</> <holder>Jason Gunthorpe</></>\n"
- "   <date>12 Março 2001</>\n"
- " </docinfo>\n"
- 
- #. type: Plain text
- #: apt.ent:23
+ #: apt.ent:7
  #, no-wrap
  msgid ""
  "<!ENTITY apt-author.team \"\n"
@@@ -187,7 -156,7 +157,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:29
+ #: apt.ent:13
  #, no-wrap
  msgid ""
  "<!ENTITY apt-qapage \"\n"
@@@ -198,7 -167,7 +168,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:40
+ #: apt.ent:24
  #, fuzzy, no-wrap
  msgid ""
  "<!-- Boiler plate Bug reporting section -->\n"
@@@ -221,7 -190,7 +191,7 @@@ msgstr "
  " </RefSect1>\n"
  
  #. type: Plain text
- #: apt.ent:48
+ #: apt.ent:32
  #, fuzzy, no-wrap
  msgid ""
  "<!-- Boiler plate Author section -->\n"
@@@ -239,7 -208,7 +209,7 @@@ msgstr "
  " </RefSect1>\n"
  
  #. type: Plain text
- #: apt.ent:58
+ #: apt.ent:42
  #, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -254,7 -223,7 +224,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:66
+ #: apt.ent:50
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -267,7 -236,7 +237,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:78
+ #: apt.ent:62
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -284,7 -253,7 +254,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:90
+ #: apt.ent:74
  #, no-wrap
  msgid ""
  "     <varlistentry>\n"
@@@ -301,7 -270,7 +271,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:101
+ #: apt.ent:85
  #, fuzzy, no-wrap
  msgid ""
  "<!-- Should be used within the option section of the text to\n"
@@@ -325,7 -294,7 +295,7 @@@ msgstr "
  "   </para>\n"
  
  #. type: Plain text
- #: apt.ent:107
+ #: apt.ent:91
  #, no-wrap
  msgid ""
  "<!ENTITY file-aptconf \"\n"
@@@ -336,7 -305,7 +306,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:113
+ #: apt.ent:97
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@@ -347,7 -316,7 +317,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:119
+ #: apt.ent:103
  #, no-wrap
  msgid ""
  "<!ENTITY file-cachearchives \"\n"
@@@ -358,18 -327,18 +328,18 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:125
+ #: apt.ent:109
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
  "     <listitem><para>Storage area for package files in transit.\n"
- "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:135
+ #: apt.ent:119
  #, no-wrap
  msgid ""
  "<!ENTITY file-preferences \"\n"
@@@ -384,7 -353,7 +354,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:141
+ #: apt.ent:125
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@@ -395,7 -364,7 +365,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:147
+ #: apt.ent:131
  #, no-wrap
  msgid ""
  "<!ENTITY file-sourceslist \"\n"
@@@ -406,7 -375,7 +376,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:153
+ #: apt.ent:137
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@@ -417,7 -386,7 +387,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:160
+ #: apt.ent:144
  #, no-wrap
  msgid ""
  "<!ENTITY file-statelists \"\n"
@@@ -429,18 -398,18 +399,18 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:166
+ #: apt.ent:150
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
  "     <listitem><para>Storage area for state information in transit.\n"
- "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:172
+ #: apt.ent:156
  #, no-wrap
  msgid ""
  "<!ENTITY file-trustedgpg \"\n"
@@@ -451,7 -420,7 +421,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:179
+ #: apt.ent:163
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@@ -463,7 -432,7 +433,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:187
+ #: apt.ent:171
  #, no-wrap
  msgid ""
  "<!ENTITY file-extended_states \"\n"
@@@ -476,7 -445,7 +446,7 @@@
  msgstr ""
  
  #. type: Plain text
- #: apt.ent:191
+ #: apt.ent:175
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@@ -485,7 -454,7 +455,7 @@@
  msgstr "<!ENTITY translation-title \"TRADUÇÃO\">\n"
  
  #. type: Plain text
- #: apt.ent:200
+ #: apt.ent:184
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@@ -503,7 -472,7 +473,7 @@@ msgstr "
  "\">\n"
  
  #. type: Plain text
- #: apt.ent:210
+ #: apt.ent:195
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@@ -518,30 -487,133 +488,133 @@@
  "\">\n"
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cache.8.xml:16
+ #. type: Plain text
+ #: apt.ent:198
+ msgid ""
+ "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+ "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:201
+ msgid ""
+ "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+ "synopsis-config-file \"config_file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:204
+ msgid ""
+ "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+ "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+ "\"target_release\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:207
+ msgid ""
+ "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+ "synopsis-architecture \"architecture\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:210
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+ "--> <!ENTITY synopsis-pkg \"pkg\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:213
+ msgid ""
+ "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+ "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:216
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+ "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:219
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+ "awesome --> <!ENTITY synopsis-regex \"regex\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:222
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+ "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:225
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+ "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+ "\"temporary_directory\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:228
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+ "synopsis-filename \"filename\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:231
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:234
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-override "
+ "\"override-file\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:237
+ msgid ""
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+ "\"pathprefix\">"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: apt.ent:240
  msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
- "February 2011</date>"
+ "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+ "generate section --> <!ENTITY synopsis-section \"section\">"
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cache.8.xml:25 apt-cache.8.xml:32
- msgid "apt-cache"
+ #. type: Plain text
+ #: apt.ent:243
+ msgid ""
+ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
  msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26
- #: apt-key.8.xml:18 apt-mark.8.xml:26 apt-secure.8.xml:18
+ #: apt-key.8.xml:25 apt-mark.8.xml:26 apt-secure.8.xml:25
  msgid "8"
  msgstr ""
  
  #. type: Content of: <refentry><refmeta><refmiscinfo>
  #: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27
  #: apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27
- #: apt-key.8.xml:19 apt-mark.8.xml:27 apt-secure.8.xml:19
- #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:33 apt_preferences.5.xml:26
+ #: apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26
+ #: apt-sortpkgs.1.xml:27 apt.conf.5.xml:32 apt_preferences.5.xml:26
  #: sources.list.5.xml:27
  msgid "APT"
  msgstr ""
@@@ -551,42 -623,18 +624,18 @@@
  msgid "query the APT cache"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cache.8.xml:39
- msgid ""
- "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
- "<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
- "arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
- "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
- "arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
- "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
- "arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
- #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
- #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
- #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+ #: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+ #: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+ #: apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50
+ #: apt-sortpkgs.1.xml:38 apt.conf.5.xml:41 apt_preferences.5.xml:36
  #: sources.list.5.xml:36
  #, fuzzy
  msgid "Description"
  msgstr "Descrição"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:65
+ #: apt-cache.8.xml:39
  msgid ""
  "<command>apt-cache</command> performs a variety of operations on APT's "
  "package cache. <command>apt-cache</command> does not manipulate the state of "
@@@ -595,32 -643,28 +644,28 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:70 apt-get.8.xml:120
+ #: apt-cache.8.xml:44 apt-get.8.xml:44
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given, "
  "one of the commands below must be present."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:74
- msgid "gencaches"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:75
+ #: apt-cache.8.xml:49
  msgid ""
- "<literal>gencaches</literal> performs the same operation as <command>apt-get "
- "check</command>. It builds the source and package caches from the sources in "
- "&sources-list; and from <filename>/var/lib/dpkg/status</filename>."
+ "<literal>gencaches</literal> creates APT's package cache. This is done "
+ "implicitly by all commands needing this cache if it is missing or outdated."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:81
- msgid "showpkg <replaceable>pkg(s)</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+ #: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
+ #: apt-cache.8.xml:226 apt-cache.8.xml:238
+ msgid "&synopsis-pkg;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:82
+ #: apt-cache.8.xml:54
  msgid ""
  "<literal>showpkg</literal> displays information about the packages listed on "
  "the command line. Remaining arguments are package names. The available "
@@@ -634,7 -678,7 +679,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-cache.8.xml:94
+ #: apt-cache.8.xml:66
  #, no-wrap
  msgid ""
  "Package: libreadline2\n"
@@@ -650,7 -694,7 +695,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:106
+ #: apt-cache.8.xml:78
  msgid ""
  "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
  "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@@ -661,27 -705,22 +706,22 @@@
  "best to consult the apt source code."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:115
- msgid "stats"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:115
+ #: apt-cache.8.xml:87
  msgid ""
  "<literal>stats</literal> displays some statistics about the cache.  No "
  "further arguments are expected. Statistics reported are:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:118
+ #: apt-cache.8.xml:90
  msgid ""
  "<literal>Total package names</literal> is the number of package names found "
  "in the cache."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:122
+ #: apt-cache.8.xml:94
  msgid ""
  "<literal>Normal packages</literal> is the number of regular, ordinary "
  "package names; these are packages that bear a one-to-one correspondence "
@@@ -690,7 -729,7 +730,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:128
+ #: apt-cache.8.xml:100
  msgid ""
  "<literal>Pure virtual packages</literal> is the number of packages that "
  "exist only as a virtual package name; that is, packages only \"provide\" the "
@@@ -701,7 -740,7 +741,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:136
+ #: apt-cache.8.xml:108
  msgid ""
  "<literal>Single virtual packages</literal> is the number of packages with "
  "only one package providing a particular virtual package. For example, in the "
@@@ -710,7 -749,7 +750,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:142
+ #: apt-cache.8.xml:114
  msgid ""
  "<literal>Mixed virtual packages</literal> is the number of packages that "
  "either provide a particular virtual package or have the virtual package name "
@@@ -719,7 -758,7 +759,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:149
+ #: apt-cache.8.xml:121
  msgid ""
  "<literal>Missing</literal> is the number of package names that were "
  "referenced in a dependency but were not provided by any package. Missing "
@@@ -729,7 -768,7 +769,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:156
+ #: apt-cache.8.xml:128
  msgid ""
  "<literal>Total distinct</literal> versions is the number of package versions "
  "found in the cache; this value is therefore at least equal to the number of "
@@@ -739,80 -778,55 +779,55 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
- #: apt-cache.8.xml:163
+ #: apt-cache.8.xml:135
  msgid ""
  "<literal>Total dependencies</literal> is the number of dependency "
  "relationships claimed by all of the packages in the cache."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:170
- msgid "showsrc <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:171
+ #: apt-cache.8.xml:143
  msgid ""
  "<literal>showsrc</literal> displays all the source package records that "
  "match the given package names. All versions are shown, as well as all "
  "records that declare the name to be a Binary."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:176 apt-config.8.xml:87
- msgid "dump"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:177
+ #: apt-cache.8.xml:149
  msgid ""
  "<literal>dump</literal> shows a short listing of every package in the cache. "
  "It is primarily for debugging."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:181
- msgid "dumpavail"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:182
+ #: apt-cache.8.xml:154
  msgid ""
  "<literal>dumpavail</literal> prints out an available list to stdout. This is "
  "suitable for use with &dpkg; and is used by the &dselect; method."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:186
- msgid "unmet"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:187
+ #: apt-cache.8.xml:159
  msgid ""
  "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
  "package cache."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:191
- msgid "show <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:192
+ #: apt-cache.8.xml:164
  msgid ""
  "<literal>show</literal> performs a function similar to <command>dpkg --print-"
  "avail</command>; it displays the package records for the named packages."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:197
- msgid "search <replaceable>regex [ regex ... ]</replaceable>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-cache.8.xml:169
+ msgid "&synopsis-regex;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:198
+ #: apt-cache.8.xml:170
  msgid ""
  "<literal>search</literal> performs a full text search on all available "
  "package lists for the POSIX regex pattern given, see "
@@@ -827,46 -841,36 +842,36 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:211
+ #: apt-cache.8.xml:183
  msgid ""
  "Separate arguments can be used to specify multiple search patterns that are "
  "and'ed together."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:215
- msgid "depends <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:216
+ #: apt-cache.8.xml:188
  msgid ""
  "<literal>depends</literal> shows a listing of each dependency a package has "
  "and all the possible other packages that can fulfill that dependency."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:220
- #, fuzzy
- msgid "rdepends <replaceable>pkg(s)</replaceable>"
- msgstr ""
- "<programlisting>\n"
- "apt-get install <replaceable>pacote</replaceable>/testing\n"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:221
+ #: apt-cache.8.xml:193
  msgid ""
  "<literal>rdepends</literal> shows a listing of each reverse dependency a "
  "package has."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:225
- msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+ #: apt-cache.8.xml:197
+ #, fuzzy
+ msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
  msgstr ""
+ "<programlisting>\n"
+ "apt-get install <replaceable>pacote</replaceable>/testing\n"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:226
+ #: apt-cache.8.xml:198
  msgid ""
  "This command prints the name of each package APT knows. The optional "
  "argument is a prefix match to filter the name list. The output is suitable "
@@@ -876,20 -880,15 +881,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:231
+ #: apt-cache.8.xml:203
  msgid ""
  "Note that a package which APT knows of is not necessarily available to "
  "download, installable or installed, e.g. virtual packages are also listed in "
  "the generated list."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:236
- msgid "dotty <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:237
+ #: apt-cache.8.xml:209
  msgid ""
  "<literal>dotty</literal> takes a list of packages on the command line and "
  "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@@ -902,7 -901,7 +902,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:246
+ #: apt-cache.8.xml:218
  msgid ""
  "The resulting nodes will have several shapes; normal packages are boxes, "
  "pure provides are triangles, mixed provides are diamonds, missing packages "
@@@ -911,29 -910,27 +911,27 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:251
+ #: apt-cache.8.xml:223
  msgid "Caution, dotty cannot graph larger sets of packages."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:254
- msgid "xvcg <replaceable>pkg(s)</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:255
+ #: apt-cache.8.xml:227
  msgid ""
  "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
  "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:259
- msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
+ #: apt-cache.8.xml:231
+ #, fuzzy
+ msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
  msgstr ""
+ "<programlisting>\n"
+ "apt-get install <replaceable>pacote</replaceable>/testing\n"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:260
+ #: apt-cache.8.xml:232
  msgid ""
  "<literal>policy</literal> is meant to help debug issues relating to the "
  "preferences file. With no arguments it will print out the priorities of each "
@@@ -941,16 -938,8 +939,8 @@@
  "selection of the named package."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:266
- #, fuzzy
- msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
- msgstr ""
- "<programlisting>\n"
- "apt-get install <replaceable>pacote</replaceable>/testing\n"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:267
+ #: apt-cache.8.xml:239
  msgid ""
  "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
  "to mimic the output format and a subset of the functionality of the Debian "
@@@ -961,44 -950,23 +951,23 @@@
  "Architecture</literal>)."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
- #: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
- #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+ #. type: Content of: <refentry><refsect1><title>
+ #: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+ #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+ #: apt-sortpkgs.1.xml:48
  msgid "options"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>-p</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:282
- msgid "<option>--pkg-cache</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:283
+ #: apt-cache.8.xml:255
  msgid ""
  "Select the file to store the package cache. The package cache is the primary "
  "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
  "pkgcache</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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 ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:288
- msgid "<option>--src-cache</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:289
+ #: apt-cache.8.xml:261
  msgid ""
  "Select the file to store the source cache. The source is used only by "
  "<literal>gencaches</literal> and it stores a parsed version of the package "
@@@ -1007,18 -975,8 +976,8 @@@
  "Item: <literal>Dir::Cache::srcpkgcache</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:545 apt-get.8.xml:383
- msgid "<option>--quiet</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:297
+ #: apt-cache.8.xml:269
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quietness up to a maximum of 2. You can also use "
@@@ -1026,103 -984,33 +985,33 @@@
  "configuration file.  Configuration Item: <literal>quiet</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>-i</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:303
- msgid "<option>--important</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:304
+ #: apt-cache.8.xml:276
  msgid ""
  "Print only important dependencies; for use with unmet and depends. Causes "
  "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
  "<literal>APT::Cache::Important</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:309
- msgid "<option>--no-pre-depends</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:310
- msgid "<option>--no-depends</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:311
- msgid "<option>--no-recommends</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:312
- msgid "<option>--no-suggests</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:313
- msgid "<option>--no-conflicts</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:314
- msgid "<option>--no-breaks</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:315
- msgid "<option>--no-replaces</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:316
- msgid "<option>--no-enhances</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:317
+ #: apt-cache.8.xml:289
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
- "print all dependencies. This can be twicked with these flags which will omit "
+ "print all dependencies. This can be tweaked with these flags which will omit "
  "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
  "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
  "Cache::ShowRecommends</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
- msgid "<option>-f</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:323
- msgid "<option>--full</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:324
+ #: apt-cache.8.xml:296
  msgid ""
  "Print full package records when searching.  Configuration Item: "
  "<literal>APT::Cache::ShowFull</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
- msgid "<option>-a</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:328
- msgid "<option>--all-versions</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:329
+ #: apt-cache.8.xml:301
  msgid ""
  "Print full records for all available versions. This is the default; to turn "
  "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@@ -1132,74 -1020,39 +1021,39 @@@
  "<literal>APT::Cache::AllVersions</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>-g</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:337
- msgid "<option>--generate</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:338
+ #: apt-cache.8.xml:310
  msgid ""
  "Perform automatic package cache regeneration, rather than use the cache as "
  "it is. This is the default; to turn it off, use <option>--no-generate</"
  "option>.  Configuration Item: <literal>APT::Cache::Generate</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343
- msgid "<option>--names-only</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:343 apt-cdrom.8.xml:142
- msgid "<option>-n</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:344
+ #: apt-cache.8.xml:316
  msgid ""
  "Only search on the package names, not the long descriptions.  Configuration "
  "Item: <literal>APT::Cache::NamesOnly</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:348
- msgid "<option>--all-names</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:349
+ #: apt-cache.8.xml:321
  msgid ""
  "Make <literal>pkgnames</literal> print all names, including virtual packages "
  "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
  "AllNames</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:354
- msgid "<option>--recurse</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:355
+ #: apt-cache.8.xml:327
  msgid ""
  "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
  "that all packages mentioned are printed once.  Configuration Item: "
  "<literal>APT::Cache::RecurseDepends</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cache.8.xml:360
- msgid "<option>--installed</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cache.8.xml:362
+ #: apt-cache.8.xml:334
  msgid ""
  "Limit the output of <literal>depends</literal> and <literal>rdepends</"
  "literal> to packages which are currently installed.  Configuration Item: "
@@@ -1207,81 -1060,59 +1061,59 @@@
  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:611 apt-get.8.xml:570
- #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+ #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
+ #: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+ #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
  msgid "&apt-commonoptions;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
- #: apt.conf.5.xml:1093 apt_preferences.5.xml:697
+ #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126
+ #: apt.conf.5.xml:1118 apt_preferences.5.xml:698
  msgid "Files"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-cache.8.xml:374
+ #: apt-cache.8.xml:346
  msgid "&file-sourceslist; &file-statelists;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
- #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
- #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
- #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
- #: sources.list.5.xml:234
+ #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
+ #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+ #: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+ #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
+ #: sources.list.5.xml:255
  #, fuzzy
  msgid "See Also"
  msgstr "Consulte também"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:380
+ #: apt-cache.8.xml:352
  msgid "&apt-conf;, &sources-list;, &apt-get;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
- #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
- #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+ #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
+ #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+ #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
  msgid "Diagnostics"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cache.8.xml:385
+ #: apt-cache.8.xml:357
  msgid ""
  "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
  "on error."
  msgstr ""
  
- #. type: Content of: <refentry><refentryinfo>
- #: apt-cdrom.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
- "February 2004</date>"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-cdrom.8.xml:24 apt-cdrom.8.xml:31
- msgid "apt-cdrom"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-cdrom.8.xml:32
  msgid "APT CDROM management utility"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-cdrom.8.xml:38
- msgid ""
- "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
- "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
- "<arg>add</arg> <arg>ident</arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:51
+ #: apt-cdrom.8.xml:38
  msgid ""
  "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
  "available sources. <command>apt-cdrom</command> takes care of determining "
@@@ -1290,20 -1121,15 +1122,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:58
+ #: apt-cdrom.8.xml:45
  msgid ""
  "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
  "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
  "must be inserted and scanned separately to account for possible mis-burns."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:68
- msgid "add"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:69
+ #: apt-cdrom.8.xml:56
  msgid ""
  "<literal>add</literal> is used to add a new disc to the source list. It will "
  "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@@ -1313,27 -1139,22 +1140,22 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:77
+ #: apt-cdrom.8.xml:64
  msgid ""
  "APT uses a CDROM ID to track which disc is currently in the drive and "
  "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
  "filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:84
- msgid "ident"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:85
+ #: apt-cdrom.8.xml:72
  msgid ""
  "A debugging tool to report the identity of the current disc as well as the "
  "stored file name"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:64
+ #: apt-cdrom.8.xml:51
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present.  <placeholder type=\"variablelist"
@@@ -1341,71 -1162,36 +1163,36 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-cdrom.8.xml:94 apt-key.8.xml:158
+ #: apt-cdrom.8.xml:81 apt-key.8.xml:160
  msgid "Options"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
- msgid "<option>-d</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:98
- msgid "<option>--cdrom</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:99
+ #: apt-cdrom.8.xml:86
  msgid ""
  "Mount point; specify the location to mount the cdrom. This mount point must "
  "be listed in <filename>/etc/fstab</filename> and properly configured.  "
  "Configuration Item: <literal>Acquire::cdrom::mount</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>-r</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:107
- msgid "<option>--rename</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:108
+ #: apt-cdrom.8.xml:95
  msgid ""
  "Rename a disc; change the label of a disk or override the disks given label. "
  "This option will cause <command>apt-cdrom</command> to prompt for a new "
  "label.  Configuration Item: <literal>APT::CDROM::Rename</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116 apt-get.8.xml:364
- msgid "<option>-m</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:116
- msgid "<option>--no-mount</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:117
+ #: apt-cdrom.8.xml:104
  msgid ""
  "No mounting; prevent <command>apt-cdrom</command> from mounting and "
  "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
  "NoMount</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:124
- msgid "<option>--fast</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:125
+ #: apt-cdrom.8.xml:112
  msgid ""
  "Fast Copy; Assume the package files are valid and do not check every "
  "package. This option should be used only if <command>apt-cdrom</command> has "
@@@ -1413,36 -1199,16 +1200,16 @@@
  "Item: <literal>APT::CDROM::Fast</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:134
- msgid "<option>--thorough</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:135
+ #: apt-cdrom.8.xml:122
  msgid ""
  "Thorough Package Scan; This option may be needed with some old Debian "
  "1.1/1.2 discs that have Package files in strange places. It takes much "
  "longer to scan the CD but will pick them all up."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:143 apt-get.8.xml:395
- msgid "<option>--just-print</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:144 apt-get.8.xml:397
- msgid "<option>--recon</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-cdrom.8.xml:145 apt-get.8.xml:398
- msgid "<option>--no-act</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-cdrom.8.xml:146
+ #: apt-cdrom.8.xml:133
  msgid ""
  "No Changes; Do not change the &sources-list; file and do not write index "
  "files. Everything is still checked however.  Configuration Item: "
@@@ -1450,48 -1216,25 +1217,25 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:159
+ #: apt-cdrom.8.xml:146
  #, fuzzy
  msgid "&apt-conf;, &apt-get;, &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-cdrom.8.xml:164
+ #: apt-cdrom.8.xml:151
  msgid ""
  "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
  "on error."
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-config.8.xml:16 apt-extracttemplates.1.xml:16 apt-sortpkgs.1.xml:16
- #: sources.list.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
- "February 2004</date>"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-config.8.xml:25 apt-config.8.xml:32
- msgid "apt-config"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-config.8.xml:33
  msgid "APT Configuration Query program"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-config.8.xml:39
- msgid ""
- "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
- "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
- "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
- "<arg>shell</arg> <arg>dump</arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:51
+ #: apt-config.8.xml:39
  msgid ""
  "<command>apt-config</command> is an internal program used by various "
  "portions of the APT suite to provide consistent configurability. It accesses "
@@@ -1500,19 -1243,14 +1244,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+ #: apt-config.8.xml:44 apt-ftparchive.1.xml:54
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given "
  "one of the commands below must be present."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-config.8.xml:61
- msgid "shell"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:63
+ #: apt-config.8.xml:51
  msgid ""
  "shell is used to access the configuration information from a shell script. "
  "It is given pairs of arguments, the first being a shell variable and the "
@@@ -1522,7 -1260,7 +1261,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
- #: apt-config.8.xml:71
+ #: apt-config.8.xml:59
  #, no-wrap
  msgid ""
  "OPTS=\"-f\"\n"
@@@ -1531,14 -1269,14 +1270,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:76
+ #: apt-config.8.xml:64
  msgid ""
  "This will set the shell environment variable $OPTS to the value of MyApp::"
  "options with a default of <option>-f</option>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:80
+ #: apt-config.8.xml:68
  msgid ""
  "The configuration item may be postfixed with a /[fdbi]. f returns file "
  "names, d returns directories, b returns true or false and i returns an "
@@@ -1546,13 -1284,37 +1285,37 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-config.8.xml:89
+ #: apt-config.8.xml:77
  msgid "Just show the contents of the configuration space."
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:90
+ msgid ""
+ "Include options which have an empty value. This is the default, so use --no-"
+ "empty to remove them from the output."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+ #: apt-config.8.xml:95
+ msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-config.8.xml:96
+ msgid ""
+ "Defines the output of each config option. &percnt;t will be replaced with "
+ "the name of the option, &percnt;f with the complete optionname and &percnt;v "
+ "with the value of the option.  Use uppercase letters and special characters "
+ "in the value will be encoded to ensure that it can e.g. be savely used in a "
+ "quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
+ "by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
+ "&percnt;."
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
- #: apt-sortpkgs.1.xml:73
+ #: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
+ #: apt-sortpkgs.1.xml:64
  #, fuzzy
  msgid "&apt-conf;"
  msgstr ""
@@@ -1561,17 -1323,12 +1324,12 @@@
  " "
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-config.8.xml:112
+ #: apt-config.8.xml:115
  msgid ""
  "<command>apt-config</command> returns zero on normal operation, decimal 100 "
  "on error."
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-extracttemplates.1.xml:25 apt-extracttemplates.1.xml:32
- msgid "apt-extracttemplates"
- msgstr ""
- 
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
  msgid "1"
@@@ -1582,17 -1339,8 +1340,8 @@@ msgstr "
  msgid "Utility to extract DebConf config and templates from Debian packages"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-extracttemplates.1.xml:39
- msgid ""
- "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
- "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
- "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
- "arg>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:47
+ #: apt-extracttemplates.1.xml:39
  msgid ""
  "<command>apt-extracttemplates</command> will take one or more Debian package "
  "files as input and write out (to a temporary directory) all associated "
@@@ -1602,31 -1350,22 +1351,22 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:52
+ #: apt-extracttemplates.1.xml:44
  msgid "package version template-file config-script"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:53
+ #: apt-extracttemplates.1.xml:45
  msgid ""
  "template-file and config-script are written to the temporary directory "
- "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
- "literal>)  directory, with filenames of the form <filename>package.template."
- "XXXX</filename> and <filename>package.config.XXXX</filename>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
- msgid "<option>-t</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-extracttemplates.1.xml:63
- msgid "<option>--tempdir</option>"
+ "specified by the <option>-t</option> or <option>--tempdir</option> "
+ "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+ "filenames of the form <filename>package.template.XXXX</filename> and "
+ "<filename>package.config.XXXX</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-extracttemplates.1.xml:65
+ #: apt-extracttemplates.1.xml:58
  msgid ""
  "Temporary directory in which to write extracted debconf template files and "
  "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@@ -1634,55 -1373,19 +1374,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-extracttemplates.1.xml:82
+ #: apt-extracttemplates.1.xml:75
  msgid ""
  "<command>apt-extracttemplates</command> returns zero on normal operation, "
  "decimal 100 on error."
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-ftparchive.1.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
- "August 2009</date>"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-ftparchive.1.xml:25 apt-ftparchive.1.xml:32
- msgid "apt-ftparchive"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-ftparchive.1.xml:33
  msgid "Utility to generate index files"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-ftparchive.1.xml:39
- msgid ""
- "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
- "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
- "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
- "arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
- "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
- "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
- "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
- "replaceable></arg><arg><replaceable>override</"
- "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
- "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
- "arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
- "arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
- "replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
- "\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:60
+ #: apt-ftparchive.1.xml:39
  msgid ""
  "<command>apt-ftparchive</command> is the command line tool that generates "
  "the index files that APT uses to access a distribution source. The index "
@@@ -1691,7 -1394,7 +1395,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:64
+ #: apt-ftparchive.1.xml:43
  msgid ""
  "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
  "program, incorporating its entire functionality via the <literal>packages</"
@@@ -1701,7 -1404,7 +1405,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:70
+ #: apt-ftparchive.1.xml:49
  msgid ""
  "Internally <command>apt-ftparchive</command> can make use of binary "
  "databases to cache the contents of a .deb file and it does not rely on any "
@@@ -1710,13 -1413,8 +1414,8 @@@
  "output files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:79
- msgid "packages"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:81
+ #: apt-ftparchive.1.xml:60
  msgid ""
  "The packages command generates a package file from a directory tree. It "
  "takes the given directory and recursively searches it for .deb files, "
@@@ -1725,18 -1423,13 +1424,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+ #: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
  msgid ""
  "The option <option>--db</option> can be used to specify a binary caching DB."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:89
- msgid "sources"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:91
+ #: apt-ftparchive.1.xml:70
  msgid ""
  "The <literal>sources</literal> command generates a source index file from a "
  "directory tree.  It takes the given directory and recursively searches it "
@@@ -1745,20 -1438,15 +1439,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:96
+ #: apt-ftparchive.1.xml:75
  msgid ""
  "If an override file is specified then a source override file will be looked "
  "for with an extension of .src. The --source-override option can be used to "
  "change the source override file that will be used."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:101
- msgid "contents"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:103
+ #: apt-ftparchive.1.xml:82
  msgid ""
  "The <literal>contents</literal> command generates a contents file from a "
  "directory tree. It takes the given directory and recursively searches it "
@@@ -1768,13 -1456,8 +1457,8 @@@
  "package is separated by a comma in the output."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:113
- msgid "release"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:115
+ #: apt-ftparchive.1.xml:94
  msgid ""
  "The <literal>release</literal> command generates a Release file from a "
  "directory tree. It recursively searches the given directory for uncompressed "
@@@ -1789,7 -1472,7 +1473,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:125
+ #: apt-ftparchive.1.xml:104
  msgid ""
  "Values for the additional metadata fields in the Release file are taken from "
  "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@@ -1801,13 -1484,8 +1485,8 @@@
  "<literal>Description</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:136
- msgid "generate"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:138
+ #: apt-ftparchive.1.xml:117
  msgid ""
  "The <literal>generate</literal> command is designed to be runnable from a "
  "cron script and builds indexes according to the given config file. The "
@@@ -1816,25 -1494,20 +1495,20 @@@
  "maintaining the required settings."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:145 apt-get.8.xml:287
- msgid "clean"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:147
+ #: apt-ftparchive.1.xml:126
  msgid ""
  "The <literal>clean</literal> command tidies the databases used by the given "
  "configuration file by removing any records that are no longer necessary."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:153
+ #: apt-ftparchive.1.xml:132
  msgid "The Generate Configuration"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:155
+ #: apt-ftparchive.1.xml:134
  msgid ""
  "The <literal>generate</literal> command uses a configuration file to "
  "describe the archives that are going to be generated. It follows the typical "
@@@ -1845,19 -1518,19 +1519,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:163
+ #: apt-ftparchive.1.xml:142
  msgid ""
  "The generate configuration has 4 separate sections, each described below."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:165
+ #: apt-ftparchive.1.xml:144
  #, fuzzy
  msgid "Dir Section"
  msgstr "Descrição"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:167
+ #: apt-ftparchive.1.xml:146
  msgid ""
  "The <literal>Dir</literal> section defines the standard directories needed "
  "to locate the files required during the generation process. These "
@@@ -1865,71 -1538,46 +1539,46 @@@
  "to produce a complete an absolute path."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:172
- msgid "ArchiveDir"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:174
+ #: apt-ftparchive.1.xml:153
  msgid ""
  "Specifies the root of the FTP archive, in a standard Debian configuration "
  "this is the directory that contains the <filename>ls-LR</filename> and dist "
  "nodes."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:179
- msgid "OverrideDir"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:181
+ #: apt-ftparchive.1.xml:160
  msgid "Specifies the location of the override files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:184
- msgid "CacheDir"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:186
+ #: apt-ftparchive.1.xml:165
  msgid "Specifies the location of the cache files"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:189
- msgid "FileListDir"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:191
+ #: apt-ftparchive.1.xml:170
  msgid ""
  "Specifies the location of the file list files, if the <literal>FileList</"
  "literal> setting is used below."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:197
+ #: apt-ftparchive.1.xml:176
  msgid "Default Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:199
+ #: apt-ftparchive.1.xml:178
  msgid ""
  "The <literal>Default</literal> section specifies default values, and "
  "settings that control the operation of the generator. Other sections may "
  "override these defaults with a per-section setting."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:203
- msgid "Packages::Compress"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:205
+ #: apt-ftparchive.1.xml:184
  msgid ""
  "Sets the default compression schemes to use for the Package index files. It "
  "is a string that contains a space separated list of at least one of: '.' (no "
@@@ -1937,137 -1585,86 +1586,86 @@@
  "'. gzip'."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:211
- msgid "Packages::Extensions"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:213
+ #: apt-ftparchive.1.xml:192
  msgid ""
  "Sets the default list of file extensions that are package files.  This "
  "defaults to '.deb'."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:217
- msgid "Sources::Compress"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:219
+ #: apt-ftparchive.1.xml:198
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Sources files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:223
- msgid "Sources::Extensions"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:225
+ #: apt-ftparchive.1.xml:204
  msgid ""
  "Sets the default list of file extensions that are source files.  This "
  "defaults to '.dsc'."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:229
- msgid "Contents::Compress"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:231
+ #: apt-ftparchive.1.xml:210
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Contents files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:235
- msgid "Translation::Compress"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:237
+ #: apt-ftparchive.1.xml:216
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Translation-en master file."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:241
- msgid "DeLinkLimit"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:243
+ #: apt-ftparchive.1.xml:222
  msgid ""
  "Specifies the number of kilobytes to delink (and replace with hard links) "
  "per run. This is used in conjunction with the per-section <literal>External-"
  "Links</literal> setting."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:248
- msgid "FileMode"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:250
+ #: apt-ftparchive.1.xml:229
  msgid ""
  "Specifies the mode of all created index files. It defaults to 0644. All "
  "index files are set to this mode with no regard to the umask."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
- #, fuzzy
- msgid "LongDescription"
- msgstr "Descrição"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+ #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
  msgid ""
  "Sets if long descriptions should be included in the Packages file or split "
  "out into a master Translation-en file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:263
+ #: apt-ftparchive.1.xml:242
  msgid "TreeDefault Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:265
+ #: apt-ftparchive.1.xml:244
  msgid ""
  "Sets defaults specific to <literal>Tree</literal> sections. All of these "
  "variables are substitution variables and have the strings $(DIST), "
  "$(SECTION) and $(ARCH) replaced with their respective values."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:270
- msgid "MaxContentsChange"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:272
+ #: apt-ftparchive.1.xml:251
  msgid ""
  "Sets the number of kilobytes of contents files that are generated each day. "
  "The contents files are round-robined so that over several days they will all "
  "be rebuilt."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:277
- msgid "ContentsAge"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:279
+ #: apt-ftparchive.1.xml:258
  msgid ""
  "Controls the number of days a contents file is allowed to be checked without "
  "changing. If this limit is passed the mtime of the contents file is updated. "
@@@ -2077,88 -1674,52 +1675,52 @@@
  "anyhow. The default is 10, the units are in days."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:288
- msgid "Directory"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:290
+ #: apt-ftparchive.1.xml:269
  msgid ""
  "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
  "$(SECTION)/binary-$(ARCH)/</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:294
- msgid "SrcDirectory"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:296
+ #: apt-ftparchive.1.xml:275
  msgid ""
  "Sets the top of the source package directory tree. Defaults to <filename>"
  "$(DIST)/$(SECTION)/source/</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
- msgid "Packages"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:302
+ #: apt-ftparchive.1.xml:281
  msgid ""
  "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "binary-$(ARCH)/Packages</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
- msgid "Sources"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:308
+ #: apt-ftparchive.1.xml:287
  msgid ""
  "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "source/Sources</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:312
- #, fuzzy
- msgid "Translation"
- msgstr "Descrição"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:314
+ #: apt-ftparchive.1.xml:293
  msgid ""
  "Set the output Translation-en master file with the long descriptions if they "
  "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
  "$(SECTION)/i18n/Translation-en</filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:319
- msgid "InternalPrefix"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:321
+ #: apt-ftparchive.1.xml:300
  msgid ""
  "Sets the path prefix that causes a symlink to be considered an internal link "
  "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
  "filename>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
- msgid "Contents"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:328
+ #: apt-ftparchive.1.xml:307
  msgid ""
  "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
  "</filename>. If this setting causes multiple Packages files to map onto a "
@@@ -2166,48 -1727,28 +1728,28 @@@
  "command> will integrate those package files together automatically."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:335
- msgid "Contents::Header"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:337
+ #: apt-ftparchive.1.xml:316
  msgid "Sets header file to prepend to the contents output."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
- msgid "BinCacheDB"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:342
+ #: apt-ftparchive.1.xml:321
  msgid ""
  "Sets the binary cache database to use for this section. Multiple sections "
  "can share the same database."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:346
- msgid "FileList"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:348
+ #: apt-ftparchive.1.xml:327
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
  "Relative files names are prefixed with the archive directory."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:353
- msgid "SourceFileList"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:355
+ #: apt-ftparchive.1.xml:334
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
@@@ -2216,12 -1757,12 +1758,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:363
+ #: apt-ftparchive.1.xml:342
  msgid "Tree Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:365
+ #: apt-ftparchive.1.xml:344
  msgid ""
  "The <literal>Tree</literal> section defines a standard Debian file tree "
  "which consists of a base directory, then multiple sections in that base "
@@@ -2231,7 -1772,7 +1773,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:370
+ #: apt-ftparchive.1.xml:349
  msgid ""
  "The <literal>Tree</literal> section takes a scope tag which sets the "
  "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@@ -2240,7 -1781,7 +1782,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:375
+ #: apt-ftparchive.1.xml:354
  msgid ""
  "All of the settings defined in the <literal>TreeDefault</literal> section "
  "can be use in a <literal>Tree</literal> section as well as three new "
@@@ -2248,7 -1789,7 +1790,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt-ftparchive.1.xml:381
+ #: apt-ftparchive.1.xml:360
  #, no-wrap
  msgid ""
  "for i in Sections do \n"
@@@ -2258,91 -1799,60 +1800,60 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:378
+ #: apt-ftparchive.1.xml:357
  msgid ""
  "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
  "command> performs an operation similar to: <placeholder type=\"programlisting"
  "\" id=\"0\"/>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:387
- #, fuzzy
- msgid "Sections"
- msgstr "Descrição"
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:389
+ #: apt-ftparchive.1.xml:368
  msgid ""
  "This is a space separated list of sections which appear under the "
  "distribution, typically this is something like <literal>main contrib non-"
  "free</literal>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:394
- msgid "Architectures"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:396
+ #: apt-ftparchive.1.xml:375
  msgid ""
  "This is a space separated list of all the architectures that appear under "
  "search section. The special architecture 'source' is used to indicate that "
  "this tree has a source archive."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
- msgid "BinOverride"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:409
+ #: apt-ftparchive.1.xml:388
  msgid ""
  "Sets the binary override file. The override file contains section, priority "
  "and maintainer address information."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
- msgid "SrcOverride"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:415
+ #: apt-ftparchive.1.xml:394
  msgid ""
  "Sets the source override file. The override file contains section "
  "information."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
- msgid "ExtraOverride"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+ #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
  msgid "Sets the binary extra override file."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
- msgid "SrcExtraOverride"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+ #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
  msgid "Sets the source extra override file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt-ftparchive.1.xml:431
+ #: apt-ftparchive.1.xml:410
  msgid "BinDirectory Section"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt-ftparchive.1.xml:433
+ #: apt-ftparchive.1.xml:412
  msgid ""
  "The <literal>bindirectory</literal> section defines a binary directory tree "
  "with no special structure. The scope tag specifies the location of the "
@@@ -2352,64 -1862,54 +1863,54 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:441
+ #: apt-ftparchive.1.xml:420
  msgid "Sets the Packages file output."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:446
+ #: apt-ftparchive.1.xml:425
  msgid ""
  "Sets the Sources file output. At least one of <literal>Packages</literal> or "
  "<literal>Sources</literal> is required."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:452
+ #: apt-ftparchive.1.xml:431
  msgid "Sets the Contents file output. (optional)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:457
+ #: apt-ftparchive.1.xml:436
  msgid "Sets the binary override file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:462
+ #: apt-ftparchive.1.xml:441
  msgid "Sets the source override file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:477
+ #: apt-ftparchive.1.xml:456
  msgid "Sets the cache DB."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:480
- msgid "PathPrefix"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:482
+ #: apt-ftparchive.1.xml:461
  msgid "Appends a path to all the output paths."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:485
- msgid "FileList, SourceFileList"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:487
+ #: apt-ftparchive.1.xml:466
  msgid "Specifies the file list file."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:494
+ #: apt-ftparchive.1.xml:473
  msgid "The Binary Override File"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:495
+ #: apt-ftparchive.1.xml:474
  msgid ""
  "The binary override file is fully compatible with &dpkg-scanpackages;. It "
  "contains 4 fields separated by spaces. The first field is the package name, "
@@@ -2419,19 -1919,19 +1920,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:501
+ #: apt-ftparchive.1.xml:480
  #, no-wrap
  msgid "old [// oldn]* => new"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: apt-ftparchive.1.xml:503
+ #: apt-ftparchive.1.xml:482
  #, no-wrap
  msgid "new"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:500
+ #: apt-ftparchive.1.xml:479
  msgid ""
  "The general form of the maintainer field is: <placeholder type="
  "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@@ -2442,12 -1942,12 +1943,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:511
+ #: apt-ftparchive.1.xml:490
  msgid "The Source Override File"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:513
+ #: apt-ftparchive.1.xml:492
  msgid ""
  "The source override file is fully compatible with &dpkg-scansources;. It "
  "contains 2 fields separated by spaces. The first fields is the source "
@@@ -2455,52 -1955,41 +1956,41 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:518
+ #: apt-ftparchive.1.xml:497
  msgid "The Extra Override File"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:520
+ #: apt-ftparchive.1.xml:499
  msgid ""
  "The extra override file allows any arbitrary tag to be added or replaced in "
  "the output. It has 3 columns, the first is the package, the second is the "
  "tag and the remainder of the line is the new value."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:529
- msgid ""
- "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:531
+ #: apt-ftparchive.1.xml:510
  msgid ""
  "Generate the given checksum. These options default to on, when turned off "
  "the generated index files will not have the checksum fields where possible.  "
  "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:539
- msgid "<option>--db</option>"
+ "<literal><replaceable>Index</replaceable></literal> can be "
+ "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+ "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+ "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:541
+ #: apt-ftparchive.1.xml:521
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
  "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:547
+ #: apt-ftparchive.1.xml:527
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -2508,13 -1997,8 +1998,8 @@@
  "file.  Configuration Item: <literal>quiet</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:553
- msgid "<option>--delink</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:555
+ #: apt-ftparchive.1.xml:535
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
  "then this option actually enables delinking of the files. It defaults to on "
@@@ -2522,13 -2006,8 +2007,8 @@@
  "Item: <literal>APT::FTPArchive::DeLinkAct</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:561
- msgid "<option>--contents</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:563
+ #: apt-ftparchive.1.xml:543
  msgid ""
  "Perform contents generation. When this option is set and package indexes are "
  "being generated with a cache DB then the file listing will also be extracted "
@@@ -2537,38 -2016,23 +2017,23 @@@
  "Configuration Item: <literal>APT::FTPArchive::Contents</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:571
- msgid "<option>--source-override</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:573
+ #: apt-ftparchive.1.xml:553
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
  "literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:577
- msgid "<option>--readonly</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:579
+ #: apt-ftparchive.1.xml:559
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-ftparchive.1.xml:583
- msgid "<option>--arch</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-ftparchive.1.xml:584
+ #: apt-ftparchive.1.xml:564
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
  "commands only package files matching <literal>*_arch.deb</literal> or "
@@@ -2576,13 -2040,8 +2041,8 @@@
  "path.  Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:592
+ #: apt-ftparchive.1.xml:572
  msgid ""
  "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
  "packages are recompiled and/or republished with the same version again, this "
@@@ -2595,13 -2054,8 +2055,8 @@@
  "are useless."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: 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:604
+ #: apt-ftparchive.1.xml:584
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
  "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@@ -2611,83 -2065,39 +2066,39 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
- #: sources.list.5.xml:198
+ #: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
+ #: sources.list.5.xml:214
  #, fuzzy
  msgid "Examples"
  msgstr "Exemplos"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
- #: apt-ftparchive.1.xml:622
+ #: apt-ftparchive.1.xml:602
  #, no-wrap
  msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:618
+ #: apt-ftparchive.1.xml:598
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-ftparchive.1.xml:632
+ #: apt-ftparchive.1.xml:612
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-get.8.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
- "November 2008</date>"
- msgstr ""
- 
- #. type: <heading></heading>
- #: apt-get.8.xml:25 apt-get.8.xml:32 guide.sgml:96
- msgid "apt-get"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-get.8.xml:33
  msgid "APT package handling utility -- command-line interface"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-get.8.xml:39
- msgid ""
- "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
- "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
- "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
- "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
- "replaceable> </arg> </arg> <group choice=\"req\"> <arg "
- "choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
- "choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
- "<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
- "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
- "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
- "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
- "arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
- "\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
- "replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
- "rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
- "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
- "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
- "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
- "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
- "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
- "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
- "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
- "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
- "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
- "</group> </arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:115
+ #: apt-get.8.xml:39
  msgid ""
  "<command>apt-get</command> is the command-line tool for handling packages, "
  "and may be considered the user's \"back-end\" to other tools using the APT "
@@@ -2695,13 -2105,8 +2106,8 @@@
  "&aptitude;, &synaptic; and &wajig;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:124 apt-key.8.xml:127
- msgid "update"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:125
+ #: apt-get.8.xml:49
  msgid ""
  "<literal>update</literal> is used to resynchronize the package index files "
  "from their sources. The indexes of available packages are fetched from the "
@@@ -2714,13 -2119,8 +2120,8 @@@
  "as the size of the package files cannot be known in advance."
  msgstr ""
  
- #. type: <tag></tag>
- #: apt-get.8.xml:136 guide.sgml:121
- msgid "upgrade"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:137
+ #: apt-get.8.xml:61
  msgid ""
  "<literal>upgrade</literal> is used to install the newest versions of all "
  "packages currently installed on the system from the sources enumerated in "
@@@ -2734,13 -2134,8 +2135,8 @@@
  "command> knows that new versions of packages are available."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:149
- msgid "dselect-upgrade"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:150
+ #: apt-get.8.xml:74
  msgid ""
  "<literal>dselect-upgrade</literal> is used in conjunction with the "
  "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@@ -2750,13 -2145,8 +2146,8 @@@
  "new packages)."
  msgstr ""
  
- #. type: <tag></tag>
- #: apt-get.8.xml:159 guide.sgml:140
- msgid "dist-upgrade"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:160
+ #: apt-get.8.xml:84
  msgid ""
  "<literal>dist-upgrade</literal> in addition to performing the function of "
  "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@@ -2769,13 -2159,8 +2160,8 @@@
  "for a mechanism for overriding the general settings for individual packages."
  msgstr ""
  
- #. type: <tag></tag>
- #: apt-get.8.xml:172 guide.sgml:131
- msgid "install"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:174
+ #: apt-get.8.xml:98
  msgid ""
  "<literal>install</literal> is followed by one or more packages desired for "
  "installation or upgrading.  Each package is a package name, not a fully "
@@@ -2791,7 -2176,7 +2177,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:192
+ #: apt-get.8.xml:116
  msgid ""
  "A specific version of a package can be selected for installation by "
  "following the package name with an equals and the version of the package to "
@@@ -2802,14 -2187,14 +2188,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:199
+ #: apt-get.8.xml:123
  msgid ""
  "Both of the version selection mechanisms can downgrade packages and must be "
  "used with care."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:202
+ #: apt-get.8.xml:126
  msgid ""
  "This is also the target to use if you want to upgrade one or more already-"
  "installed packages without upgrading every package you have on your system. "
@@@ -2821,14 -2206,14 +2207,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:213
+ #: apt-get.8.xml:137
  msgid ""
  "Finally, the &apt-preferences; mechanism allows you to create an alternative "
  "installation policy for individual packages."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:217
+ #: apt-get.8.xml:141
  msgid ""
  "If no package matches the given expression and the expression contains one "
  "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@@ -2839,13 -2224,8 +2225,8 @@@
  "expression."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:226
- msgid "remove"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:227
+ #: apt-get.8.xml:151
  msgid ""
  "<literal>remove</literal> is identical to <literal>install</literal> except "
  "that packages are removed instead of installed. Note the removing a package "
@@@ -2854,38 -2234,28 +2235,28 @@@
  "installed instead of removed."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:234
- msgid "purge"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:235
+ #: apt-get.8.xml:159
  msgid ""
  "<literal>purge</literal> is identical to <literal>remove</literal> except "
  "that packages are removed and purged (any configuration files are deleted "
  "too)."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:239
- msgid "source"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:240
+ #: apt-get.8.xml:164
  msgid ""
  "<literal>source</literal> causes <command>apt-get</command> to fetch source "
  "packages. APT will examine the available packages to decide which source "
  "package to fetch. It will then find and download into the current directory "
- "the newest available version of that source package while respect the "
+ "the newest available version of that source package while respecting the "
  "default release, set with the option <literal>APT::Default-Release</"
  "literal>, the <option>-t</option> option or per package with the "
  "<literal>pkg/release</literal> syntax, if possible."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:248
+ #: apt-get.8.xml:172
  msgid ""
  "Source packages are tracked separately from binary packages via <literal>deb-"
  "src</literal> type lines in the &sources-list; file. This means that you "
@@@ -2895,16 -2265,17 +2266,17 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:255
+ #: apt-get.8.xml:179
  msgid ""
  "If the <option>--compile</option> option is specified then the package will "
- "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
- "<option>--download-only</option> is specified then the source package will "
- "not be unpacked."
+ "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+ "the architecture as defined by the <command>--host-architecture</command> "
+ "option.  If <option>--download-only</option> is specified then the source "
+ "package will not be unpacked."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:260
+ #: apt-get.8.xml:186
  msgid ""
  "A specific source version can be retrieved by postfixing the source name "
  "with an equals and then the version to fetch, similar to the mechanism used "
@@@ -2914,51 -2285,39 +2286,39 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:266
+ #: apt-get.8.xml:192
  msgid ""
  "Note that source packages are not tracked like binary packages, they exist "
  "only in the current directory and are similar to downloading source tar "
  "balls."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:271
- msgid "build-dep"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:272
+ #: apt-get.8.xml:198
  msgid ""
  "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
- "attempt to satisfy the build dependencies for a source package."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:276
- msgid "check"
+ "attempt to satisfy the build dependencies for a source package. By default "
+ "the dependencies are satisfied to build the package natively. If desired a "
+ "host-architecture can be specified with the <option>--host-architecture</"
+ "option> option instead."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:277
+ #: apt-get.8.xml:205
  msgid ""
  "<literal>check</literal> is a diagnostic tool; it updates the package cache "
  "and checks for broken dependencies."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:281
- msgid "download"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:282
+ #: apt-get.8.xml:210
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
- "current directoy."
+ "current directory."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:288
+ #: apt-get.8.xml:216
  msgid ""
  "<literal>clean</literal> clears out the local repository of retrieved "
  "package files. It removes everything but the lock file from "
@@@ -2969,13 -2328,8 +2329,8 @@@
  "disk space."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:297
- msgid "autoclean"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:298
+ #: apt-get.8.xml:226
  msgid ""
  "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
  "local repository of retrieved package files. The difference is that it only "
@@@ -2986,80 -2340,51 +2341,51 @@@
  "is set to off."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:307
- msgid "autoremove"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:308
+ #: apt-get.8.xml:236
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
- "automatically installed to satisfy dependencies for some package and that "
- "are no more needed."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:312
- msgid "changelog"
+ "automatically installed to satisfy dependencies for other packages and are "
+ "now no longer needed."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:313
+ #: apt-get.8.xml:241
  msgid ""
  "<literal>changelog</literal> downloads a package changelog and displays it "
  "through <command>sensible-pager</command>. The server name and base "
  "directory is defined in the <literal>APT::Changelogs::Server</literal> "
- "variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
- "Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
- "Ubuntu).  By default it displays the changelog for the version that is "
+ "variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+ "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+ "changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+ "for Ubuntu).  By default it displays the changelog for the version that is "
  "installed.  However, you can specify the same options as for the "
  "<option>install</option> command."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:335
- msgid "<option>--no-install-recommends</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:336
+ #: apt-get.8.xml:264
  msgid ""
  "Do not consider recommended packages as a dependency for installing.  "
  "Configuration Item: <literal>APT::Install-Recommends</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:340
- msgid "<option>--install-suggests</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:341
+ #: apt-get.8.xml:269
  msgid ""
  "Consider suggested packages as a dependency for installing.  Configuration "
  "Item: <literal>APT::Install-Suggests</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:345
- msgid "<option>--download-only</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:346
+ #: apt-get.8.xml:274
  msgid ""
  "Download only; package files are only retrieved, not unpacked or installed.  "
  "Configuration Item: <literal>APT::Get::Download-Only</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:350
- msgid "<option>--fix-broken</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:351
+ #: apt-get.8.xml:279
  msgid ""
  "Fix; attempt to correct a system with broken dependencies in place. This "
  "option, when used with install/remove, can omit any packages to permit APT "
@@@ -3074,18 -2399,8 +2400,8 @@@
  "<literal>APT::Get::Fix-Broken</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:364
- msgid "<option>--ignore-missing</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:365
- msgid "<option>--fix-missing</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:366
+ #: apt-get.8.xml:294
  msgid ""
  "Ignore missing packages; If packages cannot be retrieved or fail the "
  "integrity check after retrieval (corrupted package files), hold back those "
@@@ -3096,13 -2411,8 +2412,8 @@@
  "Configuration Item: <literal>APT::Get::Fix-Missing</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:376
- msgid "<option>--no-download</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:377
+ #: apt-get.8.xml:305
  msgid ""
  "Disables downloading of packages. This is best used with <option>--ignore-"
  "missing</option> to force APT to use only the .debs it has already "
@@@ -3110,7 -2420,7 +2421,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:384
+ #: apt-get.8.xml:312
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -3121,18 -2431,8 +2432,8 @@@
  "<literal>quiet</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:394
- msgid "<option>--simulate</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:396
- msgid "<option>--dry-run</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:399
+ #: apt-get.8.xml:327
  msgid ""
  "No action; perform a simulation of events that would occur but do not "
  "actually change the system.  Configuration Item: <literal>APT::Get::"
@@@ -3140,7 -2440,7 +2441,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:403
+ #: apt-get.8.xml:331
  msgid ""
  "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
  "literal>)  automatic. Also a notice will be displayed indicating that this "
@@@ -3151,7 -2451,7 +2452,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:409
+ #: apt-get.8.xml:337
  msgid ""
  "Simulate prints out a series of lines each one representing a dpkg "
  "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@@ -3159,23 -2459,8 +2460,8 @@@
  "that are of no consequence (rare)."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>-y</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:416
- msgid "<option>--yes</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:417
- msgid "<option>--assume-yes</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:418
+ #: apt-get.8.xml:346
  msgid ""
  "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
  "non-interactively. If an undesirable situation, such as changing a held "
@@@ -3184,69 -2469,47 +2470,47 @@@
  "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>-u</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:425
- msgid "<option>--show-upgraded</option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:354
+ msgid ""
+ "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+ "Assume-No</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:426
+ #: apt-get.8.xml:359
  msgid ""
  "Show upgraded packages; Print out a list of all packages that are to be "
  "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>-V</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:431
- msgid "<option>--verbose-versions</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:432
+ #: apt-get.8.xml:365
  msgid ""
  "Show full versions for upgraded and installed packages.  Configuration Item: "
  "<literal>APT::Get::Show-Versions</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>-b</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:436
- msgid "<option>--compile</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:437
- msgid "<option>--build</option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+ #: apt-get.8.xml:371
+ msgid ""
+ "This option controls the architecture packages are built for by <command>apt-"
+ "get source --compile</command> and how cross-builddependencies are "
+ "satisfied. By default is it not set which means that the host architecture "
+ "is the same as the build architecture (which is defined by <literal>APT::"
+ "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
+ "Architecture</literal>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:438
+ #: apt-get.8.xml:381
  msgid ""
  "Compile source packages after downloading them.  Configuration Item: "
  "<literal>APT::Get::Compile</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:442
- msgid "<option>--ignore-hold</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:443
+ #: apt-get.8.xml:386
  msgid ""
  "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
  "hold placed on a package. This may be useful in conjunction with "
@@@ -3254,13 -2517,8 +2518,8 @@@
  "holds.  Configuration Item: <literal>APT::Ignore-Hold</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:449
- msgid "<option>--no-upgrade</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:450
+ #: apt-get.8.xml:393
  msgid ""
  "Do not upgrade packages; When used in conjunction with <literal>install</"
  "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@@ -3268,27 -2526,17 +2527,17 @@@
  "<literal>APT::Get::Upgrade</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:456
- msgid "<option>--only-upgrade</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:457
+ #: apt-get.8.xml:400
  msgid ""
  "Do not install new packages; When used in conjunction with <literal>install</"
- "literal>, <literal>only-upgrade</literal> will prevent packages on the "
- "command line from being upgraded if they are not already installed.  "
+ "literal>, <literal>only-upgrade</literal> will install upgrades for already "
+ "installed packages only and ignore requests to install new packages.  "
  "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:463
- msgid "<option>--force-yes</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:464
+ #: apt-get.8.xml:408
  msgid ""
  "Force yes; This is a dangerous option that will cause apt to continue "
  "without prompting if it is doing something potentially harmful. It should "
@@@ -3297,13 -2545,8 +2546,8 @@@
  "<literal>APT::Get::force-yes</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:471
- msgid "<option>--print-uris</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:472
+ #: apt-get.8.xml:416
  msgid ""
  "Instead of fetching the files to install their URIs are printed. Each URI "
  "will have the path, the destination file name, the size and the expected md5 "
@@@ -3315,13 -2558,8 +2559,8 @@@
  "Print-URIs</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:482
- msgid "<option>--purge</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:483
+ #: apt-get.8.xml:427
  msgid ""
  "Use purge instead of remove for anything that would be removed.  An asterisk "
  "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@@ -3329,25 -2567,15 +2568,15 @@@
  "command.  Configuration Item: <literal>APT::Get::Purge</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:490
- msgid "<option>--reinstall</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:491
+ #: apt-get.8.xml:435
  msgid ""
  "Re-Install packages that are already installed and at the newest version.  "
  "Configuration Item: <literal>APT::Get::ReInstall</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:495
- msgid "<option>--list-cleanup</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:496
+ #: apt-get.8.xml:440
  msgid ""
  "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
  "it off. When on <command>apt-get</command> will automatically manage the "
@@@ -3357,18 -2585,8 +2586,8 @@@
  "Cleanup</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:505
- msgid "<option>--target-release</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:506
- msgid "<option>--default-release</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:507
+ #: apt-get.8.xml:451
  msgid ""
  "This option controls the default input to the policy engine, it creates a "
  "default pin at priority 990 using the specified release string.  This "
@@@ -3381,13 -2599,8 +2600,8 @@@
  "also the &apt-preferences; manual page."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:520
- msgid "<option>--trivial-only</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:522
+ #: apt-get.8.xml:466
  msgid ""
  "Only perform operations that are 'trivial'. Logically this can be considered "
  "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@@ -3395,25 -2608,15 +2609,15 @@@
  "answer no.  Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:528
- msgid "<option>--no-remove</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:529
+ #: apt-get.8.xml:473
  msgid ""
  "If any packages are to be removed apt-get immediately aborts without "
  "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:534
- msgid "<option>--auto-remove</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:535
+ #: apt-get.8.xml:479
  msgid ""
  "If the command is either <literal>install</literal> or <literal>remove</"
  "literal>, then this option acts like running <literal>autoremove</literal> "
@@@ -3421,13 -2624,8 +2625,8 @@@
  "<literal>APT::Get::AutomaticRemove</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:541
- msgid "<option>--only-source</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:542
+ #: apt-get.8.xml:486
  msgid ""
  "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
  "literal> commands.  Indicates that the given source names are not to be "
@@@ -3438,48 -2636,23 +2637,23 @@@
  "Source</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--diff-only</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--dsc-only</option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:552
- msgid "<option>--tar-only</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:553
+ #: apt-get.8.xml:497
  msgid ""
  "Download only the diff, dsc, or tar file of a source archive.  Configuration "
  "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
  "literal>, and <literal>APT::Get::Tar-Only</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:558
- msgid "<option>--arch-only</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:559
+ #: apt-get.8.xml:503
  msgid ""
  "Only process architecture-dependent build-dependencies.  Configuration Item: "
  "<literal>APT::Get::Arch-Only</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:563
- msgid "<option>--allow-unauthenticated</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-get.8.xml:564
+ #: apt-get.8.xml:508
  msgid ""
  "Ignore if packages can't be authenticated and don't prompt about it.  This "
  "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@@ -3487,68 -2660,34 +2661,34 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-get.8.xml:577
+ #: apt-get.8.xml:521
  msgid ""
  "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
  "&file-statelists;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:586
- msgid ""
- "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
- "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
- "preferences;, the APT Howto."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:592
- msgid ""
- "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
- "error."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:595
- msgid "ORIGINAL AUTHORS"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:596
- msgid "&apt-author.jgunthorpe;"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><title>
- #: apt-get.8.xml:599
- msgid "CURRENT AUTHORS"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><para>
- #: apt-get.8.xml:601
- msgid "&apt-author.team;"
+ #: apt-get.8.xml:530
+ msgid ""
+ "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
+ "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
+ "preferences;, the APT Howto."
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-key.8.xml:17 apt-key.8.xml:24
- msgid "apt-key"
+ #. type: Content of: <refentry><refsect1><para>
+ #: apt-get.8.xml:536
+ msgid ""
+ "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
+ "error."
  msgstr ""
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-key.8.xml:25
+ #: apt-key.8.xml:32
  msgid "APT key management utility"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-key.8.xml:31
- msgid ""
- "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
- "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
- "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
- "arg>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:40
+ #: apt-key.8.xml:39
  msgid ""
  "<command>apt-key</command> is used to manage the list of keys used by apt to "
  "authenticate packages.  Packages which have been authenticated using these "
@@@ -3556,214 -2695,146 +2696,146 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-key.8.xml:46
+ #: apt-key.8.xml:45
  msgid "Commands"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:48
- msgid "add <replaceable>filename</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:52
+ #: apt-key.8.xml:50
  msgid ""
- "Add a new key to the list of trusted keys.  The key is read from "
- "<replaceable>filename</replaceable>, or standard input if "
- "<replaceable>filename</replaceable> is <literal>-</literal>."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:60
- msgid "del <replaceable>keyid</replaceable>"
+ "Add a new key to the list of trusted keys.  The key is read from the "
+ "filename given with the parameter &synopsis-param-filename; or if the "
+ "filename is <literal>-</literal> from standard input."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:64
+ #: apt-key.8.xml:63
  msgid "Remove a key from the list of trusted keys."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:71
- msgid "export <replaceable>keyid</replaceable>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:75
- msgid "Output the key <replaceable>keyid</replaceable> to standard output."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:82
- msgid "exportall"
+ #: apt-key.8.xml:74
+ msgid "Output the key &synopsis-param-keyid; to standard output."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:86
+ #: apt-key.8.xml:85
  msgid "Output all trusted keys to standard output."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:93
- msgid "list"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:97
+ #: apt-key.8.xml:96
  msgid "List trusted keys."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:104
- msgid "finger"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:108
+ #: apt-key.8.xml:107
  msgid "List fingerprints of trusted keys."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:115
- msgid "adv"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:119
+ #: apt-key.8.xml:118
  msgid ""
  "Pass advanced options to gpg. With adv --recv-key you can download the "
  "public key."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:131
+ #: apt-key.8.xml:130
  msgid ""
- "Update the local keyring with the keyring of Debian archive keys and removes "
- "from the keyring the archive keys which are no longer valid."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:140
- msgid "net-update"
+ "Update the local keyring with the archive keyring and remove from the local "
+ "keyring the archive keys which are no longer valid.  The archive keyring is "
+ "shipped in the <literal>archive-keyring</literal> package of your "
 -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
 -"Debian."
++"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
++"Ubuntu."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:144
  msgid ""
- "Update the local keyring with the keys of a key server and removes from the "
- "keyring the archive keys which are no longer valid. This requires an "
- "installed wget and an APT build configured to have a server to fetch from. "
- "APT in Debian does not support this command, but Ubuntu's APT does."
+ "Work similar to the <command>update</command> command above, but get the "
+ "archive keyring from an URI instead and validate it against a master key.  "
+ "This requires an installed &wget; and an APT build configured to have a "
+ "server to fetch from and a master keyring to validate.  APT in Debian does "
+ "not support this command and relies on <command>update</command> instead, "
+ "but Ubuntu's APT does."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:159
+ #: apt-key.8.xml:161
  msgid ""
  "Note that options need to be defined before the commands described in the "
  "previous section."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:161
- #, fuzzy
- msgid "--keyring <replaceable>filename</replaceable>"
- msgstr ""
- "<programlisting>\n"
- "apt-get install <replaceable>pacote</replaceable>/testing\n"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:162
+ #: apt-key.8.xml:164
  msgid ""
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
  "<filename>trusted.gpg</filename> file as well as on all parts in the "
- "<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+ "<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</"
  "filename> is the primary keyring which means that e.g. new keys are added to "
  "this one."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-key.8.xml:175
+ #: apt-key.8.xml:177
  msgid "&file-trustedgpg;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:177
+ #: apt-key.8.xml:179
  #, fuzzy
  msgid "<filename>/etc/apt/trustdb.gpg</filename>"
  msgstr "<filename>/etc/apt.conf</>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:178
+ #: apt-key.8.xml:180
  msgid "Local trust database of archive keys."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:181
- msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+ #: apt-key.8.xml:183
 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
++msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:182
- msgid "Keyring of Debian archive trusted keys."
+ #: apt-key.8.xml:184
 -msgid "Keyring of Debian archive trusted keys."
++msgid "Keyring of Ubuntu archive trusted keys."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-key.8.xml:185
+ #: apt-key.8.xml:187
  msgid ""
--"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
++"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-key.8.xml:186
- msgid "Keyring of Debian archive removed trusted keys."
+ #: apt-key.8.xml:188
 -msgid "Keyring of Debian archive removed trusted keys."
++msgid "Keyring of Ubuntu archive removed trusted keys."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-key.8.xml:195
+ #: apt-key.8.xml:197
  #, fuzzy
  msgid "&apt-get;, &apt-secure;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt-mark.8.xml:16
- msgid ""
- "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
- "April 2011</date>"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-mark.8.xml:25 apt-mark.8.xml:32
- msgid "apt-mark"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-mark.8.xml:33
  msgid "mark/unmark a package as being automatically-installed"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-mark.8.xml:39
- msgid ""
- "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
- "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
- "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
- "\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
- "\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
- "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
- "arg> </group>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:57
+ #: apt-mark.8.xml:39
  msgid ""
  "<command>apt-mark</command> will change whether a package has been marked as "
  "being automatically installed."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:61
+ #: apt-mark.8.xml:43
  msgid ""
  "When you request that a package is installed, and as a result other packages "
  "are installed to satisfy its dependencies, the dependencies are marked as "
@@@ -3772,39 -2843,24 +2844,24 @@@
  "removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:69
- msgid "auto"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:70
+ #: apt-mark.8.xml:52
  msgid ""
  "<literal>auto</literal> is used to mark a package as being automatically "
  "installed, which will cause the package to be removed when no more manually "
  "installed packages depend on this package."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:77
- msgid "manual"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:78
+ #: apt-mark.8.xml:60
  msgid ""
  "<literal>manual</literal> is used to mark a package as being manually "
  "installed, which will prevent the package from being automatically removed "
  "if no other packages depend on it."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:85
- msgid "hold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:86
+ #: apt-mark.8.xml:68
  msgid ""
  "<literal>hold</literal> is used to mark a package as hold back, which will "
  "prevent the package from being automatically installed, upgraded or "
@@@ -3813,25 -2869,15 +2870,15 @@@
  "effected by the <option>--filename</option> option."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:95
- msgid "unhold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:96
+ #: apt-mark.8.xml:78
  msgid ""
  "<literal>unhold</literal> is used to cancel a previously set hold on a "
  "package to allow all actions again."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:101
- msgid "showauto"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:102
+ #: apt-mark.8.xml:84
  msgid ""
  "<literal>showauto</literal> is used to print a list of automatically "
  "installed packages with each package on a new line.  All automatically "
@@@ -3839,83 -2885,64 +2886,64 @@@
  "given only those which are automatically installed will be shown."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:109
- msgid "showmanual"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:110
+ #: apt-mark.8.xml:92
  msgid ""
  "<literal>showmanual</literal> can be used in the same way as "
  "<literal>showauto</literal> except that it will print a list of manually "
  "installed packages instead."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:116
- msgid "showhold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:117
+ #: apt-mark.8.xml:99
  msgid ""
  "<literal>showhold</literal> is used to print a list of packages on hold in "
  "the same way as for the other show commands."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:130
- msgid ""
- "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-mark.8.xml:131
- msgid ""
- "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
- "option>"
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+ #: apt-mark.8.xml:112 apt-mark.8.xml:113
+ #, fuzzy
+ msgid "<replaceable>&synopsis-filename;</replaceable>"
  msgstr ""
+ "<programlisting>\n"
+ "apt-get install <replaceable>pacote</replaceable>/testing\n"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-mark.8.xml:134
+ #: apt-mark.8.xml:115
  msgid ""
- "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
- "filename> instead of the default location, which is "
- "<filename>extended_status</filename> in the directory defined by the "
- "Configuration Item: <literal>Dir::State</literal>."
+ "Read/Write package stats from the filename given with the parameter "
+ "<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+ "of from the default location, which is <filename>extended_status</filename> "
+ "in the directory defined by the Configuration Item: <literal>Dir::State</"
+ "literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt-mark.8.xml:146
+ #: apt-mark.8.xml:128
  msgid "  &file-extended_states;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:151
+ #: apt-mark.8.xml:133
  #, fuzzy
  msgid "&apt-get;,&aptitude;,&apt-conf;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-mark.8.xml:155
+ #: apt-mark.8.xml:137
  msgid ""
  "<command>apt-mark</command> returns zero on normal operation, non-zero on "
  "error."
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-secure.8.xml:17 apt-secure.8.xml:39
- msgid "apt-secure"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt-secure.8.xml:40
+ #: apt-secure.8.xml:47
  msgid "Archive authentication support for APT"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:45
+ #: apt-secure.8.xml:52
  msgid ""
  "Starting with version 0.6, <command>apt</command> contains code that does "
  "signature checking of the Release file for all archives. This ensures that "
@@@ -3924,7 -2951,7 +2952,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:53
+ #: apt-secure.8.xml:60
  msgid ""
  "If a package comes from a archive without a signature or with a signature "
  "that apt does not have a key for that package is considered untrusted and "
@@@ -3934,19 -2961,19 +2962,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:62
+ #: apt-secure.8.xml:69
  msgid ""
  "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
  "authentication feature."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:67
+ #: apt-secure.8.xml:74
  msgid "Trusted archives"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:70
+ #: apt-secure.8.xml:77
  msgid ""
  "The chain of trust from an apt archive to the end user is made up of "
  "different steps. <command>apt-secure</command> is the last step in this "
@@@ -3957,7 -2984,7 +2985,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:78
+ #: apt-secure.8.xml:85
  msgid ""
  "apt-secure does not review signatures at a package level. If you require "
  "tools to do this you should look at <command>debsig-verify</command> and "
@@@ -3966,7 -2993,7 +2994,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:85
+ #: apt-secure.8.xml:92
  msgid ""
  "The chain of trust in Debian starts when a maintainer uploads a new package "
  "or a new version of a package to the Debian archive. This upload in order to "
@@@ -3977,7 -3004,7 +3005,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:95
+ #: apt-secure.8.xml:102
  msgid ""
  "Once the uploaded package is verified and included in the archive, the "
  "maintainer signature is stripped off, an MD5 sum of the package is computed "
@@@ -3988,7 -3015,7 +3016,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:105
+ #: apt-secure.8.xml:112
  msgid ""
  "Any end user can check the signature of the Release file, extract the MD5 "
  "sum of a package from it and compare it with the MD5 sum of the package he "
@@@ -3998,14 -3025,14 +3026,14 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:112
+ #: apt-secure.8.xml:119
  msgid ""
  "Notice that this is distinct from checking signatures on a per package "
  "basis. It is designed to prevent two possible attacks:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:117
+ #: apt-secure.8.xml:124
  msgid ""
  "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
  "checking, a malicious agent can introduce himself in the package download "
@@@ -4015,7 -3042,7 +3043,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:125
+ #: apt-secure.8.xml:132
  msgid ""
  "<literal>Mirror network compromise</literal>.  Without signature checking, a "
  "malicious agent can compromise a mirror host and modify the files in it to "
@@@ -4024,7 -3051,7 +3052,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:132
+ #: apt-secure.8.xml:139
  msgid ""
  "However, it does not defend against a compromise of the Debian master server "
  "itself (which signs the packages) or against a compromise of the key used to "
@@@ -4033,12 -3060,12 +3061,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:138
+ #: apt-secure.8.xml:145
  msgid "User configuration"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:140
+ #: apt-secure.8.xml:147
  msgid ""
  "<command>apt-key</command> is the program that manages the list of keys used "
  "by apt. It can be used to add or remove keys although an installation of "
@@@ -4047,7 -3074,7 +3075,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:147
+ #: apt-secure.8.xml:154
  msgid ""
  "In order to add a new key you need to first download it (you should make "
  "sure you are using a trusted communication channel when retrieving it), add "
@@@ -4058,19 -3085,19 +3086,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:156
+ #: apt-secure.8.xml:163
  msgid "Archive configuration"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:158
+ #: apt-secure.8.xml:165
  msgid ""
  "If you want to provide archive signatures in an archive under your "
  "maintenance you have to:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:163
+ #: apt-secure.8.xml:170
  msgid ""
  "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
  "already. You can do this by running <command>apt-ftparchive release</"
@@@ -4078,7 -3105,7 +3106,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:168
+ #: apt-secure.8.xml:175
  msgid ""
  "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
  "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@@ -4086,7 -3113,7 +3114,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
- #: apt-secure.8.xml:172
+ #: apt-secure.8.xml:179
  msgid ""
  "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
  "know what key they need to import in order to authenticate the files in the "
@@@ -4094,7 -3121,7 +3122,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:179
+ #: apt-secure.8.xml:186
  msgid ""
  "Whenever the contents of the archive changes (new packages are added or "
  "removed) the archive maintainer has to follow the first two steps previously "
@@@ -4102,56 -3129,42 +3130,42 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:187
+ #: apt-secure.8.xml:194
  msgid ""
  "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
  "&debsign; &debsig-verify;, &gpg;"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:191
+ #: apt-secure.8.xml:198
  msgid ""
  "For more background information you might want to review the <ulink url="
- "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
- "\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
- "Manual (available also in the harden-doc package) and the <ulink url="
- "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
- "Distribution HOWTO</ulink> by V. Alex Brennen."
+ "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+ "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+ "(available also in the harden-doc package) and the <ulink url=\"http://www."
+ "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
+ "ulink> by V. Alex Brennen."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt-secure.8.xml:204
+ #: apt-secure.8.xml:211
  msgid "Manpage Authors"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-secure.8.xml:206
+ #: apt-secure.8.xml:213
  msgid ""
  "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
  "Jones, Colin Walters, Florian Weimer and Michael Vogt."
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt-sortpkgs.1.xml:25 apt-sortpkgs.1.xml:32
- msgid "apt-sortpkgs"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-sortpkgs.1.xml:33
  msgid "Utility to sort package index files"
  msgstr ""
  
- #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
- #: apt-sortpkgs.1.xml:39
- msgid ""
- "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
- "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
- "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
- "\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:48
+ #: apt-sortpkgs.1.xml:39
  msgid ""
  "<command>apt-sortpkgs</command> will take an index file (Source index or "
  "Package index) and sort the records so that they are ordered by the package "
@@@ -4160,56 -3173,46 +3174,46 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:54
+ #: apt-sortpkgs.1.xml:45
  msgid "All output is sent to stdout, the input must be a seekable file."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-sortpkgs.1.xml:61
- msgid "<option>--source</option>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt-sortpkgs.1.xml:63
+ #: apt-sortpkgs.1.xml:54
  msgid ""
  "Use Source index field ordering.  Configuration Item: <literal>APT::"
  "SortPkgs::Source</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt-sortpkgs.1.xml:77
+ #: apt-sortpkgs.1.xml:68
  msgid ""
  "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
  "100 on error."
  msgstr ""
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt.conf.5.xml:16
- msgid ""
- "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
- "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
- "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
- "&apt-product; <date>16 January 2010</date>"
+ #. type: Content of: <refentry><refentryinfo><author><contrib>
+ #: apt.conf.5.xml:20
+ msgid "Initial documentation of Debug::*."
  msgstr ""
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt.conf.5.xml:31 apt.conf.5.xml:38
- msgid "apt.conf"
+ #. type: Content of: <refentry><refentryinfo><author><email>
+ #: apt.conf.5.xml:21
+ msgid "dburrows@debian.org"
  msgstr ""
  
  #. type: Content of: <refentry><refmeta><manvolnum>
- #: apt.conf.5.xml:32 apt_preferences.5.xml:25 sources.list.5.xml:26
+ #: apt.conf.5.xml:31 apt_preferences.5.xml:25 sources.list.5.xml:26
  msgid "5"
  msgstr ""
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
- #: apt.conf.5.xml:39
+ #: apt.conf.5.xml:38
  msgid "Configuration file for APT"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:43
+ #: apt.conf.5.xml:42
  msgid ""
  "<filename>apt.conf</filename> is the main configuration file for the APT "
  "suite of tools, but by far not the only place changes to options can be "
@@@ -4218,50 -3221,51 +3222,51 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><para>
- #: apt.conf.5.xml:48
+ #: apt.conf.5.xml:47
  msgid ""
  "When an APT tool starts up it will read the configuration files in the "
  "following order:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:50
+ #: apt.conf.5.xml:49
  msgid ""
  "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
  "any)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:52
+ #: apt.conf.5.xml:51
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
- "order which have no or \"<literal>conf</literal>\" as filename extension and "
- "which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
- "characters.  Otherwise APT will print a notice that it has ignored a file if "
- "the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
- "literal> configuration list - in this case it will be silently ignored."
+ "order which have either no or \"<literal>conf</literal>\" as filename "
+ "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+ "and period (.) characters.  Otherwise APT will print a notice that it has "
+ "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+ "Ignore-Files-Silently</literal> configuration list - in this case it will be "
+ "silently ignored."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:59
+ #: apt.conf.5.xml:58
  msgid ""
  "the main configuration file specified by <literal>Dir::Etc::main</literal>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
- #: apt.conf.5.xml:61
+ #: apt.conf.5.xml:60
  msgid ""
  "the command line options are applied to override the configuration "
  "directives or to load even more configuration files."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:65
+ #: apt.conf.5.xml:64
  msgid "Syntax"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:66
+ #: apt.conf.5.xml:65
  msgid ""
  "The configuration file is organized in a tree with options organized into "
  "functional groups. Option specification is given with a double colon "
@@@ -4271,7 -3275,7 +3276,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:72
+ #: apt.conf.5.xml:71
  msgid ""
  "Syntactically the configuration language is modeled after what the ISC tools "
  "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@@ -4287,7 -3291,7 +3292,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:86
+ #: apt.conf.5.xml:85
  #, no-wrap
  msgid ""
  "APT {\n"
@@@ -4299,7 -3303,7 +3304,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:94
+ #: apt.conf.5.xml:93
  msgid ""
  "with newlines placed to make it more readable. Lists can be created by "
  "opening a scope and including a single string enclosed in quotes followed by "
@@@ -4307,27 -3311,27 +3312,27 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
- #: apt.conf.5.xml:99
+ #: apt.conf.5.xml:98
  #, no-wrap
  msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:102
+ #: apt.conf.5.xml:101
  msgid ""
  "In general the sample configuration file in <filename>&docdir;examples/apt."
  "conf</filename> &configureindex; is a good guide for how it should look."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:106
+ #: apt.conf.5.xml:105
  msgid ""
  "The names of the configuration items are not case-sensitive. So in the "
  "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:109
+ #: apt.conf.5.xml:108
  msgid ""
  "Names for the configuration items are optional if a list is defined as it "
  "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@@ -4337,7 -3341,7 +3342,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:114
+ #: apt.conf.5.xml:113
  msgid ""
  "Two specials are allowed, <literal>#include</literal> (which is deprecated "
  "and not supported by alternative implementations) and <literal>#clear</"
@@@ -4349,7 -3353,7 +3354,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:122
+ #: apt.conf.5.xml:121
  msgid ""
  "The #clear command is the only way to delete a list or a complete scope.  "
  "Reopening a scope or the ::-style described below will <emphasis>not</"
@@@ -4359,23 -3363,23 +3364,23 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:127
+ #: apt.conf.5.xml:126
  msgid ""
  "All of the APT tools take a -o option which allows an arbitrary "
  "configuration directive to be specified on the command line. The syntax is a "
  "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
- "followed by an equals sign then the new value of the option. Lists can be "
- "appended too by adding a trailing :: to the list name. (As you might "
+ "followed by an equals sign then the new value of the option. To append a new "
+ "element to a list, add a trailing :: to the name of the list. (As you might "
  "suspect: The scope syntax can't be used on the command line.)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:134
+ #: apt.conf.5.xml:133
  msgid ""
  "Note that you can use :: only for appending one item per line to a list and "
  "that you should not use it in combination with the scope syntax.  (The scope "
  "syntax implicit insert ::) Using both syntaxes together will trigger a bug "
- "which some users unfortunately relay on: An option with the unusual name "
+ "which some users unfortunately depend on: An option with the unusual name "
  "\"<literal>::</literal>\" which acts like every other option with a name. "
  "These introduces many problems including that a user who writes multiple "
  "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
@@@ -4387,37 -3391,40 +3392,40 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:146
+ #: apt.conf.5.xml:145
  msgid "The APT Group"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:147
+ #: apt.conf.5.xml:146
  msgid ""
  "This group of options controls general APT behavior as well as holding the "
  "options for all of the tools."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:151
- msgid "Architecture"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:152
+ #: apt.conf.5.xml:151
  msgid ""
  "System Architecture; sets the architecture to use when fetching files and "
  "parsing package lists. The internal default is the architecture apt was "
  "compiled for."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:157
- msgid "Default-Release"
+ msgid ""
+ "All Architectures the system supports. Processors implementing the "
+ "<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
+ "set are e.g. also able to execute binaries compiled for the <literal>i386</"
+ "literal> (<literal>x86</literal>) instruction set; This list is use when "
+ "fetching files and parsing package lists. The internal default is always the "
+ "native architecture (<literal>APT::Architecture</literal>)  and all foreign "
+ "architectures it can retrieve by calling <command>dpkg --print-foreign-"
+ "architectures</command>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:158
+ #: apt.conf.5.xml:167
  msgid ""
  "Default release to install packages from if more than one version available. "
  "Contains release name, codename or release version. Examples: 'stable', "
@@@ -4425,25 -3432,15 +3433,15 @@@
  "'5.0*'. See also &apt-preferences;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:163
- msgid "Ignore-Hold"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:164
+ #: apt.conf.5.xml:173
  msgid ""
  "Ignore Held packages; This global option causes the problem resolver to "
  "ignore held packages in its decision making."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:168
- msgid "Clean-Installed"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:169
+ #: apt.conf.5.xml:178
  msgid ""
  "Defaults to on. When turned on the autoclean feature will remove any "
  "packages which can no longer be downloaded from the cache. If turned off "
@@@ -4451,13 -3448,8 +3449,8 @@@
  "but note that APT provides no direct means to reinstall them."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:175
- msgid "Immediate-Configure"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:176
+ #: apt.conf.5.xml:185
  msgid ""
  "Defaults to on which will cause APT to install essential and important "
  "packages as fast as possible in the install/upgrade operation. This is done "
@@@ -4489,13 -3481,8 +3482,8 @@@
  "improving or correcting the upgrade process."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:198
- msgid "Force-LoopBreak"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:199
+ #: apt.conf.5.xml:208
  msgid ""
  "Never Enable this option unless you -really- know what you are doing. It "
  "permits APT to temporarily remove an essential package to break a Conflicts/"
@@@ -4505,89 -3492,59 +3493,59 @@@
  "those packages depend on."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:207
- msgid "Cache-Start, Cache-Grow and Cache-Limit"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:208
+ #: apt.conf.5.xml:217
  msgid ""
  "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
  "the 'available' information. <literal>Cache-Start</literal> acts as a hint "
  "to which size the Cache will grow and is therefore the amount of memory APT "
  "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
- "that these amount of space need to be available for APT otherwise it will "
- "likely fail ungracefully, so for memory restricted devices these value "
- "should be lowered while on systems with a lot of configured sources this "
- "might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
- "default of 1048576 (~1 MB) how much the Cache size will be increased in the "
- "event the space defined by <literal>Cache-Start</literal> is not enough. "
- "These value will be applied again and again until either the cache is big "
- "enough to store all information or the size of the cache reaches the "
- "<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
- "literal> is 0 which stands for no limit.  If <literal>Cache-Grow</literal> "
- "is set to 0 the automatic grow of the cache is disabled."
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:223
- msgid "Build-Essential"
+ "that this amount of space needs to be available for APT otherwise it will "
+ "likely fail ungracefully, so for memory restricted devices this value should "
+ "be lowered while on systems with a lot of configured sources it should be "
+ "increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
+ "of 1048576 (~1 MB) how much the Cache size will be increased in the event "
+ "the space defined by <literal>Cache-Start</literal> is not enough. These "
+ "value will be applied again and again until either the cache is big enough "
+ "to store all information or the size of the cache reaches the <literal>Cache-"
+ "Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
+ "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
+ "automatic grow of the cache is disabled."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:224
+ #: apt.conf.5.xml:233
  msgid "Defines which package(s) are considered essential build dependencies."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:227
- msgid "Get"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:228
+ #: apt.conf.5.xml:237
  msgid ""
  "The Get subsection controls the &apt-get; tool, please see its documentation "
  "for more information about the options here."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:232
- msgid "Cache"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:233
+ #: apt.conf.5.xml:242
  msgid ""
  "The Cache subsection controls the &apt-cache; tool, please see its "
  "documentation for more information about the options here."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:237
- msgid "CDROM"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:238
+ #: apt.conf.5.xml:247
  msgid ""
  "The CDROM subsection controls the &apt-cdrom; tool, please see its "
  "documentation for more information about the options here."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:244
+ #: apt.conf.5.xml:253
  msgid "The Acquire Group"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:249
- msgid "Check-Valid-Until"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:250
+ #: apt.conf.5.xml:259
  msgid ""
  "Security related option defaulting to true as an expiring validation for a "
  "Release file prevents longtime replay attacks and can e.g. also help users "
@@@ -4598,55 -3555,48 +3556,48 @@@
  "<literal>Max-ValidTime</literal> option can be used."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:260
- msgid "Max-ValidTime"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:261
+ #: apt.conf.5.xml:270
  msgid ""
- "Seconds the Release file should be considered valid after it was created. "
- "The default is \"for ever\" (0) if the Release file of the archive doesn't "
- "include a <literal>Valid-Until</literal> header.  If it does then this date "
- "is the default. The date from the Release file or the date specified by the "
- "creation time of the Release file (<literal>Date</literal> header) plus the "
- "seconds specified with this options are used to check if the validation of a "
- "file has expired by using the earlier date of the two. Archive specific "
- "settings can be made by appending the label of the archive to the option "
- "name."
+ "Seconds the Release file should be considered valid after it was created "
+ "(indicated by the <literal>Date</literal> header).  If the Release file "
+ "itself includes a <literal>Valid-Until</literal> header the earlier date of "
+ "the two is used as the expiration date.  The default value is <literal>0</"
+ "literal> which stands for \"for ever valid\".  Archive specific settings can "
+ "be made by appending the label of the archive to the option name."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:273
- msgid "PDiffs"
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:281
+ msgid ""
+ "Minimum of seconds the Release file should be considered valid after it was "
+ "created (indicated by the <literal>Date</literal> header).  Use this if you "
+ "need to use a seldomly updated (local) mirror of a more regular updated "
+ "archive with a <literal>Valid-Until</literal> header instead of completely "
+ "disabling the expiration date checking.  Archive specific settings can and "
+ "should be used by appending the label of the archive to the option name."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:274
+ #: apt.conf.5.xml:292
  msgid ""
  "Try to download deltas called <literal>PDiffs</literal> for Packages or "
  "Sources files instead of downloading whole ones. True by default."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:277
+ #: apt.conf.5.xml:295
  msgid ""
  "Two sub-options to limit the use of PDiffs are also available: With "
  "<literal>FileLimit</literal> can be specified how many PDiff files are "
- "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
- "other hand is the maximum precentage of the size of all patches compared to "
+ "downloaded at most to update a file. <literal>SizeLimit</literal> on the "
+ "other hand is the maximum percentage of the size of all patches compared to "
  "the size of the targeted file. If one of these limits is exceeded the "
  "complete file is downloaded instead of the patches."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
- msgid "Queue-Mode"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:305
  msgid ""
  "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
  "literal> or <literal>access</literal> which determines how APT parallelizes "
@@@ -4655,37 -3605,22 +3606,22 @@@
  "connection per URI type will be opened."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:294
- msgid "Retries"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:295
+ #: apt.conf.5.xml:313
  msgid ""
  "Number of retries to perform. If this is non-zero APT will retry failed "
  "files the given number of times."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:299
- msgid "Source-Symlinks"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:300
+ #: apt.conf.5.xml:318
  msgid ""
  "Use symlinks for source archives. If set to true then source archives will "
  "be symlinked when possible instead of copying. True is the default."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:304 sources.list.5.xml:144
- msgid "http"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:305
+ #: apt.conf.5.xml:323
  msgid ""
  "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
  "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@@ -4696,7 -3631,7 +3632,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:313
+ #: apt.conf.5.xml:331
  msgid ""
  "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
  "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@@ -4710,7 -3645,7 +3646,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:323 apt.conf.5.xml:387
+ #: apt.conf.5.xml:341 apt.conf.5.xml:407
  msgid ""
  "The option <literal>timeout</literal> sets the timeout timer used by the "
  "method, this applies to all things including connection timeout and data "
@@@ -4718,19 -3653,26 +3654,26 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:326
+ #: apt.conf.5.xml:344
+ msgid ""
+ "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+ "enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
+ "g. on high-latency connections. It specifies how many requests are send in a "
+ "pipeline.  Previous APT versions had a default of 10 for this setting, but "
+ "the default value is now 0 (= disabled) to avoid problems with the ever-"
+ "growing amount of webservers and proxies which choose to not conform to the "
+ "HTTP/1.1 specification."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:351
  msgid ""
- "One setting is provided to control the pipeline depth in cases where the "
- "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
- "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
- "indicating how many outstanding requests APT should send. A value of zero "
- "MUST be specified if the remote host does not properly linger on TCP "
- "connections - otherwise data corruption will occur. Hosts which require this "
- "are in violation of RFC 2068."
+ "<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
+ "redirects, which is enabled by default."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:334
+ #: apt.conf.5.xml:354
  msgid ""
  "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
  "literal> which accepts integer values in kilobyte. The default value is 0 "
@@@ -4740,20 -3682,15 +3683,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:339
+ #: apt.conf.5.xml:359
  msgid ""
  "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
  "User-Agent for the http download method as some proxies allow access for "
  "clients only if the client uses a known identifier."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:345
- msgid "https"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:346
+ #: apt.conf.5.xml:366
  msgid ""
  "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
  "options are the same as for <literal>http</literal> method and will also "
@@@ -4763,7 -3700,7 +3701,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:352
+ #: apt.conf.5.xml:372
  msgid ""
  "<literal>CaInfo</literal> suboption specifies place of file that holds info "
  "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@@ -4783,13 -3720,8 +3721,8 @@@
  "option."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:370 sources.list.5.xml:155
- msgid "ftp"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:371
+ #: apt.conf.5.xml:391
  msgid ""
  "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
  "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@@ -4808,7 -3740,7 +3741,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:390
+ #: apt.conf.5.xml:410
  msgid ""
  "Several settings are provided to control passive mode. Generally it is safe "
  "to leave passive mode on, it works in nearly every environment.  However "
@@@ -4818,7 -3750,7 +3751,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:397
+ #: apt.conf.5.xml:417
  msgid ""
  "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
  "envar> environment variable to a http url - see the discussion of the http "
@@@ -4827,7 -3759,7 +3760,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:402
+ #: apt.conf.5.xml:422
  msgid ""
  "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
  "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@@ -4836,19 -3768,14 +3769,14 @@@
  "that most FTP servers do not support RFC2428."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:409 sources.list.5.xml:137
- msgid "cdrom"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:415
+ #: apt.conf.5.xml:435
  #, no-wrap
  msgid "/cdrom/::Mount \"foo\";"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:410
+ #: apt.conf.5.xml:430
  msgid ""
  "CDROM URIs; the only setting for CDROM URIs is the mount point, "
  "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@@ -4860,32 -3787,22 +3788,22 @@@
  "can be specified using UMount."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:420
- msgid "gpgv"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:421
+ #: apt.conf.5.xml:441
  msgid ""
  "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
  "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
  "passed to gpgv."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:426
- msgid "CompressionTypes"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:432
+ #: apt.conf.5.xml:452
  #, no-wrap
  msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:427
+ #: apt.conf.5.xml:447
  msgid ""
  "List of compression types which are understood by the acquire methods.  "
  "Files like <filename>Packages</filename> can be available in various "
@@@ -4897,19 -3814,19 +3815,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:437
+ #: apt.conf.5.xml:457
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order:: \"gz\";"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
- #: apt.conf.5.xml:440
+ #: apt.conf.5.xml:460
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:433
+ #: apt.conf.5.xml:453
  msgid ""
  "Also the <literal>Order</literal> subgroup can be used to define in which "
  "order the acquire system will try to download the compressed files. The "
@@@ -4926,20 -3843,20 +3844,20 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:444
+ #: apt.conf.5.xml:464
  #, no-wrap
  msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:442
+ #: apt.conf.5.xml:462
  msgid ""
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
  "will only be used if this file exists, e.g. for the bzip2 method (the "
- "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
- "that list entries specified on the command line will be added at the end of "
- "the list specified in the configuration files, but before the default "
+ "inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+ "also that list entries specified on the command line will be added at the "
+ "end of the list specified in the configuration files, but before the default "
  "entries. To prefer a type in this case over the ones specified in the "
  "configuration files you can set the option direct - not in list style.  This "
  "will not override the defined list, it will only prefix the list with this "
@@@ -4947,20 -3864,15 +3865,15 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:449
+ #: apt.conf.5.xml:469
  msgid ""
  "The special type <literal>uncompressed</literal> can be used to give "
- "uncompressed files a preference, but note that most archives doesn't provide "
+ "uncompressed files a preference, but note that most archives don't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:454
- msgid "GzipIndexes"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:456
+ #: apt.conf.5.xml:476
  msgid ""
  "When downloading <literal>gzip</literal> compressed indexes (Packages, "
  "Sources, or Translations), keep them gzip compressed locally instead of "
@@@ -4968,13 -3880,8 +3881,8 @@@
  "CPU requirements when building the local package caches. False by default."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:463
- msgid "Languages"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:464
+ #: apt.conf.5.xml:484
  msgid ""
  "The Languages subsection controls which <filename>Translation</filename> "
  "files are downloaded and in which order APT tries to display the Description-"
@@@ -4987,13 -3894,13 +3895,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
- #: apt.conf.5.xml:480
+ #: apt.conf.5.xml:500
  #, no-wrap
  msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:470
+ #: apt.conf.5.xml:490
  msgid ""
  "The default list includes \"environment\" and \"en\". "
  "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@@ -5015,32 -3922,41 +3923,41 @@@
  "\"0\"/>"
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+ #: apt.conf.5.xml:501
+ msgid ""
+ "Note: To prevent problems resulting from APT being executed in different "
+ "environments (e.g. by different users or by other programs) all Translation "
+ "files which are found in <filename>/var/lib/apt/lists/</filename> will be "
+ "added to the end of the list (after an implicit \"<literal>none</literal>\")."
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:245
+ #: apt.conf.5.xml:254
  msgid ""
  "The <literal>Acquire</literal> group of options controls the download of "
  "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:487
+ #: apt.conf.5.xml:512
  msgid "Directories"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:489
+ #: apt.conf.5.xml:514
  msgid ""
  "The <literal>Dir::State</literal> section has directories that pertain to "
  "local state information. <literal>lists</literal> is the directory to place "
  "downloaded package lists in and <literal>status</literal> is the name of the "
  "dpkg status file.  <literal>preferences</literal> is the name of the APT "
- "preferences file.  <literal>Dir::State</literal> contains the default "
- "directory to prefix on all sub items if they do not start with <filename>/</"
- "filename> or <filename>./</filename>."
+ "<filename>preferences</filename> file.  <literal>Dir::State</literal> "
+ "contains the default directory to prefix on all sub items if they do not "
+ "start with <filename>/</filename> or <filename>./</filename>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:496
+ #: apt.conf.5.xml:521
  msgid ""
  "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
  "information, such as the two package caches <literal>srcpkgcache</literal> "
@@@ -5053,7 -3969,7 +3970,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:505
+ #: apt.conf.5.xml:530
  msgid ""
  "<literal>Dir::Etc</literal> contains the location of configuration files, "
  "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@@ -5063,7 -3979,7 +3980,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:511
+ #: apt.conf.5.xml:536
  msgid ""
  "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
  "in lexical order from the directory specified. After this is done then the "
@@@ -5071,7 -3987,7 +3988,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:515
+ #: apt.conf.5.xml:540
  msgid ""
  "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
  "Bin::Methods</literal> specifies the location of the method handlers and "
@@@ -5082,7 -3998,7 +3999,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:523
+ #: apt.conf.5.xml:548
  msgid ""
  "The configuration item <literal>RootDir</literal> has a special meaning.  If "
  "set, all paths in <literal>Dir::</literal> will be relative to "
@@@ -5095,7 -4011,7 +4012,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:536
+ #: apt.conf.5.xml:561
  msgid ""
  "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
  "which files APT should silently ignore while parsing the files in the "
@@@ -5106,25 -4022,20 +4023,20 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:545
+ #: apt.conf.5.xml:570
  msgid "APT in DSelect"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:547
+ #: apt.conf.5.xml:572
  msgid ""
  "When APT is used as a &dselect; method several configuration directives "
  "control the default behaviour. These are in the <literal>DSelect</literal> "
  "section."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:551
- msgid "Clean"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:552
+ #: apt.conf.5.xml:577
  msgid ""
  "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
  "and never.  always and prompt will remove all packages from the cache after "
@@@ -5135,68 -4046,48 +4047,48 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:561
+ #: apt.conf.5.xml:586
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the install phase."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:565
- msgid "Updateoptions"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:566
+ #: apt.conf.5.xml:591
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the update phase."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:570
- msgid "PromptAfterUpdate"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:571
+ #: apt.conf.5.xml:596
  msgid ""
  "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
  "The default is to prompt only on error."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:577
+ #: apt.conf.5.xml:602
  msgid "How APT calls dpkg"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:578
+ #: apt.conf.5.xml:603
  msgid ""
  "Several configuration directives control how APT invokes &dpkg;. These are "
  "in the <literal>DPkg</literal> section."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:583
+ #: apt.conf.5.xml:608
  msgid ""
  "This is a list of options to pass to dpkg. The options must be specified "
  "using the list notation and each list item is passed as a single argument to "
  "&dpkg;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Pre-Invoke"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:588
- msgid "Post-Invoke"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:589
+ #: apt.conf.5.xml:614
  msgid ""
  "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -5204,13 -4095,8 +4096,8 @@@
  "fail APT will abort."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:595
- msgid "Pre-Install-Pkgs"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:596
+ #: apt.conf.5.xml:621
  msgid ""
  "This is a list of shell commands to run before invoking dpkg. Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -5220,7 -4106,7 +4107,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:602
+ #: apt.conf.5.xml:627
  msgid ""
  "Version 2 of this protocol dumps more information, including the protocol "
  "version, the APT configuration space and the packages, files and versions "
@@@ -5229,37 -4115,27 +4116,27 @@@
  "given to <literal>Pre-Install-Pkgs</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:609
- msgid "Run-Directory"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:610
+ #: apt.conf.5.xml:635
  msgid ""
  "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
  "</filename>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:614
- msgid "Build-options"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:615
+ #: apt.conf.5.xml:640
  msgid ""
  "These options are passed to &dpkg-buildpackage; when compiling packages, the "
  "default is to disable signing and produce all binaries."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt.conf.5.xml:620
+ #: apt.conf.5.xml:645
  msgid "dpkg trigger usage (and related options)"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:621
+ #: apt.conf.5.xml:646
  msgid ""
  "APT can call dpkg in a way so it can make aggressive use of triggers over "
  "multiple calls of dpkg. Without further options dpkg will use triggers only "
@@@ -5274,7 -4150,7 +4151,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
- #: apt.conf.5.xml:636
+ #: apt.conf.5.xml:661
  #, no-wrap
  msgid ""
  "DPkg::NoTriggers \"true\";\n"
@@@ -5284,7 -4160,7 +4161,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt.conf.5.xml:630
+ #: apt.conf.5.xml:655
  msgid ""
  "Note that it is not guaranteed that APT will support these options or that "
  "these options will not cause (big) trouble in the future. If you have "
@@@ -5297,13 -4173,8 +4174,8 @@@
  "would be <placeholder type=\"literallayout\" id=\"0\"/>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:642
- msgid "DPkg::NoTriggers"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:643
+ #: apt.conf.5.xml:668
  msgid ""
  "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
  "call).  See &dpkg; if you are interested in what this actually means. In "
@@@ -5314,13 -4185,8 +4186,8 @@@
  "dpkg - now apt will add these flag also to the unpack and remove calls."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:650
- msgid "PackageManager::Configure"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:651
+ #: apt.conf.5.xml:676
  msgid ""
  "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
  "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@@ -5335,13 -4201,8 +4202,8 @@@
  "the system could end in an unconfigured status which could be unbootable!"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:661
- msgid "DPkg::ConfigurePending"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:662
+ #: apt.conf.5.xml:687
  msgid ""
  "If this option is set apt will call <command>dpkg --configure --pending</"
  "command> to let dpkg handle all required configurations and triggers. This "
@@@ -5351,13 -4212,8 +4213,8 @@@
  "you could deactivate this option in all but the last run."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:668
- msgid "DPkg::TriggersPending"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:669
+ #: apt.conf.5.xml:694
  msgid ""
  "Useful for <literal>smart</literal> configuration as a package which has "
  "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@@ -5366,13 -4222,8 +4223,8 @@@
  "triggers, not only the triggers needed to configure this package."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:674
- msgid "PackageManager::UnpackAll"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:675
+ #: apt.conf.5.xml:700
  msgid ""
  "As the configuration can be deferred to be done at the end by dpkg it can be "
  "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@@ -5383,13 -4234,8 +4235,8 @@@
  "really useful."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
- #: apt.conf.5.xml:682
- msgid "OrderList::Score::Immediate"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:690
+ #: apt.conf.5.xml:715
  #, no-wrap
  msgid ""
  "OrderList::Score {\n"
@@@ -5401,7 -4247,7 +4248,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:683
+ #: apt.conf.5.xml:708
  msgid ""
  "Essential packages (and there dependencies) should be configured immediately "
  "after unpacking. It will be a good idea to do this quite early in the "
@@@ -5415,12 -4261,12 +4262,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:703
+ #: apt.conf.5.xml:728
  msgid "Periodic and Archives options"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:704
+ #: apt.conf.5.xml:729
  msgid ""
  "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
  "of options configure behavior of apt periodic updates, which is done by "
@@@ -5429,12 -4275,12 +4276,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: apt.conf.5.xml:712
+ #: apt.conf.5.xml:737
  msgid "Debug options"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:714
+ #: apt.conf.5.xml:739
  msgid ""
  "Enabling options in the <literal>Debug::</literal> section will cause "
  "debugging information to be sent to the standard error stream of the program "
@@@ -5445,7 -4291,7 +4292,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:725
+ #: apt.conf.5.xml:750
  msgid ""
  "<literal>Debug::pkgProblemResolver</literal> enables output about the "
  "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@@ -5453,7 -4299,7 +4300,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:733
+ #: apt.conf.5.xml:758
  msgid ""
  "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
  "used to run some operations (for instance, <literal>apt-get -s install</"
@@@ -5461,7 -4307,7 +4308,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:742
+ #: apt.conf.5.xml:767
  msgid ""
  "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
  "time that <literal>apt</literal> invokes &dpkg;."
@@@ -5471,220 -4317,120 +4318,120 @@@ msgstr "
  #. 	   motivating example, except I haven't a clue why you'd want
  #. 	   to do this. 
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:750
+ #: apt.conf.5.xml:775
  msgid ""
  "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
  "in CDROM IDs."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:760
+ #: apt.conf.5.xml:785
  msgid "A full list of debugging options to apt follows."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:765
- #, fuzzy
- msgid "<literal>Debug::Acquire::cdrom</literal>"
- msgstr "a linha <literal>Archive:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:769
+ #: apt.conf.5.xml:794
  msgid ""
  "Print information related to accessing <literal>cdrom://</literal> sources."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:776
- #, fuzzy
- msgid "<literal>Debug::Acquire::ftp</literal>"
- msgstr "a linha <literal>Archive:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:780
+ #: apt.conf.5.xml:805
  msgid "Print information related to downloading packages using FTP."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:787
- #, fuzzy
- msgid "<literal>Debug::Acquire::http</literal>"
- msgstr "a linha <literal>Archive:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:791
+ #: apt.conf.5.xml:816
  msgid "Print information related to downloading packages using HTTP."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:798
- #, fuzzy
- msgid "<literal>Debug::Acquire::https</literal>"
- msgstr "a linha <literal>Archive:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:802
+ #: apt.conf.5.xml:827
  msgid "Print information related to downloading packages using HTTPS."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:809
- #, fuzzy
- msgid "<literal>Debug::Acquire::gpgv</literal>"
- msgstr "a linha <literal>Archive:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:813
+ #: apt.conf.5.xml:838
  msgid ""
  "Print information related to verifying cryptographic signatures using "
  "<literal>gpg</literal>."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:820
- #, fuzzy
- msgid "<literal>Debug::aptcdrom</literal>"
- msgstr "a linha <literal>Version:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:824
+ #: apt.conf.5.xml:849
  msgid ""
  "Output information about the process of accessing collections of packages "
  "stored on CD-ROMs."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:831
- #, fuzzy
- msgid "<literal>Debug::BuildDeps</literal>"
- msgstr "a linha <literal>Label:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:834
+ #: apt.conf.5.xml:859
  msgid "Describes the process of resolving build-dependencies in &apt-get;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:841
- #, fuzzy
- msgid "<literal>Debug::Hashes</literal>"
- msgstr "a linha <literal>Label:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:844
+ #: apt.conf.5.xml:869
  msgid ""
  "Output each cryptographic hash that is generated by the <literal>apt</"
  "literal> libraries."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:851
- #, fuzzy
- msgid "<literal>Debug::IdentCDROM</literal>"
- msgstr "a linha <literal>Label:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:854
+ #: apt.conf.5.xml:879
  msgid ""
  "Do not include information from <literal>statfs</literal>, namely the number "
  "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
  "a CD-ROM."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:862
- #, fuzzy
- msgid "<literal>Debug::NoLocking</literal>"
- msgstr "a linha <literal>Origin:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:865
+ #: apt.conf.5.xml:890
  msgid ""
  "Disable all file locking.  For instance, this will allow two instances of "
  "<quote><literal>apt-get update</literal></quote> to run at the same time."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:873
- #, fuzzy
- msgid "<literal>Debug::pkgAcquire</literal>"
- msgstr "a linha <literal>Archive:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:877
+ #: apt.conf.5.xml:902
  msgid "Log when items are added to or removed from the global download queue."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:884
- #, fuzzy
- msgid "<literal>Debug::pkgAcquire::Auth</literal>"
- msgstr "a linha <literal>Archive:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:887
+ #: apt.conf.5.xml:912
  msgid ""
  "Output status messages and errors related to verifying checksums and "
  "cryptographic signatures of downloaded files."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:894
- #, fuzzy
- msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
- msgstr "a linha <literal>Archive:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:897
+ #: apt.conf.5.xml:922
  msgid ""
  "Output information about downloading and applying package index list diffs, "
  "and errors relating to package index list diffs."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:905
- #, fuzzy
- msgid "<literal>Debug::pkgAcquire::RRed</literal>"
- msgstr "a linha <literal>Archive:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:909
+ #: apt.conf.5.xml:934
  msgid ""
  "Output information related to patching apt package lists when downloading "
  "index diffs instead of full indices."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:916
- #, fuzzy
- msgid "<literal>Debug::pkgAcquire::Worker</literal>"
- msgstr "a linha <literal>Archive:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:920
+ #: apt.conf.5.xml:945
  msgid ""
  "Log all interactions with the sub-processes that actually perform downloads."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:927
- msgid "<literal>Debug::pkgAutoRemove</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:931
+ #: apt.conf.5.xml:956
  msgid ""
  "Log events related to the automatically-installed status of packages and to "
  "the removal of unused packages."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:938
- msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:941
+ #: apt.conf.5.xml:966
  msgid ""
  "Generate debug messages describing which packages are being automatically "
  "installed to resolve dependencies.  This corresponds to the initial auto-"
@@@ -5693,13 -4439,8 +4440,8 @@@
  "pkgProblemResolver</literal> for that."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:952
- msgid "<literal>Debug::pkgDepCache::Marker</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:955
+ #: apt.conf.5.xml:980
  msgid ""
  "Generate debug messages describing which package is marked as keep/install/"
  "remove while the ProblemResolver does his work.  Each addition or deletion "
@@@ -5715,148 -4456,84 +4457,84 @@@
  "<literal>section</literal> is the name of the section the package appears in."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:974
- #, fuzzy
- msgid "<literal>Debug::pkgInitConfig</literal>"
- msgstr "a linha <literal>Version:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:977
+ #: apt.conf.5.xml:1002
  msgid "Dump the default configuration to standard error on startup."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:984
- #, fuzzy
- msgid "<literal>Debug::pkgDPkgPM</literal>"
- msgstr "a linha <literal>Package:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:987
+ #: apt.conf.5.xml:1012
  msgid ""
  "When invoking &dpkg;, output the precise command line with which it is being "
  "invoked, with arguments separated by a single space character."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:995
- msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:998
+ #: apt.conf.5.xml:1023
  msgid ""
  "Output all the data received from &dpkg; on the status file descriptor and "
  "any errors encountered while parsing it."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1005
- #, fuzzy
- msgid "<literal>Debug::pkgOrderList</literal>"
- msgstr "a linha <literal>Origin:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1009
+ #: apt.conf.5.xml:1034
  msgid ""
  "Generate a trace of the algorithm that decides the order in which "
  "<literal>apt</literal> should pass packages to &dpkg;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1017
- #, fuzzy
- msgid "<literal>Debug::pkgPackageManager</literal>"
- msgstr "a linha <literal>Package:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1021
+ #: apt.conf.5.xml:1046
  msgid ""
  "Output status messages tracing the steps performed when invoking &dpkg;."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1028
- #, fuzzy
- msgid "<literal>Debug::pkgPolicy</literal>"
- msgstr "a linha <literal>Label:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1032
+ #: apt.conf.5.xml:1057
  msgid "Output the priority of each package list on startup."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1038
- msgid "<literal>Debug::pkgProblemResolver</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1042
+ #: apt.conf.5.xml:1067
  msgid ""
  "Trace the execution of the dependency resolver (this applies only to what "
  "happens when a complex dependency problem is encountered)."
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1050
- msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
- msgstr ""
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1053
+ #: apt.conf.5.xml:1078
  msgid ""
  "Display a list of all installed packages with their calculated score used by "
  "the pkgProblemResolver. The description of the package is the same as "
  "described in <literal>Debug::pkgDepCache::Marker</literal>"
  msgstr ""
  
- #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt.conf.5.xml:1061
- #, fuzzy
- msgid "<literal>Debug::sourceList</literal>"
- msgstr "a linha <literal>Version:</literal>"
- 
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:1065
+ #: apt.conf.5.xml:1090
  msgid ""
  "Print information about the vendors read from <filename>/etc/apt/vendors."
  "list</filename>."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1088
+ #: apt.conf.5.xml:1113
  msgid ""
  "&configureindex; is a configuration file showing example values for all "
  "possible options."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt.conf.5.xml:1095
+ #: apt.conf.5.xml:1120
  msgid "&file-aptconf;"
  msgstr ""
  
  #.  ? reading apt.conf 
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1100
+ #: apt.conf.5.xml:1125
  #, fuzzy
  msgid "&apt-cache;, &apt-config;, &apt-preferences;."
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
- #.  The last update date 
- #. type: Content of: <refentry><refentryinfo>
- #: apt_preferences.5.xml:16
- msgid ""
- "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
- msgstr ""
- 
- #. type: Content of: <refentry><refnamediv><refname>
- #: apt_preferences.5.xml:24 apt_preferences.5.xml:31
- #, fuzzy
- msgid "apt_preferences"
- msgstr "apt_preferences"
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt_preferences.5.xml:32
  #, fuzzy
@@@ -5934,8 -4611,8 +4612,8 @@@ msgstr "
  msgid ""
  "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
  "directory are parsed in alphanumeric ascending order and need to obey the "
- "following naming convention: The files have no or \"<literal>pref</literal>"
- "\" as filename extension and which only contain alphanumeric, hyphen (-), "
+ "following naming convention: The files have either no or \"<literal>pref</"
+ "literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
  "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
  "that it has ignored a file if the file doesn't match a pattern in the "
  "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@@ -6399,7 -5076,7 +5077,7 @@@ msgid "
  "APT also supports pinning by glob() expressions and regular expressions "
  "surrounded by /. For example, the following example assigns the priority 500 "
  "to all packages from experimental where the name starts with gnome (as a glob"
- "()-like expression or contains the word kde (as a POSIX extended regular "
+ "()-like expression) or contains the word kde (as a POSIX extended regular "
  "expression surrounded by slashes)."
  msgstr ""
  
@@@ -6420,7 -5097,7 +5098,7 @@@ msgstr "
  #: apt_preferences.5.xml:279
  msgid ""
  "The rule for those expressions is that they can occur anywhere where a "
- "string can occur. Those, the following pin assigns the priority 990 to all "
+ "string can occur. Thus, the following pin assigns the priority 990 to all "
  "packages from a release starting with karmic."
  msgstr ""
  
@@@ -6437,30 -5114,31 +5115,31 @@@ msgstr "
  "Pin: release a=unstable\n"
  "Pin-Priority: 50\n"
  
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:290
- msgid "Package"
- msgstr ""
- 
- #. type: Content of: <refentry><refsect1><refsect2><literal>
- #: apt_preferences.5.xml:296
- msgid "*"
+ #. type: Content of: <refentry><refsect1><refsect2><para>
+ #: apt_preferences.5.xml:291
+ msgid ""
+ "If a regular expression occurs in a <literal>Package</literal> field, the "
+ "behavior is the same as if this regular expression were replaced with a list "
+ "of all package names it matches. It is undecided whether this will change in "
+ "the future, thus you should always list wild-card pins first, so later "
+ "specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+ "Package field is not considered a glob() expression in itself."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:306
+ #: apt_preferences.5.xml:307
  #, 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:314
+ #: apt_preferences.5.xml:315
  #, fuzzy
  msgid "P &gt; 1000"
  msgstr "P &gt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:315
+ #: apt_preferences.5.xml:316
  #, fuzzy
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
@@@ -6470,13 -5148,13 +5149,13 @@@ msgstr "
  "dowgrade do pacote"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:319
+ #: apt_preferences.5.xml:320
  #, 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:320
+ #: apt_preferences.5.xml:321
  #, fuzzy
  msgid ""
  "causes a version to be installed even if it does not come from the target "
@@@ -6486,13 -5164,13 +5165,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:325
+ #: apt_preferences.5.xml:326
  #, 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:326
+ #: apt_preferences.5.xml:327
  #, fuzzy
  msgid ""
  "causes a version to be installed unless there is a version available "
@@@ -6502,13 -5180,13 +5181,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:331
+ #: apt_preferences.5.xml:332
  #, 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:332
+ #: apt_preferences.5.xml:333
  #, fuzzy
  msgid ""
  "causes a version to be installed unless there is a version available "
@@@ -6519,13 -5197,13 +5198,13 @@@ msgstr "
  "seja mais recente"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:337
+ #: apt_preferences.5.xml:338
  #, 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:338
+ #: apt_preferences.5.xml:339
  #, fuzzy
  msgid ""
  "causes a version to be installed only if there is no installed version of "
@@@ -6535,19 -5213,19 +5214,19 @@@ msgstr "
  "instalada do pacote"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:342
+ #: apt_preferences.5.xml:343
  #, fuzzy
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:343
+ #: apt_preferences.5.xml:344
  #, 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:309
+ #: apt_preferences.5.xml:310
  #, fuzzy
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
@@@ -6559,7 -5237,7 +5238,7 @@@ msgstr "
  "seguir (a grosso modo):"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:348
+ #: apt_preferences.5.xml:349
  #, fuzzy
  msgid ""
  "If any specific-form records match an available package version then the "
@@@ -6575,7 -5253,7 +5254,7 @@@ msgstr "
  "determinará a prioridade da versão do pacote."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:354
+ #: apt_preferences.5.xml:355
  #, fuzzy
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
@@@ -6585,7 -5263,7 +5264,7 @@@ msgstr "
  "registros apresentados anteriormente :"
  
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
- #: apt_preferences.5.xml:358
+ #: apt_preferences.5.xml:359
  #, fuzzy, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -6614,12 -5292,12 +5293,12 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:371
+ #: apt_preferences.5.xml:372
  msgid "Then:"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:373
+ #: apt_preferences.5.xml:374
  #, fuzzy
  msgid ""
  "The most recent available version of the <literal>perl</literal> package "
@@@ -6635,7 -5313,7 +5314,7 @@@ msgstr "
  "será feito um downgrade do <literal>perl</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:378
+ #: apt_preferences.5.xml:379
  #, fuzzy
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
@@@ -6647,7 -5325,7 +5326,7 @@@ msgstr "
  "mesmo versões pertencentes a versão alvo."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
- #: apt_preferences.5.xml:382
+ #: apt_preferences.5.xml:383
  #, fuzzy
  msgid ""
  "A version of a package whose origin is not the local system but some other "
@@@ -6662,13 -5340,13 +5341,13 @@@ msgstr "
  "instalada."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:392
+ #: apt_preferences.5.xml:393
  #, 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:394
+ #: apt_preferences.5.xml:395
  #, fuzzy
  msgid ""
  "The locations listed in the &sources-list; file should provide "
@@@ -6680,31 -5358,31 +5359,31 @@@ msgstr "
  "os pacotes disponíveis nessas localidades."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:406
+ #: apt_preferences.5.xml:407
  #, 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:407
+ #: apt_preferences.5.xml:408
  #, 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:410 apt_preferences.5.xml:460
+ #: apt_preferences.5.xml:411 apt_preferences.5.xml:461
  #, 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:411
+ #: apt_preferences.5.xml:412
  #, 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:398
+ #: apt_preferences.5.xml:399
  #, fuzzy
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
@@@ -6726,13 -5404,13 +5405,13 @@@ msgstr "
  "do APT :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:427
+ #: apt_preferences.5.xml:428
  #, 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:428
+ #: apt_preferences.5.xml:429
  #, fuzzy
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
@@@ -6750,7 -5428,7 +5429,7 @@@ msgstr "
  "requerer a linha :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:438
+ #: apt_preferences.5.xml:439
  #, fuzzy, no-wrap
  msgid "Pin: release a=stable\n"
  msgstr ""
@@@ -6758,13 -5436,13 +5437,13 @@@
  "Pin: release a=stable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:444
+ #: apt_preferences.5.xml:445
  #, 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:445
+ #: apt_preferences.5.xml:446
  #, fuzzy
  msgid ""
  "names the codename to which all the packages in the directory tree belong.  "
@@@ -6782,7 -5460,7 +5461,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:455
  #, fuzzy, no-wrap
  msgid "Pin: release n=&testing-codename;\n"
  msgstr ""
@@@ -6790,7 -5468,7 +5469,7 @@@
  "Pin: release a=stable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
- #: apt_preferences.5.xml:461
+ #: apt_preferences.5.xml:462
  #, fuzzy
  msgid ""
  "names the release version.  For example, the packages in the tree might "
@@@ -6807,7 -5485,7 +5486,7 @@@ msgstr "
  "das linhas a seguir."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:470
+ #: apt_preferences.5.xml:471
  #, fuzzy, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -6820,13 -5498,13 +5499,13 @@@ msgstr "
  "Pin: release 3.0\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:479
+ #: apt_preferences.5.xml:480
  #, 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:480
+ #: apt_preferences.5.xml:481
  #, fuzzy
  msgid ""
  "names the licensing component associated with the packages in the directory "
@@@ -6845,7 -5523,7 +5524,7 @@@ msgstr "
  "requerer a linha :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:489
+ #: apt_preferences.5.xml:490
  #, fuzzy, no-wrap
  msgid "Pin: release c=main\n"
  msgstr ""
@@@ -6853,13 -5531,13 +5532,13 @@@
  "Pin: release c=main\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:495
+ #: apt_preferences.5.xml:496
  #, 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:496
+ #: apt_preferences.5.xml:497
  #, fuzzy
  msgid ""
  "names the originator of the packages in the directory tree of the "
@@@ -6873,7 -5551,7 +5552,7 @@@ msgstr "
  "requerer a linha :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
- #: apt_preferences.5.xml:502
+ #: apt_preferences.5.xml:503
  #, fuzzy, no-wrap
  msgid "Pin: release o=Debian\n"
  msgstr ""
@@@ -6881,13 -5559,13 +5560,13 @@@
  "Pin: release o=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
- #: apt_preferences.5.xml:508
+ #: apt_preferences.5.xml:509
  #, 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:509
+ #: apt_preferences.5.xml:510
  #, fuzzy
  msgid ""
  "names the label of the packages in the directory tree of the "
@@@ -6900,7 -5578,7 +5579,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:515
+ #: apt_preferences.5.xml:516
  #, fuzzy, no-wrap
  msgid "Pin: release l=Debian\n"
  msgstr ""
@@@ -6908,7 -5586,7 +5587,7 @@@
  "Pin: release l=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:416
+ #: apt_preferences.5.xml:417
  #, fuzzy
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
@@@ -6932,7 -5610,7 +5611,7 @@@ msgstr "
  "do APT :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:522
+ #: apt_preferences.5.xml:523
  #, fuzzy
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
@@@ -6958,13 -5636,13 +5637,13 @@@ msgstr "
  "<literal>unstable</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:535
+ #: apt_preferences.5.xml:536
  #, 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:537
+ #: apt_preferences.5.xml:538
  #, fuzzy
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
@@@ -6976,13 -5654,13 +5655,13 @@@ msgstr "
  "</literal>. Isto oferece um local para inserir comentários."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:546
+ #: apt_preferences.5.xml:547
  #, fuzzy
  msgid "Tracking Stable"
  msgstr "Acompanhando a Stable"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:554
+ #: apt_preferences.5.xml:555
  #, fuzzy, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -7007,7 -5685,7 +5686,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:548
+ #: apt_preferences.5.xml:549
  #, fuzzy
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
@@@ -7023,8 -5701,8 +5702,8 @@@ msgstr "
  "outras distribuições <literal>Debian</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:571 apt_preferences.5.xml:617
- #: apt_preferences.5.xml:675
+ #: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+ #: apt_preferences.5.xml:676
  #, fuzzy, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -7037,7 -5715,7 +5716,7 @@@ msgstr "
  "apt-get dist-upgrade\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:566
+ #: apt_preferences.5.xml:567
  #, fuzzy
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
@@@ -7050,7 -5728,7 +5729,7 @@@ msgstr "
  "ulítma(s) versão(ôes) <literal>stable</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:583
+ #: apt_preferences.5.xml:584
  #, fuzzy, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/testing\n"
  msgstr ""
@@@ -7058,7 -5736,7 +5737,7 @@@
  "apt-get install <replaceable>pacote</replaceable>/testing\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:577
+ #: apt_preferences.5.xml:578
  #, fuzzy
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
@@@ -7071,13 -5749,13 +5750,13 @@@ msgstr "
  "atualizado novamente a menos que esse comando seja executado novamente."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:589
+ #: apt_preferences.5.xml:590
  #, fuzzy
  msgid "Tracking Testing or Unstable"
  msgstr "Acompanhando a Testing"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:598
+ #: apt_preferences.5.xml:599
  #, fuzzy, no-wrap
  msgid ""
  "Package: *\n"
@@@ -7106,7 -5784,7 +5785,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:591
+ #: apt_preferences.5.xml:592
  #, fuzzy
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
@@@ -7123,7 -5801,7 +5802,7 @@@ msgstr "
  "versões de pacotes de outras distribuições <literal>Debian</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:612
+ #: apt_preferences.5.xml:613
  #, fuzzy
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
@@@ -7136,7 -5814,7 +5815,7 @@@ msgstr "
  "(s) última(s) versão(ões) <literal>testing</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:632
+ #: apt_preferences.5.xml:633
  #, fuzzy, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
  msgstr ""
@@@ -7144,7 -5822,7 +5823,7 @@@
  "apt-get install <replaceable>pacote</replaceable>/unstable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:623
+ #: apt_preferences.5.xml:624
  #, fuzzy
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
@@@ -7164,12 -5842,12 +5843,12 @@@ msgstr "
  "recente que a versão instalada."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:639
+ #: apt_preferences.5.xml:640
  msgid "Tracking the evolution of a codename release"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:653
+ #: apt_preferences.5.xml:654
  #, fuzzy, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -7199,7 -5877,7 +5878,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:641
+ #: apt_preferences.5.xml:642
  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 "
@@@ -7214,7 -5892,7 +5893,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:670
+ #: apt_preferences.5.xml:671
  #, fuzzy
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
@@@ -7227,7 -5905,7 +5906,7 @@@ msgstr "
  "ulítma(s) versão(ôes) <literal>stable</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
- #: apt_preferences.5.xml:690
+ #: apt_preferences.5.xml:691
  #, fuzzy, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/sid\n"
  msgstr ""
@@@ -7235,7 -5913,7 +5914,7 @@@
  "apt-get install <replaceable>pacote</replaceable>/testing\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:681
+ #: apt_preferences.5.xml:682
  #, fuzzy
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
@@@ -7255,22 -5933,17 +5934,17 @@@ msgstr "
  "recente que a versão instalada."
  
  #. type: Content of: <refentry><refsect1><variablelist>
- #: apt_preferences.5.xml:699
+ #: apt_preferences.5.xml:700
  #, fuzzy
  msgid "&file-preferences;"
  msgstr "apt_preferences"
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt_preferences.5.xml:705
+ #: apt_preferences.5.xml:706
  #, fuzzy
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
- #. type: Content of: <refentry><refnamediv><refname>
- #: sources.list.5.xml:25 sources.list.5.xml:32
- msgid "sources.list"
- msgstr ""
- 
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: sources.list.5.xml:33
  msgid "Package resource list for APT"
@@@ -7346,7 -6019,7 +6020,7 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><literallayout>
  #: sources.list.5.xml:81
  #, no-wrap
- msgid "deb uri distribution [component1] [component2] [...]"
+ msgid "deb [ options ] uri distribution [component1] [component2] [...]"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -7391,6 -6064,38 +6065,38 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:112
  msgid ""
+ "<literal>options</literal> is always optional and needs to be surounded by "
+ "square brackets. It can consist of multiple settings in the form "
+ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+ "replaceable></literal>.  Multiple settings are separated by spaces. The "
+ "following settings are supported by APT, note though that unsupported "
+ "settings will be ignored silently:"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:117
+ msgid ""
+ "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+ "replaceable>,…</literal> can be used to specify for which architectures "
+ "packages information should be downloaded. If this option is not set all "
+ "architectures defined by the <literal>APT::Architectures</literal> option "
+ "will be downloaded."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+ #: sources.list.5.xml:121
+ msgid ""
+ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+ "this source are always authenticated even if the <filename>Release</"
+ "filename> file is not signed or the signature can't be checked. This "
+ "disables parts of &apt-secure; and should therefore only be used in a local "
+ "and trusted context. <literal>trusted=no</literal> is the opposite which "
+ "handles even correctly authenticated sources as not authenticated."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:128
+ msgid ""
  "It is important to list sources in order of preference, with the most "
  "preferred source listed first. Typically this will result in sorting by "
  "speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@@ -7398,13 -6103,13 +6104,13 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:117
+ #: sources.list.5.xml:133
  #, fuzzy
  msgid "Some examples:"
  msgstr "Exemplos"
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:119
+ #: sources.list.5.xml:135
  #, no-wrap
  msgid ""
  "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@@ -7413,32 -6118,42 +6119,42 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><title>
- #: sources.list.5.xml:125
+ #: sources.list.5.xml:141
  msgid "URI specification"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:130
+ #: sources.list.5.xml:146
  msgid "file"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:132
+ #: sources.list.5.xml:148
  msgid ""
  "The file scheme allows an arbitrary directory in the file system to be "
  "considered an archive. This is useful for NFS mounts and local mirrors or "
  "archives."
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:153
+ msgid "cdrom"
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:139
+ #: sources.list.5.xml:155
  msgid ""
  "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
  "Use the &apt-cdrom; program to create cdrom entries in the source list."
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:160
+ msgid "http"
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:146
+ #: sources.list.5.xml:162
  msgid ""
  "The http scheme specifies an HTTP server for the archive. If an environment "
  "variable <envar>http_proxy</envar> is set with the format http://server:"
@@@ -7448,8 -6163,13 +6164,13 @@@
  "authentication."
  msgstr ""
  
+ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+ #: sources.list.5.xml:171
+ msgid "ftp"
+ msgstr ""
+ 
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:157
+ #: sources.list.5.xml:173
  msgid ""
  "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
  "is highly configurable; for more information see the &apt-conf; manual page. "
@@@ -7461,12 -6181,12 +6182,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:166
+ #: sources.list.5.xml:182
  msgid "copy"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:168
+ #: sources.list.5.xml:184
  msgid ""
  "The copy scheme is identical to the file scheme except that packages are "
  "copied into the cache directory instead of used directly at their location.  "
@@@ -7474,17 -6194,17 +6195,17 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "rsh"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:173
+ #: sources.list.5.xml:189
  msgid "ssh"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:175
+ #: sources.list.5.xml:191
  msgid ""
  "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
  "user and access the files. It is a good idea to do prior arrangements with "
@@@ -7494,12 -6214,12 +6215,12 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: sources.list.5.xml:183
+ #: sources.list.5.xml:199
  msgid "more recognizable URI types"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: sources.list.5.xml:185
+ #: sources.list.5.xml:201
  msgid ""
  "APT can be extended with more methods shipped in other optional packages "
  "which should follow the nameing scheme <literal>apt-transport-"
@@@ -7512,75 -6232,91 +6233,91 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:127
+ #: sources.list.5.xml:143
  msgid ""
  "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
  "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:199
+ #: sources.list.5.xml:215
  msgid ""
  "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
  "stable/main, stable/contrib, and stable/non-free."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:201
+ #: sources.list.5.xml:217
  #, no-wrap
  msgid "deb file:/home/jason/debian stable main contrib non-free"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:203
+ #: sources.list.5.xml:219
  msgid "As above, except this uses the unstable (development) distribution."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:204
+ #: sources.list.5.xml:220
  #, no-wrap
  msgid "deb file:/home/jason/debian unstable main contrib non-free"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:206
+ #: sources.list.5.xml:222
  msgid "Source line for the above"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:207
+ #: sources.list.5.xml:223
  #, no-wrap
  msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:209
+ #: sources.list.5.xml:225
+ msgid ""
+ "The first line gets package information for the architectures in "
+ "<literal>APT::Architectures</literal> while the second always retrieves "
+ "<literal>amd64</literal> and <literal>armel</literal>."
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><literallayout>
+ #: sources.list.5.xml:227
+ #, no-wrap
+ msgid ""
+ "deb http://ftp.debian.org/debian &stable-codename; main\n"
+ "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+ msgstr ""
+ 
+ #. type: Content of: <refentry><refsect1><para>
+ #: sources.list.5.xml:230
  msgid ""
  "Uses HTTP to access the archive at archive.debian.org, and uses only the "
  "hamm/main area."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:211
+ #: sources.list.5.xml:232
  #, no-wrap
  msgid "deb http://archive.debian.org/debian-archive hamm main"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:213
+ #: sources.list.5.xml:234
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the &stable-codename;/contrib area."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:215
+ #: sources.list.5.xml:236
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:217
+ #: sources.list.5.xml:238
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the unstable/contrib area. If this line appears as "
@@@ -7589,19 -6325,19 +6326,19 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><literallayout>
- #: sources.list.5.xml:221
+ #: sources.list.5.xml:242
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian unstable contrib"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
- #: sources.list.5.xml:230
+ #: sources.list.5.xml:251
  #, no-wrap
  msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:223
+ #: sources.list.5.xml:244
  msgid ""
  "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
  "directory, and uses only files found under <filename>unstable/binary-i386</"
@@@ -7613,7 -6349,7 +6350,7 @@@
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
- #: sources.list.5.xml:235
+ #: sources.list.5.xml:256
  #, fuzzy
  msgid "&apt-cache; &apt-conf;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@@ -7750,6 -6486,11 +6487,11 @@@ msgid "
  "packages for installation."
  msgstr ""
  
+ #. type: <heading></heading>
+ #: guide.sgml:96
+ msgid "apt-get"
+ msgstr ""
+ 
  #. type: <p></p>
  #: guide.sgml:102
  msgid ""
@@@ -7786,6 -6527,11 +6528,11 @@@ msgstr "
  msgid "Once updated there are several commands that can be used:"
  msgstr ""
  
+ #. type: <tag></tag>
+ #: guide.sgml:121
+ msgid "upgrade"
+ msgstr ""
+ 
  #. type: <p></p>
  #: guide.sgml:131
  msgid ""
@@@ -7798,6 -6544,11 +6545,11 @@@
  "<tt>apt-get install</tt> can be used to force these packages to install."
  msgstr ""
  
+ #. type: <tag></tag>
+ #: guide.sgml:131
+ msgid "install"
+ msgstr ""
+ 
  #. type: <p></p>
  #: guide.sgml:140
  msgid ""
@@@ -7810,6 -6561,11 +6562,11 @@@
  "anything other than its arguments are changed."
  msgstr ""
  
+ #. type: <tag></tag>
+ #: guide.sgml:140
+ msgid "dist-upgrade"
+ msgstr ""
+ 
  #. type: <p></p>
  #: guide.sgml:149
  msgid ""
@@@ -8675,6 -7431,35 +7432,35 @@@ msgstr "
  msgid "Which will use the already fetched archives on the disc."
  msgstr ""
  
+ #, fuzzy
+ #~ msgid "&apt-author.team; &apt-email; &apt-product;"
+ #~ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+ 
+ #, fuzzy
+ #~ msgid ""
+ #~ "<!-- Boiler plate docinfo section -->\n"
+ #~ "<!ENTITY apt-docinfo \"\n"
+ #~ " <refentryinfo>\n"
+ #~ "   <address><email>apt@packages.debian.org</email></address>\n"
+ #~ "   <author>\n"
+ #~ "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+ #~ "     <contrib></contrib>\n"
+ #~ "   </author>\n"
+ #~ "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+ #~ "copyright>\n"
+ #~ "   <date>28 October 2008</date>\n"
+ #~ "   <productname>Linux</productname>\n"
+ #~ " </refentryinfo>\n"
+ #~ "\">\n"
+ #~ msgstr ""
+ #~ "\n"
+ #~ " <docinfo>\n"
+ #~ "   <address><email>apt@packages.debian.org</></address>\n"
+ #~ "   <author><firstname>Jason</> <surname>Gunthorpe</></>\n"
+ #~ "   <copyright><year>1998-2001</> <holder>Jason Gunthorpe</></>\n"
+ #~ "   <date>12 Março 2001</>\n"
+ #~ " </docinfo>\n"
+ 
  #, fuzzy
  #~ msgid "to the version that is already installed (if any)."
  #~ msgstr "para a instância que já esteja instalada (caso exista)."
@@@ -8691,26 -7476,6 +7477,6 @@@
  #~ "menos o último valor especificado em uma linha iniciando com <literal>Pin-"
  #~ "Priority: release ...</literal>."
  
- #, fuzzy
- #~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
- #~ msgstr "<filename>/etc/apt.conf</>"
- 
- #, fuzzy
- #~ msgid "/usr/share/doc/apt/"
- #~ msgstr "/usr/share/doc/apt/"
- 
- #, fuzzy
- #~ msgid "<filename>&docdir;examples/configure-index.gz</>"
- #~ msgstr "<filename>&docdir;examples/configure-index.gz</>"
- 
- #, fuzzy
- #~ msgid "/var/lib/apt"
- #~ msgstr "/var/lib/apt"
- 
- #, fuzzy
- #~ msgid "/var/cache/apt"
- #~ msgstr "/var/cache/apt"
- 
  #, fuzzy
  #~ msgid ""
  #~ "\n"
@@@ -8763,14 -7528,6 +7529,6 @@@
  #~ "     de configuração arbitrária. A sintaxe é <option>-o Foo::Bar=bar</>.\n"
  #~ "     </VarListEntry>\n"
  
- #, fuzzy
- #~ msgid "<manvolnum>5</manvolnum>"
- #~ msgstr "<manvolnum>5</manvolnum>"
- 
  #, fuzzy
  #~ msgid "</programlisting> Then:"
  #~ msgstr "</programlisting> Então :"
- 
- #, fuzzy
- #~ msgid "&manbugs; &manauthor;"
- #~ msgstr "&manbugs; &manauthor;"