summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po1740
1 files changed, 899 insertions, 841 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b16cda2af..0bacabeb2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: coreutils 5.92\n"
+"Project-Id-Version: coreutils 5.95\n"
"Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2006-03-12 23:43+0100\n"
-"PO-Revision-Date: 2005-10-24 19:57+0800\n"
+"POT-Creation-Date: 2006-08-09 12:26-0700\n"
+"PO-Revision-Date: 2006-05-20 13:36+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: lib/acl.c:256 lib/acl.c:270 lib/acl.c:287 lib/acl.c:299 lib/acl.c:398
-#: src/copy.c:1758
+#: src/copy.c:1772
#, fuzzy, c-format
msgid "preserving permissions for %s"
msgstr "设定 %s 的权限"
-#: lib/acl.c:379 lib/acl.c:387 lib/acl.c:406 src/copy.c:1517 src/cp.c:472
+#: lib/acl.c:379 lib/acl.c:387 lib/acl.c:406 src/copy.c:1516 src/cp.c:472
#, c-format
msgid "setting permissions for %s"
msgstr "设定 %s 的权限"
@@ -44,12 +44,12 @@ msgstr "%2$s 的参数 %1$s 不明确"
msgid "Valid arguments are:"
msgstr "有效的参数为:"
-#: lib/closeout.c:94 src/base64.c:115 src/base64.c:127 src/base64.c:133
-#: src/base64.c:174 src/base64.c:218 src/cat.c:193 src/cat.c:277 src/cat.c:327
+#: lib/closeout.c:74 src/base64.c:115 src/base64.c:127 src/base64.c:133
+#: src/base64.c:174 src/base64.c:218 src/cat.c:193 src/cat.c:209 src/cat.c:293
#: src/cksum.c:255 src/expand.c:337 src/expand.c:362 src/head.c:300
#: src/head.c:350 src/head.c:758 src/head.c:799 src/od.c:966 src/paste.c:143
-#: src/tail.c:309 src/tail.c:1097 src/tr.c:1561 src/tr.c:1784 src/tr.c:1887
-#: src/unexpand.c:434 src/unexpand.c:450
+#: src/shuf.c:408 src/tail.c:309 src/tail.c:1097 src/tr.c:1562 src/tr.c:1785
+#: src/tr.c:1888 src/unexpand.c:434 src/unexpand.c:450
msgid "write error"
msgstr "写入错误"
@@ -57,8 +57,8 @@ msgstr "写入错误"
msgid "Unknown system error"
msgstr "未知的系统错误"
-#: lib/euidaccess-stat.c:139 src/copy.c:977 src/copy.c:1015 src/copy.c:1505
-#: src/df.c:492 src/install.c:444 src/stat.c:728
+#: lib/euidaccess-stat.c:139 src/copy.c:978 src/copy.c:1016 src/copy.c:1504
+#: src/df.c:497 src/install.c:426 src/stat.c:729
#, c-format
msgid "cannot stat %s"
msgstr "无法 stat %s"
@@ -133,9 +133,8 @@ msgid "Non-recoverable failure in name resolution"
msgstr "名称解析有不可恢复的失败"
#: lib/gai_strerror.c:51
-#, fuzzy
msgid "ai_family not supported"
-msgstr "不支持 FIFO 文件"
+msgstr "不支持 ai_family"
#: lib/gai_strerror.c:52
msgid "Memory allocation failure"
@@ -154,9 +153,8 @@ msgid "Servname not supported for ai_socktype"
msgstr ""
#: lib/gai_strerror.c:56
-#, fuzzy
msgid "ai_socktype not supported"
-msgstr "不支持 FIFO 文件"
+msgstr "不支持 ai_socktype"
#: lib/gai_strerror.c:57
msgid "System error"
@@ -249,32 +247,17 @@ msgstr "%s:选项“-W %s”不允许参数\n"
msgid "block size"
msgstr "块大小"
-#: lib/mkdir-p.c:103 src/cp.c:481 src/cp.c:500
-#, c-format
-msgid "%s exists but is not a directory"
-msgstr "%s 存在但并非目录"
-
-#: lib/mkdir-p.c:206 lib/mkdir-p.c:313
-#, c-format
-msgid "cannot change owner and/or group of %s"
-msgstr "无法更改 %s 的属主和/或组"
-
-#: lib/mkdir-p.c:238
-#, c-format
-msgid "cannot chdir to directory %s"
-msgstr "无法切换到目录 %s"
-
-#: lib/mkdir-p.c:250 lib/mkdir-p.c:285 src/copy.c:1494 src/mkdir.c:168
+#: lib/mkdir-p.c:117 src/copy.c:1493 src/install.c:408
#, c-format
msgid "cannot create directory %s"
msgstr "无法创建目录 %s"
-#: lib/mkdir-p.c:326 lib/mkdir-p.c:351 src/install.c:523
+#: lib/mkdir-p.c:129 src/install.c:494
#, c-format
msgid "cannot change permissions of %s"
msgstr "无法更改 %s 的权限"
-#: lib/obstack.c:433 lib/obstack.c:435 lib/xalloc-die.c:37 src/csplit.c:237
+#: lib/obstack.c:433 lib/obstack.c:435 lib/xalloc-die.c:37 src/csplit.c:238
msgid "memory exhausted"
msgstr "内存用尽"
@@ -282,7 +265,7 @@ msgstr "内存用尽"
msgid "unable to record current working directory"
msgstr "无法记录目前的工作目录"
-#: lib/openat-die.c:49 src/df.c:515
+#: lib/openat-die.c:49 src/df.c:520
msgid "failed to return to initial working directory"
msgstr "返回到初始工作目录失败"
@@ -313,17 +296,22 @@ msgstr "“"
msgid "'"
msgstr "”"
-#: lib/root-dev-ino.h:19
+#: lib/randread.c:125
+#, fuzzy, c-format
+msgid "%s: end of file"
+msgstr "strip 出现错误"
+
+#: lib/root-dev-ino.h:20
#, c-format
msgid "it is dangerous to operate recursively on %s"
msgstr "在 %s 进行递归操作十分危险"
-#: lib/root-dev-ino.h:23
+#: lib/root-dev-ino.h:24
#, c-format
msgid "it is dangerous to operate recursively on %s (same as %s)"
msgstr "在 %s 进行递归操作十分危险(与 %s 相同)"
-#: lib/root-dev-ino.h:25
+#: lib/root-dev-ino.h:26
msgid "use --no-preserve-root to override this failsafe"
msgstr ""
@@ -335,24 +323,24 @@ msgstr "^[yY]"
msgid "^[nN]"
msgstr "^[nN]"
-#: lib/unicodeio.c:157
+#: lib/unicodeio.c:153
msgid "iconv function not usable"
msgstr "iconv 函数无法使用"
-#: lib/unicodeio.c:159
+#: lib/unicodeio.c:155
msgid "iconv function not available"
msgstr "iconv 函数不存在"
-#: lib/unicodeio.c:166
+#: lib/unicodeio.c:162
msgid "character out of range"
msgstr "字符值超出可接受的范围以外"
-#: lib/unicodeio.c:230
+#: lib/unicodeio.c:226
#, c-format
msgid "cannot convert U+%04X to local character set"
msgstr "无法将 U+%04X 转换至用户的字符集"
-#: lib/unicodeio.c:232
+#: lib/unicodeio.c:228
#, c-format
msgid "cannot convert U+%04X to local character set: %s"
msgstr "无法将 U+%04X 转换至用户的字符集:%s"
@@ -365,9 +353,10 @@ msgstr "无效的用户"
msgid "invalid group"
msgstr "无效的组"
-#: lib/userspec.c:113
-msgid "cannot get the login group of a numeric UID"
-msgstr "无法取得 UID 数值所表示的用户的主组"
+#: lib/userspec.c:112
+#, fuzzy
+msgid "invalid spec"
+msgstr "无效的用户"
#. TRANSLATORS: Translate "(C)" to the copyright symbol
#. (C-in-a-circle), if this symbol is available in the user's
@@ -498,43 +487,53 @@ msgstr ""
"%s、%s、%s、%s、\n"
"%s、%s、和其他人编写。\n"
+#: lib/xmemxfrm.c:57
+#, fuzzy
+msgid "string transformation failed"
+msgstr "字符串比较出现错误"
+
+#: lib/xmemxfrm.c:58 lib/xmemcoll.c:51 src/expr.c:769
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "请设定 LC_ALL='C' 避免问题出现。"
+
+#: lib/xmemxfrm.c:60
+#, c-format
+msgid "The untransformed string was %s."
+msgstr ""
+
#: lib/xfts.c:60
#, c-format
msgid "invalid argument: %s"
msgstr "无效的参数:%s"
-#: lib/xmemcoll.c:50 src/expr.c:741
+#: lib/xmemcoll.c:50 src/expr.c:768
msgid "string comparison failed"
msgstr "字符串比较出现错误"
-#: lib/xmemcoll.c:51 src/expr.c:742
-msgid "Set LC_ALL='C' to work around the problem."
-msgstr "请设定 LC_ALL='C' 避免问题出现。"
-
-#: lib/xmemcoll.c:53 src/expr.c:744
+#: lib/xmemcoll.c:53 src/expr.c:771
#, c-format
msgid "The strings compared were %s and %s."
msgstr "要比较的字符串为 %s 和 %s。"
-#: src/base64.c:61 src/basename.c:51 src/cat.c:91 src/chgrp.c:104
-#: src/chmod.c:323 src/chown.c:90 src/chroot.c:42 src/cksum.c:264
-#: src/comm.c:69 src/cp.c:154 src/csplit.c:1448 src/cut.c:184 src/date.c:128
-#: src/dd.c:400 src/df.c:716 src/dircolors.c:101 src/dirname.c:45 src/du.c:276
-#: src/echo.c:60 src/env.c:114 src/expand.c:107 src/expr.c:97 src/factor.c:70
+#: src/base64.c:61 src/basename.c:51 src/cat.c:91 src/chgrp.c:109
+#: src/chmod.c:325 src/chown.c:90 src/chroot.c:42 src/cksum.c:264
+#: src/comm.c:69 src/cp.c:154 src/csplit.c:1450 src/cut.c:184 src/date.c:128
+#: src/dd.c:400 src/df.c:721 src/dircolors.c:101 src/dirname.c:45 src/du.c:276
+#: src/echo.c:60 src/env.c:114 src/expand.c:107 src/expr.c:98 src/factor.c:70
#: src/fmt.c:269 src/fold.c:66 src/head.c:105 src/hostid.c:44
-#: src/hostname.c:61 src/id.c:74 src/install.c:628 src/join.c:130
-#: src/kill.c:90 src/link.c:46 src/ln.c:316 src/logname.c:40 src/ls.c:4119
-#: src/md5sum.c:152 src/mkdir.c:55 src/mkfifo.c:51 src/mknod.c:51 src/mv.c:287
-#: src/nice.c:72 src/nl.c:168 src/nohup.c:53 src/od.c:303 src/paste.c:413
+#: src/hostname.c:61 src/id.c:74 src/install.c:618 src/join.c:130
+#: src/kill.c:90 src/link.c:46 src/ln.c:314 src/logname.c:40 src/ls.c:4245
+#: src/md5sum.c:146 src/mkdir.c:55 src/mkfifo.c:51 src/mknod.c:51 src/mv.c:287
+#: src/nice.c:72 src/nl.c:173 src/nohup.c:53 src/od.c:303 src/paste.c:413
#: src/pathchk.c:95 src/pinky.c:510 src/pr.c:2764 src/printenv.c:57
-#: src/printf.c:96 src/ptx.c:1883 src/pwd.c:50 src/readlink.c:63 src/rm.c:155
-#: src/rmdir.c:135 src/seq.c:78 src/setuidgid.c:47 src/shred.c:152
-#: src/sleep.c:43 src/sort.c:280 src/split.c:103 src/stat.c:771 src/stty.c:507
-#: src/su.c:404 src/sum.c:55 src/sync.c:41 src/tac.c:128 src/tail.c:216
-#: src/tee.c:58 src/test.c:690 src/touch.c:229 src/tr.c:286 src/tsort.c:82
-#: src/tty.c:65 src/uname.c:113 src/unexpand.c:117 src/uniq.c:131
-#: src/unlink.c:46 src/uptime.c:175 src/users.c:104 src/wc.c:123 src/who.c:631
-#: src/whoami.c:46 src/yes.c:42
+#: src/printf.c:96 src/ptx.c:1879 src/pwd.c:50 src/readlink.c:63 src/rm.c:155
+#: src/rmdir.c:135 src/seq.c:70 src/setuidgid.c:47 src/shred.c:157
+#: src/shuf.c:47 src/sleep.c:43 src/sort.c:281 src/split.c:103 src/stat.c:772
+#: src/stty.c:507 src/su.c:382 src/sum.c:55 src/sync.c:41 src/tac.c:129
+#: src/tail.c:216 src/tee.c:58 src/test.c:690 src/touch.c:229 src/tr.c:286
+#: src/tsort.c:82 src/tty.c:65 src/uname.c:113 src/unexpand.c:117
+#: src/uniq.c:131 src/unlink.c:46 src/uptime.c:175 src/users.c:104
+#: src/wc.c:128 src/who.c:631 src/whoami.c:46 src/yes.c:42
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "请尝试执行“%s --help”来获取更多信息。\n"
@@ -563,9 +562,9 @@ msgstr ""
msgid ""
" --help Display this help and exit.\n"
" --version Output version information and exit.\n"
-msgstr " --version 显示版本信息并离开\n"
+msgstr " --version 输出版本信息并退出\n"
-#: src/base64.c:80 src/cat.c:117 src/fmt.c:296 src/sum.c:71
+#: src/base64.c:80 src/cat.c:117 src/fmt.c:296 src/shuf.c:74 src/sum.c:71
msgid ""
"\n"
"With no FILE, or when FILE is -, read standard input.\n"
@@ -582,25 +581,25 @@ msgid ""
"the encoded stream.\n"
msgstr ""
-#: src/base64.c:89 src/basename.c:74 src/cat.c:128 src/chgrp.c:159
-#: src/chmod.c:354 src/chown.c:159 src/chroot.c:60 src/cksum.c:279
-#: src/comm.c:94 src/cp.c:253 src/csplit.c:1490 src/cut.c:235 src/date.c:241
-#: src/dd.c:508 src/df.c:755 src/dircolors.c:122 src/dirname.c:68 src/du.c:344
-#: src/echo.c:98 src/env.c:133 src/expand.c:132 src/expr.c:165 src/factor.c:90
+#: src/base64.c:89 src/basename.c:74 src/cat.c:128 src/chgrp.c:164
+#: src/chmod.c:356 src/chown.c:159 src/chroot.c:60 src/cksum.c:279
+#: src/comm.c:94 src/cp.c:253 src/csplit.c:1492 src/cut.c:235 src/date.c:241
+#: src/dd.c:508 src/df.c:760 src/dircolors.c:122 src/dirname.c:68 src/du.c:344
+#: src/echo.c:98 src/env.c:133 src/expand.c:132 src/expr.c:166 src/factor.c:90
#: src/fmt.c:300 src/fold.c:89 src/head.c:140 src/hostid.c:57
-#: src/hostname.c:74 src/id.c:95 src/install.c:686 src/join.c:172
-#: src/kill.c:121 src/link.c:58 src/ln.c:374 src/logname.c:51 src/ls.c:4264
-#: src/md5sum.c:200 src/mkdir.c:74 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:338
-#: src/nice.c:88 src/nl.c:224 src/nohup.c:70 src/od.c:393 src/paste.c:437
+#: src/hostname.c:74 src/id.c:95 src/install.c:676 src/join.c:172
+#: src/kill.c:121 src/link.c:58 src/ln.c:372 src/logname.c:51 src/ls.c:4396
+#: src/md5sum.c:194 src/mkdir.c:74 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:338
+#: src/nice.c:88 src/nl.c:229 src/nohup.c:70 src/od.c:393 src/paste.c:437
#: src/pathchk.c:109 src/pinky.c:537 src/pr.c:2876 src/printenv.c:71
-#: src/printf.c:145 src/ptx.c:1930 src/pwd.c:62 src/readlink.c:87 src/rm.c:201
-#: src/rmdir.c:154 src/seq.c:106 src/setuidgid.c:67 src/shred.c:225
-#: src/sleep.c:60 src/sort.c:356 src/split.c:137 src/stat.c:850 src/stty.c:724
-#: src/su.c:425 src/sum.c:75 src/sync.c:52 src/tac.c:151 src/tail.c:287
-#: src/tee.c:75 src/test.c:777 src/touch.c:263 src/tr.c:359 src/true.c:54
-#: src/tsort.c:94 src/tty.c:77 src/uname.c:136 src/unexpand.c:141
-#: src/uniq.c:170 src/unlink.c:57 src/uptime.c:190 src/users.c:117
-#: src/wc.c:145 src/who.c:670 src/whoami.c:58 src/yes.c:58
+#: src/printf.c:145 src/ptx.c:1925 src/pwd.c:62 src/readlink.c:87 src/rm.c:201
+#: src/rmdir.c:154 src/seq.c:99 src/setuidgid.c:67 src/shred.c:231
+#: src/shuf.c:78 src/sleep.c:60 src/sort.c:357 src/split.c:137 src/stat.c:851
+#: src/stty.c:724 src/su.c:403 src/sum.c:75 src/sync.c:52 src/tac.c:152
+#: src/tail.c:287 src/tee.c:75 src/test.c:777 src/touch.c:263 src/tr.c:359
+#: src/true.c:54 src/tsort.c:94 src/tty.c:77 src/uname.c:136
+#: src/unexpand.c:141 src/uniq.c:170 src/unlink.c:57 src/uptime.c:190
+#: src/users.c:117 src/wc.c:153 src/who.c:670 src/whoami.c:58 src/yes.c:58
#, c-format
msgid ""
"\n"
@@ -609,8 +608,8 @@ msgstr ""
"\n"
"请向 <%s> 报告错误。\n"
-#: src/base64.c:177 src/base64.c:210 src/csplit.c:282 src/csplit.c:1437
-#: src/join.c:251 src/tac-pipe.c:57 src/tee.c:204 src/tr.c:1585
+#: src/base64.c:177 src/base64.c:210 src/csplit.c:283 src/csplit.c:1439
+#: src/join.c:243 src/shuf.c:401 src/tac-pipe.c:57 src/tee.c:204 src/tr.c:1586
msgid "read error"
msgstr "读取错误"
@@ -625,18 +624,18 @@ msgid "invalid wrap size: %s"
msgstr "无效的制表位大小:%s"
#: src/base64.c:276 src/basename.c:124 src/comm.c:278 src/cp.c:567
-#: src/date.c:428 src/dircolors.c:457 src/dirname.c:101 src/du.c:940
-#: src/hostid.c:82 src/hostname.c:120 src/id.c:160 src/install.c:325
-#: src/join.c:749 src/link.c:90 src/ln.c:494 src/logname.c:76 src/mknod.c:152
-#: src/mv.c:451 src/od.c:1840 src/ptx.c:2182 src/readlink.c:154 src/seq.c:373
-#: src/split.c:533 src/tr.c:1738 src/tsort.c:552 src/tty.c:117 src/uname.c:222
-#: src/uniq.c:435 src/uniq.c:452 src/unlink.c:86 src/uptime.c:222
-#: src/users.c:149 src/who.c:824 src/whoami.c:84
+#: src/date.c:428 src/dircolors.c:455 src/dirname.c:101 src/du.c:944
+#: src/hostid.c:82 src/hostname.c:120 src/id.c:160 src/install.c:339
+#: src/join.c:741 src/link.c:90 src/ln.c:492 src/logname.c:76 src/mknod.c:152
+#: src/mv.c:451 src/od.c:1840 src/ptx.c:2154 src/readlink.c:154 src/seq.c:331
+#: src/shuf.c:381 src/split.c:533 src/tr.c:1739 src/tsort.c:552 src/tty.c:117
+#: src/uname.c:222 src/uniq.c:435 src/uniq.c:452 src/unlink.c:86
+#: src/uptime.c:222 src/users.c:149 src/wc.c:668 src/who.c:824 src/whoami.c:84
#, c-format
msgid "extra operand %s"
msgstr "额外的操作数 %s"
-#: src/base64.c:302 src/cat.c:769
+#: src/base64.c:302 src/cat.c:785
msgid "closing standard input"
msgstr "关闭标准输入"
@@ -671,13 +670,13 @@ msgstr ""
" %s /usr/bin/sort 输出“sort”。\n"
" %s include/stdio.h .h 输出“stdio”。\n"
-#: src/basename.c:118 src/chgrp.c:268 src/chmod.c:474 src/chown.c:295
-#: src/chroot.c:84 src/comm.c:270 src/csplit.c:1385 src/dirname.c:95
-#: src/expr.c:203 src/join.c:915 src/link.c:82 src/mkdir.c:121
-#: src/mkfifo.c:109 src/mknod.c:141 src/nohup.c:96 src/pathchk.c:158
+#: src/basename.c:118 src/chgrp.c:282 src/chmod.c:476 src/chown.c:295
+#: src/chroot.c:84 src/comm.c:270 src/csplit.c:1387 src/dirname.c:95
+#: src/expr.c:211 src/join.c:907 src/link.c:82 src/mkdir.c:151
+#: src/mkfifo.c:109 src/mknod.c:141 src/nohup.c:101 src/pathchk.c:158
#: src/printf.c:669 src/readlink.c:146 src/rm.c:333 src/rmdir.c:197
-#: src/seq.c:367 src/setuidgid.c:95 src/sleep.c:122 src/stat.c:913
-#: src/tr.c:1723 src/unlink.c:80
+#: src/seq.c:325 src/setuidgid.c:95 src/sleep.c:122 src/stat.c:914
+#: src/tr.c:1724 src/unlink.c:80
msgid "missing operand"
msgstr "缺少操作数"
@@ -731,26 +730,26 @@ msgstr ""
" %s f - g 先输出 f 的内容,然后输出标准输入的内容,最后输出 g 的内容。\n"
" %s 将标准输入的内容复制到标准输出。\n"
-#: src/cat.c:316
+#: src/cat.c:333
#, c-format
msgid "cannot do ioctl on %s"
msgstr "无法在 %s 上执行 ioctrl"
-#: src/cat.c:627 src/dd.c:1671 src/sort.c:272 src/tee.c:163 src/yes.c:92
+#: src/cat.c:643 src/dd.c:1668 src/sort.c:273 src/tee.c:163 src/yes.c:92
msgid "standard output"
msgstr "标准输出"
-#: src/cat.c:704
+#: src/cat.c:720
#, c-format
msgid "%s: input file is output file"
msgstr "%s:输入文件是输出文件"
-#: src/chgrp.c:91 src/install.c:613
+#: src/chgrp.c:96 src/install.c:584
#, c-format
msgid "invalid group %s"
msgstr "无效的组 %s"
-#: src/chgrp.c:108
+#: src/chgrp.c:113
#, c-format
msgid ""
"Usage: %s [OPTION]... GROUP FILE...\n"
@@ -759,7 +758,7 @@ msgstr ""
"用法:%s [选项]... 组 文件...\n"
" 或:%s [选项]... --reference=参考文件 文件...\n"
-#: src/chgrp.c:113
+#: src/chgrp.c:118
msgid ""
"Change the group of each FILE to GROUP.\n"
"With --reference, change the group of each FILE to that of RFILE.\n"
@@ -776,7 +775,7 @@ msgstr ""
" --dereference 会影响符号链接所指示的对象,而非符号链接本身(默认"
"值)\n"
-#: src/chgrp.c:121 src/chown.c:107
+#: src/chgrp.c:126 src/chown.c:107
#, fuzzy
msgid ""
" -h, --no-dereference affect each symbolic link instead of any "
@@ -787,25 +786,22 @@ msgstr ""
" -h, --no-dereference 会影响符号链接本身,而非符号链接所指示的目的地\n"
" (当系统支持更改符号链接的所有者,此选项才有效)\n"
-#: src/chgrp.c:126 src/chown.c:119
+#: src/chgrp.c:131 src/chown.c:119
#, fuzzy
msgid ""
" --no-preserve-root do not treat `/' specially (the default)\n"
" --preserve-root fail to operate recursively on `/'\n"
msgstr ""
-"删除指定的<文件>(即解除链接)。\n"
-"\n"
-" -d, --directory 删除可能仍有数据的目录 (只限超级用户)\n"
-" -f, --force 略过不存在的文件,不显示任何信息\n"
-" -i, --interactive 进行任何删除操作前必须先确认\n"
-" -r, -R, --recursive 同时删除该目录下的所有目录层\n"
+" --no-preserve-root 不特殊对待“/”(默认值)\n"
+" --preserve-root 不允许在“/”上递归操作\n"
+" -r, -R, --recursive 递归删除目录及其内容\n"
" -v, --verbose 详细显示进行的步骤\n"
-#: src/chgrp.c:130
+#: src/chgrp.c:135
#, fuzzy
msgid ""
" -f, --silent, --quiet suppress most error messages\n"
-" --reference=RFILE use RFILE's group rather than the specifying\n"
+" --reference=RFILE use RFILE's group rather than specifying a\n"
" GROUP value\n"
" -R, --recursive operate on files and directories recursively\n"
" -v, --verbose output a diagnostic for every file processed\n"
@@ -816,7 +812,7 @@ msgstr ""
" -R, --recursive 递归处理所有的文件及子目录\n"
" -v, --verbose 处理任何文件都会显示信息\n"
-#: src/chgrp.c:138 src/chown.c:131
+#: src/chgrp.c:143 src/chown.c:131
msgid ""
"The following options modify how a hierarchy is traversed when the -R\n"
"option is also specified. If more than one is specified, only the final\n"
@@ -830,7 +826,7 @@ msgid ""
"\n"
msgstr ""
-#: src/chgrp.c:152
+#: src/chgrp.c:157
#, c-format
msgid ""
"\n"
@@ -839,24 +835,24 @@ msgid ""
" %s -hR staff /u Change the group of /u and subfiles to \"staff\".\n"
msgstr ""
-#: src/chgrp.c:249 src/chown.c:276
+#: src/chgrp.c:263 src/chown.c:276
msgid "-R --dereference requires either -H or -L"
msgstr "-R --dereference 需要 -H 或 -L 其中之一"
-#: src/chgrp.c:255 src/chown.c:282
+#: src/chgrp.c:269 src/chown.c:282
msgid "-R -h requires -P"
msgstr "-R -h 需要 -P"
-#: src/chgrp.c:270 src/chmod.c:476 src/chown.c:297 src/comm.c:272
-#: src/csplit.c:1387 src/join.c:917 src/link.c:84 src/mknod.c:143
-#: src/setuidgid.c:97 src/tr.c:1726
+#: src/chgrp.c:284 src/chmod.c:478 src/chown.c:297 src/comm.c:272
+#: src/csplit.c:1389 src/join.c:909 src/link.c:84 src/mknod.c:143
+#: src/setuidgid.c:97 src/tr.c:1727
#, c-format
msgid "missing operand after %s"
msgstr "%s 后缺少操作数"
-#: src/chgrp.c:278 src/chmod.c:484 src/chmod.c:503 src/chown.c:305
-#: src/chown.c:334 src/cp.c:297 src/cp.c:426 src/cp.c:450 src/pwd.c:267
-#: src/rm.c:343 src/touch.c:159 src/touch.c:353
+#: src/chgrp.c:292 src/chgrp.c:310 src/chmod.c:486 src/chmod.c:505
+#: src/chown.c:305 src/chown.c:334 src/cp.c:297 src/cp.c:426 src/cp.c:450
+#: src/pwd.c:267 src/rm.c:343 src/touch.c:159 src/touch.c:353
#, c-format
msgid "failed to get attributes of %s"
msgstr "无法取得 %s 的属性"
@@ -887,6 +883,7 @@ msgid "mode of %s retained as %04lo (%s)\n"
msgstr "%s 的权限模式保留为 %04lo (%s)\n"
#: src/chmod.c:197 src/chown-core.c:270 src/copy.c:145 src/du.c:495
+#: src/ls.c:2633
#, c-format
msgid "cannot access %s"
msgstr "无法访问 %s"
@@ -901,21 +898,21 @@ msgstr "%s"
msgid "cannot read directory %s"
msgstr "无法读取目录 %s"
-#: src/chmod.c:234
+#: src/chmod.c:235
#, c-format
msgid "changing permissions of %s"
msgstr "更改 %s 的权限"
-#: src/chmod.c:268
+#: src/chmod.c:270
#, c-format
msgid "%s: new permissions are %s, not %s"
msgstr "%s:新的权限为 %s,而非 %s"
-#: src/chmod.c:302 src/chown-core.c:460 src/du.c:650
+#: src/chmod.c:304 src/chown-core.c:460 src/du.c:650
msgid "fts_read failed"
msgstr "fts_read 失败"
-#: src/chmod.c:327
+#: src/chmod.c:329
#, c-format
msgid ""
"Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -926,7 +923,7 @@ msgstr ""
" 或:%s [选项]... 八进制模式 文件...\n"
" 或:%s [选项]... --reference=参考文件 文件...\n"
-#: src/chmod.c:333
+#: src/chmod.c:335
msgid ""
"Change the mode of each FILE to MODE.\n"
"\n"
@@ -937,13 +934,13 @@ msgstr ""
"\n"
" -c, --changes 类似 --verbose,但只在有更改时才显示结果\n"
-#: src/chmod.c:338
+#: src/chmod.c:340
msgid ""
" --no-preserve-root do not treat `/' specially (the default)\n"
" --preserve-root fail to operate recursively on `/'\n"
msgstr ""
-#: src/chmod.c:342
+#: src/chmod.c:344
msgid ""
" -f, --silent, --quiet suppress most error messages\n"
" -v, --verbose output a diagnostic for every file processed\n"
@@ -955,17 +952,17 @@ msgstr ""
" --reference=参考文件 使用[参考文件]的模式,而非自行指定权限模式\n"
" -R, --recursive 以递归方式更改所有的文件及子目录\n"
-#: src/chmod.c:350
+#: src/chmod.c:352
msgid ""
"\n"
"Each MODE is of the form `[ugoa]*([-+=]([rwxXst]*|[ugo]))+'.\n"
msgstr ""
-#: src/chmod.c:461
+#: src/chmod.c:463
msgid "cannot combine mode and --reference options"
msgstr ""
-#: src/chmod.c:492
+#: src/chmod.c:494
#, c-format
msgid "invalid mode: %s"
msgstr "无效模式:%s"
@@ -1076,7 +1073,7 @@ msgstr ""
msgid ""
" -f, --silent, --quiet suppress most error messages\n"
" --reference=RFILE use RFILE's owner and group rather than\n"
-" the specifying OWNER:GROUP values\n"
+" specifying OWNER:GROUP values\n"
" -R, --recursive operate on files and directories recursively\n"
" -v, --verbose output a diagnostic for every file processed\n"
"\n"
@@ -1139,7 +1136,7 @@ msgstr "无法将根目录切换到 %s"
msgid "cannot chdir to root directory"
msgstr "无法切换到根目录"
-#: src/chroot.c:115 src/nohup.c:184 src/setuidgid.c:124
+#: src/chroot.c:115 src/nohup.c:212 src/setuidgid.c:126
#, fuzzy, c-format
msgid "cannot run command %s"
msgstr "无法解除%s的链接"
@@ -1169,11 +1166,11 @@ msgstr ""
#: src/comm.c:73 src/join.c:134
#, c-format
msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
-msgstr "用法:%s [选项]... [文件1] [文件2]\n"
+msgstr "用法:%s [选项]... 文件1 文件2\n"
#: src/comm.c:77
msgid "Compare sorted files FILE1 and FILE2 line by line.\n"
-msgstr ""
+msgstr "逐行比较已排序的文件[文件1]和[文件2]。\n"
#: src/comm.c:80
msgid ""
@@ -1191,225 +1188,220 @@ msgid ""
" -3 suppress lines that appear in both files\n"
msgstr ""
-#: src/copy.c:199 src/copy.c:1679 src/cp.c:326
+#: src/copy.c:199 src/copy.c:1693 src/cp.c:326
#, c-format
msgid "failed to preserve ownership for %s"
msgstr "保留 %s 的所有者失败"
-#: src/copy.c:221
+#: src/copy.c:222
#, c-format
msgid "failed to lookup file %s"
msgstr "查阅文件 %s 失败"
-#: src/copy.c:226
+#: src/copy.c:227
#, c-format
msgid "failed to preserve authorship for %s"
msgstr "保留 %s 的作者失败"
-#: src/copy.c:259 src/csplit.c:647 src/du.c:947 src/fmt.c:431 src/head.c:849
-#: src/split.c:540 src/tac.c:543 src/tail.c:1295
+#: src/copy.c:260 src/csplit.c:648 src/du.c:951 src/fmt.c:431 src/head.c:849
+#: src/split.c:540 src/tac.c:544 src/tail.c:1295 src/wc.c:680
#, c-format
msgid "cannot open %s for reading"
msgstr "无法打开 %s 读取数据"
-#: src/copy.c:265 src/copy.c:317 src/dd.c:1715 src/tail.c:1131 src/tail.c:1197
+#: src/copy.c:266 src/copy.c:318 src/dd.c:1712 src/tail.c:1131 src/tail.c:1197
#, c-format
msgid "cannot fstat %s"
msgstr "无法 fstat %s"
-#: src/copy.c:275
+#: src/copy.c:276
#, c-format
msgid "skipping file %s, as it was replaced while being copied"
msgstr "跳过文件 %s,因为准备复制时它已被其它文件替代"
-#: src/copy.c:295 src/copy.c:1034 src/copy.c:1223 src/copy.c:1333 src/ln.c:268
-#: src/remove.c:745 src/remove.c:933 src/remove.c:954 src/remove.c:970
-#: src/remove.c:1132 src/remove.c:1227
+#: src/copy.c:296 src/copy.c:1035 src/copy.c:1233 src/copy.c:1343 src/ln.c:265
+#: src/remove.c:773 src/remove.c:961 src/remove.c:982 src/remove.c:998
+#: src/remove.c:1173 src/remove.c:1259
#, c-format
msgid "cannot remove %s"
msgstr "无法删除 %s"
-#: src/copy.c:310
+#: src/copy.c:311
#, c-format
msgid "cannot create regular file %s"
msgstr "无法创建一般文件%s"
-#: src/copy.c:402 src/dd.c:1162 src/dd.c:1473
+#: src/copy.c:403 src/dd.c:1159 src/dd.c:1470
#, c-format
msgid "reading %s"
msgstr "读入 %s"
-#: src/copy.c:438 src/head.c:428
+#: src/copy.c:439 src/head.c:428
#, c-format
msgid "cannot lseek %s"
msgstr "无法 lseek %s"
-#: src/copy.c:451 src/copy.c:479 src/dd.c:1530 src/dd.c:1592
+#: src/copy.c:452 src/copy.c:480 src/dd.c:1527 src/dd.c:1589
#, c-format
msgid "writing %s"
msgstr "写入 %s"
-#: src/copy.c:494 src/copy.c:1727
+#: src/copy.c:495 src/copy.c:1741
#, c-format
msgid "preserving times for %s"
msgstr "保留 %s 的时间"
-#: src/copy.c:529 src/copy.c:535 src/head.c:857 src/touch.c:191
+#: src/copy.c:530 src/copy.c:536 src/head.c:857 src/touch.c:191
#, c-format
msgid "closing %s"
msgstr "关闭 %s"
-#: src/copy.c:755
+#: src/copy.c:756
#, c-format
msgid "%s: overwrite %s, overriding mode %04lo? "
msgstr "%s:是否覆盖 %s,而不理会权限模式 %04lo?"
-#: src/copy.c:761
+#: src/copy.c:762
#, c-format
msgid "%s: overwrite %s? "
msgstr "%s:是否覆盖%s? "
-#: src/copy.c:987
+#: src/copy.c:988
#, c-format
msgid "omitting directory %s"
msgstr "略过目录 %s"
-#: src/copy.c:1001
+#: src/copy.c:1002
#, c-format
msgid "warning: source file %s specified more than once"
msgstr "警告:指定来源文件 %s 多于一次"
-#: src/copy.c:1047 src/ln.c:207
+#: src/copy.c:1048 src/ln.c:203
#, c-format
msgid "%s and %s are the same file"
msgstr "%s 及 %s 为同一文件"
-#: src/copy.c:1057
+#: src/copy.c:1063
#, c-format
msgid "cannot overwrite non-directory %s with directory %s"
msgstr "无法以目录 %2$s 来覆盖非目录 %1$s"
-#: src/copy.c:1074
+#: src/copy.c:1081
#, c-format
msgid "will not overwrite just-created %s with %s"
msgstr "不会以 %2$s 覆盖刚创建的 %1$s"
-#: src/copy.c:1085
+#: src/copy.c:1097
#, c-format
msgid "cannot overwrite directory %s with non-directory"
msgstr "无法以非目录来覆盖目录 %s"
-#: src/copy.c:1151
-#, c-format
-msgid "cannot overwrite directory %s"
-msgstr "无法覆盖目录 %s"
-
-#: src/copy.c:1160
+#: src/copy.c:1166
#, c-format
msgid "cannot move directory onto non-directory: %s -> %s"
msgstr "无法将目录移动至非目录:%s -> %s"
-#: src/copy.c:1181
+#: src/copy.c:1189
#, c-format
msgid "backing up %s would destroy source; %s not moved"
msgstr "备份 %s 会破坏源文件;未移动 %s"
-#: src/copy.c:1182
+#: src/copy.c:1190
#, c-format
msgid "backing up %s would destroy source; %s not copied"
msgstr "备份 %s 会破坏源文件;未复制 %s"
-#: src/copy.c:1201 src/ln.c:237
+#: src/copy.c:1209 src/ln.c:233
#, c-format
msgid "cannot backup %s"
msgstr "无法备份 %s"
-#: src/copy.c:1238
+#: src/copy.c:1248
#, c-format
msgid " (backup: %s)"
msgstr " (备份:%s)"
-#: src/copy.c:1301
+#: src/copy.c:1311
#, c-format
msgid "cannot copy a directory, %s, into itself, %s"
msgstr "无法将目录 %s 复制到自己 %s"
-#: src/copy.c:1318
+#: src/copy.c:1328
#, c-format
msgid "will not create hard link %s to directory %s"
msgstr "不会创建指向目录 %2$s 的硬链接 %1$s"
-#: src/copy.c:1341
+#: src/copy.c:1351
#, c-format
msgid "cannot create hard link %s to %s"
msgstr "无法创建指向 %2$s 的硬链接 %1$s"
-#: src/copy.c:1395
+#: src/copy.c:1394
#, c-format
msgid "cannot move %s to a subdirectory of itself, %s"
msgstr "无法将目录 %s 移动至自身的子目录 %s 下"
-#: src/copy.c:1438
+#: src/copy.c:1437
#, c-format
msgid "cannot move %s to %s"
msgstr "无法将 %s 移动至 %s"
-#: src/copy.c:1450
+#: src/copy.c:1449
#, c-format
msgid "inter-device move failed: %s to %s; unable to remove target"
msgstr "无法进行跨设备的移动:%s 至 %s;无法删除目标"
-#: src/copy.c:1478
+#: src/copy.c:1477
#, c-format
msgid "cannot copy cyclic symbolic link %s"
msgstr "无法复制循环的符号链接 %s"
-#: src/copy.c:1575
+#: src/copy.c:1574
#, c-format
msgid "%s: can make relative symbolic links only in current directory"
msgstr "%s:只能于当前目录中创建相对的符号链接"
-#: src/copy.c:1582
+#: src/copy.c:1581
#, c-format
msgid "cannot create symbolic link %s to %s"
msgstr "无法创建指向 %2$s 的符号链接 %1$s"
-#: src/copy.c:1593
+#: src/copy.c:1607
#, c-format
msgid "cannot create link %s"
msgstr "无法创建链接 %s"
-#: src/copy.c:1613 src/mkfifo.c:129
+#: src/copy.c:1627 src/mkfifo.c:129
#, c-format
msgid "cannot create fifo %s"
msgstr "无法创建先进先出文件 %s"
-#: src/copy.c:1624
+#: src/copy.c:1638
#, c-format
msgid "cannot create special file %s"
msgstr "无法创建特殊文件 %s"
-#: src/copy.c:1636 src/ls.c:2756 src/stat.c:436
+#: src/copy.c:1650 src/ls.c:2795 src/stat.c:437
#, c-format
msgid "cannot read symbolic link %s"
msgstr "无法读取符号链接 %s"
-#: src/copy.c:1662
+#: src/copy.c:1676
#, c-format
msgid "cannot create symbolic link %s"
msgstr "无法创建符号链接 %s"
-#: src/copy.c:1694
+#: src/copy.c:1708
#, c-format
msgid "%s has unknown file type"
msgstr "%s 的文件类型不详"
-#: src/copy.c:1781 src/ln.c:304
+#: src/copy.c:1795 src/ln.c:302
#, c-format
msgid "cannot un-backup %s"
msgstr "无法将 %s 的备份还原"
-#: src/copy.c:1785
+#: src/copy.c:1799
#, c-format
msgid "%s -> %s (unbackup)\n"
msgstr "%s -> %s (还原备份)\n"
@@ -1433,20 +1425,21 @@ msgstr ""
"将<源>文件复制至<目的>,或将多个<源>复制至<目录>。\n"
"\n"
-#: src/cp.c:168 src/csplit.c:1461 src/cut.c:196 src/df.c:726 src/du.c:288
+#: src/cp.c:168 src/csplit.c:1463 src/cut.c:196 src/df.c:731 src/du.c:288
#: src/expand.c:120 src/fmt.c:279 src/fold.c:79 src/head.c:119
-#: src/install.c:645 src/kill.c:104 src/ln.c:335 src/ls.c:4129 src/mkdir.c:64
-#: src/mkfifo.c:60 src/mknod.c:61 src/mv.c:301 src/nl.c:181 src/paste.c:427
-#: src/pr.c:2777 src/ptx.c:1895 src/shred.c:162 src/sort.c:292 src/split.c:117
-#: src/tac.c:141 src/tail.c:230 src/touch.c:238 src/unexpand.c:130
-#: src/uniq.c:144
+#: src/install.c:635 src/kill.c:104 src/ln.c:333 src/ls.c:4255 src/mkdir.c:64
+#: src/mkfifo.c:60 src/mknod.c:61 src/mv.c:301 src/nl.c:186 src/paste.c:427
+#: src/pr.c:2777 src/ptx.c:1891 src/shred.c:167 src/shuf.c:61 src/sort.c:293
+#: src/split.c:117 src/tac.c:142 src/tail.c:230 src/touch.c:238
+#: src/unexpand.c:130 src/uniq.c:144
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "长选项必须用的参数在使用短选项时也是必须的。\n"
#: src/cp.c:171
+#, fuzzy
msgid ""
-" -a, --archive same as -dpR\n"
+" -a, --archive same as -dpPR\n"
" --backup[=CONTROL] make a backup of each existing destination "
"file\n"
" -b like --backup but does not accept an "
@@ -1593,7 +1586,7 @@ msgstr ""
"变量来选择。以下是可用的变量值:\n"
"\n"
-#: src/cp.c:241 src/install.c:680 src/ln.c:368 src/mv.c:332
+#: src/cp.c:241 src/install.c:670 src/ln.c:366 src/mv.c:332
msgid ""
" none, off never make backups (even if --backup is given)\n"
" numbered, t make numbered backups\n"
@@ -1632,30 +1625,35 @@ msgstr "保留 %s 的权限失败"
msgid "cannot make directory %s"
msgstr "无法创建目录 %s"
-#: src/cp.c:530 src/cp.c:976 src/install.c:177 src/install.c:271 src/ln.c:124
-#: src/ln.c:152 src/ln.c:181 src/ln.c:447 src/mv.c:158 src/mv.c:403
+#: src/cp.c:481 src/cp.c:500
+#, c-format
+msgid "%s exists but is not a directory"
+msgstr "%s 存在但并非目录"
+
+#: src/cp.c:530 src/cp.c:976 src/install.c:191 src/install.c:285 src/ln.c:120
+#: src/ln.c:148 src/ln.c:177 src/ln.c:445 src/mv.c:158 src/mv.c:403
#, c-format
msgid "accessing %s"
msgstr "访问 %s"
-#: src/cp.c:534 src/cp.c:577 src/cp.c:978 src/install.c:179 src/install.c:273
-#: src/install.c:334 src/ln.c:126 src/ln.c:449 src/ln.c:505 src/mv.c:160
+#: src/cp.c:534 src/cp.c:577 src/cp.c:978 src/install.c:193 src/install.c:287
+#: src/install.c:348 src/ln.c:122 src/ln.c:447 src/ln.c:503 src/mv.c:160
#: src/mv.c:405 src/mv.c:460
#, c-format
msgid "target %s is not a directory"
msgstr "目标 %s 不是目录"
-#: src/cp.c:552 src/install.c:310 src/ln.c:477 src/mv.c:436 src/shred.c:1236
+#: src/cp.c:552 src/install.c:324 src/ln.c:475 src/mv.c:436 src/shred.c:1177
#: src/touch.c:412
msgid "missing file operand"
msgstr "缺少了文件操作数"
-#: src/cp.c:554 src/install.c:312 src/ln.c:491 src/mv.c:438
+#: src/cp.c:554 src/install.c:326 src/ln.c:489 src/mv.c:438
#, fuzzy, c-format
msgid "missing destination file operand after %s"
msgstr "缺少了目的地文件"
-#: src/cp.c:563 src/install.c:321 src/mv.c:447
+#: src/cp.c:563 src/install.c:335 src/mv.c:447
msgid "Cannot combine --target-directory (-t) and --no-target-directory (-T)"
msgstr ""
@@ -1671,11 +1669,11 @@ msgstr ""
"警告:--version-control (-V) 选项已经过时;将来的版本随时可能不再支持\n"
"此选项。请使用 --backup=%s。"
-#: src/cp.c:964 src/ln.c:437
+#: src/cp.c:964 src/ln.c:435
msgid "symbolic links are not supported on this system"
msgstr "此系统并不支持符号链接"
-#: src/cp.c:971 src/install.c:266 src/ln.c:442 src/mv.c:398
+#: src/cp.c:971 src/install.c:280 src/ln.c:440 src/mv.c:398
#, fuzzy
msgid "multiple target directories specified"
msgstr "正在关闭输出文件 %s"
@@ -1684,140 +1682,140 @@ msgstr "正在关闭输出文件 %s"
msgid "cannot make both hard and symbolic links"
msgstr "无法同时创建实际及符号链接"
-#: src/cp.c:1024 src/install.c:300 src/ln.c:518 src/mv.c:468
+#: src/cp.c:1024 src/install.c:314 src/ln.c:511 src/mv.c:468
msgid "backup type"
msgstr "备份方式"
-#: src/csplit.c:539
+#: src/csplit.c:540
msgid "input disappeared"
msgstr ""
-#: src/csplit.c:667 src/csplit.c:678
+#: src/csplit.c:668 src/csplit.c:679
#, fuzzy, c-format
msgid "%s: line number out of range"
msgstr "%s:覆盖次数无效"
-#: src/csplit.c:707
+#: src/csplit.c:708
#, fuzzy, c-format
msgid "%s: %s: line number out of range"
msgstr "%s:覆盖次数无效"
-#: src/csplit.c:710 src/csplit.c:759
+#: src/csplit.c:711 src/csplit.c:760
#, c-format
msgid " on repetition %s\n"
msgstr ""
-#: src/csplit.c:753
+#: src/csplit.c:754
#, c-format
msgid "%s: %s: match not found"
msgstr ""
-#: src/csplit.c:817 src/csplit.c:857 src/nl.c:349 src/tac.c:274
+#: src/csplit.c:818 src/csplit.c:858 src/nl.c:353 src/tac.c:275
msgid "error in regular expression search"
msgstr ""
-#: src/csplit.c:982
+#: src/csplit.c:983
#, fuzzy, c-format
msgid "write error for %s"
msgstr "写入时发生错误"
-#: src/csplit.c:1058
+#: src/csplit.c:1059
#, c-format
msgid "%s: integer expected after delimiter"
msgstr ""
-#: src/csplit.c:1074
+#: src/csplit.c:1075
#, c-format
msgid "%s: `}' is required in repeat count"
msgstr ""
-#: src/csplit.c:1084
+#: src/csplit.c:1085
#, c-format
msgid "%s}: integer required between `{' and `}'"
msgstr ""
-#: src/csplit.c:1111
+#: src/csplit.c:1112
#, c-format
msgid "%s: closing delimiter `%c' missing"
msgstr ""
-#: src/csplit.c:1127
+#: src/csplit.c:1129
#, fuzzy, c-format
msgid "%s: invalid regular expression: %s"
msgstr "转换无效:%s"
-#: src/csplit.c:1160
+#: src/csplit.c:1162
#, fuzzy, c-format
msgid "%s: invalid pattern"
msgstr "%s:文件类型无效"
-#: src/csplit.c:1163
+#: src/csplit.c:1165
#, c-format
msgid "%s: line number must be greater than zero"
msgstr ""
-#: src/csplit.c:1169
+#: src/csplit.c:1171
#, c-format
msgid "line number %s is smaller than preceding line number, %s"
msgstr ""
-#: src/csplit.c:1175
+#: src/csplit.c:1177
#, c-format
msgid "warning: line number %s is the same as preceding line number"
msgstr ""
-#: src/csplit.c:1228
+#: src/csplit.c:1230
#, fuzzy
msgid "invalid format width"
msgstr "日期格式 %s 无效"
-#: src/csplit.c:1249
+#: src/csplit.c:1251
#, fuzzy
msgid "invalid format precision"
msgstr "权限模式字符串无效:%s "
-#: src/csplit.c:1270
+#: src/csplit.c:1272
msgid "missing conversion specifier in suffix"
msgstr ""
-#: src/csplit.c:1276
+#: src/csplit.c:1278
#, fuzzy, c-format
msgid "invalid conversion specifier in suffix: %c"
msgstr "转换无效:%s"
-#: src/csplit.c:1279
+#: src/csplit.c:1281
#, fuzzy, c-format
msgid "invalid conversion specifier in suffix: \\%.3o"
msgstr "转换无效:%s"
-#: src/csplit.c:1302
+#: src/csplit.c:1304
#, c-format
msgid "too many %% conversion specifications in suffix"
msgstr ""
-#: src/csplit.c:1317
+#: src/csplit.c:1319
#, c-format
msgid "missing %% conversion specification in suffix"
msgstr ""
-#: src/csplit.c:1361
-#, fuzzy, c-format
+#: src/csplit.c:1363
+#, c-format
msgid "%s: invalid number"
-msgstr "无效的号码 %s"
+msgstr "%s:无效数字"
-#: src/csplit.c:1452
-#, fuzzy, c-format
+#: src/csplit.c:1454
+#, c-format
msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
-msgstr "用法:%s [选项]... 目录...\n"
+msgstr "用法:%s [选项]... 文件通配符...\n"
-#: src/csplit.c:1456
+#: src/csplit.c:1458
msgid ""
"Output pieces of FILE separated by PATTERN(s) to files `xx00', `xx01', ...,\n"
"and output byte counts of each piece to standard output.\n"
"\n"
msgstr ""
-#: src/csplit.c:1464
+#: src/csplit.c:1466
#, c-format
msgid ""
" -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n"
@@ -1825,20 +1823,20 @@ msgid ""
" -k, --keep-files do not remove output files on errors\n"
msgstr ""
-#: src/csplit.c:1469
+#: src/csplit.c:1471
msgid ""
" -n, --digits=DIGITS use specified number of digits instead of 2\n"
" -s, --quiet, --silent do not print counts of output file sizes\n"
" -z, --elide-empty-files remove empty output files\n"
msgstr ""
-#: src/csplit.c:1476
+#: src/csplit.c:1478
msgid ""
"\n"
"Read standard input if FILE is -. Each PATTERN may be:\n"
msgstr ""
-#: src/csplit.c:1480
+#: src/csplit.c:1482
msgid ""
"\n"
" INTEGER copy up to but not including specified line number\n"
@@ -1850,10 +1848,9 @@ msgid ""
"A line OFFSET is a required `+' or `-' followed by a positive integer.\n"
msgstr ""
-#: src/cut.c:188 src/df.c:720 src/expand.c:111 src/fold.c:70 src/head.c:109
-#: src/ls.c:4123 src/nl.c:172 src/paste.c:417 src/pr.c:2768 src/sort.c:284
-#: src/sum.c:59 src/tac.c:132 src/tail.c:220 src/tee.c:62 src/unexpand.c:121
-#: src/wc.c:127
+#: src/cut.c:188 src/df.c:725 src/expand.c:111 src/fold.c:70 src/head.c:109
+#: src/ls.c:4249 src/nl.c:177 src/paste.c:417 src/pr.c:2768 src/sort.c:285
+#: src/sum.c:59 src/tac.c:133 src/tail.c:220 src/tee.c:62 src/unexpand.c:121
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr "用法:%s [选项]... [文件]...\n"
@@ -2098,10 +2095,10 @@ msgid ""
"O to use the locale's alternate numeric symbols if available.\n"
msgstr ""
-#: src/date.c:262 src/dd.c:1655 src/head.c:840 src/md5sum.c:440
-#: src/md5sum.c:726 src/od.c:910 src/od.c:1932 src/pr.c:1178 src/pr.c:1381
-#: src/pr.c:1503 src/stty.c:841 src/tac.c:534 src/tee.c:126 src/tr.c:1893
-#: src/tsort.c:527 src/wc.c:204
+#: src/date.c:262 src/dd.c:1652 src/head.c:840 src/md5sum.c:434
+#: src/md5sum.c:720 src/od.c:910 src/od.c:1932 src/pr.c:1178 src/pr.c:1381
+#: src/pr.c:1503 src/stty.c:841 src/tac.c:535 src/tee.c:126 src/tr.c:1894
+#: src/tsort.c:527 src/wc.c:212
msgid "standard input"
msgstr "标准输入"
@@ -2145,12 +2142,12 @@ msgid "time %s is out of range"
msgstr "文件偏移值超出范围以外"
#: src/dd.c:404
-#, fuzzy, c-format
+#, c-format
msgid ""
"Usage: %s [OPERAND]...\n"
" or: %s OPTION\n"
msgstr ""
-"用法:%s [字符串]...\n"
+"用法:%s [操作符]...\n"
" 或:%s 选项\n"
#: src/dd.c:409
@@ -2357,66 +2354,66 @@ msgstr "正在关闭输入文件 %s"
msgid "closing output file %s"
msgstr "正在关闭输出文件 %s"
-#: src/dd.c:783 src/dd.c:1443
+#: src/dd.c:782 src/dd.c:1440
#, c-format
msgid "writing to %s"
msgstr "正在写入 %s"
-#: src/dd.c:877
+#: src/dd.c:876
#, fuzzy, c-format
msgid "unrecognized operand %s"
msgstr "无法识别的选项 %s"
-#: src/dd.c:888
+#: src/dd.c:887
#, c-format
msgid "invalid conversion: %s"
msgstr "转换无效:%s"
-#: src/dd.c:891
+#: src/dd.c:890
#, fuzzy, c-format
msgid "invalid input flag: %s"
msgstr "无效的行宽数值:%s"
-#: src/dd.c:894
+#: src/dd.c:893
#, fuzzy, c-format
msgid "invalid output flag: %s"
msgstr "无效的组名称 %s"
-#: src/dd.c:897
+#: src/dd.c:896
#, fuzzy, c-format
msgid "invalid status flag: %s"
msgstr "日期格式 %s 无效"
-#: src/dd.c:933
+#: src/dd.c:932
#, fuzzy, c-format
msgid "unrecognized operand %s=%s"
msgstr "无法识别的选项 %s=%s"
-#: src/dd.c:939
+#: src/dd.c:938
#, c-format
msgid "invalid number %s"
msgstr "无效的号码 %s"
-#: src/dd.c:959
+#: src/dd.c:958
msgid "cannot combine any two of {ascii,ebcdic,ibm}"
msgstr ""
-#: src/dd.c:961
+#: src/dd.c:960
#, fuzzy
msgid "cannot combine block and unblock"
msgstr "不可同时省略用户和所属组"
-#: src/dd.c:963
+#: src/dd.c:962
#, fuzzy
msgid "cannot combine lcase and ucase"
msgstr "无法比较文件名 %s 和 %s"
-#: src/dd.c:965
+#: src/dd.c:964
#, fuzzy
msgid "cannot combine excl and nocreat"
msgstr "无法决定 %s 所在的设备及 inode"
-#: src/dd.c:1113
+#: src/dd.c:1110
#, c-format
msgid ""
"warning: working around lseek kernel bug for file (%s)\n"
@@ -2425,111 +2422,111 @@ msgstr ""
"警告:暂时避免有关文件 (%s) 的 lseek 核心错误,文件的 mt_type=0x%0lx --\n"
" 有关 mt_type 类型的列表请参考 <sys/mtio.h>"
-#: src/dd.c:1170 src/dd.c:1227
+#: src/dd.c:1167 src/dd.c:1224
#, fuzzy, c-format
msgid "%s: cannot seek"
msgstr "%s:无法删除"
-#: src/dd.c:1207
+#: src/dd.c:1204
#, c-format
msgid "offset overflow while reading file %s"
msgstr ""
-#: src/dd.c:1219
+#: src/dd.c:1216
#, fuzzy
msgid "warning: screwy file offset after failed read"
msgstr "警告:指定来源文件%s多于一次"
-#: src/dd.c:1223
+#: src/dd.c:1220
msgid "cannot work around kernel bug after all"
msgstr ""
-#: src/dd.c:1366
+#: src/dd.c:1363
#, fuzzy, c-format
msgid "setting flags for %s"
msgstr "设置 %s 的时间"
-#: src/dd.c:1604
+#: src/dd.c:1601
#, c-format
msgid "fdatasync failed for %s"
msgstr ""
-#: src/dd.c:1614
+#: src/dd.c:1611
#, fuzzy, c-format
msgid "fsync failed for %s"
msgstr "无法保留%s的时间"
-#: src/dd.c:1661 src/dd.c:1690
+#: src/dd.c:1658 src/dd.c:1687
#, c-format
msgid "opening %s"
msgstr "打开 %s"
-#: src/dd.c:1700
+#: src/dd.c:1697
#, c-format
msgid ""
"offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
"blocks"
msgstr ""
-#: src/dd.c:1721
+#: src/dd.c:1718
#, fuzzy, c-format
msgid "truncating at %<PRIuMAX> bytes in output file %s"
msgstr "略过输出文件 %2$s 的最初 %1$s 个字节"
-#: src/df.c:149
+#: src/df.c:152
msgid "Filesystem Type"
msgstr "文件系统 类型"
-#: src/df.c:151
+#: src/df.c:154
msgid "Filesystem "
msgstr "文件系统 "
-#: src/df.c:154
+#: src/df.c:157
#, c-format
msgid " Inodes IUsed IFree IUse%%"
msgstr " Inode (I)已用 (I)可用 (I)已用%%"
-#: src/df.c:158
+#: src/df.c:161
#, c-format
msgid " Size Used Avail Use%%"
msgstr " 容量 已用 可用 已用%%"
-#: src/df.c:160
+#: src/df.c:163
#, c-format
msgid " Size Used Avail Use%%"
msgstr " 容量 已用 可用 已用%%"
-#: src/df.c:163
+#: src/df.c:166
#, fuzzy, c-format
msgid " %4s-blocks Used Available Capacity"
msgstr " %4d-块 已用 可用 容量"
-#: src/df.c:194
+#: src/df.c:197
#, c-format
msgid " %4s-blocks Used Available Use%%"
msgstr " %4s-块 已用 可用 已用%%"
-#: src/df.c:198
+#: src/df.c:201
#, c-format
msgid " Mounted on\n"
msgstr " 挂载点\n"
-#: src/df.c:448
+#: src/df.c:453
#, fuzzy
msgid "cannot get current directory"
msgstr "无法创建目录%s"
-#: src/df.c:458 src/df.c:472 src/df.c:500
+#: src/df.c:463 src/df.c:477 src/df.c:505
#, c-format
msgid "cannot change to directory %s"
msgstr "无法进入目录 %s"
-#: src/df.c:478
+#: src/df.c:483
#, fuzzy, c-format
msgid "cannot stat current directory (now %s)"
msgstr "无法创建目录%s"
-#: src/df.c:721
+#: src/df.c:726
#, fuzzy
msgid ""
"Show information about the file system on which each FILE resides,\n"
@@ -2539,7 +2536,7 @@ msgstr ""
"显示每个<文件>所在的文件系统的信息,默认是显示所有文件系统。\n"
"\n"
-#: src/df.c:729
+#: src/df.c:734
#, fuzzy
msgid ""
" -a, --all include dummy file systems\n"
@@ -2553,7 +2550,7 @@ msgstr ""
" -h, --human-readable 以容易理解的格式印出文件系统大小 (例如 1K 234M 2G)\n"
" -H, --si 类似 -h,但取 1000 的次方而不是 1024\n"
-#: src/df.c:735
+#: src/df.c:740
#, fuzzy
msgid ""
" -i, --inodes list inode information instead of block usage\n"
@@ -2567,7 +2564,7 @@ msgstr ""
" -l, --local 只显示本机的文件系统\n"
" --no-sync 取得使用量数据前不进行 sync 动作 (默认)\n"
-#: src/df.c:741
+#: src/df.c:746
#, fuzzy
msgid ""
" -P, --portability use the POSIX output format\n"
@@ -2584,7 +2581,7 @@ msgstr ""
" -x, --exclude-type=类型 只印出不是指定<类型>的文件系统信息\n"
" -v (此选项不作处理)\n"
-#: src/df.c:751 src/du.c:340 src/ls.c:4247
+#: src/df.c:756 src/du.c:340 src/ls.c:4379
msgid ""
"\n"
"SIZE may be (or may be an integer optionally followed by) one of following:\n"
@@ -2594,11 +2591,11 @@ msgstr ""
"[大小]可以是以下的单位(单位前可加上整数):\n"
"kB 1000,K 1024,MB 1000000,M 1048576,还有 G、T、P、E、Z、Y。\n"
-#: src/df.c:812 src/du.c:755 src/ls.c:1541
+#: src/df.c:816 src/du.c:759 src/ls.c:1567
msgid "the --kilobytes option is deprecated; use -k instead"
msgstr "--kilobytes 选项已经被弃用,请使用 -k"
-#: src/df.c:871
+#: src/df.c:875
#, c-format
msgid "file system type %s both selected and excluded"
msgstr "不能同时选择和排除文件系统类型 %s"
@@ -2612,6 +2609,10 @@ msgstr "警告:"
msgid "%scannot read table of mounted file systems"
msgstr "%s无法读取已挂上的文件系统的目录"
+#: src/df.c:945
+msgid "no file systems processed"
+msgstr ""
+
#: src/dircolors.c:105
#, c-format
msgid "Usage: %s [OPTION]... [FILE]\n"
@@ -2645,21 +2646,21 @@ msgstr ""
"否则,会使用一个默认的数据库。如要了解此文件格式的细节,请执行\n"
"“dircolors --print-database”。\n"
-#: src/dircolors.c:296
+#: src/dircolors.c:294
#, c-format
msgid "%s:%lu: invalid line; missing second token"
msgstr "%s:%lu:此行无效;缺少了第二栏数据"
-#: src/dircolors.c:368
+#: src/dircolors.c:366
#, c-format
msgid "%s:%lu: unrecognized keyword %s"
msgstr "%s:%lu:无法识别的关键字 %s"
-#: src/dircolors.c:369
+#: src/dircolors.c:367
msgid "<internal>"
msgstr "<内部数据>"
-#: src/dircolors.c:450
+#: src/dircolors.c:448
msgid ""
"the options to output dircolors' internal database and\n"
"to select a shell syntax are mutually exclusive"
@@ -2667,11 +2668,11 @@ msgstr ""
"显示 dircolors 内部数据库的选项和选择 shell 语法的选项\n"
"是互相抵触的"
-#: src/dircolors.c:460
+#: src/dircolors.c:458
msgid "File operands cannot be combined with --print-database (-p)."
msgstr "文件操作数无法与 --print-database (-p) 组合使用。"
-#: src/dircolors.c:483
+#: src/dircolors.c:481
msgid "no SHELL environment variable, and no shell type option given"
msgstr "没有设定 SHELL 环境变量,也没有指定 shell 类型的选项"
@@ -2700,7 +2701,7 @@ msgid ""
" %s stdio.h Output \".\".\n"
msgstr ""
-#: src/du.c:280
+#: src/du.c:280 src/wc.c:132
#, c-format
msgid ""
"Usage: %s [OPTION]... [FILE]...\n"
@@ -2798,59 +2799,59 @@ msgid ""
" FORMAT is interpreted like `date'\n"
msgstr ""
-#: src/du.c:667 src/ls.c:2402 src/wc.c:657
+#: src/du.c:667 src/ls.c:2437 src/wc.c:721
msgid "total"
msgstr "总计"
-#: src/du.c:745
+#: src/du.c:749
msgid ""
"WARNING: use --si, not -H; the meaning of the -H option will soon\n"
"change to be the same as that of --dereference-args (-D)"
msgstr ""
-#: src/du.c:773
+#: src/du.c:777
#, c-format
msgid "invalid maximum depth %s"
msgstr "目录最大深度 %s 无效"
-#: src/du.c:782
+#: src/du.c:786
#, fuzzy
msgid "the --megabytes option is deprecated; use -m instead"
msgstr ""
"警告:--version-control (-V) 选项已经过时;将来的版本随时可能不再支持\n"
"此选项。请使用 --backup=%s。"
-#: src/du.c:864
+#: src/du.c:868
msgid "cannot both summarize and show all entries"
msgstr "不能只显示总用量,同时又显示每个项目"
-#: src/du.c:871
+#: src/du.c:875
msgid "warning: summarizing is the same as using --max-depth=0"
msgstr "警告:显示总用量等于使用 --max-depth=0"
-#: src/du.c:877
+#: src/du.c:881
#, fuzzy, c-format
msgid "warning: summarizing conflicts with --max-depth=%lu"
msgstr "警告:显示总用量的选项和 --max-depth=%d 互相抵触"
-#: src/du.c:942
+#: src/du.c:946 src/wc.c:670
msgid "File operands cannot be combined with --files0-from."
msgstr ""
-#: src/du.c:953
+#: src/du.c:957 src/wc.c:687
#, fuzzy, c-format
msgid "cannot read file names from %s"
msgstr "无法比较文件名 %s 和 %s"
-#: src/du.c:993 src/du.c:996
+#: src/du.c:997 src/du.c:1000
#, fuzzy
msgid "invalid zero-length file name"
msgstr "无效的组名称 %s"
#: src/echo.c:64
-#, fuzzy, c-format
+#, c-format
msgid "Usage: %s [OPTION]... [STRING]...\n"
-msgstr "用法:%s [选项]... [文件]...\n"
+msgstr "用法:%s [选项]... [字符串]...\n"
#: src/echo.c:65
msgid ""
@@ -2858,6 +2859,9 @@ msgid ""
"\n"
" -n do not output the trailing newline\n"
msgstr ""
+"将[字符串]回显到标准输出。\n"
+"\n"
+" -n 不输出为岁的换行\n"
#: src/echo.c:71
msgid ""
@@ -2865,12 +2869,6 @@ msgid ""
" -E disable interpretation of backslash escapes\n"
msgstr ""
-#: src/echo.c:74
-msgid ""
-" -e enable interpretation of backslash escapes\n"
-" -E disable interpretation of backslash escapes (default)\n"
-msgstr ""
-
#: src/echo.c:80
msgid ""
"\n"
@@ -2952,7 +2950,7 @@ msgstr ""
msgid "input line is too long"
msgstr "%s:文件过大"
-#: src/expr.c:101
+#: src/expr.c:102
#, c-format
msgid ""
"Usage: %s EXPRESSION\n"
@@ -2961,7 +2959,7 @@ msgstr ""
"用法:%s 表达式\n"
" 或:%s 选项\n"
-#: src/expr.c:109
+#: src/expr.c:110
msgid ""
"\n"
"Print the value of EXPRESSION to standard output. A blank line below\n"
@@ -2972,7 +2970,7 @@ msgid ""
" ARG1 & ARG2 ARG1 if neither argument is null or 0, otherwise 0\n"
msgstr ""
-#: src/expr.c:118
+#: src/expr.c:119
msgid ""
"\n"
" ARG1 < ARG2 ARG1 is less than ARG2\n"
@@ -2983,14 +2981,14 @@ msgid ""
" ARG1 > ARG2 ARG1 is greater than ARG2\n"
msgstr ""
-#: src/expr.c:127
+#: src/expr.c:128
msgid ""
"\n"
" ARG1 + ARG2 arithmetic sum of ARG1 and ARG2\n"
" ARG1 - ARG2 arithmetic difference of ARG1 and ARG2\n"
msgstr ""
-#: src/expr.c:132
+#: src/expr.c:133
#, c-format
msgid ""
"\n"
@@ -2999,7 +2997,7 @@ msgid ""
" ARG1 % ARG2 arithmetic remainder of ARG1 divided by ARG2\n"
msgstr ""
-#: src/expr.c:138
+#: src/expr.c:139
msgid ""
"\n"
" STRING : REGEXP anchored pattern match of REGEXP in STRING\n"
@@ -3010,7 +3008,7 @@ msgid ""
" length STRING length of STRING\n"
msgstr ""
-#: src/expr.c:147
+#: src/expr.c:148
msgid ""
" + TOKEN interpret TOKEN as a string, even if it is a\n"
" keyword like `match' or an operator like `/'\n"
@@ -3018,7 +3016,7 @@ msgid ""
" ( EXPRESSION ) value of EXPRESSION\n"
msgstr ""
-#: src/expr.c:153
+#: src/expr.c:154
msgid ""
"\n"
"Beware that many operators need to be escaped or quoted for shells.\n"
@@ -3028,7 +3026,7 @@ msgid ""
"0.\n"
msgstr ""
-#: src/expr.c:160
+#: src/expr.c:161
msgid ""
"\n"
"Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -3036,27 +3034,20 @@ msgid ""
"or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
msgstr ""
-#: src/expr.c:174
+#: src/expr.c:175
msgid "syntax error"
msgstr "语法错误"
-#: src/expr.c:424
-#, c-format
-msgid ""
-"warning: unportable BRE: %s: using `^' as the first character\n"
-"of the basic regular expression is not portable; it is being ignored"
-msgstr ""
-
-#: src/expr.c:464 src/ptx.c:288
+#: src/expr.c:464 src/ptx.c:292
#, fuzzy
msgid "error in regular expression matcher"
msgstr "转换无效:%s"
-#: src/expr.c:639 src/expr.c:681
+#: src/expr.c:639 src/expr.c:697
msgid "non-numeric argument"
msgstr "非数值参数"
-#: src/expr.c:645
+#: src/expr.c:651
msgid "division by zero"
msgstr "被零除"
@@ -3331,63 +3322,53 @@ msgstr "无法改变所属组至没有名称的组"
msgid " groups="
msgstr ""
-#: src/install.c:291
+#: src/install.c:305
msgid "the strip option may not be used when installing a directory"
msgstr "安装目录时不能用 strip 选项"
-#: src/install.c:294
+#: src/install.c:308
#, fuzzy
msgid "target directory not allowed when installing a directory"
msgstr "安装目录时不能用 strip 选项"
-#: src/install.c:342 src/mkdir.c:137
+#: src/install.c:356 src/mkdir.c:165
#, c-format
msgid "invalid mode %s"
msgstr "无效模式 %s"
-#: src/install.c:357 src/mkdir.c:155
-#, fuzzy
-msgid "cannot return to working directory"
-msgstr "无法创建目录%s"
-
-#: src/install.c:363 src/install.c:415
-#, c-format
-msgid "creating directory %s"
-msgstr "正在创建目录%s"
-
-#: src/install.c:420
-#, fuzzy
-msgid "cannot return to current directory"
-msgstr "无法创建目录%s"
-
-#: src/install.c:517
+#: src/install.c:492
#, fuzzy, c-format
msgid "cannot change ownership of %s"
msgstr "无法更改%s的权限"
-#: src/install.c:542
+#: src/install.c:513
#, c-format
msgid "cannot set time stamps for %s"
msgstr "无法设定 %s 的时间标记"
-#: src/install.c:563
+#: src/install.c:534
msgid "fork system call failed"
msgstr "fork 系统进程出现错误"
-#: src/install.c:567
+#: src/install.c:538
msgid "cannot run strip"
msgstr "无法执行 strip 命令"
-#: src/install.c:574
+#: src/install.c:545
msgid "strip failed"
msgstr "strip 出现错误"
-#: src/install.c:595
+#: src/install.c:566
#, c-format
msgid "invalid user %s"
msgstr "无效的用户 %s"
-#: src/install.c:632
+#: src/install.c:601
+#, c-format
+msgid "creating directory %s"
+msgstr "正在创建目录%s"
+
+#: src/install.c:622
#, fuzzy, c-format
msgid ""
"Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -3399,7 +3380,7 @@ msgstr ""
" 或:%s [选项]... 来源... 目录\n"
" 或:%s [选项]... --target-directory=目录 来源...\n"
-#: src/install.c:639
+#: src/install.c:629
#, fuzzy
msgid ""
"In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n"
@@ -3412,7 +3393,7 @@ msgstr ""
"指定的目录及它们的主目录。\n"
"\n"
-#: src/install.c:648
+#: src/install.c:638
#, fuzzy
msgid ""
" --backup[=CONTROL] make a backup of each existing destination file\n"
@@ -3427,7 +3408,7 @@ msgstr ""
" -d, --directory 所有参数都作为目录处理;而且会创建指定目录的所有主目"
"录\n"
-#: src/install.c:655
+#: src/install.c:645
#, fuzzy
msgid ""
" -D create all leading components of DEST except the "
@@ -3445,7 +3426,7 @@ msgstr ""
" -m, --mode=模式 自行设定权限模式 (像 chmod),而不是 rwxr-xr-x\n"
" -o, --owner=所有者 自行设定所有者 (只适用于超级用户)\n"
-#: src/install.c:662
+#: src/install.c:652
#, fuzzy
msgid ""
" -p, --preserve-timestamps apply access/modification times of SOURCE "
@@ -3465,7 +3446,7 @@ msgstr ""
" -S, --suffix=后缀 自行指定备份文件的<后缀>\n"
" -v, --verbose 处理每个文件/目录时印出名称\n"
-#: src/install.c:673 src/ln.c:361 src/mv.c:325
+#: src/install.c:663 src/ln.c:359 src/mv.c:325
msgid ""
"\n"
"The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -3520,49 +3501,49 @@ msgid ""
"E.g., use `sort -k 1b,1' if `join' has no options.\n"
msgstr ""
-#: src/join.c:623
+#: src/join.c:615
#, c-format
msgid "value %s is so large that it is not representable"
msgstr ""
-#: src/join.c:628 src/join.c:823
+#: src/join.c:620 src/join.c:815
#, fuzzy, c-format
msgid "invalid field number: %s"
msgstr "无效的号码 %s"
-#: src/join.c:649 src/join.c:658
+#: src/join.c:641 src/join.c:650
#, fuzzy, c-format
msgid "invalid field specifier: %s"
msgstr "无效的 tab 字符定位值:%s"
-#: src/join.c:665
+#: src/join.c:657
#, fuzzy, c-format
msgid "invalid file number in field spec: %s"
msgstr "无效的号码 %s"
-#: src/join.c:708
+#: src/join.c:700
#, c-format
msgid "incompatible join fields %lu, %lu"
msgstr ""
-#: src/join.c:834
+#: src/join.c:826
msgid "conflicting empty-field replacement strings"
msgstr ""
-#: src/join.c:875 src/sort.c:2462
+#: src/join.c:867 src/sort.c:2547
msgid "empty tab"
msgstr ""
-#: src/join.c:881 src/sort.c:2473
+#: src/join.c:873 src/sort.c:2558
#, fuzzy, c-format
msgid "multi-character tab %s"
msgstr "权限模式字符串 %2$s 中出现无效的字符 %1$s"
-#: src/join.c:885 src/sort.c:2478
+#: src/join.c:877 src/sort.c:2563
msgid "incompatible tabs"
msgstr ""
-#: src/join.c:942
+#: src/join.c:934
msgid "both files cannot be standard input"
msgstr ""
@@ -3649,52 +3630,52 @@ msgstr ""
msgid "cannot create link %s to %s"
msgstr "无法创建指向%2$s的链接%1$s"
-#: src/ln.c:159
+#: src/ln.c:155
#, c-format
msgid "%s: warning: making a hard link to a symbolic link is not portable"
msgstr "%s:警告:将硬链接指向符号链接是不通用的功能"
-#: src/ln.c:169
+#: src/ln.c:165
#, c-format
msgid "%s: hard link not allowed for directory"
msgstr "%s: 不允许将硬链接指向目录"
-#: src/ln.c:216
+#: src/ln.c:212
#, c-format
msgid "%s: cannot overwrite directory"
msgstr "%s:无法覆盖目录"
-#: src/ln.c:221
+#: src/ln.c:217
#, c-format
msgid "%s: replace %s? "
msgstr "%s:是否置换%s? "
-#: src/ln.c:291
+#: src/ln.c:289
#, fuzzy, c-format
msgid "creating symbolic link %s"
msgstr "正在创建指向%2$s的符号链接%1$s"
-#: src/ln.c:292
+#: src/ln.c:290
#, fuzzy, c-format
msgid "creating symbolic link %s -> %s"
msgstr "正在创建指向%2$s的符号链接%1$s"
-#: src/ln.c:294
+#: src/ln.c:292
#, fuzzy, c-format
msgid "creating hard link to %.0s%s"
msgstr "正在创建指向%2$s的硬链接%1$s"
-#: src/ln.c:297
+#: src/ln.c:295
#, fuzzy, c-format
msgid "creating hard link %s"
msgstr "正在创建指向%2$s的硬链接%1$s"
-#: src/ln.c:298
+#: src/ln.c:296
#, fuzzy, c-format
msgid "creating hard link %s => %s"
msgstr "正在创建指向%2$s的硬链接%1$s"
-#: src/ln.c:320
+#: src/ln.c:318
#, fuzzy, c-format
msgid ""
"Usage: %s [OPTION]... [-T] TARGET LINK_NAME (1st form)\n"
@@ -3706,7 +3687,7 @@ msgstr ""
" 或:%s [选项]... 来源... 目录 (第二种格式)\n"
" 或:%s -d [选项]... 目录... (第三种格式)\n"
-#: src/ln.c:327
+#: src/ln.c:325
#, fuzzy
msgid ""
"In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
@@ -3724,7 +3705,7 @@ msgstr ""
"在。\n"
"\n"
-#: src/ln.c:338
+#: src/ln.c:336
#, fuzzy
msgid ""
" --backup[=CONTROL] make a backup of each existing destination "
@@ -3742,7 +3723,7 @@ msgstr ""
" -d, -F, --directory 创建指向目录的硬链接 (只适用于超级用户)\n"
" -f, --force 强迫删除任何已存在的目的地文件\n"
-#: src/ln.c:346
+#: src/ln.c:344
msgid ""
" -n, --no-dereference treat destination that is a symlink to a\n"
" directory as if it were a normal file\n"
@@ -3755,7 +3736,7 @@ msgstr ""
" -i, --interactive 确认是否删除目的地文件\n"
" -s, --symbolic 创建符号链接而不是硬链接\n"
-#: src/ln.c:352
+#: src/ln.c:350
#, fuzzy
msgid ""
" -S, --suffix=SUFFIX override the usual backup suffix\n"
@@ -3769,7 +3750,7 @@ msgstr ""
" --target-directory=目录 在指定<目录>中创建链接\n"
" -v, --verbose 链接前先印出每个文件的名称\n"
-#: src/ln.c:485
+#: src/ln.c:483
#, fuzzy
msgid "Cannot combine --target-directory and --no-target-directory"
msgstr "%s:指定的目的地不是目录"
@@ -3791,90 +3772,95 @@ msgstr ""
msgid "no login name"
msgstr "无登录名"
-#: src/ls.c:686
+#: src/ls.c:702
msgid "%b %e %Y"
msgstr "%Y-%m-%d"
-#: src/ls.c:694
+#: src/ls.c:710
msgid "%b %e %H:%M"
msgstr "%m-%d %H:%M"
-#: src/ls.c:1428
+#: src/ls.c:1450
#, c-format
msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
msgstr "忽略无效的环境变量 QUOTING_STYLE 的变量值:%s"
-#: src/ls.c:1455
+#: src/ls.c:1477
#, c-format
msgid "ignoring invalid width in environment variable COLUMNS: %s"
msgstr "忽略无效的环境变量 COLUMNS 的宽度数值:%s"
-#: src/ls.c:1485
+#: src/ls.c:1507
#, c-format
msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
msgstr "忽略无效的环境变量 TABSIZE 的 tab 字符定位值:%s"
-#: src/ls.c:1601 src/ptx.c:2071
+#: src/ls.c:1627 src/ptx.c:2043
#, c-format
msgid "invalid line width: %s"
msgstr "无效的行宽:%s"
-#: src/ls.c:1675
+#: src/ls.c:1701
#, c-format
msgid "invalid tab size: %s"
msgstr "无效的制表位大小:%s"
-#: src/ls.c:1852
+#: src/ls.c:1882
#, c-format
msgid "invalid time style format %s"
msgstr "无效的日期时间格式 %s"
-#: src/ls.c:2196
+#: src/ls.c:2226
#, c-format
msgid "unrecognized prefix: %s"
msgstr "无法识别的前缀:%s"
-#: src/ls.c:2219
+#: src/ls.c:2249
msgid "unparsable value for LS_COLORS environment variable"
msgstr "LS_COLORS 环境变量中存在无法分析的值"
-#: src/ls.c:2311
+#: src/ls.c:2326 src/pwd.c:155
+#, c-format
+msgid "cannot open directory %s"
+msgstr "无法打开目录 %s"
+
+#: src/ls.c:2341
#, c-format
msgid "cannot determine device and inode of %s"
msgstr "无法决定 %s 所在的设备及 inode"
-#: src/ls.c:2319
+#: src/ls.c:2349
#, c-format
msgid "%s: not listing already-listed directory"
msgstr "%s:不会再列出已经列出的目录"
-#: src/ls.c:2360 src/pwd.c:223
+#: src/ls.c:2395 src/pwd.c:223
#, c-format
msgid "reading directory %s"
msgstr "读取目录 %s"
-#: src/ls.c:2370
+#: src/ls.c:2405
#, c-format
msgid "closing directory %s"
msgstr "关闭目录 %s"
-#: src/ls.c:2874
+#: src/ls.c:2913
#, c-format
msgid "cannot compare file names %s and %s"
msgstr "无法比较文件名 %s 和 %s"
-#: src/ls.c:4124
+#: src/ls.c:4250
+#, fuzzy
msgid ""
"List information about the FILEs (the current directory by default).\n"
-"Sort entries alphabetically if none of -cftuSUX nor --sort.\n"
+"Sort entries alphabetically if none of -cftuvSUX nor --sort.\n"
"\n"
msgstr ""
"列出<文件>的信息 (默认为目前的目录)。\n"
"如果不指定 -cftuSUX 或 --sort 任何一个选项,则根据字母大小排序。\n"
"\n"
-#: src/ls.c:4132
-#, fuzzy
+#: src/ls.c:4258
msgid ""
" -a, --all do not ignore entries starting with .\n"
" -A, --almost-all do not list implied . and ..\n"
@@ -3883,10 +3869,10 @@ msgid ""
msgstr ""
" -a, --all 不隐藏任何以 . 字符开始的项目\n"
" -A, --almost-all 列出除了 . 及 .. 以外的任何项目\n"
-" --author 印出每个文件著作者\n"
+" --author 和 -l 同时使用时列出每个文件的作者\n"
" -b, --escape 以八进制溢出序列表示不可打印的字符\n"
-#: src/ls.c:4138
+#: src/ls.c:4264
msgid ""
" --block-size=SIZE use SIZE-byte blocks\n"
" -B, --ignore-backups do not list implied entries ending with ~\n"
@@ -3903,7 +3889,7 @@ msgstr ""
" 配合 -l:显示 ctime 但根据名称排序\n"
" 否则:根据 ctime 排序\n"
-#: src/ls.c:4146
+#: src/ls.c:4272
#, fuzzy
msgid ""
" -C list entries by columns\n"
@@ -3921,7 +3907,7 @@ msgstr ""
" -d, --directory 当遇到目录时列出目录本身而非目录内的文件\n"
" -D, --dired 产生适合 Emacs 的 dired 模式使用的结果\n"
-#: src/ls.c:4154
+#: src/ls.c:4280
#, fuzzy
msgid ""
" -f do not sort, enable -aU, disable -ls --color\n"
@@ -3937,11 +3923,20 @@ msgstr ""
" single-column -1,verbose -l,vertical -C\n"
" --full-time 即 -l --time-style=full-iso\n"
-#: src/ls.c:4162
+#: src/ls.c:4288
+msgid " -g like -l, but do not list owner\n"
+msgstr ""
+
+#: src/ls.c:4291
+msgid ""
+" --group-directories-first\n"
+" group directories before files\n"
+msgstr ""
+
+#: src/ls.c:4295
#, fuzzy
msgid ""
-" -g like -l, but do not list owner\n"
-" -G, --no-group like -l, but do not list group\n"
+" -G, --no-group in a long listing, don't print group names\n"
" -h, --human-readable with -l, print sizes in human readable format\n"
" (e.g., 1K 234M 2G)\n"
" --si likewise, but use powers of 1000 not 1024\n"
@@ -3961,7 +3956,7 @@ msgstr ""
" --si 类似 -h,但取 1000 的次方而不是 1024\n"
" -H, --dereference-command-line 使用命令列中的符号链接指示的真正目的地\n"
-#: src/ls.c:4176
+#: src/ls.c:4308
#, fuzzy
msgid ""
" --indicator-style=WORD append indicator with style WORD to entry "
@@ -3979,7 +3974,7 @@ msgstr ""
" -I, --ignore=样式 不印出任何符合 shell 万用字符<样式>的项目\n"
" -k 即 --block-size=1K\n"
-#: src/ls.c:4184
+#: src/ls.c:4316
msgid ""
" -l use a long listing format\n"
" -L, --dereference when showing file information for a symbolic\n"
@@ -3993,7 +3988,7 @@ msgstr ""
" 的对象而并非符号链接本身的信息\n"
" -m 所有项目以逗号分隔,并填满整行行宽\n"
-#: src/ls.c:4191
+#: src/ls.c:4323
#, fuzzy
msgid ""
" -n, --numeric-uid-gid like -l, but list numeric user and group IDs\n"
@@ -4010,7 +4005,7 @@ msgstr ""
" -o 类似 -l,但不列出有关组的信息\n"
" -p, --file-type 加上文件类型的指示符号 (/=@| 其中一个)\n"
-#: src/ls.c:4199
+#: src/ls.c:4331
msgid ""
" -q, --hide-control-chars print ? instead of non graphic characters\n"
" --show-control-chars show non graphic characters as-is (default\n"
@@ -4029,18 +4024,17 @@ msgstr ""
" literal、locale、shell、shell-always、c、"
"escape\n"
-#: src/ls.c:4207
-#, fuzzy
+#: src/ls.c:4339
msgid ""
" -r, --reverse reverse order while sorting\n"
" -R, --recursive list subdirectories recursively\n"
" -s, --size with -l, print size of each file, in blocks\n"
msgstr ""
-" -r, --reverse 依相反次序排列\n"
-" -R, --recursive 同时列出所有子目录层\n"
-" -s, --size 以块大小为单位列出所有文件的大小\n"
+" -r, --reverse 逆序排序\n"
+" -R, --recursive 递归列出所有子目录\n"
+" -s, --size 和 -l 同时使用时以块为单位列出每个文件的大小\n"
-#: src/ls.c:4212
+#: src/ls.c:4344
#, fuzzy
msgid ""
" -S sort by file size\n"
@@ -4059,12 +4053,12 @@ msgstr ""
" size -S atime -u\n"
" time -t access -u\n"
" version -v use -u\n"
-" --time=WORD 显示 WORD 所代表的时间而非修改时间:\n"
-" atime、access、use、ctime 或 status;加上\n"
-" --sort=time 选项时会以指定时间作为排序索引\n"
+" --time=WORD 和 -l 同时使用时显示 WORD 所代表的时间而非修改"
+"时\n"
+" 间:atime、access、use、ctime 或 status;加上\n"
+" --sort=time 选项时会以指定时间作为排序关键字\n"
-#: src/ls.c:4221
-#, fuzzy
+#: src/ls.c:4353
msgid ""
" --time-style=STYLE with -l, show times using style STYLE:\n"
" full-iso, long-iso, iso, locale, +FORMAT.\n"
@@ -4077,15 +4071,18 @@ msgid ""
" -t sort by modification time\n"
" -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n"
msgstr ""
-" --time-style=WORD 根据 WORD 代表的格式显示时间:\n"
-" full-iso、iso、locale、posix-iso、+FORMAT\n"
+" --time-style=STYLE 和 -l 同时使用时根据 STYLE 代表的格式显示时"
+"间:\n"
+" full-iso、iso、locale、posix-iso、+FORMAT。\n"
" FORMAT 即是“date”所用的时间格式;如果 FORMAT\n"
-" 是 FORMAT1<newline>FORMAT2,FORMAT1 适用于较旧\n"
-" 的文件而 FORMAT2 适用于较新的文件\n"
+" 是 FORMAT1<新行>FORMAT2,FORMAT1 适用于较旧\n"
+" 的文件而 FORMAT2 适用于较新的文件;如果 STYLE\n"
+" 以“posix-”开头,则 STYLE 仅在 POSIX 语系之外\n"
+" 生效。\n"
" -t 根据修改时间排序\n"
" -T, --tabsize=宽度 自行指定 tab 的<宽度>,而非 8 个字符\n"
-#: src/ls.c:4232
+#: src/ls.c:4364
msgid ""
" -u with -lt: sort by, and show, access time\n"
" with -l: show access time and sort by name\n"
@@ -4099,7 +4096,7 @@ msgstr ""
" -U 不进行排序;依文件系统原有的次序列出项目\n"
" -v 根据版本进行排序\n"
-#: src/ls.c:4239
+#: src/ls.c:4371
msgid ""
" -w, --width=COLS assume screen width instead of current value\n"
" -x list entries by lines instead of by columns\n"
@@ -4111,7 +4108,7 @@ msgstr ""
" -X 根据扩展名排序\n"
" -1 每行只列出一个文件\n"
-#: src/ls.c:4251
+#: src/ls.c:4383
#, fuzzy
msgid ""
"\n"
@@ -4127,13 +4124,13 @@ msgstr ""
"--color 选项但不指定 WHEN 参数等于 --color=always。当使用 --color=auto 时,\n"
"只当输出至终端机画面 (tty) 时才会显示色彩。\n"
-#: src/ls.c:4260
+#: src/ls.c:4392
msgid ""
"\n"
"Exit status is 0 if OK, 1 if minor problems, 2 if serious trouble.\n"
msgstr ""
-#: src/md5sum.c:156
+#: src/md5sum.c:150
#, c-format
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -4142,13 +4139,13 @@ msgid ""
"\n"
msgstr ""
-#: src/md5sum.c:166
+#: src/md5sum.c:160
msgid ""
" -b, --binary read in binary mode (default unless reading tty "
"stdin)\n"
msgstr ""
-#: src/md5sum.c:170
+#: src/md5sum.c:164
#, fuzzy
msgid " -b, --binary read in binary mode\n"
msgstr ""
@@ -4156,21 +4153,21 @@ msgstr ""
" -B, --binary 使用二进制写入到控制台设备。\n"
"\n"
-#: src/md5sum.c:173
+#: src/md5sum.c:167
#, c-format
msgid " -c, --check read %s sums from the FILEs and check them\n"
msgstr ""
-#: src/md5sum.c:177
+#: src/md5sum.c:171
msgid ""
" -t, --text read in text mode (default if reading tty stdin)\n"
msgstr ""
-#: src/md5sum.c:181
+#: src/md5sum.c:175
msgid " -t, --text read in text mode (default)\n"
msgstr ""
-#: src/md5sum.c:184
+#: src/md5sum.c:178
msgid ""
"\n"
"The following two options are useful only when verifying checksums:\n"
@@ -4179,7 +4176,7 @@ msgid ""
"\n"
msgstr ""
-#: src/md5sum.c:193
+#: src/md5sum.c:187
#, c-format
msgid ""
"\n"
@@ -4189,48 +4186,48 @@ msgid ""
"text), and name for each FILE.\n"
msgstr ""
-#: src/md5sum.c:465
+#: src/md5sum.c:459
#, c-format
msgid "%s: too many checksum lines"
msgstr ""
-#: src/md5sum.c:487
+#: src/md5sum.c:481
#, c-format
msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
msgstr ""
-#: src/md5sum.c:510
+#: src/md5sum.c:504
#, c-format
msgid "%s: FAILED open or read\n"
msgstr ""
-#: src/md5sum.c:534
+#: src/md5sum.c:528
msgid "FAILED"
msgstr ""
-#: src/md5sum.c:534
+#: src/md5sum.c:528
msgid "OK"
msgstr ""
-#: src/md5sum.c:546 src/od.c:950 src/tac.c:239 src/tac.c:350 src/tac.c:480
-#: src/tac.c:556
+#: src/md5sum.c:540 src/od.c:950 src/tac.c:240 src/tac.c:351 src/tac.c:481
+#: src/tac.c:557
#, fuzzy, c-format
msgid "%s: read error"
msgstr "%s:名称已更改为 %s"
-#: src/md5sum.c:559
+#: src/md5sum.c:553
#, c-format
msgid "%s: no properly formatted %s checksum lines found"
msgstr ""
-#: src/md5sum.c:568
+#: src/md5sum.c:562
#, c-format
msgid "WARNING: %<PRIuMAX> of %<PRIuMAX> listed file could not be read"
msgid_plural "WARNING: %<PRIuMAX> of %<PRIuMAX> listed files could not be read"
msgstr[0] ""
msgstr[1] ""
-#: src/md5sum.c:580
+#: src/md5sum.c:574
#, c-format
msgid "WARNING: %<PRIuMAX> of %<PRIuMAX> computed checksum did NOT match"
msgid_plural ""
@@ -4238,16 +4235,16 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/md5sum.c:646
+#: src/md5sum.c:640
msgid ""
"the --binary and --text options are meaningless when verifying checksums"
msgstr ""
-#: src/md5sum.c:654
+#: src/md5sum.c:648
msgid "the --status option is meaningful only when verifying checksums"
msgstr ""
-#: src/md5sum.c:661
+#: src/md5sum.c:655
msgid "the --warn option is meaningful only when verifying checksums"
msgstr ""
@@ -4275,16 +4272,11 @@ msgstr ""
" -p, --parents 需要时创建上层目录,如目录早已存在则不当作错误\n"
" -v, --verbose 每次创建新目录都显示信息\n"
-#: src/mkdir.c:110
+#: src/mkdir.c:140
#, c-format
msgid "created directory %s"
msgstr "已创建目录 %s"
-#: src/mkdir.c:182
-#, c-format
-msgid "cannot set permissions of directory %s"
-msgstr "无法设定目录 %s 的权限"
-
#: src/mkfifo.c:55
#, c-format
msgid "Usage: %s [OPTION] NAME...\n"
@@ -4477,21 +4469,21 @@ msgstr "无法创建链接 %s"
msgid "cannot set niceness"
msgstr "stat%s失败"
-#: src/nl.c:176
+#: src/nl.c:181
msgid ""
"Write each FILE to standard output, with line numbers added.\n"
"With no FILE, or when FILE is -, read standard input.\n"
"\n"
msgstr ""
-#: src/nl.c:184
+#: src/nl.c:189
msgid ""
" -b, --body-numbering=STYLE use STYLE for numbering body lines\n"
" -d, --section-delimiter=CC use CC for separating logical pages\n"
" -f, --footer-numbering=STYLE use STYLE for numbering footer lines\n"
msgstr ""
-#: src/nl.c:189
+#: src/nl.c:194
msgid ""
" -h, --header-numbering=STYLE use STYLE for numbering header lines\n"
" -i, --page-increment=NUMBER line number increment at each line\n"
@@ -4503,13 +4495,13 @@ msgid ""
" -s, --number-separator=STRING add STRING after (possible) line number\n"
msgstr ""
-#: src/nl.c:197
+#: src/nl.c:202
msgid ""
" -v, --first-page=NUMBER first line number on each logical page\n"
" -w, --number-width=NUMBER use NUMBER columns for line numbers\n"
msgstr ""
-#: src/nl.c:203
+#: src/nl.c:208
msgid ""
"\n"
"By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n"
@@ -4517,7 +4509,7 @@ msgid ""
"second character implies :. Type \\\\ for \\. STYLE is one of:\n"
msgstr ""
-#: src/nl.c:209
+#: src/nl.c:214
msgid ""
"\n"
" a number all lines\n"
@@ -4534,58 +4526,58 @@ msgid ""
"\n"
msgstr ""
-#: src/nl.c:276
+#: src/nl.c:280
#, fuzzy
msgid "line number overflow"
msgstr "无效的号码 %s"
-#: src/nl.c:474
+#: src/nl.c:478
#, fuzzy, c-format
msgid "invalid header numbering style: %s"
msgstr "无效的号码 %s"
-#: src/nl.c:482
+#: src/nl.c:486
#, fuzzy, c-format
msgid "invalid body numbering style: %s"
msgstr "无效的号码 %s"
-#: src/nl.c:490
+#: src/nl.c:494
#, fuzzy, c-format
msgid "invalid footer numbering style: %s"
msgstr "无效的号码 %s"
-#: src/nl.c:499
+#: src/nl.c:503
#, fuzzy, c-format
msgid "invalid starting line number: %s"
msgstr "无效的 major 设备号 %s"
-#: src/nl.c:508
+#: src/nl.c:512
#, fuzzy, c-format
msgid "invalid line number increment: %s"
msgstr "无效的行宽数值:%s"
-#: src/nl.c:520
+#: src/nl.c:524
#, fuzzy, c-format
msgid "invalid number of blank lines: %s"
msgstr "%s:覆盖次数无效"
-#: src/nl.c:534
+#: src/nl.c:538
#, fuzzy, c-format
msgid "invalid line number field width: %s"
msgstr "无效的行宽数值:%s"
-#: src/nl.c:553
+#: src/nl.c:557
#, fuzzy, c-format
msgid "invalid line numbering format: %s"
msgstr "无效的行宽数值:%s"
#: src/nohup.c:57
-#, fuzzy, c-format
+#, c-format
msgid ""
"Usage: %s COMMAND [ARG]...\n"
" or: %s OPTION\n"
msgstr ""
-"用法:%s 文件\n"
+"用法:%s 命令 [参数]...\n"
" 或:%s 选项\n"
#: src/nohup.c:63
@@ -4594,21 +4586,30 @@ msgid ""
"\n"
msgstr ""
-#: src/nohup.c:129 src/nohup.c:131
+#: src/nohup.c:117
+#, fuzzy
+msgid "ignoring input"
+msgstr "忽略全部参数"
+
+#: src/nohup.c:149 src/nohup.c:151
#, fuzzy, c-format
msgid "failed to open %s"
msgstr "无法保留%s的时间"
-#: src/nohup.c:139
+#: src/nohup.c:161
#, fuzzy, c-format
-msgid "appending output to %s"
+msgid "ignoring input and appending output to %s"
msgstr "正在更改 %s 的所属组"
-#: src/nohup.c:155
+#: src/nohup.c:179
msgid "failed to set the copy of stderr to close on exec"
msgstr ""
-#: src/nohup.c:161
+#: src/nohup.c:184
+msgid "ignoring input and redirecting stderr to stdout"
+msgstr ""
+
+#: src/nohup.c:188
msgid "failed to redirect standard error"
msgstr ""
@@ -4818,9 +4819,9 @@ msgid ""
msgstr ""
#: src/pathchk.c:99
-#, fuzzy, c-format
+#, c-format
msgid "Usage: %s [OPTION]... NAME...\n"
-msgstr "用法:%s [选项] 名称...\n"
+msgstr "用法:%s [选项]... 名称...\n"
#: src/pathchk.c:100
msgid ""
@@ -4920,9 +4921,9 @@ msgid "Where"
msgstr ""
#: src/pinky.c:514
-#, fuzzy, c-format
+#, c-format
msgid "Usage: %s [OPTION]... [USER]...\n"
-msgstr "用法:%s [选项]... [文件]...\n"
+msgstr "用法:%s [选项]... [用户]...\n"
#: src/pinky.c:515
msgid ""
@@ -5174,12 +5175,12 @@ msgid ""
msgstr ""
#: src/printf.c:100
-#, fuzzy, c-format
+#, c-format
msgid ""
"Usage: %s FORMAT [ARGUMENT]...\n"
" or: %s OPTION\n"
msgstr ""
-"用法:%s 文件\n"
+"用法:%s 格式 [参数]...\n"
" 或:%s 选项\n"
#: src/printf.c:105
@@ -5274,34 +5275,33 @@ msgstr ""
msgid "F. Pinard"
msgstr ""
-#: src/ptx.c:421
+#: src/ptx.c:422
#, c-format
msgid "%s (for regexp %s)"
msgstr ""
-#: src/ptx.c:1887
+#: src/ptx.c:1883
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT]... (without -G)\n"
" or: %s -G [OPTION]... [INPUT [OUTPUT]]\n"
msgstr ""
-#: src/ptx.c:1891
+#: src/ptx.c:1887
msgid ""
"Output a permuted index, including context, of the words in the input "
"files.\n"
"\n"
msgstr ""
-#: src/ptx.c:1898
+#: src/ptx.c:1894
msgid ""
" -A, --auto-reference output automatically generated references\n"
-" -C, --copyright display Copyright and copying conditions\n"
" -G, --traditional behave more like System V `ptx'\n"
" -F, --flag-truncation=STRING use STRING for flagging line truncations\n"
msgstr ""
-#: src/ptx.c:1904
+#: src/ptx.c:1899
msgid ""
" -M, --macro-name=STRING macro name to use instead of `xx'\n"
" -O, --format=roff generate output as roff directives\n"
@@ -5310,7 +5310,7 @@ msgid ""
" -T, --format=tex generate output as TeX directives\n"
msgstr ""
-#: src/ptx.c:1911
+#: src/ptx.c:1906
msgid ""
" -W, --word-regexp=REGEXP use REGEXP to match each keyword\n"
" -b, --break-file=FILE word break characters in this FILE\n"
@@ -5320,7 +5320,7 @@ msgid ""
" -o, --only-file=FILE read only word list from this FILE\n"
msgstr ""
-#: src/ptx.c:1919
+#: src/ptx.c:1914
msgid ""
" -r, --references first field of each line is a reference\n"
" -t, --typeset-mode - not implemented -\n"
@@ -5328,52 +5328,31 @@ msgid ""
"excluded\n"
msgstr ""
-#: src/ptx.c:1926
+#: src/ptx.c:1921
msgid ""
"\n"
"With no FILE or if FILE is -, read Standard Input. `-F /' by default.\n"
msgstr ""
-#: src/ptx.c:2005
-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"
-"the Free Software Foundation; either version 2, or (at your option)\n"
-"any later version.\n"
-"\n"
-msgstr ""
-
-#: src/ptx.c:2012
-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"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-msgstr ""
-
-#: src/ptx.c:2019
-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"
-"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
-msgstr ""
-
-#: src/ptx.c:2044
+#: src/ptx.c:2016
#, fuzzy, c-format
msgid "invalid gap width: %s"
msgstr "无效的行宽数值:%s"
+#: src/ptx.c:2089
+#, fuzzy
+msgid "the --copyright option is deprecated; use --version instead"
+msgstr ""
+"警告:--version-control (-V) 选项已经过时;将来的版本随时可能不再支持\n"
+"此选项。请使用 --backup=%s。"
+
#: src/pwd.c:55
msgid ""
"Print the full filename of the current working directory.\n"
"\n"
msgstr ""
-
-#: src/pwd.c:155
-#, c-format
-msgid "cannot open directory %s"
-msgstr "无法打开目录%s"
+"打印当前工作目录的完整文件名。\n"
+"\n"
#: src/pwd.c:160
#, fuzzy, c-format
@@ -5396,9 +5375,9 @@ msgid "ignoring non-option arguments"
msgstr "忽略任何参数"
#: src/readlink.c:67
-#, fuzzy, c-format
+#, c-format
msgid "Usage: %s [OPTION]... FILE\n"
-msgstr "用法:%s [选项]... [文件]\n"
+msgstr "用法:%s [选项]... 文件\n"
#: src/readlink.c:68
msgid ""
@@ -5427,119 +5406,118 @@ msgid ""
" -v, --verbose report error messages\n"
msgstr ""
-#: src/remove.c:428 src/remove.c:479
+#: src/remove.c:437 src/remove.c:489
#, fuzzy, c-format
msgid "FATAL: failed to close directory %s"
msgstr "无法保留%s的时间"
-#: src/remove.c:441
+#: src/remove.c:450
#, fuzzy, c-format
msgid "FATAL: cannot open .. from %s"
-msgstr "无法打开目录%s"
+msgstr "无法打开目录 %s"
-#: src/remove.c:449
+#: src/remove.c:458
#, c-format
msgid "FATAL: cannot ensure %s (returned to via ..) is safe"
msgstr ""
-#: src/remove.c:457
+#: src/remove.c:466
#, fuzzy, c-format
msgid "FATAL: directory %s changed dev/ino"
-msgstr "%s的 dev/ino 变了"
+msgstr "%s 的 dev/ino 变了"
-#: src/remove.c:465
+#: src/remove.c:474
#, c-format
msgid "FATAL: cannot return to .. from %s"
msgstr ""
-#: src/remove.c:569
+#: src/remove.c:586
#, fuzzy, c-format
msgid "FATAL: cannot enter directory %s"
msgstr "无法创建目录 %s"
-#: src/remove.c:577
+#: src/remove.c:594
#, c-format
msgid "FATAL: just-changed-to directory %s changed dev/ino"
msgstr ""
-#: src/remove.c:753 src/remove.c:899 src/remove.c:977 src/remove.c:1304
+#: src/remove.c:602
+#, c-format
+msgid ""
+"WARNING: Circular directory structure.\n"
+"This almost certainly means that you have a corrupted file system.\n"
+"NOTIFY YOUR SYSTEM MANAGER.\n"
+"The following directory is part of the cycle:\n"
+" %s\n"
+msgstr ""
+" 警告:发现循环的目录架构。\n"
+"这几乎可以肯定文件系统已经损坏。\n"
+"** 请告诉系统管理员。**\n"
+"以下的目录是循环的一部份:\n"
+" %s\n"
+
+#: src/remove.c:781 src/remove.c:927 src/remove.c:1005 src/remove.c:1337
#, c-format
msgid "cannot remove directory %s"
msgstr "无法删除目录%s"
-#: src/remove.c:782
+#: src/remove.c:810
#, c-format
msgid "%s: descend into write-protected directory %s? "
msgstr "%s:是否进入有写保护的目录%s? "
-#: src/remove.c:783
+#: src/remove.c:811
#, c-format
msgid "%s: descend into directory %s? "
-msgstr "%s:是否进入目录%s? "
+msgstr "%s:是否进入目录 %s? "
-#: src/remove.c:793
+#: src/remove.c:821
#, c-format
msgid "%s: remove write-protected %s %s? "
-msgstr "%s:是否删除有写保护的%s%s? "
+msgstr "%s:是否删除有写保护的 %s %s? "
-#: src/remove.c:794
+#: src/remove.c:822
#, c-format
msgid "%s: remove %s %s? "
-msgstr "%s:是否删除%s%s? "
+msgstr "%s:是否删除 %s %s? "
-#: src/remove.c:837
+#: src/remove.c:865
#, c-format
msgid "removed %s\n"
msgstr "已删除%s\n"
-#: src/remove.c:852 src/remove.c:1299
+#: src/remove.c:880 src/remove.c:1332
#, c-format
msgid "removed directory: %s\n"
msgstr "已删除目录:%s\n"
-#: src/remove.c:1140
-#, c-format
-msgid ""
-"WARNING: Circular directory structure.\n"
-"This almost certainly means that you have a corrupted file system.\n"
-"NOTIFY YOUR SYSTEM MANAGER.\n"
-"The following directory is part of the cycle:\n"
-" %s\n"
-msgstr ""
-" 警告:发现循环的目录架构。\n"
-"这几乎可以肯定文件系统已经损坏。\n"
-"** 请告诉系统管理员。**\n"
-"以下的目录是循环的一部份:\n"
-" %s\n"
-
-#: src/remove.c:1152 src/remove.c:1326
+#: src/remove.c:1184 src/remove.c:1359
#, fuzzy, c-format
msgid "failed to close directory %s"
msgstr "无法保留%s的时间"
-#: src/remove.c:1344
+#: src/remove.c:1377
msgid "cannot remove `.' or `..'"
msgstr "无法删除“.”或“..”"
-#: src/remove.c:1383
+#: src/remove.c:1418
#, fuzzy, c-format
msgid "cannot remove relative-named %s"
msgstr "无法删除目录%s"
-#: src/remove.c:1397
-#, fuzzy
+#: src/remove.c:1432
msgid "cannot restore current working directory"
-msgstr "无法创建目录%s"
+msgstr "无法恢复当前工作目录"
#: src/rm.c:142
#, c-format
msgid "Try `%s ./%s' to remove the file %s.\n"
-msgstr ""
+msgstr "请使用“%s ./%s”删除文件 %s。\n"
#: src/rm.c:159 src/touch.c:233
#, c-format
msgid "Usage: %s [OPTION]... FILE...\n"
-msgstr "用法:%s [选项]... 目录...\n"
+msgstr "用法:%s [选项]... 文件...\n"
#: src/rm.c:160
msgid ""
@@ -5569,12 +5547,9 @@ msgid ""
" -r, -R, --recursive remove directories and their contents recursively\n"
" -v, --verbose explain what is being done\n"
msgstr ""
-"删除指定的<文件>(即解除链接)。\n"
-"\n"
-" -d, --directory 删除可能仍有数据的目录 (只限超级用户)\n"
-" -f, --force 略过不存在的文件,不显示任何信息\n"
-" -i, --interactive 进行任何删除操作前必须先确认\n"
-" -r, -R, --recursive 同时删除该目录下的所有目录层\n"
+" --no-preserve-root 不特殊对待“/”(默认值)\n"
+" --preserve-root 不允许在“/”上递归操作\n"
+" -r, -R, --recursive 递归删除目录及其内容\n"
" -v, --verbose 详细显示进行的步骤\n"
#: src/rm.c:181
@@ -5584,6 +5559,10 @@ msgid ""
"option to remove each listed directory, too, along with all of its "
"contents.\n"
msgstr ""
+"\n"
+"默认情况下,rm 不删除目录。使用 --recursive (-r 或 -R)选项可以删除每个列出"
+"的\n"
+"目录及其下面的内容。\n"
#: src/rm.c:186
#, c-format
@@ -5621,7 +5600,7 @@ msgstr ""
#: src/rm.c:356
#, fuzzy, c-format
msgid "%s: remove all arguments? "
-msgstr "%s:是否删除%s%s? "
+msgstr "%s:是否删除 %s %s? "
#: src/rmdir.c:109 src/rmdir.c:207
#, c-format
@@ -5658,7 +5637,7 @@ msgstr ""
" “rmdir -p a/b/c”的效果等于“rmdir a/b/c a/b a”。\n"
" -v, --verbose 处理每个目录时都显示信息\n"
-#: src/seq.c:82
+#: src/seq.c:74
#, fuzzy, c-format
msgid ""
"Usage: %s [OPTION]... LAST\n"
@@ -5669,19 +5648,16 @@ msgstr ""
" 或:%s [选项]... 来源... 目录\n"
" 或:%s [选项]... --target-directory=目录 来源...\n"
-#: src/seq.c:87
-#, c-format
+#: src/seq.c:79
msgid ""
"Print numbers from FIRST to LAST, in steps of INCREMENT.\n"
"\n"
-" -f, --format=FORMAT use printf style floating-point FORMAT (default: %"
-"g)\n"
+" -f, --format=FORMAT use printf style floating-point FORMAT\n"
" -s, --separator=STRING use STRING to separate numbers (default: \\n)\n"
" -w, --equal-width equalize width by padding with leading zeroes\n"
msgstr ""
-#: src/seq.c:96
-#, c-format
+#: src/seq.c:88
msgid ""
"\n"
"If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n"
@@ -5689,21 +5665,22 @@ msgid ""
"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n"
"INCREMENT is usually positive if FIRST is smaller than LAST, and\n"
"INCREMENT is usually negative if FIRST is greater than LAST.\n"
-"When given, the FORMAT argument must contain exactly one of\n"
-"the printf-style, floating point output formats %e, %f, %g\n"
+"FORMAT must be suitable for printing one argument of type `double';\n"
+"it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n"
+"decimal numbers with maximum precision PREC, and to %g otherwise.\n"
msgstr ""
-#: src/seq.c:121
-#, fuzzy, c-format
+#: src/seq.c:132
+#, c-format
msgid "invalid floating point argument: %s"
-msgstr "日期格式 %s 无效"
+msgstr "无效的浮点参数:%s"
-#: src/seq.c:379
-#, fuzzy, c-format
+#: src/seq.c:340
+#, c-format
msgid "invalid format string: %s"
-msgstr "权限模式字符串无效:%s "
+msgstr "无效的格式字符串:%s "
-#: src/seq.c:399
+#: src/seq.c:362
#, fuzzy
msgid "format string may not be specified when printing equal width strings"
msgstr "安装目录时不能用 strip 选项"
@@ -5730,47 +5707,51 @@ msgstr ""
#: src/setuidgid.c:105
#, c-format
msgid "unknown user-ID: %s"
-msgstr ""
+msgstr "未知的用户 ID:%s"
-#: src/setuidgid.c:108
+#: src/setuidgid.c:109
#, fuzzy
msgid "cannot set supplemental group"
msgstr "无法改变所属组至没有名称的组"
-#: src/setuidgid.c:112
+#: src/setuidgid.c:114
#, fuzzy, c-format
msgid "cannot set group-ID to %lu"
msgstr "无法改变所属组至没有名称的组"
-#: src/setuidgid.c:116
+#: src/setuidgid.c:118
#, fuzzy, c-format
msgid "cannot set user-ID to %lu"
msgstr "stat%s失败"
-#: src/shred.c:156
+#: src/shred.c:161
#, c-format
msgid "Usage: %s [OPTIONS] FILE [...]\n"
msgstr "用法:%s [选项] 文件 [...]\n"
-#: src/shred.c:157
+#: src/shred.c:162
msgid ""
"Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
"for even very expensive hardware probing to recover the data.\n"
"\n"
-msgstr "重复覆盖<文件>,使得即使是昂贵的硬件探测仪器也难以将数据复原。\n"
+msgstr ""
+"重复覆盖<文件>,使得即使是昂贵的硬件探测仪器也难以将数据复原。\n"
+"\n"
-#: src/shred.c:165
-#, c-format
+#: src/shred.c:170
+#, fuzzy, c-format
msgid ""
" -f, --force change permissions to allow writing if necessary\n"
" -n, --iterations=N Overwrite N times instead of the default (%d)\n"
+" --random-source=FILE get random bytes from FILE (default /dev/"
+"urandom)\n"
" -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n"
msgstr ""
" -f, --force 有需要时强迫程序可写入文件\n"
" -n, --iterations=N 自行指定重复覆盖的次数 (默认为 %d 次)\n"
" -s, --size=N 覆盖指定的字节数目 (可接受 K、M、G 等等的单位)\n"
-#: src/shred.c:170
+#: src/shred.c:176
#, fuzzy
msgid ""
" -u, --remove truncate and remove file after overwriting\n"
@@ -5785,7 +5766,7 @@ msgstr ""
" -z, --zero 最后一次会使用 0 字节进行覆盖来隐藏覆盖动作\n"
" - 覆盖标准输出的数据\n"
-#: src/shred.c:179
+#: src/shred.c:185
#, fuzzy
msgid ""
"\n"
@@ -5802,7 +5783,7 @@ msgstr ""
"覆盖像 /dev/hda 等的设备文件是很普遍的,而这些文件通常不应删除。当覆盖\n"
"一般文件时,绝大多数人都会使用 --remove 选项。\n"
-#: src/shred.c:189
+#: src/shred.c:195
#, fuzzy
msgid ""
"CAUTION: Note that shred relies on a very important assumption:\n"
@@ -5818,7 +5799,7 @@ msgstr ""
"的文件系统都不符合条件。以下是会令 shred 无效的文件系统的例子:\n"
"\n"
-#: src/shred.c:197
+#: src/shred.c:203
#, fuzzy
msgid ""
"* log-structured or journaled file systems, such as those supplied with\n"
@@ -5839,7 +5820,7 @@ msgstr ""
"* 会不时进行快照纪录的文件系统,像 Network Applicance 的 NFS 服务器\n"
"\n"
-#: src/shred.c:207
+#: src/shred.c:213
msgid ""
"* file systems that cache in temporary locations, such as NFS\n"
" version 3 clients\n"
@@ -5859,121 +5840,185 @@ msgid ""
"to be recovered later.\n"
msgstr ""
-#: src/shred.c:365
+#: src/shred.c:295
#, fuzzy, c-format
msgid "%s: fdatasync failed"
msgstr "strip 出现错误"
-#: src/shred.c:376
+#: src/shred.c:306
#, fuzzy, c-format
msgid "%s: fsync failed"
msgstr "strip 出现错误"
-#: src/shred.c:444
+#: src/shred.c:372
#, c-format
msgid "%s: cannot rewind"
msgstr "%s:无法向后搜寻"
-#: src/shred.c:470
+#: src/shred.c:395
#, c-format
msgid "%s: pass %lu/%lu (%s)..."
msgstr "%1$s:%3$lu 次之第 %2$lu 次 (%4$s)..."
-#: src/shred.c:521
+#: src/shred.c:446
#, c-format
msgid "%s: error writing at offset %s"
msgstr "%s:在位置 %s 写入时出现错误 "
-#: src/shred.c:541
+#: src/shred.c:466
#, fuzzy, c-format
msgid "%s: lseek failed"
msgstr "strip 出现错误"
-#: src/shred.c:552
+#: src/shred.c:477
#, c-format
msgid "%s: file too large"
msgstr "%s:文件过大"
-#: src/shred.c:575
+#: src/shred.c:500
#, c-format
msgid "%s: pass %lu/%lu (%s)...%s"
msgstr "%1$s:%3$lu 次之第 %2$lu 次 (%4$s)...%5$s"
-#: src/shred.c:591
+#: src/shred.c:516
#, c-format
msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%"
msgstr "%1$s:%3$lu 次之第 %2$lu 次 (%4$s)...%5$s/%6$s %7$d%%"
-#: src/shred.c:843
+#: src/shred.c:764
#, fuzzy, c-format
msgid "%s: fstat failed"
msgstr "strip 出现错误"
-#: src/shred.c:854
+#: src/shred.c:775
#, c-format
msgid "%s: invalid file type"
msgstr "%s:文件类型无效"
-#: src/shred.c:873
+#: src/shred.c:794
#, c-format
msgid "%s: file has negative size"
msgstr "%s:文件的大小为负数"
-#: src/shred.c:938
+#: src/shred.c:861
#, c-format
msgid "%s: error truncating"
msgstr "%s:截断文件时出现错误"
-#: src/shred.c:954
+#: src/shred.c:877
#, fuzzy, c-format
msgid "%s: fcntl failed"
msgstr "strip 出现错误"
-#: src/shred.c:959
+#: src/shred.c:882
#, c-format
msgid "%s: cannot shred append-only file descriptor"
msgstr "%s:不能将只可加上数据的文件描述符 (file descriptor) 进行 shred 动作"
-#: src/shred.c:1037
+#: src/shred.c:960
#, c-format
msgid "%s: removing"
msgstr "%s:删除中"
-#: src/shred.c:1061
+#: src/shred.c:984
#, c-format
msgid "%s: renamed to %s"
msgstr "%s:已重命名为 %s"
-#: src/shred.c:1083
-#, fuzzy, c-format
+#: src/shred.c:1006
+#, c-format
msgid "%s: failed to remove"
-msgstr "%s:文件过大"
+msgstr "%s:删除失败"
-#: src/shred.c:1087
+#: src/shred.c:1010
#, c-format
msgid "%s: removed"
msgstr "%s:已删除"
-#: src/shred.c:1094 src/shred.c:1137
-#, fuzzy, c-format
+#: src/shred.c:1017 src/shred.c:1060
+#, c-format
msgid "%s: failed to close"
-msgstr "%s:文件过大"
+msgstr "%s:关闭失败"
-#: src/shred.c:1130
-#, fuzzy, c-format
+#: src/shred.c:1053
+#, c-format
msgid "%s: failed to open for writing"
-msgstr "%s:文件过大"
+msgstr "%s:打开写入失败"
-#: src/shred.c:1186
+#: src/shred.c:1121
#, c-format
msgid "%s: invalid number of passes"
msgstr "%s:覆盖次数无效"
-#: src/shred.c:1203
+#: src/shred.c:1130 src/shuf.c:331 src/sort.c:2531
+#, fuzzy
+msgid "multiple random sources specified"
+msgstr "正在关闭输出文件 %s"
+
+#: src/shred.c:1144
#, c-format
msgid "%s: invalid file size"
msgstr "%s:文件大小无效"
+#: src/shuf.c:51
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [OPTION]... [FILE]\n"
+" or: %s -e [OPTION]... [ARG]...\n"
+" or: %s -i LO-HI [OPTION]...\n"
+msgstr ""
+"用法:%s [选项]... 来源 目的地\n"
+" 或:%s [选项]... 来源... 目录\n"
+" 或:%s [选项]... --target-directory=目录 来源...\n"
+
+#: src/shuf.c:57
+msgid ""
+"Write a random permutation of the input lines to standard output.\n"
+"\n"
+msgstr ""
+
+#: src/shuf.c:64
+msgid ""
+" -e, --echo treat each ARG as an input line\n"
+" -i, --input-range=LO-HI treat each number LO through HI as an input "
+"line\n"
+" -n, --head-lines=LINES output at most LINES lines\n"
+" -o, --output=FILE write result to FILE instead of standard output\n"
+" --random-source=FILE get random bytes from FILE (default /dev/"
+"urandom)\n"
+" -z, --zero-terminated end lines with 0 byte, not newline\n"
+msgstr ""
+
+#: src/shuf.c:285
+#, fuzzy
+msgid "multiple -i options specified"
+msgstr "正在关闭输出文件 %s"
+
+#: src/shuf.c:305
+#, fuzzy, c-format
+msgid "invalid input range %s"
+msgstr "无效的行宽数值:%s"
+
+#: src/shuf.c:318
+#, fuzzy, c-format
+msgid "invalid line count %s"
+msgstr "无效的行宽:%s"
+
+#: src/shuf.c:325 src/sort.c:2525
+#, fuzzy
+msgid "multiple output files specified"
+msgstr "正在关闭输出文件 %s"
+
+#: src/shuf.c:351
+#, fuzzy
+msgid "cannot combine -e and -i options"
+msgstr "无法决定 %s 所在的设备及 inode"
+
+#: src/shuf.c:360
+#, fuzzy, c-format
+msgid "extra operand %s\n"
+msgstr "额外的操作数 %s"
+
#: src/sleep.c:47
#, c-format
msgid ""
@@ -5998,19 +6043,21 @@ msgstr "无效的日期时间格式 %s"
msgid "cannot read realtime clock"
msgstr "无法创建链接%s"
-#: src/sort.c:288
+#: src/sort.c:289
msgid ""
"Write sorted concatenation of all FILE(s) to standard output.\n"
"\n"
msgstr ""
-#: src/sort.c:295
+#: src/sort.c:296
msgid ""
"Ordering options:\n"
"\n"
msgstr ""
+"顺序选项:\n"
+"\n"
-#: src/sort.c:299
+#: src/sort.c:300
msgid ""
" -b, --ignore-leading-blanks ignore leading blanks\n"
" -d, --dictionary-order consider only blanks and alphanumeric "
@@ -6018,18 +6065,20 @@ msgid ""
" -f, --ignore-case fold lower case to upper case characters\n"
msgstr ""
-#: src/sort.c:304
+#: src/sort.c:305
msgid ""
" -g, --general-numeric-sort compare according to general numerical value\n"
" -i, --ignore-nonprinting consider only printable characters\n"
" -M, --month-sort compare (unknown) < `JAN' < ... < `DEC'\n"
" -n, --numeric-sort compare according to string numerical value\n"
" -R, --random-sort sort by random hash of keys\n"
+" --random-source=FILE get random bytes from FILE (default /dev/"
+"urandom)\n"
" -r, --reverse reverse the result of comparisons\n"
"\n"
msgstr ""
-#: src/sort.c:313
+#: src/sort.c:315
msgid ""
"Other options:\n"
"\n"
@@ -6037,13 +6086,12 @@ msgid ""
" -k, --key=POS1[,POS2] start a key at POS1, end it at POS2 (origin 1)\n"
" -m, --merge merge already sorted files; do not sort\n"
" -o, --output=FILE write result to FILE instead of standard output\n"
-" --seed=STRING seed random hash function with STRING\n"
" -s, --stable stabilize sort by disabling last-resort "
"comparison\n"
" -S, --buffer-size=SIZE use SIZE for main memory buffer\n"
msgstr ""
-#: src/sort.c:324
+#: src/sort.c:325
#, c-format
msgid ""
" -t, --field-separator=SEP use SEP instead of non-blank to blank "
@@ -6056,11 +6104,11 @@ msgid ""
"run\n"
msgstr ""
-#: src/sort.c:331
+#: src/sort.c:332
msgid " -z, --zero-terminated end lines with 0 byte, not newline\n"
msgstr ""
-#: src/sort.c:336
+#: src/sort.c:337
msgid ""
"\n"
"POS is F[.C][OPTS], where F is the field number and C the character "
@@ -6075,8 +6123,7 @@ msgid ""
"SIZE may be followed by the following multiplicative suffixes:\n"
msgstr ""
-#: src/sort.c:346
-#, c-format
+#: src/sort.c:347
msgid ""
"% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
"\n"
@@ -6088,122 +6135,108 @@ msgid ""
"native byte values.\n"
msgstr ""
-#: src/sort.c:457
-#, fuzzy
+#: src/sort.c:458
msgid "cannot create temporary file"
-msgstr "无法创建一般文件%s"
+msgstr "无法创建临时文件"
-#: src/sort.c:484
-#, fuzzy
+#: src/sort.c:485 src/sort.c:2649
msgid "open failed"
-msgstr "strip 出现错误"
+msgstr "打开失败"
-#: src/sort.c:506
+#: src/sort.c:507
#, fuzzy
msgid "fflush failed"
msgstr "strip 出现错误"
-#: src/sort.c:511 src/sort.c:2603
-#, fuzzy
+#: src/sort.c:512 src/sort.c:2684
msgid "close failed"
-msgstr "strip 出现错误"
+msgstr "关闭失败"
-#: src/sort.c:520
-#, fuzzy
+#: src/sort.c:521
msgid "write failed"
-msgstr "strip 出现错误"
+msgstr "写入失败"
-#: src/sort.c:557
-#, fuzzy, c-format
+#: src/sort.c:558
+#, c-format
msgid "warning: cannot remove: %s"
-msgstr "无法删除%s"
+msgstr "警告:无法删除:%s"
-#: src/sort.c:674
-#, fuzzy
+#: src/sort.c:675
msgid "sort size"
-msgstr "块大小"
+msgstr "排序大小"
-#: src/sort.c:753
+#: src/sort.c:754
#, fuzzy
msgid "stat failed"
msgstr "strip 出现错误"
-#: src/sort.c:1017
-#, fuzzy
+#: src/sort.c:1018
msgid "read failed"
-msgstr "strip 出现错误"
+msgstr "读取失败"
-#: src/sort.c:1454
+#: src/sort.c:1532
#, c-format
msgid "%s: %s:%s: disorder: "
msgstr ""
-#: src/sort.c:1458
-#, fuzzy
+#: src/sort.c:1536
msgid "standard error"
-msgstr "标准输出"
+msgstr "标准错误"
-#: src/sort.c:2044
+#: src/sort.c:2122
#, fuzzy, c-format
msgid "%s: invalid field specification %s"
msgstr "%s:文件大小无效"
-#: src/sort.c:2055
+#: src/sort.c:2133
#, c-format
msgid "options `-%s' are incompatible"
msgstr ""
-#: src/sort.c:2114
+#: src/sort.c:2192
#, fuzzy, c-format
msgid "%s: count `%.*s' too large"
msgstr "%s:文件过大"
-#: src/sort.c:2120
+#: src/sort.c:2198
#, fuzzy, c-format
msgid "%s: invalid count at start of %s"
msgstr "%s:覆盖次数无效"
-#: src/sort.c:2346
+#: src/sort.c:2428
#, fuzzy
msgid "invalid number after `-'"
msgstr "无效的号码 %s"
-#: src/sort.c:2349 src/sort.c:2396 src/sort.c:2423
+#: src/sort.c:2431 src/sort.c:2479 src/sort.c:2506
#, fuzzy
msgid "invalid number after `.'"
msgstr "无效的号码 %s"
-#: src/sort.c:2352 src/sort.c:2432
+#: src/sort.c:2434 src/sort.c:2515
#, fuzzy
msgid "stray character in field spec"
msgstr "字符特殊文件"
-#: src/sort.c:2387
+#: src/sort.c:2470
#, fuzzy
msgid "invalid number at field start"
msgstr "无效的号码 %s"
-#: src/sort.c:2391 src/sort.c:2419
-#, fuzzy
+#: src/sort.c:2474 src/sort.c:2502
msgid "field number is zero"
-msgstr "无效的号码 %s"
+msgstr "字段编号为零"
-#: src/sort.c:2400
-#, fuzzy
+#: src/sort.c:2483
msgid "character offset is zero"
-msgstr "字符特殊文件"
+msgstr "字符偏移为零"
-#: src/sort.c:2415
+#: src/sort.c:2498
#, fuzzy
msgid "invalid number after `,'"
msgstr "无效的号码 %s"
-#: src/sort.c:2442
-#, fuzzy
-msgid "multiple output files specified"
-msgstr "正在关闭输出文件 %s"
-
-#: src/sort.c:2586
+#: src/sort.c:2667
#, c-format
msgid "extra operand %s not allowed with -c"
msgstr ""
@@ -6249,14 +6282,13 @@ msgid "Output file suffixes exhausted"
msgstr ""
#: src/split.c:212
-#, fuzzy, c-format
+#, c-format
msgid "creating file %s\n"
-msgstr "创建文件“%s”\n"
+msgstr "创建文件 %s\n"
#: src/split.c:371
-#, fuzzy
msgid "cannot split in more than one way"
-msgstr "无法由多于一种的来源来指定时间"
+msgstr "无法按多种方式拆分"
#: src/split.c:421
#, c-format
@@ -6283,31 +6315,31 @@ msgstr "%s:文件过大"
msgid "invalid number of lines: 0"
msgstr "无效的号码 %s"
-#: src/stat.c:590
+#: src/stat.c:591
#, fuzzy, c-format
msgid "warning: unrecognized escape `\\%c'"
msgstr "%s:无法识别的选项“%c%s”\n"
-#: src/stat.c:625
+#: src/stat.c:626
#, fuzzy, c-format
msgid "%s%s: invalid directive"
msgstr "%s:文件类型无效"
-#: src/stat.c:670
+#: src/stat.c:671
msgid "warning: backslash at end of format"
msgstr ""
-#: src/stat.c:699
+#: src/stat.c:700
#, fuzzy, c-format
msgid "cannot read file system information for %s"
msgstr "无法创建 fifo 文件%s"
-#: src/stat.c:775
+#: src/stat.c:776
#, c-format
msgid "Usage: %s [OPTION] FILE...\n"
msgstr "用法:%s [选项] 文件...\n"
-#: src/stat.c:776
+#: src/stat.c:777
msgid ""
"Display file or file system status.\n"
"\n"
@@ -6315,7 +6347,7 @@ msgid ""
" -f, --file-system display file system status instead of file status\n"
msgstr ""
-#: src/stat.c:782
+#: src/stat.c:783
msgid ""
" -c --format=FORMAT use the specified FORMAT instead of the default;\n"
" output a newline after each use of FORMAT\n"
@@ -6325,7 +6357,7 @@ msgid ""
" -t, --terse print the information in terse form\n"
msgstr ""
-#: src/stat.c:793
+#: src/stat.c:794
msgid ""
"\n"
"The valid format sequences for files (without --file-system):\n"
@@ -6336,7 +6368,7 @@ msgid ""
" %B The size in bytes of each block reported by %b\n"
msgstr ""
-#: src/stat.c:801
+#: src/stat.c:802
msgid ""
" %d Device number in decimal\n"
" %D Device number in hex\n"
@@ -6346,7 +6378,7 @@ msgid ""
" %G Group name of owner\n"
msgstr ""
-#: src/stat.c:809
+#: src/stat.c:810
msgid ""
" %h Number of hard links\n"
" %i Inode number\n"
@@ -6358,7 +6390,7 @@ msgid ""
" %T Minor device type in hex\n"
msgstr ""
-#: src/stat.c:819
+#: src/stat.c:820
msgid ""
" %u User ID of owner\n"
" %U User name of owner\n"
@@ -6371,7 +6403,7 @@ msgid ""
"\n"
msgstr ""
-#: src/stat.c:831
+#: src/stat.c:832
msgid ""
"Valid format sequences for file systems:\n"
"\n"
@@ -6382,7 +6414,7 @@ msgid ""
" %f Free blocks in file system\n"
msgstr ""
-#: src/stat.c:840
+#: src/stat.c:841
msgid ""
" %i File System ID in hex\n"
" %l Maximum length of filenames\n"
@@ -6692,15 +6724,15 @@ msgid "%s: couldn't reset non-blocking mode"
msgstr ""
#: src/stty.c:885 src/stty.c:995
-#, fuzzy, c-format
+#, c-format
msgid "invalid argument %s"
-msgstr "无效的参数:%s"
+msgstr "无效参数 %s"
#: src/stty.c:896 src/stty.c:913 src/stty.c:925 src/stty.c:938 src/stty.c:950
#: src/stty.c:970
-#, fuzzy, c-format
+#, c-format
msgid "missing argument to %s"
-msgstr "缺少了文件参数"
+msgstr "缺少 %s 的参数"
#: src/stty.c:976
#, fuzzy, c-format
@@ -6723,72 +6755,74 @@ msgid "%s: no size information for this device"
msgstr ""
#: src/stty.c:1889
-#, fuzzy, c-format
+#, c-format
msgid "invalid integer argument %s"
-msgstr "%2$s 的参数 %1$s 无效"
+msgstr "无效的整数参数 %s"
-#: src/su.c:265
+#: src/su.c:243
msgid "Password:"
-msgstr ""
+msgstr "密码:"
-#: src/su.c:268
+#: src/su.c:246
#, fuzzy
msgid "getpass: cannot open /dev/tty"
msgstr "无法打开目录%s"
-#: src/su.c:326
+#: src/su.c:304
#, fuzzy
msgid "cannot set groups"
msgstr "stat%s失败"
-#: src/su.c:330
+#: src/su.c:308
#, fuzzy
msgid "cannot set group id"
msgstr "无法改变所属组至没有名称的组"
-#: src/su.c:332
+#: src/su.c:310
#, fuzzy
msgid "cannot set user id"
msgstr "stat%s失败"
-#: src/su.c:408
-#, fuzzy, c-format
+#: src/su.c:386
+#, c-format
msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
-msgstr "用法:%s [选项]... [文件]...\n"
+msgstr "用法:%s [选项]... [-] [用户 [参数]...]\n"
-#: src/su.c:409
+#: src/su.c:387
msgid ""
"Change the effective user id and group id to that of USER.\n"
"\n"
" -, -l, --login make the shell a login shell\n"
-" -c, --commmand=COMMAND pass a single COMMAND to the shell with -c\n"
+" -c, --command=COMMAND pass a single COMMAND to the shell with -c\n"
" -f, --fast pass -f to the shell (for csh or tcsh)\n"
" -m, --preserve-environment do not reset environment variables\n"
" -p same as -m\n"
" -s, --shell=SHELL run SHELL if /etc/shells allows it\n"
msgstr ""
-#: src/su.c:421
+#: src/su.c:399
msgid ""
"\n"
"A mere - implies -l. If USER not given, assume root.\n"
msgstr ""
+"\n"
+"单独的 - 代表 -l。如果未给出[用户],则假定为 root。\n"
-#: src/su.c:498
+#: src/su.c:476
#, c-format
msgid "user %s does not exist"
-msgstr ""
+msgstr "用户 %s 不存在"
-#: src/su.c:521
+#: src/su.c:499
msgid "incorrect password"
-msgstr ""
+msgstr "密码不正确"
-#: src/su.c:538
+#: src/su.c:516
#, c-format
msgid "using restricted shell %s"
-msgstr ""
+msgstr "使用被限制的 shell %s"
-#: src/su.c:546
+#: src/su.c:524
#, fuzzy, c-format
msgid "warning: cannot change directory to %s"
msgstr "无法进入目录 %s"
@@ -6811,9 +6845,9 @@ msgstr ""
#: src/sync.c:74
msgid "ignoring all arguments"
-msgstr "忽略任何参数"
+msgstr "忽略全部参数"
-#: src/system.h:604
+#: src/system.h:529
#, c-format
msgid ""
"\n"
@@ -6822,56 +6856,55 @@ msgid ""
"for details about the options it supports.\n"
msgstr ""
-#: src/system.h:610
+#: src/system.h:535
msgid " --help display this help and exit\n"
-msgstr " --help 显示此帮助信息并离开\n"
+msgstr " --help 显示此帮助信息并退出\n"
-#: src/system.h:612
+#: src/system.h:537
msgid " --version output version information and exit\n"
-msgstr " --version 显示版本信息并离开\n"
+msgstr " --version 输出版本信息并退出\n"
-#: src/tac.c:136
+#: src/tac.c:137
msgid ""
"Write each FILE to standard output, last line first.\n"
"With no FILE, or when FILE is -, read standard input.\n"
"\n"
msgstr ""
-#: src/tac.c:144
+#: src/tac.c:145
msgid ""
" -b, --before attach the separator before instead of after\n"
" -r, --regex interpret the separator as a regular expression\n"
" -s, --separator=STRING use STRING as the separator instead of newline\n"
msgstr ""
-#: src/tac.c:235 src/tac.c:336
+#: src/tac.c:236 src/tac.c:337
#, fuzzy, c-format
msgid "%s: seek failed"
msgstr "strip 出现错误"
-#: src/tac.c:264
-#, fuzzy
+#: src/tac.c:265
msgid "record too large"
-msgstr "%s:文件过大"
+msgstr "记录太大"
-#: src/tac.c:458
-#, fuzzy, c-format
+#: src/tac.c:459
+#, c-format
msgid "cannot create temporary file %s"
-msgstr "无法创建一般文件%s"
+msgstr "无法创建临时文件 %s"
-#: src/tac.c:465
-#, fuzzy, c-format
+#: src/tac.c:466
+#, c-format
msgid "cannot open %s for writing"
-msgstr "无法打开 %s 来读取数据"
+msgstr "无法打开 %s 写入"
-#: src/tac.c:486 src/tac.c:493
-#, fuzzy, c-format
+#: src/tac.c:487 src/tac.c:494
+#, c-format
msgid "%s: write error"
-msgstr "写入错误"
+msgstr "%s:写入错误"
-#: src/tac.c:600
+#: src/tac.c:601
msgid "separator cannot be empty"
-msgstr ""
+msgstr "分隔符不能为空"
#: src/tail.c:224
#, c-format
@@ -7045,12 +7078,12 @@ msgstr ""
msgid "warning: --pid=PID is not supported on this system"
msgstr "此系统并不支持符号链接"
-#: src/tail.c:1657
+#: src/tail.c:1664
#, c-format
msgid "cannot follow %s by name"
msgstr ""
-#: src/tail.c:1663
+#: src/tail.c:1670
msgid "warning: following standard input indefinitely is ineffective"
msgstr ""
@@ -7069,14 +7102,14 @@ msgid ""
msgstr ""
#: src/test.c:125
-#, fuzzy, c-format
+#, c-format
msgid "missing argument after %s"
-msgstr "缺少了文件参数"
+msgstr "%s 后缺少参数"
#: src/test.c:161
#, fuzzy, c-format
msgid "invalid integer %s"
-msgstr "无效的号码 %s"
+msgstr "无效的整数 %s\n"
#: src/test.c:242
msgid "')' expected"
@@ -7232,9 +7265,9 @@ msgid "missing `]'"
msgstr "缺少操作数"
#: src/test.c:846
-#, fuzzy, c-format
+#, c-format
msgid "extra argument %s"
-msgstr "无效的参数:%s"
+msgstr "额外参数 %s"
#: src/touch.c:112 src/touch.c:318
#, c-format
@@ -7315,9 +7348,9 @@ msgid ""
msgstr "警告:“touch %s”已经过时;请使用“touch -t %04d%02d%02d%02d%02d.%02d”"
#: src/tr.c:290
-#, fuzzy, c-format
+#, c-format
msgid "Usage: %s [OPTION]... SET1 [SET2]\n"
-msgstr "用法:%s [选项]... [文件]\n"
+msgstr "用法:%s [选项]... 集合1 [集合2]\n"
#: src/tr.c:294
msgid ""
@@ -7397,107 +7430,103 @@ msgid ""
"translation or deletion.\n"
msgstr ""
-#: src/tr.c:518
+#: src/tr.c:519
#, 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:681
+#: src/tr.c:682
#, c-format
msgid "range-endpoints of `%s-%s' are in reverse collating sequence order"
msgstr ""
-#: src/tr.c:837
+#: src/tr.c:838
#, c-format
msgid "invalid repeat count %s in [c*n] construct"
msgstr ""
-#: src/tr.c:918
+#: src/tr.c:919
msgid "missing character class name `[::]'"
msgstr ""
-#: src/tr.c:921
+#: src/tr.c:922
msgid "missing equivalence class character `[==]'"
msgstr ""
-#: src/tr.c:936
+#: src/tr.c:937
#, fuzzy, c-format
msgid "invalid character class %s"
msgstr "权限模式字符串 %2$s 中出现无效的字符 %1$s"
-#: src/tr.c:955
+#: src/tr.c:956
#, c-format
msgid "%s: equivalence class operand must be a single character"
msgstr ""
-#: src/tr.c:1275
+#: src/tr.c:1276
#, fuzzy
msgid "too many characters in set"
msgstr "字符特殊文件"
-#: src/tr.c:1423
+#: src/tr.c:1424
msgid "the [c*] repeat construct may not appear in string1"
msgstr ""
-#: src/tr.c:1433
+#: src/tr.c:1434
msgid "only one [c*] repeat construct may appear in string2"
msgstr ""
-#: src/tr.c:1441
+#: src/tr.c:1442
msgid "[=c=] expressions may not appear in string2 when translating"
msgstr ""
-#: src/tr.c:1454
+#: src/tr.c:1455
msgid "when not truncating set1, string2 must be non-empty"
msgstr ""
-#: src/tr.c:1463
+#: src/tr.c:1464
msgid ""
"when translating with complemented character classes,\n"
"string2 must map all characters in the domain to one"
msgstr ""
-#: src/tr.c:1470
+#: src/tr.c:1471
msgid ""
"when translating, the only character classes that may appear in\n"
"string2 are `upper' and `lower'"
msgstr ""
-#: src/tr.c:1479
+#: src/tr.c:1480
msgid "the [c*] construct may appear in string2 only when translating"
msgstr ""
-#: src/tr.c:1731
+#: src/tr.c:1732
msgid "Two strings must be given when translating."
msgstr ""
-#: src/tr.c:1741
+#: src/tr.c:1742
msgid "Only one string may be given when deleting without squeezing repeats."
msgstr ""
-#: src/tr.c:1844
+#: src/tr.c:1845
msgid "misaligned [:upper:] and/or [:lower:] construct"
msgstr ""
#: src/true.c:42
-#, fuzzy, c-format
+#, c-format
msgid ""
"Usage: %s [ignored command line arguments]\n"
" or: %s OPTION\n"
msgstr ""
-"用法:%s 文件\n"
+"用法:%s [忽略的命令行开关]\n"
" 或:%s 选项\n"
#: src/true.c:49
msgid "Exit with a status code indicating success."
msgstr ""
-#: src/true.c:50
-msgid "Exit with a status code indicating failure."
-msgstr ""
-
#: src/tsort.c:86
#, c-format
msgid ""
@@ -7515,7 +7544,7 @@ msgstr "%s:覆盖次数无效"
#: src/tsort.c:515
#, c-format
msgid "%s: input contains a loop:"
-msgstr ""
+msgstr "%s:输入包含循环:"
#: src/tty.c:69 src/uname.c:117 src/whoami.c:50
#, c-format
@@ -7622,9 +7651,8 @@ msgid ""
msgstr ""
#: src/uniq.c:341
-#, fuzzy
msgid "too many repeated lines"
-msgstr "参数太多"
+msgstr "重复行太多"
#: src/uniq.c:476 src/uniq.c:503
#, fuzzy
@@ -7632,18 +7660,16 @@ msgid "invalid number of fields to skip"
msgstr "%s:覆盖次数无效"
#: src/uniq.c:512
-#, fuzzy
msgid "invalid number of bytes to skip"
-msgstr "%s:覆盖次数无效"
+msgstr "要跳过的字节数无效"
#: src/uniq.c:521
-#, fuzzy
msgid "invalid number of bytes to compare"
-msgstr "%s:覆盖次数无效"
+msgstr "要比较的字节数无效"
#: src/uniq.c:536
msgid "printing all duplicated lines and repeat counts is meaningless"
-msgstr ""
+msgstr "打印所有重复行和重复计数毫无意义"
#: src/unlink.c:50
#, c-format
@@ -7659,6 +7685,8 @@ msgid ""
"Call the unlink function to remove the specified FILE.\n"
"\n"
msgstr ""
+"调用 unlink 函数以便删除指定的[文件]。\n"
+"\n"
#: src/unlink.c:91
#, c-format
@@ -7667,7 +7695,7 @@ msgstr "无法解除 %s 的链接"
#: src/uptime.c:108
msgid "couldn't get boot time"
-msgstr ""
+msgstr "无法获得启动时间"
#: src/uptime.c:116
#, c-format
@@ -7690,13 +7718,13 @@ msgstr ""
#: src/uptime.c:124
#, c-format
msgid "???? days ??:??, "
-msgstr ""
+msgstr "???? 天 ??:??,"
#: src/uptime.c:128
-#, fuzzy, c-format
+#, c-format
msgid "%ld day"
msgid_plural "%ld days"
-msgstr[0] "%d 天"
+msgstr[0] "%ld 天"
#: src/uptime.c:131
#, c-format
@@ -7723,6 +7751,10 @@ msgid ""
"If FILE is not specified, use %s. %s as FILE is common.\n"
"\n"
msgstr ""
+"打印当前时间、系统已经运行的时间、系统的用户数、以及刚才一分钟、五\n"
+"分钟、十五分钟内运行队列中的平均任务数。\n"
+"如果未指定[文件],则使用 %s。%s 作为文件很常见。\n"
+"\n"
#: src/users.c:109
#, c-format
@@ -7732,7 +7764,7 @@ msgid ""
"\n"
msgstr ""
-#: src/wc.c:131
+#: src/wc.c:137
msgid ""
"Print newline, word, and byte counts for each FILE, and a total line if\n"
"more than one FILE is specified. With no FILE, or when FILE is -,\n"
@@ -7742,12 +7774,19 @@ msgid ""
" -l, --lines print the newline counts\n"
msgstr ""
-#: src/wc.c:139
+#: src/wc.c:145
msgid ""
+" --files0-from=F read input from the files specified by\n"
+" NUL-terminated names in file F\n"
" -L, --max-line-length print the length of the longest line\n"
" -w, --words print the word counts\n"
msgstr ""
+#: src/wc.c:711
+#, c-format
+msgid "when reading file names from stdin, no file name of %s allowed"
+msgstr ""
+
#: src/who.c:216
msgid " old "
msgstr ""
@@ -7865,7 +7904,6 @@ msgid "Warning: -i will be removed in a future release; use -u instead"
msgstr "警告:-i 即将在未来的版本删除;请换用 -u"
#: src/whoami.c:51
-#, fuzzy
msgid ""
"Print the user name associated with the current effective user ID.\n"
"Same as id -un.\n"
@@ -7876,9 +7914,9 @@ msgstr ""
"\n"
#: src/whoami.c:95
-#, fuzzy, c-format
+#, c-format
msgid "%s: cannot find name for user ID %lu\n"
-msgstr "%s:找不到 UID %lu 的用户名\n"
+msgstr "%s:找不到 ID %lu 的用户名\n"
#: src/yes.c:46
#, c-format
@@ -7897,9 +7935,35 @@ msgstr ""
"重复输出一行指定的<字符串>,或者重复“y”。\n"
"\n"
+#~ msgid "cannot change owner and/or group of %s"
+#~ msgstr "无法更改 %s 的属主和/或组"
+
+#~ msgid "cannot chdir to directory %s"
+#~ msgstr "无法切换到目录 %s"
+
+#~ msgid "cannot get the login group of a numeric UID"
+#~ msgstr "无法取得 UID 数值所表示的用户的主组"
+
#~ msgid "unrecognized option `-%c'"
#~ msgstr "无法识别的选项“-%c”"
+#, fuzzy
+#~ msgid "cannot return to working directory"
+#~ msgstr "无法创建目录%s"
+
+#, fuzzy
+#~ msgid "cannot return to current directory"
+#~ msgstr "无法创建目录%s"
+
+#~ msgid "create symbolic link %s to %s"
+#~ msgstr "创建指向%2$s的符号链接%1$s"
+
+#~ msgid "create hard link %s to %s"
+#~ msgstr "创建指向%2$s的硬链接%1$s"
+
+#~ msgid "cannot set permissions of directory %s"
+#~ msgstr "无法设定目录 %s 的权限"
+
#~ msgid "cannot set permissions of fifo %s"
#~ msgstr "无法设定 fifo 文件 %s 的权限"
@@ -7907,24 +7971,17 @@ msgstr ""
#~ msgstr "无法设定 %s 的权限"
#~ msgid "cannot chdir from %s to .."
-#~ msgstr "无法从%s目录切换到 .. 目录"
+#~ msgstr "无法从 %s 目录切换到 .. 目录"
#~ msgid "cannot lstat `.' in %s"
-#~ msgstr "无法在%s中 lstat“.”"
+#~ msgstr "无法在 %s 中 lstat“.”"
#~ msgid "cannot lstat %s"
-#~ msgstr "lstat%s失败"
+#~ msgstr "lstat %s 失败"
#~ msgid "cannot chdir from %s to %s"
-#~ msgstr "无法从%s切换到目录%s"
+#~ msgstr "无法从 %s 切换到目录 %s"
-#~ msgid "create symbolic link %s to %s"
-#~ msgstr "创建指向%2$s的符号链接%1$s"
-
-#~ msgid "create hard link %s to %s"
-#~ msgstr "创建指向%2$s的硬链接%1$s"
-
-#, fuzzy
#~ msgid ""
#~ "Remove (unlink) the FILE(s).\n"
#~ "\n"
@@ -7935,10 +7992,11 @@ msgstr ""
#~ " -f, --force ignore nonexistent files, never prompt\n"
#~ " -i, --interactive prompt before any removal\n"
#~ msgstr ""
-#~ "删除指定的<文件>(即解除链接)。\n"
+#~ "删除指定的<文件>。\n"
#~ "\n"
-#~ " -d, --directory 删除可能仍有数据的目录 (只限超级用户)\n"
-#~ " -f, --force 略过不存在的文件,不显示任何信息\n"
+#~ " -d, --directory 删除<文件>,即便该文件可能是非空目录\n"
+#~ " (只限超级用户;仅当您的系统支持“unlink”非空目"
+#~ "录\n"
+#~ " 时才有效)\n"
+#~ " -f, --force 略过不存在的文件,决不提示\n"
#~ " -i, --interactive 进行任何删除操作前必须先确认\n"
-#~ " -r, -R, --recursive 同时删除该目录下的所有目录层\n"
-#~ " -v, --verbose 详细显示进行的步骤\n"