unfuzzy typofixes in th french manpage update

4 files changed, 106 insertions, 244 deletions

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 6adb824b5..13bca71e5 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.9.5.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-02 19:24+0300\n"
+"POT-Creation-Date: 2012-06-02 23:41+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 4f73a2faa..a8c8cba80 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-02 18:01+0300\n"
+"POT-Creation-Date: 2012-06-02 19:24+0300\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"
@@ -173,8 +173,7 @@ 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"
 
@@ -196,8 +195,7 @@ 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"
@@ -212,8 +210,7 @@ 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"
@@ -221,8 +218,7 @@ 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"
@@ -278,12 +274,10 @@ 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"
@@ -292,15 +286,10 @@ 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"
@@ -325,10 +314,8 @@ 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"
@@ -342,8 +329,7 @@ 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"
@@ -354,12 +340,9 @@ 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"
@@ -372,15 +355,13 @@ 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
@@ -389,15 +370,13 @@ msgstr ""
 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"
 
@@ -408,40 +387,28 @@ 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
 #, no-wrap
-#| msgid ""
-#| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
-#| "     <listitem><para>Storage area for package files in transit.\n"
-#| "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
-#| "     </varlistentry>\n"
-#| "\">\n"
-msgid ""
-"     <varlistentry><term><filename>&cachedir;/archives/partial/</filename><"
-"/term>\n"
+msgid ""
+"     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
 "     <listitem><para>Storage area for package files in transit.\n"
-"     Configuration Item: <literal>Dir::Cache::Archives</literal> (<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> (<"
-"filename>partial</filename> sera implicitement ajouté). </para></listitem>\n"
+"     Élément de configuration : <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> sera implicitement ajouté). </para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -456,18 +423,14 @@ 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
@@ -476,15 +439,13 @@ msgstr ""
 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"
 
@@ -495,35 +456,28 @@ 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"
 
@@ -533,44 +487,30 @@ msgstr ""
 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
 #, no-wrap
-#| msgid ""
-#| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
-#| "     <listitem><para>Storage area for state information in transit.\n"
-#| "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
-#| "     </varlistentry>\n"
-#| "\">\n"
 msgid ""
-"     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>"
-"\n"
+"     <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> (<"
-"filename>partial</filename> sera implicitement ajouté).</para></listitem>\n"
+"     Élément de configuration : <literal>Dir::State::Lists</literal> (<filename>partial</filename> sera implicitement ajouté).</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -580,18 +520,14 @@ msgstr ""
 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
@@ -599,21 +535,16 @@ msgstr ""
 #, 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"
 
@@ -622,8 +553,7 @@ msgstr ""
 #, 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"
@@ -631,11 +561,9 @@ msgid ""
 "\">\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"
 
@@ -643,10 +571,8 @@ msgstr ""
 #: 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"
 
@@ -654,39 +580,28 @@ msgstr "<!ENTITY translation-title \"TRADUCTEURS\">\n"
 #: 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"
@@ -695,8 +610,7 @@ 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"
@@ -1060,12 +974,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #: apt-cache.8.xml:128
-#| msgid ""
-#| "<literal>Total distinct</literal> versions is the number of package "
-#| "versions found in the cache; this value is therefore at least equal to "
-#| "the number of total package names. If more than one distribution (both "
-#| "\"stable\" and \"unstable\", for instance), is being accessed, this value "
-#| "can be considerably larger than the number of total package names."
 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 "
@@ -1090,10 +998,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:143
-#| msgid ""
-#| "<literal>showsrc</literal> displays all the source package records that "
-#| "match the given package names. All versions are shown, as well as all "
-#| "records that declare the name to be a Binary."
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -1148,17 +1052,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:170
-#| msgid ""
-#| "<literal>search</literal> performs a full text search on all available "
-#| "package lists for the POSIX regex pattern given, see "
-#| "<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-#| "<manvolnum>7</manvolnum></citerefentry>.  It searches the package names "
-#| "and the descriptions for an occurrence of the regular expression and "
-#| "prints out the package name and the short description, including virtual "
-#| "package names.  If <option>--full</option> is given then output identical "
-#| "to <literal>show</literal> is produced for each matched package, and if "
-#| "<option>--names-only</option> is given then the long description is not "
-#| "searched, only the package name is."
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -1171,13 +1064,12 @@ msgid ""
 msgstr ""
 "La commande <literal>search</literal> recherche l'expression rationnelle "
 "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 à "
-"<literal>show</literal> pour chaque paquet ; l'option <option>--names-only</"
-"option> ne recherche pas la chaîne dans les descriptions longues mais "
-"seulement dans les noms de paquets."
+"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 à <literal>show</literal> pour chaque paquet ; l'option <option>--"
+"names-only</option> ne recherche pas la chaîne dans les descriptions longues "
+"mais seulement dans les noms de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:181
@@ -1262,11 +1154,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:216
-#| msgid ""
-#| "The resulting nodes will have several shapes; normal packages are boxes, "
-#| "pure provides are triangles, mixed provides are diamonds, missing "
-#| "packages are hexagons. Orange boxes mean recursion was stopped [leaf "
-#| "packages], blue lines are pre-depends, green lines are conflicts."
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2826,12 +2713,8 @@ 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
@@ -5463,12 +5346,8 @@ 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
@@ -5629,10 +5508,8 @@ 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
@@ -6279,7 +6156,7 @@ 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 ""
@@ -6562,7 +6439,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;."
@@ -6684,12 +6561,8 @@ msgstr "Priorités affectées par défaut"
 #. 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
@@ -7829,10 +7702,8 @@ msgstr "Suivre l'évolution d'une version par son nom de code"
 #: 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"
@@ -8164,13 +8035,11 @@ 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>
@@ -8670,8 +8539,7 @@ 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"
@@ -9391,11 +9259,9 @@ 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
@@ -9465,12 +9331,10 @@ 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"
 
@@ -9836,8 +9700,7 @@ 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
@@ -9958,8 +9821,7 @@ 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"
 
diff --git a/doc/po/it.po b/doc/po/it.po
index 177905070..c7a5c0a72 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-02 18:01+0300\n"
+"POT-Creation-Date: 2012-06-02 19:24+0300\n"
 "PO-Revision-Date: 2003-04-26 23:26+0100\n"
 "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
 "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -2775,7 +2775,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>
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index f302127bf..28af3e4f7 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-02 18:01+0300\n"
+"POT-Creation-Date: 2012-06-02 19:24+0300\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -2836,7 +2836,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>