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.po2672
1 files changed, 1427 insertions, 1245 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 55899021e4..badaa165ae 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libc 2.25-pre1\n"
-"POT-Creation-Date: 2017-01-11 17:27+0530\n"
+"POT-Creation-Date: 2019-07-18 13:28-0400\n"
 "PO-Revision-Date: 2017-01-11 14:20-0500\n"
 "Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -109,8 +109,11 @@ 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"
+#, fuzzy, c-format
+#| msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
+msgid ""
+"%s%s%s:%u: %s%sUnexpected error: %s.\n"
+"%n"
 msgstr "%s%s%s:%u:%s%s意外的错误:%s。\n"
 
 #: assert/assert.c:101
@@ -151,10 +154,10 @@ msgstr ""
 "[输出文件 [输入文件]...]"
 
 #: catgets/gencat.c:229 debug/pcprofiledump.c:209 elf/ldconfig.c:308
-#: elf/pldd.c:252 elf/sln.c:77 elf/sprof.c:372 iconv/iconv_prog.c:408
-#: iconv/iconvconfig.c:379 locale/programs/locale.c:277
-#: locale/programs/localedef.c:366 login/programs/pt_chown.c:89
-#: malloc/memusagestat.c:563 nss/getent.c:913 nss/makedb.c:369
+#: elf/pldd.c:247 elf/sln.c:77 elf/sprof.c:372 iconv/iconv_prog.c:405
+#: iconv/iconvconfig.c:379 locale/programs/locale.c:276
+#: locale/programs/localedef.c:437 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
 msgid ""
@@ -165,11 +168,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:268 elf/sotruss.sh:75
-#: elf/sprof.c:389 iconv/iconv_prog.c:425 iconv/iconvconfig.c:396
-#: locale/programs/locale.c:294 locale/programs/localedef.c:392
+#: 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
 #: login/programs/pt_chown.c:63 malloc/memusage.sh:71
-#: malloc/memusagestat.c:581 nscd/nscd.c:509 nss/getent.c:86 nss/makedb.c:385
+#: malloc/memusagestat.c:581 nscd/nscd.c:509 nss/getent.c:88 nss/makedb.c:385
 #: posix/getconf.c:485 sysdeps/unix/sysv/linux/lddlibc4.c:68
 #, c-format
 msgid ""
@@ -182,10 +185,10 @@ msgstr ""
 "或者适合某些特殊目的。\n"
 
 #: catgets/gencat.c:250 debug/pcprofiledump.c:230 debug/xtrace.sh:68
-#: elf/ldconfig.c:329 elf/pldd.c:273 elf/sprof.c:395 iconv/iconv_prog.c:430
-#: iconv/iconvconfig.c:401 locale/programs/locale.c:299
-#: locale/programs/localedef.c:397 malloc/memusage.sh:75
-#: malloc/memusagestat.c:586 nscd/nscd.c:514 nss/getent.c:91 nss/makedb.c:390
+#: elf/ldconfig.c:329 elf/pldd.c:268 elf/sprof.c:395 iconv/iconv_prog.c:427
+#: 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
 #: posix/getconf.c:490
 #, c-format
 msgid "Written by %s.\n"
@@ -195,7 +198,7 @@ msgstr "由 %s 编写。\n"
 msgid "*standard input*"
 msgstr "*标准输入*"
 
-#: catgets/gencat.c:287 iconv/iconv_charmap.c:167 iconv/iconv_prog.c:293
+#: catgets/gencat.c:287 iconv/iconv_charmap.c:167 iconv/iconv_prog.c:290
 #: nss/makedb.c:246
 #, c-format
 msgid "cannot open input file `%s'"
@@ -256,21 +259,21 @@ msgstr "无法打开输出文件“%s”"
 msgid "invalid escape sequence"
 msgstr "无效的转义序列"
 
-#: catgets/gencat.c:1209
+#: catgets/gencat.c:1211
 msgid "unterminated message"
 msgstr "未终止的消息"
 
-#: catgets/gencat.c:1233
+#: catgets/gencat.c:1235
 #, c-format
 msgid "while opening old catalog file"
 msgstr "在打开旧分类文件时"
 
-#: catgets/gencat.c:1324
+#: catgets/gencat.c:1326
 #, c-format
 msgid "conversion modules not available"
 msgstr "转换模块不可用"
 
-#: catgets/gencat.c:1350
+#: catgets/gencat.c:1352
 #, c-format
 msgid "cannot determine escape character"
 msgstr "无法确定转义字符"
@@ -388,60 +391,61 @@ msgstr "无效的模式参数"
 msgid "unknown"
 msgstr "未知"
 
-#: elf/cache.c:135
+#: elf/cache.c:141
 msgid "Unknown OS"
 msgstr "未知的操作系统"
 
-#: elf/cache.c:140
+#: elf/cache.c:146
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", OS ABI: %s %d.%d.%d"
 
-#: elf/cache.c:157 elf/ldconfig.c:1341
+#: elf/cache.c:163 elf/ldconfig.c:1333
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "无法打开缓冲文件 %s\n"
 
-#: elf/cache.c:171
+#: elf/cache.c:177
 #, c-format
 msgid "mmap of cache file failed.\n"
 msgstr "缓冲文件的 mmap 失败。\n"
 
-#: elf/cache.c:175 elf/cache.c:189
+#: elf/cache.c:181 elf/cache.c:195 elf/cache.c:205
 #, c-format
 msgid "File is not a cache file.\n"
 msgstr "文件不是缓冲区文件。\n"
 
-#: elf/cache.c:222 elf/cache.c:232
+#: elf/cache.c:233 elf/cache.c:243
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "在缓冲区“%2$s”中找到 %1$d 个库\n"
 
-#: elf/cache.c:426
+#: elf/cache.c:437
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "无法创建临时缓冲文件 %s"
 
-#: elf/cache.c:434 elf/cache.c:444 elf/cache.c:448 elf/cache.c:453
+#: elf/cache.c:445 elf/cache.c:455 elf/cache.c:459 elf/cache.c:463
+#: elf/cache.c:473
 #, c-format
 msgid "Writing of cache data failed"
 msgstr "写缓冲数据失败"
 
-#: elf/cache.c:458
+#: elf/cache.c:468
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr "将 %s 的访问权限改变为 %#o 失败"
 
-#: elf/cache.c:463
+#: elf/cache.c:477
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "将 %s 改名为 %s 失败"
 
-#: elf/dl-close.c:397 elf/dl-open.c:478
+#: elf/dl-close.c:399 elf/dl-open.c:424
 msgid "cannot create scope list"
 msgstr "无法创建范围列表"
 
-#: elf/dl-close.c:837
+#: elf/dl-close.c:839
 msgid "shared object not open"
 msgstr "共享库未打开"
 
@@ -458,176 +462,186 @@ msgstr "空动态字符串替换"
 msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
 msgstr "由于空的动态字串字组替换而无法加载外部的 `%s'\n"
 
-#: elf/dl-deps.c:467
+#: elf/dl-deps.c:220
+#, fuzzy
+#| msgid "cannot allocate dependency list"
+msgid "cannot allocate dependency buffer"
+msgstr "无法分配倚赖列表"
+
+#: elf/dl-deps.c:443
 msgid "cannot allocate dependency list"
 msgstr "无法分配倚赖列表"
 
-#: elf/dl-deps.c:504 elf/dl-deps.c:564
+#: elf/dl-deps.c:483 elf/dl-deps.c:543
 msgid "cannot allocate symbol search list"
 msgstr "无法分配符号搜索列表"
 
-#: elf/dl-deps.c:544
+#: elf/dl-deps.c:523
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr "过滤程序不支持与 LD_TRACE_PRELINKING 共用"
 
-#: elf/dl-error-skeleton.c:87
-msgid "DYNAMIC LINKER BUG!!!"
-msgstr "动态链接器 BUG!!!"
-
-#: elf/dl-error-skeleton.c:136
+#: elf/dl-error-skeleton.c:80
 msgid "error while loading shared libraries"
 msgstr "装入共享库时出错"
 
-#: elf/dl-fptr.c:88 sysdeps/hppa/dl-fptr.c:94
+#: elf/dl-error-skeleton.c:113
+msgid "DYNAMIC LINKER BUG!!!"
+msgstr "动态链接器 BUG!!!"
+
+#: elf/dl-fptr.c:88 sysdeps/hppa/dl-fptr.c:95
 msgid "cannot map pages for fdesc table"
 msgstr "无法为 fdesc 表映射页"
 
-#: elf/dl-fptr.c:192 sysdeps/hppa/dl-fptr.c:207
+#: elf/dl-fptr.c:192 sysdeps/hppa/dl-fptr.c:213
 msgid "cannot map pages for fptr table"
 msgstr "无法为 fptr 表映射页"
 
-#: elf/dl-fptr.c:221 sysdeps/hppa/dl-fptr.c:236
+#: elf/dl-fptr.c:221 sysdeps/hppa/dl-fptr.c:242
 msgid "internal error: symidx out of range of fptr table"
 msgstr "内部错误: symidx 超出 fptr 表的范围"
 
-#: elf/dl-hwcaps.c:184 elf/dl-hwcaps.c:196
+#: elf/dl-hwcaps.c:202 elf/dl-hwcaps.c:214
 msgid "cannot create capability list"
 msgstr "无法创建功能列表"
 
-#: elf/dl-load.c:412
+#: elf/dl-load.c:427
 msgid "cannot allocate name record"
 msgstr "无法分配名记录"
 
-#: elf/dl-load.c:497 elf/dl-load.c:613 elf/dl-load.c:696 elf/dl-load.c:815
+#: elf/dl-load.c:513 elf/dl-load.c:626 elf/dl-load.c:715 elf/dl-load.c:811
 msgid "cannot create cache for search path"
 msgstr "无法创建搜索路径缓冲器"
 
-#: elf/dl-load.c:588
+#: elf/dl-load.c:609
 msgid "cannot create RUNPATH/RPATH copy"
 msgstr "无法创建 RUNPATH/RPATH 的副本"
 
-#: elf/dl-load.c:682
+#: elf/dl-load.c:702
 msgid "cannot create search path array"
 msgstr "无法创建搜索路径数组"
 
-#: elf/dl-load.c:888
+#: elf/dl-load.c:883
 msgid "cannot stat shared object"
 msgstr "无法对共享目标进行 stat 操作"
 
-#: elf/dl-load.c:965
-msgid "cannot open zero fill device"
-msgstr "无法打开零填充设备"
-
-#: elf/dl-load.c:1012 elf/dl-load.c:2172
+#: elf/dl-load.c:992 elf/dl-load.c:2198
 msgid "cannot create shared object descriptor"
 msgstr "无法创建共享对象描述符"
 
-#: elf/dl-load.c:1031 elf/dl-load.c:1556 elf/dl-load.c:1668
+#: elf/dl-load.c:1011 elf/dl-load.c:1555 elf/dl-load.c:1668
 msgid "cannot read file data"
 msgstr "无法读入文件数据"
 
-#: elf/dl-load.c:1071
+#: elf/dl-load.c:1057
 msgid "ELF load command alignment not page-aligned"
 msgstr "ELF 加载命令对齐不是按页对齐的"
 
-#: elf/dl-load.c:1078
+#: elf/dl-load.c:1064
 msgid "ELF load command address/offset not properly aligned"
 msgstr "ELF 装入命令的地址/偏移量没有正确地对齐"
 
-#: elf/dl-load.c:1163
+#: elf/dl-load.c:1146
+#, fuzzy
+#| msgid "cannot restore segment prot after reloc"
+msgid "cannot process note segment"
+msgstr "重定位后无法恢复段 prot"
+
+#: elf/dl-load.c:1157
 msgid "object file has no loadable segments"
 msgstr "目标文件没有可加载段"
 
-#: elf/dl-load.c:1172 elf/dl-load.c:1648
+#: elf/dl-load.c:1170 elf/dl-load.c:1647
 msgid "cannot dynamically load executable"
 msgstr "无法动态装入可执行文件"
 
-#: elf/dl-load.c:1193
+#: elf/dl-load.c:1191
 msgid "object file has no dynamic section"
 msgstr "目标文件没有动态节"
 
-#: elf/dl-load.c:1216
+#: elf/dl-load.c:1218
+#, fuzzy
+#| msgid "cannot dynamically load executable"
+msgid "cannot dynamically load position-independent executable"
+msgstr "无法动态装入可执行文件"
+
+#: elf/dl-load.c:1220
 msgid "shared object cannot be dlopen()ed"
 msgstr "无法用 dlopen() 打开共享库"
 
-#: elf/dl-load.c:1229
+#: elf/dl-load.c:1233
 msgid "cannot allocate memory for program header"
 msgstr "无法为程序头分配内存"
 
-#: elf/dl-load.c:1245 elf/dl-open.c:195
-msgid "invalid caller"
-msgstr "无效的调用者"
-
-#: elf/dl-load.c:1268 elf/dl-load.h:130
+#: elf/dl-load.c:1266 elf/dl-load.h:130
 msgid "cannot change memory protections"
 msgstr "无法改变内存保护"
 
-#: elf/dl-load.c:1288
+#: elf/dl-load.c:1286
 msgid "cannot enable executable stack as shared object requires"
 msgstr "无法启用共享目标需要的执行栈"
 
-#: elf/dl-load.c:1301
+#: elf/dl-load.c:1299
 msgid "cannot close file descriptor"
 msgstr "无法关闭文件描述符"
 
-#: elf/dl-load.c:1556
+#: elf/dl-load.c:1555
 msgid "file too short"
 msgstr "文件过短"
 
-#: elf/dl-load.c:1591
+#: elf/dl-load.c:1590
 msgid "invalid ELF header"
 msgstr "无效的 ELF 头"
 
-#: elf/dl-load.c:1603
+#: elf/dl-load.c:1602
 msgid "ELF file data encoding not big-endian"
 msgstr "ELF 文件数据编码不是大端序"
 
-#: elf/dl-load.c:1605
+#: elf/dl-load.c:1604
 msgid "ELF file data encoding not little-endian"
 msgstr "ELF 文件数据编码不是小端序"
 
 # e_ident[]
-#: elf/dl-load.c:1609
+#: elf/dl-load.c:1608
 msgid "ELF file version ident does not match current one"
 msgstr "ELF 文件的版本信息不符合目前所使用的"
 
-#: elf/dl-load.c:1613
+#: elf/dl-load.c:1612
 msgid "ELF file OS ABI invalid"
 msgstr "ELF 文件 OS ABI 无效"
 
-#: elf/dl-load.c:1616
+#: elf/dl-load.c:1615
 msgid "ELF file ABI version invalid"
 msgstr "ELF 文件 ABI 版本无效"
 
-#: elf/dl-load.c:1619
+#: elf/dl-load.c:1618
 msgid "nonzero padding in e_ident"
 msgstr "在 e_ident 中填补非零值"
 
-#: elf/dl-load.c:1622
+#: elf/dl-load.c:1621
 msgid "internal error"
 msgstr "内部错误"
 
-#: elf/dl-load.c:1629
+#: elf/dl-load.c:1628
 msgid "ELF file version does not match current one"
 msgstr "ELF 文件版本与当前版本不匹配"
 
-#: elf/dl-load.c:1637
+#: elf/dl-load.c:1636
 msgid "only ET_DYN and ET_EXEC can be loaded"
 msgstr "只有 ET_DYN 以及 ET_EXEC 可以加载"
 
-#: elf/dl-load.c:1653
+#: elf/dl-load.c:1652
 msgid "ELF file's phentsize not the expected size"
 msgstr "ELF 文件的标头项目大小(phentsize)出乎意料"
 
-#: elf/dl-load.c:2191
+#: elf/dl-load.c:2217
 msgid "wrong ELF class: ELFCLASS64"
 msgstr "ELF 类不对:ELFCLASS64"
 
-#: elf/dl-load.c:2192
+#: elf/dl-load.c:2218
 msgid "wrong ELF class: ELFCLASS32"
 msgstr "ELF 类不对:ELFCLASS32"
 
-#: elf/dl-load.c:2195
+#: elf/dl-load.c:2221
 msgid "cannot open shared object file"
 msgstr "无法打开共享对象文件"
 
@@ -639,68 +653,64 @@ msgstr "无法从共享目标中映射段"
 msgid "cannot map zero-fill pages"
 msgstr "无法映射用零填充的页"
 
-#: elf/dl-lookup.c:849
-msgid "relocation error"
-msgstr "重定位错误"
-
-#: elf/dl-lookup.c:875
+#: elf/dl-lookup.c:830
 msgid "symbol lookup error"
 msgstr "符号查询错误"
 
-#: elf/dl-open.c:102
+#: elf/dl-open.c:99
 msgid "cannot extend global scope"
 msgstr "无法扩展全局范围"
 
-#: elf/dl-open.c:528
+#: elf/dl-open.c:474
 msgid "TLS generation counter wrapped!  Please report this."
 msgstr "TLS 产生计数器被转换运行! 请报告这个情况。"
 
-#: elf/dl-open.c:592
+#: elf/dl-open.c:538
 msgid "invalid mode for dlopen()"
 msgstr "无效的 dlopen() 模式"
 
-#: elf/dl-open.c:609
+#: elf/dl-open.c:555
 msgid "no more namespaces available for dlmopen()"
 msgstr "无更多命名空间可见于 dlmopen ()"
 
-#: elf/dl-open.c:633
+#: elf/dl-open.c:579
 msgid "invalid target namespace in dlmopen()"
 msgstr "dlmopen() 中无效的目标名字空间"
 
-#: elf/dl-reloc.c:121
+#: elf/dl-reloc.c:120
 msgid "cannot allocate memory in static TLS block"
 msgstr "无法在静态 TLS 块中分配内存"
 
-#: elf/dl-reloc.c:212
+#: elf/dl-reloc.c:213
 msgid "cannot make segment writable for relocation"
 msgstr "在重新寻址以后无法将节设为可写入状态"
 
-#: elf/dl-reloc.c:283
+#: elf/dl-reloc.c:272
 #, c-format
 msgid "%s: out of memory to store relocation results for %s\n"
 msgstr "%s: 内存不足以保存重寻址结果用于 %s\n"
 
-#: elf/dl-reloc.c:299
+#: elf/dl-reloc.c:288
 msgid "cannot restore segment prot after reloc"
 msgstr "重定位后无法恢复段 prot"
 
-#: elf/dl-reloc.c:330
+#: elf/dl-reloc.c:319
 msgid "cannot apply additional memory protection after relocation"
 msgstr "无法在重定位后应用额外的内存保护"
 
-#: elf/dl-sym.c:153
+#: elf/dl-sym.c:136
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "代码所使用的 RTLD_NEXT 没有动态加载"
 
-#: elf/dl-tls.c:940
+#: elf/dl-tls.c:931
 msgid "cannot create TLS data structures"
 msgstr "无法创建 TLS 数据结构"
 
-#: elf/dl-version.c:166
+#: elf/dl-version.c:148
 msgid "version lookup error"
 msgstr "版本查找错误"
 
-#: elf/dl-version.c:296
+#: elf/dl-version.c:279
 msgid "cannot allocate version reference table"
 msgstr "无法分配版本引用表格"
 
@@ -816,7 +826,7 @@ msgstr " (跳过)\n"
 msgid "Can't find %s"
 msgstr "无法找到 %s"
 
-#: elf/ldconfig.c:603 elf/ldconfig.c:776 elf/ldconfig.c:835 elf/ldconfig.c:869
+#: elf/ldconfig.c:603 elf/ldconfig.c:769 elf/ldconfig.c:825 elf/ldconfig.c:857
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "无法对 %s 进行 lstat 操作"
@@ -836,88 +846,88 @@ msgstr "未创建链接,因为 %s 无法找到 soname"
 msgid "Can't open directory %s"
 msgstr "无法打开目录 %s"
 
-#: elf/ldconfig.c:794 elf/ldconfig.c:856 elf/readlib.c:97
+#: elf/ldconfig.c:787 elf/ldconfig.c:845 elf/readlib.c:97
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "未找到输入文件 %s。\n"
 
-#: elf/ldconfig.c:801
+#: elf/ldconfig.c:794
 #, c-format
 msgid "Cannot stat %s"
 msgstr "无法对 %s 进行 stat 操作"
 
-#: elf/ldconfig.c:952
+#: elf/ldconfig.c:939
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "libc5 的库 %s 处于错误的目录中"
 
-#: elf/ldconfig.c:955
+#: elf/ldconfig.c:942
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "libc5 的库 %s 处于错误的目录中"
 
-#: elf/ldconfig.c:958
+#: elf/ldconfig.c:945
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "libc4 的库 %s 处于错误的目录中"
 
-#: elf/ldconfig.c:986
+#: elf/ldconfig.c:973
 #, 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:1095
+#: elf/ldconfig.c:1082
 #, c-format
 msgid "Warning: ignoring configuration file that cannot be opened: %s"
 msgstr "警告:正在忽略无法打开的组态文件:%s"
 
-#: elf/ldconfig.c:1161
+#: elf/ldconfig.c:1148
 #, c-format
 msgid "%s:%u: bad syntax in hwcap line"
 msgstr "%s:%u: 在 hwcap 行中有不当的语法"
 
-#: elf/ldconfig.c:1167
+#: elf/ldconfig.c:1154
 #, c-format
 msgid "%s:%u: hwcap index %lu above maximum %u"
 msgstr "%s:%u: hwcap 索引 %lu 以上的最大值 %u"
 
-#: elf/ldconfig.c:1174 elf/ldconfig.c:1182
+#: elf/ldconfig.c:1161 elf/ldconfig.c:1169
 #, c-format
 msgid "%s:%u: hwcap index %lu already defined as %s"
 msgstr "%s:%u: hwcap 索引 %lu 已经被定义为 %s"
 
-#: elf/ldconfig.c:1185
+#: elf/ldconfig.c:1172
 #, c-format
 msgid "%s:%u: duplicate hwcap %lu %s"
 msgstr "%s:%u: 重制 hwcap %lu %s"
 
-#: elf/ldconfig.c:1207
+#: elf/ldconfig.c:1194
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr "需要绝对文件名称用于组态文件时正在使用 -r"
 
-#: elf/ldconfig.c:1214 locale/programs/xmalloc.c:63 malloc/obstack.c:416
+#: elf/ldconfig.c:1201 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:1246
+#: elf/ldconfig.c:1234
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr "%s:%u: 无法读取目录 %s"
 
-#: elf/ldconfig.c:1290
+#: elf/ldconfig.c:1282
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr "用来建置缓存的相对路径 `%s'"
 
-#: elf/ldconfig.c:1320
+#: elf/ldconfig.c:1312
 #, c-format
 msgid "Can't chdir to /"
 msgstr "无法改变目录到 /"
 
-#: elf/ldconfig.c:1361
+#: elf/ldconfig.c:1353
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "无法打开缓冲文件目录 %s\n"
@@ -960,14 +970,14 @@ msgstr "试用“ldd --help”以获取更多信息。"
 msgid "missing file arguments"
 msgstr "缺少文件参数"
 
-#. TRANS No such file or directory.  This is a ``file doesn't exist'' error
+#. 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
 msgid "No such file or directory"
 msgstr "没有那个文件或目录"
 
-#: elf/ldd.bash.in:150 inet/rcmd.c:475
+#: elf/ldd.bash.in:150 inet/rcmd.c:480
 msgid "not regular file"
 msgstr "不是普通文件"
 
@@ -975,107 +985,113 @@ msgstr "不是普通文件"
 msgid "warning: you do not have execution permission for"
 msgstr "警告: 你没有执行权限 "
 
-#: elf/ldd.bash.in:182
+#: elf/ldd.bash.in:170
 msgid "\tnot a dynamic executable"
 msgstr "\t不是动态可执行文件"
 
-#: elf/ldd.bash.in:190
+#: elf/ldd.bash.in:178
 msgid "exited with unknown exit code"
 msgstr "以未知的退出码退出"
 
-#: elf/ldd.bash.in:195
+#: elf/ldd.bash.in:183
 msgid "error: you do not have read permission for"
 msgstr "错误: 你没有读权限 "
 
-#: elf/pldd-xx.c:105
+#: elf/pldd-xx.c:102
 #, c-format
 msgid "cannot find program header of process"
 msgstr "找不到进程的程序标头"
 
-#: elf/pldd-xx.c:110
+#: elf/pldd-xx.c:106
 #, c-format
 msgid "cannot read program header"
 msgstr "无法读取程序标头"
 
-#: elf/pldd-xx.c:135
+#: elf/pldd-xx.c:128
 #, c-format
 msgid "cannot read dynamic section"
 msgstr "无法读取动态节"
 
-#: elf/pldd-xx.c:147
+#: elf/pldd-xx.c:137
 #, c-format
 msgid "cannot read r_debug"
 msgstr "无法读取 r_debug"
 
-#: elf/pldd-xx.c:167
+#: elf/pldd-xx.c:154
 #, c-format
 msgid "cannot read program interpreter"
 msgstr "无法读取程序解译器"
 
-#: elf/pldd-xx.c:197
+#: elf/pldd-xx.c:183
 #, c-format
 msgid "cannot read link map"
 msgstr "无法读取链结映射"
 
-#: elf/pldd-xx.c:209
+#: elf/pldd-xx.c:190
 #, c-format
 msgid "cannot read object name"
 msgstr "无法读取对象名称"
 
-#: elf/pldd-xx.c:219
+#: elf/pldd-xx.c:197
 #, c-format
 msgid "cannot allocate buffer for object name"
 msgstr "无法为对象名称分配缓冲区"
 
-#: elf/pldd.c:64
+#: elf/pldd.c:58
 msgid "List dynamic shared objects loaded into process."
 msgstr "列出已加载进程中的动态共用对象。"
 
-#: elf/pldd.c:68
+#: elf/pldd.c:62
 msgid "PID"
 msgstr "进程识别号"
 
-#: elf/pldd.c:100
+#: elf/pldd.c:89
 #, c-format
 msgid "Exactly one parameter with process ID required.\n"
 msgstr "需要刚好一个附有进程识别号的参数。\n"
 
-#: elf/pldd.c:112
+#: elf/pldd.c:103
 #, c-format
 msgid "invalid process ID '%s'"
 msgstr "无效的进程识别号 %s"
 
-#: elf/pldd.c:120
+#: elf/pldd.c:111
 #, c-format
 msgid "cannot open %s"
 msgstr "无法打开 %s"
 
-#: elf/pldd.c:152
+#: elf/pldd.c:142
 #, c-format
 msgid "cannot open %s/task"
 msgstr "无法打开 %s/任务"
 
-#: elf/pldd.c:155
+#: elf/pldd.c:145
 #, c-format
 msgid "cannot prepare reading %s/task"
 msgstr "无法准备读取 %s/任务"
 
-#: elf/pldd.c:168
+#: elf/pldd.c:158
 #, c-format
 msgid "invalid thread ID '%s'"
 msgstr "无效的线程识别号 %s"
 
-#: elf/pldd.c:179
+#: elf/pldd.c:169
 #, c-format
 msgid "cannot attach to process %lu"
 msgstr "无法附加到进程 %lu"
 
-#: elf/pldd.c:294
+# 	zic_t		r_stdoff;	/* offset from standard time */
+#: elf/pldd.c:184
+#, fuzzy, c-format
+msgid "no valid %s/task entries"
+msgstr "无效的保存时间"
+
+#: elf/pldd.c:290
 #, c-format
 msgid "cannot get information about process %lu"
 msgstr "无法获得进程 %lu 的相关信息"
 
-#: elf/pldd.c:307
+#: elf/pldd.c:303
 #, c-format
 msgid "process %lu is no ELF program"
 msgstr "进程 %lu 并非 ELF 程序"
@@ -1344,12 +1360,12 @@ msgstr "`%s' 不是 `%s' 中正确的测速评估数据文件"
 msgid "cannot allocate symbol data"
 msgstr "无法分配符号数据"
 
-#: iconv/iconv_charmap.c:141 iconv/iconv_prog.c:448
+#: iconv/iconv_charmap.c:141 iconv/iconv_prog.c:445
 #, c-format
 msgid "cannot open output file"
 msgstr "无法打开输出文件"
 
-#: iconv/iconv_charmap.c:187 iconv/iconv_prog.c:311
+#: iconv/iconv_charmap.c:187 iconv/iconv_prog.c:308
 #, c-format
 msgid "error while closing input `%s'"
 msgstr "关闭输入“%s”时出错"
@@ -1359,18 +1375,18 @@ msgstr "关闭输入“%s”时出错"
 msgid "illegal input sequence at position %Zd"
 msgstr "位于 %Zd 的非法输入序列"
 
-#: iconv/iconv_charmap.c:454 iconv/iconv_prog.c:539
+#: iconv/iconv_charmap.c:454 iconv/iconv_prog.c:536
 #, 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:582
-#: iconv/iconv_prog.c:618
+#: iconv/iconv_charmap.c:499 iconv/iconv_charmap.c:535 iconv/iconv_prog.c:579
+#: iconv/iconv_prog.c:615
 #, c-format
 msgid "error while reading the input"
 msgstr "读取输入时出错"
 
-#: iconv/iconv_charmap.c:517 iconv/iconv_prog.c:600
+#: iconv/iconv_charmap.c:517 iconv/iconv_prog.c:597
 #, c-format
 msgid "unable to allocate buffer for input"
 msgstr "无法为输入分配缓冲区"
@@ -1395,7 +1411,7 @@ msgstr "信息:"
 msgid "list all known coded character sets"
 msgstr "列举所有已知的字符集"
 
-#: iconv/iconv_prog.c:64 locale/programs/localedef.c:123
+#: iconv/iconv_prog.c:64 locale/programs/localedef.c:124
 msgid "Output control:"
 msgstr "输出控制:"
 
@@ -1404,8 +1420,8 @@ msgid "omit invalid characters from output"
 msgstr "从输出中忽略无效的字符"
 
 #: iconv/iconv_prog.c:66 iconv/iconvconfig.c:128
-#: locale/programs/localedef.c:116 locale/programs/localedef.c:118
-#: locale/programs/localedef.c:120 locale/programs/localedef.c:140
+#: 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 "文件"
@@ -1430,57 +1446,57 @@ msgstr "转换给定文件的编码。"
 msgid "[FILE...]"
 msgstr "[文件...]"
 
-#: iconv/iconv_prog.c:233
+#: iconv/iconv_prog.c:230
 #, c-format
 msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "不支持从“%s”到“%s”的转换"
 
-#: iconv/iconv_prog.c:238
+#: iconv/iconv_prog.c:235
 #, c-format
 msgid "conversion from `%s' is not supported"
 msgstr "不支持以“%s”为源头的转换"
 
-#: iconv/iconv_prog.c:245
+#: iconv/iconv_prog.c:242
 #, c-format
 msgid "conversion to `%s' is not supported"
 msgstr "不支持以“%s”为目标的转换"
 
-#: iconv/iconv_prog.c:249
+#: iconv/iconv_prog.c:246
 #, c-format
 msgid "conversion from `%s' to `%s' is not supported"
 msgstr "不支持从“%s”到“%s”的转换"
 
-#: iconv/iconv_prog.c:259
+#: iconv/iconv_prog.c:256
 #, c-format
 msgid "failed to start conversion processing"
 msgstr "启动转换处理失败"
 
-#: iconv/iconv_prog.c:357
+#: iconv/iconv_prog.c:354
 #, c-format
 msgid "error while closing output file"
 msgstr "关闭输出文件时出错"
 
-#: iconv/iconv_prog.c:458
+#: iconv/iconv_prog.c:455
 #, c-format
 msgid "conversion stopped due to problem in writing the output"
 msgstr "由于写入输出时出现的问题转换停止"
 
-#: iconv/iconv_prog.c:535
+#: iconv/iconv_prog.c:532
 #, c-format
 msgid "illegal input sequence at position %ld"
 msgstr "未知 %ld 处的非法输入序列"
 
-#: iconv/iconv_prog.c:543
+#: iconv/iconv_prog.c:540
 #, c-format
 msgid "internal error (illegal descriptor)"
 msgstr "内部错误 (非法的描述符)"
 
-#: iconv/iconv_prog.c:546
+#: iconv/iconv_prog.c:543
 #, c-format
 msgid "unknown iconv() error %d"
 msgstr "未知的 iconv() 错误 %d"
 
-#: iconv/iconv_prog.c:791
+#: iconv/iconv_prog.c:786
 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"
@@ -1503,7 +1519,7 @@ msgstr "创建快速装入 iconv 模块配置文件。"
 msgid "[DIR...]"
 msgstr "[目录...]"
 
-#: iconv/iconvconfig.c:126 locale/programs/localedef.c:126
+#: iconv/iconvconfig.c:126 locale/programs/localedef.c:129
 msgid "PATH"
 msgstr "路径"
 
@@ -1524,7 +1540,7 @@ msgstr "不搜索标准目录,只使用命令行指定的"
 msgid "Directory arguments required when using --nostdlib"
 msgstr "目录参数必要项时正在使用 --nostdlib"
 
-#: iconv/iconvconfig.c:341 locale/programs/localedef.c:287
+#: iconv/iconvconfig.c:341
 #, c-format
 msgid "no output file produced because warnings were issued"
 msgstr "由于出现警告而未生成输出文件"
@@ -1534,73 +1550,73 @@ msgstr "由于出现警告而未生成输出文件"
 msgid "while inserting in search tree"
 msgstr "插入搜索树时"
 
-#: iconv/iconvconfig.c:1239
+#: iconv/iconvconfig.c:1238
 #, c-format
 msgid "cannot generate output file"
 msgstr "无法生成输出文件"
 
-#: inet/rcmd.c:155
+#: inet/rcmd.c:157
 msgid "rcmd: Cannot allocate memory\n"
 msgstr "rcmd:无法分配内存\n"
 
-#: inet/rcmd.c:170
+#: inet/rcmd.c:174
 msgid "rcmd: socket: All ports in use\n"
 msgstr "rcmd:socket:所有端口都已在使用了\n"
 
-#: inet/rcmd.c:198
+#: inet/rcmd.c:202
 #, c-format
 msgid "connect to address %s: "
 msgstr "连接到地址 %s:"
 
-#: inet/rcmd.c:211
+#: inet/rcmd.c:215
 #, c-format
 msgid "Trying %s...\n"
 msgstr "正在尝试 %s...\n"
 
-#: inet/rcmd.c:247
+#: inet/rcmd.c:251
 #, c-format
 msgid "rcmd: write (setting up stderr): %m\n"
 msgstr "rcmd: write (正在设置标准错误输出): %m\n"
 
-#: inet/rcmd.c:263
+#: inet/rcmd.c:267
 #, c-format
 msgid "rcmd: poll (setting up stderr): %m\n"
 msgstr "rcmd: poll (正在设置标准错误输出): %m\n"
 
-#: inet/rcmd.c:266
+#: inet/rcmd.c:270
 msgid "poll: protocol failure in circuit setup\n"
 msgstr "poll: 通信协定在设置线路时失效\n"
 
-#: inet/rcmd.c:298
+#: inet/rcmd.c:302
 msgid "socket: protocol failure in circuit setup\n"
 msgstr "socket: 通信协定在设置线路时失效\n"
 
-#: inet/rcmd.c:322
+#: inet/rcmd.c:326
 #, c-format
 msgid "rcmd: %s: short read"
 msgstr "rcmd: %s: 读入数据过短"
 
-#: inet/rcmd.c:473
+#: inet/rcmd.c:478
 msgid "lstat failed"
 msgstr "lstat 操作失败"
 
-#: inet/rcmd.c:480
+#: inet/rcmd.c:485
 msgid "cannot open"
 msgstr "无法打开"
 
-#: inet/rcmd.c:482
+#: inet/rcmd.c:487
 msgid "fstat failed"
 msgstr "fstat 失败"
 
-#: inet/rcmd.c:484
+#: inet/rcmd.c:489
 msgid "bad owner"
 msgstr "错误的拥有者"
 
-#: inet/rcmd.c:486
+#: inet/rcmd.c:491
 msgid "writeable by other than owner"
 msgstr "可由除所有者之外的人写入"
 
-#: inet/rcmd.c:488
+#: inet/rcmd.c:493
 msgid "hard linked somewhere"
 msgstr "某处的硬链接"
 
@@ -1613,7 +1629,9 @@ msgid "Error: .netrc file is readable by others."
 msgstr "错误:.netrc 对其它人是可读的。"
 
 #: inet/ruserpass.c:180
-msgid "Remove password or make file unreadable by others."
+#, fuzzy
+#| msgid "Remove password or make file unreadable by others."
+msgid "Remove 'password' line or make file unreadable by others."
 msgstr "删除不能由其它人读入的口令或 make 文件"
 
 #: inet/ruserpass.c:199
@@ -1621,11 +1639,7 @@ msgstr "删除不能由其它人读入的口令或 make 文件"
 msgid "Unknown .netrc keyword %s"
 msgstr "未知的 .netrc 关键字 %s"
 
-#: libidn/nfkc.c:463
-msgid "Character out of range for UTF-8"
-msgstr "字符超出 UTF-8 的范围"
-
-#: locale/programs/charmap-dir.c:57
+#: locale/programs/charmap-dir.c:56
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr "无法读入字母映射目录“%s”"
@@ -1635,842 +1649,834 @@ msgstr "无法读入字母映射目录“%s”"
 msgid "character map file `%s' not found"
 msgstr "找不到字符映射文件“%s”"
 
-#: locale/programs/charmap.c:195
+#: locale/programs/charmap.c:196
 #, c-format
 msgid "default character map file `%s' not found"
 msgstr "找不到默认字符映射文件“%s”"
 
-#: locale/programs/charmap.c:258
-#, c-format
-msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
+#: locale/programs/charmap.c:265
+#, fuzzy, c-format
+#| msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
+msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant [--no-warnings=ascii]"
 msgstr "字符对应 `%s' 不是 ASCII 兼容码,区域化数据库不符合 ISO C\n"
 
-#: locale/programs/charmap.c:337
+#: locale/programs/charmap.c:343
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s:<mb_cur_max> 必须大于 <mb_cur_min>\n"
 
-#: locale/programs/charmap.c:357 locale/programs/charmap.c:374
-#: locale/programs/repertoire.c:174
+#: locale/programs/charmap.c:363 locale/programs/charmap.c:380
+#: locale/programs/repertoire.c:173
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "序言中语法错误:%s"
 
-#: locale/programs/charmap.c:358
+#: locale/programs/charmap.c:364
 msgid "invalid definition"
 msgstr "无效的定义"
 
-#: locale/programs/charmap.c:375 locale/programs/locfile.c:131
-#: locale/programs/locfile.c:158 locale/programs/repertoire.c:175
+#: locale/programs/charmap.c:381 locale/programs/locfile.c:131
+#: locale/programs/locfile.c:158 locale/programs/repertoire.c:174
 msgid "bad argument"
 msgstr "错误的参数"
 
-#: locale/programs/charmap.c:403
+#: locale/programs/charmap.c:408
 #, c-format
 msgid "duplicate definition of <%s>"
 msgstr "重复定义 <%s>"
 
-#: locale/programs/charmap.c:410
+#: locale/programs/charmap.c:415
 #, c-format
 msgid "value for <%s> must be 1 or greater"
 msgstr "<%s>的值必须是 1 或更大"
 
-#: locale/programs/charmap.c:422
+#: locale/programs/charmap.c:427
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "<%s> 的值必须大于等于 <%s> 的值"
 
-#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183
+#: locale/programs/charmap.c:450 locale/programs/repertoire.c:182
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "<%s>的参数必须是单个字符"
 
-#: locale/programs/charmap.c:471
+#: locale/programs/charmap.c:476
 msgid "character sets with locking states are not supported"
 msgstr "不支持带有锁定状态的字符集"
 
-#: locale/programs/charmap.c:498 locale/programs/charmap.c:552
-#: locale/programs/charmap.c:584 locale/programs/charmap.c:678
-#: locale/programs/charmap.c:733 locale/programs/charmap.c:774
-#: locale/programs/charmap.c:815
+#: locale/programs/charmap.c:503 locale/programs/charmap.c:557
+#: locale/programs/charmap.c:589 locale/programs/charmap.c:683
+#: locale/programs/charmap.c:739 locale/programs/charmap.c:780
+#: locale/programs/charmap.c:821
 #, c-format
 msgid "syntax error in %s definition: %s"
 msgstr "%s 的定义中的语法错误:%s"
 
-#: locale/programs/charmap.c:499 locale/programs/charmap.c:679
-#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230
+#: locale/programs/charmap.c:504 locale/programs/charmap.c:684
+#: locale/programs/charmap.c:781 locale/programs/repertoire.c:229
 msgid "no symbolic name given"
 msgstr "没有给出符号名"
 
-#: locale/programs/charmap.c:553
+#: locale/programs/charmap.c:558
 msgid "invalid encoding given"
 msgstr "给出无效的编码"
 
-#: locale/programs/charmap.c:562
+#: locale/programs/charmap.c:567
 msgid "too few bytes in character encoding"
 msgstr "字符编码中字节数过少"
 
-#: locale/programs/charmap.c:564
+#: locale/programs/charmap.c:569
 msgid "too many bytes in character encoding"
 msgstr "字符编码中字节数过多"
 
-#: locale/programs/charmap.c:586 locale/programs/charmap.c:734
-#: locale/programs/charmap.c:817 locale/programs/repertoire.c:296
+#: locale/programs/charmap.c:591 locale/programs/charmap.c:740
+#: locale/programs/charmap.c:823 locale/programs/repertoire.c:295
 msgid "no symbolic name given for end of range"
 msgstr "没有为范围的结束给出符号化的名称"
 
-#: locale/programs/charmap.c:610 locale/programs/ld-address.c:528
-#: locale/programs/ld-collate.c:2626 locale/programs/ld-collate.c:3784
-#: locale/programs/ld-ctype.c:2128 locale/programs/ld-ctype.c:2840
-#: locale/programs/ld-identification.c:399
-#: locale/programs/ld-measurement.c:215 locale/programs/ld-messages.c:298
-#: locale/programs/ld-monetary.c:740 locale/programs/ld-name.c:264
-#: locale/programs/ld-numeric.c:326 locale/programs/ld-paper.c:214
-#: locale/programs/ld-telephone.c:278 locale/programs/ld-time.c:947
-#: locale/programs/repertoire.c:313
+#: locale/programs/charmap.c:615 locale/programs/ld-address.c:524
+#: locale/programs/ld-collate.c:2616 locale/programs/ld-collate.c:3774
+#: locale/programs/ld-ctype.c:2118 locale/programs/ld-ctype.c:2830
+#: locale/programs/ld-identification.c:397
+#: locale/programs/ld-measurement.c:213 locale/programs/ld-messages.c:295
+#: locale/programs/ld-monetary.c:748 locale/programs/ld-name.c:262
+#: locale/programs/ld-numeric.c:325 locale/programs/ld-paper.c:212
+#: locale/programs/ld-telephone.c:276 locale/programs/ld-time.c:959
+#: locale/programs/repertoire.c:312
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
 msgstr "%1$s:定义不以“END %1$s”结尾"
 
-#: locale/programs/charmap.c:643
+#: locale/programs/charmap.c:648
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr "只有 WIDTH 定义才能直接写在 CHARMAP 定义之后"
 
-#: locale/programs/charmap.c:651 locale/programs/charmap.c:714
+#: locale/programs/charmap.c:656 locale/programs/charmap.c:720
 #, c-format
 msgid "value for %s must be an integer"
 msgstr "%s 的值必须为整数"
 
-#: locale/programs/charmap.c:842
+#: locale/programs/charmap.c:848
 #, c-format
 msgid "%s: error in state machine"
 msgstr "%s:状态机出错"
 
-#: locale/programs/charmap.c:850 locale/programs/ld-address.c:544
-#: locale/programs/ld-collate.c:2623 locale/programs/ld-collate.c:3977
-#: locale/programs/ld-ctype.c:2125 locale/programs/ld-ctype.c:2857
-#: locale/programs/ld-identification.c:415
-#: locale/programs/ld-measurement.c:231 locale/programs/ld-messages.c:314
-#: locale/programs/ld-monetary.c:756 locale/programs/ld-name.c:280
-#: locale/programs/ld-numeric.c:342 locale/programs/ld-paper.c:230
-#: locale/programs/ld-telephone.c:294 locale/programs/ld-time.c:963
-#: locale/programs/locfile.c:1000 locale/programs/repertoire.c:324
+#: locale/programs/charmap.c:856 locale/programs/ld-address.c:540
+#: locale/programs/ld-collate.c:2613 locale/programs/ld-collate.c:3967
+#: locale/programs/ld-ctype.c:2115 locale/programs/ld-ctype.c:2847
+#: locale/programs/ld-identification.c:413
+#: locale/programs/ld-measurement.c:229 locale/programs/ld-messages.c:311
+#: locale/programs/ld-monetary.c:764 locale/programs/ld-name.c:278
+#: locale/programs/ld-numeric.c:341 locale/programs/ld-paper.c:228
+#: locale/programs/ld-telephone.c:292 locale/programs/ld-time.c:990
+#: locale/programs/locfile.c:1010 locale/programs/repertoire.c:323
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s:文件不完整"
 
-#: locale/programs/charmap.c:869 locale/programs/charmap.c:880
+#: locale/programs/charmap.c:875 locale/programs/charmap.c:886
 #, c-format
 msgid "unknown character `%s'"
 msgstr "未知的字符“%s”"
 
-#: locale/programs/charmap.c:888
+#: locale/programs/charmap.c:894
 #, c-format
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
 msgstr "在范围起始与结束的字节序列中,字节的数目并不一致: %d vs %d"
 
-#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:2903
-#: locale/programs/repertoire.c:419
+#: locale/programs/charmap.c:999 locale/programs/ld-collate.c:2893
+#: locale/programs/repertoire.c:418
 msgid "invalid names for character range"
 msgstr "无效的字符范围名称"
 
-#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431
+#: locale/programs/charmap.c:1011 locale/programs/repertoire.c:430
 msgid "hexadecimal range format should use only capital characters"
 msgstr "在表示十六进制的范围时只能用大写的英文本母表示"
 
-#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449
+#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:448
 #, c-format
 msgid "<%s> and <%s> are invalid names for range"
 msgstr "<%s> 和 <%s> 是无效的范围名"
 
-#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456
+#: locale/programs/charmap.c:1035 locale/programs/repertoire.c:455
 msgid "upper limit in range is smaller than lower limit"
 msgstr "范围的上限小于下限"
 
-#: locale/programs/charmap.c:1087
+#: locale/programs/charmap.c:1093
 msgid "resulting bytes for range not representable."
 msgstr "用来定义范围的字节无法被表述出来"
 
-#: locale/programs/ld-address.c:135 locale/programs/ld-collate.c:1565
-#: locale/programs/ld-ctype.c:431 locale/programs/ld-identification.c:133
-#: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
-#: locale/programs/ld-monetary.c:193 locale/programs/ld-name.c:94
-#: locale/programs/ld-numeric.c:98 locale/programs/ld-paper.c:91
-#: locale/programs/ld-telephone.c:94 locale/programs/ld-time.c:159
+#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1563
+#: locale/programs/ld-ctype.c:430 locale/programs/ld-identification.c:131
+#: locale/programs/ld-measurement.c:92 locale/programs/ld-messages.c:96
+#: locale/programs/ld-monetary.c:192 locale/programs/ld-name.c:93
+#: locale/programs/ld-numeric.c:97 locale/programs/ld-paper.c:89
+#: locale/programs/ld-telephone.c:92 locale/programs/ld-time.c:164
 #, c-format
 msgid "No definition for %s category found"
 msgstr "找不到 %s 类别的定义"
 
-#: locale/programs/ld-address.c:146 locale/programs/ld-address.c:184
-#: locale/programs/ld-address.c:202 locale/programs/ld-address.c:231
-#: locale/programs/ld-address.c:303 locale/programs/ld-address.c:322
-#: locale/programs/ld-address.c:335 locale/programs/ld-identification.c:146
-#: locale/programs/ld-measurement.c:105 locale/programs/ld-monetary.c:205
-#: locale/programs/ld-monetary.c:249 locale/programs/ld-monetary.c:265
-#: locale/programs/ld-monetary.c:277 locale/programs/ld-name.c:105
-#: locale/programs/ld-name.c:142 locale/programs/ld-numeric.c:112
-#: locale/programs/ld-numeric.c:126 locale/programs/ld-paper.c:102
-#: locale/programs/ld-paper.c:111 locale/programs/ld-telephone.c:105
-#: locale/programs/ld-telephone.c:162 locale/programs/ld-time.c:175
-#: locale/programs/ld-time.c:196
+#: locale/programs/ld-address.c:144 locale/programs/ld-address.c:182
+#: locale/programs/ld-address.c:199 locale/programs/ld-address.c:228
+#: locale/programs/ld-address.c:300 locale/programs/ld-address.c:319
+#: locale/programs/ld-address.c:331 locale/programs/ld-identification.c:144
+#: locale/programs/ld-measurement.c:103 locale/programs/ld-monetary.c:204
+#: locale/programs/ld-monetary.c:258 locale/programs/ld-monetary.c:274
+#: locale/programs/ld-monetary.c:286 locale/programs/ld-name.c:104
+#: locale/programs/ld-name.c:141 locale/programs/ld-numeric.c:111
+#: locale/programs/ld-numeric.c:125 locale/programs/ld-paper.c:100
+#: locale/programs/ld-paper.c:109 locale/programs/ld-telephone.c:103
+#: locale/programs/ld-telephone.c:160 locale/programs/ld-time.c:180
+#: locale/programs/ld-time.c:201
 #, c-format
 msgid "%s: field `%s' not defined"
 msgstr "%s:域“%s”未定义"
 
-#: locale/programs/ld-address.c:158 locale/programs/ld-address.c:210
-#: locale/programs/ld-address.c:240 locale/programs/ld-address.c:278
-#: locale/programs/ld-name.c:117 locale/programs/ld-telephone.c:117
+#: locale/programs/ld-address.c:156 locale/programs/ld-address.c:207
+#: locale/programs/ld-address.c:237 locale/programs/ld-address.c:275
+#: locale/programs/ld-name.c:116 locale/programs/ld-telephone.c:115
 #, c-format
 msgid "%s: field `%s' must not be empty"
 msgstr "%s:域“%s”不能为空"
 
-#: locale/programs/ld-address.c:170
+#: locale/programs/ld-address.c:168
 #, c-format
 msgid "%s: invalid escape `%%%c' sequence in field `%s'"
 msgstr "%1$s:域“%3$s”中无效的转义“%%%2$c”序列"
 
-#: locale/programs/ld-address.c:221
+#: locale/programs/ld-address.c:218
 #, c-format
 msgid "%s: terminology language code `%s' not defined"
 msgstr "%s: 术语语言编码 `%s' 未定义"
 
-#: locale/programs/ld-address.c:246
+#: locale/programs/ld-address.c:243
 #, c-format
 msgid "%s: field `%s' must not be defined"
 msgstr "%s:域“%s”必须未定义"
 
-#: locale/programs/ld-address.c:260 locale/programs/ld-address.c:289
+#: locale/programs/ld-address.c:257 locale/programs/ld-address.c:286
 #, c-format
 msgid "%s: language abbreviation `%s' not defined"
 msgstr "%s:未定义的语言缩写“%s”"
 
-#: locale/programs/ld-address.c:267 locale/programs/ld-address.c:295
-#: locale/programs/ld-address.c:329 locale/programs/ld-address.c:341
+#: locale/programs/ld-address.c:264 locale/programs/ld-address.c:292
+#: locale/programs/ld-address.c:325 locale/programs/ld-address.c:337
 #, c-format
 msgid "%s: `%s' value does not match `%s' value"
 msgstr "%s:“%s”的值不能匹配“%s”的值"
 
-#: locale/programs/ld-address.c:314
+#: locale/programs/ld-address.c:311
 #, c-format
 msgid "%s: numeric country code `%d' not valid"
 msgstr "%s:数值国家编码“%d”无效"
 
-#: locale/programs/ld-address.c:436 locale/programs/ld-address.c:473
-#: locale/programs/ld-address.c:511 locale/programs/ld-ctype.c:2489
-#: locale/programs/ld-identification.c:311
-#: locale/programs/ld-measurement.c:198 locale/programs/ld-messages.c:267
-#: locale/programs/ld-monetary.c:495 locale/programs/ld-monetary.c:530
-#: locale/programs/ld-monetary.c:571 locale/programs/ld-name.c:237
-#: locale/programs/ld-numeric.c:218 locale/programs/ld-paper.c:197
-#: locale/programs/ld-telephone.c:253 locale/programs/ld-time.c:852
-#: locale/programs/ld-time.c:894
+#: locale/programs/ld-address.c:432 locale/programs/ld-address.c:469
+#: locale/programs/ld-address.c:507 locale/programs/ld-ctype.c:2479
+#: locale/programs/ld-identification.c:309
+#: locale/programs/ld-measurement.c:196 locale/programs/ld-messages.c:264
+#: locale/programs/ld-monetary.c:503 locale/programs/ld-monetary.c:538
+#: locale/programs/ld-monetary.c:579 locale/programs/ld-name.c:235
+#: locale/programs/ld-numeric.c:217 locale/programs/ld-paper.c:195
+#: locale/programs/ld-telephone.c:251 locale/programs/ld-time.c:864
+#: locale/programs/ld-time.c:906
 #, c-format
 msgid "%s: field `%s' declared more than once"
 msgstr "%s:多次声明域“%s”"
 
-#: locale/programs/ld-address.c:440 locale/programs/ld-address.c:478
-#: locale/programs/ld-identification.c:315 locale/programs/ld-messages.c:277
-#: locale/programs/ld-monetary.c:499 locale/programs/ld-monetary.c:534
-#: locale/programs/ld-name.c:241 locale/programs/ld-numeric.c:222
-#: locale/programs/ld-telephone.c:257 locale/programs/ld-time.c:746
-#: locale/programs/ld-time.c:815 locale/programs/ld-time.c:857
+#: locale/programs/ld-address.c:436 locale/programs/ld-address.c:474
+#: locale/programs/ld-identification.c:313 locale/programs/ld-messages.c:274
+#: locale/programs/ld-monetary.c:507 locale/programs/ld-monetary.c:542
+#: locale/programs/ld-name.c:239 locale/programs/ld-numeric.c:221
+#: locale/programs/ld-telephone.c:255 locale/programs/ld-time.c:756
+#: locale/programs/ld-time.c:827 locale/programs/ld-time.c:869
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr "%s:域“%s”中含有未知字符"
 
-#: locale/programs/ld-address.c:525 locale/programs/ld-collate.c:3782
-#: locale/programs/ld-ctype.c:2837 locale/programs/ld-identification.c:396
-#: locale/programs/ld-measurement.c:212 locale/programs/ld-messages.c:296
-#: locale/programs/ld-monetary.c:738 locale/programs/ld-name.c:262
-#: locale/programs/ld-numeric.c:324 locale/programs/ld-paper.c:212
-#: locale/programs/ld-telephone.c:276 locale/programs/ld-time.c:945
+#: locale/programs/ld-address.c:521 locale/programs/ld-collate.c:3772
+#: locale/programs/ld-ctype.c:2827 locale/programs/ld-identification.c:394
+#: locale/programs/ld-measurement.c:210 locale/programs/ld-messages.c:293
+#: locale/programs/ld-monetary.c:746 locale/programs/ld-name.c:260
+#: locale/programs/ld-numeric.c:323 locale/programs/ld-paper.c:210
+#: locale/programs/ld-telephone.c:274 locale/programs/ld-time.c:957
 #, c-format
 msgid "%s: incomplete `END' line"
 msgstr "%s:不完整的“END”行"
 
-#: locale/programs/ld-address.c:535 locale/programs/ld-collate.c:551
-#: locale/programs/ld-collate.c:603 locale/programs/ld-collate.c:899
-#: locale/programs/ld-collate.c:912 locale/programs/ld-collate.c:2592
-#: locale/programs/ld-collate.c:2613 locale/programs/ld-collate.c:3967
-#: locale/programs/ld-ctype.c:1857 locale/programs/ld-ctype.c:2115
-#: locale/programs/ld-ctype.c:2687 locale/programs/ld-ctype.c:2848
-#: locale/programs/ld-identification.c:406
-#: locale/programs/ld-measurement.c:222 locale/programs/ld-messages.c:305
-#: locale/programs/ld-monetary.c:747 locale/programs/ld-name.c:271
-#: locale/programs/ld-numeric.c:333 locale/programs/ld-paper.c:221
-#: locale/programs/ld-telephone.c:285 locale/programs/ld-time.c:954
+#: locale/programs/ld-address.c:531 locale/programs/ld-collate.c:550
+#: locale/programs/ld-collate.c:602 locale/programs/ld-collate.c:898
+#: locale/programs/ld-collate.c:911 locale/programs/ld-collate.c:2582
+#: locale/programs/ld-collate.c:2603 locale/programs/ld-collate.c:3957
+#: locale/programs/ld-ctype.c:1847 locale/programs/ld-ctype.c:2105
+#: locale/programs/ld-ctype.c:2677 locale/programs/ld-ctype.c:2838
+#: locale/programs/ld-identification.c:404
+#: locale/programs/ld-measurement.c:220 locale/programs/ld-messages.c:302
+#: locale/programs/ld-monetary.c:755 locale/programs/ld-name.c:269
+#: locale/programs/ld-numeric.c:332 locale/programs/ld-paper.c:219
+#: locale/programs/ld-telephone.c:283 locale/programs/ld-time.c:981
 #, c-format
 msgid "%s: syntax error"
 msgstr "%s:语法错误"
 
-#: locale/programs/ld-collate.c:426
+#: locale/programs/ld-collate.c:425
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "已经在字符映射表中定义了“%.*s”"
 
-#: locale/programs/ld-collate.c:435
+#: locale/programs/ld-collate.c:434
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "已经在指令表中定义了“%.*s”"
 
-#: locale/programs/ld-collate.c:442
+#: locale/programs/ld-collate.c:441
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "`%.*s' 已被定义为对照符号"
 
-#: locale/programs/ld-collate.c:449
+#: locale/programs/ld-collate.c:448
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "`%.*s' 已被定义为对照元素"
 
-#: locale/programs/ld-collate.c:480 locale/programs/ld-collate.c:506
+#: locale/programs/ld-collate.c:479 locale/programs/ld-collate.c:505
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s:“forward”和“backward”是互斥的"
 
-#: locale/programs/ld-collate.c:490 locale/programs/ld-collate.c:516
-#: locale/programs/ld-collate.c:532
+#: locale/programs/ld-collate.c:489 locale/programs/ld-collate.c:515
+#: locale/programs/ld-collate.c:531
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s: `%s' 不只一次地在权重 %d 中被提到"
 
-#: locale/programs/ld-collate.c:588
+#: locale/programs/ld-collate.c:587
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s:规则过多;第一个条目只含有 %d"
 
-#: locale/programs/ld-collate.c:624
+#: locale/programs/ld-collate.c:623
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s:排序规则不足"
 
-#: locale/programs/ld-collate.c:789
+#: locale/programs/ld-collate.c:788
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s:不允许空权字符串"
 
-#: locale/programs/ld-collate.c:884
+#: locale/programs/ld-collate.c:883
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: 权重必须使用与名称相同的省略符号"
 
-#: locale/programs/ld-collate.c:940
+#: locale/programs/ld-collate.c:939
 #, c-format
 msgid "%s: too many values"
 msgstr "%s:值过多"
 
-#: locale/programs/ld-collate.c:1060 locale/programs/ld-collate.c:1235
+#: locale/programs/ld-collate.c:1059 locale/programs/ld-collate.c:1234
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "`%.*s' 的顺序已经在 %s:%Zu 里面定义了"
 
-#: locale/programs/ld-collate.c:1110
+#: locale/programs/ld-collate.c:1109
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: 启始与结束符号范围必须代表字符"
 
-#: locale/programs/ld-collate.c:1137
+#: locale/programs/ld-collate.c:1136
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 msgstr "%s:字节序列的第一个和最后一个字符的长度必须相同"
 
-#: locale/programs/ld-collate.c:1179
+#: locale/programs/ld-collate.c:1178
 #, c-format
 msgid "%s: byte sequence of first character of range is not lower than that of the last character"
 msgstr "%s:范围的字节序列的第一个字符不小于最后一个字符"
 
-#: locale/programs/ld-collate.c:1304
+#: locale/programs/ld-collate.c:1303
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: 符号范围的省略不可以直接在 `order_start' 之后"
 
-#: locale/programs/ld-collate.c:1308
+#: locale/programs/ld-collate.c:1307
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr "%s: 符号范围的省略不可以直接在 `order_end' 之前"
 
-#: locale/programs/ld-collate.c:1328 locale/programs/ld-ctype.c:1374
+#: locale/programs/ld-collate.c:1327 locale/programs/ld-ctype.c:1363
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "“%s”和“%.*s”是无效的符号范围名"
 
-#: locale/programs/ld-collate.c:1378 locale/programs/ld-collate.c:3718
+#: locale/programs/ld-collate.c:1377 locale/programs/ld-collate.c:3708
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: `%.*s' 的顺序已在 %s:%Zu 中定义"
 
-#: locale/programs/ld-collate.c:1387
+#: locale/programs/ld-collate.c:1386
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s:“%s”必须是一个字符"
 
-#: locale/programs/ld-collate.c:1582
+#: locale/programs/ld-collate.c:1580
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
 msgstr "%s: `position' 必须在所有区块里特定的等级中使用,否则不能使用"
 
-#: locale/programs/ld-collate.c:1607
+#: locale/programs/ld-collate.c:1604
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "符号“%s”未定义"
 
-#: locale/programs/ld-collate.c:1683 locale/programs/ld-collate.c:1789
+#: locale/programs/ld-collate.c:1680 locale/programs/ld-collate.c:1785
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "跟符号 `%s' 有相同的编码: "
 
-#: locale/programs/ld-collate.c:1687 locale/programs/ld-collate.c:1793
+#: locale/programs/ld-collate.c:1684 locale/programs/ld-collate.c:1789
 #, c-format
 msgid "symbol `%s'"
 msgstr "符号“%s”"
 
-#: locale/programs/ld-collate.c:1833
-#, c-format
-msgid "no definition of `UNDEFINED'"
-msgstr "没有关于“UNDEFINIED”的定义"
-
-#: locale/programs/ld-collate.c:1862
-#, c-format
+#: locale/programs/ld-collate.c:1852
 msgid "too many errors; giving up"
 msgstr "错误过多;放弃"
 
-#: locale/programs/ld-collate.c:2518 locale/programs/ld-collate.c:3906
+#: locale/programs/ld-collate.c:2508 locale/programs/ld-collate.c:3896
 #, c-format
 msgid "%s: nested conditionals not supported"
 msgstr "%s: 不支持嵌套条件"
 
-#: locale/programs/ld-collate.c:2536
+#: locale/programs/ld-collate.c:2526
 #, c-format
 msgid "%s: more than one 'else'"
 msgstr "%s: 使用多于一个 “else”"
 
-#: locale/programs/ld-collate.c:2711
+#: locale/programs/ld-collate.c:2701
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s:重复定义“%s”"
 
-#: locale/programs/ld-collate.c:2747
+#: locale/programs/ld-collate.c:2737
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s:重复声明节“%s”"
 
-#: locale/programs/ld-collate.c:2883
+#: locale/programs/ld-collate.c:2873
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: 未知的字符在对照符号名称中"
 
-#: locale/programs/ld-collate.c:3012
+#: locale/programs/ld-collate.c:3002
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s:等价定义名中未知的字符"
 
-#: locale/programs/ld-collate.c:3023
+#: locale/programs/ld-collate.c:3013
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s:等价定义值中未知的字符"
 
-#: locale/programs/ld-collate.c:3033
+#: locale/programs/ld-collate.c:3023
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s:等价定义中未知的符号“%s”"
 
-#: locale/programs/ld-collate.c:3042
+#: locale/programs/ld-collate.c:3032
 msgid "error while adding equivalent collating symbol"
 msgstr "正在加入同义对照符号时发生错误"
 
-#: locale/programs/ld-collate.c:3080
+#: locale/programs/ld-collate.c:3070
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "重复定义脚本“%s”"
 
-#: locale/programs/ld-collate.c:3128
+#: locale/programs/ld-collate.c:3118
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr "%s:未知的节名“%.*s”"
 
-#: locale/programs/ld-collate.c:3157
+#: locale/programs/ld-collate.c:3147
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s:关于“%s”节出现多个顺序定义"
 
-#: locale/programs/ld-collate.c:3185
+#: locale/programs/ld-collate.c:3175
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s:排序规则的数量无效"
 
-#: locale/programs/ld-collate.c:3212
+#: locale/programs/ld-collate.c:3202
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s:关于未命名节出现多个顺序定义"
 
-#: locale/programs/ld-collate.c:3267 locale/programs/ld-collate.c:3397
-#: locale/programs/ld-collate.c:3760
+#: locale/programs/ld-collate.c:3257 locale/programs/ld-collate.c:3387
+#: locale/programs/ld-collate.c:3750
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s:遗漏关键字“order_end”"
 
-#: locale/programs/ld-collate.c:3330
+#: locale/programs/ld-collate.c:3320
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: 对照符号 %.*s 的顺序尚未定义"
 
-#: locale/programs/ld-collate.c:3348
+#: locale/programs/ld-collate.c:3338
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: 对照元素 %.*s 的顺序尚未定义"
 
-#: locale/programs/ld-collate.c:3359
+#: locale/programs/ld-collate.c:3349
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: 无法重新排列在 %.*s 之后: 未知的符号"
 
-#: locale/programs/ld-collate.c:3411 locale/programs/ld-collate.c:3772
+#: locale/programs/ld-collate.c:3401 locale/programs/ld-collate.c:3762
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s:以后关键字“reorder-end”"
 
-#: locale/programs/ld-collate.c:3445 locale/programs/ld-collate.c:3643
+#: locale/programs/ld-collate.c:3435 locale/programs/ld-collate.c:3633
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s:未知的节“%.*s”"
 
-#: locale/programs/ld-collate.c:3510
+#: locale/programs/ld-collate.c:3500
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: 不当的符号 <%.*s>"
 
-#: locale/programs/ld-collate.c:3706
+#: locale/programs/ld-collate.c:3696
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: 无法用 `%s' 作为省略节的结尾"
 
-#: locale/programs/ld-collate.c:3756
+#: locale/programs/ld-collate.c:3746
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s:不允许空范畴描述"
 
-#: locale/programs/ld-collate.c:3775
+#: locale/programs/ld-collate.c:3765
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s:遗漏关键字“reorder-sections-end”"
 
-#: locale/programs/ld-collate.c:3939
+#: locale/programs/ld-collate.c:3929
 #, c-format
 msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
 msgstr "%s: “%s” 而不需吻合中 “ifdef” 或 “ifndef” "
 
-#: locale/programs/ld-collate.c:3957
+#: locale/programs/ld-collate.c:3947
 #, c-format
 msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
 msgstr "%s: “endif” 而不需吻合中 “ifdef” 或 “ifndef” "
 
-#: locale/programs/ld-ctype.c:450
-#, c-format
+#: locale/programs/ld-ctype.c:448
 msgid "No character set name specified in charmap"
 msgstr "字符映射表中未给出字符集名称"
 
-#: locale/programs/ld-ctype.c:479
+#: locale/programs/ld-ctype.c:476
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr "character L'\\u%0*x' (放在类别 `%s' 之中) 必须在类别 `%s' 里面"
 
-#: locale/programs/ld-ctype.c:494
+#: locale/programs/ld-ctype.c:490
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr "character L'\\u%0*x' (放在类别 `%s' 之中) 不能在类别 `%s' 里面"
 
-#: locale/programs/ld-ctype.c:508 locale/programs/ld-ctype.c:566
+#: locale/programs/ld-ctype.c:504 locale/programs/ld-ctype.c:560
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr "在 %s 的第 %u 行出现内部错误"
 
-#: locale/programs/ld-ctype.c:537
+#: locale/programs/ld-ctype.c:532
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr "类“%2$s”中的字符“%1$s”必须属于类“%3$s”"
 
-#: locale/programs/ld-ctype.c:553
+#: locale/programs/ld-ctype.c:547
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr "类“%2$s”中的字符“%1$s”不得属于类“%3$s”"
 
-#: locale/programs/ld-ctype.c:583 locale/programs/ld-ctype.c:621
+#: locale/programs/ld-ctype.c:576 locale/programs/ld-ctype.c:611
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr "字符 <SP> 不在类“%s”中"
 
-#: locale/programs/ld-ctype.c:595 locale/programs/ld-ctype.c:632
+#: locale/programs/ld-ctype.c:587 locale/programs/ld-ctype.c:621
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr "字符 <SP> 不能属于类“%s”"
 
-#: locale/programs/ld-ctype.c:610
-#, c-format
+#: locale/programs/ld-ctype.c:601
 msgid "character <SP> not defined in character map"
 msgstr "字符映射中未定义字符 <SP>"
 
-#: locale/programs/ld-ctype.c:746
-#, c-format
+#: locale/programs/ld-ctype.c:735
 msgid "`digit' category has not entries in groups of ten"
 msgstr "`digit' 类别在群组 \"十\" 中没有项目"
 
-#: locale/programs/ld-ctype.c:795
-#, c-format
+#: locale/programs/ld-ctype.c:784
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr "没有定义输入数字,在字集对照表中也找不到相符的标准名称"
 
-#: locale/programs/ld-ctype.c:860
-#, c-format
+#: locale/programs/ld-ctype.c:849
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr "在字集对照表中无法找到某些在 `outdigit' 中用到的字符"
 
-#: locale/programs/ld-ctype.c:877
-#, c-format
+#: locale/programs/ld-ctype.c:866
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr "在编码映射表中无法找到某些在 `outdigit' 中用到的字符"
 
-#: locale/programs/ld-ctype.c:1142
+#: locale/programs/ld-ctype.c:1131
 #, c-format
 msgid "character class `%s' already defined"
 msgstr "字符类“%s”已定义"
 
-#: locale/programs/ld-ctype.c:1148
+#: locale/programs/ld-ctype.c:1137
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr "程序实现的限制: 不能使用超过 %Zd 个字集类别"
 
-#: locale/programs/ld-ctype.c:1174
+#: locale/programs/ld-ctype.c:1163
 #, c-format
 msgid "character map `%s' already defined"
 msgstr "字集对照表 `%s' 已经定义过了"
 
-#: locale/programs/ld-ctype.c:1180
+#: locale/programs/ld-ctype.c:1169
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr "实现限制:不得多于 %d 个字符映射表"
 
-#: locale/programs/ld-ctype.c:1445 locale/programs/ld-ctype.c:1570
-#: locale/programs/ld-ctype.c:1676 locale/programs/ld-ctype.c:2352
-#: locale/programs/ld-ctype.c:3324
+#: locale/programs/ld-ctype.c:1435 locale/programs/ld-ctype.c:1560
+#: locale/programs/ld-ctype.c:1666 locale/programs/ld-ctype.c:2342
+#: locale/programs/ld-ctype.c:3302
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr "%s:域“%s”含有条目的个数不是十个"
 
-#: locale/programs/ld-ctype.c:1473 locale/programs/ld-ctype.c:2047
+#: locale/programs/ld-ctype.c:1463 locale/programs/ld-ctype.c:2037
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr "区域定义的结尾值 <U%0*X> 比起始值 <U%0*X> 还要小"
 
-#: locale/programs/ld-ctype.c:1600
+#: locale/programs/ld-ctype.c:1590
 msgid "start and end character sequence of range must have the same length"
 msgstr "范围的起始和终止字符序列必须具有相同的长度"
 
-#: locale/programs/ld-ctype.c:1607
+#: locale/programs/ld-ctype.c:1597
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr "字符序列定义的结尾值比起始值还要小"
 
-#: locale/programs/ld-ctype.c:1967 locale/programs/ld-ctype.c:2018
+#: locale/programs/ld-ctype.c:1957 locale/programs/ld-ctype.c:2008
 msgid "premature end of `translit_ignore' definition"
 msgstr "`translit_ignore' 定义没有按时结束"
 
-#: locale/programs/ld-ctype.c:1973 locale/programs/ld-ctype.c:2024
-#: locale/programs/ld-ctype.c:2066
+#: locale/programs/ld-ctype.c:1963 locale/programs/ld-ctype.c:2014
+#: locale/programs/ld-ctype.c:2056
 msgid "syntax error"
 msgstr "语法错误"
 
-#: locale/programs/ld-ctype.c:2199
+#: locale/programs/ld-ctype.c:2189
 #, c-format
 msgid "%s: syntax error in definition of new character class"
 msgstr "%s:在定义新字符集合中出现语法错误"
 
-#: locale/programs/ld-ctype.c:2214
+#: locale/programs/ld-ctype.c:2204
 #, c-format
 msgid "%s: syntax error in definition of new character map"
 msgstr "%s:在新字符映射中出现语法错误"
 
-#: locale/programs/ld-ctype.c:2374
+#: locale/programs/ld-ctype.c:2364
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr "省略区域必须用两个型别相同的算符标示出来"
 
-#: locale/programs/ld-ctype.c:2383
+#: locale/programs/ld-ctype.c:2373
 msgid "with symbolic name range values the absolute ellipsis `...' must not be used"
 msgstr "用符号名称来指定字符编码范围时不可以用绝对位置的省略符号 `…'"
 
-#: locale/programs/ld-ctype.c:2398
+#: locale/programs/ld-ctype.c:2388
 msgid "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr "用来指定 UCS 值的范围时得用十六进制表示的省略符号 `..'"
 
-#: locale/programs/ld-ctype.c:2412
+#: locale/programs/ld-ctype.c:2402
 msgid "with character code range values one must use the absolute ellipsis `...'"
 msgstr "用来指定字符编码值的范围时得用绝对位置的省略符号 `…'"
 
-#: locale/programs/ld-ctype.c:2563
+#: locale/programs/ld-ctype.c:2553
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr "重复定义映射“%s”"
 
-#: locale/programs/ld-ctype.c:2649 locale/programs/ld-ctype.c:2793
+#: locale/programs/ld-ctype.c:2639 locale/programs/ld-ctype.c:2783
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
 msgstr "%s:“translit_start”节不以“translit_end”结束"
 
-#: locale/programs/ld-ctype.c:2744
+#: locale/programs/ld-ctype.c:2734
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr "%s:重复定义“default_missing”"
 
-#: locale/programs/ld-ctype.c:2749
+#: locale/programs/ld-ctype.c:2739
 msgid "previous definition was here"
 msgstr "前一个定义在这里"
 
-#: locale/programs/ld-ctype.c:2771
+#: locale/programs/ld-ctype.c:2761
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
 msgstr "%s: 找不到可表示为 `default_missing' 的定义"
 
-#: locale/programs/ld-ctype.c:2889 locale/programs/ld-ctype.c:2986
-#: locale/programs/ld-ctype.c:3006 locale/programs/ld-ctype.c:3027
-#: locale/programs/ld-ctype.c:3048 locale/programs/ld-ctype.c:3069
-#: locale/programs/ld-ctype.c:3090 locale/programs/ld-ctype.c:3130
-#: locale/programs/ld-ctype.c:3151 locale/programs/ld-ctype.c:3216
-#: locale/programs/ld-ctype.c:3258 locale/programs/ld-ctype.c:3283
+#: locale/programs/ld-ctype.c:2878 locale/programs/ld-ctype.c:2974
+#: locale/programs/ld-ctype.c:2993 locale/programs/ld-ctype.c:3013
+#: locale/programs/ld-ctype.c:3033 locale/programs/ld-ctype.c:3053
+#: locale/programs/ld-ctype.c:3073 locale/programs/ld-ctype.c:3112
+#: locale/programs/ld-ctype.c:3132 locale/programs/ld-ctype.c:3198
+#: locale/programs/ld-ctype.c:3239 locale/programs/ld-ctype.c:3262
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr "%s: 字符 `%s' 没有定义,但它是必需的默认值"
 
-#: locale/programs/ld-ctype.c:2894 locale/programs/ld-ctype.c:2991
-#: locale/programs/ld-ctype.c:3011 locale/programs/ld-ctype.c:3032
-#: locale/programs/ld-ctype.c:3053 locale/programs/ld-ctype.c:3074
-#: locale/programs/ld-ctype.c:3095 locale/programs/ld-ctype.c:3135
-#: locale/programs/ld-ctype.c:3156 locale/programs/ld-ctype.c:3221
+#: locale/programs/ld-ctype.c:2883 locale/programs/ld-ctype.c:2979
+#: locale/programs/ld-ctype.c:2998 locale/programs/ld-ctype.c:3018
+#: locale/programs/ld-ctype.c:3038 locale/programs/ld-ctype.c:3058
+#: locale/programs/ld-ctype.c:3078 locale/programs/ld-ctype.c:3117
+#: locale/programs/ld-ctype.c:3137 locale/programs/ld-ctype.c:3203
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr "%s: 字集对照表中的字符 `%s' 无法表示为单一字节"
 
-#: locale/programs/ld-ctype.c:3265 locale/programs/ld-ctype.c:3290
+#: locale/programs/ld-ctype.c:3245 locale/programs/ld-ctype.c:3268
 #, c-format
 msgid "%s: character `%s' needed as default value not representable with one byte"
 msgstr "%s:需要作为默认值的字符“%s”无法以单个字节来表示"
 
-#: locale/programs/ld-ctype.c:3346
-#, c-format
+#: locale/programs/ld-ctype.c:3324
 msgid "no output digits defined and none of the standard names in the charmap"
 msgstr "没有定义输出数字,在字集对照表中也找不到相符的标准名称"
 
-#: locale/programs/ld-ctype.c:3595
+#: locale/programs/ld-ctype.c:3573
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
 msgstr "%s: 语区数据`%s' 的音译数据不存在"
 
-#: locale/programs/ld-ctype.c:3695
-#, c-format
-msgid "%s: table for class \"%s\": %lu bytes\n"
+#: locale/programs/ld-ctype.c:3672
+#, fuzzy, c-format
+#| msgid "%s: table for class \"%s\": %lu bytes\n"
+msgid "%s: table for class \"%s\": %lu bytes"
 msgstr "%s: 类别 \"%s\" 表格: %lu 字节\n"
 
-#: locale/programs/ld-ctype.c:3760
-#, c-format
-msgid "%s: table for map \"%s\": %lu bytes\n"
+#: locale/programs/ld-ctype.c:3736
+#, fuzzy, c-format
+#| msgid "%s: table for map \"%s\": %lu bytes\n"
+msgid "%s: table for map \"%s\": %lu bytes"
 msgstr "%s: 映射表 \"%s\" 表格: %lu 字节\n"
 
-#: locale/programs/ld-ctype.c:3885
-#, c-format
-msgid "%s: table for width: %lu bytes\n"
+#: locale/programs/ld-ctype.c:3860
+#, fuzzy, c-format
+#| msgid "%s: table for width: %lu bytes\n"
+msgid "%s: table for width: %lu bytes"
 msgstr "%s: 宽度表格: %lu 字节\n"
 
 # LC_IDENTIFICATION 放的是“坏了找谁”之类的事情,参照 locale(5)
-#: locale/programs/ld-identification.c:175
+#: locale/programs/ld-identification.c:173
 #, c-format
 msgid "%s: no identification for category `%s'"
 msgstr "%s: 类别 `%s' 没有身份信息"
 
 # 写成“不认识”、“没听说过”感觉要通顺很多(
-#: locale/programs/ld-identification.c:199
+#: locale/programs/ld-identification.c:197
 #, c-format
 msgid "%s: unknown standard `%s' for category `%s'"
 msgstr "%1$s:类别“%3$s”的标准“%2$s”未知"
 
-#: locale/programs/ld-identification.c:382
+#: locale/programs/ld-identification.c:380
 #, c-format
 msgid "%s: duplicate category version definition"
 msgstr "%s: 重复的类别版本定义"
 
-#: locale/programs/ld-measurement.c:113
+#: locale/programs/ld-measurement.c:111
 #, c-format
 msgid "%s: invalid value for field `%s'"
 msgstr "%s:域“%s”中的值无效"
 
-#: locale/programs/ld-messages.c:114 locale/programs/ld-messages.c:148
+#: locale/programs/ld-messages.c:113 locale/programs/ld-messages.c:146
 #, c-format
 msgid "%s: field `%s' undefined"
 msgstr "%s:解除域“%s”的定义"
 
-#: locale/programs/ld-messages.c:121 locale/programs/ld-messages.c:155
-#: locale/programs/ld-monetary.c:255 locale/programs/ld-numeric.c:118
+#: locale/programs/ld-messages.c:119 locale/programs/ld-messages.c:152
+#: locale/programs/ld-monetary.c:264 locale/programs/ld-numeric.c:117
 #, c-format
 msgid "%s: value for field `%s' must not be an empty string"
 msgstr "%s:域“%s”的值不能是空字符串"
 
-#: locale/programs/ld-messages.c:137 locale/programs/ld-messages.c:171
+#: locale/programs/ld-messages.c:135 locale/programs/ld-messages.c:168
 #, c-format
 msgid "%s: no correct regular expression for field `%s': %s"
 msgstr "%s:域“%s”中没有正确的常规表达式:%s"
 
-#: locale/programs/ld-monetary.c:223
+#: locale/programs/ld-monetary.c:228
 #, c-format
 msgid "%s: value of field `int_curr_symbol' has wrong length"
 msgstr "%s:域“int_curr_symbol”的值的长度错误"
 
-#: locale/programs/ld-monetary.c:236
-#, c-format
-msgid "%s: value of field `int_curr_symbol' does not correspond to a valid name in ISO 4217"
+#: locale/programs/ld-monetary.c:245
+#, fuzzy, c-format
+#| msgid "%s: value of field `int_curr_symbol' does not correspond to a valid name in ISO 4217"
+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 中任何一个合法的名称都不对应"
 
-#: locale/programs/ld-monetary.c:284 locale/programs/ld-monetary.c:314
+#: 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"
 msgstr "%s:“%s”域的值必须在 %d...%d 的范围内"
 
-#: locale/programs/ld-monetary.c:541 locale/programs/ld-numeric.c:229
+#: locale/programs/ld-monetary.c:549 locale/programs/ld-numeric.c:228
 #, c-format
 msgid "%s: value for field `%s' must be a single character"
 msgstr "%s:“%s”域的值必须是单个字符"
 
-#: locale/programs/ld-monetary.c:638 locale/programs/ld-numeric.c:273
+#: locale/programs/ld-monetary.c:646 locale/programs/ld-numeric.c:272
 #, c-format
 msgid "%s: `-1' must be last entry in `%s' field"
 msgstr "%s:“-1”必须是“%s”域中的最后一个条目"
 
-#: locale/programs/ld-monetary.c:660 locale/programs/ld-numeric.c:290
+#: locale/programs/ld-monetary.c:668 locale/programs/ld-numeric.c:289
 #, c-format
 msgid "%s: values for field `%s' must be smaller than 127"
 msgstr "%s:域“%s”的值必须小于 127"
 
-#: locale/programs/ld-monetary.c:706
+#: locale/programs/ld-monetary.c:714
 msgid "conversion rate value cannot be zero"
 msgstr "转换率的值不能为 0"
 
-#: locale/programs/ld-name.c:129 locale/programs/ld-telephone.c:126
-#: locale/programs/ld-telephone.c:149
+#: locale/programs/ld-name.c:128 locale/programs/ld-telephone.c:124
+#: locale/programs/ld-telephone.c:147
 #, c-format
 msgid "%s: invalid escape sequence in field `%s'"
 msgstr "%s:域“%s”中含有无效转义序列"
 
-#: locale/programs/ld-time.c:247
+#: locale/programs/ld-time.c:251
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not '+' nor '-'"
 msgstr "%s: 在 `era' 字段的字串 %Zd 中,方向旗标既不是 '+' 也不是 '-'"
 
-#: locale/programs/ld-time.c:258
+#: locale/programs/ld-time.c:261
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not a single character"
 msgstr "%s: 在 `era' 字段的字串 %Zd 中,方向旗标不是一个单一字符"
 
-#: locale/programs/ld-time.c:271
+#: locale/programs/ld-time.c:273
 #, c-format
 msgid "%s: invalid number for offset in string %Zd in `era' field"
 msgstr "%s: 在 `era' 字段、字串 %Zd 中的位移数字不适用"
 
-#: locale/programs/ld-time.c:279
+#: locale/programs/ld-time.c:280
 #, c-format
 msgid "%s: garbage at end of offset value in string %Zd in `era' field"
 msgstr "%s: 无用的数据,在 `era' 字段、字串 %Zd 中末尾的位移值"
@@ -2480,57 +2486,57 @@ msgstr "%s: 无用的数据,在 `era' 字段、字串 %Zd 中末尾的位移
 msgid "%s: invalid starting date in string %Zd in `era' field"
 msgstr "%s: 在 `era' 字段、字串 %Zd 中的起始日期不适用"
 
-#: locale/programs/ld-time.c:339
+#: 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 中末尾的起始日期"
 
-#: locale/programs/ld-time.c:358
+#: locale/programs/ld-time.c:356
 #, c-format
 msgid "%s: starting date is invalid in string %Zd in `era' field"
 msgstr "%s: 在 `era' 区域的字串 %Zd 中的启始日期是不适用的"
 
-#: locale/programs/ld-time.c:407 locale/programs/ld-time.c:435
+#: locale/programs/ld-time.c:404 locale/programs/ld-time.c:430
 #, c-format
 msgid "%s: invalid stopping date in string %Zd in `era' field"
 msgstr "%s: 在 `era' 字段、字串 %Zd 中的结束日期不适用"
 
-#: locale/programs/ld-time.c:416
+#: locale/programs/ld-time.c:412
 #, c-format
 msgid "%s: garbage at end of stopping date in string %Zd in `era' field"
 msgstr "%s: 无用的数据,在 `era' 区域、字串 %Zd 中末尾的结束日期"
 
-#: locale/programs/ld-time.c:444
+#: locale/programs/ld-time.c:438
 #, c-format
 msgid "%s: missing era name in string %Zd in `era' field"
 msgstr "%s: 缺少 era 名称,在 `era' 字段、字串 %Zd 中"
 
-#: locale/programs/ld-time.c:456
+#: locale/programs/ld-time.c:449
 #, c-format
 msgid "%s: missing era format in string %Zd in `era' field"
 msgstr "%s: 缺少 era 格式,在 `era' 字段、字串 %Zd 中"
 
-#: locale/programs/ld-time.c:501
+#: locale/programs/ld-time.c:494
 #, c-format
 msgid "%s: third operand for value of field `%s' must not be larger than %d"
 msgstr "%s: 字段 `%s' 值的第三个算符不可以比 %d 大"
 
-#: locale/programs/ld-time.c:509 locale/programs/ld-time.c:517
-#: locale/programs/ld-time.c:525
+#: locale/programs/ld-time.c:502 locale/programs/ld-time.c:510
+#: locale/programs/ld-time.c:518
 #, c-format
 msgid "%s: values for field `%s' must not be larger than %d"
 msgstr "%s:域“%s”的值不能大于 %d"
 
-#: locale/programs/ld-time.c:730
+#: locale/programs/ld-time.c:740
 #, c-format
 msgid "%s: too few values for field `%s'"
 msgstr "%s:域“%s”的值过少"
 
-#: locale/programs/ld-time.c:775
+#: locale/programs/ld-time.c:785
 msgid "extra trailing semicolon"
 msgstr "多余的终止分号"
 
-#: locale/programs/ld-time.c:778
+#: locale/programs/ld-time.c:788
 #, c-format
 msgid "%s: too many values for field `%s'"
 msgstr "%s:域“%s”的值过多"
@@ -2555,20 +2561,16 @@ msgstr "未终止的符号名"
 msgid "illegal escape sequence at end of string"
 msgstr "字符串末尾的非法转义序列"
 
-#: locale/programs/linereader.c:627 locale/programs/linereader.c:855
+#: locale/programs/linereader.c:627 locale/programs/linereader.c:847
 msgid "unterminated string"
 msgstr "未终止的字符串"
 
-#: locale/programs/linereader.c:669
-msgid "non-symbolic character value should not be used"
-msgstr "不应该使用非符号字符的值"
-
-#: locale/programs/linereader.c:816
+#: locale/programs/linereader.c:808
 #, c-format
 msgid "symbol `%.*s' not in charmap"
 msgstr "符号 `%.*s' 并不在字集对照表中"
 
-#: locale/programs/linereader.c:837
+#: locale/programs/linereader.c:829
 #, c-format
 msgid "symbol `%.*s' not in repertoire map"
 msgstr "符号 `%.*s' 并不在编码映射表中"
@@ -2578,39 +2580,39 @@ msgstr "符号 `%.*s' 并不在编码映射表中"
 msgid "unknown name \"%s\""
 msgstr "不明名称 “%s” "
 
-#: locale/programs/locale.c:72
+#: locale/programs/locale.c:70
 msgid "System information:"
 msgstr "系统信息:"
 
-#: locale/programs/locale.c:74
+#: locale/programs/locale.c:72
 msgid "Write names of available locales"
 msgstr "写出可用区域的名称"
 
-#: locale/programs/locale.c:76
+#: locale/programs/locale.c:74
 msgid "Write names of available charmaps"
 msgstr "写出可用字符映射的名称"
 
-#: locale/programs/locale.c:77
+#: locale/programs/locale.c:75
 msgid "Modify output format:"
 msgstr "修改输出格式:"
 
-#: locale/programs/locale.c:78
+#: locale/programs/locale.c:76
 msgid "Write names of selected categories"
 msgstr "写出选中范畴的名称"
 
-#: locale/programs/locale.c:79
+#: locale/programs/locale.c:77
 msgid "Write names of selected keywords"
 msgstr "写出选中关键字的名称"
 
-#: locale/programs/locale.c:80
+#: locale/programs/locale.c:78
 msgid "Print more information"
 msgstr "打印更多信息"
 
-#: locale/programs/locale.c:85
+#: locale/programs/locale.c:83
 msgid "Get locale-specific information."
 msgstr "给出区域特定的信息。"
 
-#: locale/programs/locale.c:88
+#: locale/programs/locale.c:86
 msgid ""
 "NAME\n"
 "[-a|-m]"
@@ -2618,108 +2620,117 @@ msgstr ""
 "名称\n"
 "[-a|-m]"
 
-#: locale/programs/locale.c:192
-#, c-format
-msgid "Cannot set LC_CTYPE to default locale"
-msgstr "无法将 LC_CTYPE 设置为缺省的语区"
-
-#: locale/programs/locale.c:194
-#, c-format
-msgid "Cannot set LC_MESSAGES to default locale"
-msgstr "无法将 LC_MESSAGES 设置为缺省的语区"
-
-#: locale/programs/locale.c:207
+#: locale/programs/locale.c:522
 #, c-format
-msgid "Cannot set LC_COLLATE to default locale"
-msgstr "无法将 LC_COLLATE 设置为缺省的语区"
+msgid "while preparing output"
+msgstr "准备输出时"
 
-#: locale/programs/locale.c:223
-#, c-format
-msgid "Cannot set LC_ALL to default locale"
+#: locale/programs/locale.c:998
+#, fuzzy, c-format
+#| msgid "Cannot set LC_ALL to default locale"
+msgid "Cannot set %s to default locale"
 msgstr "无法将 LC_ALL 设置为缺省的语区"
 
-#: locale/programs/locale.c:525
+#: locale/programs/locale.c:1096
 #, c-format
-msgid "while preparing output"
-msgstr "准备输出时"
+msgid "warning: The LOCPATH variable is set to \"%s\"\n"
+msgstr ""
 
-#: locale/programs/localedef.c:115
+#: locale/programs/localedef.c:116
 msgid "Input Files:"
 msgstr "输入文件:"
 
-#: locale/programs/localedef.c:117
+#: locale/programs/localedef.c:118
 msgid "Symbolic character names defined in FILE"
 msgstr "符号字符的名称定义在文件 FILE 中"
 
-#: locale/programs/localedef.c:119
+#: locale/programs/localedef.c:120
 msgid "Source definitions are found in FILE"
 msgstr "在 FILE 中找到源定义"
 
-#: locale/programs/localedef.c:121
+#: locale/programs/localedef.c:122
 msgid "FILE contains mapping from symbolic names to UCS4 values"
 msgstr "文件 FILE 内含符号名与 UCS4 编码之间的映射"
 
-#: locale/programs/localedef.c:125
+#: locale/programs/localedef.c:126
 msgid "Create output even if warning messages were issued"
 msgstr "即使出现警告消息也创建输出"
 
-#: locale/programs/localedef.c:126
+#: 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 "可选的输出文件前缀"
 
-#: locale/programs/localedef.c:127
+#: locale/programs/localedef.c:130
 msgid "Strictly conform to POSIX"
 msgstr "严格遵从 POSIX"
 
-#: locale/programs/localedef.c:129
+#: locale/programs/localedef.c:132
 msgid "Suppress warnings and information messages"
 msgstr "关闭警告和信息消息"
 
-#: locale/programs/localedef.c:130
+#: locale/programs/localedef.c:133
 msgid "Print more messages"
 msgstr "打印更多消息"
 
-#: locale/programs/localedef.c:131
+#: locale/programs/localedef.c:134 locale/programs/localedef.c:137
+#, fuzzy
+#| msgid "warning: "
+msgid "<warnings>"
+msgstr "警告:"
+
+#: locale/programs/localedef.c:135
+msgid "Comma-separated list of warnings to disable; supported warnings are: ascii, intcurrsym"
+msgstr ""
+
+#: locale/programs/localedef.c:138
+msgid "Comma-separated list of warnings to enable; supported warnings are: ascii, intcurrsym"
+msgstr ""
+
+#: locale/programs/localedef.c:141
 msgid "Archive control:"
 msgstr "归档控制:"
 
-#: locale/programs/localedef.c:133
+#: locale/programs/localedef.c:143
 msgid "Don't add new data to archive"
 msgstr "不要将新数据添加到归档文件中"
 
-#: locale/programs/localedef.c:135
+#: locale/programs/localedef.c:145
 msgid "Add locales named by parameters to archive"
 msgstr "将由参数命名的区域添加到归档文件中"
 
-#: locale/programs/localedef.c:136
+#: locale/programs/localedef.c:146
 msgid "Replace existing archive content"
 msgstr "替换现有的归档文件内容"
 
-#: locale/programs/localedef.c:138
+#: locale/programs/localedef.c:148
 msgid "Remove locales named by parameters from archive"
 msgstr "从归档文件中删除由参数命名的区域"
 
-#: locale/programs/localedef.c:139
+#: locale/programs/localedef.c:149
 msgid "List content of archive"
 msgstr "列出归档文件的内容"
 
-#: locale/programs/localedef.c:141
+#: locale/programs/localedef.c:151
 msgid "locale.alias file to consult when making archive"
 msgstr "在制作归档文件时参考 locale.alias 文件"
 
-#: locale/programs/localedef.c:143
+#: locale/programs/localedef.c:153
 msgid "Generate little-endian output"
 msgstr "生成小端序输出"
 
-#: locale/programs/localedef.c:145
+#: locale/programs/localedef.c:155
 msgid "Generate big-endian output"
 msgstr "生成大端序输出"
 
-#: locale/programs/localedef.c:150
+#: locale/programs/localedef.c:160
 msgid "Compile locale specification"
 msgstr "编译区域规范"
 
-#: locale/programs/localedef.c:153
+#: locale/programs/localedef.c:163
 msgid ""
 "NAME\n"
 "[--add-to-archive|--delete-from-archive] FILE...\n"
@@ -2729,28 +2740,33 @@ msgstr ""
 "[--add-to-archive|--delete-from-archive] 文件...\n"
 "--list-archive [文件]"
 
-#: locale/programs/localedef.c:228
+#: locale/programs/localedef.c:238
 #, c-format
 msgid "cannot create directory for output files"
 msgstr "无法为输出文件创建目录"
 
-#: locale/programs/localedef.c:239
-#, c-format
+#: locale/programs/localedef.c:249
 msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
 msgstr "致命错误:系统未定义“_POSIX2_LOCALEDEF”"
 
-#: locale/programs/localedef.c:253 locale/programs/localedef.c:269
-#: locale/programs/localedef.c:602 locale/programs/localedef.c:622
+#: locale/programs/localedef.c:263 locale/programs/localedef.c:279
+#: locale/programs/localedef.c:673 locale/programs/localedef.c:693
 #, c-format
 msgid "cannot open locale definition file `%s'"
 msgstr "无法打开区域定义文件“%s”"
 
-#: locale/programs/localedef.c:281
+#: locale/programs/localedef.c:303
 #, c-format
 msgid "cannot write output files to `%s'"
 msgstr "无法将输出文件写入“%s”"
 
-#: locale/programs/localedef.c:370
+#: locale/programs/localedef.c:309
+#, fuzzy
+#| msgid "no output file produced because warnings were issued"
+msgid "no output file produced because errors were issued"
+msgstr "由于出现警告而未生成输出文件"
+
+#: locale/programs/localedef.c:441
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
@@ -2763,12 +2779,11 @@ msgstr ""
 "\t\t      语区路径   :%s\n"
 "%s"
 
-#: locale/programs/localedef.c:570
-#, c-format
+#: locale/programs/localedef.c:641
 msgid "circular dependencies between locale definitions"
 msgstr "区域定义中的循环倚赖"
 
-#: locale/programs/localedef.c:576
+#: locale/programs/localedef.c:647
 #, c-format
 msgid "cannot add already read locale `%s' a second time"
 msgstr "无法再次添加已经读入的“%s”"
@@ -2805,7 +2820,6 @@ msgid "cannot change mode of new locale archive"
 msgstr "无法改变新归档文件的模式"
 
 #: locale/programs/locarchive.c:324
-#, c-format
 msgid "cannot read data from locale archive"
 msgstr "无法从语区归档读取数据"
 
@@ -2891,17 +2905,17 @@ msgstr "“%s”不是目录;忽略"
 msgid "cannot open directory \"%s\": %s: ignored"
 msgstr "无法打开目录“%s”:%s:忽略"
 
-#: locale/programs/locarchive.c:1442
+#: locale/programs/locarchive.c:1438
 #, c-format
 msgid "incomplete set of locale files in \"%s\""
 msgstr "“%s”中的区域文件不完整"
 
-#: locale/programs/locarchive.c:1506
+#: locale/programs/locarchive.c:1502
 #, c-format
 msgid "cannot read all files in \"%s\": ignored"
 msgstr "无法读入“%s”中的所有文件:忽略"
 
-#: locale/programs/locarchive.c:1576
+#: locale/programs/locarchive.c:1572
 #, c-format
 msgid "locale \"%s\" not in archive"
 msgstr "区域“%s”在归档文件中"
@@ -2915,54 +2929,53 @@ msgstr "“%s”的参数必须是单个字符"
 msgid "syntax error: not inside a locale definition section"
 msgstr "语法错误:不在区域定义节之中"
 
-#: locale/programs/locfile.c:800
+#: locale/programs/locfile.c:799
 #, c-format
 msgid "cannot open output file `%s' for category `%s'"
 msgstr "无法为范畴“%2$s”打开输出文件“%1$s”"
 
-#: locale/programs/locfile.c:824
+#: locale/programs/locfile.c:822
 #, c-format
 msgid "failure while writing data for category `%s'"
 msgstr "为范畴“%s”写入数据失败"
 
-#: locale/programs/locfile.c:920
+#: locale/programs/locfile.c:930
 #, c-format
 msgid "cannot create output file `%s' for category `%s'"
 msgstr "无法为范畴“%2$s”创建输出文件“%1$s”"
 
-#: locale/programs/locfile.c:956
+#: locale/programs/locfile.c:966
 msgid "expecting string argument for `copy'"
 msgstr "`copy' 的参数应该是字串才对"
 
-#: locale/programs/locfile.c:960
+#: locale/programs/locfile.c:970
 msgid "locale name should consist only of portable characters"
 msgstr "区域名称应该仅由可移植的字符组成"
 
-#: locale/programs/locfile.c:979
+#: locale/programs/locfile.c:989
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr "使用“copy”时不应再使用其它关键字"
 
-#: locale/programs/locfile.c:993
+#: locale/programs/locfile.c:1003
 #, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "对“%1$s”的定义并不以“END %1%s”结束"
 
-#: locale/programs/repertoire.c:229 locale/programs/repertoire.c:270
-#: locale/programs/repertoire.c:295
+#: locale/programs/repertoire.c:228 locale/programs/repertoire.c:269
+#: locale/programs/repertoire.c:294
 #, c-format
 msgid "syntax error in repertoire map definition: %s"
 msgstr "编码映射表中的定义有语法错误: %s"
 
-#: locale/programs/repertoire.c:271
+#: locale/programs/repertoire.c:270
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "即未给出 <Uxxxx> 也未给出 <Uxxxxxxxx>"
 
-#: locale/programs/repertoire.c:331
-#, c-format
+#: locale/programs/repertoire.c:330
 msgid "cannot save new repertoire map"
 msgstr "无法保存新的指令表"
 
-#: locale/programs/repertoire.c:342
+#: locale/programs/repertoire.c:341
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr "找不到编码映射表 `%s'"
@@ -3142,7 +3155,7 @@ msgstr "未知的系统错误"
 msgid "unable to free arguments"
 msgstr "无法释放参数"
 
-#: nis/nis_error.h:1 nis/ypclnt.c:817 nis/ypclnt.c:905 posix/regcomp.c:137
+#: nis/nis_error.h:1 nis/ypclnt.c:825 nis/ypclnt.c:914 posix/regcomp.c:135
 #: sysdeps/gnu/errlist.c:21
 msgid "Success"
 msgstr "成功"
@@ -3183,8 +3196,8 @@ msgstr "一般系统错误"
 msgid "First/next chain broken"
 msgstr "第一个/下一个链坏掉了"
 
-#. TRANS Permission denied; the file permissions do not allow the attempted operation.
-#: nis/nis_error.h:11 nis/ypclnt.c:862 sysdeps/gnu/errlist.c:158
+#. TRANS The file permissions do not allow the attempted operation.
+#: nis/nis_error.h:11 nis/ypclnt.c:870 sysdeps/gnu/errlist.c:158
 msgid "Permission denied"
 msgstr "权限不够"
 
@@ -3336,128 +3349,128 @@ msgstr "无法在服务器上创建进程"
 msgid "Master server busy, full dump rescheduled."
 msgstr "主要服务器忙中,完整数据转储已被重调度。"
 
-#: nis/nis_local_names.c:121
+#: nis/nis_local_names.c:122
 #, c-format
 msgid "LOCAL entry for UID %d in directory %s not unique\n"
 msgstr "%2$s 目录中 UID 为 %1$d 的项目在 LOCAL 中不是唯一的\n"
 
-#: nis/nis_print.c:51
+#: nis/nis_print.c:52
 msgid "UNKNOWN"
 msgstr "未知"
 
-#: nis/nis_print.c:109
+#: nis/nis_print.c:110
 msgid "BOGUS OBJECT\n"
 msgstr "假的对象\n"
 
-#: nis/nis_print.c:112
+#: nis/nis_print.c:113
 msgid "NO OBJECT\n"
 msgstr "无对象\n"
 
-#: nis/nis_print.c:115
+#: nis/nis_print.c:116
 msgid "DIRECTORY\n"
 msgstr "目录\n"
 
-#: nis/nis_print.c:118
+#: nis/nis_print.c:119
 msgid "GROUP\n"
 msgstr "组\n"
 
-#: nis/nis_print.c:121
+#: nis/nis_print.c:122
 msgid "TABLE\n"
 msgstr "表\n"
 
-#: nis/nis_print.c:124
+#: nis/nis_print.c:125
 msgid "ENTRY\n"
 msgstr "条目\n"
 
-#: nis/nis_print.c:127
+#: nis/nis_print.c:128
 msgid "LINK\n"
 msgstr "链接\n"
 
-#: nis/nis_print.c:130
+#: nis/nis_print.c:131
 msgid "PRIVATE\n"
 msgstr "私有\n"
 
-#: nis/nis_print.c:133
+#: nis/nis_print.c:134
 msgid "(Unknown object)\n"
 msgstr "(未知对象)\n"
 
-#: nis/nis_print.c:167
+#: nis/nis_print.c:168
 #, c-format
 msgid "Name : `%s'\n"
 msgstr "名称:“%s”\n"
 
-#: nis/nis_print.c:168
+#: nis/nis_print.c:169
 #, c-format
 msgid "Type : %s\n"
 msgstr "类型:%s\n"
 
-#: nis/nis_print.c:173
+#: nis/nis_print.c:174
 msgid "Master Server :\n"
 msgstr "主服务器:\n"
 
-#: nis/nis_print.c:175
+#: nis/nis_print.c:176
 msgid "Replicate :\n"
 msgstr "复制:\n"
 
-#: nis/nis_print.c:176
+#: nis/nis_print.c:177
 #, c-format
 msgid "\tName       : %s\n"
 msgstr "\t名称      :%s\n"
 
-#: nis/nis_print.c:177
+#: nis/nis_print.c:178
 msgid "\tPublic Key : "
 msgstr "\t公钥      :"
 
-#: nis/nis_print.c:181
+#: nis/nis_print.c:182
 msgid "None.\n"
 msgstr "无。\n"
 
-#: nis/nis_print.c:184
+#: nis/nis_print.c:185
 #, c-format
 msgid "Diffie-Hellmann (%d bits)\n"
 msgstr "Diffie-Hellmann(%d 位)\n"
 
-#: nis/nis_print.c:189
+#: nis/nis_print.c:190
 #, c-format
 msgid "RSA (%d bits)\n"
 msgstr "RSA(%d 位)\n"
 
-#: nis/nis_print.c:192
+#: nis/nis_print.c:193
 msgid "Kerberos.\n"
 msgstr "Kerberos。\n"
 
-#: nis/nis_print.c:195
+#: nis/nis_print.c:196
 #, c-format
 msgid "Unknown (type = %d, bits = %d)\n"
 msgstr "未知(类型 = %d,位数 = %d)\n"
 
-#: nis/nis_print.c:206
+#: nis/nis_print.c:207
 #, c-format
 msgid "\tUniversal addresses (%u)\n"
 msgstr "\t绝对地址(%u)\n"
 
-#: nis/nis_print.c:228
+#: nis/nis_print.c:229
 msgid "Time to live : "
 msgstr "存留时间   : "
 
-#: nis/nis_print.c:230
+#: nis/nis_print.c:231
 msgid "Default Access rights :\n"
 msgstr "默认访问权限:\n"
 
-#: nis/nis_print.c:239
+#: nis/nis_print.c:240
 #, c-format
 msgid "\tType         : %s\n"
 msgstr "\t类型       :%s\n"
 
-#: nis/nis_print.c:240
+#: nis/nis_print.c:241
 msgid "\tAccess rights: "
 msgstr "\t访问权限   :"
 
-#: nis/nis_print.c:254
+#: nis/nis_print.c:255
 msgid "Group Flags :"
 msgstr "组标志     :"
 
-#: nis/nis_print.c:257
+#: nis/nis_print.c:258
 msgid ""
 "\n"
 "Group Members :\n"
@@ -3465,95 +3478,95 @@ msgstr ""
 "\n"
 "组成员     :\n"
 
-#: nis/nis_print.c:269
+#: nis/nis_print.c:270
 #, c-format
 msgid "Table Type          : %s\n"
 msgstr "表格类型            :%s\n"
 
-#: nis/nis_print.c:270
+#: nis/nis_print.c:271
 #, c-format
 msgid "Number of Columns   : %d\n"
 msgstr "列数                :%d\n"
 
-#: nis/nis_print.c:271
+#: nis/nis_print.c:272
 #, c-format
 msgid "Character Separator : %c\n"
 msgstr "字符分隔符          :%c\n"
 
-#: nis/nis_print.c:272
+#: nis/nis_print.c:273
 #, c-format
 msgid "Search Path         : %s\n"
 msgstr "搜索路径            :%s\n"
 
-#: nis/nis_print.c:273
+#: nis/nis_print.c:274
 msgid "Columns             :\n"
 msgstr "列                  :\n"
 
-#: nis/nis_print.c:276
+#: nis/nis_print.c:277
 #, c-format
 msgid "\t[%d]\tName          : %s\n"
 msgstr "\t[%d]\t名称         :%s\n"
 
-#: nis/nis_print.c:278
+#: nis/nis_print.c:279
 msgid "\t\tAttributes    : "
 msgstr "\t\t属性     :"
 
-#: nis/nis_print.c:280
+#: nis/nis_print.c:281
 msgid "\t\tAccess Rights : "
 msgstr "\t\t访问权限 :"
 
-#: nis/nis_print.c:290
+#: nis/nis_print.c:291
 msgid "Linked Object Type : "
 msgstr "链接到对象类型 :"
 
-#: nis/nis_print.c:292
+#: nis/nis_print.c:293
 #, c-format
 msgid "Linked to : %s\n"
 msgstr "链接到 :%s\n"
 
-#: nis/nis_print.c:302
+#: nis/nis_print.c:303
 #, c-format
 msgid "\tEntry data of type %s\n"
 msgstr "\t型别为 %s 的项目数据\n"
 
-#: nis/nis_print.c:305
+#: nis/nis_print.c:306
 #, c-format
 msgid "\t[%u] - [%u bytes] "
 msgstr "\t[%u] - [%u 字节] "
 
-#: nis/nis_print.c:308
+#: nis/nis_print.c:309
 msgid "Encrypted data\n"
 msgstr "已加密的数据\n"
 
-#: nis/nis_print.c:310
+#: nis/nis_print.c:311
 msgid "Binary data\n"
 msgstr "二进制数据\n"
 
-#: nis/nis_print.c:326
+#: nis/nis_print.c:327
 #, c-format
 msgid "Object Name   : %s\n"
 msgstr "对象名称  :%s\n"
 
-#: nis/nis_print.c:327
+#: nis/nis_print.c:328
 #, c-format
 msgid "Directory     : %s\n"
 msgstr "目录      :%s\n"
 
-#: nis/nis_print.c:328
+#: nis/nis_print.c:329
 #, c-format
 msgid "Owner         : %s\n"
 msgstr "所有者    :%s\n"
 
-#: nis/nis_print.c:329
+#: nis/nis_print.c:330
 #, c-format
 msgid "Group         : %s\n"
 msgstr "组        :%s\n"
 
-#: nis/nis_print.c:330
+#: nis/nis_print.c:331
 msgid "Access Rights : "
 msgstr "访问权限:"
 
-#: nis/nis_print.c:332
+#: nis/nis_print.c:333
 #, c-format
 msgid ""
 "\n"
@@ -3562,90 +3575,90 @@ msgstr ""
 "\n"
 "存留时间   :"
 
-#: nis/nis_print.c:335
+#: nis/nis_print.c:336
 #, c-format
 msgid "Creation Time : %s"
 msgstr "创建时间   :%s"
 
-#: nis/nis_print.c:337
+#: nis/nis_print.c:338
 #, c-format
 msgid "Mod. Time     : %s"
 msgstr "修改时间   :%s"
 
-#: nis/nis_print.c:338
+#: nis/nis_print.c:339
 msgid "Object Type   : "
 msgstr "对象类型   :%s"
 
-#: nis/nis_print.c:358
+#: nis/nis_print.c:359
 #, c-format
 msgid "    Data Length = %u\n"
 msgstr "    数据长度 = %u\n"
 
-#: nis/nis_print.c:372
+#: nis/nis_print.c:373
 #, c-format
 msgid "Status            : %s\n"
 msgstr "状态     :%s\n"
 
-#: nis/nis_print.c:373
+#: nis/nis_print.c:374
 #, c-format
 msgid "Number of objects : %u\n"
 msgstr "对象的数量 :%u\n"
 
-#: nis/nis_print.c:377
+#: nis/nis_print.c:378
 #, c-format
 msgid "Object #%d:\n"
 msgstr "对象 #%d:\n"
 
-#: nis/nis_print_group_entry.c:116
+#: nis/nis_print_group_entry.c:117
 #, c-format
 msgid "Group entry for \"%s.%s\" group:\n"
 msgstr "群组 \"%s.%s\" 群组项目:\n"
 
-#: nis/nis_print_group_entry.c:124
+#: nis/nis_print_group_entry.c:125
 msgid "    Explicit members:\n"
 msgstr "    显式成员:\n"
 
-#: nis/nis_print_group_entry.c:129
+#: nis/nis_print_group_entry.c:130
 msgid "    No explicit members\n"
 msgstr "    无显式成员\n"
 
-#: nis/nis_print_group_entry.c:132
+#: nis/nis_print_group_entry.c:133
 msgid "    Implicit members:\n"
 msgstr "    隐含成员:\n"
 
-#: nis/nis_print_group_entry.c:137
+#: nis/nis_print_group_entry.c:138
 msgid "    No implicit members\n"
 msgstr "    无隐含成员\n"
 
-#: nis/nis_print_group_entry.c:140
+#: nis/nis_print_group_entry.c:141
 msgid "    Recursive members:\n"
 msgstr "    递归成员:\n"
 
-#: nis/nis_print_group_entry.c:145
+#: nis/nis_print_group_entry.c:146
 msgid "    No recursive members\n"
 msgstr "    无递归成员\n"
 
-#: nis/nis_print_group_entry.c:148
+#: nis/nis_print_group_entry.c:149
 msgid "    Explicit nonmembers:\n"
 msgstr "    明确的非成员:\n"
 
-#: nis/nis_print_group_entry.c:153
+#: nis/nis_print_group_entry.c:154
 msgid "    No explicit nonmembers\n"
 msgstr "    没有明确的非成员\n"
 
-#: nis/nis_print_group_entry.c:156
+#: nis/nis_print_group_entry.c:157
 msgid "    Implicit nonmembers:\n"
 msgstr "    不明确的非成员:\n"
 
-#: nis/nis_print_group_entry.c:161
+#: nis/nis_print_group_entry.c:162
 msgid "    No implicit nonmembers\n"
 msgstr "    没有不明确的非成员\n"
 
-#: nis/nis_print_group_entry.c:164
+#: nis/nis_print_group_entry.c:165
 msgid "    Recursive nonmembers:\n"
 msgstr "    递归非成员:\n"
 
-#: nis/nis_print_group_entry.c:169
+#: nis/nis_print_group_entry.c:170
 msgid "    No recursive nonmembers\n"
 msgstr "    没有递归的非成员\n"
 
@@ -3687,100 +3700,100 @@ msgstr "netname2user: %s 的本地端项目在 %s 目录下并不是唯一的"
 msgid "netname2user: should not have uid 0"
 msgstr "netname2user:uid 不应为 0"
 
-#: nis/ypclnt.c:820
+#: nis/ypclnt.c:828
 msgid "Request arguments bad"
 msgstr "请求参数错误"
 
-#: nis/ypclnt.c:823
+#: nis/ypclnt.c:831
 msgid "RPC failure on NIS operation"
 msgstr "NIS 运作 RPC 失败"
 
-#: nis/ypclnt.c:826
+#: nis/ypclnt.c:834
 msgid "Can't bind to server which serves this domain"
 msgstr "无法于为此域服务的服务器绑定"
 
-#: nis/ypclnt.c:829
+#: nis/ypclnt.c:837
 msgid "No such map in server's domain"
 msgstr "在服务器的领域数据中找不到此一映射表"
 
-#: nis/ypclnt.c:832
+#: nis/ypclnt.c:840
 msgid "No such key in map"
 msgstr "在映射表中没有此一键值"
 
-#: nis/ypclnt.c:835
+#: nis/ypclnt.c:843
 msgid "Internal NIS error"
 msgstr "内部 NIS 错误"
 
-#: nis/ypclnt.c:838
+#: nis/ypclnt.c:846
 msgid "Local resource allocation failure"
 msgstr "本地资源分配失败"
 
-#: nis/ypclnt.c:841
+#: nis/ypclnt.c:849
 msgid "No more records in map database"
 msgstr "在映射表数据库中没有其他纪录了"
 
-#: nis/ypclnt.c:844
+#: nis/ypclnt.c:852
 msgid "Can't communicate with portmapper"
 msgstr "无法与 portmapper 通讯"
 
-#: nis/ypclnt.c:847
+#: nis/ypclnt.c:855
 msgid "Can't communicate with ypbind"
 msgstr "无法与 ypbind 通讯"
 
-#: nis/ypclnt.c:850
+#: nis/ypclnt.c:858
 msgid "Can't communicate with ypserv"
 msgstr "无法与 ypserv 通讯"
 
-#: nis/ypclnt.c:853
+#: nis/ypclnt.c:861
 msgid "Local domain name not set"
 msgstr "未设置本地域名"
 
-#: nis/ypclnt.c:856
+#: nis/ypclnt.c:864
 msgid "NIS map database is bad"
 msgstr "NIS 映射数据库错误"
 
-#: nis/ypclnt.c:859
+#: nis/ypclnt.c:867
 msgid "NIS client/server version mismatch - can't supply service"
 msgstr "NIS 客户端/服务器版本不匹配 - 无法支持服务"
 
-#: nis/ypclnt.c:865
+#: nis/ypclnt.c:873
 msgid "Database is busy"
 msgstr "数据库忙"
 
-#: nis/ypclnt.c:868
+#: nis/ypclnt.c:876
 msgid "Unknown NIS error code"
 msgstr "未知的 NIS 错误码"
 
-#: nis/ypclnt.c:908
+#: nis/ypclnt.c:917
 msgid "Internal ypbind error"
 msgstr "内部 ypbind 错误"
 
-#: nis/ypclnt.c:911
+#: nis/ypclnt.c:920
 msgid "Domain not bound"
 msgstr "未绑定域"
 
-#: nis/ypclnt.c:914
+#: nis/ypclnt.c:923
 msgid "System resource allocation failure"
 msgstr "系统资源分配失败"
 
-#: nis/ypclnt.c:917
+#: nis/ypclnt.c:926
 msgid "Unknown ypbind error"
 msgstr "未知的 ypbind 错误"
 
-#: nis/ypclnt.c:958
+#: nis/ypclnt.c:967
 msgid "yp_update: cannot convert host to netname\n"
 msgstr "yp_update:无法将主机名转换为网名\n"
 
-#: nis/ypclnt.c:976
+#: nis/ypclnt.c:985
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update:无法获取服务器地址\n"
 
-#: nscd/aicache.c:84 nscd/hstcache.c:485
+#: nscd/aicache.c:82 nscd/hstcache.c:452
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "无法在主机缓冲区中找到“%s”!"
 
-#: nscd/aicache.c:86 nscd/hstcache.c:487
+#: nscd/aicache.c:84 nscd/hstcache.c:454
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
 msgstr "在主机缓冲区中重新加载“%s”!"
@@ -3814,289 +3827,280 @@ msgstr "pruning %s 缓存;时间 %ld"
 msgid "considering %s entry \"%s\", timeout %<PRIu64>"
 msgstr "认为中 %s 项目 “%s” ,逾时 %<PRIu64>"
 
-#: nscd/connections.c:548
+#: nscd/connections.c:520
 #, c-format
 msgid "invalid persistent database file \"%s\": %s"
 msgstr "无效的永久性的数据库文件 “%s” :%s"
 
-#: nscd/connections.c:556
+#: nscd/connections.c:528
 msgid "uninitialized header"
 msgstr "未起始的标头"
 
-#: nscd/connections.c:561
+#: nscd/connections.c:533
 msgid "header size does not match"
 msgstr "标头大小不吻合"
 
-#: nscd/connections.c:571
+#: nscd/connections.c:543
 msgid "file size does not match"
 msgstr "文件大小不匹配"
 
-#: nscd/connections.c:588
+#: nscd/connections.c:560
 msgid "verification failed"
 msgstr "验证失败"
 
-#: nscd/connections.c:602
+#: nscd/connections.c:574
 #, c-format
 msgid "suggested size of table for database %s larger than the persistent database's table"
 msgstr "用于数据库 %s 的建议表格大小大于永久性的数据库表格"
 
-#: nscd/connections.c:613 nscd/connections.c:697
+#: nscd/connections.c:585 nscd/connections.c:669
 #, c-format
 msgid "cannot create read-only descriptor for \"%s\"; no mmap"
 msgstr "无法为“%s”创建只读描述符;没有 mmap"
 
-#: nscd/connections.c:629
+#: nscd/connections.c:601
 #, c-format
 msgid "cannot access '%s'"
 msgstr "无法访问 ‘%s’"
 
-#: nscd/connections.c:677
+#: nscd/connections.c:649
 #, c-format
 msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
 msgstr "数据库用于 %s 已损坏或被同步地使用;若必要,手动移除 %s 并重启"
 
-#: nscd/connections.c:683
+#: nscd/connections.c:655
 #, c-format
 msgid "cannot create %s; no persistent database used"
 msgstr "无法创建 %s; 不使用持久数据库"
 
-#: nscd/connections.c:686
+#: nscd/connections.c:658
 #, c-format
 msgid "cannot create %s; no sharing possible"
 msgstr "无法创建 %s; 无法共享"
 
-#: nscd/connections.c:757
+#: nscd/connections.c:729
 #, c-format
 msgid "cannot write to database file %s: %s"
 msgstr "无法写入数据库文件 %s: %s"
 
-#: nscd/connections.c:796
-#, c-format
-msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
-msgstr "无法设置通信端到关闭于 exec:%s; 停用 paranoia 模式"
-
-#: nscd/connections.c:831
+#: nscd/connections.c:785
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "无法打开套接字:%s"
 
-#: nscd/connections.c:850
+#: nscd/connections.c:804
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "无法启用套接字以接受连接:%s"
 
-#: nscd/connections.c:907
+#: nscd/connections.c:861
 #, c-format
 msgid "disabled inotify-based monitoring for file `%s': %s"
 msgstr "为 `%s' 禁用基于 inotify 的监控: %s"
 
-#: nscd/connections.c:911
+#: nscd/connections.c:865
 #, c-format
 msgid "monitoring file `%s` (%d)"
 msgstr "监控文件 `%s' (%d)"
 
-#: nscd/connections.c:924
+#: nscd/connections.c:878
 #, c-format
 msgid "disabled inotify-based monitoring for directory `%s': %s"
 msgstr "为目录 `%s' 禁用基于 inotify 的监控: %s"
 
-#: nscd/connections.c:928
+#: nscd/connections.c:882
 #, c-format
 msgid "monitoring directory `%s` (%d)"
 msgstr "监视目录 `%s` (%d)"
 
-#: nscd/connections.c:956
+#: nscd/connections.c:910
 #, c-format
 msgid "monitoring file %s for database %s"
 msgstr "监视文件 %s, 用于数据库 %s"
 
-#: nscd/connections.c:966
+#: nscd/connections.c:920
 #, c-format
 msgid "stat failed for file `%s'; will try again later: %s"
 msgstr "stat 文件 `%s' 失败;将稍后再试: %s"
 
-#: nscd/connections.c:1085
+#: nscd/connections.c:1039
 #, c-format
 msgid "provide access to FD %d, for %s"
 msgstr "提供访问到 FD %d, 用于 %s"
 
-#: nscd/connections.c:1097
+#: nscd/connections.c:1051
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "无法处理旧请求版本 %d;当前版本为 %d"
 
-#: nscd/connections.c:1119
+#: nscd/connections.c:1074
 #, c-format
 msgid "request from %ld not handled due to missing permission"
 msgstr "由于缺少权限而无法处理来自 %ld 的要求"
 
-#: nscd/connections.c:1124
+#: nscd/connections.c:1079
 #, c-format
 msgid "request from '%s' [%ld] not handled due to missing permission"
 msgstr "由于缺少权限而无法处理来自 '%s' [%ld] 的要求"
 
-#: nscd/connections.c:1129
+#: nscd/connections.c:1084
 msgid "request not handled due to missing permission"
 msgstr "要求无法控柄的由于缺少权限"
 
-#: nscd/connections.c:1167 nscd/connections.c:1220
+#: nscd/connections.c:1122 nscd/connections.c:1148
 #, c-format
 msgid "cannot write result: %s"
 msgstr "无法写入结果:“%s”"
 
-#: nscd/connections.c:1311
+#: nscd/connections.c:1239
 #, c-format
 msgid "error getting caller's id: %s"
 msgstr "取得调用程序识别码时发生错误: %s"
 
-#: nscd/connections.c:1371
-#, c-format
-msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
+#: nscd/connections.c:1349
+#, fuzzy, c-format
+#| msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
+msgid "cannot open /proc/self/cmdline: %m; disabling paranoia mode"
 msgstr "无法打开/proc/self/cmdline:%s; 停用 paranoia 模式"
 
-#: nscd/connections.c:1385
-#, c-format
-msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
-msgstr "无法读取/proc/self/cmdline:%s; 停用 paranoia 模式"
-
-#: nscd/connections.c:1425
+#: nscd/connections.c:1372
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr "无法变更为旧的 UID:%s; 停用 paranoia 模式"
 
-#: nscd/connections.c:1435
+#: nscd/connections.c:1383
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr "无法变更为旧的 GID:%s; 停用 paranoia 模式"
 
-#: nscd/connections.c:1448
+#: nscd/connections.c:1397
 #, c-format
 msgid "cannot change to old working directory: %s; disabling paranoia mode"
 msgstr "无法变更为旧的工作目录:%s; 停用 paranoia 模式"
 
-#: nscd/connections.c:1494
+#: nscd/connections.c:1444
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr "re-exec 失败:%s; 停用 paranoia 模式"
 
-#: nscd/connections.c:1503
+#: nscd/connections.c:1453
 #, c-format
 msgid "cannot change current working directory to \"/\": %s"
 msgstr "无法变更目前的工作目录到 “/” :%s"
 
-#: nscd/connections.c:1696
+#: nscd/connections.c:1637
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "读取请求时没有读入足够的数据:%s"
 
-#: nscd/connections.c:1729
+#: nscd/connections.c:1670
 #, c-format
 msgid "key length in request too long: %d"
 msgstr "请求中的键过长:%d"
 
-#: nscd/connections.c:1742
+#: nscd/connections.c:1683
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "读入请求键的时候没有读入足够的数据:%s"
 
-#: nscd/connections.c:1752
+#: nscd/connections.c:1693
 #, c-format
 msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr "处理请求:已从进程ID %2$ld 收到请求 (版本 = %1$d)"
 
-#: nscd/connections.c:1757
+#: nscd/connections.c:1698
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "处理请求:已收到请求 (版本 = %d)"
 
-#: nscd/connections.c:1897
+#: nscd/connections.c:1838
 #, c-format
 msgid "ignored inotify event for `%s` (file exists)"
 msgstr "为 `%s` 忽略 inotify 事件(文件存在)"
 
-#: nscd/connections.c:1902
+#: nscd/connections.c:1843
 #, c-format
 msgid "monitored file `%s` was %s, removing watch"
 msgstr "监视文件 `%s' 原为 %s,移除监视"
 
-#: nscd/connections.c:1910 nscd/connections.c:1952
+#: nscd/connections.c:1851 nscd/connections.c:1893
 #, c-format
 msgid "failed to remove file watch `%s`: %s"
 msgstr "移除文件监视 `%s' 失败: %s"
 
-#: nscd/connections.c:1925
+#: nscd/connections.c:1866
 #, c-format
 msgid "monitored file `%s` was written to"
 msgstr "监视的文件 '%s' 被写入"
 
-#: nscd/connections.c:1949
+#: nscd/connections.c:1890
 #, c-format
 msgid "monitored parent directory `%s` was %s, removing watch on `%s`"
 msgstr "监视父目录 `%s' 原为 %s,移除 `%s' 上的监视"
 
-#: nscd/connections.c:1975
+#: nscd/connections.c:1916
 #, c-format
 msgid "monitored file `%s` was %s, adding watch"
 msgstr "监视文件 `%s' 原为 %s,添加监视"
 
-#: nscd/connections.c:1987
+#: nscd/connections.c:1928
 #, c-format
 msgid "failed to add file watch `%s`: %s"
 msgstr "添加文件监视 `%s' 失败: %s"
 
-#: nscd/connections.c:2181 nscd/connections.c:2362
+#: nscd/connections.c:2106 nscd/connections.c:2271
 #, c-format
 msgid "disabled inotify-based monitoring after read error %d"
 msgstr "停用基于 inotify 的监控,在读取错误 %d 发生后"
 
-#: nscd/connections.c:2477
+#: nscd/connections.c:2386
 msgid "could not initialize conditional variable"
 msgstr "无法初始化条件变量"
 
-#: nscd/connections.c:2485
+#: nscd/connections.c:2394
 msgid "could not start clean-up thread; terminating"
 msgstr "无法开始清理线程;终止中"
 
-#: nscd/connections.c:2499
+#: nscd/connections.c:2408
 msgid "could not start any worker thread; terminating"
 msgstr "无法开始任何背景工作线程;终止中"
 
-#: nscd/connections.c:2554 nscd/connections.c:2556 nscd/connections.c:2572
-#: nscd/connections.c:2582 nscd/connections.c:2600 nscd/connections.c:2611
-#: nscd/connections.c:2621
+#: nscd/connections.c:2463 nscd/connections.c:2465 nscd/connections.c:2481
+#: nscd/connections.c:2491 nscd/connections.c:2509 nscd/connections.c:2520
+#: nscd/connections.c:2530
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr "以用户 '%s' 的身分运行 nscd 失败"
 
-#: nscd/connections.c:2574
+#: nscd/connections.c:2483
 msgid "initial getgrouplist failed"
 msgstr "初始化 getgrouplist 失败"
 
-#: nscd/connections.c:2583
+#: nscd/connections.c:2492
 msgid "getgrouplist failed"
 msgstr "getgrouplist 失败"
 
-#: nscd/connections.c:2601
+#: nscd/connections.c:2510
 msgid "setgroups failed"
 msgstr "setgroups 失败"
 
-#: nscd/grpcache.c:416 nscd/hstcache.c:432 nscd/initgrcache.c:411
-#: nscd/pwdcache.c:394 nscd/servicescache.c:338
+#: nscd/grpcache.c:385 nscd/hstcache.c:402 nscd/initgrcache.c:385
+#: nscd/pwdcache.c:363 nscd/servicescache.c:310
 #, c-format
 msgid "short write in %s: %s"
 msgstr "写入 %s 的数据过短: %s"
 
-#: nscd/grpcache.c:461 nscd/initgrcache.c:78
+#: nscd/grpcache.c:430 nscd/initgrcache.c:81
 #, c-format
 msgid "Haven't found \"%s\" in group cache!"
 msgstr "无法在组缓冲区中找到“%s”!"
 
-#: nscd/grpcache.c:463 nscd/initgrcache.c:80
+#: nscd/grpcache.c:432 nscd/initgrcache.c:83
 #, c-format
 msgid "Reloading \"%s\" in group cache!"
 msgstr "在组缓冲区中重新加载“%s”!"
 
-#: nscd/grpcache.c:542
+#: nscd/grpcache.c:492
 #, c-format
 msgid "Invalid numeric gid \"%s\"!"
 msgstr "无效的 gid 数值 \"%s\"!"
@@ -4111,22 +4115,22 @@ msgstr "在 %2$s 缓存中 %1$zu 字节可用"
 msgid "no more memory for database '%s'"
 msgstr "无内存可用于数据库 “%s” "
 
-#: nscd/netgroupcache.c:121
+#: nscd/netgroupcache.c:122
 #, c-format
 msgid "Haven't found \"%s\" in netgroup cache!"
 msgstr "尚未在网络群组缓存中找到 “%s” !"
 
-#: nscd/netgroupcache.c:123
+#: nscd/netgroupcache.c:124
 #, c-format
 msgid "Reloading \"%s\" in netgroup cache!"
 msgstr "重新在网络群组缓存中加载 “%s” !"
 
-#: nscd/netgroupcache.c:495
+#: nscd/netgroupcache.c:470
 #, c-format
 msgid "Haven't found \"%s (%s,%s,%s)\" in netgroup cache!"
 msgstr "尚未在网络群组缓存中找到 “%s (%s,%s,%s)” !"
 
-#: nscd/netgroupcache.c:498
+#: nscd/netgroupcache.c:473
 #, c-format
 msgid "Reloading \"%s (%s,%s,%s)\" in netgroup cache!"
 msgstr "重新在网络群组缓存中加载 “%s (%s,%s,%s)” !"
@@ -4179,7 +4183,7 @@ msgstr "为每个用户使用分离的缓冲区"
 msgid "Name Service Cache Daemon."
 msgstr "网域名称缓存精灵"
 
-#: nscd/nscd.c:155 nss/getent.c:947 nss/makedb.c:206
+#: nscd/nscd.c:155 nss/getent.c:987 nss/makedb.c:206
 #, c-format
 msgid "wrong number of arguments"
 msgstr "参数个数错误"
@@ -4212,7 +4216,7 @@ msgstr "无法变更目前的工作目录到 “/” "
 msgid "Could not create log file"
 msgstr "无法创建日志文件"
 
-#: nscd/nscd.c:355 nscd/nscd_stat.c:194
+#: nscd/nscd.c:355 nscd/nscd_stat.c:209
 #, c-format
 msgid "write incomplete"
 msgstr "写入不完整"
@@ -4227,7 +4231,7 @@ msgstr "无法读入 invalidate ACK"
 msgid "invalidation failed"
 msgstr "无效化失败"
 
-#: nscd/nscd.c:417 nscd/nscd.c:442 nscd/nscd_stat.c:175
+#: nscd/nscd.c:417 nscd/nscd.c:442 nscd/nscd_stat.c:190
 #, c-format
 msgid "Only root is allowed to use this option!"
 msgstr "只有根用户允许使用本选项!"
@@ -4287,60 +4291,60 @@ msgstr "解析错误:%s"
 msgid "Must specify user name for server-user option"
 msgstr "必须为服务器用户选项指定用户名"
 
-#: nscd/nscd_conf.c:198
+#: nscd/nscd_conf.c:201
 #, c-format
 msgid "Must specify user name for stat-user option"
 msgstr "必须为 stat 用户选项指定用户名"
 
-#: nscd/nscd_conf.c:255
+#: nscd/nscd_conf.c:259
 #, c-format
 msgid "Must specify value for restart-interval option"
 msgstr "必须指定用于 restart-interval 选项的值"
 
-#: nscd/nscd_conf.c:269
+#: nscd/nscd_conf.c:273
 #, c-format
 msgid "Unknown option: %s %s %s"
 msgstr "未知的选项:%s %s %s"
 
-#: nscd/nscd_conf.c:282
+#: nscd/nscd_conf.c:286
 #, c-format
 msgid "cannot get current working directory: %s; disabling paranoia mode"
 msgstr "无法取得目前的工作目录:%s; 停用 paranoia 模式"
 
-#: nscd/nscd_conf.c:302
+#: nscd/nscd_conf.c:306
 #, c-format
 msgid "maximum file size for %s database too small"
 msgstr "最大值文件大小用于 %s 数据库太小"
 
-#: nscd/nscd_stat.c:144
+#: nscd/nscd_stat.c:159
 #, c-format
 msgid "cannot write statistics: %s"
 msgstr "无法写入统计:%s"
 
-#: nscd/nscd_stat.c:159
+#: nscd/nscd_stat.c:174
 msgid "yes"
 msgstr "是"
 
-#: nscd/nscd_stat.c:160
+#: nscd/nscd_stat.c:175
 msgid "no"
 msgstr "无"
 
-#: nscd/nscd_stat.c:171
+#: nscd/nscd_stat.c:186
 #, c-format
 msgid "Only root or %s is allowed to use this option!"
 msgstr "只有根用户或 %s 允许使用本选项!"
 
-#: nscd/nscd_stat.c:182
+#: nscd/nscd_stat.c:197
 #, c-format
 msgid "nscd not running!\n"
 msgstr "nscd 未运行!\n"
 
-#: nscd/nscd_stat.c:206
+#: nscd/nscd_stat.c:221
 #, c-format
 msgid "cannot read statistics data"
 msgstr "无法读入统计数据"
 
-#: nscd/nscd_stat.c:209
+#: nscd/nscd_stat.c:224
 #, c-format
 msgid ""
 "nscd configuration:\n"
@@ -4351,27 +4355,27 @@ msgstr ""
 "\n"
 "%15d  服务器调试级别\n"
 
-#: nscd/nscd_stat.c:233
+#: nscd/nscd_stat.c:248
 #, c-format
 msgid "%3ud %2uh %2um %2lus  server runtime\n"
 msgstr "%3ud %2uh %2um %2lus  服务器 运行时长\n"
 
-#: nscd/nscd_stat.c:236
+#: nscd/nscd_stat.c:251
 #, c-format
 msgid "    %2uh %2um %2lus  server runtime\n"
 msgstr "    %2uh %2um %2lus  服务器 运行时长\n"
 
-#: nscd/nscd_stat.c:238
+#: nscd/nscd_stat.c:253
 #, c-format
 msgid "        %2um %2lus  server runtime\n"
 msgstr "        %2um %2lus  服务器 运行时长\n"
 
-#: nscd/nscd_stat.c:240
+#: nscd/nscd_stat.c:255
 #, c-format
 msgid "            %2lus  server runtime\n"
 msgstr "            %2lus  服务器 运行时长\n"
 
-#: nscd/nscd_stat.c:242
+#: nscd/nscd_stat.c:257
 #, c-format
 msgid ""
 "%15d  current number of threads\n"
@@ -4388,7 +4392,7 @@ msgstr ""
 "%15lu  内部重新启动\n"
 "%15u  重新加载计数\n"
 
-#: nscd/nscd_stat.c:277
+#: nscd/nscd_stat.c:292
 #, c-format
 msgid ""
 "\n"
@@ -4439,17 +4443,19 @@ msgstr ""
 "%15<PRIuMAX> 内存配置失败\n"
 "%15s  检查 /etc/%s 的变更\n"
 
-#: nscd/pwdcache.c:439
-#, c-format
-msgid "Haven't found \"%s\" in password cache!"
-msgstr "无法在口令缓冲区中找到“%s”!"
+#: nscd/pwdcache.c:407
+#, fuzzy, c-format
+#| msgid "Haven't found \"%s\" in hosts cache!"
+msgid "Haven't found \"%s\" in user database cache!"
+msgstr "无法在主机缓冲区中找到“%s”!"
 
-#: nscd/pwdcache.c:441
-#, c-format
-msgid "Reloading \"%s\" in password cache!"
-msgstr "在口令缓冲区中重新加载“%s”!"
+#: nscd/pwdcache.c:409
+#, fuzzy, c-format
+#| msgid "Reloading \"%s\" in hosts cache!"
+msgid "Reloading \"%s\" in user database cache!"
+msgstr "在主机缓冲区中重新加载“%s”!"
 
-#: nscd/pwdcache.c:522
+#: nscd/pwdcache.c:471
 #, c-format
 msgid "Invalid numeric uid \"%s\"!"
 msgstr "无效的 uid 数值 \"%s\"!"
@@ -4559,51 +4565,57 @@ msgstr ""
 "%15u  CAV 探查\n"
 "%15u  CAV 缺少\n"
 
-#: nscd/servicescache.c:387
+#: nscd/servicescache.c:358
 #, c-format
 msgid "Haven't found \"%s\" in services cache!"
 msgstr "无法在服务缓冲区中找到“%s”!"
 
-#: nscd/servicescache.c:389
+#: nscd/servicescache.c:360
 #, c-format
 msgid "Reloading \"%s\" in services cache!"
 msgstr "在服务缓冲区中重新加载“%s”!"
 
-#: nss/getent.c:53
+#: nss/getent.c:55
 msgid "database [key ...]"
 msgstr "数据库 [键 ...]"
 
-#: nss/getent.c:58
+#: nss/getent.c:60
 msgid "CONFIG"
 msgstr "组态"
 
-#: nss/getent.c:58
+#: nss/getent.c:60
 msgid "Service configuration to be used"
 msgstr "要使用的服务配置"
 
-#: nss/getent.c:59
+#: nss/getent.c:61
 msgid "disable IDN encoding"
 msgstr "停用 IDN 编码"
 
-#: nss/getent.c:64
+#: nss/getent.c:66
 msgid "Get entries from administrative database."
 msgstr "从管理数据库取得条目。"
 
-#: nss/getent.c:148 nss/getent.c:441 nss/getent.c:486
+#: nss/getent.c:150 nss/getent.c:462 nss/getent.c:509
 #, c-format
 msgid "Enumeration not supported on %s\n"
 msgstr "%s 不支持枚举\n"
 
-#: nss/getent.c:861
+#: nss/getent.c:517 nss/getent.c:530
+#, fuzzy, c-format
+#| msgid "Could not create log file"
+msgid "Could not allocate group list: %m\n"
+msgstr "无法创建日志文件"
+
+#: nss/getent.c:901
 #, c-format
 msgid "Unknown database name"
 msgstr "未知的数据库名"
 
-#: nss/getent.c:891
+#: nss/getent.c:931
 msgid "Supported databases:\n"
 msgstr "支持的数据库:\n"
 
-#: nss/getent.c:957
+#: nss/getent.c:997
 #, c-format
 msgid "Unknown database: %s\n"
 msgstr "未知的数据库:%s\n"
@@ -4759,131 +4771,117 @@ msgstr "未定义"
 msgid "Unrecognized variable `%s'"
 msgstr "不可识别的变量“%s”"
 
-#: posix/getopt.c:592 posix/getopt.c:621
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: posix/getopt.c:277
+#, fuzzy, c-format
+#| msgid "%s: option '-W %s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: 选项 `-W %s' 含义不清\n"
+
+#: posix/getopt.c:283
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
 msgstr "%s:选项 ‘%s’ 是模棱两可的;可能是:"
 
-#: posix/getopt.c:662 posix/getopt.c:666
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: 选项 `--%s' 不允许附加参数\n"
+#: posix/getopt.c:318
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: 未知的选项 `%c%s'\n"
 
-#: posix/getopt.c:675 posix/getopt.c:680
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: posix/getopt.c:344
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: 选项 `%c%s' 不允许附加参数\n"
 
-#: posix/getopt.c:723 posix/getopt.c:742
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: posix/getopt.c:359
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s:选项 ‘--%s’ 需要一个参数\n"
 
-#: posix/getopt.c:780 posix/getopt.c:783
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: 未知的选项 `--%s'\n"
-
-#: posix/getopt.c:791 posix/getopt.c:794
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: 未知的选项 `%c%s'\n"
-
-#: posix/getopt.c:843 posix/getopt.c:846
+#: posix/getopt.c:620
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: 不适用的选项 -- %c\n"
 
-#: posix/getopt.c:899 posix/getopt.c:916 posix/getopt.c:1126
-#: posix/getopt.c:1144
+#: posix/getopt.c:635 posix/getopt.c:681
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: 选项需要一个参数 -- %c\n"
 
-#: posix/getopt.c:972 posix/getopt.c:988
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: 选项 `-W %s' 含义不清\n"
-
-#: posix/getopt.c:1012 posix/getopt.c:1030
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: 选项 `-W %s' 不允许附加参数\n"
-
-#: posix/getopt.c:1051 posix/getopt.c:1069
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s:选项 ‘-W %s’ 需要一个参数\n"
-
-#: posix/regcomp.c:140
+#: posix/regcomp.c:138
 msgid "No match"
 msgstr "没有匹配"
 
-#: posix/regcomp.c:143
+#: posix/regcomp.c:141
 msgid "Invalid regular expression"
 msgstr "无效的常规表达式"
 
-#: posix/regcomp.c:146
+#: posix/regcomp.c:144
 msgid "Invalid collation character"
 msgstr "不适用的对照字符"
 
-#: posix/regcomp.c:149
+#: posix/regcomp.c:147
 msgid "Invalid character class name"
 msgstr "无效的字符类名"
 
-#: posix/regcomp.c:152
+#: posix/regcomp.c:150
 msgid "Trailing backslash"
 msgstr "尾端的反斜线"
 
-#: posix/regcomp.c:155
+#: posix/regcomp.c:153
 msgid "Invalid back reference"
 msgstr "无效的向后引用"
 
-#: posix/regcomp.c:158
-msgid "Unmatched [ or [^"
+#: posix/regcomp.c:156
+#, fuzzy
+#| msgid "Unmatched [ or [^"
+msgid "Unmatched [, [^, [:, [., or [="
 msgstr " 不匹配的 [ 或 [^"
 
-#: posix/regcomp.c:161
+#: posix/regcomp.c:159
 msgid "Unmatched ( or \\("
 msgstr "不匹配的 ( 或 \\("
 
-#: posix/regcomp.c:164
+#: posix/regcomp.c:162
 msgid "Unmatched \\{"
 msgstr "不匹配的 \\{"
 
-#: posix/regcomp.c:167
+#: posix/regcomp.c:165
 msgid "Invalid content of \\{\\}"
 msgstr "无效的 \\{\\} 的内容"
 
-#: posix/regcomp.c:170
+#: posix/regcomp.c:168
 msgid "Invalid range end"
 msgstr "不适用的范围结束"
 
-#: posix/regcomp.c:173
+#: posix/regcomp.c:171
 msgid "Memory exhausted"
 msgstr "内存耗尽"
 
-#: posix/regcomp.c:176
+#: posix/regcomp.c:174
 msgid "Invalid preceding regular expression"
 msgstr "无效的前导常规表达式"
 
-#: posix/regcomp.c:179
+#: posix/regcomp.c:177
 msgid "Premature end of regular expression"
 msgstr "常规表达式非正常结束"
 
-#: posix/regcomp.c:182
+#: posix/regcomp.c:180
 msgid "Regular expression too big"
 msgstr "常规表达式过大"
 
-#: posix/regcomp.c:185
+#: posix/regcomp.c:183
 msgid "Unmatched ) or \\)"
 msgstr "不匹配的 ) 或 \\)"
 
-#: posix/regcomp.c:673
+#: posix/regcomp.c:676
 msgid "No previous regular expression"
 msgstr "没有前一个常规表达式"
 
-#: posix/wordexp.c:1852
+#: posix/wordexp.c:1816
 msgid "parameter null or not set"
 msgstr "参数为 null 或未设置"
 
@@ -5068,7 +5066,7 @@ msgstr "输出缓冲区可用"
 msgid "Input message available"
 msgstr "输入消息可用"
 
-#: stdio-common/psiginfo-data.h:46 timezone/zdump.c:541 timezone/zic.c:483
+#: stdio-common/psiginfo-data.h:46 timezone/zdump.c:375 timezone/zic.c:561
 msgid "I/O error"
 msgstr "I/O 错误"
 
@@ -5080,43 +5078,43 @@ msgstr "高优先权输入可用"
 msgid "Device disconnected"
 msgstr "设备已经结束连接"
 
-#: stdio-common/psiginfo.c:139
+#: stdio-common/psiginfo.c:140
 msgid "Signal sent by kill()"
 msgstr "kill() 已发送信号"
 
-#: stdio-common/psiginfo.c:142
+#: stdio-common/psiginfo.c:143
 msgid "Signal sent by sigqueue()"
 msgstr "sigqueue() 已发送信号"
 
-#: stdio-common/psiginfo.c:145
+#: stdio-common/psiginfo.c:146
 msgid "Signal generated by the expiration of a timer"
 msgstr "计时器的逾期已产生信号"
 
-#: stdio-common/psiginfo.c:148
+#: stdio-common/psiginfo.c:149
 msgid "Signal generated by the completion of an asynchronous I/O request"
 msgstr "异步 I/O 要求的完成已产生信号"
 
-#: stdio-common/psiginfo.c:152
+#: stdio-common/psiginfo.c:153
 msgid "Signal generated by the arrival of a message on an empty message queue"
 msgstr "空消息队列中到达的消息已产生信号"
 
-#: stdio-common/psiginfo.c:157
+#: stdio-common/psiginfo.c:158
 msgid "Signal sent by tkill()"
 msgstr "tkill() 已发送信号"
 
-#: stdio-common/psiginfo.c:162
+#: stdio-common/psiginfo.c:163
 msgid "Signal generated by the completion of an asynchronous name lookup request"
 msgstr "异步名称查找要求的完成已产生信号"
 
-#: stdio-common/psiginfo.c:168
+#: stdio-common/psiginfo.c:169
 msgid "Signal generated by the completion of an I/O request"
 msgstr "I/O 要求的完成已产生信号"
 
-#: stdio-common/psiginfo.c:174
+#: stdio-common/psiginfo.c:175
 msgid "Signal sent by the kernel"
 msgstr "内核已发送信号"
 
-#: stdio-common/psiginfo.c:198
+#: stdio-common/psiginfo.c:199
 #, c-format
 msgid "Unknown signal %d\n"
 msgstr "不明信号 %d\n"
@@ -5148,11 +5146,11 @@ msgstr "实时信号 %d"
 msgid "Unknown signal %d"
 msgstr "未知信号 %d"
 
-#: sunrpc/auth_unix.c:111 sunrpc/clnt_tcp.c:123 sunrpc/clnt_udp.c:135
-#: sunrpc/clnt_unix.c:124 sunrpc/svc_tcp.c:188 sunrpc/svc_tcp.c:233
-#: sunrpc/svc_udp.c:160 sunrpc/svc_unix.c:188 sunrpc/svc_unix.c:229
-#: sunrpc/xdr.c:627 sunrpc/xdr.c:787 sunrpc/xdr_array.c:101
-#: sunrpc/xdr_rec.c:152 sunrpc/xdr_ref.c:78
+#: sunrpc/auth_unix.c:112 sunrpc/clnt_tcp.c:124 sunrpc/clnt_udp.c:139
+#: sunrpc/clnt_unix.c:125 sunrpc/svc_tcp.c:189 sunrpc/svc_tcp.c:233
+#: sunrpc/svc_udp.c:161 sunrpc/svc_unix.c:189 sunrpc/svc_unix.c:229
+#: sunrpc/xdr.c:631 sunrpc/xdr.c:791 sunrpc/xdr_array.c:102
+#: sunrpc/xdr_rec.c:153 sunrpc/xdr_ref.c:79
 msgid "out of memory\n"
 msgstr "内存不足\n"
 
@@ -5160,138 +5158,138 @@ msgstr "内存不足\n"
 msgid "auth_unix.c: Fatal marshalling problem"
 msgstr "auth_unix.c: 严重的编组问题"
 
-#: sunrpc/clnt_perr.c:95 sunrpc/clnt_perr.c:111
+#: sunrpc/clnt_perr.c:92 sunrpc/clnt_perr.c:108
 #, c-format
 msgid "%s: %s; low version = %lu, high version = %lu"
 msgstr "%s: %s; 低版本 = %lu,高版本 = %lu"
 
-#: sunrpc/clnt_perr.c:102
+#: sunrpc/clnt_perr.c:99
 #, c-format
 msgid "%s: %s; why = %s\n"
 msgstr "%s: %s; 原因 = %s\n"
 
-#: sunrpc/clnt_perr.c:104
+#: sunrpc/clnt_perr.c:101
 #, c-format
 msgid "%s: %s; why = (unknown authentication error - %d)\n"
 msgstr "%s: %s; 原因 = (不明的认证错误 - %d)\n"
 
-#: sunrpc/clnt_perr.c:153
+#: sunrpc/clnt_perr.c:150
 msgid "RPC: Success"
 msgstr "RPC:成功"
 
-#: sunrpc/clnt_perr.c:156
+#: sunrpc/clnt_perr.c:153
 msgid "RPC: Can't encode arguments"
 msgstr "RPC:无法对参数进行编码"
 
-#: sunrpc/clnt_perr.c:160
+#: sunrpc/clnt_perr.c:157
 msgid "RPC: Can't decode result"
 msgstr "RPC:无法对结果进行解码"
 
-#: sunrpc/clnt_perr.c:164
+#: sunrpc/clnt_perr.c:161
 msgid "RPC: Unable to send"
 msgstr "RPC:无法发送"
 
-#: sunrpc/clnt_perr.c:168
+#: sunrpc/clnt_perr.c:165
 msgid "RPC: Unable to receive"
 msgstr "RPC:无法接收"
 
-#: sunrpc/clnt_perr.c:172
+#: sunrpc/clnt_perr.c:169
 msgid "RPC: Timed out"
 msgstr "RPC:超时"
 
-#: sunrpc/clnt_perr.c:176
+#: sunrpc/clnt_perr.c:173
 msgid "RPC: Incompatible versions of RPC"
 msgstr "RPC:RPC 版本不兼容"
 
-#: sunrpc/clnt_perr.c:180
+#: sunrpc/clnt_perr.c:177
 msgid "RPC: Authentication error"
 msgstr "RPC:认证错误"
 
-#: sunrpc/clnt_perr.c:184
+#: sunrpc/clnt_perr.c:181
 msgid "RPC: Program unavailable"
 msgstr "RPC:程序不可用"
 
-#: sunrpc/clnt_perr.c:188
+#: sunrpc/clnt_perr.c:185
 msgid "RPC: Program/version mismatch"
 msgstr "RPC:程序/版本不匹配"
 
-#: sunrpc/clnt_perr.c:192
+#: sunrpc/clnt_perr.c:189
 msgid "RPC: Procedure unavailable"
 msgstr "RPC: 无法取得进程"
 
-#: sunrpc/clnt_perr.c:196
+#: sunrpc/clnt_perr.c:193
 msgid "RPC: Server can't decode arguments"
 msgstr "RPC:服务器无法对参数进行解码"
 
-#: sunrpc/clnt_perr.c:200
+#: sunrpc/clnt_perr.c:197
 msgid "RPC: Remote system error"
 msgstr "RPC:远程系统错误"
 
-#: sunrpc/clnt_perr.c:204
+#: sunrpc/clnt_perr.c:201
 msgid "RPC: Unknown host"
 msgstr "RPC:未知主机"
 
-#: sunrpc/clnt_perr.c:208
+#: sunrpc/clnt_perr.c:205
 msgid "RPC: Unknown protocol"
 msgstr "RPC:未知协议"
 
-#: sunrpc/clnt_perr.c:212
+#: sunrpc/clnt_perr.c:209
 msgid "RPC: Port mapper failure"
 msgstr "RPC: 通信阜映射错误"
 
-#: sunrpc/clnt_perr.c:216
+#: sunrpc/clnt_perr.c:213
 msgid "RPC: Program not registered"
 msgstr "RPC:程序未注册"
 
-#: sunrpc/clnt_perr.c:220
+#: sunrpc/clnt_perr.c:217
 msgid "RPC: Failed (unspecified error)"
 msgstr "RPC:失败 (未指明的错误)"
 
-#: sunrpc/clnt_perr.c:261
+#: sunrpc/clnt_perr.c:258
 msgid "RPC: (unknown error code)"
 msgstr "RPC:(未知的错误码)"
 
-#: sunrpc/clnt_perr.c:333
+#: sunrpc/clnt_perr.c:330
 msgid "Authentication OK"
 msgstr "认证成功"
 
-#: sunrpc/clnt_perr.c:336
+#: sunrpc/clnt_perr.c:333
 msgid "Invalid client credential"
 msgstr "无效的客户证书"
 
-#: sunrpc/clnt_perr.c:340
+#: sunrpc/clnt_perr.c:337
 msgid "Server rejected credential"
 msgstr "服务器拒绝证书"
 
-#: sunrpc/clnt_perr.c:344
+#: sunrpc/clnt_perr.c:341
 msgid "Invalid client verifier"
 msgstr "无效的客户校验"
 
-#: sunrpc/clnt_perr.c:348
+#: sunrpc/clnt_perr.c:345
 msgid "Server rejected verifier"
 msgstr "服务器拒绝校验"
 
-#: sunrpc/clnt_perr.c:352
+#: sunrpc/clnt_perr.c:349
 msgid "Client credential too weak"
 msgstr "客户证书太弱"
 
-#: sunrpc/clnt_perr.c:356
+#: sunrpc/clnt_perr.c:353
 msgid "Invalid server verifier"
 msgstr "无效的服务器校验"
 
-#: sunrpc/clnt_perr.c:360
+#: sunrpc/clnt_perr.c:357
 msgid "Failed (unspecified error)"
 msgstr "失败 (未指明的错误)"
 
-#: sunrpc/clnt_raw.c:115
+#: sunrpc/clnt_raw.c:112
 msgid "clnt_raw.c: fatal header serialization error"
 msgstr "clnt_raw.c: 致命的头编序错误。"
 
-#: sunrpc/pm_getmaps.c:77
+#: sunrpc/pm_getmaps.c:78
 msgid "pmap_getmaps.c: rpc problem"
 msgstr "pmap_getmaps.c: 远程进程调用问题"
 
-#: sunrpc/pmap_clnt.c:127
+#: sunrpc/pmap_clnt.c:128
 msgid "Cannot register service"
 msgstr "无法注册服务"
 
@@ -5374,195 +5372,190 @@ msgstr "无法指定多个输入文件!\n"
 
 #: sunrpc/rpc_main.c:1349
 #, c-format
-msgid "This implementation doesn't support newstyle or MT-safe code!\n"
-msgstr "此实现方式不支持新式 (newstyle) 或多线程安全 (MT-Safe) 的程序!\n"
-
-#: sunrpc/rpc_main.c:1358
-#, c-format
 msgid "Cannot use netid flag with inetd flag!\n"
 msgstr "无法在使用 inetd 标志的同时使用 netid 标志!\n"
 
-#: sunrpc/rpc_main.c:1367
+#: sunrpc/rpc_main.c:1358
 #, c-format
 msgid "Cannot use netid flag without TIRPC!\n"
 msgstr "无法在未使用 TIRPC 的时候使用 netid 标志!\n"
 
-#: sunrpc/rpc_main.c:1374
+#: sunrpc/rpc_main.c:1365
 #, c-format
 msgid "Cannot use table flags with newstyle!\n"
 msgstr "无法以新风格 (newstyle) 使用表格标志!\n"
 
-#: sunrpc/rpc_main.c:1393
+#: sunrpc/rpc_main.c:1384
 #, c-format
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr "“输入文件”对模板生成标志来说是必须的。\n"
 
-#: sunrpc/rpc_main.c:1398
+#: sunrpc/rpc_main.c:1389
 #, c-format
 msgid "Cannot have more than one file generation flag!\n"
 msgstr "无法使用多于一个的文件生成标志!\n"
 
-#: sunrpc/rpc_main.c:1407
+#: sunrpc/rpc_main.c:1398
 #, c-format
 msgid "usage: %s infile\n"
 msgstr "用法:%s 输入文件\n"
 
-#: sunrpc/rpc_main.c:1408
+#: 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:1410
+#: 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:1412
+#: 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:1413
+#: 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:1421
+#: sunrpc/rpc_main.c:1412
 #, c-format
 msgid "options:\n"
 msgstr "选项:\n"
 
-#: sunrpc/rpc_main.c:1422
+#: 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:1423
+#: 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:1424
+#: sunrpc/rpc_main.c:1415
 #, c-format
 msgid "-c\t\tgenerate XDR routines\n"
 msgstr "-c\t\t产生 XDR 例程\n"
 
-#: sunrpc/rpc_main.c:1425
+#: sunrpc/rpc_main.c:1416
 #, c-format
 msgid "-C\t\tANSI C mode\n"
 msgstr "-C\t\tANSI C 模式\n"
 
-#: sunrpc/rpc_main.c:1426
+#: 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:1427
+#: sunrpc/rpc_main.c:1418
 #, c-format
 msgid "-h\t\tgenerate header file\n"
 msgstr "-h\t\t产生标头档\n"
 
-#: sunrpc/rpc_main.c:1428
+#: 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:1429
+#: 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:1430
+#: 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:1431
+#: sunrpc/rpc_main.c:1422
 #, c-format
 msgid "-l\t\tgenerate client side stubs\n"
 msgstr "-l\t\t产生客户端残余\n"
 
-#: sunrpc/rpc_main.c:1432
+#: 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:1433
+#: sunrpc/rpc_main.c:1424
 #, c-format
 msgid "-m\t\tgenerate server side stubs\n"
 msgstr "-m\t\t产生服务器端残余\n"
 
-#: sunrpc/rpc_main.c:1434
+#: sunrpc/rpc_main.c:1425
 #, c-format
 msgid "-M\t\tgenerate MT-safe code\n"
 msgstr "-M\t\t产生多线程安全代码\n"
 
-#: sunrpc/rpc_main.c:1435
+#: 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:1436
+#: 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:1437
+#: sunrpc/rpc_main.c:1428
 #, c-format
 msgid "-o outfile\tname of the output file\n"
 msgstr "-o 输出文件\t输出文件的名称\n"
 
-#: sunrpc/rpc_main.c:1438
+#: 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:1439
+#: 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:1440
+#: 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:1441
+#: sunrpc/rpc_main.c:1432
 #, c-format
 msgid "-Sm \t\tgenerate makefile template \n"
 msgstr "-Sm\t\t产生 makefile 模板\n"
 
-#: sunrpc/rpc_main.c:1442
+#: 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:1443
+#: 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:1444
+#: 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:1445
+#: sunrpc/rpc_main.c:1436
 #, c-format
 msgid "-5\t\tSysVr4 compatibility mode\n"
 msgstr "-5\t\tSysVr4 兼容模式\n"
 
-#: sunrpc/rpc_main.c:1446
+#: sunrpc/rpc_main.c:1437
 #, c-format
 msgid "--help\t\tgive this help list\n"
 msgstr "--help\t\t给出这个使用方式列表\n"
 
-#: sunrpc/rpc_main.c:1447
+#: sunrpc/rpc_main.c:1438
 #, c-format
 msgid "--version\tprint program version\n"
 msgstr "--version\t打印程序版本\n"
 
-#: sunrpc/rpc_main.c:1449
+#: sunrpc/rpc_main.c:1440
 #, c-format
 msgid ""
 "\n"
@@ -5593,240 +5586,240 @@ msgstr "空的字符字串"
 msgid "preprocessor error"
 msgstr "预处理错误"
 
-#: sunrpc/svc_run.c:71
+#: sunrpc/svc_run.c:72
 msgid "svc_run: - out of memory"
 msgstr "svc_run: - 内存不足"
 
-#: sunrpc/svc_run.c:91
+#: sunrpc/svc_run.c:92
 msgid "svc_run: - poll failed"
 msgstr "svc_run: - poll 失败"
 
-#: sunrpc/svc_simple.c:80
+#: sunrpc/svc_simple.c:72
 #, c-format
 msgid "can't reassign procedure number %ld\n"
 msgstr "无法重新指定进程编号 %ld\n"
 
-#: sunrpc/svc_simple.c:90
+#: sunrpc/svc_simple.c:82
 msgid "couldn't create an rpc server\n"
 msgstr "无法创建 rpc 服务器\n"
 
-#: sunrpc/svc_simple.c:98
+#: sunrpc/svc_simple.c:90
 #, c-format
 msgid "couldn't register prog %ld vers %ld\n"
 msgstr "无法注册程序 %ld 版本 %ld\n"
 
-#: sunrpc/svc_simple.c:106
+#: sunrpc/svc_simple.c:98
 msgid "registerrpc: out of memory\n"
 msgstr "registerrpc:内存不足\n"
 
-#: sunrpc/svc_simple.c:169
+#: sunrpc/svc_simple.c:161
 #, c-format
 msgid "trouble replying to prog %d\n"
 msgstr "回应程序 %d 时发生困难\n"
 
-#: sunrpc/svc_simple.c:178
+#: sunrpc/svc_simple.c:170
 #, c-format
 msgid "never registered prog %d\n"
 msgstr "从未注册的程序 %d\n"
 
-#: sunrpc/svc_tcp.c:164
+#: sunrpc/svc_tcp.c:165
 msgid "svc_tcp.c - tcp socket creation problem"
 msgstr "svc_tcp.c - tcp 套接字创建问题"
 
-#: sunrpc/svc_tcp.c:179
+#: sunrpc/svc_tcp.c:180
 msgid "svc_tcp.c - cannot getsockname or listen"
 msgstr "svc_tcp.c - 无法进行 getsockname 或 listen 操作"
 
-#: sunrpc/svc_udp.c:135
+#: sunrpc/svc_udp.c:136
 msgid "svcudp_create: socket creation problem"
 msgstr "svcudp_create: 套接字创建问题"
 
-#: sunrpc/svc_udp.c:149
+#: sunrpc/svc_udp.c:150
 msgid "svcudp_create - cannot getsockname"
 msgstr "svcudp_create - 无法调用 getsockname"
 
-#: sunrpc/svc_udp.c:181
+#: sunrpc/svc_udp.c:182
 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
 msgstr "svcudp_create:xp_pad 对 IP_PKTINFO 来说太小\n"
 
-#: sunrpc/svc_udp.c:480
+#: sunrpc/svc_udp.c:481
 msgid "enablecache: cache already enabled"
 msgstr "enablecache:缓冲区已经启用"
 
-#: sunrpc/svc_udp.c:486
+#: sunrpc/svc_udp.c:487
 msgid "enablecache: could not allocate cache"
 msgstr "enablecache:无法分配缓冲区"
 
-#: sunrpc/svc_udp.c:495
+#: sunrpc/svc_udp.c:496
 msgid "enablecache: could not allocate cache data"
 msgstr "enablecache:无法分配缓冲区数据"
 
-#: sunrpc/svc_udp.c:503
+#: sunrpc/svc_udp.c:504
 msgid "enablecache: could not allocate cache fifo"
 msgstr "enablecache: 无法配置缓存 fifo 管线"
 
-#: sunrpc/svc_udp.c:539
+#: sunrpc/svc_udp.c:540
 msgid "cache_set: victim not found"
 msgstr "cache_set:找不到 victim"
 
-#: sunrpc/svc_udp.c:550
+#: sunrpc/svc_udp.c:551
 msgid "cache_set: victim alloc failed"
 msgstr "cache_set:分配 victim 失败"
 
-#: sunrpc/svc_udp.c:557
+#: sunrpc/svc_udp.c:558
 msgid "cache_set: could not allocate new rpc_buffer"
 msgstr "cache_set:无法分配新的 rpc_buffer"
 
-#: sunrpc/svc_unix.c:162
+#: sunrpc/svc_unix.c:163
 msgid "svc_unix.c - AF_UNIX socket creation problem"
 msgstr "svc_unix.c - AF_UNIX 套接字创建问题"
 
-#: sunrpc/svc_unix.c:178
+#: sunrpc/svc_unix.c:179
 msgid "svc_unix.c - cannot getsockname or listen"
 msgstr "svc_unix.c - 无法进行 getsockname 或 listen 操作"
 
-#: sysdeps/generic/siglist.h:28
+#: sysdeps/generic/siglist.h:29
 msgid "Hangup"
 msgstr "挂起"
 
-#: sysdeps/generic/siglist.h:29
+#: sysdeps/generic/siglist.h:30
 msgid "Interrupt"
 msgstr "中断"
 
-#: sysdeps/generic/siglist.h:30
+#: sysdeps/generic/siglist.h:31
 msgid "Quit"
 msgstr "退出"
 
-#: sysdeps/generic/siglist.h:31
+#: sysdeps/generic/siglist.h:32
 msgid "Illegal instruction"
 msgstr "非法指令"
 
-#: sysdeps/generic/siglist.h:32
+#: sysdeps/generic/siglist.h:33
 msgid "Trace/breakpoint trap"
 msgstr "追踪与中断点陷阱"
 
-#: sysdeps/generic/siglist.h:33
+#: sysdeps/generic/siglist.h:34
 msgid "Aborted"
 msgstr "已放弃"
 
-#: sysdeps/generic/siglist.h:34
+#: sysdeps/generic/siglist.h:35
 msgid "Floating point exception"
 msgstr "浮点数例外"
 
-#: sysdeps/generic/siglist.h:35
+#: sysdeps/generic/siglist.h:36
 msgid "Killed"
 msgstr "已杀死"
 
-#: sysdeps/generic/siglist.h:36
+#: sysdeps/generic/siglist.h:37
 msgid "Bus error"
 msgstr "总线错误"
 
-#: sysdeps/generic/siglist.h:37
+#: sysdeps/generic/siglist.h:38
+msgid "Bad system call"
+msgstr "错误的系统调用"
+
+#: sysdeps/generic/siglist.h:39
 msgid "Segmentation fault"
 msgstr "段错误"
 
-#. TRANS Broken pipe; there is no process reading from the other end of a pipe.
+#. TRANS There is no process reading from the other end of a pipe.
 #. TRANS Every library function that returns this error code also generates a
 #. TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
 #. TRANS or blocked.  Thus, your program will never actually see @code{EPIPE}
 #. TRANS unless it has handled or blocked @code{SIGPIPE}.
-#: sysdeps/generic/siglist.h:38 sysdeps/gnu/errlist.c:360
+#: sysdeps/generic/siglist.h:40 sysdeps/gnu/errlist.c:360
 msgid "Broken pipe"
 msgstr "断开的管道"
 
-#: sysdeps/generic/siglist.h:39
+#: sysdeps/generic/siglist.h:41
 msgid "Alarm clock"
 msgstr "闹钟"
 
-#: sysdeps/generic/siglist.h:40
+#: sysdeps/generic/siglist.h:42
 msgid "Terminated"
 msgstr "已终止"
 
-#: sysdeps/generic/siglist.h:41
+#: sysdeps/generic/siglist.h:43
 msgid "Urgent I/O condition"
 msgstr "紧急的输出入状态"
 
-#: sysdeps/generic/siglist.h:42
+#: sysdeps/generic/siglist.h:44
 msgid "Stopped (signal)"
 msgstr "停止 (信号)"
 
-#: sysdeps/generic/siglist.h:43
+#: sysdeps/generic/siglist.h:45
 msgid "Stopped"
 msgstr "停止"
 
-#: sysdeps/generic/siglist.h:44
+#: sysdeps/generic/siglist.h:46
 msgid "Continued"
 msgstr "继续"
 
-#: sysdeps/generic/siglist.h:45
+#: sysdeps/generic/siglist.h:47
 msgid "Child exited"
 msgstr "子进程已退出"
 
-#: sysdeps/generic/siglist.h:46
+#: sysdeps/generic/siglist.h:48
 msgid "Stopped (tty input)"
 msgstr "停止 (tty 输入)"
 
-#: sysdeps/generic/siglist.h:47
+#: sysdeps/generic/siglist.h:49
 msgid "Stopped (tty output)"
 msgstr "停止 (tty 输出)"
 
-#: sysdeps/generic/siglist.h:48
+#: sysdeps/generic/siglist.h:50
 msgid "I/O possible"
 msgstr "I/O 可行"
 
-#: sysdeps/generic/siglist.h:49
+#: sysdeps/generic/siglist.h:51
 msgid "CPU time limit exceeded"
 msgstr "超出 CPU 时限"
 
-#: sysdeps/generic/siglist.h:50
+#: sysdeps/generic/siglist.h:52
 msgid "File size limit exceeded"
 msgstr "文件大小超出限制"
 
-#: sysdeps/generic/siglist.h:51
+#: sysdeps/generic/siglist.h:53
 msgid "Virtual timer expired"
 msgstr "虚拟计时器超时"
 
-#: sysdeps/generic/siglist.h:52
+#: sysdeps/generic/siglist.h:54
 msgid "Profiling timer expired"
 msgstr "测速评估用的计时器已过时取消了"
 
-#: sysdeps/generic/siglist.h:53
+#: sysdeps/generic/siglist.h:55
 msgid "User defined signal 1"
 msgstr "用户定义信号 1"
 
-#: sysdeps/generic/siglist.h:54
+#: sysdeps/generic/siglist.h:56
 msgid "User defined signal 2"
 msgstr "用户定义信号 2"
 
-#: sysdeps/generic/siglist.h:58
-msgid "EMT trap"
-msgstr "EMT 陷阱"
+#: sysdeps/generic/siglist.h:57
+msgid "Window changed"
+msgstr "范围改变了"
 
 #: sysdeps/generic/siglist.h:61
-msgid "Bad system call"
-msgstr "错误的系统调用"
+msgid "EMT trap"
+msgstr "EMT 陷阱"
 
 #: sysdeps/generic/siglist.h:64
 msgid "Stack fault"
 msgstr "栈失效"
 
 #: sysdeps/generic/siglist.h:67
-msgid "Information request"
-msgstr "信息请求"
-
-#: sysdeps/generic/siglist.h:69
 msgid "Power failure"
 msgstr "电源失效"
 
-#: sysdeps/generic/siglist.h:72
+#: sysdeps/generic/siglist.h:70
+msgid "Information request"
+msgstr "信息请求"
+
+#: sysdeps/generic/siglist.h:73
 msgid "Resource lost"
 msgstr "资源丢失"
 
-#: sysdeps/generic/siglist.h:75
-msgid "Window changed"
-msgstr "范围改变了"
-
-#. TRANS Operation not permitted; only the owner of the file (or other resource)
+#. 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
 msgid "Operation not permitted"
@@ -5837,7 +5830,7 @@ msgstr "不允许的操作"
 msgid "No such process"
 msgstr "没有那个进程"
 
-#. TRANS Interrupted function call; an asynchronous signal occurred and prevented
+#. TRANS An asynchronous signal occurred and prevented
 #. TRANS completion of the call.  When this happens, you should try the call
 #. TRANS again.
 #. TRANS
@@ -5848,12 +5841,12 @@ msgstr "没有那个进程"
 msgid "Interrupted system call"
 msgstr "被中断的系统调用"
 
-#. TRANS Input/output error; usually used for physical read or write errors.
+#. TRANS Usually used for physical read or write errors.
 #: sysdeps/gnu/errlist.c:70
 msgid "Input/output error"
 msgstr "输入/输出错误"
 
-#. TRANS No such device or address.  The system tried to use the device
+#. TRANS The system tried to use the device
 #. TRANS represented by a file you specified, and it couldn't find the device.
 #. 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
@@ -5862,7 +5855,7 @@ msgstr "输入/输出错误"
 msgid "No such device or address"
 msgstr "没有那个设备或地址"
 
-#. TRANS Argument list too long; used when the arguments passed to a new program
+#. TRANS Used when the arguments passed to a new program
 #. 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{}.
@@ -5876,21 +5869,21 @@ msgstr "参数列表过长"
 msgid "Exec format error"
 msgstr "可执行文件格式错误"
 
-#. TRANS Bad file descriptor; for example, I/O on a descriptor that has been
+#. 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
 msgid "Bad file descriptor"
 msgstr "错误的文件描述符"
 
-#. TRANS There are no child processes.  This error happens on operations that are
+#. 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
 msgid "No child processes"
 msgstr "没有子进程"
 
-#. TRANS Deadlock avoided; allocating a system resource would have resulted in a
+#. TRANS Allocating a system resource would have resulted in a
 #. 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.
@@ -5898,13 +5891,13 @@ msgstr "没有子进程"
 msgid "Resource deadlock avoided"
 msgstr "已避免资源死锁"
 
-#. TRANS No memory available.  The system cannot allocate more virtual memory
+#. TRANS The system cannot allocate more virtual memory
 #. TRANS because its capacity is full.
 #: sysdeps/gnu/errlist.c:149
 msgid "Cannot allocate memory"
 msgstr "无法分配内存"
 
-#. TRANS Bad address; an invalid pointer was detected.
+#. TRANS An invalid pointer was detected.
 #. TRANS On @gnuhurdsystems{}, this error never happens; you get a signal instead.
 #: sysdeps/gnu/errlist.c:168
 msgid "Bad address"
@@ -5917,14 +5910,14 @@ msgstr "错误的地址"
 msgid "Block device required"
 msgstr "需要块设备"
 
-#. TRANS Resource busy; a system resource that can't be shared is already in use.
+#. 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
 msgid "Device or resource busy"
 msgstr "设备或资源忙"
 
-#. TRANS File exists; an existing file was specified in a context where it only
+#. 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
 msgid "File exists"
@@ -5948,13 +5941,13 @@ msgstr "没有那个设备"
 msgid "Not a directory"
 msgstr "不是目录"
 
-#. TRANS File is a directory; you cannot open a directory for writing,
+#. TRANS You cannot open a directory for writing,
 #. TRANS or create or remove hard links to it.
 #: sysdeps/gnu/errlist.c:240
 msgid "Is a directory"
 msgstr "是一个目录"
 
-#. TRANS Invalid argument.  This is used to indicate various kinds of problems
+#. 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
 msgid "Invalid argument"
@@ -5993,12 +5986,12 @@ msgstr "对设备不适当的 ioctl 操作"
 msgid "Text file busy"
 msgstr "文本文件忙"
 
-#. TRANS File too big; the size of a file would be larger than allowed by the system.
+#. TRANS The size of a file would be larger than allowed by the system.
 #: sysdeps/gnu/errlist.c:308
 msgid "File too large"
 msgstr "文件过大"
 
-#. TRANS No space left on device; write operation on a file failed because the
+#. TRANS Write operation on a file failed because the
 #. TRANS disk is full.
 #: sysdeps/gnu/errlist.c:318
 msgid "No space left on device"
@@ -6014,26 +6007,26 @@ msgstr "非法 seek 操作"
 msgid "Read-only file system"
 msgstr "只读文件系统"
 
-#. TRANS Too many links; the link count of a single file would become too large.
+#. 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
 msgid "Too many links"
 msgstr "过多的链接"
 
-#. TRANS Domain error; used by mathematical functions when an argument value does
+#. 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
 msgid "Numerical argument out of domain"
 msgstr "数值参数超出域"
 
-#. TRANS Range error; used by mathematical functions when the result value is
+#. TRANS Used by mathematical functions when the result value is
 #. TRANS not representable because of overflow or underflow.
 #: sysdeps/gnu/errlist.c:380
 msgid "Numerical result out of range"
 msgstr "数值结果超出范围"
 
-#. TRANS Resource temporarily unavailable; the call might work if you try again
+#. TRANS The call might work if you try again
 #. TRANS later.  The macro @code{EWOULDBLOCK} is another name for @code{EAGAIN};
 #. TRANS they are always the same in @theglibc{}.
 #. TRANS
@@ -6221,76 +6214,75 @@ msgstr "需要目标地址"
 msgid "Cannot send after transport endpoint shutdown"
 msgstr "无法在传输端点关闭以后发送"
 
-#. TRANS ???
-#: sysdeps/gnu/errlist.c:677
+#: sysdeps/gnu/errlist.c:676
 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:687
+#: sysdeps/gnu/errlist.c:686
 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:697
+#: sysdeps/gnu/errlist.c:696
 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:707
+#: sysdeps/gnu/errlist.c:706
 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:718
+#: sysdeps/gnu/errlist.c:717
 msgid "File name too long"
 msgstr "文件名过长"
 
 #. TRANS The remote host for a requested network connection is down.
-#: sysdeps/gnu/errlist.c:727
+#: sysdeps/gnu/errlist.c:726
 msgid "Host is down"
 msgstr "主机关闭"
 
 #. TRANS The remote host for a requested network connection is not reachable.
-#: sysdeps/gnu/errlist.c:736
+#: sysdeps/gnu/errlist.c:735
 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:746
+#: sysdeps/gnu/errlist.c:745
 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:757
+#: 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:767
+#: sysdeps/gnu/errlist.c:766
 msgid "Too many users"
 msgstr "用户过多"
 
 #. TRANS The user's disk quota was exceeded.
-#: sysdeps/gnu/errlist.c:776
+#: sysdeps/gnu/errlist.c:775
 msgid "Disk quota exceeded"
 msgstr "超出磁盘限额"
 
-#. TRANS Stale file handle.  This indicates an internal confusion in the
+#. TRANS This indicates an internal confusion in the
 #. TRANS file system which is due to file system rearrangements on the server host
 #. 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:789
+#: sysdeps/gnu/errlist.c:788
 msgid "Stale file handle"
 msgstr "过旧的文件控柄"
 
@@ -6298,72 +6290,65 @@ 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:801
+#: sysdeps/gnu/errlist.c:800
 msgid "Object is remote"
 msgstr "对象是远程的"
 
-#. TRANS ???
-#: sysdeps/gnu/errlist.c:810
+#: sysdeps/gnu/errlist.c:808
 msgid "RPC struct is bad"
 msgstr "RPC 结构错误"
 
-#. TRANS ???
-#: sysdeps/gnu/errlist.c:819
+#: sysdeps/gnu/errlist.c:816
 msgid "RPC version wrong"
 msgstr "RPC 版本错误"
 
-#. TRANS ???
-#: sysdeps/gnu/errlist.c:828
+#: sysdeps/gnu/errlist.c:824
 msgid "RPC program not available"
 msgstr "RPC 程序不可用"
 
-#. TRANS ???
-#: sysdeps/gnu/errlist.c:837
+#: sysdeps/gnu/errlist.c:832
 msgid "RPC program version wrong"
 msgstr "RPC 程序版本错误"
 
-#. TRANS ???
-#: sysdeps/gnu/errlist.c:846
+#: sysdeps/gnu/errlist.c:840
 msgid "RPC bad procedure for program"
 msgstr "程序的 RPC 进程错误"
 
-#. TRANS No locks available.  This is used by the file locking facilities; see
+#. 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:858
+#: sysdeps/gnu/errlist.c:852
 msgid "No locks available"
 msgstr "没有可用的锁"
 
-#. TRANS Inappropriate file type or format.  The file was the wrong type for the
+#. 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:871
+#: sysdeps/gnu/errlist.c:865
 msgid "Inappropriate file type or format"
 msgstr "不适当的文件类型或格式"
 
-#. TRANS ???
-#: sysdeps/gnu/errlist.c:880
+#: sysdeps/gnu/errlist.c:873
 msgid "Authentication error"
 msgstr "认证错误"
 
-#. TRANS ???
-#: sysdeps/gnu/errlist.c:889
+#: sysdeps/gnu/errlist.c:881
 msgid "Need authenticator"
 msgstr "需要认证器"
 
-#. TRANS Function not implemented.  This indicates that the function called is
+#. 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:902
+#: sysdeps/gnu/errlist.c:894
 msgid "Function not implemented"
 msgstr "函数未实现"
 
-#. TRANS Not supported.  A function returns this error when certain parameter
+#. 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
@@ -6375,13 +6360,13 @@ msgstr "函数未实现"
 #. TRANS
 #. TRANS If the entire function is not available at all in the implementation,
 #. TRANS it returns @code{ENOSYS} instead.
-#: sysdeps/gnu/errlist.c:922
+#: 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:932
+#: sysdeps/gnu/errlist.c:924
 msgid "Invalid or incomplete multibyte or wide character"
 msgstr "无效或不完整的多字节字符或宽字符"
 
@@ -6391,26 +6376,26 @@ msgstr "无效或不完整的多字节字符或宽字符"
 #. 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:946
+#: 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:957
+#: 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:968
+#: sysdeps/gnu/errlist.c:960
 msgid "?"
 msgstr "?"
 
 #. TRANS You did @strong{what}?
-#: sysdeps/gnu/errlist.c:977
+#: sysdeps/gnu/errlist.c:969
 msgid "You really blew it this time"
 msgstr "这次真的被您打败了"
 
@@ -6447,252 +6432,265 @@ msgstr "这次真的被您打败了"
 # 简单的说,儿歌 "唐老先生有块地...",然后呢?? ;-p
 #
 #. TRANS Go home and have a glass of warm, dairy-fresh milk.
-#: sysdeps/gnu/errlist.c:986
+#. 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:995
+#: sysdeps/gnu/errlist.c:1000
 msgid "Gratuitous error"
 msgstr "无故的错误"
 
-#: sysdeps/gnu/errlist.c:1003
+#: sysdeps/gnu/errlist.c:1008
 msgid "Bad message"
 msgstr "错误的消息"
 
-#: sysdeps/gnu/errlist.c:1011
+#: sysdeps/gnu/errlist.c:1016
 msgid "Identifier removed"
 msgstr "标识符已删除"
 
-#: sysdeps/gnu/errlist.c:1019
+#: sysdeps/gnu/errlist.c:1024
 msgid "Multihop attempted"
 msgstr "尝试 Multihop"
 
-#: sysdeps/gnu/errlist.c:1027
+#: sysdeps/gnu/errlist.c:1032
 msgid "No data available"
 msgstr "没有可用的数据"
 
-#: sysdeps/gnu/errlist.c:1035
+#: sysdeps/gnu/errlist.c:1040
 msgid "Link has been severed"
 msgstr "链接已有服务"
 
-#: sysdeps/gnu/errlist.c:1043
+#: sysdeps/gnu/errlist.c:1048
 msgid "No message of desired type"
 msgstr "没有符合需求格式的消息"
 
-#: sysdeps/gnu/errlist.c:1051
+#: sysdeps/gnu/errlist.c:1056
 msgid "Out of streams resources"
 msgstr "流资源不足"
 
-#: sysdeps/gnu/errlist.c:1059
+#: sysdeps/gnu/errlist.c:1064
 msgid "Device not a stream"
 msgstr "设备不是流"
 
-#: sysdeps/gnu/errlist.c:1067
+#: sysdeps/gnu/errlist.c:1072
 msgid "Value too large for defined data type"
 msgstr "对已定义的数据类型来说值过大"
 
-#: sysdeps/gnu/errlist.c:1075
+#: sysdeps/gnu/errlist.c:1080
 msgid "Protocol error"
 msgstr "协议错误"
 
-#: sysdeps/gnu/errlist.c:1083
+#: sysdeps/gnu/errlist.c:1088
 msgid "Timer expired"
 msgstr "计时器超时"
 
-#. TRANS Operation canceled; an asynchronous operation was canceled before it
+#. TRANS An asynchronous operation was canceled before it
 #. 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:1095
+#: sysdeps/gnu/errlist.c:1100
 msgid "Operation canceled"
 msgstr "操作已取消"
 
-#: sysdeps/gnu/errlist.c:1103
+#: sysdeps/gnu/errlist.c:1108
+msgid "Owner died"
+msgstr "拥有者已消逝"
+
+#: sysdeps/gnu/errlist.c:1116
+msgid "State not recoverable"
+msgstr "状态无法回复"
+
+#: sysdeps/gnu/errlist.c:1124
 msgid "Interrupted system call should be restarted"
 msgstr "被中断的系统调用应该重新启动"
 
-#: sysdeps/gnu/errlist.c:1111
+#: sysdeps/gnu/errlist.c:1132
 msgid "Channel number out of range"
 msgstr "通道编号超出范围"
 
-#: sysdeps/gnu/errlist.c:1119
+#: sysdeps/gnu/errlist.c:1140
 msgid "Level 2 not synchronized"
 msgstr "级别 2 尚未同步"
 
-#: sysdeps/gnu/errlist.c:1127
+#: sysdeps/gnu/errlist.c:1148
 msgid "Level 3 halted"
 msgstr "级别 3 已关闭"
 
-#: sysdeps/gnu/errlist.c:1135
+#: sysdeps/gnu/errlist.c:1156
 msgid "Level 3 reset"
 msgstr "级别 3 已重置"
 
-#: sysdeps/gnu/errlist.c:1143
+#: sysdeps/gnu/errlist.c:1164
 msgid "Link number out of range"
 msgstr "链接数超出范围"
 
-#: sysdeps/gnu/errlist.c:1151
+#: sysdeps/gnu/errlist.c:1172
 msgid "Protocol driver not attached"
 msgstr "未加载协议驱动程序"
 
-#: sysdeps/gnu/errlist.c:1159
+#: sysdeps/gnu/errlist.c:1180
 msgid "No CSI structure available"
 msgstr "没有可用的 CSI 结构"
 
-#: sysdeps/gnu/errlist.c:1167
+#: sysdeps/gnu/errlist.c:1188
 msgid "Level 2 halted"
 msgstr "级别 2 己关闭"
 
-#: sysdeps/gnu/errlist.c:1175
+#: sysdeps/gnu/errlist.c:1196
 msgid "Invalid exchange"
 msgstr "无效的交换"
 
-#: sysdeps/gnu/errlist.c:1183
+#: sysdeps/gnu/errlist.c:1204
 msgid "Invalid request descriptor"
 msgstr "无效的请求描述符"
 
-#: sysdeps/gnu/errlist.c:1191
+#: sysdeps/gnu/errlist.c:1212
 msgid "Exchange full"
 msgstr "交换满"
 
-#: sysdeps/gnu/errlist.c:1199
+#: sysdeps/gnu/errlist.c:1220
 msgid "No anode"
 msgstr "没有 anode"
 
-#: sysdeps/gnu/errlist.c:1207
+#: sysdeps/gnu/errlist.c:1228
 msgid "Invalid request code"
 msgstr "无效的请求码"
 
-#: sysdeps/gnu/errlist.c:1215
+#: sysdeps/gnu/errlist.c:1236
 msgid "Invalid slot"
 msgstr "不适用的 slot"
 
-#: sysdeps/gnu/errlist.c:1223
+#: sysdeps/gnu/errlist.c:1244
 msgid "File locking deadlock error"
 msgstr "文件锁死锁错误"
 
-#: sysdeps/gnu/errlist.c:1231
+#: sysdeps/gnu/errlist.c:1252
 msgid "Bad font file format"
 msgstr "错误的字体文件格式"
 
-#: sysdeps/gnu/errlist.c:1239
+#: sysdeps/gnu/errlist.c:1260
 msgid "Machine is not on the network"
 msgstr "机器不在网络中"
 
-#: sysdeps/gnu/errlist.c:1247
+#: sysdeps/gnu/errlist.c:1268
 msgid "Package not installed"
 msgstr "包未安装"
 
-#: sysdeps/gnu/errlist.c:1255
+#: sysdeps/gnu/errlist.c:1276
 msgid "Advertise error"
 msgstr "通知错误"
 
-#: sysdeps/gnu/errlist.c:1263
+#: sysdeps/gnu/errlist.c:1284
 msgid "Srmount error"
 msgstr "Srmount 错误"
 
-#: sysdeps/gnu/errlist.c:1271
+#: sysdeps/gnu/errlist.c:1292
 msgid "Communication error on send"
 msgstr "发送时出现通讯错误"
 
-#: sysdeps/gnu/errlist.c:1279
+#: sysdeps/gnu/errlist.c:1300
 msgid "RFS specific error"
 msgstr "RFS 特定错误"
 
-#: sysdeps/gnu/errlist.c:1287
+#: sysdeps/gnu/errlist.c:1308
 msgid "Name not unique on network"
 msgstr "网络上的名称不是唯一的"
 
-#: sysdeps/gnu/errlist.c:1295
+#: sysdeps/gnu/errlist.c:1316
 msgid "File descriptor in bad state"
 msgstr "文件描述符处于错误状态"
 
-#: sysdeps/gnu/errlist.c:1303
+#: sysdeps/gnu/errlist.c:1324
 msgid "Remote address changed"
 msgstr "远程地址已改变"
 
-#: sysdeps/gnu/errlist.c:1311
+#: sysdeps/gnu/errlist.c:1332
 msgid "Can not access a needed shared library"
 msgstr "无法访问必须的共享库"
 
-#: sysdeps/gnu/errlist.c:1319
+#: sysdeps/gnu/errlist.c:1340
 msgid "Accessing a corrupted shared library"
 msgstr "正在访问一个已毁坏的共享库"
 
-#: sysdeps/gnu/errlist.c:1327
+#: sysdeps/gnu/errlist.c:1348
 msgid ".lib section in a.out corrupted"
 msgstr "a.out 中的 .lib 节已毁坏"
 
-#: sysdeps/gnu/errlist.c:1335
+#: sysdeps/gnu/errlist.c:1356
 msgid "Attempting to link in too many shared libraries"
 msgstr "试图与过多的共享库相链接"
 
-#: sysdeps/gnu/errlist.c:1343
+#: sysdeps/gnu/errlist.c:1364
 msgid "Cannot exec a shared library directly"
 msgstr "无法直接执行共享库"
 
-#: sysdeps/gnu/errlist.c:1351
+#: sysdeps/gnu/errlist.c:1372
 msgid "Streams pipe error"
 msgstr "流管道错误"
 
-#: sysdeps/gnu/errlist.c:1359
+#: sysdeps/gnu/errlist.c:1380
 msgid "Structure needs cleaning"
 msgstr "结构需要清理"
 
-#: sysdeps/gnu/errlist.c:1367
+#: sysdeps/gnu/errlist.c:1388
 msgid "Not a XENIX named type file"
 msgstr "不是 XENIX 命名的类型文件"
 
-#: sysdeps/gnu/errlist.c:1375
+#: sysdeps/gnu/errlist.c:1396
 msgid "No XENIX semaphores available"
 msgstr "没有可用的 XENIX 信号量"
 
-#: sysdeps/gnu/errlist.c:1383
+#: sysdeps/gnu/errlist.c:1404
 msgid "Is a named type file"
 msgstr "是一个有名类型文件"
 
-#: sysdeps/gnu/errlist.c:1391
+#: sysdeps/gnu/errlist.c:1412
 msgid "Remote I/O error"
 msgstr "远程 I/O 错误"
 
-#: sysdeps/gnu/errlist.c:1399
+#: sysdeps/gnu/errlist.c:1420
 msgid "No medium found"
 msgstr "找不到介质"
 
-#: sysdeps/gnu/errlist.c:1407
+#: sysdeps/gnu/errlist.c:1428
 msgid "Wrong medium type"
 msgstr "错误的介质类型"
 
-#: sysdeps/gnu/errlist.c:1415
+#: sysdeps/gnu/errlist.c:1436
 msgid "Required key not available"
 msgstr "需要的关键字不存在"
 
-#: sysdeps/gnu/errlist.c:1423
+#: sysdeps/gnu/errlist.c:1444
 msgid "Key has expired"
 msgstr "关键字已过期"
 
-#: sysdeps/gnu/errlist.c:1431
+#: sysdeps/gnu/errlist.c:1452
 msgid "Key has been revoked"
 msgstr "键值已取消"
 
-#: sysdeps/gnu/errlist.c:1439
+#: sysdeps/gnu/errlist.c:1460
 msgid "Key was rejected by service"
 msgstr "键值被服务所拒绝"
 
-#: sysdeps/gnu/errlist.c:1447
-msgid "Owner died"
-msgstr "拥有者已消逝"
-
-#: sysdeps/gnu/errlist.c:1455
-msgid "State not recoverable"
-msgstr "状态无法回复"
-
-#: sysdeps/gnu/errlist.c:1463
+#: sysdeps/gnu/errlist.c:1468
 msgid "Operation not possible due to RF-kill"
 msgstr "由于 RF-kill 而无法操作"
 
-#: sysdeps/gnu/errlist.c:1471
+#: sysdeps/gnu/errlist.c:1476
 msgid "Memory page has hardware error"
 msgstr "内存分页有硬件错误"
 
@@ -6797,78 +6795,123 @@ msgstr "无法打开“%s”"
 msgid "cannot read header from `%s'"
 msgstr "无法从“%s”中读入头"
 
-#: timezone/zdump.c:494
+#: sysdeps/x86/dl-cet.c:202
+msgid "mprotect legacy bitmap failed"
+msgstr ""
+
+#: sysdeps/x86/dl-cet.c:217
+#, fuzzy
+#| msgid "Data input available"
+msgid "legacy bitmap isn't available"
+msgstr "数据输入可用"
+
+#: sysdeps/x86/dl-cet.c:247
+#, fuzzy
+#| msgid "failed to start conversion processing"
+msgid "failed to mark legacy code region"
+msgstr "启动转换处理失败"
+
+#: sysdeps/x86/dl-cet.c:269
+msgid "shadow stack isn't enabled"
+msgstr ""
+
+#: sysdeps/x86/dl-cet.c:290
+msgid "can't disable CET"
+msgstr ""
+
+#: timezone/zdump.c:332
 msgid "has fewer than 3 characters"
 msgstr "不足 3 个字符"
 
-#: timezone/zdump.c:496
+#: timezone/zdump.c:334
 msgid "has more than 6 characters"
 msgstr "超过 6 个字符"
 
-#: timezone/zdump.c:498
+#: timezone/zdump.c:336
 msgid "has characters other than ASCII alphanumerics, '-' or '+'"
 msgstr "含有 ASCII 数字、字母、“-”、“+”之外的字符"
 
-#: timezone/zdump.c:503
+#: timezone/zdump.c:341
 #, c-format
 msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"
 msgstr "%s: 警告:区域 “%s” 缩写 “%s” %s\n"
 
-#: timezone/zdump.c:553
+#: timezone/zdump.c:387
 #, c-format
 msgid ""
-"%s: usage: %s [--version] [--help] [-{vV}] [-{ct} [lo,]hi] zonename ...\n"
+"%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 [--version] [--help] [-v] [-c [低年分,]高年分 ] 区域名称 ...\n"
-"\n"
-"将错误通报给 %s。\n"
 
-#: timezone/zdump.c:635
+#: timezone/zdump.c:473
 #, c-format
 msgid "%s: wild -c argument %s\n"
 msgstr "%s: 怪异的 -c 选项 %s\n"
 
-#: timezone/zdump.c:668
+#: timezone/zdump.c:506
 #, c-format
 msgid "%s: wild -t argument %s\n"
 msgstr "%s: wild -c 参数 %s\n"
 
-#: timezone/zic.c:361
+#: timezone/zic.c:429
 #, c-format
 msgid "%s: Memory exhausted: %s\n"
 msgstr "%s:内存耗尽:%s\n"
 
-#: timezone/zic.c:369
+#: timezone/zic.c:437
 msgid "size overflow"
 msgstr "大小溢出"
 
-#: timezone/zic.c:416
-msgid "int overflow"
+#: timezone/zic.c:447
+#, fuzzy
+#| msgid "int overflow"
+msgid "alignment overflow"
+msgstr "整数溢出"
+
+#: timezone/zic.c:495
+#, fuzzy
+#| msgid "Integer overflow"
+msgid "integer overflow"
 msgstr "整数溢出"
 
-#: timezone/zic.c:451
-#, c-format
-msgid "\"%s\", line %d: "
+#: timezone/zic.c:529
+#, fuzzy, c-format
+#| msgid "\"%s\", line %d: "
+msgid "\"%s\", line %<PRIdMAX>: "
 msgstr "\"%s\", 第 %d 行: "
 
-#: timezone/zic.c:454
-#, c-format
-msgid " (rule from \"%s\", line %d)"
+#: timezone/zic.c:532
+#, fuzzy, c-format
+#| msgid " (rule from \"%s\", line %d)"
+msgid " (rule from \"%s\", line %<PRIdMAX>)"
 msgstr " (规则来自 \"%s\", 第 %d 行)"
 
-#: timezone/zic.c:473
+#: timezone/zic.c:551
 #, c-format
 msgid "warning: "
 msgstr "警告:"
 
-#: timezone/zic.c:498
-#, c-format
+#: timezone/zic.c:576
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: usage is %s [ --version ] [ --help ] [ -v ] \\\n"
+#| "\t[ -l localtime ] [ -p posixrules ] [ -d directory ] \\\n"
+#| "\t[ -L leapseconds ] [ filename ... ]\n"
+#| "\n"
+#| "Report bugs to %s.\n"
 msgid ""
 "%s: usage is %s [ --version ] [ --help ] [ -v ] \\\n"
 "\t[ -l localtime ] [ -p posixrules ] [ -d directory ] \\\n"
-"\t[ -L leapseconds ] [ filename ... ]\n"
+"\t[ -t localtime-link ] [ -L leapseconds ] [ filename ... ]\n"
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
@@ -6878,368 +6921,507 @@ msgstr ""
 "\n"
 "将错误通报给 %s。\n"
 
-#: timezone/zic.c:534
+#: timezone/zic.c:599
+#, fuzzy, c-format
+#| msgid "%s: Can't create %s: %s\n"
+msgid "%s: Can't chdir to %s: %s\n"
+msgstr "%s:无法创建 %s:%s\n"
+
+#: timezone/zic.c:632
 msgid "wild compilation-time specification of zic_t"
 msgstr "zic_t 的万用编译时间规格"
 
-#: timezone/zic.c:554
+#: timezone/zic.c:652
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s:给出了多个 -d 选项\n"
 
-#: timezone/zic.c:564
+#: timezone/zic.c:662
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s:给出了多个 -l 选项\n"
 
-#: timezone/zic.c:574
+#: timezone/zic.c:672
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s:给出了多个 -p 选项\n"
 
-#: timezone/zic.c:584
+#: timezone/zic.c:680
+#, fuzzy, c-format
+#| msgid "%s: More than one -d option specified\n"
+msgid "%s: More than one -t option specified\n"
+msgstr "%s:给出了多个 -d 选项\n"
+
+#: timezone/zic.c:689
+msgid "-y is obsolescent"
+msgstr ""
+
+#: timezone/zic.c:693
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr "%s:给出了多个 -y 选项\n"
 
-#: timezone/zic.c:594
+#: timezone/zic.c:703
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s:给出了多个 -L 选项\n"
 
-#: timezone/zic.c:603
+#: timezone/zic.c:712
 msgid "-s ignored"
 msgstr "-s 已被忽略"
 
-#: timezone/zic.c:641
+#: timezone/zic.c:753
 msgid "link to link"
 msgstr "链接到链接"
 
-#: timezone/zic.c:644 timezone/zic.c:648
+#: timezone/zic.c:756 timezone/zic.c:760
 msgid "command line"
 msgstr "命令行"
 
-#: timezone/zic.c:664
+#: timezone/zic.c:776
 msgid "empty file name"
 msgstr "空文件名"
 
-#: timezone/zic.c:667
+#: timezone/zic.c:779
 #, c-format
 msgid "file name '%s' begins with '/'"
 msgstr "文件名“%s”以“/”开头"
 
-#: timezone/zic.c:676
+#: timezone/zic.c:789
 #, c-format
 msgid "file name '%s' contains '%.*s' component"
 msgstr "文件名“%s”包含“%.*s”部分"
 
-#: timezone/zic.c:682
+#: timezone/zic.c:795
 #, c-format
 msgid "file name '%s' component contains leading '-'"
 msgstr "文件名“%s”部分以“-”开头"
 
 # component_len_max < component_len
-#: timezone/zic.c:685
+#: timezone/zic.c:798
 #, c-format
 msgid "file name '%s' contains overlength component '%.*s...'"
 msgstr "文件名“%s”中的“%.*s”部分过长"
 
-#: timezone/zic.c:713
+#: timezone/zic.c:826
 #, c-format
 msgid "file name '%s' contains byte '%c'"
 msgstr "文件名“%s”包含字节“%c”"
 
-#: timezone/zic.c:714
+#: timezone/zic.c:827
 #, c-format
 msgid "file name '%s' contains byte '\\%o'"
 msgstr "文件名“%s”包含字节“\\%o”"
 
-#: timezone/zic.c:757
-#, c-format
-msgid "%s: link from %s failed: %s"
+#: timezone/zic.c:897
+#, fuzzy, c-format
+#| msgid "%s: link from %s failed: %s"
+msgid "%s: link from %s/%s failed: %s\n"
 msgstr "%s:无法链接到 %s:%s"
 
-#: timezone/zic.c:792
-msgid "hard link failed, symbolic link used"
-msgstr "硬链接失败,使用符号链接"
+#: timezone/zic.c:907 timezone/zic.c:1876
+#, fuzzy, c-format
+#| msgid "%s: Can't remove %s: %s\n"
+msgid "%s: Can't remove %s/%s: %s\n"
+msgstr "%s:无法删除 %s:%s\n"
 
-#: timezone/zic.c:802
+#: timezone/zic.c:931
 #, c-format
-msgid "%s: Can't read %s: %s\n"
+msgid "symbolic link used because hard link failed: %s"
+msgstr ""
+
+#: timezone/zic.c:939
+#, fuzzy, c-format
+#| msgid "%s: Can't read %s: %s\n"
+msgid "%s: Can't read %s/%s: %s\n"
 msgstr "%s: 无法读取 %s: %s\n"
 
-#: timezone/zic.c:810 timezone/zic.c:1701
-#, c-format
-msgid "%s: Can't create %s: %s\n"
+#: timezone/zic.c:946 timezone/zic.c:1889
+#, fuzzy, c-format
+#| msgid "%s: Can't create %s: %s\n"
+msgid "%s: Can't create %s/%s: %s\n"
 msgstr "%s:无法创建 %s:%s\n"
 
-#: timezone/zic.c:818
-msgid "link failed, copy used"
-msgstr "链接失败,使用复制代替"
+#: timezone/zic.c:955
+#, c-format
+msgid "copy used because hard link failed: %s"
+msgstr ""
 
-#: timezone/zic.c:913 timezone/zic.c:915
+#: timezone/zic.c:958
+#, fuzzy, c-format
+#| msgid "Don't update symbolic links"
+msgid "copy used because symbolic link failed: %s"
+msgstr "不更新符号链接"
+
+#: timezone/zic.c:1032 timezone/zic.c:1034
 msgid "same rule name in multiple files"
 msgstr "多个文件中的相同规则名"
 
-#: timezone/zic.c:956
-msgid "unruly zone"
-msgstr "没有规则的时区"
-
-#: timezone/zic.c:963
+#: timezone/zic.c:1081
 #, c-format
 msgid "%s in ruleless zone"
 msgstr "%s 在没有规则的节"
 
-#: timezone/zic.c:983
+#: timezone/zic.c:1101
 msgid "standard input"
 msgstr "标准输入"
 
-#: timezone/zic.c:988
+#: timezone/zic.c:1106
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr "%s:无法打开 %s:%s\n"
 
-#: timezone/zic.c:999
+#: timezone/zic.c:1117
 msgid "line too long"
 msgstr "行过长"
 
-#: timezone/zic.c:1019
+#: timezone/zic.c:1139
 msgid "input line of unknown type"
 msgstr "未知类型的输入行"
 
-#: timezone/zic.c:1034
-#, c-format
-msgid "%s: Leap line in non leap seconds file %s"
-msgstr "%s: 闰时设置行出现在不含闰秒的文件 %s 中"
-
-#: timezone/zic.c:1042 timezone/zic.c:1447 timezone/zic.c:1469
+#: timezone/zic.c:1158 timezone/zic.c:1593 timezone/zic.c:1615
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: 严重错误: 错误的 l_value %d\n"
 
-#: timezone/zic.c:1051
+#: timezone/zic.c:1167
 msgid "expected continuation line not found"
 msgstr "找不到应该出现的续行"
 
-#: timezone/zic.c:1093 timezone/zic.c:2826
+#: timezone/zic.c:1203
+#, fuzzy
+#| msgid "format '%s' not handled by pre-2015 versions of zic"
+msgid "fractional seconds rejected by pre-2018 versions of zic"
+msgstr "“%s”格式无法由早于 2015 年的 zic 版本所处理"
+
+#: timezone/zic.c:1221 timezone/zic.c:3078
 msgid "time overflow"
 msgstr "时间溢出"
 
-#: timezone/zic.c:1098
+#: timezone/zic.c:1227
 msgid "values over 24 hours not handled by pre-2007 versions of zic"
 msgstr "24 小时以上的值无法由早于 2007 的 zic 版本所处理"
 
-#: timezone/zic.c:1109
-msgid "wrong number of fields on Rule line"
-msgstr "规则行中域的个数错误"
-
-#: timezone/zic.c:1113
-msgid "nameless rule"
-msgstr "无名规则"
-
 # 	zic_t		r_stdoff;	/* offset from standard time */
-#: timezone/zic.c:1118
+#: timezone/zic.c:1245
 #, fuzzy
 msgid "invalid saved time"
 msgstr "无效的保存时间"
 
-#: timezone/zic.c:1135
+#: timezone/zic.c:1256
+msgid "wrong number of fields on Rule line"
+msgstr "规则行中域的个数错误"
+
+#: timezone/zic.c:1265
+#, fuzzy, c-format
+#| msgid "Invalid numeric gid \"%s\"!"
+msgid "Invalid rule name \"%s\""
+msgstr "无效的 gid 数值 \"%s\"!"
+
+#: timezone/zic.c:1287
 msgid "wrong number of fields on Zone line"
 msgstr "区域行中域的个数错误"
 
-#: timezone/zic.c:1140
+#: timezone/zic.c:1292
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "\"Zone %s\" 行和 -l 选项是互斥的"
 
-#: timezone/zic.c:1146
+#: timezone/zic.c:1298
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "\"Zone %s\" 行和 -p 选项是互斥的"
 
-#: timezone/zic.c:1154
-#, c-format
-msgid "duplicate zone name %s (file \"%s\", line %d)"
+#: timezone/zic.c:1305
+#, fuzzy, c-format
+#| msgid "duplicate zone name %s (file \"%s\", line %d)"
+msgid "duplicate zone name %s (file \"%s\", line %<PRIdMAX>)"
 msgstr "重复的区域名 %s (文件“%s”,行 %d)"
 
-#: timezone/zic.c:1167
+#: timezone/zic.c:1319
 msgid "wrong number of fields on Zone continuation line"
 msgstr "时区接续行的字段数目不对"
 
-#: timezone/zic.c:1207
+#: timezone/zic.c:1359
 msgid "invalid UT offset"
 msgstr "无效的 UT 偏移量"
 
-#: timezone/zic.c:1211
+#: timezone/zic.c:1363
 msgid "invalid abbreviation format"
 msgstr "无效的缩略格式"
 
-#: timezone/zic.c:1220
+#: timezone/zic.c:1372
 #, c-format
 msgid "format '%s' not handled by pre-2015 versions of zic"
 msgstr "“%s”格式无法由早于 2015 年的 zic 版本所处理"
 
-#: timezone/zic.c:1247
+#: timezone/zic.c:1399
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr "时区接续行的结束时间不在上一行的结束时间之后"
 
-#: timezone/zic.c:1274
+#: timezone/zic.c:1426
 msgid "wrong number of fields on Leap line"
 msgstr "闰时设置行的字段数目错误"
 
-#: timezone/zic.c:1283
+#: timezone/zic.c:1435
 msgid "invalid leaping year"
 msgstr "无效的闰年"
 
-#: timezone/zic.c:1303 timezone/zic.c:1401
+#: timezone/zic.c:1455 timezone/zic.c:1547
 msgid "invalid month name"
 msgstr "无效的月名称"
 
-#: timezone/zic.c:1316 timezone/zic.c:1514 timezone/zic.c:1528
+#: timezone/zic.c:1468 timezone/zic.c:1663 timezone/zic.c:1677
 msgid "invalid day of month"
 msgstr "无效的日"
 
-#: timezone/zic.c:1321
+#: timezone/zic.c:1473
 msgid "time too small"
 msgstr "时间太小"
 
-#: timezone/zic.c:1325
+#: timezone/zic.c:1477
 msgid "time too large"
 msgstr "时间过大"
 
-#: timezone/zic.c:1329 timezone/zic.c:1430
+#: timezone/zic.c:1481 timezone/zic.c:1576
 msgid "invalid time of day"
 msgstr "无效的时间"
 
-#: timezone/zic.c:1348
+#: timezone/zic.c:1494
 msgid "illegal CORRECTION field on Leap line"
 msgstr "在闰时设置行中有不合法的 CORRECTION 字段"
 
-#: timezone/zic.c:1353
+#: timezone/zic.c:1499
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "在闰时设置行中有不合法的 Rolling/Stationary 字段"
 
-#: timezone/zic.c:1359
-msgid "leap second precedes Big Bang"
+#: timezone/zic.c:1505
+#, fuzzy
+#| msgid "leap second precedes Big Bang"
+msgid "leap second precedes Epoch"
 msgstr "闰秒出现在大爆炸之前"
 
-#: timezone/zic.c:1372
+#: timezone/zic.c:1518
 msgid "wrong number of fields on Link line"
 msgstr "链接行中域的个数错误"
 
-#: timezone/zic.c:1376
+#: timezone/zic.c:1522
 msgid "blank FROM field on Link line"
 msgstr "Link 行中空白的 FROM 域"
 
-#: timezone/zic.c:1451
+#: timezone/zic.c:1597
 msgid "invalid starting year"
 msgstr "无效的起始年份"
 
-#: timezone/zic.c:1473
+#: timezone/zic.c:1619
 msgid "invalid ending year"
 msgstr "无效的终止年份"
 
-#: timezone/zic.c:1477
+#: timezone/zic.c:1623
 msgid "starting year greater than ending year"
 msgstr "起始年份大于终止年份"
 
-#: timezone/zic.c:1484
+#: timezone/zic.c:1630
 msgid "typed single year"
 msgstr "输入的年分是同一年"
 
-#: timezone/zic.c:1519
+#: timezone/zic.c:1633
+#, c-format
+msgid "year type \"%s\" is obsolete; use \"-\" instead"
+msgstr ""
+
+#: timezone/zic.c:1668
 msgid "invalid weekday name"
 msgstr "无效的星期名"
 
-#: timezone/zic.c:1638
+#: timezone/zic.c:1800
+#, fuzzy, c-format
+#| msgid "pre-2014 clients may mishandle more than 1200 transition times"
+msgid "reference clients mishandle more than %d transition times"
+msgstr "2014 之前的客户端可能会错误处理超过 1200 次的改变次数"
+
+#: timezone/zic.c:1804
 msgid "pre-2014 clients may mishandle more than 1200 transition times"
 msgstr "2014 之前的客户端可能会错误处理超过 1200 次的改变次数"
 
-#: timezone/zic.c:1691
-#, c-format
-msgid "%s: Can't remove %s: %s\n"
-msgstr "%s:无法删除 %s:%s\n"
+#: timezone/zic.c:1920
+#, fuzzy
+#| msgid "too many local time types"
+msgid "too many transition times"
+msgstr "过多的本地时间类型"
 
-#: timezone/zic.c:1918
-#, c-format
-msgid "%%z UTC offset magnitude exceeds 99:59:59"
+#: timezone/zic.c:2107
+#, fuzzy, c-format
+#| msgid "%%z UTC offset magnitude exceeds 99:59:59"
+msgid "%%z UT offset magnitude exceeds 99:59:59"
 msgstr "%%z UTC 偏移大小超过了 99:59:59"
 
-#: timezone/zic.c:2291
+#: timezone/zic.c:2488
 msgid "no POSIX environment variable for zone"
 msgstr "无 POSIX 环境变量用于区"
 
-#: timezone/zic.c:2297
+#: timezone/zic.c:2494
 #, c-format
 msgid "%s: pre-%d clients may mishandle distant timestamps"
 msgstr "%s: %d 之前的客户端可能会错误处理久远的时间戳"
 
-#: timezone/zic.c:2428
+#: timezone/zic.c:2631
 msgid "two rules for same instant"
 msgstr "为同一时间点制订了两种规则"
 
-#: timezone/zic.c:2485
+#: timezone/zic.c:2696
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr "无法决定在结束时间以后该使用的时区简写"
 
-#: timezone/zic.c:2531 timezone/zic.c:2593
+#: timezone/zic.c:2785
 msgid "too many local time types"
 msgstr "过多的本地时间类型"
 
-#: timezone/zic.c:2597
+#: timezone/zic.c:2789
 msgid "UT offset out of range"
 msgstr "UTC 偏移超出范围"
 
-#: timezone/zic.c:2621
+#: timezone/zic.c:2813
 msgid "too many leap seconds"
 msgstr "太多闰秒"
 
-#: timezone/zic.c:2627
-msgid "repeated leap second moment"
-msgstr "重复的闰秒设置"
+#: timezone/zic.c:2844
+msgid "Leap seconds too close together"
+msgstr ""
 
-#: timezone/zic.c:2677
+#: timezone/zic.c:2891
 msgid "Wild result from command execution"
 msgstr "命令运行导致奇怪的结果"
 
-#: timezone/zic.c:2678
+#: timezone/zic.c:2892
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s:命令为“%s”,结果为 %d\n"
 
-#: timezone/zic.c:2810
+#: timezone/zic.c:2998
+#, c-format
+msgid "\"%s\" is undocumented; use \"last%s\" instead"
+msgstr ""
+
+#: timezone/zic.c:3029
+#, c-format
+msgid "\"%s\" is ambiguous in pre-2017c zic"
+msgstr ""
+
+#: timezone/zic.c:3063
 msgid "Odd number of quotation marks"
 msgstr "奇数个引号"
 
-#: timezone/zic.c:2896
+#: timezone/zic.c:3157
 msgid "use of 2/29 in non leap-year"
 msgstr "在非闰年时用到 2/29 日"
 
-#: timezone/zic.c:2931
+#: timezone/zic.c:3192
 msgid "rule goes past start/end of month; will not work with pre-2004 versions of zic"
 msgstr "规则超过开始/结束月分;将无法用于 2004 年之前的 zic 版本"
 
-#: timezone/zic.c:2958
+#: timezone/zic.c:3219
 msgid "time zone abbreviation has fewer than 3 characters"
 msgstr "时区缩写少于 3 个字母"
 
-#: timezone/zic.c:2960
+#: timezone/zic.c:3221
 msgid "time zone abbreviation has too many characters"
 msgstr "时区缩写字母太多"
 
-#: timezone/zic.c:2962
+#: timezone/zic.c:3223
 msgid "time zone abbreviation differs from POSIX standard"
 msgstr "时区缩写与 POSIX 标准不同"
 
-#: timezone/zic.c:2968
+#: timezone/zic.c:3229
 msgid "too many, or too long, time zone abbreviations"
 msgstr "过多或过长的时区缩写"
 
-#: timezone/zic.c:3004
+#: timezone/zic.c:3275
 #, c-format
 msgid "%s: Can't create directory %s: %s"
 msgstr "%s:无法创建目录 %s:%s"
 
+#~ msgid "cannot open zero fill device"
+#~ msgstr "无法打开零填充设备"
+
+#~ msgid "invalid caller"
+#~ msgstr "无效的调用者"
+
+#~ msgid "relocation error"
+#~ msgstr "重定位错误"
+
+#~ msgid "Character out of range for UTF-8"
+#~ msgstr "字符超出 UTF-8 的范围"
+
+#~ msgid "no definition of `UNDEFINED'"
+#~ msgstr "没有关于“UNDEFINIED”的定义"
+
+#~ msgid "non-symbolic character value should not be used"
+#~ msgstr "不应该使用非符号字符的值"
+
+#~ msgid "Cannot set LC_CTYPE to default locale"
+#~ msgstr "无法将 LC_CTYPE 设置为缺省的语区"
+
+#~ msgid "Cannot set LC_MESSAGES to default locale"
+#~ msgstr "无法将 LC_MESSAGES 设置为缺省的语区"
+
+#~ msgid "Cannot set LC_COLLATE to default locale"
+#~ msgstr "无法将 LC_COLLATE 设置为缺省的语区"
+
+#~ msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
+#~ msgstr "无法设置通信端到关闭于 exec:%s; 停用 paranoia 模式"
+
+#~ msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
+#~ msgstr "无法读取/proc/self/cmdline:%s; 停用 paranoia 模式"
+
+#~ msgid "Haven't found \"%s\" in password cache!"
+#~ msgstr "无法在口令缓冲区中找到“%s”!"
+
+#~ msgid "Reloading \"%s\" in password cache!"
+#~ msgstr "在口令缓冲区中重新加载“%s”!"
+
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: 选项 `--%s' 不允许附加参数\n"
+
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: 未知的选项 `--%s'\n"
+
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: 选项 `-W %s' 不允许附加参数\n"
+
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s:选项 ‘-W %s’ 需要一个参数\n"
+
+#~ msgid "This implementation doesn't support newstyle or MT-safe code!\n"
+#~ msgstr "此实现方式不支持新式 (newstyle) 或多线程安全 (MT-Safe) 的程序!\n"
+
+#~ msgid ""
+#~ "%s: usage: %s [--version] [--help] [-{vV}] [-{ct} [lo,]hi] zonename ...\n"
+#~ "\n"
+#~ "Report bugs to %s.\n"
+#~ msgstr ""
+#~ "%s:用法: %s [--version] [--help] [-v] [-c [低年分,]高年分 ] 区域名称 ...\n"
+#~ "\n"
+#~ "将错误通报给 %s。\n"
+
+#~ msgid "hard link failed, symbolic link used"
+#~ msgstr "硬链接失败,使用符号链接"
+
+#~ msgid "link failed, copy used"
+#~ msgstr "链接失败,使用复制代替"
+
+#~ msgid "unruly zone"
+#~ msgstr "没有规则的时区"
+
+#~ msgid "%s: Leap line in non leap seconds file %s"
+#~ msgstr "%s: 闰时设置行出现在不含闰秒的文件 %s 中"
+
+#~ msgid "nameless rule"
+#~ msgstr "无名规则"
+
+#~ msgid "repeated leap second moment"
+#~ msgstr "重复的闰秒设置"
+
 #~ msgid "cannot allocate TLS data structures for initial thread"
 #~ msgstr "无法配置 TLS 数据结构用以起始线程"