summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@sourceware.org>2017-01-12 15:07:01 +0530
committerSiddhesh Poyarekar <siddhesh@sourceware.org>2017-01-12 15:07:01 +0530
commit468e525c81a4af10f2e613289b6ff7c950773a9e (patch)
tree3aea3f583c9d57a2c2a0f72cc8c68ff2902ee27d /po/zh_CN.po
parentc1f0601389db64d97b3a4580c9037d7e1c9daefb (diff)
downloadglibc-468e525c81a4af10f2e613289b6ff7c950773a9e.tar.gz
Merge translations from the Translation Project
Update translations from the 2.25 candidate libc.pot. * po/cs.po: Merge translations from the Translation Project. * po/de.po: Likewise. * po/pl.po: Likewise. * po/ru.po: Likewise. * po/tr.po: Likewise. * po/uk.po: Likewise. * po/vi.po: Likewise. * po/zh_CN.po: Likewise.
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po1515
1 files changed, 775 insertions, 740 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index efe65d0884..55899021e4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,21 +7,22 @@
# Wei-Lun Chao <william.chao@ossii.com.tw>, 2005, 2008, 2011.
# LI Daobing <lidaobing@gmail.com>, 2007.
# Wei-Lun Chao <bluebat@member.fsf.org>, 2012, 2013.
-# Mingye Wang <arthur200126@gmail.com>, 2015.
+# Mingye Wang <arthur200126@gmail.com>, 2015, 2017.
#
msgid ""
msgstr ""
-"Project-Id-Version: libc 2.22-pre1\n"
-"POT-Creation-Date: 2015-07-31 00:10-0400\n"
-"PO-Revision-Date: 2015-09-19 19:13-0400\n"
-"Last-Translator: Mingye Wang <arthur200126@gmail.com>\n"
+"Project-Id-Version: libc 2.25-pre1\n"
+"POT-Creation-Date: 2017-01-11 17:27+0530\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"
"Language: zh_CN\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 1.8.11\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: argp/argp-help.c:227
#, c-format
@@ -36,7 +37,7 @@ msgstr "%.*s:未知的 ARGP_HELP_FMT 参数"
#: argp/argp-help.c:250
#, c-format
msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr "ARGP_HELP_FMT 中有垃圾: %s"
+msgstr "ARGP_HELP_FMT 中有垃圾:%s"
#: argp/argp-help.c:1214
msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
@@ -149,13 +150,12 @@ msgstr ""
"-o 输出文件 [输入文件]...\n"
"[输出文件 [输入文件]...]"
-#: catgets/gencat.c:229 debug/pcprofiledump.c:209 elf/ldconfig.c:307
-#: elf/pldd.c:252 elf/sln.c:85 elf/sprof.c:372 iconv/iconv_prog.c:408
+#: 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:376 login/programs/pt_chown.c:88
-#: malloc/memusagestat.c:563 nss/getent.c:973 nss/makedb.c:369
-#: posix/getconf.c:486 sunrpc/rpcinfo.c:691
-#: sysdeps/unix/sysv/linux/lddlibc4.c:61
+#: locale/programs/localedef.c:366 login/programs/pt_chown.c:89
+#: malloc/memusagestat.c:563 nss/getent.c:913 nss/makedb.c:369
+#: posix/getconf.c:503 sysdeps/unix/sysv/linux/lddlibc4.c:61
#, c-format
msgid ""
"For bug reporting instructions, please see:\n"
@@ -165,12 +165,12 @@ msgstr ""
"%s。\n"
#: catgets/gencat.c:245 debug/pcprofiledump.c:225 debug/xtrace.sh:64
-#: elf/ldconfig.c:323 elf/ldd.bash.in:38 elf/pldd.c:268 elf/sotruss.sh:75
+#: 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:402
-#: login/programs/pt_chown.c:62 malloc/memusage.sh:71
+#: locale/programs/locale.c:294 locale/programs/localedef.c:392
+#: 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
-#: posix/getconf.c:468 sysdeps/unix/sysv/linux/lddlibc4.c:68
+#: posix/getconf.c:485 sysdeps/unix/sysv/linux/lddlibc4.c:68
#, c-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -182,11 +182,11 @@ msgstr ""
"或者适合某些特殊目的。\n"
#: catgets/gencat.c:250 debug/pcprofiledump.c:230 debug/xtrace.sh:68
-#: elf/ldconfig.c:328 elf/pldd.c:273 elf/sprof.c:395 iconv/iconv_prog.c:430
+#: 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:407 malloc/memusage.sh:75
+#: 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
-#: posix/getconf.c:473
+#: posix/getconf.c:490
#, c-format
msgid "Written by %s.\n"
msgstr "由 %s 编写。\n"
@@ -397,7 +397,7 @@ msgstr "未知的操作系统"
msgid ", OS ABI: %s %d.%d.%d"
msgstr ", OS ABI: %s %d.%d.%d"
-#: elf/cache.c:157 elf/ldconfig.c:1340
+#: elf/cache.c:157 elf/ldconfig.c:1341
#, c-format
msgid "Can't open cache file %s\n"
msgstr "无法打开缓冲文件 %s\n"
@@ -437,11 +437,11 @@ msgstr "将 %s 的访问权限改变为 %#o 失败"
msgid "Renaming of %s to %s failed"
msgstr "将 %s 改名为 %s 失败"
-#: elf/dl-close.c:396 elf/dl-open.c:478
+#: elf/dl-close.c:397 elf/dl-open.c:478
msgid "cannot create scope list"
msgstr "无法创建范围列表"
-#: elf/dl-close.c:816
+#: elf/dl-close.c:837
msgid "shared object not open"
msgstr "共享库未打开"
@@ -470,11 +470,11 @@ msgstr "无法分配符号搜索列表"
msgid "Filters not supported with LD_TRACE_PRELINKING"
msgstr "过滤程序不支持与 LD_TRACE_PRELINKING 共用"
-#: elf/dl-error.c:77
+#: elf/dl-error-skeleton.c:87
msgid "DYNAMIC LINKER BUG!!!"
msgstr "动态链接器 BUG!!!"
-#: elf/dl-error.c:127
+#: elf/dl-error-skeleton.c:136
msgid "error while loading shared libraries"
msgstr "装入共享库时出错"
@@ -494,147 +494,140 @@ msgstr "内部错误: symidx 超出 fptr 表的范围"
msgid "cannot create capability list"
msgstr "无法创建功能列表"
-#: elf/dl-load.c:410
+#: elf/dl-load.c:412
msgid "cannot allocate name record"
msgstr "无法分配名记录"
-#: elf/dl-load.c:495 elf/dl-load.c:611 elf/dl-load.c:694 elf/dl-load.c:813
+#: elf/dl-load.c:497 elf/dl-load.c:613 elf/dl-load.c:696 elf/dl-load.c:815
msgid "cannot create cache for search path"
msgstr "无法创建搜索路径缓冲器"
-#: elf/dl-load.c:586
+#: elf/dl-load.c:588
msgid "cannot create RUNPATH/RPATH copy"
msgstr "无法创建 RUNPATH/RPATH 的副本"
-#: elf/dl-load.c:680
+#: elf/dl-load.c:682
msgid "cannot create search path array"
msgstr "无法创建搜索路径数组"
-#: elf/dl-load.c:885
+#: elf/dl-load.c:888
msgid "cannot stat shared object"
msgstr "无法对共享目标进行 stat 操作"
-#: elf/dl-load.c:962
+#: elf/dl-load.c:965
msgid "cannot open zero fill device"
msgstr "无法打开零填充设备"
-#: elf/dl-load.c:1009 elf/dl-load.c:2159
+#: elf/dl-load.c:1012 elf/dl-load.c:2172
msgid "cannot create shared object descriptor"
msgstr "无法创建共享对象描述符"
-#: elf/dl-load.c:1028 elf/dl-load.c:1568 elf/dl-load.c:1680
+#: elf/dl-load.c:1031 elf/dl-load.c:1556 elf/dl-load.c:1668
msgid "cannot read file data"
msgstr "无法读入文件数据"
-#: elf/dl-load.c:1068
+#: elf/dl-load.c:1071
msgid "ELF load command alignment not page-aligned"
msgstr "ELF 加载命令对齐不是按页对齐的"
-#: elf/dl-load.c:1075
+#: elf/dl-load.c:1078
msgid "ELF load command address/offset not properly aligned"
msgstr "ELF 装入命令的地址/偏移量没有正确地对齐"
-#: elf/dl-load.c:1159
-msgid "cannot allocate TLS data structures for initial thread"
-msgstr "无法配置 TLS 数据结构用以起始线程"
-
-#: elf/dl-load.c:1182
-msgid "cannot handle TLS data"
-msgstr "无法处理 TLS 数据"
-
-#: elf/dl-load.c:1201
+#: elf/dl-load.c:1163
msgid "object file has no loadable segments"
msgstr "目标文件没有可加载段"
-#: elf/dl-load.c:1210 elf/dl-load.c:1660
+#: elf/dl-load.c:1172 elf/dl-load.c:1648
msgid "cannot dynamically load executable"
msgstr "无法动态装入可执行文件"
-#: elf/dl-load.c:1231
+#: elf/dl-load.c:1193
msgid "object file has no dynamic section"
msgstr "目标文件没有动态节"
-#: elf/dl-load.c:1254
+#: elf/dl-load.c:1216
msgid "shared object cannot be dlopen()ed"
msgstr "无法用 dlopen() 打开共享库"
-#: elf/dl-load.c:1267
+#: elf/dl-load.c:1229
msgid "cannot allocate memory for program header"
msgstr "无法为程序头分配内存"
-#: elf/dl-load.c:1283 elf/dl-open.c:195
+#: elf/dl-load.c:1245 elf/dl-open.c:195
msgid "invalid caller"
msgstr "无效的调用者"
-#: elf/dl-load.c:1306 elf/dl-load.h:130
+#: elf/dl-load.c:1268 elf/dl-load.h:130
msgid "cannot change memory protections"
msgstr "无法改变内存保护"
-#: elf/dl-load.c:1326
+#: elf/dl-load.c:1288
msgid "cannot enable executable stack as shared object requires"
msgstr "无法启用共享目标需要的执行栈"
-#: elf/dl-load.c:1339
+#: elf/dl-load.c:1301
msgid "cannot close file descriptor"
msgstr "无法关闭文件描述符"
-#: elf/dl-load.c:1568
+#: elf/dl-load.c:1556
msgid "file too short"
msgstr "文件过短"
-#: elf/dl-load.c:1603
+#: elf/dl-load.c:1591
msgid "invalid ELF header"
msgstr "无效的 ELF 头"
-#: elf/dl-load.c:1615
+#: elf/dl-load.c:1603
msgid "ELF file data encoding not big-endian"
-msgstr "ELF 文件数据编码不是 big-endian"
+msgstr "ELF 文件数据编码不是大端序"
-#: elf/dl-load.c:1617
+#: elf/dl-load.c:1605
msgid "ELF file data encoding not little-endian"
-msgstr "ELF 文件数据编码不是 little-endian"
+msgstr "ELF 文件数据编码不是小端序"
-#: elf/dl-load.c:1621
+# e_ident[]
+#: elf/dl-load.c:1609
msgid "ELF file version ident does not match current one"
-msgstr "ELF 档版本 ident 不符合目前所使用的"
+msgstr "ELF 文件的版本信息不符合目前所使用的"
-#: elf/dl-load.c:1625
+#: elf/dl-load.c:1613
msgid "ELF file OS ABI invalid"
msgstr "ELF 文件 OS ABI 无效"
-#: elf/dl-load.c:1628
+#: elf/dl-load.c:1616
msgid "ELF file ABI version invalid"
msgstr "ELF 文件 ABI 版本无效"
-#: elf/dl-load.c:1631
+#: elf/dl-load.c:1619
msgid "nonzero padding in e_ident"
msgstr "在 e_ident 中填补非零值"
-#: elf/dl-load.c:1634
+#: elf/dl-load.c:1622
msgid "internal error"
msgstr "内部错误"
-#: elf/dl-load.c:1641
+#: elf/dl-load.c:1629
msgid "ELF file version does not match current one"
msgstr "ELF 文件版本与当前版本不匹配"
-#: elf/dl-load.c:1649
+#: elf/dl-load.c:1637
msgid "only ET_DYN and ET_EXEC can be loaded"
msgstr "只有 ET_DYN 以及 ET_EXEC 可以加载"
-#: elf/dl-load.c:1665
+#: elf/dl-load.c:1653
msgid "ELF file's phentsize not the expected size"
-msgstr "ELF 档的 phentsize 并不是预期中的大小"
+msgstr "ELF 文件的标头项目大小(phentsize)出乎意料"
-#: elf/dl-load.c:2178
+#: elf/dl-load.c:2191
msgid "wrong ELF class: ELFCLASS64"
-msgstr "错误 ELF 类: ELFCLASS64"
+msgstr "ELF 类不对:ELFCLASS64"
-#: elf/dl-load.c:2179
+#: elf/dl-load.c:2192
msgid "wrong ELF class: ELFCLASS32"
-msgstr "错误 ELF 类: ELFCLASS32"
+msgstr "ELF 类不对:ELFCLASS32"
-#: elf/dl-load.c:2182
+#: elf/dl-load.c:2195
msgid "cannot open shared object file"
msgstr "无法打开共享对象文件"
@@ -646,11 +639,11 @@ msgstr "无法从共享目标中映射段"
msgid "cannot map zero-fill pages"
msgstr "无法映射用零填充的页"
-#: elf/dl-lookup.c:845
+#: elf/dl-lookup.c:849
msgid "relocation error"
msgstr "重定位错误"
-#: elf/dl-lookup.c:872
+#: elf/dl-lookup.c:875
msgid "symbol lookup error"
msgstr "符号查询错误"
@@ -678,20 +671,20 @@ msgstr "dlmopen() 中无效的目标名字空间"
msgid "cannot allocate memory in static TLS block"
msgstr "无法在静态 TLS 块中分配内存"
-#: elf/dl-reloc.c:206
+#: elf/dl-reloc.c:212
msgid "cannot make segment writable for relocation"
msgstr "在重新寻址以后无法将节设为可写入状态"
-#: elf/dl-reloc.c:276
+#: elf/dl-reloc.c:283
#, c-format
msgid "%s: out of memory to store relocation results for %s\n"
msgstr "%s: 内存不足以保存重寻址结果用于 %s\n"
-#: elf/dl-reloc.c:292
+#: elf/dl-reloc.c:299
msgid "cannot restore segment prot after reloc"
msgstr "重定位后无法恢复段 prot"
-#: elf/dl-reloc.c:323
+#: elf/dl-reloc.c:330
msgid "cannot apply additional memory protection after relocation"
msgstr "无法在重定位后应用额外的内存保护"
@@ -699,7 +692,7 @@ msgstr "无法在重定位后应用额外的内存保护"
msgid "RTLD_NEXT used in code not dynamically loaded"
msgstr "代码所使用的 RTLD_NEXT 没有动态加载"
-#: elf/dl-tls.c:934
+#: elf/dl-tls.c:940
msgid "cannot create TLS data structures"
msgstr "无法创建 TLS 数据结构"
@@ -711,220 +704,220 @@ msgstr "版本查找错误"
msgid "cannot allocate version reference table"
msgstr "无法分配版本引用表格"
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:142
msgid "Print cache"
msgstr "打印缓冲区"
-#: elf/ldconfig.c:142
+#: elf/ldconfig.c:143
msgid "Generate verbose messages"
msgstr "生成详细消息"
-#: elf/ldconfig.c:143
+#: elf/ldconfig.c:144
msgid "Don't build cache"
msgstr "不要创建缓冲区"
-#: elf/ldconfig.c:144
-msgid "Don't generate links"
-msgstr "不要生成连接"
-
#: elf/ldconfig.c:145
+msgid "Don't update symbolic links"
+msgstr "不更新符号链接"
+
+#: elf/ldconfig.c:146
msgid "Change to and use ROOT as root directory"
msgstr "进入 ROOT 目录并将其作为根目录"
-#: elf/ldconfig.c:145
+#: elf/ldconfig.c:146
msgid "ROOT"
msgstr "ROOT"
-#: elf/ldconfig.c:146
+#: elf/ldconfig.c:147
msgid "CACHE"
msgstr "CACHE"
-#: elf/ldconfig.c:146
+#: elf/ldconfig.c:147
msgid "Use CACHE as cache file"
msgstr "将 CACHE 用作缓冲区文件"
-#: elf/ldconfig.c:147
+#: elf/ldconfig.c:148
msgid "CONF"
msgstr "CONF"
-#: elf/ldconfig.c:147
+#: elf/ldconfig.c:148
msgid "Use CONF as configuration file"
msgstr "将 CONF 用作配置文件"
-#: elf/ldconfig.c:148
+#: elf/ldconfig.c:149
msgid "Only process directories specified on the command line. Don't build cache."
msgstr "只在命令行中给出了进程目录。未创建缓冲区。"
-#: elf/ldconfig.c:149
+#: elf/ldconfig.c:150
msgid "Manually link individual libraries."
-msgstr "手工连接独立的库。"
+msgstr "手工链接独立的库。"
-#: elf/ldconfig.c:150
+#: elf/ldconfig.c:151
msgid "FORMAT"
msgstr "FORMAT"
-#: elf/ldconfig.c:150
+#: elf/ldconfig.c:151
msgid "Format to use: new, old or compat (default)"
msgstr "采用的格式:新、旧或兼容(默认)"
-#: elf/ldconfig.c:151
+#: elf/ldconfig.c:152
msgid "Ignore auxiliary cache file"
msgstr "忽略辅助缓存文件"
-#: elf/ldconfig.c:159
+#: elf/ldconfig.c:160
msgid "Configure Dynamic Linker Run Time Bindings."
-msgstr "设置运行时期动态连接"
+msgstr "设置运行时期动态链接"
-#: elf/ldconfig.c:346
+#: elf/ldconfig.c:347
#, c-format
msgid "Path `%s' given more than once"
msgstr "多次给出路径“%s”"
-#: elf/ldconfig.c:386
+#: elf/ldconfig.c:387
#, c-format
msgid "%s is not a known library type"
msgstr "%s 不是已知类型的库"
-#: elf/ldconfig.c:414
+#: elf/ldconfig.c:415
#, c-format
msgid "Can't stat %s"
msgstr "无法对 %s 进行 stat 操作"
-#: elf/ldconfig.c:488
+#: elf/ldconfig.c:489
#, c-format
msgid "Can't stat %s\n"
msgstr "无法对 %s 进行 stat 操作\n"
-#: elf/ldconfig.c:498
+#: elf/ldconfig.c:499
#, c-format
msgid "%s is not a symbolic link\n"
-msgstr "%s 不是符号连接\n"
+msgstr "%s 不是符号链接\n"
-#: elf/ldconfig.c:517
+#: elf/ldconfig.c:518
#, c-format
msgid "Can't unlink %s"
msgstr "无法取消链接 %s"
-#: elf/ldconfig.c:523
+#: elf/ldconfig.c:524
#, c-format
msgid "Can't link %s to %s"
-msgstr "无法将 %s 连接到 %s"
+msgstr "无法将 %s 链接到 %s"
-#: elf/ldconfig.c:529
+#: elf/ldconfig.c:530
msgid " (changed)\n"
msgstr " (改变)\n"
-#: elf/ldconfig.c:531
+#: elf/ldconfig.c:532
msgid " (SKIPPED)\n"
msgstr " (跳过)\n"
-#: elf/ldconfig.c:586
+#: elf/ldconfig.c:587
#, c-format
msgid "Can't find %s"
msgstr "无法找到 %s"
-#: elf/ldconfig.c:602 elf/ldconfig.c:775 elf/ldconfig.c:834 elf/ldconfig.c:868
+#: elf/ldconfig.c:603 elf/ldconfig.c:776 elf/ldconfig.c:835 elf/ldconfig.c:869
#, c-format
msgid "Cannot lstat %s"
msgstr "无法对 %s 进行 lstat 操作"
-#: elf/ldconfig.c:609
+#: elf/ldconfig.c:610
#, c-format
msgid "Ignored file %s since it is not a regular file."
msgstr "由于不是一个普通文件,忽略文件 %s"
-#: elf/ldconfig.c:618
+#: elf/ldconfig.c:619
#, c-format
msgid "No link created since soname could not be found for %s"
msgstr "未创建链接,因为 %s 无法找到 soname"
-#: elf/ldconfig.c:701
+#: elf/ldconfig.c:702
#, c-format
msgid "Can't open directory %s"
msgstr "无法打开目录 %s"
-#: elf/ldconfig.c:793 elf/ldconfig.c:855 elf/readlib.c:97
+#: elf/ldconfig.c:794 elf/ldconfig.c:856 elf/readlib.c:97
#, c-format
msgid "Input file %s not found.\n"
msgstr "未找到输入文件 %s。\n"
-#: elf/ldconfig.c:800
+#: elf/ldconfig.c:801
#, c-format
msgid "Cannot stat %s"
msgstr "无法对 %s 进行 stat 操作"
-#: elf/ldconfig.c:951
+#: elf/ldconfig.c:952
#, c-format
msgid "libc5 library %s in wrong directory"
msgstr "libc5 的库 %s 处于错误的目录中"
-#: elf/ldconfig.c:954
+#: elf/ldconfig.c:955
#, c-format
msgid "libc6 library %s in wrong directory"
msgstr "libc5 的库 %s 处于错误的目录中"
-#: elf/ldconfig.c:957
+#: elf/ldconfig.c:958
#, c-format
msgid "libc4 library %s in wrong directory"
msgstr "libc4 的库 %s 处于错误的目录中"
-#: elf/ldconfig.c:985
+#: elf/ldconfig.c:986
#, 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:1094
+#: elf/ldconfig.c:1095
#, c-format
msgid "Warning: ignoring configuration file that cannot be opened: %s"
msgstr "警告:正在忽略无法打开的组态文件:%s"
-#: elf/ldconfig.c:1160
+#: elf/ldconfig.c:1161
#, c-format
msgid "%s:%u: bad syntax in hwcap line"
msgstr "%s:%u: 在 hwcap 行中有不当的语法"
-#: elf/ldconfig.c:1166
+#: elf/ldconfig.c:1167
#, c-format
msgid "%s:%u: hwcap index %lu above maximum %u"
msgstr "%s:%u: hwcap 索引 %lu 以上的最大值 %u"
-#: elf/ldconfig.c:1173 elf/ldconfig.c:1181
+#: elf/ldconfig.c:1174 elf/ldconfig.c:1182
#, c-format
msgid "%s:%u: hwcap index %lu already defined as %s"
msgstr "%s:%u: hwcap 索引 %lu 已经被定义为 %s"
-#: elf/ldconfig.c:1184
+#: elf/ldconfig.c:1185
#, c-format
msgid "%s:%u: duplicate hwcap %lu %s"
msgstr "%s:%u: 重制 hwcap %lu %s"
-#: elf/ldconfig.c:1206
+#: elf/ldconfig.c:1207
#, c-format
msgid "need absolute file name for configuration file when using -r"
msgstr "需要绝对文件名称用于组态文件时正在使用 -r"
-#: elf/ldconfig.c:1213 locale/programs/xmalloc.c:64 malloc/obstack.c:416
-#: malloc/obstack.c:418 posix/getconf.c:441 posix/getconf.c:661
+#: elf/ldconfig.c:1214 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:1245
+#: elf/ldconfig.c:1246
#, c-format
msgid "%s:%u: cannot read directory %s"
msgstr "%s:%u: 无法读取目录 %s"
-#: elf/ldconfig.c:1289
+#: elf/ldconfig.c:1290
#, c-format
msgid "relative path `%s' used to build cache"
msgstr "用来建置缓存的相对路径 `%s'"
-#: elf/ldconfig.c:1319
+#: elf/ldconfig.c:1320
#, c-format
msgid "Can't chdir to /"
msgstr "无法改变目录到 /"
-#: elf/ldconfig.c:1360
+#: elf/ldconfig.c:1361
#, c-format
msgid "Can't open cache file directory %s\n"
msgstr "无法打开缓冲文件目录 %s\n"
@@ -974,7 +967,7 @@ msgstr "缺少文件参数"
msgid "No such file or directory"
msgstr "没有那个文件或目录"
-#: elf/ldd.bash.in:150 inet/rcmd.c:492
+#: elf/ldd.bash.in:150 inet/rcmd.c:475
msgid "not regular file"
msgstr "不是普通文件"
@@ -1142,7 +1135,7 @@ msgstr "无法对文件 %s 进行 mmap 操作。\n"
msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
msgstr "%s 不是 ELF 文件 - 起始处的魔数有误。\n"
-#: elf/sln.c:84
+#: elf/sln.c:76
#, c-format
msgid ""
"Usage: sln src dest|file\n"
@@ -1151,32 +1144,32 @@ msgstr ""
"用法:sln 源代码 目的|文件\n"
"\n"
-#: elf/sln.c:109
+#: elf/sln.c:97
#, c-format
msgid "%s: file open error: %m\n"
msgstr "%s:文件打开错误:%m\n"
-#: elf/sln.c:146
+#: elf/sln.c:134
#, c-format
msgid "No target in line %d\n"
msgstr "没有目标于第 %d 行\n"
-#: elf/sln.c:178
+#: elf/sln.c:164
#, c-format
msgid "%s: destination must not be a directory\n"
msgstr "%s:目的必须不是目录\n"
-#: elf/sln.c:184
+#: elf/sln.c:170
#, c-format
msgid "%s: failed to remove the old destination\n"
msgstr "%s:无法移除旧的目的\n"
-#: elf/sln.c:192
+#: elf/sln.c:178
#, c-format
msgid "%s: invalid destination: %s\n"
msgstr "%s:无效的目的:%s\n"
-#: elf/sln.c:207 elf/sln.c:216
+#: elf/sln.c:189 elf/sln.c:198
#, c-format
msgid "Invalid link from \"%s\" to \"%s\": %s\n"
msgstr "从 “%s” 到 “%s” 的链结无效:%s\n"
@@ -1329,7 +1322,7 @@ msgstr "当分析 profile 数据文件"
#: elf/sprof.c:797
#, c-format
msgid "profiling data file `%s' does not match shared object `%s'"
-msgstr "测试数据档 `%s' 与共用目的档 `%s' 不符合"
+msgstr "测试数据文件 `%s' 与共用对象文件 `%s' 不符合"
#: elf/sprof.c:808
#, c-format
@@ -1344,7 +1337,7 @@ msgstr "正在关闭测试数据文件时发生错误"
#: elf/sprof.c:899
#, c-format
msgid "`%s' is no correct profile data file for `%s'"
-msgstr "`%s' 不是 `%s' 中正确的测速评估数据档"
+msgstr "`%s' 不是 `%s' 中正确的测速评估数据文件"
#: elf/sprof.c:1080 elf/sprof.c:1138
#, c-format
@@ -1402,7 +1395,7 @@ msgstr "信息:"
msgid "list all known coded character sets"
msgstr "列举所有已知的字符集"
-#: iconv/iconv_prog.c:64 locale/programs/localedef.c:129
+#: iconv/iconv_prog.c:64 locale/programs/localedef.c:123
msgid "Output control:"
msgstr "输出控制:"
@@ -1411,8 +1404,8 @@ msgid "omit invalid characters from output"
msgstr "从输出中忽略无效的字符"
#: iconv/iconv_prog.c:66 iconv/iconvconfig.c:128
-#: locale/programs/localedef.c:122 locale/programs/localedef.c:124
-#: locale/programs/localedef.c:126 locale/programs/localedef.c:147
+#: locale/programs/localedef.c:116 locale/programs/localedef.c:118
+#: locale/programs/localedef.c:120 locale/programs/localedef.c:140
#: malloc/memusagestat.c:56
msgid "FILE"
msgstr "文件"
@@ -1510,7 +1503,7 @@ msgstr "创建快速装入 iconv 模块配置文件。"
msgid "[DIR...]"
msgstr "[目录...]"
-#: iconv/iconvconfig.c:126 locale/programs/localedef.c:133
+#: iconv/iconvconfig.c:126 locale/programs/localedef.c:126
msgid "PATH"
msgstr "路径"
@@ -1531,7 +1524,7 @@ msgstr "不搜索标准目录,只使用命令行指定的"
msgid "Directory arguments required when using --nostdlib"
msgstr "目录参数必要项时正在使用 --nostdlib"
-#: iconv/iconvconfig.c:341 locale/programs/localedef.c:294
+#: iconv/iconvconfig.c:341 locale/programs/localedef.c:287
#, c-format
msgid "no output file produced because warnings were issued"
msgstr "由于出现警告而未生成输出文件"
@@ -1546,84 +1539,84 @@ msgstr "插入搜索树时"
msgid "cannot generate output file"
msgstr "无法生成输出文件"
-#: inet/rcmd.c:163
+#: inet/rcmd.c:155
msgid "rcmd: Cannot allocate memory\n"
msgstr "rcmd:无法分配内存\n"
-#: inet/rcmd.c:178
+#: inet/rcmd.c:170
msgid "rcmd: socket: All ports in use\n"
msgstr "rcmd:socket:所有端口都已在使用了\n"
-#: inet/rcmd.c:206
+#: inet/rcmd.c:198
#, c-format
msgid "connect to address %s: "
msgstr "连接到地址 %s:"
-#: inet/rcmd.c:219
+#: inet/rcmd.c:211
#, c-format
msgid "Trying %s...\n"
msgstr "正在尝试 %s...\n"
-#: inet/rcmd.c:255
+#: inet/rcmd.c:247
#, c-format
msgid "rcmd: write (setting up stderr): %m\n"
msgstr "rcmd: write (正在设置标准错误输出): %m\n"
-#: inet/rcmd.c:271
+#: inet/rcmd.c:263
#, c-format
msgid "rcmd: poll (setting up stderr): %m\n"
msgstr "rcmd: poll (正在设置标准错误输出): %m\n"
-#: inet/rcmd.c:274
+#: inet/rcmd.c:266
msgid "poll: protocol failure in circuit setup\n"
msgstr "poll: 通信协定在设置线路时失效\n"
-#: inet/rcmd.c:306
+#: inet/rcmd.c:298
msgid "socket: protocol failure in circuit setup\n"
msgstr "socket: 通信协定在设置线路时失效\n"
-#: inet/rcmd.c:330
+#: inet/rcmd.c:322
#, c-format
msgid "rcmd: %s: short read"
msgstr "rcmd: %s: 读入数据过短"
-#: inet/rcmd.c:490
+#: inet/rcmd.c:473
msgid "lstat failed"
msgstr "lstat 操作失败"
-#: inet/rcmd.c:497
+#: inet/rcmd.c:480
msgid "cannot open"
msgstr "无法打开"
-#: inet/rcmd.c:499
+#: inet/rcmd.c:482
msgid "fstat failed"
msgstr "fstat 失败"
-#: inet/rcmd.c:501
+#: inet/rcmd.c:484
msgid "bad owner"
msgstr "错误的拥有者"
-#: inet/rcmd.c:503
+#: inet/rcmd.c:486
msgid "writeable by other than owner"
msgstr "可由除所有者之外的人写入"
-#: inet/rcmd.c:505
+#: inet/rcmd.c:488
msgid "hard linked somewhere"
-msgstr "某处的硬连接"
+msgstr "某处的硬链接"
-#: inet/ruserpass.c:170 inet/ruserpass.c:193
+#: inet/ruserpass.c:165 inet/ruserpass.c:188
msgid "out of memory"
msgstr "内存不足"
-#: inet/ruserpass.c:184
+#: inet/ruserpass.c:179
msgid "Error: .netrc file is readable by others."
msgstr "错误:.netrc 对其它人是可读的。"
-#: inet/ruserpass.c:185
+#: inet/ruserpass.c:180
msgid "Remove password or make file unreadable by others."
msgstr "删除不能由其它人读入的口令或 make 文件"
-#: inet/ruserpass.c:277
+#: inet/ruserpass.c:199
#, c-format
msgid "Unknown .netrc keyword %s"
msgstr "未知的 .netrc 关键字 %s"
@@ -1727,13 +1720,13 @@ 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:2635 locale/programs/ld-collate.c:3793
+#: 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:368
+#: 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:943
+#: locale/programs/ld-telephone.c:278 locale/programs/ld-time.c:947
#: locale/programs/repertoire.c:313
#, c-format
msgid "%1$s: definition does not end with `END %1$s'"
@@ -1754,13 +1747,13 @@ msgid "%s: error in state machine"
msgstr "%s:状态机出错"
#: locale/programs/charmap.c:850 locale/programs/ld-address.c:544
-#: locale/programs/ld-collate.c:2632 locale/programs/ld-collate.c:3986
+#: 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:384
+#: 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:959
+#: locale/programs/ld-telephone.c:294 locale/programs/ld-time.c:963
#: locale/programs/locfile.c:1000 locale/programs/repertoire.c:324
#, c-format
msgid "%s: premature end of file"
@@ -1776,7 +1769,7 @@ msgstr "未知的字符“%s”"
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:2912
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:2903
#: locale/programs/repertoire.c:419
msgid "invalid names for character range"
msgstr "无效的字符范围名称"
@@ -1798,7 +1791,7 @@ msgstr "范围的上限小于下限"
msgid "resulting bytes for range not representable."
msgstr "用来定义范围的字节无法被表述出来"
-#: locale/programs/ld-address.c:135 locale/programs/ld-collate.c:1566
+#: 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
@@ -1864,309 +1857,309 @@ 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:280
+#: 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:848
-#: locale/programs/ld-time.c:890
+#: locale/programs/ld-telephone.c:253 locale/programs/ld-time.c:852
+#: locale/programs/ld-time.c:894
#, 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:284 locale/programs/ld-messages.c:277
+#: 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:742
-#: locale/programs/ld-time.c:811 locale/programs/ld-time.c:853
+#: locale/programs/ld-telephone.c:257 locale/programs/ld-time.c:746
+#: locale/programs/ld-time.c:815 locale/programs/ld-time.c:857
#, c-format
msgid "%s: unknown character in field `%s'"
msgstr "%s:域“%s”中含有未知字符"
-#: locale/programs/ld-address.c:525 locale/programs/ld-collate.c:3791
-#: locale/programs/ld-ctype.c:2837 locale/programs/ld-identification.c:365
+#: 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:941
+#: locale/programs/ld-telephone.c:276 locale/programs/ld-time.c:945
#, c-format
msgid "%s: incomplete `END' line"
msgstr "%s:不完整的“END”行"
-#: locale/programs/ld-address.c:535 locale/programs/ld-collate.c:552
-#: locale/programs/ld-collate.c:604 locale/programs/ld-collate.c:900
-#: locale/programs/ld-collate.c:913 locale/programs/ld-collate.c:2601
-#: locale/programs/ld-collate.c:2622 locale/programs/ld-collate.c:3976
+#: 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:375
+#: 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:950
+#: locale/programs/ld-telephone.c:285 locale/programs/ld-time.c:954
#, c-format
msgid "%s: syntax error"
msgstr "%s:语法错误"
-#: locale/programs/ld-collate.c:427
+#: locale/programs/ld-collate.c:426
#, c-format
msgid "`%.*s' already defined in charmap"
msgstr "已经在字符映射表中定义了“%.*s”"
-#: locale/programs/ld-collate.c:436
+#: locale/programs/ld-collate.c:435
#, c-format
msgid "`%.*s' already defined in repertoire"
msgstr "已经在指令表中定义了“%.*s”"
-#: locale/programs/ld-collate.c:443
+#: locale/programs/ld-collate.c:442
#, c-format
msgid "`%.*s' already defined as collating symbol"
msgstr "`%.*s' 已被定义为对照符号"
-#: locale/programs/ld-collate.c:450
+#: locale/programs/ld-collate.c:449
#, c-format
msgid "`%.*s' already defined as collating element"
msgstr "`%.*s' 已被定义为对照元素"
-#: locale/programs/ld-collate.c:481 locale/programs/ld-collate.c:507
+#: locale/programs/ld-collate.c:480 locale/programs/ld-collate.c:506
#, c-format
msgid "%s: `forward' and `backward' are mutually excluding each other"
msgstr "%s:“forward”和“backward”是互斥的"
-#: locale/programs/ld-collate.c:491 locale/programs/ld-collate.c:517
-#: locale/programs/ld-collate.c:533
+#: locale/programs/ld-collate.c:490 locale/programs/ld-collate.c:516
+#: locale/programs/ld-collate.c:532
#, c-format
msgid "%s: `%s' mentioned more than once in definition of weight %d"
msgstr "%s: `%s' 不只一次地在权重 %d 中被提到"
-#: locale/programs/ld-collate.c:589
+#: locale/programs/ld-collate.c:588
#, c-format
msgid "%s: too many rules; first entry only had %d"
msgstr "%s:规则过多;第一个条目只含有 %d"
-#: locale/programs/ld-collate.c:625
+#: locale/programs/ld-collate.c:624
#, c-format
msgid "%s: not enough sorting rules"
msgstr "%s:排序规则不足"
-#: locale/programs/ld-collate.c:790
+#: locale/programs/ld-collate.c:789
#, c-format
msgid "%s: empty weight string not allowed"
msgstr "%s:不允许空权字符串"
-#: locale/programs/ld-collate.c:885
+#: locale/programs/ld-collate.c:884
#, c-format
msgid "%s: weights must use the same ellipsis symbol as the name"
msgstr "%s: 权重必须使用与名称相同的省略符号"
-#: locale/programs/ld-collate.c:941
+#: locale/programs/ld-collate.c:940
#, c-format
msgid "%s: too many values"
msgstr "%s:值过多"
-#: locale/programs/ld-collate.c:1061 locale/programs/ld-collate.c:1236
+#: locale/programs/ld-collate.c:1060 locale/programs/ld-collate.c:1235
#, c-format
msgid "order for `%.*s' already defined at %s:%Zu"
msgstr "`%.*s' 的顺序已经在 %s:%Zu 里面定义了"
-#: locale/programs/ld-collate.c:1111
+#: locale/programs/ld-collate.c:1110
#, c-format
msgid "%s: the start and the end symbol of a range must stand for characters"
msgstr "%s: 启始与结束符号范围必须代表字符"
-#: locale/programs/ld-collate.c:1138
+#: locale/programs/ld-collate.c:1137
#, c-format
msgid "%s: byte sequences of first and last character must have the same length"
msgstr "%s:字节序列的第一个和最后一个字符的长度必须相同"
-#: locale/programs/ld-collate.c:1180
+#: locale/programs/ld-collate.c:1179
#, 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:1305
+#: locale/programs/ld-collate.c:1304
#, c-format
msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
msgstr "%s: 符号范围的省略不可以直接在 `order_start' 之后"
-#: locale/programs/ld-collate.c:1309
+#: locale/programs/ld-collate.c:1308
#, c-format
msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
msgstr "%s: 符号范围的省略不可以直接在 `order_end' 之前"
-#: locale/programs/ld-collate.c:1329 locale/programs/ld-ctype.c:1374
+#: locale/programs/ld-collate.c:1328 locale/programs/ld-ctype.c:1374
#, c-format
msgid "`%s' and `%.*s' are not valid names for symbolic range"
msgstr "“%s”和“%.*s”是无效的符号范围名"
-#: locale/programs/ld-collate.c:1379 locale/programs/ld-collate.c:3727
+#: locale/programs/ld-collate.c:1378 locale/programs/ld-collate.c:3718
#, c-format
msgid "%s: order for `%.*s' already defined at %s:%Zu"
msgstr "%s: `%.*s' 的顺序已在 %s:%Zu 中定义"
-#: locale/programs/ld-collate.c:1388
+#: locale/programs/ld-collate.c:1387
#, c-format
msgid "%s: `%s' must be a character"
msgstr "%s:“%s”必须是一个字符"
-#: locale/programs/ld-collate.c:1583
+#: locale/programs/ld-collate.c:1582
#, 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:1608
+#: locale/programs/ld-collate.c:1607
#, c-format
msgid "symbol `%s' not defined"
msgstr "符号“%s”未定义"
-#: locale/programs/ld-collate.c:1684 locale/programs/ld-collate.c:1790
+#: locale/programs/ld-collate.c:1683 locale/programs/ld-collate.c:1789
#, c-format
msgid "symbol `%s' has the same encoding as"
msgstr "跟符号 `%s' 有相同的编码: "
-#: locale/programs/ld-collate.c:1688 locale/programs/ld-collate.c:1794
+#: locale/programs/ld-collate.c:1687 locale/programs/ld-collate.c:1793
#, c-format
msgid "symbol `%s'"
msgstr "符号“%s”"
-#: locale/programs/ld-collate.c:1834
+#: locale/programs/ld-collate.c:1833
#, c-format
msgid "no definition of `UNDEFINED'"
msgstr "没有关于“UNDEFINIED”的定义"
-#: locale/programs/ld-collate.c:1863
+#: locale/programs/ld-collate.c:1862
#, c-format
msgid "too many errors; giving up"
msgstr "错误过多;放弃"
-#: locale/programs/ld-collate.c:2527 locale/programs/ld-collate.c:3915
+#: locale/programs/ld-collate.c:2518 locale/programs/ld-collate.c:3906
#, c-format
msgid "%s: nested conditionals not supported"
msgstr "%s: 不支持嵌套条件"
-#: locale/programs/ld-collate.c:2545
+#: locale/programs/ld-collate.c:2536
#, c-format
msgid "%s: more than one 'else'"
msgstr "%s: 使用多于一个 “else”"
-#: locale/programs/ld-collate.c:2720
+#: locale/programs/ld-collate.c:2711
#, c-format
msgid "%s: duplicate definition of `%s'"
msgstr "%s:重复定义“%s”"
-#: locale/programs/ld-collate.c:2756
+#: locale/programs/ld-collate.c:2747
#, c-format
msgid "%s: duplicate declaration of section `%s'"
msgstr "%s:重复声明节“%s”"
-#: locale/programs/ld-collate.c:2892
+#: locale/programs/ld-collate.c:2883
#, c-format
msgid "%s: unknown character in collating symbol name"
msgstr "%s: 未知的字符在对照符号名称中"
-#: locale/programs/ld-collate.c:3021
+#: locale/programs/ld-collate.c:3012
#, c-format
msgid "%s: unknown character in equivalent definition name"
msgstr "%s:等价定义名中未知的字符"
-#: locale/programs/ld-collate.c:3032
+#: locale/programs/ld-collate.c:3023
#, c-format
msgid "%s: unknown character in equivalent definition value"
msgstr "%s:等价定义值中未知的字符"
-#: locale/programs/ld-collate.c:3042
+#: locale/programs/ld-collate.c:3033
#, c-format
msgid "%s: unknown symbol `%s' in equivalent definition"
msgstr "%s:等价定义中未知的符号“%s”"
-#: locale/programs/ld-collate.c:3051
+#: locale/programs/ld-collate.c:3042
msgid "error while adding equivalent collating symbol"
msgstr "正在加入同义对照符号时发生错误"
-#: locale/programs/ld-collate.c:3089
+#: locale/programs/ld-collate.c:3080
#, c-format
msgid "duplicate definition of script `%s'"
msgstr "重复定义脚本“%s”"
-#: locale/programs/ld-collate.c:3137
+#: locale/programs/ld-collate.c:3128
#, c-format
msgid "%s: unknown section name `%.*s'"
msgstr "%s:未知的节名“%.*s”"
-#: locale/programs/ld-collate.c:3166
+#: locale/programs/ld-collate.c:3157
#, c-format
msgid "%s: multiple order definitions for section `%s'"
msgstr "%s:关于“%s”节出现多个顺序定义"
-#: locale/programs/ld-collate.c:3194
+#: locale/programs/ld-collate.c:3185
#, c-format
msgid "%s: invalid number of sorting rules"
msgstr "%s:排序规则的数量无效"
-#: locale/programs/ld-collate.c:3221
+#: locale/programs/ld-collate.c:3212
#, c-format
msgid "%s: multiple order definitions for unnamed section"
msgstr "%s:关于未命名节出现多个顺序定义"
-#: locale/programs/ld-collate.c:3276 locale/programs/ld-collate.c:3406
-#: locale/programs/ld-collate.c:3769
+#: locale/programs/ld-collate.c:3267 locale/programs/ld-collate.c:3397
+#: locale/programs/ld-collate.c:3760
#, c-format
msgid "%s: missing `order_end' keyword"
msgstr "%s:遗漏关键字“order_end”"
-#: locale/programs/ld-collate.c:3339
+#: locale/programs/ld-collate.c:3330
#, c-format
msgid "%s: order for collating symbol %.*s not yet defined"
msgstr "%s: 对照符号 %.*s 的顺序尚未定义"
-#: locale/programs/ld-collate.c:3357
+#: locale/programs/ld-collate.c:3348
#, c-format
msgid "%s: order for collating element %.*s not yet defined"
msgstr "%s: 对照元素 %.*s 的顺序尚未定义"
-#: locale/programs/ld-collate.c:3368
+#: locale/programs/ld-collate.c:3359
#, c-format
msgid "%s: cannot reorder after %.*s: symbol not known"
msgstr "%s: 无法重新排列在 %.*s 之后: 未知的符号"
-#: locale/programs/ld-collate.c:3420 locale/programs/ld-collate.c:3781
+#: locale/programs/ld-collate.c:3411 locale/programs/ld-collate.c:3772
#, c-format
msgid "%s: missing `reorder-end' keyword"
msgstr "%s:以后关键字“reorder-end”"
-#: locale/programs/ld-collate.c:3454 locale/programs/ld-collate.c:3652
+#: locale/programs/ld-collate.c:3445 locale/programs/ld-collate.c:3643
#, c-format
msgid "%s: section `%.*s' not known"
msgstr "%s:未知的节“%.*s”"
-#: locale/programs/ld-collate.c:3519
+#: locale/programs/ld-collate.c:3510
#, c-format
msgid "%s: bad symbol <%.*s>"
msgstr "%s: 不当的符号 <%.*s>"
-#: locale/programs/ld-collate.c:3715
+#: locale/programs/ld-collate.c:3706
#, c-format
msgid "%s: cannot have `%s' as end of ellipsis range"
msgstr "%s: 无法用 `%s' 作为省略节的结尾"
-#: locale/programs/ld-collate.c:3765
+#: locale/programs/ld-collate.c:3756
#, c-format
msgid "%s: empty category description not allowed"
msgstr "%s:不允许空范畴描述"
-#: locale/programs/ld-collate.c:3784
+#: locale/programs/ld-collate.c:3775
#, c-format
msgid "%s: missing `reorder-sections-end' keyword"
msgstr "%s:遗漏关键字“reorder-sections-end”"
-#: locale/programs/ld-collate.c:3948
+#: locale/programs/ld-collate.c:3939
#, c-format
msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
msgstr "%s: “%s” 而不需吻合中 “ifdef” 或 “ifndef” "
-#: locale/programs/ld-collate.c:3966
+#: locale/programs/ld-collate.c:3957
#, c-format
msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
msgstr "%s: “endif” 而不需吻合中 “ifdef” 或 “ifndef” "
@@ -2224,7 +2217,7 @@ msgstr "`digit' 类别在群组 \"十\" 中没有项目"
#: locale/programs/ld-ctype.c:795
#, c-format
msgid "no input digits defined and none of the standard names in the charmap"
-msgstr "没有定义输入数字,在字集对照档中也找不到相符的标准名称"
+msgstr "没有定义输入数字,在字集对照表中也找不到相符的标准名称"
#: locale/programs/ld-ctype.c:860
#, c-format
@@ -2234,7 +2227,7 @@ msgstr "在字集对照表中无法找到某些在 `outdigit' 中用到的字符
#: locale/programs/ld-ctype.c:877
#, c-format
msgid "not all characters used in `outdigit' are available in the repertoire"
-msgstr "在编码映射档中无法找到某些在 `outdigit' 中用到的字符"
+msgstr "在编码映射表中无法找到某些在 `outdigit' 中用到的字符"
#: locale/programs/ld-ctype.c:1142
#, c-format
@@ -2249,7 +2242,7 @@ msgstr "程序实现的限制: 不能使用超过 %Zd 个字集类别"
#: locale/programs/ld-ctype.c:1174
#, c-format
msgid "character map `%s' already defined"
-msgstr "字集对照档 `%s' 已经定义过了"
+msgstr "字集对照表 `%s' 已经定义过了"
#: locale/programs/ld-ctype.c:1180
#, c-format
@@ -2362,7 +2355,7 @@ msgstr "%s:需要作为默认值的字符“%s”无法以单个字节来表
#: locale/programs/ld-ctype.c:3346
#, c-format
msgid "no output digits defined and none of the standard names in the charmap"
-msgstr "没有定义输出数字,在字集对照档中也找不到相符的标准名称"
+msgstr "没有定义输出数字,在字集对照表中也找不到相符的标准名称"
#: locale/programs/ld-ctype.c:3595
#, c-format
@@ -2384,12 +2377,19 @@ msgstr "%s: 映射表 \"%s\" 表格: %lu 字节\n"
msgid "%s: table for width: %lu bytes\n"
msgstr "%s: 宽度表格: %lu 字节\n"
-#: locale/programs/ld-identification.c:170
+# LC_IDENTIFICATION 放的是“坏了找谁”之类的事情,参照 locale(5)
+#: locale/programs/ld-identification.c:175
#, c-format
msgid "%s: no identification for category `%s'"
-msgstr "%s: 类别 `%s' 没有认证"
+msgstr "%s: 类别 `%s' 没有身份信息"
+
+# 写成“不认识”、“没听说过”感觉要通顺很多(
+#: locale/programs/ld-identification.c:199
+#, c-format
+msgid "%s: unknown standard `%s' for category `%s'"
+msgstr "%1$s:类别“%3$s”的标准“%2$s”未知"
-#: locale/programs/ld-identification.c:351
+#: locale/programs/ld-identification.c:382
#, c-format
msgid "%s: duplicate category version definition"
msgstr "%s: 重复的类别版本定义"
@@ -2510,27 +2510,27 @@ msgstr "%s: 缺少 era 名称,在 `era' 字段、字串 %Zd 中"
msgid "%s: missing era format in string %Zd in `era' field"
msgstr "%s: 缺少 era 格式,在 `era' 字段、字串 %Zd 中"
-#: locale/programs/ld-time.c:497
+#: locale/programs/ld-time.c:501
#, 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:505 locale/programs/ld-time.c:513
-#: locale/programs/ld-time.c:521
+#: locale/programs/ld-time.c:509 locale/programs/ld-time.c:517
+#: locale/programs/ld-time.c:525
#, c-format
msgid "%s: values for field `%s' must not be larger than %d"
msgstr "%s:域“%s”的值不能大于 %d"
-#: locale/programs/ld-time.c:726
+#: locale/programs/ld-time.c:730
#, c-format
msgid "%s: too few values for field `%s'"
msgstr "%s:域“%s”的值过少"
-#: locale/programs/ld-time.c:771
+#: locale/programs/ld-time.c:775
msgid "extra trailing semicolon"
msgstr "多余的终止分号"
-#: locale/programs/ld-time.c:774
+#: locale/programs/ld-time.c:778
#, c-format
msgid "%s: too many values for field `%s'"
msgstr "%s:域“%s”的值过多"
@@ -2571,7 +2571,7 @@ msgstr "符号 `%.*s' 并不在字集对照表中"
#: locale/programs/linereader.c:837
#, c-format
msgid "symbol `%.*s' not in repertoire map"
-msgstr "符号 `%.*s' 并不在编码映射档中"
+msgstr "符号 `%.*s' 并不在编码映射表中"
#: locale/programs/locale-spec.c:130
#, c-format
@@ -2638,92 +2638,88 @@ msgstr "无法将 LC_COLLATE 设置为缺省的语区"
msgid "Cannot set LC_ALL to default locale"
msgstr "无法将 LC_ALL 设置为缺省的语区"
-#: locale/programs/locale.c:519
+#: locale/programs/locale.c:525
#, c-format
msgid "while preparing output"
msgstr "准备输出时"
-#: locale/programs/localedef.c:121
+#: locale/programs/localedef.c:115
msgid "Input Files:"
msgstr "输入文件:"
-#: locale/programs/localedef.c:123
+#: locale/programs/localedef.c:117
msgid "Symbolic character names defined in FILE"
msgstr "符号字符的名称定义在文件 FILE 中"
-#: locale/programs/localedef.c:125
+#: locale/programs/localedef.c:119
msgid "Source definitions are found in FILE"
msgstr "在 FILE 中找到源定义"
-#: locale/programs/localedef.c:127
+#: locale/programs/localedef.c:121
msgid "FILE contains mapping from symbolic names to UCS4 values"
msgstr "文件 FILE 内含符号名与 UCS4 编码之间的映射"
-#: locale/programs/localedef.c:131
+#: locale/programs/localedef.c:125
msgid "Create output even if warning messages were issued"
msgstr "即使出现警告消息也创建输出"
-#: locale/programs/localedef.c:132
-msgid "Create old-style tables"
-msgstr "创建旧风格表格"
-
-#: locale/programs/localedef.c:133
+#: locale/programs/localedef.c:126
msgid "Optional output file prefix"
msgstr "可选的输出文件前缀"
-#: locale/programs/localedef.c:134
+#: locale/programs/localedef.c:127
msgid "Strictly conform to POSIX"
msgstr "严格遵从 POSIX"
-#: locale/programs/localedef.c:136
+#: locale/programs/localedef.c:129
msgid "Suppress warnings and information messages"
msgstr "关闭警告和信息消息"
-#: locale/programs/localedef.c:137
+#: locale/programs/localedef.c:130
msgid "Print more messages"
msgstr "打印更多消息"
-#: locale/programs/localedef.c:138
+#: locale/programs/localedef.c:131
msgid "Archive control:"
msgstr "归档控制:"
-#: locale/programs/localedef.c:140
+#: locale/programs/localedef.c:133
msgid "Don't add new data to archive"
msgstr "不要将新数据添加到归档文件中"
-#: locale/programs/localedef.c:142
+#: locale/programs/localedef.c:135
msgid "Add locales named by parameters to archive"
msgstr "将由参数命名的区域添加到归档文件中"
-#: locale/programs/localedef.c:143
+#: locale/programs/localedef.c:136
msgid "Replace existing archive content"
msgstr "替换现有的归档文件内容"
-#: locale/programs/localedef.c:145
+#: locale/programs/localedef.c:138
msgid "Remove locales named by parameters from archive"
msgstr "从归档文件中删除由参数命名的区域"
-#: locale/programs/localedef.c:146
+#: locale/programs/localedef.c:139
msgid "List content of archive"
msgstr "列出归档文件的内容"
-#: locale/programs/localedef.c:148
+#: locale/programs/localedef.c:141
msgid "locale.alias file to consult when making archive"
msgstr "在制作归档文件时参考 locale.alias 文件"
-#: locale/programs/localedef.c:150
+#: locale/programs/localedef.c:143
msgid "Generate little-endian output"
msgstr "生成小端序输出"
-#: locale/programs/localedef.c:152
+#: locale/programs/localedef.c:145
msgid "Generate big-endian output"
msgstr "生成大端序输出"
-#: locale/programs/localedef.c:157
+#: locale/programs/localedef.c:150
msgid "Compile locale specification"
msgstr "编译区域规范"
-#: locale/programs/localedef.c:160
+#: locale/programs/localedef.c:153
msgid ""
"NAME\n"
"[--add-to-archive|--delete-from-archive] FILE...\n"
@@ -2733,28 +2729,28 @@ msgstr ""
"[--add-to-archive|--delete-from-archive] 文件...\n"
"--list-archive [文件]"
-#: locale/programs/localedef.c:235
+#: locale/programs/localedef.c:228
#, c-format
msgid "cannot create directory for output files"
msgstr "无法为输出文件创建目录"
-#: locale/programs/localedef.c:246
+#: locale/programs/localedef.c:239
#, c-format
msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
msgstr "致命错误:系统未定义“_POSIX2_LOCALEDEF”"
-#: locale/programs/localedef.c:260 locale/programs/localedef.c:276
-#: locale/programs/localedef.c:614 locale/programs/localedef.c:634
+#: locale/programs/localedef.c:253 locale/programs/localedef.c:269
+#: locale/programs/localedef.c:602 locale/programs/localedef.c:622
#, c-format
msgid "cannot open locale definition file `%s'"
msgstr "无法打开区域定义文件“%s”"
-#: locale/programs/localedef.c:288
+#: locale/programs/localedef.c:281
#, c-format
msgid "cannot write output files to `%s'"
msgstr "无法将输出文件写入“%s”"
-#: locale/programs/localedef.c:380
+#: locale/programs/localedef.c:370
#, c-format
msgid ""
"System's directory for character maps : %s\n"
@@ -2767,12 +2763,12 @@ msgstr ""
"\t\t 语区路径 :%s\n"
"%s"
-#: locale/programs/localedef.c:582
+#: locale/programs/localedef.c:570
#, c-format
msgid "circular dependencies between locale definitions"
msgstr "区域定义中的循环倚赖"
-#: locale/programs/localedef.c:588
+#: locale/programs/localedef.c:576
#, c-format
msgid "cannot add already read locale `%s' a second time"
msgstr "无法再次添加已经读入的“%s”"
@@ -2870,42 +2866,42 @@ msgstr "区域“%s”已存在"
msgid "cannot add to locale archive"
msgstr "无法添加到区域归档文件"
-#: locale/programs/locarchive.c:1206
+#: locale/programs/locarchive.c:1203
#, c-format
msgid "locale alias file `%s' not found"
msgstr "找不到区域别名文件“%s”"
-#: locale/programs/locarchive.c:1357
+#: locale/programs/locarchive.c:1351
#, c-format
msgid "Adding %s\n"
msgstr "正在添加 %s\n"
-#: locale/programs/locarchive.c:1363
+#: locale/programs/locarchive.c:1357
#, c-format
msgid "stat of \"%s\" failed: %s: ignored"
msgstr "无法对“%s”运行 stat:%s:忽略"
-#: locale/programs/locarchive.c:1369
+#: locale/programs/locarchive.c:1363
#, c-format
msgid "\"%s\" is no directory; ignored"
msgstr "“%s”不是目录;忽略"
-#: locale/programs/locarchive.c:1376
+#: locale/programs/locarchive.c:1370
#, c-format
msgid "cannot open directory \"%s\": %s: ignored"
msgstr "无法打开目录“%s”:%s:忽略"
-#: locale/programs/locarchive.c:1448
+#: locale/programs/locarchive.c:1442
#, c-format
msgid "incomplete set of locale files in \"%s\""
msgstr "“%s”中的区域文件不完整"
-#: locale/programs/locarchive.c:1512
+#: locale/programs/locarchive.c:1506
#, c-format
msgid "cannot read all files in \"%s\": ignored"
msgstr "无法读入“%s”中的所有文件:忽略"
-#: locale/programs/locarchive.c:1584
+#: locale/programs/locarchive.c:1576
#, c-format
msgid "locale \"%s\" not in archive"
msgstr "区域“%s”在归档文件中"
@@ -2955,7 +2951,7 @@ msgstr "对“%1$s”的定义并不以“END %1%s”结束"
#: locale/programs/repertoire.c:295
#, c-format
msgid "syntax error in repertoire map definition: %s"
-msgstr "编码映射档中的定义有语法错误: %s"
+msgstr "编码映射表中的定义有语法错误: %s"
#: locale/programs/repertoire.c:271
msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
@@ -2969,14 +2965,14 @@ msgstr "无法保存新的指令表"
#: locale/programs/repertoire.c:342
#, c-format
msgid "repertoire map file `%s' not found"
-msgstr "找不到编码映射档 `%s'"
+msgstr "找不到编码映射表 `%s'"
-#: login/programs/pt_chown.c:78
+#: login/programs/pt_chown.c:79
#, c-format
msgid "Set the owner, group and access permission of the slave pseudo terminal corresponding to the master pseudo terminal passed on file descriptor `%d'. This is the helper program for the `grantpt' function. It is not intended to be run directly from the command line.\n"
msgstr "设置与以文件描述符 %d 指定的主伪终端对应的从属伪终端的所有者、组和权限 。 此辅助程序用于 “grantpt” 函数,并未用于直接从命令行运行。\n"
-#: login/programs/pt_chown.c:92
+#: login/programs/pt_chown.c:93
#, c-format
msgid ""
"The owner is set to the current user, the group is set to `%s', and the access permission is set to `%o'.\n"
@@ -2987,33 +2983,33 @@ msgstr ""
"\n"
"%s"
-#: login/programs/pt_chown.c:198
+#: login/programs/pt_chown.c:204
#, c-format
msgid "too many arguments"
msgstr "选项过多"
-#: login/programs/pt_chown.c:206
+#: login/programs/pt_chown.c:212
#, c-format
msgid "needs to be installed setuid `root'"
msgstr "需要是已安装的 setuid “root”"
-#: malloc/mcheck.c:346
+#: malloc/mcheck.c:344
msgid "memory is consistent, library is buggy\n"
msgstr "内存不一致,库有错误\n"
-#: malloc/mcheck.c:349
+#: malloc/mcheck.c:347
msgid "memory clobbered before allocated block\n"
msgstr "内存在分配之前就被覆写了\n"
-#: malloc/mcheck.c:352
+#: malloc/mcheck.c:350
msgid "memory clobbered past end of allocated block\n"
msgstr "内存覆写超过了经过的已分配的区块尾部\n"
-#: malloc/mcheck.c:355
+#: malloc/mcheck.c:353
msgid "block freed twice\n"
msgstr "块释放了两次\n"
-#: malloc/mcheck.c:358
+#: malloc/mcheck.c:356
msgid "bogus mcheck_status, library is buggy\n"
msgstr "内存检查状态 (mcheck_ststus) 有误,您所用的函数库有问题\n"
@@ -3146,7 +3142,7 @@ msgstr "未知的系统错误"
msgid "unable to free arguments"
msgstr "无法释放参数"
-#: nis/nis_error.h:1 nis/ypclnt.c:831 nis/ypclnt.c:919 posix/regcomp.c:137
+#: nis/nis_error.h:1 nis/ypclnt.c:817 nis/ypclnt.c:905 posix/regcomp.c:137
#: sysdeps/gnu/errlist.c:21
msgid "Success"
msgstr "成功"
@@ -3188,7 +3184,7 @@ 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:876 sysdeps/gnu/errlist.c:158
+#: nis/nis_error.h:11 nis/ypclnt.c:862 sysdeps/gnu/errlist.c:158
msgid "Permission denied"
msgstr "权限不够"
@@ -3250,7 +3246,7 @@ msgstr "条目/表格类型不匹配"
#: nis/nis_error.h:26
msgid "Link points to illegal name"
-msgstr "连接指向非法名称"
+msgstr "链接指向非法名称"
#: nis/nis_error.h:27
msgid "Partial success"
@@ -3375,7 +3371,7 @@ msgstr "条目\n"
#: nis/nis_print.c:127
msgid "LINK\n"
-msgstr "连接\n"
+msgstr "链接\n"
#: nis/nis_print.c:130
msgid "PRIVATE\n"
@@ -3410,7 +3406,7 @@ msgstr "\t名称 :%s\n"
#: nis/nis_print.c:177
msgid "\tPublic Key : "
-msgstr "\t公钥 :"
+msgstr "\t公钥 :"
#: nis/nis_print.c:181
msgid "None.\n"
@@ -3419,47 +3415,47 @@ msgstr "无。\n"
#: nis/nis_print.c:184
#, c-format
msgid "Diffie-Hellmann (%d bits)\n"
-msgstr "Diffie-Hellmann (%d 位)\n"
+msgstr "Diffie-Hellmann(%d 位)\n"
#: nis/nis_print.c:189
#, c-format
msgid "RSA (%d bits)\n"
-msgstr "RSA (%d 位)\n"
+msgstr "RSA(%d 位)\n"
#: nis/nis_print.c:192
msgid "Kerberos.\n"
-msgstr "Kerberos.\n"
+msgstr "Kerberos。\n"
#: nis/nis_print.c:195
#, c-format
msgid "Unknown (type = %d, bits = %d)\n"
-msgstr "未知 (类型 = %d,位 = %d)\n"
+msgstr "未知(类型 = %d,位数 = %d)\n"
#: nis/nis_print.c:206
#, c-format
msgid "\tUniversal addresses (%u)\n"
-msgstr "\t绝对地址 (%u)\n"
+msgstr "\t绝对地址(%u)\n"
#: nis/nis_print.c:228
msgid "Time to live : "
-msgstr "存在的时间 :"
+msgstr "存留时间 : "
#: nis/nis_print.c:230
msgid "Default Access rights :\n"
-msgstr "默认访问权限 :\n"
+msgstr "默认访问权限:\n"
#: nis/nis_print.c:239
#, c-format
msgid "\tType : %s\n"
-msgstr "\t类型 :%s\n"
+msgstr "\t类型 :%s\n"
#: nis/nis_print.c:240
msgid "\tAccess rights: "
-msgstr "\t访问权限 :"
+msgstr "\t访问权限 :"
#: nis/nis_print.c:254
msgid "Group Flags :"
-msgstr "组标志 :"
+msgstr "组标志 :"
#: nis/nis_print.c:257
msgid ""
@@ -3472,31 +3468,31 @@ msgstr ""
#: nis/nis_print.c:269
#, c-format
msgid "Table Type : %s\n"
-msgstr "表格类型 :%s\n"
+msgstr "表格类型 :%s\n"
#: nis/nis_print.c:270
#, c-format
msgid "Number of Columns : %d\n"
-msgstr "列的数量 :%d\n"
+msgstr "列数 :%d\n"
#: nis/nis_print.c:271
#, c-format
msgid "Character Separator : %c\n"
-msgstr "字符分隔符:%c\n"
+msgstr "字符分隔符 :%c\n"
#: nis/nis_print.c:272
#, c-format
msgid "Search Path : %s\n"
-msgstr "搜索路径 :%s\n"
+msgstr "搜索路径 :%s\n"
#: nis/nis_print.c:273
msgid "Columns :\n"
-msgstr "列数 :\n"
+msgstr "列 :\n"
#: nis/nis_print.c:276
#, c-format
msgid "\t[%d]\tName : %s\n"
-msgstr "\t[%d]\t名称 :%s\n"
+msgstr "\t[%d]\t名称 :%s\n"
#: nis/nis_print.c:278
msgid "\t\tAttributes : "
@@ -3508,12 +3504,12 @@ msgstr "\t\t访问权限 :"
#: nis/nis_print.c:290
msgid "Linked Object Type : "
-msgstr "连接到对象类型 :"
+msgstr "链接到对象类型 :"
#: nis/nis_print.c:292
#, c-format
msgid "Linked to : %s\n"
-msgstr "连接到 :%s\n"
+msgstr "链接到 :%s\n"
#: nis/nis_print.c:302
#, c-format
@@ -3541,17 +3537,17 @@ msgstr "对象名称 :%s\n"
#: nis/nis_print.c:327
#, c-format
msgid "Directory : %s\n"
-msgstr "目录 :%s\n"
+msgstr "目录 :%s\n"
#: nis/nis_print.c:328
#, c-format
msgid "Owner : %s\n"
-msgstr "所有者 :%s\n"
+msgstr "所有者 :%s\n"
#: nis/nis_print.c:329
#, c-format
msgid "Group : %s\n"
-msgstr "组 :%s\n"
+msgstr "组 :%s\n"
#: nis/nis_print.c:330
msgid "Access Rights : "
@@ -3564,21 +3560,21 @@ msgid ""
"Time to Live : "
msgstr ""
"\n"
-"存在的时间 :"
+"存留时间 :"
#: nis/nis_print.c:335
#, c-format
msgid "Creation Time : %s"
-msgstr "创建时间:%s"
+msgstr "创建时间 :%s"
#: nis/nis_print.c:337
#, c-format
msgid "Mod. Time : %s"
-msgstr "修改时间 :%s"
+msgstr "修改时间 :%s"
#: nis/nis_print.c:338
msgid "Object Type : "
-msgstr "对象类型 :%s"
+msgstr "对象类型 :%s"
#: nis/nis_print.c:358
#, c-format
@@ -3691,100 +3687,100 @@ msgstr "netname2user: %s 的本地端项目在 %s 目录下并不是唯一的"
msgid "netname2user: should not have uid 0"
msgstr "netname2user:uid 不应为 0"
-#: nis/ypclnt.c:834
+#: nis/ypclnt.c:820
msgid "Request arguments bad"
msgstr "请求参数错误"
-#: nis/ypclnt.c:837
+#: nis/ypclnt.c:823
msgid "RPC failure on NIS operation"
msgstr "NIS 运作 RPC 失败"
-#: nis/ypclnt.c:840
+#: nis/ypclnt.c:826
msgid "Can't bind to server which serves this domain"
msgstr "无法于为此域服务的服务器绑定"
-#: nis/ypclnt.c:843
+#: nis/ypclnt.c:829
msgid "No such map in server's domain"
msgstr "在服务器的领域数据中找不到此一映射表"
-#: nis/ypclnt.c:846
+#: nis/ypclnt.c:832
msgid "No such key in map"
msgstr "在映射表中没有此一键值"
-#: nis/ypclnt.c:849
+#: nis/ypclnt.c:835
msgid "Internal NIS error"
msgstr "内部 NIS 错误"
-#: nis/ypclnt.c:852
+#: nis/ypclnt.c:838
msgid "Local resource allocation failure"
msgstr "本地资源分配失败"
-#: nis/ypclnt.c:855
+#: nis/ypclnt.c:841
msgid "No more records in map database"
msgstr "在映射表数据库中没有其他纪录了"
-#: nis/ypclnt.c:858
+#: nis/ypclnt.c:844
msgid "Can't communicate with portmapper"
msgstr "无法与 portmapper 通讯"
-#: nis/ypclnt.c:861
+#: nis/ypclnt.c:847
msgid "Can't communicate with ypbind"
msgstr "无法与 ypbind 通讯"
-#: nis/ypclnt.c:864
+#: nis/ypclnt.c:850
msgid "Can't communicate with ypserv"
msgstr "无法与 ypserv 通讯"
-#: nis/ypclnt.c:867
+#: nis/ypclnt.c:853
msgid "Local domain name not set"
msgstr "未设置本地域名"
-#: nis/ypclnt.c:870
+#: nis/ypclnt.c:856
msgid "NIS map database is bad"
msgstr "NIS 映射数据库错误"
-#: nis/ypclnt.c:873
+#: nis/ypclnt.c:859
msgid "NIS client/server version mismatch - can't supply service"
msgstr "NIS 客户端/服务器版本不匹配 - 无法支持服务"
-#: nis/ypclnt.c:879
+#: nis/ypclnt.c:865
msgid "Database is busy"
msgstr "数据库忙"
-#: nis/ypclnt.c:882
+#: nis/ypclnt.c:868
msgid "Unknown NIS error code"
msgstr "未知的 NIS 错误码"
-#: nis/ypclnt.c:922
+#: nis/ypclnt.c:908
msgid "Internal ypbind error"
msgstr "内部 ypbind 错误"
-#: nis/ypclnt.c:925
+#: nis/ypclnt.c:911
msgid "Domain not bound"
msgstr "未绑定域"
-#: nis/ypclnt.c:928
+#: nis/ypclnt.c:914
msgid "System resource allocation failure"
msgstr "系统资源分配失败"
-#: nis/ypclnt.c:931
+#: nis/ypclnt.c:917
msgid "Unknown ypbind error"
msgstr "未知的 ypbind 错误"
-#: nis/ypclnt.c:972
+#: nis/ypclnt.c:958
msgid "yp_update: cannot convert host to netname\n"
msgstr "yp_update:无法将主机名转换为网名\n"
-#: nis/ypclnt.c:990
+#: nis/ypclnt.c:976
msgid "yp_update: cannot get server address\n"
msgstr "yp_update:无法获取服务器地址\n"
-#: nscd/aicache.c:83 nscd/hstcache.c:485
+#: nscd/aicache.c:84 nscd/hstcache.c:485
#, c-format
msgid "Haven't found \"%s\" in hosts cache!"
msgstr "无法在主机缓冲区中找到“%s”!"
-#: nscd/aicache.c:85 nscd/hstcache.c:487
+#: nscd/aicache.c:86 nscd/hstcache.c:487
#, c-format
msgid "Reloading \"%s\" in hosts cache!"
msgstr "在主机缓冲区中重新加载“%s”!"
@@ -3818,299 +3814,289 @@ msgstr "pruning %s 缓存;时间 %ld"
msgid "considering %s entry \"%s\", timeout %<PRIu64>"
msgstr "认为中 %s 项目 “%s” ,逾时 %<PRIu64>"
-#: nscd/connections.c:553
+#: nscd/connections.c:548
#, c-format
msgid "invalid persistent database file \"%s\": %s"
msgstr "无效的永久性的数据库文件 “%s” :%s"
-#: nscd/connections.c:561
+#: nscd/connections.c:556
msgid "uninitialized header"
msgstr "未起始的标头"
-#: nscd/connections.c:566
+#: nscd/connections.c:561
msgid "header size does not match"
msgstr "标头大小不吻合"
-#: nscd/connections.c:576
+#: nscd/connections.c:571
msgid "file size does not match"
msgstr "文件大小不匹配"
-#: nscd/connections.c:593
+#: nscd/connections.c:588
msgid "verification failed"
msgstr "验证失败"
-#: nscd/connections.c:607
+#: nscd/connections.c:602
#, c-format
msgid "suggested size of table for database %s larger than the persistent database's table"
msgstr "用于数据库 %s 的建议表格大小大于永久性的数据库表格"
-#: nscd/connections.c:618 nscd/connections.c:702
+#: nscd/connections.c:613 nscd/connections.c:697
#, c-format
msgid "cannot create read-only descriptor for \"%s\"; no mmap"
msgstr "无法为“%s”创建只读描述符;没有 mmap"
-#: nscd/connections.c:634
+#: nscd/connections.c:629
#, c-format
msgid "cannot access '%s'"
msgstr "无法访问 ‘%s’"
-#: nscd/connections.c:682
+#: nscd/connections.c:677
#, c-format
msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
msgstr "数据库用于 %s 已损坏或被同步地使用;若必要,手动移除 %s 并重启"
-#: nscd/connections.c:688
+#: nscd/connections.c:683
#, c-format
msgid "cannot create %s; no persistent database used"
msgstr "无法创建 %s; 不使用持久数据库"
-#: nscd/connections.c:691
+#: nscd/connections.c:686
#, c-format
msgid "cannot create %s; no sharing possible"
msgstr "无法创建 %s; 无法共享"
-#: nscd/connections.c:762
+#: nscd/connections.c:757
#, c-format
msgid "cannot write to database file %s: %s"
msgstr "无法写入数据库文件 %s: %s"
-#: nscd/connections.c:801
+#: 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:850
+#: nscd/connections.c:831
#, c-format
msgid "cannot open socket: %s"
msgstr "无法打开套接字:%s"
-#: nscd/connections.c:870 nscd/connections.c:934
-#, c-format
-msgid "cannot change socket to nonblocking mode: %s"
-msgstr "无法转换套接字到非堵塞模式: %s"
-
-#: nscd/connections.c:878 nscd/connections.c:944
-#, c-format
-msgid "cannot set socket to close on exec: %s"
-msgstr "无法设定套接字为 exec 时关闭: %s"
-
-#: nscd/connections.c:891
+#: nscd/connections.c:850
#, c-format
msgid "cannot enable socket to accept connections: %s"
msgstr "无法启用套接字以接受连接:%s"
-#: nscd/connections.c:973
+#: nscd/connections.c:907
#, c-format
msgid "disabled inotify-based monitoring for file `%s': %s"
msgstr "为 `%s' 禁用基于 inotify 的监控: %s"
-#: nscd/connections.c:977
+#: nscd/connections.c:911
#, c-format
msgid "monitoring file `%s` (%d)"
msgstr "监控文件 `%s' (%d)"
-#: nscd/connections.c:990
+#: nscd/connections.c:924
#, c-format
msgid "disabled inotify-based monitoring for directory `%s': %s"
msgstr "为目录 `%s' 禁用基于 inotify 的监控: %s"
-#: nscd/connections.c:994
+#: nscd/connections.c:928
#, c-format
msgid "monitoring directory `%s` (%d)"
msgstr "监视目录 `%s` (%d)"
-#: nscd/connections.c:1022
+#: nscd/connections.c:956
#, c-format
msgid "monitoring file %s for database %s"
msgstr "监视文件 %s, 用于数据库 %s"
-#: nscd/connections.c:1032
+#: nscd/connections.c:966
#, c-format
msgid "stat failed for file `%s'; will try again later: %s"
msgstr "stat 文件 `%s' 失败;将稍后再试: %s"
-#: nscd/connections.c:1151
+#: nscd/connections.c:1085
#, c-format
msgid "provide access to FD %d, for %s"
msgstr "提供访问到 FD %d, 用于 %s"
-#: nscd/connections.c:1163
+#: nscd/connections.c:1097
#, c-format
msgid "cannot handle old request version %d; current version is %d"
msgstr "无法处理旧请求版本 %d;当前版本为 %d"
-#: nscd/connections.c:1185
+#: nscd/connections.c:1119
#, c-format
msgid "request from %ld not handled due to missing permission"
msgstr "由于缺少权限而无法处理来自 %ld 的要求"
-#: nscd/connections.c:1190
+#: nscd/connections.c:1124
#, c-format
msgid "request from '%s' [%ld] not handled due to missing permission"
msgstr "由于缺少权限而无法处理来自 '%s' [%ld] 的要求"
-#: nscd/connections.c:1195
+#: nscd/connections.c:1129
msgid "request not handled due to missing permission"
msgstr "要求无法控柄的由于缺少权限"
-#: nscd/connections.c:1233 nscd/connections.c:1286
+#: nscd/connections.c:1167 nscd/connections.c:1220
#, c-format
msgid "cannot write result: %s"
msgstr "无法写入结果:“%s”"
-#: nscd/connections.c:1377
+#: nscd/connections.c:1311
#, c-format
msgid "error getting caller's id: %s"
msgstr "取得调用程序识别码时发生错误: %s"
-#: nscd/connections.c:1437
+#: nscd/connections.c:1371
#, c-format
msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
msgstr "无法打开/proc/self/cmdline:%s; 停用 paranoia 模式"
-#: nscd/connections.c:1451
+#: 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:1491
+#: nscd/connections.c:1425
#, c-format
msgid "cannot change to old UID: %s; disabling paranoia mode"
msgstr "无法变更为旧的 UID:%s; 停用 paranoia 模式"
-#: nscd/connections.c:1501
+#: nscd/connections.c:1435
#, c-format
msgid "cannot change to old GID: %s; disabling paranoia mode"
msgstr "无法变更为旧的 GID:%s; 停用 paranoia 模式"
-#: nscd/connections.c:1514
+#: nscd/connections.c:1448
#, c-format
msgid "cannot change to old working directory: %s; disabling paranoia mode"
msgstr "无法变更为旧的工作目录:%s; 停用 paranoia 模式"
-#: nscd/connections.c:1560
+#: nscd/connections.c:1494
#, c-format
msgid "re-exec failed: %s; disabling paranoia mode"
msgstr "re-exec 失败:%s; 停用 paranoia 模式"
-#: nscd/connections.c:1569
+#: nscd/connections.c:1503
#, c-format
msgid "cannot change current working directory to \"/\": %s"
msgstr "无法变更目前的工作目录到 “/” :%s"
-#: nscd/connections.c:1762
+#: nscd/connections.c:1696
#, c-format
msgid "short read while reading request: %s"
msgstr "读取请求时没有读入足够的数据:%s"
-#: nscd/connections.c:1795
+#: nscd/connections.c:1729
#, c-format
msgid "key length in request too long: %d"
msgstr "请求中的键过长:%d"
-#: nscd/connections.c:1808
+#: nscd/connections.c:1742
#, c-format
msgid "short read while reading request key: %s"
msgstr "读入请求键的时候没有读入足够的数据:%s"
-#: nscd/connections.c:1818
+#: nscd/connections.c:1752
#, c-format
msgid "handle_request: request received (Version = %d) from PID %ld"
msgstr "处理请求:已从进程ID %2$ld 收到请求 (版本 = %1$d)"
-#: nscd/connections.c:1823
+#: nscd/connections.c:1757
#, c-format
msgid "handle_request: request received (Version = %d)"
msgstr "处理请求:已收到请求 (版本 = %d)"
-#: nscd/connections.c:1963
+#: nscd/connections.c:1897
#, c-format
msgid "ignored inotify event for `%s` (file exists)"
msgstr "为 `%s` 忽略 inotify 事件(文件存在)"
-#: nscd/connections.c:1968
+#: nscd/connections.c:1902
#, c-format
msgid "monitored file `%s` was %s, removing watch"
msgstr "监视文件 `%s' 原为 %s,移除监视"
-#: nscd/connections.c:1976 nscd/connections.c:2018
+#: nscd/connections.c:1910 nscd/connections.c:1952
#, c-format
msgid "failed to remove file watch `%s`: %s"
msgstr "移除文件监视 `%s' 失败: %s"
-#: nscd/connections.c:1991
+#: nscd/connections.c:1925
#, c-format
msgid "monitored file `%s` was written to"
msgstr "监视的文件 '%s' 被写入"
-#: nscd/connections.c:2015
+#: nscd/connections.c:1949
#, c-format
msgid "monitored parent directory `%s` was %s, removing watch on `%s`"
msgstr "监视父目录 `%s' 原为 %s,移除 `%s' 上的监视"
-#: nscd/connections.c:2041
+#: nscd/connections.c:1975
#, c-format
msgid "monitored file `%s` was %s, adding watch"
msgstr "监视文件 `%s' 原为 %s,添加监视"
-#: nscd/connections.c:2053
+#: nscd/connections.c:1987
#, c-format
msgid "failed to add file watch `%s`: %s"
msgstr "添加文件监视 `%s' 失败: %s"
-#: nscd/connections.c:2247 nscd/connections.c:2428
+#: nscd/connections.c:2181 nscd/connections.c:2362
#, c-format
msgid "disabled inotify-based monitoring after read error %d"
msgstr "停用基于 inotify 的监控,在读取错误 %d 发生后"
-#: nscd/connections.c:2543
+#: nscd/connections.c:2477
msgid "could not initialize conditional variable"
msgstr "无法初始化条件变量"
-#: nscd/connections.c:2551
+#: nscd/connections.c:2485
msgid "could not start clean-up thread; terminating"
msgstr "无法开始清理线程;终止中"
-#: nscd/connections.c:2565
+#: nscd/connections.c:2499
msgid "could not start any worker thread; terminating"
msgstr "无法开始任何背景工作线程;终止中"
-#: nscd/connections.c:2620 nscd/connections.c:2622 nscd/connections.c:2638
-#: nscd/connections.c:2648 nscd/connections.c:2666 nscd/connections.c:2677
-#: nscd/connections.c:2687
+#: 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
#, c-format
msgid "Failed to run nscd as user '%s'"
msgstr "以用户 '%s' 的身分运行 nscd 失败"
-#: nscd/connections.c:2640
+#: nscd/connections.c:2574
msgid "initial getgrouplist failed"
msgstr "初始化 getgrouplist 失败"
-#: nscd/connections.c:2649
+#: nscd/connections.c:2583
msgid "getgrouplist failed"
msgstr "getgrouplist 失败"
-#: nscd/connections.c:2667
+#: nscd/connections.c:2601
msgid "setgroups failed"
msgstr "setgroups 失败"
-#: nscd/grpcache.c:405 nscd/hstcache.c:432 nscd/initgrcache.c:411
-#: nscd/pwdcache.c:383 nscd/servicescache.c:338
+#: nscd/grpcache.c:416 nscd/hstcache.c:432 nscd/initgrcache.c:411
+#: nscd/pwdcache.c:394 nscd/servicescache.c:338
#, c-format
msgid "short write in %s: %s"
msgstr "写入 %s 的数据过短: %s"
-#: nscd/grpcache.c:450 nscd/initgrcache.c:78
+#: nscd/grpcache.c:461 nscd/initgrcache.c:78
#, c-format
msgid "Haven't found \"%s\" in group cache!"
msgstr "无法在组缓冲区中找到“%s”!"
-#: nscd/grpcache.c:452 nscd/initgrcache.c:80
+#: nscd/grpcache.c:463 nscd/initgrcache.c:80
#, c-format
msgid "Reloading \"%s\" in group cache!"
msgstr "在组缓冲区中重新加载“%s”!"
-#: nscd/grpcache.c:531
+#: nscd/grpcache.c:542
#, c-format
msgid "Invalid numeric gid \"%s\"!"
msgstr "无效的 gid 数值 \"%s\"!"
@@ -4193,7 +4179,7 @@ msgstr "为每个用户使用分离的缓冲区"
msgid "Name Service Cache Daemon."
msgstr "网域名称缓存精灵"
-#: nscd/nscd.c:155 nss/getent.c:1007 nss/makedb.c:206
+#: nscd/nscd.c:155 nss/getent.c:947 nss/makedb.c:206
#, c-format
msgid "wrong number of arguments"
msgstr "参数个数错误"
@@ -4366,24 +4352,24 @@ msgstr ""
"%15d 服务器调试级别\n"
#: nscd/nscd_stat.c:233
-#, fuzzy, c-format
+#, c-format
msgid "%3ud %2uh %2um %2lus server runtime\n"
-msgstr "%3ud %2uh %2um %2lus 服务器 运行时\n"
+msgstr "%3ud %2uh %2um %2lus 服务器 运行时长\n"
#: nscd/nscd_stat.c:236
-#, fuzzy, c-format
+#, c-format
msgid " %2uh %2um %2lus server runtime\n"
-msgstr " %2uh %2um %2lus 服务器 运行时\n"
+msgstr " %2uh %2um %2lus 服务器 运行时长\n"
#: nscd/nscd_stat.c:238
-#, fuzzy, c-format
+#, c-format
msgid " %2um %2lus server runtime\n"
-msgstr " %2um %2lus 服务器 运行时期\n"
+msgstr " %2um %2lus 服务器 运行时长\n"
#: nscd/nscd_stat.c:240
-#, fuzzy, c-format
+#, c-format
msgid " %2lus server runtime\n"
-msgstr " %2lus 服务器 运行时期\n"
+msgstr " %2lus 服务器 运行时长\n"
#: nscd/nscd_stat.c:242
#, c-format
@@ -4453,17 +4439,17 @@ msgstr ""
"%15<PRIuMAX> 内存配置失败\n"
"%15s 检查 /etc/%s 的变更\n"
-#: nscd/pwdcache.c:428
+#: nscd/pwdcache.c:439
#, c-format
msgid "Haven't found \"%s\" in password cache!"
msgstr "无法在口令缓冲区中找到“%s”!"
-#: nscd/pwdcache.c:430
+#: nscd/pwdcache.c:441
#, c-format
msgid "Reloading \"%s\" in password cache!"
msgstr "在口令缓冲区中重新加载“%s”!"
-#: nscd/pwdcache.c:511
+#: nscd/pwdcache.c:522
#, c-format
msgid "Invalid numeric uid \"%s\"!"
msgstr "无效的 uid 数值 \"%s\"!"
@@ -4603,21 +4589,21 @@ msgstr "停用 IDN 编码"
msgid "Get entries from administrative database."
msgstr "从管理数据库取得条目。"
-#: nss/getent.c:148 nss/getent.c:477 nss/getent.c:522
+#: nss/getent.c:148 nss/getent.c:441 nss/getent.c:486
#, c-format
msgid "Enumeration not supported on %s\n"
msgstr "%s 不支持枚举\n"
-#: nss/getent.c:921
+#: nss/getent.c:861
#, c-format
msgid "Unknown database name"
msgstr "未知的数据库名"
-#: nss/getent.c:951
+#: nss/getent.c:891
msgid "Supported databases:\n"
msgstr "支持的数据库:\n"
-#: nss/getent.c:1017
+#: nss/getent.c:957
#, c-format
msgid "Unknown database: %s\n"
msgstr "未知的数据库:%s\n"
@@ -4686,56 +4672,56 @@ msgstr "无法取得新创建文件的状态"
msgid "cannot rename temporary file"
msgstr "无法重命名暂存文件"
-#: nss/makedb.c:531 nss/makedb.c:554
+#: nss/makedb.c:527 nss/makedb.c:550
#, c-format
msgid "cannot create search tree"
msgstr "无法创建搜索树"
-#: nss/makedb.c:560
+#: nss/makedb.c:556
msgid "duplicate key"
msgstr "重复键值"
-#: nss/makedb.c:572
+#: nss/makedb.c:568
#, c-format
msgid "problems while reading `%s'"
msgstr "读取“%s”时出错"
-#: nss/makedb.c:799
+#: nss/makedb.c:795
#, c-format
msgid "failed to write new database file"
msgstr "写入新数据库文件时失败"
-#: nss/makedb.c:812
+#: nss/makedb.c:808
#, c-format
msgid "cannot stat database file"
msgstr "无法取得数据库文件的状态"
-#: nss/makedb.c:817
+#: nss/makedb.c:813
#, c-format
msgid "cannot map database file"
msgstr "无法映射数据库文件"
-#: nss/makedb.c:820
+#: nss/makedb.c:816
#, c-format
msgid "file not a database file"
msgstr "文件不是数据库文件"
-#: nss/makedb.c:871
+#: nss/makedb.c:867
#, c-format
msgid "cannot set file creation context for `%s'"
msgstr "无法为 %s 设置文件创建语境"
-#: posix/getconf.c:400
+#: posix/getconf.c:417
#, c-format
msgid "Usage: %s [-v specification] variable_name [pathname]\n"
msgstr "用法:%s [-v 规范] 变量名 [路径名]\n"
-#: posix/getconf.c:403
+#: posix/getconf.c:420
#, c-format
msgid " %s -a [pathname]\n"
msgstr " %s -a [路径名称]\n"
-#: posix/getconf.c:479
+#: posix/getconf.c:496
#, c-format
msgid ""
"Usage: getconf [-v SPEC] VAR\n"
@@ -4754,21 +4740,21 @@ msgstr ""
"环境 SPEC 值。\n"
"\n"
-#: posix/getconf.c:537
+#: posix/getconf.c:572
#, c-format
msgid "unknown specification \"%s\""
msgstr "未知的规范“%s”"
-#: posix/getconf.c:589
+#: posix/getconf.c:624
#, c-format
msgid "Couldn't execute %s"
msgstr "无法运行 %s"
-#: posix/getconf.c:633 posix/getconf.c:649
+#: posix/getconf.c:669 posix/getconf.c:685
msgid "undefined"
msgstr "未定义"
-#: posix/getconf.c:671
+#: posix/getconf.c:707
#, c-format
msgid "Unrecognized variable `%s'"
msgstr "不可识别的变量“%s”"
@@ -4893,63 +4879,63 @@ msgstr "常规表达式过大"
msgid "Unmatched ) or \\)"
msgstr "不匹配的 ) 或 \\)"
-#: posix/regcomp.c:685
+#: posix/regcomp.c:673
msgid "No previous regular expression"
msgstr "没有前一个常规表达式"
-#: posix/wordexp.c:1851
+#: posix/wordexp.c:1852
msgid "parameter null or not set"
msgstr "参数为 null 或未设置"
-#: resolv/herror.c:68
+#: resolv/herror.c:63
msgid "Resolver Error 0 (no error)"
msgstr "解析器错误 0 (无错误)"
-#: resolv/herror.c:69
+#: resolv/herror.c:64
msgid "Unknown host"
msgstr "未知的主机"
-#: resolv/herror.c:70
+#: resolv/herror.c:65
msgid "Host name lookup failure"
msgstr "主机名搜索失败"
-#: resolv/herror.c:71
+#: resolv/herror.c:66
msgid "Unknown server error"
msgstr "未知的服务器错误"
-#: resolv/herror.c:72
+#: resolv/herror.c:67
msgid "No address associated with name"
msgstr "没有与名字关联的地址"
-#: resolv/herror.c:107
+#: resolv/herror.c:102
msgid "Resolver internal error"
msgstr "解析器内部错误"
-#: resolv/herror.c:110
+#: resolv/herror.c:105
msgid "Unknown resolver error"
msgstr "未知的解析器错误"
-#: resolv/res_hconf.c:125
+#: resolv/res_hconf.c:118
#, c-format
msgid "%s: line %d: cannot specify more than %d trim domains"
msgstr "%s:行 %d:无法指定多于 %d 个规整域"
-#: resolv/res_hconf.c:146
+#: resolv/res_hconf.c:139
#, c-format
msgid "%s: line %d: list delimiter not followed by domain"
msgstr "%s:行 %d:列表分隔符没有出现在域之后"
-#: resolv/res_hconf.c:205
+#: resolv/res_hconf.c:176
#, c-format
msgid "%s: line %d: expected `on' or `off', found `%s'\n"
msgstr "%s:行 %d:应为“on”或“off”,得到“%s”\n"
-#: resolv/res_hconf.c:248
+#: resolv/res_hconf.c:219
#, c-format
msgid "%s: line %d: bad command `%s'\n"
msgstr "%s:行 %d:错误命令“%s”\n"
-#: resolv/res_hconf.c:283
+#: resolv/res_hconf.c:252
#, c-format
msgid "%s: line %d: ignoring trailing garbage `%s'\n"
msgstr "%s: 行 %d: 正在忽略尾端的无用数据 `%s'\n"
@@ -5082,7 +5068,7 @@ msgstr "输出缓冲区可用"
msgid "Input message available"
msgstr "输入消息可用"
-#: stdio-common/psiginfo-data.h:46
+#: stdio-common/psiginfo-data.h:46 timezone/zdump.c:541 timezone/zic.c:483
msgid "I/O error"
msgstr "I/O 错误"
@@ -5148,7 +5134,7 @@ msgstr "未知信号"
msgid "Unknown error "
msgstr "未知的错误 "
-#: string/strerror.c:42
+#: string/strerror.c:41
msgid "Unknown error"
msgstr "未知的错误"
@@ -5164,9 +5150,9 @@ 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:162 sunrpc/svc_unix.c:188 sunrpc/svc_unix.c:229
-#: sunrpc/xdr.c:631 sunrpc/xdr.c:793 sunrpc/xdr_array.c:97
-#: sunrpc/xdr_rec.c:152 sunrpc/xdr_ref.c:76
+#: 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
msgid "out of memory\n"
msgstr "内存不足\n"
@@ -5309,23 +5295,23 @@ msgstr "pmap_getmaps.c: 远程进程调用问题"
msgid "Cannot register service"
msgstr "无法注册服务"
-#: sunrpc/pmap_rmt.c:243
+#: sunrpc/pmap_rmt.c:244
msgid "Cannot create socket for broadcast rpc"
msgstr "无法为广播 rpc 创建套接字"
-#: sunrpc/pmap_rmt.c:250
+#: sunrpc/pmap_rmt.c:251
msgid "Cannot set socket option SO_BROADCAST"
msgstr "无法设置套接字选项 SO_BROADCAST"
-#: sunrpc/pmap_rmt.c:302
+#: sunrpc/pmap_rmt.c:303
msgid "Cannot send broadcast packet"
msgstr "无法发送广播包"
-#: sunrpc/pmap_rmt.c:327
+#: sunrpc/pmap_rmt.c:328
msgid "Broadcast poll problem"
msgstr "Broadcast 调查有问题"
-#: sunrpc/pmap_rmt.c:340
+#: sunrpc/pmap_rmt.c:341
msgid "Cannot receive reply to broadcast"
msgstr "无法接收对广播的应答"
@@ -5524,7 +5510,7 @@ msgstr "-N\t\t支持多重参数和传值调用\n"
#: sunrpc/rpc_main.c:1437
#, c-format
msgid "-o outfile\tname of the output file\n"
-msgstr "-o 输出档\t输出文件的名称\n"
+msgstr "-o 输出文件\t输出文件的名称\n"
#: sunrpc/rpc_main.c:1438
#, c-format
@@ -5607,83 +5593,6 @@ msgstr "空的字符字串"
msgid "preprocessor error"
msgstr "预处理错误"
-#: sunrpc/rpcinfo.c:246 sunrpc/rpcinfo.c:392
-#, c-format
-msgid "program %lu is not available\n"
-msgstr "程序 %lu 不可用\n"
-
-#: sunrpc/rpcinfo.c:273 sunrpc/rpcinfo.c:319 sunrpc/rpcinfo.c:342
-#: sunrpc/rpcinfo.c:416 sunrpc/rpcinfo.c:462 sunrpc/rpcinfo.c:485
-#: sunrpc/rpcinfo.c:519
-#, c-format
-msgid "program %lu version %lu is not available\n"
-msgstr "程序 %lu 版本 %lu 不可用\n"
-
-#: sunrpc/rpcinfo.c:524
-#, c-format
-msgid "program %lu version %lu ready and waiting\n"
-msgstr "程序 %lu 版本 %lu 就绪并等待\n"
-
-#: sunrpc/rpcinfo.c:565 sunrpc/rpcinfo.c:572
-msgid "rpcinfo: can't contact portmapper"
-msgstr "rpcinfo:无法同 portmapper 交互"
-
-#: sunrpc/rpcinfo.c:579
-msgid "No remote programs registered.\n"
-msgstr "没有注册的远程程序。\n"
-
-#: sunrpc/rpcinfo.c:583
-msgid " program vers proto port\n"
-msgstr " 程序 版本 协议 端口\n"
-
-#: sunrpc/rpcinfo.c:622
-msgid "(unknown)"
-msgstr "(未知)"
-
-#: sunrpc/rpcinfo.c:646
-#, c-format
-msgid "rpcinfo: broadcast failed: %s\n"
-msgstr "rpcinfo:广播失败:%s\n"
-
-#: sunrpc/rpcinfo.c:667
-msgid "Sorry. You are not root\n"
-msgstr "抱歉。您不是 root 用户\n"
-
-#: sunrpc/rpcinfo.c:674
-#, c-format
-msgid "rpcinfo: Could not delete registration for prog %s version %s\n"
-msgstr "rpcinfo:无法删除程序 %s 版本 %s 的注册\n"
-
-#: sunrpc/rpcinfo.c:683
-msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
-msgstr "用法:rpcinfo [ -n 端口号 ] -u 主机名 程序号 [ 版本号 ]\n"
-
-#: sunrpc/rpcinfo.c:685
-msgid " rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n"
-msgstr " rpcinfo [ -n 端口号 ] -t 主机 程序号 [ 版本号 ]\n"
-
-#: sunrpc/rpcinfo.c:687
-msgid " rpcinfo -p [ host ]\n"
-msgstr " rpcinfo -p [ 主机 ]\n"
-
-#: sunrpc/rpcinfo.c:688
-msgid " rpcinfo -b prognum versnum\n"
-msgstr " rpcinfo -b 程序号 版本号\n"
-
-#: sunrpc/rpcinfo.c:689
-msgid " rpcinfo -d prognum versnum\n"
-msgstr " rpcinfo -d 程序号 版本号\n"
-
-#: sunrpc/rpcinfo.c:714
-#, c-format
-msgid "rpcinfo: %s is unknown service\n"
-msgstr "rpcinfo:%s 是未知的服务\n"
-
-#: sunrpc/rpcinfo.c:751
-#, c-format
-msgid "rpcinfo: %s is unknown host\n"
-msgstr "rpcinfo:%s 是未知的主机\n"
-
#: sunrpc/svc_run.c:71
msgid "svc_run: - out of memory"
msgstr "svc_run: - 内存不足"
@@ -5728,43 +5637,43 @@ msgstr "svc_tcp.c - tcp 套接字创建问题"
msgid "svc_tcp.c - cannot getsockname or listen"
msgstr "svc_tcp.c - 无法进行 getsockname 或 listen 操作"
-#: sunrpc/svc_udp.c:137
+#: sunrpc/svc_udp.c:135
msgid "svcudp_create: socket creation problem"
msgstr "svcudp_create: 套接字创建问题"
-#: sunrpc/svc_udp.c:151
+#: sunrpc/svc_udp.c:149
msgid "svcudp_create - cannot getsockname"
msgstr "svcudp_create - 无法调用 getsockname"
-#: sunrpc/svc_udp.c:183
+#: sunrpc/svc_udp.c:181
msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
msgstr "svcudp_create:xp_pad 对 IP_PKTINFO 来说太小\n"
-#: sunrpc/svc_udp.c:495
+#: sunrpc/svc_udp.c:480
msgid "enablecache: cache already enabled"
msgstr "enablecache:缓冲区已经启用"
-#: sunrpc/svc_udp.c:501
+#: sunrpc/svc_udp.c:486
msgid "enablecache: could not allocate cache"
msgstr "enablecache:无法分配缓冲区"
-#: sunrpc/svc_udp.c:510
+#: sunrpc/svc_udp.c:495
msgid "enablecache: could not allocate cache data"
msgstr "enablecache:无法分配缓冲区数据"
-#: sunrpc/svc_udp.c:518
+#: sunrpc/svc_udp.c:503
msgid "enablecache: could not allocate cache fifo"
msgstr "enablecache: 无法配置缓存 fifo 管线"
-#: sunrpc/svc_udp.c:554
+#: sunrpc/svc_udp.c:539
msgid "cache_set: victim not found"
msgstr "cache_set:找不到 victim"
-#: sunrpc/svc_udp.c:565
+#: sunrpc/svc_udp.c:550
msgid "cache_set: victim alloc failed"
msgstr "cache_set:分配 victim 失败"
-#: sunrpc/svc_udp.c:572
+#: sunrpc/svc_udp.c:557
msgid "cache_set: could not allocate new rpc_buffer"
msgstr "cache_set:无法分配新的 rpc_buffer"
@@ -6026,7 +5935,7 @@ msgstr "文件已存在"
#. TRANS also when you rename a file with @code{rename} (@pxref{Renaming Files}).
#: sysdeps/gnu/errlist.c:211
msgid "Invalid cross-device link"
-msgstr "无效的跨设备连接"
+msgstr "无效的跨设备链接"
#. TRANS The wrong type of device was given to a function that expects a
#. TRANS particular sort of device.
@@ -6110,7 +6019,7 @@ msgstr "只读文件系统"
#. TRANS as many links as it can take (@pxref{Renaming Files}).
#: sysdeps/gnu/errlist.c:347
msgid "Too many links"
-msgstr "过多的连接"
+msgstr "过多的链接"
#. TRANS Domain error; used by mathematical functions when an argument value does
#. TRANS not fall into the domain over which the function is defined.
@@ -6621,7 +6530,7 @@ msgstr "级别 3 已重置"
#: sysdeps/gnu/errlist.c:1143
msgid "Link number out of range"
-msgstr "连接数超出范围"
+msgstr "链接数超出范围"
#: sysdeps/gnu/errlist.c:1151
msgid "Protocol driver not attached"
@@ -6717,7 +6626,7 @@ msgstr "a.out 中的 .lib 节已毁坏"
#: sysdeps/gnu/errlist.c:1335
msgid "Attempting to link in too many shared libraries"
-msgstr "试图于过多的共享库相连接"
+msgstr "试图与过多的共享库相链接"
#: sysdeps/gnu/errlist.c:1343
msgid "Cannot exec a shared library directly"
@@ -6888,28 +6797,24 @@ msgstr "无法打开“%s”"
msgid "cannot read header from `%s'"
msgstr "无法从“%s”中读入头"
-#: timezone/zdump.c:282
-msgid "lacks alphabetic at start"
-msgstr "lacks 字母顺序于开始"
-
-#: timezone/zdump.c:284
-msgid "has fewer than 3 alphabetics"
-msgstr "有更少的比 3 字母顺序"
+#: timezone/zdump.c:494
+msgid "has fewer than 3 characters"
+msgstr "不足 3 个字符"
-#: timezone/zdump.c:286
-msgid "has more than 6 alphabetics"
-msgstr "有超过 6 字母顺序"
+#: timezone/zdump.c:496
+msgid "has more than 6 characters"
+msgstr "超过 6 个字符"
-#: timezone/zdump.c:294
-msgid "differs from POSIX standard"
-msgstr "differs 从 POSIX 标准"
+#: timezone/zdump.c:498
+msgid "has characters other than ASCII alphanumerics, '-' or '+'"
+msgstr "含有 ASCII 数字、字母、“-”、“+”之外的字符"
-#: timezone/zdump.c:300
+#: timezone/zdump.c:503
#, c-format
msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"
msgstr "%s: 警告:区域 “%s” 缩写 “%s” %s\n"
-#: timezone/zdump.c:309
+#: timezone/zdump.c:553
#, c-format
msgid ""
"%s: usage: %s [--version] [--help] [-{vV}] [-{ct} [lo,]hi] zonename ...\n"
@@ -6920,386 +6825,522 @@ msgstr ""
"\n"
"将错误通报给 %s。\n"
-#: timezone/zdump.c:386
+#: timezone/zdump.c:635
#, c-format
msgid "%s: wild -c argument %s\n"
msgstr "%s: 怪异的 -c 选项 %s\n"
-#: timezone/zdump.c:419
+#: timezone/zdump.c:668
#, c-format
msgid "%s: wild -t argument %s\n"
msgstr "%s: wild -c 参数 %s\n"
-#: timezone/zdump.c:508
-msgid "Error writing to standard output"
-msgstr "写入标准输出出错"
-
-#: timezone/zic.c:371
+#: timezone/zic.c:361
#, c-format
msgid "%s: Memory exhausted: %s\n"
msgstr "%s:内存耗尽:%s\n"
-#: timezone/zic.c:438
+#: timezone/zic.c:369
+msgid "size overflow"
+msgstr "大小溢出"
+
+#: timezone/zic.c:416
+msgid "int overflow"
+msgstr "整数溢出"
+
+#: timezone/zic.c:451
#, c-format
msgid "\"%s\", line %d: "
msgstr "\"%s\", 第 %d 行: "
-#: timezone/zic.c:441
+#: timezone/zic.c:454
#, c-format
msgid " (rule from \"%s\", line %d)"
msgstr " (规则来自 \"%s\", 第 %d 行)"
-#: timezone/zic.c:460
+#: timezone/zic.c:473
#, c-format
msgid "warning: "
msgstr "警告:"
-#: timezone/zic.c:470
+#: timezone/zic.c:498
#, c-format
msgid ""
-"%s: usage is %s [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
-"\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
+"%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"
msgstr ""
-"%s:用法为 %s [ --version ] [ --help ] [ -v ] [ -l 本地时间 ] [ -p POSIX规则 ] \\\n"
-"\t[ -d 目录 ] [ -L 跳跃秒数 ] [ -y 年分类型 ] [ 文件名 ... ]\n"
+"%s:用法为 %s [ --version ] [ --help ] [ -v ]\\\n"
+"\t[ -l 本地时间 ] [ -p POSIX规则 ] [ -d 目录 ]\\\n"
+"\t[ -L 闰秒数量 ] [ 文件名 ... ]\n"
"\n"
"将错误通报给 %s。\n"
-#: timezone/zic.c:505
+#: timezone/zic.c:534
msgid "wild compilation-time specification of zic_t"
msgstr "zic_t 的万用编译时间规格"
-#: timezone/zic.c:524
+#: timezone/zic.c:554
#, c-format
msgid "%s: More than one -d option specified\n"
msgstr "%s:给出了多个 -d 选项\n"
-#: timezone/zic.c:534
+#: timezone/zic.c:564
#, c-format
msgid "%s: More than one -l option specified\n"
msgstr "%s:给出了多个 -l 选项\n"
-#: timezone/zic.c:544
+#: timezone/zic.c:574
#, c-format
msgid "%s: More than one -p option specified\n"
msgstr "%s:给出了多个 -p 选项\n"
-#: timezone/zic.c:554
+#: timezone/zic.c:584
#, c-format
msgid "%s: More than one -y option specified\n"
msgstr "%s:给出了多个 -y 选项\n"
-#: timezone/zic.c:564
+#: timezone/zic.c:594
#, c-format
msgid "%s: More than one -L option specified\n"
msgstr "%s:给出了多个 -L 选项\n"
-#: timezone/zic.c:611
+#: timezone/zic.c:603
+msgid "-s ignored"
+msgstr "-s 已被忽略"
+
+#: timezone/zic.c:641
msgid "link to link"
msgstr "链接到链接"
-#: timezone/zic.c:678
-msgid "hard link failed, symbolic link used"
-msgstr "硬连接失败,使用符号连接"
+#: timezone/zic.c:644 timezone/zic.c:648
+msgid "command line"
+msgstr "命令行"
+
+#: timezone/zic.c:664
+msgid "empty file name"
+msgstr "空文件名"
-#: timezone/zic.c:688
+#: timezone/zic.c:667
#, c-format
-msgid "%s: Can't read %s: %s\n"
-msgstr "%s: 无法读取 %s: %s\n"
+msgid "file name '%s' begins with '/'"
+msgstr "文件名“%s”以“/”开头"
-#: timezone/zic.c:696 timezone/zic.c:1595
+#: timezone/zic.c:676
#, c-format
-msgid "%s: Can't create %s: %s\n"
-msgstr "%s:无法创建 %s:%s\n"
+msgid "file name '%s' contains '%.*s' component"
+msgstr "文件名“%s”包含“%.*s”部分"
+
+#: timezone/zic.c:682
+#, c-format
+msgid "file name '%s' component contains leading '-'"
+msgstr "文件名“%s”部分以“-”开头"
-#: timezone/zic.c:704 timezone/zic.c:939
+# component_len_max < component_len
+#: timezone/zic.c:685
#, c-format
-msgid "%s: Error reading %s\n"
-msgstr "%s:读 %s 错误\n"
+msgid "file name '%s' contains overlength component '%.*s...'"
+msgstr "文件名“%s”中的“%.*s”部分过长"
-#: timezone/zic.c:710 timezone/zic.c:1792
+#: timezone/zic.c:713
#, c-format
-msgid "%s: Error writing %s\n"
-msgstr "%s:写 %s 错误\n"
+msgid "file name '%s' contains byte '%c'"
+msgstr "文件名“%s”包含字节“%c”"
#: timezone/zic.c:714
+#, 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"
+msgstr "%s:无法链接到 %s:%s"
+
+#: timezone/zic.c:792
+msgid "hard link failed, symbolic link used"
+msgstr "硬链接失败,使用符号链接"
+
+#: timezone/zic.c:802
+#, c-format
+msgid "%s: Can't read %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"
+msgstr "%s:无法创建 %s:%s\n"
+
+#: timezone/zic.c:818
msgid "link failed, copy used"
msgstr "链接失败,使用复制代替"
-#: timezone/zic.c:802 timezone/zic.c:804
+#: timezone/zic.c:913 timezone/zic.c:915
msgid "same rule name in multiple files"
msgstr "多个文件中的相同规则名"
-#: timezone/zic.c:845
+#: timezone/zic.c:956
msgid "unruly zone"
msgstr "没有规则的时区"
-#: timezone/zic.c:852
+#: timezone/zic.c:963
#, c-format
msgid "%s in ruleless zone"
msgstr "%s 在没有规则的节"
-#: timezone/zic.c:872
+#: timezone/zic.c:983
msgid "standard input"
msgstr "标准输入"
-#: timezone/zic.c:877
+#: timezone/zic.c:988
#, c-format
msgid "%s: Can't open %s: %s\n"
msgstr "%s:无法打开 %s:%s\n"
-#: timezone/zic.c:888
+#: timezone/zic.c:999
msgid "line too long"
msgstr "行过长"
-#: timezone/zic.c:908
+#: timezone/zic.c:1019
msgid "input line of unknown type"
msgstr "未知类型的输入行"
-#: timezone/zic.c:924
+#: timezone/zic.c:1034
#, c-format
-msgid "%s: Leap line in non leap seconds file %s\n"
-msgstr "%s: 闰时设置行出现在不含闰秒的设置档 %s 中\n"
+msgid "%s: Leap line in non leap seconds file %s"
+msgstr "%s: 闰时设置行出现在不含闰秒的文件 %s 中"
-#: timezone/zic.c:931 timezone/zic.c:1339 timezone/zic.c:1361
+#: timezone/zic.c:1042 timezone/zic.c:1447 timezone/zic.c:1469
#, c-format
msgid "%s: panic: Invalid l_value %d\n"
msgstr "%s: 严重错误: 错误的 l_value %d\n"
-#: timezone/zic.c:946
-#, c-format
-msgid "%s: Error closing %s: %s\n"
-msgstr "%s:关闭 %s 错误:%s\n"
-
-#: timezone/zic.c:951
+#: timezone/zic.c:1051
msgid "expected continuation line not found"
msgstr "找不到应该出现的续行"
-#: timezone/zic.c:992 timezone/zic.c:2644 timezone/zic.c:2658
+#: timezone/zic.c:1093 timezone/zic.c:2826
msgid "time overflow"
msgstr "时间溢出"
-#: timezone/zic.c:997
+#: timezone/zic.c:1098
msgid "values over 24 hours not handled by pre-2007 versions of zic"
msgstr "24 小时以上的值无法由早于 2007 的 zic 版本所处理"
-#: timezone/zic.c:1008
+#: timezone/zic.c:1109
msgid "wrong number of fields on Rule line"
msgstr "规则行中域的个数错误"
-#: timezone/zic.c:1012
+#: timezone/zic.c:1113
msgid "nameless rule"
msgstr "无名规则"
-#: timezone/zic.c:1017
+# zic_t r_stdoff; /* offset from standard time */
+#: timezone/zic.c:1118
#, fuzzy
msgid "invalid saved time"
-msgstr "无效的节约时间"
+msgstr "无效的保存时间"
-#: timezone/zic.c:1034
+#: timezone/zic.c:1135
msgid "wrong number of fields on Zone line"
msgstr "区域行中域的个数错误"
-#: timezone/zic.c:1039
+#: timezone/zic.c:1140
#, c-format
msgid "\"Zone %s\" line and -l option are mutually exclusive"
msgstr "\"Zone %s\" 行和 -l 选项是互斥的"
-#: timezone/zic.c:1045
+#: timezone/zic.c:1146
#, c-format
msgid "\"Zone %s\" line and -p option are mutually exclusive"
msgstr "\"Zone %s\" 行和 -p 选项是互斥的"
-#: timezone/zic.c:1053
+#: timezone/zic.c:1154
#, c-format
msgid "duplicate zone name %s (file \"%s\", line %d)"
msgstr "重复的区域名 %s (文件“%s”,行 %d)"
-#: timezone/zic.c:1066
+#: timezone/zic.c:1167
msgid "wrong number of fields on Zone continuation line"
msgstr "时区接续行的字段数目不对"
-#: timezone/zic.c:1103
+#: timezone/zic.c:1207
msgid "invalid UT offset"
msgstr "无效的 UT 偏移量"
-#: timezone/zic.c:1106
+#: timezone/zic.c:1211
msgid "invalid abbreviation format"
msgstr "无效的缩略格式"
-#: timezone/zic.c:1135
+#: timezone/zic.c:1220
+#, c-format
+msgid "format '%s' not handled by pre-2015 versions of zic"
+msgstr "“%s”格式无法由早于 2015 年的 zic 版本所处理"
+
+#: timezone/zic.c:1247
msgid "Zone continuation line end time is not after end time of previous line"
msgstr "时区接续行的结束时间不在上一行的结束时间之后"
-#: timezone/zic.c:1161
+#: timezone/zic.c:1274
msgid "wrong number of fields on Leap line"
msgstr "闰时设置行的字段数目错误"
-#: timezone/zic.c:1170
+#: timezone/zic.c:1283
msgid "invalid leaping year"
msgstr "无效的闰年"
-#: timezone/zic.c:1190 timezone/zic.c:1293
+#: timezone/zic.c:1303 timezone/zic.c:1401
msgid "invalid month name"
msgstr "无效的月名称"
-#: timezone/zic.c:1203 timezone/zic.c:1406 timezone/zic.c:1420
+#: timezone/zic.c:1316 timezone/zic.c:1514 timezone/zic.c:1528
msgid "invalid day of month"
msgstr "无效的日"
-#: timezone/zic.c:1208
+#: timezone/zic.c:1321
msgid "time too small"
msgstr "时间太小"
-#: timezone/zic.c:1212
+#: timezone/zic.c:1325
msgid "time too large"
msgstr "时间过大"
-#: timezone/zic.c:1216 timezone/zic.c:1322
+#: timezone/zic.c:1329 timezone/zic.c:1430
msgid "invalid time of day"
msgstr "无效的时间"
-#: timezone/zic.c:1235
+#: timezone/zic.c:1348
msgid "illegal CORRECTION field on Leap line"
msgstr "在闰时设置行中有不合法的 CORRECTION 字段"
-#: timezone/zic.c:1240
+#: timezone/zic.c:1353
msgid "illegal Rolling/Stationary field on Leap line"
msgstr "在闰时设置行中有不合法的 Rolling/Stationary 字段"
-#: timezone/zic.c:1246
+#: timezone/zic.c:1359
msgid "leap second precedes Big Bang"
msgstr "闰秒出现在大爆炸之前"
-#: timezone/zic.c:1259
+#: timezone/zic.c:1372
msgid "wrong number of fields on Link line"
-msgstr "连接行中域的个数错误"
+msgstr "链接行中域的个数错误"
-#: timezone/zic.c:1263
+#: timezone/zic.c:1376
msgid "blank FROM field on Link line"
msgstr "Link 行中空白的 FROM 域"
-#: timezone/zic.c:1267
-msgid "blank TO field on Link line"
-msgstr "Link 行中空白的 TO 域"
-
-#: timezone/zic.c:1343
+#: timezone/zic.c:1451
msgid "invalid starting year"
msgstr "无效的起始年份"
-#: timezone/zic.c:1365
+#: timezone/zic.c:1473
msgid "invalid ending year"
msgstr "无效的终止年份"
-#: timezone/zic.c:1369
+#: timezone/zic.c:1477
msgid "starting year greater than ending year"
msgstr "起始年份大于终止年份"
-#: timezone/zic.c:1376
+#: timezone/zic.c:1484
msgid "typed single year"
msgstr "输入的年分是同一年"
-#: timezone/zic.c:1411
+#: timezone/zic.c:1519
msgid "invalid weekday name"
msgstr "无效的星期名"
-#: timezone/zic.c:1530
+#: timezone/zic.c:1638
msgid "pre-2014 clients may mishandle more than 1200 transition times"
msgstr "2014 之前的客户端可能会错误处理超过 1200 次的改变次数"
-#: timezone/zic.c:1585
+#: timezone/zic.c:1691
#, c-format
msgid "%s: Can't remove %s: %s\n"
msgstr "%s:无法删除 %s:%s\n"
-#: timezone/zic.c:2143
+#: timezone/zic.c:1918
+#, c-format
+msgid "%%z UTC offset magnitude exceeds 99:59:59"
+msgstr "%%z UTC 偏移大小超过了 99:59:59"
+
+#: timezone/zic.c:2291
msgid "no POSIX environment variable for zone"
msgstr "无 POSIX 环境变量用于区"
-#: timezone/zic.c:2149
+#: timezone/zic.c:2297
#, c-format
msgid "%s: pre-%d clients may mishandle distant timestamps"
msgstr "%s: %d 之前的客户端可能会错误处理久远的时间戳"
-#: timezone/zic.c:2329
+#: timezone/zic.c:2428
+msgid "two rules for same instant"
+msgstr "为同一时间点制订了两种规则"
+
+#: timezone/zic.c:2485
msgid "can't determine time zone abbreviation to use just after until time"
msgstr "无法决定在结束时间以后该使用的时区简写"
-#: timezone/zic.c:2375 timezone/zic.c:2450
+#: timezone/zic.c:2531 timezone/zic.c:2593
msgid "too many local time types"
msgstr "过多的本地时间类型"
-#: timezone/zic.c:2423
-msgid "internal error - addtype called with bad isdst"
-msgstr "内部错误 - 以错误的 isdst 调用 addtype"
-
-#: timezone/zic.c:2427
-msgid "internal error - addtype called with bad ttisstd"
-msgstr "内部错误 - 以错误的 ttisstd 调用 addtype"
-
-#: timezone/zic.c:2431
-msgid "internal error - addtype called with bad ttisgmt"
-msgstr "内部错误 - 以错误的 ttisgmt 调用 addtype"
-
-#: timezone/zic.c:2454
+#: timezone/zic.c:2597
msgid "UT offset out of range"
msgstr "UTC 偏移超出范围"
-#: timezone/zic.c:2478
+#: timezone/zic.c:2621
msgid "too many leap seconds"
msgstr "太多闰秒"
-#: timezone/zic.c:2484
+#: timezone/zic.c:2627
msgid "repeated leap second moment"
msgstr "重复的闰秒设置"
-#: timezone/zic.c:2534
+#: timezone/zic.c:2677
msgid "Wild result from command execution"
msgstr "命令运行导致奇怪的结果"
-#: timezone/zic.c:2535
+#: timezone/zic.c:2678
#, c-format
msgid "%s: command was '%s', result was %d\n"
msgstr "%s:命令为“%s”,结果为 %d\n"
-#: timezone/zic.c:2626
+#: timezone/zic.c:2810
msgid "Odd number of quotation marks"
msgstr "奇数个引号"
-#: timezone/zic.c:2703
+#: timezone/zic.c:2896
msgid "use of 2/29 in non leap-year"
msgstr "在非闰年时用到 2/29 日"
-#: timezone/zic.c:2738
-msgid "rule goes past start/end of month--will not work with pre-2004 versions of zic"
-msgstr "规则超过开始/结束月分--将无法适用早于 2004 的 zic 版本"
-
-#: timezone/zic.c:2769
-msgid "time zone abbreviation lacks alphabetic at start"
-msgstr "时区缩写开头缺少字母"
+#: timezone/zic.c:2931
+msgid "rule goes past start/end of month; will not work with pre-2004 versions of zic"
+msgstr "规则超过开始/结束月分;将无法用于 2004 年之前的 zic 版本"
-#: timezone/zic.c:2771
-msgid "time zone abbreviation has fewer than 3 alphabetics"
-msgstr "时间区缩写少于 3 个字母"
+#: timezone/zic.c:2958
+msgid "time zone abbreviation has fewer than 3 characters"
+msgstr "时区缩写少于 3 个字母"
-#: timezone/zic.c:2773
-msgid "time zone abbreviation has too many alphabetics"
-msgstr "时区缩写太多字母"
+#: timezone/zic.c:2960
+msgid "time zone abbreviation has too many characters"
+msgstr "时区缩写字母太多"
-#: timezone/zic.c:2783
+#: timezone/zic.c:2962
msgid "time zone abbreviation differs from POSIX standard"
msgstr "时区缩写与 POSIX 标准不同"
-#: timezone/zic.c:2789
+#: timezone/zic.c:2968
msgid "too many, or too long, time zone abbreviations"
msgstr "过多或过长的时区缩写"
-#: timezone/zic.c:2829
+#: timezone/zic.c:3004
#, c-format
-msgid "%s: Can't create directory %s: %s\n"
-msgstr "%s:无法创建目录 %s:%s\n"
+msgid "%s: Can't create directory %s: %s"
+msgstr "%s:无法创建目录 %s:%s"
+
+#~ msgid "cannot allocate TLS data structures for initial thread"
+#~ msgstr "无法配置 TLS 数据结构用以起始线程"
+
+#~ msgid "cannot handle TLS data"
+#~ msgstr "无法处理 TLS 数据"
+
+#~ msgid "Don't generate links"
+#~ msgstr "不要生成连接"
+
+#~ msgid "Create old-style tables"
+#~ msgstr "创建旧风格表格"
+
+#~ msgid "cannot change socket to nonblocking mode: %s"
+#~ msgstr "无法转换套接字到非堵塞模式: %s"
+
+#~ msgid "cannot set socket to close on exec: %s"
+#~ msgstr "无法设定套接字为 exec 时关闭: %s"
+
+#~ msgid "program %lu is not available\n"
+#~ msgstr "程序 %lu 不可用\n"
+
+#~ msgid "program %lu version %lu is not available\n"
+#~ msgstr "程序 %lu 版本 %lu 不可用\n"
+
+#~ msgid "program %lu version %lu ready and waiting\n"
+#~ msgstr "程序 %lu 版本 %lu 就绪并等待\n"
+
+#~ msgid "rpcinfo: can't contact portmapper"
+#~ msgstr "rpcinfo:无法同 portmapper 交互"
+
+#~ msgid "No remote programs registered.\n"
+#~ msgstr "没有注册的远程程序。\n"
+
+#~ msgid " program vers proto port\n"
+#~ msgstr " 程序 版本 协议 端口\n"
+
+#~ msgid "(unknown)"
+#~ msgstr "(未知)"
+
+#~ msgid "rpcinfo: broadcast failed: %s\n"
+#~ msgstr "rpcinfo:广播失败:%s\n"
+
+#~ msgid "Sorry. You are not root\n"
+#~ msgstr "抱歉。您不是 root 用户\n"
+
+#~ msgid "rpcinfo: Could not delete registration for prog %s version %s\n"
+#~ msgstr "rpcinfo:无法删除程序 %s 版本 %s 的注册\n"
+
+#~ msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
+#~ msgstr "用法:rpcinfo [ -n 端口号 ] -u 主机名 程序号 [ 版本号 ]\n"
+
+#~ msgid " rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n"
+#~ msgstr " rpcinfo [ -n 端口号 ] -t 主机 程序号 [ 版本号 ]\n"
+
+#~ msgid " rpcinfo -p [ host ]\n"
+#~ msgstr " rpcinfo -p [ 主机 ]\n"
+
+#~ msgid " rpcinfo -b prognum versnum\n"
+#~ msgstr " rpcinfo -b 程序号 版本号\n"
+
+#~ msgid " rpcinfo -d prognum versnum\n"
+#~ msgstr " rpcinfo -d 程序号 版本号\n"
+
+#~ msgid "rpcinfo: %s is unknown service\n"
+#~ msgstr "rpcinfo:%s 是未知的服务\n"
+
+#~ msgid "rpcinfo: %s is unknown host\n"
+#~ msgstr "rpcinfo:%s 是未知的主机\n"
+
+#~ msgid "lacks alphabetic at start"
+#~ msgstr "lacks 字母顺序于开始"
+
+#~ msgid "differs from POSIX standard"
+#~ msgstr "differs 从 POSIX 标准"
+
+#~ msgid "Error writing to standard output"
+#~ msgstr "写入标准输出出错"
+
+#~ msgid "%s: Error reading %s\n"
+#~ msgstr "%s:读 %s 错误\n"
+
+#~ msgid "%s: Error writing %s\n"
+#~ msgstr "%s:写 %s 错误\n"
+
+#~ msgid "%s: Error closing %s: %s\n"
+#~ msgstr "%s:关闭 %s 错误:%s\n"
+
+#~ msgid "blank TO field on Link line"
+#~ msgstr "Link 行中空白的 TO 域"
+
+#~ msgid "internal error - addtype called with bad isdst"
+#~ msgstr "内部错误 - 以错误的 isdst 调用 addtype"
+
+#~ msgid "internal error - addtype called with bad ttisstd"
+#~ msgstr "内部错误 - 以错误的 ttisstd 调用 addtype"
+
+#~ msgid "internal error - addtype called with bad ttisgmt"
+#~ msgstr "内部错误 - 以错误的 ttisgmt 调用 addtype"
+
+#~ msgid "time zone abbreviation lacks alphabetic at start"
+#~ msgstr "时区缩写开头缺少字母"
#~ msgid "Try \\`xtrace --help' for more information.\\n"
#~ msgstr "试用“xtrace --help”以获取更多信息。\\n"
@@ -7412,9 +7453,6 @@ msgstr "%s:无法创建目录 %s:%s\n"
#~ msgid "Arg list too long"
#~ msgstr "参数列表过长"
-#~ msgid "Bad file number"
-#~ msgstr "错误的文件编号"
-
#~ msgid "Not enough space"
#~ msgstr "空间不够"
@@ -7592,9 +7630,6 @@ msgstr "%s:无法创建目录 %s:%s\n"
#~ msgid "Cannot send after socket shutdown"
#~ msgstr "无法在套接字关闭后发送"
-#~ msgid "%s: Can't unlink %s: %s\n"
-#~ msgstr "%s:无法解除连接 %s:%s\n"
-
#~ msgid "%s: line %d: expected service, found `%s'\n"
#~ msgstr "%s:行 %d:应为 service,得到“%s”\n"