merged the lp:~mvo/apt/mvo branch

diff --combined apt-pkg/contrib/fileutl.cc
index 767951daf14a4e2eead649dc829e9ec44daa3fa1,935c4bebfdf0909f9184168a75f3f21e7cf59a02..50019872e3d3e16fbe81df2698025644e5eac4b3
--- 1/apt-pkg/contrib/fileutl.cc
--- 2/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@@ -42,11 -42,6 +42,11 @@@
  #include <errno.h>
  #include <set>
  #include <algorithm>
 +
 +#include <config.h>
 +#ifdef WORDS_BIGENDIAN
 +#include <inttypes.h>
 +#endif
                                                                        /*}}}*/
  
  using namespace std;
@@@ -67,6 -62,15 +67,15 @@@ bool RunScripts(const char *Cnf
     // This is the child
     if (Child == 0)
     {
+       if (_config->FindDir("DPkg::Chroot-Directory","/") != "/") 
+       {
+          std::cerr << "Chrooting into " 
+                    << _config->FindDir("DPkg::Chroot-Directory") 
+                    << std::endl;
+          if (chroot(_config->FindDir("DPkg::Chroot-Directory","/").c_str()) != 0)
+             _exit(100);
+       }
+ 
        if (chdir("/tmp/") != 0)
         _exit(100);
         
@@@ -967,16 -971,9 +976,16 @@@ unsigned long FileFd::Size(
         off_t orig_pos = lseek(iFd, 0, SEEK_CUR);
         if (lseek(iFd, -4, SEEK_END) < 0)
           return _error->Errno("lseek","Unable to seek to end of gzipped file");
 +       size = 0L;
         if (read(iFd, &size, 4) != 4)
           return _error->Errno("read","Unable to read original size of gzipped file");
 -       size &= 0xFFFFFFFF;
 +
 +#ifdef WORDS_BIGENDIAN
 +       uint32_t tmp_size = size;
 +       uint8_t const * const p = (uint8_t const * const) &tmp_size;
 +       tmp_size = (p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0];
 +       size = tmp_size;
 +#endif
  
         if (lseek(iFd, orig_pos, SEEK_SET) < 0)
           return _error->Errno("lseek","Unable to seek in gzipped file");

diff --combined apt-pkg/deb/dpkgpm.cc
index 7b0955b96bd8390849df74f5474116d4b5fa81d3,5747f11643cbc6ec335e1cedfedac843ca2602bb..eb9abe909fef1d4b2505a4579842f096443cec27
--- 1/apt-pkg/deb/dpkgpm.cc
--- 2/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -308,6 -308,15 +308,15 @@@ bool pkgDPkgPM::RunScriptsWithPkgs(cons
         SetCloseExec(STDIN_FILENO,false);      
         SetCloseExec(STDERR_FILENO,false);
  
+        if (_config->FindDir("DPkg::Chroot-Directory","/") != "/") 
+        {
+           std::cerr << "Chrooting into " 
+                     << _config->FindDir("DPkg::Chroot-Directory") 
+                     << std::endl;
+           if (chroot(_config->FindDir("DPkg::Chroot-Directory","/").c_str()) != 0)
+              _exit(100);
+        }
+ 
         const char *Args[4];
         Args[0] = "/bin/sh";
         Args[1] = "-c";
@@@ -881,10 -890,7 +890,10 @@@ bool pkgDPkgPM::Go(int OutStatusFd
  
        // Generate the argument list
        const char *Args[MaxArgs + 50];
 -      
 +      // keep track of allocated strings for multiarch package names
 +      char *Packages[MaxArgs + 50];
 +      unsigned int pkgcount = 0;
 +
        // Now check if we are within the MaxArgs limit
        //
        // this code below is problematic, because it may happen that
@@@ -992,20 -998,13 +1001,20 @@@
        }      
        else
        {
 +       string const nativeArch = _config->Find("APT::Architecture");
         for (;I != J && Size < MaxArgBytes; I++)
         {
            if((*I).Pkg.end() == true)
               continue;
            if (I->Op == Item::Configure && disappearedPkgs.find(I->Pkg.Name()) != disappearedPkgs.end())
               continue;
 -          Args[n++] = I->Pkg.Name();
 +          if (I->Pkg.Arch() == nativeArch || !strcmp(I->Pkg.Arch(), "all"))
 +             Args[n++] = I->Pkg.Name();
 +          else
 +          {
 +             Packages[pkgcount] = strdup(I->Pkg.FullName(false).c_str());
 +             Args[n++] = Packages[pkgcount++];
 +          }
            Size += strlen(Args[n-1]);
         }       
        }      
@@@ -1155,11 -1154,6 +1164,11 @@@
        sigemptyset(&sigmask);
        sigprocmask(SIG_BLOCK,&sigmask,&original_sigmask);
  
 +      /* clean up the temporary allocation for multiarch package names in
 +         the parent, so we don't leak memory when we return. */
 +      for (unsigned int i = 0; i < pkgcount; i++)
 +       free(Packages[i]);
 +
        // the result of the waitpid call
        int res;
        int select_ret;

diff --combined debian/changelog
index 238d9d63eb312abef2061783628b51d1a668a7e3,fba16811010350655bfc67a565a7c025f82aea7f..32b74267c3555601609d36a93016422c99f6d1ff
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,137 -1,31 +1,149 @@@
- apt (0.8.11.6) UNRELEASED; urgency=low
+ apt (0.8.12) UNRELEASED; urgency=low
+ 
+   [ Michael Vogt ]
 -  * merged lp:~evfool/apt/fix641673:
 -    - String-fix in the source and the translations for the grammatical 
 -      mistake reported in bug LP: #641673, thanks to Robert Roth
 -  * merged lp:~evfool/apt/fix418552:
 -    - Grammar fix for bug LP: #418552, thanks to Robert Roth
+   * 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
+   * apt-pkg/contrib/cdromutl.{cc,h}, apt-pkg/cdrom.{cc,h}:
+     - deal with missing FSTAB_DIR when using libudev to discover cdrom
+     - add experimental APT::cdrom::CdromOnly option (on by default). 
+       When this is set to false apt-cdrom will handle any removable
+       deivce (like a usb-stick) as a "cdrom/dvd" source
  
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Feb 2011 17:37:56 +0100
 +  [ Christian Perrier ]
 +  * Fix error in French translation of manpages (apt_preferences(5)).
 +    Merci, Rémi Vanicat. Closes: #613689
 +  * Complete French manpage translation
 +  * Italian translation update (Milo Casagrande). Closes: #614395
 +
 +  [ David Kalnischkies ]
 +  * ftparchive/multicompress.cc, apt-inst/deb/debfile.cc:
 +    - support xz compressor to create xz-compressed Indexes and be able
 +      to open data.tar.xz files
 +    - load the supported compressors from configuration
 +  * ftparchive/writer.cc:
 +    - ensure that Date and Valid-Until time strings are not localised
 +    - add options to disable specific checksums for Indexes
 +    - include xz-compressed Packages and Sources files in Release file
 +  * apt-pkg/aptconfiguration.cc:
 +    - support download of xz-compressed indexes files
 +    - support adding new compressors by configuration
 +  * apt-pkg/deb/debsrcrecords.cc:
 +    - support xz-compressed source v3 debian.tar files
 +    - support every compression we have a compressor configured
 +  * ftparchive/contents.cc:
 +    - remove ExtractArchive codecopy from apt-inst/deb/debfile.cc
 +  * apt-inst/deb/debfile.cc:
 +    - support data.tar's compressed with any configured compressor
 +  * cmdline/apt-get.cc:
 +    - reinstall dependencies of reinstalled "garbage" (Closes: #617257)
 +
 +  [ Steve Langasek ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - make sure that for multiarch packages, we are passing the full
 +      qualified package name to dpkg for removals. (Closes: #614298)
 +  * Remove the "pseudopackage" handling of Architecture: all packages for
 +    Multi-Arch; instead, Arch: all packages only satisfy dependencies for
 +    the native arch, except where the Arch: all package is declared
 +    Multi-Arch: foreign.  (Closes: #613584)
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 08 Mar 2011 19:20:56 +0100
  
 -apt (0.8.11) UNRELEASED; urgency=low
 +apt (0.8.11.5) unstable; urgency=low
 +
 +  [ Christian Perrier ]
 +  * Add missing dot in French translation of manpages. Merci, Olivier
 +    Humbert.
 +  * French translation update
 +  * French manpages translation update
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/depcache.cc:
 +    - party revert fix in 0.8.11.2 which marked all packages as manual
 +      installed if the FromUser bit is set in the MarkInstall call.
 +      The default for this bit is true and aptitude depends on the old
 +      behavior so the package is only marked as manual if its not marked
 +      ("old" behavior) or if automatic installation is enabled - which
 +      aptitude disables always (see also #613775)
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 17 Feb 2011 15:16:31 +0100
 +
 +apt (0.8.11.4) unstable; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/contrib/error.cc:
 +    - ensure that va_list is not invalid in second try
 +  * cmdline/apt-get.cc:
 +    - don't remove new dependencies of garbage packages (Closes: #613420)
 +  
 +  [ Michael Vogt ]
 +  * test/integration/*
 +    - fix dashish in the integration tests
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 16 Feb 2011 14:36:03 +0100
 +
 +apt (0.8.11.3) unstable; urgency=low
 +
 +  * apt-pkg/contrib/fileutl.cc:
 +    - really detect bigendian machines by including config.h,
 +      so we can really (Closes: #612986)
 +  * apt-pkg/contrib/mmap.cc:
 +    - Base has as 'valid' failure states 0 and -1 so add a simple
 +      validData method to check for failure states
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 14 Feb 2011 16:58:03 +0100
 +
 +apt (0.8.11.2) unstable; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merged lp:~evfool/apt/fix641673:
 +    - String-fix in the source and the translations for the grammatical 
 +      mistake reported in bug LP: #641673, thanks to Robert Roth
 +  * merged lp:~evfool/apt/fix418552:
 +    - Grammar fix for bug LP: #418552, thanks to Robert Roth
 +  
 +  [ David Kalnischkies ]
 +  * cmdline/apt-get.cc:
 +    - add --install-suggests option (Closes: #473089)
 +  * apt-pkg/depcache.cc:
 +    - mark a package which was requested to be installed on commandline
 +      always as manual regardless if it is already marked or not as the
 +      marker could be lost later by the removal of rdepends (Closes: #612557)
 +  * methods/rred.cc:
 +    - read patch into MMap only if we work on uncompressed patches
 +    - update size of dynamic MMap as we write in from the outside
 +  * apt-pkg/contrib/mmap.cc:
 +    - do not try to free the mapping if its is unset
 +  * apt-pkg/contrib/fileutl.cc:
 +    - reorder the loaded filesize bytes for big endian (Closes: #612986)
 +      Thanks to Jörg Sommer for the detailed analyse!
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 14 Feb 2011 12:07:18 +0100
 +
 +apt (0.8.11.1) unstable; urgency=low
 +
 +  [ Stefan Lippers-Hollmann ]
 +  * cmdline/apt-key:
 +    - fix root test which prevented setting of trustdb-name
 +      which lets gpg fail if it adds/remove keys from trusted.gpg
 +      as it tries to open the (maybe) not existent /root/.gnupg
 +
 +  [ David Kalnischkies ]
 +  * debian/apt.symbols:
 +    - add more arch dependent symbols
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 09 Feb 2011 17:49:59 +0100
 +
 +apt (0.8.11) unstable; urgency=low
  
    [ David Kalnischkies ]
    * apt-pkg/depcache.cc:
      - add SetCandidateRelease() to set a candidate version and
        the candidates of dependencies if needed to a specified
        release (Closes: #572709)
 +    - allow conflicts in the same group again (Closes: #612099)
    * cmdline/apt-get.cc:
      - if --print-uris is used don't setup downloader as we don't need
        progress, lock nor the directories it would create otherwise
@@@ -143,8 -37,6 +155,8 @@@
        so installing packages from experimental or backports is easier
      - really do not show packages in the extra section if they were
        requested on the commandline, e.g. with a modifier (Closes: #184730)
 +    - always do removes first and set not installed remove packages
 +      on hold to prevent temporary installation later (Closes: #549968)
    * debian/control:
      - add Vcs-Browser now that loggerhead works again (Closes: #511168)
      - depend on debhelper 7 to raise compat level
@@@ -171,7 -63,6 +183,7 @@@
      - remove duplicated mentioning of --install-recommends
    * doc/sources.list.5.xml:
      - remove obsolete references to non-us (Closes: #594495)
 +    - a notice is printed for ignored files (Closes: #597615)
    * debian/rules:
      - use -- instead of deprecated -u for dh_gencontrol
      - remove shlibs.local creation and usage
@@@ -200,19 -91,6 +212,19 @@@
      - print a good error message if FileSize() is zero
    * apt-pkg/aptconfiguration.cc:
      - remove the inbuilt Translation files whitelist
 +  * cmdline/apt-cache.cc:
 +    - remove not implemented 'apt-cache add' command
 +  * doc/apt-cache.8.xml:
 +    - describe reality as apt-cache just queries and doesn't manipulate
 +      the caches. Thanks to Enrico Zini for spotting it! (Closes: #612009)
 +  * apt-pkg/algorithms.cc:
 +    - mark pseudo packages of installed all packages as configured
 +      in the simulation as we don't call configure for these packages
 +  * apt-pkg/pkgcachegen.cc:
 +    - in multiarch, let :all packages conflict with :any packages
 +      with a different version to be sure
 +  * apt-pkg/contrib/error.cc:
 +    - remove 400 char size limit of error messages (LP: #365611)
  
    [ Michael Vogt ]
    * methods/http.cc:
@@@ -223,9 -101,6 +235,9 @@@
        to Guillem Jover
    * apt-pkg/cdrom.cc, apt-pkg/init.cc, methods/cdrom.cc:
      - use /media/cdrom as default mountoint (closes: #611569)
 +  * cmdline/apt-get.cc:
 +    - add apt-get changelog (closes: #526990)
 +    - add apt-get download (closes: #82738)
  
    [ Martin Pitt ]
    * test/integration/test-compressed-indexes, test/test-indexes.sh:
@@@ -233,7 -108,7 +245,7 @@@
        will actually test uncompressed indexes regardless of the internal
        default value of Acquire::GzipIndexes.
  
 - -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 28 Jan 2011 12:22:25 +0100
 + -- Michael Vogt <mvo@debian.org>  Tue, 08 Feb 2011 12:58:12 +0100
  
  apt (0.8.10.3) unstable; urgency=low
  

diff --combined doc/po/fr.po
index 660bc740a40a5da439a315d597bec68a983d08b7,cd95d172780ec2d325cdfe7a9bb7c4dc789531a2..e2216cf311782345304c29f5cb6e80029d137cc4
--- 1/doc/po/fr.po
--- 2/doc/po/fr.po
+++ b/doc/po/fr.po
@@@ -5,12 -5,12 +5,12 @@@
  # Translators:
  # Jérôme Marant, 2000.
  # Philippe Batailler, 2005.
 -# Christian Perrier <bubulle@debian.org>, 2009, 2010.
 +# Christian Perrier <bubulle@debian.org>, 2009, 2010, 2011.
  msgid ""
  msgstr ""
  "Project-Id-Version: \n"
 -"POT-Creation-Date: 2010-11-30 10:38+0100\n"
 -"PO-Revision-Date: 2010-10-30 09:41+0200\n"
 +"POT-Creation-Date: 2011-02-14 13:42+0100\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"
  "Language: \n"
@@@ -646,23 -646,21 +646,20 @@@ msgid "
  "\">\n"
  msgstr ""
  "<!ENTITY translation-english \"\n"
 -"     Veuillez noter que cette traduction peut contenir des parties non traduites\n"
 +"     Veuillez noter que cette traduction peut contenir des parties non traduites.\n"
  "     Cela est volontaire, pour éviter de perdre du contenu quand la\n"
  "     traduction est légèrement en retard sur le contenu d'origine.\n"
  "\">\n"
  
- #.  The last update date
+ #.  The last update date 
  #. type: Content of: <refentry><refentryinfo>
 -#: apt-cache.8.xml:16 apt-config.8.xml:16 apt-extracttemplates.1.xml:16
 -#: apt-sortpkgs.1.xml:16 sources.list.5.xml:16
 +#: apt-cache.8.xml:16
- #| 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>29 "
 -"February 2004</date>"
 +"&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>29 "
 -"février 2004</date>"
 +"&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
@@@ -686,68 -684,55 +683,53 @@@ msgstr "APT
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-cache.8.xml:33
 -msgid "APT package handling utility -- cache manipulator"
 -msgstr "Gestionnaire de paquets APT - manipulation du cache"
 +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>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>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="
 +"<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>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="
 +"<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>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>"
 +"<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="
 -"choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
 -"\"><replaceable>fichier</replaceable></arg></arg> <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>"
++"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>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquets</"
 -"replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
 -"\"><replaceable>paquets</replaceable></arg></arg> </group>"
++"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:65 apt-cdrom.8.xml:50 apt-config.8.xml:50
 +#: 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:55 apt-secure.8.xml:43
  #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
@@@ -756,7 -741,7 +738,7 @@@ msgid "Description
  msgstr "Description"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-cache.8.xml:66
 +#: apt-cache.8.xml:65
  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 "
@@@ -769,7 -754,7 +751,7 @@@ msgstr "
  "desquelles il extrait les informations intéressantes."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-cache.8.xml:71 apt-get.8.xml:120
 +#: apt-cache.8.xml:70 apt-get.8.xml:120
  msgid ""
  "Unless the <option>-h</option>, or <option>--help</option> option is given, "
  "one of the commands below must be present."
@@@ -778,12 -763,26 +760,12 @@@ msgstr "
  "donnée, l'une des commandes suivantes doit être présente."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:75
 -msgid "add <replaceable>file(s)</replaceable>"
 -msgstr "add <replaceable>fichier(s)</replaceable>"
 -
 -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-cache.8.xml:76
 -msgid ""
 -"<literal>add</literal> adds the named package index files to the package "
 -"cache.  This is for debugging only."
 -msgstr ""
 -"La commande <literal>add</literal> ajoute des fichiers indexant des paquets "
 -"au cache des paquets. Cela sert uniquement pour le débogage."
 -
 -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:80
 +#: apt-cache.8.xml:74
  msgid "gencaches"
  msgstr "gencaches"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-cache.8.xml:81
 +#: apt-cache.8.xml:75
  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 "
@@@ -795,12 -794,12 +777,12 @@@ msgstr "
  "lib/dpkg/status</filename>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:87
 +#: apt-cache.8.xml:81
  msgid "showpkg <replaceable>pkg(s)</replaceable>"
  msgstr "showpkg <replaceable>paquet(s)</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-cache.8.xml:88
 +#: apt-cache.8.xml:82
  msgid ""
  "<literal>showpkg</literal> displays information about the packages listed on "
  "the command line. Remaining arguments are package names. The available "
@@@ -824,7 -823,7 +806,7 @@@ msgstr "
  "résultat :"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 -#: apt-cache.8.xml:100
 +#: apt-cache.8.xml:94
  #, no-wrap
  msgid ""
  "Package: libreadline2\n"
@@@ -850,7 -849,7 +832,7 @@@ msgstr "
  "Reverse Provides: \n"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-cache.8.xml:112
 +#: apt-cache.8.xml:106
  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, "
@@@ -869,12 -868,12 +851,12 @@@ msgstr "
  "consulter le code source d'APT."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:121
 +#: apt-cache.8.xml:115
  msgid "stats"
  msgstr "stats"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-cache.8.xml:121
 +#: apt-cache.8.xml:115
  msgid ""
  "<literal>stats</literal> displays some statistics about the cache.  No "
  "further arguments are expected. Statistics reported are:"
@@@ -884,7 -883,7 +866,7 @@@ msgstr "
  "rapportées :"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 -#: apt-cache.8.xml:124
 +#: apt-cache.8.xml:118
  msgid ""
  "<literal>Total package names</literal> is the number of package names found "
  "in the cache."
@@@ -893,7 -892,7 +875,7 @@@ msgstr "
  "le cache."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 -#: apt-cache.8.xml:128
 +#: apt-cache.8.xml:122
  msgid ""
  "<literal>Normal packages</literal> is the number of regular, ordinary "
  "package names; these are packages that bear a one-to-one correspondence "
@@@ -906,7 -905,7 +888,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:134
 +#: apt-cache.8.xml:128
  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 "
@@@ -924,7 -923,7 +906,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:142
 +#: apt-cache.8.xml:136
  msgid ""
  "<literal>Single virtual packages</literal> is the number of packages with "
  "only one package providing a particular virtual package. For example, in the "
@@@ -937,7 -936,7 +919,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:148
 +#: apt-cache.8.xml:142
  msgid ""
  "<literal>Mixed virtual packages</literal> is the number of packages that "
  "either provide a particular virtual package or have the virtual package name "
@@@ -950,7 -949,7 +932,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:155
 +#: apt-cache.8.xml:149
  msgid ""
  "<literal>Missing</literal> is the number of package names that were "
  "referenced in a dependency but were not provided by any package. Missing "
@@@ -965,7 -964,7 +947,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:162
 +#: apt-cache.8.xml:156
  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 "
@@@ -980,7 -979,7 +962,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:169
 +#: apt-cache.8.xml:163
  msgid ""
  "<literal>Total dependencies</literal> is the number of dependency "
  "relationships claimed by all of the packages in the cache."
@@@ -989,12 -988,12 +971,12 @@@ msgstr "
  "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:176
 +#: 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:177
 +#: apt-cache.8.xml:171
  msgid ""
  "<literal>showsrc</literal> displays all the source package records that "
  "match the given package names. All versions are shown, as well as all "
@@@ -1005,12 -1004,12 +987,12 @@@ msgstr "
  "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:182 apt-config.8.xml:87
 +#: 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:183
 +#: apt-cache.8.xml:177
  msgid ""
  "<literal>dump</literal> shows a short listing of every package in the cache. "
  "It is primarily for debugging."
@@@ -1019,12 -1018,12 +1001,12 @@@ msgstr "
  "paquet du cache. Elle est d'abord destinée au débogage."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:187
 +#: apt-cache.8.xml:181
  msgid "dumpavail"
  msgstr "dumpavail"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-cache.8.xml:188
 +#: apt-cache.8.xml:182
  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."
@@@ -1034,12 -1033,12 +1016,12 @@@ msgstr "
  "et la méthode &dselect; s'en sert."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:192
 +#: apt-cache.8.xml:186
  msgid "unmet"
  msgstr "unmet"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-cache.8.xml:193
 +#: apt-cache.8.xml:187
  msgid ""
  "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
  "package cache."
@@@ -1048,12 -1047,12 +1030,12 @@@ msgstr "
  "dépendances absentes dans le cache de paquets."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:197
 +#: 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:198
 +#: apt-cache.8.xml:192
  msgid ""
  "<literal>show</literal> performs a function similar to <command>dpkg --print-"
  "avail</command>; it displays the package records for the named packages."
@@@ -1063,12 -1062,12 +1045,12 @@@ msgstr "
  "argument."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:203
 +#: apt-cache.8.xml:197
  msgid "search <replaceable>regex [ regex ... ]</replaceable>"
  msgstr "search <replaceable>expression [ expression ... ]</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-cache.8.xml:204
 +#: apt-cache.8.xml:198
  msgid ""
  "<literal>search</literal> performs a full text search on all available "
  "package lists for the POSIX regex pattern given, see "
@@@ -1091,7 -1090,7 +1073,7 @@@ msgstr "
  "seulement dans les noms de paquets."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-cache.8.xml:217
 +#: apt-cache.8.xml:211
  msgid ""
  "Separate arguments can be used to specify multiple search patterns that are "
  "and'ed together."
@@@ -1100,12 -1099,12 +1082,12 @@@ msgstr "
  "rationnelles différentes sur lesquelles seront réalisées un « et » logique."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:221
 +#: 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:222
 +#: apt-cache.8.xml:216
  msgid ""
  "<literal>depends</literal> shows a listing of each dependency a package has "
  "and all the possible other packages that can fulfill that dependency."
@@@ -1115,12 -1114,12 +1097,12 @@@ msgstr "
  "satisfont ces dépendances."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:226
 +#: 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:227
 +#: apt-cache.8.xml:221
  msgid ""
  "<literal>rdepends</literal> shows a listing of each reverse dependency a "
  "package has."
@@@ -1129,12 -1128,12 +1111,12 @@@ msgstr "
  "dépendances inverses d'un paquet."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:231
 +#: apt-cache.8.xml:225
  msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
  msgstr "pkgnames <replaceable>[ préfixe ]</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-cache.8.xml:232
 +#: apt-cache.8.xml:226
  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 "
@@@ -1149,7 -1148,7 +1131,7 @@@ msgstr "
  "l'option <option>--generate</option>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-cache.8.xml:237
 +#: apt-cache.8.xml:231
  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 "
@@@ -1160,12 -1159,12 +1142,12 @@@ msgstr "
  "affichés dans la liste créée."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:242
 +#: 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:243
 +#: apt-cache.8.xml:237
  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."
@@@ -1187,7 -1186,7 +1169,7 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-cache.8.xml:252
 +#: apt-cache.8.xml:246
  msgid ""
  "The resulting nodes will have several shapes; normal packages are boxes, "
  "pure provides are triangles, mixed provides are diamonds, missing packages "
@@@ -1202,19 -1201,19 +1184,19 @@@ msgstr "
  "conflits."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-cache.8.xml:257
 +#: apt-cache.8.xml:251
  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:260
 +#: 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:261
 +#: apt-cache.8.xml:255
  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>."
@@@ -1224,12 -1223,12 +1206,12 @@@ msgstr "
  "ulink>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:265
 +#: apt-cache.8.xml:259
  msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
  msgstr "policy <replaceable>[ paquet(s) ]</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-cache.8.xml:266
 +#: apt-cache.8.xml:260
  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 "
@@@ -1242,12 -1241,12 +1224,12 @@@ msgstr "
  "paquet donné en argument."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:272
 +#: 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:273
 +#: apt-cache.8.xml:267
  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 "
@@@ -1267,24 -1266,24 +1249,24 @@@ msgstr "
  "literal>)."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:284 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
 -#: apt-ftparchive.1.xml:522 apt-get.8.xml:308 apt-mark.8.xml:92
 -#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:559 apt.conf.5.xml:581
 +#: 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:92
 +#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
  msgid "options"
  msgstr "options"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:288
 +#: 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:288
 +#: 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:289
 +#: apt-cache.8.xml:283
  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::"
@@@ -1295,18 -1294,18 +1277,18 @@@ msgstr "
  "<literal>Dir::Cache::pkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:294 apt-ftparchive.1.xml:565 apt-get.8.xml:365
 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 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:294
 +#: 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:295
 +#: apt-cache.8.xml:289
  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 "
@@@ -1322,17 -1321,17 +1304,17 @@@ msgstr "
  "<literal>Dir::Cache::srcpkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:302 apt-ftparchive.1.xml:539 apt-get.8.xml:355
 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 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:302 apt-ftparchive.1.xml:539 apt-get.8.xml:355
 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 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:303
 +#: apt-cache.8.xml:297
  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 "
@@@ -1347,17 -1346,17 +1329,17 @@@ msgstr "
  "<literal>quiet</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:309
 +#: 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:309
 +#: 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:310
 +#: apt-cache.8.xml:304
  msgid ""
  "Print only important dependencies; for use with unmet and depends. Causes "
  "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@@ -1368,47 -1367,47 +1350,47 @@@ msgstr "
  "Élément de configuration : <literal>APT::Cache::Important</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:315
 +#: 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:316
 +#: 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:317
 +#: 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:318
 +#: 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:319
 +#: 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:320
 +#: 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:321
 +#: 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:322
 +#: 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:323
 +#: apt-cache.8.xml:317
  msgid ""
  "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
  "print all dependencies. This can be twicked with these flags which will omit "
@@@ -1423,17 -1422,17 +1405,17 @@@ msgstr "
  "replaceable></literal>, p. ex. <literal>APT::Cache::ShowRecommends</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:329 apt-cdrom.8.xml:124 apt-get.8.xml:322
 +#: 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:329
 +#: 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:330
 +#: apt-cache.8.xml:324
  msgid ""
  "Print full package records when searching.  Configuration Item: "
  "<literal>APT::Cache::ShowFull</literal>."
@@@ -1443,17 -1442,17 +1425,17 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:334 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:577
 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580
  msgid "<option>-a</option>"
  msgstr "<option>-a</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:334
 +#: 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:335
 +#: apt-cache.8.xml:329
  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-"
@@@ -1471,17 -1470,17 +1453,17 @@@ msgstr "
  "<literal>APT::Cache::AllVersions</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:343
 +#: 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:343
 +#: 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:344
 +#: apt-cache.8.xml:338
  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</"
@@@ -1493,17 -1492,17 +1475,17 @@@ msgstr "
  "configuration : <literal>APT::Cache::Generate</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:349
 +#: 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:349 apt-cdrom.8.xml:142
 +#: 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:350
 +#: apt-cache.8.xml:344
  msgid ""
  "Only search on the package names, not the long descriptions.  Configuration "
  "Item: <literal>APT::Cache::NamesOnly</literal>."
@@@ -1513,12 -1512,12 +1495,12 @@@ msgstr "
  "NamesOnly</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:354
 +#: 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:355
 +#: apt-cache.8.xml:349
  msgid ""
  "Make <literal>pkgnames</literal> print all names, including virtual packages "
  "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@@ -1529,12 -1528,12 +1511,12 @@@ msgstr "
  "configuration : <literal>APT::Cache::AllNames</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:360
 +#: 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:361
 +#: apt-cache.8.xml:355
  msgid ""
  "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
  "that all packages mentioned are printed once.  Configuration Item: "
@@@ -1546,12 -1545,12 +1528,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cache.8.xml:366
 +#: 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:368
 +#: apt-cache.8.xml:362
  msgid ""
  "Limit the output of <literal>depends</literal> and <literal>rdepends</"
  "literal> to packages which are currently installed.  Configuration Item: "
@@@ -1562,46 -1561,46 +1544,46 @@@ msgstr "
  "Élément de configuration : <literal>APT::Cache::Installed</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
 -#: apt-cache.8.xml:373 apt-cdrom.8.xml:153 apt-config.8.xml:101
 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:605 apt-get.8.xml:550
 +#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570
  #: apt-sortpkgs.1.xml:67
  msgid "&apt-commonoptions;"
  msgstr "&apt-commonoptions;"
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-cache.8.xml:378 apt-get.8.xml:555 apt-key.8.xml:156 apt-mark.8.xml:125
 -#: apt.conf.5.xml:1092 apt_preferences.5.xml:647
 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
  msgid "Files"
  msgstr "Fichiers"
  
  #. type: Content of: <refentry><refsect1><variablelist>
 -#: apt-cache.8.xml:380
 +#: apt-cache.8.xml:374
  msgid "&file-sourceslist; &file-statelists;"
  msgstr "&file-sourceslist; &file-statelists;"
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-cache.8.xml:385 apt-cdrom.8.xml:158 apt-config.8.xml:106
 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:621 apt-get.8.xml:565
 -#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:184
 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1098 apt_preferences.5.xml:654
 -#: sources.list.5.xml:236
 +#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585
 +#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
 +#: sources.list.5.xml:234
  msgid "See Also"
  msgstr "Voir aussi"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-cache.8.xml:386
 +#: apt-cache.8.xml:380
  msgid "&apt-conf;, &sources-list;, &apt-get;"
  msgstr "&apt-conf;, &sources-list;, &apt-get;."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-cache.8.xml:390 apt-cdrom.8.xml:163 apt-config.8.xml:111
 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:625 apt-get.8.xml:571
 +#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591
  #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
  msgid "Diagnostics"
  msgstr "Diagnostics"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-cache.8.xml:391
 +#: apt-cache.8.xml:385
  msgid ""
  "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
  "on error."
@@@ -1730,7 -1729,7 +1712,7 @@@ msgid "Options
  msgstr "Options"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:533 apt-get.8.xml:317
 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345
  msgid "<option>-d</option>"
  msgstr "<option>-d</option>"
  
@@@ -1774,7 -1773,7 +1756,7 @@@ msgstr "
  "<literal>APT::CDROM::Rename</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-cdrom.8.xml:116 apt-get.8.xml:336
 +#: apt-cdrom.8.xml:116 apt-get.8.xml:364
  msgid "<option>-m</option>"
  msgstr "<option>-m</option>"
  
@@@ -1831,17 -1830,17 +1813,17 @@@ msgstr "
  "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:367
 +#: 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:369
 +#: 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:370
 +#: apt-cdrom.8.xml:145 apt-get.8.xml:398
  msgid "<option>--no-act</option>"
  msgstr "<option>--no-act</option>"
  
@@@ -1870,17 -1869,6 +1852,17 @@@ 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
++#.  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"
@@@ -1987,7 -1975,7 +1969,7 @@@ msgid "Just show the contents of the co
  msgstr "Affiche seulement le contenu de l'espace de configuration."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:622
 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625
  #: apt-sortpkgs.1.xml:73
  msgid "&apt-conf;"
  msgstr "&apt-conf;"
@@@ -2066,7 -2054,7 +2048,7 @@@ msgstr "
  "<filename>package.config.XXXX</filename>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-extracttemplates.1.xml:63 apt-get.8.xml:484
 +#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
  msgid "<option>-t</option>"
  msgstr "<option>-t</option>"
  
@@@ -2095,7 -2083,7 +2077,7 @@@ msgstr "
  "<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, "
  "le nombre 100 en cas d'erreur."
  
- #.  The last update date
+ #.  The last update date 
  #. type: Content of: <refentry><refentryinfo>
  #: apt-ftparchive.1.xml:16
  msgid ""
@@@ -2221,7 -2209,8 +2203,8 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
- msgid "The option <option>--db</option> can be used to specify a binary caching DB."
+ 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."
@@@ -2288,26 -2277,19 +2271,30 @@@ msgstr "release
  #: apt-ftparchive.1.xml:115
  msgid ""
  "The <literal>release</literal> command generates a Release file from a "
 -"directory tree. It recursively searches the given directory for Packages, "
 -"Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and "
 -"md5sum.txt files.  It then writes to stdout a Release file containing an MD5 "
 -"digest and SHA1 digest for each file."
 -msgstr ""
 -"La commande <literal>release</literal> crée un fichier « Release » à partir "
 -"d'un répertoire. Elle cherche récursivement dans ce répertoire les fichiers "
 -"Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, "
 -"Release et md5sum.txt. Elle envoie alors un fichier Release sur la sortie "
 -"standard avec un résumé MD5 et un résumé SHA1 pour chaque fichier."
 -
 -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:122
 +"directory tree. It recursively searches the given directory for uncompressed "
 +"<filename>Packages</filename> and <filename>Sources</filename> files and the "
 +"ones compressed with <command>gzip</command>, <command>bzip2</command> or "
 +"<command>lzma</command> as well as <filename>Release</filename> and "
 +"<filename>md5sum.txt</filename> files by default (<literal>APT::FTPArchive::"
 +"Release::Default-Patterns</literal>). Additional filename patterns can be "
 +"added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
 +"literal>.  It then writes to stdout a Release file containing a MD5, SHA1 "
 +"and SHA256 digest for each file."
 +msgstr ""
- "La commande <literal>release</literal> crée un fichier Release à partir d'une arborescence. Elle recherche récursivement dans le répertoire indiqué des fichiers <filename>Packages</filename> et <filename>Sources<"
- "/filename> non compressés et compressés avec <command>gzip</command>, <command>bzip2</command> ou "
- "<command>lzma</command> ainsi que des fichiers <filename>Release</filename> et "
- "<filename>md5sum.txt</filename> par défaut (<literal>APT::FTPArchive::"
- "Release::Default-Patterns</literal>). Des motifs supplémentaires pour les noms de fichiers peuvent être ajoutés en les mentionnant dans  <literal>APT::FTPArchive::Release::Patterns</"
- "literal>.  Le fichier Release est ensuite affiché et comporte des sommes de contrôle MD5, SHA1 "
- "et SHA256 pour chaque fichier."
++"La commande <literal>release</literal> crée un fichier Release à partir "
++"d'une arborescence. Elle recherche récursivement dans le répertoire indiqué "
++"des fichiers <filename>Packages</filename> et <filename>Sources</filename> "
++"non compressés et compressés avec <command>gzip</command>, <command>bzip2</"
++"command> ou <command>lzma</command> ainsi que des fichiers "
++"<filename>Release</filename> et <filename>md5sum.txt</filename> par défaut "
++"(<literal>APT::FTPArchive::Release::Default-Patterns</literal>). Des motifs "
++"supplémentaires pour les noms de fichiers peuvent être ajoutés en les "
++"mentionnant dans  <literal>APT::FTPArchive::Release::Patterns</literal>.  Le "
++"fichier Release est ensuite affiché et comporte des sommes de contrôle MD5, "
++"SHA1 et SHA256 pour chaque fichier."
 +
 +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 +#: apt-ftparchive.1.xml:125
  msgid ""
  "Values for the additional metadata fields in the Release file are taken from "
  "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@@ -2328,12 -2310,12 +2315,12 @@@ msgstr "
  "<literal>Description</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:133
 +#: apt-ftparchive.1.xml:136
  msgid "generate"
  msgstr "generate"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:135
 +#: apt-ftparchive.1.xml:138
  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 "
@@@ -2347,12 -2329,12 +2334,12 @@@ msgstr "
  "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:142 apt-get.8.xml:281
 +#: 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:144
 +#: apt-ftparchive.1.xml:147
  msgid ""
  "The <literal>clean</literal> command tidies the databases used by the given "
  "configuration file by removing any records that are no longer necessary."
@@@ -2362,12 -2344,12 +2349,12 @@@ msgstr "
  "sont plus nécessaires."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-ftparchive.1.xml:150
 +#: apt-ftparchive.1.xml:153
  msgid "The Generate Configuration"
  msgstr "Configuration de la commande generate"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:152
 +#: apt-ftparchive.1.xml:155
  msgid ""
  "The <literal>generate</literal> command uses a configuration file to "
  "describe the archives that are going to be generated. It follows the typical "
@@@ -2384,17 -2366,19 +2371,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:160
 +#: apt-ftparchive.1.xml:163
- msgid "The generate configuration has 4 separate sections, each described below."
- msgstr "Ce fichier de configuration possède quatre sections, décrites ci-dessous."
+ 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:162
 +#: apt-ftparchive.1.xml:165
  msgid "Dir Section"
  msgstr "La section Dir"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt-ftparchive.1.xml:164
 +#: apt-ftparchive.1.xml:167
  msgid ""
  "The <literal>Dir</literal> section defines the standard directories needed "
  "to locate the files required during the generation process. These "
@@@ -2407,12 -2391,12 +2396,12 @@@ msgstr "
  "manière à produire un chemin absolu et complet."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:169
 +#: apt-ftparchive.1.xml:172
  msgid "ArchiveDir"
  msgstr "ArchiveDir"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:171
 +#: apt-ftparchive.1.xml:174
  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 "
@@@ -2423,32 -2407,32 +2412,32 @@@ msgstr "
  "filename> et les noeuds des distributions."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:176
 +#: apt-ftparchive.1.xml:179
  msgid "OverrideDir"
  msgstr "OverrideDir"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:178
 +#: apt-ftparchive.1.xml:181
  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:181
 +#: apt-ftparchive.1.xml:184
  msgid "CacheDir"
  msgstr "CacheDir"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:183
 +#: apt-ftparchive.1.xml:186
  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:186
 +#: apt-ftparchive.1.xml:189
  msgid "FileListDir"
  msgstr "FileListDir"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:188
 +#: apt-ftparchive.1.xml:191
  msgid ""
  "Specifies the location of the file list files, if the <literal>FileList</"
  "literal> setting is used below."
@@@ -2457,12 -2441,12 +2446,12 @@@ msgstr "
  "sert de la valeur <literal>FileList</literal> définie plus bas)."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
 -#: apt-ftparchive.1.xml:194
 +#: apt-ftparchive.1.xml:197
  msgid "Default Section"
  msgstr "La section Default"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt-ftparchive.1.xml:196
 +#: apt-ftparchive.1.xml:199
  msgid ""
  "The <literal>Default</literal> section specifies default values, and "
  "settings that control the operation of the generator. Other sections may "
@@@ -2473,12 -2457,12 +2462,12 @@@ msgstr "
  "annulées dans d'autres sections (paramètrage par section)."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:200
 +#: 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:202
 +#: apt-ftparchive.1.xml:205
  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 "
@@@ -2491,12 -2475,12 +2480,12 @@@ msgstr "
  "Par défaut, c'est la chaîne « . gzip »."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:208
 +#: 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:210
 +#: apt-ftparchive.1.xml:213
  msgid ""
  "Sets the default list of file extensions that are package files.  This "
  "defaults to '.deb'."
@@@ -2505,12 -2489,12 +2494,12 @@@ msgstr "
  "paquets. Par défaut, c'est « .deb »."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:214
 +#: 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:216
 +#: apt-ftparchive.1.xml:219
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Sources files."
@@@ -2519,12 -2503,12 +2508,12 @@@ msgstr "
  "compressés les fichiers sources."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:220
 +#: 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:222
 +#: apt-ftparchive.1.xml:225
  msgid ""
  "Sets the default list of file extensions that are source files.  This "
  "defaults to '.dsc'."
@@@ -2533,12 -2517,12 +2522,12 @@@ msgstr "
  "fichiers sources. Par défaut, c'est « .dsc »."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:226
 +#: 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:228
 +#: apt-ftparchive.1.xml:231
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Contents files."
@@@ -2547,12 -2531,12 +2536,12 @@@ msgstr "
  "compressés les fichiers « Contents »."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:232
 +#: 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:234
 +#: apt-ftparchive.1.xml:237
  msgid ""
  "This is similar to <literal>Packages::Compress</literal> except that it "
  "controls the compression for the Translation-en master file."
@@@ -2561,12 -2545,12 +2550,12 @@@ msgstr "
  "compressé le fichier maître Translations-en."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:238
 +#: apt-ftparchive.1.xml:241
  msgid "DeLinkLimit"
  msgstr "DeLinkLimit"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:240
 +#: apt-ftparchive.1.xml:243
  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-"
@@@ -2577,12 -2561,12 +2566,12 @@@ msgstr "
  "paramètre <literal>External-Links</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:245
 +#: apt-ftparchive.1.xml:248
  msgid "FileMode"
  msgstr "FileMode"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:247
 +#: apt-ftparchive.1.xml:250
  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."
@@@ -2592,12 -2576,12 +2581,12 @@@ msgstr "
  "utilisateur (umasq) est ignoré."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:252 apt-ftparchive.1.xml:398
 +#: 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:254 apt-ftparchive.1.xml:400
 +#: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
  msgid ""
  "Sets if long descriptions should be included in the Packages file or split "
  "out into a master Translation-en file."
@@@ -2606,12 -2590,12 +2595,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:260
 +#: apt-ftparchive.1.xml:263
  msgid "TreeDefault Section"
  msgstr "La section TreeDefault"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt-ftparchive.1.xml:262
 +#: apt-ftparchive.1.xml:265
  msgid ""
  "Sets defaults specific to <literal>Tree</literal> sections. All of these "
  "variables are substitution variables and have the strings $(DIST), "
@@@ -2623,12 -2607,12 +2612,12 @@@ msgstr "
  "respective."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:267
 +#: apt-ftparchive.1.xml:270
  msgid "MaxContentsChange"
  msgstr "MaxContentsChange"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:269
 +#: apt-ftparchive.1.xml:272
  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 "
@@@ -2639,12 -2623,12 +2628,12 @@@ msgstr "
  "robin » de manière que, sur plusieurs jours, tous soient reconstruits."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:274
 +#: apt-ftparchive.1.xml:277
  msgid "ContentsAge"
  msgstr "ContentsAge"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:276
 +#: apt-ftparchive.1.xml:279
  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. "
@@@ -2662,12 -2646,12 +2651,12 @@@ msgstr "
  "défaut ce nombre vaut 10, l'unité étant le jour."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:285
 +#: apt-ftparchive.1.xml:288
  msgid "Directory"
  msgstr "Directory"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:287
 +#: apt-ftparchive.1.xml:290
  msgid ""
  "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
  "$(SECTION)/binary-$(ARCH)/</filename>"
@@@ -2676,12 -2660,12 +2665,12 @@@ msgstr "
  "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:291
 +#: apt-ftparchive.1.xml:294
  msgid "SrcDirectory"
  msgstr "SrcDirectory"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:293
 +#: apt-ftparchive.1.xml:296
  msgid ""
  "Sets the top of the source package directory tree. Defaults to <filename>"
  "$(DIST)/$(SECTION)/source/</filename>"
@@@ -2690,12 -2674,12 +2679,12 @@@ msgstr "
  "<filename>$(DIST)/$(SECTION)/source/</filename>."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:297 apt-ftparchive.1.xml:436
 +#: 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:299
 +#: apt-ftparchive.1.xml:302
  msgid ""
  "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "binary-$(ARCH)/Packages</filename>"
@@@ -2704,12 -2688,12 +2693,12 @@@ msgstr "
  "$(SECTION)/binary-$(ARCH)/Packages</filename>."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:303 apt-ftparchive.1.xml:441
 +#: 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:305
 +#: apt-ftparchive.1.xml:308
  msgid ""
  "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
  "source/Sources</filename>"
@@@ -2718,12 -2702,12 +2707,12 @@@ msgstr "
  "$(SECTION)/source/Sources</filename>."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:309
 +#: apt-ftparchive.1.xml:312
  msgid "Translation"
  msgstr "Translation"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:311
 +#: apt-ftparchive.1.xml:314
  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)/"
@@@ -2734,12 -2718,12 +2723,12 @@@ msgstr "
  "défaut : <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:316
 +#: apt-ftparchive.1.xml:319
  msgid "InternalPrefix"
  msgstr "InternalPrefix"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:318
 +#: apt-ftparchive.1.xml:321
  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)/</"
@@@ -2750,12 -2734,12 +2739,12 @@@ msgstr "
  "défaut, c'est <filename>$(DIST)/$(SECTION)/</filename>."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:323 apt-ftparchive.1.xml:447
 +#: 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:325
 +#: apt-ftparchive.1.xml:328
  msgid ""
  "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
  "</filename>. If this setting causes multiple Packages files to map onto a "
@@@ -2768,22 -2752,22 +2757,22 @@@ msgstr "
  "<command>apt-ftparchive</command> les intègre automatiquement."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:332
 +#: 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:334
 +#: apt-ftparchive.1.xml:337
  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:337 apt-ftparchive.1.xml:472
 +#: 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:339
 +#: apt-ftparchive.1.xml:342
  msgid ""
  "Sets the binary cache database to use for this section. Multiple sections "
  "can share the same database."
@@@ -2792,12 -2776,12 +2781,12 @@@ msgstr "
  "Différentes sections peuvent partager cette base de données."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:343
 +#: apt-ftparchive.1.xml:346
  msgid "FileList"
  msgstr "FileList"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:345
 +#: apt-ftparchive.1.xml:348
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
@@@ -2808,12 -2792,12 +2797,12 @@@ msgstr "
  "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:350
 +#: apt-ftparchive.1.xml:353
  msgid "SourceFileList"
  msgstr "SourceFileList"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:352
 +#: apt-ftparchive.1.xml:355
  msgid ""
  "Specifies that instead of walking the directory tree, <command>apt-"
  "ftparchive</command> should read the list of files from the given file. "
@@@ -2826,12 -2810,12 +2815,12 @@@ msgstr "
  "traiter les index de sources."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
 -#: apt-ftparchive.1.xml:360
 +#: apt-ftparchive.1.xml:363
  msgid "Tree Section"
  msgstr "La section Tree"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt-ftparchive.1.xml:362
 +#: apt-ftparchive.1.xml:365
  msgid ""
  "The <literal>Tree</literal> section defines a standard Debian file tree "
  "which consists of a base directory, then multiple sections in that base "
@@@ -2845,7 -2829,7 +2834,7 @@@ msgstr "
  "par la variable de substitution <literal>Directory</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt-ftparchive.1.xml:367
 +#: apt-ftparchive.1.xml:370
  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 "
@@@ -2858,7 -2842,7 +2847,7 @@@ msgstr "
  "C'est par exemple : <filename>dists/&stable-codename;</filename>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt-ftparchive.1.xml:372
 +#: apt-ftparchive.1.xml:375
  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 "
@@@ -2869,7 -2853,7 +2858,7 @@@ msgstr "
  "trois nouvelles variables suivantes."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 -#: apt-ftparchive.1.xml:378
 +#: apt-ftparchive.1.xml:381
  #, no-wrap
  msgid ""
  "for i in Sections do \n"
@@@ -2883,7 -2867,7 +2872,7 @@@ msgstr "
  "     "
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt-ftparchive.1.xml:375
 +#: apt-ftparchive.1.xml:378
  msgid ""
  "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
  "command> performs an operation similar to: <placeholder type=\"programlisting"
@@@ -2894,12 -2878,12 +2883,12 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:384
 +#: apt-ftparchive.1.xml:387
  msgid "Sections"
  msgstr "Sections"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:386
 +#: apt-ftparchive.1.xml:389
  msgid ""
  "This is a space separated list of sections which appear under the "
  "distribution, typically this is something like <literal>main contrib non-"
@@@ -2910,12 -2894,12 +2899,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:391
 +#: apt-ftparchive.1.xml:394
  msgid "Architectures"
  msgstr "Architectures"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:393
 +#: apt-ftparchive.1.xml:396
  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 "
@@@ -2926,12 -2910,12 +2915,12 @@@ msgstr "
  "que l'arborescence est une arborescence de sources."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:404 apt-ftparchive.1.xml:452
 +#: 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:406
 +#: apt-ftparchive.1.xml:409
  msgid ""
  "Sets the binary override file. The override file contains section, priority "
  "and maintainer address information."
@@@ -2940,12 -2924,12 +2929,12 @@@ msgstr "
  "informations sur la section, la priorité et le responsable du paquet."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:410 apt-ftparchive.1.xml:457
 +#: 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:412
 +#: apt-ftparchive.1.xml:415
  msgid ""
  "Sets the source override file. The override file contains section "
  "information."
@@@ -2954,32 -2938,32 +2943,32 @@@ msgstr "
  "informations sur la section."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:416 apt-ftparchive.1.xml:462
 +#: 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:418 apt-ftparchive.1.xml:464
 +#: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
  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:421 apt-ftparchive.1.xml:467
 +#: 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:423 apt-ftparchive.1.xml:469
 +#: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
  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:428
 +#: apt-ftparchive.1.xml:431
  msgid "BinDirectory Section"
  msgstr "La section BinDirectory"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt-ftparchive.1.xml:430
 +#: apt-ftparchive.1.xml:433
  msgid ""
  "The <literal>bindirectory</literal> section defines a binary directory tree "
  "with no special structure. The scope tag specifies the location of the "
@@@ -2994,12 -2978,12 +2983,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:438
 +#: apt-ftparchive.1.xml:441
  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:443
 +#: apt-ftparchive.1.xml:446
  msgid ""
  "Sets the Sources file output. At least one of <literal>Packages</literal> or "
  "<literal>Sources</literal> is required."
@@@ -3008,52 -2992,52 +2997,52 @@@ 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:449
 +#: apt-ftparchive.1.xml:452
  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:454
 +#: apt-ftparchive.1.xml:457
  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:459
 +#: apt-ftparchive.1.xml:462
  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:474
 +#: apt-ftparchive.1.xml:477
  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:477
 +#: apt-ftparchive.1.xml:480
  msgid "PathPrefix"
  msgstr "PathPrefix"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:479
 +#: apt-ftparchive.1.xml:482
  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:482
 +#: 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:484
 +#: apt-ftparchive.1.xml:487
  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:491
 +#: apt-ftparchive.1.xml:494
  msgid "The Binary Override File"
  msgstr "Le fichier d'« Override » pour les binaires."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:492
 +#: apt-ftparchive.1.xml:495
  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, "
@@@ -3068,19 -3052,19 +3057,19 @@@ msgstr "
  "nom du responsable de paquet."
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
 -#: apt-ftparchive.1.xml:498
 +#: apt-ftparchive.1.xml:501
  #, no-wrap
  msgid "old [// oldn]* => new"
  msgstr "old [// oldn]* => new"
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
 -#: apt-ftparchive.1.xml:500
 +#: apt-ftparchive.1.xml:503
  #, no-wrap
  msgid "new"
  msgstr "new"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:497
 +#: apt-ftparchive.1.xml:500
  msgid ""
  "The general form of the maintainer field is: <placeholder type="
  "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@@ -3097,12 -3081,12 +3086,12 @@@ msgstr "
  "deuxième forme remplace inconditionnellement le champ."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-ftparchive.1.xml:508
 +#: apt-ftparchive.1.xml:511
  msgid "The Source Override File"
  msgstr "Le fichier d'« Override » pour les sources"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:510
 +#: apt-ftparchive.1.xml:513
  msgid ""
  "The source override file is fully compatible with &dpkg-scansources;. It "
  "contains 2 fields separated by spaces. The first fields is the source "
@@@ -3113,12 -3097,12 +3102,12 @@@ msgstr "
  "sa section."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-ftparchive.1.xml:515
 +#: apt-ftparchive.1.xml:518
  msgid "The Extra Override File"
  msgstr "Le fichier supplémentaire d'« Override »"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:517
 +#: apt-ftparchive.1.xml:520
  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 "
@@@ -3130,12 -3114,12 +3119,12 @@@ msgstr "
  "ligne est la nouvelle valeur."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:526
 +#: apt-ftparchive.1.xml:529
  msgid "<option>--md5</option>"
  msgstr "<option>--md5</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:528
 +#: apt-ftparchive.1.xml:531
  msgid ""
  "Generate MD5 sums. This defaults to on, when turned off the generated index "
  "files will not have MD5Sum fields where possible.  Configuration Item: "
@@@ -3147,12 -3131,12 +3136,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:533
 +#: apt-ftparchive.1.xml:536
  msgid "<option>--db</option>"
  msgstr "<option>--db</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:535
 +#: apt-ftparchive.1.xml:538
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
  "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@@ -3162,7 -3146,7 +3151,7 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:541
 +#: apt-ftparchive.1.xml:544
  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 "
@@@ -3177,12 -3161,12 +3166,12 @@@ msgstr "
  "configuration : <literal>quiet</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:547
 +#: apt-ftparchive.1.xml:550
  msgid "<option>--delink</option>"
  msgstr "<option>--delink</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:549
 +#: apt-ftparchive.1.xml:552
  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 "
@@@ -3196,12 -3180,12 +3185,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:555
 +#: apt-ftparchive.1.xml:558
  msgid "<option>--contents</option>"
  msgstr "<option>--contents</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:557
 +#: apt-ftparchive.1.xml:560
  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 "
@@@ -3217,12 -3201,12 +3206,12 @@@ msgstr "
  "de configuration : <literal>APT::FTPArchive::Contents</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:565
 +#: apt-ftparchive.1.xml:568
  msgid "<option>--source-override</option>"
  msgstr "<option>--source-override</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:567
 +#: apt-ftparchive.1.xml:570
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@@ -3233,12 -3217,12 +3222,12 @@@ msgstr "
  "FTPArchive::SourceOverride</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:571
 +#: apt-ftparchive.1.xml:574
  msgid "<option>--readonly</option>"
  msgstr "<option>--readonly</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:573
 +#: apt-ftparchive.1.xml:576
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3247,12 -3231,12 +3236,12 @@@ msgstr "
  "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:577
 +#: apt-ftparchive.1.xml:580
  msgid "<option>--arch</option>"
  msgstr "<option>--arch</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-ftparchive.1.xml:578
 +#: apt-ftparchive.1.xml:581
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
  "commands only package files matching <literal>*_arch.deb</literal> or "
@@@ -3266,12 -3250,12 +3255,12 @@@ msgstr "
  "<literal>APT::FTPArchive::Architecture</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:584
 +#: apt-ftparchive.1.xml:587
  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:586
 +#: apt-ftparchive.1.xml:589
  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 "
@@@ -3294,12 -3278,12 +3283,12 @@@ msgstr "
  "survenir et l'ensemble de ces contrôles devient inutile."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-ftparchive.1.xml:596
 +#: apt-ftparchive.1.xml:599
  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:598
 +#: apt-ftparchive.1.xml:601
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
  "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@@ -3315,19 -3299,19 +3304,19 @@@ msgstr "
  "generate."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-ftparchive.1.xml:610 apt.conf.5.xml:1086 apt_preferences.5.xml:494
 -#: sources.list.5.xml:196
 +#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
 +#: sources.list.5.xml:198
  msgid "Examples"
  msgstr "Exemples"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
 -#: apt-ftparchive.1.xml:616
 +#: apt-ftparchive.1.xml:619
  #, 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:612
 +#: apt-ftparchive.1.xml:615
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3336,7 -3320,7 +3325,7 @@@ msgstr "
  "des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-ftparchive.1.xml:626
 +#: apt-ftparchive.1.xml:629
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -3344,7 -3328,7 +3333,7 @@@ msgstr "
  "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
  "nombre 100 en cas d'erreur."
  
- #.  The last update date
+ #.  The last update date 
  #. type: Content of: <refentry><refentryinfo>
  #: apt-get.8.xml:16
  msgid ""
@@@ -3362,7 -3346,8 +3351,8 @@@ 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."
+ msgstr ""
+ "Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
  
  #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
  #: apt-get.8.xml:39
@@@ -3802,21 -3787,9 +3792,23 @@@ 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
  msgid ""
- msgstr "<literal>download</literal> télécharge le fichier binaire indiqué dans le répertoire courant."
 +"<literal>download</literal> will download the given binary package into the "
 +"current directoy."
++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
 +msgid ""
  "<literal>clean</literal> clears out the local repository of retrieved "
  "package files. It removes everything but the lock file from "
  "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/archives/"
@@@ -3834,12 -3807,12 +3826,12 @@@ msgstr "
  "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:291
 +#: apt-get.8.xml:297
  msgid "autoclean"
  msgstr "autoclean"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:292
 +#: apt-get.8.xml:298
  msgid ""
  "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
  "local repository of retrieved package files. The difference is that it only "
@@@ -3858,12 -3831,12 +3850,12 @@@ msgstr "
  "installés."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:301
 +#: apt-get.8.xml:307
  msgid "autoremove"
  msgstr "autoremove"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:302
 +#: apt-get.8.xml:308
  msgid ""
  "<literal>autoremove</literal> is used to remove packages that were "
  "automatically installed to satisfy dependencies for some package and that "
@@@ -3874,34 -3847,12 +3866,39 @@@ msgstr "
  "ne sont plus nécessaires."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:312 apt-get.8.xml:418
 +#: apt-get.8.xml:312
 +msgid "changelog"
 +msgstr "changelog"
 +
 +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 +#: apt-get.8.xml:313
 +msgid ""
 +"<literal>changelog</literal> downloads a package changelog and displays it "
 +"through <command>sensible-pager</command>. The server name and base "
 +"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."
 +msgstr ""
- "<literal>changelog</literal> télécharge le journal des modifications d'un paquet et l'affiche avec <command>sensible-pager</command>. Le nom du serveur et le répertoire de base sont définis dans la variable <"
- "literal>APT::Changelogs::Server</literal> (p. ex. <ulink>http://packages.debian.org/changelogs</ulink> pour "
- "Debian ou <ulink>http://changelogs.ubuntu.com/changelogs</ulink> pour Ubuntu). Par défaut, c'est le journal des modifications de la version installée du paquet qui est affiché. Cependant, il est possible d'utiliser "
- "les mêmes options que pour la commande <option>install</option>."
++"<literal>changelog</literal> télécharge le journal des modifications d'un "
++"paquet et l'affiche avec <command>sensible-pager</command>. Le nom du "
++"serveur et le répertoire de base sont définis dans la variable <literal>APT::"
++"Changelogs::Server</literal> (p. ex. <ulink>http://packages.debian.org/"
++"changelogs</ulink> pour Debian ou <ulink>http://changelogs.ubuntu.com/"
++"changelogs</ulink> pour Ubuntu). Par défaut, c'est le journal des "
++"modifications de la version installée du paquet qui est affiché. Cependant, "
++"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:313
 +#: apt-get.8.xml:336
  msgid ""
  "Do not consider recommended packages as a dependency for installing.  "
  "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@@ -3910,30 -3861,12 +3907,26 @@@ msgstr "
  "Élément de configuration : <literal>APT::Install-Recommends</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:317
 +#: apt-get.8.xml:340
- #| msgid "<option>--no-suggests</option>"
 +msgid "<option>--install-suggests</option>"
 +msgstr "<option>--install-suggests</option>"
 +
 +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 +#: apt-get.8.xml:341
- #| msgid ""
- #| "Do not consider recommended packages as a dependency for installing.  "
- #| "Configuration Item: <literal>APT::Install-Recommends</literal>."
 +msgid ""
 +"Consider suggested packages as a dependency for installing.  Configuration "
 +"Item: <literal>APT::Install-Suggests</literal>."
 +msgstr ""
- "Considérer les paquets suggérés comme des dépendances à installer. "
- "Élément de configuration : <literal>APT::Install-Suggests</literal>."
++"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:318
 +#: apt-get.8.xml:346
  msgid ""
  "Download only; package files are only retrieved, not unpacked or installed.  "
  "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@@ -3943,12 -3876,12 +3936,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:322
 +#: 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:323
 +#: apt-get.8.xml:351
  msgid ""
  "Fix; attempt to correct a system with broken dependencies in place. This "
  "option, when used with install/remove, can omit any packages to permit APT "
@@@ -3976,17 -3909,17 +3969,17 @@@ msgstr "
  "configuration : <literal>APT::Get::Fix-Broken</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:336
 +#: 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:337
 +#: 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:338
 +#: apt-get.8.xml:366
  msgid ""
  "Ignore missing packages; If packages cannot be retrieved or fail the "
  "integrity check after retrieval (corrupted package files), hold back those "
@@@ -4006,12 -3939,12 +3999,12 @@@ msgstr "
  "<literal>APT::Get::Fix-Missing</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:348
 +#: 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:349
 +#: apt-get.8.xml:377
  msgid ""
  "Disables downloading of packages. This is best used with <option>--ignore-"
  "missing</option> to force APT to use only the .debs it has already "
@@@ -4023,7 -3956,7 +4016,7 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:356
 +#: apt-get.8.xml:384
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -4045,17 -3978,17 +4038,17 @@@ msgstr "
  "configuration : <literal>quiet</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:366
 +#: 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:368
 +#: 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:371
 +#: apt-get.8.xml:399
  msgid ""
  "No action; perform a simulation of events that would occur but do not "
  "actually change the system.  Configuration Item: <literal>APT::Get::"
@@@ -4066,7 -3999,7 +4059,7 @@@ msgstr "
  "<literal>APT::Get::Simulate</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:375
 +#: apt-get.8.xml:403
  msgid ""
  "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
  "literal>)  automatic. Also a notice will be displayed indicating that this "
@@@ -4085,7 -4018,7 +4078,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:381
 +#: apt-get.8.xml:409
  msgid ""
  "Simulate prints out a series of lines each one representing a dpkg "
  "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@@ -4098,22 -4031,22 +4091,22 @@@ msgstr "
  "que les dommages n'ont aucune conséquence (rare)."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:388
 +#: 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:388
 +#: 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:389
 +#: 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:390
 +#: apt-get.8.xml:418
  msgid ""
  "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
  "non-interactively. If an undesirable situation, such as changing a held "
@@@ -4129,17 -4062,17 +4122,17 @@@ msgstr "
  "configuration : <literal>APT::Get::Assume-Yes</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:397
 +#: 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:397
 +#: 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:398
 +#: apt-get.8.xml:426
  msgid ""
  "Show upgraded packages; Print out a list of all packages that are to be "
  "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@@ -4149,17 -4082,17 +4142,17 @@@ msgstr "
  "Upgraded</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:403
 +#: 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:403
 +#: 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:404
 +#: apt-get.8.xml:432
  msgid ""
  "Show full versions for upgraded and installed packages.  Configuration Item: "
  "<literal>APT::Get::Show-Versions</literal>."
@@@ -4168,22 -4101,22 +4161,22 @@@ msgstr "
  "Élément de configuration : <literal>APT::Get::Show-Versions</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:408
 +#: 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:408
 +#: 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:409
 +#: 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:410
 +#: apt-get.8.xml:438
  msgid ""
  "Compile source packages after downloading them.  Configuration Item: "
  "<literal>APT::Get::Compile</literal>."
@@@ -4192,12 -4125,27 +4185,12 @@@ msgstr "
  "configuration : <literal>APT::Get::Compile</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:414
 -msgid "<option>--install-recommends</option>"
 -msgstr "<option>--install-recommends</option>"
 -
 -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:415
 -msgid "Also install recommended packages."
 -msgstr "Installer également les paquets recommandés."
 -
 -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:419
 -msgid "Do not install recommended packages."
 -msgstr "Ne pas installer les paquets recommandés."
 -
 -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:422
 +#: 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:423
 +#: apt-get.8.xml:443
  msgid ""
  "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
  "hold placed on a package. This may be useful in conjunction with "
@@@ -4211,12 -4159,12 +4204,12 @@@ msgstr "
  "<literal>APT::Ignore-Hold</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:429
 +#: 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:430
 +#: apt-get.8.xml:450
  msgid ""
  "Do not upgrade packages; When used in conjunction with <literal>install</"
  "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@@ -4229,12 -4177,12 +4222,12 @@@ msgstr "
  "Upgrade</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:436
 +#: 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:437
 +#: apt-get.8.xml:457
  msgid ""
  "Do not install new packages; When used in conjunction with <literal>install</"
  "literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@@ -4248,12 -4196,12 +4241,12 @@@ msgstr "
  "Upgrade</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:443
 +#: 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:444
 +#: apt-get.8.xml:464
  msgid ""
  "Force yes; This is a dangerous option that will cause apt to continue "
  "without prompting if it is doing something potentially harmful. It should "
@@@ -4269,12 -4217,12 +4262,12 @@@ msgstr "
  "yes</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:451
 +#: 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:452
 +#: apt-get.8.xml:472
  msgid ""
  "Instead of fetching the files to install their URIs are printed. Each URI "
  "will have the path, the destination file name, the size and the expected md5 "
@@@ -4296,12 -4244,12 +4289,12 @@@ msgstr "
  "<literal>APT::Get::Print-URIs</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:462
 +#: 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:463
 +#: apt-get.8.xml:483
  msgid ""
  "Use purge instead of remove for anything that would be removed.  An asterisk "
  "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@@ -4315,12 -4263,12 +4308,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:470
 +#: 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:471
 +#: apt-get.8.xml:491
  msgid ""
  "Re-Install packages that are already installed and at the newest version.  "
  "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@@ -4329,12 -4277,12 +4322,12 @@@ msgstr "
  "Élément de configuration : <literal>APT::Get::ReInstall</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:475
 +#: 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:476
 +#: apt-get.8.xml:496
  msgid ""
  "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
  "it off. When on <command>apt-get</command> will automatically manage the "
@@@ -4352,17 -4300,17 +4345,17 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:485
 +#: 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:486
 +#: 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:487
 +#: apt-get.8.xml:507
  msgid ""
  "This option controls the default input to the policy engine, it creates a "
  "default pin at priority 990 using the specified release string.  This "
@@@ -4384,12 -4332,12 +4377,12 @@@ msgstr "
  "Release</literal>.  Voyez aussi la page de manuel d'&apt-preferences;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:500
 +#: 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:502
 +#: apt-get.8.xml:522
  msgid ""
  "Only perform operations that are 'trivial'. Logically this can be considered "
  "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@@ -4403,12 -4351,12 +4396,12 @@@ msgstr "
  "Get::Trivial-Only</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:508
 +#: 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:509
 +#: apt-get.8.xml:529
  msgid ""
  "If any packages are to be removed apt-get immediately aborts without "
  "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@@ -4418,12 -4366,12 +4411,12 @@@ msgstr "
  "Remove</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:514
 +#: 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:515
 +#: apt-get.8.xml:535
  msgid ""
  "If the command is either <literal>install</literal> or <literal>remove</"
  "literal>, then this option acts like running <literal>autoremove</literal> "
@@@ -4436,12 -4384,12 +4429,12 @@@ msgstr "
  "inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:521
 +#: 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:522
 +#: apt-get.8.xml:542
  msgid ""
  "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
  "literal> commands.  Indicates that the given source names are not to be "
@@@ -4461,22 -4409,22 +4454,22 @@@ msgstr "
  "literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:532
 +#: 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:532
 +#: 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:532
 +#: 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:533
 +#: apt-get.8.xml:553
  msgid ""
  "Download only the diff, dsc, or tar file of a source archive.  Configuration "
  "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@@ -4488,12 -4436,12 +4481,12 @@@ msgstr "
  "literal>, "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:538
 +#: 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:539
 +#: apt-get.8.xml:559
  msgid ""
  "Only process architecture-dependent build-dependencies.  Configuration Item: "
  "<literal>APT::Get::Arch-Only</literal>."
@@@ -4503,12 -4451,12 +4496,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt-get.8.xml:543
 +#: 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:544
 +#: apt-get.8.xml:564
  msgid ""
  "Ignore if packages can't be authenticated and don't prompt about it.  This "
  "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@@ -4520,7 -4468,7 +4513,7 @@@ msgstr "
  "AllowUnauthenticated</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist>
 -#: apt-get.8.xml:557
 +#: apt-get.8.xml:577
  msgid ""
  "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
  "&file-statelists;"
@@@ -4529,7 -4477,7 +4522,7 @@@ msgstr "
  "&file-statelists;"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-get.8.xml:566
 +#: 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-"
@@@ -4540,7 -4488,7 +4533,7 @@@ msgstr "
  "« HOWTO » d'APT."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-get.8.xml:572
 +#: apt-get.8.xml:592
  msgid ""
  "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
  "error."
@@@ -4549,22 -4497,22 +4542,22 @@@ msgstr "
  "décimal 100 en cas d'erreur."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-get.8.xml:575
 +#: apt-get.8.xml:595
  msgid "ORIGINAL AUTHORS"
  msgstr "AUTEURS D'ORIGINE"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-get.8.xml:576
 +#: apt-get.8.xml:596
  msgid "&apt-author.jgunthorpe;"
  msgstr "&apt-author.jgunthorpe;"
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-get.8.xml:579
 +#: apt-get.8.xml:599
  msgid "CURRENT AUTHORS"
  msgstr "AUTEURS ACTUELS"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-get.8.xml:581
 +#: apt-get.8.xml:601
  msgid "&apt-author.team;"
  msgstr "&apt-author.team;"
  
@@@ -4753,8 -4701,10 +4746,10 @@@ msgstr "Trousseau des clés fiables de 
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-key.8.xml:169
- msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
- msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+ msgid ""
+ "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+ msgstr ""
+ "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-key.8.xml:170
@@@ -4766,7 -4716,7 +4761,7 @@@ msgstr "Trousseau des clés fiables sup
  msgid "&apt-get;, &apt-secure;"
  msgstr "&apt-get;, &apt-secure;"
  
- #.  The last update date
+ #.  The last update date 
  #. type: Content of: <refentry><refentryinfo>
  #: apt-mark.8.xml:16
  msgid ""
@@@ -4876,8 -4826,10 +4871,10 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-mark.8.xml:96
- msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
- msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
+ 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:97
@@@ -5152,26 -5104,18 +5149,20 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt-secure.8.xml:147
- #| 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 it with <command>apt-key</command> and then run <command>apt-get "
- #| "update</command> so that apt can download and verify the "
- #| "<filename>Release.gpg</filename> files from the archives you have "
- #| "configured."
  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 "
  "it with <command>apt-key</command> and then run <command>apt-get update</"
 -"command> so that apt can download and verify the <filename>Release.gpg</"
 -"filename> files from the archives you have configured."
 +"command> so that apt can download and verify the <filename>InRelease</"
 +"filename> or <filename>Release.gpg</filename> files from the archives you "
 +"have configured."
  msgstr ""
  "Pour ajouter une clé, vous devez d'abord la télécharger. Il vaut mieux "
  "utiliser un canal fiable pour ce téléchargement. Ensuite vous l'ajoutez avec "
  "la commande <command>apt-key</command> et vous lancez la commande "
  "<command>apt-get update</command> pour télécharger et vérifier le fichier "
- "<filename>InRelease</filename> ou <filename>Release.gpg</filename> de l'archive que vous avez configurée."
 -"<filename>Release.gpg</filename> de l'archive que vous avez configurée."
++"<filename>InRelease</filename> ou <filename>Release.gpg</filename> de "
++"l'archive que vous avez configurée."
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-secure.8.xml:156
@@@ -5200,19 -5144,15 +5191,17 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
  #: apt-secure.8.xml:168
- #| msgid ""
- #| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"
- #| "abs -o Release.gpg Release</command>."
  msgid ""
 -"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -"
 -"o Release.gpg Release</command>."
 +"<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>le signer</emphasis>, avec les commande <command>gpg -- clearsign -o InRelease Release</command> et <command>gpg -abs -o "
 -"<emphasis>le signer</emphasis>, avec la commande <command>gpg -abs -o "
--"Release.gpg Release</command>."
++"<emphasis>le signer</emphasis>, avec les commande <command>gpg -- clearsign -"
++"o InRelease Release</command> et <command>gpg -abs -o Release.gpg Release</"
++"command>."
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 -#: apt-secure.8.xml:171
 +#: apt-secure.8.xml:172
  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 "
@@@ -5223,7 -5163,7 +5212,7 @@@ msgstr "
  "authentifier les fichiers de l'archive."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-secure.8.xml:178
 +#: apt-secure.8.xml:179
  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 "
@@@ -5233,7 -5173,7 +5222,7 @@@ msgstr "
  "les deux premières étapes."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-secure.8.xml:186
 +#: apt-secure.8.xml:187
  msgid ""
  "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
  "&debsign; &debsig-verify;, &gpg;"
@@@ -5242,7 -5182,7 +5231,7 @@@ msgstr "
  "&debsign; &debsig-verify;, &gpg;"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-secure.8.xml:190
 +#: apt-secure.8.xml:191
  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"
@@@ -5259,12 -5199,12 +5248,12 @@@ msgstr "
  "Distribution HOWTO</ulink> par V. Alex Brennen."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-secure.8.xml:203
 +#: apt-secure.8.xml:204
  msgid "Manpage Authors"
  msgstr "Auteurs des pages de manuel"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-secure.8.xml:205
 +#: apt-secure.8.xml:206
  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."
@@@ -5338,7 -5278,7 +5327,7 @@@ msgstr "
  "<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 "
  "en cas d'erreur."
  
- #.  The last update date
+ #.  The last update date 
  #. type: Content of: <refentry><refentryinfo>
  #: apt.conf.5.xml:16
  msgid ""
@@@ -5402,33 -5342,27 +5391,33 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
  #: apt.conf.5.xml:52
- #| 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 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 they will be silently ignored."
 +"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>"
  "\", soit aucune extension et qui ne contiennent que des caractères "
  "alphanumériques, des tirets (-), des caractères de soulignement (_) et des "
- "points (.), les autres fichiers étant ignorés. Dans le cas contraire, APT affichera un avertissement indiquant qu'il a ignoré un fichier si celui-ci ne correspond par à un motif défini dans <literal>"
- "Dir::Ignore-Files-Silently</literal> (les fichiers correspondant à cette variable de configuration étant, eux, ignorés silencieusemennt)."
 -"points (.), les autres fichiers étant ignorés."
++"points (.), les autres fichiers étant ignorés. Dans le cas contraire, APT "
++"affichera un avertissement indiquant qu'il a ignoré un fichier si celui-ci "
++"ne correspond par à un motif défini dans <literal>Dir::Ignore-Files-"
++"Silently</literal> (les fichiers correspondant à cette variable de "
++"configuration étant, eux, ignorés silencieusemennt)."
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 -#: apt.conf.5.xml:57
 +#: apt.conf.5.xml:59
- 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>"
+ 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:59
 +#: apt.conf.5.xml:61
  msgid ""
  "the command line options are applied to override the configuration "
  "directives or to load even more configuration files."
@@@ -5438,12 -5372,12 +5427,12 @@@ msgstr "
  "configuration."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt.conf.5.xml:63
 +#: apt.conf.5.xml:65
  msgid "Syntax"
  msgstr "Syntaxe"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:64
 +#: apt.conf.5.xml:66
  msgid ""
  "The configuration file is organized in a tree with options organized into "
  "functional groups. Option specification is given with a double colon "
@@@ -5458,7 -5392,7 +5447,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:70
 +#: apt.conf.5.xml:72
  msgid ""
  "Syntactically the configuration language is modeled after what the ISC tools "
  "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@@ -5488,7 -5422,7 +5477,7 @@@ msgstr "
  "avec des accolades, comme suit :"
  
  #. type: Content of: <refentry><refsect1><informalexample><programlisting>
 -#: apt.conf.5.xml:84
 +#: apt.conf.5.xml:86
  #, no-wrap
  msgid ""
  "APT {\n"
@@@ -5506,7 -5440,7 +5495,7 @@@ msgstr "
  "};\n"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:92
 +#: apt.conf.5.xml:94
  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 "
@@@ -5517,13 -5451,13 +5506,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:97
 +#: apt.conf.5.xml:99
  #, 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:100
 +#: apt.conf.5.xml:102
  msgid ""
  "In general the sample configuration file in <filename>&docdir;examples/apt."
  "conf</filename> &configureindex; is a good guide for how it should look."
@@@ -5533,7 -5467,7 +5522,7 @@@ msgstr "
  "configuration."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:104
 +#: apt.conf.5.xml:106
  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>."
@@@ -5543,7 -5477,7 +5532,7 @@@ msgstr "
  "<literal>dpkg::pre-install-pkgs</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:107
 +#: apt.conf.5.xml:109
  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. "
@@@ -5559,7 -5493,7 +5548,7 @@@ msgstr "
  "réaffectant une valeur."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:112
 +#: apt.conf.5.xml:114
  msgid ""
  "Two specials are allowed, <literal>#include</literal> (which is deprecated "
  "and not supported by alternative implementations) and <literal>#clear</"
@@@ -5579,7 -5513,7 +5568,7 @@@ msgstr "
  "également se terminer avec un point-virgule."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:120
 +#: apt.conf.5.xml:122
  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</"
@@@ -5595,7 -5529,7 +5584,7 @@@ msgstr "
  "remplacés mais seulement effacés."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:125
 +#: apt.conf.5.xml:127
  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 "
@@@ -5613,7 -5547,7 +5602,7 @@@ msgstr "
  "ne peut pas être indiquée à la ligne de commande."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:132
 +#: apt.conf.5.xml:134
  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 "
@@@ -5644,12 -5578,12 +5633,12 @@@ msgstr "
  "tant qu'APT ne s'en plaint pas explicitement."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt.conf.5.xml:144
 +#: apt.conf.5.xml:146
  msgid "The APT Group"
  msgstr "Le groupe APT"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:145
 +#: apt.conf.5.xml:147
  msgid ""
  "This group of options controls general APT behavior as well as holding the "
  "options for all of the tools."
@@@ -5658,12 -5592,12 +5647,12 @@@ msgstr "
  "également des options communes à tous les outils."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:149
 +#: apt.conf.5.xml:151
  msgid "Architecture"
  msgstr "Architecture"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:150
 +#: apt.conf.5.xml:152
  msgid ""
  "System Architecture; sets the architecture to use when fetching files and "
  "parsing package lists. The internal default is the architecture apt was "
@@@ -5674,12 -5608,12 +5663,12 @@@ msgstr "
  "valeur interne par défaut est l'architecture pour laquelle APT a été compilé."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:155
 +#: apt.conf.5.xml:157
  msgid "Default-Release"
  msgstr "Default-Release"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:156
 +#: apt.conf.5.xml:158
  msgid ""
  "Default release to install packages from if more than one version available. "
  "Contains release name, codename or release version. Examples: 'stable', "
@@@ -5693,12 -5627,12 +5682,12 @@@ msgstr "
  "&apt-preferences;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:161
 +#: apt.conf.5.xml:163
  msgid "Ignore-Hold"
  msgstr "Ignore-Hold"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:162
 +#: apt.conf.5.xml:164
  msgid ""
  "Ignore Held packages; This global option causes the problem resolver to "
  "ignore held packages in its decision making."
@@@ -5708,12 -5642,12 +5697,12 @@@ msgstr "
  "décision."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:166
 +#: apt.conf.5.xml:168
  msgid "Clean-Installed"
  msgstr "Clean-Installed"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:167
 +#: apt.conf.5.xml:169
  msgid ""
  "Defaults to on. When turned on the autoclean feature will remove any "
  "packages which can no longer be downloaded from the cache. If turned off "
@@@ -5727,12 -5661,12 +5716,12 @@@ msgstr "
  "direct pour les réinstaller."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:173
 +#: apt.conf.5.xml:175
  msgid "Immediate-Configure"
  msgstr "Immediate-Configure"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:174
 +#: apt.conf.5.xml:176
  msgid ""
  "Defaults to on which will cause APT to install essential and important "
  "packages as fast as possible in the install/upgrade operation. This is done "
@@@ -5796,12 -5730,12 +5785,12 @@@ msgstr "
  "utilisée afin qu'il soit étudié et corrigé."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:196
 +#: apt.conf.5.xml:198
  msgid "Force-LoopBreak"
  msgstr "Force-LoopBreak"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:197
 +#: apt.conf.5.xml:199
  msgid ""
  "Never Enable this option unless you -really- know what you are doing. It "
  "permits APT to temporarily remove an essential package to break a Conflicts/"
@@@ -5819,12 -5753,12 +5808,12 @@@ msgstr "
  "les paquets dont ces paquets dépendent."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:205
 +#: 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:206
 +#: apt.conf.5.xml:208
  msgid ""
  "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
  "the 'available' information. <literal>Cache-Start</literal> acts as a hint "
@@@ -5864,24 -5798,24 +5853,24 @@@ msgstr "
  "l'augmentation automatique de la taille du cache est désactivée."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:221
 +#: apt.conf.5.xml:223
  msgid "Build-Essential"
  msgstr "Build-Essential"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:222
 +#: apt.conf.5.xml:224
  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:225
 +#: apt.conf.5.xml:227
  msgid "Get"
  msgstr "Get"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:226
 +#: apt.conf.5.xml:228
  msgid ""
  "The Get subsection controls the &apt-get; tool, please see its documentation "
  "for more information about the options here."
@@@ -5891,12 -5825,12 +5880,12 @@@ msgstr "
  "question."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:230
 +#: apt.conf.5.xml:232
  msgid "Cache"
  msgstr "Cache"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:231
 +#: apt.conf.5.xml:233
  msgid ""
  "The Cache subsection controls the &apt-cache; tool, please see its "
  "documentation for more information about the options here."
@@@ -5906,12 -5840,12 +5895,12 @@@ msgstr "
  "options en question."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:235
 +#: apt.conf.5.xml:237
  msgid "CDROM"
  msgstr "CDROM"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:236
 +#: apt.conf.5.xml:238
  msgid ""
  "The CDROM subsection controls the &apt-cdrom; tool, please see its "
  "documentation for more information about the options here."
@@@ -5921,17 -5855,17 +5910,17 @@@ msgstr "
  "options en question."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt.conf.5.xml:242
 +#: apt.conf.5.xml:244
  msgid "The Acquire Group"
  msgstr "Le groupe Acquire"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:247
 +#: 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:248
 +#: apt.conf.5.xml:250
  msgid ""
  "Security related option defaulting to true as an expiring validation for a "
  "Release file prevents longtime replay attacks and can e.g. also help users "
@@@ -5951,12 -5885,12 +5940,12 @@@ msgstr "
  "ValidTime</literal> est alors utilisée."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:258
 +#: 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:259
 +#: apt.conf.5.xml:261
  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 "
@@@ -5980,12 -5914,12 +5969,12 @@@ msgstr "
  "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:271
 +#: apt.conf.5.xml:273
  msgid "PDiffs"
  msgstr "PDiffs"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:272
 +#: apt.conf.5.xml:274
  msgid ""
  "Try to download deltas called <literal>PDiffs</literal> for Packages or "
  "Sources files instead of downloading whole ones. True by default."
@@@ -5995,7 -5929,7 +5984,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:275
 +#: apt.conf.5.xml:277
  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 "
@@@ -6014,12 -5948,12 +6003,12 @@@ msgstr "
  "fichiers de différences."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:284
 +#: 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:285
 +#: apt.conf.5.xml:287
  msgid ""
  "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
  "literal> or <literal>access</literal> which determines how APT parallelizes "
@@@ -6035,12 -5969,12 +6024,12 @@@ msgstr "
  "initiée."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:292
 +#: apt.conf.5.xml:294
  msgid "Retries"
  msgstr "Retries"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:293
 +#: apt.conf.5.xml:295
  msgid ""
  "Number of retries to perform. If this is non-zero APT will retry failed "
  "files the given number of times."
@@@ -6050,12 -5984,12 +6039,12 @@@ msgstr "
  "échoué."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:297
 +#: 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:298
 +#: apt.conf.5.xml:300
  msgid ""
  "Use symlinks for source archives. If set to true then source archives will "
  "be symlinked when possible instead of copying. True is the default."
@@@ -6065,12 -5999,12 +6054,12 @@@ msgstr "
  "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:302 sources.list.5.xml:142
 +#: 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:303
 +#: apt.conf.5.xml:305
  msgid ""
  "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
  "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@@ -6090,7 -6024,7 +6079,7 @@@ msgstr "
  "options de mandataire HTTP."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:311
 +#: apt.conf.5.xml:313
  msgid ""
  "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
  "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@@ -6115,7 -6049,7 +6104,7 @@@ msgstr "
  "en compte aucune de ces options."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:321 apt.conf.5.xml:385
 +#: apt.conf.5.xml:323 apt.conf.5.xml:387
  msgid ""
  "The option <literal>timeout</literal> sets the timeout timer used by the "
  "method, this applies to all things including connection timeout and data "
@@@ -6126,7 -6060,7 +6115,7 @@@ msgstr "
  "données."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:324
 +#: 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).  "
@@@ -6146,7 -6080,7 +6135,7 @@@ msgstr "
  "cette option ne respectent pas la RFC 2068."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:332
 +#: apt.conf.5.xml:334
  msgid ""
  "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
  "literal> which accepts integer values in kilobyte. The default value is 0 "
@@@ -6161,7 -6095,7 +6150,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:337
 +#: apt.conf.5.xml:339
  msgid ""
  "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
  "User-Agent for the http download method as some proxies allow access for "
@@@ -6173,12 -6107,12 +6162,12 @@@ msgstr "
  "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:343
 +#: apt.conf.5.xml:345
  msgid "https"
  msgstr "https"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:344
 +#: apt.conf.5.xml:346
  msgid ""
  "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
  "options are the same as for <literal>http</literal> method and will also "
@@@ -6194,7 -6128,7 +6183,7 @@@ msgstr "
  "encore gérée."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:350
 +#: apt.conf.5.xml:352
  msgid ""
  "<literal>CaInfo</literal> suboption specifies place of file that holds info "
  "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@@ -6226,12 -6160,12 +6215,12 @@@ msgstr "
  "ou 'SSLv3'."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:368 sources.list.5.xml:153
 +#: 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:369
 +#: apt.conf.5.xml:371
  msgid ""
  "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
  "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@@ -6266,7 -6200,7 +6255,7 @@@ msgstr "
  "correspond à l'élément respectif de l'URI."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:388
 +#: apt.conf.5.xml:390
  msgid ""
  "Several settings are provided to control passive mode. Generally it is safe "
  "to leave passive mode on, it works in nearly every environment.  However "
@@@ -6283,7 -6217,7 +6272,7 @@@ msgstr "
  "modèle de fichier de configuration)."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:395
 +#: apt.conf.5.xml:397
  msgid ""
  "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
  "envar> environment variable to a http url - see the discussion of the http "
@@@ -6298,7 -6232,7 +6287,7 @@@ msgstr "
  "efficacité de cette méthode."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:400
 +#: apt.conf.5.xml:402
  msgid ""
  "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
  "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@@ -6314,18 -6248,18 +6303,18 @@@ msgstr "
  "des serveurs FTP ne suivent pas la RFC 2428."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:407 sources.list.5.xml:135
 +#: 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:413
 +#: apt.conf.5.xml:415
  #, no-wrap
  msgid "/cdrom/::Mount \"foo\";"
  msgstr "/cdrom/::Mount \"foo\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:408
 +#: apt.conf.5.xml:410
  msgid ""
  "CDROM URIs; the only setting for CDROM URIs is the mount point, "
  "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@@ -6347,12 -6281,12 +6336,12 @@@ msgstr "
  "spécifiées en utilisant <literal>UMount</literal>."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:418
 +#: apt.conf.5.xml:420
  msgid "gpgv"
  msgstr "gpgv"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:419
 +#: apt.conf.5.xml:421
  msgid ""
  "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
  "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@@ -6363,18 -6297,18 +6352,18 @@@ msgstr "
  "supplémentaires passées à gpgv."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:424
 +#: apt.conf.5.xml:426
  msgid "CompressionTypes"
  msgstr "CompressionTypes"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 -#: apt.conf.5.xml:430
 +#: apt.conf.5.xml:432
  #, 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:425
 +#: apt.conf.5.xml:427
  msgid ""
  "List of compression types which are understood by the acquire methods.  "
  "Files like <filename>Packages</filename> can be available in various "
@@@ -6394,19 -6328,19 +6383,19 @@@ msgstr "
  "type=\"synopsis\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 -#: apt.conf.5.xml:435
 +#: apt.conf.5.xml:437
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order:: \"gz\";"
  msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 -#: apt.conf.5.xml:438
 +#: apt.conf.5.xml:440
  #, no-wrap
  msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:431
 +#: apt.conf.5.xml:433
  msgid ""
  "Also the <literal>Order</literal> subgroup can be used to define in which "
  "order the acquire system will try to download the compressed files. The "
@@@ -6437,24 -6371,13 +6426,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:442
 +#: apt.conf.5.xml:444
  #, 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:440
 +#: apt.conf.5.xml:442
- #| 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 "
- #| "in the configuration files you can set the option direct - not in list "
- #| "style.  This will not override the defined list, it will only prefix the "
- #| "list with this type."
  msgid ""
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
@@@ -6462,7 -6385,7 +6440,7 @@@
  "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 in the "
 +"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."
@@@ -6480,22 -6403,28 +6458,24 @@@ 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:447
 +#: apt.conf.5.xml:449
  msgid ""
 -"While it is possible to add an empty compression type to the order list, but "
 -"APT in its current version doesn't understand it correctly and will display "
 -"many warnings about not downloaded files - these warnings are most of the "
 -"time false negatives. Future versions will maybe include a way to really "
 -"prefer uncompressed files to support the usage of local mirrors."
 +"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 so this is mostly only useable for local mirrors."
  msgstr ""
- "Le type spécial <literal>uncompressed</literal> peut servir à donner la préférence aux fichiers non compressés. Veuillez noter que la plupart des archives ne fournissent pas de fichiers non compressés, donc ce "
- "réglage est surtout destiné aux miroirs locaux."
 -"Bien qu'il soit possible d'ajouter un type vide de compression à la liste "
 -"ordonnée, APT ne l'interprétera pas correctement et affichera de nombreux "
 -"messages d'avertissement à propos d'échec de téléchargement, qui sont le "
 -"plus souvent des avertissements sans conséquences. Dans de futures versions, "
 -"il deviendra réellement possible d'établir une préférence pour des fichiers "
 -"non compressés afin de gérer des miroirs locaux."
++"Le type spécial <literal>uncompressed</literal> peut servir à donner la "
++"préférence aux fichiers non compressés. Veuillez noter que la plupart des "
++"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:453
 +#: apt.conf.5.xml:454
  msgid "GzipIndexes"
  msgstr "GzipIndexes"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:455
 +#: apt.conf.5.xml:456
  msgid ""
  "When downloading <literal>gzip</literal> compressed indexes (Packages, "
  "Sources, or Translations), keep them gzip compressed locally instead of "
@@@ -6510,12 -6439,12 +6490,12 @@@ msgstr "
  "(« False »)."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:462
 +#: apt.conf.5.xml:463
  msgid "Languages"
  msgstr "Langues"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:463
 +#: apt.conf.5.xml:464
  msgid ""
  "The Languages subsection controls which <filename>Translation</filename> "
  "files are downloaded and in which order APT tries to display the Description-"
@@@ -6537,13 -6466,13 +6517,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:479
 +#: apt.conf.5.xml:480
  #, 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:469
 +#: apt.conf.5.xml:470
  msgid ""
  "The default list includes \"environment\" and \"en\". "
  "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@@ -6585,7 -6514,7 +6565,7 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:243
 +#: apt.conf.5.xml:245
  msgid ""
  "The <literal>Acquire</literal> group of options controls the download of "
  "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@@ -6595,12 -6524,12 +6575,12 @@@ msgstr "
  "id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt.conf.5.xml:486
 +#: apt.conf.5.xml:487
  msgid "Directories"
  msgstr "Les répertoires"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:488
 +#: apt.conf.5.xml:489
  msgid ""
  "The <literal>Dir::State</literal> section has directories that pertain to "
  "local state information. <literal>lists</literal> is the directory to place "
@@@ -6620,7 -6549,7 +6600,7 @@@ msgstr "
  "filename>."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:495
 +#: apt.conf.5.xml:496
  msgid ""
  "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
  "information, such as the two package caches <literal>srcpkgcache</literal> "
@@@ -6643,7 -6572,7 +6623,7 @@@ msgstr "
  "Cache</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:504
 +#: apt.conf.5.xml:505
  msgid ""
  "<literal>Dir::Etc</literal> contains the location of configuration files, "
  "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@@ -6658,7 -6587,7 +6638,7 @@@ msgstr "
  "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:510
 +#: apt.conf.5.xml:511
  msgid ""
  "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
  "in lexical order from the directory specified. After this is done then the "
@@@ -6669,7 -6598,7 +6649,7 @@@ msgstr "
  "configuration est chargé."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:514
 +#: apt.conf.5.xml:515
  msgid ""
  "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
  "Bin::Methods</literal> specifies the location of the method handlers and "
@@@ -6687,7 -6616,7 +6667,7 @@@ msgstr "
  "programmes correspondants."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:522
 +#: apt.conf.5.xml:523
  msgid ""
  "The configuration item <literal>RootDir</literal> has a special meaning.  If "
  "set, all paths in <literal>Dir::</literal> will be relative to "
@@@ -6709,7 -6638,7 +6689,7 @@@ msgstr "
  "staging/var/lib/dpkg/status</filename>."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:535
 +#: apt.conf.5.xml:536
  msgid ""
  "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
  "which files APT should silently ignore while parsing the files in the "
@@@ -6727,12 -6656,12 +6707,12 @@@ msgstr "
  "est possible d'utiliser la syntaxe des expressions rationnelles."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt.conf.5.xml:544
 +#: apt.conf.5.xml:545
  msgid "APT in DSelect"
  msgstr "APT et DSelect"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:546
 +#: apt.conf.5.xml:547
  msgid ""
  "When APT is used as a &dselect; method several configuration directives "
  "control the default behaviour. These are in the <literal>DSelect</literal> "
@@@ -6743,12 -6672,12 +6723,12 @@@ msgstr "
  "<literal>DSelect</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:550
 +#: apt.conf.5.xml:551
  msgid "Clean"
  msgstr "Clean"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:551
 +#: apt.conf.5.xml:552
  msgid ""
  "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
  "and never.  always and prompt will remove all packages from the cache after "
@@@ -6766,7 -6695,7 +6746,7 @@@ msgstr "
  "supprime avant de récupérer de nouveaux paquets."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:560
 +#: apt.conf.5.xml:561
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the install phase."
@@@ -6775,12 -6704,12 +6755,12 @@@ msgstr "
  "&apt-get; lors de la phase d'installation."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:564
 +#: apt.conf.5.xml:565
  msgid "Updateoptions"
  msgstr "UpdateOptions"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:565
 +#: apt.conf.5.xml:566
  msgid ""
  "The contents of this variable is passed to &apt-get; as command line options "
  "when it is run for the update phase."
@@@ -6789,12 -6718,12 +6769,12 @@@ msgstr "
  "&apt-get; lors de la phase de mise à jour."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:569
 +#: apt.conf.5.xml:570
  msgid "PromptAfterUpdate"
  msgstr "PromptAfterUpdate"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:570
 +#: apt.conf.5.xml:571
  msgid ""
  "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
  "The default is to prompt only on error."
@@@ -6804,12 -6733,12 +6784,12 @@@ msgstr "
  "d'erreur que l'on propose à l'utilisateur d'intervenir."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt.conf.5.xml:576
 +#: apt.conf.5.xml:577
  msgid "How APT calls dpkg"
  msgstr "Méthode d'appel de &dpkg; par APT"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:577
 +#: apt.conf.5.xml:578
  msgid ""
  "Several configuration directives control how APT invokes &dpkg;. These are "
  "in the <literal>DPkg</literal> section."
@@@ -6818,7 -6747,7 +6798,7 @@@ msgstr "
  "&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:582
 +#: apt.conf.5.xml:583
  msgid ""
  "This is a list of options to pass to dpkg. The options must be specified "
  "using the list notation and each list item is passed as a single argument to "
@@@ -6829,17 -6758,17 +6809,17 @@@ msgstr "
  "est passé comme un seul paramètre à &dpkg;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:587
 +#: apt.conf.5.xml:588
  msgid "Pre-Invoke"
  msgstr "Pre-Invoke"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:587
 +#: apt.conf.5.xml:588
  msgid "Post-Invoke"
  msgstr "Post-Invoke"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:588
 +#: apt.conf.5.xml:589
  msgid ""
  "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -6852,12 -6781,12 +6832,12 @@@ msgstr "
  "<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:594
 +#: 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:595
 +#: apt.conf.5.xml:596
  msgid ""
  "This is a list of shell commands to run before invoking dpkg. Like "
  "<literal>options</literal> this must be specified in list notation. The "
@@@ -6873,7 -6802,7 +6853,7 @@@ msgstr "
  "qu'il va installer, à raison d'un par ligne."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:601
 +#: apt.conf.5.xml:602
  msgid ""
  "Version 2 of this protocol dumps more information, including the protocol "
  "version, the APT configuration space and the packages, files and versions "
@@@ -6889,12 -6818,12 +6869,12 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:608
 +#: apt.conf.5.xml:609
  msgid "Run-Directory"
  msgstr "Run-Directory"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:609
 +#: apt.conf.5.xml:610
  msgid ""
  "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
  "</filename>."
@@@ -6903,12 -6832,12 +6883,12 @@@ msgstr "
  "le répertoire <filename>/</filename>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:613
 +#: apt.conf.5.xml:614
  msgid "Build-options"
  msgstr "Build-options"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:614
 +#: apt.conf.5.xml:615
  msgid ""
  "These options are passed to &dpkg-buildpackage; when compiling packages, the "
  "default is to disable signing and produce all binaries."
@@@ -6918,29 -6847,17 +6898,17 @@@ msgstr "
  "créés."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
 -#: apt.conf.5.xml:619
 +#: apt.conf.5.xml:620
  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:620
 +#: apt.conf.5.xml:621
- #| msgid ""
- #| "APT can call dpkg in a way so it can make aggressive use of triggers over "
- #| "multiply calls of dpkg. Without further options dpkg will use triggers "
- #| "only in between his own run. Activating these options can therefore "
- #| "decrease the time needed to perform the install / upgrade. Note that it "
- #| "is intended to activate these options per default in the future, but as "
- #| "it changes the way APT calling dpkg drastically it needs a lot more "
- #| "testing.  <emphasis>These options are therefore currently experimental "
- #| "and should not be used in productive environments.</emphasis> Also it "
- #| "breaks the progress reporting so all frontends will currently stay around "
- #| "half (or more) of the time in the 100% state while it actually configures "
- #| "all packages."
  msgid ""
  "APT can call dpkg in a way so it can make aggressive use of triggers over "
 -"multiply calls of dpkg. Without further options dpkg will use triggers only "
 +"multiple calls of dpkg. Without further options dpkg will use triggers only "
  "in between his own run. Activating these options can therefore decrease the "
  "time needed to perform the install / upgrade. Note that it is intended to "
  "activate these options per default in the future, but as it changes the way "
@@@ -6964,7 -6881,7 +6932,7 @@@ msgstr "
  "configuration des paquets."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
 -#: apt.conf.5.xml:635
 +#: apt.conf.5.xml:636
  #, no-wrap
  msgid ""
  "DPkg::NoTriggers \"true\";\n"
@@@ -6978,7 -6895,7 +6946,7 @@@ msgstr "
  "DPkg::TriggersPending \"true\";"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt.conf.5.xml:629
 +#: apt.conf.5.xml:630
  msgid ""
  "Note that it is not guaranteed that APT will support these options or that "
  "these options will not cause (big) trouble in the future. If you have "
@@@ -7002,12 -6919,12 +6970,12 @@@ msgstr "
  "type=\"literallayout\" id=\"0\"/>."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:641
 +#: 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:642
 +#: apt.conf.5.xml:643
  msgid ""
  "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
  "call).  See &dpkg; if you are interested in what this actually means. In "
@@@ -7029,12 -6946,12 +6997,12 @@@ msgstr "
  "options « unpack » et « remove »."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:649
 +#: 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:650
 +#: apt.conf.5.xml:651
  msgid ""
  "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
  "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@@ -7062,12 -6979,12 +7030,12 @@@ msgstr "
  "configuré et donc éventuellement non amorçable."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:660
 +#: 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:661
 +#: apt.conf.5.xml:662
  msgid ""
  "If this option is set apt will call <command>dpkg --configure --pending</"
  "command> to let dpkg handle all required configurations and triggers. This "
@@@ -7086,12 -7003,12 +7054,12 @@@ msgstr "
  "peut conserver l'option active."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:667
 +#: 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:668
 +#: apt.conf.5.xml:669
  msgid ""
  "Useful for <literal>smart</literal> configuration as a package which has "
  "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@@ -7109,12 -7026,12 +7077,12 @@@ msgstr "
  "celles concernant le paquet en cours de traitement."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:673
 +#: 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:674
 +#: apt.conf.5.xml:675
  msgid ""
  "As the configuration can be deferred to be done at the end by dpkg it can be "
  "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@@ -7139,12 -7056,12 +7107,12 @@@ msgstr "
  "traduction n'est pas exclu...)."
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:681
 +#: 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:689
 +#: apt.conf.5.xml:690
  #, no-wrap
  msgid ""
  "OrderList::Score {\n"
@@@ -7162,7 -7079,7 +7130,7 @@@ msgstr "
  "};"
  
  #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 -#: apt.conf.5.xml:682
 +#: apt.conf.5.xml:683
  msgid ""
  "Essential packages (and there dependencies) should be configured immediately "
  "after unpacking. It will be a good idea to do this quite early in the "
@@@ -7188,12 -7105,12 +7156,12 @@@ msgstr "
  "id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt.conf.5.xml:702
 +#: apt.conf.5.xml:703
  msgid "Periodic and Archives options"
  msgstr "Options « Periodic » et « Archive »"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:703
 +#: apt.conf.5.xml:704
  msgid ""
  "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
  "of options configure behavior of apt periodic updates, which is done by "
@@@ -7205,12 -7122,12 +7173,12 @@@ msgstr "
  "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt.conf.5.xml:711
 +#: apt.conf.5.xml:712
  msgid "Debug options"
  msgstr "Les options de débogage"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:713
 +#: apt.conf.5.xml:714
  msgid ""
  "Enabling options in the <literal>Debug::</literal> section will cause "
  "debugging information to be sent to the standard error stream of the program "
@@@ -7228,7 -7145,7 +7196,7 @@@ msgstr "
  "peuvent tout de même être utiles :"
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 -#: apt.conf.5.xml:724
 +#: apt.conf.5.xml:725
  msgid ""
  "<literal>Debug::pkgProblemResolver</literal> enables output about the "
  "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@@ -7239,7 -7156,7 +7207,7 @@@ msgstr "
  "upgrade, upgrade, install, remove et purge</literal>."
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 -#: apt.conf.5.xml:732
 +#: apt.conf.5.xml:733
  msgid ""
  "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
  "used to run some operations (for instance, <literal>apt-get -s install</"
@@@ -7251,7 -7168,7 +7219,7 @@@ msgstr "
  "superutilisateur."
  
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 -#: apt.conf.5.xml:741
 +#: apt.conf.5.xml:742
  msgid ""
  "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
  "time that <literal>apt</literal> invokes &dpkg;."
@@@ -7261,9 -7178,9 +7229,9 @@@ msgstr "
  
  #.  TODO: provide a
  #.       motivating example, except I haven't a clue why you'd want
- #.       to do this.
+ #.       to do this. 
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 -#: apt.conf.5.xml:749
 +#: apt.conf.5.xml:750
  msgid ""
  "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
  "in CDROM IDs."
@@@ -7272,59 -7189,62 +7240,62 @@@ msgstr "
  "type statfs dans les identifiants de CD."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:759
 +#: apt.conf.5.xml:760
  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:764
 +#: 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:768
 +#: apt.conf.5.xml:769
- msgid "Print information related to accessing <literal>cdrom://</literal> sources."
+ 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:775
 +#: 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:779
 +#: apt.conf.5.xml:780
  msgid "Print information related to downloading packages using FTP."
- msgstr "Affiche les informations concernant le téléchargement de paquets par 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:786
 +#: 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:790
 +#: apt.conf.5.xml:791
  msgid "Print information related to downloading packages using HTTP."
- msgstr "Affiche les informations concernant le téléchargement de paquets par 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:797
 +#: 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:801
 +#: apt.conf.5.xml:802
  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:808
 +#: 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:812
 +#: apt.conf.5.xml:813
  msgid ""
  "Print information related to verifying cryptographic signatures using "
  "<literal>gpg</literal>."
@@@ -7333,12 -7253,12 +7304,12 @@@ msgstr "
  "cryptographiques avec <literal>gpg</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:819
 +#: 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:823
 +#: apt.conf.5.xml:824
  msgid ""
  "Output information about the process of accessing collections of packages "
  "stored on CD-ROMs."
@@@ -7347,24 -7267,24 +7318,24 @@@ msgstr "
  "stockées sur CD."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:830
 +#: 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:833
 +#: apt.conf.5.xml:834
  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:840
 +#: 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:843
 +#: apt.conf.5.xml:844
  msgid ""
  "Output each cryptographic hash that is generated by the <literal>apt</"
  "literal> libraries."
@@@ -7373,12 -7293,12 +7344,12 @@@ msgstr "
  "librairies d'<literal>apt</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:850
 +#: 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:853
 +#: apt.conf.5.xml:854
  msgid ""
  "Do not include information from <literal>statfs</literal>, namely the number "
  "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@@ -7389,12 -7309,12 +7360,12 @@@ msgstr "
  "utilisés sur le système de fichier du CD."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:861
 +#: 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:864
 +#: apt.conf.5.xml:865
  msgid ""
  "Disable all file locking.  For instance, this will allow two instances of "
  "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@@ -7404,24 -7324,24 +7375,24 @@@ msgstr "
  "temps."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:872
 +#: 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:876
 +#: apt.conf.5.xml:877
  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:883
 +#: 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:886
 +#: apt.conf.5.xml:887
  msgid ""
  "Output status messages and errors related to verifying checksums and "
  "cryptographic signatures of downloaded files."
@@@ -7431,12 -7351,12 +7402,12 @@@ msgstr "
  "éventuelles."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:893
 +#: 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:896
 +#: apt.conf.5.xml:897
  msgid ""
  "Output information about downloading and applying package index list diffs, "
  "and errors relating to package index list diffs."
@@@ -7446,12 -7366,12 +7417,12 @@@ msgstr "
  "éventuelles."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:904
 +#: 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:908
 +#: apt.conf.5.xml:909
  msgid ""
  "Output information related to patching apt package lists when downloading "
  "index diffs instead of full indices."
@@@ -7461,24 -7381,25 +7432,25 @@@ msgstr "
  "place des fichiers complets."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:915
 +#: 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:919
 +#: apt.conf.5.xml:920
- msgid "Log all interactions with the sub-processes that actually perform downloads."
+ 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:926
 +#: 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:930
 +#: apt.conf.5.xml:931
  msgid ""
  "Log events related to the automatically-installed status of packages and to "
  "the removal of unused packages."
@@@ -7487,12 -7408,12 +7459,12 @@@ msgstr "
  "automatiquement, et la suppression des paquets inutiles."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:937
 +#: 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:940
 +#: apt.conf.5.xml:941
  msgid ""
  "Generate debug messages describing which packages are being automatically "
  "installed to resolve dependencies.  This corresponds to the initial auto-"
@@@ -7507,12 -7428,12 +7479,12 @@@ msgstr "
  "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:951
 +#: 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:954
 +#: apt.conf.5.xml:955
  msgid ""
  "Generate debug messages describing which package is marked as keep/install/"
  "remove while the ProblemResolver does his work.  Each addition or deletion "
@@@ -7547,24 -7468,24 +7519,24 @@@ msgstr "
  "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:973
 +#: 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:976
 +#: apt.conf.5.xml:977
  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:983
 +#: 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:986
 +#: apt.conf.5.xml:987
  msgid ""
  "When invoking &dpkg;, output the precise command line with which it is being "
  "invoked, with arguments separated by a single space character."
@@@ -7573,12 -7494,12 +7545,12 @@@ msgstr "
  "paramètres sont séparés par des espaces."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:994
 +#: 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:997
 +#: apt.conf.5.xml:998
  msgid ""
  "Output all the data received from &dpkg; on the status file descriptor and "
  "any errors encountered while parsing it."
@@@ -7588,12 -7509,12 +7560,12 @@@ msgstr "
  "fichier."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:1004
 +#: 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:1008
 +#: apt.conf.5.xml:1009
  msgid ""
  "Generate a trace of the algorithm that decides the order in which "
  "<literal>apt</literal> should pass packages to &dpkg;."
@@@ -7602,32 -7523,33 +7574,33 @@@ msgstr "
  "<literal>apt</literal> passe les paquets à &dpkg;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:1016
 +#: 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:1020
 +#: apt.conf.5.xml:1021
- msgid "Output status messages tracing the steps performed when invoking &dpkg;."
+ 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:1027
 +#: 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:1031
 +#: apt.conf.5.xml:1032
  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:1037
 +#: 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:1041
 +#: apt.conf.5.xml:1042
  msgid ""
  "Trace the execution of the dependency resolver (this applies only to what "
  "happens when a complex dependency problem is encountered)."
@@@ -7636,12 -7558,12 +7609,12 @@@ msgstr "
  "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:1049
 +#: 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:1052
 +#: apt.conf.5.xml:1053
  msgid ""
  "Display a list of all installed packages with their calculated score used by "
  "the pkgProblemResolver. The description of the package is the same as "
@@@ -7652,12 -7574,12 +7625,12 @@@ msgstr "
  "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 -#: apt.conf.5.xml:1060
 +#: 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:1064
 +#: apt.conf.5.xml:1065
  msgid ""
  "Print information about the vendors read from <filename>/etc/apt/vendors."
  "list</filename>."
@@@ -7666,7 -7588,7 +7639,7 @@@ msgstr "
  "list</filename>."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:1087
 +#: apt.conf.5.xml:1088
  msgid ""
  "&configureindex; is a configuration file showing example values for all "
  "possible options."
@@@ -7675,21 -7597,23 +7648,23 @@@ msgstr "
  "exemples pour toutes les options existantes."
  
  #. type: Content of: <refentry><refsect1><variablelist>
 -#: apt.conf.5.xml:1094
 +#: apt.conf.5.xml:1095
  msgid "&file-aptconf;"
  msgstr "&file-aptconf;"
  
- #.  ? reading apt.conf
+ #.  ? reading apt.conf 
  #. type: Content of: <refentry><refsect1><para>
 -#: apt.conf.5.xml:1099
 +#: apt.conf.5.xml:1100
  msgid "&apt-cache;, &apt-config;, &apt-preferences;."
  msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
  
- #.  The last update date
+ #.  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>"
+ 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
@@@ -7774,49 -7698,40 +7749,45 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt_preferences.5.xml:70
- #| msgid ""
- #| "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
- #| "directory are parsed in alphanumeric ascending order and need to obey the "
- #| "following naming convention: The files have no or \"<literal>pref</"
- #| "literal>\" as filename extension and which only contain alphanumeric, "
- #| "hyphen (-), underscore (_) and period (.) characters - otherwise they "
- #| "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 (-), "
 -"underscore (_) and period (.) characters - otherwise they will be silently "
 -"ignored."
 +"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 ""
  "Veuillez noter que les fichiers du répertoire <filename>/etc/apt/preferences."
  "d</filename> sont analysés par ordre alphanumérique ascendant, doivent avoir "
  "l'extension \"<literal>pref</literal>\" ou aucune extension et ne peuvent "
  "continir que des caractères alphanumériques, des tirets (-), des caractères "
- "de soulignement (_) et des points (.). Dans le cas contraire, APT affichera un avertissement indiquant qu'il a ignoré un fichier si celui-ci ne correspond par à un motif défini dans <literal>"
- "Dir::Ignore-Files-Silently</literal> (les fichiers correspondant à cette variable de configuration étant, eux, ignorés silencieusemennt)."
 -"de soulignement (_) et des points (.). Dans le cas contraire, ils seront "
 -"ignorés sans avertissement."
++"de soulignement (_) et des points (.). Dans le cas contraire, APT affichera "
++"un avertissement indiquant qu'il a ignoré un fichier si celui-ci ne "
++"correspond par à un motif défini dans <literal>Dir::Ignore-Files-Silently</"
++"literal> (les fichiers correspondant à cette variable de configuration "
++"étant, eux, ignorés silencieusemennt)."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
 -#: apt_preferences.5.xml:77
 +#: apt_preferences.5.xml:79
  msgid "APT's Default Priority Assignments"
  msgstr "Priorités affectées par défaut"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 -#: apt_preferences.5.xml:92
 +#: apt_preferences.5.xml:94
  #, no-wrap
  msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
  msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 -#: apt_preferences.5.xml:95
 +#: apt_preferences.5.xml:97
  #, no-wrap
  msgid "APT::Default-Release \"stable\";\n"
  msgstr "APT::Default-Release \"stable\";\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:79
 +#: apt_preferences.5.xml:81
  msgid ""
  "If there is no preferences file or if there is no entry in the file that "
  "applies to a particular version then the priority assigned to that version "
@@@ -7841,12 -7756,12 +7812,12 @@@ msgstr "
  "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:104
 +#: apt_preferences.5.xml:106
  msgid "priority 1"
  msgstr "priorité 1"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 -#: apt_preferences.5.xml:105
 +#: apt_preferences.5.xml:107
  msgid ""
  "to the versions coming from archives which in their <filename>Release</"
  "filename> files are marked as \"NotAutomatic: yes\" like the debian "
@@@ -7857,22 -7772,22 +7828,22 @@@ msgstr "
  "l'archive « experimental » de Debian."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:110
 +#: apt_preferences.5.xml:112
  msgid "priority 100"
  msgstr "une priorité égale à 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 -#: apt_preferences.5.xml:111
 +#: apt_preferences.5.xml:113
  msgid "to the version that is already installed (if any)."
  msgstr "est affectée à la version déjà installée (si elle existe)."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:115
 +#: apt_preferences.5.xml:117
  msgid "priority 500"
  msgstr "une priorité égale à 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 -#: apt_preferences.5.xml:116
 +#: apt_preferences.5.xml:118
  msgid ""
  "to the versions that are not installed and do not belong to the target "
  "release."
@@@ -7881,19 -7796,20 +7852,20 @@@ msgstr "
  "pas à la distribution par défaut."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:120
 +#: apt_preferences.5.xml:122
  msgid "priority 990"
  msgstr "une priorité égale à 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 -#: apt_preferences.5.xml:121
 +#: apt_preferences.5.xml:123
- msgid "to the versions that are not installed and belong to the target release."
+ msgid ""
+ "to the versions that are not installed and belong to the target release."
  msgstr ""
  "est affectée aux versions qui ne sont pas installées et qui appartiennent à "
  "la distribution par défaut."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:99
 +#: apt_preferences.5.xml:101
  msgid ""
  "If the target release has been specified then APT uses the following "
  "algorithm to set the priorities of the versions of a package.  Assign: "
@@@ -7904,7 -7820,7 +7876,7 @@@ msgstr "
  "type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:126
 +#: apt_preferences.5.xml:128
  msgid ""
  "If the target release has not been specified then APT simply assigns "
  "priority 100 to all installed package versions and priority 500 to all "
@@@ -7920,7 -7836,7 +7892,7 @@@ msgstr "
  "priorité égale à 1."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:132
 +#: apt_preferences.5.xml:134
  msgid ""
  "APT then applies the following rules, listed in order of precedence, to "
  "determine which version of a package to install."
@@@ -7929,7 -7845,7 +7901,7 @@@ msgstr "
  "qu'il faut installer (par ordre de priorité) :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 -#: apt_preferences.5.xml:135
 +#: apt_preferences.5.xml:137
  msgid ""
  "Never downgrade unless the priority of an available version exceeds 1000.  "
  "(\"Downgrading\" is installing a less recent version of a package in place "
@@@ -7945,12 -7861,12 +7917,12 @@@ msgstr "
  "arrière."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 -#: apt_preferences.5.xml:141
 +#: apt_preferences.5.xml:143
  msgid "Install the highest priority version."
  msgstr "Installer la version qui possède la priorité la plus haute."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 -#: apt_preferences.5.xml:142
 +#: apt_preferences.5.xml:144
  msgid ""
  "If two or more versions have the same priority, install the most recent one "
  "(that is, the one with the higher version number)."
@@@ -7959,7 -7875,7 +7931,7 @@@ msgstr "
  "plus récente (c.-à-d. celle dont le numéro de version est le plus grand)."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 -#: apt_preferences.5.xml:145
 +#: apt_preferences.5.xml:147
  msgid ""
  "If two or more versions have the same priority and version number but either "
  "the packages differ in some of their metadata or the <literal>--reinstall</"
@@@ -7971,7 -7887,7 +7943,7 @@@ msgstr "
  "qui n'est pas installée."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:151
 +#: apt_preferences.5.xml:153
  msgid ""
  "In a typical situation, the installed version of a package (priority 100)  "
  "is not as recent as one of the versions available from the sources listed in "
@@@ -7986,7 -7902,7 +7958,7 @@@ msgstr "
  "replaceable></command> ou <command>apt-get dist-upgrade</command>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:158
 +#: apt_preferences.5.xml:160
  msgid ""
  "More rarely, the installed version of a package is <emphasis>more</emphasis> "
  "recent than any of the other available versions.  The package will not be "
@@@ -7999,7 -7915,7 +7971,7 @@@ msgstr "
  "<command>apt-get upgrade</command> ne provoquent pas de retour en arrière."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:163
 +#: apt_preferences.5.xml:165
  msgid ""
  "Sometimes the installed version of a package is more recent than the version "
  "belonging to the target release, but not as recent as a version belonging to "
@@@ -8018,12 -7934,12 +7990,12 @@@ msgstr "
  "priorité que celle de la version installée."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
 -#: apt_preferences.5.xml:172
 +#: apt_preferences.5.xml:174
  msgid "The Effect of APT Preferences"
  msgstr "Conséquences des préférences"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:174
 +#: apt_preferences.5.xml:176
  msgid ""
  "The APT preferences file allows the system administrator to control the "
  "assignment of priorities.  The file consists of one or more multi-line "
@@@ -8036,7 -7952,7 +8008,7 @@@ msgstr "
  "formes, une forme particulière et une forme générale."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 -#: apt_preferences.5.xml:180
 +#: apt_preferences.5.xml:182
  msgid ""
  "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
  "specified packages and specified version or version range.  For example, the "
@@@ -8051,7 -7967,7 +8023,7 @@@ msgstr "
  "dont le numéro de version commence par <literal>5.8</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 -#: apt_preferences.5.xml:187
 +#: apt_preferences.5.xml:189
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8063,7 -7979,7 +8035,7 @@@ msgstr "
  "Pin-Priority: 1001\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 -#: apt_preferences.5.xml:193
 +#: apt_preferences.5.xml:195
  msgid ""
  "The general form assigns a priority to all of the package versions in a "
  "given distribution (that is, to all the versions of packages that are listed "
@@@ -8078,7 -7994,7 +8050,7 @@@ msgstr "
  "un nom complètement qualifié."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 -#: apt_preferences.5.xml:199
 +#: apt_preferences.5.xml:201
  msgid ""
  "This general-form entry in the APT preferences file applies only to groups "
  "of packages.  For example, the following record assigns a high priority to "
@@@ -8089,7 -8005,7 +8061,7 @@@ msgstr "
  "priorité haute à toutes les versions disponibles dans le site local."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 -#: apt_preferences.5.xml:204
 +#: apt_preferences.5.xml:206
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8101,7 -8017,7 +8073,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 -#: apt_preferences.5.xml:209
 +#: apt_preferences.5.xml:211
  msgid ""
  "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
  "which can be used to match a hostname. The following record will assign a "
@@@ -8114,7 -8030,7 +8086,7 @@@ msgstr "
  "serveur identifié par l' nom d'hôte « ftp.de.debian.org »."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 -#: apt_preferences.5.xml:213
 +#: apt_preferences.5.xml:215
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8126,7 -8042,7 +8098,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 -#: apt_preferences.5.xml:217
 +#: apt_preferences.5.xml:219
  msgid ""
  "This should <emphasis>not</emphasis> be confused with the Origin of a "
  "distribution as specified in a <filename>Release</filename> file.  What "
@@@ -8141,7 -8057,7 +8113,7 @@@ msgstr "
  "mais le nom d'un auteur ou d'un distributeur, comme « Debian » ou « Ximian »."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 -#: apt_preferences.5.xml:222
 +#: apt_preferences.5.xml:224
  msgid ""
  "The following record assigns a low priority to all package versions "
  "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@@ -8152,7 -8068,7 +8124,7 @@@ msgstr "
  "<literal>unstable</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 -#: apt_preferences.5.xml:226
 +#: apt_preferences.5.xml:228
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8164,7 -8080,7 +8136,7 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 -#: apt_preferences.5.xml:231
 +#: apt_preferences.5.xml:233
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@@ -8175,7 -8091,7 +8147,7 @@@ msgstr "
  "<literal>&testing-codename;</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 -#: apt_preferences.5.xml:235
 +#: apt_preferences.5.xml:237
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8187,7 -8103,7 +8159,7 @@@ msgstr "
  "Pin-Priority: 900\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 -#: apt_preferences.5.xml:240
 +#: apt_preferences.5.xml:242
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@@ -8199,7 -8115,7 +8171,7 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 -#: apt_preferences.5.xml:245
 +#: apt_preferences.5.xml:247
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8211,17 -8127,17 +8183,17 @@@ msgstr "
  "Pin-Priority: 500\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
 -#: apt_preferences.5.xml:256
 +#: apt_preferences.5.xml:258
  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:264
 +#: apt_preferences.5.xml:266
  msgid "P &gt; 1000"
  msgstr "P &gt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 -#: apt_preferences.5.xml:265
 +#: apt_preferences.5.xml:267
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
  "package"
@@@ -8230,12 -8146,12 +8202,12 @@@ msgstr "
  "retour en arrière."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:269
 +#: apt_preferences.5.xml:271
  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:270
 +#: apt_preferences.5.xml:272
  msgid ""
  "causes a version to be installed even if it does not come from the target "
  "release, unless the installed version is more recent"
@@@ -8245,12 -8161,12 +8217,12 @@@ msgstr "
  "plus récente."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:275
 +#: apt_preferences.5.xml:277
  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:276
 +#: apt_preferences.5.xml:278
  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"
@@@ -8259,12 -8175,12 +8231,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:281
 +#: apt_preferences.5.xml:283
  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:282
 +#: apt_preferences.5.xml:284
  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"
@@@ -8273,29 -8189,29 +8245,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:287
 +#: apt_preferences.5.xml:289
  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:288
 +#: apt_preferences.5.xml:290
  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:292
 +#: apt_preferences.5.xml:294
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 -#: apt_preferences.5.xml:293
 +#: apt_preferences.5.xml:295
  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:259
 +#: apt_preferences.5.xml:261
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -8306,7 -8222,7 +8278,7 @@@ msgstr "
  "<placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:298
 +#: apt_preferences.5.xml:300
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -8320,7 -8236,7 +8292,7 @@@ msgstr "
  "trouvée détermine la priorité."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:304
 +#: apt_preferences.5.xml:306
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
  "presented earlier:"
@@@ -8329,7 -8245,7 +8301,7 @@@ msgstr "
  "entrées décrites ci-dessous :"
  
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 -#: apt_preferences.5.xml:308
 +#: apt_preferences.5.xml:310
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8357,12 -8273,12 +8329,12 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:321
 +#: apt_preferences.5.xml:323
  msgid "Then:"
  msgstr "Alors :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 -#: apt_preferences.5.xml:323
 +#: apt_preferences.5.xml:325
  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 "
@@@ -8376,7 -8292,7 +8348,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:328
 +#: apt_preferences.5.xml:330
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -8387,7 -8303,7 +8359,7 @@@ msgstr "
  "appartenant à la distribution par défaut."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 -#: apt_preferences.5.xml:332
 +#: apt_preferences.5.xml:334
  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</"
@@@ -8400,12 -8316,13 +8372,13 @@@ msgstr "
  "paquet n'est déjà installée."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
 -#: apt_preferences.5.xml:342
 +#: apt_preferences.5.xml:344
  msgid "Determination of Package Version and Distribution Properties"
- msgstr "Détermination de la version des paquets et des propriétés des distributions"
+ 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:344
 +#: apt_preferences.5.xml:346
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -8416,27 -8333,27 +8389,27 @@@ msgstr "
  "décrivent les paquets disponibles à cet endroit."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:356
 +#: apt_preferences.5.xml:358
  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:357
 +#: apt_preferences.5.xml:359
  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:360 apt_preferences.5.xml:410
 +#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
  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:361
 +#: apt_preferences.5.xml:363
  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:348
 +#: apt_preferences.5.xml:350
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -8457,12 -8374,12 +8430,12 @@@ msgstr "
  "\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:377
 +#: apt_preferences.5.xml:379
  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:378
 +#: apt_preferences.5.xml:380
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -8479,18 -8396,18 +8452,18 @@@ msgstr "
  "préférences demanderait cette ligne :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 -#: apt_preferences.5.xml:388
 +#: apt_preferences.5.xml:390
  #, 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:394
 +#: apt_preferences.5.xml:396
  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:395
 +#: apt_preferences.5.xml:397
  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 "
@@@ -8508,13 -8425,13 +8481,13 @@@ msgstr "
  "ligne :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 -#: apt_preferences.5.xml:404
 +#: apt_preferences.5.xml:406
  #, 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:411
 +#: apt_preferences.5.xml:413
  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 "
@@@ -8530,7 -8447,7 +8503,7 @@@ msgstr "
  "préférences demanderait ces lignes :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 -#: apt_preferences.5.xml:420
 +#: apt_preferences.5.xml:422
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -8542,12 -8459,12 +8515,12 @@@ msgstr "
  "Pin: release 3.0\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 -#: apt_preferences.5.xml:429
 +#: apt_preferences.5.xml:431
  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:430
 +#: apt_preferences.5.xml:432
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -8565,18 -8482,18 +8538,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:439
 +#: apt_preferences.5.xml:441
  #, 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:445
 +#: apt_preferences.5.xml:447
  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:446
 +#: apt_preferences.5.xml:448
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8589,18 -8506,18 +8562,18 @@@ msgstr "
  "ligne :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 -#: apt_preferences.5.xml:452
 +#: apt_preferences.5.xml:454
  #, 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:458
 +#: apt_preferences.5.xml:460
  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:459
 +#: apt_preferences.5.xml:461
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8613,13 -8530,13 +8586,13 @@@ msgstr "
  "préférences demanderait cette ligne :"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 -#: apt_preferences.5.xml:465
 +#: apt_preferences.5.xml:467
  #, 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:366
 +#: apt_preferences.5.xml:368
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -8643,7 -8560,7 +8616,7 @@@ msgstr "
  "\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:472
 +#: apt_preferences.5.xml:474
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -8668,12 -8585,12 +8641,12 @@@ msgstr "
  "<literal>unstable</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
 -#: apt_preferences.5.xml:485
 +#: apt_preferences.5.xml:487
  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:487
 +#: apt_preferences.5.xml:489
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -8684,12 -8601,12 +8657,12 @@@ msgstr "
  "commentaires."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
 -#: apt_preferences.5.xml:496
 +#: apt_preferences.5.xml:498
  msgid "Tracking Stable"
  msgstr "Méthode pour suivre Stable"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 -#: apt_preferences.5.xml:504
 +#: apt_preferences.5.xml:506
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -8713,7 -8630,7 +8686,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:498
 +#: apt_preferences.5.xml:500
  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 "
@@@ -8728,8 -8645,8 +8701,8 @@@ msgstr "
  "literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 -#: apt_preferences.5.xml:521 apt_preferences.5.xml:567
 -#: apt_preferences.5.xml:625
 +#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
 +#: apt_preferences.5.xml:627
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -8741,7 -8658,7 +8714,7 @@@ msgstr "
  "apt-get dist-upgrade\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:516
 +#: apt_preferences.5.xml:518
  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 "
@@@ -8754,13 -8671,13 +8727,13 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 -#: apt_preferences.5.xml:533
 +#: apt_preferences.5.xml:535
  #, 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:527
 +#: apt_preferences.5.xml:529
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -8773,12 -8690,12 +8746,12 @@@ msgstr "
  "de relancer la commande.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
 -#: apt_preferences.5.xml:539
 +#: apt_preferences.5.xml:541
  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:548
 +#: apt_preferences.5.xml:550
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8806,7 -8723,7 +8779,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:541
 +#: apt_preferences.5.xml:543
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -8823,7 -8740,7 +8796,7 @@@ msgstr "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:562
 +#: apt_preferences.5.xml:564
  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 "
@@@ -8836,13 -8753,13 +8809,13 @@@ msgstr "
  "type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 -#: apt_preferences.5.xml:582
 +#: apt_preferences.5.xml:584
  #, 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:573
 +#: apt_preferences.5.xml:575
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -8861,12 -8778,12 +8834,12 @@@ msgstr "
  "installée.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
 -#: apt_preferences.5.xml:589
 +#: apt_preferences.5.xml:591
  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:603
 +#: apt_preferences.5.xml:605
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -8892,7 -8809,7 +8865,7 @@@ msgstr "
  "\n"
  "Explanation: Debian unstable porte toujours le nom sid\n"
  "Package: *\n"
 -"Pin: release a=sid\n"
 +"Pin: release n=sid\n"
  "Pin-Priority: 800\n"
  "\n"
  "Package: *\n"
@@@ -8900,7 -8817,7 +8873,7 @@@
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:591
 +#: apt_preferences.5.xml:593
  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 "
@@@ -8924,7 -8841,7 +8897,7 @@@ msgstr "
  "exemples précédents.  <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
 -#: apt_preferences.5.xml:620
 +#: apt_preferences.5.xml:622
  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 "
@@@ -8937,13 -8854,13 +8910,13 @@@ msgstr "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 -#: apt_preferences.5.xml:640
 +#: apt_preferences.5.xml:642
  #, 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:631
 +#: apt_preferences.5.xml:633
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -8962,12 -8879,12 +8935,12 @@@ msgstr "
  "<placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><variablelist>
 -#: apt_preferences.5.xml:649
 +#: apt_preferences.5.xml:651
  msgid "&file-preferences;"
  msgstr "&file-preferences;"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt_preferences.5.xml:655
 +#: apt_preferences.5.xml:657
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
@@@ -9023,22 -8940,13 +8996,15 @@@ msgstr "sources.list.d
  
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:54
- #| msgid ""
- #| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
- #| "to add sources.list entries in separate files.  The format is the same as "
- #| "for the regular <filename>sources.list</filename> file.  File names need "
- #| "to end with <filename>.list</filename> and may only contain letters (a-z "
- #| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
- #| "characters.  Otherwise they will be silently ignored."
  msgid ""
  "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
  "add sources.list entries in separate files.  The format is the same as for "
  "the regular <filename>sources.list</filename> file.  File names need to end "
  "with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
  "digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
 -"Otherwise they will be silently ignored."
 +"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 ""
  "Le répertoire <filename>/etc/apt/sources.list.d</filename> permet de "
  "spécifier des sources de paquets dans des fichiers distincts qui se "
@@@ -9046,51 -8954,39 +9012,45 @@@
  "fichier <filename>sources.list</filename>. Les noms de fichiers doivent se "
  "terminer par <filename>.list</filename> et ne peuvent contenir que des "
  "lettres (a-z et A-Z), des chiffres (0-9), des caractères de soulignement "
- "(_), des tirets et des points. Dans le cas contraire, APT affichera un avertissement indiquant qu'il a ignoré un fichier si celui-ci ne correspond par à un motif défini dans <literal>Dir::Ignore-Files-Silently<"
- "/literal> (les fichiers correspondant à cette variable de configuration étant, eux, ignorés silencieusemennt)."
 -"(_), des tirets et des points. Dans le cas contraire, ils seront ignorés."
++"(_), des tirets et des points. Dans le cas contraire, APT affichera un "
++"avertissement indiquant qu'il a ignoré un fichier si celui-ci ne correspond "
++"par à un motif défini dans <literal>Dir::Ignore-Files-Silently</literal> "
++"(les fichiers correspondant à cette variable de configuration étant, eux, "
++"ignorés silencieusemennt)."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: sources.list.5.xml:63
 +#: sources.list.5.xml:65
  msgid "The deb and deb-src types"
  msgstr "Les types deb et deb-src."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:64
 +#: sources.list.5.xml:66
- #| msgid ""
- #| "The <literal>deb</literal> type describes a typical two-level Debian "
- #| "archive, <filename>distribution/component</filename>. Typically, "
- #| "<literal>distribution</literal> is generally one of <literal>stable</"
- #| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
- #| "component is one of <literal>main</literal> <literal>contrib</literal> "
- #| "<literal>non-free</literal> or <literal>non-us</literal>. The "
- #| "<literal>deb-src</literal> type describes a debian distribution's source "
- #| "code in the same form as the <literal>deb</literal> type.  A <literal>deb-"
- #| "src</literal> line is required to fetch source indexes."
  msgid ""
  "The <literal>deb</literal> type describes a typical two-level Debian "
  "archive, <filename>distribution/component</filename>. Typically, "
 -"<literal>distribution</literal> is generally one of <literal>stable</"
 -"literal> <literal>unstable</literal> or <literal>testing</literal> while "
 -"component is one of <literal>main</literal> <literal>contrib</literal> "
 -"<literal>non-free</literal> or <literal>non-us</literal>. The <literal>deb-"
 -"src</literal> type describes a debian distribution's source code in the same "
 -"form as the <literal>deb</literal> type.  A <literal>deb-src</literal> line "
 -"is required to fetch source indexes."
 +"<literal>distribution</literal> is generally an archivename like "
 +"<literal>stable</literal> or <literal>testing</literal> or a codename like "
 +"<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
 +"literal> while component is one of <literal>main</literal> <literal>contrib</"
 +"literal> or <literal>non-free</literal>. The <literal>deb-src</literal> type "
 +"describes a debian distribution's source code in the same form as the "
 +"<literal>deb</literal> type.  A <literal>deb-src</literal> line is required "
 +"to fetch source indexes."
  msgstr ""
  "Le type <literal>deb</literal> décrit une archive Debian classique à deux "
  "niveaux, <filename>distribution/composant</filename>. <literal>distribution</"
- "literal> peut prendre l'une des valeurs suivantes : un nom d'archive tel que <literal>stable</"
- "literal> ou <literal>testing</literal> ou bien un nom de code comme <literal>&stable-codename;</literal> ou <literal>&testing-codename;</ literal>, alors que "
- "composant prend les valeurs : <literal>main</literal>, <literal>contrib</literal> ou "
- "<literal>non-free</literal>.  Le type "
 -"literal> peut prendre l'une des valeurs suivantes : <literal>stable</"
 -"literal>, <literal>unstable</literal>, ou <literal>testing</literal>, et "
 -"composant : <literal>main</literal>, <literal>contrib</literal>, "
 -"<literal>non-free</literal>, ou <literal>non-us</literal>.  Le type "
--"<literal>deb-src</literal> décrit une archive de distribution de code source "
--"pour une distribution Debian dans le même format que le type <literal>deb</"
--"literal>. Une ligne <literal>deb-src</literal> est nécessaire pour récupérer "
--"les index des sources."
++"literal> peut prendre l'une des valeurs suivantes : un nom d'archive tel que "
++"<literal>stable</literal> ou <literal>testing</literal> ou bien un nom de "
++"code comme <literal>&stable-codename;</literal> ou <literal>&testing-"
++"codename;</ literal>, alors que composant prend les valeurs : <literal>main</"
++"literal>, <literal>contrib</literal> ou <literal>non-free</literal>.  Le "
++"type <literal>deb-src</literal> décrit une archive de distribution de code "
++"source pour une distribution Debian dans le même format que le type "
++"<literal>deb</literal>. Une ligne <literal>deb-src</literal> est nécessaire "
++"pour récupérer les index des sources."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:76
 +#: sources.list.5.xml:78
  msgid ""
  "The format for a <filename>sources.list</filename> entry using the "
  "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@@ -9099,13 -8995,13 +9059,13 @@@ msgstr "
  "types <literal>deb</literal> et <literal>deb-src</literal> est :"
  
  #. type: Content of: <refentry><refsect1><literallayout>
 -#: sources.list.5.xml:79
 +#: sources.list.5.xml:81
  #, no-wrap
  msgid "deb uri distribution [component1] [component2] [...]"
  msgstr "deb uri distribution [composant1] [composant2] [...]"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:81
 +#: sources.list.5.xml:83
  msgid ""
  "The URI for the <literal>deb</literal> type must specify the base of the "
  "Debian distribution, from which APT will find the information it needs.  "
@@@ -9126,7 -9022,7 +9086,7 @@@ msgstr "
  "exact, un <literal>composant</literal> au moins doit être présent."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:90
 +#: sources.list.5.xml:92
  msgid ""
  "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
  "</literal> which expands to the Debian architecture (i386, m68k, "
@@@ -9144,7 -9040,7 +9104,7 @@@ msgstr "
  "de l'architecture effective."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:98
 +#: sources.list.5.xml:100
  msgid ""
  "Since only one distribution can be specified per line it may be necessary to "
  "have multiple lines for the same URI, if a subset of all available "
@@@ -9170,7 -9066,7 +9130,7 @@@ msgstr "
  "tirer plus efficacement parti des sites à faible bande passante."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:110
 +#: sources.list.5.xml:112
  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 "
@@@ -9183,12 -9079,12 +9143,12 @@@ msgstr "
  "les hôtes distants."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:115
 +#: sources.list.5.xml:117
  msgid "Some examples:"
  msgstr "Exemples :"
  
  #. type: Content of: <refentry><refsect1><literallayout>
 -#: sources.list.5.xml:117
 +#: sources.list.5.xml:119
  #, no-wrap
  msgid ""
  "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@@ -9200,17 -9096,17 +9160,17 @@@ msgstr "
  "   "
  
  #. type: Content of: <refentry><refsect1><title>
 -#: sources.list.5.xml:123
 +#: sources.list.5.xml:125
  msgid "URI specification"
  msgstr "Spécification des URI"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: sources.list.5.xml:128
 +#: sources.list.5.xml:130
  msgid "file"
  msgstr "file"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: sources.list.5.xml:130
 +#: sources.list.5.xml:132
  msgid ""
  "The file scheme allows an arbitrary directory in the file system to be "
  "considered an archive. This is useful for NFS mounts and local mirrors or "
@@@ -9221,7 -9117,7 +9181,7 @@@ msgstr "
  "avec les montages NFS, les miroirs et les archives locaux."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: sources.list.5.xml:137
 +#: sources.list.5.xml:139
  msgid ""
  "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
  "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@@ -9231,7 -9127,7 +9191,7 @@@ msgstr "
  "pour créer des entrées dans la liste des sources."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: sources.list.5.xml:144
 +#: sources.list.5.xml:146
  msgid ""
  "The http scheme specifies an HTTP server for the archive. If an environment "
  "variable <envar>http_proxy</envar> is set with the format http://server:"
@@@ -9248,7 -9144,7 +9208,7 @@@ msgstr "
  "Notez qu'il s'agit d'une méthode d'authentification peu sûre."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: sources.list.5.xml:155
 +#: sources.list.5.xml:157
  msgid ""
  "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
  "is highly configurable; for more information see the &apt-conf; manual page. "
@@@ -9268,12 -9164,12 +9228,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:164
 +#: sources.list.5.xml:166
  msgid "copy"
  msgstr "copy"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: sources.list.5.xml:166
 +#: sources.list.5.xml:168
  msgid ""
  "The copy scheme is identical to the file scheme except that packages are "
  "copied into the cache directory instead of used directly at their location.  "
@@@ -9285,17 -9181,17 +9245,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:171
 +#: sources.list.5.xml:173
  msgid "rsh"
  msgstr "rsh"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: sources.list.5.xml:171
 +#: sources.list.5.xml:173
  msgid "ssh"
  msgstr "ssh"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 -#: sources.list.5.xml:173
 +#: sources.list.5.xml:175
  msgid ""
  "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
  "user and access the files. It is a good idea to do prior arrangements with "
@@@ -9310,12 -9206,12 +9270,12 @@@ msgstr "
  "commandes standard <command>find</command> et <command>dd</command>."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 -#: sources.list.5.xml:181
 +#: sources.list.5.xml:183
  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:183
 +#: sources.list.5.xml:185
  msgid ""
  "APT can be extended with more methods shipped in other optional packages "
  "which should follow the nameing scheme <literal>apt-transport-"
@@@ -9337,7 -9233,7 +9297,7 @@@ msgstr "
  "citerefentry>)."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:125
 +#: sources.list.5.xml:127
  msgid ""
  "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
  "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@@ -9346,7 -9242,7 +9306,7 @@@ msgstr "
  "ssh et rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:197
 +#: sources.list.5.xml:199
  msgid ""
  "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
  "stable/main, stable/contrib, and stable/non-free."
@@@ -9355,37 -9251,37 +9315,37 @@@ msgstr "
  "debian pour stable/main, stable/contrib et stable/non-free."
  
  #. type: Content of: <refentry><refsect1><literallayout>
 -#: sources.list.5.xml:199
 +#: sources.list.5.xml:201
  #, no-wrap
  msgid "deb file:/home/jason/debian stable main contrib non-free"
  msgstr "deb file:/home/jason/debian stable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:201
 +#: sources.list.5.xml:203
  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:202
 +#: sources.list.5.xml:204
  #, no-wrap
  msgid "deb file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb file:/home/jason/debian unstable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:204
 +#: sources.list.5.xml:206
  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:205
 +#: sources.list.5.xml:207
  #, no-wrap
  msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
  msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:207
 +#: sources.list.5.xml:209
  msgid ""
  "Uses HTTP to access the archive at archive.debian.org, and uses only the "
  "hamm/main area."
@@@ -9394,13 -9290,13 +9354,13 @@@ msgstr "
  "n'utiliser que la section hamm/main."
  
  #. type: Content of: <refentry><refsect1><literallayout>
 -#: sources.list.5.xml:209
 +#: sources.list.5.xml:211
  #, no-wrap
  msgid "deb http://archive.debian.org/debian-archive hamm main"
  msgstr "deb http://archive.debian.org/debian-archive hamm main"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:211
 +#: sources.list.5.xml:213
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the &stable-codename;/contrib area."
@@@ -9409,13 -9305,13 +9369,13 @@@ msgstr "
  "répertoire debian, et n'utiliser que la section &stable-codename;/contrib."
  
  #. type: Content of: <refentry><refsect1><literallayout>
 -#: sources.list.5.xml:213
 +#: sources.list.5.xml:215
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:215
 +#: sources.list.5.xml:217
  msgid ""
  "Uses FTP to access the archive at ftp.debian.org, under the debian "
  "directory, and uses only the unstable/contrib area. If this line appears as "
@@@ -9428,48 -9324,53 +9388,39 @@@ msgstr "
  "apparaissent, une seule session FTP sera utilisée pour les deux lignes."
  
  #. type: Content of: <refentry><refsect1><literallayout>
 -#: sources.list.5.xml:219
 +#: sources.list.5.xml:221
  #, no-wrap
  msgid "deb ftp://ftp.debian.org/debian unstable contrib"
  msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
  
 -#. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:221
 -msgid ""
 -"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
 -"directory."
 -msgstr ""
 -"Utiliser HTTP pour accéder à l'archive située à nonus.debian.org, dans le "
 -"répertoire debian-non-US."
 -
 -#. type: Content of: <refentry><refsect1><literallayout>
 -#: sources.list.5.xml:223
 -#, no-wrap
 -msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
 -msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
 -
  #. type: Content of: <refentry><refsect1><para><literallayout>
 -#: sources.list.5.xml:232
 +#: sources.list.5.xml:230
  #, no-wrap
- #| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
 -msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
 -msgstr "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.tlh.debian.org/universe unstable/binary-$(ARCH)/"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:225
 +#: sources.list.5.xml:223
- #| msgid ""
- #| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
- #| "US directory, and uses only files found under <filename>unstable/binary-"
- #| "i386</filename> on i386 machines, <filename>unstable/binary-m68k</"
- #| "filename> on m68k, and so forth for other supported architectures. [Note "
- #| "this example only illustrates how to use the substitution variable; non-"
- #| "us is no longer structured like this] <placeholder type=\"literallayout\" "
- #| "id=\"0\"/>"
  msgid ""
 -"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
 +"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</"
 -"filename> on i386 machines, <filename>unstable/binary-m68k</filename> on "
 -"m68k, and so forth for other supported architectures. [Note this example "
 -"only illustrates how to use the substitution variable; non-us is no longer "
 -"structured like this] <placeholder type=\"literallayout\" id=\"0\"/>"
 +"filename> on i386 machines, <filename>unstable/binary-amd64</filename> on "
 +"amd64, and so forth for other supported architectures. [Note this example "
 +"only illustrates how to use the substitution variable; official debian "
 +"archives are not structured like this] <placeholder type=\"literallayout\" "
 +"id=\"0\"/>"
  msgstr ""
 -"Utiliser HTTP pour accéder à l'archive située à nonus.debian.org, dans le "
 -"répertoire debian-non-US, et n'utiliser que les fichiers trouvés dans "
 +"Utiliser HTTP pour accéder à l'archive située à ftp.tlh.debian.org, dans le "
 +"répertoire universe, et n'utiliser que les fichiers trouvés dans "
  "<filename>unstable/binary-i386</filename> pour les machines i386, dans "
- "<filename>unstable/binary-amd64</filename> pour les machines amd64 et ainsi de "
 -"<filename>unstable/binary-m68k</filename> pour les machines m68k et ainsi de "
--"suite pour les autres architectures reconnues. [Notez que cet exemple montre "
- "seulement la manière d'utiliser la variable à substituer, les archives Debian n'étant "
- "plas structurées de cette manière.] <placeholder type=\"literallayout\" id="
 -"seulement la manière d'utiliser la variable à substituer, non-us n'étant "
 -"plus structuré de cette manière.] <placeholder type=\"literallayout\" id="
--"\"0\"/>"
++"<filename>unstable/binary-amd64</filename> pour les machines amd64 et ainsi "
++"de suite pour les autres architectures reconnues. [Notez que cet exemple "
++"montre seulement la manière d'utiliser la variable à substituer, les "
++"archives Debian n'étant plas structurées de cette manière.] <placeholder "
++"type=\"literallayout\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
 -#: sources.list.5.xml:237
 +#: sources.list.5.xml:235
  msgid "&apt-cache; &apt-conf;"
  msgstr "&apt-cache; &apt-conf;"
  
@@@ -9490,7 -9391,8 +9441,8 @@@ msgstr "$Id: guide.sgml,v 1.7 2003/04/2
  
  #. type: <abstract></abstract>
  #: guide.sgml:11
- msgid "This document provides an overview of how to use the the APT package manager."
+ msgid ""
+ "This document provides an overview of how to use the the APT package manager."
  msgstr ""
  "Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de "
  "paquets APT."
@@@ -10396,8 -10298,10 +10348,10 @@@ msgstr "Résumé final
  
  #. type: <p></p>
  #: guide.sgml:447
- msgid "Finally, APT will print out a summary of all the changes that will occur."
- msgstr "Enfin, APT affichera un résumé de toutes les opérations qui prendront place."
+ msgid ""
+ "Finally, APT will print out a summary of all the changes that will occur."
+ msgstr ""
+ "Enfin, APT affichera un résumé de toutes les opérations qui prendront place."
  
  #. type: <example></example>
  #: guide.sgml:452
@@@ -11032,67 -10936,6 +10986,71 @@@ msgstr "  # apt-get -o dir::cache::arch
  msgid "Which will use the already fetched archives on the disc."
  msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
  
- #~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
- #~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
 +#~ msgid "APT package handling utility -- cache manipulator"
 +#~ msgstr "Gestionnaire de paquets APT - manipulation du cache"
 +
 +#~ msgid "add <replaceable>file(s)</replaceable>"
 +#~ msgstr "add <replaceable>fichier(s)</replaceable>"
 +
 +#~ msgid ""
 +#~ "<literal>add</literal> adds the named package index files to the package "
 +#~ "cache.  This is for debugging only."
 +#~ msgstr ""
 +#~ "La commande <literal>add</literal> ajoute des fichiers indexant des "
 +#~ "paquets au cache des paquets. Cela sert uniquement pour le débogage."
 +
 +#~ msgid ""
 +#~ "The <literal>release</literal> command generates a Release file from a "
 +#~ "directory tree. It recursively searches the given directory for Packages, "
 +#~ "Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and "
 +#~ "md5sum.txt files.  It then writes to stdout a Release file containing an "
 +#~ "MD5 digest and SHA1 digest for each file."
 +#~ msgstr ""
 +#~ "La commande <literal>release</literal> crée un fichier « Release » à "
 +#~ "partir d'un répertoire. Elle cherche récursivement dans ce répertoire les "
 +#~ "fichiers Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, "
 +#~ "Sources.bz2, Release et md5sum.txt. Elle envoie alors un fichier Release "
 +#~ "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."
 +
 +#~ msgid "Do not install recommended packages."
 +#~ msgstr "Ne pas installer les paquets recommandés."
 +
 +#~ msgid ""
 +#~ "While it is possible to add an empty compression type to the order list, "
 +#~ "but APT in its current version doesn't understand it correctly and will "
 +#~ "display many warnings about not downloaded files - these warnings are "
 +#~ "most of the time false negatives. Future versions will maybe include a "
 +#~ "way to really prefer uncompressed files to support the usage of local "
 +#~ "mirrors."
 +#~ msgstr ""
 +#~ "Bien qu'il soit possible d'ajouter un type vide de compression à la liste "
 +#~ "ordonnée, APT ne l'interprétera pas correctement et affichera de nombreux "
 +#~ "messages d'avertissement à propos d'échec de téléchargement, qui sont le "
 +#~ "plus souvent des avertissements sans conséquences. Dans de futures "
 +#~ "versions, il deviendra réellement possible d'établir une préférence pour "
 +#~ "des fichiers non compressés afin de gérer des miroirs locaux."
 +
 +#~ msgid ""
 +#~ "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
 +#~ "US directory."
 +#~ msgstr ""
 +#~ "Utiliser HTTP pour accéder à l'archive située à nonus.debian.org, dans le "
 +#~ "répertoire debian-non-US."
 +
++#~ msgid ""
++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
++#~ "free"
++#~ msgstr ""
++#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
++#~ "free"
 +
  #~ msgid "OPTIONS"
  #~ msgstr "OPTIONS"