Update.

	* po/zh_CN.po: Update from translation team.

2 files changed, 4257 insertions, 3967 deletions

diff --git a/ChangeLog b/ChangeLog
index ea8514f5db..96a0c304a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-06-02  Ulrich Drepper  <drepper@redhat.com>
 
+	* po/zh_CN.po: Update from translation team.
+
 	* posix/getconf.c (main): Also recognize names without the
 	__POSIX_ prefix.
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a277ff094a..554e9c539a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,1114 +4,1689 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.2.5\n"
-"POT-Creation-Date: 2001-08-17 13:03-0700\n"
-"PO-Revision-Date: 2002-09-24 13:13+0800\n"
+"Project-Id-Version: libc 2.3.2\n"
+"POT-Creation-Date: 2003-02-22 15:34-0800\n"
+"PO-Revision-Date: 2003-06-03 10:16+0800\n"
 "Last-Translator: Wang Li <charles@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=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: locale/programs/ld-monetary.c:278
-#, c-format
-msgid "\t\t\t\t\t\t\t      %s: value for field `%s' must be in range %d...%d"
-msgstr "\t\t\t\t\t\t\t      %s：域“%s”的值必须处于范围 %d...%d 之内"
+#: sysdeps/generic/siglist.h:29 stdio-common/../sysdeps/unix/siglist.c:27
+msgid "Hangup"
+msgstr "挂起"
 
-#: nis/nis_print.c:277
-msgid "\t\tAccess Rights : "
-msgstr "\t\t访问权限 ："
+#: sysdeps/generic/siglist.h:30 stdio-common/../sysdeps/unix/siglist.c:28
+msgid "Interrupt"
+msgstr "中断"
 
-#: nis/nis_print.c:275
-msgid "\t\tAttributes    : "
-msgstr "\t\t属性     ："
+#: sysdeps/generic/siglist.h:31 stdio-common/../sysdeps/unix/siglist.c:29
+msgid "Quit"
+msgstr "退出"
 
-#: sunrpc/rpc_main.c:1427
-#, c-format
-msgid "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] infile\n"
-msgstr "\t%s [-abkCLNTM][-D名字[=值]] [-i 大小] [-I [-K 秒数]] [-Y 路径] 输入文件\n"
+#: sysdeps/generic/siglist.h:32 stdio-common/../sysdeps/unix/siglist.c:30
+msgid "Illegal instruction"
+msgstr "非法指令"
 
-#: sunrpc/rpc_main.c:1429
-#, c-format
-msgid "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
-msgstr "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o 输出文件] [输入文件]\n"
+#: sysdeps/generic/siglist.h:33 stdio-common/../sysdeps/unix/siglist.c:31
+msgid "Trace/breakpoint trap"
+msgstr ""
 
-#: sunrpc/rpc_main.c:1432
-#, c-format
-msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
-msgstr "\t%s [-n 网络 id]* [-o 输出文件] [输入文件]\n"
+#: sysdeps/generic/siglist.h:34
+msgid "Aborted"
+msgstr "已放弃"
 
-#: sunrpc/rpc_main.c:1431
-#, c-format
-msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
-msgstr "\t%s [-s 网络类型]* [-o 输出文件] [输入文件]\n"
+#: sysdeps/generic/siglist.h:35 stdio-common/../sysdeps/unix/siglist.c:34
+msgid "Floating point exception"
+msgstr "浮点数例外"
 
-#: nis/nis_print.c:239
-msgid "\tAccess rights: "
-msgstr "\t访问权限 ："
+#: sysdeps/generic/siglist.h:36 stdio-common/../sysdeps/unix/siglist.c:35
+msgid "Killed"
+msgstr "已杀死"
 
-#: nis/nis_print.c:297
-#, c-format
-msgid "\tEntry data of type %s\n"
+#: sysdeps/generic/siglist.h:37 stdio-common/../sysdeps/unix/siglist.c:36
+msgid "Bus error"
+msgstr "总线错误"
+
+#: sysdeps/generic/siglist.h:38 stdio-common/../sysdeps/unix/siglist.c:37
+msgid "Segmentation fault"
+msgstr "段错误"
+
+#. TRANS Broken pipe; there is no process reading from the other end of a pipe.
+#. TRANS Every library function that returns this error code also generates a
+#. TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
+#. TRANS or blocked.  Thus, your program will never actually see @code{EPIPE}
+#. TRANS unless it has handled or blocked @code{SIGPIPE}.
+#: sysdeps/generic/siglist.h:39 stdio-common/../sysdeps/gnu/errlist.c:351
+#: stdio-common/../sysdeps/unix/siglist.c:39
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:62
+msgid "Broken pipe"
+msgstr "断开的管道"
+
+#: sysdeps/generic/siglist.h:40 stdio-common/../sysdeps/unix/siglist.c:40
+msgid "Alarm clock"
+msgstr "闹钟"
+
+#: sysdeps/generic/siglist.h:41 stdio-common/../sysdeps/unix/siglist.c:41
+msgid "Terminated"
+msgstr "已终止"
+
+#: sysdeps/generic/siglist.h:42 stdio-common/../sysdeps/unix/siglist.c:42
+msgid "Urgent I/O condition"
 msgstr ""
 
-#: nis/nis_print.c:175
-#, c-format
-msgid "\tName       : %s\n"
-msgstr "\t名称     ：%s\n"
+#: sysdeps/generic/siglist.h:43 stdio-common/../sysdeps/unix/siglist.c:43
+msgid "Stopped (signal)"
+msgstr "停止 (信号)"
 
-#: nis/nis_print.c:176
-msgid "\tPublic Key : "
-msgstr "\t公钥     ："
+#: sysdeps/generic/siglist.h:44 stdio-common/../sysdeps/unix/siglist.c:44
+msgid "Stopped"
+msgstr "停止"
 
-#: nis/nis_print.c:238
-#, c-format
-msgid "\tType         : %s\n"
-msgstr "\t类型     ：%s\n"
+#: sysdeps/generic/siglist.h:45 stdio-common/../sysdeps/unix/siglist.c:45
+msgid "Continued"
+msgstr "继续"
 
-#: nis/nis_print.c:205
-#, c-format
-msgid "\tUniversal addresses (%u)\n"
+#: sysdeps/generic/siglist.h:46 stdio-common/../sysdeps/unix/siglist.c:46
+msgid "Child exited"
+msgstr "子进程已退出"
+
+#: sysdeps/generic/siglist.h:47 stdio-common/../sysdeps/unix/siglist.c:47
+msgid "Stopped (tty input)"
+msgstr "停止 (tty 输入)"
+
+#: sysdeps/generic/siglist.h:48 stdio-common/../sysdeps/unix/siglist.c:48
+msgid "Stopped (tty output)"
+msgstr "停止 (tty 输出)"
+
+#: sysdeps/generic/siglist.h:49 stdio-common/../sysdeps/unix/siglist.c:49
+msgid "I/O possible"
 msgstr ""
 
-#: nis/nis_print.c:273
-#, c-format
-msgid "\t[%d]\tName          : %s\n"
-msgstr "\t[%d]\t名称       ：%s\n"
+#: sysdeps/generic/siglist.h:50 stdio-common/../sysdeps/unix/siglist.c:50
+msgid "CPU time limit exceeded"
+msgstr "超出 CPU 时限"
 
-#: nis/nis_print.c:300
-#, c-format
-msgid "\t[%u] - [%u bytes] "
-msgstr "\t[%u] - [%u 字节] "
+#: sysdeps/generic/siglist.h:51 stdio-common/../sysdeps/unix/siglist.c:51
+msgid "File size limit exceeded"
+msgstr "文件大小超出限制"
 
-#: nscd/nscd_stat.c:154
-#, c-format
-msgid ""
-"\n"
-"%s cache:\n"
-"\n"
-"%15s  cache is enabled\n"
-"%15Zd  suggested size\n"
-"%15ld  seconds time to live for positive entries\n"
-"%15ld  seconds time to live for negative entries\n"
-"%15ld  cache hits on positive entries\n"
-"%15ld  cache hits on negative entries\n"
-"%15ld  cache misses on positive entries\n"
-"%15ld  cache misses on negative entries\n"
-"%15ld%% cache hit rate\n"
-"%15s  check /etc/%s for changes\n"
+#: sysdeps/generic/siglist.h:52 stdio-common/../sysdeps/unix/siglist.c:52
+msgid "Virtual timer expired"
+msgstr "虚拟计时器超时"
+
+#: sysdeps/generic/siglist.h:53 stdio-common/../sysdeps/unix/siglist.c:53
+msgid "Profiling timer expired"
 msgstr ""
 
-#: nis/nis_print.c:255
-msgid ""
-"\n"
-"Group Members :\n"
+#: sysdeps/generic/siglist.h:54 stdio-common/../sysdeps/unix/siglist.c:54
+msgid "Window changed"
 msgstr ""
-"\n"
-"组成员     ：\n"
 
-#: nis/nis_print.c:326
-msgid ""
-"\n"
-"Time to Live  : "
+#: sysdeps/generic/siglist.h:55 stdio-common/../sysdeps/unix/siglist.c:56
+msgid "User defined signal 1"
+msgstr "用户定义信号 1"
+
+#: sysdeps/generic/siglist.h:56 stdio-common/../sysdeps/unix/siglist.c:57
+msgid "User defined signal 2"
+msgstr "用户定义信号 2"
+
+#: sysdeps/generic/siglist.h:60 stdio-common/../sysdeps/unix/siglist.c:33
+msgid "EMT trap"
 msgstr ""
-"\n"
-"存在的时间 ："
 
-#: sunrpc/rpcinfo.c:679
-msgid "       rpcinfo -b prognum versnum\n"
-msgstr "       rpcinfo -b 程序号 版本号\n"
+#: sysdeps/generic/siglist.h:63 stdio-common/../sysdeps/unix/siglist.c:38
+msgid "Bad system call"
+msgstr "错误的系统调用"
 
-#: sunrpc/rpcinfo.c:680
-msgid "       rpcinfo -d prognum versnum\n"
-msgstr "       rpcinfo -d 程序号 版本号\n"
+#: sysdeps/generic/siglist.h:66
+msgid "Stack fault"
+msgstr "栈失效"
 
-#: sunrpc/rpcinfo.c:678
-msgid "       rpcinfo -p [ host ]\n"
-msgstr "       rpcinfo -p [ 主机 ]\n"
+#: sysdeps/generic/siglist.h:69
+msgid "Information request"
+msgstr "信息请求"
 
-#: sunrpc/rpcinfo.c:676
-msgid "       rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n"
-msgstr "       rpcinfo [ -n 端口号 ] -t 主机 程序号 [ 版本号 ]\n"
+#: sysdeps/generic/siglist.h:71
+msgid "Power failure"
+msgstr "电源失效"
 
-#: nscd/nscd_stat.c:146 nscd/nscd_stat.c:148
-msgid "      no"
-msgstr "      否"
+#: sysdeps/generic/siglist.h:74 stdio-common/../sysdeps/unix/siglist.c:55
+msgid "Resource lost"
+msgstr "资源丢失"
 
-#: nscd/nscd_stat.c:146 nscd/nscd_stat.c:148
-msgid "     yes"
-msgstr "     是"
+#: sysdeps/mach/hurd/mips/dl-machine.c:68
+#: string/../sysdeps/mach/_strerror.c:57
+msgid "Error in unknown error system: "
+msgstr "未知的错误系统中出错："
 
-#: nis/nis_print.c:352
+#: sysdeps/mach/hurd/mips/dl-machine.c:83
+#: string/../sysdeps/generic/_strerror.c:44
+#: string/../sysdeps/mach/_strerror.c:87
+msgid "Unknown error "
+msgstr "未知的错误 "
+
+#: sysdeps/unix/sysv/linux/lddlibc4.c:64
 #, c-format
-msgid "    Data Length = %u\n"
-msgstr "    数据长度 = %u\n"
+msgid "cannot open `%s'"
+msgstr "无法打开“%s”"
 
-#: nis/nis_print_group_entry.c:123
-msgid "    Explicit members:\n"
-msgstr ""
+#: sysdeps/unix/sysv/linux/lddlibc4.c:68
+#, c-format
+msgid "cannot read header from `%s'"
+msgstr "无法从“%s”中读入头"
 
-#: nis/nis_print_group_entry.c:147 nis/nis_print_group_entry.c:163
-msgid "    Explicit nonmembers:\n"
-msgstr ""
+#: iconv/iconv_charmap.c:159 iconv/iconv_prog.c:293 catgets/gencat.c:288
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "无法打开输入文件“%s”"
 
-#: nis/nis_print_group_entry.c:131
-msgid "    Implicit members:\n"
-msgstr ""
+#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:311
+#, c-format
+msgid "error while closing input `%s'"
+msgstr "关闭输入“%s”时出错"
 
-#: nis/nis_print_group_entry.c:155
-msgid "    Implicit nonmembers:\n"
-msgstr ""
+#: iconv/iconv_charmap.c:443
+#, c-format
+msgid "illegal input sequence at position %Zd"
+msgstr "位于 %Zd 的非法输入序列"
 
-#: nis/nis_print_group_entry.c:128
-msgid "    No explicit members\n"
-msgstr ""
+#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:503
+msgid "incomplete character or shift sequence at end of buffer"
+msgstr "位于缓冲区末尾的不完整字符或转义序列"
 
-#: nis/nis_print_group_entry.c:152
-msgid "    No explicit nonmembers\n"
-msgstr ""
+#: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:543 iconv/iconv_prog.c:546
+#: iconv/iconv_prog.c:582
+msgid "error while reading the input"
+msgstr "读取输入时出错"
 
-#: nis/nis_print_group_entry.c:136
-msgid "    No implicit members\n"
-msgstr ""
+#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:564
+msgid "unable to allocate buffer for input"
+msgstr "无法为输入分配缓冲区"
 
-#: nis/nis_print_group_entry.c:160
-msgid "    No implicit nonmembers\n"
-msgstr ""
+#: iconv/iconv_prog.c:61
+msgid "Input/Output format specification:"
+msgstr "输入/输出格式规范："
 
-#: nis/nis_print_group_entry.c:144
-msgid "    No recursive members\n"
-msgstr ""
+#: iconv/iconv_prog.c:62
+msgid "encoding of original text"
+msgstr "原始文本编码"
 
-#: nis/nis_print_group_entry.c:168
-msgid "    No recursive nonmembers\n"
-msgstr ""
+#: iconv/iconv_prog.c:63
+msgid "encoding for output"
+msgstr "输出编码"
 
-#: nis/nis_print_group_entry.c:139
-msgid "    Recursive members:\n"
-msgstr ""
+#: iconv/iconv_prog.c:64
+msgid "Information:"
+msgstr "信息："
 
-#: sunrpc/rpcinfo.c:574
-msgid "   program vers proto   port\n"
-msgstr "   程序 版本 协议   端口\n"
+#: iconv/iconv_prog.c:65
+msgid "list all known coded character sets"
+msgstr "列举所有已知的字符集"
 
-#: argp/argp-help.c:1572
-msgid "  or: "
-msgstr "  或："
+#: iconv/iconv_prog.c:66 locale/programs/localedef.c:128
+msgid "Output control:"
+msgstr "输出控制："
 
-#: elf/ldconfig.c:457
-msgid " (SKIPPED)\n"
-msgstr " (跳过)\n"
+#: iconv/iconv_prog.c:67
+msgid "omit invalid characters from output"
+msgstr "从输出中忽略无效的字符"
 
-#: elf/ldconfig.c:455
-msgid " (changed)\n"
-msgstr " (改变)\n"
+#: iconv/iconv_prog.c:68
+msgid "output file"
+msgstr "输出文件"
 
-#: timezone/zic.c:427
+#: iconv/iconv_prog.c:69
+msgid "suppress warnings"
+msgstr "关闭警告"
+
+#: iconv/iconv_prog.c:70
+msgid "print progress information"
+msgstr "打印进度信息"
+
+#: iconv/iconv_prog.c:75
+msgid "Convert encoding of given files from one encoding to another."
+msgstr "转换给定文件的编码。"
+
+#: iconv/iconv_prog.c:79
+msgid "[FILE...]"
+msgstr "[文件...]"
+
+#: iconv/iconv_prog.c:199
+msgid "cannot open output file"
+msgstr "无法打开输出文件"
+
+#: iconv/iconv_prog.c:241
 #, c-format
-msgid " (rule from \"%s\", line %d)"
-msgstr ""
+msgid "conversion from `%s' and to `%s' are not supported"
+msgstr "不支持从“%s”到“%s”的转换"
 
-#: argp/argp-help.c:1584
-msgid " [OPTION...]"
-msgstr " [选项...]"
+#: iconv/iconv_prog.c:246
+#, c-format
+msgid "conversion from `%s' is not supported"
+msgstr "不支持以“%s”为源头的转换"
 
-#: timezone/zic.c:424
+#: iconv/iconv_prog.c:253
 #, c-format
-msgid "\"%s\", line %d: %s"
-msgstr "“%s”，行 %d：%s"
+msgid "conversion to `%s' is not supported"
+msgstr "不支持以“%s”为目标的转换"
 
-#: timezone/zic.c:989
+#: iconv/iconv_prog.c:257
 #, c-format
-msgid "\"Zone %s\" line and -l option are mutually exclusive"
-msgstr ""
+msgid "conversion from `%s' to `%s' is not supported"
+msgstr "不支持从“%s”到“%s”的转换"
+
+#: iconv/iconv_prog.c:263
+msgid "failed to start conversion processing"
+msgstr "启动转换处理失败"
 
-#: timezone/zic.c:997
+#: iconv/iconv_prog.c:358
+msgid "error while closing output file"
+msgstr "关闭输出文件时出错"
+
+#: iconv/iconv_prog.c:407 iconv/iconvconfig.c:357 locale/programs/locale.c:274
+#: locale/programs/localedef.c:372 catgets/gencat.c:233
+#: malloc/memusagestat.c:602 debug/pcprofiledump.c:199
+msgid "Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"
+msgstr "用“glibcbug”脚本将错误报告给 <bugs@gnu.org>。\n"
+
+#: iconv/iconv_prog.c:421 iconv/iconvconfig.c:371 locale/programs/locale.c:287
+#: locale/programs/localedef.c:386 catgets/gencat.c:246 posix/getconf.c:910
+#: nss/getent.c:74 nscd/nscd.c:330 nscd/nscd_nischeck.c:90 elf/ldconfig.c:271
+#: elf/sprof.c:349
 #, c-format
-msgid "\"Zone %s\" line and -p option are mutually exclusive"
+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 ""
 
-#: sunrpc/rpc_main.c:1412
-msgid "\"infile\" is required for template generation flags.\n"
-msgstr "“输入文件”对模板生成标志来说是必须的。\n"
+#: iconv/iconv_prog.c:426 iconv/iconvconfig.c:376 locale/programs/locale.c:292
+#: locale/programs/localedef.c:391 catgets/gencat.c:251 posix/getconf.c:915
+#: nss/getent.c:79 nscd/nscd.c:335 nscd/nscd_nischeck.c:95 elf/ldconfig.c:276
+#: elf/sprof.c:355
+#, c-format
+msgid "Written by %s.\n"
+msgstr "由 %s 编写。\n"
+
+#: iconv/iconv_prog.c:456 iconv/iconv_prog.c:482
+msgid "conversion stopped due to problem in writing the output"
+msgstr "由于写入输出时出现的问题转换停止"
 
-#: argp/argp-help.c:209
+#: iconv/iconv_prog.c:499
 #, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr "%.*s：参数 ARGP_HELP_FMT 需要一个值"
+msgid "illegal input sequence at position %ld"
+msgstr "未知 %ld 处的非法输入序列"
+
+#: iconv/iconv_prog.c:507
+msgid "internal error (illegal descriptor)"
+msgstr "内部错误 (非法的描述符)"
 
-#: argp/argp-help.c:218
+#: iconv/iconv_prog.c:510
 #, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr "%.*s：未知的 ARGP_HELP_FMT 参数"
+msgid "unknown iconv() error %d"
+msgstr "未知的 iconv() 错误 %d"
+
+#: iconv/iconv_prog.c:753
+msgid ""
+"The following list contain all the coded character sets known.  This does\n"
+"not necessarily mean that all combinations of these names can be used for\n"
+"the FROM and TO command line parameters.  One coded character set can be\n"
+"listed with several different names (aliases).\n"
+"\n"
+"  "
+msgstr ""
 
-#: locale/programs/ld-address.c:581 locale/programs/ld-collate.c:2612
-#: locale/programs/ld-collate.c:3740 locale/programs/ld-ctype.c:2112
-#: locale/programs/ld-ctype.c:2849 locale/programs/ld-identification.c:448
-#: locale/programs/ld-measurement.c:237 locale/programs/ld-messages.c:331
-#: locale/programs/ld-monetary.c:936 locale/programs/ld-name.c:305
-#: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:238
-#: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1199
+#: iconv/iconvconfig.c:110
+msgid "Create fastloading iconv module configuration file."
+msgstr "创建快速装入 iconv 模块配置文件。"
+
+#: iconv/iconvconfig.c:114
+msgid "[DIR...]"
+msgstr "[目录...]"
+
+#: iconv/iconvconfig.c:126
+msgid "Prefix used for all file accesses"
+msgstr "用于所有文件访问的前缀"
+
+#: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
+msgid "no output file produced because warning were issued"
+msgstr "由于出现警告而未生成输出文件"
+
+#: iconv/iconvconfig.c:405
+msgid "while inserting in search tree"
+msgstr "插入搜索树时"
+
+#: iconv/iconvconfig.c:1204
+msgid "cannot generate output file"
+msgstr "无法生成输出文件"
+
+#: locale/programs/charmap-dir.c:59
 #, c-format
-msgid "%1$s: definition does not end with `END %1$s'"
-msgstr "%1$s：定义不以“END %1$s”结尾"
+msgid "cannot read character map directory `%s'"
+msgstr "无法读入字母映射目录“%s”"
 
-#: elf/cache.c:190 elf/cache.c:200
+#: locale/programs/charmap.c:135
 #, c-format
-msgid "%d libs found in cache `%s'\n"
-msgstr "在缓冲区“%2$s”中找到 %1$d 个库\n"
+msgid "character map file `%s' not found"
+msgstr "找不到字符映射文件“%s”"
 
-#: timezone/zic.c:799
+#: locale/programs/charmap.c:193
 #, c-format
-msgid "%s in ruleless zone"
+msgid "default character map file `%s' not found"
+msgstr "找不到默认字符映射文件“%s”"
+
+#: locale/programs/charmap.c:255
+#, c-format
+msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
 msgstr ""
 
-#: elf/../sysdeps/generic/readelflib.c:67
+#: locale/programs/charmap.c:332
 #, c-format
-msgid "%s is a 32 bit ELF file.\n"
-msgstr "%s 是一个 32 位 ELF 文件。\n"
+msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
+msgstr "%s：<mb_cur_max> 必须大于 <mb_cur_min>\n"
 
-#: elf/../sysdeps/generic/readelflib.c:69
+#: locale/programs/charmap.c:352 locale/programs/charmap.c:369
+#: locale/programs/repertoire.c:175
 #, c-format
-msgid "%s is a 64 bit ELF file.\n"
-msgstr "%s 是一个 64 位 ELF 文件。\n"
+msgid "syntax error in prolog: %s"
+msgstr "序言中语法错误：%s"
 
-#: elf/../sysdeps/unix/sysv/linux/i386/readelflib.c:49
+#: locale/programs/charmap.c:353
+msgid "invalid definition"
+msgstr "无效的定义"
+
+#: locale/programs/charmap.c:370 locale/programs/locfile.c:126
+#: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
+msgid "bad argument"
+msgstr "错误的参数"
+
+#: locale/programs/charmap.c:398
 #, c-format
-msgid "%s is for unknown machine %d.\n"
-msgstr "%s 用于未知的机器 %d。\n"
+msgid "duplicate definition of <%s>"
+msgstr "重复定义 <%s>"
 
-#: elf/ldconfig.c:326
+#: locale/programs/charmap.c:405
 #, c-format
-msgid "%s is not a known library type"
-msgstr "%s 不是已知类型的库"
+msgid "value for <%s> must be 1 or greater"
+msgstr "<%s>的值必须是 1 或更大"
 
-#: elf/../sysdeps/generic/readelflib.c:78
+#: locale/programs/charmap.c:417
 #, c-format
-msgid "%s is not a shared object file (Type: %d).\n"
-msgstr "%s 不是共享目标文件 (类型：%d)。\n"
+msgid "value of <%s> must be greater or equal than the value of <%s>"
+msgstr "<%s> 的值必须大于等于 <%s> 的值"
 
-#: elf/ldconfig.c:424
+#: locale/programs/charmap.c:440 locale/programs/repertoire.c:184
 #, c-format
-msgid "%s is not a symbolic link\n"
-msgstr "%s 不是符号连接\n"
+msgid "argument to <%s> must be a single character"
+msgstr "<%s>的参数必须是单个字符"
+
+#: locale/programs/charmap.c:466
+msgid "character sets with locking states are not supported"
+msgstr "不支持带有锁定状态的字符集"
 
-#: elf/readlib.c:155
+#: locale/programs/charmap.c:493 locale/programs/charmap.c:547
+#: locale/programs/charmap.c:579 locale/programs/charmap.c:673
+#: locale/programs/charmap.c:728 locale/programs/charmap.c:769
+#: locale/programs/charmap.c:810
 #, c-format
-msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
-msgstr "%s 不是 ELF 文件 - 它起始的魔数错误。\n"
+msgid "syntax error in %s definition: %s"
+msgstr "%s 的定义中的语法错误：%s"
+
+#: locale/programs/charmap.c:494 locale/programs/charmap.c:674
+#: locale/programs/charmap.c:770 locale/programs/repertoire.c:231
+msgid "no symbolic name given"
+msgstr "没有给出符号名"
 
-#: assert/assert.c:54
+#: locale/programs/charmap.c:548
+msgid "invalid encoding given"
+msgstr "给出无效的编码"
+
+#: locale/programs/charmap.c:557
+msgid "too few bytes in character encoding"
+msgstr "字符编码中字节数过少"
+
+#: locale/programs/charmap.c:559
+msgid "too many bytes in character encoding"
+msgstr "字符编码中字节数过多"
+
+#: locale/programs/charmap.c:581 locale/programs/charmap.c:729
+#: locale/programs/charmap.c:812 locale/programs/repertoire.c:297
+msgid "no symbolic name given for end of range"
+msgstr "没有为范围的结束给出符号化的名称"
+
+#: locale/programs/charmap.c:605 locale/programs/locfile.h:96
+#: locale/programs/repertoire.c:314
 #, c-format
-msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
-msgstr "%s%s%s：%u：%s%s断言“%s”失败。\n"
+msgid "`%1$s' definition does not end with `END %1$s'"
+msgstr "对“%1$s”的定义并不以“END %1%s”结束"
+
+#: locale/programs/charmap.c:638
+msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
+msgstr ""
 
-#: assert/assert-perr.c:56
+#: locale/programs/charmap.c:646 locale/programs/charmap.c:709
 #, c-format
-msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
-msgstr "%s%s%s：%u：%s%s意外的错误：%s。\n"
+msgid "value for %s must be an integer"
+msgstr "%s 的值必须为整数"
 
-#: stdio-common/psignal.c:62
+#: locale/programs/charmap.c:837
 #, c-format
-msgid "%s%sUnknown signal %d\n"
-msgstr "%s%s未知的信号 %d\n"
+msgid "%s: error in state machine"
+msgstr "%s：状态机出错"
 
-#: timezone/zic.c:2234
+#: locale/programs/charmap.c:845 locale/programs/ld-address.c:605
+#: locale/programs/ld-collate.c:2635 locale/programs/ld-collate.c:3793
+#: locale/programs/ld-ctype.c:2216 locale/programs/ld-ctype.c:2977
+#: locale/programs/ld-identification.c:469
+#: locale/programs/ld-measurement.c:255 locale/programs/ld-messages.c:349
+#: locale/programs/ld-monetary.c:952 locale/programs/ld-name.c:324
+#: locale/programs/ld-numeric.c:392 locale/programs/ld-paper.c:258
+#: locale/programs/ld-telephone.c:330 locale/programs/ld-time.c:1217
+#: locale/programs/locfile.h:103 locale/programs/repertoire.c:325
 #, c-format
-msgid "%s: %d did not sign extend correctly\n"
-msgstr ""
+msgid "%s: premature end of file"
+msgstr "%s：文件不完整"
 
-#: locale/programs/charmap.c:331
+#: locale/programs/charmap.c:864 locale/progra