merge with official v0.8.1

1 files changed, 34 insertions, 32 deletions

diff --git a/doc/po/fr.po b/doc/po/fr.po
index 43f8b87ee..caa6f5fb1 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: 2010-08-23 18:46-0300\n"
-"PO-Revision-Date: 2010-08-23 14:04-0400\n"
+"PO-Revision-Date: 2010-08-31 07:24+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: \n"
@@ -1153,7 +1153,7 @@ msgstr ""
 "<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
 "ENTITY testing-codename \"squeeze\">"
 
-#.  The last update date 
+#.  The last update date
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
 #: apt-sortpkgs.1.xml:13 sources.list.5.xml:13
@@ -2585,7 +2585,7 @@ msgstr ""
 "<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, "
 "le nombre 100 en cas d'erreur."
 
-#.  The last update date 
+#.  The last update date
 #. type: Content of: <refentry><refentryinfo>
 #: apt-ftparchive.1.xml:13
 msgid ""
@@ -3830,7 +3830,7 @@ msgstr ""
 "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
 "nombre 100 en cas d'erreur."
 
-#.  The last update date 
+#.  The last update date
 #. type: Content of: <refentry><refentryinfo>
 #: apt-get.8.xml:13
 msgid ""
@@ -3882,30 +3882,32 @@ msgid ""
 "</group> </arg> </group>"
 msgstr ""
 "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>option_de_configuration</replaceable> </option> </"
+"<option>-o= <replaceable>options_de_configuration</replaceable> </option> </"
 "arg> <arg> <option>-c= <replaceable>fichier_de_configuration</replaceable> </"
-"option> </arg> <arg> <option>-t=</option> <group choice='req'> <arg "
-"choice='plain'> <replaceable>nom_version_cible</replaceable> </arg> <group "
-"choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
-"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group "
-"choice='req'> <arg choice='plain'> =<replaceable>numero_version_paquet</"
-"replaceable> </arg> <arg choice='plain'> /<replaceable>nom_version_cible</"
-"replaceable> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>paquet</replaceable> <arg> "
-"=<replaceable>numéro_version_paquet</replaceable> </arg> </arg> </arg> <arg "
-"choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>paquet</replaceable></arg></arg> <arg choice='plain'>check</"
-"arg> <arg choice='plain'>clean</arg> <arg choice='plain'>autoclean</arg> "
-"<arg choice='plain'>autoremove</arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-v</arg> <arg choice='plain'>--version</"
-"arg> </group> </arg> <arg choice='plain'> <group choice='req'> <arg "
-"choice='plain'>-h</arg> <arg choice='plain'>--help</arg> </group> </arg> </"
-"group>"
+"option> </arg> <arg> <option>-t=</option> <arg choice='plain'> "
+"<replaceable>nom_version_cible</replaceable> </arg> </arg> <group choice="
+"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
+"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
+"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>paquet</replaceable> <arg> <group choice='req'> <arg "
+"choice='plain'> =<replaceable>numéro_version_paquet</replaceable> </arg> "
+"<arg choice='plain'> /<replaceable>nom_version_cible</replaceable> </arg> </"
+"group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" "
+"rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg "
+"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>paquet</replaceable></arg></arg> <arg choice='plain'>source "
+"<arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable> <arg> "
+"<group choice='req'> <arg choice='plain'> "
+"=<replaceable>numéro_version_paquet</replaceable> </arg> <arg "
+"choice='plain'> /<replaceable>nom_version_cible</replaceable> </arg> </"
+"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
+"\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg "
+"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
+"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
+"</group> </arg> </group>"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:112
@@ -5216,7 +5218,7 @@ msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
-#.  The last update date 
+#.  The last update date
 #. type: Content of: <refentry><refentryinfo>
 #: apt-mark.8.xml:13
 msgid ""
@@ -5778,7 +5780,7 @@ msgstr ""
 "<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 "
 "en cas d'erreur."
 
-#.  The last update date 
+#.  The last update date
 #. type: Content of: <refentry><refentryinfo>
 #: apt.conf.5.xml:13
 msgid ""
@@ -7678,7 +7680,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:746
 msgid ""
@@ -8101,13 +8103,13 @@ msgstr ""
 msgid "&file-aptconf;"
 msgstr "&file-aptconf;"
 
-#.  ? reading apt.conf 
+#.  ? reading apt.conf
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:1096
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
-#.  The last update date 
+#.  The last update date
 #. type: Content of: <refentry><refentryinfo>
 #: apt_preferences.5.xml:13
 msgid ""