Merging upstream version 2.12.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 15 insertions, 15 deletions

diff --git a/gl/po/zh_CN.po b/gl/po/zh_CN.po
index 8b35758..21aa19e 100644
--- a/gl/po/zh_CN.po
+++ b/gl/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib 2.0.0.3462.e9796\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2023-09-23 21:04+0000\n"
+"POT-Creation-Date: 2024-04-05 08:01+0000\n"
 "PO-Revision-Date: 2010-02-26 09:54+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -41,7 +41,7 @@ msgstr "%.*s: 未知的 ARGP_HELP_FMT 参数"
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "ARGP_HELP_FMT 中的无效参数: %s"
 
-#: gl/lib/argp-help.c:1373
+#: gl/lib/argp-help.c:1378
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
@@ -49,29 +49,29 @@ msgstr ""
 "选项完整形式所必须用的或是可选的参数，在使用选项缩写形式时也是必须的或是可选"
 "的。"
 
-#: gl/lib/argp-help.c:1739
+#: gl/lib/argp-help.c:1744
 msgid "Usage:"
 msgstr "用法："
 
-#: gl/lib/argp-help.c:1743
+#: gl/lib/argp-help.c:1748
 msgid "  or: "
 msgstr "  或者： "
 
-#: gl/lib/argp-help.c:1755
+#: gl/lib/argp-help.c:1760
 msgid " [OPTION...]"
 msgstr "[选项...]"
 
-#: gl/lib/argp-help.c:1782
+#: gl/lib/argp-help.c:1787
 #, fuzzy, c-format
 msgid "Try '%s --help' or '%s --usage' for more information.\n"
 msgstr "请尝试执行“%s --help”或“%s --usage”来获取更多信息。\n"
 
-#: gl/lib/argp-help.c:1810
+#: gl/lib/argp-help.c:1815
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "请向 %s 报告错误。\n"
 
-#: gl/lib/argp-help.c:2010 gl/lib/error.c:194
+#: gl/lib/argp-help.c:2015 gl/lib/error.c:194
 msgid "Unknown system error"
 msgstr "未知的系统错误"
 
@@ -116,37 +116,37 @@ msgstr "%s：参数太多\n"
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "（程序错误）未知的选项！？"
 
-#: gl/lib/getopt.c:278
+#: gl/lib/getopt.c:282
 #, fuzzy, c-format
 msgid "%s: option '%s%s' is ambiguous\n"
 msgstr "%s: 选项\"%s\"歧义\n"
 
-#: gl/lib/getopt.c:284
+#: gl/lib/getopt.c:288
 #, fuzzy, c-format
 msgid "%s: option '%s%s' is ambiguous; possibilities:"
 msgstr "%s: 选项\"%s\"歧义\n"
 
-#: gl/lib/getopt.c:319
+#: gl/lib/getopt.c:322
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%s%s'\n"
 msgstr "%s: 无法识别的选项\"%c%s\"\n"
 
-#: gl/lib/getopt.c:345
+#: gl/lib/getopt.c:348
 #, fuzzy, c-format
 msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: 选项\"%c%s\"不要参数\n"
 
-#: gl/lib/getopt.c:360
+#: gl/lib/getopt.c:363
 #, fuzzy, c-format
 msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s: 选项\"%s\"必须带参数\n"
 
-#: gl/lib/getopt.c:621
+#: gl/lib/getopt.c:624
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: 无效选项 -- \"%c\"\n"
 
-#: gl/lib/getopt.c:636 gl/lib/getopt.c:682
+#: gl/lib/getopt.c:639 gl/lib/getopt.c:685
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: 选项需要参数 -- \"%c\"\n"