diff options
| author | Jim Meyering <jim@meyering.net> | 2003-09-08 06:38:37 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2003-09-08 06:38:37 +0000 |
| commit | a1dfc8dc22dae9e789d998be68092102f0601663 (patch) | |
| tree | 492934f4894f41ce3cf89d1d1470cf03af30829a /po/zh_CN.po | |
| parent | c054f7cdc6694c1bfe12d20295db36196de89e98 (diff) | |
| download | coreutils-a1dfc8dc22dae9e789d998be68092102f0601663.tar.xz | |
.
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 907 |
1 files changed, 458 insertions, 449 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 2252a8e15..f0efb5a42 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: fileutils 4.1.9\n" -"POT-Creation-Date: 2003-07-27 22:05+0200\n" +"Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" +"POT-Creation-Date: 2003-09-08 08:09+0200\n" "PO-Revision-Date: 2002-07-19 23:58+0800\n" "Last-Translator: Anthony Fok <anthony@thizlinux.com>\n" "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n" @@ -30,8 +31,8 @@ msgid "Valid arguments are:" msgstr "有效的参数为：" #: lib/closeout.c:88 src/cat.c:188 src/cat.c:271 src/cat.c:322 src/cksum.c:268 -#: src/head.c:307 src/head.c:357 src/head.c:775 src/head.c:820 src/tail.c:323 -#: src/tail.c:1701 src/tr.c:1664 src/tr.c:1911 src/tr.c:2019 +#: src/head.c:304 src/head.c:354 src/head.c:774 src/head.c:819 src/tail.c:326 +#: src/tail.c:1729 src/tr.c:1659 src/tr.c:1906 src/tr.c:2014 msgid "write error" msgstr "写入时发生错误" @@ -142,20 +143,20 @@ msgstr "%s：选项‘-W %s’不明确\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s：选项‘-W %s’不可配合参数使用\n" -#: lib/human.c:501 +#: lib/human.c:499 msgid "block size" msgstr "块大小" -#: lib/makepath.c:112 src/df.c:515 src/remove.c:402 +#: lib/makepath.c:112 src/df.c:515 src/remove.c:394 msgid "failed to return to initial working directory" msgstr "" -#: lib/makepath.c:161 src/copy.c:1319 src/mkdir.c:171 +#: lib/makepath.c:161 src/copy.c:1322 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "无法创建目录%s" -#: lib/makepath.c:167 lib/makepath.c:409 src/cp.c:442 src/cp.c:464 +#: lib/makepath.c:167 lib/makepath.c:409 src/cp.c:441 src/cp.c:463 #, c-format msgid "%s exists but is not a directory" msgstr "%s存在但并非目录。" @@ -170,7 +171,7 @@ msgstr "无法更改%s的所有者及/或组" msgid "cannot chdir to directory %s" msgstr "无法切换到目录%s" -#: lib/makepath.c:380 lib/makepath.c:395 lib/makepath.c:434 src/install.c:474 +#: lib/makepath.c:380 lib/makepath.c:395 lib/makepath.c:434 src/install.c:475 #, c-format msgid "cannot change permissions of %s" msgstr "无法更改%s的权限" @@ -195,24 +196,24 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/unicodeio.c:155 +#: lib/unicodeio.c:151 msgid "iconv function not usable" msgstr "iconv 功能无法使用" -#: lib/unicodeio.c:157 +#: lib/unicodeio.c:153 msgid "iconv function not available" msgstr "iconv 功能不存在" -#: lib/unicodeio.c:164 +#: lib/unicodeio.c:160 msgid "character out of range" msgstr "字符值超出可接受的范围以外" -#: lib/unicodeio.c:227 +#: lib/unicodeio.c:223 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "无法将 U+%04X 转换至用户的字符集" -#: lib/unicodeio.c:229 +#: lib/unicodeio.c:225 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "无法将 U+%04X 转换至用户的字符集：%s" @@ -260,23 +261,23 @@ msgid "The strings compared were %s and %s." msgstr "要比较的字串为 %s 和 %s。" #: src/basename.c:49 src/cat.c:87 src/chgrp.c:122 src/chmod.c:238 -#: src/chown.c:95 src/chroot.c:40 src/cksum.c:277 src/comm.c:68 src/cp.c:156 -#: src/csplit.c:1492 src/cut.c:178 src/date.c:114 src/dd.c:283 src/df.c:723 +#: src/chown.c:95 src/chroot.c:40 src/cksum.c:277 src/comm.c:68 src/cp.c:157 +#: src/csplit.c:1492 src/cut.c:178 src/date.c:115 src/dd.c:283 src/df.c:723 #: src/dircolors.c:100 src/dirname.c:41 src/du.c:170 src/echo.c:72 #: src/env.c:114 src/expand.c:107 src/expr.c:99 src/factor.c:69 src/fmt.c:267 -#: src/fold.c:62 src/head.c:112 src/hostid.c:40 src/hostname.c:62 src/id.c:82 -#: src/install.c:590 src/join.c:139 src/kill.c:90 src/link.c:47 src/ln.c:336 +#: src/fold.c:62 src/head.c:109 src/hostid.c:40 src/hostname.c:62 src/id.c:82 +#: src/install.c:589 src/join.c:139 src/kill.c:90 src/link.c:47 src/ln.c:335 #: src/logname.c:44 src/ls.c:3751 src/md5sum.c:120 src/mkdir.c:57 -#: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:303 src/nice.c:61 src/nl.c:172 -#: src/nohup.c:52 src/od.c:282 src/paste.c:397 src/pathchk.c:136 +#: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:303 src/nice.c:65 src/nl.c:172 +#: src/nohup.c:52 src/od.c:282 src/paste.c:402 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2749 src/printenv.c:59 src/printf.c:96 -#: src/ptx.c:1854 src/pwd.c:41 src/readlink.c:63 src/rm.c:96 src/rmdir.c:142 +#: src/ptx.c:1868 src/pwd.c:41 src/readlink.c:63 src/rm.c:96 src/rmdir.c:142 #: src/seq.c:77 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:47 -#: src/sort.c:275 src/split.c:92 src/stat.c:690 src/stty.c:485 src/su.c:432 -#: src/sum.c:55 src/sync.c:40 src/tac.c:122 src/tail.c:230 src/tee.c:58 -#: src/test.c:972 src/touch.c:225 src/tr.c:321 src/tsort.c:92 src/tty.c:58 +#: src/sort.c:270 src/split.c:96 src/stat.c:691 src/stty.c:485 src/su.c:432 +#: src/sum.c:55 src/sync.c:40 src/tac.c:122 src/tail.c:233 src/tee.c:58 +#: src/test.c:972 src/touch.c:234 src/tr.c:316 src/tsort.c:92 src/tty.c:58 #: src/uname.c:105 src/unexpand.c:369 src/uniq.c:130 src/unlink.c:47 -#: src/uptime.c:186 src/users.c:113 src/wc.c:131 src/who.c:615 src/whoami.c:47 +#: src/uptime.c:186 src/users.c:113 src/wc.c:131 src/who.c:614 src/whoami.c:47 #: src/yes.c:45 #, c-format msgid "Try `%s --help' for more information.\n" @@ -299,24 +300,24 @@ msgid "" msgstr "" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:152 src/chmod.c:264 -#: src/chown.c:139 src/chroot.c:58 src/cksum.c:292 src/comm.c:85 src/cp.c:253 -#: src/csplit.c:1534 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 +#: src/chown.c:139 src/chroot.c:58 src/cksum.c:292 src/comm.c:85 src/cp.c:254 +#: src/csplit.c:1534 src/cut.c:223 src/date.c:217 src/dd.c:341 src/df.c:762 #: src/dircolors.c:121 src/dirname.c:57 src/du.c:219 src/echo.c:104 #: src/env.c:133 src/expand.c:132 src/expr.c:162 src/factor.c:89 -#: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:147 src/hostid.c:53 -#: src/hostname.c:75 src/id.c:103 src/install.c:645 src/join.c:180 -#: src/kill.c:120 src/link.c:59 src/ln.c:391 src/logname.c:55 src/ls.c:3885 +#: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:53 +#: src/hostname.c:75 src/id.c:103 src/install.c:644 src/join.c:180 +#: src/kill.c:120 src/link.c:59 src/ln.c:390 src/logname.c:55 src/ls.c:3885 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:357 -#: src/nice.c:75 src/nl.c:227 src/nohup.c:68 src/od.c:369 src/paste.c:421 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:68 src/od.c:369 src/paste.c:426 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2861 src/printenv.c:72 #: src/printf.c:145 src/pwd.c:52 src/readlink.c:80 src/rm.c:130 #: src/rmdir.c:162 src/seq.c:103 src/setuidgid.c:66 src/shred.c:219 -#: src/sleep.c:63 src/sort.c:346 src/split.c:124 src/stat.c:761 src/stty.c:699 -#: src/su.c:453 src/sum.c:75 src/sync.c:51 src/tac.c:145 src/tail.c:300 -#: src/tee.c:71 src/test.c:1051 src/touch.c:256 src/tr.c:394 src/true.c:43 +#: src/sleep.c:63 src/sort.c:341 src/split.c:129 src/stat.c:762 src/stty.c:699 +#: src/su.c:453 src/sum.c:75 src/sync.c:51 src/tac.c:145 src/tail.c:303 +#: src/tee.c:71 src/test.c:1051 src/touch.c:265 src/tr.c:389 src/true.c:43 #: src/tsort.c:104 src/tty.c:70 src/uname.c:127 src/unexpand.c:393 #: src/uniq.c:169 src/unlink.c:58 src/uptime.c:201 src/users.c:126 -#: src/wc.c:153 src/who.c:658 src/whoami.c:59 src/yes.c:61 +#: src/wc.c:153 src/who.c:655 src/whoami.c:59 src/yes.c:61 #, fuzzy, c-format msgid "" "\n" @@ -327,18 +328,18 @@ msgstr "" #: src/basename.c:114 src/chgrp.c:211 src/chmod.c:353 src/chown.c:212 #: src/chroot.c:78 src/comm.c:265 src/csplit.c:1464 src/dirname.c:89 -#: src/expr.c:202 src/install.c:281 src/link.c:88 src/mkdir.c:125 +#: src/expr.c:202 src/install.c:282 src/link.c:88 src/mkdir.c:125 #: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:101 src/pathchk.c:189 -#: src/readlink.c:128 src/rm.c:203 src/rmdir.c:207 src/seq.c:411 -#: src/setuidgid.c:98 src/sleep.c:139 src/stat.c:813 src/unlink.c:89 +#: src/readlink.c:128 src/rm.c:203 src/rmdir.c:207 src/seq.c:374 +#: src/setuidgid.c:98 src/sleep.c:139 src/stat.c:819 src/unlink.c:89 msgid "too few arguments" msgstr "参数太少" #: src/basename.c:115 src/dircolors.c:475 src/dirname.c:90 src/hostid.c:76 #: src/hostname.c:122 src/link.c:94 src/logname.c:91 src/mknod.c:140 -#: src/readlink.c:136 src/seq.c:417 src/split.c:514 src/tr.c:1847 +#: src/readlink.c:136 src/seq.c:380 src/split.c:533 src/tr.c:1842 #: src/uname.c:215 src/unlink.c:95 src/uptime.c:244 src/users.c:169 -#: src/who.c:811 +#: src/who.c:803 msgid "too many arguments" msgstr "参数太多" @@ -472,8 +473,8 @@ msgstr "" " -v, --verbose 处理任何文件都会显示信息\n" #: src/chgrp.c:219 src/chmod.c:157 src/chmod.c:366 src/chown-core.c:235 -#: src/chown-core.c:247 src/chown.c:221 src/cp.c:299 src/touch.c:153 -#: src/touch.c:349 +#: src/chown-core.c:247 src/chown.c:221 src/cp.c:300 src/touch.c:154 +#: src/touch.c:360 #, c-format msgid "failed to get attributes of %s" msgstr "无法取得 %s 的属性" @@ -515,6 +516,7 @@ msgstr "" " 或：%s [选项]... --reference=参考文件 文件...\n" #: src/chmod.c:248 +#, fuzzy msgid "" "Change the mode of each FILE to MODE.\n" "\n" @@ -731,248 +733,248 @@ msgid "" " -3 suppress lines that appear in both files\n" msgstr "" -#: src/copy.c:158 src/du.c:332 +#: src/copy.c:159 src/du.c:332 #, c-format msgid "cannot access %s" msgstr "无法访问%s" -#: src/copy.c:222 src/fmt.c:435 src/head.c:867 src/tail.c:1247 +#: src/copy.c:223 src/fmt.c:435 src/head.c:866 src/tail.c:1267 #, c-format msgid "cannot open %s for reading" msgstr "无法打开 %s 来读取数据" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1210 src/tail.c:1090 -#: src/tail.c:1160 +#: src/copy.c:229 src/copy.c:283 src/copy.c:298 src/dd.c:1210 src/tail.c:1097 +#: src/tail.c:1169 #, c-format msgid "cannot fstat %s" msgstr "无法 fstat%s" -#: src/copy.c:238 +#: src/copy.c:239 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "略过文件%s，因为准备复制时它已被其他文件取代" -#: src/copy.c:258 src/copy.c:884 src/copy.c:1065 src/copy.c:1155 src/ln.c:292 -#: src/remove.c:734 src/remove.c:788 src/remove.c:909 src/remove.c:1016 +#: src/copy.c:259 src/copy.c:887 src/copy.c:1068 src/copy.c:1158 src/ln.c:291 +#: src/remove.c:726 src/remove.c:780 src/remove.c:905 src/remove.c:1012 #, c-format msgid "cannot remove %s" msgstr "无法删除%s" -#: src/copy.c:273 +#: src/copy.c:274 #, c-format msgid "cannot create regular file %s" msgstr "无法创建一般文件%s" -#: src/copy.c:324 src/dd.c:826 src/dd.c:1020 +#: src/copy.c:325 src/dd.c:826 src/dd.c:1020 #, c-format msgid "reading %s" msgstr "正在读入%s" -#: src/copy.c:358 src/head.c:440 +#: src/copy.c:359 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "无法 lseek%s" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1064 src/dd.c:1125 +#: src/copy.c:374 src/copy.c:398 src/dd.c:1064 src/dd.c:1125 #, c-format msgid "writing %s" msgstr "正在写入%s" -#: src/copy.c:405 src/copy.c:411 src/head.c:875 +#: src/copy.c:406 src/copy.c:412 src/head.c:874 #, c-format msgid "closing %s" msgstr "正在关闭%s" -#: src/copy.c:628 +#: src/copy.c:631 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s：是否覆盖%s，而不理会权限模式 %04lo? " -#: src/copy.c:634 +#: src/copy.c:637 #, c-format msgid "%s: overwrite %s? " msgstr "%s：是否覆盖%s? " -#: src/copy.c:828 src/copy.c:866 src/df.c:492 src/stat.c:648 +#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:649 #, c-format msgid "cannot stat %s" msgstr "stat%s失败" -#: src/copy.c:838 +#: src/copy.c:841 #, c-format msgid "omitting directory %s" msgstr "略过目录%s" -#: src/copy.c:852 +#: src/copy.c:855 #, c-format msgid "warning: source file %s specified more than once" msgstr "警告：指定来源文件%s多於一次" -#: src/copy.c:897 src/ln.c:238 +#: src/copy.c:900 src/ln.c:237 #, c-format msgid "%s and %s are the same file" msgstr "%s及%s为同一文件" -#: src/copy.c:907 +#: src/copy.c:910 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "无法以目录%2$s来覆盖非目录%1$s" -#: src/copy.c:924 +#: src/copy.c:927 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "不会以%2$s覆盖刚创建的%1$s" -#: src/copy.c:935 +#: src/copy.c:938 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "无法以非目录来覆盖目录%s" -#: src/copy.c:996 +#: src/copy.c:999 #, c-format msgid "cannot overwrite directory %s" msgstr "无法覆盖目录%s" -#: src/copy.c:1005 +#: src/copy.c:1008 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "无法将目录移动至非目录：%s→%s" -#: src/copy.c:1028 +#: src/copy.c:1031 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "将%s备份会破坏来源文件，故不移动%s。" -#: src/copy.c:1029 +#: src/copy.c:1032 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "将%s备份会破坏来源文件，故不复制%s。" -#: src/copy.c:1044 src/ln.c:274 +#: src/copy.c:1047 src/ln.c:273 #, c-format msgid "cannot backup %s" msgstr "无法备份%s" -#: src/copy.c:1080 src/ln.c:309 +#: src/copy.c:1083 src/ln.c:308 #, c-format msgid " (backup: %s)" msgstr " (备份：%s)" -#: src/copy.c:1130 +#: src/copy.c:1133 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "无法将目录%s复制至原来位置%s" -#: src/copy.c:1137 +#: src/copy.c:1140 #, c-format msgid "will not create hard link %s to directory %s" msgstr "不会创建连至目录%2$s的硬链接%1$s" -#: src/copy.c:1163 +#: src/copy.c:1166 #, c-format msgid "cannot create hard link %s to %s" msgstr "无法创建连至%2$s的硬链接%1$s" -#: src/copy.c:1217 +#: src/copy.c:1220 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "无法将目录%s移动至本身的子目录%s下" -#: src/copy.c:1260 +#: src/copy.c:1263 #, c-format msgid "cannot move %s to %s" msgstr "无法移动%s至%s" -#: src/copy.c:1272 +#: src/copy.c:1275 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "无法进行跨设备的移动 (%s至%s)；无法删除目标文件或目录" -#: src/copy.c:1300 +#: src/copy.c:1303 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "无法复制循环的符号链接%s" -#: src/copy.c:1377 +#: src/copy.c:1380 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s：只能於目前的目录中创建相对符号链接" -#: src/copy.c:1384 +#: src/copy.c:1387 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "无法创建连至%2$s的符号链接%1$s" -#: src/copy.c:1395 +#: src/copy.c:1398 #, c-format msgid "cannot create link %s" msgstr "无法创建链接%s" -#: src/copy.c:1420 src/mkfifo.c:134 +#: src/copy.c:1423 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "无法创建 fifo 文件%s" -#: src/copy.c:1434 +#: src/copy.c:1437 #, c-format msgid "cannot create special file %s" msgstr "无法创建特殊文件%s" -#: src/copy.c:1446 src/ls.c:2485 src/stat.c:436 +#: src/copy.c:1449 src/ls.c:2485 src/stat.c:436 #, c-format msgid "cannot read symbolic link %s" msgstr "无法读取符号链接%s" -#: src/copy.c:1471 +#: src/copy.c:1474 #, c-format msgid "cannot create symbolic link %s" msgstr "无法创建符号链接%s" -#: src/copy.c:1487 src/copy.c:1550 src/cp.c:335 +#: src/copy.c:1490 src/copy.c:1551 src/cp.c:334 #, c-format msgid "failed to preserve ownership for %s" msgstr "无法保留%s的所有者" -#: src/copy.c:1502 +#: src/copy.c:1505 #, c-format msgid "%s has unknown file type" msgstr "%s的文件类型不详" -#: src/copy.c:1537 +#: src/copy.c:1538 #, c-format msgid "preserving times for %s" msgstr "保留%s的时间" -#: src/copy.c:1562 +#: src/copy.c:1563 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "无法保留%s的时间" -#: src/copy.c:1567 +#: src/copy.c:1568 #, c-format msgid "failed to preserve authorship for %s" msgstr "无法保留%s的著作者" -#: src/copy.c:1586 +#: src/copy.c:1587 #, c-format msgid "setting permissions for %s" msgstr "设定%s的权限" -#: src/copy.c:1608 src/ln.c:327 +#: src/copy.c:1609 src/ln.c:326 #, c-format msgid "cannot un-backup %s" msgstr "无法将 %s 的备份还原" -#: src/copy.c:1612 +#: src/copy.c:1613 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s → %s (还原备份)\n" -#: src/cp.c:49 +#: src/cp.c:50 msgid "Torbjorn Granlund, David MacKenzie, and Jim Meyering" msgstr "Torbjorn Granlund、David MacKenzie 及 Jim Meyering" -#: src/cp.c:160 src/mv.c:307 +#: src/cp.c:161 src/mv.c:307 #, c-format msgid "" "Usage: %s [OPTION]... SOURCE DEST\n" @@ -983,7 +985,7 @@ msgstr "" " 或：%s [选项]... 来源... 目录\n" " 或：%s [选项]... --target-directory=目录 来源...\n" -#: src/cp.c:166 +#: src/cp.c:167 msgid "" "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" "\n" @@ -991,18 +993,18 @@ msgstr "" "将<来源>文件复制至<目的地>，或将多个<文件>复制至<目录>。\n" "\n" -#: src/cp.c:170 src/csplit.c:1505 src/cut.c:190 src/df.c:733 src/du.c:179 -#: src/expand.c:120 src/fmt.c:277 src/fold.c:75 src/head.c:126 -#: src/install.c:606 src/kill.c:104 src/ln.c:355 src/ls.c:3761 src/mkdir.c:66 -#: src/mkfifo.c:60 src/mknod.c:61 src/mv.c:317 src/nl.c:185 src/paste.c:411 -#: src/pr.c:2762 src/ptx.c:1866 src/shred.c:165 src/sort.c:289 src/split.c:105 -#: src/tac.c:135 src/tail.c:244 src/touch.c:234 src/unexpand.c:382 +#: src/cp.c:171 src/csplit.c:1505 src/cut.c:190 src/df.c:733 src/du.c:179 +#: src/expand.c:120 src/fmt.c:277 src/fold.c:75 src/head.c:123 +#: src/install.c:605 src/kill.c:104 src/ln.c:354 src/ls.c:3761 src/mkdir.c:66 +#: src/mkfifo.c:60 src/mknod.c:61 src/mv.c:317 src/nl.c:185 src/paste.c:416 +#: src/pr.c:2762 src/ptx.c:1880 src/shred.c:165 src/sort.c:284 src/split.c:109 +#: src/tac.c:135 src/tail.c:247 src/touch.c:243 src/unexpand.c:382 #: src/uniq.c:143 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "长选项必须用的参数在使用短选项时也是必须的。\n" -#: src/cp.c:173 +#: src/cp.c:174 msgid "" " -a, --archive same as -dpR\n" " --backup[=CONTROL] make a backup of each existing destination " @@ -1019,7 +1021,7 @@ msgstr "" " --copy-contents 当使用递归模式时复制特殊文件的内容\n" " -d 等於 --no-dereference --preserve=link\n" -#: src/cp.c:180 +#: src/cp.c:181 msgid "" " --no-dereference never follow symbolic links\n" " -f, --force if an existing destination file cannot be\n" @@ -1033,7 +1035,7 @@ msgstr "" " -i, --interactive 覆盖文件前需要确认\n" " -H 使用命令列中的符号链接指示的真正目的地\n" -#: src/cp.c:187 +#: src/cp.c:188 msgid "" " -l, --link link files instead of copying\n" " -L, --dereference always follow symbolic links\n" @@ -1049,7 +1051,7 @@ msgstr "" " (默认值为：mode,ownership,timestamps)\n" " 额外的属性有：links、all\n" -#: src/cp.c:195 +#: src/cp.c:196 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents append source path to DIRECTORY\n" @@ -1059,7 +1061,7 @@ msgstr "" " --parents 复制前先在<目录>创建来源文件路径中的所有目录\n" " -P 等於‘--no-dereference’\n" -#: src/cp.c:200 +#: src/cp.c:201 msgid "" " -R, -r, --recursive copy directories recursively\n" " --remove-destination remove each existing destination file before\n" @@ -1070,7 +1072,7 @@ msgstr "" " --remove-destination 尝试打开目的地文件前先删除已存在的目的地\n" " 文件 (与 --force 选项作对比)\n" -#: src/cp.c:205 +#: src/cp.c:206 msgid "" " --reply={yes,no,query} specify how to handle the prompt about an\n" " existing destination file\n" @@ -1082,7 +1084,7 @@ msgstr "" " --sparse=WHEN 控制创建 sparse 文件的方式\n" " --strip-trailing-slashes 删除参数中所有<来源>文件/目录末端的斜杠\n" -#: src/cp.c:212 +#: src/cp.c:213 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -1093,7 +1095,7 @@ msgstr "" " -S, --suffix=后缀 自行指定备份文件的<后缀>\n" " --target-directory=目录 将所有参数指定的<来源>文件/目录复制至<目录>\n" -#: src/cp.c:217 +#: src/cp.c:218 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -1106,7 +1108,7 @@ msgstr "" " -v, --verbose 详细显示进行的步骤\n" " -x, --one-file-system 不会跨越文件系统进行操作\n" -#: src/cp.c:226 +#: src/cp.c:227 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -1125,7 +1127,7 @@ msgstr "" "使用 --sparse=never 会禁止产生 sparse 文件。\n" "\n" -#: src/cp.c:235 +#: src/cp.c:236 msgid "" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control method may be selected via the --backup option or " @@ -1138,7 +1140,7 @@ msgstr "" "变量来选择。以下是可用的变量值：\n" "\n" -#: src/cp.c:241 src/install.c:639 src/ln.c:385 src/mv.c:351 +#: src/cp.c:242 src/install.c:638 src/ln.c:384 src/mv.c:351 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -1151,7 +1153,7 @@ msgstr "" "份\n" " simple, never 永远使用普通方式备份\n" -#: src/cp.c:247 +#: src/cp.c:248 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -1162,54 +1164,54 @@ msgstr "" "有一个特别情况：如果同时指定 --force 和 --backup 选项，而且<来源>和<目的地>\n" "是同一个已存在的一般文件的话，cp 会将<来源>文件备份。\n" -#: src/cp.c:321 +#: src/cp.c:320 #, c-format msgid "failed to preserve times for %s" msgstr "无法保留%s的时间" -#: src/cp.c:345 +#: src/cp.c:344 #, c-format msgid "failed to preserve permissions for %s" msgstr "无法保留%s的权限" -#: src/cp.c:430 +#: src/cp.c:429 #, c-format msgid "cannot make directory %s" msgstr "无法创建目录%s" -#: src/cp.c:489 src/ln.c:489 src/mv.c:456 src/shred.c:1601 +#: src/cp.c:488 src/ln.c:488 src/mv.c:456 src/shred.c:1601 msgid "missing file argument" msgstr "缺少了文件参数" -#: src/cp.c:494 +#: src/cp.c:493 msgid "missing destination file" msgstr "缺少了目的地文件" -#: src/cp.c:519 src/ln.c:161 src/ln.c:184 src/ln.c:211 src/ln.c:298 +#: src/cp.c:518 src/ln.c:161 src/ln.c:184 src/ln.c:211 src/ln.c:297 #, c-format msgid "accessing %s" msgstr "正在访问%s" -#: src/cp.c:544 +#: src/cp.c:543 #, fuzzy, c-format msgid "%s: specified destination directory does not exist" msgstr "%s：指定的目的地不是目录" -#: src/cp.c:546 +#: src/cp.c:545 #, c-format msgid "%s: specified target is not a directory" msgstr "%s：指定的目标不是目录" -#: src/cp.c:549 +#: src/cp.c:548 #, c-format msgid "copying multiple files, but last argument %s is not a directory" msgstr "复制多个文件，但最后的参数%s并非目录。" -#: src/cp.c:648 +#: src/cp.c:647 msgid "when preserving paths, the destination must be a directory" msgstr "当保留路径时，目的地必须是目录" -#: src/cp.c:875 src/install.c:216 src/ln.c:436 src/mv.c:402 +#: src/cp.c:874 src/install.c:217 src/ln.c:435 src/mv.c:402 #, c-format msgid "" "warning: --version-control (-V) is obsolete; support for it\n" @@ -1218,15 +1220,15 @@ msgstr "" "警告：--version-control (-V) 选项已经过时；将来的版本随时可能不再支持\n" "此选项。请使用 --backup=%s。" -#: src/cp.c:969 src/ln.c:466 +#: src/cp.c:968 src/ln.c:465 msgid "symbolic links are not supported on this system" msgstr "此系统并不支持符号链接" -#: src/cp.c:1005 +#: src/cp.c:1004 msgid "cannot make both hard and symbolic links" msgstr "无法同时创建实际及符号链接" -#: src/cp.c:1013 src/install.c:272 src/ln.c:532 src/mv.c:480 +#: src/cp.c:1012 src/install.c:273 src/ln.c:531 src/mv.c:480 msgid "backup type" msgstr "备份方式" @@ -1236,7 +1238,7 @@ msgid "Stuart Kemp and David MacKenzie" msgstr "Mike Parker 和 David MacKenzie" #: src/csplit.c:288 src/csplit.c:1481 src/tac-pipe.c:57 src/tee.c:220 -#: src/tr.c:1607 src/tr.c:1709 src/tr.c:1752 +#: src/tr.c:1602 src/tr.c:1704 src/tr.c:1747 #, fuzzy msgid "read error" msgstr "写入时发生错误" @@ -1404,8 +1406,8 @@ msgid "David Ihnat, David MacKenzie, and Jim Meyering" msgstr "Mike Parker、David MacKenzie 和 Jim Meyering" #: src/cut.c:182 src/df.c:727 src/du.c:174 src/expand.c:111 src/fold.c:66 -#: src/head.c:116 src/ls.c:3755 src/nl.c:176 src/paste.c:401 src/pr.c:2753 -#: src/sort.c:279 src/sum.c:59 src/tac.c:126 src/tail.c:234 src/tee.c:62 +#: src/head.c:113 src/ls.c:3755 src/nl.c:176 src/paste.c:406 src/pr.c:2753 +#: src/sort.c:274 src/sum.c:59 src/tac.c:126 src/tail.c:237 src/tee.c:62 #: src/unexpand.c:373 src/wc.c:135 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1505,14 +1507,14 @@ msgstr "缺少了目的地文件" msgid "missing list of positions" msgstr "缺少了目的地文件" -#: src/date.c:118 +#: src/date.c:119 #, c-format msgid "" "Usage: %s [OPTION]... [+FORMAT]\n" " or: %s [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]]\n" msgstr "" -#: src/date.c:123 +#: src/date.c:124 msgid "" "Display the current time in the given FORMAT, or set the system date.\n" "\n" @@ -1525,15 +1527,15 @@ msgid "" " --iso-8601 without TIMESPEC defaults to `date'.\n" msgstr "" -#: src/date.c:134 +#: src/date.c:135 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" -" -R, --rfc-822 output RFC-822 compliant date string\n" +" -R, --rfc-2822 output RFC-2822 compliant date string\n" " -s, --set=STRING set time described by STRING\n" " -u, --utc, --universal print or set Coordinated Universal Time\n" msgstr "" -#: src/date.c:142 +#: src/date.c:143 msgid "" "\n" "FORMAT controls the output. The only valid option for the second form\n" @@ -1543,7 +1545,7 @@ msgid "" " %a locale's abbreviated weekday name (Sun..Sat)\n" msgstr "" -#: src/date.c:150 +#: src/date.c:151 msgid "" " %A locale's full weekday name, variable length (Sunday..Saturday)\n" " %b locale's abbreviated month name (Jan..Dec)\n" @@ -1551,7 +1553,7 @@ msgid "" " %c locale's date and time (Sat Nov 04 12:02:33 EST 1989)\n" msgstr "" -#: src/date.c:156 +#: src/date.c:157 msgid "" " %C century (year divided by 100 and truncated to an integer) [00-99]\n" " %d day of month (01..31)\n" @@ -1559,14 +1561,14 @@ msgid "" " %e day of month, blank padded ( 1..31)\n" msgstr "" -#: src/date.c:162 +#: src/date.c:163 msgid "" " %F same as %Y-%m-%d\n" " %g the 2-digit year corresponding to the %V week number\n" " %G the 4-digit year corresponding to the %V week number\n" msgstr "" -#: src/date.c:167 +#: src/date.c:168 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -1574,7 +1576,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:173 +#: src/date.c:174 msgid "" " %k hour ( 0..23)\n" " %l hour ( 1..12)\n" @@ -1582,7 +1584,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:179 +#: src/date.c:180 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -1593,7 +1595,7 @@ msgid "" " %s seconds since `00:00:00 1970-01-01 UTC' (a GNU extension)\n" msgstr "" -#: src/date.c:188 +#: src/date.c:189 msgid "" " %S second (00..60); the 60 is necessary to accommodate a leap second\n" " %t a horizontal tab\n" @@ -1601,7 +1603,7 @@ msgid "" " %u day of week (1..7); 1 represents Monday\n" msgstr "" -#: src/date.c:194 +#: src/date.c:195 msgid "" " %U week number of year with Sunday as first day of week (00..53)\n" " %V week number of year with Monday as first day of week (01..53)\n" @@ -1609,7 +1611,7 @@ msgid "" " %W week number of year with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:200 +#: src/date.c:201 msgid "" " %x locale's date representation (mm/dd/yy)\n" " %X locale's time representation (%H:%M:%S)\n" @@ -1617,9 +1619,9 @@ msgid "" " %Y year (1970...)\n" msgstr "" -#: src/date.c:206 +#: src/date.c:207 msgid "" -" %z RFC-822 style numeric timezone (-0500) (a nonstandard extension)\n" +" %z RFC-2822 style numeric timezone (-0500) (a nonstandard extension)\n" " %Z time zone (e.g., EDT), or nothing if no time zone is determinable\n" "\n" "By default, date pads numeric fields with zeroes. GNU date recognizes\n" @@ -1629,35 +1631,35 @@ msgid "" " `_' (underscore) pad the field with spaces\n" msgstr "" -#: src/date.c:238 src/dd.c:1184 src/dircolors.c:532 src/head.c:860 -#: src/md5sum.c:383 src/md5sum.c:725 src/od.c:958 src/od.c:1999 src/pr.c:1163 +#: src/date.c:239 src/dd.c:1184 src/dircolors.c:532 src/head.c:859 +#: src/md5sum.c:390 src/md5sum.c:732 src/od.c:958 src/od.c:1999 src/pr.c:1163 #: src/pr.c:1370 src/pr.c:1492 src/stty.c:901 src/tac.c:482 src/tac.c:488 -#: src/tee.c:151 src/tr.c:2026 src/tsort.c:585 src/wc.c:210 +#: src/tee.c:151 src/tr.c:2021 src/tsort.c:585 src/wc.c:210 msgid "standard input" msgstr "标准输入" -#: src/date.c:269 src/date.c:462 +#: src/date.c:270 src/date.c:463 #, fuzzy, c-format msgid "invalid date `%s'" msgstr "无效的权限模式%s" -#: src/date.c:366 +#: src/date.c:367 #, fuzzy msgid "the options to specify dates for printing are mutually exclusive" msgstr "" "显示 dircolors 内部数据库的选项和选择 shell 语法的选项\n" "是互相抵触的" -#: src/date.c:373 +#: src/date.c:374 msgid "the options to print and set the time may not be used together" msgstr "" -#: src/date.c:379 +#: src/date.c:380 #, fuzzy, c-format msgid "too many non-option arguments: %s%s" msgstr "参数太多" -#: src/date.c:387 +#: src/date.c:388 #, c-format msgid "" "the argument `%s' lacks a leading `+';\n" @@ -1665,21 +1667,22 @@ msgid "" "argument must be a format string beginning with `+'." msgstr "" -#: src/date.c:399 +#: src/date.c:400 +#, fuzzy msgid "" -"a format string may not be specified when using the --rfc-822 (-R) option" -msgstr "" +"a format string may not be specified when using the --rfc-2822 (-R) option" +msgstr "安装目录时不能用 strip 选项" -#: src/date.c:435 +#: src/date.c:436 msgid "undefined" msgstr "" -#: src/date.c:437 +#: src/date.c:438 src/touch.c:402 #, fuzzy msgid "cannot get time of day" msgstr "无法设定 %s 的时间标记" -#: src/date.c:470 +#: src/date.c:471 #, fuzzy msgid "cannot set date" msgstr "stat%s失败" @@ -1874,7 +1877,7 @@ msgstr "略过输出文件 %2$s 的最初 %1$s 个字节" #: src/df.c:45 #, fuzzy -msgid "Torbjorn Granlund, David MacKenzie, Larry McVoy, and Paul Eggert" +msgid "Torbjorn Granlund, David MacKenzie, and Paul Eggert" msgstr "Torbjorn Granlund、David MacKenzie 及 Jim Meyering" #: src/df.c:149 @@ -1916,7 +1919,7 @@ msgstr " %4s-块 已用 可用 已用%%" msgid " Mounted on\n" msgstr " 挂载点\n" -#: src/df.c:448 src/pwd.c:78 src/remove.c:987 +#: src/df.c:448 src/pwd.c:78 src/remove.c:983 #, fuzzy msgid "cannot get current directory" msgstr "无法创建目录%s" @@ -2095,9 +2098,7 @@ msgstr "" #: src/du.c:49 #, fuzzy -msgid "" -"Torbjorn Granlund, David MacKenzie, Larry McVoy, Paul Eggert, and Jim " -"Meyering" +msgid "Torbjorn Granlund, David MacKenzie, Paul Eggert, and Jim Meyering" msgstr "Torbjorn Granlund、David MacKenzie 及 Jim Meyering" #: src/du.c:175 @@ -2496,17 +2497,17 @@ msgid "" " -w, --width=WIDTH use WIDTH columns instead of 80\n" msgstr "" -#: src/fold.c:267 +#: src/fold.c:266 #, c-format msgid "`%s' option is obsolete; use `%s'" msgstr "" -#: src/fold.c:295 +#: src/fold.c:294 #, fuzzy, c-format msgid "invalid number of columns: `%s'" msgstr "无效的号码 %s" -#: src/head.c:120 +#: src/head.c:117 msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" @@ -2514,7 +2515,7 @@ msgid "" "\n" msgstr "" -#: src/head.c:129 +#: src/head.c:126 msgid "" " -c, --bytes=[-]N print the first N bytes of each file;\n" " with the leading `-', print all but the last\n" @@ -2524,92 +2525,92 @@ msgid "" " N lines of each file\n" msgstr "" -#: src/head.c:137 +#: src/head.c:134 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" msgstr "" -#: src/head.c:143 +#: src/head.c:140 msgid "" "\n" "N may have a multiplier suffix: b 512, k 1024, m 1024*1024.\n" msgstr "" -#: src/head.c:158 src/head.c:271 src/head.c:343 src/head.c:550 src/head.c:632 -#: src/head.c:704 src/head.c:769 src/head.c:797 src/tail.c:361 src/tail.c:442 -#: src/tail.c:491 src/tail.c:583 src/tail.c:708 src/tail.c:756 src/tail.c:795 -#: src/tail.c:1273 src/tail.c:1309 src/uniq.c:378 +#: src/head.c:155 src/head.c:268 src/head.c:340 src/head.c:549 src/head.c:631 +#: src/head.c:703 src/head.c:768 src/head.c:796 src/tail.c:364 src/tail.c:445 +#: src/tail.c:494 src/tail.c:587 src/tail.c:715 src/tail.c:763 src/tail.c:802 +#: src/tail.c:1293 src/tail.c:1329 src/uniq.c:378 #, fuzzy, c-format msgid "error reading %s" msgstr "正在读入%s" -#: src/head.c:161 src/uniq.c:383 +#: src/head.c:158 src/uniq.c:383 #, fuzzy, c-format msgid "error writing %s" msgstr "正在写入%s" -#: src/head.c:164 +#: src/head.c:161 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:237 +#: src/head.c:234 #, fuzzy, c-format msgid "%s: number of bytes is large" msgstr "参数数目错误" -#: src/head.c:455 +#: src/head.c:452 #, fuzzy, c-format msgid "%s: cannot lseek back to original position" msgstr "无法创建 fifo 文件%s" -#: src/head.c:625 src/head.c:696 src/tail.c:392 +#: src/head.c:624 src/head.c:695 src/tail.c:395 #, fuzzy, c-format msgid "%s: cannot seek to offset %s" msgstr "无法 lseek%s" -#: src/head.c:814 +#: src/head.c:813 #, fuzzy, c-format msgid "cannot reposition file pointer for %s" msgstr "无法取得 %s 的时间标记" -#: src/head.c:898 src/tail.c:1433 +#: src/head.c:897 src/tail.c:1453 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "" -#: src/head.c:899 src/tail.c:1435 +#: src/head.c:898 src/tail.c:1455 #, fuzzy msgid "number of lines" msgstr "参数数目错误" -#: src/head.c:899 src/tail.c:1436 +#: src/head.c:898 src/tail.c:1456 #, fuzzy msgid "number of bytes" msgstr "参数数目错误" -#: src/head.c:906 src/tail.c:1522 +#: src/head.c:905 src/tail.c:1542 #, fuzzy msgid "invalid number of lines" msgstr "无效的号码 %s" -#: src/head.c:907 src/tail.c:1523 +#: src/head.c:906 src/tail.c:1543 #, fuzzy msgid "invalid number of bytes" msgstr "无效的号码 %s" -#: src/head.c:994 +#: src/head.c:993 #, fuzzy, c-format msgid "unrecognized option `-%c'" msgstr "无法识别的选项 %s" -#: src/head.c:1001 +#: src/head.c:1000 #, c-format msgid "`-%s' option is obsolete; use `-%c %.*s%.*s%s'" msgstr "" -#: src/head.c:1077 +#: src/head.c:1076 #, fuzzy, c-format msgid "%s: number of bytes is too large" msgstr "%s：覆盖次数无效" @@ -2707,68 +2708,68 @@ msgstr "无法改变所属组至没有名称的组" msgid " groups=" msgstr "" -#: src/install.c:266 +#: src/install.c:267 msgid "the strip option may not be used when installing a directory" msgstr "安装目录时不能用 strip 选项" -#: src/install.c:289 src/mkdir.c:141 +#: src/install.c:290 src/mkdir.c:141 #, c-format msgid "invalid mode %s" msgstr "无效的权限模式%s" -#: src/install.c:304 src/install.c:368 +#: src/install.c:305 src/install.c:369 #, c-format msgid "creating directory %s" msgstr "正在创建目录%s" -#: src/install.c:329 +#: src/install.c:330 #, c-format msgid "installing multiple files, but last argument, %s is not a directory" msgstr "正在安装多个文件，但最后的参数 %s 并非目录。" -#: src/install.c:432 +#: src/install.c:433 #, c-format msgid "%s is a directory" msgstr "%s是目录" -#: src/install.c:468 +#: src/install.c:469 #, fuzzy, c-format msgid "cannot change ownership of %s" msgstr "无法更改%s的权限" -#: src/install.c:492 +#: src/install.c:493 #, c-format msgid "cannot obtain time stamps for %s" msgstr "无法取得 %s 的时间标记" -#: src/install.c:504 +#: src/install.c:503 #, c-format msgid "cannot set time stamps for %s" msgstr "无法设定 %s 的时间标记" -#: src/install.c:525 +#: src/install.c:524 msgid "fork system call failed" msgstr "fork 系统进程出现错误" -#: src/install.c:529 +#: src/install.c:528 msgid "cannot run strip" msgstr "无法执行 strip 命令" -#: src/install.c:536 +#: src/install.c:535 msgid "strip failed" msgstr "strip 出现错误" -#: src/install.c:557 +#: src/install.c:556 #, c-format msgid "invalid user %s" msgstr "无效的用户 %s" -#: src/install.c:575 +#: src/install.c:574 #, c-format msgid "invalid group %s" msgstr "无效的组 %s" -#: src/install.c:594 +#: src/install.c:593 #, c-format msgid "" "Usage: %s [OPTION]... SOURCE DEST (1st format)\n" @@ -2779,7 +2780,7 @@ msgstr "" " 或：%s [选项]... 来源... 目录 (第二种格式)\n" " 或：%s -d [选项]... 目录... (第三种格式)\n" -#: src/install.c:600 +#: src/install.c:599 msgid "" "In the first two formats, copy SOURCE to DEST or multiple SOURCE(s) to\n" "the existing DIRECTORY, while setting permission modes and owner/group.\n" @@ -2791,7 +2792,7 @@ msgstr "" "指定的目录及它们的主目录。\n" "\n" -#: src/install.c:609 +#: src/install.c:608 msgid "" " --backup[=CONTROL] make a backup of each existing destination file\n" " -b like --backup but does not accept an argument\n" @@ -2805,7 +2806,7 @@ msgstr "" " -d, --directory 所有参数都作为目录处理；而且会创建指定目录的所有主目" "录\n" -#: src/install.c:616 +#: src/install.c:615 msgid "" " -D create all leading components of DEST except the " "last,\n" @@ -2822,7 +2823,7 @@ msgstr "" " -m, --mode=模式 自行设定权限模式 (像 chmod)，而不是 rwxr-xr-x\n" " -o, --owner=所有者 自行设定所有者 (只适用於超级用户)\n" -#: src/install.c:623 +#: src/install.c:622 msgid "" " -p, --preserve-timestamps apply access/modification times of SOURCE " "files\n" @@ -2838,7 +2839,7 @@ msgstr "" " -S, --suffix=后缀 自行指定备份文件的<后缀>\n" " -v, --verbose 处理每个文件/目录时印出名称\n" -#: src/install.c:632 src/ln.c:378 src/mv.c:344 +#: src/install.c:631 src/ln.c:377 src/mv.c:344 msgid "" "\n" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -3033,42 +3034,42 @@ msgstr "%s：警告：将硬链接连至符号链接是不通用的功能" msgid "%s: hard link not allowed for directory" msgstr "%s: 不允许将硬链接连至目录" -#: src/ln.c:247 +#: src/ln.c:246 #, c-format msgid "%s: cannot overwrite directory" msgstr "%s：无法覆盖目录" -#: src/ln.c:252 +#: src/ln.c:251 #, c-format msgid "%s: replace %s? " msgstr "%s：是否置换%s? " -#: src/ln.c:258 +#: src/ln.c:257 #, c-format msgid "%s: File exists" msgstr "%s：文件已存在" -#: src/ln.c:305 +#: src/ln.c:304 #, c-format msgid "create symbolic link %s to %s" msgstr "创建连至%2$s的符号链接%1$s" -#: src/ln.c:306 +#: src/ln.c:305 #, c-format msgid "create hard link %s to %s" msgstr "创建连至%2$s的硬链接%1$s" -#: src/ln.c:320 +#: src/ln.c:319 #, c-format msgid "creating symbolic link %s to %s" msgstr "正在创建连至%2$s的符号链接%1$s" -#: src/ln.c:321 +#: src/ln.c:320 #, c-format msgid "creating hard link %s to %s" msgstr "正在创建连至%2$s的硬链接%1$s" -#: src/ln.c:340 +#: src/ln.c:339 #, c-format msgid "" "Usage: %s [OPTION]... TARGET [LINK_NAME]\n" @@ -3079,7 +3080,7 @@ msgstr "" " 或：%s [选项]... 目标... 目录\n" " 或：%s [选项]... --target-directory=目录 目标...\n" -#: src/ln.c:346 +#: src/ln.c:345 msgid "" "Create a link to the specified TARGET with optional LINK_NAME.\n" "If LINK_NAME is omitted, a link with the same basename as the TARGET is\n" @@ -3097,7 +3098,7 @@ msgstr "" "在。\n" "\n" -#: src/ln.c:358 +#: src/ln.c:357 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -3110,7 +3111,7 @@ msgstr "" " -d, -F, --directory 创建连至目录的硬链接 (只适用於超级用户)\n" " -f, --force 强迫删除任何已存在的目的地文件\n" -#: src/ln.c:364 +#: src/ln.c:363 msgid "" " -n, --no-dereference treat destination that is a symlink to a\n" " directory as if it were a normal file\n" @@ -3123,7 +3124,7 @@ msgstr "" " -i, --interactive 确认是否删除目的地文件\n" " -s, --symbolic 创建符号链接而不是硬链接\n" -#: src/ln.c:370 +#: src/ln.c:369 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -3135,12 +3136,12 @@ msgstr "" " --target-directory=目录 在指定<目录>中创建链接\n" " -v, --verbose 链接前先印出每个文件的名称\n" -#: src/ln.c:523 +#: src/ln.c:522 #, c-format msgid "%s: specified target directory is not a directory" msgstr "%s：指定的目的地不是目录" -#: src/ln.c:544 +#: src/ln.c:543 msgid "when making multiple links, last argument must be a directory" msgstr "创建多个链接时，最后的参数必须为目录" @@ -3216,7 +3217,7 @@ msgstr "无法决定 %s 所在的设备及 inode" msgid "not listing already-listed directory: %s" msgstr "不会再列出已经列出的目录：%s" -#: src/ls.c:2200 src/remove.c:945 +#: src/ls.c:2200 src/remove.c:941 #, fuzzy, c-format msgid "reading directory %s" msgstr "正在创建目录%s" @@ -3521,82 +3522,82 @@ msgid "" "text), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:428 +#: src/md5sum.c:435 #, c-format msgid "%s: %lu: improperly formatted %s checksum line" msgstr "" -#: src/md5sum.c:450 +#: src/md5sum.c:457 #, c-format msgid "%s: FAILED open or read\n" msgstr "" -#: src/md5sum.c:474 +#: src/md5sum.c:481 msgid "FAILED" msgstr "" -#: src/md5sum.c:474 +#: src/md5sum.c:481 msgid "OK" msgstr "" -#: src/md5sum.c:487 +#: src/md5sum.c:494 #, fuzzy, c-format msgid "%s: read error" msgstr "%s：名称已更改为 %s" -#: src/md5sum.c:500 +#: src/md5sum.c:507 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:513 +#: src/md5sum.c:520 #, c-format msgid "WARNING: %d of %d listed %s could not be read" msgstr "" -#: src/md5sum.c:516 +#: src/md5sum.c:523 msgid "file" msgstr "" -#: src/md5sum.c:516 +#: src/md5sum.c:523 msgid "files" msgstr "" -#: src/md5sum.c:522 +#: src/md5sum.c:529 #, c-format msgid "WARNING: %d of %d computed %s did NOT match" msgstr "" -#: src/md5sum.c:525 +#: src/md5sum.c:532 msgid "checksum" msgstr "" -#: src/md5sum.c:525 +#: src/md5sum.c:532 msgid "checksums" msgstr "" -#: src/md5sum.c:608 +#: src/md5sum.c:615 msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:616 +#: src/md5sum.c:623 msgid "the --string and --check options are mutually exclusive" msgstr "" -#: src/md5sum.c:623 +#: src/md5sum.c:630 msgid "the --status option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:630 +#: src/md5sum.c:637 msgid "the --warn option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:640 +#: src/md5sum.c:647 msgid "no files may be specified when using --string" msgstr "" -#: src/md5sum.c:662 +#: src/md5sum.c:669 msgid "only one argument may be specified when using --check" msgstr "" @@ -3813,12 +3814,12 @@ msgstr "指定的目标%s不是目录" msgid "when moving multiple files, last argument must be a directory" msgstr "移动多个文件时，最后的参数必须为目录。" -#: src/nice.c:65 +#: src/nice.c:69 #, fuzzy, c-format msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "用法：%s [选项] 名称...\n" -#: src/nice.c:66 +#: src/nice.c:70 msgid "" "Run COMMAND with an adjusted scheduling priority.\n" "With no COMMAND, print the current scheduling priority. ADJUST is 10\n" @@ -3827,26 +3828,26 @@ msgid "" " -n, --adjustment=ADJUST increment priority by ADJUST first\n" msgstr "" -#: src/nice.c:108 src/nice.c:121 +#: src/nice.c:112 src/nice.c:125 #, fuzzy, c-format msgid "invalid option `%s'" msgstr "无效的组 %s" -#: src/nice.c:146 +#: src/nice.c:150 #, fuzzy, c-format msgid "invalid priority `%s'" msgstr "无效的组 %s" -#: src/nice.c:170 +#: src/nice.c:174 msgid "a command must be given with an adjustment" msgstr "" -#: src/nice.c:177 src/nice.c:186 +#: src/nice.c:181 src/nice.c:190 #, fuzzy msgid "cannot get priority" msgstr "无法进入目录 %s" -#: src/nice.c:191 +#: src/nice.c:195 #, fuzzy msgid "cannot set priority" msgstr "无法设定 %s 的权限" @@ -4202,7 +4203,7 @@ msgstr "Mike Parker 和 David MacKenzie" msgid "standard input is closed" msgstr "标准输入" -#: src/paste.c:405 +#: src/paste.c:410 msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" @@ -4210,7 +4211,7 @@ msgid "" "\n" msgstr "" -#: src/paste.c:414 +#: src/paste.c:419 msgid "" " -d, --delimiters=LIST reuse characters from LIST instead of TABs\n" " -s, --serial paste one file at a time instead of in parallel\n" @@ -4691,26 +4692,26 @@ msgstr "" msgid "warning: ignoring excess arguments, starting with `%s'" msgstr "" -#: src/ptx.c:409 +#: src/ptx.c:405 #, c-format msgid "%s (for regexp `%s')" msgstr "" -#: src/ptx.c:1858 +#: src/ptx.c:1872 #, c-format msgid "" "Usage: %s [OPTION]... [INPUT]... (without -G)\n" " or: %s -G [OPTION]... [INPUT [OUTPUT]]\n" msgstr "" -#: src/ptx.c:1862 +#: src/ptx.c:1876 msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" "\n" msgstr "" -#: src/ptx.c:1869 +#: src/ptx.c:1883 msgid "" " -A, --auto-reference output automatically generated references\n" " -C, --copyright display Copyright and copying conditions\n" @@ -4718,7 +4719,7 @@ msgid "" " -F, --flag-truncation=STRING use STRING for flagging line truncations\n" msgstr "" -#: src/ptx.c:1875 +#: src/ptx.c:1889 msgid "" " -M, --macro-name=STRING macro name to use instead of `xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -4727,7 +4728,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1882 +#: src/ptx.c:1896 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -4737,7 +4738,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1890 +#: src/ptx.c:1904 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -4745,13 +4746,13 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1897 +#: src/ptx.c:1911 msgid "" "\n" "With no FILE or if FILE is -, read Standard Input. `-F /' by default.\n" msgstr "" -#: src/ptx.c:1978 +#: src/ptx.c:1992 msgid "" "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -4760,7 +4761,7 @@ msgid "" "\n" msgstr "" -#: src/ptx.c:1985 +#: src/ptx.c:1999 msgid "" "This program is distributed in the hope that it will be useful,\n" "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" @@ -4769,7 +4770,7 @@ msgid "" "\n" msgstr "" -#: src/ptx.c:1992 +#: src/ptx.c:2006 msgid "" "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software Foundation,\n" @@ -4808,72 +4809,72 @@ msgid "" " -v, --verbose report error messages\n" msgstr "" -#: src/remove.c:394 +#: src/remove.c:386 #, c-format msgid "cannot chdir from %s to .." msgstr "无法从%s目录切换到 .. 目录" -#: src/remove.c:407 src/remove.c:488 +#: src/remove.c:399 src/remove.c:480 #, c-format msgid "cannot lstat `.' in %s" msgstr "无法在%s中 lstat‘.’" -#: src/remove.c:414 src/remove.c:492 +#: src/remove.c:406 src/remove.c:484 #, c-format msgid "%s changed dev/ino" msgstr "%s的 dev/ino 变了" -#: src/remove.c:574 src/remove.c:719 src/remove.c:897 src/remove.c:1003 +#: src/remove.c:566 src/remove.c:711 src/remove.c:889 src/remove.c:999 #, c-format msgid "cannot lstat %s" msgstr "lstat%s失败" -#: src/remove.c:581 src/remove.c:741 src/remove.c:758 src/remove.c:1083 +#: src/remove.c:573 src/remove.c:733 src/remove.c:750 src/remove.c:1079 #, c-format msgid "cannot remove directory %s" msgstr "无法删除目录%s" -#: src/remove.c:610 +#: src/remove.c:602 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s：是否进入有写保护的目录%s? " -#: src/remove.c:611 +#: src/remove.c:603 #, c-format msgid "%s: descend into directory %s? " msgstr "%s：是否进入目录%s? " -#: src/remove.c:621 +#: src/remove.c:613 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s：是否删除有写保护的%s%s? " -#: src/remove.c:622 +#: src/remove.c:614 #, c-format msgid "%s: remove %s %s? " msgstr "%s：是否删除%s%s? " -#: src/remove.c:646 +#: src/remove.c:638 #, c-format msgid "removed %s\n" msgstr "已删除%s\n" -#: src/remove.c:661 src/remove.c:1078 +#: src/remove.c:653 src/remove.c:1074 #, c-format msgid "removed directory: %s\n" msgstr "已删除目录：%s\n" -#: src/remove.c:823 +#: src/remove.c:815 #, c-format msgid "cannot open directory %s" msgstr "无法打开目录%s" -#: src/remove.c:912 src/remove.c:1021 +#: src/remove.c:908 src/remove.c:1017 #, c-format msgid "cannot chdir from %s to %s" msgstr "无法从%s切换到目录%s" -#: src/remove.c:920 +#: src/remove.c:916 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -4888,7 +4889,7 @@ msgstr "" "以下的目录是循环的一部份：\n" " %s\n" -#: src/remove.c:1117 +#: src/remove.c:1113 msgid "cannot remove `.' or `..'" msgstr "无法删除‘.’或‘..’" @@ -4897,7 +4898,7 @@ msgstr "无法删除‘.’或‘..’" msgid "Paul Rubin, David MacKenzie, Richard Stallman, and Jim Meyering" msgstr "Mike Parker、David MacKenzie 和 Jim Meyering" -#: src/rm.c:101 src/touch.c:229 +#: src/rm.c:101 src/touch.c:238 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "用法：%s [选项]... 目录...\n" @@ -5023,24 +5024,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "日期格式 %s 无效" -#: src/seq.c:188 -msgid "" -"when the starting value is larger than the limit,\n" -"the increment must be negative" -msgstr "" - -#: src/seq.c:212 -msgid "" -"when the starting value is smaller than the limit,\n" -"the increment must be positive" -msgstr "" - -#: src/seq.c:423 +#: src/seq.c:386 #, fuzzy, c-format msgid "invalid format string: `%s'" msgstr "权限模式字串无效：%s " -#: src/seq.c:445 +#: src/seq.c:406 #, fuzzy msgid "format string may not be specified when printing equal width strings" msgstr "安装目录时不能用 strip 选项" @@ -5291,7 +5280,7 @@ msgstr "" msgid "invalid time interval `%s'" msgstr "无效的日期时间格式 %s" -#: src/sleep.c:166 src/tail.c:1061 +#: src/sleep.c:166 src/tail.c:1068 #, fuzzy msgid "cannot read realtime clock" msgstr "无法创建链接%s" @@ -5300,7 +5289,7 @@ msgstr "无法创建链接%s" msgid "Mike Haertel and Paul Eggert" msgstr "" -#: src/sort.c:283 +#: src/sort.c:278 msgid "" "Write sorted concatenation of all FILE(s) to standard output.\n" "\n" @@ -5308,7 +5297,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:292 +#: src/sort.c:287 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -5316,7 +5305,7 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:297 +#: src/sort.c:292 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -5326,7 +5315,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:305 +#: src/sort.c:300 msgid "" "Other options:\n" "\n" @@ -5339,10 +5328,10 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:315 +#: src/sort.c:310 #, c-format msgid "" -" -t, --field-separator=SEP use SEP instead of non- to whitespace " +" -t, --field-separator=SEP use SEP instead of non-blank to blank " "transition\n" " -T, --temporary-directory=DIR use DIR for temporaries, not $TMPDIR or %s\n" " multiple options specify multiple directories\n" @@ -5351,11 +5340,11 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:322 +#: src/sort.c:317 msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr "" -#: src/sort.c:327 +#: src/sort.c:322 msgid "" "\n" "POS is F[.C][OPTS], where F is the field number and C the character " @@ -5367,7 +5356,7 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:336 +#: src/sort.c:331 #, c-format msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" @@ -5380,27 +5369,27 @@ msgid "" "native byte values.\n" msgstr "" -#: src/sort.c:447 +#: src/sort.c:442 #, fuzzy msgid "cannot create temporary file" msgstr "无法创建一般文件%s" -#: src/sort.c:470 +#: src/sort.c:465 #, fuzzy msgid "open failed" msgstr "strip 出现错误" -#: src/sort.c:490 src/sort.c:2556 +#: src/sort.c:485 src/sort.c:2578 #, fuzzy msgid "close failed" msgstr "strip 出现错误" -#: src/sort.c:498 +#: src/sort.c:493 #, fuzzy msgid "write failed" msgstr "strip 出现错误" -#: src/sort.c:644 +#: src/sort.c:639 #, fuzzy msgid "sort size" msgstr "块大小" @@ -5410,154 +5399,168 @@ msgstr "块大小" msgid "stat failed" msgstr "strip 出现错误" -#: src/sort.c:975 +#: src/sort.c:992 #, fuzzy msgid "read failed" msgstr "strip 出现错误" -#: src/sort.c:1573 +#: src/sort.c:1589 #, c-format msgid "%s: %s:%s: disorder: " msgstr "" -#: src/sort.c:1577 +#: src/sort.c:1593 #, fuzzy msgid "standard error" msgstr "标准输出" -#: src/sort.c:2089 +#: src/sort.c:2090 #, fuzzy, c-format msgid "%s: invalid field specification `%s'" msgstr "%s：文件大小无效" -#: src/sort.c:2115 +#: src/sort.c:2116 #, fuzzy, c-format msgid "%s: count `%.*s' too large" msgstr "%s：文件过大" -#: src/sort.c:2121 +#: src/sort.c:2122 #, fuzzy, c-format msgid "%s: invalid count at start of `%s'" msgstr "%s：覆盖次数无效" -#: src/sort.c:2358 +#: src/sort.c:2364 #, fuzzy msgid "invalid number after `-'" msgstr "无效的号码 %s" -#: src/sort.c:2361 src/sort.c:2407 src/sort.c:2434 +#: src/sort.c:2367 src/sort.c:2413 src/sort.c:2440 #, fuzzy msgid "invalid number after `.'" msgstr "无效的号码 %s" -#: src/sort.c:2364 src/sort.c:2443 +#: src/sort.c:2370 src/sort.c:2449 #, fuzzy msgid "stray character in field spec" msgstr "字符特殊文件" -#: src/sort.c:2398 +#: src/sort.c:2404 #, fuzzy msgid "invalid number at field start" msgstr "无效的号码 %s" -#: src/sort.c:2402 src/sort.c:2430 +#: src/sort.c:2408 src/sort.c:2436 #, fuzzy msgid "field number is zero" msgstr "无效的号码 %s" -#: src/sort.c:2411 +#: src/sort.c:2417 #, fuzzy msgid "character offset is zero" msgstr "字符特殊文件" -#: src/sort.c:2426 +#: src/sort.c:2432 #, fuzzy msgid "invalid number after `,'" msgstr "无效的号码 %s" -#: src/sort.c:2471 +#: src/sort.c:2459 +#, fuzzy +msgid "multiple output files specified" +msgstr "正在关闭输出文件 %s" + +#: src/sort.c:2475 +msgid "empty tab" +msgstr "" + +#: src/sort.c:2486 #, c-format msgid "multi-character tab `%s'" msgstr "" -#: src/sort.c:2539 +#: src/sort.c:2491 +msgid "incompatible tabs" +msgstr "" + +#: src/sort.c:2561 #, c-format msgid "extra operand `%s' not allowed with -c" msgstr "" -#: src/split.c:96 +#: src/split.c:100 #, fuzzy, c-format msgid "Usage: %s [OPTION] [INPUT [PREFIX]]\n" msgstr "用法：%s [选项]... [文件]\n" -#: src/split.c:100 +#: src/split.c:104 msgid "" "Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n" "PREFIX is `x'. With no INPUT, or when INPUT is -, read standard input.\n" "\n" msgstr "" -#: src/split.c:108 +#: src/split.c:112 #, c-format msgid "" " -a, --suffix-length=N use suffixes of length N (default %d)\n" " -b, --bytes=SIZE put SIZE bytes per output file\n" " -C, --line-bytes=SIZE put at most SIZE bytes of lines per output file\n" +" -d, --numeric-suffixes use numeric suffixes instead of alphabetic\n" " -l, --lines=NUMBER put NUMBER lines per output file\n" msgstr "" -#: src/split.c:114 +#: src/split.c:119 msgid "" " --verbose print a diagnostic to standard error just\n" " before each output file is opened\n" msgstr "" -#: src/split.c:120 +#: src/split.c:125 msgid "" "\n" "SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n" msgstr "" -#: src/split.c:171 +#: src/split.c:186 msgid "Output file suffixes exhausted" msgstr "" -#: src/split.c:189 +#: src/split.c:204 #, fuzzy, c-format msgid "creating file `%s'\n" msgstr "正在创建目录 %s" -#: src/split.c:346 +#: src/split.c:361 #, fuzzy msgid "cannot split in more than one way" msgstr "无法由多於一种的来源来指定时间" -#: src/split.c:398 +#: src/split.c:413 #, fuzzy, c-format msgid "%s: invalid suffix length" msgstr "%s：文件类型无效" -#: src/split.c:412 src/split.c:436 +#: src/split.c:427 src/split.c:451 #, fuzzy, c-format msgid "%s: invalid number of bytes" msgstr "%s：覆盖次数无效" -#: src/split.c:424 +#: src/split.c:439 #, fuzzy, c-format msgid "%s: invalid number of lines" msgstr "%s：覆盖次数无效" -#: src/split.c:466 +#: src/split.c:481 #, fuzzy, c-format msgid "line count option -%s%c... is too large" msgstr "%s：文件过大" -#: src/split.c:485 +#: src/split.c:504 #, c-format msgid "`-%s' option is obsolete; use `-l %s'" msgstr "" -#: src/split.c:500 +#: src/split.c:519 #, fuzzy msgid "invalid number of lines: 0" msgstr "无效的号码 %s" @@ -5567,17 +5570,17 @@ msgstr "无效的号码 %s" msgid "*** invalid date/time ***" msgstr "无效的权限模式%s" -#: src/stat.c:618 +#: src/stat.c:619 #, fuzzy, c-format msgid "cannot read file system information for %s" msgstr "无法创建 fifo 文件%s" -#: src/stat.c:694 +#: src/stat.c:695 #, c-format msgid "Usage: %s [OPTION] FILE...\n" msgstr "用法：%s [选项] 文件...\n" -#: src/stat.c:695 +#: src/stat.c:696 msgid "" "Display file or filesystem status.\n" "\n" @@ -5587,7 +5590,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:706 +#: src/stat.c:707 msgid "" "\n" "The valid format sequences for files (without --filesystem):\n" @@ -5598,7 +5601,7 @@ msgid "" " %b Number of blocks allocated (see %B)\n" msgstr "" -#: src/stat.c:714 +#: src/stat.c:715 msgid "" " %D Device number in hex\n" " %d Device number in decimal\n" @@ -5608,7 +5611,7 @@ msgid "" " %g Group ID of owner\n" msgstr "" -#: src/stat.c:722 +#: src/stat.c:723 msgid "" " %h Number of hard links\n" " %i Inode number\n" @@ -5620,7 +5623,7 @@ msgid "" " %t Major device type in hex\n" msgstr "" -#: src/stat.c:732 +#: src/stat.c:733 msgid "" " %U User name of owner\n" " %u User ID of owner\n" @@ -5633,7 +5636,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:744 +#: src/stat.c:745 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -5644,7 +5647,7 @@ msgid "" " %f Free blocks in file system\n" msgstr "" -#: src/stat.c:753 +#: src/stat.c:754 msgid "" " %i File System id in hex\n" " %l Maximum length of filenames\n" @@ -5654,6 +5657,13 @@ msgid "" " %t Type in hex\n" msgstr "" +#: src/stat.c:794 +#, fuzzy +msgid "Warning: `-l' is deprecated; use `-L' instead" +msgstr "" +"警告：--version-control (-V) 选项已经过时；将来的版本随时可能不再支持\n" +"此选项。请使用 --backup=%s。" + #: src/stty.c:489 #, c-format msgid "" @@ -6069,11 +6079,11 @@ msgstr "" msgid "ignoring all arguments" msgstr "忽略任何参数" -#: src/sys2.h:469 +#: src/sys2.h:470 msgid " --help display this help and exit\n" msgstr " --help 显示此帮助信息并离开\n" -#: src/sys2.h:471 +#: src/sys2.h:472 msgid " --version output version information and exit\n" msgstr " --version 显示版本信息并离开\n" @@ -6114,7 +6124,7 @@ msgstr "" msgid "Paul Rubin, David MacKenzie, Ian Lance Taylor, and Jim Meyering" msgstr "Mike Parker、David MacKenzie 和 Jim Meyering" -#: src/tail.c:238 +#: src/tail.c:241 #, c-format msgid "" "Print the last %d lines of each FILE to standard output.\n" @@ -6123,7 +6133,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:247 +#: src/tail.c:250 msgid "" " --retry keep trying to open a file even if it is\n" " inaccessible when tail starts or if it becomes\n" @@ -6131,7 +6141,7 @@ msgid "" " -c, --bytes=N output the last N bytes\n" msgstr "" -#: src/tail.c:253 +#: src/tail.c:256 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -6140,7 +6150,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:260 +#: src/tail.c:263 #, c-format msgid "" " -n, --lines=N output the last N lines, instead of the last %d\n" @@ -6151,7 +6161,7 @@ msgid "" " (this is the usual case of rotated log files)\n" msgstr "" -#: src/tail.c:271 +#: src/tail.c:274 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -6160,7 +6170,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:280 +#: src/tail.c:283 msgid "" "\n" "If the first character of N (the number of bytes or lines) is a `+',\n" @@ -6170,14 +6180,14 @@ msgid "" "\n" msgstr "" -#: src/tail.c:288 +#: src/tail.c:291 msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" "means that even if a tail'ed file is renamed, tail will continue to track\n" "its end. " msgstr "" -#: src/tail.c:293 +#: src/tail.c:296 msgid "" "This default behavior is not desirable when you really want to\n" "track the actual name of the file, not the file descriptor (e.g., log\n" @@ -6186,67 +6196,67 @@ msgid "" "recreated by some other program.\n" msgstr "" -#: src/tail.c:331 +#: src/tail.c:334 #, fuzzy, c-format msgid "closing %s (fd=%d)" msgstr "正在关闭%s" -#: src/tail.c:396 +#: src/tail.c:399 #, fuzzy, c-format msgid "%s: cannot seek to relative offset %s" msgstr "无法创建 fifo 文件%s" -#: src/tail.c:400 +#: src/tail.c:403 #, fuzzy, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "无法创建 fifo 文件%s" -#: src/tail.c:848 +#: src/tail.c:855 #, c-format msgid "`%s' has become inaccessible" msgstr "" -#: src/tail.c:865 +#: src/tail.c:872 #, c-format msgid "`%s' has been replaced with an untailable file; giving up on this name" msgstr "" -#: src/tail.c:886 +#: src/tail.c:893 #, c-format msgid "`%s' has become accessible" msgstr "" -#: src/tail.c:894 +#: src/tail.c:901 #, c-format msgid "`%s' has appeared; following end of new file" msgstr "" -#: src/tail.c:905 +#: src/tail.c:912 #, c-format msgid "`%s' has been replaced; following end of new file" msgstr "" -#: src/tail.c:1030 +#: src/tail.c:1037 #, fuzzy, c-format msgid "%s: file truncated" msgstr "%s：截断文件时出现错误" -#: src/tail.c:1050 +#: src/tail.c:1057 #, fuzzy msgid "no files remaining" msgstr "缺少了文件参数" -#: src/tail.c:1277 +#: src/tail.c:1297 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" -#: src/tail.c:1401 +#: src/tail.c:1421 #, fuzzy, c-format msgid "%c: invalid suffix character in obsolescent option" msgstr "权限模式字串 %2$s 中出现无效的字符 %1$s" -#: src/tail.c:1450 +#: src/tail.c:1470 #, c-format msgid "" "too many arguments; When using tail's obsolescent option syntax (%s)\n" @@ -6254,7 +6264,7 @@ msgid "" "option instead." msgstr "" -#: src/tail.c:1459 +#: src/tail.c:1479 #, c-format msgid "" "Warning: it is not portable to use two or more file arguments with\n" @@ -6262,40 +6272,47 @@ msgid "" "option instead." msgstr "" -#: src/tail.c:1468 +#: src/tail.c:1488 #, c-format msgid "`%s' option is obsolete; use `%s-%c %.*s'" msgstr "" -#: src/tail.c:1548 +#: src/tail.c:1560 +#, fuzzy +msgid "the --allow-missing option is deprecated; use --retry instead" +msgstr "" +"警告：--version-control (-V) 选项已经过时；将来的版本随时可能不再支持\n" +"此选项。请使用 --backup=%s。" + +#: src/tail.c:1572 #, fuzzy, c-format msgid "%s: invalid maximum number of unchanged stats between opens" msgstr "%s：覆盖次数无效" -#: src/tail.c:1560 +#: src/tail.c:1584 #, fuzzy, c-format msgid "%s: invalid maximum number of consecutive size changes" msgstr "%s：覆盖次数无效" -#: src/tail.c:1572 +#: src/tail.c:1596 #, fuzzy, c-format msgid "%s: invalid PID" msgstr "%s：文件大小无效" -#: src/tail.c:1587 +#: src/tail.c:1615 #, fuzzy, c-format msgid "%s: invalid number of seconds" msgstr "%s：覆盖次数无效" -#: src/tail.c:1606 +#: src/tail.c:1634 msgid "warning: --retry is useful only when following by name" msgstr "" -#: src/tail.c:1610 +#: src/tail.c:1638 msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" -#: src/tail.c:1613 +#: src/tail.c:1641 #, fuzzy msgid "warning: --pid=PID is not supported on this system" msgstr "此系统并不支持符号链接" @@ -6523,34 +6540,34 @@ msgstr "" msgid "too many arguments\n" msgstr "参数太多" -#: src/touch.c:39 +#: src/touch.c:40 #, fuzzy msgid "" "Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and Randy Smith" msgstr "Richard Stallman 和 David MacKenzie" -#: src/touch.c:148 src/touch.c:164 +#: src/touch.c:149 src/touch.c:165 #, c-format msgid "creating %s" msgstr "正在创建目录 %s" -#: src/touch.c:207 +#: src/touch.c:216 #, fuzzy, c-format msgid "cannot touch %s" msgstr "无法解除%s的链接" -#: src/touch.c:213 +#: src/touch.c:222 #, c-format msgid "setting times of %s" msgstr "正在设定 %s 的时间" -#: src/touch.c:230 +#: src/touch.c:239 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" msgstr "将每个<文件>的访问及修改时间都更新为目前的时间。\n" -#: src/touch.c:237 +#: src/touch.c:246 #, fuzzy msgid "" " -a change only the access time\n" @@ -6565,7 +6582,7 @@ msgstr "" " -f (此选项不作处理)\n" " -m 只更改修改时间\n" -#: src/touch.c:244 +#: src/touch.c:253 msgid "" " -r, --reference=FILE use this file's times instead of current time\n" " -t STAMP use [[CC]YY]MMDDhhmm[.ss] instead of current time\n" @@ -6579,7 +6596,7 @@ msgstr "" " --time=WORD 使用 WORD 指定的时间：access、atime、use 都等於 -a\n" " 选项的效果，而 modify、mtime 等於 -m 选项的效果\n" -#: src/touch.c:252 +#: src/touch.c:261 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -6587,31 +6604,31 @@ msgstr "" "\n" "请注意，-d 和 -t 选项可接受不同的时间/日期格式。\n" -#: src/touch.c:297 src/touch.c:317 +#: src/touch.c:307 src/touch.c:327 #, c-format msgid "invalid date format %s" msgstr "日期格式 %s 无效" -#: src/touch.c:341 +#: src/touch.c:352 msgid "cannot specify times from more than one source" msgstr "无法由多於一种的来源来指定时间" -#: src/touch.c:364 +#: src/touch.c:376 #, c-format msgid "" "warning: `touch %s' is obsolete; use `touch -t %04d%02d%02d%02d%02d.%02d'" msgstr "警告：‘touch %s’已经过时；请使用‘touch -t %04d%02d%02d%02d%02d.%02d’" -#: src/touch.c:385 +#: src/touch.c:410 msgid "file arguments missing" msgstr "缺少了文件参数" -#: src/tr.c:325 +#: src/tr.c:320 #, fuzzy, c-format msgid "Usage: %s [OPTION]... SET1 [SET2]\n" msgstr "用法：%s [选项]... [文件]\n" -#: src/tr.c:329 +#: src/tr.c:324 msgid "" "Translate, squeeze, and/or delete characters from standard input,\n" "writing to standard output.\n" @@ -6625,7 +6642,7 @@ msgid "" " -t, --truncate-set1 first truncate SET1 to length of SET2\n" msgstr "" -#: src/tr.c:342 +#: src/tr.c:337 msgid "" "\n" "SETs are specified as strings of characters. Most represent themselves.\n" @@ -6641,7 +6658,7 @@ msgid "" " \\t horizontal tab\n" msgstr "" -#: src/tr.c:356 +#: src/tr.c:351 msgid "" " \\v vertical tab\n" " CHAR1-CHAR2 all characters from CHAR1 to CHAR2 in ascending order\n" @@ -6654,7 +6671,7 @@ msgid "" " [:digit:] all digits\n" msgstr "" -#: src/tr.c:367 +#: src/tr.c:362 msgid "" " [:graph:] all printable characters, not including space\n" " [:lower:] all lower case letters\n" @@ -6666,7 +6683,7 @@ msgid "" " [=CHAR=] all characters which are equivalent to CHAR\n" msgstr "" -#: src/tr.c:377 +#: src/tr.c:372 msgid "" "\n" "Translation occurs if -d is not given and both SET1 and SET2 appear.\n" @@ -6674,7 +6691,7 @@ msgid "" "SET1 by repeating its last character as necessary. " msgstr "" -#: src/tr.c:383 +#: src/tr.c:378 msgid "" "Excess characters\n" "of SET2 are ignored. Only [:lower:] and [:upper:] are guaranteed to\n" @@ -6682,111 +6699,111 @@ msgid "" "only be used in pairs to specify case conversion. " msgstr "" -#: src/tr.c:389 +#: src/tr.c:384 msgid "" "-s uses SET1 if not\n" "translating nor deleting; else squeezing uses SET2 and occurs after\n" "translation or deletion.\n" msgstr "" -#: src/tr.c:555 +#: src/tr.c:550 #, c-format msgid "" "warning: the ambiguous octal escape \\%c%c%c is being\n" "\tinterpreted as the 2-byte sequence \\0%c%c, `%c'" msgstr "" -#: src/tr.c:564 +#: src/tr.c:559 #, fuzzy msgid "invalid backslash escape at end of string" msgstr "权限模式字串 %2$s 中出现无效的字符 %1$s" -#: src/tr.c:570 +#: src/tr.c:565 #, c-format msgid "invalid backslash escape `\\%c'" msgstr "" -#: src/tr.c:723 +#: src/tr.c:718 #, c-format msgid "range-endpoints of `%s-%s' are in reverse collating sequence order" msgstr "" -#: src/tr.c:904 +#: src/tr.c:899 #, c-format msgid "invalid repeat count `%s' in [c*n] construct" msgstr "" -#: src/tr.c:997 +#: src/tr.c:992 msgid "missing character class name `[::]'" msgstr "" -#: src/tr.c:1000 +#: src/tr.c:995 msgid "missing equivalence class character `[==]'" msgstr "" -#: src/tr.c:1023 +#: src/tr.c:1018 #, fuzzy, c-format msgid "invalid character class `%s'" msgstr "权限模式字串 %2$s 中出现无效的字符 %1$s" -#: src/tr.c:1048 +#: src/tr.c:1043 #, c-format msgid "%s: equivalence class operand must be a single character" msgstr "" -#: src/tr.c:1520 +#: src/tr.c:1515 msgid "the [c*] repeat construct may not appear in string1" msgstr "" -#: src/tr.c:1530 +#: src/tr.c:1525 msgid "only one [c*] repeat construct may appear in string2" msgstr "" -#: src/tr.c:1538 +#: src/tr.c:1533 msgid "[=c=] expressions may not appear in string2 when translating" msgstr "" -#: src/tr.c:1551 +#: src/tr.c:1546 msgid "when not truncating set1, string2 must be non-empty" msgstr "" -#: src/tr.c:1560 +#: src/tr.c:1555 msgid "" "when translating with complemented character classes,\n" "string2 must map all characters in the domain to one" msgstr "" -#: src/tr.c:1567 +#: src/tr.c:1562 msgid "" "when translating, the only character classes that may appear in\n" "string2 are `upper' and `lower'" msgstr "" -#: src/tr.c:1576 +#: src/tr.c:1571 msgid "the [c*] construct may appear in string2 only when translating" msgstr "" -#: src/tr.c:1852 +#: src/tr.c:1847 msgid "two strings must be given when translating" msgstr "" -#: src/tr.c:1855 +#: src/tr.c:1850 msgid "two strings must be given when both deleting and squeezing repeats" msgstr "" -#: src/tr.c:1869 +#: src/tr.c:1864 msgid "only one string may be given when deleting without squeezing repeats" msgstr "" -#: src/tr.c:1875 +#: src/tr.c:1870 msgid "at least one string must be given when squeezing repeats" msgstr "" -#: src/tr.c:1966 +#: src/tr.c:1961 msgid "misaligned [:upper:] and/or [:lower:] construct" msgstr "" -#: src/tr.c:1989 +#: src/tr.c:1984 msgid "" "invalid identity mapping; when translating, any [:lower:] or [:upper:]\n" "construct in string1 must be aligned with a corresponding construct\n" @@ -7065,75 +7082,75 @@ msgstr "" msgid "Joseph Arceneaux, David MacKenzie, and Michael Stone" msgstr "Mike Parker、David MacKenzie 和 Jim Meyering" -#: src/who.c:222 +#: src/who.c:221 msgid " old " msgstr "" -#: src/who.c:432 src/who.c:435 +#: src/who.c:431 src/who.c:434 msgid "id=" msgstr "" -#: src/who.c:448 src/who.c:453 +#: src/who.c:447 src/who.c:452 msgid "term=" msgstr "" -#: src/who.c:450 src/who.c:454 +#: src/who.c:449 src/who.c:453 msgid "exit=" msgstr "" -#: src/who.c:491 +#: src/who.c:490 msgid "clock change" msgstr "" -#: src/who.c:503 src/who.c:504 +#: src/who.c:502 src/who.c:503 msgid "run-level" msgstr "" -#: src/who.c:507 src/who.c:508 +#: src/who.c:506 src/who.c:507 msgid "last=" msgstr "" -#: src/who.c:537 +#: src/who.c:536 #, c-format msgid "" "\n" "# users=%u\n" msgstr "" -#: src/who.c:543 +#: src/who.c:542 msgid "NAME" msgstr "" -#: src/who.c:543 +#: src/who.c:542 msgid "LINE" msgstr "" -#: src/who.c:543 +#: src/who.c:542 msgid "TIME" msgstr "" -#: src/who.c:543 +#: src/who.c:542 msgid "IDLE" msgstr "" -#: src/who.c:543 +#: src/who.c:542 msgid "PID" msgstr "" -#: src/who.c:544 +#: src/who.c:543 msgid "COMMENT" msgstr "" -#: src/who.c:544 +#: src/who.c:543 msgid "EXIT" msgstr "" -#: src/who.c:619 +#: src/who.c:618 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "用法：%s [选项]... [文件]\n" -#: src/who.c:620 +#: src/who.c:619 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -7142,23 +7159,21 @@ msgid "" " -H, --heading print line of column headings\n" msgstr "" -#: src/who.c:627 +#: src/who.c:626 msgid "" " -i, --idle add idle time as HOURS:MINUTES, . or old\n" " (deprecated, use -u)\n" -" --login print system login processes\n" -" (equivalent to SUS -l)\n" +" -l, --login print system login processes\n" msgstr "" -#: src/who.c:633 +#: src/who.c:631 msgid "" -" -l, --lookup attempt to canonicalize hostnames via DNS\n" -" (-l is deprecated, use --lookup)\n" +" --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" -#: src/who.c:639 +#: src/who.c:636 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -7166,7 +7181,7 @@ msgid "" " -t, --time print last system clock change\n" msgstr "" -#: src/who.c:645 +#: src/who.c:642 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -7174,7 +7189,7 @@ msgid "" " --writable same as -T\n" msgstr "" -#: src/who.c:653 +#: src/who.c:650 #, c-format msgid "" "\n" @@ -7182,19 +7197,13 @@ msgid "" "If ARG1 ARG2 given, -m presumed: `am i' or `mom likes' are usual.\n" msgstr "" -#: src/who.c:757 +#: src/who.c:753 #, fuzzy msgid "Warning: -i will be removed in a future release; use -u instead" msgstr "" "警告：--version-control (-V) 选项已经过时；将来的版本随时可能不再支持\n" "此选项。请使用 --backup=%s。" -#: src/who.c:768 -msgid "" -"Warning: the meaning of '-l' will change in a future release to conform to " -"POSIX" -msgstr "" - #: src/whoami.c:52 msgid "" "Print the user name associated with the current effective user id.\n" |