summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po923
1 files changed, 499 insertions, 424 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2d0cd74645..badaa165ae 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@
msgid ""
msgstr ""
"Project-Id-Version: libc 2.25-pre1\n"
-"POT-Creation-Date: 2018-07-26 22:19-0400\n"
+"POT-Creation-Date: 2019-07-18 13:28-0400\n"
"PO-Revision-Date: 2017-01-11 14:20-0500\n"
"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -154,10 +154,10 @@ msgstr ""
"[输出文件 [输入文件]...]"
#: catgets/gencat.c:229 debug/pcprofiledump.c:209 elf/ldconfig.c:308
-#: elf/pldd.c:252 elf/sln.c:77 elf/sprof.c:372 iconv/iconv_prog.c:405
-#: iconv/iconvconfig.c:379 locale/programs/locale.c:275
-#: locale/programs/localedef.c:427 login/programs/pt_chown.c:89
-#: malloc/memusagestat.c:563 nss/getent.c:933 nss/makedb.c:369
+#: elf/pldd.c:247 elf/sln.c:77 elf/sprof.c:372 iconv/iconv_prog.c:405
+#: iconv/iconvconfig.c:379 locale/programs/locale.c:276
+#: locale/programs/localedef.c:437 login/programs/pt_chown.c:89
+#: malloc/memusagestat.c:563 nss/getent.c:953 nss/makedb.c:369
#: posix/getconf.c:503 sysdeps/unix/sysv/linux/lddlibc4.c:61
#, c-format
msgid ""
@@ -168,11 +168,11 @@ msgstr ""
"%s。\n"
#: catgets/gencat.c:245 debug/pcprofiledump.c:225 debug/xtrace.sh:64
-#: elf/ldconfig.c:324 elf/ldd.bash.in:38 elf/pldd.c:268 elf/sotruss.sh:75
+#: elf/ldconfig.c:324 elf/ldd.bash.in:38 elf/pldd.c:263 elf/sotruss.sh:75
#: elf/sprof.c:389 iconv/iconv_prog.c:422 iconv/iconvconfig.c:396
-#: locale/programs/locale.c:292 locale/programs/localedef.c:453
+#: locale/programs/locale.c:293 locale/programs/localedef.c:463
#: login/programs/pt_chown.c:63 malloc/memusage.sh:71
-#: malloc/memusagestat.c:581 nscd/nscd.c:509 nss/getent.c:87 nss/makedb.c:385
+#: malloc/memusagestat.c:581 nscd/nscd.c:509 nss/getent.c:88 nss/makedb.c:385
#: posix/getconf.c:485 sysdeps/unix/sysv/linux/lddlibc4.c:68
#, c-format
msgid ""
@@ -185,10 +185,10 @@ msgstr ""
"或者适合某些特殊目的。\n"
#: catgets/gencat.c:250 debug/pcprofiledump.c:230 debug/xtrace.sh:68
-#: elf/ldconfig.c:329 elf/pldd.c:273 elf/sprof.c:395 iconv/iconv_prog.c:427
-#: iconv/iconvconfig.c:401 locale/programs/locale.c:297
-#: locale/programs/localedef.c:458 malloc/memusage.sh:75
-#: malloc/memusagestat.c:586 nscd/nscd.c:514 nss/getent.c:92 nss/makedb.c:390
+#: elf/ldconfig.c:329 elf/pldd.c:268 elf/sprof.c:395 iconv/iconv_prog.c:427
+#: iconv/iconvconfig.c:401 locale/programs/locale.c:298
+#: locale/programs/localedef.c:468 malloc/memusage.sh:75
+#: malloc/memusagestat.c:586 nscd/nscd.c:514 nss/getent.c:93 nss/makedb.c:390
#: posix/getconf.c:490
#, c-format
msgid "Written by %s.\n"
@@ -259,21 +259,21 @@ msgstr "无法打开输出文件“%s”"
msgid "invalid escape sequence"
msgstr "无效的转义序列"
-#: catgets/gencat.c:1209
+#: catgets/gencat.c:1211
msgid "unterminated message"
msgstr "未终止的消息"
-#: catgets/gencat.c:1233
+#: catgets/gencat.c:1235
#, c-format
msgid "while opening old catalog file"
msgstr "在打开旧分类文件时"
-#: catgets/gencat.c:1324
+#: catgets/gencat.c:1326
#, c-format
msgid "conversion modules not available"
msgstr "转换模块不可用"
-#: catgets/gencat.c:1350
+#: catgets/gencat.c:1352
#, c-format
msgid "cannot determine escape character"
msgstr "无法确定转义字符"
@@ -400,7 +400,7 @@ msgstr "未知的操作系统"
msgid ", OS ABI: %s %d.%d.%d"
msgstr ", OS ABI: %s %d.%d.%d"
-#: elf/cache.c:163 elf/ldconfig.c:1332
+#: elf/cache.c:163 elf/ldconfig.c:1333
#, c-format
msgid "Can't open cache file %s\n"
msgstr "无法打开缓冲文件 %s\n"
@@ -410,38 +410,38 @@ msgstr "无法打开缓冲文件 %s\n"
msgid "mmap of cache file failed.\n"
msgstr "缓冲文件的 mmap 失败。\n"
-#: elf/cache.c:181 elf/cache.c:195
+#: elf/cache.c:181 elf/cache.c:195 elf/cache.c:205
#, c-format
msgid "File is not a cache file.\n"
msgstr "文件不是缓冲区文件。\n"
-#: elf/cache.c:228 elf/cache.c:238
+#: elf/cache.c:233 elf/cache.c:243
#, c-format
msgid "%d libs found in cache `%s'\n"
msgstr "在缓冲区“%2$s”中找到 %1$d 个库\n"
-#: elf/cache.c:432
+#: elf/cache.c:437
#, c-format
msgid "Can't create temporary cache file %s"
msgstr "无法创建临时缓冲文件 %s"
-#: elf/cache.c:440 elf/cache.c:450 elf/cache.c:454 elf/cache.c:458
-#: elf/cache.c:468
+#: elf/cache.c:445 elf/cache.c:455 elf/cache.c:459 elf/cache.c:463
+#: elf/cache.c:473
#, c-format
msgid "Writing of cache data failed"
msgstr "写缓冲数据失败"
-#: elf/cache.c:463
+#: elf/cache.c:468
#, c-format
msgid "Changing access rights of %s to %#o failed"
msgstr "将 %s 的访问权限改变为 %#o 失败"
-#: elf/cache.c:472
+#: elf/cache.c:477
#, c-format
msgid "Renaming of %s to %s failed"
msgstr "将 %s 改名为 %s 失败"
-#: elf/dl-close.c:399 elf/dl-open.c:420
+#: elf/dl-close.c:399 elf/dl-open.c:424
msgid "cannot create scope list"
msgstr "无法创建范围列表"
@@ -524,122 +524,124 @@ msgstr "无法创建搜索路径数组"
msgid "cannot stat shared object"
msgstr "无法对共享目标进行 stat 操作"
-#: elf/dl-load.c:960
-msgid "cannot open zero fill device"
-msgstr "无法打开零填充设备"
-
-#: elf/dl-load.c:1007 elf/dl-load.c:2203
+#: elf/dl-load.c:992 elf/dl-load.c:2198
msgid "cannot create shared object descriptor"
msgstr "无法创建共享对象描述符"
-#: elf/dl-load.c:1026 elf/dl-load.c:1560 elf/dl-load.c:1673
+#: elf/dl-load.c:1011 elf/dl-load.c:1555 elf/dl-load.c:1668
msgid "cannot read file data"
msgstr "无法读入文件数据"
-#: elf/dl-load.c:1072
+#: elf/dl-load.c:1057
msgid "ELF load command alignment not page-aligned"
msgstr "ELF 加载命令对齐不是按页对齐的"
-#: elf/dl-load.c:1079
+#: elf/dl-load.c:1064
msgid "ELF load command address/offset not properly aligned"
msgstr "ELF 装入命令的地址/偏移量没有正确地对齐"
-#: elf/dl-load.c:1161
+#: elf/dl-load.c:1146
#, fuzzy
#| msgid "cannot restore segment prot after reloc"
msgid "cannot process note segment"
msgstr "重定位后无法恢复段 prot"
-#: elf/dl-load.c:1172
+#: elf/dl-load.c:1157
msgid "object file has no loadable segments"
msgstr "目标文件没有可加载段"
-#: elf/dl-load.c:1181 elf/dl-load.c:1652
+#: elf/dl-load.c:1170 elf/dl-load.c:1647
msgid "cannot dynamically load executable"
msgstr "无法动态装入可执行文件"
-#: elf/dl-load.c:1202
+#: elf/dl-load.c:1191
msgid "object file has no dynamic section"
msgstr "目标文件没有动态节"
-#: elf/dl-load.c:1225
+#: elf/dl-load.c:1218
+#, fuzzy
+#| msgid "cannot dynamically load executable"
+msgid "cannot dynamically load position-independent executable"
+msgstr "无法动态装入可执行文件"
+
+#: elf/dl-load.c:1220
msgid "shared object cannot be dlopen()ed"
msgstr "无法用 dlopen() 打开共享库"
-#: elf/dl-load.c:1238
+#: elf/dl-load.c:1233
msgid "cannot allocate memory for program header"
msgstr "无法为程序头分配内存"
-#: elf/dl-load.c:1271 elf/dl-load.h:130
+#: elf/dl-load.c:1266 elf/dl-load.h:130
msgid "cannot change memory protections"
msgstr "无法改变内存保护"
-#: elf/dl-load.c:1291
+#: elf/dl-load.c:1286
msgid "cannot enable executable stack as shared object requires"
msgstr "无法启用共享目标需要的执行栈"
-#: elf/dl-load.c:1304
+#: elf/dl-load.c:1299
msgid "cannot close file descriptor"
msgstr "无法关闭文件描述符"
-#: elf/dl-load.c:1560
+#: elf/dl-load.c:1555
msgid "file too short"
msgstr "文件过短"
-#: elf/dl-load.c:1595
+#: elf/dl-load.c:1590
msgid "invalid ELF header"
msgstr "无效的 ELF 头"
-#: elf/dl-load.c:1607
+#: elf/dl-load.c:1602
msgid "ELF file data encoding not big-endian"
msgstr "ELF 文件数据编码不是大端序"
-#: elf/dl-load.c:1609
+#: elf/dl-load.c:1604
msgid "ELF file data encoding not little-endian"
msgstr "ELF 文件数据编码不是小端序"
# e_ident[]
-#: elf/dl-load.c:1613
+#: elf/dl-load.c:1608
msgid "ELF file version ident does not match current one"
msgstr "ELF 文件的版本信息不符合目前所使用的"
-#: elf/dl-load.c:1617
+#: elf/dl-load.c:1612
msgid "ELF file OS ABI invalid"
msgstr "ELF 文件 OS ABI 无效"
-#: elf/dl-load.c:1620
+#: elf/dl-load.c:1615
msgid "ELF file ABI version invalid"
msgstr "ELF 文件 ABI 版本无效"
-#: elf/dl-load.c:1623
+#: elf/dl-load.c:1618
msgid "nonzero padding in e_ident"
msgstr "在 e_ident 中填补非零值"
-#: elf/dl-load.c:1626
+#: elf/dl-load.c:1621
msgid "internal error"
msgstr "内部错误"
-#: elf/dl-load.c:1633
+#: elf/dl-load.c:1628
msgid "ELF file version does not match current one"
msgstr "ELF 文件版本与当前版本不匹配"
-#: elf/dl-load.c:1641
+#: elf/dl-load.c:1636
msgid "only ET_DYN and ET_EXEC can be loaded"
msgstr "只有 ET_DYN 以及 ET_EXEC 可以加载"
-#: elf/dl-load.c:1657
+#: elf/dl-load.c:1652
msgid "ELF file's phentsize not the expected size"
msgstr "ELF 文件的标头项目大小(phentsize)出乎意料"
-#: elf/dl-load.c:2222
+#: elf/dl-load.c:2217
msgid "wrong ELF class: ELFCLASS64"
msgstr "ELF 类不对:ELFCLASS64"
-#: elf/dl-load.c:2223
+#: elf/dl-load.c:2218
msgid "wrong ELF class: ELFCLASS32"
msgstr "ELF 类不对:ELFCLASS32"
-#: elf/dl-load.c:2226
+#: elf/dl-load.c:2221
msgid "cannot open shared object file"
msgstr "无法打开共享对象文件"
@@ -651,11 +653,7 @@ msgstr "无法从共享目标中映射段"
msgid "cannot map zero-fill pages"
msgstr "无法映射用零填充的页"
-#: elf/dl-lookup.c:835
-msgid "relocation error"
-msgstr "重定位错误"
-
-#: elf/dl-lookup.c:858
+#: elf/dl-lookup.c:830
msgid "symbol lookup error"
msgstr "符号查询错误"
@@ -663,19 +661,19 @@ msgstr "符号查询错误"
msgid "cannot extend global scope"
msgstr "无法扩展全局范围"
-#: elf/dl-open.c:470
+#: elf/dl-open.c:474
msgid "TLS generation counter wrapped! Please report this."
msgstr "TLS 产生计数器被转换运行! 请报告这个情况。"
-#: elf/dl-open.c:534
+#: elf/dl-open.c:538
msgid "invalid mode for dlopen()"
msgstr "无效的 dlopen() 模式"
-#: elf/dl-open.c:551
+#: elf/dl-open.c:555
msgid "no more namespaces available for dlmopen()"
msgstr "无更多命名空间可见于 dlmopen ()"
-#: elf/dl-open.c:575
+#: elf/dl-open.c:579
msgid "invalid target namespace in dlmopen()"
msgstr "dlmopen() 中无效的目标名字空间"
@@ -683,20 +681,20 @@ msgstr "dlmopen() 中无效的目标名字空间"
msgid "cannot allocate memory in static TLS block"
msgstr "无法在静态 TLS 块中分配内存"
-#: elf/dl-reloc.c:205
+#: elf/dl-reloc.c:213
msgid "cannot make segment writable for relocation"
msgstr "在重新寻址以后无法将节设为可写入状态"
-#: elf/dl-reloc.c:276
+#: elf/dl-reloc.c:272
#, c-format
msgid "%s: out of memory to store relocation results for %s\n"
msgstr "%s: 内存不足以保存重寻址结果用于 %s\n"
-#: elf/dl-reloc.c:292
+#: elf/dl-reloc.c:288
msgid "cannot restore segment prot after reloc"
msgstr "重定位后无法恢复段 prot"
-#: elf/dl-reloc.c:323
+#: elf/dl-reloc.c:319
msgid "cannot apply additional memory protection after relocation"
msgstr "无法在重定位后应用额外的内存保护"
@@ -914,22 +912,22 @@ msgstr "需要绝对文件名称用于组态文件时正在使用 -r"
msgid "memory exhausted"
msgstr "内存耗尽"
-#: elf/ldconfig.c:1233
+#: elf/ldconfig.c:1234
#, c-format
msgid "%s:%u: cannot read directory %s"
msgstr "%s:%u: 无法读取目录 %s"
-#: elf/ldconfig.c:1281
+#: elf/ldconfig.c:1282
#, c-format
msgid "relative path `%s' used to build cache"
msgstr "用来建置缓存的相对路径 `%s'"
-#: elf/ldconfig.c:1311
+#: elf/ldconfig.c:1312
#, c-format
msgid "Can't chdir to /"
msgstr "无法改变目录到 /"
-#: elf/ldconfig.c:1352
+#: elf/ldconfig.c:1353
#, c-format
msgid "Can't open cache file directory %s\n"
msgstr "无法打开缓冲文件目录 %s\n"
@@ -999,95 +997,101 @@ msgstr "以未知的退出码退出"
msgid "error: you do not have read permission for"
msgstr "错误: 你没有读权限 "
-#: elf/pldd-xx.c:105
+#: elf/pldd-xx.c:102
#, c-format
msgid "cannot find program header of process"
msgstr "找不到进程的程序标头"
-#: elf/pldd-xx.c:110
+#: elf/pldd-xx.c:106
#, c-format
msgid "cannot read program header"
msgstr "无法读取程序标头"
-#: elf/pldd-xx.c:135
+#: elf/pldd-xx.c:128
#, c-format
msgid "cannot read dynamic section"
msgstr "无法读取动态节"
-#: elf/pldd-xx.c:147
+#: elf/pldd-xx.c:137
#, c-format
msgid "cannot read r_debug"
msgstr "无法读取 r_debug"
-#: elf/pldd-xx.c:167
+#: elf/pldd-xx.c:154
#, c-format
msgid "cannot read program interpreter"
msgstr "无法读取程序解译器"
-#: elf/pldd-xx.c:197
+#: elf/pldd-xx.c:183
#, c-format
msgid "cannot read link map"
msgstr "无法读取链结映射"
-#: elf/pldd-xx.c:209
+#: elf/pldd-xx.c:190
#, c-format
msgid "cannot read object name"
msgstr "无法读取对象名称"
-#: elf/pldd-xx.c:219
+#: elf/pldd-xx.c:197
#, c-format
msgid "cannot allocate buffer for object name"
msgstr "无法为对象名称分配缓冲区"
-#: elf/pldd.c:64
+#: elf/pldd.c:58
msgid "List dynamic shared objects loaded into process."
msgstr "列出已加载进程中的动态共用对象。"
-#: elf/pldd.c:68
+#: elf/pldd.c:62
msgid "PID"
msgstr "进程识别号"
-#: elf/pldd.c:100
+#: elf/pldd.c:89
#, c-format
msgid "Exactly one parameter with process ID required.\n"
msgstr "需要刚好一个附有进程识别号的参数。\n"
-#: elf/pldd.c:112
+#: elf/pldd.c:103
#, c-format
msgid "invalid process ID '%s'"
msgstr "无效的进程识别号 %s"
-#: elf/pldd.c:120
+#: elf/pldd.c:111
#, c-format
msgid "cannot open %s"
msgstr "无法打开 %s"
-#: elf/pldd.c:152
+#: elf/pldd.c:142
#, c-format
msgid "cannot open %s/task"
msgstr "无法打开 %s/任务"
-#: elf/pldd.c:155
+#: elf/pldd.c:145
#, c-format
msgid "cannot prepare reading %s/task"
msgstr "无法准备读取 %s/任务"
-#: elf/pldd.c:168
+#: elf/pldd.c:158
#, c-format
msgid "invalid thread ID '%s'"
msgstr "无效的线程识别号 %s"
-#: elf/pldd.c:179
+#: elf/pldd.c:169
#, c-format
msgid "cannot attach to process %lu"
msgstr "无法附加到进程 %lu"
-#: elf/pldd.c:294
+# zic_t r_stdoff; /* offset from standard time */
+#: elf/pldd.c:184
+#, fuzzy, c-format
+msgid "no valid %s/task entries"
+msgstr "无效的保存时间"
+
+#: elf/pldd.c:290
#, c-format
msgid "cannot get information about process %lu"
msgstr "无法获得进程 %lu 的相关信息"
-#: elf/pldd.c:307
+#: elf/pldd.c:303
#, c-format
msgid "process %lu is no ELF program"
msgstr "进程 %lu 并非 ELF 程序"
@@ -1407,7 +1411,7 @@ msgstr "信息:"
msgid "list all known coded character sets"
msgstr "列举所有已知的字符集"
-#: iconv/iconv_prog.c:64 locale/programs/localedef.c:120
+#: iconv/iconv_prog.c:64 locale/programs/localedef.c:124
msgid "Output control:"
msgstr "输出控制:"
@@ -1416,8 +1420,8 @@ msgid "omit invalid characters from output"
msgstr "从输出中忽略无效的字符"
#: iconv/iconv_prog.c:66 iconv/iconvconfig.c:128
-#: locale/programs/localedef.c:113 locale/programs/localedef.c:115
-#: locale/programs/localedef.c:117 locale/programs/localedef.c:144
+#: locale/programs/localedef.c:117 locale/programs/localedef.c:119
+#: locale/programs/localedef.c:121 locale/programs/localedef.c:150
#: malloc/memusagestat.c:56
msgid "FILE"
msgstr "文件"
@@ -1515,7 +1519,7 @@ msgstr "创建快速装入 iconv 模块配置文件。"
msgid "[DIR...]"
msgstr "[目录...]"
-#: iconv/iconvconfig.c:126 locale/programs/localedef.c:123
+#: iconv/iconvconfig.c:126 locale/programs/localedef.c:129
msgid "PATH"
msgstr "路径"
@@ -1702,14 +1706,14 @@ msgstr "不支持带有锁定状态的字符集"
#: locale/programs/charmap.c:503 locale/programs/charmap.c:557
#: locale/programs/charmap.c:589 locale/programs/charmap.c:683
-#: locale/programs/charmap.c:738 locale/programs/charmap.c:779
-#: locale/programs/charmap.c:820
+#: locale/programs/charmap.c:739 locale/programs/charmap.c:780
+#: locale/programs/charmap.c:821
#, c-format
msgid "syntax error in %s definition: %s"
msgstr "%s 的定义中的语法错误:%s"
#: locale/programs/charmap.c:504 locale/programs/charmap.c:684
-#: locale/programs/charmap.c:780 locale/programs/repertoire.c:229
+#: locale/programs/charmap.c:781 locale/programs/repertoire.c:229
msgid "no symbolic name given"
msgstr "没有给出符号名"
@@ -1725,14 +1729,14 @@ msgstr "字符编码中字节数过少"
msgid "too many bytes in character encoding"
msgstr "字符编码中字节数过多"
-#: locale/programs/charmap.c:591 locale/programs/charmap.c:739
-#: locale/programs/charmap.c:822 locale/programs/repertoire.c:295
+#: locale/programs/charmap.c:591 locale/programs/charmap.c:740
+#: locale/programs/charmap.c:823 locale/programs/repertoire.c:295
msgid "no symbolic name given for end of range"
msgstr "没有为范围的结束给出符号化的名称"
#: locale/programs/charmap.c:615 locale/programs/ld-address.c:524
#: locale/programs/ld-collate.c:2616 locale/programs/ld-collate.c:3774
-#: locale/programs/ld-ctype.c:2117 locale/programs/ld-ctype.c:2829
+#: locale/programs/ld-ctype.c:2118 locale/programs/ld-ctype.c:2830
#: locale/programs/ld-identification.c:397
#: locale/programs/ld-measurement.c:213 locale/programs/ld-messages.c:295
#: locale/programs/ld-monetary.c:748 locale/programs/ld-name.c:262
@@ -1747,58 +1751,58 @@ msgstr "%1$s:定义不以“END %1$s”结尾"
msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
msgstr "只有 WIDTH 定义才能直接写在 CHARMAP 定义之后"
-#: locale/programs/charmap.c:656 locale/programs/charmap.c:719
+#: locale/programs/charmap.c:656 locale/programs/charmap.c:720
#, c-format
msgid "value for %s must be an integer"
msgstr "%s 的值必须为整数"
-#: locale/programs/charmap.c:847
+#: locale/programs/charmap.c:848
#, c-format
msgid "%s: error in state machine"
msgstr "%s:状态机出错"
-#: locale/programs/charmap.c:855 locale/programs/ld-address.c:540
+#: locale/programs/charmap.c:856 locale/programs/ld-address.c:540
#: locale/programs/ld-collate.c:2613 locale/programs/ld-collate.c:3967
-#: locale/programs/ld-ctype.c:2114 locale/programs/ld-ctype.c:2846
+#: locale/programs/ld-ctype.c:2115 locale/programs/ld-ctype.c:2847
#: locale/programs/ld-identification.c:413
#: locale/programs/ld-measurement.c:229 locale/programs/ld-messages.c:311
#: locale/programs/ld-monetary.c:764 locale/programs/ld-name.c:278
#: locale/programs/ld-numeric.c:341 locale/programs/ld-paper.c:228
#: locale/programs/ld-telephone.c:292 locale/programs/ld-time.c:990
-#: locale/programs/locfile.c:997 locale/programs/repertoire.c:323
+#: locale/programs/locfile.c:1010 locale/programs/repertoire.c:323
#, c-format
msgid "%s: premature end of file"
msgstr "%s:文件不完整"
-#: locale/programs/charmap.c:874 locale/programs/charmap.c:885
+#: locale/programs/charmap.c:875 locale/programs/charmap.c:886
#, c-format
msgid "unknown character `%s'"
msgstr "未知的字符“%s”"
-#: locale/programs/charmap.c:893
+#: locale/programs/charmap.c:894
#, c-format
msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
msgstr "在范围起始与结束的字节序列中,字节的数目并不一致: %d vs %d"
-#: locale/programs/charmap.c:998 locale/programs/ld-collate.c:2893
+#: locale/programs/charmap.c:999 locale/programs/ld-collate.c:2893
#: locale/programs/repertoire.c:418
msgid "invalid names for character range"
msgstr "无效的字符范围名称"
-#: locale/programs/charmap.c:1010 locale/programs/repertoire.c:430
+#: locale/programs/charmap.c:1011 locale/programs/repertoire.c:430
msgid "hexadecimal range format should use only capital characters"
msgstr "在表示十六进制的范围时只能用大写的英文本母表示"
-#: locale/programs/charmap.c:1028 locale/programs/repertoire.c:448
+#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:448
#, c-format
msgid "<%s> and <%s> are invalid names for range"
msgstr "<%s> 和 <%s> 是无效的范围名"
-#: locale/programs/charmap.c:1034 locale/programs/repertoire.c:455
+#: locale/programs/charmap.c:1035 locale/programs/repertoire.c:455
msgid "upper limit in range is smaller than lower limit"
msgstr "范围的上限小于下限"
-#: locale/programs/charmap.c:1092
+#: locale/programs/charmap.c:1093
msgid "resulting bytes for range not representable."
msgstr "用来定义范围的字节无法被表述出来"
@@ -1867,7 +1871,7 @@ msgid "%s: numeric country code `%d' not valid"
msgstr "%s:数值国家编码“%d”无效"
#: locale/programs/ld-address.c:432 locale/programs/ld-address.c:469
-#: locale/programs/ld-address.c:507 locale/programs/ld-ctype.c:2478
+#: locale/programs/ld-address.c:507 locale/programs/ld-ctype.c:2479
#: locale/programs/ld-identification.c:309
#: locale/programs/ld-measurement.c:196 locale/programs/ld-messages.c:264
#: locale/programs/ld-monetary.c:503 locale/programs/ld-monetary.c:538
@@ -1890,7 +1894,7 @@ msgid "%s: unknown character in field `%s'"
msgstr "%s:域“%s”中含有未知字符"
#: locale/programs/ld-address.c:521 locale/programs/ld-collate.c:3772
-#: locale/programs/ld-ctype.c:2826 locale/programs/ld-identification.c:394
+#: locale/programs/ld-ctype.c:2827 locale/programs/ld-identification.c:394
#: locale/programs/ld-measurement.c:210 locale/programs/ld-messages.c:293
#: locale/programs/ld-monetary.c:746 locale/programs/ld-name.c:260
#: locale/programs/ld-numeric.c:323 locale/programs/ld-paper.c:210
@@ -1903,8 +1907,8 @@ msgstr "%s:不完整的“END”行"
#: locale/programs/ld-collate.c:602 locale/programs/ld-collate.c:898
#: locale/programs/ld-collate.c:911 locale/programs/ld-collate.c:2582
#: locale/programs/ld-collate.c:2603 locale/programs/ld-collate.c:3957
-#: locale/programs/ld-ctype.c:1846 locale/programs/ld-ctype.c:2104
-#: locale/programs/ld-ctype.c:2676 locale/programs/ld-ctype.c:2837
+#: locale/programs/ld-ctype.c:1847 locale/programs/ld-ctype.c:2105
+#: locale/programs/ld-ctype.c:2677 locale/programs/ld-ctype.c:2838
#: locale/programs/ld-identification.c:404
#: locale/programs/ld-measurement.c:220 locale/programs/ld-messages.c:302
#: locale/programs/ld-monetary.c:755 locale/programs/ld-name.c:269
@@ -2248,131 +2252,131 @@ msgstr "字集对照表 `%s' 已经定义过了"
msgid "implementation limit: no more than %d character maps allowed"
msgstr "实现限制:不得多于 %d 个字符映射表"
-#: locale/programs/ld-ctype.c:1434 locale/programs/ld-ctype.c:1559
-#: locale/programs/ld-ctype.c:1665 locale/programs/ld-ctype.c:2341
-#: locale/programs/ld-ctype.c:3299
+#: locale/programs/ld-ctype.c:1435 locale/programs/ld-ctype.c:1560
+#: locale/programs/ld-ctype.c:1666 locale/programs/ld-ctype.c:2342
+#: locale/programs/ld-ctype.c:3302
#, c-format
msgid "%s: field `%s' does not contain exactly ten entries"
msgstr "%s:域“%s”含有条目的个数不是十个"
-#: locale/programs/ld-ctype.c:1462 locale/programs/ld-ctype.c:2036
+#: locale/programs/ld-ctype.c:1463 locale/programs/ld-ctype.c:2037
#, c-format
msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
msgstr "区域定义的结尾值 <U%0*X> 比起始值 <U%0*X> 还要小"
-#: locale/programs/ld-ctype.c:1589
+#: locale/programs/ld-ctype.c:1590
msgid "start and end character sequence of range must have the same length"
msgstr "范围的起始和终止字符序列必须具有相同的长度"
-#: locale/programs/ld-ctype.c:1596
+#: locale/programs/ld-ctype.c:1597
msgid "to-value character sequence is smaller than from-value sequence"
msgstr "字符序列定义的结尾值比起始值还要小"
-#: locale/programs/ld-ctype.c:1956 locale/programs/ld-ctype.c:2007
+#: locale/programs/ld-ctype.c:1957 locale/programs/ld-ctype.c:2008
msgid "premature end of `translit_ignore' definition"
msgstr "`translit_ignore' 定义没有按时结束"
-#: locale/programs/ld-ctype.c:1962 locale/programs/ld-ctype.c:2013
-#: locale/programs/ld-ctype.c:2055
+#: locale/programs/ld-ctype.c:1963 locale/programs/ld-ctype.c:2014
+#: locale/programs/ld-ctype.c:2056
msgid "syntax error"
msgstr "语法错误"
-#: locale/programs/ld-ctype.c:2188
+#: locale/programs/ld-ctype.c:2189
#, c-format
msgid "%s: syntax error in definition of new character class"
msgstr "%s:在定义新字符集合中出现语法错误"
-#: locale/programs/ld-ctype.c:2203
+#: locale/programs/ld-ctype.c:2204
#, c-format
msgid "%s: syntax error in definition of new character map"
msgstr "%s:在新字符映射中出现语法错误"
-#: locale/programs/ld-ctype.c:2363
+#: locale/programs/ld-ctype.c:2364
msgid "ellipsis range must be marked by two operands of same type"
msgstr "省略区域必须用两个型别相同的算符标示出来"
-#: locale/programs/ld-ctype.c:2372
+#: locale/programs/ld-ctype.c:2373
msgid "with symbolic name range values the absolute ellipsis `...' must not be used"
msgstr "用符号名称来指定字符编码范围时不可以用绝对位置的省略符号 `…'"
-#: locale/programs/ld-ctype.c:2387
+#: locale/programs/ld-ctype.c:2388
msgid "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
msgstr "用来指定 UCS 值的范围时得用十六进制表示的省略符号 `..'"
-#: locale/programs/ld-ctype.c:2401
+#: locale/programs/ld-ctype.c:2402
msgid "with character code range values one must use the absolute ellipsis `...'"
msgstr "用来指定字符编码值的范围时得用绝对位置的省略符号 `…'"
-#: locale/programs/ld-ctype.c:2552
+#: locale/programs/ld-ctype.c:2553
#, c-format
msgid "duplicated definition for mapping `%s'"
msgstr "重复定义映射“%s”"
-#: locale/programs/ld-ctype.c:2638 locale/programs/ld-ctype.c:2782
+#: locale/programs/ld-ctype.c:2639 locale/programs/ld-ctype.c:2783
#, c-format
msgid "%s: `translit_start' section does not end with `translit_end'"
msgstr "%s:“translit_start”节不以“translit_end”结束"
-#: locale/programs/ld-ctype.c:2733
+#: locale/programs/ld-ctype.c:2734
#, c-format
msgid "%s: duplicate `default_missing' definition"
msgstr "%s:重复定义“default_missing”"
-#: locale/programs/ld-ctype.c:2738
+#: locale/programs/ld-ctype.c:2739
msgid "previous definition was here"
msgstr "前一个定义在这里"
-#: locale/programs/ld-ctype.c:2760
+#: locale/programs/ld-ctype.c:2761
#, c-format
msgid "%s: no representable `default_missing' definition found"
msgstr "%s: 找不到可表示为 `default_missing' 的定义"
-#: locale/programs/ld-ctype.c:2877 locale/programs/ld-ctype.c:2973
-#: locale/programs/ld-ctype.c:2992 locale/programs/ld-ctype.c:3012
-#: locale/programs/ld-ctype.c:3032 locale/programs/ld-ctype.c:3052
-#: locale/programs/ld-ctype.c:3072 locale/programs/ld-ctype.c:3111
-#: locale/programs/ld-ctype.c:3131 locale/programs/ld-ctype.c:3195
-#: locale/programs/ld-ctype.c:3236 locale/programs/ld-ctype.c:3259
+#: locale/programs/ld-ctype.c:2878 locale/programs/ld-ctype.c:2974
+#: locale/programs/ld-ctype.c:2993 locale/programs/ld-ctype.c:3013
+#: locale/programs/ld-ctype.c:3033 locale/programs/ld-ctype.c:3053
+#: locale/programs/ld-ctype.c:3073 locale/programs/ld-ctype.c:3112
+#: locale/programs/ld-ctype.c:3132 locale/programs/ld-ctype.c:3198
+#: locale/programs/ld-ctype.c:3239 locale/programs/ld-ctype.c:3262
#, c-format
msgid "%s: character `%s' not defined while needed as default value"
msgstr "%s: 字符 `%s' 没有定义,但它是必需的默认值"
-#: locale/programs/ld-ctype.c:2882 locale/programs/ld-ctype.c:2978
-#: locale/programs/ld-ctype.c:2997 locale/programs/ld-ctype.c:3017
-#: locale/programs/ld-ctype.c:3037 locale/programs/ld-ctype.c:3057
-#: locale/programs/ld-ctype.c:3077 locale/programs/ld-ctype.c:3116
-#: locale/programs/ld-ctype.c:3136 locale/programs/ld-ctype.c:3200
+#: locale/programs/ld-ctype.c:2883 locale/programs/ld-ctype.c:2979
+#: locale/programs/ld-ctype.c:2998 locale/programs/ld-ctype.c:3018
+#: locale/programs/ld-ctype.c:3038 locale/programs/ld-ctype.c:3058
+#: locale/programs/ld-ctype.c:3078 locale/programs/ld-ctype.c:3117
+#: locale/programs/ld-ctype.c:3137 locale/programs/ld-ctype.c:3203
#, c-format
msgid "%s: character `%s' in charmap not representable with one byte"
msgstr "%s: 字集对照表中的字符 `%s' 无法表示为单一字节"
-#: locale/programs/ld-ctype.c:3242 locale/programs/ld-ctype.c:3265
+#: locale/programs/ld-ctype.c:3245 locale/programs/ld-ctype.c:3268
#, c-format
msgid "%s: character `%s' needed as default value not representable with one byte"
msgstr "%s:需要作为默认值的字符“%s”无法以单个字节来表示"
-#: locale/programs/ld-ctype.c:3321
+#: locale/programs/ld-ctype.c:3324
msgid "no output digits defined and none of the standard names in the charmap"
msgstr "没有定义输出数字,在字集对照表中也找不到相符的标准名称"
-#: locale/programs/ld-ctype.c:3570
+#: locale/programs/ld-ctype.c:3573
#, c-format
msgid "%s: transliteration data from locale `%s' not available"
msgstr "%s: 语区数据`%s' 的音译数据不存在"
-#: locale/programs/ld-ctype.c:3669
+#: locale/programs/ld-ctype.c:3672
#, fuzzy, c-format
#| msgid "%s: table for class \"%s\": %lu bytes\n"
msgid "%s: table for class \"%s\": %lu bytes"
msgstr "%s: 类别 \"%s\" 表格: %lu 字节\n"
-#: locale/programs/ld-ctype.c:3733
+#: locale/programs/ld-ctype.c:3736
#, fuzzy, c-format
#| msgid "%s: table for map \"%s\": %lu bytes\n"
msgid "%s: table for map \"%s\": %lu bytes"
msgstr "%s: 映射表 \"%s\" 表格: %lu 字节\n"
-#: locale/programs/ld-ctype.c:3857
+#: locale/programs/ld-ctype.c:3860
#, fuzzy, c-format
#| msgid "%s: table for width: %lu bytes\n"
msgid "%s: table for width: %lu bytes"
@@ -2616,122 +2620,117 @@ msgstr ""
"名称\n"
"[-a|-m]"
-#: locale/programs/locale.c:190
+#: locale/programs/locale.c:522
#, c-format
-msgid "Cannot set LC_CTYPE to default locale"
-msgstr "无法将 LC_CTYPE 设置为缺省的语区"
-
-#: locale/programs/locale.c:192
-#, c-format
-msgid "Cannot set LC_MESSAGES to default locale"
-msgstr "无法将 LC_MESSAGES 设置为缺省的语区"
-
-#: locale/programs/locale.c:205
-#, c-format
-msgid "Cannot set LC_COLLATE to default locale"
-msgstr "无法将 LC_COLLATE 设置为缺省的语区"
+msgid "while preparing output"
+msgstr "准备输出时"
-#: locale/programs/locale.c:221
-#, c-format
-msgid "Cannot set LC_ALL to default locale"
+#: locale/programs/locale.c:998
+#, fuzzy, c-format
+#| msgid "Cannot set LC_ALL to default locale"
+msgid "Cannot set %s to default locale"
msgstr "无法将 LC_ALL 设置为缺省的语区"
-#: locale/programs/locale.c:521
+#: locale/programs/locale.c:1096
#, c-format
-msgid "while preparing output"
-msgstr "准备输出时"
+msgid "warning: The LOCPATH variable is set to \"%s\"\n"
+msgstr ""
-#: locale/programs/localedef.c:112
+#: locale/programs/localedef.c:116
msgid "Input Files:"
msgstr "输入文件:"
-#: locale/programs/localedef.c:114
+#: locale/programs/localedef.c:118
msgid "Symbolic character names defined in FILE"
msgstr "符号字符的名称定义在文件 FILE 中"
-#: locale/programs/localedef.c:116
+#: locale/programs/localedef.c:120
msgid "Source definitions are found in FILE"
msgstr "在 FILE 中找到源定义"
-#: locale/programs/localedef.c:118
+#: locale/programs/localedef.c:122
msgid "FILE contains mapping from symbolic names to UCS4 values"
msgstr "文件 FILE 内含符号名与 UCS4 编码之间的映射"
-#: locale/programs/localedef.c:122
+#: locale/programs/localedef.c:126
msgid "Create output even if warning messages were issued"
msgstr "即使出现警告消息也创建输出"
-#: locale/programs/localedef.c:123
+#: locale/programs/localedef.c:128
+msgid "Do not create hard links between installed locales"
+msgstr ""
+
+#: locale/programs/localedef.c:129
msgid "Optional output file prefix"
msgstr "可选的输出文件前缀"
-#: locale/programs/localedef.c:124
+#: locale/programs/localedef.c:130
msgid "Strictly conform to POSIX"
msgstr "严格遵从 POSIX"
-#: locale/programs/localedef.c:126
+#: locale/programs/localedef.c:132
msgid "Suppress warnings and information messages"
msgstr "关闭警告和信息消息"
-#: locale/programs/localedef.c:127
+#: locale/programs/localedef.c:133
msgid "Print more messages"
msgstr "打印更多消息"
-#: locale/programs/localedef.c:128 locale/programs/localedef.c:131
+#: locale/programs/localedef.c:134 locale/programs/localedef.c:137
#, fuzzy
#| msgid "warning: "
msgid "<warnings>"
msgstr "警告:"
-#: locale/programs/localedef.c:129
+#: locale/programs/localedef.c:135
msgid "Comma-separated list of warnings to disable; supported warnings are: ascii, intcurrsym"
msgstr ""
-#: locale/programs/localedef.c:132
+#: locale/programs/localedef.c:138
msgid "Comma-separated list of warnings to enable; supported warnings are: ascii, intcurrsym"
msgstr ""
-#: locale/programs/localedef.c:135
+#: locale/programs/localedef.c:141
msgid "Archive control:"
msgstr "归档控制:"
-#: locale/programs/localedef.c:137
+#: locale/programs/localedef.c:143
msgid "Don't add new data to archive"
msgstr "不要将新数据添加到归档文件中"
-#: locale/programs/localedef.c:139
+#: locale/programs/localedef.c:145
msgid "Add locales named by parameters to archive"
msgstr "将由参数命名的区域添加到归档文件中"
-#: locale/programs/localedef.c:140
+#: locale/programs/localedef.c:146
msgid "Replace existing archive content"
msgstr "替换现有的归档文件内容"
-#: locale/programs/localedef.c:142
+#: locale/programs/localedef.c:148
msgid "Remove locales named by parameters from archive"
msgstr "从归档文件中删除由参数命名的区域"
-#: locale/programs/localedef.c:143
+#: locale/programs/localedef.c:149
msgid "List content of archive"
msgstr "列出归档文件的内容"
-#: locale/programs/localedef.c:145
+#: locale/programs/localedef.c:151
msgid "locale.alias file to consult when making archive"
msgstr "在制作归档文件时参考 locale.alias 文件"
-#: locale/programs/localedef.c:147
+#: locale/programs/localedef.c:153
msgid "Generate little-endian output"
msgstr "生成小端序输出"
-#: locale/programs/localedef.c:149
+#: locale/programs/localedef.c:155
msgid "Generate big-endian output"
msgstr "生成大端序输出"
-#: locale/programs/localedef.c:154
+#: locale/programs/localedef.c:160
msgid "Compile locale specification"
msgstr "编译区域规范"
-#: locale/programs/localedef.c:157
+#: locale/programs/localedef.c:163
msgid ""
"NAME\n"
"[--add-to-archive|--delete-from-archive] FILE...\n"
@@ -2741,33 +2740,33 @@ msgstr ""
"[--add-to-archive|--delete-from-archive] 文件...\n"
"--list-archive [文件]"
-#: locale/programs/localedef.c:232
+#: locale/programs/localedef.c:238
#, c-format
msgid "cannot create directory for output files"
msgstr "无法为输出文件创建目录"
-#: locale/programs/localedef.c:243
+#: locale/programs/localedef.c:249
msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
msgstr "致命错误:系统未定义“_POSIX2_LOCALEDEF”"
-#: locale/programs/localedef.c:257 locale/programs/localedef.c:273
-#: locale/programs/localedef.c:663 locale/programs/localedef.c:683
+#: locale/programs/localedef.c:263 locale/programs/localedef.c:279
+#: locale/programs/localedef.c:673 locale/programs/localedef.c:693
#, c-format
msgid "cannot open locale definition file `%s'"
msgstr "无法打开区域定义文件“%s”"
-#: locale/programs/localedef.c:297
+#: locale/programs/localedef.c:303
#, c-format
msgid "cannot write output files to `%s'"
msgstr "无法将输出文件写入“%s”"
-#: locale/programs/localedef.c:303
+#: locale/programs/localedef.c:309
#, fuzzy
#| msgid "no output file produced because warnings were issued"
msgid "no output file produced because errors were issued"
msgstr "由于出现警告而未生成输出文件"
-#: locale/programs/localedef.c:431
+#: locale/programs/localedef.c:441
#, c-format
msgid ""
"System's directory for character maps : %s\n"
@@ -2780,11 +2779,11 @@ msgstr ""
"\t\t 语区路径 :%s\n"
"%s"
-#: locale/programs/localedef.c:631
+#: locale/programs/localedef.c:641
msgid "circular dependencies between locale definitions"
msgstr "区域定义中的循环倚赖"
-#: locale/programs/localedef.c:637
+#: locale/programs/localedef.c:647
#, c-format
msgid "cannot add already read locale `%s' a second time"
msgstr "无法再次添加已经读入的“%s”"
@@ -2940,24 +2939,24 @@ msgstr "无法为范畴“%2$s”打开输出文件“%1$s”"
msgid "failure while writing data for category `%s'"
msgstr "为范畴“%s”写入数据失败"
-#: locale/programs/locfile.c:917
+#: locale/programs/locfile.c:930
#, c-format
msgid "cannot create output file `%s' for category `%s'"
msgstr "无法为范畴“%2$s”创建输出文件“%1$s”"
-#: locale/programs/locfile.c:953
+#: locale/programs/locfile.c:966
msgid "expecting string argument for `copy'"
msgstr "`copy' 的参数应该是字串才对"
-#: locale/programs/locfile.c:957
+#: locale/programs/locfile.c:970
msgid "locale name should consist only of portable characters"
msgstr "区域名称应该仅由可移植的字符组成"
-#: locale/programs/locfile.c:976
+#: locale/programs/locfile.c:989
msgid "no other keyword shall be specified when `copy' is used"
msgstr "使用“copy”时不应再使用其它关键字"
-#: locale/programs/locfile.c:990
+#: locale/programs/locfile.c:1003
#, c-format
msgid "`%1$s' definition does not end with `END %1$s'"
msgstr "对“%1$s”的定义并不以“END %1%s”结束"
@@ -3789,12 +3788,12 @@ msgstr "yp_update:无法将主机名转换为网名\n"
msgid "yp_update: cannot get server address\n"
msgstr "yp_update:无法获取服务器地址\n"
-#: nscd/aicache.c:83 nscd/hstcache.c:452
+#: nscd/aicache.c:82 nscd/hstcache.c:452
#, c-format
msgid "Haven't found \"%s\" in hosts cache!"
msgstr "无法在主机缓冲区中找到“%s”!"
-#: nscd/aicache.c:85 nscd/hstcache.c:454
+#: nscd/aicache.c:84 nscd/hstcache.c:454
#, c-format
msgid "Reloading \"%s\" in hosts cache!"
msgstr "在主机缓冲区中重新加载“%s”!"
@@ -4116,22 +4115,22 @@ msgstr "在 %2$s 缓存中 %1$zu 字节可用"
msgid "no more memory for database '%s'"
msgstr "无内存可用于数据库 “%s” "
-#: nscd/netgroupcache.c:121
+#: nscd/netgroupcache.c:122
#, c-format
msgid "Haven't found \"%s\" in netgroup cache!"
msgstr "尚未在网络群组缓存中找到 “%s” !"
-#: nscd/netgroupcache.c:123
+#: nscd/netgroupcache.c:124
#, c-format
msgid "Reloading \"%s\" in netgroup cache!"
msgstr "重新在网络群组缓存中加载 “%s” !"
-#: nscd/netgroupcache.c:469
+#: nscd/netgroupcache.c:470
#, c-format
msgid "Haven't found \"%s (%s,%s,%s)\" in netgroup cache!"
msgstr "尚未在网络群组缓存中找到 “%s (%s,%s,%s)” !"
-#: nscd/netgroupcache.c:472
+#: nscd/netgroupcache.c:473
#, c-format
msgid "Reloading \"%s (%s,%s,%s)\" in netgroup cache!"
msgstr "重新在网络群组缓存中加载 “%s (%s,%s,%s)” !"
@@ -4184,7 +4183,7 @@ msgstr "为每个用户使用分离的缓冲区"
msgid "Name Service Cache Daemon."
msgstr "网域名称缓存精灵"
-#: nscd/nscd.c:155 nss/getent.c:967 nss/makedb.c:206
+#: nscd/nscd.c:155 nss/getent.c:987 nss/makedb.c:206
#, c-format
msgid "wrong number of arguments"
msgstr "参数个数错误"
@@ -4292,27 +4291,27 @@ msgstr "解析错误:%s"
msgid "Must specify user name for server-user option"
msgstr "必须为服务器用户选项指定用户名"
-#: nscd/nscd_conf.c:198
+#: nscd/nscd_conf.c:201
#, c-format
msgid "Must specify user name for stat-user option"
msgstr "必须为 stat 用户选项指定用户名"
-#: nscd/nscd_conf.c:255
+#: nscd/nscd_conf.c:259
#, c-format
msgid "Must specify value for restart-interval option"
msgstr "必须指定用于 restart-interval 选项的值"
-#: nscd/nscd_conf.c:269
+#: nscd/nscd_conf.c:273
#, c-format
msgid "Unknown option: %s %s %s"
msgstr "未知的选项:%s %s %s"
-#: nscd/nscd_conf.c:282
+#: nscd/nscd_conf.c:286
#, c-format
msgid "cannot get current working directory: %s; disabling paranoia mode"
msgstr "无法取得目前的工作目录:%s; 停用 paranoia 模式"
-#: nscd/nscd_conf.c:302
+#: nscd/nscd_conf.c:306
#, c-format
msgid "maximum file size for %s database too small"
msgstr "最大值文件大小用于 %s 数据库太小"
@@ -4576,47 +4575,47 @@ msgstr "无法在服务缓冲区中找到“%s”!"
msgid "Reloading \"%s\" in services cache!"
msgstr "在服务缓冲区中重新加载“%s”!"
-#: nss/getent.c:54
+#: nss/getent.c:55
msgid "database [key ...]"
msgstr "数据库 [键 ...]"
-#: nss/getent.c:59
+#: nss/getent.c:60
msgid "CONFIG"
msgstr "组态"
-#: nss/getent.c:59
+#: nss/getent.c:60
msgid "Service configuration to be used"
msgstr "要使用的服务配置"
-#: nss/getent.c:60
+#: nss/getent.c:61
msgid "disable IDN encoding"
msgstr "停用 IDN 编码"
-#: nss/getent.c:65
+#: nss/getent.c:66
msgid "Get entries from administrative database."
msgstr "从管理数据库取得条目。"
-#: nss/getent.c:149 nss/getent.c:442 nss/getent.c:489
+#: nss/getent.c:150 nss/getent.c:462 nss/getent.c:509
#, c-format
msgid "Enumeration not supported on %s\n"
msgstr "%s 不支持枚举\n"
-#: nss/getent.c:497 nss/getent.c:510
+#: nss/getent.c:517 nss/getent.c:530
#, fuzzy, c-format
#| msgid "Could not create log file"
msgid "Could not allocate group list: %m\n"
msgstr "无法创建日志文件"
-#: nss/getent.c:881
+#: nss/getent.c:901
#, c-format
msgid "Unknown database name"
msgstr "未知的数据库名"
-#: nss/getent.c:911
+#: nss/getent.c:931
msgid "Supported databases:\n"
msgstr "支持的数据库:\n"
-#: nss/getent.c:977
+#: nss/getent.c:997
#, c-format
msgid "Unknown database: %s\n"
msgstr "未知的数据库:%s\n"
@@ -4878,11 +4877,11 @@ msgstr "常规表达式过大"
msgid "Unmatched ) or \\)"
msgstr "不匹配的 ) 或 \\)"
-#: posix/regcomp.c:689
+#: posix/regcomp.c:676
msgid "No previous regular expression"
msgstr "没有前一个常规表达式"
-#: posix/wordexp.c:1815
+#: posix/wordexp.c:1816
msgid "parameter null or not set"
msgstr "参数为 null 或未设置"
@@ -5067,7 +5066,7 @@ msgstr "输出缓冲区可用"
msgid "Input message available"
msgstr "输入消息可用"
-#: stdio-common/psiginfo-data.h:46 timezone/zdump.c:381 timezone/zic.c:520
+#: stdio-common/psiginfo-data.h:46 timezone/zdump.c:375 timezone/zic.c:561
msgid "I/O error"
msgstr "I/O 错误"
@@ -5150,7 +5149,7 @@ msgstr "未知信号 %d"
#: sunrpc/auth_unix.c:112 sunrpc/clnt_tcp.c:124 sunrpc/clnt_udp.c:139
#: sunrpc/clnt_unix.c:125 sunrpc/svc_tcp.c:189 sunrpc/svc_tcp.c:233
#: sunrpc/svc_udp.c:161 sunrpc/svc_unix.c:189 sunrpc/svc_unix.c:229
-#: sunrpc/xdr.c:628 sunrpc/xdr.c:788 sunrpc/xdr_array.c:102
+#: sunrpc/xdr.c:631 sunrpc/xdr.c:791 sunrpc/xdr_array.c:102
#: sunrpc/xdr_rec.c:153 sunrpc/xdr_ref.c:79
msgid "out of memory\n"
msgstr "内存不足\n"
@@ -6433,56 +6432,69 @@ msgstr "这次真的被您打败了"
# 简单的说,儿歌 "唐老先生有块地...",然后呢?? ;-p
#
#. TRANS Go home and have a glass of warm, dairy-fresh milk.
-#: sysdeps/gnu/errlist.c:978
+#. TRANS @c Okay. Since you are dying to know, I'll tell you.
+#. TRANS @c This is a joke, obviously. There is a children's song which begins,
+#. TRANS @c "Old McDonald had a farm, e-i-e-i-o." Every time I see the (real)
+#. TRANS @c errno macro EIO, I think about that song. Probably most of my
+#. TRANS @c compatriots who program on Unix do, too. One of them must have stayed
+#. TRANS @c up a little too late one night and decided to add it to Hurd or Glibc.
+#. TRANS @c Whoever did it should be castigated, but it made me laugh.
+#. TRANS @c --jtobey@channel1.com
+#. TRANS @c
+#. TRANS @c "bought the farm" means "died". -jtobey
+#. TRANS @c
+#. TRANS @c Translators, please do not translate this litteraly, translate it into
+#. TRANS @c an idiomatic funny way of saying that the computer died.
+#: sysdeps/gnu/errlist.c:991
msgid "Computer bought the farm"
msgstr "这台电脑买了一块地啰"
#. TRANS This error code has no purpose.
-#: sysdeps/gnu/errlist.c:987
+#: sysdeps/gnu/errlist.c:1000
msgid "Gratuitous error"
msgstr "无故的错误"
-#: sysdeps/gnu/errlist.c:995
+#: sysdeps/gnu/errlist.c:1008
msgid "Bad message"
msgstr "错误的消息"
-#: sysdeps/gnu/errlist.c:1003
+#: sysdeps/gnu/errlist.c:1016
msgid "Identifier removed"
msgstr "标识符已删除"
-#: sysdeps/gnu/errlist.c:1011
+#: sysdeps/gnu/errlist.c:1024
msgid "Multihop attempted"
msgstr "尝试 Multihop"
-#: sysdeps/gnu/errlist.c:1019
+#: sysdeps/gnu/errlist.c:1032
msgid "No data available"
msgstr "没有可用的数据"
-#: sysdeps/gnu/errlist.c:1027
+#: sysdeps/gnu/errlist.c:1040
msgid "Link has been severed"
msgstr "链接已有服务"
-#: sysdeps/gnu/errlist.c:1035
+#: sysdeps/gnu/errlist.c:1048
msgid "No message of desired type"
msgstr "没有符合需求格式的消息"
-#: sysdeps/gnu/errlist.c:1043
+#: sysdeps/gnu/errlist.c:1056
msgid "Out of streams resources"
msgstr "流资源不足"
-#: sysdeps/gnu/errlist.c:1051
+#: sysdeps/gnu/errlist.c:1064
msgid "Device not a stream"
msgstr "设备不是流"
-#: sysdeps/gnu/errlist.c:1059
+#: sysdeps/gnu/errlist.c:1072
msgid "Value too large for defined data type"
msgstr "对已定义的数据类型来说值过大"
-#: sysdeps/gnu/errlist.c:1067
+#: sysdeps/gnu/errlist.c:1080
msgid "Protocol error"
msgstr "协议错误"
-#: sysdeps/gnu/errlist.c:1075
+#: sysdeps/gnu/errlist.c:1088
msgid "Timer expired"
msgstr "计时器超时"
@@ -6490,195 +6502,195 @@ msgstr "计时器超时"
#. TRANS completed. @xref{Asynchronous I/O}. When you call @code{aio_cancel},
#. TRANS the normal result is for the operations affected to complete with this
#. TRANS error; @pxref{Cancel AIO Operations}.
-#: sysdeps/gnu/errlist.c:1087
+#: sysdeps/gnu/errlist.c:1100
msgid "Operation canceled"
msgstr "操作已取消"
-#: sysdeps/gnu/errlist.c:1095
+#: sysdeps/gnu/errlist.c:1108
msgid "Owner died"
msgstr "拥有者已消逝"
-#: sysdeps/gnu/errlist.c:1103
+#: sysdeps/gnu/errlist.c:1116
msgid "State not recoverable"
msgstr "状态无法回复"
-#: sysdeps/gnu/errlist.c:1111
+#: sysdeps/gnu/errlist.c:1124
msgid "Interrupted system call should be restarted"
msgstr "被中断的系统调用应该重新启动"
-#: sysdeps/gnu/errlist.c:1119
+#: sysdeps/gnu/errlist.c:1132
msgid "Channel number out of range"
msgstr "通道编号超出范围"
-#: sysdeps/gnu/errlist.c:1127
+#: sysdeps/gnu/errlist.c:1140
msgid "Level 2 not synchronized"
msgstr "级别 2 尚未同步"
-#: sysdeps/gnu/errlist.c:1135
+#: sysdeps/gnu/errlist.c:1148
msgid "Level 3 halted"
msgstr "级别 3 已关闭"
-#: sysdeps/gnu/errlist.c:1143
+#: sysdeps/gnu/errlist.c:1156
msgid "Level 3 reset"
msgstr "级别 3 已重置"
-#: sysdeps/gnu/errlist.c:1151
+#: sysdeps/gnu/errlist.c:1164
msgid "Link number out of range"
msgstr "链接数超出范围"
-#: sysdeps/gnu/errlist.c:1159
+#: sysdeps/gnu/errlist.c:1172
msgid "Protocol driver not attached"
msgstr "未加载协议驱动程序"
-#: sysdeps/gnu/errlist.c:1167
+#: sysdeps/gnu/errlist.c:1180
msgid "No CSI structure available"
msgstr "没有可用的 CSI 结构"
-#: sysdeps/gnu/errlist.c:1175
+#: sysdeps/gnu/errlist.c:1188
msgid "Level 2 halted"
msgstr "级别 2 己关闭"
-#: sysdeps/gnu/errlist.c:1183
+#: sysdeps/gnu/errlist.c:1196
msgid "Invalid exchange"
msgstr "无效的交换"
-#: sysdeps/gnu/errlist.c:1191
+#: sysdeps/gnu/errlist.c:1204
msgid "Invalid request descriptor"
msgstr "无效的请求描述符"
-#: sysdeps/gnu/errlist.c:1199
+#: sysdeps/gnu/errlist.c:1212
msgid "Exchange full"
msgstr "交换满"
-#: sysdeps/gnu/errlist.c:1207
+#: sysdeps/gnu/errlist.c:1220
msgid "No anode"
msgstr "没有 anode"
-#: sysdeps/gnu/errlist.c:1215
+#: sysdeps/gnu/errlist.c:1228
msgid "Invalid request code"
msgstr "无效的请求码"
-#: sysdeps/gnu/errlist.c:1223
+#: sysdeps/gnu/errlist.c:1236
msgid "Invalid slot"
msgstr "不适用的 slot"
-#: sysdeps/gnu/errlist.c:1231
+#: sysdeps/gnu/errlist.c:1244
msgid "File locking deadlock error"
msgstr "文件锁死锁错误"
-#: sysdeps/gnu/errlist.c:1239
+#: sysdeps/gnu/errlist.c:1252
msgid "Bad font file format"
msgstr "错误的字体文件格式"
-#: sysdeps/gnu/errlist.c:1247
+#: sysdeps/gnu/errlist.c:1260
msgid "Machine is not on the network"
msgstr "机器不在网络中"
-#: sysdeps/gnu/errlist.c:1255
+#: sysdeps/gnu/errlist.c:1268
msgid "Package not installed"
msgstr "包未安装"
-#: sysdeps/gnu/errlist.c:1263
+#: sysdeps/gnu/errlist.c:1276
msgid "Advertise error"
msgstr "通知错误"
-#: sysdeps/gnu/errlist.c:1271
+#: sysdeps/gnu/errlist.c:1284
msgid "Srmount error"
msgstr "Srmount 错误"
-#: sysdeps/gnu/errlist.c:1279
+#: sysdeps/gnu/errlist.c:1292
msgid "Communication error on send"
msgstr "发送时出现通讯错误"
-#: sysdeps/gnu/errlist.c:1287
+#: sysdeps/gnu/errlist.c:1300
msgid "RFS specific error"
msgstr "RFS 特定错误"
-#: sysdeps/gnu/errlist.c:1295
+#: sysdeps/gnu/errlist.c:1308
msgid "Name not unique on network"
msgstr "网络上的名称不是唯一的"
-#: sysdeps/gnu/errlist.c:1303
+#: sysdeps/gnu/errlist.c:1316
msgid "File descriptor in bad state"
msgstr "文件描述符处于错误状态"
-#: sysdeps/gnu/errlist.c:1311
+#: sysdeps/gnu/errlist.c:1324
msgid "Remote address changed"
msgstr "远程地址已改变"
-#: sysdeps/gnu/errlist.c:1319
+#: sysdeps/gnu/errlist.c:1332
msgid "Can not access a needed shared library"
msgstr "无法访问必须的共享库"
-#: sysdeps/gnu/errlist.c:1327
+#: sysdeps/gnu/errlist.c:1340
msgid "Accessing a corrupted shared library"
msgstr "正在访问一个已毁坏的共享库"
-#: sysdeps/gnu/errlist.c:1335
+#: sysdeps/gnu/errlist.c:1348
msgid ".lib section in a.out corrupted"
msgstr "a.out 中的 .lib 节已毁坏"
-#: sysdeps/gnu/errlist.c:1343
+#: sysdeps/gnu/errlist.c:1356
msgid "Attempting to link in too many shared libraries"
msgstr "试图与过多的共享库相链接"
-#: sysdeps/gnu/errlist.c:1351
+#: sysdeps/gnu/errlist.c:1364
msgid "Cannot exec a shared library directly"
msgstr "无法直接执行共享库"
-#: sysdeps/gnu/errlist.c:1359
+#: sysdeps/gnu/errlist.c:1372
msgid "Streams pipe error"
msgstr "流管道错误"
-#: sysdeps/gnu/errlist.c:1367
+#: sysdeps/gnu/errlist.c:1380
msgid "Structure needs cleaning"
msgstr "结构需要清理"
-#: sysdeps/gnu/errlist.c:1375
+#: sysdeps/gnu/errlist.c:1388
msgid "Not a XENIX named type file"
msgstr "不是 XENIX 命名的类型文件"
-#: sysdeps/gnu/errlist.c:1383
+#: sysdeps/gnu/errlist.c:1396
msgid "No XENIX semaphores available"
msgstr "没有可用的 XENIX 信号量"
-#: sysdeps/gnu/errlist.c:1391
+#: sysdeps/gnu/errlist.c:1404
msgid "Is a named type file"
msgstr "是一个有名类型文件"
-#: sysdeps/gnu/errlist.c:1399
+#: sysdeps/gnu/errlist.c:1412
msgid "Remote I/O error"
msgstr "远程 I/O 错误"
-#: sysdeps/gnu/errlist.c:1407
+#: sysdeps/gnu/errlist.c:1420
msgid "No medium found"
msgstr "找不到介质"
-#: sysdeps/gnu/errlist.c:1415
+#: sysdeps/gnu/errlist.c:1428
msgid "Wrong medium type"
msgstr "错误的介质类型"
-#: sysdeps/gnu/errlist.c:1423
+#: sysdeps/gnu/errlist.c:1436
msgid "Required key not available"
msgstr "需要的关键字不存在"
-#: sysdeps/gnu/errlist.c:1431
+#: sysdeps/gnu/errlist.c:1444
msgid "Key has expired"
msgstr "关键字已过期"
-#: sysdeps/gnu/errlist.c:1439
+#: sysdeps/gnu/errlist.c:1452
msgid "Key has been revoked"
msgstr "键值已取消"
-#: sysdeps/gnu/errlist.c:1447
+#: sysdeps/gnu/errlist.c:1460
msgid "Key was rejected by service"
msgstr "键值被服务所拒绝"
-#: sysdeps/gnu/errlist.c:1455
+#: sysdeps/gnu/errlist.c:1468
msgid "Operation not possible due to RF-kill"
msgstr "由于 RF-kill 而无法操作"
-#: sysdeps/gnu/errlist.c:1463
+#: sysdeps/gnu/errlist.c:1476
msgid "Memory page has hardware error"
msgstr "内存分页有硬件错误"
@@ -6807,27 +6819,27 @@ msgstr ""
msgid "can't disable CET"
msgstr ""
-#: timezone/zdump.c:338
+#: timezone/zdump.c:332
msgid "has fewer than 3 characters"
msgstr "不足 3 个字符"
-#: timezone/zdump.c:340
+#: timezone/zdump.c:334
msgid "has more than 6 characters"
msgstr "超过 6 个字符"
-#: timezone/zdump.c:342
+#: timezone/zdump.c:336
msgid "has characters other than ASCII alphanumerics, '-' or '+'"
msgstr "含有 ASCII 数字、字母、“-”、“+”之外的字符"
-#: timezone/zdump.c:347
+#: timezone/zdump.c:341
#, c-format
msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"
msgstr "%s: 警告:区域 “%s” 缩写 “%s” %s\n"
-#: timezone/zdump.c:393
+#: timezone/zdump.c:387
#, c-format
msgid ""
-"%s: usage: %s OPTIONS ZONENAME ...\n"
+"%s: usage: %s OPTIONS TIMEZONE ...\n"
"Options include:\n"
" -c [L,]U Start at year L (default -500), end before year U (default 2500)\n"
" -t [L,]U Start at time L, end before time U (in seconds since 1970)\n"
@@ -6840,54 +6852,66 @@ msgid ""
"Report bugs to %s.\n"
msgstr ""
-#: timezone/zdump.c:479
+#: timezone/zdump.c:473
#, c-format
msgid "%s: wild -c argument %s\n"
msgstr "%s: 怪异的 -c 选项 %s\n"
-#: timezone/zdump.c:512
+#: timezone/zdump.c:506
#, c-format
msgid "%s: wild -t argument %s\n"
msgstr "%s: wild -c 参数 %s\n"
-#: timezone/zic.c:398
+#: timezone/zic.c:429
#, c-format
msgid "%s: Memory exhausted: %s\n"
msgstr "%s:内存耗尽:%s\n"
-#: timezone/zic.c:406
+#: timezone/zic.c:437
msgid "size overflow"
msgstr "大小溢出"
-#: timezone/zic.c:454
+#: timezone/zic.c:447
+#, fuzzy
+#| msgid "int overflow"
+msgid "alignment overflow"
+msgstr "整数溢出"
+
+#: timezone/zic.c:495
#, fuzzy
#| msgid "Integer overflow"
msgid "integer overflow"
msgstr "整数溢出"
-#: timezone/zic.c:488
+#: timezone/zic.c:529
#, fuzzy, c-format
#| msgid "\"%s\", line %d: "
msgid "\"%s\", line %<PRIdMAX>: "
msgstr "\"%s\", 第 %d 行: "
-#: timezone/zic.c:491
+#: timezone/zic.c:532
#, fuzzy, c-format
#| msgid " (rule from \"%s\", line %d)"
msgid " (rule from \"%s\", line %<PRIdMAX>)"
msgstr " (规则来自 \"%s\", 第 %d 行)"
-#: timezone/zic.c:510
+#: timezone/zic.c:551
#, c-format
msgid "warning: "
msgstr "警告:"
-#: timezone/zic.c:535
-#, c-format
+#: timezone/zic.c:576
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: usage is %s [ --version ] [ --help ] [ -v ] \\\n"
+#| "\t[ -l localtime ] [ -p posixrules ] [ -d directory ] \\\n"
+#| "\t[ -L leapseconds ] [ filename ... ]\n"
+#| "\n"
+#| "Report bugs to %s.\n"
msgid ""
"%s: usage is %s [ --version ] [ --help ] [ -v ] \\\n"
"\t[ -l localtime ] [ -p posixrules ] [ -d directory ] \\\n"
-"\t[ -L leapseconds ] [ filename ... ]\n"
+"\t[ -t localtime-link ] [ -L leapseconds ] [ filename ... ]\n"
"\n"
"Report bugs to %s.\n"
msgstr ""
@@ -6897,402 +6921,435 @@ msgstr ""
"\n"
"将错误通报给 %s。\n"
-#: timezone/zic.c:558
+#: timezone/zic.c:599
#, fuzzy, c-format
#| msgid "%s: Can't create %s: %s\n"
msgid "%s: Can't chdir to %s: %s\n"
msgstr "%s:无法创建 %s:%s\n"
-#: timezone/zic.c:590
+#: timezone/zic.c:632
msgid "wild compilation-time specification of zic_t"
msgstr "zic_t 的万用编译时间规格"
-#: timezone/zic.c:610
+#: timezone/zic.c:652
#, c-format
msgid "%s: More than one -d option specified\n"
msgstr "%s:给出了多个 -d 选项\n"
-#: timezone/zic.c:620
+#: timezone/zic.c:662
#, c-format
msgid "%s: More than one -l option specified\n"
msgstr "%s:给出了多个 -l 选项\n"
-#: timezone/zic.c:630
+#: timezone/zic.c:672
#, c-format
msgid "%s: More than one -p option specified\n"
msgstr "%s:给出了多个 -p 选项\n"
-#: timezone/zic.c:640
+#: timezone/zic.c:680
+#, fuzzy, c-format
+#| msgid "%s: More than one -d option specified\n"
+msgid "%s: More than one -t option specified\n"
+msgstr "%s:给出了多个 -d 选项\n"
+
+#: timezone/zic.c:689
+msgid "-y is obsolescent"
+msgstr ""
+
+#: timezone/zic.c:693
#, c-format
msgid "%s: More than one -y option specified\n"
msgstr "%s:给出了多个 -y 选项\n"
-#: timezone/zic.c:650
+#: timezone/zic.c:703
#, c-format
msgid "%s: More than one -L option specified\n"
msgstr "%s:给出了多个 -L 选项\n"
-#: timezone/zic.c:659
+#: timezone/zic.c:712
msgid "-s ignored"
msgstr "-s 已被忽略"
-#: timezone/zic.c:698
+#: timezone/zic.c:753
msgid "link to link"
msgstr "链接到链接"
-#: timezone/zic.c:701 timezone/zic.c:705
+#: timezone/zic.c:756 timezone/zic.c:760
msgid "command line"
msgstr "命令行"
-#: timezone/zic.c:721
+#: timezone/zic.c:776
msgid "empty file name"
msgstr "空文件名"
-#: timezone/zic.c:724
+#: timezone/zic.c:779
#, c-format
msgid "file name '%s' begins with '/'"
msgstr "文件名“%s”以“/”开头"
-#: timezone/zic.c:734
+#: timezone/zic.c:789
#, c-format
msgid "file name '%s' contains '%.*s' component"
msgstr "文件名“%s”包含“%.*s”部分"
-#: timezone/zic.c:740
+#: timezone/zic.c:795
#, c-format
msgid "file name '%s' component contains leading '-'"
msgstr "文件名“%s”部分以“-”开头"
# component_len_max < component_len
-#: timezone/zic.c:743
+#: timezone/zic.c:798
#, c-format
msgid "file name '%s' contains overlength component '%.*s...'"
msgstr "文件名“%s”中的“%.*s”部分过长"
-#: timezone/zic.c:771
+#: timezone/zic.c:826
#, c-format
msgid "file name '%s' contains byte '%c'"
msgstr "文件名“%s”包含字节“%c”"
-#: timezone/zic.c:772
+#: timezone/zic.c:827
#, c-format
msgid "file name '%s' contains byte '\\%o'"
msgstr "文件名“%s”包含字节“\\%o”"
-#: timezone/zic.c:842
+#: timezone/zic.c:897
#, fuzzy, c-format
#| msgid "%s: link from %s failed: %s"
msgid "%s: link from %s/%s failed: %s\n"
msgstr "%s:无法链接到 %s:%s"
-#: timezone/zic.c:852 timezone/zic.c:1815
+#: timezone/zic.c:907 timezone/zic.c:1876
#, fuzzy, c-format
#| msgid "%s: Can't remove %s: %s\n"
msgid "%s: Can't remove %s/%s: %s\n"
msgstr "%s:无法删除 %s:%s\n"
-#: timezone/zic.c:874
+#: timezone/zic.c:931
#, c-format
msgid "symbolic link used because hard link failed: %s"
msgstr ""
-#: timezone/zic.c:882
+#: timezone/zic.c:939
#, fuzzy, c-format
#| msgid "%s: Can't read %s: %s\n"
msgid "%s: Can't read %s/%s: %s\n"
msgstr "%s: 无法读取 %s: %s\n"
-#: timezone/zic.c:889 timezone/zic.c:1828
+#: timezone/zic.c:946 timezone/zic.c:1889
#, fuzzy, c-format
#| msgid "%s: Can't create %s: %s\n"
msgid "%s: Can't create %s/%s: %s\n"
msgstr "%s:无法创建 %s:%s\n"
-#: timezone/zic.c:898
+#: timezone/zic.c:955
#, c-format
msgid "copy used because hard link failed: %s"
msgstr ""
-#: timezone/zic.c:901
+#: timezone/zic.c:958
#, fuzzy, c-format
#| msgid "Don't update symbolic links"
msgid "copy used because symbolic link failed: %s"
msgstr "不更新符号链接"
-#: timezone/zic.c:1013 timezone/zic.c:1015
+#: timezone/zic.c:1032 timezone/zic.c:1034
msgid "same rule name in multiple files"
msgstr "多个文件中的相同规则名"
-#: timezone/zic.c:1056
-msgid "unruly zone"
-msgstr "没有规则的时区"
-
-#: timezone/zic.c:1063
+#: timezone/zic.c:1081
#, c-format
msgid "%s in ruleless zone"
msgstr "%s 在没有规则的节"
-#: timezone/zic.c:1083
+#: timezone/zic.c:1101
msgid "standard input"
msgstr "标准输入"
-#: timezone/zic.c:1088
+#: timezone/zic.c:1106
#, c-format
msgid "%s: Can't open %s: %s\n"
msgstr "%s:无法打开 %s:%s\n"
-#: timezone/zic.c:1099
+#: timezone/zic.c:1117
msgid "line too long"
msgstr "行过长"
-#: timezone/zic.c:1119
+#: timezone/zic.c:1139
msgid "input line of unknown type"
msgstr "未知类型的输入行"
-#: timezone/zic.c:1134
-#, c-format
-msgid "%s: Leap line in non leap seconds file %s"
-msgstr "%s: 闰时设置行出现在不含闰秒的文件 %s 中"
-
-#: timezone/zic.c:1142 timezone/zic.c:1547 timezone/zic.c:1569
+#: timezone/zic.c:1158 timezone/zic.c:1593 timezone/zic.c:1615
#, c-format
msgid "%s: panic: Invalid l_value %d\n"
msgstr "%s: 严重错误: 错误的 l_value %d\n"
-#: timezone/zic.c:1151
+#: timezone/zic.c:1167
msgid "expected continuation line not found"
msgstr "找不到应该出现的续行"
-#: timezone/zic.c:1193 timezone/zic.c:2976
+#: timezone/zic.c:1203
+#, fuzzy
+#| msgid "format '%s' not handled by pre-2015 versions of zic"
+msgid "fractional seconds rejected by pre-2018 versions of zic"
+msgstr "“%s”格式无法由早于 2015 年的 zic 版本所处理"
+
+#: timezone/zic.c:1221 timezone/zic.c:3078
msgid "time overflow"
msgstr "时间溢出"
-#: timezone/zic.c:1198
+#: timezone/zic.c:1227
msgid "values over 24 hours not handled by pre-2007 versions of zic"
msgstr "24 小时以上的值无法由早于 2007 的 zic 版本所处理"
-#: timezone/zic.c:1209
-msgid "wrong number of fields on Rule line"
-msgstr "规则行中域的个数错误"
-
-#: timezone/zic.c:1213
-msgid "nameless rule"
-msgstr "无名规则"
-
# zic_t r_stdoff; /* offset from standard time */
-#: timezone/zic.c:1218
+#: timezone/zic.c:1245
#, fuzzy
msgid "invalid saved time"
msgstr "无效的保存时间"
-#: timezone/zic.c:1235
+#: timezone/zic.c:1256
+msgid "wrong number of fields on Rule line"
+msgstr "规则行中域的个数错误"
+
+#: timezone/zic.c:1265
+#, fuzzy, c-format
+#| msgid "Invalid numeric gid \"%s\"!"
+msgid "Invalid rule name \"%s\""
+msgstr "无效的 gid 数值 \"%s\"!"
+
+#: timezone/zic.c:1287
msgid "wrong number of fields on Zone line"
msgstr "区域行中域的个数错误"
-#: timezone/zic.c:1240
+#: timezone/zic.c:1292
#, c-format
msgid "\"Zone %s\" line and -l option are mutually exclusive"
msgstr "\"Zone %s\" 行和 -l 选项是互斥的"
-#: timezone/zic.c:1246
+#: timezone/zic.c:1298
#, c-format
msgid "\"Zone %s\" line and -p option are mutually exclusive"
msgstr "\"Zone %s\" 行和 -p 选项是互斥的"
-#: timezone/zic.c:1253
+#: timezone/zic.c:1305
#, fuzzy, c-format
#| msgid "duplicate zone name %s (file \"%s\", line %d)"
msgid "duplicate zone name %s (file \"%s\", line %<PRIdMAX>)"
msgstr "重复的区域名 %s (文件“%s”,行 %d)"
-#: timezone/zic.c:1267
+#: timezone/zic.c:1319
msgid "wrong number of fields on Zone continuation line"
msgstr "时区接续行的字段数目不对"
-#: timezone/zic.c:1307
+#: timezone/zic.c:1359
msgid "invalid UT offset"
msgstr "无效的 UT 偏移量"
-#: timezone/zic.c:1311
+#: timezone/zic.c:1363
msgid "invalid abbreviation format"
msgstr "无效的缩略格式"
-#: timezone/zic.c:1320
+#: timezone/zic.c:1372
#, c-format
msgid "format '%s' not handled by pre-2015 versions of zic"
msgstr "“%s”格式无法由早于 2015 年的 zic 版本所处理"
-#: timezone/zic.c:1347
+#: timezone/zic.c:1399
msgid "Zone continuation line end time is not after end time of previous line"
msgstr "时区接续行的结束时间不在上一行的结束时间之后"
-#: timezone/zic.c:1374
+#: timezone/zic.c:1426
msgid "wrong number of fields on Leap line"
msgstr "闰时设置行的字段数目错误"
-#: timezone/zic.c:1383
+#: timezone/zic.c:1435
msgid "invalid leaping year"
msgstr "无效的闰年"
-#: timezone/zic.c:1403 timezone/zic.c:1501
+#: timezone/zic.c:1455 timezone/zic.c:1547
msgid "invalid month name"
msgstr "无效的月名称"
-#: timezone/zic.c:1416 timezone/zic.c:1614 timezone/zic.c:1628
+#: timezone/zic.c:1468 timezone/zic.c:1663 timezone/zic.c:1677
msgid "invalid day of month"
msgstr "无效的日"
-#: timezone/zic.c:1421
+#: timezone/zic.c:1473
msgid "time too small"
msgstr "时间太小"
-#: timezone/zic.c:1425
+#: timezone/zic.c:1477
msgid "time too large"
msgstr "时间过大"
-#: timezone/zic.c:1429 timezone/zic.c:1530
+#: timezone/zic.c:1481 timezone/zic.c:1576
msgid "invalid time of day"
msgstr "无效的时间"
-#: timezone/zic.c:1448
+#: timezone/zic.c:1494
msgid "illegal CORRECTION field on Leap line"
msgstr "在闰时设置行中有不合法的 CORRECTION 字段"
-#: timezone/zic.c:1453
+#: timezone/zic.c:1499
msgid "illegal Rolling/Stationary field on Leap line"
msgstr "在闰时设置行中有不合法的 Rolling/Stationary 字段"
-#: timezone/zic.c:1459
-msgid "leap second precedes Big Bang"
+#: timezone/zic.c:1505
+#, fuzzy
+#| msgid "leap second precedes Big Bang"
+msgid "leap second precedes Epoch"
msgstr "闰秒出现在大爆炸之前"
-#: timezone/zic.c:1472
+#: timezone/zic.c:1518
msgid "wrong number of fields on Link line"
msgstr "链接行中域的个数错误"
-#: timezone/zic.c:1476
+#: timezone/zic.c:1522
msgid "blank FROM field on Link line"
msgstr "Link 行中空白的 FROM 域"
-#: timezone/zic.c:1551
+#: timezone/zic.c:1597
msgid "invalid starting year"
msgstr "无效的起始年份"
-#: timezone/zic.c:1573
+#: timezone/zic.c:1619
msgid "invalid ending year"
msgstr "无效的终止年份"
-#: timezone/zic.c:1577
+#: timezone/zic.c:1623
msgid "starting year greater than ending year"
msgstr "起始年份大于终止年份"
-#: timezone/zic.c:1584
+#: timezone/zic.c:1630
msgid "typed single year"
msgstr "输入的年分是同一年"
-#: timezone/zic.c:1619
+#: timezone/zic.c:1633
+#, c-format
+msgid "year type \"%s\" is obsolete; use \"-\" instead"
+msgstr ""
+
+#: timezone/zic.c:1668
msgid "invalid weekday name"
msgstr "无效的星期名"
-#: timezone/zic.c:1743
+#: timezone/zic.c:1800
#, fuzzy, c-format
#| msgid "pre-2014 clients may mishandle more than 1200 transition times"
msgid "reference clients mishandle more than %d transition times"
msgstr "2014 之前的客户端可能会错误处理超过 1200 次的改变次数"
-#: timezone/zic.c:1747
+#: timezone/zic.c:1804
msgid "pre-2014 clients may mishandle more than 1200 transition times"
msgstr "2014 之前的客户端可能会错误处理超过 1200 次的改变次数"
-#: timezone/zic.c:1858
+#: timezone/zic.c:1920
#, fuzzy
#| msgid "too many local time types"
msgid "too many transition times"
msgstr "过多的本地时间类型"
-#: timezone/zic.c:2047
-#, c-format
-msgid "%%z UTC offset magnitude exceeds 99:59:59"
+#: timezone/zic.c:2107
+#, fuzzy, c-format
+#| msgid "%%z UTC offset magnitude exceeds 99:59:59"
+msgid "%%z UT offset magnitude exceeds 99:59:59"
msgstr "%%z UTC 偏移大小超过了 99:59:59"
-#: timezone/zic.c:2424
+#: timezone/zic.c:2488
msgid "no POSIX environment variable for zone"
msgstr "无 POSIX 环境变量用于区"
-#: timezone/zic.c:2430
+#: timezone/zic.c:2494
#, c-format
msgid "%s: pre-%d clients may mishandle distant timestamps"
msgstr "%s: %d 之前的客户端可能会错误处理久远的时间戳"
-#: timezone/zic.c:2566
+#: timezone/zic.c:2631
msgid "two rules for same instant"
msgstr "为同一时间点制订了两种规则"
-#: timezone/zic.c:2627
+#: timezone/zic.c:2696
msgid "can't determine time zone abbreviation to use just after until time"
msgstr "无法决定在结束时间以后该使用的时区简写"
-#: timezone/zic.c:2725
+#: timezone/zic.c:2785
msgid "too many local time types"
msgstr "过多的本地时间类型"
-#: timezone/zic.c:2729
+#: timezone/zic.c:2789
msgid "UT offset out of range"
msgstr "UTC 偏移超出范围"
-#: timezone/zic.c:2753
+#: timezone/zic.c:2813
msgid "too many leap seconds"
msgstr "太多闰秒"
-#: timezone/zic.c:2759
-msgid "repeated leap second moment"
-msgstr "重复的闰秒设置"
+#: timezone/zic.c:2844
+msgid "Leap seconds too close together"
+msgstr ""
-#: timezone/zic.c:2830
+#: timezone/zic.c:2891
msgid "Wild result from command execution"
msgstr "命令运行导致奇怪的结果"
-#: timezone/zic.c:2831
+#: timezone/zic.c:2892
#, c-format
msgid "%s: command was '%s', result was %d\n"
msgstr "%s:命令为“%s”,结果为 %d\n"
-#: timezone/zic.c:2961
+#: timezone/zic.c:2998
+#, c-format
+msgid "\"%s\" is undocumented; use \"last%s\" instead"
+msgstr ""
+
+#: timezone/zic.c:3029
+#, c-format
+msgid "\"%s\" is ambiguous in pre-2017c zic"
+msgstr ""
+
+#: timezone/zic.c:3063
msgid "Odd number of quotation marks"
msgstr "奇数个引号"
-#: timezone/zic.c:3046
+#: timezone/zic.c:3157
msgid "use of 2/29 in non leap-year"
msgstr "在非闰年时用到 2/29 日"
-#: timezone/zic.c:3081
+#: timezone/zic.c:3192
msgid "rule goes past start/end of month; will not work with pre-2004 versions of zic"
msgstr "规则超过开始/结束月分;将无法用于 2004 年之前的 zic 版本"
-#: timezone/zic.c:3108
+#: timezone/zic.c:3219
msgid "time zone abbreviation has fewer than 3 characters"
msgstr "时区缩写少于 3 个字母"
-#: timezone/zic.c:3110
+#: timezone/zic.c:3221
msgid "time zone abbreviation has too many characters"
msgstr "时区缩写字母太多"
-#: timezone/zic.c:3112
+#: timezone/zic.c:3223
msgid "time zone abbreviation differs from POSIX standard"
msgstr "时区缩写与 POSIX 标准不同"
-#: timezone/zic.c:3118
+#: timezone/zic.c:3229
msgid "too many, or too long, time zone abbreviations"
msgstr "过多或过长的时区缩写"
-#: timezone/zic.c:3161
+#: timezone/zic.c:3275
#, c-format
msgid "%s: Can't create directory %s: %s"
msgstr "%s:无法创建目录 %s:%s"
+#~ msgid "cannot open zero fill device"
+#~ msgstr "无法打开零填充设备"
+
#~ msgid "invalid caller"
#~ msgstr "无效的调用者"
+#~ msgid "relocation error"
+#~ msgstr "重定位错误"
+
#~ msgid "Character out of range for UTF-8"
#~ msgstr "字符超出 UTF-8 的范围"
@@ -7302,6 +7359,15 @@ msgstr "%s:无法创建目录 %s:%s"
#~ msgid "non-symbolic character value should not be used"
#~ msgstr "不应该使用非符号字符的值"
+#~ msgid "Cannot set LC_CTYPE to default locale"
+#~ msgstr "无法将 LC_CTYPE 设置为缺省的语区"
+
+#~ msgid "Cannot set LC_MESSAGES to default locale"
+#~ msgstr "无法将 LC_MESSAGES 设置为缺省的语区"
+
+#~ msgid "Cannot set LC_COLLATE to default locale"
+#~ msgstr "无法将 LC_COLLATE 设置为缺省的语区"
+
#~ msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
#~ msgstr "无法设置通信端到关闭于 exec:%s; 停用 paranoia 模式"
@@ -7338,15 +7404,24 @@ msgstr "%s:无法创建目录 %s:%s"
#~ "\n"
#~ "将错误通报给 %s。\n"
-#~ msgid "int overflow"
-#~ msgstr "整数溢出"
-
#~ msgid "hard link failed, symbolic link used"
#~ msgstr "硬链接失败,使用符号链接"
#~ msgid "link failed, copy used"
#~ msgstr "链接失败,使用复制代替"
+#~ msgid "unruly zone"
+#~ msgstr "没有规则的时区"
+
+#~ msgid "%s: Leap line in non leap seconds file %s"
+#~ msgstr "%s: 闰时设置行出现在不含闰秒的文件 %s 中"
+
+#~ msgid "nameless rule"
+#~ msgstr "无名规则"
+
+#~ msgid "repeated leap second moment"
+#~ msgstr "重复的闰秒设置"
+
#~ msgid "cannot allocate TLS data structures for initial thread"
#~ msgstr "无法配置 TLS 数据结构用以起始线程"