summaryrefslogtreecommitdiff
path: root/doc/po/fr.po
diff options
context:
space:
mode:
Diffstat (limited to 'doc/po/fr.po')
-rw-r--r--doc/po/fr.po160
1 files changed, 160 insertions, 0 deletions
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 6e3977c43..3b0f486b1 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
+<<<<<<< TREE
+"POT-Creation-Date: 2011-06-09 08:32+0530\n"
+=======
"POT-Creation-Date: 2011-06-28 16:42+0200\n"
+>>>>>>> MERGE-SOURCE
"PO-Revision-Date: 2011-02-17 07:50+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1277,7 +1281,11 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+=======
#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393
+>>>>>>> MERGE-SOURCE
#: apt-sortpkgs.1.xml:61
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1304,12 +1312,20 @@ msgstr ""
"<literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1432,7 +1448,11 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+=======
#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -1552,7 +1572,11 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
+<<<<<<< TREE
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+=======
#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570
+>>>>>>> MERGE-SOURCE
#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
@@ -1570,7 +1594,11 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
+<<<<<<< TREE
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+=======
#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585
+>>>>>>> MERGE-SOURCE
#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
#: sources.list.5.xml:234
@@ -1584,7 +1612,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;."
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
+<<<<<<< TREE
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+=======
#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591
+>>>>>>> MERGE-SOURCE
#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr "Diagnostics"
@@ -1719,7 +1751,11 @@ msgid "Options"
msgstr "Options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+=======
#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
+>>>>>>> MERGE-SOURCE
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -1976,7 +2012,11 @@ msgid "Just show the contents of the configuration space."
msgstr "Affiche seulement le contenu de l'espace de configuration."
#. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+=======
#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
+>>>>>>> MERGE-SOURCE
#: apt-sortpkgs.1.xml:73
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -3133,25 +3173,61 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:531
+#, fuzzy
+#| msgid ""
+#| "Values for the additional metadata fields in the Release file are taken "
+#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
+#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The "
+#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
+#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
+#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
+#| "literal>, <literal>Description</literal>."
msgid ""
"Generate the given checksum. These options default to on, when turned off "
"the generated index files will not have the checksum fields where possible. "
"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
"replaceable>::<replaceable>Checksum</replaceable></literal> where "
+<<<<<<< TREE
+"<literal>Index</literal> can be <literal>Packages</literal>, "
+"<literal>Sources</literal> or <literal>Release</literal> and "
+"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
+"literal> or <literal>SHA256</literal>."
+=======
"<literal><replaceable>Index</replaceable></literal> can be "
"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+>>>>>>> MERGE-SOURCE
msgstr ""
+<<<<<<< TREE
+"La valeur des autres champs de métadonnées du fichier Release sont tirées de "
+"la valeur correspondante dans <literal>APT::FTPArchive::Release</literal>, "
+"p. ex. <literal>APT::FTPArchive::Release::Origin</literal>. Les champs "
+"reconnus sont : <literal>Origin</literal>, <literal>Label</literal>, "
+"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
+=======
+>>>>>>> MERGE-SOURCE
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:539
+=======
#: apt-ftparchive.1.xml:540
+>>>>>>> MERGE-SOURCE
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:541
+=======
#: apt-ftparchive.1.xml:542
+>>>>>>> MERGE-SOURCE
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3161,7 +3237,11 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:547
+=======
#: apt-ftparchive.1.xml:548
+>>>>>>> MERGE-SOURCE
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 "
@@ -3176,12 +3256,20 @@ msgstr ""
"configuration : <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:553
+=======
#: apt-ftparchive.1.xml:554
+>>>>>>> MERGE-SOURCE
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:555
+=======
#: apt-ftparchive.1.xml:556
+>>>>>>> MERGE-SOURCE
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3195,12 +3283,20 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:561
+=======
#: apt-ftparchive.1.xml:562
+>>>>>>> MERGE-SOURCE
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:563
+=======
#: apt-ftparchive.1.xml:564
+>>>>>>> MERGE-SOURCE
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3216,12 +3312,20 @@ msgstr ""
"de configuration : <literal>APT::FTPArchive::Contents</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:571
+=======
#: apt-ftparchive.1.xml:572
+>>>>>>> MERGE-SOURCE
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:573
+=======
#: apt-ftparchive.1.xml:574
+>>>>>>> MERGE-SOURCE
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3232,12 +3336,20 @@ msgstr ""
"FTPArchive::SourceOverride</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:577
+=======
#: apt-ftparchive.1.xml:578
+>>>>>>> MERGE-SOURCE
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:579
+=======
#: apt-ftparchive.1.xml:580
+>>>>>>> MERGE-SOURCE
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3246,12 +3358,20 @@ msgstr ""
"configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:583
+=======
#: apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
msgid "<option>--arch</option>"
msgstr "<option>--arch</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:584
+=======
#: apt-ftparchive.1.xml:585
+>>>>>>> MERGE-SOURCE
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3265,12 +3385,20 @@ msgstr ""
"<literal>APT::FTPArchive::Architecture</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:590
+=======
#: apt-ftparchive.1.xml:591
+>>>>>>> MERGE-SOURCE
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:592
+=======
#: apt-ftparchive.1.xml:593
+>>>>>>> MERGE-SOURCE
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -3293,12 +3421,20 @@ msgstr ""
"survenir et l'ensemble de ces contrôles devient inutile."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:602
+=======
#: apt-ftparchive.1.xml:603
+>>>>>>> MERGE-SOURCE
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:604
+=======
#: apt-ftparchive.1.xml:605
+>>>>>>> MERGE-SOURCE
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3314,19 +3450,31 @@ msgstr ""
"generate."
#. type: Content of: <refentry><refsect1><title>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+=======
#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+>>>>>>> MERGE-SOURCE
#: sources.list.5.xml:198
msgid "Examples"
msgstr "Exemples"
#. type: Content of: <refentry><refsect1><para><programlisting>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:622
+=======
#: apt-ftparchive.1.xml:623
+>>>>>>> MERGE-SOURCE
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:618
+=======
#: apt-ftparchive.1.xml:619
+>>>>>>> MERGE-SOURCE
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3335,7 +3483,11 @@ msgstr ""
"des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
+#: apt-ftparchive.1.xml:632
+=======
#: apt-ftparchive.1.xml:633
+>>>>>>> MERGE-SOURCE
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -8346,7 +8498,11 @@ msgid ""
"APT also supports pinning by glob() expressions and regular expressions "
"surrounded by /. For example, the following example assigns the priority 500 "
"to all packages from experimental where the name starts with gnome (as a glob"
+<<<<<<< TREE
+"()-like expression or contains the word kde (as a POSIX extended regular "
+=======
"()-like expression) or contains the word kde (as a POSIX extended regular "
+>>>>>>> MERGE-SOURCE
"expression surrounded by slashes)."
msgstr ""
@@ -8370,7 +8526,11 @@ msgstr ""
#: apt_preferences.5.xml:279
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
+<<<<<<< TREE
+"string can occur. Those, the following pin assigns the priority 990 to all "
+=======
"string can occur. Thus, the following pin assigns the priority 990 to all "
+>>>>>>> MERGE-SOURCE
"packages from a release starting with karmic."
msgstr ""