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

1 files changed, 15 insertions, 5 deletions

diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index a7666eb7a..22dc60860 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-07 03:31+0100\n"
+"POT-Creation-Date: 2016-11-11 02:43+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"
@@ -7028,7 +7028,7 @@ msgstr ""
 #: dpkg.man dpkg-buildpackage.man
 msgid ""
 "Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
-"B<auto>, B<always> and B<never> (default)."
+"B<auto> (default), B<always> and B<never>."
 msgstr ""
 
 #. type: SS
@@ -10331,7 +10331,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-msgid "B<auto> is the default behavior (since dpkg 1.18.11)."
+msgid ""
+"B<auto> is the default behavior (since dpkg 1.18.11). Setting the number of "
+"jobs to 1 will restore a serial behavior."
 msgstr ""
 
 #. type: TP
@@ -10850,8 +10852,16 @@ msgstr ""
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid ""
-"If set, and containing B<nocheck> the B<DEB_CHECK_COMMAND> variable will be "
-"ignored."
+"If set, it will contain a space-separated list of options that might affect "
+"the build process in I<debian/rules>, and the behavior of some dpkg commands."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"With B<nocheck> the B<DEB_CHECK_COMMAND> variable will be ignored.  With "
+"B<parallel=>I<N> the parallel jobs will be set to I<N>, overridden by the "
+"B<--jobs-try> option."
 msgstr ""
 
 #. type: TP