Undo mistake in last commit.

diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index 24b8ae85bba49d0c230b137392cccb6d5478347b..00394e3e8bdfc31ebcac2fde227de6b5aec1b9ec 100644 (file)
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-07  Bruno Haible  <bruno@clisp.org>
+
+       * zh_CN.po: Restore the accidentally emptied translations.
+       Reported by Benno Schulenberg <coordinator@translationproject.org>.
+
 2007-11-07  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.17 released.

diff --git a/gettext-runtime/po/zh_CN.po b/gettext-runtime/po/zh_CN.po
index d183d694f7e0fb8aaaaf2b60af383046dab389a2..9de07c02767cb0d40442f3e9ce5b507eb59b244a 100644 (file)
--- a/gettext-runtime/po/zh_CN.po
+++ b/gettext-runtime/po/zh_CN.po
@@ -1,90 +1,92 @@
-# Chinese translations for GNU gettext-runtime package.
-# Copyright (C) 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the GNU gettext-runtime package.
-# Bruno Haible <bruno@clisp.org>, 2007.
+# Simplified Chinese translation for gettext.
+# Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
+# Yuan-Chung Cheng <platin@ms.ccafps.khc.edu.tw>, 1998.
+# Pofeng Lee <pofeng@linux.org.tw>, 2001-2002.
+# Abel Cheung <maddog@linux.org.hk>, 2002.
+# Liu Songhe <jackliu9999@263.net>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime\n"
+"Project-Id-Version: gettext-runtime 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "POT-Creation-Date: 2007-11-02 03:22+0100\n"
-"PO-Revision-Date: 2007-06-28 13:08+0200\n"
-"Last-Translator: Bruno Haible <bruno@clisp.org>\n"
-"Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
-"sourceforge.net>\n"
+"PO-Revision-Date: 2006-08-22 23:02+0800\n"
+"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr ""
+msgstr "写错误"
 
 #: gnulib-lib/error.c:125
 msgid "Unknown system error"
-msgstr ""
+msgstr "未知的系统错误"
 
 #: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
+msgstr "%s：选项“%s”是不明确的\n"
 
 #: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
+msgstr "%s：选项“--%s”不允许有参数\n"
 
 #: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
+msgstr "%s：选项“%c%s”不允许有参数\n"
 
 #: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
 #: gnulib-lib/getopt.c:994
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr ""
+msgstr "%s：选项“%s”需要一个参数\n"
 
 #: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
+msgstr "%s：无法识别的选项“--%s”\n"
 
 #: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
+msgstr "%s：无法识别的选项“%c%s”\n"
 
 #: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr ""
+msgstr "%s：非法选项 ─ %c\n"
 
 #: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr ""
+msgstr "%s：无效选项 ─ %c\n"
 
 #: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
 #: gnulib-lib/getopt.c:1065
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr ""
+msgstr "%s：选项需要一个参数 ─ %c\n"
 
 #: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
+msgstr "%s：选项“-W %s”是不明确的\n"
 
 #: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
+msgstr "%s：选项“-W %s”不允许有参数\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
-msgstr ""
+msgstr "内存耗尽"
 
 #: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
 #, c-format, no-wrap
@@ -98,62 +100,62 @@ msgstr ""
 #: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
-msgstr ""
+msgstr "由 %s 编写。\n"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/envsubst.c:118
 msgid "Bruno Haible"
-msgstr ""
+msgstr "Bruno Haible"
 
 #: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
-msgstr ""
+msgstr "参数过多"
 
 #: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
-msgstr ""
+msgstr "缺少了参数"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr ""
+msgstr "试试“%s --help”来获取更多信息。\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr ""
+msgstr "用法：%s [选项] [SHELL格式]\n"
 
 #: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
-msgstr ""
+msgstr "替换环境变量的值。\n"
 
 #: src/envsubst.c:185
 #, c-format, no-wrap
 msgid "Operation mode:\n"
-msgstr ""
+msgstr "操作模式：\n"
 
 #: src/envsubst.c:188
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr ""
+msgstr "  -v, --variables             输出 SHELL格式 中出现的变量\n"
 
 #: src/envsubst.c:192
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr ""
+msgstr "信息性输出：\n"
 
 #: src/envsubst.c:195
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr ""
+msgstr "  -h, --help                  显示此帮助并退出\n"
 
 #: src/envsubst.c:198
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr ""
+msgstr "  -V, --version               输出版本信息并退出\n"
 
 #: src/envsubst.c:202
 #, c-format, no-wrap
@@ -165,6 +167,9 @@ msgid ""
 "substituted; otherwise all environment variables references occurring in\n"
 "standard input are substituted.\n"
 msgstr ""
+"在普通操作模式下，会将标准输入复制到标准输出中，而以 $VARIABLE 或 ${VARIABLE}\n"
+"格式给出的环境变量引用会被替换成相应的值。如果给出了 SHELL格式，则只有在该格式\n"
+"中引用的环境变量会被替换；否则，标准输入中出现的全部环境变量引用都将被替换。\n"
 
 #: src/envsubst.c:211
 #, c-format, no-wrap
@@ -172,6 +177,8 @@ msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
 "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n"
 msgstr ""
+"若使用了 --variables，则会忽略标准输入，而输出由 SHELL格式 引用的环境变量组成，\n"
+"每行出现一个环境变量。\n"
 
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
 #. for this package.  Please add _another line_ saying
@@ -179,21 +186,21 @@ msgstr ""
 #. bugs (typically your translation team's web or email address).
 #: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr ""
+msgstr "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
 
 #: src/envsubst.c:442
 #, c-format
 msgid "error while reading \"%s\""
-msgstr ""
+msgstr "读取“%s”时出错"
 
 #: src/envsubst.c:443
 msgid "standard input"
-msgstr ""
+msgstr "标准输入"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/gettext.c:139 src/ngettext.c:129
 msgid "Ulrich Drepper"
-msgstr ""
+msgstr "Ulrich Drepper"
 
 #: src/gettext.c:243
 #, c-format, no-wrap
@@ -201,11 +208,13 @@ msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
+"用法：%s [选项] [[文本域] MSGID]\n"
+"或：  %s [选项] -s [MSGID]...\n"
 
 #: src/gettext.c:249
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
-msgstr ""
+msgstr "显示某原文消息的本地语言翻译。\n"
 
 #: src/gettext.c:253
 #, c-format, no-wrap
@@ -219,6 +228,13 @@ msgid ""
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
+"  -d, --domain=文本域       由<文本域>读取翻译后的消息\n"
+"  -e                        允许展开某些转义字符\n"
+"  -E                        (为了兼容性存在的选项，不会造成任何影响)\n"
+"  -h, --help                显示此段说明消息并退出\n"
+"  -n                        禁用尾随的换行符\n"
+"  -V, --version             显示版本信息并退出\n"
+"  [文本域] MSGID            由<文本域>读取相应于 MSGID 的翻译消息\n"
 
 #: src/gettext.c:264
 #, c-format, no-wrap
@@ -232,18 +248,24 @@ msgid ""
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
+"假如没有指定<文本域>参数，程序会根据 TEXTDOMAIN 环境变量来设定<文本域>。\n"
+"假如消息一览表文件不在正常的目录下，可以用环境变量 TEXTDOMAINDIR 指定\n"
+"消息一览表文件所在的位置。\n"
+"使用选项“-s”时此程序和“echo”命令类似。但它不是直接把参数复制至标准\n"
+"输出，而是寻找消息一览表文件里翻译过的消息。\n"
+"标准的搜索目录为：%s\n"
 
 #: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-msgstr ""
+msgstr "用法：%s [选项] [文本域] MSGID 复数-MSGID 数字\n"
 
 #: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
-msgstr ""
+msgstr "显示某原文消息的本地语言翻译，而翻译的语法和数字有关。\n"
 
 #: src/ngettext.c:222
 #, c-format, no-wrap
@@ -257,6 +279,14 @@ msgid ""
 "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
+"  -d, --domain=文本域       由<文本域>读取翻译后的消息。\n"
+"  -e                        允许展开某些转义字符\n"
+"  -E                        (为了兼容性存在的选项，不会造成任何影响)\n"
+"  -h, --help                显示此段说明并退出\n"
+"  -V, --version             显示版本信息并退出\n"
+"  [文本域]                  由<文本域>读取翻译消息\n"
+"  MSGID 复数-MSGID          翻译 MSGID (单数) / 复数-MSGID (复数)\n"
+"  数字                      根据<数字>来选择单数或复数型态\n"
 
 #: src/ngettext.c:233
 #, c-format, no-wrap
@@ -267,3 +297,16 @@ msgid ""
 "variable TEXTDOMAINDIR.\n"
 "Standard search directory: %s\n"
 msgstr ""
+"假如没有指定<文本域>参数，程序会根据 TEXTDOMAIN 环境变量来设定文本域。\n"
+"假如消息一览表文件不在正常的目录下，可以用环境变量 TEXTDOMAINDIR 指定\n"
+"消息一览表文件所在的位置。\n"
+"标准的搜索目录为：%s\n"
+
+#~ msgid ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "This is free software; see the source for copying conditions.  There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ msgstr ""
+#~ "版权所有 (C) %s Free Software Foundation, Inc.\n"
+#~ "这是自由软件；请参考原始码的版权声明。本软件不提供任何担保，甚至不会包括\n"
+#~ "可售性或适用于任何特定目的的担保。\n"