From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 2 Jun 2012 20:29:31 +0000 (+0200)
Subject: merge with debian-sid to get all the updated l10ns
X-Git-Tag: 0.9.6~1^2~23
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/c861c34804edcbe0644118dcf48c74fd552aea5a?hp=-c

merge with debian-sid to get all the updated l10ns

[ Christian Perrier ]
* French program and manpage translation update
* Danish program translation by Joe Hansen. Closes: #675605
---

c861c34804edcbe0644118dcf48c74fd552aea5a
diff --combined debian/changelog
index 08338d939,1547e5d35..d09239de5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,39 -1,14 +1,43 @@@
  apt (0.9.5.2) UNRELEASED; urgency=low
  
 -  [ Translation of manpages ]
 -  * Polish updated by Robert Luberda. Closes: #675603
 -  * French updated by Christian Perrier
 -
 -  [ Translation of programs ]
 -  * Danish by Joe Hansen. Closes: #675605
 -  * French updated by Christian Perrier
 +  [ David Kalnischkies ]
 +  * cmdline/apt-get.cc:
 +    - do not show 'list of broken packages' header if no package
 +      is broken as it happens e.g. for external resolver errors
 +  * debian/apt-utils.links:
 +    - the internal resolver 'apt' is now directly installed in
 +      /usr/lib/apt/solvers, so don't instruct dh to create a broken link
 +  * doc/apt-verbatim.ent:
 +    - APT doesn't belong to the product 'Linux', so use 'APT' instead
 +      as after all APT is a big suite of applications
 +  * doc/examples/sources.list:
 +    - use the codename instead of 'stable' in the examples sources.list
 +      as we do in the manpage and as the debian-installer does
 +  * doc/apt-get.8.xml:
 +    - use apt-utils as package example instead of libc6
  
 - -- Christian Perrier <bubulle@debian.org>  Sat, 02 Jun 2012 18:25:18 +0200
 +  [ Justin B Rye ]
 +  * doc/apt-cdrom.8.xml:
 +    - replace CDROM with the proper CD-ROM in text
 +    - correct disc vs. disk issues
 +  * doc/apt-config.8.xml:
 +    - review and fix spelling issues
 +  * doc/apt-extracttemplates.1.xml:
 +    - debconf is not DebConf
 +  * doc/apt-get.8.xml:
 +    - move dselect-upgrade below dist-upgrade
 +    - review and fix spelling issues
 +
 +  [ Robert Luberda ]
 +  * Polish manpage translation update (Closes: #675603)
 +  * doc/apt-mark.8.xml:
 +    - in hold, the option name is --file not --filename
 +
++  [ Christian Perrier ]
++  * French program and manpage translation update
++  * Danish program translation by Joe Hansen. Closes: #675605
++
 + -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 24 May 2012 19:40:58 +0200
  
  apt (0.9.5.1) unstable; urgency=low
  
diff --combined doc/po/fr.po
index a7a5e3b19,08c60d915..4f73a2faa
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@@ -5,20 -5,20 +5,20 @@@
  # Translators:
  # Jérôme Marant, 2000.
  # Philippe Batailler, 2005.
- # Christian Perrier <bubulle@debian.org>, 2009, 2010, 2011.
+ # Christian Perrier <bubulle@debian.org>, 2009, 2010, 2011, 2012.
  msgid ""
  msgstr ""
  "Project-Id-Version: \n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 -"POT-Creation-Date: 2012-05-24 15:57+0300\n"
 +"POT-Creation-Date: 2012-06-02 18:01+0300\n"
- "PO-Revision-Date: 2011-02-17 07:50+0100\n"
+ "PO-Revision-Date: 2012-06-02 18:37+0200\n"
  "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
  "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
  "Language: \n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
- "X-Generator: Lokalize 1.0\n"
+ "X-Generator: Lokalize 1.2\n"
  "Plural-Forms: nplurals=2; plural=(n > 1);\n"
  
  #. type: TH
@@@ -173,7 -173,8 +173,8 @@@ msgid "
  msgstr ""
  "<!ENTITY apt-qapage \"\n"
  "\t<para>\n"
- "\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>Page qualité</ulink>\n"
+ "\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>Page qualité</ulink>"
+ "\n"
  "\t</para>\n"
  "\">\n"
  
@@@ -195,7 -196,8 +196,8 @@@ msgstr "
  "<!-- Boiler plate Bug reporting section -->\n"
  "<!ENTITY manbugs \"\n"
  " <refsect1><title>Bogues</title>\n"
- "   <para><ulink url='http://bugs.debian.org/src:apt'>Page des bogues d'APT</ulink>. \n"
+ "   <para><ulink url='http://bugs.debian.org/src:apt'>Page des bogues d'APT<"
+ "/ulink>. \n"
  "   Si vous souhaitez signaler un bogue à propos d'APT, veuillez lire\n"
  "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utiliser\n"
  "   la commande &reportbug;.\n"
@@@ -210,7 -212,8 +212,8 @@@ msgid "
  "<!-- Boiler plate Author section -->\n"
  "<!ENTITY manauthor \"\n"
  " <refsect1><title>Author</title>\n"
- "   <para>APT was written by the APT team <email>apt@packages.debian.org</email>.\n"
+ "   <para>APT was written by the APT team <email>apt@packages.debian.org<"
+ "/email>.\n"
  "   </para>\n"
  " </refsect1>\n"
  "\">\n"
@@@ -218,7 -221,8 +221,8 @@@ msgstr "
  "<!-- Boiler plate Author section -->\n"
  "<!ENTITY manauthor \"\n"
  " <refsect1><title>Author</title>\n"
- "   <para>APT a été écrit par l'équipe de développement APT <email>apt@packages.debian.org</email>.\n"
+ "   <para>APT a été écrit par l'équipe de développement APT <email>"
+ "apt@packages.debian.org</email>.\n"
  "   </para>\n"
  " </refsect1>\n"
  "\">\n"
@@@ -274,10 -278,12 +278,12 @@@ msgid "
  "     <varlistentry>\n"
  "      <term><option>-c</option></term>\n"
  "      <term><option>--config-file</option></term>\n"
- "     <listitem><para>Configuration File; Specify a configuration file to use. \n"
+ "     <listitem><para>Configuration File; Specify a configuration file to use. "
+ "\n"
  "     The program will read the default configuration file and then this \n"
  "     configuration file. If configuration settings need to be set before the\n"
- "     default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
+ "     default configuration files are parsed specify a file with the <envar>"
+ "APT_CONFIG</envar>\n"
  "     environment variable. See &apt-conf; for syntax information.\n"
  "     </para>\n"
  "     </listitem>\n"
@@@ -286,10 -292,15 +292,15 @@@ msgstr "
  "     <varlistentry>\n"
  "      <term><option>-c</option></term>\n"
  "      <term><option>--config-file</option></term>\n"
- "     <listitem><para>Fichier de configuration ; indique le fichier de configuration à utiliser. \n"
- "     Le programme lira le fichier de configuration par défaut puis le fichier indiqué ici. \n"
- "     Si les réglages de configuration doivent être établis avant l'analyse des fichiers\n"
- "     de configuration par défaut, un fichier peut être indiqué avec la variable d'environnement <envar>APT_CONFIG</envar>.     Veuillez consulter &apt-conf; pour des informations sur la syntaxe d'utilisation.     \n"
+ "     <listitem><para>Fichier de configuration ; indique le fichier de "
+ "configuration à utiliser. \n"
+ "     Le programme lira le fichier de configuration par défaut puis le fichier "
+ "indiqué ici. \n"
+ "     Si les réglages de configuration doivent être établis avant l'analyse "
+ "des fichiers\n"
+ "     de configuration par défaut, un fichier peut être indiqué avec la "
+ "variable d'environnement <envar>APT_CONFIG</envar>.     Veuillez consulter "
+ "&apt-conf; pour des informations sur la syntaxe d'utilisation.     \n"
  "     </para>\n"
  "     </listitem>\n"
  "     </varlistentry>\n"
@@@ -314,8 -325,10 +325,10 @@@ msgstr "
  "      <term><option>-o</option></term>\n"
  "      <term><option>--option</option></term>\n"
  "     <listitem><para>Définir une option de configuration ; permet de régler\n"
- "      une option de configuration donnée. La syntaxe est <option>-o Foo::Bar=bar</option>.\n"
- "      <option>-o</option> et <option>--option</option> peuvent être utilisées plusieurs fois\n"
+ "      une option de configuration donnée. La syntaxe est <option>-o "
+ "Foo::Bar=bar</option>.\n"
+ "      <option>-o</option> et <option>--option</option> peuvent être utilisées "
+ "plusieurs fois\n"
  "      pour définir des options différentes.\n"
  "     </para>\n"
  "     </listitem>\n"
@@@ -329,7 -342,8 +342,8 @@@ msgid "
  "<!-- Should be used within the option section of the text to\n"
  "     put in the blurb about -h, -v, -c and -o -->\n"
  "<!ENTITY apt-cmdblurb \"\n"
- "   <para>All command line options may be set using the configuration file, the\n"
+ "   <para>All command line options may be set using the configuration file, "
+ "the\n"
  "   descriptions indicate the configuration option to set. For boolean\n"
  "   options you can override the config file by using something like \n"
  "   <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option>\n"
@@@ -340,9 -354,12 +354,12 @@@ msgstr "
  "<!-- Should be used within the option section of the text to\n"
  "     put in the blurb about -h, -v, -c and -o -->\n"
  "<!ENTITY apt-cmdblurb \"\n"
- "   <para>Toutes les options de la ligne de commande peuvent être définies dans le fichier de configuration, \n"
- "   les descriptions indiquant l'option de configuration concernée. Pour les options\n"
- "   booléennes, vous pouvez inverser les réglages du fichiers de configuration avec \n"
+ "   <para>Toutes les options de la ligne de commande peuvent être définies "
+ "dans le fichier de configuration, \n"
+ "   les descriptions indiquant l'option de configuration concernée. Pour les "
+ "options\n"
+ "   booléennes, vous pouvez inverser les réglages du fichiers de configuration "
+ "avec \n"
  "   <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option>\n"
  "   et d'autres variantes analogues.\n"
  "   </para>\n"
@@@ -355,13 -372,15 +372,15 @@@ msgid "
  "<!ENTITY file-aptconf \"\n"
  "     <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
  "     <listitem><para>APT configuration file.\n"
- "     Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>"
+ "\n"
  "     </varlistentry>\n"
  msgstr ""
  "<!ENTITY file-aptconf \"\n"
  "     <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
  "     <listitem><para>Fichier de configuration d'APT.\n"
- "     Élément de configuration : <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
+ "     Élément de configuration : <literal>Dir::Etc::Main</literal>.</para><"
+ "/listitem>\n"
  "     </varlistentry>\n"
  
  #. type: Plain text
@@@ -370,13 -389,15 +389,15 @@@
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
  "     <listitem><para>APT configuration file fragments.\n"
- "     Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>"
+ "\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
  "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
  "     <listitem><para>Fragments du fichier de configuration d'APT.\n"
- "     Élément de configuration : <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
+ "     Élément de configuration : <literal>Dir::Etc::Parts</literal>.</para><"
+ "/listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  
@@@ -387,18 -408,20 +408,20 @@@ msgid "
  "<!ENTITY file-cachearchives \"\n"
  "     <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
  "     <listitem><para>Storage area for retrieved package files.\n"
- "     Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Cache::Archives</literal>.</para><"
+ "/listitem>\n"
  "     </varlistentry>\n"
  msgstr ""
  "<!ENTITY file-cachearchives \"\n"
  "     <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
  "     <listitem><para>Zone de stockage des fichiers récupérés.\n"
- "     Élément de configuration : <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
+ "     Élément de configuration : <literal>Dir::Cache::Archives</literal>.<"
+ "/para></listitem>\n"
  "     </varlistentry>\n"
  
  #. type: Plain text
  #: apt.ent:109
- #, fuzzy, no-wrap
+ #, no-wrap
  #| msgid ""
  #| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
  #| "     <listitem><para>Storage area for package files in transit.\n"
@@@ -406,15 -429,19 +429,19 @@@
  #| "     </varlistentry>\n"
  #| "\">\n"
  msgid ""
- "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+ "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename><"
+ "/term>\n"
  "     <listitem><para>Storage area for package files in transit.\n"
- "     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>"
+ "partial</filename> will be implicitly appended)</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
- "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+ "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename><"
+ "/term>\n"
  "     <listitem><para>Zone de stockage pour les paquets en transit.\n"
- "     Élément de configuration : <literal>Dir::Cache::Archives</literal> (implicitement, partial). </para></listitem>\n"
+ "     Élément de configuration : <literal>Dir::Cache::Archives</literal> (<"
+ "filename>partial</filename> sera implicitement ajouté). </para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  
@@@ -429,14 -456,18 +456,18 @@@ msgid "
  "     i.e. a preference to get certain packages\n"
  "     from a separate source\n"
  "     or from a different version of a distribution.\n"
- "     Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para><"
+ "/listitem>\n"
  "     </varlistentry>\n"
  msgstr ""
  "<!ENTITY file-preferences \"\n"
  "     <varlistentry><term><filename>/etc/apt/preferences</filename></term>\n"
  "     <listitem><para>Fichier des préférences.\n"
- "     C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente.\n"
- "     Élément de configuration : <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
+ "     C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) "
+ "c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une "
+ "distribution différente.\n"
+ "     Élément de configuration : <literal>Dir::Etc::Preferences</literal>.<"
+ "/para></listitem>\n"
  "     </varlistentry>\n"
  
  #. type: Plain text
@@@ -445,13 -476,15 +476,15 @@@
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
  "     <listitem><para>File fragments for the version preferences.\n"
- "     Configuration Item: <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Etc::PreferencesParts</literal>.</para>"
+ "</listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
  "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
  "     <listitem><para>Fragments de fichiers pour la préférence des versions.\n"
- "     Élément de configuration : <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
+ "     Élément de configuration : <literal>Dir::Etc::PreferencesParts</literal>."
+ "</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  
@@@ -462,28 -495,35 +495,35 @@@ msgid "
  "<!ENTITY file-sourceslist \"\n"
  "     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
  "     <listitem><para>Locations to fetch packages from.\n"
- "     Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para><"
+ "/listitem>\n"
  "     </varlistentry>\n"
  msgstr ""
  "<!ENTITY file-sourceslist \"\n"
  "     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
  "     <listitem><para>Emplacement pour la récupération des paquets.\n"
- "     Élément de configuration : <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+ "     Élément de configuration : <literal>Dir::Etc::SourceList</literal>.<"
+ "/para></listitem>\n"
  "     </varlistentry>\n"
  
  #. type: Plain text
  #: apt.ent:137
  #, no-wrap
  msgid ""
- "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+ "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>"
+ "\n"
  "     <listitem><para>File fragments for locations to fetch packages from.\n"
- "     Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para><"
+ "/listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
- "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
- "     <listitem><para>Fragments de fichiers définissant les emplacements de récupération de paquets.\n"
- "     Élément de configuration : <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+ "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>"
+ "\n"
+ "     <listitem><para>Fragments de fichiers définissant les emplacements de "
+ "récupération de paquets.\n"
+ "     Élément de configuration : <literal>Dir::Etc::SourceParts</literal>.<"
+ "/para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  
@@@ -493,20 -533,24 +533,24 @@@
  msgid ""
  "<!ENTITY file-statelists \"\n"
  "     <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
- "     <listitem><para>Storage area for state information for each package resource specified in\n"
+ "     <listitem><para>Storage area for state information for each package "
+ "resource specified in\n"
  "     &sources-list;\n"
- "     Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::State::Lists</literal>.</para><"
+ "/listitem>\n"
  "     </varlistentry>\n"
  msgstr ""
  "<!ENTITY file-statelists \"\n"
  "     <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
- "     <listitem><para>Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans &sources-list;\n"
- "     Élément de configuration : <literal>Dir::State::Lists</literal>.</para></listitem>\n"
+ "     <listitem><para>Zone de stockage pour les informations qui concernent "
+ "chaque ressource de paquet spécifiée dans &sources-list;\n"
+ "     Élément de configuration : <literal>Dir::State::Lists</literal>.</para><"
+ "/listitem>\n"
  "     </varlistentry>\n"
  
  #. type: Plain text
  #: apt.ent:150
- #, fuzzy, no-wrap
+ #, no-wrap
  #| msgid ""
  #| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
  #| "     <listitem><para>Storage area for state information in transit.\n"
@@@ -514,15 -558,19 +558,19 @@@
  #| "     </varlistentry>\n"
  #| "\">\n"
  msgid ""
- "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+ "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>"
+ "\n"
  "     <listitem><para>Storage area for state information in transit.\n"
- "     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
+ "     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>"
+ "partial</filename> will be implicitly appended)</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
- "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+ "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>"
+ "\n"
  "     <listitem><para>Zone de stockage pour les informations en transit.\n"
- "     Élément de configuration : <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+ "     Élément de configuration : <literal>Dir::State::Lists</literal> (<"
+ "filename>partial</filename> sera implicitement ajouté).</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  
@@@ -532,14 -580,18 +580,18 @@@
  msgid ""
  "<!ENTITY file-trustedgpg \"\n"
  "     <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
- "     <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
- "     Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+ "     <listitem><para>Keyring of local trusted keys, new keys will be added "
+ "here.\n"
+ "     Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para><"
+ "/listitem>\n"
  "     </varlistentry>\n"
  msgstr ""
  "<!ENTITY file-trustedgpg \"\n"
  "     <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
- "     <listitem><para>Porte-clés des clés de confiance locales. Les nouvelles clés y seront ajoutées.\n"
- "     Élément de configuration: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+ "     <listitem><para>Porte-clés des clés de confiance locales. Les nouvelles "
+ "clés y seront ajoutées.\n"
+ "     Élément de configuration: <literal>Dir::Etc::Trusted</literal>.</para><"
+ "/listitem>\n"
  "     </varlistentry>\n"
  
  #. type: Plain text
@@@ -547,16 -599,21 +599,21 @@@
  #, no-wrap
  msgid ""
  "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
- "     <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+ "     <listitem><para>File fragments for the trusted keys, additional keyrings "
+ "can\n"
  "     be stored here (by other packages or the administrator).\n"
- "     Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+ "     Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para><"
+ "/listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  msgstr ""
  "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
- "     <listitem><para>Fragments de fichiers pour les clés de signatures sûres. Des fichiers\n"
- "     supplémentaires peuvent être placés à cet endroit (par des paquets ou par l'administrateur).\n"
- "     Élément de configuration : <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+ "     <listitem><para>Fragments de fichiers pour les clés de signatures sûres. "
+ "Des fichiers\n"
+ "     supplémentaires peuvent être placés à cet endroit (par des paquets ou "
+ "par l'administrateur).\n"
+ "     Élément de configuration : <literal>Dir::Etc::TrustedParts</literal>.<"
+ "/para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  
@@@ -565,7 -622,8 +622,8 @@@
  #, no-wrap
  msgid ""
  "<!ENTITY file-extended_states \"\n"
- "      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+ "      <varlistentry><term><filename>/var/lib/apt/extended_states</filename><"
+ "/term>\n"
  "      <listitem><para>Status list of auto-installed packages.\n"
  "      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
  "      </para></listitem>\n"
@@@ -573,9 -631,11 +631,11 @@@
  "\">\n"
  msgstr ""
  "<!ENTITY file-extended_states \"\n"
- "     <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+ "     <varlistentry><term><filename>/var/lib/apt/extended_states</filename><"
+ "/term>\n"
  "     <listitem><para>Liste d'état des paquets installés automatiquement.\n"
- "     Élément de configuration : <literal>Dir::State::extended_states</literal>.</para></listitem>\n"
+ "     Élément de configuration : <literal>Dir::State::extended_states</literal>"
+ ".</para></listitem>\n"
  "     </varlistentry>\n"
  "\">\n"
  
@@@ -583,8 -643,10 +643,10 @@@
  #: apt.ent:175
  #, no-wrap
  msgid ""
- "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
- "     to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
+ "<!-- TRANSLATOR: This is the section header for the following paragraphs - "
+ "comparable\n"
+ "     to the other headers like NAME and DESCRIPTION and should therefore be "
+ "uppercase. -->\n"
  "<!ENTITY translation-title \"TRANSLATION\">\n"
  msgstr "<!ENTITY translation-title \"TRADUCTEURS\">\n"
  
@@@ -592,28 -654,39 +654,39 @@@
  #: apt.ent:184
  #, no-wrap
  msgid ""
- "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
- "     to the translation in the past, who is responsible now and maybe further information\n"
+ "<!-- TRANSLATOR: This is a placeholder. You should write here who has "
+ "contributed\n"
+ "     to the translation in the past, who is responsible now and maybe further "
+ "information\n"
  "     specially related to your translation. -->\n"
  "<!ENTITY translation-holder \"\n"
- "     The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
- "     2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
- "     Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+ "     The english translation was done by John Doe <email>john@doe.org</email> "
+ "in 2009,\n"
+ "     2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together "
+ "with the\n"
+ "     Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>."
+ "\n"
  "\">\n"
  msgstr ""
  "<!ENTITY translation-holder \"\n"
- "     Jérôme Marant, Philippe Batailler, Christian Perrier <email>bubulle@debian.org</email> (2000, 2005, 2009, 2010),\n"
- "     Équipe de traduction francophone de Debian <email>debian-l10n-french@lists.debian.org</email>\n"
+ "     Jérôme Marant, Philippe Batailler, Christian Perrier <email>"
+ "bubulle@debian.org</email> (2000, 2005, 2009, 2010),\n"
+ "     Équipe de traduction francophone de Debian <email>"
+ "debian-l10n-french@lists.debian.org</email>\n"
  "\">\n"
  
  #. type: Plain text
  #: apt.ent:195
  #, no-wrap
  msgid ""
- "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
- "     in a shipped manpage newer/modified paragraphs will maybe appear in english in\n"
- "     the generated manpage. This sentence is therefore here to tell the reader that this\n"
- "     is not a mistake by the translator - obviously the target is that at least for stable\n"
+ "<!-- TRANSLATOR: As a translation is allowed to have 20% of "
+ "untranslated/fuzzy strings\n"
+ "     in a shipped manpage newer/modified paragraphs will maybe appear in "
+ "english in\n"
+ "     the generated manpage. This sentence is therefore here to tell the "
+ "reader that this\n"
+ "     is not a mistake by the translator - obviously the target is that at "
+ "least for stable\n"
  "     releases this sentence is not needed. :) -->\n"
  "<!ENTITY translation-english \"\n"
  "     Note that this translated document may contain untranslated parts.\n"
@@@ -622,7 -695,8 +695,8 @@@
  "\">\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"
@@@ -633,13 -707,15 +707,15 @@@ msgid "
  "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
  "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
  msgstr ""
+ "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
+ "\"chaîne_de_configuration\">"
  
  #. type: Plain text
  #: apt.ent:201
  msgid ""
  "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
  "synopsis-config-file \"config_file\">"
- msgstr ""
+ msgstr "synopsis-config-file \"fichier_de_configuration\">"
  
  #. type: Plain text
  #: apt.ent:204
@@@ -648,41 -724,43 +724,43 @@@ msgid "
  "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
  "\"target_release\">"
  msgstr ""
+ "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+ "\"publication_cible\">"
  
  #. type: Plain text
  #: apt.ent:207
  msgid ""
  "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
  "synopsis-architecture \"architecture\">"
- msgstr ""
+ msgstr "synopsis-architecture \"architecture\">"
  
  #. type: Plain text
  #: apt.ent:210
  msgid ""
  "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
  "--> <!ENTITY synopsis-pkg \"pkg\">"
- msgstr ""
+ msgstr "--> <!ENTITY synopsis-pkg \"paquet\">"
  
  #. type: Plain text
  #: apt.ent:213
  msgid ""
  "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
  "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
- msgstr ""
+ msgstr "ENTITY synopsis-pkg-ver-number \"numéro_version_paquet\">"
  
  #. type: Plain text
  #: apt.ent:216
  msgid ""
  "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
  "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
- msgstr ""
+ msgstr "pkgnames apt --> <!ENTITY synopsis-prefix \"préfixe\">"
  
  #. type: Plain text
  #: apt.ent:219
  msgid ""
  "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
  "awesome --> <!ENTITY synopsis-regex \"regex\">"
- msgstr ""
+ msgstr "awesome --> <!ENTITY synopsis-regex \"expression_régulière\">"
  
  #. type: Plain text
  #: apt.ent:222
@@@ -690,6 -768,7 +768,7 @@@ msgid "
  "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
  "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
  msgstr ""
+ "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"point_de_montage_CD-ROM\">"
  
  #. type: Plain text
  #: apt.ent:225
@@@ -698,13 -777,15 +777,15 @@@ msgid "
  "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
  "\"temporary_directory\">"
  msgstr ""
+ "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+ "\"répertoire_temporaire\">"
  
  #. type: Plain text
  #: apt.ent:228
  msgid ""
  "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
  "synopsis-filename \"filename\">"
- msgstr ""
+ msgstr "synopsis-filename \"nom_de_fichier\">"
  
  #. type: Plain text
  #: apt.ent:231
@@@ -712,6 -793,7 +793,7 @@@ msgid "
  "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
  "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
  msgstr ""
+ "packages path override-file pathprefix --> <!ENTITY synopsis-path \"chemin\">"
  
  #. type: Plain text
  #: apt.ent:234
@@@ -720,6 -802,8 +802,8 @@@ msgid "
  "packages path override-file pathprefix --> <!ENTITY synopsis-override "
  "\"override-file\">"
  msgstr ""
+ "packages path override-file pathprefix --> <!ENTITY synopsis-override "
+ "\"fichier-override\">"
  
  #. type: Plain text
  #: apt.ent:237
@@@ -728,20 -812,22 +812,22 @@@ msgid "
  "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
  "\"pathprefix\">"
  msgstr ""
+ "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+ "\"préfixe_de_chemin\">"
  
  #. type: Plain text
  #: apt.ent:240
  msgid ""
  "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
  "generate section --> <!ENTITY synopsis-section \"section\">"
- msgstr ""
+ msgstr "generate section --> <!ENTITY synopsis-section \"section\">"
  
  #. type: Plain text
  #: apt.ent:243
  msgid ""
  "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
  "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
- msgstr ""
+ msgstr "473041FA --> <!ENTITY synopsis-keyid \"id_de_clé\">"
  
  #. type: Content of: <refentry><refmeta><manvolnum>
  #: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26
@@@ -801,13 -887,16 +887,16 @@@ msgid "
  "<literal>gencaches</literal> creates APT's package cache. This is done "
  "implicitly by all commands needing this cache if it is missing or outdated."
  msgstr ""
+ "<literal>gencaches</literal> crée le cache d'APT. Cette action est faite "
+ "implicitement par toute commande qui a besoin de ce cache s'il est manquant "
+ "ou obsolète."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
  #: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
  #: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
  #: apt-cache.8.xml:224 apt-cache.8.xml:236
  msgid "&synopsis-pkg;"
- msgstr ""
+ msgstr "&synopsis-pkg;"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cache.8.xml:54
@@@ -971,7 -1060,6 +1060,6 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
  #: apt-cache.8.xml:128
- #, fuzzy
  #| msgid ""
  #| "<literal>Total distinct</literal> versions is the number of package "
  #| "versions found in the cache; this value is therefore at least equal to "
@@@ -1002,7 -1090,6 +1090,6 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cache.8.xml:143
- #, fuzzy
  #| msgid ""
  #| "<literal>showsrc</literal> displays all the source package records that "
  #| "match the given package names. All versions are shown, as well as all "
@@@ -1061,7 -1148,6 +1148,6 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cache.8.xml:170
- #, fuzzy
  #| msgid ""
  #| "<literal>search</literal> performs a full text search on all available "
  #| "package lists for the POSIX regex pattern given, see "
@@@ -1084,7 -1170,8 +1170,8 @@@ msgid "
  "description is not searched, only the package name is."
  msgstr ""
  "La commande <literal>search</literal> recherche l'expression rationnelle "
- "donnée en paramètre sur tous les paquets disponibles. Elle cherche une "
+ "POSIX donnée en paramètre sur tous les paquets disponibles, voir &regex;. "
+ "Elle cherche une "
  "occurrence de la chaîne dans les noms de paquets et dans les descriptions "
  "puis elle affiche le nom du paquet et sa description courte. Quand l'option "
  "<option>--full</option> est fournie, la sortie est identique à "
@@@ -1175,7 -1262,6 +1262,6 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cache.8.xml:216
- #, fuzzy
  #| msgid ""
  #| "The resulting nodes will have several shapes; normal packages are boxes, "
  #| "pure provides are triangles, mixed provides are diamonds, missing "
@@@ -1251,7 -1337,7 +1337,7 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
 -#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
 +#: apt-ftparchive.1.xml:504 apt-get.8.xml:258 apt-mark.8.xml:108
  #: apt-sortpkgs.1.xml:48
  msgid "options"
  msgstr "options"
@@@ -1410,14 -1496,14 +1496,14 @@@ msgstr "
  "Élément de configuration : <literal>APT::Cache::Installed</literal>."
  
  #. type: Content of: <refentry><refsect1><title>
 -#: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
 +#: apt-cache.8.xml:343 apt-get.8.xml:518 apt-key.8.xml:174 apt-mark.8.xml:125
  #: apt.conf.5.xml:1118 apt_preferences.5.xml:698
  msgid "Files"
  msgstr "Fichiers"
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:350 apt-cdrom.8.xml:144 apt-config.8.xml:109
 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:528
  #: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192
  #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
  #: sources.list.5.xml:252
@@@ -1431,7 -1517,7 +1517,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:355 apt-cdrom.8.xml:149 apt-config.8.xml:114
 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:534
  #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
  msgid "Diagnostics"
  msgstr "Diagnostics"
@@@ -1447,13 -1533,13 +1533,13 @@@ msgstr "
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-cdrom.8.xml:32
 -msgid "APT CDROM management utility"
 +msgid "APT CD-ROM management utility"
  msgstr "Utilitaire de gestion des CD d'APT"
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt-cdrom.8.xml:38
  msgid ""
 -"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
 +"<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
  "available sources. <command>apt-cdrom</command> takes care of determining "
  "the structure of the disc as well as correcting for several possible mis-"
  "burns and verifying the index files."
@@@ -1467,7 -1553,7 +1553,7 @@@ msgstr "
  #: apt-cdrom.8.xml:45
  msgid ""
  "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 -"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
 +"system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
  "must be inserted and scanned separately to account for possible mis-burns."
  msgstr ""
  "Il est nécessaire d'utiliser <command>apt-cdrom</command> pour ajouter des "
@@@ -1479,21 -1565,21 +1565,21 @@@
  #: apt-cdrom.8.xml:56
  msgid ""
  "<literal>add</literal> is used to add a new disc to the source list. It will "
 -"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
 +"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
  "to scan it and copy the index files. If the disc does not have a proper "
 -"<filename>disk</filename> directory you will be prompted for a descriptive "
 +"<filename>.disk</filename> directory you will be prompted for a descriptive "
  "title."
  msgstr ""
  "La commande <literal>add</literal> est utilisée pour ajouter un nouveau "
  "disque à la liste des sources. Elle démonte le CD, réclame l'insertion d'un "
  "disque, parcourt ensuite le disque et copie les fichiers d'index. Si le "
 -"disque ne possède pas de répertoire <filename>disk/</filename> correct, un "
 +"disque ne possède pas de répertoire <filename>.disk</filename> correct, un "
  "titre descriptif est demandé."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cdrom.8.xml:64
  msgid ""
 -"APT uses a CDROM ID to track which disc is currently in the drive and "
 +"APT uses a CD-ROM ID to track which disc is currently in the drive and "
  "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
  "filename>"
  msgstr ""
@@@ -1518,7 -1604,7 +1604,7 @@@ msgstr "Options
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cdrom.8.xml:85
  msgid ""
 -"Mount point; specify the location to mount the cdrom. This mount point must "
 +"Mount point; specify the location to mount the CD-ROM. This mount point must "
  "be listed in <filename>/etc/fstab</filename> and properly configured.  "
  "Configuration Item: <literal>Acquire::cdrom::mount</literal>."
  msgstr ""
@@@ -1530,9 -1616,9 +1616,9 @@@
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-cdrom.8.xml:94
  msgid ""
 -"Rename a disc; change the label of a disk or override the disks given label. "
 -"This option will cause <command>apt-cdrom</command> to prompt for a new "
 -"label.  Configuration Item: <literal>APT::CDROM::Rename</literal>."
 +"Rename a disc; change the label of a disc or override the disc's given "
 +"label. This option will cause <command>apt-cdrom</command> to prompt for a "
 +"new label.  Configuration Item: <literal>APT::CDROM::Rename</literal>."
  msgstr ""
  "Change le nom d'un disque ; change le nom d'un disque ou remplace un disque "
  "pour un nom donné. Cette option oblige <command>apt-cdrom</command> à "
@@@ -1612,7 -1698,7 +1698,7 @@@ msgid "
  "<command>apt-config</command> is an internal program used by various "
  "portions of the APT suite to provide consistent configurability. It accesses "
  "the main configuration file <filename>/etc/apt/apt.conf</filename> in a "
 -"manner that is easy to use by scripted applications."
 +"manner that is easy to use for scripted applications."
  msgstr ""
  "<command>apt-config</command> est un programme interne utilisé par "
  "différents composants d'APT ; il offre la possibilité d'une configuration "
@@@ -1622,19 -1708,12 +1708,19 @@@
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-config.8.xml:51
 +#, fuzzy
 +#| msgid ""
 +#| "shell is used to access the configuration information from a shell "
 +#| "script. It is given pairs of arguments, the first being a shell variable "
 +#| "and the second the configuration value to query. As output it lists a "
 +#| "series of shell assignments commands for each present value.  In a shell "
 +#| "script it should be used like:"
  msgid ""
  "shell is used to access the configuration information from a shell script. "
  "It is given pairs of arguments, the first being a shell variable and the "
 -"second the configuration value to query. As output it lists a series of "
 -"shell assignments commands for each present value.  In a shell script it "
 -"should be used like:"
 +"second the configuration value to query. As output it lists shell assignment "
 +"commands for each value present.  In a shell script it should be used as "
 +"follows:"
  msgstr ""
  "Le terme shell est utilisé pour accéder aux informations de configuration "
  "depuis un script shell. Deux arguments doivent lui être donnés ; le premier "
@@@ -1697,11 -1776,12 +1783,11 @@@ msgstr "
  #: apt-config.8.xml:96
  msgid ""
  "Defines the output of each config option. &percnt;t will be replaced with "
 -"the name of the option, &percnt;f with the complete optionname and &percnt;v "
 -"with the value of the option.  Use uppercase letters and special characters "
 -"in the value will be encoded to ensure that it can e.g. be savely used in a "
 -"quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
 -"by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
 -"&percnt;."
 +"its individual name, &percnt;f with its full hierarchical name and &percnt;v "
 +"with its value.  Use uppercase letters and special characters in the value "
 +"will be encoded to ensure that it can e.g. be safely used in a quoted-string "
 +"as defined by RFC822. Additionally &percnt;n will be replaced by a newline, "
 +"and &percnt;N by a tab. A &percnt; can be printed by using &percnt;&percnt;."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para>
@@@ -1726,12 -1806,10 +1812,12 @@@ msgstr "1
  
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-extracttemplates.1.xml:33
 -msgid "Utility to extract DebConf config and templates from Debian packages"
 +msgid ""
 +"Utility to extract <command>debconf</command> config and templates from "
 +"Debian packages"
  msgstr ""
 -"Outil d'extraction des textes et fichiers de configuration pour DebConf "
 -"contenu dans un paquet Debian"
 +"Outil d'extraction des textes et fichiers de configuration pour "
 +"<command>debconf</command> contenu dans un paquet Debian"
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt-extracttemplates.1.xml:39
@@@ -1771,13 -1849,13 +1857,13 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-extracttemplates.1.xml:58
  msgid ""
 -"Temporary directory in which to write extracted debconf template files and "
 -"config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
 -"TempDir</literal>"
 +"Temporary directory in which to write extracted <command>debconf</command> "
 +"template files and config scripts.  Configuration Item: <literal>APT::"
 +"ExtractTemplates::TempDir</literal>"
  msgstr ""
  "Répertoire temporaire dans lequel écrire les scripts de configuration et "
 -"modèles d'écrans pour Debconf. Élément de configuration : <literal>APT::"
 -"ExtractTemplates::TempDir</literal>."
 +"modèles d'écrans pour <command>debconf</command>. Élément de configuration : "
 +"<literal>APT::ExtractTemplates::TempDir</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt-extracttemplates.1.xml:75
@@@ -2740,8 -2818,12 +2826,12 @@@ msgstr "Exemples
  #. type: Content of: <refentry><refsect1><para><programlisting>
  #: apt-ftparchive.1.xml:602
  #, no-wrap
- msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
- msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+ 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:598
@@@ -2834,16 -2916,33 +2924,16 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:74
  msgid ""
 -"<literal>dselect-upgrade</literal> is used in conjunction with the "
 -"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
 -"literal> follows the changes made by &dselect; to the <literal>Status</"
 -"literal> field of available packages, and performs the actions necessary to "
 -"realize that state (for instance, the removal of old and the installation of "
 -"new packages)."
 -msgstr ""
 -"<literal>dselect-upgrade</literal> est utilisée conjointement avec "
 -"&dselect;, la plus ancienne interface du projet Debian pour la gestion des "
 -"paquets.  La commande <literal>dselect-upgrade</literal> suit les "
 -"modifications faites par &dselect; dans le champ <literal>Status</literal> "
 -"des paquets disponibles, et effectue les actions nécessaires à la "
 -"réalisation de cet état (par exemple, suppression d'anciens paquets, "
 -"installation de nouveaux paquets)."
 -
 -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:84
 -msgid ""
  "<literal>dist-upgrade</literal> in addition to performing the function of "
  "<literal>upgrade</literal>, also intelligently handles changing dependencies "
  "with new versions of packages; <command>apt-get</command> has a \"smart\" "
  "conflict resolution system, and it will attempt to upgrade the most "
 -"important packages at the expense of less important ones if necessary.  So, "
 -"<literal>dist-upgrade</literal> command may remove some packages.  The "
 -"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
 -"from which to retrieve desired package files.  See also &apt-preferences; "
 -"for a mechanism for overriding the general settings for individual packages."
 +"important packages at the expense of less important ones if necessary.  The "
 +"<literal>dist-upgrade</literal> command may therefore remove some packages.  "
 +"The <filename>/etc/apt/sources.list</filename> file contains a list of "
 +"locations from which to retrieve desired package files.  See also &apt-"
 +"preferences; for a mechanism for overriding the general settings for "
 +"individual packages."
  msgstr ""
  "La commande <literal>dist-upgrade</literal> effectue la fonction "
  "<literal>upgrade</literal> en y ajoutant une gestion intelligente des "
@@@ -2855,36 -2954,17 +2945,36 @@@
  "sources où récupérer les paquets désirés. Voyez aussi &apt-preferences; pour "
  "un mécanisme de remplacement des paramètres généraux pour certains paquets."
  
 +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 +#: apt-get.8.xml:87
 +msgid ""
 +"<literal>dselect-upgrade</literal> is used in conjunction with the "
 +"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
 +"literal> follows the changes made by &dselect; to the <literal>Status</"
 +"literal> field of available packages, and performs the actions necessary to "
 +"realize that state (for instance, the removal of old and the installation of "
 +"new packages)."
 +msgstr ""
 +"<literal>dselect-upgrade</literal> est utilisée conjointement avec "
 +"&dselect;, la plus ancienne interface du projet Debian pour la gestion des "
 +"paquets.  La commande <literal>dselect-upgrade</literal> suit les "
 +"modifications faites par &dselect; dans le champ <literal>Status</literal> "
 +"des paquets disponibles, et effectue les actions nécessaires à la "
 +"réalisation de cet état (par exemple, suppression d'anciens paquets, "
 +"installation de nouveaux paquets)."
 +
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:98
  msgid ""
  "<literal>install</literal> is followed by one or more packages desired for "
  "installation or upgrading.  Each package is a package name, not a fully "
 -"qualified filename (for instance, in a Debian system, libc6 would be the "
 -"argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages "
 -"required by the package(s) specified for installation will also be retrieved "
 -"and installed.  The <filename>/etc/apt/sources.list</filename> file is used "
 -"to locate the desired packages. If a hyphen is appended to the package name "
 -"(with no intervening space), the identified package will be removed if it is "
 +"qualified filename (for instance, in a Debian system, <package>apt-utils</"
 +"package> would be the argument provided, not <filename>apt-utils_&apt-"
 +"product-version;_amd64.deb</filename>). All packages required by the package"
 +"(s) specified for installation will also be retrieved and installed.  The "
 +"<filename>/etc/apt/sources.list</filename> file is used to locate the "
 +"desired packages. If a hyphen is appended to the package name (with no "
 +"intervening space), the identified package will be removed if it is "
  "installed.  Similarly a plus sign can be used to designate a package to "
  "install. These latter features may be used to override decisions made by apt-"
  "get's conflict resolution system."
@@@ -2892,15 -2972,14 +2982,15 @@@ msgstr "
  "La commande <literal>install</literal> est suivie par un ou plusieurs "
  "paquets à installer. Chaque paquet est un nom de paquet ; ce n'est pas un "
  "nom complet de fichier (par exemple, dans un système Debian, on indiquera "
 -"libc6 et non pas <literal>libc6_1.9.6-2.deb</literal>). Tous les paquets "
 -"requis par le(s) paquet(s) que l'on veut installer sont aussi récupérés et "
 -"installés. Le fichier <filename>/etc/apt/sources.list</filename> est utilisé "
 -"pour retrouver les paquets désirés. Quand un trait d'union est accolé (sans "
 -"espace intermédiaire) au nom d'un paquet déjà installé, ce paquet est "
 -"supprimé. De même on peut ajouter un signe « + » pour désigner un paquet à "
 -"installer.  Cette dernière fonctionnalité peut être utilisée pour annuler "
 -"les décisions prises par le système de résolution des conflits d'apt-get."
 +"<package>apt-utils</package> et non pas <filename>apt-utils_&apt-product-"
 +"version;_amd64.deb</filename>). Tous les paquets requis par le(s) paquet(s) "
 +"que l'on veut installer sont aussi récupérés et installés. Le fichier "
 +"<filename>/etc/apt/sources.list</filename> est utilisé pour retrouver les "
 +"paquets désirés. Quand un trait d'union est accolé (sans espace "
 +"intermédiaire) au nom d'un paquet déjà installé, ce paquet est supprimé. De "
 +"même on peut ajouter un signe « + » pour désigner un paquet à installer.  "
 +"Cette dernière fonctionnalité peut être utilisée pour annuler les décisions "
 +"prises par le système de résolution des conflits d'apt-get."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:116
@@@ -2983,9 -3062,9 +3073,9 @@@ msgstr "
  #: apt-get.8.xml:151
  msgid ""
  "<literal>remove</literal> is identical to <literal>install</literal> except "
 -"that packages are removed instead of installed. Note the removing a package "
 -"leaves its configuration files in system. If a plus sign is appended to the "
 -"package name (with no intervening space), the identified package will be "
 +"that packages are removed instead of installed. Note that removing a package "
 +"leaves its configuration files on the system. If a plus sign is appended to "
 +"the package name (with no intervening space), the identified package will be "
  "installed instead of removed."
  msgstr ""
  "La commande <literal>remove</literal> est identique à la commande "
@@@ -3028,20 -3107,12 +3118,20 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:172
 +#, fuzzy
 +#| msgid ""
 +#| "Source packages are tracked separately from binary packages via "
 +#| "<literal>deb-src</literal> type lines in the &sources-list; file. This "
 +#| "means that you will need to add such a line for each repository you want "
 +#| "to get sources from. If you don't do this you will probably get another "
 +#| "(newer, older or none) source version than the one you have installed or "
 +#| "could install."
  msgid ""
  "Source packages are tracked separately from binary packages via <literal>deb-"
 -"src</literal> type lines in the &sources-list; file. This means that you "
 -"will need to add such a line for each repository you want to get sources "
 -"from. If you don't do this you will properly get another (newer, older or "
 -"none) source version than the one you have installed or could install."
 +"src</literal> lines in the &sources-list; file. This means that you will "
 +"need to add such a line for each repository you want to get sources from; "
 +"otherwise you will probably get either the wrong (too old/too new) source "
 +"versions or none at all."
  msgstr ""
  "Les paquets source sont gérés indépendamment des paquets binaires, avec les "
  "lignes de type <literal>deb-src</literal> dans le fichier &sources-list;. Il "
@@@ -3051,7 -3122,7 +3141,7 @@@
  "installé ou que vous voulez installer."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:179
 +#: apt-get.8.xml:178
  #, fuzzy
  #| msgid ""
  #| "If the <option>--compile</option> option is specified then the package "
@@@ -3070,7 -3141,7 +3160,7 @@@ msgstr "
  "download-only</option> est spécifié, le source n'est pas décompacté."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:186
 +#: apt-get.8.xml:185
  msgid ""
  "A specific source version can be retrieved by postfixing the source name "
  "with an equals and then the version to fetch, similar to the mechanism used "
@@@ -3085,23 -3156,18 +3175,23 @@@ msgstr "
  "Source</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:192
 +#: apt-get.8.xml:191
 +#, fuzzy
 +#| msgid ""
 +#| "Note that source packages are not tracked like binary packages, they "
 +#| "exist only in the current directory and are similar to downloading source "
 +#| "tar balls."
  msgid ""
 -"Note that source packages are not tracked like binary packages, they exist "
 -"only in the current directory and are similar to downloading source tar "
 -"balls."
 +"Note that source packages are not installed and tracked in the "
 +"<command>dpkg</command> database like binary packages; they are simply "
 +"downloaded to the current directory, like source tarballs."
  msgstr ""
  "Veuillez noter que les paquets source ne sont pas suivis comme le sont les "
  "paquets binaires. Ils ne sont présents que dans le répertoire courant et "
  "sont semblables à des sources téléchargées sous forme d'archives tar."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:198
 +#: apt-get.8.xml:197
  #, fuzzy
  #| msgid ""
  #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
@@@ -3118,7 -3184,7 +3208,7 @@@ msgstr "
  "paquet source."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:205
 +#: apt-get.8.xml:204
  msgid ""
  "<literal>check</literal> is a diagnostic tool; it updates the package cache "
  "and checks for broken dependencies."
@@@ -3127,7 -3193,7 +3217,7 @@@ msgstr "
  "jour le cache des paquets et cherche les dépendances défectueuses."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:210
 +#: apt-get.8.xml:209
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
  "current directory."
@@@ -3136,7 -3202,7 +3226,7 @@@ msgstr "
  "répertoire courant."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:216
 +#: apt-get.8.xml:215
  msgid ""
  "<literal>clean</literal> clears out the local repository of retrieved "
  "package files. It removes everything but the lock file from "
@@@ -3155,7 -3221,7 +3245,7 @@@ msgstr "
  "temps en temps si l'on veut libérer de l'espace disque."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:226
 +#: apt-get.8.xml:225
  msgid ""
  "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
  "local repository of retrieved package files. The difference is that it only "
@@@ -3174,7 -3240,7 +3264,7 @@@ msgstr "
  "installés."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:236
 +#: apt-get.8.xml:235
  #, fuzzy
  #| msgid ""
  #| "<literal>autoremove</literal> is used to remove packages that were "
@@@ -3190,15 -3256,15 +3280,15 @@@ msgstr "
  "ne sont plus nécessaires."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:241
 +#: apt-get.8.xml:240
  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 url=\"http://packages.debian.org/changelogs"
 -"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
 -"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
 -"for Ubuntu).  By default it displays the changelog for the version that is "
 +"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
 +"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
 +"ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> for "
 +"Ubuntu).  By default it displays the changelog for the version that is "
  "installed.  However, you can specify the same options as for the "
  "<option>install</option> command."
  msgstr ""
@@@ -3214,7 -3280,7 +3304,7 @@@
  "<option>install</option>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:264
 +#: apt-get.8.xml:263
  msgid ""
  "Do not consider recommended packages as a dependency for installing.  "
  "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@@ -3223,7 -3289,7 +3313,7 @@@ msgstr "
  "Élément de configuration : <literal>APT::Install-Recommends</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:269
 +#: apt-get.8.xml:268
  msgid ""
  "Consider suggested packages as a dependency for installing.  Configuration "
  "Item: <literal>APT::Install-Suggests</literal>."
@@@ -3232,7 -3298,7 +3322,7 @@@ msgstr "
  "de configuration : <literal>APT::Install-Suggests</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:274
 +#: apt-get.8.xml:273
  msgid ""
  "Download only; package files are only retrieved, not unpacked or installed.  "
  "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@@ -3242,7 -3308,7 +3332,7 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:279
 +#: apt-get.8.xml:278
  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 "
@@@ -3270,9 -3336,9 +3360,9 @@@ msgstr "
  "configuration : <literal>APT::Get::Fix-Broken</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:294
 +#: apt-get.8.xml:293
  msgid ""
 -"Ignore missing packages; If packages cannot be retrieved or fail the "
 +"Ignore missing packages; if packages cannot be retrieved or fail the "
  "integrity check after retrieval (corrupted package files), hold back those "
  "packages and handle the result. Use of this option together with <option>-f</"
  "option> may produce an error in some situations. If a package is selected "
@@@ -3290,7 -3356,7 +3380,7 @@@ msgstr "
  "<literal>APT::Get::Fix-Missing</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:305
 +#: apt-get.8.xml:304
  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 "
@@@ -3302,14 -3368,14 +3392,14 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:312
 +#: apt-get.8.xml:311
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
  "<option>-q=#</option> to set the quiet level, overriding the configuration "
 -"file.  Note that quiet level 2 implies <option>-y</option>, you should never "
 +"file.  Note that quiet level 2 implies <option>-y</option>; you should never "
  "use -qq without a no-action modifier such as -d, --print-uris or -s as APT "
 -"may decided to do something you did not expect.  Configuration Item: "
 +"may decide to do something you did not expect.  Configuration Item: "
  "<literal>quiet</literal>."
  msgstr ""
  "Mode silencieux ; cette commande produit une sortie destinée à "
@@@ -3324,7 -3390,7 +3414,7 @@@
  "configuration : <literal>quiet</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:327
 +#: apt-get.8.xml:326
  msgid ""
  "No action; perform a simulation of events that would occur but do not "
  "actually change the system.  Configuration Item: <literal>APT::Get::"
@@@ -3335,24 -3401,14 +3425,24 @@@ msgstr "
  "<literal>APT::Get::Simulate</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:331
 -msgid ""
 -"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 -"literal>)  automatic. Also a notice will be displayed indicating that this "
 -"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-"
 -"Note</literal> is set (Default: true).  Neither NoLocking nor the notice "
 -"will be triggered if run as root (root should know what he is doing without "
 -"further warnings by <literal>apt-get</literal>)."
 +#: apt-get.8.xml:330
 +#, fuzzy
 +#| msgid ""
 +#| "Simulation run as user will deactivate locking (<literal>Debug::"
 +#| "NoLocking</literal>)  automatic. Also a notice will be displayed "
 +#| "indicating that this is only a simulation, if the option <literal>APT::"
 +#| "Get::Show-User-Simulation-Note</literal> is set (Default: true).  Neither "
 +#| "NoLocking nor the notice will be triggered if run as root (root should "
 +#| "know what he is doing without further warnings by <literal>apt-get</"
 +#| "literal>)."
 +msgid ""
 +"Simulated runs performed as a user will automatically deactivate locking "
 +"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
 +"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
 +"will also be displayed indicating that this is only a simulation. Runs "
 +"performed as root do not trigger either NoLocking or the notice - superusers "
 +"should know what they are doing without further warnings from <literal>apt-"
 +"get</literal>."
  msgstr ""
  "Lorsque la simulation est effectuée par un utilisateur sans privilège, le "
  "verrouillage (<literal>Debug::NoLocking</literal>) sera désactivé "
@@@ -3364,19 -3420,12 +3454,19 @@@
  "utile qu'<literal>apt-get</literal> envoie de telles notifications)."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:337
 +#: apt-get.8.xml:338
 +#, fuzzy
 +#| msgid ""
 +#| "Simulate prints out a series of lines each one representing a dpkg "
 +#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
 +#| "brackets indicate broken packages and empty set of square brackets "
 +#| "meaning breaks that are of no consequence (rare)."
  msgid ""
 -"Simulate prints out a series of lines each one representing a dpkg "
 -"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
 -"indicate broken packages and empty set of square brackets meaning breaks "
 -"that are of no consequence (rare)."
 +"Simulated runs print out a series of lines, each representing a "
 +"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
 +"remove (<literal>Remv</literal>)  or unpack (<literal>Inst</literal>). "
 +"Square brackets indicate broken packages, and empty square brackets indicate "
 +"breaks that are of no consequence (rare)."
  msgstr ""
  "La simulation affiche une série de lignes représentant chacune une opération "
  "de dpkg, Configure (Conf), Remove (Remv), Unpack (Inst). Des crochets "
@@@ -3409,7 -3458,7 +3499,7 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:359
  msgid ""
 -"Show upgraded packages; Print out a list of all packages that are to be "
 +"Show upgraded packages; print out a list of all packages that are to be "
  "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
  msgstr ""
  "Afficher les paquets mis à niveau ; affiche une liste de tous les paquets à "
@@@ -3448,7 -3497,7 +3538,7 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:386
  msgid ""
 -"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 +"Ignore package holds; this causes <command>apt-get</command> to ignore a "
  "hold placed on a package. This may be useful in conjunction with "
  "<literal>dist-upgrade</literal> to override a large number of undesired "
  "holds.  Configuration Item: <literal>APT::Ignore-Hold</literal>."
@@@ -3462,7 -3511,7 +3552,7 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:393
  msgid ""
 -"Do not upgrade packages; When used in conjunction with <literal>install</"
 +"Do not upgrade packages; when used in conjunction with <literal>install</"
  "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
  "line from being upgraded if they are already installed.  Configuration Item: "
  "<literal>APT::Get::Upgrade</literal>."
@@@ -3476,12 -3525,12 +3566,12 @@@ msgstr "
  #: apt-get.8.xml:400
  #, fuzzy
  #| msgid ""
 -#| "Do not install new packages; When used in conjunction with "
 +#| "Do not install new packages; when used in conjunction with "
  #| "<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
  #| "packages on the command line from being upgraded if they are not already "
  #| "installed.  Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
  msgid ""
 -"Do not install new packages; When used in conjunction with <literal>install</"
 +"Do not install new packages; when used in conjunction with <literal>install</"
  "literal>, <literal>only-upgrade</literal> will install upgrades for already "
  "installed packages only and ignore requests to install new packages.  "
  "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
@@@ -3495,7 -3544,7 +3585,7 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:408
  msgid ""
 -"Force yes; This is a dangerous option that will cause apt to continue "
 +"Force yes; this is a dangerous option that will cause apt to continue "
  "without prompting if it is doing something potentially harmful. It should "
  "not be used except in very special situations. Using <literal>force-yes</"
  "literal> can potentially destroy your system! Configuration Item: "
@@@ -3512,7 -3561,7 +3602,7 @@@ msgstr "
  #: apt-get.8.xml:416
  msgid ""
  "Instead of fetching the files to install their URIs are printed. Each URI "
 -"will have the path, the destination file name, the size and the expected md5 "
 +"will have the path, the destination file name, the size and the expected MD5 "
  "hash. Note that the file name to write to will not always match the file "
  "name on the remote site! This also works with the <literal>source</literal> "
  "and <literal>update</literal> commands. When used with the <literal>update</"
@@@ -3522,7 -3571,7 +3612,7 @@@
  msgstr ""
  "Au lieu de récupérer les paquets à installer, leurs URI sont affichées.  "
  "Chaque URI a un chemin, un nom de fichier destination, une taille et une clé "
 -"md5 attendue. Veuillez noter que le nom de fichier à afficher ne correspond "
 +"MD5 attendue. Veuillez noter que le nom de fichier à afficher ne correspond "
  "pas toujours au nom de fichier sur le site distant. Cette option fonctionne "
  "aussi avec la commande <literal>source</literal> et avec la commande "
  "<literal>update</literal>. Avec la commande <literal>update</literal>, la "
@@@ -3547,7 -3596,7 +3637,7 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:435
  msgid ""
 -"Re-Install packages that are already installed and at the newest version.  "
 +"Re-install packages that are already installed and at the newest version.  "
  "Configuration Item: <literal>APT::Get::ReInstall</literal>."
  msgstr ""
  "Réinstaller les paquets déjà installés avec leur version la plus récente.  "
@@@ -3555,21 -3604,13 +3645,21 @@@
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:440
 -msgid ""
 -"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 -"it off. When on <command>apt-get</command> will automatically manage the "
 -"contents of <filename>&statedir;/lists</filename> to ensure that obsolete "
 -"files are erased.  The only reason to turn it off is if you frequently "
 -"change your source list.  Configuration Item: <literal>APT::Get::List-"
 -"Cleanup</literal>."
 +#, fuzzy
 +#| 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 contents of <filename>&statedir;/lists</filename> to ensure that "
 +#| "obsolete files are erased.  The only reason to turn it off is if you "
 +#| "frequently change your source list.  Configuration Item: <literal>APT::"
 +#| "Get::List-Cleanup</literal>."
 +msgid ""
 +"This option is on by default; use <literal>--no-list-cleanup</literal> to "
 +"turn it off. When it is on, <command>apt-get</command> will automatically "
 +"manage the contents of <filename>&statedir;/lists</filename> to ensure that "
 +"obsolete files are erased.  The only reason to turn it off is if you "
 +"frequently change your sources list.  Configuration Item: <literal>APT::Get::"
 +"List-Cleanup</literal>."
  msgstr ""
  "Cette option est activée par défaut ; utilisez <literal>--no-list-cleanup</"
  "literal> pour la désactiver. Quand elle est activée, <command>apt-get</"
@@@ -3580,9 -3621,9 +3670,9 @@@
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:451
 +#: apt-get.8.xml:450
  msgid ""
 -"This option controls the default input to the policy engine, it creates a "
 +"This option controls the default input to the policy engine; it creates a "
  "default pin at priority 990 using the specified release string.  This "
  "overrides the general settings in <filename>/etc/apt/preferences</"
  "filename>.  Specifically pinned packages are not affected by the value of "
@@@ -3602,10 -3643,10 +3692,10 @@@ msgstr "
  "Release</literal>.  Voyez aussi la page de manuel d'&apt-preferences;."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:466
 +#: apt-get.8.xml:465
  msgid ""
  "Only perform operations that are 'trivial'. Logically this can be considered "
 -"related to <option>--assume-yes</option>, where <option>--assume-yes</"
 +"related to <option>--assume-yes</option>; where <option>--assume-yes</"
  "option> will answer yes to any prompt, <option>--trivial-only</option> will "
  "answer no.  Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
  msgstr ""
@@@ -3616,7 -3657,7 +3706,7 @@@
  "Get::Trivial-Only</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:473
 +#: apt-get.8.xml:472
  msgid ""
  "If any packages are to be removed apt-get immediately aborts without "
  "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@@ -3626,11 -3667,11 +3716,11 @@@ msgstr "
  "Remove</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:479
 +#: apt-get.8.xml:478
  msgid ""
  "If the command is either <literal>install</literal> or <literal>remove</"
 -"literal>, then this option acts like running <literal>autoremove</literal> "
 -"command, removing the unused dependency packages. Configuration Item: "
 +"literal>, then this option acts like running the <literal>autoremove</"
 +"literal> command, removing unused dependency packages. Configuration Item: "
  "<literal>APT::Get::AutomaticRemove</literal>."
  msgstr ""
  "Si la commande utilisée est soit <literal>install</literal> soit "
@@@ -3639,7 -3680,7 +3729,7 @@@
  "inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:486
 +#: apt-get.8.xml:485
  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 "
@@@ -3659,7 -3700,7 +3749,7 @@@ msgstr "
  "literal>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:497
 +#: apt-get.8.xml:496
  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</"
@@@ -3671,7 -3712,7 +3761,7 @@@ msgstr "
  "literal>, "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:503
 +#: apt-get.8.xml:502
  msgid ""
  "Only process architecture-dependent build-dependencies.  Configuration Item: "
  "<literal>APT::Get::Arch-Only</literal>."
@@@ -3681,7 -3722,7 +3771,7 @@@ msgstr "
  "literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 -#: apt-get.8.xml:508
 +#: apt-get.8.xml:507
  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::"
@@@ -3693,7 -3734,7 +3783,7 @@@ msgstr "
  "AllowUnauthenticated</literal>."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-get.8.xml:530
 +#: apt-get.8.xml:529
  msgid ""
  "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
  "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@@ -3704,7 -3745,7 +3794,7 @@@ msgstr "
  "« HOWTO » d'APT."
  
  #. type: Content of: <refentry><refsect1><para>
 -#: apt-get.8.xml:536
 +#: apt-get.8.xml:535
  msgid ""
  "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
  "error."
@@@ -3935,7 -3976,7 +4025,7 @@@ msgid "
  "prevent the package from being automatically installed, upgraded or "
  "removed.  The command is only a wrapper around <command>dpkg --set-"
  "selections</command> and the state is therefore maintained by &dpkg; and not "
 -"effected by the <option>--filename</option> option."
 +"effected by the <option>--file</option> option."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@@ -5340,8 -5381,8 +5430,8 @@@ msgstr "/cdrom/::Mount \"foo\";
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:430
  msgid ""
 -"CDROM URIs; the only setting for CDROM URIs is the mount point, "
 -"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
 +"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
 +"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
  "drive as specified in <filename>/etc/fstab</filename>. It is possible to "
  "provide alternate mount and unmount commands if your mount point cannot be "
  "listed in the fstab (such as an SMB mount and old mount packages). The "
@@@ -5373,8 -5414,12 +5463,12 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
  #: apt.conf.5.xml:452
  #, no-wrap
- msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
- msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
+ 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:447
@@@ -5535,8 -5580,10 +5629,10 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
  #: apt.conf.5.xml:500
  #, no-wrap
- msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
- msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
+ 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:490
@@@ -6183,12 -6230,12 +6279,12 @@@ 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:775
  msgid ""
  "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 -"in CDROM IDs."
 +"in CD-ROM IDs."
  msgstr ""
  "<literal>Debug::IdentCdrom</literal> désactive l'inclusion de données de "
  "type statfs dans les identifiants de CD."
@@@ -6466,7 -6513,7 +6562,7 @@@ msgstr "
  "Le fichier &configureindex; contient un modèle de fichier montrant des "
  "exemples pour toutes les options existantes."
  
- #.  ? reading apt.conf 
+ #.  ? reading apt.conf
  #. type: Content of: <refentry><refsect1><para>
  #: apt.conf.5.xml:1125
  msgid "&apt-cache;, &apt-config;, &apt-preferences;."
@@@ -6588,8 -6635,12 +6684,12 @@@ msgstr "Priorités affectées par défa
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
  #: 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"
+ 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:97
@@@ -7729,8 -7780,10 +7829,10 @@@ msgstr "Suivre l'évolution d'une versi
  #: apt_preferences.5.xml:654
  #, no-wrap
  msgid ""
- "Explanation: Uninstall or do not install any Debian-originated package versions\n"
- "Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
+ "Explanation: Uninstall or do not install any Debian-originated package "
+ "versions\n"
+ "Explanation: other than those in the distribution codenamed with "
+ "&testing-codename; or sid\n"
  "Package: *\n"
  "Pin: release n=&testing-codename;\n"
  "Pin-Priority: 900\n"
@@@ -8062,11 -8115,13 +8164,13 @@@ msgstr "Exemples :
  #, no-wrap
  msgid ""
  "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
- "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+ "deb http://security.debian.org/ &stable-codename;/updates main contrib "
+ "non-free\n"
  "   "
  msgstr ""
  "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
- "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+ "deb http://security.debian.org/ &stable-codename;/updates main contrib "
+ "non-free\n"
  "   "
  
  #. type: Content of: <refentry><refsect1><title>
@@@ -8095,7 -8150,7 +8199,7 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #: sources.list.5.xml:154
  msgid ""
 -"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
 +"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
  "Use the &apt-cdrom; program to create cdrom entries in the source list."
  msgstr ""
  "Le procédé <literal>cdrom</literal> permet l'utilisation d'un lecteur de CD "
@@@ -8566,7 -8621,8 +8670,8 @@@ msgid "
  "Building Dependency Tree... Done"
  msgstr ""
  "# apt-get update\n"
- "Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
+ "Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ "
+ "Packages\n"
  "Réception de http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
  "Lecture des listes de paquets... Fait\n"
  "Construction de l'arbre des dépendances... Fait"
@@@ -8713,12 -8769,12 +8818,12 @@@ msgid "
  "To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
  "and then choose the APT method. You will be prompted for a set of "
  "<em>Sources</em> which are places to fetch archives from. These can be "
 -"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
 +"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
  "provide a fragment of the total Debian archive, APT will automatically "
 -"combine them to form a complete set of packages. If you have a CDROM then it "
 -"is a good idea to specify it first and then specify a mirror so that you "
 +"combine them to form a complete set of packages. If you have a CD-ROM then "
 +"it is a good idea to specify it first and then specify a mirror so that you "
  "have access to the latest bug fixes. APT will automatically use packages on "
 -"your CDROM before downloading from the Internet."
 +"your CD-ROM before downloading from the Internet."
  msgstr ""
  "Pour activer la méthode APT, il est nécessaire de choisir [A]ccéder dans "
  "<prgn>dselect</prgn> puis utiliser le choix permettant d'activer APT. Des "
@@@ -9286,9 -9342,11 +9391,11 @@@ msgid "
  "12 packages not fully installed or removed.\n"
  "Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
  msgstr ""
- "206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis à jour.\n"
+ "206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis "
+ "à jour.\n"
  "12 paquets partiellement installés ou enlevés.\n"
- "Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés."
+ "Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette "
+ "opération, 26,5Mo d'espace disque supplémentaires seront utilisés."
  
  #. type: <p></p>
  #: guide.sgml:470
@@@ -9358,10 -9416,12 +9465,12 @@@ msgid "
  "11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
  msgstr ""
  "# apt-get update\n"
- "Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
+ "Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ "
+ "Packages\n"
  "Réception de :2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
  "Atteint http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
- "Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
+ "Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ "
+ "Packages\n"
  "Réception de :5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
  "11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s"
  
@@@ -9727,7 -9787,8 +9836,8 @@@ msgstr "
  " # apt-get update\n"
  " [ APT récupère les fichiers des paquets ]\n"
  " # apt-get dist-upgrade\n"
- " [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]"
+ " [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine "
+ "distante ]"
  
  #. type: </example></p>
  #: offline.sgml:149
@@@ -9848,7 -9909,8 +9958,8 @@@ msgid "
  " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
  msgstr ""
  " # apt-get dist-upgrade \n"
- " [ Répondre négativement à la question, pour être sûr(e) que les actions vous conviennent ]\n"
+ " [ Répondre négativement à la question, pour être sûr(e) que les actions vous "
+ "conviennent ]\n"
  " # apt-get -qq --print-uris dist-upgrade > uris\n"
  " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"