po: Regenerate .pot files and merge .po files with them

1 files changed, 96 insertions, 79 deletions

diff --git a/man/po/fr.po b/man/po/fr.po
index 41a75a458..73c2127bf 100644
--- a/man/po/fr.po
+++ b/man/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2016-11-11 02:43+0100\n"
+"POT-Creation-Date: 2016-11-16 03:40+0100\n"
 "PO-Revision-Date: 2016-10-17 04:40+0200\n"
 "Last-Translator: Sébastien Poher <sbphr@volted.net>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -660,22 +660,14 @@ msgstr ""
 
 #. type: Plain text
 #: deb-buildinfo.man
-msgid "The B<.buildinfo> filename by default has the following form:"
-msgstr ""
-
-#. type: Plain text
-#: deb-buildinfo.man
-#, fuzzy
-#| msgid "B<Source:> I<source-package-name> (required)"
-msgid "I<source-name>B<_>I<source-version>B<_>I<buildinfo-id>B<.buildinfo>"
-msgstr "B<Source:> I<nom-du-paquet-source> (requis)"
-
-#. type: Plain text
-#: deb-buildinfo.man
 msgid ""
-"where I<buildinfo-id> is composed of the build time formatted as "
-"B<strftime>(2) «%Y%m%dT%H%M%Sz», followed by a minus ‘-’ and the eight left-"
-"most characters from the B<.buildinfo>'s file contents MD5 digest."
+"The name of the B<.buildinfo> file will depend on the type of build and will "
+"be as specific as necessary but not more; for a build that includes B<any> "
+"the name will be I<source-name>B<_>I<source-version>B<_>I<arch>B<."
+"buildinfo>, or otherwise for a build that includes B<all> the name will be "
+"I<source-name>B<_>I<source-version>B<_>B<all.buildinfo>, or otherwise for a "
+"build that includes B<source> the name will be I<source-name>B<_>I<source-"
+"version>B<_>B<source.buildinfo>."
 msgstr ""
 
 #. type: SH
@@ -699,7 +691,7 @@ msgid ""
 "of the field value is a version number with a major and minor component.  "
 "Backward incompatible changes to the format will bump the major version, and "
 "backward compatible changes (such as field additions) will bump the minor "
-"version.  The current format version is B<0.1>."
+"version.  The current format version is B<0.2>."
 msgstr ""
 
 #. type: TP
@@ -899,6 +891,20 @@ msgstr ""
 
 #. type: TP
 #: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<Date:>I< date>"
+msgid "B<Build-Date:> I<build-date>"
+msgstr "B<Date:>I< date>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The date the package was built.  It must be in the same format as the date "
+"in a B<deb-changelog>(5)  entry."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
 #, no-wrap
 msgid "B<Build-Path:> I<build-path>"
 msgstr ""
@@ -12888,8 +12894,9 @@ msgid ""
 "B<DEB_BUILD_OPTIONS> environment variable.  Note that the B<auto> value will "
 "get replaced by the actual number of currently active processors, and as "
 "such will not get propagated to any child process. If the number of online "
-"processors cannot be inferred then the code will fallback to using an "
-"unlimited number."
+"processors cannot be inferred then the code will fallback to using serial "
+"execution (since dpkg 1.18.15), although this should only happen on exotic "
+"and unsupported systems."
 msgstr ""
 "Nombre de processus simultanés qui peuvent être exécutés, nombre de "
 "processus correspondant au nombre de processeurs en ligne si B<auto> est "
@@ -13295,38 +13302,6 @@ msgid "The upstream version."
 msgstr "La version amont."
 
 #. type: TP
-#: dpkg-buildpackage.man dpkg-genbuildinfo.man
-#, fuzzy, no-wrap
-#| msgid "B<--infodir=>I<infodir>"
-msgid "B<--buildinfo-id=>I<identifier>"
-msgstr "B<--infodir=>I<rep-info>"
-
-#. type: Plain text
-#: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "The value of this field is the name of the source package, and should "
-#| "match the name of the source package in the debian/changelog file. A "
-#| "package name must consist only of lower case letters (a-z), digits (0-9), "
-#| "plus (+) and minus (-) signs, and periods (.). Package names must be at "
-#| "least two characters long and must start with an alphanumeric character."
-msgid ""
-"Specify the identifier part of the B<.buildinfo> file name (since dpkg "
-"1.18.11).  By default, B<dpkg-buildpackage> will create an identifier using "
-"the current time and the first characters of the MD5 hash.  An arbitrary "
-"identifier can be specified as a replacement.  The identifier has the same "
-"restriction as package names: it must consist only of lower case letters (a-"
-"z), digits (0-9), plus (+) and minus (-)  signs, and periods (.), be at "
-"least two characters long and must start with an alphanumeric character."
-msgstr ""
-"La valeur de ce champ est le nom du paquet source et doit correspondre au "
-"nom du paquet source dans le fichier debian/changelog. Un nom de paquet doit "
-"être constitué uniquement de lettres minuscules (a-z), de chiffres (0-9), "
-"des caractères plus (+) et moins (-) et de points (.). Les noms de paquets "
-"doivent comporter au moins deux caractères et doivent commencer par un "
-"caractère alphanumérique."
-
-#. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
 #| msgid "B<--source-option=>I<opt>"
@@ -13998,12 +13973,20 @@ msgstr "B<-O>[I<nom-de-fichier>]"
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
+#, fuzzy
+#| msgid ""
+#| "Print the control file to standard output (or I<filename> if specified), "
+#| "rather than to B<debian/tmp/DEBIAN/control> (or I<package-build-dir>B</"
+#| "DEBIAN/control> if B<-P> was used)."
 msgid ""
 "Print the buildinfo file to standard output (or I<filename> if specified)  "
-"rather than to I<dir>B</>I<source-name>B<_>I<source-version>B<_>I<buildinfo-"
-"id>B<.buildinfo> (where I<dir> is B<..> by default or I<upload-files-dir> if "
-"B<-u> was used)."
+"rather than to I<dir>B</>I<source-name>B<_>I<source-version>B<_>I<arch>B<."
+"buildinfo> (where I<dir> is B<..> by default or I<upload-files-dir> if B<-u> "
+"was used)."
 msgstr ""
+"Affiche le fichier « control » sur la sortie standard (ou I<nom-de-fichier>) "
+"au lieu de B<debian/tmp/DEBIAN/control> (ou I<rep-de-construction-du-"
+"paquet>B</DEBIAN/control> si l'option B<-P> a été utilisée)."
 
 #. type: TP
 #: dpkg-genbuildinfo.man dpkg-genchanges.man
@@ -14028,31 +14011,6 @@ msgstr ""
 "manière à mettre leurs tailles et leurs sommes de contrôle dans le fichier "
 "B<.changes>)."
 
-#. type: Plain text
-#: dpkg-genbuildinfo.man
-#, fuzzy
-#| msgid ""
-#| "The value of this field is the name of the source package, and should "
-#| "match the name of the source package in the debian/changelog file. A "
-#| "package name must consist only of lower case letters (a-z), digits (0-9), "
-#| "plus (+) and minus (-) signs, and periods (.). Package names must be at "
-#| "least two characters long and must start with an alphanumeric character."
-msgid ""
-"Specify the identifier part of the B<.buildinfo> file name.  By default, "
-"B<dpkg-genbuildinfo> will create an identifier using the current time and "
-"the first characters of the MD5 hash.  An arbitrary identifier can be "
-"specified as a replacement.  The identifier has the same restriction as "
-"package names: it must consist only of lower case letters (a-z), digits "
-"(0-9), plus (+) and minus (-)  signs, and periods (.), be at least two "
-"characters long and must start with an alphanumeric character."
-msgstr ""
-"La valeur de ce champ est le nom du paquet source et doit correspondre au "
-"nom du paquet source dans le fichier debian/changelog. Un nom de paquet doit "
-"être constitué uniquement de lettres minuscules (a-z), de chiffres (0-9), "
-"des caractères plus (+) et moins (-) et de points (.). Les noms de paquets "
-"doivent comporter au moins deux caractères et doivent commencer par un "
-"caractère alphanumérique."
-
 #. type: TP
 #: dpkg-genbuildinfo.man
 #, fuzzy, no-wrap
@@ -27481,6 +27439,65 @@ msgstr "B<update-alternatives --auto vi>"
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, le standard pour l'organisation du système de fichiers."
 
+#, fuzzy
+#~| msgid "B<Source:> I<source-package-name> (required)"
+#~ msgid "I<source-name>B<_>I<source-version>B<_>I<buildinfo-id>B<.buildinfo>"
+#~ msgstr "B<Source:> I<nom-du-paquet-source> (requis)"
+
+#, fuzzy
+#~| msgid "B<--infodir=>I<infodir>"
+#~ msgid "B<--buildinfo-id=>I<identifier>"
+#~ msgstr "B<--infodir=>I<rep-info>"
+
+#, fuzzy
+#~| msgid ""
+#~| "The value of this field is the name of the source package, and should "
+#~| "match the name of the source package in the debian/changelog file. A "
+#~| "package name must consist only of lower case letters (a-z), digits "
+#~| "(0-9), plus (+) and minus (-) signs, and periods (.). Package names must "
+#~| "be at least two characters long and must start with an alphanumeric "
+#~| "character."
+#~ msgid ""
+#~ "Specify the identifier part of the B<.buildinfo> file name (since dpkg "
+#~ "1.18.11).  By default, B<dpkg-buildpackage> will create an identifier "
+#~ "using the current time and the first characters of the MD5 hash.  An "
+#~ "arbitrary identifier can be specified as a replacement.  The identifier "
+#~ "has the same restriction as package names: it must consist only of lower "
+#~ "case letters (a-z), digits (0-9), plus (+) and minus (-)  signs, and "
+#~ "periods (.), be at least two characters long and must start with an "
+#~ "alphanumeric character."
+#~ msgstr ""
+#~ "La valeur de ce champ est le nom du paquet source et doit correspondre au "
+#~ "nom du paquet source dans le fichier debian/changelog. Un nom de paquet "
+#~ "doit être constitué uniquement de lettres minuscules (a-z), de chiffres "
+#~ "(0-9), des caractères plus (+) et moins (-) et de points (.). Les noms de "
+#~ "paquets doivent comporter au moins deux caractères et doivent commencer "
+#~ "par un caractère alphanumérique."
+
+#, fuzzy
+#~| msgid ""
+#~| "The value of this field is the name of the source package, and should "
+#~| "match the name of the source package in the debian/changelog file. A "
+#~| "package name must consist only of lower case letters (a-z), digits "
+#~| "(0-9), plus (+) and minus (-) signs, and periods (.). Package names must "
+#~| "be at least two characters long and must start with an alphanumeric "
+#~| "character."
+#~ msgid ""
+#~ "Specify the identifier part of the B<.buildinfo> file name.  By default, "
+#~ "B<dpkg-genbuildinfo> will create an identifier using the current time and "
+#~ "the first characters of the MD5 hash.  An arbitrary identifier can be "
+#~ "specified as a replacement.  The identifier has the same restriction as "
+#~ "package names: it must consist only of lower case letters (a-z), digits "
+#~ "(0-9), plus (+) and minus (-)  signs, and periods (.), be at least two "
+#~ "characters long and must start with an alphanumeric character."
+#~ msgstr ""
+#~ "La valeur de ce champ est le nom du paquet source et doit correspondre au "
+#~ "nom du paquet source dans le fichier debian/changelog. Un nom de paquet "
+#~ "doit être constitué uniquement de lettres minuscules (a-z), de chiffres "
+#~ "(0-9), des caractères plus (+) et moins (-) et de points (.). Les noms de "
+#~ "paquets doivent comporter au moins deux caractères et doivent commencer "
+#~ "par un caractère alphanumérique."
+
 #~ msgid ""
 #~ "If set, and containing B<nocheck> the B<DEB_CHECK_COMMAND> variable will "
 #~ "be ignored."