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

1 files changed, 28 insertions, 19 deletions

diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index 29c88628c..ad8123099 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: 2017-02-01 05:48+0100\n"
+"POT-Creation-Date: 2017-03-06 06:25+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"
@@ -611,7 +611,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.2>."
+"version.  The current format version is B<1.0>."
 msgstr ""
 
 #. type: TP
@@ -2152,8 +2152,11 @@ msgstr ""
 #. type: Plain text
 #: deb-conffiles.man
 msgid ""
-"This file contains a list of files, one per line.  Trailing whitespace will "
-"be trimmed, and empty lines will be ignored."
+"This file contains a list of files, one per line.  They should be listed as "
+"absolute pathnames, and should exist in the binary package, otherwise "
+"B<dpkg>(1) will ignore them (although by default B<dpkg-deb>(1) will refuse "
+"to build such binary packages).  Trailing whitespace will be trimmed, and "
+"empty lines will be ignored."
 msgstr ""
 
 #. type: Plain text
@@ -2167,11 +2170,11 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: deb-conffiles.man deb-postinst.man deb-postrm.man deb-preinst.man
-#: deb-prerm.man dpkg.cfg.man dpkg-divert.man dpkg-query.man
-#: dpkg-statoverride.man
-msgid "B<dpkg>(1)."
-msgstr ""
+#: deb-conffiles.man
+#, fuzzy
+#| msgid "B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5)."
+msgid "B<dpkg-deb>(1), B<dpkg>(1)."
+msgstr "B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 
 #. type: TH
 #: deb-src-control.man
@@ -4104,6 +4107,12 @@ msgstr ""
 msgid "If I<prerm> fails during replacement due to conflict."
 msgstr ""
 
+#. type: Plain text
+#: deb-postinst.man deb-postrm.man deb-preinst.man deb-prerm.man dpkg.cfg.man
+#: dpkg-divert.man dpkg-query.man dpkg-statoverride.man
+msgid "B<dpkg>(1)."
+msgstr ""
+
 #. type: TH
 #: deb-postrm.man
 #, fuzzy, no-wrap
@@ -9451,16 +9460,16 @@ msgstr ""
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This setting (enabled by default since dpkg 1.18.11, and injected by default "
-"by gcc on the amd64, arm64, armel, armhf, i386, mips, mipsel, mips64el, "
-"ppc64el and s390x Debian architectures) adds the required options if needed "
-"to enable or disable PIE. When enabled and injected by gcc, adds nothing. "
-"When enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, "
-"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
-"B<FCFLAGS>, and B<-fPIE -pie> to B<LDFLAGS>. When disabled and injected by "
-"gcc, adds B<-fno-PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, "
-"B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-"
-"pie> to B<LDFLAGS>."
+"This setting (with no default since dpkg 1.18.23, and injected by default by "
+"gcc on the amd64, arm64, armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, "
+"mips, mipsel, mips64el, ppc64el, s390x, sparc and sparc64 Debian "
+"architectures)  adds the required options via gcc specs files if needed to "
+"enable or disable PIE. When enabled and injected by gcc, adds nothing. When "
+"enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, B<CXXFLAGS>, "
+"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-"
+"fPIE -pie> to B<LDFLAGS>. When disabled and injected by gcc, adds B<-fno-"
+"PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
+"B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-pie> to B<LDFLAGS>."
 msgstr ""
 
 #. type: Plain text