diff options
Diffstat (limited to 'doc/po/fr.po')
| -rw-r--r-- | doc/po/fr.po | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/doc/po/fr.po b/doc/po/fr.po index c2f4b6d83..41358cfa2 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -10,7 +10,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" +======= "POT-Creation-Date: 2013-06-13 13:46+0300\n" +>>>>>>> upstream/debian/sid "PO-Revision-Date: 2013-04-09 07:56+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -2257,12 +2261,19 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 +#, fuzzy +#| msgid "" +#| "Update the local keyring with the archive keyring and remove from the " +#| "local keyring the archive keys which are no longer valid. The archive " +#| "keyring is shipped in the <literal>archive-keyring</literal> package of " +#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " +#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " -"Debian." +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " +"Ubuntu." msgstr "" "Mettre à jour le trousseau de clés local avec le trousseau de clés de " "l'archive et y supprimer les clés qui ne sont plus valables. Le trousseau de " @@ -2331,24 +2342,33 @@ msgstr "Base de données locale de fiabilité des clés de l'archive." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +#, fuzzy +#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:184 -msgid "Keyring of Debian archive trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of Ubuntu archive trusted keys." msgstr "Trousseau des clés fiables de l'archive Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 +#, fuzzy +#| msgid "" +#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:188 -msgid "Keyring of Debian archive removed trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive removed trusted keys." +msgid "Keyring of Ubuntu archive removed trusted keys." msgstr "Trousseau des clés fiables supprimées de l'archive Debian." #. type: Content of: <refentry><refsect1><para> |