diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | po/zh_CN.po | 565 |
2 files changed, 300 insertions, 267 deletions
diff --git a/ChangeLog b/ChangeLog index 4491ac0c95..d5fb530ab9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2007-11-17 Ulrich Drepper <drepper@redhat.com> + * po/zh_CN.po: Update from translation team. + * sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_headers): Add sys/signalfd.h and sys/eventfd.h. diff --git a/po/zh_CN.po b/po/zh_CN.po index a0c6150b6b..b42bef9db9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: libc 2.6.1\n" -"POT-Creation-Date: 2007-08-04 11:37+0200\n" -"PO-Revision-Date: 2007-08-05 16:31+0800\n" +"Project-Id-Version: libc 2.7\n" +"POT-Creation-Date: 2007-10-15 21:18-0700\n" +"PO-Revision-Date: 2007-11-18 12:34+0800\n" "Last-Translator: LI Daobing <lidaobing@gmail.com>\n" "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" @@ -128,7 +128,7 @@ msgstr "" "-o 输出文件 [输入文件]...\n" "[输出文件 [输入文件]...]" -#: catgets/gencat.c:232 debug/pcprofiledump.c:199 iconv/iconv_prog.c:411 +#: catgets/gencat.c:232 debug/pcprofiledump.c:204 iconv/iconv_prog.c:411 #: iconv/iconvconfig.c:380 locale/programs/localedef.c:371 #: login/programs/pt_chown.c:88 malloc/memusagestat.c:526 nss/makedb.c:231 msgid "" @@ -136,7 +136,7 @@ msgid "" "<http://www.gnu.org/software/libc/bugs.html>.\n" msgstr "" -#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:287 +#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:296 #: elf/ldd.bash.in:39 elf/sprof.c:355 iconv/iconv_prog.c:426 #: iconv/iconvconfig.c:395 locale/programs/locale.c:275 #: locale/programs/localedef.c:387 login/programs/pt_chown.c:59 @@ -149,7 +149,7 @@ msgid "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:292 elf/sprof.c:361 +#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:301 elf/sprof.c:361 #: iconv/iconv_prog.c:431 iconv/iconvconfig.c:400 locale/programs/locale.c:280 #: locale/programs/localedef.c:392 malloc/memusage.sh:75 nscd/nscd.c:411 #: nss/getent.c:88 nss/makedb.c:250 posix/getconf.c:1017 @@ -241,29 +241,29 @@ msgstr "转换模块不可用" msgid "cannot determine escape character" msgstr "无法确定转义字符" -#: debug/pcprofiledump.c:52 +#: debug/pcprofiledump.c:53 msgid "Don't buffer output" msgstr "不要对输出进行缓冲" -#: debug/pcprofiledump.c:57 +#: debug/pcprofiledump.c:58 msgid "Dump information generated by PC profiling." msgstr "" -#: debug/pcprofiledump.c:60 +#: debug/pcprofiledump.c:61 msgid "[FILE]" msgstr "[文件]" -#: debug/pcprofiledump.c:100 +#: debug/pcprofiledump.c:104 #, c-format msgid "cannot open input file" msgstr "无法打开输入文件" -#: debug/pcprofiledump.c:106 +#: debug/pcprofiledump.c:111 #, c-format msgid "cannot read header" msgstr "无法读入头" -#: debug/pcprofiledump.c:170 +#: debug/pcprofiledump.c:175 #, c-format msgid "invalid pointer size" msgstr "无效的指针大小" @@ -335,60 +335,55 @@ msgstr "无效的模式" msgid "invalid mode parameter" msgstr "无效的模式参数" -#: elf/cache.c:68 +#: elf/cache.c:69 msgid "unknown" msgstr "未知" -#: elf/cache.c:111 +#: elf/cache.c:112 msgid "Unknown OS" msgstr "未知的操作系统" -#: elf/cache.c:116 +#: elf/cache.c:117 #, c-format msgid ", OS ABI: %s %d.%d.%d" msgstr ", OS ABI: %s %d.%d.%d" -#: elf/cache.c:142 elf/ldconfig.c:1236 +#: elf/cache.c:134 elf/ldconfig.c:1270 #, c-format msgid "Can't open cache file %s\n" msgstr "无法打开缓冲文件 %s\n" -#: elf/cache.c:154 +#: elf/cache.c:148 #, c-format msgid "mmap of cache file failed.\n" msgstr "缓冲文件的 mmap 失败。\n" -#: elf/cache.c:158 elf/cache.c:168 +#: elf/cache.c:152 elf/cache.c:166 #, c-format msgid "File is not a cache file.\n" msgstr "文件不是缓冲区文件。\n" -#: elf/cache.c:201 elf/cache.c:211 +#: elf/cache.c:199 elf/cache.c:209 #, c-format msgid "%d libs found in cache `%s'\n" msgstr "在缓冲区“%2$s”中找到 %1$d 个库\n" -#: elf/cache.c:410 -#, c-format -msgid "Can't remove old temporary cache file %s" -msgstr "无法删除旧临时缓冲文件 %s" - -#: elf/cache.c:417 +#: elf/cache.c:403 #, c-format msgid "Can't create temporary cache file %s" msgstr "无法创建临时缓冲文件 %s" -#: elf/cache.c:425 elf/cache.c:435 elf/cache.c:439 elf/cache.c:443 +#: elf/cache.c:411 elf/cache.c:421 elf/cache.c:425 elf/cache.c:430 #, c-format msgid "Writing of cache data failed" msgstr "写缓冲数据失败" -#: elf/cache.c:450 +#: elf/cache.c:435 #, c-format msgid "Changing access rights of %s to %#o failed" msgstr "将 %s 的访问权限改变为 %#o 失败" -#: elf/cache.c:455 +#: elf/cache.c:440 #, c-format msgid "Renaming of %s to %s failed" msgstr "将 %s 改名为 %s 失败" @@ -401,28 +396,28 @@ msgstr "无法创建范围列表" msgid "shared object not open" msgstr "共享库未打开" -#: elf/dl-deps.c:112 +#: elf/dl-deps.c:114 msgid "DST not allowed in SUID/SGID programs" msgstr "在 SUID/SGID 程序中不允许 DST" -#: elf/dl-deps.c:125 elf/dl-open.c:282 +#: elf/dl-deps.c:127 elf/dl-open.c:282 msgid "empty dynamic string token substitution" msgstr "空动态字符串替换" -#: elf/dl-deps.c:131 +#: elf/dl-deps.c:133 #, c-format msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n" msgstr "" -#: elf/dl-deps.c:472 +#: elf/dl-deps.c:474 msgid "cannot allocate dependency list" msgstr "无法分配倚赖列表" -#: elf/dl-deps.c:505 elf/dl-deps.c:560 +#: elf/dl-deps.c:510 elf/dl-deps.c:565 msgid "cannot allocate symbol search list" msgstr "无法分配符号搜索列表" -#: elf/dl-deps.c:545 +#: elf/dl-deps.c:550 msgid "Filters not supported with LD_TRACE_PRELINKING" msgstr "" @@ -598,11 +593,11 @@ msgstr "错误 ELF 类: ELFCLASS32" msgid "cannot open shared object file" msgstr "无法打开共享对象文件" -#: elf/dl-lookup.c:261 +#: elf/dl-lookup.c:356 msgid "relocation error" msgstr "重定位错误" -#: elf/dl-lookup.c:289 +#: elf/dl-lookup.c:384 msgid "symbol lookup error" msgstr "符号查询错误" @@ -652,11 +647,11 @@ msgstr "重定位后无法恢复段 prot" msgid "cannot apply additional memory protection after relocation" msgstr "无法在重定位后应用额外的内存保护" -#: elf/dl-sym.c:161 +#: elf/dl-sym.c:162 msgid "RTLD_NEXT used in code not dynamically loaded" msgstr "" -#: elf/dl-sysdep.c:474 elf/dl-sysdep.c:486 +#: elf/dl-sysdep.c:469 elf/dl-sysdep.c:481 msgid "cannot create capability list" msgstr "无法创建功能列表" @@ -668,216 +663,220 @@ msgstr "无法创建 TLS 数据结构" msgid "cannot allocate version reference table" msgstr "无法分配版本引用表格" -#: elf/ldconfig.c:135 +#: elf/ldconfig.c:138 msgid "Print cache" msgstr "打印缓冲区" -#: elf/ldconfig.c:136 +#: elf/ldconfig.c:139 msgid "Generate verbose messages" msgstr "生成详细消息" -#: elf/ldconfig.c:137 +#: elf/ldconfig.c:140 msgid "Don't build cache" msgstr "不要创建缓冲区" -#: elf/ldconfig.c:138 +#: elf/ldconfig.c:141 msgid "Don't generate links" msgstr "不要生成连接" -#: elf/ldconfig.c:139 +#: elf/ldconfig.c:142 msgid "Change to and use ROOT as root directory" msgstr "进入 ROOT 目录并将其作为根目录" -#: elf/ldconfig.c:139 +#: elf/ldconfig.c:142 msgid "ROOT" msgstr "ROOT" -#: elf/ldconfig.c:140 +#: elf/ldconfig.c:143 msgid "CACHE" msgstr "CACHE" -#: elf/ldconfig.c:140 +#: elf/ldconfig.c:143 msgid "Use CACHE as cache file" msgstr "将 CACHE 用作缓冲区文件" -#: elf/ldconfig.c:141 +#: elf/ldconfig.c:144 msgid "CONF" msgstr "CONF" -#: elf/ldconfig.c:141 +#: elf/ldconfig.c:144 msgid "Use CONF as configuration file" msgstr "将 CONF 用作配置文件" -#: elf/ldconfig.c:142 +#: elf/ldconfig.c:145 msgid "Only process directories specified on the command line. Don't build cache." msgstr "只在命令行中给出了进程目录。未创建缓冲区。" -#: elf/ldconfig.c:143 +#: elf/ldconfig.c:146 msgid "Manually link individual libraries." msgstr "手工连接独立的库。" -#: elf/ldconfig.c:144 +#: elf/ldconfig.c:147 msgid "FORMAT" msgstr "FORMAT" -#: elf/ldconfig.c:144 +#: elf/ldconfig.c:147 msgid "Format to use: new, old or compat (default)" msgstr "采用的格式：新、旧或兼容(默认)" -#: elf/ldconfig.c:152 +#: elf/ldconfig.c:148 +msgid "Ignore auxiliary cache file" +msgstr "忽略辅助缓存文件" + +#: elf/ldconfig.c:156 msgid "Configure Dynamic Linker Run Time Bindings." msgstr "" -#: elf/ldconfig.c:310 +#: elf/ldconfig.c:319 #, c-format msgid "Path `%s' given more than once" msgstr "多次给出路径“%s”" -#: elf/ldconfig.c:350 +#: elf/ldconfig.c:359 #, c-format msgid "%s is not a known library type" msgstr "%s 不是已知类型的库" -#: elf/ldconfig.c:375 +#: elf/ldconfig.c:384 #, c-format msgid "Can't stat %s" msgstr "无法对 %s 进行 stat 操作" -#: elf/ldconfig.c:449 +#: elf/ldconfig.c:458 #, c-format msgid "Can't stat %s\n" msgstr "无法对 %s 进行 stat 操作\n" -#: elf/ldconfig.c:459 +#: elf/ldconfig.c:468 #, c-format msgid "%s is not a symbolic link\n" msgstr "%s 不是符号连接\n" -#: elf/ldconfig.c:478 +#: elf/ldconfig.c:487 #, c-format msgid "Can't unlink %s" msgstr "" -#: elf/ldconfig.c:484 +#: elf/ldconfig.c:493 #, c-format msgid "Can't link %s to %s" msgstr "无法将 %s 连接到 %s" -#: elf/ldconfig.c:490 +#: elf/ldconfig.c:499 msgid " (changed)\n" msgstr " (改变)\n" -#: elf/ldconfig.c:492 +#: elf/ldconfig.c:501 msgid " (SKIPPED)\n" msgstr " (跳过)\n" -#: elf/ldconfig.c:547 +#: elf/ldconfig.c:556 #, c-format msgid "Can't find %s" msgstr "无法找到 %s" -#: elf/ldconfig.c:563 elf/ldconfig.c:737 elf/ldconfig.c:784 +#: elf/ldconfig.c:572 elf/ldconfig.c:745 elf/ldconfig.c:793 elf/ldconfig.c:827 #, c-format msgid "Cannot lstat %s" msgstr "无法对 %s 进行 lstat 操作" -#: elf/ldconfig.c:570 +#: elf/ldconfig.c:579 #, c-format msgid "Ignored file %s since it is not a regular file." msgstr "由于不是一个普通文件，忽略文件 %s" -#: elf/ldconfig.c:578 +#: elf/ldconfig.c:588 #, c-format msgid "No link created since soname could not be found for %s" msgstr "未创建链接，因为 %s 无法找到 soname" -#: elf/ldconfig.c:669 +#: elf/ldconfig.c:671 #, c-format msgid "Can't open directory %s" msgstr "无法打开目录 %s" -#: elf/ldconfig.c:749 +#: elf/ldconfig.c:759 #, c-format msgid "Cannot stat %s" msgstr "无法对 %s 进行 stat 操作" -#: elf/ldconfig.c:806 elf/readlib.c:91 +#: elf/ldconfig.c:814 elf/readlib.c:91 #, c-format msgid "Input file %s not found.\n" msgstr "未找到输入文件 %s。\n" -#: elf/ldconfig.c:857 +#: elf/ldconfig.c:888 #, c-format msgid "libc5 library %s in wrong directory" msgstr "libc5 的库 %s 处于错误的目录中" -#: elf/ldconfig.c:860 +#: elf/ldconfig.c:891 #, c-format msgid "libc6 library %s in wrong directory" msgstr "libc5 的库 %s 处于错误的目录中" -#: elf/ldconfig.c:863 +#: elf/ldconfig.c:894 #, c-format msgid "libc4 library %s in wrong directory" msgstr "libc4 的库 %s 处于错误的目录中" -#: elf/ldconfig.c:890 +#: elf/ldconfig.c:922 #, 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:997 +#: elf/ldconfig.c:1031 #, c-format msgid "Can't open configuration file %s" msgstr "无法打开配置文件 %s" -#: elf/ldconfig.c:1061 +#: elf/ldconfig.c:1095 #, c-format msgid "%s:%u: bad syntax in hwcap line" msgstr "" -#: elf/ldconfig.c:1067 +#: elf/ldconfig.c:1101 #, c-format msgid "%s:%u: hwcap index %lu above maximum %u" msgstr "" -#: elf/ldconfig.c:1074 elf/ldconfig.c:1082 +#: elf/ldconfig.c:1108 elf/ldconfig.c:1116 #, c-format msgid "%s:%u: hwcap index %lu already defined as %s" msgstr "" -#: elf/ldconfig.c:1085 +#: elf/ldconfig.c:1119 #, c-format msgid "%s:%u: duplicate hwcap %lu %s" msgstr "" -#: elf/ldconfig.c:1107 +#: elf/ldconfig.c:1141 #, c-format msgid "need absolute file name for configuration file when using -r" msgstr "" -#: elf/ldconfig.c:1114 locale/programs/xmalloc.c:70 malloc/obstack.c:434 +#: elf/ldconfig.c:1148 locale/programs/xmalloc.c:70 malloc/obstack.c:434 #: malloc/obstack.c:436 posix/getconf.c:985 posix/getconf.c:1163 #, c-format msgid "memory exhausted" msgstr "内存耗尽" -#: elf/ldconfig.c:1144 +#: elf/ldconfig.c:1178 #, c-format msgid "%s:%u: cannot read directory %s" msgstr "%s：%u: 无法读取目录 %s" -#: elf/ldconfig.c:1189 +#: elf/ldconfig.c:1223 #, c-format msgid "relative path `%s' used to build cache" msgstr "" -#: elf/ldconfig.c:1215 +#: elf/ldconfig.c:1249 #, c-format msgid "Can't chdir to /" msgstr "无法改变目录到 /" -#: elf/ldconfig.c:1257 +#: elf/ldconfig.c:1291 #, c-format msgid "Can't open cache file directory %s\n" msgstr "无法打开缓冲文件目录 %s\n" @@ -1378,7 +1377,7 @@ msgstr "未知的 .netrc 关键字 %s" msgid "Character out of range for UTF-8" msgstr "字符超出 UTF-8 的范围" -#: locale/programs/charmap-dir.c:58 +#: locale/programs/charmap-dir.c:59 #, c-format msgid "cannot read character map directory `%s'" msgstr "无法读入字母映射目录“%s”" @@ -1404,7 +1403,7 @@ msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n" msgstr "%s：<mb_cur_max> 必须大于 <mb_cur_min>\n" #: locale/programs/charmap.c:357 locale/programs/charmap.c:374 -#: locale/programs/repertoire.c:175 +#: locale/programs/repertoire.c:174 #, c-format msgid "syntax error in prolog: %s" msgstr "序言中语法错误：%s" @@ -1414,7 +1413,7 @@ msgid "invalid definition" msgstr "无效的定义" #: locale/programs/charmap.c:375 locale/programs/locfile.c:126 -#: locale/programs/locfile.c:153 locale/programs/repertoire.c:176 +#: locale/programs/locfile.c:153 locale/programs/repertoire.c:175 msgid "bad argument" msgstr "错误的参数" @@ -1433,7 +1432,7 @@ msgstr "<%s>的值必须是 1 或更大" msgid "value of <%s> must be greater or equal than the value of <%s>" msgstr "<%s> 的值必须大于等于 <%s> 的值" -#: locale/programs/charmap.c:445 locale/programs/repertoire.c:184 +#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183 #, c-format msgid "argument to <%s> must be a single character" msgstr "<%s>的参数必须是单个字符" @@ -1451,7 +1450,7 @@ msgid "syntax error in %s definition: %s" msgstr "%s 的定义中的语法错误：%s" #: locale/programs/charmap.c:499 locale/programs/charmap.c:679 -#: locale/programs/charmap.c:775 locale/programs/repertoire.c:231 +#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230 msgid "no symbolic name given" msgstr "没有给出符号名" @@ -1468,19 +1467,19 @@ msgid "too many bytes in character encoding" msgstr "字符编码中字节数过多" #: locale/programs/charmap.c:586 locale/programs/charmap.c:734 -#: locale/programs/charmap.c:817 locale/programs/repertoire.c:297 +#: locale/programs/charmap.c:817 locale/programs/repertoire.c:296 msgid "no symbolic name given for end of range" msgstr "没有为范围的结束给出符号化的名称" #: locale/programs/charmap.c:610 locale/programs/ld-address.c:600 -#: locale/programs/ld-collate.c:2677 locale/programs/ld-collate.c:3828 +#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3924 #: locale/programs/ld-ctype.c:2232 locale/programs/ld-ctype.c:2984 #: locale/programs/ld-identification.c:452 #: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332 #: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307 #: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:241 #: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1221 -#: locale/programs/repertoire.c:314 +#: locale/programs/repertoire.c:313 #, c-format msgid "%1$s: definition does not end with `END %1$s'" msgstr "%1$s：定义不以“END %1$s”结尾" @@ -1500,14 +1499,14 @@ msgid "%s: error in state machine" msgstr "%s：状态机出错" #: locale/programs/charmap.c:850 locale/programs/ld-address.c:616 -#: locale/programs/ld-collate.c:2674 locale/programs/ld-collate.c:3844 +#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4115 #: locale/programs/ld-ctype.c:2229 locale/programs/ld-ctype.c:3001 #: locale/programs/ld-identification.c:468 #: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348 #: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323 #: locale/programs/ld-numeric.c:384 locale/programs/ld-paper.c:257 #: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1237 -#: locale/programs/locfile.c:826 locale/programs/repertoire.c:325 +#: locale/programs/locfile.c:826 locale/programs/repertoire.c:324 #, c-format msgid "%s: premature end of file" msgstr "%s：文件不完整" @@ -1522,21 +1521,21 @@ msgstr "未知的字符“%s”" msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d" msgstr "" -#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:2957 -#: locale/programs/repertoire.c:420 +#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3047 +#: locale/programs/repertoire.c:419 msgid "invalid names for character range" msgstr "" -#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:432 +#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431 msgid "hexadecimal range format should use only capital characters" msgstr "" -#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:450 +#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449 #, c-format msgid "<%s> and <%s> are invalid names for range" msgstr "<%s> 和 <%s> 是无效的范围名" -#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:457 +#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456 msgid "upper limit in range is smaller than lower limit" msgstr "范围的上限小于下限" @@ -1544,7 +1543,7 @@ msgstr "范围的上限小于下限" msgid "resulting bytes for range not representable." msgstr "" -#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1536 +#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1556 #: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:133 #: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94 @@ -1631,7 +1630,7 @@ msgstr "%s：多次声明域“%s”" msgid "%s: unknown character in field `%s'" msgstr "%s：域“%s”中含有未知字符" -#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3826 +#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3922 #: locale/programs/ld-ctype.c:2981 locale/programs/ld-identification.c:449 #: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330 #: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305 @@ -1641,12 +1640,13 @@ msgstr "%s：域“%s”中含有未知字符" msgid "%s: incomplete `END' line" msgstr "%s：不完整的“END”行" -#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:522 -#: locale/programs/ld-collate.c:574 locale/programs/ld-collate.c:870 -#: locale/programs/ld-collate.c:883 locale/programs/ld-collate.c:2664 -#: locale/programs/ld-collate.c:3835 locale/programs/ld-ctype.c:1960 -#: locale/programs/ld-ctype.c:2219 locale/programs/ld-ctype.c:2806 -#: locale/programs/ld-ctype.c:2992 locale/programs/ld-identification.c:459 +#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:542 +#: locale/programs/ld-collate.c:594 locale/programs/ld-collate.c:890 +#: locale/programs/ld-collate.c:903 locale/programs/ld-collate.c:2733 +#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4105 +#: locale/programs/ld-ctype.c:1960 locale/programs/ld-ctype.c:2219 +#: locale/programs/ld-ctype.c:2806 locale/programs/ld-ctype.c:2992 +#: locale/programs/ld-identification.c:459 #: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339 #: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314 #: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:248 @@ -1655,247 +1655,267 @@ msgstr "%s：不完整的“END”行" msgid "%s: syntax error" msgstr "%s：语法错误" -#: locale/programs/ld-collate.c:397 +#: locale/programs/ld-collate.c:417 #, c-format msgid "`%.*s' already defined in charmap" msgstr "已经在字符映射表中定义了“%.*s”" -#: locale/programs/ld-collate.c:406 +#: locale/programs/ld-collate.c:426 #, c-format msgid "`%.*s' already defined in repertoire" msgstr "已经在指令表中定义了“%.*s”" -#: locale/programs/ld-collate.c:413 +#: locale/programs/ld-collate.c:433 #, c-format msgid "`%.*s' already defined as collating symbol" msgstr "" -#: locale/programs/ld-collate.c:420 +#: locale/programs/ld-collate.c:440 #, c-format msgid "`%.*s' already defined as collating element" msgstr "" -#: locale/programs/ld-collate.c:451 locale/programs/ld-collate.c:477 +#: locale/programs/ld-collate.c:471 locale/programs/ld-collate.c:497 #, c-format msgid "%s: `forward' and `backward' are mutually excluding each other" msgstr "%s：“forward”和“backward”是互斥的" -#: locale/programs/ld-collate.c:461 locale/programs/ld-collate.c:487 -#: locale/programs/ld-collate.c:503 +#: locale/programs/ld-collate.c:481 locale/programs/ld-collate.c:507 +#: locale/programs/ld-collate.c:523 #, c-format msgid "%s: `%s' mentioned more than once in definition of weight %d" msgstr "" -#: locale/programs/ld-collate.c:559 +#: locale/programs/ld-collate.c:579 #, c-format msgid "%s: too many rules; first entry only had %d" msgstr "%s：规则过多；第一个条目只含有 %d" -#: locale/programs/ld-collate.c:595 +#: locale/programs/ld-collate.c:615 #, c-format msgid "%s: not enough sorting rules" msgstr "%s：排序规则不足" -#: locale/programs/ld-collate.c:760 +#: locale/programs/ld-collate.c:780 #, c-format msgid "%s: empty weight string not allowed" msgstr "%s：不允许空权字符串" -#: locale/programs/ld-collate.c:855 +#: locale/programs/ld-collate.c:875 #, c-format msgid "%s: weights must use the same ellipsis symbol as the name" msgstr "" -#: locale/programs/ld-collate.c:911 +#: locale/programs/ld-collate.c:931 #, c-format msgid "%s: too many values" msgstr "%s：值过多" -#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206 +#: locale/programs/ld-collate.c:1051 locale/programs/ld-collate.c:1226 #, c-format msgid "order for `%.*s' already defined at %s:%Zu" msgstr "" -#: locale/programs/ld-collate.c:1081 +#: locale/programs/ld-collate.c:1101 #, c-format msgid "%s: the start and the end symbol of a range must stand for characters" msgstr "" -#: locale/programs/ld-collate.c:1108 +#: locale/programs/ld-collate.c:1128 #, c-format msgid "%s: byte sequences of first and last character must have the same length" msgstr "%s：字节序列的第一个和最后一个字符的长度必须相同" -#: locale/programs/ld-collate.c:1150 +#: locale/programs/ld-collate.c:1170 #, 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:1275 +#: locale/programs/ld-collate.c:1295 #, c-format msgid "%s: symbolic range ellipsis must not directly follow `order_start'" msgstr "" -#: locale/programs/ld-collate.c:1279 +#: locale/programs/ld-collate.c:1299 #, c-format msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'" msgstr "" -#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1477 +#: locale/programs/ld-collate.c:1319 locale/programs/ld-ctype.c:1477 #, c-format msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "“%s”和“%.*s”是无效的符号范围名" -#: locale/programs/ld-collate.c:1349 locale/programs/ld-collate.c:3763 +#: locale/programs/ld-collate.c:1369 locale/programs/ld-collate.c:3858 #, c-format msgid "%s: order for `%.*s' already defined at %s:%Zu" msgstr "" -#: locale/programs/ld-collate.c:1358 +#: locale/programs/ld-collate.c:1378 #, c-format msgid "%s: `%s' must be a character" msgstr "%s：“%s”必须是一个字符" -#: locale/programs/ld-collate.c:1552 +#: locale/programs/ld-collate.c:1573 #, c-format msgid "%s: `position' must be used for a specific level in all sections or none" msgstr "" -#: locale/programs/ld-collate.c:1577 +#: locale/programs/ld-collate.c:1598 #, c-format msgid "symbol `%s' not defined" msgstr "符号“%s”未定义" -#: locale/programs/ld-collate.c:1653 locale/programs/ld-collate.c:1759 +#: locale/programs/ld-collate.c:1674 locale/programs/ld-collate.c:1780 #, c-format msgid "symbol `%s' has the same encoding as" msgstr "" -#: locale/programs/ld-collate.c:1657 locale/programs/ld-collate.c:1763 +#: locale/programs/ld-collate.c:1678 locale/programs/ld-collate.c:1784 #, c-format msgid "symbol `%s'" msgstr "符号“%s”" -#: locale/programs/ld-collate.c:1805 +#: locale/programs/ld-collate.c:1826 #, c-format msgid "no definition of `UNDEFINED'" msgstr "没有关于“UNDEFINIED”的定义" -#: locale/programs/ld-collate.c:1834 +#: locale/programs/ld-collate.c:1855 #, c-format msgid "too many errors; giving up" msgstr "错误过多；放弃" -#: locale/programs/ld-collate.c:2762 +#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4044 +#, c-format +msgid "%s: nested conditionals not supported" +msgstr "%s: 不支持嵌套条件" + +#: locale/programs/ld-collate.c:2677 +#, c-format +msgid "%s: more then one 'else'" +msgstr "%s: 多于一个'else'" + +#: locale/programs/ld-collate.c:2852 #, c-format msgid "%s: duplicate definition of `%s'" msgstr "%s：重复定义“%s”" -#: locale/programs/ld-collate.c:2798 +#: locale/programs/ld-collate.c:2888 #, c-format msgid "%s: duplicate declaration of section `%s'" msgstr "%s：重复声明节“%s”" -#: locale/programs/ld-collate.c:2937 +#: locale/programs/ld-collate.c:3027 #, c-format msgid "%s: unknown character in collating symbol name" msgstr "" -#: locale/programs/ld-collate.c:3069 +#: locale/programs/ld-collate.c:3159 #, c-format msgid "%s: unknown character in equivalent definition name" msgstr "%s：等价定义名中未知的字符" -#: locale/programs/ld-collate.c:3082 +#: locale/programs/ld-collate.c:3172 #, c-format msgid "%s: unknown character in equivalent definition value" msgstr "%s：等价定义值中未知的字符" -#: locale/programs/ld-collate.c:3092 +#: locale/programs/ld-collate.c:3182 #, c-format msgid "%s: unknown symbol `%s' in equivalent definition" msgstr "%s：等价定义中未知的符号“%s”" -#: locale/programs/ld-collate.c:3101 +#: locale/programs/ld-collate.c:3191 msgid "error while adding equivalent collating symbol" msgstr "" -#: locale/programs/ld-collate.c:3131 +#: locale/programs/ld-collate.c:3221 #, c-format msgid "duplicate definition of script `%s'" msgstr "重复定义脚本“%s”" -#: locale/programs/ld-collate.c:3179 +#: locale/programs/ld-collate.c:3269 #, c-format msgid "%s: unknown section name `%.*s'" msgstr "%s：未知的节名“%.*s”" -#: locale/programs/ld-collate.c:3208 +#: locale/programs/ld-collate.c:3298 #, c-format msgid "%s: multiple order definitions for section `%s'" msgstr "%s：关于“%s”节出现多个顺序定义" -#: locale/programs/ld-collate.c:3233 +#: locale/programs/ld-collate.c:3326 #, c-format msgid "%s: invalid number of sorting rules" msgstr "%s：排序规则的数量无效" -#: locale/programs/ld-collate.c:3260 +#: locale/programs/ld-collate.c:3353 #, c-format msgid "%s: multiple order definitions for unnamed section" msgstr "%s：关于未命名节出现多个顺序定义" -#: locale/programs/ld-collate.c:3314 locale/programs/ld-collate.c:3442 -#: locale/programs/ld-collate.c:3804 +#: locale/programs/ld-collate.c:3407 locale/programs/ld-collate.c:3537 +#: locale/programs/ld-collate.c:3900 #, c-format msgid "%s: missing `order_end' keyword" msgstr "%s：遗漏关键字“order_end”" -#: locale/programs/ld-collate.c:3375 +#: locale/programs/ld-collate.c:3470 #, c-format msgid "%s: order for collating symbol %.*s not yet defined" msgstr "" -#: locale/programs/ld-collate.c:3393 +#: locale/programs/ld-collate.c:3488 #, c-format msgid "%s: order for collating element %.*s not yet defined" msgstr "" -#: locale/programs/ld-collate.c:3404 +#: locale/programs/ld-collate.c:3499 #, c-format msgid "%s: cannot reorder after %.*s: symbol not known" msgstr "" -#: locale/programs/ld-collate.c:3456 locale/programs/ld-collate.c:3816 +#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912 #, c-format msgid "%s: missing `reorder-end' keyword" msgstr "%s：以后关键字“reorder-end”" -#: locale/programs/ld-collate.c:3490 locale/programs/ld-collate.c:3688 +#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783 #, c-format msgid "%s: section `%.*s' not known" msgstr "%s：未知的节“%.*s”" -#: locale/programs/ld-collate.c:3555 +#: locale/programs/ld-collate.c:3650 #, c-format msgid "%s: bad symbol <%.*s>" msgstr "" -#: locale/programs/ld-collate.c:3751 +#: locale/programs/ld-collate.c:3846 #, c-format msgid "%s: cannot have `%s' as end of ellipsis range" msgstr "" -#: locale/programs/ld-collate.c:3800 +#: locale/programs/ld-collate.c:3896 #, c-format msgid "%s: empty category description not allowed" msgstr "%s：不允许空范畴描述" -#: locale/programs/ld-collate.c:3819 +#: locale/programs/ld-collate.c:3915 #, c-format msgid "%s: missing `reorder-sections-end' keyword" msgstr "%s：遗漏关键字“reorder-sections-end”" +#: locale/programs/ld-collate.c:4077 +#, c-format +msgid "%s: '%s' without matching 'ifdef' or 'ifndef'" +msgstr "" + +#: locale/programs/ld-collate.c:4095 +#, c-format +msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'" +msgstr "" + #: locale/programs/ld-ctype.c:439 #, c-format msgid "No character set name specified in charmap" @@ -2660,22 +2680,22 @@ msgstr "使用“copy”时不应再使用其它关键字" msgid "`%1$s' definition does not end with `END %1$s'" msgstr "对“%1$s”的定义并不以“END %1%s”结束" -#: locale/programs/repertoire.c:230 locale/programs/repertoire.c:271 -#: locale/programs/repertoire.c:296 +#: locale/programs/repertoire.c:229 locale/programs/repertoire.c:270 +#: locale/programs/repertoire.c:295 #, c-format msgid "syntax error in repertoire map definition: %s" msgstr "" -#: locale/programs/repertoire.c:272 +#: locale/programs/repertoire.c:271 msgid "no <Uxxxx> or <Uxxxxxxxx> value given" msgstr "即未给出 <Uxxxx> 也未给出 <Uxxxxxxxx>" -#: locale/programs/repertoire.c:332 +#: locale/programs/repertoire.c:331 #, c-format msgid "cannot save new repertoire map" msgstr "无法保存新的指令表" -#: locale/programs/repertoire.c:343 +#: locale/programs/repertoire.c:342 #, c-format msgid "repertoire map file `%s' not found" msgstr "" @@ -3455,12 +3475,12 @@ msgstr "yp_update：无法将主机名转换为网名\n" msgid "yp_update: cannot get server address\n" msgstr "yp_update：无法获取服务器地址\n" -#: nscd/aicache.c:77 nscd/hstcache.c:462 +#: nscd/aicache.c:77 nscd/hstcache.c:468 #, c-format msgid "Haven't found \"%s\" in hosts cache!" msgstr "无法在主机缓冲区中找到“%s”！" -#: nscd/aicache.c:79 nscd/hstcache.c:464 +#: nscd/aicache.c:79 nscd/hstcache.c:470 #, c-format msgid "Reloading \"%s\" in hosts cache!" msgstr "在主机缓冲区中重新加载“%s”！" @@ -3474,7 +3494,7 @@ msgstr "" msgid " (first)" msgstr "" -#: nscd/cache.c:256 nscd/connections.c:786 +#: nscd/cache.c:256 nscd/connections.c:810 #, c-format msgid "cannot stat() file `%s': %s" msgstr "无法对文件“%s”进行 stat() 操作：%s" @@ -3489,188 +3509,188 @@ msgstr "" msgid "considering %s entry \"%s\", timeout %<PRIu64>" msgstr "" -#: nscd/connections.c:505 nscd/connections.c:517 nscd/connections.c:529 -#: nscd/connections.c:548 +#: nscd/connections.c:521 nscd/connections.c:533 nscd/connections.c:545 +#: nscd/connections.c:564 #, c-format msgid "invalid persistent database file \"%s\": %s" msgstr "" -#: nscd/connections.c:519 +#: nscd/connections.c:535 msgid "header size does not match" msgstr "" -#: nscd/connections.c:531 +#: nscd/connections.c:547 msgid "file size does not match" msgstr "文件大小不匹配" -#: nscd/connections.c:550 +#: nscd/connections.c:566 msgid "verification failed" msgstr "验证失败" -#: nscd/connections.c:564 +#: nscd/connections.c:580 #, c-format msgid "suggested size of table for database %s larger than the persistent database's table" msgstr "" -#: nscd/connections.c:574 nscd/connections.c:655 +#: nscd/connections.c:591 nscd/connections.c:673 #, c-format msgid "cannot create read-only descriptor for \"%s\"; no mmap" msgstr "无法为“%s”创建只读描述符；没有 mmap" -#: nscd/connections.c:634 +#: nscd/connections.c:652 #, c-format msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart" msgstr "" -#: nscd/connections.c:641 +#: nscd/connections.c:659 #, c-format msgid "cannot create %s; no persistent database used" msgstr "无法创建 %s; 不使用持久数据库" -#: nscd/connections.c:644 +#: nscd/connections.c:662 #, c-format msgid "cannot create %s; no sharing possible" msgstr "无法创建 %s; 无法共享" -#: nscd/connections.c:715 +#: nscd/connections.c:733 #, c-format msgid "cannot write to database file %s: %s" msgstr "无法写入数据库文件 %s: %s" -#: nscd/connections.c:749 +#: nscd/connections.c:772 #, c-format msgid "cannot set socket to close on exec: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:799 +#: nscd/connections.c:823 #, c-format msgid "cannot open socket: %s" msgstr "无法打开套接字：%s" -#: nscd/connections.c:816 +#: nscd/connections.c:840 #, c-format msgid "cannot change socket to nonblocking mode: %s" msgstr "无法转换套接字到非堵塞模式: %s" -#: nscd/connections.c:824 +#: nscd/connections.c:848 #, c-format msgid "cannot set socket to close on exec: %s" msgstr "无法设定套接字为 exec 时关闭: %s" -#: nscd/connections.c:835 +#: nscd/connections.c:859 #, c-format msgid "cannot enable socket to accept connections: %s" msgstr "无法启用套接字以接受连接：%s" -#: nscd/connections.c:926 +#: nscd/connections.c:955 #, c-format msgid "provide access to FD %d, for %s" msgstr "" -#: nscd/connections.c:938 +#: nscd/connections.c:967 #, c-format msgid "cannot handle old request version %d; current version is %d" msgstr "无法处理旧请求版本 %d；当前版本为 %d" -#: nscd/connections.c:980 nscd/connections.c:1033 +#: nscd/connections.c:1009 nscd/connections.c:1062 #, c-format msgid "cannot write result: %s" msgstr "无法写入结果：“%s”" -#: nscd/connections.c:1116 +#: nscd/connections.c:1145 #, c-format msgid "error getting caller's id: %s" msgstr "" -#: nscd/connections.c:1175 +#: nscd/connections.c:1204 #, c-format msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1189 +#: nscd/connections.c:1218 #, c-format msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1229 +#: nscd/connections.c:1258 #, c-format msgid "cannot change to old UID: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1239 +#: nscd/connections.c:1268 #, c-format msgid "cannot change to old GID: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1252 +#: nscd/connections.c:1281 #, c-format msgid "cannot change to old working directory: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1280 +#: nscd/connections.c:1310 #, c-format msgid "re-exec failed: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1289 +#: nscd/connections.c:1319 #, c-format msgid "cannot change current working directory to \"/\": %s" msgstr "" -#: nscd/connections.c:1407 +#: nscd/connections.c:1437 #, c-format msgid "short read while reading request: %s" msgstr "读取请求时没有读入足够的数据：%s" -#: nscd/connections.c:1438 +#: nscd/connections.c:1468 #, c-format msgid "key length in request too long: %d" msgstr "请求中的键过长：%d" -#: nscd/connections.c:1451 +#: nscd/connections.c:1481 #, c-format msgid "short read while reading request key: %s" msgstr "读入请求键的时候没有读入足够的数据：%s" -#: nscd/connections.c:1460 +#: nscd/connections.c:1490 #, c-format msgid "handle_request: request received (Version = %d) from PID %ld" msgstr "处理请求：已从进程ID %2$ld 收到请求 (版本 = %1$d)" -#: nscd/connections.c:1465 +#: nscd/connections.c:1495 #, c-format msgid "handle_request: request received (Version = %d)" msgstr "处理请求：已收到请求 (版本 = %d)" -#: nscd/connections.c:1826 +#: nscd/connections.c:1856 #, c-format msgid "could only start %d threads; terminating" msgstr "" -#: nscd/connections.c:1874 nscd/connections.c:1875 nscd/connections.c:1892 -#: nscd/connections.c:1901 nscd/connections.c:1919 nscd/connections.c:1930 -#: nscd/connections.c:1941 +#: nscd/connections.c:1904 nscd/connections.c:1905 nscd/connections.c:1922 +#: nscd/connections.c:1931 nscd/connections.c:1949 nscd/connections.c:1960 +#: nscd/connections.c:1971 #, c-format msgid "Failed to run nscd as user '%s'" msgstr "" -#: nscd/connections.c:1893 +#: nscd/connections.c:1923 #, c-format msgid "initial getgrouplist failed" msgstr "初始化 getgrouplist 失败" -#: nscd/connections.c:1902 +#: nscd/connections.c:1932 #, c-format msgid "getgrouplist failed" msgstr "getgrouplist 失败" -#: nscd/connections.c:1920 +#: nscd/connections.c:1950 #, c-format msgid "setgroups failed" msgstr "setgroups 失败" -#: nscd/grpcache.c:402 nscd/hstcache.c:412 nscd/initgrcache.c:412 -#: nscd/pwdcache.c:397 nscd/servicescache.c:342 +#: nscd/grpcache.c:402 nscd/hstcache.c:418 nscd/initgrcache.c:412 +#: nscd/pwdcache.c:397 nscd/servicescache.c:343 #, c-format msgid "short write in %s: %s" msgstr "" @@ -4042,12 +4062,12 @@ msgid "" "%15u CAV misses\n" msgstr "" -#: nscd/servicescache.c:389 +#: nscd/servicescache.c:390 #, c-format msgid "Haven't found \"%s\" in services cache!" msgstr "无法在服务缓冲区中找到“%s”！" -#: nscd/servicescache.c:391 +#: nscd/servicescache.c:392 #, c-format msgid "Reloading \"%s\" in services cache!" msgstr "在服务缓冲区中重新加载“%s”！" @@ -6114,7 +6134,7 @@ msgstr "未知类型的输入行" msgid "%s: Leap line in non leap seconds file %s\n" msgstr "" -#: timezone/zic.c:892 timezone/zic.c:1323 timezone/zic.c:1345 +#: timezone/zic.c:892 timezone/zic.c:1329 timezone/zic.c:1351 #, c-format msgid "%s: panic: Invalid l_value %d\n" msgstr "" @@ -6133,235 +6153,246 @@ msgstr "%s：关闭 %s 错误：%s\n" msgid "expected continuation line not found" msgstr "找不到应该出现的续行" -#: timezone/zic.c:956 +#: timezone/zic.c:956 timezone/zic.c:2489 timezone/zic.c:2508 +msgid "time overflow" +msgstr "时间溢出" + +#: timezone/zic.c:960 msgid "24:00 not handled by pre-1998 versions of zic" msgstr "" -#: timezone/zic.c:970 +#: timezone/zic.c:963 +msgid "values over 24 hours not handled by pre-2007 versions of zic" +msgstr "" + +#: timezone/zic.c:976 msgid "wrong number of fields on Rule line" msgstr "规则行中域的个数错误" -#: timezone/zic.c:974 +#: timezone/zic.c:980 msgid "nameless rule" msgstr "无名规则" -#: timezone/zic.c:979 +#: timezone/zic.c:985 msgid "invalid saved time" msgstr "" -#: timezone/zic.c:1000 +#: timezone/zic.c:1006 msgid "wrong number of fields on Zone line" msgstr "区域行中域的个数错误" -#: timezone/zic.c:1006 +#: timezone/zic.c:1012 #, c-format msgid "\"Zone %s\" line and -l option are mutually exclusive" msgstr "" -#: timezone/zic.c:1014 +#: timezone/zic.c:1020 #, c-format msgid "\"Zone %s\" line and -p option are mutually exclusive" msgstr "" -#: timezone/zic.c:1026 +#: timezone/zic.c:1032 #, c-format msgid "duplicate zone name %s (file \"%s\", line %d)" msgstr "重复的区域名 %s (文件“%s”，行 %d)" -#: timezone/zic.c:1042 +#: timezone/zic.c:1048 msgid "wrong number of fields on Zone continuation line" msgstr "" -#: timezone/zic.c:1082 +#: timezone/zic.c:1088 msgid "invalid UTC offset" msgstr "无效的 UTC 偏移量" -#: timezone/zic.c:1085 +#: timezone/zic.c:1091 msgid "invalid abbreviation format" msgstr "无效的缩略格式" -#: timezone/zic.c:1114 +#: timezone/zic.c:1120 msgid "Zone continuation line end time is not after end time of previous line" msgstr "" -#: timezone/zic.c:1142 +#: timezone/zic.c:1148 msgid "wrong number of fields on Leap line" msgstr "" -#: timezone/zic.c:1151 +#: timezone/zic.c:1157 msgid "invalid leaping year" msgstr "无效的闰年" -#: timezone/zic.c:1171 timezone/zic.c:1277 +#: timezone/zic.c:1177 timezone/zic.c:1283 msgid "invalid month name" msgstr "无效的月名称" -#: timezone/zic.c:1184 timezone/zic.c:1390 timezone/zic.c:1404 +#: timezone/zic.c:1190 timezone/zic.c:1396 timezone/zic.c:1410 msgid "invalid day of month" msgstr "无效的日" -#: timezone/zic.c:1189 +#: timezone/zic.c:1195 msgid "time before zero" msgstr "" -#: timezone/zic.c:1193 +#: timezone/zic.c:1199 msgid "time too small" msgstr "" -#: timezone/zic.c:1197 +#: timezone/zic.c:1203 msgid "time too large" msgstr "时间过大" -#: timezone/zic.c:1201 timezone/zic.c:1306 +#: timezone/zic.c:1207 timezone/zic.c:1312 msgid "invalid time of day" msgstr "无效的时间" -#: timezone/zic.c:1220 +#: timezone/zic.c:1226 msgid "illegal CORRECTION field on Leap line" msgstr "" -#: timezone/zic.c:1225 +#: timezone/zic.c:1231 msgid "illegal Rolling/Stationary field on Leap line" msgstr "" -#: timezone/zic.c:1241 +#: timezone/zic.c:1247 msgid "wrong number of fields on Link line" msgstr "连接行中域的个数错误" -#: timezone/zic.c:1245 +#: timezone/zic.c:1251 msgid "blank FROM field on Link line" msgstr "Link 行中空白的 FROM 域" -#: timezone/zic.c:1249 +#: timezone/zic.c:1255 msgid "blank TO field on Link line" msgstr "Link 行中空白的 TO 域" -#: timezone/zic.c:1327 +#: timezone/zic.c:1333 msgid "invalid starting year" msgstr "无效的起始年份" -#: timezone/zic.c:1349 +#: timezone/zic.c:1355 msgid "invalid ending year" msgstr "无效的终止年份" -#: timezone/zic.c:1353 +#: timezone/zic.c:1359 msgid "starting year greater than ending year" msgstr "起始年份大于终止年份" -#: timezone/zic.c:1360 +#: timezone/zic.c:1366 msgid "typed single year" msgstr "" -#: timezone/zic.c:1395 +#: timezone/zic.c:1401 msgid "invalid weekday name" msgstr "无效的星期名" -#: timezone/zic.c:1573 +#: timezone/zic.c:1579 #, c-format msgid "%s: Can't remove %s: %s\n" msgstr "%s：无法删除 %s：%s\n" -#: timezone/zic.c:1583 +#: timezone/zic.c:1589 #, c-format msgid "%s: Can't create %s: %s\n" msgstr "%s：无法创建 %s：%s\n" -#: timezone/zic.c:1733 +#: timezone/zic.c:1739 #, c-format msgid "%s: Error writing %s\n" msgstr "%s：写 %s 错误\n" -#: timezone/zic.c:2025 +#: timezone/zic.c:2031 msgid "no POSIX environment variable for zone" msgstr "" -#: timezone/zic.c:2179 +#: timezone/zic.c:2185 msgid "can't determine time zone abbreviation to use just after until time" msgstr "" -#: timezone/zic.c:2225 +#: timezone/zic.c:2231 msgid "too many transitions?!" msgstr "" -#: timezone/zic.c:2244 +#: timezone/zic.c:2250 msgid "internal error - addtype called with bad isdst" msgstr "内部错误 - 以错误的 isdst 调用 addtype" -#: timezone/zic.c:2248 +#: timezone/zic.c:2254 msgid "internal error - addtype called with bad ttisstd" msgstr "内部错误 - 以错误的 ttisstd 调用 addtype" -#: timezone/zic.c:2252 +#: timezone/zic.c:2258 msgid "internal error - addtype called with bad ttisgmt" msgstr "内部错误 - 以错误的 ttisgmt 调用 addtype" -#: timezone/zic.c:2271 +#: timezone/zic.c:2277 msgid "too many local time types" msgstr "过多的本地时间类型" -#: timezone/zic.c:2299 +#: timezone/zic.c:2281 +msgid "UTC offset out of range" +msgstr "UTC 偏移值超出范围" + +#: timezone/zic.c:2309 msgid "too many leap seconds" msgstr "" -#: timezone/zic.c:2305 +#: timezone/zic.c:2315 msgid "repeated leap second moment" msgstr "" -#: timezone/zic.c:2357 +#: timezone/zic.c:2367 msgid "Wild result from command execution" msgstr "" -#: timezone/zic.c:2358 +#: timezone/zic.c:2368 #, c-format msgid "%s: command was '%s', result was %d\n" msgstr "%s：命令为“%s”，结果为 %d\n" -#: timezone/zic.c:2456 +#: timezone/zic.c:2466 msgid "Odd number of quotation marks" msgstr "奇数个引号" -#: timezone/zic.c:2479 timezone/zic.c:2498 -msgid "time overflow" -msgstr "时间溢出" - -#: timezone/zic.c:2545 +#: timezone/zic.c:2555 msgid "use of 2/29 in non leap-year" msgstr "" -#: timezone/zic.c:2580 +#: timezone/zic.c:2590 msgid "rule goes past start/end of month--will not work with pre-2004 versions of zic" msgstr "" -#: timezone/zic.c:2612 +#: timezone/zic.c:2622 msgid "time zone abbreviation lacks alphabetic at start" msgstr "" -#: timezone/zic.c:2614 +#: timezone/zic.c:2624 msgid "time zone abbreviation has more than 3 alphabetics" msgstr "" -#: timezone/zic.c:2616 +#: timezone/zic.c:2626 msgid "time zone abbreviation has too many alphabetics" msgstr "" -#: timezone/zic.c:2626 +#: timezone/zic.c:2636 msgid "time zone abbreviation differs from POSIX standard" msgstr "" -#: timezone/zic.c:2638 +#: timezone/zic.c:2648 msgid "too many, or too long, time zone abbreviations" msgstr "过多或过长的时区缩写" -#: timezone/zic.c:2679 +#: timezone/zic.c:2689 #, c-format msgid "%s: Can't create directory %s: %s\n" msgstr "%s：无法创建目录 %s：%s\n" -#: timezone/zic.c:2701 +#: timezone/zic.c:2711 #, c-format msgid "%s: %d did not sign extend correctly\n" msgstr "" +#~ msgid "Can't remove old temporary cache file %s" +#~ msgstr "无法删除旧临时缓冲文件 %s" + #~ msgid "Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n" #~ msgstr "用“glibcbug”脚本将错误报告给 <bugs@gnu.org>。\n" |