about summary refs log tree commit diff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po1886
1 files changed, 911 insertions, 975 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f59a401f6e..b893c81ed5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,21 +7,22 @@
 # Wei-Lun Chao <william.chao@ossii.com.tw>, 2005, 2008, 2011.
 # LI Daobing <lidaobing@gmail.com>, 2007.
 # Wei-Lun Chao <bluebat@member.fsf.org>, 2012, 2013.
-# Mingye Wang <arthur200126@gmail.com>, 2015, 2017.
+# Jia Bailie <zhaohongxinxin@qq.com>, 2020.
+# Mingye Wang <arthur200126@gmail.com>, 2015, 2017, 2020.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.25-pre1\n"
-"POT-Creation-Date: 2020-01-02 20:08+0530\n"
-"PO-Revision-Date: 2017-01-11 14:20-0500\n"
-"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
+"Project-Id-Version: libc 2.30.9000\n"
+"POT-Creation-Date: 2020-07-22 23:24-0400\n"
+"PO-Revision-Date: 2020-07-21 17:37+0800\n"
+"Last-Translator: Mingye Wang <arthur200126@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.2.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: argp/argp-help.c:227
@@ -74,7 +75,8 @@ msgid "Give a short usage message"
 msgstr "给出简要的用法信息"
 
 #: argp/argp-parse.c:103 catgets/gencat.c:109 catgets/gencat.c:113
-#: iconv/iconv_prog.c:60 iconv/iconv_prog.c:61 nscd/nscd.c:105 nss/makedb.c:120
+#: iconv/iconv_prog.c:61 iconv/iconv_prog.c:62 nscd/nscd.c:107 nscd/nscd.c:111
+#: nss/makedb.c:120
 msgid "NAME"
 msgstr "名称"
 
@@ -107,6 +109,15 @@ msgstr "%s:过多的选项\n"
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(程序错误) 选项应该可识别!?"
 
+#: assert/assert-perr.c:35
+#, c-format
+msgid ""
+"%s%s%s:%u: %s%sUnexpected error: %s.\n"
+"%n"
+msgstr ""
+"%s%s%s:%u:%s%s意外的错误:%s。\n"
+"%n"
+
 #: assert/assert.c:101
 #, c-format
 msgid ""
@@ -144,10 +155,10 @@ msgstr ""
 "-o 输出文件 [输入文件]...\n"
 "[输出文件 [输入文件]...]"
 
-#: catgets/gencat.c:229 debug/pcprofiledump.c:209 elf/ldconfig.c:308
-#: elf/pldd.c:247 elf/sln.c:77 elf/sprof.c:372 iconv/iconv_prog.c:405
+#: catgets/gencat.c:229 debug/pcprofiledump.c:209 elf/ldconfig.c:306
+#: elf/pldd.c:247 elf/sln.c:77 elf/sprof.c:372 iconv/iconv_prog.c:388
 #: iconv/iconvconfig.c:379 locale/programs/locale.c:276
-#: locale/programs/localedef.c:437 login/programs/pt_chown.c:89
+#: locale/programs/localedef.c:438 login/programs/pt_chown.c:89
 #: malloc/memusagestat.c:563 nss/getent.c:953 nss/makedb.c:369
 #: posix/getconf.c:503 sysdeps/unix/sysv/linux/lddlibc4.c:61
 #, c-format
@@ -159,11 +170,11 @@ msgstr ""
 "%s。\n"
 
 #: catgets/gencat.c:245 debug/pcprofiledump.c:225 debug/xtrace.sh:64
-#: elf/ldconfig.c:324 elf/ldd.bash.in:38 elf/pldd.c:263 elf/sotruss.sh:75
-#: elf/sprof.c:389 iconv/iconv_prog.c:422 iconv/iconvconfig.c:396
-#: locale/programs/locale.c:293 locale/programs/localedef.c:463
+#: elf/ldconfig.c:322 elf/ldd.bash.in:38 elf/pldd.c:263 elf/sotruss.sh:75
+#: elf/sprof.c:389 iconv/iconv_prog.c:405 iconv/iconvconfig.c:396
+#: locale/programs/locale.c:293 locale/programs/localedef.c:460
 #: login/programs/pt_chown.c:63 malloc/memusage.sh:71 malloc/memusagestat.c:581
-#: nscd/nscd.c:509 nss/getent.c:88 nss/makedb.c:385 posix/getconf.c:485
+#: nscd/nscd.c:522 nss/getent.c:88 nss/makedb.c:385 posix/getconf.c:485
 #: sysdeps/unix/sysv/linux/lddlibc4.c:68
 #, c-format
 msgid ""
@@ -176,10 +187,10 @@ msgstr ""
 "或者适合某些特殊目的。\n"
 
 #: catgets/gencat.c:250 debug/pcprofiledump.c:230 debug/xtrace.sh:68
-#: elf/ldconfig.c:329 elf/pldd.c:268 elf/sprof.c:395 iconv/iconv_prog.c:427
+#: elf/ldconfig.c:327 elf/pldd.c:268 elf/sprof.c:395 iconv/iconv_prog.c:410
 #: iconv/iconvconfig.c:401 locale/programs/locale.c:298
-#: locale/programs/localedef.c:468 malloc/memusage.sh:75
-#: malloc/memusagestat.c:586 nscd/nscd.c:514 nss/getent.c:93 nss/makedb.c:390
+#: locale/programs/localedef.c:465 malloc/memusage.sh:75
+#: malloc/memusagestat.c:586 nscd/nscd.c:527 nss/getent.c:93 nss/makedb.c:390
 #: posix/getconf.c:490
 #, c-format
 msgid "Written by %s.\n"
@@ -189,7 +200,7 @@ msgstr "由 %s 编写。\n"
 msgid "*standard input*"
 msgstr "*标准输入*"
 
-#: catgets/gencat.c:287 iconv/iconv_charmap.c:167 iconv/iconv_prog.c:290
+#: catgets/gencat.c:287 iconv/iconv_charmap.c:167 iconv/iconv_prog.c:273
 #: nss/makedb.c:246
 #, c-format
 msgid "cannot open input file `%s'"
@@ -275,7 +286,7 @@ msgstr "不要对输出进行缓冲"
 
 #: debug/pcprofiledump.c:58
 msgid "Dump information generated by PC profiling."
-msgstr "将产生于 PC 测速评估的数据倾卸出来"
+msgstr "转储由 PC 分析生成的信息。"
 
 #: debug/pcprofiledump.c:61
 msgid "[FILE]"
@@ -364,7 +375,7 @@ msgstr "不支持的 dlinfo 请求"
 
 #: dlfcn/dlmopen.c:63
 msgid "invalid namespace"
-msgstr "无效的名字空间"
+msgstr "无效的命名空间"
 
 #: dlfcn/dlmopen.c:68
 msgid "invalid mode"
@@ -387,7 +398,7 @@ msgstr "未知的操作系统"
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", OS ABI: %s %d.%d.%d"
 
-#: elf/cache.c:163 elf/ldconfig.c:1334
+#: elf/cache.c:163 elf/ldconfig.c:1297
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "无法打开缓冲文件 %s\n"
@@ -400,12 +411,12 @@ msgstr "缓冲文件的 mmap 失败。\n"
 #: elf/cache.c:181 elf/cache.c:195 elf/cache.c:205
 #, c-format
 msgid "File is not a cache file.\n"
-msgstr "文件不是缓冲区文件。\n"
+msgstr "文件不是缓存文件。\n"
 
 #: elf/cache.c:233 elf/cache.c:243
 #, c-format
 msgid "%d libs found in cache `%s'\n"
-msgstr "在缓冲区“%2$s”中找到 %1$d 个库\n"
+msgstr "在缓存“%2$s”中找到 %1$d 个库\n"
 
 #: elf/cache.c:437
 #, c-format
@@ -428,11 +439,11 @@ msgstr "将 %s 的访问权限改变为 %#o 失败"
 msgid "Renaming of %s to %s failed"
 msgstr "将 %s 改名为 %s 失败"
 
-#: elf/dl-close.c:406 elf/dl-open.c:285
+#: elf/dl-close.c:406 elf/dl-open.c:293
 msgid "cannot create scope list"
 msgstr "无法创建范围列表"
 
-#: elf/dl-close.c:852
+#: elf/dl-close.c:862
 msgid "shared object not open"
 msgstr "共享库未打开"
 
@@ -449,21 +460,25 @@ msgstr "空动态字符串替换"
 msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
 msgstr "由于空的动态字串字组替换而无法加载外部的 `%s'\n"
 
+#: elf/dl-deps.c:220
+msgid "cannot allocate dependency buffer"
+msgstr "无法分配依赖缓冲"
+
 #: elf/dl-deps.c:443
 msgid "cannot allocate dependency list"
-msgstr "无法分配倚赖列表"
+msgstr "无法分配依赖列表"
 
-#: elf/dl-deps.c:483 elf/dl-deps.c:543
+#: elf/dl-deps.c:483 elf/dl-deps.c:548
 msgid "cannot allocate symbol search list"
 msgstr "无法分配符号搜索列表"
 
-#: elf/dl-deps.c:523
+#: elf/dl-deps.c:528
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr "过滤程序不支持与 LD_TRACE_PRELINKING 共用"
 
 #: elf/dl-error-skeleton.c:80
 msgid "error while loading shared libraries"
-msgstr "装入共享库时出错"
+msgstr "载入共享库时出错"
 
 #: elf/dl-error-skeleton.c:113
 msgid "DYNAMIC LINKER BUG!!!"
@@ -481,136 +496,140 @@ msgstr "无法为 fptr 表映射页"
 msgid "internal error: symidx out of range of fptr table"
 msgstr "内部错误: symidx 超出 fptr 表的范围"
 
-#: elf/dl-hwcaps.c:202 elf/dl-hwcaps.c:214
+#: elf/dl-hwcaps.c:92 elf/dl-hwcaps.c:104
 msgid "cannot create capability list"
 msgstr "无法创建功能列表"
 
-#: elf/dl-load.c:427
+#: elf/dl-load.c:428
 msgid "cannot allocate name record"
 msgstr "无法分配名记录"
 
-#: elf/dl-load.c:513 elf/dl-load.c:626 elf/dl-load.c:715 elf/dl-load.c:811
+#: elf/dl-load.c:514 elf/dl-load.c:627 elf/dl-load.c:716 elf/dl-load.c:812
 msgid "cannot create cache for search path"
 msgstr "无法创建搜索路径缓冲器"
 
-#: elf/dl-load.c:609
+#: elf/dl-load.c:610
 msgid "cannot create RUNPATH/RPATH copy"
 msgstr "无法创建 RUNPATH/RPATH 的副本"
 
-#: elf/dl-load.c:702
+#: elf/dl-load.c:703
 msgid "cannot create search path array"
 msgstr "无法创建搜索路径数组"
 
-#: elf/dl-load.c:892
+#: elf/dl-load.c:964
 msgid "cannot stat shared object"
 msgstr "无法对共享目标进行 stat 操作"
 
-#: elf/dl-load.c:1003 elf/dl-load.c:2191
+#: elf/dl-load.c:1075 elf/dl-load.c:2278
 msgid "cannot create shared object descriptor"
 msgstr "无法创建共享对象描述符"
 
-#: elf/dl-load.c:1022 elf/dl-load.c:1571 elf/dl-load.c:1672
+#: elf/dl-load.c:1094 elf/dl-load.c:1658 elf/dl-load.c:1759
 msgid "cannot read file data"
 msgstr "无法读入文件数据"
 
-#: elf/dl-load.c:1068
+#: elf/dl-load.c:1140
 msgid "ELF load command alignment not page-aligned"
 msgstr "ELF 加载命令对齐不是按页对齐的"
 
-#: elf/dl-load.c:1075
+#: elf/dl-load.c:1147
 msgid "ELF load command address/offset not properly aligned"
-msgstr "ELF 装入命令的地址/偏移量没有正确地对齐"
+msgstr "ELF 载入命令的地址/偏移量没有正确地对齐"
 
-#: elf/dl-load.c:1162
+#: elf/dl-load.c:1226
 msgid "object file has no loadable segments"
 msgstr "目标文件没有可加载段"
 
-#: elf/dl-load.c:1175
+#: elf/dl-load.c:1239
 msgid "cannot dynamically load executable"
-msgstr "无法动态装入可执行文件"
+msgstr "无法动态载入可执行文件"
 
-#: elf/dl-load.c:1196
+#: elf/dl-load.c:1275
 msgid "object file has no dynamic section"
 msgstr "目标文件没有动态节"
 
-#: elf/dl-load.c:1225
+#: elf/dl-load.c:1302
+msgid "cannot dynamically load position-independent executable"
+msgstr "无法动态载入位置无关可执行文件"
+
+#: elf/dl-load.c:1304
 msgid "shared object cannot be dlopen()ed"
 msgstr "无法用 dlopen() 打开共享库"
 
-#: elf/dl-load.c:1238
+#: elf/dl-load.c:1317
 msgid "cannot allocate memory for program header"
 msgstr "无法为程序头分配内存"
 
-#: elf/dl-load.c:1271 elf/dl-load.h:130
+#: elf/dl-load.c:1350 elf/dl-load.h:130
 msgid "cannot change memory protections"
 msgstr "无法改变内存保护"
 
-#: elf/dl-load.c:1291
+#: elf/dl-load.c:1370
 msgid "cannot enable executable stack as shared object requires"
 msgstr "无法启用共享目标需要的执行栈"
 
-#: elf/dl-load.c:1304
+#: elf/dl-load.c:1383
 msgid "cannot close file descriptor"
 msgstr "无法关闭文件描述符"
 
-#: elf/dl-load.c:1571
+#: elf/dl-load.c:1658
 msgid "file too short"
 msgstr "文件过短"
 
-#: elf/dl-load.c:1606
+#: elf/dl-load.c:1693
 msgid "invalid ELF header"
 msgstr "无效的 ELF 头"
 
-#: elf/dl-load.c:1618
+#: elf/dl-load.c:1705
 msgid "ELF file data encoding not big-endian"
 msgstr "ELF 文件数据编码不是大端序"
 
-#: elf/dl-load.c:1620
+#: elf/dl-load.c:1707
 msgid "ELF file data encoding not little-endian"
 msgstr "ELF 文件数据编码不是小端序"
 
 # e_ident[]
-#: elf/dl-load.c:1624
+#: elf/dl-load.c:1711
 msgid "ELF file version ident does not match current one"
 msgstr "ELF 文件的版本信息不符合目前所使用的"
 
-#: elf/dl-load.c:1628
+#: elf/dl-load.c:1715
 msgid "ELF file OS ABI invalid"
 msgstr "ELF 文件 OS ABI 无效"
 
-#: elf/dl-load.c:1631
+#: elf/dl-load.c:1718
 msgid "ELF file ABI version invalid"
 msgstr "ELF 文件 ABI 版本无效"
 
-#: elf/dl-load.c:1634
+#: elf/dl-load.c:1721
 msgid "nonzero padding in e_ident"
 msgstr "在 e_ident 中填补非零值"
 
-#: elf/dl-load.c:1637
+#: elf/dl-load.c:1724
 msgid "internal error"
 msgstr "内部错误"
 
-#: elf/dl-load.c:1644
+#: elf/dl-load.c:1731
 msgid "ELF file version does not match current one"
 msgstr "ELF 文件版本与当前版本不匹配"
 
-#: elf/dl-load.c:1652
+#: elf/dl-load.c:1739
 msgid "only ET_DYN and ET_EXEC can be loaded"
 msgstr "只有 ET_DYN 以及 ET_EXEC 可以加载"
 
-#: elf/dl-load.c:1657
+#: elf/dl-load.c:1744
 msgid "ELF file's phentsize not the expected size"
 msgstr "ELF 文件的标头项目大小(phentsize)出乎意料"
 
-#: elf/dl-load.c:2210
+#: elf/dl-load.c:2297
 msgid "wrong ELF class: ELFCLASS64"
-msgstr "ELF 类不对:ELFCLASS64"
+msgstr "错误的 ELF 类:ELFCLASS64"
 
-#: elf/dl-load.c:2211
+#: elf/dl-load.c:2298
 msgid "wrong ELF class: ELFCLASS32"
-msgstr "ELF 类不对:ELFCLASS32"
+msgstr "错误的 ELF 类:ELFCLASS32"
 
-#: elf/dl-load.c:2214
+#: elf/dl-load.c:2301
 msgid "cannot open shared object file"
 msgstr "无法打开共享对象文件"
 
@@ -622,56 +641,56 @@ msgstr "无法从共享目标中映射段"
 msgid "cannot map zero-fill pages"
 msgstr "无法映射用零填充的页"
 
-#: elf/dl-lookup.c:882
+#: elf/dl-lookup.c:876
 msgid "symbol lookup error"
 msgstr "符号查询错误"
 
-#: elf/dl-open.c:71
+#: elf/dl-open.c:79
 msgid "cannot extend global scope"
 msgstr "无法扩展全局范围"
 
-#: elf/dl-open.c:391
+#: elf/dl-open.c:399
 msgid "TLS generation counter wrapped!  Please report this."
 msgstr "TLS 产生计数器被转换运行! 请报告这个情况。"
 
-#: elf/dl-open.c:783
+#: elf/dl-open.c:808
 msgid "invalid mode for dlopen()"
 msgstr "无效的 dlopen() 模式"
 
-#: elf/dl-open.c:800
+#: elf/dl-open.c:825
 msgid "no more namespaces available for dlmopen()"
 msgstr "无更多命名空间可见于 dlmopen ()"
 
-#: elf/dl-open.c:824
+#: elf/dl-open.c:849
 msgid "invalid target namespace in dlmopen()"
 msgstr "dlmopen() 中无效的目标名字空间"
 
-#: elf/dl-reloc.c:120
+#: elf/dl-reloc.c:139
 msgid "cannot allocate memory in static TLS block"
 msgstr "无法在静态 TLS 块中分配内存"
 
-#: elf/dl-reloc.c:213
+#: elf/dl-reloc.c:232
 msgid "cannot make segment writable for relocation"
 msgstr "在重新寻址以后无法将节设为可写入状态"
 
-#: elf/dl-reloc.c:273
+#: elf/dl-reloc.c:292
 #, c-format
 msgid "%s: out of memory to store relocation results for %s\n"
 msgstr "%s: 内存不足以保存重寻址结果用于 %s\n"
 
-#: elf/dl-reloc.c:289
+#: elf/dl-reloc.c:308
 msgid "cannot restore segment prot after reloc"
 msgstr "重定位后无法恢复段 prot"
 
-#: elf/dl-reloc.c:320
+#: elf/dl-reloc.c:339
 msgid "cannot apply additional memory protection after relocation"
 msgstr "无法在重定位后应用额外的内存保护"
 
-#: elf/dl-sym.c:150
+#: elf/dl-sym.c:138
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "代码所使用的 RTLD_NEXT 没有动态加载"
 
-#: elf/dl-tls.c:931
+#: elf/dl-tls.c:1011
 msgid "cannot create TLS data structures"
 msgstr "无法创建 TLS 数据结构"
 
@@ -683,220 +702,197 @@ msgstr "版本查找错误"
 msgid "cannot allocate version reference table"
 msgstr "无法分配版本引用表格"
 
-#: elf/ldconfig.c:142
+#: elf/ldconfig.c:145
 msgid "Print cache"
-msgstr "打印缓冲区"
+msgstr "打印缓存"
 
-#: elf/ldconfig.c:143
+#: elf/ldconfig.c:146
 msgid "Generate verbose messages"
 msgstr "生成详细消息"
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:147
 msgid "Don't build cache"
-msgstr "不要创建缓冲区"
+msgstr "不要创建缓存"
 
-#: elf/ldconfig.c:145
+#: elf/ldconfig.c:148
 msgid "Don't update symbolic links"
 msgstr "不更新符号链接"
 
-#: elf/ldconfig.c:146
+#: elf/ldconfig.c:149
 msgid "Change to and use ROOT as root directory"
 msgstr "进入 ROOT 目录并将其作为根目录"
 
-#: elf/ldconfig.c:146
+#: elf/ldconfig.c:149
 msgid "ROOT"
 msgstr "ROOT"
 
-#: elf/ldconfig.c:147
+#: elf/ldconfig.c:150
 msgid "CACHE"
 msgstr "CACHE"
 
-#: elf/ldconfig.c:147
+#: elf/ldconfig.c:150
 msgid "Use CACHE as cache file"
-msgstr "将 CACHE 用作缓冲区文件"
+msgstr "将 CACHE 用作缓存文件"
 
-#: elf/ldconfig.c:148
+#: elf/ldconfig.c:151
 msgid "CONF"
 msgstr "CONF"
 
-#: elf/ldconfig.c:148
+#: elf/ldconfig.c:151
 msgid "Use CONF as configuration file"
 msgstr "将 CONF 用作配置文件"
 
-#: elf/ldconfig.c:149
+#: elf/ldconfig.c:152
 msgid "Only process directories specified on the command line.  Don't build cache."
-msgstr "只在命令行中给出了进程目录。未创建缓冲区。"
+msgstr "只在命令行中给出了进程目录。未创建缓存。"
 
-#: elf/ldconfig.c:150
+#: elf/ldconfig.c:153
 msgid "Manually link individual libraries."
 msgstr "手工链接独立的库。"
 
-#: elf/ldconfig.c:151
+#: elf/ldconfig.c:154
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: elf/ldconfig.c:151
-msgid "Format to use: new, old or compat (default)"
-msgstr "采用的格式:新、旧或兼容(默认)"
-
-#: elf/ldconfig.c:152
+#: elf/ldconfig.c:155
 msgid "Ignore auxiliary cache file"
 msgstr "忽略辅助缓存文件"
 
-#: elf/ldconfig.c:160
+#: elf/ldconfig.c:163
 msgid "Configure Dynamic Linker Run Time Bindings."
-msgstr "设置运行时期动态链接"
+msgstr "设置运行时期动态链接绑定。"
 
-#: elf/ldconfig.c:347
+#: elf/ldconfig.c:346
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "多次给出路径“%s”"
 
-#: elf/ldconfig.c:387
+#: elf/ldconfig.c:393
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s 不是已知类型的库"
 
-#: elf/ldconfig.c:415
+#: elf/ldconfig.c:421
 #, c-format
 msgid "Can't stat %s"
 msgstr "无法对 %s 进行 stat 操作"
 
-#: elf/ldconfig.c:489
+#: elf/ldconfig.c:500
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "无法对 %s 进行 stat 操作\n"
 
-#: elf/ldconfig.c:499
+#: elf/ldconfig.c:510
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s 不是符号链接\n"
 
-#: elf/ldconfig.c:518
+#: elf/ldconfig.c:529
 #, c-format
 msgid "Can't unlink %s"
 msgstr "无法取消链接 %s"
 
-#: elf/ldconfig.c:524
+#: elf/ldconfig.c:535
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "无法将 %s 链接到 %s"
 
-#: elf/ldconfig.c:530
+#: elf/ldconfig.c:541
 msgid " (changed)\n"
 msgstr " (改变)\n"
 
-#: elf/ldconfig.c:532
+#: elf/ldconfig.c:543
 msgid " (SKIPPED)\n"
 msgstr " (跳过)\n"
 
-#: elf/ldconfig.c:587
+#: elf/ldconfig.c:598
 #, c-format
 msgid "Can't find %s"
 msgstr "无法找到 %s"
 
-#: elf/ldconfig.c:603 elf/ldconfig.c:769 elf/ldconfig.c:825 elf/ldconfig.c:857
+#: elf/ldconfig.c:614 elf/ldconfig.c:781 elf/ldconfig.c:839 elf/ldconfig.c:871
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "无法对 %s 进行 lstat 操作"
 
-#: elf/ldconfig.c:610
+#: elf/ldconfig.c:621
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
-msgstr "由于不是一个普通文件,忽略文件 %s"
+msgstr "忽略文件 %s 由于不是一个普通文件。"
 
-#: elf/ldconfig.c:619
+#: elf/ldconfig.c:630
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "未创建链接,因为 %s 无法找到 soname"
 
-#: elf/ldconfig.c:702
+#: elf/ldconfig.c:714
 #, c-format
 msgid "Can't open directory %s"
 msgstr "无法打开目录 %s"
 
-#: elf/ldconfig.c:787 elf/ldconfig.c:845 elf/readlib.c:97
+#: elf/ldconfig.c:799 elf/ldconfig.c:859 elf/readlib.c:97
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "未找到输入文件 %s。\n"
 
-#: elf/ldconfig.c:794
+#: elf/ldconfig.c:806
 #, c-format
 msgid "Cannot stat %s"
 msgstr "无法对 %s 进行 stat 操作"
 
-#: elf/ldconfig.c:939
+#: elf/ldconfig.c:953
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "libc5 的库 %s 处于错误的目录中"
 
-#: elf/ldconfig.c:942
+#: elf/ldconfig.c:956
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "libc5 的库 %s 处于错误的目录中"
 
-#: elf/ldconfig.c:945
+#: elf/ldconfig.c:959
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "libc4 的库 %s 处于错误的目录中"
 
-#: elf/ldconfig.c:973
+#: elf/ldconfig.c:987
 #, c-format
 msgid "libraries %s and %s in directory %s have same soname but different type."
 msgstr "目录 %3$s 中的 %1$s 和 %2$s 的 so 名称相同但类型不同。"
 
-#: elf/ldconfig.c:1083
+#: elf/ldconfig.c:1097
 #, c-format
 msgid "Warning: ignoring configuration file that cannot be opened: %s"
 msgstr "警告:正在忽略无法打开的组态文件:%s"
 
-#: elf/ldconfig.c:1149
-#, c-format
-msgid "%s:%u: bad syntax in hwcap line"
-msgstr "%s:%u: 在 hwcap 行中有不当的语法"
-
-#: elf/ldconfig.c:1155
-#, c-format
-msgid "%s:%u: hwcap index %lu above maximum %u"
-msgstr "%s:%u: hwcap 索引 %lu 以上的最大值 %u"
-
-#: elf/ldconfig.c:1162 elf/ldconfig.c:1170
-#, c-format
-msgid "%s:%u: hwcap index %lu already defined as %s"
-msgstr "%s:%u: hwcap 索引 %lu 已经被定义为 %s"
-
-#: elf/ldconfig.c:1173
-#, c-format
-msgid "%s:%u: duplicate hwcap %lu %s"
-msgstr "%s:%u: 重制 hwcap %lu %s"
-
-#: elf/ldconfig.c:1195
+#: elf/ldconfig.c:1164
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr "需要绝对文件名称用于组态文件时正在使用 -r"
 
-#: elf/ldconfig.c:1202 locale/programs/xmalloc.c:63 malloc/obstack.c:416
-#: malloc/obstack.c:418 posix/getconf.c:458 posix/getconf.c:697
+#: elf/ldconfig.c:1171 locale/programs/xasprintf.c:31
+#: locale/programs/xmalloc.c:63 malloc/obstack.c:416 malloc/obstack.c:418
+#: posix/getconf.c:458 posix/getconf.c:697
 #, c-format
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: elf/ldconfig.c:1235
+#: elf/ldconfig.c:1204
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr "%s:%u: 无法读取目录 %s"
 
-#: elf/ldconfig.c:1283
+#: elf/ldconfig.c:1252
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr "用来建置缓存的相对路径 `%s'"
 
-#: elf/ldconfig.c:1313
+#: elf/ldconfig.c:1276
 #, c-format
 msgid "Can't chdir to /"
 msgstr "无法改变目录到 /"
 
-#: elf/ldconfig.c:1354
+#: elf/ldconfig.c:1317
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "无法打开缓冲文件目录 %s\n"
@@ -942,7 +938,7 @@ msgstr "缺少文件参数"
 #. TRANS This is a ``file doesn't exist'' error
 #. TRANS for ordinary files that are referenced in contexts where they are
 #. TRANS expected to already exist.
-#: elf/ldd.bash.in:147 sysdeps/gnu/errlist.c:37
+#: elf/ldd.bash.in:147 sysdeps/gnu/errlist.h:16
 msgid "No such file or directory"
 msgstr "没有那个文件或目录"
 
@@ -952,7 +948,7 @@ msgstr "不是普通文件"
 
 #: elf/ldd.bash.in:153
 msgid "warning: you do not have execution permission for"
-msgstr "警告: 你没有执行权限 "
+msgstr "警告:你没有执行权限 "
 
 #: elf/ldd.bash.in:170
 msgid "\tnot a dynamic executable"
@@ -964,7 +960,7 @@ msgstr "以未知的退出码退出"
 
 #: elf/ldd.bash.in:183
 msgid "error: you do not have read permission for"
-msgstr "错误: 你没有读权限 "
+msgstr "错误:你没有读权限 "
 
 #: elf/pldd-xx.c:102
 #, c-format
@@ -1049,6 +1045,12 @@ msgstr "无效的线程识别号 %s"
 msgid "cannot attach to process %lu"
 msgstr "无法附加到进程 %lu"
 
+# 	zic_t		r_stdoff;	/* offset from standard time */
+#: elf/pldd.c:184
+#, c-format
+msgid "no valid %s/task entries"
+msgstr "无效的 %s/task 条目"
+
 #: elf/pldd.c:290
 #, c-format
 msgid "cannot get information about process %lu"
@@ -1184,7 +1186,7 @@ msgstr ""
 
 #: elf/sotruss.sh:46
 msgid "Mandatory arguments to long options are also mandatory for any corresponding\\nshort options.\\n"
-msgstr "长选项的必要参数同样也是相对应短选项的必要参数。"
+msgstr "长选项的必要参数同样也是相对应短选项的必要参数。\\n"
 
 #: elf/sotruss.sh:55
 msgid "%s: option requires an argument -- '%s'\\n"
@@ -1241,7 +1243,7 @@ msgstr "SHOBJ [PROFDATA]"
 #: elf/sprof.c:433
 #, c-format
 msgid "failed to load shared object `%s'"
-msgstr "装入共享目标文件“%s”失败"
+msgstr "载入共享目标文件“%s”失败"
 
 #: elf/sprof.c:442 elf/sprof.c:825 elf/sprof.c:923
 #, c-format
@@ -1286,7 +1288,7 @@ msgstr "*** 文件“%s”已剥离:不可能进行细节分析\n"
 #: elf/sprof.c:715
 #, c-format
 msgid "failed to load symbol data"
-msgstr "装入符号数据失败"
+msgstr "载入符号数据失败"
 
 #: elf/sprof.c:780
 #, c-format
@@ -1323,12 +1325,12 @@ msgstr "`%s' 不是 `%s' 中正确的测速评估数据文件"
 msgid "cannot allocate symbol data"
 msgstr "无法分配符号数据"
 
-#: iconv/iconv_charmap.c:141 iconv/iconv_prog.c:445
+#: iconv/iconv_charmap.c:141 iconv/iconv_prog.c:428
 #, c-format
 msgid "cannot open output file"
 msgstr "无法打开输出文件"
 
-#: iconv/iconv_charmap.c:187 iconv/iconv_prog.c:308
+#: iconv/iconv_charmap.c:187 iconv/iconv_prog.c:291
 #, c-format
 msgid "error while closing input `%s'"
 msgstr "关闭输入“%s”时出错"
@@ -1338,128 +1340,128 @@ msgstr "关闭输入“%s”时出错"
 msgid "illegal input sequence at position %Zd"
 msgstr "位于 %Zd 的非法输入序列"
 
-#: iconv/iconv_charmap.c:454 iconv/iconv_prog.c:536
+#: iconv/iconv_charmap.c:454 iconv/iconv_prog.c:519
 #, c-format
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr "位于缓冲区末尾的不完整字符或转义序列"
 
-#: iconv/iconv_charmap.c:499 iconv/iconv_charmap.c:535 iconv/iconv_prog.c:579
-#: iconv/iconv_prog.c:615
+#: iconv/iconv_charmap.c:499 iconv/iconv_charmap.c:535 iconv/iconv_prog.c:562
+#: iconv/iconv_prog.c:598
 #, c-format
 msgid "error while reading the input"
 msgstr "读取输入时出错"
 
-#: iconv/iconv_charmap.c:517 iconv/iconv_prog.c:597
+#: iconv/iconv_charmap.c:517 iconv/iconv_prog.c:580
 #, c-format
 msgid "unable to allocate buffer for input"
 msgstr "无法为输入分配缓冲区"
 
-#: iconv/iconv_prog.c:59
+#: iconv/iconv_prog.c:60
 msgid "Input/Output format specification:"
 msgstr "输入/输出格式规范:"
 
-#: iconv/iconv_prog.c:60
+#: iconv/iconv_prog.c:61
 msgid "encoding of original text"
 msgstr "原始文本编码"
 
-#: iconv/iconv_prog.c:61
+#: iconv/iconv_prog.c:62
 msgid "encoding for output"
 msgstr "输出编码"
 
-#: iconv/iconv_prog.c:62
+#: iconv/iconv_prog.c:63
 msgid "Information:"
 msgstr "信息:"
 
-#: iconv/iconv_prog.c:63
+#: iconv/iconv_prog.c:64
 msgid "list all known coded character sets"
 msgstr "列举所有已知的字符集"
 
-#: iconv/iconv_prog.c:64 locale/programs/localedef.c:124
+#: iconv/iconv_prog.c:65 locale/programs/localedef.c:124
 msgid "Output control:"
 msgstr "输出控制:"
 
-#: iconv/iconv_prog.c:65
+#: iconv/iconv_prog.c:66
 msgid "omit invalid characters from output"
 msgstr "从输出中忽略无效的字符"
 
-#: iconv/iconv_prog.c:66 iconv/iconvconfig.c:128
+#: iconv/iconv_prog.c:67 iconv/iconvconfig.c:128
 #: locale/programs/localedef.c:117 locale/programs/localedef.c:119
 #: locale/programs/localedef.c:121 locale/programs/localedef.c:150
 #: malloc/memusagestat.c:56
 msgid "FILE"
 msgstr "文件"
 
-#: iconv/iconv_prog.c:66
+#: iconv/iconv_prog.c:67
 msgid "output file"
 msgstr "输出文件"
 
-#: iconv/iconv_prog.c:67
+#: iconv/iconv_prog.c:68
 msgid "suppress warnings"
 msgstr "关闭警告"
 
-#: iconv/iconv_prog.c:68
+#: iconv/iconv_prog.c:69
 msgid "print progress information"
 msgstr "打印进度信息"
 
-#: iconv/iconv_prog.c:73
+#: iconv/iconv_prog.c:74
 msgid "Convert encoding of given files from one encoding to another."
 msgstr "转换给定文件的编码。"
 
-#: iconv/iconv_prog.c:77
+#: iconv/iconv_prog.c:78
 msgid "[FILE...]"
 msgstr "[文件...]"
 
-#: iconv/iconv_prog.c:230
+#: iconv/iconv_prog.c:177 iconv/iconv_prog.c:239
+#, c-format
+msgid "failed to start conversion processing"
+msgstr "启动转换处理失败"
+
+#: iconv/iconv_prog.c:213
 #, c-format
 msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "不支持从“%s”到“%s”的转换"
 
-#: iconv/iconv_prog.c:235
+#: iconv/iconv_prog.c:218
 #, c-format
 msgid "conversion from `%s' is not supported"
 msgstr "不支持以“%s”为源头的转换"
 
-#: iconv/iconv_prog.c:242
+#: iconv/iconv_prog.c:225
 #, c-format
 msgid "conversion to `%s' is not supported"
 msgstr "不支持以“%s”为目标的转换"
 
-#: iconv/iconv_prog.c:246
+#: iconv/iconv_prog.c:229
 #, c-format
 msgid "conversion from `%s' to `%s' is not supported"
 msgstr "不支持从“%s”到“%s”的转换"
 
-#: iconv/iconv_prog.c:256
-#, c-format
-msgid "failed to start conversion processing"
-msgstr "启动转换处理失败"
-
-#: iconv/iconv_prog.c:354
+#: iconv/iconv_prog.c:337
 #, c-format
 msgid "error while closing output file"
 msgstr "关闭输出文件时出错"
 
-#: iconv/iconv_prog.c:455
+#: iconv/iconv_prog.c:438
 #, c-format
 msgid "conversion stopped due to problem in writing the output"
 msgstr "由于写入输出时出现的问题转换停止"
 
-#: iconv/iconv_prog.c:532
+#: iconv/iconv_prog.c:515
 #, c-format
 msgid "illegal input sequence at position %ld"
 msgstr "未知 %ld 处的非法输入序列"
 
-#: iconv/iconv_prog.c:540
+#: iconv/iconv_prog.c:523
 #, c-format
 msgid "internal error (illegal descriptor)"
 msgstr "内部错误 (非法的描述符)"
 
-#: iconv/iconv_prog.c:543
+#: iconv/iconv_prog.c:526
 #, c-format
 msgid "unknown iconv() error %d"
 msgstr "未知的 iconv() 错误 %d"
 
-#: iconv/iconv_prog.c:786
+#: iconv/iconv_prog.c:769
 msgid ""
 "The following list contains all the coded character sets known.  This does\n"
 "not necessarily mean that all combinations of these names can be used for\n"
@@ -1476,7 +1478,7 @@ msgstr ""
 
 #: iconv/iconvconfig.c:109
 msgid "Create fastloading iconv module configuration file."
-msgstr "创建快速装入 iconv 模块配置文件。"
+msgstr "创建快速载入 iconv 模块配置文件。"
 
 #: iconv/iconvconfig.c:113
 msgid "[DIR...]"
@@ -1529,7 +1531,7 @@ msgstr "rcmd:socket:所有端口都已在使用了\n"
 #: inet/rcmd.c:202
 #, c-format
 msgid "connect to address %s: "
-msgstr "连接到地址 %s:"
+msgstr "连接到地址 %s: "
 
 #: inet/rcmd.c:215
 #, c-format
@@ -1591,6 +1593,10 @@ msgstr "内存不足"
 msgid "Error: .netrc file is readable by others."
 msgstr "错误:.netrc 对其它人是可读的。"
 
+#: inet/ruserpass.c:180
+msgid "Remove 'password' line or make file unreadable by others."
+msgstr "删除“password”(口令)行或令文件不可由他人读取。"
+
 #: inet/ruserpass.c:199
 #, c-format
 msgid "Unknown .netrc keyword %s"
@@ -1611,6 +1617,11 @@ msgstr "找不到字符映射文件“%s”"
 msgid "default character map file `%s' not found"
 msgstr "找不到默认字符映射文件“%s”"
 
+#: locale/programs/charmap.c:265
+#, c-format
+msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant [--no-warnings=ascii]"
+msgstr "字符映射“%s”不兼容ASCII,区域化数据库不符合 ISO C  [--no-warnings=ascii]"
+
 #: locale/programs/charmap.c:343
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
@@ -1754,7 +1765,7 @@ msgstr "范围的上限小于下限"
 
 #: locale/programs/charmap.c:1093
 msgid "resulting bytes for range not representable."
-msgstr "用来定义范围的字节无法被表述出来"
+msgstr "范围的结果字节无法被表述出来。"
 
 #: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1563
 #: locale/programs/ld-ctype.c:430 locale/programs/ld-identification.c:131
@@ -2115,12 +2126,12 @@ msgstr "%s:遗漏关键字“reorder-sections-end”"
 #: locale/programs/ld-collate.c:3929
 #, c-format
 msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
-msgstr "%s: “%s” 而不需吻合中 “ifdef” 或 “ifndef” "
+msgstr "%s: “%s” 没有匹配 “ifdef” 或 “ifndef” "
 
 #: locale/programs/ld-collate.c:3947
 #, c-format
 msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
-msgstr "%s: “endif” 而不需吻合中 “ifdef” 或 “ifndef” "
+msgstr "%s: “endif” 没有匹配 “ifdef” 或 “ifndef” "
 
 #: locale/programs/ld-ctype.c:448
 msgid "No character set name specified in charmap"
@@ -2313,6 +2324,21 @@ msgstr "没有定义输出数字,在字集对照表中也找不到相符的标
 msgid "%s: transliteration data from locale `%s' not available"
 msgstr "%s: 语区数据`%s' 的音译数据不存在"
 
+#: locale/programs/ld-ctype.c:3672
+#, c-format
+msgid "%s: table for class \"%s\": %lu bytes"
+msgstr "%s: 类别 \"%s\" 表格: %lu 字节"
+
+#: locale/programs/ld-ctype.c:3736
+#, c-format
+msgid "%s: table for map \"%s\": %lu bytes"
+msgstr "%s:映射表 “%s” 表格:%lu 字节"
+
+#: locale/programs/ld-ctype.c:3860
+#, c-format
+msgid "%s: table for width: %lu bytes"
+msgstr "%s:宽度表格:%lu 字节"
+
 # LC_IDENTIFICATION 放的是“坏了找谁”之类的事情,参照 locale(5)
 #: locale/programs/ld-identification.c:173
 #, c-format
@@ -2356,6 +2382,11 @@ msgstr "%s:域“%s”中没有正确的常规表达式:%s"
 msgid "%s: value of field `int_curr_symbol' has wrong length"
 msgstr "%s:域“int_curr_symbol”的值的长度错误"
 
+#: locale/programs/ld-monetary.c:245
+#, c-format
+msgid "%s: value of field `int_curr_symbol' does not correspond to a valid name in ISO 4217 [--no-warnings=intcurrsym]"
+msgstr "%s:域 “int_curr_symbol” 的值与 ISO 4217 中有效的名称不对应 [--no-warnings=intcurrsym]"
+
 #: locale/programs/ld-monetary.c:293 locale/programs/ld-monetary.c:322
 #, c-format
 msgid "%s: value for field `%s' must be in range %d...%d"
@@ -2414,7 +2445,7 @@ msgstr "%s: 在 `era' 字段、字串 %Zd 中的起始日期不适用"
 #: locale/programs/ld-time.c:338
 #, c-format
 msgid "%s: garbage at end of starting date in string %Zd in `era' field "
-msgstr "%s: 无用的数据,在 `era' 字段、字串 %Zd 中末尾的起始日期"
+msgstr "%s:在 ‘era’ 域中字串 %Zd 中末尾的起始日期的数据无效 "
 
 #: locale/programs/ld-time.c:356
 #, c-format
@@ -2503,7 +2534,7 @@ msgstr "符号 `%.*s' 并不在编码映射表中"
 #: locale/programs/locale-spec.c:130
 #, c-format
 msgid "unknown name \"%s\""
-msgstr "不明名称 “%s” "
+msgstr "未知名称 “%s” "
 
 #: locale/programs/locale.c:70
 msgid "System information:"
@@ -2550,6 +2581,16 @@ msgstr ""
 msgid "while preparing output"
 msgstr "准备输出时"
 
+#: locale/programs/locale.c:998
+#, c-format
+msgid "Cannot set %s to default locale"
+msgstr "无法将 %s 设置为默认的语区"
+
+#: locale/programs/locale.c:1096
+#, c-format
+msgid "warning: The LOCPATH variable is set to \"%s\"\n"
+msgstr "警告:变量 LOCPATH 设置为 “%s” \n"
+
 #: locale/programs/localedef.c:116
 msgid "Input Files:"
 msgstr "输入文件:"
@@ -2570,6 +2611,10 @@ msgstr "文件 FILE 内含符号名与 UCS4 编码之间的映射"
 msgid "Create output even if warning messages were issued"
 msgstr "即使出现警告消息也创建输出"
 
+#: locale/programs/localedef.c:128
+msgid "Do not create hard links between installed locales"
+msgstr "不要在已安装的语区之间创建硬链接"
+
 #: locale/programs/localedef.c:129
 msgid "Optional output file prefix"
 msgstr "可选的输出文件前缀"
@@ -2586,6 +2631,18 @@ msgstr "关闭警告和信息消息"
 msgid "Print more messages"
 msgstr "打印更多消息"
 
+#: locale/programs/localedef.c:134 locale/programs/localedef.c:137
+msgid "<warnings>"
+msgstr "<警告>"
+
+#: locale/programs/localedef.c:135
+msgid "Comma-separated list of warnings to disable; supported warnings are: ascii, intcurrsym"
+msgstr "逗号分隔的警告禁用列表;支持的警告有:ascii,intcurrsym"
+
+#: locale/programs/localedef.c:138
+msgid "Comma-separated list of warnings to enable; supported warnings are: ascii, intcurrsym"
+msgstr "逗号分隔的警告启用列表;支持的警告有:ascii,intcurrsym"
+
 #: locale/programs/localedef.c:141
 msgid "Archive control:"
 msgstr "归档控制:"
@@ -2636,26 +2693,30 @@ msgstr ""
 "[--add-to-archive|--delete-from-archive] 文件...\n"
 "--list-archive [文件]"
 
-#: locale/programs/localedef.c:238
+#: locale/programs/localedef.c:239
 #, c-format
 msgid "cannot create directory for output files"
 msgstr "无法为输出文件创建目录"
 
-#: locale/programs/localedef.c:249
+#: locale/programs/localedef.c:250
 msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
 msgstr "致命错误:系统未定义“_POSIX2_LOCALEDEF”"
 
-#: locale/programs/localedef.c:263 locale/programs/localedef.c:279
-#: locale/programs/localedef.c:673 locale/programs/localedef.c:693
+#: locale/programs/localedef.c:264 locale/programs/localedef.c:280
+#: locale/programs/localedef.c:678 locale/programs/localedef.c:698
 #, c-format
 msgid "cannot open locale definition file `%s'"
 msgstr "无法打开区域定义文件“%s”"
 
-#: locale/programs/localedef.c:303
+#: locale/programs/localedef.c:304
 #, c-format
 msgid "cannot write output files to `%s'"
 msgstr "无法将输出文件写入“%s”"
 
+#: locale/programs/localedef.c:310
+msgid "no output file produced because errors were issued"
+msgstr "由于出现错误,没有产生输出文件"
+
 #: locale/programs/localedef.c:441
 #, c-format
 msgid ""
@@ -2669,11 +2730,11 @@ msgstr ""
 "\t\t      语区路径   :%s\n"
 "%s"
 
-#: locale/programs/localedef.c:641
+#: locale/programs/localedef.c:646
 msgid "circular dependencies between locale definitions"
-msgstr "区域定义中的循环倚赖"
+msgstr "区域定义中的循环依赖"
 
-#: locale/programs/localedef.c:647
+#: locale/programs/localedef.c:652
 #, c-format
 msgid "cannot add already read locale `%s' a second time"
 msgstr "无法再次添加已经读入的“%s”"
@@ -3046,7 +3107,7 @@ msgid "unable to free arguments"
 msgstr "无法释放参数"
 
 #: nis/nis_error.h:1 nis/ypclnt.c:825 nis/ypclnt.c:914 posix/regcomp.c:135
-#: sysdeps/gnu/errlist.c:21
+#: sysdeps/gnu/errlist.h:4
 msgid "Success"
 msgstr "成功"
 
@@ -3087,7 +3148,7 @@ msgid "First/next chain broken"
 msgstr "第一个/下一个链坏掉了"
 
 #. TRANS The file permissions do not allow the attempted operation.
-#: nis/nis_error.h:11 nis/ypclnt.c:870 sysdeps/gnu/errlist.c:158
+#: nis/nis_error.h:11 nis/ypclnt.c:870 sysdeps/gnu/errlist.h:93
 msgid "Permission denied"
 msgstr "权限不够"
 
@@ -3250,7 +3311,7 @@ msgstr "未知"
 
 #: nis/nis_print.c:110
 msgid "BOGUS OBJECT\n"
-msgstr "假的对象\n"
+msgstr "虚假对象\n"
 
 #: nis/nis_print.c:113
 msgid "NO OBJECT\n"
@@ -3282,7 +3343,7 @@ msgstr "私有\n"
 
 #: nis/nis_print.c:134
 msgid "(Unknown object)\n"
-msgstr "(未知对象)\n"
+msgstr "(未知对象)\n"
 
 #: nis/nis_print.c:168
 #, c-format
@@ -3477,7 +3538,7 @@ msgstr "修改时间   :%s"
 
 #: nis/nis_print.c:339
 msgid "Object Type   : "
-msgstr "对象类型   :%s"
+msgstr "对象类型   :"
 
 #: nis/nis_print.c:359
 #, c-format
@@ -3552,44 +3613,6 @@ msgstr "    递归非成员:\n"
 msgid "    No recursive nonmembers\n"
 msgstr "    没有递归的非成员\n"
 
-#: nis/nss_nisplus/nisplus-publickey.c:100
-#: nis/nss_nisplus/nisplus-publickey.c:182
-#, c-format
-msgid "DES entry for netname %s not unique\n"
-msgstr "netname %s 的 DES 项目并不唯一\n"
-
-#: nis/nss_nisplus/nisplus-publickey.c:219
-#, c-format
-msgid "netname2user: missing group id list in `%s'"
-msgstr "netname2user:在 “%s” 中缺少群组识别号清单"
-
-#: nis/nss_nisplus/nisplus-publickey.c:301
-#: nis/nss_nisplus/nisplus-publickey.c:307
-#: nis/nss_nisplus/nisplus-publickey.c:372
-#: nis/nss_nisplus/nisplus-publickey.c:381
-#, c-format
-msgid "netname2user: (nis+ lookup): %s\n"
-msgstr "netname2user: (nis+ 搜索): %s\n"
-
-#: nis/nss_nisplus/nisplus-publickey.c:320
-#, c-format
-msgid "netname2user: DES entry for %s in directory %s not unique"
-msgstr "netname2user: %s 的 DES 项目在 %s 目录下并不是唯一的"
-
-#: nis/nss_nisplus/nisplus-publickey.c:338
-#, c-format
-msgid "netname2user: principal name `%s' too long"
-msgstr "netname2user:基本名称“%s”过长"
-
-#: nis/nss_nisplus/nisplus-publickey.c:394
-#, c-format
-msgid "netname2user: LOCAL entry for %s in directory %s not unique"
-msgstr "netname2user: %s 的本地端项目在 %s 目录下并不是唯一的"
-
-#: nis/nss_nisplus/nisplus-publickey.c:401
-msgid "netname2user: should not have uid 0"
-msgstr "netname2user:uid 不应为 0"
-
 #: nis/ypclnt.c:828
 msgid "Request arguments bad"
 msgstr "请求参数错误"
@@ -3678,15 +3701,15 @@ msgstr "yp_update:无法将主机名转换为网名\n"
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update:无法获取服务器地址\n"
 
-#: nscd/aicache.c:82 nscd/hstcache.c:452
+#: nscd/aicache.c:69 nscd/hstcache.c:452
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
-msgstr "无法在主机缓冲区中找到“%s”!"
+msgstr "无法在主机缓存中找到“%s”!"
 
-#: nscd/aicache.c:84 nscd/hstcache.c:454
+#: nscd/aicache.c:71 nscd/hstcache.c:454
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
-msgstr "在主机缓冲区中重新加载“%s”!"
+msgstr "在主机缓存中重新加载“%s”!"
 
 #: nscd/cache.c:151
 #, c-format
@@ -3847,25 +3870,30 @@ msgstr "无法写入结果:“%s”"
 msgid "error getting caller's id: %s"
 msgstr "取得调用程序识别码时发生错误: %s"
 
+#: nscd/connections.c:1349
+#, c-format
+msgid "cannot open /proc/self/cmdline: %m; disabling paranoia mode"
+msgstr "无法打开 /proc/self/cmdline:%m;停用偏执模式"
+
 #: nscd/connections.c:1372
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
-msgstr "无法变更为旧的 UID:%s; 停用 paranoia 模式"
+msgstr "无法变更为旧的 UID:%s; 停用偏执模式"
 
 #: nscd/connections.c:1383
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
-msgstr "无法变更为旧的 GID:%s; 停用 paranoia 模式"
+msgstr "无法变更为旧的 GID:%s; 停用偏执模式"
 
 #: nscd/connections.c:1397
 #, c-format
 msgid "cannot change to old working directory: %s; disabling paranoia mode"
-msgstr "无法变更为旧的工作目录:%s; 停用 paranoia 模式"
+msgstr "无法变更为旧的工作目录:%s; 停用偏执模式"
 
 #: nscd/connections.c:1444
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
-msgstr "re-exec 失败:%s; 停用 paranoia 模式"
+msgstr "re-exec 失败:%s; 停用偏执模式"
 
 #: nscd/connections.c:1453
 #, c-format
@@ -3968,21 +3996,21 @@ msgstr "getgrouplist 失败"
 msgid "setgroups failed"
 msgstr "setgroups 失败"
 
-#: nscd/grpcache.c:385 nscd/hstcache.c:402 nscd/initgrcache.c:385
+#: nscd/grpcache.c:385 nscd/hstcache.c:402 nscd/initgrcache.c:379
 #: nscd/pwdcache.c:363 nscd/servicescache.c:310
 #, c-format
 msgid "short write in %s: %s"
 msgstr "写入 %s 的数据过短: %s"
 
-#: nscd/grpcache.c:430 nscd/initgrcache.c:81
+#: nscd/grpcache.c:430 nscd/initgrcache.c:75
 #, c-format
 msgid "Haven't found \"%s\" in group cache!"
-msgstr "无法在组缓冲区中找到“%s”!"
+msgstr "无法在组缓存中找到“%s”!"
 
-#: nscd/grpcache.c:432 nscd/initgrcache.c:83
+#: nscd/grpcache.c:432 nscd/initgrcache.c:77
 #, c-format
 msgid "Reloading \"%s\" in group cache!"
-msgstr "在组缓冲区中重新加载“%s”!"
+msgstr "在组缓存中重新加载“%s”!"
 
 #: nscd/grpcache.c:492
 #, c-format
@@ -3997,7 +4025,7 @@ msgstr "在 %2$s 缓存中 %1$zu 字节可用"
 #: nscd/mem.c:568
 #, c-format
 msgid "no more memory for database '%s'"
-msgstr "无内存可用于数据库 “%s” "
+msgstr "无更多内存可用于数据库 “%s” "
 
 #: nscd/netgroupcache.c:122
 #, c-format
@@ -4019,118 +4047,118 @@ msgstr "尚未在网络群组缓存中找到 “%s (%s,%s,%s)” !"
 msgid "Reloading \"%s (%s,%s,%s)\" in netgroup cache!"
 msgstr "重新在网络群组缓存中加载 “%s (%s,%s,%s)” !"
 
-#: nscd/nscd.c:106
+#: nscd/nscd.c:108
 msgid "Read configuration data from NAME"
 msgstr "从 NAME 中读取配置数据"
 
-#: nscd/nscd.c:108
+#: nscd/nscd.c:110
 msgid "Do not fork and display messages on the current tty"
 msgstr "不在目前的 tty 产生子进程 (fork) 以及显示消息"
 
-#: nscd/nscd.c:110
+#: nscd/nscd.c:114
 msgid "Do not fork, but otherwise behave like a daemon"
 msgstr "不衍生,但是否则 behave 如同守护程序"
 
-#: nscd/nscd.c:111
+#: nscd/nscd.c:115
 msgid "NUMBER"
 msgstr "号码"
 
-#: nscd/nscd.c:111
+#: nscd/nscd.c:115
 msgid "Start NUMBER threads"
 msgstr "启动 NUMBER 个线程"
 
-#: nscd/nscd.c:112
+#: nscd/nscd.c:116
 msgid "Shut the server down"
 msgstr "关闭服务器"
 
-#: nscd/nscd.c:113
+#: nscd/nscd.c:117
 msgid "Print current configuration statistics"
 msgstr "印出目前组态统计"
 
-#: nscd/nscd.c:114
+#: nscd/nscd.c:118
 msgid "TABLE"
 msgstr "表格"
 
-#: nscd/nscd.c:115
+#: nscd/nscd.c:119
 msgid "Invalidate the specified cache"
 msgstr "使选定的缓存无效"
 
-#: nscd/nscd.c:116
+#: nscd/nscd.c:120
 msgid "TABLE,yes"
 msgstr "要制作表格"
 
-#: nscd/nscd.c:117
+#: nscd/nscd.c:121
 msgid "Use separate cache for each user"
-msgstr "为每个用户使用分离的缓冲区"
+msgstr "为每个用户使用分离的缓存"
 
-#: nscd/nscd.c:122
+#: nscd/nscd.c:126
 msgid "Name Service Cache Daemon."
-msgstr "网域名称缓存精灵"
+msgstr "域名服务缓存守护进程。"
 
-#: nscd/nscd.c:155 nss/getent.c:987 nss/makedb.c:206
+#: nscd/nscd.c:159 nss/getent.c:987 nss/makedb.c:206
 #, c-format
 msgid "wrong number of arguments"
 msgstr "参数个数错误"
 
-#: nscd/nscd.c:165
+#: nscd/nscd.c:174
 #, c-format
 msgid "failure while reading configuration file; this is fatal"
 msgstr "无法读入配置文件;这是致命的"
 
-#: nscd/nscd.c:174
+#: nscd/nscd.c:183
 #, c-format
 msgid "already running"
 msgstr "已经在运行"
 
-#: nscd/nscd.c:194
+#: nscd/nscd.c:203
 #, c-format
 msgid "cannot create a pipe to talk to the child"
 msgstr "无法为同子进程交流创建管道"
 
-#: nscd/nscd.c:198
+#: nscd/nscd.c:207
 #, c-format
 msgid "cannot fork"
 msgstr "无法 fork"
 
-#: nscd/nscd.c:268
+#: nscd/nscd.c:277
 msgid "cannot change current working directory to \"/\""
-msgstr "无法变更目前的工作目录到 “/” "
+msgstr "无法变更目前的工作目录到 “/”"
 
-#: nscd/nscd.c:276
+#: nscd/nscd.c:285
 msgid "Could not create log file"
 msgstr "无法创建日志文件"
 
-#: nscd/nscd.c:355 nscd/nscd_stat.c:209
+#: nscd/nscd.c:364 nscd/nscd_stat.c:209
 #, c-format
 msgid "write incomplete"
 msgstr "写入不完整"
 
-#: nscd/nscd.c:366
+#: nscd/nscd.c:375
 #, c-format
 msgid "cannot read invalidate ACK"
 msgstr "无法读入 invalidate ACK"
 
-#: nscd/nscd.c:372
+#: nscd/nscd.c:381
 #, c-format
 msgid "invalidation failed"
 msgstr "无效化失败"
 
-#: nscd/nscd.c:417 nscd/nscd.c:442 nscd/nscd_stat.c:190
+#: nscd/nscd.c:430 nscd/nscd.c:455 nscd/nscd_stat.c:190
 #, c-format
 msgid "Only root is allowed to use this option!"
 msgstr "只有根用户允许使用本选项!"
 
-#: nscd/nscd.c:437
+#: nscd/nscd.c:450
 #, c-format
 msgid "'%s' is not a known database"
-msgstr " ‘%s’ 并非一已知数据库"
+msgstr "‘%s’ 并非已知数据库"
 
-#: nscd/nscd.c:452
+#: nscd/nscd.c:465
 #, c-format
 msgid "secure services not implemented anymore"
 msgstr "安全服务不再实现"
 
-#: nscd/nscd.c:485
+#: nscd/nscd.c:498
 #, c-format
 msgid ""
 "Supported tables:\n"
@@ -4145,17 +4173,17 @@ msgstr ""
 "要获得 bug 报告指示,请见:\n"
 "%s。\n"
 
-#: nscd/nscd.c:635
+#: nscd/nscd.c:648
 #, c-format
 msgid "'wait' failed\n"
 msgstr "'wait' 失败\n"
 
-#: nscd/nscd.c:642
+#: nscd/nscd.c:655
 #, c-format
 msgid "child exited with status %d\n"
 msgstr "子进程以状态 %d 退出\n"
 
-#: nscd/nscd.c:647
+#: nscd/nscd.c:660
 #, c-format
 msgid "child terminated by signal %d\n"
 msgstr "子进程被信号 %d 中断\n"
@@ -4193,7 +4221,7 @@ msgstr "未知的选项:%s %s %s"
 #: nscd/nscd_conf.c:286
 #, c-format
 msgid "cannot get current working directory: %s; disabling paranoia mode"
-msgstr "无法取得目前的工作目录:%s; 停用 paranoia 模式"
+msgstr "无法取得目前的工作目录:%s; 停用偏执模式"
 
 #: nscd/nscd_conf.c:306
 #, c-format
@@ -4272,7 +4300,7 @@ msgstr ""
 "%15d  目前线程数量\n"
 "%15d  最大线程数量\n"
 "%15lu  客户端必须等待的次数\n"
-"%15s  paranoia 模式已启用\n"
+"%15s 偏执模式已启用\n"
 "%15lu  内部重新启动\n"
 "%15u  重新加载计数\n"
 
@@ -4327,6 +4355,16 @@ msgstr ""
 "%15<PRIuMAX> 内存配置失败\n"
 "%15s  检查 /etc/%s 的变更\n"
 
+#: nscd/pwdcache.c:407
+#, c-format
+msgid "Haven't found \"%s\" in user database cache!"
+msgstr "无法在用户数据库缓存中找到“%s”!"
+
+#: nscd/pwdcache.c:409
+#, c-format
+msgid "Reloading \"%s\" in user database cache!"
+msgstr "在用户数据库缓存中重新加载“%s”!"
+
 #: nscd/pwdcache.c:471
 #, c-format
 msgid "Invalid numeric uid \"%s\"!"
@@ -4391,7 +4429,7 @@ msgstr "为未定义的对象类型或权限请求策略时出错。"
 
 #: nscd/selinux.c:375
 msgid "Error getting security class for nscd."
-msgstr "取得 nscd 的安全类时发生错误"
+msgstr "取得 nscd 的安全类时发生错误。"
 
 #: nscd/selinux.c:380
 #, c-format
@@ -4440,12 +4478,12 @@ msgstr ""
 #: nscd/servicescache.c:358
 #, c-format
 msgid "Haven't found \"%s\" in services cache!"
-msgstr "无法在服务缓冲区中找到“%s”!"
+msgstr "无法在服务缓存中找到“%s”!"
 
 #: nscd/servicescache.c:360
 #, c-format
 msgid "Reloading \"%s\" in services cache!"
-msgstr "在服务缓冲区中重新加载“%s”!"
+msgstr "在服务缓存中重新加载“%s”!"
 
 #: nss/getent.c:55
 msgid "database [key ...]"
@@ -4453,7 +4491,7 @@ msgstr "数据库 [键 ...]"
 
 #: nss/getent.c:60
 msgid "CONFIG"
-msgstr "组态"
+msgstr "配置"
 
 #: nss/getent.c:60
 msgid "Service configuration to be used"
@@ -4472,6 +4510,11 @@ msgstr "从管理数据库取得条目。"
 msgid "Enumeration not supported on %s\n"
 msgstr "%s 不支持枚举\n"
 
+#: nss/getent.c:517 nss/getent.c:530
+#, c-format
+msgid "Could not allocate group list: %m\n"
+msgstr "无法分配组列表:%m\n"
+
 #: nss/getent.c:901
 #, c-format
 msgid "Unknown database name"
@@ -4637,6 +4680,31 @@ msgstr "未定义"
 msgid "Unrecognized variable `%s'"
 msgstr "不可识别的变量“%s”"
 
+#: posix/getopt.c:277
+#, c-format
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: 选项 ‘%s%s’ 含义不清\n"
+
+#: posix/getopt.c:283
+#, c-format
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
+msgstr "%s: 选项 ‘%s%s’ 含义不清;可能为:"
+
+#: posix/getopt.c:318
+#, c-format
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s:未识别的选项 ‘%s%s’\n"
+
+#: posix/getopt.c:344
+#, c-format
+msgid "%s: option '%s%s' doesn't allow an argument\n"
+msgstr "%s:选项 ‘%s%s’ 不允许有参数\n"
+
+#: posix/getopt.c:359
+#, c-format
+msgid "%s: option '%s%s' requires an argument\n"
+msgstr "%s:选项 ‘%s%s’ 需要一个参数\n"
+
 #: posix/getopt.c:620
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
@@ -4671,6 +4739,10 @@ msgstr "尾端的反斜线"
 msgid "Invalid back reference"
 msgstr "无效的向后引用"
 
+#: posix/regcomp.c:156
+msgid "Unmatched [, [^, [:, [., or [="
+msgstr "不匹配的 [、[^、[:、[.、或 [="
+
 #: posix/regcomp.c:159
 msgid "Unmatched ( or \\("
 msgstr "不匹配的 ( 或 \\("
@@ -4896,7 +4968,7 @@ msgstr "输出缓冲区可用"
 msgid "Input message available"
 msgstr "输入消息可用"
 
-#: stdio-common/psiginfo-data.h:46 timezone/zdump.c:375 timezone/zic.c:561
+#: stdio-common/psiginfo-data.h:46 timezone/zdump.c:375 timezone/zic.c:564
 msgid "I/O error"
 msgstr "I/O 错误"
 
@@ -4958,20 +5030,16 @@ msgstr "%s%s未知的信号 %d\n"
 msgid "Unknown signal"
 msgstr "未知信号"
 
-#: string/_strerror.c:45 sysdeps/mach/_strerror.c:86
+#: string/_strerror.c:30 sysdeps/mach/_strerror.c:55
 msgid "Unknown error "
 msgstr "未知的错误 "
 
-#: string/strerror.c:41
-msgid "Unknown error"
-msgstr "未知的错误"
-
-#: string/strsignal.c:60
+#: string/strsignal.c:39
 #, c-format
 msgid "Real-time signal %d"
 msgstr "实时信号 %d"
 
-#: string/strsignal.c:64
+#: string/strsignal.c:43
 #, c-format
 msgid "Unknown signal %d"
 msgstr "未知信号 %d"
@@ -5079,41 +5147,41 @@ msgstr "RPC:失败 (未指明的错误)"
 msgid "RPC: (unknown error code)"
 msgstr "RPC:(未知的错误码)"
 
-#: sunrpc/clnt_perr.c:330
+#: sunrpc/clnt_perr.c:334
 msgid "Authentication OK"
 msgstr "认证成功"
 
-#: sunrpc/clnt_perr.c:333
+#: sunrpc/clnt_perr.c:337
 msgid "Invalid client credential"
 msgstr "无效的客户证书"
 
-#: sunrpc/clnt_perr.c:337
+#: sunrpc/clnt_perr.c:341
 msgid "Server rejected credential"
 msgstr "服务器拒绝证书"
 
-#: sunrpc/clnt_perr.c:341
+#: sunrpc/clnt_perr.c:345
 msgid "Invalid client verifier"
 msgstr "无效的客户校验"
 
-#: sunrpc/clnt_perr.c:345
+#: sunrpc/clnt_perr.c:349
 msgid "Server rejected verifier"
 msgstr "服务器拒绝校验"
 
-#: sunrpc/clnt_perr.c:349
+#: sunrpc/clnt_perr.c:353
 msgid "Client credential too weak"
 msgstr "客户证书太弱"
 
-#: sunrpc/clnt_perr.c:353
+#: sunrpc/clnt_perr.c:357
 msgid "Invalid server verifier"
 msgstr "无效的服务器校验"
 
-#: sunrpc/clnt_perr.c:357
+#: sunrpc/clnt_perr.c:361
 msgid "Failed (unspecified error)"
 msgstr "失败 (未指明的错误)"
 
 #: sunrpc/clnt_raw.c:112
 msgid "clnt_raw.c: fatal header serialization error"
-msgstr "clnt_raw.c: 致命的头编序错误。"
+msgstr "clnt_raw.c:致命的头编序错误"
 
 #: sunrpc/pm_getmaps.c:78
 msgid "pmap_getmaps.c: rpc problem"
@@ -5143,279 +5211,6 @@ msgstr "Broadcast 调查有问题"
 msgid "Cannot receive reply to broadcast"
 msgstr "无法接收对广播的应答"
 
-#: sunrpc/rpc_main.c:281
-#, c-format
-msgid "%s: output would overwrite %s\n"
-msgstr "%s:输出将覆盖 %s\n"
-
-#: sunrpc/rpc_main.c:288
-#, c-format
-msgid "%s: unable to open %s: %m\n"
-msgstr "%s:无法打开 %s:%m\n"
-
-#: sunrpc/rpc_main.c:300
-#, c-format
-msgid "%s: while writing output %s: %m"
-msgstr "%s:写入输出 %s 时:%m"
-
-#: sunrpc/rpc_main.c:336 sunrpc/rpc_main.c:375
-#, c-format
-msgid "cannot find C preprocessor: %s\n"
-msgstr "找不到 C 前置处理器:%s\n"
-
-#: sunrpc/rpc_main.c:411
-#, c-format
-msgid "%s: C preprocessor failed with signal %d\n"
-msgstr "%s:C 预处理器因信号 %d 而失败\n"
-
-#: sunrpc/rpc_main.c:414
-#, c-format
-msgid "%s: C preprocessor failed with exit code %d\n"
-msgstr "%s:C 预处理器失败,返回 %d\n"
-
-#: sunrpc/rpc_main.c:454
-#, c-format
-msgid "illegal nettype: `%s'\n"
-msgstr "非法网络类型:“%s”\n"
-
-#: sunrpc/rpc_main.c:1089
-#, c-format
-msgid "rpcgen: too many defines\n"
-msgstr "rpcgen:定义过多\n"
-
-#: sunrpc/rpc_main.c:1101
-#, c-format
-msgid "rpcgen: arglist coding error\n"
-msgstr "rpcgen: arglist 编码错误\n"
-
-#. TRANS: the file will not be removed; this is an
-#. TRANS: informative message.
-#: sunrpc/rpc_main.c:1134
-#, c-format
-msgid "file `%s' already exists and may be overwritten\n"
-msgstr "文件“%s”已存在并可能被覆盖\n"
-
-#: sunrpc/rpc_main.c:1179
-#, c-format
-msgid "Cannot specify more than one input file!\n"
-msgstr "无法指定多个输入文件!\n"
-
-#: sunrpc/rpc_main.c:1349
-#, c-format
-msgid "Cannot use netid flag with inetd flag!\n"
-msgstr "无法在使用 inetd 标志的同时使用 netid 标志!\n"
-
-#: sunrpc/rpc_main.c:1358
-#, c-format
-msgid "Cannot use netid flag without TIRPC!\n"
-msgstr "无法在未使用 TIRPC 的时候使用 netid 标志!\n"
-
-#: sunrpc/rpc_main.c:1365
-#, c-format
-msgid "Cannot use table flags with newstyle!\n"
-msgstr "无法以新风格 (newstyle) 使用表格标志!\n"
-
-#: sunrpc/rpc_main.c:1384
-#, c-format
-msgid "\"infile\" is required for template generation flags.\n"
-msgstr "“输入文件”对模板生成标志来说是必须的。\n"
-
-#: sunrpc/rpc_main.c:1389
-#, c-format
-msgid "Cannot have more than one file generation flag!\n"
-msgstr "无法使用多于一个的文件生成标志!\n"
-
-#: sunrpc/rpc_main.c:1398
-#, c-format
-msgid "usage: %s infile\n"
-msgstr "用法:%s 输入文件\n"
-
-#: sunrpc/rpc_main.c:1399
-#, 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"
-
-#: sunrpc/rpc_main.c:1401
-#, 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"
-
-#: sunrpc/rpc_main.c:1403
-#, c-format
-msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
-msgstr "\t%s [-s 网络类型]* [-o 输出文件] [输入文件]\n"
-
-#: sunrpc/rpc_main.c:1404
-#, c-format
-msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
-msgstr "\t%s [-n 网络 id]* [-o 输出文件] [输入文件]\n"
-
-#: sunrpc/rpc_main.c:1412
-#, c-format
-msgid "options:\n"
-msgstr "选项:\n"
-
-#: sunrpc/rpc_main.c:1413
-#, c-format
-msgid "-a\t\tgenerate all files, including samples\n"
-msgstr "-a\t\t产生所有文件,包含样本\n"
-
-#: sunrpc/rpc_main.c:1414
-#, c-format
-msgid "-b\t\tbackward compatibility mode (generates code for SunOS 4.1)\n"
-msgstr "-b\t\t向后兼容模式 (产生用于 SunOS 4.1 的编码)\n"
-
-#: sunrpc/rpc_main.c:1415
-#, c-format
-msgid "-c\t\tgenerate XDR routines\n"
-msgstr "-c\t\t产生 XDR 例程\n"
-
-#: sunrpc/rpc_main.c:1416
-#, c-format
-msgid "-C\t\tANSI C mode\n"
-msgstr "-C\t\tANSI C 模式\n"
-
-#: sunrpc/rpc_main.c:1417
-#, c-format
-msgid "-Dname[=value]\tdefine a symbol (same as #define)\n"
-msgstr "-D名称[=值]\t定义一个符号 (如同 #define)\n"
-
-#: sunrpc/rpc_main.c:1418
-#, c-format
-msgid "-h\t\tgenerate header file\n"
-msgstr "-h\t\t产生标头档\n"
-
-#: sunrpc/rpc_main.c:1419
-#, c-format
-msgid "-i size\t\tsize at which to start generating inline code\n"
-msgstr "-i 大小\t\t启始产生内联编码的大小\n"
-
-#: sunrpc/rpc_main.c:1420
-#, c-format
-msgid "-I\t\tgenerate code for inetd support in server (for SunOS 4.1)\n"
-msgstr "-I\t\t产生在服务器中支持的 inetd 编码 (用于 SunOS 4.1)\n"
-
-#: sunrpc/rpc_main.c:1421
-#, c-format
-msgid "-K seconds\tserver exits after K seconds of inactivity\n"
-msgstr "-K 秒\t不作用 K 秒之后离开服务器\n"
-
-#: sunrpc/rpc_main.c:1422
-#, c-format
-msgid "-l\t\tgenerate client side stubs\n"
-msgstr "-l\t\t产生客户端残余\n"
-
-#: sunrpc/rpc_main.c:1423
-#, c-format
-msgid "-L\t\tserver errors will be printed to syslog\n"
-msgstr "-L\t\t服务器错误将被打印到 syslog\n"
-
-#: sunrpc/rpc_main.c:1424
-#, c-format
-msgid "-m\t\tgenerate server side stubs\n"
-msgstr "-m\t\t产生服务器端残余\n"
-
-#: sunrpc/rpc_main.c:1425
-#, c-format
-msgid "-M\t\tgenerate MT-safe code\n"
-msgstr "-M\t\t产生多线程安全代码\n"
-
-#: sunrpc/rpc_main.c:1426
-#, c-format
-msgid "-n netid\tgenerate server code that supports named netid\n"
-msgstr "-n netid\t产生支持具名 netid 的服务器编码\n"
-
-#: sunrpc/rpc_main.c:1427
-#, c-format
-msgid "-N\t\tsupports multiple arguments and call-by-value\n"
-msgstr "-N\t\t支持多重参数和传值调用\n"
-
-#: sunrpc/rpc_main.c:1428
-#, c-format
-msgid "-o outfile\tname of the output file\n"
-msgstr "-o 输出文件\t输出文件的名称\n"
-
-#: sunrpc/rpc_main.c:1429
-#, c-format
-msgid "-s nettype\tgenerate server code that supports named nettype\n"
-msgstr "-s nettype\t产生支持具名 nettype 的服务器编码\n"
-
-#: sunrpc/rpc_main.c:1430
-#, c-format
-msgid "-Sc\t\tgenerate sample client code that uses remote procedures\n"
-msgstr "-Sc\t\t产生使用远程进程的范例客户端编码\n"
-
-#: sunrpc/rpc_main.c:1431
-#, c-format
-msgid "-Ss\t\tgenerate sample server code that defines remote procedures\n"
-msgstr "-Ss\t\t产生定义远程进程的范例服务器编码\n"
-
-#: sunrpc/rpc_main.c:1432
-#, c-format
-msgid "-Sm \t\tgenerate makefile template \n"
-msgstr "-Sm\t\t产生 makefile 模板\n"
-
-#: sunrpc/rpc_main.c:1433
-#, c-format
-msgid "-t\t\tgenerate RPC dispatch table\n"
-msgstr "-t\t\t产生 RPC 派送表\n"
-
-#: sunrpc/rpc_main.c:1434
-#, c-format
-msgid "-T\t\tgenerate code to support RPC dispatch tables\n"
-msgstr "-T\t\t产生支持 RPC 派送表的编码\n"
-
-#: sunrpc/rpc_main.c:1435
-#, c-format
-msgid "-Y path\t\tdirectory name to find C preprocessor (cpp)\n"
-msgstr "-Y 路径\t\t要寻找 C 前置处理器 (cpp) 的目录名称\n"
-
-#: sunrpc/rpc_main.c:1436
-#, c-format
-msgid "-5\t\tSysVr4 compatibility mode\n"
-msgstr "-5\t\tSysVr4 兼容模式\n"
-
-#: sunrpc/rpc_main.c:1437
-#, c-format
-msgid "--help\t\tgive this help list\n"
-msgstr "--help\t\t给出这个使用方式列表\n"
-
-#: sunrpc/rpc_main.c:1438
-#, c-format
-msgid "--version\tprint program version\n"
-msgstr "--version\t打印程序版本\n"
-
-#: sunrpc/rpc_main.c:1440
-#, c-format
-msgid ""
-"\n"
-"For bug reporting instructions, please see:\n"
-"%s.\n"
-msgstr ""
-"\n"
-"要知道错误报告指令,请参看:\n"
-"%s。\n"
-
-#: sunrpc/rpc_scan.c:112
-msgid "constant or identifier expected"
-msgstr "应为常量或标识符"
-
-#: sunrpc/rpc_scan.c:308
-msgid "illegal character in file: "
-msgstr "文件中的非法字符:"
-
-#: sunrpc/rpc_scan.c:347 sunrpc/rpc_scan.c:373
-msgid "unterminated string constant"
-msgstr "未终止的字符串常量"
-
-#: sunrpc/rpc_scan.c:379
-msgid "empty char string"
-msgstr "空的字符字串"
-
-#: sunrpc/rpc_scan.c:521 sunrpc/rpc_scan.c:531
-msgid "preprocessor error"
-msgstr "预处理错误"
-
 #: sunrpc/svc_run.c:72
 msgid "svc_run: - out of memory"
 msgstr "svc_run: - 内存不足"
@@ -5474,15 +5269,15 @@ msgstr "svcudp_create:xp_pad 对 IP_PKTINFO 来说太小\n"
 
 #: sunrpc/svc_udp.c:481
 msgid "enablecache: cache already enabled"
-msgstr "enablecache:缓冲区已经启用"
+msgstr "enablecache:缓存已经启用"
 
 #: sunrpc/svc_udp.c:487
 msgid "enablecache: could not allocate cache"
-msgstr "enablecache:无法分配缓冲区"
+msgstr "enablecache:无法分配缓存"
 
 #: sunrpc/svc_udp.c:496
 msgid "enablecache: could not allocate cache data"
-msgstr "enablecache:无法分配缓冲区数据"
+msgstr "enablecache:无法分配缓存数据"
 
 #: sunrpc/svc_udp.c:504
 msgid "enablecache: could not allocate cache fifo"
@@ -5557,7 +5352,7 @@ msgstr "段错误"
 #. 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:40 sysdeps/gnu/errlist.c:360
+#: sysdeps/generic/siglist.h:40 sysdeps/gnu/errlist.h:219
 msgid "Broken pipe"
 msgstr "断开的管道"
 
@@ -5651,12 +5446,12 @@ msgstr "资源丢失"
 
 #. TRANS Only the owner of the file (or other resource)
 #. TRANS or processes with special privileges can perform the operation.
-#: sysdeps/gnu/errlist.c:26
+#: sysdeps/gnu/errlist.h:9
 msgid "Operation not permitted"
 msgstr "不允许的操作"
 
 #. TRANS No process matches the specified process ID.
-#: sysdeps/gnu/errlist.c:46
+#: sysdeps/gnu/errlist.h:21
 msgid "No such process"
 msgstr "没有那个进程"
 
@@ -5667,12 +5462,12 @@ msgstr "没有那个进程"
 #. TRANS You can choose to have functions resume after a signal that is handled,
 #. TRANS rather than failing with @code{EINTR}; see @ref{Interrupted
 #. TRANS Primitives}.
-#: sysdeps/gnu/errlist.c:61
+#: sysdeps/gnu/errlist.h:32
 msgid "Interrupted system call"
 msgstr "被中断的系统调用"
 
 #. TRANS Usually used for physical read or write errors.
-#: sysdeps/gnu/errlist.c:70
+#: sysdeps/gnu/errlist.h:37
 msgid "Input/output error"
 msgstr "输入/输出错误"
 
@@ -5681,7 +5476,7 @@ msgstr "输入/输出错误"
 #. TRANS This can mean that the device file was installed incorrectly, or that
 #. TRANS the physical device is missing or not correctly attached to the
 #. TRANS computer.
-#: sysdeps/gnu/errlist.c:83
+#: sysdeps/gnu/errlist.h:46
 msgid "No such device or address"
 msgstr "没有那个设备或地址"
 
@@ -5689,27 +5484,27 @@ msgstr "没有那个设备或地址"
 #. TRANS being executed with one of the @code{exec} functions (@pxref{Executing a
 #. TRANS File}) occupy too much memory space.  This condition never arises on
 #. TRANS @gnuhurdsystems{}.
-#: sysdeps/gnu/errlist.c:95
+#: sysdeps/gnu/errlist.h:54
 msgid "Argument list too long"
 msgstr "参数列表过长"
 
 #. TRANS Invalid executable file format.  This condition is detected by the
 #. TRANS @code{exec} functions; see @ref{Executing a File}.
-#: sysdeps/gnu/errlist.c:105
+#: sysdeps/gnu/errlist.h:60
 msgid "Exec format error"
 msgstr "可执行文件格式错误"
 
 #. TRANS For example, I/O on a descriptor that has been
 #. TRANS closed or reading from a descriptor open only for writing (or vice
 #. TRANS versa).
-#: sysdeps/gnu/errlist.c:116
+#: sysdeps/gnu/errlist.h:67
 msgid "Bad file descriptor"
 msgstr "错误的文件描述符"
 
 #. TRANS This error happens on operations that are
 #. TRANS supposed to manipulate child processes, when there aren't any processes
 #. TRANS to manipulate.
-#: sysdeps/gnu/errlist.c:127
+#: sysdeps/gnu/errlist.h:74
 msgid "No child processes"
 msgstr "没有子进程"
 
@@ -5717,69 +5512,69 @@ msgstr "没有子进程"
 #. TRANS deadlock situation.  The system does not guarantee that it will notice
 #. TRANS all such situations.  This error means you got lucky and the system
 #. TRANS noticed; it might just hang.  @xref{File Locks}, for an example.
-#: sysdeps/gnu/errlist.c:139
+#: sysdeps/gnu/errlist.h:82
 msgid "Resource deadlock avoided"
 msgstr "已避免资源死锁"
 
 #. TRANS The system cannot allocate more virtual memory
 #. TRANS because its capacity is full.
-#: sysdeps/gnu/errlist.c:149
+#: sysdeps/gnu/errlist.h:88
 msgid "Cannot allocate memory"
 msgstr "无法分配内存"
 
 #. TRANS An invalid pointer was detected.
 #. TRANS On @gnuhurdsystems{}, this error never happens; you get a signal instead.
-#: sysdeps/gnu/errlist.c:168
+#: sysdeps/gnu/errlist.h:99
 msgid "Bad address"
 msgstr "错误的地址"
 
 #. TRANS A file that isn't a block special file was given in a situation that
 #. TRANS requires one.  For example, trying to mount an ordinary file as a file
 #. TRANS system in Unix gives this error.
-#: sysdeps/gnu/errlist.c:179
+#: sysdeps/gnu/errlist.h:106
 msgid "Block device required"
 msgstr "需要块设备"
 
 #. TRANS A system resource that can't be shared is already in use.
 #. TRANS For example, if you try to delete a file that is the root of a currently
 #. TRANS mounted filesystem, you get this error.
-#: sysdeps/gnu/errlist.c:190
+#: sysdeps/gnu/errlist.h:113
 msgid "Device or resource busy"
 msgstr "设备或资源忙"
 
 #. TRANS An existing file was specified in a context where it only
 #. TRANS makes sense to specify a new file.
-#: sysdeps/gnu/errlist.c:200
+#: sysdeps/gnu/errlist.h:119
 msgid "File exists"
 msgstr "文件已存在"
 
 #. TRANS An attempt to make an improper link across file systems was detected.
 #. TRANS This happens not only when you use @code{link} (@pxref{Hard Links}) but
 #. TRANS also when you rename a file with @code{rename} (@pxref{Renaming Files}).
-#: sysdeps/gnu/errlist.c:211
+#: sysdeps/gnu/errlist.h:126
 msgid "Invalid cross-device link"
 msgstr "无效的跨设备链接"
 
 #. TRANS The wrong type of device was given to a function that expects a
 #. TRANS particular sort of device.
-#: sysdeps/gnu/errlist.c:221
+#: sysdeps/gnu/errlist.h:132
 msgid "No such device"
 msgstr "没有那个设备"
 
 #. TRANS A file that isn't a directory was specified when a directory is required.
-#: sysdeps/gnu/errlist.c:230
+#: sysdeps/gnu/errlist.h:137
 msgid "Not a directory"
 msgstr "不是目录"
 
 #. TRANS You cannot open a directory for writing,
 #. TRANS or create or remove hard links to it.
-#: sysdeps/gnu/errlist.c:240
+#: sysdeps/gnu/errlist.h:143
 msgid "Is a directory"
 msgstr "是一个目录"
 
 #. TRANS This is used to indicate various kinds of problems
 #. TRANS with passing the wrong argument to a library function.
-#: sysdeps/gnu/errlist.c:250
+#: sysdeps/gnu/errlist.h:149
 msgid "Invalid argument"
 msgstr "无效的参数"
 
@@ -5790,20 +5585,20 @@ msgstr "无效的参数"
 #. TRANS limit that can usually be increased.  If you get this error, you might
 #. TRANS want to increase the @code{RLIMIT_NOFILE} limit or make it unlimited;
 #. TRANS @pxref{Limits on Resources}.
-#: sysdeps/gnu/errlist.c:265
+#: sysdeps/gnu/errlist.h:160
 msgid "Too many open files"
 msgstr "打开的文件过多"
 
 #. TRANS There are too many distinct file openings in the entire system.  Note
 #. TRANS that any number of linked channels count as just one file opening; see
 #. TRANS @ref{Linked Channels}.  This error never occurs on @gnuhurdsystems{}.
-#: sysdeps/gnu/errlist.c:276
+#: sysdeps/gnu/errlist.h:167
 msgid "Too many open files in system"
 msgstr "系统中打开的文件过多"
 
 #. TRANS Inappropriate I/O control operation, such as trying to set terminal
 #. TRANS modes on an ordinary file.
-#: sysdeps/gnu/errlist.c:286
+#: sysdeps/gnu/errlist.h:173
 msgid "Inappropriate ioctl for device"
 msgstr "对设备不适当的 ioctl 操作"
 
@@ -5812,47 +5607,47 @@ msgstr "对设备不适当的 ioctl 操作"
 #. TRANS debugger to run a program is considered having it open for writing and
 #. TRANS will cause this error.  (The name stands for ``text file busy''.)  This
 #. TRANS is not an error on @gnuhurdsystems{}; the text is copied as necessary.
-#: sysdeps/gnu/errlist.c:299
+#: sysdeps/gnu/errlist.h:182
 msgid "Text file busy"
 msgstr "文本文件忙"
 
 #. TRANS The size of a file would be larger than allowed by the system.
-#: sysdeps/gnu/errlist.c:308
+#: sysdeps/gnu/errlist.h:187
 msgid "File too large"
 msgstr "文件过大"
 
 #. TRANS Write operation on a file failed because the
 #. TRANS disk is full.
-#: sysdeps/gnu/errlist.c:318
+#: sysdeps/gnu/errlist.h:193
 msgid "No space left on device"
 msgstr "设备上没有空间"
 
 #. TRANS Invalid seek operation (such as on a pipe).
-#: sysdeps/gnu/errlist.c:327
+#: sysdeps/gnu/errlist.h:198
 msgid "Illegal seek"
 msgstr "非法 seek 操作"
 
 #. TRANS An attempt was made to modify something on a read-only file system.
-#: sysdeps/gnu/errlist.c:336
+#: sysdeps/gnu/errlist.h:203
 msgid "Read-only file system"
 msgstr "只读文件系统"
 
 #. TRANS The link count of a single file would become too large.
 #. TRANS @code{rename} can cause this error if the file being renamed already has
 #. TRANS as many links as it can take (@pxref{Renaming Files}).
-#: sysdeps/gnu/errlist.c:347
+#: sysdeps/gnu/errlist.h:210
 msgid "Too many links"
 msgstr "过多的链接"
 
 #. TRANS Used by mathematical functions when an argument value does
 #. TRANS not fall into the domain over which the function is defined.
-#: sysdeps/gnu/errlist.c:370
+#: sysdeps/gnu/errlist.h:225
 msgid "Numerical argument out of domain"
 msgstr "数值参数超出域"
 
 #. TRANS Used by mathematical functions when the result value is
 #. TRANS not representable because of overflow or underflow.
-#: sysdeps/gnu/errlist.c:380
+#: sysdeps/gnu/errlist.h:231
 msgid "Numerical result out of range"
 msgstr "数值结果超出范围"
 
@@ -5885,19 +5680,10 @@ msgstr "数值结果超出范围"
 #. TRANS so usually an interactive program should report the error to the user
 #. TRANS and return to its command loop.
 #. TRANS @end itemize
-#: sysdeps/gnu/errlist.c:417
+#: sysdeps/gnu/errlist.h:264
 msgid "Resource temporarily unavailable"
 msgstr "资源暂时不可用"
 
-#. TRANS In @theglibc{}, this is another name for @code{EAGAIN} (above).
-#. TRANS The values are always the same, on every operating system.
-#. TRANS
-#. TRANS C libraries in many older Unix systems have @code{EWOULDBLOCK} as a
-#. TRANS separate error code.
-#: sysdeps/gnu/errlist.c:430
-msgid "Operation would block"
-msgstr "操作将阻塞"
-
 #. TRANS An operation that cannot complete immediately was initiated on an object
 #. TRANS that has non-blocking mode selected.  Some functions that must always
 #. TRANS block (such as @code{connect}; @pxref{Connecting}) never return
@@ -5906,47 +5692,47 @@ msgstr "操作将阻塞"
 #. TRANS the object before the call completes return @code{EALREADY}.  You can
 #. TRANS use the @code{select} function to find out when the pending operation
 #. TRANS has completed; @pxref{Waiting for I/O}.
-#: sysdeps/gnu/errlist.c:446
+#: sysdeps/gnu/errlist.h:276
 msgid "Operation now in progress"
 msgstr "操作现在正在进行"
 
 #. TRANS An operation is already in progress on an object that has non-blocking
 #. TRANS mode selected.
-#: sysdeps/gnu/errlist.c:456
+#: sysdeps/gnu/errlist.h:282
 msgid "Operation already in progress"
 msgstr "操作已经在进行"
 
 #. TRANS A file that isn't a socket was specified when a socket is required.
-#: sysdeps/gnu/errlist.c:465
+#: sysdeps/gnu/errlist.h:287
 msgid "Socket operation on non-socket"
 msgstr "对非套接字进行套接字操作"
 
 #. TRANS The size of a message sent on a socket was larger than the supported
 #. TRANS maximum size.
-#: sysdeps/gnu/errlist.c:475
+#: sysdeps/gnu/errlist.h:293
 msgid "Message too long"
 msgstr "消息过长"
 
 #. TRANS The socket type does not support the requested communications protocol.
-#: sysdeps/gnu/errlist.c:484
+#: sysdeps/gnu/errlist.h:298
 msgid "Protocol wrong type for socket"
 msgstr "错误的 socket 协议类型"
 
 #. TRANS You specified a socket option that doesn't make sense for the
 #. TRANS particular protocol being used by the socket.  @xref{Socket Options}.
-#: sysdeps/gnu/errlist.c:494
+#: sysdeps/gnu/errlist.h:304
 msgid "Protocol not available"
 msgstr "不可用的协议"
 
 #. TRANS The socket domain does not support the requested communications protocol
 #. TRANS (perhaps because the requested protocol is completely invalid).
 #. TRANS @xref{Creating a Socket}.
-#: sysdeps/gnu/errlist.c:505
+#: sysdeps/gnu/errlist.h:311
 msgid "Protocol not supported"
 msgstr "不支持的协议"
 
 #. TRANS The socket type is not supported.
-#: sysdeps/gnu/errlist.c:514
+#: sysdeps/gnu/errlist.h:316
 msgid "Socket type not supported"
 msgstr "不支持的套接字类型"
 
@@ -5956,71 +5742,71 @@ msgstr "不支持的套接字类型"
 #. TRANS error can happen for many calls when the object does not support the
 #. TRANS particular operation; it is a generic indication that the server knows
 #. TRANS nothing to do for that call.
-#: sysdeps/gnu/errlist.c:528
+#: sysdeps/gnu/errlist.h:326
 msgid "Operation not supported"
 msgstr "不支持的操作"
 
 #. TRANS The socket communications protocol family you requested is not supported.
-#: sysdeps/gnu/errlist.c:537
+#: sysdeps/gnu/errlist.h:331
 msgid "Protocol family not supported"
 msgstr "不支持的协议族"
 
 #. TRANS The address family specified for a socket is not supported; it is
 #. TRANS inconsistent with the protocol being used on the socket.  @xref{Sockets}.
-#: sysdeps/gnu/errlist.c:547
+#: sysdeps/gnu/errlist.h:337
 msgid "Address family not supported by protocol"
 msgstr "协议不支持的地址族"
 
 #. TRANS The requested socket address is already in use.  @xref{Socket Addresses}.
-#: sysdeps/gnu/errlist.c:556
+#: sysdeps/gnu/errlist.h:342
 msgid "Address already in use"
 msgstr "地址已在使用"
 
 #. TRANS The requested socket address is not available; for example, you tried
 #. TRANS to give a socket a name that doesn't match the local host name.
 #. TRANS @xref{Socket Addresses}.
-#: sysdeps/gnu/errlist.c:567
+#: sysdeps/gnu/errlist.h:349
 msgid "Cannot assign requested address"
 msgstr "无法指定被请求的地址"
 
 #. TRANS A socket operation failed because the network was down.
-#: sysdeps/gnu/errlist.c:576
+#: sysdeps/gnu/errlist.h:354
 msgid "Network is down"
 msgstr "网络已关闭"
 
 #. TRANS A socket operation failed because the subnet containing the remote host
 #. TRANS was unreachable.
-#: sysdeps/gnu/errlist.c:586
+#: sysdeps/gnu/errlist.h:360
 msgid "Network is unreachable"
 msgstr "网络不可达"
 
 #. TRANS A network connection was reset because the remote host crashed.
-#: sysdeps/gnu/errlist.c:595
+#: sysdeps/gnu/errlist.h:365
 msgid "Network dropped connection on reset"
 msgstr "重置时断开网络连接"
 
 #. TRANS A network connection was aborted locally.
-#: sysdeps/gnu/errlist.c:604
+#: sysdeps/gnu/errlist.h:370
 msgid "Software caused connection abort"
 msgstr "由软件导致的连接断开"
 
 #. TRANS A network connection was closed for reasons outside the control of the
 #. TRANS local host, such as by the remote machine rebooting or an unrecoverable
 #. TRANS protocol violation.
-#: sysdeps/gnu/errlist.c:615
+#: sysdeps/gnu/errlist.h:377
 msgid "Connection reset by peer"
 msgstr "连接被对方重设"
 
 #. TRANS The kernel's buffers for I/O operations are all in use.  In GNU, this
 #. TRANS error is always synonymous with @code{ENOMEM}; you may get one or the
 #. TRANS other from network operations.
-#: sysdeps/gnu/errlist.c:626
+#: sysdeps/gnu/errlist.h:384
 msgid "No buffer space available"
 msgstr "没有可用的缓冲区空间"
 
 #. TRANS You tried to connect a socket that is already connected.
 #. TRANS @xref{Connecting}.
-#: sysdeps/gnu/errlist.c:636
+#: sysdeps/gnu/errlist.h:390
 msgid "Transport endpoint is already connected"
 msgstr "传输端点已连接"
 
@@ -6028,82 +5814,74 @@ msgstr "传输端点已连接"
 #. TRANS try to transmit data over a socket, without first specifying a
 #. TRANS destination for the data.  For a connectionless socket (for datagram
 #. TRANS protocols, such as UDP), you get @code{EDESTADDRREQ} instead.
-#: sysdeps/gnu/errlist.c:648
+#: sysdeps/gnu/errlist.h:398
 msgid "Transport endpoint is not connected"
 msgstr "传输端点尚未连接"
 
 #. TRANS No default destination address was set for the socket.  You get this
 #. TRANS error when you try to transmit data over a connectionless socket,
 #. TRANS without first specifying a destination for the data with @code{connect}.
-#: sysdeps/gnu/errlist.c:659
+#: sysdeps/gnu/errlist.h:405
 msgid "Destination address required"
 msgstr "需要目标地址"
 
 #. TRANS The socket has already been shut down.
-#: sysdeps/gnu/errlist.c:668
+#: sysdeps/gnu/errlist.h:410
 msgid "Cannot send after transport endpoint shutdown"
 msgstr "无法在传输端点关闭以后发送"
 
-#: sysdeps/gnu/errlist.c:676
+#: sysdeps/gnu/errlist.h:413
 msgid "Too many references: cannot splice"
 msgstr "过多的引用:无法接合"
 
 #. TRANS A socket operation with a specified timeout received no response during
 #. TRANS the timeout period.
-#: sysdeps/gnu/errlist.c:686
+#: sysdeps/gnu/errlist.h:419
 msgid "Connection timed out"
 msgstr "连接超时"
 
 #. TRANS A remote host refused to allow the network connection (typically because
 #. TRANS it is not running the requested service).
-#: sysdeps/gnu/errlist.c:696
+#: sysdeps/gnu/errlist.h:425
 msgid "Connection refused"
 msgstr "拒绝连接"
 
 #. TRANS Too many levels of symbolic links were encountered in looking up a file name.
 #. TRANS This often indicates a cycle of symbolic links.
-#: sysdeps/gnu/errlist.c:706
+#: sysdeps/gnu/errlist.h:431
 msgid "Too many levels of symbolic links"
 msgstr "符号连接的层数过多"
 
 #. TRANS Filename too long (longer than @code{PATH_MAX}; @pxref{Limits for
 #. TRANS Files}) or host name too long (in @code{gethostname} or
 #. TRANS @code{sethostname}; @pxref{Host Identification}).
-#: sysdeps/gnu/errlist.c:717
+#: sysdeps/gnu/errlist.h:438
 msgid "File name too long"
 msgstr "文件名过长"
 
 #. TRANS The remote host for a requested network connection is down.
-#: sysdeps/gnu/errlist.c:726
+#: sysdeps/gnu/errlist.h:443
 msgid "Host is down"
 msgstr "主机关闭"
 
-#. TRANS The remote host for a requested network connection is not reachable.
-#: sysdeps/gnu/errlist.c:735
+#: sysdeps/gnu/errlist.h:448
 msgid "No route to host"
 msgstr "没有到主机的路由"
 
 #. TRANS Directory not empty, where an empty directory was expected.  Typically,
 #. TRANS this error occurs when you are trying to delete a directory.
-#: sysdeps/gnu/errlist.c:745
+#: sysdeps/gnu/errlist.h:454
 msgid "Directory not empty"
 msgstr "目录非空"
 
-#. TRANS This means that the per-user limit on new process would be exceeded by
-#. TRANS an attempted @code{fork}.  @xref{Limits on Resources}, for details on
-#. TRANS the @code{RLIMIT_NPROC} limit.
-#: sysdeps/gnu/errlist.c:756
-msgid "Too many processes"
-msgstr "进程过多"
-
 #. TRANS The file quota system is confused because there are too many users.
 #. TRANS @c This can probably happen in a GNU system when using NFS.
-#: sysdeps/gnu/errlist.c:766
+#: sysdeps/gnu/errlist.h:460
 msgid "Too many users"
 msgstr "用户过多"
 
 #. TRANS The user's disk quota was exceeded.
-#: sysdeps/gnu/errlist.c:775
+#: sysdeps/gnu/errlist.h:465
 msgid "Disk quota exceeded"
 msgstr "超出磁盘限额"
 
@@ -6112,7 +5890,7 @@ msgstr "超出磁盘限额"
 #. TRANS for NFS file systems or corruption in other file systems.
 #. TRANS Repairing this condition usually requires unmounting, possibly repairing
 #. TRANS and remounting the file system.
-#: sysdeps/gnu/errlist.c:788
+#: sysdeps/gnu/errlist.h:474
 msgid "Stale file handle"
 msgstr "过旧的文件控柄"
 
@@ -6120,211 +5898,74 @@ msgstr "过旧的文件控柄"
 #. TRANS already specifies an NFS-mounted file.
 #. TRANS (This is an error on some operating systems, but we expect it to work
 #. TRANS properly on @gnuhurdsystems{}, making this error code impossible.)
-#: sysdeps/gnu/errlist.c:800
+#: sysdeps/gnu/errlist.h:482
 msgid "Object is remote"
 msgstr "对象是远程的"
 
-#: sysdeps/gnu/errlist.c:808
-msgid "RPC struct is bad"
-msgstr "RPC 结构错误"
-
-#: sysdeps/gnu/errlist.c:816
-msgid "RPC version wrong"
-msgstr "RPC 版本错误"
-
-#: sysdeps/gnu/errlist.c:824
-msgid "RPC program not available"
-msgstr "RPC 程序不可用"
-
-#: sysdeps/gnu/errlist.c:832
-msgid "RPC program version wrong"
-msgstr "RPC 程序版本错误"
-
-#: sysdeps/gnu/errlist.c:840
-msgid "RPC bad procedure for program"
-msgstr "程序的 RPC 进程错误"
-
 #. TRANS This is used by the file locking facilities; see
 #. TRANS @ref{File Locks}.  This error is never generated by @gnuhurdsystems{}, but
 #. TRANS it can result from an operation to an NFS server running another
 #. TRANS operating system.
-#: sysdeps/gnu/errlist.c:852
+#: sysdeps/gnu/errlist.h:490
 msgid "No locks available"
 msgstr "没有可用的锁"
 
-#. TRANS The file was the wrong type for the
-#. TRANS operation, or a data file had the wrong format.
-#. TRANS
-#. TRANS On some systems @code{chmod} returns this error if you try to set the
-#. TRANS sticky bit on a non-directory file; @pxref{Setting Permissions}.
-#: sysdeps/gnu/errlist.c:865
-msgid "Inappropriate file type or format"
-msgstr "不适当的文件类型或格式"
-
-#: sysdeps/gnu/errlist.c:873
-msgid "Authentication error"
-msgstr "认证错误"
-
-#: sysdeps/gnu/errlist.c:881
-msgid "Need authenticator"
-msgstr "需要认证器"
-
 #. TRANS This indicates that the function called is
 #. TRANS not implemented at all, either in the C library itself or in the
 #. TRANS operating system.  When you get this error, you can be sure that this
 #. TRANS particular function will always fail with @code{ENOSYS} unless you
 #. TRANS install a new version of the C library or the operating system.
-#: sysdeps/gnu/errlist.c:894
+#: sysdeps/gnu/errlist.h:499
 msgid "Function not implemented"
 msgstr "函数未实现"
 
-#. TRANS A function returns this error when certain parameter
-#. TRANS values are valid, but the functionality they request is not available.
-#. TRANS This can mean that the function does not implement a particular command
-#. TRANS or option value or flag bit at all.  For functions that operate on some
-#. TRANS object given in a parameter, such as a file descriptor or a port, it
-#. TRANS might instead mean that only @emph{that specific object} (file
-#. TRANS descriptor, port, etc.) is unable to support the other parameters given;
-#. TRANS different file descriptors might support different ranges of parameter
-#. TRANS values.
-#. TRANS
-#. TRANS If the entire function is not available at all in the implementation,
-#. TRANS it returns @code{ENOSYS} instead.
-#: sysdeps/gnu/errlist.c:914
-msgid "Not supported"
-msgstr "不支持"
-
 #. TRANS While decoding a multibyte character the function came along an invalid
 #. TRANS or an incomplete sequence of bytes or the given wide character is invalid.
-#: sysdeps/gnu/errlist.c:924
+#: sysdeps/gnu/errlist.h:505
 msgid "Invalid or incomplete multibyte or wide character"
 msgstr "无效或不完整的多字节字符或宽字符"
 
-#. TRANS On @gnuhurdsystems{}, servers supporting the @code{term} protocol return
-#. TRANS this error for certain operations when the caller is not in the
-#. TRANS foreground process group of the terminal.  Users do not usually see this
-#. TRANS error because functions such as @code{read} and @code{write} translate
-#. TRANS it into a @code{SIGTTIN} or @code{SIGTTOU} signal.  @xref{Job Control},
-#. TRANS for information on process groups and these signals.
-#: sysdeps/gnu/errlist.c:938
-msgid "Inappropriate operation for background process"
-msgstr "对后台进程的不适当操作"
-
-#. TRANS On @gnuhurdsystems{}, opening a file returns this error when the file is
-#. TRANS translated by a program and the translator program dies while starting
-#. TRANS up, before it has connected to the file.
-#: sysdeps/gnu/errlist.c:949
-msgid "Translator died"
-msgstr "中介程序已经结束"
-
-#. TRANS The experienced user will know what is wrong.
-#. TRANS @c This error code is a joke.  Its perror text is part of the joke.
-#. TRANS @c Don't change it.
-#: sysdeps/gnu/errlist.c:960
-msgid "?"
-msgstr "?"
-
-#. TRANS You did @strong{what}?
-#: sysdeps/gnu/errlist.c:969
-msgid "You really blew it this time"
-msgstr "这次真的被您打败了"
-
-# This is error EIEIO, errno 104
-#
-# - Macro: int EIEIO
-#     Go home and have a glass of warm, dairy-fresh milk.
-#
-# The following messages were copied & pasted
-# from es.po by Santiago Vila Doncel <sanvila@unex.es>.
-#
-# <es.po>
-#  稣u diablos es esto?, esperemos a tener las fuentes
-#  estupendo, este error parece mostrarse en dos ocasiones
-# - Macro: int EIEIO
-#     Go home and have a glass of warm, dairy-fresh milk.
-#  Jochen tambien lo traduce as.  em
-#
-# Okay.  Since you are dying to know, I'll tell you.
-# This is a joke, obviously.  There is a children's song which begins,
-# "Old McDonald had a farm, e-i-e-i-o."  Every time I see the (real)
-# errno macro EIO, I think about that song.  Probably most of my
-# compatriots who program on Unix do, too.  One of them must have stayed
-# up a little too late one night and decided to add it to Hurd or Glibc.
-# Whoever did it should be castigated, but it made me laugh.
-#  --jtobey@channel1.com
-#
-# "bought the farm" means "died".  -jtobey
-#
-# Bueno, pues despu廥 de pensarlo mucho, he seguido el ejemplo de la
-# traducci鏮 francesa (traducci鏮 libre). sv
-# </es.po>
-#
-# 简单的说,儿歌 "唐老先生有块地...",然后呢?? ;-p
-#
-#. TRANS Go home and have a glass of warm, dairy-fresh milk.
-#. TRANS @c Okay.  Since you are dying to know, I'll tell you.
-#. TRANS @c This is a joke, obviously.  There is a children's song which begins,
-#. TRANS @c "Old McDonald had a farm, e-i-e-i-o."  Every time I see the (real)
-#. TRANS @c errno macro EIO, I think about that song.  Probably most of my
-#. TRANS @c compatriots who program on Unix do, too.  One of them must have stayed
-#. TRANS @c up a little too late one night and decided to add it to Hurd or Glibc.
-#. TRANS @c Whoever did it should be castigated, but it made me laugh.
-#. TRANS @c  --jtobey@channel1.com
-#. TRANS @c
-#. TRANS @c "bought the farm" means "died".  -jtobey
-#. TRANS @c
-#. TRANS @c Translators, please do not translate this litteraly, translate it into
-#. TRANS @c an idiomatic funny way of saying that the computer died.
-#: sysdeps/gnu/errlist.c:991
-msgid "Computer bought the farm"
-msgstr "这台电脑买了一块地啰"
-
-#. TRANS This error code has no purpose.
-#: sysdeps/gnu/errlist.c:1000
-msgid "Gratuitous error"
-msgstr "无故的错误"
-
-#: sysdeps/gnu/errlist.c:1008
+#: sysdeps/gnu/errlist.h:508
 msgid "Bad message"
 msgstr "错误的消息"
 
-#: sysdeps/gnu/errlist.c:1016
+#: sysdeps/gnu/errlist.h:511
 msgid "Identifier removed"
 msgstr "标识符已删除"
 
-#: sysdeps/gnu/errlist.c:1024
+#: sysdeps/gnu/errlist.h:514
 msgid "Multihop attempted"
 msgstr "尝试 Multihop"
 
-#: sysdeps/gnu/errlist.c:1032
+#: sysdeps/gnu/errlist.h:517
 msgid "No data available"
 msgstr "没有可用的数据"
 
-#: sysdeps/gnu/errlist.c:1040
+#: sysdeps/gnu/errlist.h:520
 msgid "Link has been severed"
 msgstr "链接已有服务"
 
-#: sysdeps/gnu/errlist.c:1048
+#: sysdeps/gnu/errlist.h:523
 msgid "No message of desired type"
 msgstr "没有符合需求格式的消息"
 
-#: sysdeps/gnu/errlist.c:1056
+#: sysdeps/gnu/errlist.h:526
 msgid "Out of streams resources"
 msgstr "流资源不足"
 
-#: sysdeps/gnu/errlist.c:1064
+#: sysdeps/gnu/errlist.h:529
 msgid "Device not a stream"
 msgstr "设备不是流"
 
-#: sysdeps/gnu/errlist.c:1072
+#: sysdeps/gnu/errlist.h:532
 msgid "Value too large for defined data type"
 msgstr "对已定义的数据类型来说值过大"
 
-#: sysdeps/gnu/errlist.c:1080
+#: sysdeps/gnu/errlist.h:535
 msgid "Protocol error"
 msgstr "协议错误"
 
-#: sysdeps/gnu/errlist.c:1088
+#: sysdeps/gnu/errlist.h:538
 msgid "Timer expired"
 msgstr "计时器超时"
 
@@ -6332,199 +5973,348 @@ msgstr "计时器超时"
 #. TRANS completed.  @xref{Asynchronous I/O}.  When you call @code{aio_cancel},
 #. TRANS the normal result is for the operations affected to complete with this
 #. TRANS error; @pxref{Cancel AIO Operations}.
-#: sysdeps/gnu/errlist.c:1100
+#: sysdeps/gnu/errlist.h:546
 msgid "Operation canceled"
 msgstr "操作已取消"
 
-#: sysdeps/gnu/errlist.c:1108
+#: sysdeps/gnu/errlist.h:549
 msgid "Owner died"
 msgstr "拥有者已消逝"
 
-#: sysdeps/gnu/errlist.c:1116
+#: sysdeps/gnu/errlist.h:552
 msgid "State not recoverable"
 msgstr "状态无法回复"
 
-#: sysdeps/gnu/errlist.c:1124
+#: sysdeps/gnu/errlist.h:555
 msgid "Interrupted system call should be restarted"
 msgstr "被中断的系统调用应该重新启动"
 
-#: sysdeps/gnu/errlist.c:1132
+#: sysdeps/gnu/errlist.h:558
 msgid "Channel number out of range"
 msgstr "通道编号超出范围"
 
-#: sysdeps/gnu/errlist.c:1140
+#: sysdeps/gnu/errlist.h:561
 msgid "Level 2 not synchronized"
 msgstr "级别 2 尚未同步"
 
-#: sysdeps/gnu/errlist.c:1148
+#: sysdeps/gnu/errlist.h:564
 msgid "Level 3 halted"
 msgstr "级别 3 已关闭"
 
-#: sysdeps/gnu/errlist.c:1156
+#: sysdeps/gnu/errlist.h:567
 msgid "Level 3 reset"
 msgstr "级别 3 已重置"
 
-#: sysdeps/gnu/errlist.c:1164
+#: sysdeps/gnu/errlist.h:570
 msgid "Link number out of range"
 msgstr "链接数超出范围"
 
-#: sysdeps/gnu/errlist.c:1172
+#: sysdeps/gnu/errlist.h:573
 msgid "Protocol driver not attached"
 msgstr "未加载协议驱动程序"
 
-#: sysdeps/gnu/errlist.c:1180
+#: sysdeps/gnu/errlist.h:576
 msgid "No CSI structure available"
 msgstr "没有可用的 CSI 结构"
 
-#: sysdeps/gnu/errlist.c:1188
+#: sysdeps/gnu/errlist.h:579
 msgid "Level 2 halted"
 msgstr "级别 2 己关闭"
 
-#: sysdeps/gnu/errlist.c:1196
+#: sysdeps/gnu/errlist.h:582
 msgid "Invalid exchange"
 msgstr "无效的交换"
 
-#: sysdeps/gnu/errlist.c:1204
+#: sysdeps/gnu/errlist.h:585
 msgid "Invalid request descriptor"
 msgstr "无效的请求描述符"
 
-#: sysdeps/gnu/errlist.c:1212
+#: sysdeps/gnu/errlist.h:588
 msgid "Exchange full"
 msgstr "交换满"
 
-#: sysdeps/gnu/errlist.c:1220
+#: sysdeps/gnu/errlist.h:591
 msgid "No anode"
 msgstr "没有 anode"
 
-#: sysdeps/gnu/errlist.c:1228
+#: sysdeps/gnu/errlist.h:594
 msgid "Invalid request code"
 msgstr "无效的请求码"
 
-#: sysdeps/gnu/errlist.c:1236
+#: sysdeps/gnu/errlist.h:597
 msgid "Invalid slot"
 msgstr "不适用的 slot"
 
-#: sysdeps/gnu/errlist.c:1244
-msgid "File locking deadlock error"
-msgstr "文件锁死锁错误"
-
-#: sysdeps/gnu/errlist.c:1252
+#: sysdeps/gnu/errlist.h:600
 msgid "Bad font file format"
 msgstr "错误的字体文件格式"
 
-#: sysdeps/gnu/errlist.c:1260
+#: sysdeps/gnu/errlist.h:603
 msgid "Machine is not on the network"
 msgstr "机器不在网络中"
 
-#: sysdeps/gnu/errlist.c:1268
+#: sysdeps/gnu/errlist.h:606
 msgid "Package not installed"
 msgstr "包未安装"
 
-#: sysdeps/gnu/errlist.c:1276
+#: sysdeps/gnu/errlist.h:609
 msgid "Advertise error"
 msgstr "通知错误"
 
-#: sysdeps/gnu/errlist.c:1284
+#: sysdeps/gnu/errlist.h:612
 msgid "Srmount error"
 msgstr "Srmount 错误"
 
-#: sysdeps/gnu/errlist.c:1292
+#: sysdeps/gnu/errlist.h:615
 msgid "Communication error on send"
 msgstr "发送时出现通讯错误"
 
-#: sysdeps/gnu/errlist.c:1300
+#: sysdeps/gnu/errlist.h:618
 msgid "RFS specific error"
 msgstr "RFS 特定错误"
 
-#: sysdeps/gnu/errlist.c:1308
+#: sysdeps/gnu/errlist.h:621
 msgid "Name not unique on network"
 msgstr "网络上的名称不是唯一的"
 
-#: sysdeps/gnu/errlist.c:1316
+#: sysdeps/gnu/errlist.h:624
 msgid "File descriptor in bad state"
 msgstr "文件描述符处于错误状态"
 
-#: sysdeps/gnu/errlist.c:1324
+#: sysdeps/gnu/errlist.h:627
 msgid "Remote address changed"
 msgstr "远程地址已改变"
 
-#: sysdeps/gnu/errlist.c:1332
+#: sysdeps/gnu/errlist.h:630
 msgid "Can not access a needed shared library"
 msgstr "无法访问必须的共享库"
 
-#: sysdeps/gnu/errlist.c:1340
+#: sysdeps/gnu/errlist.h:633
 msgid "Accessing a corrupted shared library"
 msgstr "正在访问一个已毁坏的共享库"
 
-#: sysdeps/gnu/errlist.c:1348
+#: sysdeps/gnu/errlist.h:636
 msgid ".lib section in a.out corrupted"
 msgstr "a.out 中的 .lib 节已毁坏"
 
-#: sysdeps/gnu/errlist.c:1356
+#: sysdeps/gnu/errlist.h:639
 msgid "Attempting to link in too many shared libraries"
 msgstr "试图与过多的共享库相链接"
 
-#: sysdeps/gnu/errlist.c:1364
+#: sysdeps/gnu/errlist.h:642
 msgid "Cannot exec a shared library directly"
 msgstr "无法直接执行共享库"
 
-#: sysdeps/gnu/errlist.c:1372
+#: sysdeps/gnu/errlist.h:645
 msgid "Streams pipe error"
 msgstr "流管道错误"
 
-#: sysdeps/gnu/errlist.c:1380
+#: sysdeps/gnu/errlist.h:648
 msgid "Structure needs cleaning"
 msgstr "结构需要清理"
 
-#: sysdeps/gnu/errlist.c:1388
+#: sysdeps/gnu/errlist.h:651
 msgid "Not a XENIX named type file"
 msgstr "不是 XENIX 命名的类型文件"
 
-#: sysdeps/gnu/errlist.c:1396
+#: sysdeps/gnu/errlist.h:654
 msgid "No XENIX semaphores available"
 msgstr "没有可用的 XENIX 信号量"
 
-#: sysdeps/gnu/errlist.c:1404
+#: sysdeps/gnu/errlist.h:657
 msgid "Is a named type file"
 msgstr "是一个有名类型文件"
 
-#: sysdeps/gnu/errlist.c:1412
+#: sysdeps/gnu/errlist.h:660
 msgid "Remote I/O error"
 msgstr "远程 I/O 错误"
 
-#: sysdeps/gnu/errlist.c:1420
+#: sysdeps/gnu/errlist.h:663
 msgid "No medium found"
 msgstr "找不到介质"
 
-#: sysdeps/gnu/errlist.c:1428
+#: sysdeps/gnu/errlist.h:666
 msgid "Wrong medium type"
 msgstr "错误的介质类型"
 
-#: sysdeps/gnu/errlist.c:1436
+#: sysdeps/gnu/errlist.h:669
 msgid "Required key not available"
 msgstr "需要的关键字不存在"
 
-#: sysdeps/gnu/errlist.c:1444
+#: sysdeps/gnu/errlist.h:672
 msgid "Key has expired"
 msgstr "关键字已过期"
 
-#: sysdeps/gnu/errlist.c:1452
+#: sysdeps/gnu/errlist.h:675
 msgid "Key has been revoked"
 msgstr "键值已取消"
 
-#: sysdeps/gnu/errlist.c:1460
+#: sysdeps/gnu/errlist.h:678
 msgid "Key was rejected by service"
 msgstr "键值被服务所拒绝"
 
-#: sysdeps/gnu/errlist.c:1468
+#: sysdeps/gnu/errlist.h:681
 msgid "Operation not possible due to RF-kill"
 msgstr "由于 RF-kill 而无法操作"
 
-#: sysdeps/gnu/errlist.c:1476
+#: sysdeps/gnu/errlist.h:684
 msgid "Memory page has hardware error"
 msgstr "内存分页有硬件错误"
 
-#: sysdeps/mach/_strerror.c:56
+#: sysdeps/gnu/errlist.h:687
+msgid "RPC struct is bad"
+msgstr "RPC 结构错误"
+
+#. TRANS The file was the wrong type for the
+#. TRANS operation, or a data file had the wrong format.
+#. TRANS
+#. TRANS On some systems @code{chmod} returns this error if you try to set the
+#. TRANS sticky bit on a non-directory file; @pxref{Setting Permissions}.
+#: sysdeps/gnu/errlist.h:696
+msgid "Inappropriate file type or format"
+msgstr "不适当的文件类型或格式"
+
+#: sysdeps/gnu/errlist.h:699
+msgid "RPC bad procedure for program"
+msgstr "程序的 RPC 进程错误"
+
+#: sysdeps/gnu/errlist.h:702
+msgid "Authentication error"
+msgstr "认证错误"
+
+#. TRANS On @gnuhurdsystems{}, opening a file returns this error when the file is
+#. TRANS translated by a program and the translator program dies while starting
+#. TRANS up, before it has connected to the file.
+#: sysdeps/gnu/errlist.h:709
+msgid "Translator died"
+msgstr "中介程序已经结束"
+
+#: sysdeps/gnu/errlist.h:712
+msgid "RPC version wrong"
+msgstr "RPC 版本错误"
+
+#. TRANS You did @strong{what}?
+#: sysdeps/gnu/errlist.h:717
+msgid "You really blew it this time"
+msgstr "这次真的被您打败了"
+
+#. TRANS This means that the per-user limit on new process would be exceeded by
+#. TRANS an attempted @code{fork}.  @xref{Limits on Resources}, for details on
+#. TRANS the @code{RLIMIT_NPROC} limit.
+#: sysdeps/gnu/errlist.h:724
+msgid "Too many processes"
+msgstr "进程过多"
+
+#. TRANS This error code has no purpose.
+#: sysdeps/gnu/errlist.h:729
+msgid "Gratuitous error"
+msgstr "无故的错误"
+
+#. TRANS A function returns this error when certain parameter
+#. TRANS values are valid, but the functionality they request is not available.
+#. TRANS This can mean that the function does not implement a particular command
+#. TRANS or option value or flag bit at all.  For functions that operate on some
+#. TRANS object given in a parameter, such as a file descriptor or a port, it
+#. TRANS might instead mean that only @emph{that specific object} (file
+#. TRANS descriptor, port, etc.) is unable to support the other parameters given;
+#. TRANS different file descriptors might support different ranges of parameter
+#. TRANS values.
+#. TRANS
+#. TRANS If the entire function is not available at all in the implementation,
+#. TRANS it returns @code{ENOSYS} instead.
+#: sysdeps/gnu/errlist.h:745
+msgid "Not supported"
+msgstr "不支持"
+
+#: sysdeps/gnu/errlist.h:748
+msgid "RPC program version wrong"
+msgstr "RPC 程序版本错误"
+
+#. TRANS On @gnuhurdsystems{}, servers supporting the @code{term} protocol return
+#. TRANS this error for certain operations when the caller is not in the
+#. TRANS foreground process group of the terminal.  Users do not usually see this
+#. TRANS error because functions such as @code{read} and @code{write} translate
+#. TRANS it into a @code{SIGTTIN} or @code{SIGTTOU} signal.  @xref{Job Control},
+#. TRANS for information on process groups and these signals.
+#: sysdeps/gnu/errlist.h:758
+msgid "Inappropriate operation for background process"
+msgstr "对后台进程的不适当操作"
+
+# This is error EIEIO, errno 104
+#
+# - Macro: int EIEIO
+#     Go home and have a glass of warm, dairy-fresh milk.
+#
+# The following messages were copied & pasted
+# from es.po by Santiago Vila Doncel <sanvila@unex.es>.
+#
+# <es.po>
+#  稣u diablos es esto?, esperemos a tener las fuentes
+#  estupendo, este error parece mostrarse en dos ocasiones
+# - Macro: int EIEIO
+#     Go home and have a glass of warm, dairy-fresh milk.
+#  Jochen tambien lo traduce as.  em
+#
+# Okay.  Since you are dying to know, I'll tell you.
+# This is a joke, obviously.  There is a children's song which begins,
+# "Old McDonald had a farm, e-i-e-i-o."  Every time I see the (real)
+# errno macro EIO, I think about that song.  Probably most of my
+# compatriots who program on Unix do, too.  One of them must have stayed
+# up a little too late one night and decided to add it to Hurd or Glibc.
+# Whoever did it should be castigated, but it made me laugh.
+#  --jtobey@channel1.com
+#
+# "bought the farm" means "died".  -jtobey
+#
+# Bueno, pues despu廥 de pensarlo mucho, he seguido el ejemplo de la
+# traducci鏮 francesa (traducci鏮 libre). sv
+# </es.po>
+#
+# 简单的说,儿歌 "唐老先生有块地...",然后呢?? ;-p
+#
+#. TRANS Go home and have a glass of warm, dairy-fresh milk.
+#. TRANS @c Okay.  Since you are dying to know, I'll tell you.
+#. TRANS @c This is a joke, obviously.  There is a children's song which begins,
+#. TRANS @c "Old McDonald had a farm, e-i-e-i-o."  Every time I see the (real)
+#. TRANS @c errno macro EIO, I think about that song.  Probably most of my
+#. TRANS @c compatriots who program on Unix do, too.  One of them must have stayed
+#. TRANS @c up a little too late one night and decided to add it to Hurd or Glibc.
+#. TRANS @c Whoever did it should be castigated, but it made me laugh.
+#. TRANS @c  --jtobey@channel1.com
+#. TRANS @c
+#. TRANS @c "bought the farm" means "died".  -jtobey
+#. TRANS @c
+#. TRANS @c Translators, please do not translate this litteraly, translate it into
+#. TRANS @c an idiomatic funny way of saying that the computer died.
+#: sysdeps/gnu/errlist.h:776
+msgid "Computer bought the farm"
+msgstr "这台电脑买了一块地啰"
+
+#. TRANS In @theglibc{}, this is another name for @code{EAGAIN} (above).
+#. TRANS The values are always the same, on every operating system.
+#. TRANS
+#. TRANS C libraries in many older Unix systems have @code{EWOULDBLOCK} as a
+#. TRANS separate error code.
+#: sysdeps/gnu/errlist.h:785
+msgid "Operation would block"
+msgstr "操作将阻塞"
+
+#: sysdeps/gnu/errlist.h:788
+msgid "Need authenticator"
+msgstr "需要认证器"
+
+#. TRANS The experienced user will know what is wrong.
+#. TRANS @c This error code is a joke.  Its perror text is part of the joke.
+#. TRANS @c Don't change it.
+#: sysdeps/gnu/errlist.h:795
+msgid "?"
+msgstr "?"
+
+#: sysdeps/gnu/errlist.h:798
+msgid "RPC program not available"
+msgstr "RPC 程序不可用"
+
+#: sysdeps/mach/_strerror.c:43
 msgid "Error in unknown error system: "
 msgstr "未知的错误系统中出错:"
 
@@ -6625,340 +6415,486 @@ msgstr "无法打开“%s”"
 msgid "cannot read header from `%s'"
 msgstr "无法从“%s”中读入头"
 
+#: sysdeps/x86/dl-cet.c:187
+msgid "can't disable CET"
+msgstr "无法禁用 CET"
+
 #: timezone/zdump.c:332
+msgid "has characters other than ASCII alphanumerics, '-' or '+'"
+msgstr "含有 ASCII 数字、字母、“-”、“+”之外的字符"
+
+#: timezone/zdump.c:334
 msgid "has fewer than 3 characters"
 msgstr "不足 3 个字符"
 
-#: timezone/zdump.c:334
+#: timezone/zdump.c:336
 msgid "has more than 6 characters"
 msgstr "超过 6 个字符"
 
-#: timezone/zdump.c:336
-msgid "has characters other than ASCII alphanumerics, '-' or '+'"
-msgstr "含有 ASCII 数字、字母、“-”、“+”之外的字符"
-
 #: timezone/zdump.c:341
 #, c-format
 msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"
 msgstr "%s: 警告:区域 “%s” 缩写 “%s” %s\n"
 
+#: timezone/zdump.c:387
+#, c-format
+msgid ""
+"%s: usage: %s OPTIONS TIMEZONE ...\n"
+"Options include:\n"
+"  -c [L,]U   Start at year L (default -500), end before year U (default 2500)\n"
+"  -t [L,]U   Start at time L, end before time U (in seconds since 1970)\n"
+"  -i         List transitions briefly (format is experimental)\n"
+"  -v         List transitions verbosely\n"
+"  -V         List transitions a bit less verbosely\n"
+"  --help     Output this help\n"
+"  --version  Output version info\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"%s:用法: %s 选项 时区 ...\n"
+"选项包括:\n"
+"  -c [低,]高  从低年开始(默认 -500), 在高年前结束(默认 2500)\n"
+"  -t [低,]高  从低时间开始, 在高时间前结束(以 1970 年以来的秒数计)\n"
+"  -i          简略地列出过渡(实验性格式)\n"
+"  -v          啰嗦地列出过渡\n"
+"  -V          不那么啰嗦地列出过渡\n"
+"  --help      显示这个帮助\n"
+"  --version   输出版本信息\n"
+"\n"
+"向 %s 报告错误.\n"
+
 #: timezone/zdump.c:473
 #, c-format
 msgid "%s: wild -c argument %s\n"
-msgstr "%s: 怪异的 -c 选项 %s\n"
+msgstr "%s:怪异的 -c 选项 %s\n"
 
 #: timezone/zdump.c:506
 #, c-format
 msgid "%s: wild -t argument %s\n"
-msgstr "%s: wild -c 参数 %s\n"
+msgstr "%s:怪异的 -t 选项 %s\n"
 
-#: timezone/zic.c:429
+#: timezone/zic.c:432
 #, c-format
 msgid "%s: Memory exhausted: %s\n"
 msgstr "%s:内存耗尽:%s\n"
 
-#: timezone/zic.c:437
+#: timezone/zic.c:440
 msgid "size overflow"
 msgstr "大小溢出"
 
-#: timezone/zic.c:551
+#: timezone/zic.c:450
+msgid "alignment overflow"
+msgstr "对齐溢出"
+
+#: timezone/zic.c:498
+msgid "integer overflow"
+msgstr "整数溢出"
+
+#: timezone/zic.c:532
+#, c-format
+msgid "\"%s\", line %<PRIdMAX>: "
+msgstr "\"%s\", 第 %<PRIdMAX>行: "
+
+#: timezone/zic.c:535
+#, c-format
+msgid " (rule from \"%s\", line %<PRIdMAX>)"
+msgstr " (规则来自 \"%s\",第 %<PRIdMAX> 行)"
+
+#: timezone/zic.c:554
 #, c-format
 msgid "warning: "
-msgstr "警告:"
+msgstr "警告: "
+
+#: timezone/zic.c:604
+#, c-format
+msgid "%s: Can't chdir to %s: %s\n"
+msgstr "%s:无法改变目录到 %s:%s\n"
 
-#: timezone/zic.c:632
+#: timezone/zic.c:698
 msgid "wild compilation-time specification of zic_t"
 msgstr "zic_t 的万用编译时间规格"
 
-#: timezone/zic.c:652
+#: timezone/zic.c:730
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s:给出了多个 -d 选项\n"
 
-#: timezone/zic.c:662
+#: timezone/zic.c:740
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s:给出了多个 -l 选项\n"
 
-#: timezone/zic.c:672
+#: timezone/zic.c:750
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s:给出了多个 -p 选项\n"
 
-#: timezone/zic.c:693
+#: timezone/zic.c:758
+#, c-format
+msgid "%s: More than one -t option specified\n"
+msgstr "%s:给出了多个 -t 选项\n"
+
+#: timezone/zic.c:767
+msgid "-y is obsolescent"
+msgstr "-y 是过时的"
+
+#: timezone/zic.c:771
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr "%s:给出了多个 -y 选项\n"
 
-#: timezone/zic.c:703
+#: timezone/zic.c:781
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s:给出了多个 -L 选项\n"
 
-#: timezone/zic.c:712
+#: timezone/zic.c:805
 msgid "-s ignored"
 msgstr "-s 已被忽略"
 
-#: timezone/zic.c:753
+#: timezone/zic.c:848
 msgid "link to link"
 msgstr "链接到链接"
 
-#: timezone/zic.c:756 timezone/zic.c:760
+#: timezone/zic.c:851 timezone/zic.c:855
 msgid "command line"
 msgstr "命令行"
 
-#: timezone/zic.c:776
+#: timezone/zic.c:871
 msgid "empty file name"
 msgstr "空文件名"
 
-#: timezone/zic.c:779
+#: timezone/zic.c:874
 #, c-format
 msgid "file name '%s' begins with '/'"
 msgstr "文件名“%s”以“/”开头"
 
-#: timezone/zic.c:789
+#: timezone/zic.c:884
 #, c-format
 msgid "file name '%s' contains '%.*s' component"
 msgstr "文件名“%s”包含“%.*s”部分"
 
-#: timezone/zic.c:795
+#: timezone/zic.c:890
 #, c-format
 msgid "file name '%s' component contains leading '-'"
 msgstr "文件名“%s”部分以“-”开头"
 
 # component_len_max < component_len
-#: timezone/zic.c:798
+#: timezone/zic.c:893
 #, c-format
 msgid "file name '%s' contains overlength component '%.*s...'"
 msgstr "文件名“%s”中的“%.*s”部分过长"
 
-#: timezone/zic.c:826
+#: timezone/zic.c:921
 #, c-format
 msgid "file name '%s' contains byte '%c'"
 msgstr "文件名“%s”包含字节“%c”"
 
-#: timezone/zic.c:827
+#: timezone/zic.c:922
 #, c-format
 msgid "file name '%s' contains byte '\\%o'"
 msgstr "文件名“%s”包含字节“\\%o”"
 
-#: timezone/zic.c:1032 timezone/zic.c:1034
+#: timezone/zic.c:992
+#, c-format
+msgid "%s: link from %s/%s failed: %s\n"
+msgstr "%s:从 %s/%s 链接失败:%s\n"
+
+#: timezone/zic.c:1002 timezone/zic.c:1992
+#, c-format
+msgid "%s: Can't remove %s/%s: %s\n"
+msgstr "%s:无法删除 %s/%s:%s\n"
+
+#: timezone/zic.c:1026
+#, c-format
+msgid "symbolic link used because hard link failed: %s"
+msgstr "硬链接失败,已使用符号链接:%s"
+
+#: timezone/zic.c:1034
+#, c-format
+msgid "%s: Can't read %s/%s: %s\n"
+msgstr "%s:无法读取 %s/%s:%s\n"
+
+#: timezone/zic.c:1041 timezone/zic.c:2005
+#, c-format
+msgid "%s: Can't create %s/%s: %s\n"
+msgstr "%s:无法创建 %s/%s:%s\n"
+
+#: timezone/zic.c:1050
+#, c-format
+msgid "copy used because hard link failed: %s"
+msgstr "硬链接失败,已复制文件:%s"
+
+#: timezone/zic.c:1053
+#, c-format
+msgid "copy used because symbolic link failed: %s"
+msgstr "符号链接失败,已复制文件:%s"
+
+#: timezone/zic.c:1122 timezone/zic.c:1124
 msgid "same rule name in multiple files"
 msgstr "多个文件中的相同规则名"
 
-#: timezone/zic.c:1081
+#: timezone/zic.c:1171
 #, c-format
 msgid "%s in ruleless zone"
-msgstr "%s 在没有规则的节"
+msgstr "%s 位于没有规则的区域"
 
-#: timezone/zic.c:1101
+#: timezone/zic.c:1191
 msgid "standard input"
 msgstr "标准输入"
 
-#: timezone/zic.c:1106
+#: timezone/zic.c:1196
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr "%s:无法打开 %s:%s\n"
 
-#: timezone/zic.c:1117
+#: timezone/zic.c:1207
 msgid "line too long"
 msgstr "行过长"
 
-#: timezone/zic.c:1139
+#: timezone/zic.c:1230
 msgid "input line of unknown type"
 msgstr "未知类型的输入行"
 
-#: timezone/zic.c:1158 timezone/zic.c:1593 timezone/zic.c:1615
+#: timezone/zic.c:1253 timezone/zic.c:1699 timezone/zic.c:1721
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: 严重错误: 错误的 l_value %d\n"
 
-#: timezone/zic.c:1167
+#: timezone/zic.c:1262
 msgid "expected continuation line not found"
 msgstr "找不到应该出现的续行"
 
-#: timezone/zic.c:1221 timezone/zic.c:3078
+#: timezone/zic.c:1298
+msgid "fractional seconds rejected by pre-2018 versions of zic"
+msgstr "小数秒会被 2018 年之前的 zic 版本拒绝"
+
+#: timezone/zic.c:1316 timezone/zic.c:3282
 msgid "time overflow"
 msgstr "时间溢出"
 
-#: timezone/zic.c:1227
+#: timezone/zic.c:1322
 msgid "values over 24 hours not handled by pre-2007 versions of zic"
 msgstr "24 小时以上的值无法由早于 2007 的 zic 版本所处理"
 
-#: timezone/zic.c:1256
+# 	zic_t		r_stdoff;	/* offset from standard time */
+#: timezone/zic.c:1340
+msgid "invalid saved time"
+msgstr "无效的已保存时间"
+
+#: timezone/zic.c:1351
 msgid "wrong number of fields on Rule line"
 msgstr "规则行中域的个数错误"
 
-#: timezone/zic.c:1287
+#: timezone/zic.c:1360
+#, c-format
+msgid "Invalid rule name \"%s\""
+msgstr "无效的规则名称 \"%s\""
+
+#: timezone/zic.c:1382
 msgid "wrong number of fields on Zone line"
 msgstr "区域行中域的个数错误"
 
-#: timezone/zic.c:1292
+#: timezone/zic.c:1387
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "\"Zone %s\" 行和 -l 选项是互斥的"
 
-#: timezone/zic.c:1298
+#: timezone/zic.c:1393
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "\"Zone %s\" 行和 -p 选项是互斥的"
 
-#: timezone/zic.c:1319
+#: timezone/zic.c:1400
+#, c-format
+msgid "duplicate zone name %s (file \"%s\", line %<PRIdMAX>)"
+msgstr "重复的区域名称 %s (文件“%s”,行 %<PRIdMAX>)"
+
+#: timezone/zic.c:1414
 msgid "wrong number of fields on Zone continuation line"
 msgstr "时区接续行的字段数目不对"
 
-#: timezone/zic.c:1359
+#: timezone/zic.c:1454
 msgid "invalid UT offset"
 msgstr "无效的 UT 偏移量"
 
-#: timezone/zic.c:1363
+#: timezone/zic.c:1458
 msgid "invalid abbreviation format"
 msgstr "无效的缩略格式"
 
-#: timezone/zic.c:1372
+#: timezone/zic.c:1467
 #, c-format
 msgid "format '%s' not handled by pre-2015 versions of zic"
 msgstr "“%s”格式无法由早于 2015 年的 zic 版本所处理"
 
-#: timezone/zic.c:1399
+#: timezone/zic.c:1494
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr "时区接续行的结束时间不在上一行的结束时间之后"
 
-#: timezone/zic.c:1426
-msgid "wrong number of fields on Leap line"
-msgstr "闰时设置行的字段数目错误"
-
-#: timezone/zic.c:1435
+#: timezone/zic.c:1526
 msgid "invalid leaping year"
 msgstr "无效的闰年"
 
-#: timezone/zic.c:1455 timezone/zic.c:1547
+#: timezone/zic.c:1548 timezone/zic.c:1653
 msgid "invalid month name"
 msgstr "无效的月名称"
 
-#: timezone/zic.c:1468 timezone/zic.c:1663 timezone/zic.c:1677
+#: timezone/zic.c:1561 timezone/zic.c:1769 timezone/zic.c:1783
 msgid "invalid day of month"
 msgstr "无效的日"
 
-#: timezone/zic.c:1473
+#: timezone/zic.c:1566
 msgid "time too small"
 msgstr "时间太小"
 
-#: timezone/zic.c:1477
+#: timezone/zic.c:1570
 msgid "time too large"
 msgstr "时间过大"
 
-#: timezone/zic.c:1481 timezone/zic.c:1576
+#: timezone/zic.c:1574 timezone/zic.c:1682
 msgid "invalid time of day"
 msgstr "无效的时间"
 
-#: timezone/zic.c:1494
-msgid "illegal CORRECTION field on Leap line"
-msgstr "在闰时设置行中有不合法的 CORRECTION 字段"
+#: timezone/zic.c:1577
+msgid "leap second precedes Epoch"
+msgstr "闰秒出现在创世之前"
 
-#: timezone/zic.c:1499
-msgid "illegal Rolling/Stationary field on Leap line"
-msgstr "在闰时设置行中有不合法的 Rolling/Stationary 字段"
+#: timezone/zic.c:1585
+msgid "wrong number of fields on Leap line"
+msgstr "闰时设置行的字段数目错误"
 
-#: timezone/zic.c:1518
+#: timezone/zic.c:1624
 msgid "wrong number of fields on Link line"
 msgstr "链接行中域的个数错误"
 
-#: timezone/zic.c:1522
+#: timezone/zic.c:1628
 msgid "blank FROM field on Link line"
 msgstr "Link 行中空白的 FROM 域"
 
-#: timezone/zic.c:1597
+#: timezone/zic.c:1703
 msgid "invalid starting year"
 msgstr "无效的起始年份"
 
-#: timezone/zic.c:1619
+#: timezone/zic.c:1725
 msgid "invalid ending year"
 msgstr "无效的终止年份"
 
-#: timezone/zic.c:1623
+#: timezone/zic.c:1729
 msgid "starting year greater than ending year"
 msgstr "起始年份大于终止年份"
 
-#: timezone/zic.c:1630
+#: timezone/zic.c:1736
 msgid "typed single year"
 msgstr "输入的年分是同一年"
 
-#: timezone/zic.c:1668
+#: timezone/zic.c:1739
+#, c-format
+msgid "year type \"%s\" is obsolete; use \"-\" instead"
+msgstr "年类型 “%s” 过时;使用 ”-“ 替代"
+
+#: timezone/zic.c:1774
 msgid "invalid weekday name"
 msgstr "无效的星期名"
 
-#: timezone/zic.c:1804
+#: timezone/zic.c:1935
+#, c-format
+msgid "reference clients mishandle more than %d transition times"
+msgstr "参考客户端会错误处理超过 %d 次的改变次数"
+
+#: timezone/zic.c:1939
 msgid "pre-2014 clients may mishandle more than 1200 transition times"
 msgstr "2014 之前的客户端可能会错误处理超过 1200 次的改变次数"
 
-#: timezone/zic.c:2488
+#: timezone/zic.c:2058
+msgid "too many transition times"
+msgstr "过多的改变次数"
+
+#: timezone/zic.c:2297
+#, c-format
+msgid "%%z UT offset magnitude exceeds 99:59:59"
+msgstr "%%z UT 偏移量超过了 99:59:59"
+
+#: timezone/zic.c:2673
 msgid "no POSIX environment variable for zone"
 msgstr "无 POSIX 环境变量用于区"
 
-#: timezone/zic.c:2494
+#: timezone/zic.c:2679
 #, c-format
 msgid "%s: pre-%d clients may mishandle distant timestamps"
 msgstr "%s: %d 之前的客户端可能会错误处理久远的时间戳"
 
-#: timezone/zic.c:2631
+#: timezone/zic.c:2818
 msgid "two rules for same instant"
 msgstr "为同一时间点制订了两种规则"
 
-#: timezone/zic.c:2696
+#: timezone/zic.c:2889
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr "无法决定在结束时间以后该使用的时区简写"
 
-#: timezone/zic.c:2785
-msgid "too many local time types"
-msgstr "过多的本地时间类型"
-
-#: timezone/zic.c:2789
+#: timezone/zic.c:2964
 msgid "UT offset out of range"
 msgstr "UTC 偏移超出范围"
 
-#: timezone/zic.c:2813
+#: timezone/zic.c:2987
+msgid "too many local time types"
+msgstr "过多的本地时间类型"
+
+#: timezone/zic.c:3005
 msgid "too many leap seconds"
 msgstr "太多闰秒"
 
-#: timezone/zic.c:2891
+#: timezone/zic.c:3032
+msgid "Leap seconds too close together"
+msgstr "闰秒距离太近"
+
+#: timezone/zic.c:3095
 msgid "Wild result from command execution"
 msgstr "命令运行导致奇怪的结果"
 
-#: timezone/zic.c:2892
+#: timezone/zic.c:3096
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s:命令为“%s”,结果为 %d\n"
 
-#: timezone/zic.c:3063
+#: timezone/zic.c:3202
+#, c-format
+msgid "\"%s\" is undocumented; use \"last%s\" instead"
+msgstr "“%s” 未被列入文档;使用“last%s”代替"
+
+#: timezone/zic.c:3233
+#, c-format
+msgid "\"%s\" is ambiguous in pre-2017c zic"
+msgstr "“%s” 在2017年前的 zic 中模糊不清"
+
+#: timezone/zic.c:3267
 msgid "Odd number of quotation marks"
 msgstr "奇数个引号"
 
-#: timezone/zic.c:3157
+#: timezone/zic.c:3361
 msgid "use of 2/29 in non leap-year"
 msgstr "在非闰年时用到 2/29 日"
 
-#: timezone/zic.c:3192
+#: timezone/zic.c:3396
 msgid "rule goes past start/end of month; will not work with pre-2004 versions of zic"
 msgstr "规则超过开始/结束月分;将无法用于 2004 年之前的 zic 版本"
 
-#: timezone/zic.c:3219
+#: timezone/zic.c:3423
 msgid "time zone abbreviation has fewer than 3 characters"
 msgstr "时区缩写少于 3 个字母"
 
-#: timezone/zic.c:3221
+#: timezone/zic.c:3425
 msgid "time zone abbreviation has too many characters"
 msgstr "时区缩写字母太多"
 
-#: timezone/zic.c:3223
+#: timezone/zic.c:3427
 msgid "time zone abbreviation differs from POSIX standard"
 msgstr "时区缩写与 POSIX 标准不同"
 
-#: timezone/zic.c:3229
+#: timezone/zic.c:3433
 msgid "too many, or too long, time zone abbreviations"
 msgstr "过多或过长的时区缩写"
 
-#: timezone/zic.c:3275
+#: timezone/zic.c:3479
 #, c-format
 msgid "%s: Can't create directory %s: %s"
 msgstr "%s:无法创建目录 %s:%s"