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

1 files changed, 34 insertions, 51 deletions

diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index 22dc60860..92408d704 100644
--- a/man/po/zh_CN.po
+++ b/man/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.21\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 05:19+0200\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -575,20 +575,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
-msgid "I<source-name>B<_>I<source-version>B<_>I<buildinfo-id>B<.buildinfo>"
-msgstr ""
-
-#. 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
@@ -612,7 +606,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
@@ -776,6 +770,20 @@ msgstr ""
 
 #. type: TP
 #: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<--abort-after=>I<number>"
+msgid "B<Build-Date:> I<build-date>"
+msgstr "B<--abort-after=>I<number>"
+
+#. 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 ""
@@ -10310,8 +10318,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 ""
 
 #. type: TP
@@ -10597,25 +10606,6 @@ msgid "The upstream version."
 msgstr ""
 
 #. type: TP
-#: dpkg-buildpackage.man dpkg-genbuildinfo.man
-#, fuzzy, no-wrap
-#| msgid "B<--admindir=>I<dir>"
-msgid "B<--buildinfo-id=>I<identifier>"
-msgstr "B<--admindir=>I<dir>"
-
-#. type: Plain text
-#: dpkg-buildpackage.man
-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 ""
-
-#. type: TP
 #: dpkg-buildpackage.man
 #, no-wrap
 msgid "B<--buildinfo-option=>I<opt>"
@@ -11137,9 +11127,9 @@ msgstr ""
 #: dpkg-genbuildinfo.man
 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 ""
 
 #. type: TP
@@ -11156,18 +11146,6 @@ msgid ""
 "sizes and checksums in the B<.buildinfo> file)."
 msgstr ""
 
-#. type: Plain text
-#: dpkg-genbuildinfo.man
-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 ""
-
 #. type: TP
 #: dpkg-genbuildinfo.man
 #, fuzzy, no-wrap
@@ -20676,6 +20654,11 @@ msgstr ""
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, 文件系统层次结构标准。"
 
+#, fuzzy
+#~| msgid "B<--admindir=>I<dir>"
+#~ msgid "B<--buildinfo-id=>I<identifier>"
+#~ msgstr "B<--admindir=>I<dir>"
+
 #~ msgid "Debian"
 #~ msgstr "Debian"