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.po29
1 files changed, 15 insertions, 14 deletions
diff --git a/doc/po/fr.po b/doc/po/fr.po
index f83672420..181a8e95a 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-12-27 19:16+0100\n"
+"POT-Creation-Date: 2015-12-27 22:52+0100\n"
"PO-Revision-Date: 2014-11-15 17:26+0100\n"
"Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -5046,11 +5046,11 @@ msgid ""
"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
"Origin::<replaceable>ORIGIN</replaceable></literal>. The value should be a "
-"normal URI to a text file, expect that package specific data is replaced "
+"normal URI to a text file, except that package specific data is replaced "
"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: "
"1. if the package is from a component (e.g. <literal>main</literal>) this "
"is the first part otherwise it is omitted, 2. the first letter of source "
-"package name, expect if the source package name starts with '<literal>lib</"
+"package name, except if the source package name starts with '<literal>lib</"
"literal>' in which case it will be the first four letters. 3. The complete "
"source package name. 4. the complete name again and 5. the source version. "
"The first (if present), second, third and fourth part are separated by a "
@@ -5387,14 +5387,15 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml
msgid ""
-"Package action lines consist of five fields in Version 2: old version, "
-"direction of version change (&lt; for upgrades, &gt; for downgrades, = for "
-"no change), new version, action. The version fields are \"-\" for no version "
-"at all (for example when installing a package for the first time; no version "
-"is treated as earlier than any real version, so that is an upgrade, "
-"indicated as <literal>- &lt; 1.23.4</literal>). The action field is "
-"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it "
-"is being removed, or the filename of a .deb file if it is being unpacked."
+"Package action lines consist of five fields in Version 2: package name "
+"(without architecture qualification even if foreign), old version, direction "
+"of version change (&lt; for upgrades, &gt; for downgrades, = for no change), "
+"new version, action. The version fields are \"-\" for no version at all (for "
+"example when installing a package for the first time; no version is treated "
+"as earlier than any real version, so that is an upgrade, indicated as "
+"<literal>- &lt; 1.23.4</literal>). The action field is \"**CONFIGURE**\" if "
+"the package is being configured, \"**REMOVE**\" if it is being removed, or "
+"the filename of a .deb file if it is being unpacked."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5402,9 +5403,9 @@ msgstr ""
msgid ""
"In Version 3 after each version field follows the architecture of this "
"version, which is \"-\" if there is no version, and a field showing the "
-"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that \"none"
-"\" is an incorrect typename which is just kept to remain compatible, it "
-"should be read as \"no\" and users are encouraged to support both."
+"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that "
+"\"none\" is an incorrect typename which is just kept to remain compatible, "
+"it should be read as \"no\" and users are encouraged to support both."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>