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

1 files changed, 153 insertions, 79 deletions

diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index c46222db5..caf878f29 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-07-03 21:04+0200\n"
+"POT-Creation-Date: 2016-07-31 16:12+0200\n"
 "PO-Revision-Date: 2016-05-07 20:39+0200\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -31,16 +31,17 @@ msgid "2014-05-24"
 msgstr "2014-05-24"
 
 #. type: TH
-#: deb.5 deb822.5 deb-changelog.5 deb-changes.5 deb-control.5 deb-src-control.5
-#: deb-split.5 deb-version.5 deb-old.5 deb-origin.5 deb-override.5
-#: deb-extra-override.5 deb-shlibs.5 deb-substvars.5 deb-symbols.5
-#: deb-triggers.5 dsc.5 dpkg.1 dpkg-architecture.1 dpkg.cfg.5 dpkg-buildflags.1
-#: dpkg-buildpackage.1 dpkg-checkbuilddeps.1 dpkg-distaddfile.1 dpkg-deb.1
-#: dpkg-divert.1 dpkg-genchanges.1 dpkg-gencontrol.1 dpkg-gensymbols.1
-#: dpkg-maintscript-helper.1 dpkg-mergechangelogs.1 dpkg-name.1
-#: dpkg-parsechangelog.1 dpkg-query.1 dpkg-scanpackages.1 dpkg-scansources.1
-#: dpkg-shlibdeps.1 dpkg-source.1 dpkg-split.1 dpkg-trigger.1 dpkg-vendor.1
-#: dselect.1 dselect.cfg.5 start-stop-daemon.8 update-alternatives.1
+#: deb.5 deb822.5 deb-changelog.5 deb-changes.5 deb-control.5 deb-conffiles.5
+#: deb-src-control.5 deb-split.5 deb-version.5 deb-old.5 deb-origin.5
+#: deb-override.5 deb-extra-override.5 deb-shlibs.5 deb-substvars.5
+#: deb-symbols.5 deb-triggers.5 dsc.5 dpkg.1 dpkg-architecture.1 dpkg.cfg.5
+#: dpkg-buildflags.1 dpkg-buildpackage.1 dpkg-checkbuilddeps.1
+#: dpkg-distaddfile.1 dpkg-deb.1 dpkg-divert.1 dpkg-genchanges.1
+#: dpkg-gencontrol.1 dpkg-gensymbols.1 dpkg-maintscript-helper.1
+#: dpkg-mergechangelogs.1 dpkg-name.1 dpkg-parsechangelog.1 dpkg-query.1
+#: dpkg-scanpackages.1 dpkg-scansources.1 dpkg-shlibdeps.1 dpkg-source.1
+#: dpkg-split.1 dpkg-trigger.1 dpkg-vendor.1 dselect.1 dselect.cfg.5
+#: start-stop-daemon.8 update-alternatives.1
 #, no-wrap
 msgid "Debian Project"
 msgstr "Debian Project"
@@ -53,17 +54,17 @@ msgid "Debian"
 msgstr "Debian"
 
 #. type: SH
-#: deb.5 deb822.5 deb-changelog.5 deb-changes.5 deb-control.5 deb-src-control.5
-#: deb-split.5 deb-version.5 deb-old.5 deb-origin.5 deb-override.5
-#: deb-extra-override.5 deb-shlibs.5 deb-substvars.5 deb-symbols.5
-#: deb-triggers.5 dsc.5 dpkg.1 dpkg-architecture.1 dpkg.cfg.5 dpkg-buildflags.1
-#: dpkg-buildpackage.1 dpkg-checkbuilddeps.1 dpkg-distaddfile.1 dpkg-deb.1
-#: dpkg-divert.1 dpkg-genchanges.1 dpkg-gencontrol.1 dpkg-gensymbols.1
-#: dpkg-maintscript-helper.1 dpkg-mergechangelogs.1 dpkg-name.1
-#: dpkg-parsechangelog.1 dpkg-query.1 dpkg-scanpackages.1 dpkg-scansources.1
-#: dpkg-shlibdeps.1 dpkg-source.1 dpkg-split.1 dpkg-statoverride.1
-#: dpkg-trigger.1 dpkg-vendor.1 dselect.1 dselect.cfg.5 start-stop-daemon.8
-#: update-alternatives.1
+#: deb.5 deb822.5 deb-changelog.5 deb-changes.5 deb-control.5 deb-conffiles.5
+#: deb-src-control.5 deb-split.5 deb-version.5 deb-old.5 deb-origin.5
+#: deb-override.5 deb-extra-override.5 deb-shlibs.5 deb-substvars.5
+#: deb-symbols.5 deb-triggers.5 dsc.5 dpkg.1 dpkg-architecture.1 dpkg.cfg.5
+#: dpkg-buildflags.1 dpkg-buildpackage.1 dpkg-checkbuilddeps.1
+#: dpkg-distaddfile.1 dpkg-deb.1 dpkg-divert.1 dpkg-genchanges.1
+#: dpkg-gencontrol.1 dpkg-gensymbols.1 dpkg-maintscript-helper.1
+#: dpkg-mergechangelogs.1 dpkg-name.1 dpkg-parsechangelog.1 dpkg-query.1
+#: dpkg-scanpackages.1 dpkg-scansources.1 dpkg-shlibdeps.1 dpkg-source.1
+#: dpkg-split.1 dpkg-statoverride.1 dpkg-trigger.1 dpkg-vendor.1 dselect.1
+#: dselect.cfg.5 start-stop-daemon.8 update-alternatives.1
 #, no-wrap
 msgid "NAME"
 msgstr "名称"
@@ -74,12 +75,12 @@ msgid "deb - Debian binary package format"
 msgstr "deb - Debian 二进制包格式"
 
 #. type: SH
-#: deb.5 deb-changelog.5 deb-changes.5 deb-control.5 deb-src-control.5
-#: deb-split.5 deb-version.5 deb-old.5 deb-origin.5 deb-override.5
-#: deb-extra-override.5 deb-substvars.5 deb-symbols.5 deb-triggers.5 dsc.5
-#: dpkg.1 dpkg-architecture.1 dpkg-buildflags.1 dpkg-buildpackage.1
-#: dpkg-checkbuilddeps.1 dpkg-distaddfile.1 dpkg-deb.1 dpkg-divert.1
-#: dpkg-genchanges.1 dpkg-gencontrol.1 dpkg-gensymbols.1
+#: deb.5 deb-changelog.5 deb-changes.5 deb-control.5 deb-conffiles.5
+#: deb-src-control.5 deb-split.5 deb-version.5 deb-old.5 deb-origin.5
+#: deb-override.5 deb-extra-override.5 deb-substvars.5 deb-symbols.5
+#: deb-triggers.5 dsc.5 dpkg.1 dpkg-architecture.1 dpkg-buildflags.1
+#: dpkg-buildpackage.1 dpkg-checkbuilddeps.1 dpkg-distaddfile.1 dpkg-deb.1
+#: dpkg-divert.1 dpkg-genchanges.1 dpkg-gencontrol.1 dpkg-gensymbols.1
 #: dpkg-maintscript-helper.1 dpkg-mergechangelogs.1 dpkg-name.1
 #: dpkg-parsechangelog.1 dpkg-query.1 dpkg-scanpackages.1 dpkg-scansources.1
 #: dpkg-shlibdeps.1 dpkg-source.1 dpkg-split.1 dpkg-statoverride.1
@@ -95,17 +96,17 @@ msgid "I<filename>B<.deb>"
 msgstr "I<filename>B<.deb>"
 
 #. type: SH
-#: deb.5 deb822.5 deb-changelog.5 deb-changes.5 deb-control.5 deb-src-control.5
-#: deb-split.5 deb-version.5 deb-old.5 deb-origin.5 deb-override.5
-#: deb-extra-override.5 deb-shlibs.5 deb-substvars.5 deb-symbols.5
-#: deb-triggers.5 dsc.5 dpkg.1 dpkg-architecture.1 dpkg.cfg.5 dpkg-buildflags.1
-#: dpkg-buildpackage.1 dpkg-checkbuilddeps.1 dpkg-distaddfile.1 dpkg-deb.1
-#: dpkg-divert.1 dpkg-genchanges.1 dpkg-gencontrol.1 dpkg-gensymbols.1
-#: dpkg-maintscript-helper.1 dpkg-mergechangelogs.1 dpkg-name.1
-#: dpkg-parsechangelog.1 dpkg-query.1 dpkg-scanpackages.1 dpkg-scansources.1
-#: dpkg-shlibdeps.1 dpkg-source.1 dpkg-split.1 dpkg-statoverride.1
-#: dpkg-trigger.1 dpkg-vendor.1 dselect.1 dselect.cfg.5 start-stop-daemon.8
-#: update-alternatives.1
+#: deb.5 deb822.5 deb-changelog.5 deb-changes.5 deb-control.5 deb-conffiles.5
+#: deb-src-control.5 deb-split.5 deb-version.5 deb-old.5 deb-origin.5
+#: deb-override.5 deb-extra-override.5 deb-shlibs.5 deb-substvars.5
+#: deb-symbols.5 deb-triggers.5 dsc.5 dpkg.1 dpkg-architecture.1 dpkg.cfg.5
+#: dpkg-buildflags.1 dpkg-buildpackage.1 dpkg-checkbuilddeps.1
+#: dpkg-distaddfile.1 dpkg-deb.1 dpkg-divert.1 dpkg-genchanges.1
+#: dpkg-gencontrol.1 dpkg-gensymbols.1 dpkg-maintscript-helper.1
+#: dpkg-mergechangelogs.1 dpkg-name.1 dpkg-parsechangelog.1 dpkg-query.1
+#: dpkg-scanpackages.1 dpkg-scansources.1 dpkg-shlibdeps.1 dpkg-source.1
+#: dpkg-split.1 dpkg-statoverride.1 dpkg-trigger.1 dpkg-vendor.1 dselect.1
+#: dselect.cfg.5 start-stop-daemon.8 update-alternatives.1
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "描述"
@@ -271,10 +272,10 @@ msgid "application/x-deb"
 msgstr "application/x-deb"
 
 #. type: SH
-#: deb.5 deb822.5 deb-changelog.5 deb-changes.5 deb-control.5 deb-src-control.5
-#: deb-split.5 deb-version.5 deb-old.5 deb-origin.5 deb-override.5
-#: deb-extra-override.5 deb-shlibs.5 deb-substvars.5 deb-symbols.5
-#: deb-triggers.5 dsc.5 dpkg.1 dpkg-architecture.1 dpkg.cfg.5
+#: deb.5 deb822.5 deb-changelog.5 deb-changes.5 deb-control.5 deb-conffiles.5
+#: deb-src-control.5 deb-split.5 deb-version.5 deb-old.5 deb-origin.5
+#: deb-override.5 deb-extra-override.5 deb-shlibs.5 deb-substvars.5
+#: deb-symbols.5 deb-triggers.5 dsc.5 dpkg.1 dpkg-architecture.1 dpkg.cfg.5
 #: dpkg-buildpackage.1 dpkg-deb.1 dpkg-divert.1 dpkg-genchanges.1
 #: dpkg-gencontrol.1 dpkg-gensymbols.1 dpkg-maintscript-helper.1 dpkg-name.1
 #: dpkg-parsechangelog.1 dpkg-query.1 dpkg-scanpackages.1 dpkg-scansources.1
@@ -841,14 +842,14 @@ msgstr "I<filename>B<.deb>"
 #. type: Plain text
 #: deb-changes.5
 msgid ""
-"Each Debian source package is composed of a .dsc control file, which "
-"contains a number of fields.  Each field begins with a tag, such as "
-"B<Source> or B<Binary> (case insensitive), followed by a colon, and the body "
-"of the field.  Fields are delimited only by field tags.  In other words, "
-"field text may be multiple lines in length, but the installation tools will "
-"generally join lines when processing the body of the field (except in case "
-"of the multiline fields B<Description>, B<Changes>, B<Files>, B<Checksums-"
-"Sha1> and B<Checksums-Sha256>, see below)."
+"Each Debian upload is composed of a .changes control file, which contains a "
+"number of fields.  Each field begins with a tag, such as B<Source> or "
+"B<Binary> (case insensitive), followed by a colon, and the body of the "
+"field.  Fields are delimited only by field tags.  In other words, field text "
+"may be multiple lines in length, but the installation tools will generally "
+"join lines when processing the body of the field (except in case of the "
+"multiline fields B<Description>, B<Changes>, B<Files>, B<Checksums-Sha1> and "
+"B<Checksums-Sha256>, see below)."
 msgstr ""
 
 #. type: Plain text
@@ -1218,7 +1219,7 @@ msgid "deb-control - Debian binary packages' master control file format"
 msgstr "deb-control - Debian 软件包的主控文件格式"
 
 #. type: Plain text
-#: deb-control.5 deb-src-control.5
+#: deb-control.5
 msgid "control"
 msgstr ""
 
@@ -1717,7 +1718,8 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: deb-control.5 deb-src-control.5 deb-origin.5 start-stop-daemon.8
+#: deb-control.5 deb-conffiles.5 deb-src-control.5 deb-origin.5
+#: start-stop-daemon.8
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "示例"
@@ -1755,6 +1757,72 @@ msgid ""
 msgstr ""
 
 #. type: TH
+#: deb-conffiles.5
+#, fuzzy, no-wrap
+#| msgid "deb-control"
+msgid "deb-conffiles"
+msgstr "deb-control"
+
+#. type: TH
+#: deb-conffiles.5
+#, no-wrap
+msgid "2016-07-07"
+msgstr ""
+
+#. type: TH
+#: deb-conffiles.5 deb-override.5 deb-extra-override.5 deb-shlibs.5
+#: deb-substvars.5 deb-symbols.5 deb-triggers.5 dpkg-architecture.1
+#: dpkg-buildpackage.1 dpkg-checkbuilddeps.1 dpkg-distaddfile.1 dpkg-divert.1
+#: dpkg-genchanges.1 dpkg-gencontrol.1 dpkg-gensymbols.1 dpkg-name.1
+#: dpkg-parsechangelog.1 dpkg-scanpackages.1 dpkg-scansources.1
+#: dpkg-shlibdeps.1 dpkg-source.1 dpkg-split.1 dpkg-statoverride.1
+#: start-stop-daemon.8 update-alternatives.1
+#, no-wrap
+msgid "dpkg utilities"
+msgstr ""
+
+#. type: Plain text
+#: deb-conffiles.5
+msgid "deb-conffiles - package conffiles"
+msgstr ""
+
+#. type: Plain text
+#: deb-conffiles.5
+#, fuzzy
+#| msgid "B<config-files>"
+msgid "conffiles"
+msgstr "B<config-files>"
+
+#. type: Plain text
+#: deb-conffiles.5
+msgid ""
+"A package declares its list of conffiles by including a I<conffiles> file in "
+"its control archive (i.e. I<DEBIAN/conffiles> during package creation)."
+msgstr ""
+
+#. type: Plain text
+#: deb-conffiles.5
+msgid ""
+"This file contains a list of files, one per line.  Trailing whitespace will "
+"be trimmed, and empty lines will be ignored."
+msgstr ""
+
+#. type: Plain text
+#: deb-conffiles.5
+#, no-wrap
+msgid ""
+"/etc/alternatives/README\n"
+"/etc/cron.daily/dpkg\n"
+"/etc/dpkg/dpkg.cfg\n"
+"/etc/logrotate.d/dpkg\n"
+msgstr ""
+
+#. type: Plain text
+#: deb-conffiles.5 dpkg.cfg.5 dpkg-divert.1 dpkg-query.1 dpkg-statoverride.1
+msgid "B<dpkg>(1)."
+msgstr ""
+
+#. type: TH
 #: deb-src-control.5
 #, no-wrap
 msgid "deb-src-control"
@@ -1767,6 +1835,13 @@ msgstr "deb-src-control - Debian 源代码包的主控文件格式"
 
 #. type: Plain text
 #: deb-src-control.5
+#, fuzzy
+#| msgid "deb-control"
+msgid "debian/control"
+msgstr "deb-control"
+
+#. type: Plain text
+#: deb-src-control.5
 msgid ""
 "Each Debian source package contains the master \\(Focontrol\\(Fc file, which "
 "contains at least 2 paragraphs, separated by a blank line.  The first "
@@ -2810,17 +2885,6 @@ msgstr ""
 msgid "deb-override"
 msgstr ""
 
-#. type: TH
-#: deb-override.5 deb-extra-override.5 deb-shlibs.5 deb-substvars.5
-#: deb-symbols.5 deb-triggers.5 dpkg-architecture.1 dpkg-buildpackage.1
-#: dpkg-checkbuilddeps.1 dpkg-distaddfile.1 dpkg-divert.1 dpkg-genchanges.1
-#: dpkg-gencontrol.1 dpkg-gensymbols.1 dpkg-name.1 dpkg-parsechangelog.1
-#: dpkg-scanpackages.1 dpkg-scansources.1 dpkg-shlibdeps.1 dpkg-source.1
-#: dpkg-split.1 dpkg-statoverride.1 start-stop-daemon.8 update-alternatives.1
-#, no-wrap
-msgid "dpkg utilities"
-msgstr ""
-
 #. type: Plain text
 #: deb-override.5
 msgid "deb-override - Debian archive override file"
@@ -3804,6 +3868,21 @@ msgid ""
 "automatically add it, preserving previous values."
 msgstr ""
 
+#. type: TP
+#: dsc.5
+#, no-wrap
+msgid "B<Testsuite-Triggers:>I< package-list>"
+msgstr ""
+
+#. type: Plain text
+#: dsc.5
+msgid ""
+"This field declares the comma-separated union of all test dependencies "
+"(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
+"removed, and OR dependencies flattened, except for binaries generated by "
+"this source package and meta-dependencies such as B<@> or B<@builddeps@>."
+msgstr ""
+
 #. type: Plain text
 #: dsc.5
 msgid ""
@@ -6392,13 +6471,13 @@ msgstr ""
 #: dpkg.1
 #, no-wrap
 msgid ""
-"I<control>\n"
-"I<conffiles>\n"
+"I<control> (B<deb-control>(5))\n"
+"I<conffiles> (B<deb-conffiles>(5))\n"
 "I<preinst>\n"
 "I<postinst>\n"
 "I<prerm>\n"
 "I<postrm>\n"
-"I<triggers>\n"
+"I<triggers> (B<deb-triggers>(5))\n"
 msgstr ""
 
 #. type: Plain text
@@ -7523,11 +7602,6 @@ msgstr ""
 msgid "I<~/.dpkg.cfg>"
 msgstr ""
 
-#. type: Plain text
-#: dpkg.cfg.5 dpkg-divert.1 dpkg-query.1 dpkg-statoverride.1
-msgid "B<dpkg>(1)."
-msgstr ""
-
 #. type: TH
 #: dpkg-buildflags.1
 #, no-wrap
@@ -8464,7 +8538,7 @@ msgstr ""
 #. type: Plain text
 #: dpkg-buildflags.1
 msgid ""
-"This setting (disabled by default) adds B<\\%-fdebug-path-"
+"This setting (enabled by default) adds B<\\%-fdebug-prefix-"
 "map=>I<BUILDPATH>B<=.> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, "
 "B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is "
 "set to the top-level directory of the package being built.  This has the "
@@ -9879,13 +9953,13 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.1
 #, no-wrap
-msgid "I<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or"
+msgid "I<$XDG_CONFIG_HOME/dpkg/buildpackage.conf> or"
 msgstr ""
 
 #. type: TQ
 #: dpkg-buildpackage.1
 #, no-wrap
-msgid "I<$HOME/.config/dpkg/buildflags.conf>"
+msgid "I<$HOME/.config/dpkg/buildpackage.conf>"
 msgstr ""
 
 #. type: SS
@@ -14874,7 +14948,7 @@ msgstr ""
 #. type: TP
 #: dpkg-shlibdeps.1
 #, no-wrap
-msgid "B<package could avoid a useless dependency if >I<binaries>B< were not linked against >I<library>B< (they uses none of the library's symbols)>"
+msgid "B<package could avoid a useless dependency if >I<binaries>B< were not linked against >I<library>B< (they use none of the library's symbols)>"
 msgstr ""
 
 #. type: Plain text
@@ -14894,8 +14968,8 @@ msgid ""
 "The I<binary> is linked to a library that it doesn't need. It's not a "
 "problem but some small performance improvements in binary load time can be "
 "obtained by not linking this library to this binary. This warning checks the "
-"same information than the previous one but does it for each binary instead "
-"of doing the check globally on all binaries analyzed."
+"same information as the previous one but does it for each binary instead of "
+"doing the check globally on all binaries analyzed."
 msgstr ""
 
 #. type: SS
@@ -15463,7 +15537,7 @@ msgid ""
 "associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
 "is said to be I<native>).  Optionally the original tarball might be "
 "accompanied by a detached upstream signature B<.orig.tar.gz.asc>, extraction "
-"and building supported since dpkg 1.18.5."
+"supported since dpkg 1.18.5."
 msgstr ""
 
 #. type: Plain text