diff --git a/po/ChangeLog b/po/ChangeLog
index f22d5a8..af832d7 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-18  Bruno Haible  <bruno@clisp.org>
+
+	* zh_CN.po: Update from Ji ZhengYu <zhengyuji@gmail.com>.
+
 2008-04-27  Bruno Haible  <bruno@clisp.org>
 
 	* sl.po: Update from
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ed02bd6..8747558 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,15 +1,18 @@
 # libiconv Simplified Chinese translation
 # Copyright (C) 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the libiconv package.
 # Wang Jian <lark@linux.net.cn>, 2003
-#
+# Ji ZhengYu <zhengyuji@gmail.com>, 2008
 msgid ""
 msgstr ""
-"Project-Id-Version: libiconv 1.9.1\n"
+"Project-Id-Version: libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
 "POT-Creation-Date: 2007-10-25 00:19+0200\n"
-"PO-Revision-Date: 2003-06-01 23:55+0800\n"
-"Last-Translator: Wang Jian <lark@linux.net.cn>\n"
-"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
+"PO-Revision-Date: 2008-05-18 12:19中国标准时间\n"
+"Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
+"Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
+"sourceforge.net>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,33 +32,33 @@
 #: src/iconv.c:111
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr ""
+msgstr "尝试‘%s --help’以获得更多信息。\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
 #: src/iconv.c:116
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
-msgstr ""
+msgstr "用法: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 
 #. TRANSLATORS: The second line of the long usage message.
 #. Align it correctly against the first line.
 #. The %s placeholder expands to the program name.
 #: src/iconv.c:123
-#, fuzzy, c-format, no-wrap
+#, c-format, no-wrap
 msgid "or:    %s -l\n"
-msgstr "或：  iconv -l"
+msgstr "或者: %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
 #: src/iconv.c:129
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
-msgstr ""
+msgstr "将文本从一种编码转换成另一种编码。\n"
 
 #: src/iconv.c:133
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
-msgstr ""
+msgstr "控制输入输出格式的选项:\n"
 
 #: src/iconv.c:136
 #, c-format, no-wrap
@@ -63,6 +66,8 @@
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              the encoding of the input\n"
 msgstr ""
+"  -f ENCODING, --from-code=ENCODING\n"
+"                              输入编码\n"
 
 #: src/iconv.c:140
 #, c-format, no-wrap
@@ -70,16 +75,18 @@
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              the encoding of the output\n"
 msgstr ""
+"  -t ENCODING, --to-code=ENCODING\n"
+"                              输出编码\n"
 
 #: src/iconv.c:145
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
-msgstr ""
+msgstr "控制转换问题的选项:\n"
 
 #: src/iconv.c:148
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
-msgstr ""
+msgstr "  -c                          忽略不可转换的字符\n"
 
 #: src/iconv.c:151
 #, c-format, no-wrap
@@ -87,11 +94,13 @@
 "  --unicode-subst=FORMATSTRING\n"
 "                              substitution for unconvertible Unicode characters\n"
 msgstr ""
+"  --unicode-subst=FORMATSTRING\n"
+"                              替代不可转换的 Unicode 字符\n"
 
 #: src/iconv.c:155
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
-msgstr ""
+msgstr "  --byte-subst=FORMATSTRING   替代不可转换的字节\n"
 
 #: src/iconv.c:158
 #, c-format, no-wrap
@@ -99,36 +108,38 @@
 "  --widechar-subst=FORMATSTRING\n"
 "                              substitution for unconvertible wide characters\n"
 msgstr ""
+"  --widechar-subst=FORMATSTRING\n"
+"                              替代不可转换的宽字符\n"
 
 #: src/iconv.c:163
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
-msgstr ""
+msgstr "控制错误输出的选项:\n"
 
 #: src/iconv.c:166
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
-msgstr ""
+msgstr "  -s, --silent                不显示有关转换出错的信息\n"
 
 #: src/iconv.c:170
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr ""
+msgstr "输出信息:\n"
 
 #: src/iconv.c:173
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
-msgstr ""
+msgstr "  -l, --list                  显示支持的编码\n"
 
 #: src/iconv.c:176
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
-msgstr ""
+msgstr "  --help                      显示此帮助并退出\n"
 
 #: src/iconv.c:179
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
-msgstr ""
+msgstr "  --version                   显示版本信息并退出\n"
 
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
 #. for this package.  Please add _another line_ saying
@@ -137,6 +148,8 @@
 #: src/iconv.c:186
 msgid "Report bugs to <bug-gnu-libiconv@gnu.org>.\n"
 msgstr ""
+"请发送错误报告至 <bug-gnu-libiconv@gnu.org>。\n"
+"请将翻译错误发送至 <translation-team-zh-cn@lists.sourceforge.net>。\n"
 
 #: src/iconv.c:197
 #, no-wrap
@@ -145,6 +158,9 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"GPLv2+ 版权协议: GNU GPL 版本 2 或更高版本 <http://gnu.org/licenses/gpl.html>\n"
+"此软件为自由软件: 您可自由得更改并重新分布它。\n"
+"在法律所允许的范围内，没有任何担保。\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
 #: src/iconv.c:203
@@ -158,7 +174,7 @@
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
-msgstr ""
+msgstr "%s 参数: 此处不允许用指令带变量宽度的格式。"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
@@ -167,21 +183,21 @@
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
 "here."
-msgstr ""
+msgstr "%s 参数: 此处不允许用指令带变量精度的格式。"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #: src/iconv.c:328
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
-msgstr ""
+msgstr "%s 参数: 此处不允许用指令带大小的格式。"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #: src/iconv.c:370
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
-msgstr ""
+msgstr "%s 参数: 字符串在指令中部终止。"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
@@ -189,7 +205,7 @@
 #: src/iconv.c:377
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
-msgstr ""
+msgstr "%s 参数: 字符‘%c’不是有效的转换定义符。"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
@@ -198,7 +214,7 @@
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
 "valid conversion specifier."
-msgstr ""
+msgstr "%s 参数: 用于终止指令格式的字符不是有效的转换定义符。"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
@@ -209,101 +225,101 @@
 "%s argument: The format string consumes more than one argument: %u argument."
 msgid_plural ""
 "%s argument: The format string consumes more than one argument: %u arguments."
-msgstr[0] ""
+msgstr[0] "%s 参数: 格式字符串需要更多的参数: %u 参数。"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
 #: src/iconv.c:457
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
-msgstr ""
+msgstr "无法将字节替代转换成 Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
 #: src/iconv.c:497
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
-msgstr ""
+msgstr "无法将 unicode 替代转换成目标编码: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
 #: src/iconv.c:538
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
-msgstr ""
+msgstr "无法将字节替代转换成宽字符串: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
 #: src/iconv.c:579
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
-msgstr ""
+msgstr "无法将宽字符替代转换成目标编码: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
 #: src/iconv.c:620
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
-msgstr ""
+msgstr "无法将字节替代转换成目标编码: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
 #: src/iconv.c:639
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%u:%u: cannot convert"
-msgstr "iconv：%s：无法转换\n"
+msgstr "%s:%u:%u: 无法转换"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
 #. A "shift sequence" is a sequence of bytes that changes the state of the converter;
 #. this concept exists only for "stateful" encodings like ISO-2022-JP.
 #: src/iconv.c:653
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
-msgstr "iconv：%s：不完整的字符或者换码序列\n"
+msgstr "%s:%u:%u: 不完整的字符或者换码序列"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The placeholders expand to the input file name, a line number, and a column number.
 #: src/iconv.c:666
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%u:%u"
-msgstr "iconv：%s："
+msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
 #: src/iconv.c:821
-#, fuzzy, c-format
+#, c-format
 msgid "%s: I/O error"
-msgstr "iconv：%s：输入输出错误\n"
+msgstr "%s: 输入输出错误"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
 #: src/iconv.c:1009
-#, fuzzy, c-format
+#, c-format
 msgid "conversion from %s unsupported"
-msgstr "iconv：不支持从 %s 进行转换\n"
+msgstr "不支持从 %s 进行转换"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
 #: src/iconv.c:1015
-#, fuzzy, c-format
+#, c-format
 msgid "conversion to %s unsupported"
-msgstr "iconv：不支持转换到 %s\n"
+msgstr "不支持转换到 %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
 #: src/iconv.c:1021
-#, fuzzy, c-format
+#, c-format
 msgid "conversion from %s to %s unsupported"
-msgstr "iconv：不支持从 %s 转换到 %s\n"
+msgstr "不支持从 %s 转换到 %s"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
 #: src/iconv.c:1026
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
-msgstr ""
+msgstr "尝试‘%s -l’获取所支持的编码列表"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
 #: src/iconv.c:1083
@@ -316,27 +332,10 @@
 #: src/iconv.c:1095
 #, c-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
 #. TRANSLATORS: An error message.
 #: src/iconv.c:1109
-#, fuzzy, c-format
+#, c-format
 msgid "I/O error"
-msgstr "iconv：输入输出错误\n"
-
-#~ msgid ""
-#~ "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 ""
-#~ "这是自由软件；请查看源代码中的复制条件。本软件不提供任何担保，包括销售\n"
-#~ "或者适用性担保。\n"
-
-#~ msgid "iconv: %s: "
-#~ msgstr "iconv：%s："
-
-#~ msgid ""
-#~ "Usage: iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
-#~ msgstr ""
-#~ "用法：iconv [--binary] [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
+msgstr "输入输出错误"