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

1 files changed, 96 insertions, 40 deletions

diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index 482473a61..d162dd28d 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-12-20 12:56+0100\n"
+"POT-Creation-Date: 2017-01-27 06:37+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -238,8 +238,10 @@ msgid ""
 "since dpkg 1.17.6), or compressed with gzip (with B<.gz> extension) or xz "
 "(with B<.xz> extension, supported since 1.17.6), as a series of plain files, "
 "of which the file B<control> is mandatory and contains the core control "
-"information. The control tarball may optionally contain an entry for ‘B<.>’, "
-"the current directory."
+"information, the B<conffiles>, B<triggers>, B<shlibs> and B<symbols> files "
+"contain optional control information, and the B<preinst>, B<postinst>, "
+"B<prerm> and B<postrm> files are optional maintainer scripts.  The control "
+"tarball may optionally contain an entry for ‘B<.>’, the current directory."
 msgstr ""
 
 #. type: Plain text
@@ -326,8 +328,11 @@ msgstr "参考"
 
 #. type: Plain text
 #: deb.man
-msgid "B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5)."
-msgstr "B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5)."
+msgid ""
+"B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5), B<deb-conffiles>(5)  B<deb-"
+"triggers>(5), B<deb-shlibs>(5), B<deb-symbols>(5), B<deb-preinst>(5), B<deb-"
+"postinst>(5), B<deb-prerm>(5), B<deb-postrm>(5)."
+msgstr ""
 
 #. type: TH
 #: deb822.man
@@ -2039,14 +2044,31 @@ msgstr ""
 #. type: TP
 #: deb-control.man
 #, no-wrap
-msgid "B<Built-For-Profiles:>I< profile-list>"
+msgid "B<Built-For-Profiles:>I< profile-list (obsolete)>"
 msgstr ""
 
 #. type: Plain text
 #: deb-control.man
 msgid ""
-"This field specifies a whitespace separated list of build profiles that this "
-"binary packages was built with."
+"This field used to specify a whitespace separated list of build profiles "
+"that this binary packages was built with (since dpkg 1.17.2 until 1.18.18).  "
+"The information previously found in this field can now be found in the B<."
+"buildinfo> file, which supersedes it."
+msgstr ""
+
+#. type: TP
+#: deb-control.man
+#, no-wrap
+msgid "B<Auto-Built-Package:>I< reason-list>"
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"This field specifies a whitespace separated list of reasons why this package "
+"was auto-generated.  Binary packages marked with this field will not appear "
+"in the I<debian/control> master source control file.  The only currently "
+"used reason is B<debug-symbols>."
 msgstr ""
 
 #. type: SH
@@ -4676,6 +4698,26 @@ msgid ""
 "dependencies, each source package would need to be unpacked."
 msgstr ""
 
+#. type: TP
+#: dsc.man
+#, no-wrap
+msgid "B<Testsuite-Restrictions:>I< name-list>"
+msgstr ""
+
+#. type: Plain text
+#: dsc.man
+msgid ""
+"This field declares the comma-separated union of all test restrictions "
+"(B<Restrictions> fields in I<debian/tests/control> file)."
+msgstr ""
+
+#. type: Plain text
+#: dsc.man
+msgid ""
+"Rationale: this field is needed because otherwise to be able to get the test "
+"restrictions, each source package would need to be unpacked."
+msgstr ""
+
 #. type: Plain text
 #: dsc.man
 msgid ""
@@ -7014,9 +7056,10 @@ msgstr ""
 
 #. type: SH
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
-#: dpkg-checkbuilddeps.man dpkg-deb.man dpkg-divert.man dpkg-gensymbols.man
-#: dpkg-query.man dpkg-source.man dpkg-split.man dpkg-statoverride.man
-#: dpkg-trigger.man dpkg-vendor.man dselect.man update-alternatives.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-deb.man dpkg-divert.man
+#: dpkg-gensymbols.man dpkg-query.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man dselect.man
+#: update-alternatives.man
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr ""
@@ -7362,24 +7405,7 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-msgid ""
-"The following files are components of a binary package. See B<deb>(5)  for "
-"more information about them:"
-msgstr ""
-
-#. type: Plain text
-#: dpkg.man
-#, no-wrap
-msgid ""
-"I<control> (B<deb-control>(5))\n"
-"I<conffiles> (B<deb-conffiles>(5))\n"
-"I<preinst> (B<deb-preinst>(5))\n"
-"I<postinst> (B<deb-postinst>(5))\n"
-"I<prerm> (B<deb-prerm>(5))\n"
-"I<postrm> (B<deb-postrm>(5))\n"
-"I<triggers> (B<deb-triggers>(5))\n"
-"I<shlibs> (B<deb-shlibs>(5))\n"
-"I<symbols> (B<deb-symbols>(5))\n"
+msgid "The format and contents of a binary package are described in B<deb>(5)."
 msgstr ""
 
 #. type: Plain text
@@ -9666,7 +9692,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-buildflags.man dpkg-buildpackage.man dpkg-genbuildinfo.man
 #, no-wrap
 msgid "B<DEB_BUILD_OPTIONS>"
 msgstr ""
@@ -10055,10 +10081,11 @@ msgstr ""
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid ""
-"It runs the B<sign> hook and calls B<gpg2> or B<gpg> to sign the B<.dsc> "
-"file (if any, unless B<-us> or B<--unsigned-source> is specified or on "
-"UNRELEASED builds), and the B<.changes> file (unless B<-uc> or B<--unsigned-"
-"changes> is specified or on UNRELEASED builds)."
+"It runs the B<sign> hook and calls B<gpg2> or B<gpg> (as long as it is not "
+"an UNRELEASED build) to sign the B<.dsc> file (if any, unless B<-us> or B<--"
+"unsigned-source> is specified), the B<.buildinfo> file (unless B<-ui> or B<--"
+"unsigned-buildinfo> is specified) and the B<.changes> file (unless B<-uc> or "
+"B<--unsigned-changes> is specified)."
 msgstr ""
 
 #. type: IP
@@ -10774,6 +10801,20 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+#| msgid "B<-E>, B<--skip-same-version>"
+msgid "B<-ui>, B<--unsigned-buildinfo>"
+msgstr "B<-E>, B<--skip-same-version>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+#, fuzzy
+#| msgid "B<bad-version>: Process even packages with wrong versions."
+msgid "Do not sign the B<.buildinfo> file (since dpkg 1.18.19)."
+msgstr "B<bad-version>: 容忍错误的软件包版本并继续。"
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 #| msgid "B<-R>, B<--recursive>"
 msgid "B<-uc>, B<--unsigned-changes>"
 msgstr "B<-R>, B<--recursive>"
@@ -10793,8 +10834,8 @@ msgstr ""
 #: dpkg-buildpackage.man
 msgid ""
 "Force the signing of the resulting files (since dpkg 1.17.0), regardless of "
-"B<-us>, B<--unsigned-source>, B<-uc>, B<--unsigned-changes> or other "
-"internal heuristics."
+"B<-us>, B<--unsigned-source>, B<-ui>, B<--unsigned-buildinfo>, B<-uc>, B<--"
+"unsigned-changes> or other internal heuristics."
 msgstr ""
 
 #. type: TP
@@ -11303,6 +11344,18 @@ msgid ""
 "B<-q> suppresses these messages."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-genbuildinfo.man
+msgid ""
+"This variable can be used to enable or disable various features that affect "
+"the information included in the .buildinfo file, via the B<buildinfo> option "
+"(since dpkg 1.18.19).  This option contains a comma-separated list of "
+"features, prefixed with the ‘B<+>’ or ‘B<->’ modifiers, to denote whether to "
+"enable or disable them.  The special feature “B<all>” can be used to enable "
+"or disable all other features.  The feature “B<path>” controls whether to "
+"unconditionally include the B<Build-Path> field."
+msgstr ""
+
 #. type: TP
 #: dpkg-genbuildinfo.man dpkg-distaddfile.man dpkg-genchanges.man
 #: dpkg-gencontrol.man
@@ -16736,7 +16789,7 @@ msgstr ""
 msgid ""
 "If a second non-option argument is supplied it should be the name of the "
 "original source directory or tarfile or the empty string if the package is a "
-"Debian-specific one and so has no Debianisation diffs. If no second argument "
+"Debian-specific one and so has no debianisation diffs. If no second argument "
 "is supplied then B<dpkg-source> will look for the original source tarfile "
 "I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the original source "
 "directory I<directory>B<.orig> depending on the B<-sX> arguments."
@@ -18473,7 +18526,7 @@ msgstr ""
 #. type: Plain text
 #: dselect.man
 msgid ""
-"B<dselect> operates as a front-end to B<dpkg>(1), the low-level debian "
+"B<dselect> operates as a front-end to B<dpkg>(1), the low-level Debian "
 "package handling tool. It features a full-screen package selections manager "
 "with package depends and conflicts resolver. When run with administrator "
 "privileges, packages can be installed, upgraded and removed. Various access "
@@ -18928,7 +18981,7 @@ msgstr ""
 msgid ""
 "B<dselect> directly exposes the administrator to some of the complexities "
 "involved with managing large sets of packages with many interdependencies. "
-"For a user who is unfamiliar with the concepts and the ways of the debian "
+"For a user who is unfamiliar with the concepts and the ways of the Debian "
 "package management system, it can be quite overwhelming. Although B<dselect> "
 "is aimed at easing package management and administration, it is only "
 "instrumental in doing so and cannot be assumed to be a sufficient substitute "
@@ -19007,7 +19060,7 @@ msgstr ""
 #. type: Plain text
 #: dselect.man
 msgid ""
-"The main select screen displays a list of all packages known to the debian "
+"The main select screen displays a list of all packages known to the Debian "
 "package management system. This includes packages installed on the system "
 "and packages known from the available packages database."
 msgstr ""
@@ -20755,6 +20808,9 @@ msgstr ""
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, 文件系统层次结构标准。"
 
+#~ msgid "B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5)."
+#~ msgstr "B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5)."
+
 #, fuzzy
 #~| msgid "B<--admindir=>I<dir>"
 #~ msgid "B<--buildinfo-id=>I<identifier>"