--- embedaddon/libiconv/po/zh_CN.po	2012/02/21 22:57:48	1.1
+++ embedaddon/libiconv/po/zh_CN.po	2012/05/29 09:29:43	1.1.1.2
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libiconv 1.12\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
-"POT-Creation-Date: 2009-06-30 22:53+0200\n"
+"POT-Creation-Date: 2011-08-07 15:24+0200\n"
 "PO-Revision-Date: 2008-11-12 09:51+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -19,24 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: The first line of the short usage message.
-#: src/iconv.c:103
+#: src/iconv.c:104
 msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]"
 msgstr "用法：iconv [-c] [-s] [-f 输入编码] [-t 输出编码] [文件 ...]"
 
 #. TRANSLATORS: The second line of the short usage message.
 #. Align it correctly against the first line.
-#: src/iconv.c:107
+#: src/iconv.c:108
 msgid "or:    iconv -l"
 msgstr "或：  iconv -l"
 
-#: src/iconv.c:109
+#: src/iconv.c:110
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "尝试‘%s --help’以获得更多信息。\n"
 
 #. TRANSLATORS: The first line of the long usage message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:114
+#: src/iconv.c:115
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
 msgstr "用法: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n"
@@ -44,23 +44,23 @@ msgstr "用法: %s [OPTION...] [-f ENCODING] [-t ENCOD
 #. 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:121
+#: src/iconv.c:122
 #, c-format, no-wrap
 msgid "or:    %s -l\n"
 msgstr "或者: %s -l\n"
 
 #. TRANSLATORS: Description of the iconv program.
-#: src/iconv.c:127
+#: src/iconv.c:128
 #, c-format, no-wrap
 msgid "Converts text from one encoding to another encoding.\n"
 msgstr "将文本从一种编码转换成另一种编码。\n"
 
-#: src/iconv.c:131
+#: src/iconv.c:132
 #, c-format, no-wrap
 msgid "Options controlling the input and output format:\n"
 msgstr "控制输入输出格式的选项:\n"
 
-#: src/iconv.c:134
+#: src/iconv.c:135
 #, c-format, no-wrap
 msgid ""
 "  -f ENCODING, --from-code=ENCODING\n"
@@ -69,7 +69,7 @@ msgstr ""
 "  -f ENCODING, --from-code=ENCODING\n"
 "                              输入编码\n"
 
-#: src/iconv.c:138
+#: src/iconv.c:139
 #, c-format, no-wrap
 msgid ""
 "  -t ENCODING, --to-code=ENCODING\n"
@@ -78,17 +78,17 @@ msgstr ""
 "  -t ENCODING, --to-code=ENCODING\n"
 "                              输出编码\n"
 
-#: src/iconv.c:143
+#: src/iconv.c:144
 #, c-format, no-wrap
 msgid "Options controlling conversion problems:\n"
 msgstr "控制字符转换的选项:\n"
 
-#: src/iconv.c:146
+#: src/iconv.c:147
 #, c-format, no-wrap
 msgid "  -c                          discard unconvertible characters\n"
 msgstr "  -c                          忽略不可转换的字符\n"
 
-#: src/iconv.c:149
+#: src/iconv.c:150
 #, c-format, no-wrap
 msgid ""
 "  --unicode-subst=FORMATSTRING\n"
@@ -97,12 +97,12 @@ msgstr ""
 "  --unicode-subst=FORMATSTRING\n"
 "                              替代不可转换的 Unicode 字符\n"
 
-#: src/iconv.c:153
+#: src/iconv.c:154
 #, c-format, no-wrap
 msgid "  --byte-subst=FORMATSTRING   substitution for unconvertible bytes\n"
 msgstr "  --byte-subst=FORMATSTRING   替代不可转换的字节\n"
 
-#: src/iconv.c:156
+#: src/iconv.c:157
 #, c-format, no-wrap
 msgid ""
 "  --widechar-subst=FORMATSTRING\n"
@@ -111,32 +111,32 @@ msgstr ""
 "  --widechar-subst=FORMATSTRING\n"
 "                              替代不可转换的宽字符\n"
 
-#: src/iconv.c:161
+#: src/iconv.c:162
 #, c-format, no-wrap
 msgid "Options controlling error output:\n"
 msgstr "控制错误输出的选项:\n"
 
-#: src/iconv.c:164
+#: src/iconv.c:165
 #, c-format, no-wrap
 msgid "  -s, --silent                suppress error messages about conversion problems\n"
 msgstr "  -s, --silent                不显示有关转换出错的信息\n"
 
-#: src/iconv.c:168
+#: src/iconv.c:169
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "输出信息:\n"
 
-#: src/iconv.c:171
+#: src/iconv.c:172
 #, c-format, no-wrap
 msgid "  -l, --list                  list the supported encodings\n"
 msgstr "  -l, --list                  列出支持的编码\n"
 
-#: src/iconv.c:174
+#: src/iconv.c:175
 #, c-format, no-wrap
 msgid "  --help                      display this help and exit\n"
 msgstr "  --help                      显示此帮助并退出\n"
 
-#: src/iconv.c:177
+#: src/iconv.c:178
 #, c-format, no-wrap
 msgid "  --version                   output version information and exit\n"
 msgstr "  --version                   显示版本信息并退出\n"
@@ -145,13 +145,13 @@ msgstr "  --version                   显示版本信�
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/iconv.c:184
+#: src/iconv.c:185
 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:195
+#: src/iconv.c:196
 #, fuzzy, no-wrap
 msgid ""
 "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
@@ -163,14 +163,14 @@ msgstr ""
 "在法律所允许的范围内，没有任何担保。\n"
 
 #. TRANSLATORS: The %s placeholder expands to an author's name.
-#: src/iconv.c:201
+#: src/iconv.c:202
 #, c-format
 msgid "Written by %s.\n"
 msgstr "作者 %s。\n"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:295
+#: src/iconv.c:296
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable width is not allowed here."
@@ -178,7 +178,7 @@ msgstr "%s 参数: 此处不允许用可变长度的�
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:310
+#: src/iconv.c:311
 #, c-format
 msgid ""
 "%s argument: A format directive with a variable precision is not allowed "
@@ -187,14 +187,14 @@ msgstr "%s 参数: 此处不允许用可变精度的�
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:326
+#: src/iconv.c:327
 #, c-format
 msgid "%s argument: A format directive with a size is not allowed here."
 msgstr "%s 参数: 此处不允许用含大小的命令格式。"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:368
+#: src/iconv.c:369
 #, c-format
 msgid "%s argument: The string ends in the middle of a directive."
 msgstr "%s 参数: 字符串在命令中部终止。"
@@ -202,14 +202,14 @@ msgstr "%s 参数: 字符串在命令中部终止。"
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %c placeholder expands to an unknown format directive.
-#: src/iconv.c:375
+#: src/iconv.c:376
 #, c-format
 msgid "%s argument: The character '%c' is not a valid conversion specifier."
 msgstr "%s 参数: 字符‘%c’不是有效的转义符。"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
-#: src/iconv.c:381
+#: src/iconv.c:382
 #, c-format
 msgid ""
 "%s argument: The character that terminates the format directive is not a "
@@ -219,7 +219,7 @@ msgstr "%s 参数: 用于终止命令格式的字符�
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a command-line option.
 #. The %u placeholder expands to the number of arguments consumed by the format string.
-#: src/iconv.c:397
+#: src/iconv.c:398
 #, c-format
 msgid ""
 "%s argument: The format string consumes more than one argument: %u argument."
@@ -229,42 +229,42 @@ msgstr[0] "%s 参数: 格式字符串需要更多的�
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:455
+#: src/iconv.c:456
 #, c-format
 msgid "cannot convert byte substitution to Unicode: %s"
 msgstr "无法将欲替换字节转换成 Unicode: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --unicode-subst.
-#: src/iconv.c:495
+#: src/iconv.c:496
 #, c-format
 msgid "cannot convert unicode substitution to target encoding: %s"
 msgstr "无法将欲替换 unicode 字元转换成目标编码: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:536
+#: src/iconv.c:537
 #, c-format
 msgid "cannot convert byte substitution to wide string: %s"
 msgstr "无法将欲替换字节转换成宽字符串: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --widechar-subst.
-#: src/iconv.c:577
+#: src/iconv.c:578
 #, c-format
 msgid "cannot convert widechar substitution to target encoding: %s"
 msgstr "无法将欲替换的宽字符转换成目标编码: %s"
 
 #. TRANSLATORS: An error message.
 #. The %s placeholder expands to a piece of text, specified through --byte-subst.
-#: src/iconv.c:618
+#: src/iconv.c:619
 #, c-format
 msgid "cannot convert byte substitution to target encoding: %s"
 msgstr "无法将欲替换字节转换成目标编码: %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the input file name, a line number, and a column number.
-#: src/iconv.c:637
+#: src/iconv.c:638
 #, c-format
 msgid "%s:%u:%u: cannot convert"
 msgstr "%s:%u:%u: 无法转换"
@@ -273,7 +273,7 @@ msgstr "%s:%u:%u: 无法转换"
 #. 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:651
+#: src/iconv.c:652
 #, c-format
 msgid "%s:%u:%u: incomplete character or shift sequence"
 msgstr "%s:%u:%u: 不完整的字符或者替换序列"
@@ -281,61 +281,61 @@ 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:664
+#: src/iconv.c:665
 #, c-format
 msgid "%s:%u:%u"
 msgstr "%s:%u:%u"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the input file name.
-#: src/iconv.c:819
+#: src/iconv.c:826
 #, c-format
 msgid "%s: I/O error"
 msgstr "%s: 输入/输出错误"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --from-code.
-#: src/iconv.c:1007
+#: src/iconv.c:1014
 #, c-format
 msgid "conversion from %s unsupported"
 msgstr "不支持从 %s 进行转换"
 
 #. TRANSLATORS: An error message.
 #. The placeholder expands to the encoding name, specified through --to-code.
-#: src/iconv.c:1013
+#: src/iconv.c:1020
 #, c-format
 msgid "conversion to %s unsupported"
 msgstr "不支持转换到 %s"
 
 #. TRANSLATORS: An error message.
 #. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively.
-#: src/iconv.c:1019
+#: src/iconv.c:1026
 #, c-format
 msgid "conversion from %s to %s unsupported"
 msgstr "不支持从 %s 转换到 %s"
 
 #. TRANSLATORS: Additional advice after an error message.
 #. The %s placeholder expands to the program name.
-#: src/iconv.c:1024
+#: src/iconv.c:1031
 #, c-format
 msgid "try '%s -l' to get the list of supported encodings"
 msgstr "尝试用‘%s -l’获取所支持的编码列表"
 
 #. TRANSLATORS: A filename substitute denoting standard input.
-#: src/iconv.c:1081
+#: src/iconv.c:1088
 msgid "(stdin)"
 msgstr "(标准输入)"
 
 #. TRANSLATORS: The first part of an error message.
 #. It is followed by a colon and a detail message.
 #. The %s placeholder expands to the input file name.
-#: src/iconv.c:1093
+#: src/iconv.c:1100
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: An error message.
-#: src/iconv.c:1107
+#: src/iconv.c:1114
 #, c-format
 msgid "I/O error"
 msgstr "输入/输出错误"