summaryrefslogtreecommitdiff
path: root/po/zh_TW.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_TW.po')
-rw-r--r--po/zh_TW.po3332
1 files changed, 1840 insertions, 1492 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 271ee27f1..ae813ef7e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: textutils 2.1\n"
"Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2004-06-01 15:37+0200\n"
+"POT-Creation-Date: 2005-01-08 11:56+0100\n"
"PO-Revision-Date: 2002-08-04 06:10+0800\n"
"Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -15,28 +15,30 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: lib/argmatch.c:133
+#: lib/argmatch.c:137
#, c-format
msgid "invalid argument %s for %s"
msgstr "%2$s的引數%1$s無效"
-#: lib/argmatch.c:134
+#: lib/argmatch.c:138
#, c-format
msgid "ambiguous argument %s for %s"
msgstr "%2$s的引數%1$s不明確"
-#: lib/argmatch.c:153
+#: lib/argmatch.c:157
#, c-format
msgid "Valid arguments are:"
msgstr "有效的引數為:"
-#: lib/closeout.c:88 src/cat.c:189 src/cat.c:272 src/cat.c:323 src/cksum.c:268
-#: src/head.c:304 src/head.c:354 src/head.c:774 src/head.c:819 src/od.c:986
-#: src/tail.c:327 src/tail.c:1748 src/tr.c:1583 src/tr.c:1814 src/tr.c:1926
+#: lib/closeout.c:94 src/cat.c:186 src/cat.c:270 src/cat.c:320 src/cksum.c:256
+#: src/expand.c:342 src/expand.c:367 src/head.c:304 src/head.c:354
+#: src/head.c:774 src/head.c:819 src/od.c:958 src/paste.c:143 src/tail.c:313
+#: src/tail.c:1093 src/tr.c:1561 src/tr.c:1781 src/tr.c:1884
+#: src/unexpand.c:441 src/unexpand.c:457
msgid "write error"
msgstr "寫入時發生錯誤"
-#: lib/error.c:127
+#: lib/error.c:123
msgid "Unknown system error"
msgstr "不明的系統錯誤"
@@ -93,103 +95,113 @@ msgstr "共用記憶體物件"
msgid "weird file"
msgstr "不正常的檔案"
-#: lib/getopt.c:570 lib/getopt.c:589
+#: lib/getopt.c:551 lib/getopt.c:570
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s:選項‘%s’不明確\n"
-#: lib/getopt.c:622 lib/getopt.c:626
+#: lib/getopt.c:603 lib/getopt.c:607
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s:選項‘--%s’不可配合引數使用\n"
-#: lib/getopt.c:635 lib/getopt.c:640
+#: lib/getopt.c:616 lib/getopt.c:621
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s:選項‘%c%s’不可配合引數使用\n"
-#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s:選項‘%s’需要引數\n"
-#: lib/getopt.c:746 lib/getopt.c:749
+#: lib/getopt.c:727 lib/getopt.c:730
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s:無法識別的選項‘--%s’\n"
-#: lib/getopt.c:757 lib/getopt.c:760
+#: lib/getopt.c:738 lib/getopt.c:741
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s:無法識別的選項‘%c%s’\n"
-#: lib/getopt.c:815 lib/getopt.c:818
+#: lib/getopt.c:796 lib/getopt.c:799
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s:不合法的選項 ─ %c\n"
-#: lib/getopt.c:824 lib/getopt.c:827
+#: lib/getopt.c:805 lib/getopt.c:808
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s:無效的選項 ─ %c\n"
-#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s:選項需要引數 ─ %c\n"
-#: lib/getopt.c:954 lib/getopt.c:973
+#: lib/getopt.c:935 lib/getopt.c:954
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s:選項‘-W %s’不明確\n"
-#: lib/getopt.c:997 lib/getopt.c:1018
+#: lib/getopt.c:978 lib/getopt.c:999
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s:選項‘-W %s’不可配合引數使用\n"
-#: lib/human.c:483
+#: lib/human.c:484
msgid "block size"
msgstr "區塊大小錯誤"
-#: lib/makepath.c:103 src/df.c:515
+#: lib/makepath.c:63 src/df.c:512
msgid "failed to return to initial working directory"
msgstr ""
-#: lib/makepath.c:152 src/copy.c:1360 src/mkdir.c:171
+#: lib/makepath.c:113 src/copy.c:1353 src/mkdir.c:169
#, c-format
msgid "cannot create directory %s"
msgstr "無法建立目錄%s"
-#: lib/makepath.c:158 lib/makepath.c:400 src/cp.c:436 src/cp.c:458
+#: lib/makepath.c:119 lib/makepath.c:359 src/cp.c:437 src/cp.c:459
#, c-format
msgid "%s exists but is not a directory"
msgstr "%s已存在但不是目錄"
-#: lib/makepath.c:295 lib/makepath.c:357 lib/makepath.c:419
+#: lib/makepath.c:254 lib/makepath.c:316 lib/makepath.c:378
#, c-format
msgid "cannot change owner and/or group of %s"
msgstr "無法更改%s的擁有者和/或所屬群組"
-#: lib/makepath.c:317
+#: lib/makepath.c:276
#, c-format
msgid "cannot chdir to directory %s"
msgstr "無法進入%s目錄"
-#: lib/makepath.c:371 lib/makepath.c:386 lib/makepath.c:425 src/install.c:479
+#: lib/makepath.c:330 lib/makepath.c:345 lib/makepath.c:384 src/install.c:517
#, c-format
msgid "cannot change permissions of %s"
msgstr "無法更改%s的權限"
-#: lib/obstack.c:417 lib/obstack.c:420 lib/xmalloc.c:45
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 src/csplit.c:233
msgid "memory exhausted"
msgstr "記憶體耗盡"
-#: lib/quotearg.c:238
+#: lib/openat.c:70
+#, fuzzy
+msgid "openat: unable to record current working directory"
+msgstr "無法建立目錄%s"
+
+#: lib/openat.c:85
+#, fuzzy
+msgid "openat: unable to restore working directory"
+msgstr "無法建立目錄%s"
+
+#: lib/quotearg.c:240
msgid "`"
msgstr "‘"
-#: lib/quotearg.c:239
+#: lib/quotearg.c:241
msgid "'"
msgstr "’"
@@ -237,36 +249,32 @@ msgstr "無法將 U+%04X 轉換至使用者的字元集"
msgid "cannot convert U+%04X to local character set: %s"
msgstr "無法將 U+%04X 轉換至使用者的字元集:%s"
-#: lib/userspec.c:146
+#: lib/userspec.c:125
msgid "invalid user"
msgstr "無效的使用者"
-#: lib/userspec.c:147
+#: lib/userspec.c:126
msgid "invalid group"
msgstr "無效的群組"
-#: lib/userspec.c:149
+#: lib/userspec.c:128
msgid "cannot get the login group of a numeric UID"
msgstr "無法取得 UID 數值所代表的登入群組"
-#: lib/userspec.c:151
-msgid "cannot omit both user and group"
-msgstr "不可同時省略使用者和所屬群組"
-
#. TRANSLATORS: %s denotes an author name.
-#: lib/version-etc.c:78
+#: lib/version-etc.c:81
#, fuzzy, c-format
msgid "Written by %s.\n"
msgstr "由 %s 編寫。\n"
#. TRANSLATORS: Each %s denotes an author name.
-#: lib/version-etc.c:82
+#: lib/version-etc.c:85
#, fuzzy, c-format
msgid "Written by %s and %s.\n"
msgstr "由 %s 編寫。\n"
#. TRANSLATORS: Each %s denotes an author name.
-#: lib/version-etc.c:86
+#: lib/version-etc.c:89
#, fuzzy, c-format
msgid "Written by %s, %s, and %s.\n"
msgstr "由 %s 編寫。\n"
@@ -274,7 +282,7 @@ msgstr "由 %s 編寫。\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
#. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:92
+#: lib/version-etc.c:95
#, fuzzy, c-format
msgid ""
"Written by %s, %s, %s,\n"
@@ -284,7 +292,7 @@ msgstr "由 %s 編寫。\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
#. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:98
+#: lib/version-etc.c:101
#, fuzzy, c-format
msgid ""
"Written by %s, %s, %s,\n"
@@ -294,7 +302,7 @@ msgstr "由 %s 編寫。\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
#. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:104
+#: lib/version-etc.c:107
#, fuzzy, c-format
msgid ""
"Written by %s, %s, %s,\n"
@@ -304,7 +312,7 @@ msgstr "由 %s 編寫。\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
#. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:111
+#: lib/version-etc.c:114
#, fuzzy, c-format
msgid ""
"Written by %s, %s, %s,\n"
@@ -314,7 +322,7 @@ msgstr "由 %s 編寫。\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
#. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:118
+#: lib/version-etc.c:121
#, fuzzy, c-format
msgid ""
"Written by %s, %s, %s,\n"
@@ -325,7 +333,7 @@ msgstr "由 %s 編寫。\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
#. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:126
+#: lib/version-etc.c:129
#, fuzzy, c-format
msgid ""
"Written by %s, %s, %s,\n"
@@ -336,7 +344,7 @@ msgstr "由 %s 編寫。\n"
#. TRANSLATORS: Each %s denotes an author name.
#. You can use line breaks, estimating that each author name occupies
#. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:136
+#: lib/version-etc.c:139
#, fuzzy, c-format
msgid ""
"Written by %s, %s, %s,\n"
@@ -344,7 +352,7 @@ msgid ""
"%s, %s, and others.\n"
msgstr "由 %s 編寫。\n"
-#: lib/version-etc.c:147
+#: lib/version-etc.c:150
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -357,43 +365,43 @@ msgstr ""
msgid "invalid argument: %s"
msgstr "%2$s的引數%1$s無效"
-#: lib/xmemcoll.c:54 src/expr.c:740
+#: lib/xmemcoll.c:50 src/expr.c:737
msgid "string comparison failed"
msgstr "字串比較出現錯誤"
-#: lib/xmemcoll.c:55 src/expr.c:741
+#: lib/xmemcoll.c:51 src/expr.c:738
msgid "Set LC_ALL='C' to work around the problem."
msgstr "請設定 LC_ALL='C' 避免問題出現。"
-#: lib/xmemcoll.c:57 src/expr.c:743
+#: lib/xmemcoll.c:53 src/expr.c:740
#, c-format
msgid "The strings compared were %s and %s."
msgstr "要比較的字串為%s及%s。"
-#: src/basename.c:49 src/cat.c:88 src/chgrp.c:115 src/chmod.c:265
-#: src/chown.c:90 src/chroot.c:41 src/cksum.c:277 src/comm.c:68 src/cp.c:155
-#: src/csplit.c:1435 src/cut.c:178 src/date.c:117 src/dd.c:312 src/df.c:710
-#: src/dircolors.c:100 src/dirname.c:41 src/du.c:166 src/echo.c:60
-#: src/env.c:114 src/expand.c:104 src/expr.c:98 src/factor.c:69 src/fmt.c:267
-#: src/fold.c:62 src/head.c:109 src/hostid.c:42 src/hostname.c:66 src/id.c:82
-#: src/install.c:593 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341
-#: src/logname.c:44 src/ls.c:3983 src/md5sum.c:120 src/mkdir.c:57
-#: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:307 src/nice.c:65 src/nl.c:172
-#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136
-#: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91
-#: src/ptx.c:1862 src/pwd.c:61 src/readlink.c:63 src/rm.c:102 src/rmdir.c:143
-#: src/seq.c:78 src/setuidgid.c:46 src/shred.c:153 src/sleep.c:48
-#: src/sort.c:272 src/split.c:97 src/stat.c:696 src/stty.c:488 src/su.c:432
-#: src/sum.c:55 src/sync.c:40 src/tac.c:122 src/tail.c:234 src/tee.c:58
-#: src/test.c:971 src/touch.c:226 src/tr.c:305 src/tsort.c:92 src/tty.c:64
-#: src/uname.c:105 src/unexpand.c:373 src/uniq.c:130 src/unlink.c:47
-#: src/uptime.c:189 src/users.c:115 src/wc.c:131 src/who.c:617 src/whoami.c:49
+#: src/basename.c:51 src/cat.c:85 src/chgrp.c:108 src/chmod.c:298
+#: src/chown.c:90 src/chroot.c:42 src/cksum.c:265 src/comm.c:69 src/cp.c:155
+#: src/csplit.c:1440 src/cut.c:184 src/date.c:117 src/dd.c:362 src/df.c:707
+#: src/dircolors.c:100 src/dirname.c:43 src/du.c:163 src/echo.c:60
+#: src/env.c:114 src/expand.c:106 src/expr.c:94 src/factor.c:70 src/fmt.c:269
+#: src/fold.c:64 src/head.c:109 src/hostid.c:44 src/hostname.c:61 src/id.c:83
+#: src/install.c:631 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:332
+#: src/logname.c:40 src/ls.c:4056 src/md5sum.c:127 src/mkdir.c:57
+#: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:294 src/nice.c:69 src/nl.c:168
+#: src/nohup.c:51 src/od.c:297 src/paste.c:412 src/pathchk.c:88
+#: src/pinky.c:509 src/pr.c:2751 src/printenv.c:57 src/printf.c:95
+#: src/ptx.c:1867 src/pwd.c:62 src/readlink.c:63 src/rm.c:102 src/rmdir.c:143
+#: src/seq.c:78 src/setuidgid.c:47 src/shred.c:153 src/sleep.c:43
+#: src/sort.c:273 src/split.c:105 src/stat.c:643 src/stty.c:495 src/su.c:404
+#: src/sum.c:55 src/sync.c:41 src/tac.c:127 src/tail.c:219 src/tee.c:58
+#: src/test.c:831 src/touch.c:224 src/tr.c:286 src/tsort.c:85 src/tty.c:65
+#: src/uname.c:113 src/unexpand.c:118 src/uniq.c:131 src/unlink.c:47
+#: src/uptime.c:175 src/users.c:103 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"
-#: src/basename.c:53
+#: src/basename.c:55
#, fuzzy, c-format
msgid ""
"Usage: %s NAME [SUFFIX]\n"
@@ -402,32 +410,32 @@ msgstr ""
"用法:%s [檔案]...\n"
" 或:%s [選項]\n"
-#: src/basename.c:58
+#: src/basename.c:60
msgid ""
"Print NAME with any leading directory components removed.\n"
"If specified, also remove a trailing SUFFIX.\n"
"\n"
msgstr ""
-#: src/basename.c:65 src/cat.c:124 src/chgrp.c:163 src/chmod.c:297
-#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:252
-#: src/csplit.c:1477 src/cut.c:223 src/date.c:218 src/dd.c:393 src/df.c:749
-#: src/dircolors.c:121 src/dirname.c:57 src/du.c:224 src/echo.c:92
-#: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89
-#: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55
-#: src/hostname.c:79 src/id.c:103 src/install.c:648 src/join.c:195
-#: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4117
-#: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:361
-#: src/nice.c:79 src/nl.c:228 src/nohup.c:66 src/od.c:369 src/paste.c:416
-#: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75
-#: src/printf.c:140 src/ptx.c:1909 src/pwd.c:72 src/readlink.c:80 src/rm.c:140
-#: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:217
-#: src/sleep.c:64 src/sort.c:343 src/split.c:130 src/stat.c:767 src/stty.c:705
-#: src/su.c:453 src/sum.c:75 src/sync.c:51 src/tac.c:145 src/tail.c:304
-#: src/tee.c:71 src/test.c:1050 src/touch.c:257 src/tr.c:378 src/true.c:43
-#: src/tsort.c:104 src/tty.c:76 src/uname.c:127 src/unexpand.c:397
-#: src/uniq.c:169 src/unlink.c:58 src/uptime.c:204 src/users.c:128
-#: src/wc.c:153 src/who.c:658 src/whoami.c:61 src/yes.c:58
+#: src/basename.c:67 src/cat.c:121 src/chgrp.c:156 src/chmod.c:330
+#: src/chown.c:151 src/chroot.c:60 src/cksum.c:280 src/comm.c:94 src/cp.c:253
+#: src/csplit.c:1482 src/cut.c:235 src/date.c:218 src/dd.c:454 src/df.c:746
+#: src/dircolors.c:121 src/dirname.c:59 src/du.c:221 src/echo.c:97
+#: src/env.c:133 src/expand.c:131 src/expr.c:162 src/factor.c:90
+#: src/false.c:43 src/fmt.c:300 src/fold.c:87 src/head.c:144 src/hostid.c:57
+#: src/hostname.c:74 src/id.c:104 src/install.c:689 src/join.c:195
+#: src/kill.c:120 src/link.c:59 src/ln.c:390 src/logname.c:51 src/ls.c:4197
+#: src/md5sum.c:163 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:349
+#: src/nice.c:84 src/nl.c:224 src/nohup.c:67 src/od.c:387 src/paste.c:436
+#: src/pathchk.c:100 src/pinky.c:536 src/pr.c:2863 src/printenv.c:70
+#: src/printf.c:143 src/ptx.c:1914 src/pwd.c:73 src/readlink.c:87 src/rm.c:140
+#: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:67 src/shred.c:218
+#: src/sleep.c:59 src/sort.c:344 src/split.c:139 src/stat.c:714 src/stty.c:712
+#: src/su.c:425 src/sum.c:75 src/sync.c:52 src/tac.c:150 src/tail.c:290
+#: src/tee.c:75 src/test.c:915 src/touch.c:256 src/tr.c:359 src/true.c:43
+#: src/tsort.c:97 src/tty.c:77 src/uname.c:135 src/unexpand.c:142
+#: src/uniq.c:170 src/unlink.c:58 src/uptime.c:190 src/users.c:116
+#: src/wc.c:150 src/who.c:672 src/whoami.c:58 src/yes.c:58
#, c-format
msgid ""
"\n"
@@ -436,29 +444,36 @@ msgstr ""
"\n"
"請向 <%s> 回報錯誤。\n"
-#: src/basename.c:114 src/chgrp.c:246 src/chmod.c:394 src/chown.c:264
-#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1377 src/dirname.c:89
-#: src/expr.c:199 src/install.c:286 src/link.c:88 src/mkdir.c:125
-#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189
-#: src/readlink.c:128 src/rm.c:234 src/rmdir.c:208 src/seq.c:374
-#: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:824 src/unlink.c:89
-msgid "too few arguments"
-msgstr "引數過少"
-
-#: src/basename.c:115 src/dircolors.c:475 src/dirname.c:90 src/hostid.c:78
-#: src/hostname.c:126 src/link.c:94 src/logname.c:91 src/mknod.c:140
-#: src/readlink.c:136 src/seq.c:380 src/split.c:535 src/tr.c:1749
-#: src/uname.c:215 src/unlink.c:95 src/uptime.c:247 src/users.c:171
-#: src/who.c:806
-msgid "too many arguments"
-msgstr "引數過多"
+#: src/basename.c:111 src/chgrp.c:265 src/chmod.c:443 src/chown.c:287
+#: src/chroot.c:84 src/comm.c:288 src/csplit.c:1380 src/dirname.c:86
+#: src/expr.c:200 src/join.c:849 src/link.c:83 src/mkdir.c:123
+#: src/mkfifo.c:112 src/mknod.c:143 src/nohup.c:95 src/pathchk.c:139
+#: src/printf.c:667 src/readlink.c:146 src/rm.c:230 src/rmdir.c:206
+#: src/seq.c:367 src/setuidgid.c:95 src/sleep.c:121 src/stat.c:772
+#: src/tr.c:1723 src/unlink.c:81
+#, fuzzy
+msgid "missing operand"
+msgstr "%s:‘%c’後面應該是整數"
+
+#: src/basename.c:117 src/comm.c:296 src/cp.c:526 src/date.c:374
+#: src/dircolors.c:464 src/dirname.c:92 src/du.c:726 src/hostid.c:82
+#: src/hostname.c:120 src/id.c:169 src/install.c:341 src/join.c:739
+#: src/link.c:91 src/ln.c:517 src/logname.c:76 src/md5sum.c:636
+#: src/mknod.c:154 src/mv.c:467 src/od.c:1835 src/ptx.c:2168
+#: src/readlink.c:154 src/seq.c:373 src/split.c:545 src/tr.c:1738
+#: src/tsort.c:562 src/tty.c:117 src/uname.c:221 src/uniq.c:447 src/uniq.c:464
+#: src/unlink.c:87 src/uptime.c:222 src/users.c:148 src/who.c:828
+#: src/whoami.c:84
+#, fuzzy, c-format
+msgid "extra operand %s"
+msgstr "多餘的參數‘%s’"
-#: src/cat.c:92
+#: src/cat.c:89
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
msgstr "用法:%s [選項] [檔案]...\n"
-#: src/cat.c:96
+#: src/cat.c:93
msgid ""
"Concatenate FILE(s), or standard input, to standard output.\n"
"\n"
@@ -478,7 +493,7 @@ msgstr ""
" -n, --number 輸出時加上行號\n"
" -s, --squeeze-blank 不連續輸出超過一行空行\n"
-#: src/cat.c:106
+#: src/cat.c:103
msgid ""
" -t equivalent to -vT\n"
" -T, --show-tabs display TAB characters as ^I\n"
@@ -491,7 +506,7 @@ msgstr ""
" -v, --show-nonprinting 除了換行及 TAB 字元外,使用 ^ 及 M- 表示法顯示字"
"元\n"
-#: src/cat.c:114 src/fmt.c:293 src/sum.c:71
+#: src/cat.c:111 src/fmt.c:296 src/sum.c:71
msgid ""
"\n"
"With no FILE, or when FILE is -, read standard input.\n"
@@ -499,7 +514,7 @@ msgstr ""
"\n"
"如果沒有指定<檔案>或<檔案>是 -,則由標準輸入讀取資料。\n"
-#: src/cat.c:119
+#: src/cat.c:116
msgid ""
"\n"
" -B, --binary use binary writes to the console device.\n"
@@ -509,50 +524,36 @@ msgstr ""
" -B, --binary (DOS/Windows)以二元碼模式將資料輸出至畫面。\n"
"\n"
-#: src/cat.c:311
+#: src/cat.c:309
#, c-format
msgid "cannot do ioctl on `%s'"
msgstr "無法對‘%s’執行輸出入控制 (ioctl)"
-#: src/cat.c:669 src/dd.c:1302 src/tee.c:155 src/yes.c:92
+#: src/cat.c:650 src/dd.c:1487 src/sort.c:265 src/tee.c:157 src/yes.c:92
msgid "standard output"
msgstr "標準輸出"
-#: src/cat.c:800
+#: src/cat.c:781
#, c-format
msgid "%s: input file is output file"
msgstr "%s:輸出和輸入檔案是相同的"
-#: src/cat.c:865
+#: src/cat.c:846
#, fuzzy
msgid "closing standard input"
msgstr "標準輸出"
-#: src/cat.c:868
+#: src/cat.c:849
#, fuzzy
msgid "closing standard output"
msgstr "標準輸出"
-#: src/chgrp.c:86
-#, fuzzy
-msgid "cannot change to null group"
-msgstr "無法更改%s的擁有者和/或所屬群組"
-
-#: src/chgrp.c:95
+#: src/chgrp.c:95 src/install.c:616
#, fuzzy, c-format
-msgid "invalid group name %s"
+msgid "invalid group %s"
msgstr "無效的群組"
-#: src/chgrp.c:99
-msgid "group number"
-msgstr "群組代號"
-
-#: src/chgrp.c:102
-#, fuzzy, c-format
-msgid "invalid group number %s"
-msgstr "無效的數字"
-
-#: src/chgrp.c:119
+#: src/chgrp.c:112
#, fuzzy, c-format
msgid ""
"Usage: %s [OPTION]... GROUP FILE...\n"
@@ -561,7 +562,7 @@ msgstr ""
"用法:%s [選項]... [檔案]...\n"
" 或:%s --traditional [檔案] [[+]偏移值 [[+]標號]]\n"
-#: src/chgrp.c:124
+#: src/chgrp.c:117
#, fuzzy
msgid ""
"Change the group of each FILE to GROUP.\n"
@@ -577,7 +578,7 @@ msgstr ""
" -c, --changes 像 --verbose,但只在有更改時才顯示結果\n"
" --dereference 會影響符號鏈結所指示的對象,而非符號鏈結本身\n"
-#: src/chgrp.c:132 src/chown.c:108
+#: src/chgrp.c:125 src/chown.c:107
#, fuzzy
msgid ""
" -h, --no-dereference affect each symbolic link instead of any "
@@ -588,13 +589,13 @@ msgstr ""
" -h, --no-dereference 會影響符號鏈結本身,而非符號鏈結所指示的目的地\n"
" (當系統支援更改符號鏈結的擁有者,此選項才有效)\n"
-#: src/chgrp.c:137 src/chown.c:120
+#: src/chgrp.c:130 src/chown.c:119
msgid ""
" --no-preserve-root do not treat `/' specially (the default)\n"
" --preserve-root fail to operate recursively on `/'\n"
msgstr ""
-#: src/chgrp.c:141
+#: src/chgrp.c:134
#, fuzzy
msgid ""
" -f, --silent, --quiet suppress most error messages\n"
@@ -609,7 +610,7 @@ msgstr ""
" -R, --recursive 遞迴處理所有的檔案及副目錄\n"
" -v, --verbose 處理任何檔案都會顯示訊息\n"
-#: src/chgrp.c:149 src/chown.c:132
+#: src/chgrp.c:142 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"
@@ -623,59 +624,79 @@ msgid ""
"\n"
msgstr ""
-#: src/chgrp.c:254 src/chmod.c:407 src/chmod.c:415 src/chown.c:272
-#: src/chown.c:299 src/cp.c:297 src/pwd.c:274 src/rm.c:244 src/touch.c:159
-#: src/touch.c:350
+#: src/chgrp.c:246 src/chown.c:268
+msgid "-R --dereference requires either -H or -L"
+msgstr ""
+
+#: src/chgrp.c:252 src/chown.c:274
+msgid "-R -h requires -P"
+msgstr ""
+
+#: src/chgrp.c:267 src/chmod.c:445 src/chown.c:289 src/comm.c:290
+#: src/csplit.c:1382 src/join.c:851 src/link.c:85 src/mknod.c:145
+#: src/setuidgid.c:97 src/tr.c:1726
+#, fuzzy, c-format
+msgid "missing operand after %s"
+msgstr "%s:‘%c’後面應該是整數"
+
+#: src/chgrp.c:275 src/chmod.c:457 src/chmod.c:465 src/chown.c:297
+#: src/chown.c:326 src/cp.c:298 src/pwd.c:280 src/rm.c:240 src/touch.c:158
+#: src/touch.c:346
#, c-format
msgid "failed to get attributes of %s"
msgstr "無法取得%s的屬性"
-#: src/chmod.c:111
+#: src/chmod.c:120
#, c-format
msgid "getting new attributes of %s"
msgstr "正在檢查%s的最新屬性"
-#: src/chmod.c:133
+#: src/chmod.c:142 src/chown-core.c:116
+#, c-format
+msgid "neither symbolic link %s nor referent has been changed\n"
+msgstr "符號鏈結%s和該鏈結所指示的對象都沒有更改\n"
+
+#: src/chmod.c:152
#, c-format
msgid "mode of %s changed to %04lo (%s)\n"
msgstr "%s的權限模式已更改為 %04lo (%s)\n"
-#: src/chmod.c:136
+#: src/chmod.c:155
#, c-format
msgid "failed to change mode of %s to %04lo (%s)\n"
msgstr "無法將%s的權限模式更改為 %04lo (%s)\n"
-#: src/chmod.c:139
+#: src/chmod.c:158
#, c-format
msgid "mode of %s retained as %04lo (%s)\n"
msgstr "%s的權限模式保留為 %04lo (%s)\n"
-#: src/chmod.c:166 src/chown-core.c:190 src/copy.c:160 src/du.c:349
+#: src/chmod.c:188 src/chown-core.c:278 src/copy.c:159 src/du.c:346
#, c-format
msgid "cannot access %s"
msgstr "無法存取%s"
-#: src/chmod.c:170 src/chown-core.c:194 src/du.c:355
+#: src/chmod.c:193 src/chown-core.c:283 src/du.c:351
#, c-format
msgid "%s"
msgstr ""
-#: src/chmod.c:174 src/chown-core.c:198 src/du.c:362
+#: src/chmod.c:198 src/chown-core.c:288 src/du.c:357
#, fuzzy, c-format
msgid "cannot read directory %s"
msgstr "無法建立目錄%s"
-#: src/chmod.c:210
+#: src/chmod.c:227
#, fuzzy, c-format
msgid "changing permissions of %s"
msgstr "無法更改%s的權限"
-#: src/chmod.c:244 src/chown-core.c:341 src/du.c:515
+#: src/chmod.c:277 src/chown-core.c:472 src/du.c:505
#, fuzzy
msgid "fts_read failed"
msgstr "讀入時發生錯誤"
-#: src/chmod.c:269
+#: src/chmod.c:302
#, c-format
msgid ""
"Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -686,7 +707,7 @@ msgstr ""
" 或:%s [選項]... 八進位模式 檔案...\n"
" 或:%s [選項]... --reference=參考檔 檔案...\n"
-#: src/chmod.c:275
+#: src/chmod.c:308
msgid ""
"Change the mode of each FILE to MODE.\n"
"\n"
@@ -694,13 +715,13 @@ msgid ""
"made\n"
msgstr ""
-#: src/chmod.c:280
+#: src/chmod.c:313
msgid ""
" --no-preserve-root do not treat `/' specially (the default)\n"
" --preserve-root fail to operate recursively on `/'\n"
msgstr ""
-#: src/chmod.c:284
+#: src/chmod.c:317
#, fuzzy
msgid ""
" -f, --silent, --quiet suppress most error messages\n"
@@ -716,7 +737,7 @@ msgstr ""
" --reference=參考檔 使用 <參考檔> 的模式,而非自行指定權限模式\n"
" -R, --recursive 以遞迴方式更改所有的檔案及副目錄\n"
-#: src/chmod.c:292
+#: src/chmod.c:325
msgid ""
"\n"
"Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
@@ -726,78 +747,86 @@ msgstr ""
"<模式> 由三部份組成:一個或以上的 ugoa 字元、一個或以上的 +-=符號、\n"
"和一個或以上的 rwxXstugo 字元。\n"
-#: src/chmod.c:356
-#, fuzzy, c-format
-msgid "invalid character %s in mode string %s"
-msgstr "類型‘%2$s’中含有無效的字元‘%1$c’。"
+#: src/chmod.c:432
+#, fuzzy
+msgid "cannot combine mode and --reference options"
+msgstr "無法將 %s 的檔案指標重新定位"
-#: src/chmod.c:403
+#: src/chmod.c:453
#, fuzzy, c-format
-msgid "invalid mode string: %s"
-msgstr "無效的類型‘%s’"
-
-#: src/chown-core.c:116
-#, c-format
-msgid "neither symbolic link %s nor referent has been changed\n"
-msgstr "符號鏈結%s和該鏈結所指示的對象都沒有更改\n"
+msgid "invalid mode: %s"
+msgstr "無效的寬度:‘%s’"
-#: src/chown-core.c:143
+#: src/chown-core.c:142
#, c-format
msgid "changed ownership of %s to %s\n"
msgstr "%s的擁有者已更改為 %s\n"
-#: src/chown-core.c:144
+#: src/chown-core.c:143
#, c-format
msgid "changed group of %s to %s\n"
msgstr "%s的所屬群組已更改為 %s\n"
-#: src/chown-core.c:148
+#: src/chown-core.c:144
+#, fuzzy, c-format
+msgid "no change to ownership of %s\n"
+msgstr "無法更改%s的權限"
+
+#: src/chown-core.c:147
#, fuzzy, c-format
msgid "failed to change ownership of %s to %s\n"
msgstr "無法更改%s的權限"
-#: src/chown-core.c:149
+#: src/chown-core.c:148
#, c-format
msgid "failed to change group of %s to %s\n"
msgstr "無法更改%s的所屬群組為 %s\n"
-#: src/chown-core.c:153
+#: src/chown-core.c:149
+#, fuzzy, c-format
+msgid "failed to change ownership of %s\n"
+msgstr "無法更改%s的權限"
+
+#: src/chown-core.c:152
#, c-format
msgid "ownership of %s retained as %s\n"
msgstr "%s的擁有者已保留為 %s\n"
-#: src/chown-core.c:154
+#: src/chown-core.c:153
#, c-format
msgid "group of %s retained as %s\n"
msgstr "%s的所屬群組已保留為 %s\n"
-#: src/chown-core.c:218
+#: src/chown-core.c:154
+#, fuzzy, c-format
+msgid "ownership of %s retained\n"
+msgstr "%s的擁有者已保留為 %s\n"
+
+#: src/chown-core.c:318
#, fuzzy, c-format
msgid "cannot dereference %s"
msgstr "無法建立目錄%s"
-#: src/chown-core.c:284
+#: src/chown-core.c:405
#, c-format
msgid "changing ownership of %s"
msgstr "正在更改%s的擁有者"
-#: src/chown-core.c:285
+#: src/chown-core.c:406
#, fuzzy, c-format
msgid "changing group of %s"
msgstr "無法更改%s的擁有者和/或所屬群組"
#: src/chown.c:94
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Usage: %s [OPTION]... OWNER[:[GROUP]] FILE...\n"
-" or: %s [OPTION]... :GROUP FILE...\n"
+"Usage: %s [OPTION]... [OWNER][:[GROUP]] FILE...\n"
" or: %s [OPTION]... --reference=RFILE FILE...\n"
msgstr ""
-"用法:%s [選項]... 擁有者[:[群組]] 檔案...\n"
-" 或:%s [選項]... :群組 檔案...\n"
-" 或:%s [選項]... --reference=參考檔 檔案...\n"
+"用法:%s [選項]... [檔案]...\n"
+" 或:%s --traditional [檔案] [[+]偏移值 [[+]標號]]\n"
-#: src/chown.c:100
+#: src/chown.c:99
#, fuzzy
msgid ""
"Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
@@ -814,7 +843,7 @@ msgstr ""
" -c, --changes 像 --verbose,但只在有更改時才顯示結果\n"
" --dereference 受影響的是符號鏈結所指示的對象,而非符號鏈結本身\n"
-#: src/chown.c:113
+#: src/chown.c:112
msgid ""
" --from=CURRENT_OWNER:CURRENT_GROUP\n"
" change the owner and/or group of each file only if\n"
@@ -829,7 +858,7 @@ msgstr ""
" 才會更改擁有者和群組。其中一個可以省略,這時\n"
" 已省略的屬性就不需要符合原有的屬性。\n"
-#: src/chown.c:124
+#: src/chown.c:123
#, fuzzy
msgid ""
" -f, --silent, --quiet suppress most error messages\n"
@@ -844,19 +873,20 @@ msgstr ""
" -R, --recursive 遞迴處理所有的檔案及副目錄\n"
" -v, --verbose 處理任何檔案都會顯示訊息\n"
-#: src/chown.c:146
+#: src/chown.c:145
+#, fuzzy
msgid ""
"\n"
"Owner is unchanged if missing. Group is unchanged if missing, but changed\n"
-"to login group if implied by a `:'. OWNER and GROUP may be numeric as well\n"
-"as symbolic.\n"
+"to login group if implied by a `:' following a symbolic OWNER.\n"
+"OWNER and GROUP may be numeric as well as symbolic.\n"
msgstr ""
"\n"
"如果沒有指定 <擁有者>,則不會更改。<群組> 若沒有指定也不會更改,\n"
"但當加上‘:’時 <群組> 會更改為指定擁有者的主要群組。\n"
"<擁有者> 及 <群組> 可以是數字或名稱。\n"
-#: src/chroot.c:45
+#: src/chroot.c:46
#, fuzzy, c-format
msgid ""
"Usage: %s NEWROOT [COMMAND...]\n"
@@ -865,39 +895,39 @@ msgstr ""
"用法:%s [檔案]...\n"
" 或:%s [選項]\n"
-#: src/chroot.c:49
+#: src/chroot.c:50
msgid ""
"Run COMMAND with root directory set to NEWROOT.\n"
"\n"
msgstr ""
-#: src/chroot.c:55
+#: src/chroot.c:56
msgid ""
"\n"
"If no command is given, run ``${SHELL} -i'' (default: /bin/sh).\n"
msgstr ""
-#: src/chroot.c:85
+#: src/chroot.c:89
#, fuzzy, c-format
msgid "cannot change root directory to %s"
msgstr "無法進入%s目錄"
-#: src/chroot.c:88
+#: src/chroot.c:92
#, fuzzy
msgid "cannot chdir to root directory"
msgstr "無法進入%s目錄"
-#: src/chroot.c:110 src/nohup.c:181 src/setuidgid.c:126
+#: src/chroot.c:115 src/nohup.c:181 src/setuidgid.c:124
#, fuzzy, c-format
msgid "cannot run command %s"
msgstr "無法對‘%s’執行輸出入控制 (ioctl)"
-#: src/cksum.c:233
+#: src/cksum.c:221
#, c-format
msgid "%s: file too long"
msgstr "%s:檔案過大"
-#: src/cksum.c:281
+#: src/cksum.c:269
#, c-format
msgid ""
"Usage: %s [FILE]...\n"
@@ -906,7 +936,7 @@ msgstr ""
"用法:%s [檔案]...\n"
" 或:%s [選項]\n"
-#: src/cksum.c:286
+#: src/cksum.c:274
msgid ""
"Print CRC checksum and byte counts of each FILE.\n"
"\n"
@@ -914,16 +944,16 @@ msgstr ""
"印出每個 <檔案> 的 CRC 總和檢查值及位元組總數。\n"
"\n"
-#: src/comm.c:72 src/join.c:158
+#: src/comm.c:73 src/join.c:158
#, c-format
msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
msgstr "用法:%s [選項]... 檔案1 檔案2\n"
-#: src/comm.c:76
+#: src/comm.c:77
msgid "Compare sorted files FILE1 and FILE2 line by line.\n"
msgstr ""
-#: src/comm.c:79
+#: src/comm.c:80
msgid ""
"\n"
"With no options, produce three-column output. Column one contains\n"
@@ -931,7 +961,7 @@ msgid ""
"and column three contains lines common to both files.\n"
msgstr ""
-#: src/comm.c:85
+#: src/comm.c:86
#, fuzzy
msgid ""
"\n"
@@ -945,245 +975,246 @@ msgstr ""
" -2 不顯示任何一行只在 RIGHT_FILE 出現過的資料\n"
" -3 不顯示兩個檔案中同時出現的任何一行\n"
-#: src/copy.c:225 src/du.c:744 src/fmt.c:435 src/head.c:866 src/tail.c:1268
+#: src/copy.c:221 src/du.c:734 src/fmt.c:431 src/head.c:866 src/tac.c:536
+#: src/tail.c:1299
#, c-format
msgid "cannot open %s for reading"
msgstr "無法開啟%s來讀取資料"
-#: src/copy.c:231 src/copy.c:285 src/copy.c:305 src/dd.c:1331 src/tail.c:1098
-#: src/tail.c:1170
+#: src/copy.c:227 src/copy.c:281 src/copy.c:301 src/dd.c:1516 src/tail.c:1131
+#: src/tail.c:1201
#, c-format
msgid "cannot fstat %s"
msgstr "無法 fstat%s"
-#: src/copy.c:241
+#: src/copy.c:237
#, c-format
msgid "skipping file %s, as it was replaced while being copied"
msgstr "略過檔案%s,因為準備複製時它已被其它檔案取代"
-#: src/copy.c:261 src/copy.c:897 src/copy.c:1093 src/copy.c:1196 src/ln.c:297
-#: src/remove.c:732 src/remove.c:784 src/remove.c:905 src/remove.c:1029
-#: src/remove.c:1155
+#: src/copy.c:257 src/copy.c:892 src/copy.c:1088 src/copy.c:1189 src/ln.c:306
+#: src/remove.c:763 src/remove.c:815 src/remove.c:936 src/remove.c:1063
+#: src/remove.c:1182
#, fuzzy, c-format
msgid "cannot remove %s"
msgstr "無法建立目錄%s"
-#: src/copy.c:276
+#: src/copy.c:272
#, fuzzy, c-format
msgid "cannot create regular file %s"
msgstr "無法建立暫存檔"
-#: src/copy.c:334 src/dd.c:902 src/dd.c:1112
+#: src/copy.c:330 src/dd.c:1017 src/dd.c:1276
#, fuzzy, c-format
msgid "reading %s"
msgstr "讀取 %s 時發生錯誤"
-#: src/copy.c:368 src/head.c:437
+#: src/copy.c:364 src/head.c:437
#, fuzzy, c-format
msgid "cannot lseek %s"
msgstr "%s:無法搜尋至位置 %s%s"
-#: src/copy.c:383 src/copy.c:407 src/dd.c:1156 src/dd.c:1217
+#: src/copy.c:379 src/copy.c:403 src/dd.c:1333 src/dd.c:1395
#, fuzzy, c-format
msgid "writing %s"
msgstr "寫入 %s 時發生錯誤"
-#: src/copy.c:415 src/copy.c:421 src/head.c:874
+#: src/copy.c:411 src/copy.c:417 src/head.c:874
#, fuzzy, c-format
msgid "closing %s"
msgstr "正在關閉 %s (fd=%d)"
-#: src/copy.c:640
+#: src/copy.c:636
#, c-format
msgid "%s: overwrite %s, overriding mode %04lo? "
msgstr "%s:是否覆寫%s,而不理會權限模式 %04lo? "
-#: src/copy.c:646
+#: src/copy.c:642
#, c-format
msgid "%s: overwrite %s? "
msgstr "%s:是否覆寫%s? "
-#: src/copy.c:841 src/copy.c:879 src/df.c:492 src/stat.c:654
+#: src/copy.c:836 src/copy.c:874 src/df.c:489 src/stat.c:600
#, fuzzy, c-format
msgid "cannot stat %s"
msgstr "無法建立目錄%s"
-#: src/copy.c:851
+#: src/copy.c:846
#, fuzzy, c-format
msgid "omitting directory %s"
msgstr "無法建立目錄%s"
-#: src/copy.c:865
+#: src/copy.c:860
#, c-format
msgid "warning: source file %s specified more than once"
msgstr "警告:指定了來源檔%s多於一次"
-#: src/copy.c:910 src/ln.c:241
+#: src/copy.c:905 src/ln.c:231
#, c-format
msgid "%s and %s are the same file"
msgstr "%s及%s為同一檔案"
-#: src/copy.c:920
+#: src/copy.c:915
#, fuzzy, c-format
msgid "cannot overwrite non-directory %s with directory %s"
msgstr "無法進入%s目錄"
-#: src/copy.c:937
+#: src/copy.c:932
#, c-format
msgid "will not overwrite just-created %s with %s"
msgstr "不會以%2$s覆寫剛建立的%1$s"
-#: src/copy.c:948
+#: src/copy.c:943
#, fuzzy, c-format
msgid "cannot overwrite directory %s with non-directory"
msgstr "無法建立目錄%s"
-#: src/copy.c:1021
+#: src/copy.c:1016
#, fuzzy, c-format
msgid "cannot overwrite directory %s"
msgstr "無法建立目錄%s"
-#: src/copy.c:1030
+#: src/copy.c:1025
#, fuzzy, c-format
msgid "cannot move directory onto non-directory: %s -> %s"
msgstr "無法進入%s目錄"
-#: src/copy.c:1053
+#: src/copy.c:1046
#, c-format
msgid "backing up %s would destroy source; %s not moved"
msgstr "將%s備份會破壞來源檔,故不移動%s。"
-#: src/copy.c:1054
+#: src/copy.c:1047
#, c-format
msgid "backing up %s would destroy source; %s not copied"
msgstr "將%s備份會破壞來源檔,故不複製%s。"
-#: src/copy.c:1072 src/ln.c:279
+#: src/copy.c:1066 src/ln.c:261
#, c-format
msgid "cannot backup %s"
msgstr "無法備份%s"
-#: src/copy.c:1108 src/ln.c:314
+#: src/copy.c:1103 src/ln.c:277
#, c-format
msgid " (backup: %s)"
msgstr " (備份:%s)"
-#: src/copy.c:1171
+#: src/copy.c:1166
#, fuzzy, c-format
msgid "cannot copy a directory, %s, into itself, %s"
msgstr "無法建立目錄%s"
-#: src/copy.c:1178
+#: src/copy.c:1173
#, fuzzy, c-format
msgid "will not create hard link %s to directory %s"
msgstr "無法進入%s目錄"
-#: src/copy.c:1204
+#: src/copy.c:1197
#, fuzzy, c-format
msgid "cannot create hard link %s to %s"
msgstr "無法建立目錄%s"
-#: src/copy.c:1258
+#: src/copy.c:1251
#, fuzzy, c-format
msgid "cannot move %s to a subdirectory of itself, %s"
msgstr "無法進入%s目錄"
-#: src/copy.c:1301
+#: src/copy.c:1294
#, fuzzy, c-format
msgid "cannot move %s to %s"
msgstr "無法對‘%s’執行輸出入控制 (ioctl)"
-#: src/copy.c:1313
+#: src/copy.c:1306
#, c-format
msgid "inter-device move failed: %s to %s; unable to remove target"
msgstr "無法進行跨裝置的移動 (%s至%s);無法移除目標檔案或目錄"
-#: src/copy.c:1341
+#: src/copy.c:1334
#, c-format
msgid "cannot copy cyclic symbolic link %s"
msgstr "無法複製循環的符號鏈結%s"
-#: src/copy.c:1418
+#: src/copy.c:1411
#, c-format
msgid "%s: can make relative symbolic links only in current directory"
msgstr "%s:只能於目前的目錄中建立相對符號鏈結"
-#: src/copy.c:1425
+#: src/copy.c:1418
#, fuzzy, c-format
msgid "cannot create symbolic link %s to %s"
msgstr "無法建立目錄%s"
-#: src/copy.c:1436
+#: src/copy.c:1429
#, fuzzy, c-format
msgid "cannot create link %s"
msgstr "無法建立目錄%s"
-#: src/copy.c:1458 src/mkfifo.c:134
+#: src/copy.c:1451 src/mkfifo.c:132
#, fuzzy, c-format
msgid "cannot create fifo %s"
msgstr "無法建立目錄%s"
-#: src/copy.c:1469
+#: src/copy.c:1462
#, fuzzy, c-format
msgid "cannot create special file %s"
msgstr "字元特殊檔案"
-#: src/copy.c:1481 src/ls.c:2647 src/stat.c:439
+#: src/copy.c:1474 src/ls.c:2702 src/stat.c:387
#, fuzzy, c-format
msgid "cannot read symbolic link %s"
msgstr "符號連結"
-#: src/copy.c:1507
+#: src/copy.c:1500
#, fuzzy, c-format
msgid "cannot create symbolic link %s"
msgstr "無法建立目錄%s"
-#: src/copy.c:1523 src/copy.c:1584 src/cp.c:331
+#: src/copy.c:1516 src/copy.c:1577 src/cp.c:332
#, c-format
msgid "failed to preserve ownership for %s"
msgstr "無法保留%s的擁有者及所屬群組"
-#: src/copy.c:1538
+#: src/copy.c:1531
#, c-format
msgid "%s has unknown file type"
msgstr "%s的檔案類型不詳"
-#: src/copy.c:1571
+#: src/copy.c:1564
#, c-format
msgid "preserving times for %s"
msgstr "保留%s的時間"
-#: src/copy.c:1596
+#: src/copy.c:1589
#, fuzzy, c-format
msgid "failed to lookup file %s"
msgstr "無法保留%s的時間"
-#: src/copy.c:1601
+#: src/copy.c:1594
#, c-format
msgid "failed to preserve authorship for %s"
msgstr "無法保留%s的著作者"
-#: src/copy.c:1620
+#: src/copy.c:1613
#, fuzzy, c-format
msgid "setting permissions for %s"
msgstr "無法更改%s的權限"
-#: src/copy.c:1642 src/ln.c:332
+#: src/copy.c:1635 src/ln.c:323
#, c-format
msgid "cannot un-backup %s"
msgstr "無法將%s的備份還原"
-#: src/copy.c:1646
+#: src/copy.c:1639
#, c-format
msgid "%s -> %s (unbackup)\n"
msgstr "%s→%s (還原備份)\n"
-#: src/cp.c:159 src/mv.c:311
-#, c-format
+#: src/cp.c:159 src/mv.c:298
+#, fuzzy, c-format
msgid ""
-"Usage: %s [OPTION]... SOURCE DEST\n"
+"Usage: %s [OPTION]... [-T] SOURCE DEST\n"
" or: %s [OPTION]... SOURCE... DIRECTORY\n"
-" or: %s [OPTION]... --target-directory=DIRECTORY SOURCE...\n"
+" or: %s [OPTION]... -t DIRECTORY SOURCE...\n"
msgstr ""
"用法:%s [選項]... 來源 目的地\n"
" 或:%s [選項]... 來源... 目錄\n"
@@ -1197,18 +1228,19 @@ msgstr ""
"將 <來源> 檔案複製至 <目的地>,或將多個 <檔案> 複製至指定 <目錄>。\n"
"\n"
-#: src/cp.c:169 src/csplit.c:1448 src/cut.c:190 src/df.c:720 src/du.c:178
-#: src/expand.c:117 src/fmt.c:277 src/fold.c:75 src/head.c:123
-#: src/install.c:609 src/kill.c:104 src/ln.c:360 src/ls.c:3993 src/mkdir.c:66
-#: src/mkfifo.c:60 src/mknod.c:61 src/mv.c:321 src/nl.c:185 src/paste.c:406
-#: src/pr.c:2761 src/ptx.c:1874 src/shred.c:163 src/sort.c:286 src/split.c:110
-#: src/tac.c:135 src/tail.c:248 src/touch.c:235 src/unexpand.c:386
-#: src/uniq.c:143
+#: src/cp.c:169 src/csplit.c:1453 src/cut.c:196 src/df.c:717 src/du.c:175
+#: src/expand.c:119 src/fmt.c:279 src/fold.c:77 src/head.c:123
+#: src/install.c:648 src/kill.c:104 src/ln.c:351 src/ls.c:4066 src/mkdir.c:66
+#: src/mkfifo.c:60 src/mknod.c:61 src/mv.c:308 src/nl.c:181 src/paste.c:426
+#: src/pr.c:2764 src/ptx.c:1879 src/shred.c:163 src/sort.c:287 src/split.c:119
+#: src/tac.c:140 src/tail.c:233 src/touch.c:233 src/unexpand.c:131
+#: src/uniq.c:144
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "長選項必須用的引數在使用短選項時也是必須的。\n"
#: src/cp.c:172
+#, fuzzy
msgid ""
" -a, --archive same as -dpR\n"
" --backup[=CONTROL] make a backup of each existing destination "
@@ -1289,17 +1321,19 @@ msgstr ""
" --strip-trailing-slashes 移除引數中所有 <來源> 檔案/目錄末端的斜號\n"
#: src/cp.c:211
+#, fuzzy
msgid ""
" -s, --symbolic-link make symbolic links instead of copying\n"
" -S, --suffix=SUFFIX override the usual backup suffix\n"
-" --target-directory=DIRECTORY move all SOURCE arguments into "
+" -t, --target-directory=DIRECTORY copy all SOURCE arguments into "
"DIRECTORY\n"
+" -T, --no-target-directory treat DEST as a normal file\n"
msgstr ""
" -s, --symbolic-link 只建立符號鏈結而不是複製檔案\n"
" -S, --suffix=後置字串 自行指定備份檔的 <後置字串>\n"
" --target-directory=目錄 將所有 <來源> 檔案/目錄複製至指定的 <目錄>\n"
-#: src/cp.c:216
+#: src/cp.c:217
msgid ""
" -u, --update copy only when the SOURCE file is newer\n"
" than the destination file or when the\n"
@@ -1312,7 +1346,7 @@ msgstr ""
" -v, --verbose 詳細顯示進行的步驟\n"
" -x, --one-file-system 不會跨越檔案系統進行操作\n"
-#: src/cp.c:225
+#: src/cp.c:226
msgid ""
"\n"
"By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -1331,7 +1365,7 @@ msgstr ""
"使用 --sparse=never 會禁止產生 sparse 檔案。\n"
"\n"
-#: src/cp.c:234
+#: src/cp.c:235
msgid ""
"The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
"The version control method may be selected via the --backup option or "
@@ -1344,7 +1378,7 @@ msgstr ""
"變數來選擇。以下是可用的變數值:\n"
"\n"
-#: src/cp.c:240 src/install.c:642 src/ln.c:392 src/mv.c:355
+#: src/cp.c:241 src/install.c:683 src/ln.c:384 src/mv.c:343
msgid ""
" none, off never make backups (even if --backup is given)\n"
" numbered, t make numbered backups\n"
@@ -1356,7 +1390,7 @@ msgstr ""
" existing, nil 若有數字的備份檔已經存在則使用數字,否則使用普通方式備份\n"
" simple, never 永遠使用普通方式備份\n"
-#: src/cp.c:246
+#: src/cp.c:247
msgid ""
"\n"
"As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -1367,56 +1401,55 @@ msgstr ""
"有一個特別情況:如果同時指定 --force 和 --backup 選項,而且 <來源> 和\n"
"<目的地> 是同一個已存在的普通檔案的話,cp 會將 <來源> 檔案備份。\n"
-#: src/cp.c:317
+#: src/cp.c:318
#, c-format
msgid "failed to preserve times for %s"
msgstr "無法保留%s的時間"
-#: src/cp.c:341
+#: src/cp.c:342
#, fuzzy, c-format
msgid "failed to preserve permissions for %s"
msgstr "無法更改%s的權限"
-#: src/cp.c:424
+#: src/cp.c:425
#, fuzzy, c-format
msgid "cannot make directory %s"
msgstr "無法建立目錄%s"
-#: src/cp.c:483 src/ln.c:496 src/mv.c:460 src/shred.c:1645
-#, fuzzy
-msgid "missing file argument"
-msgstr "略過引數"
-
-#: src/cp.c:488
-#, fuzzy
-msgid "missing destination file"
-msgstr "缺少了欄位數值"
-
-#: src/cp.c:513 src/ln.c:165 src/ln.c:188 src/ln.c:215 src/ln.c:303
+#: src/cp.c:489 src/cp.c:949 src/install.c:186 src/install.c:287 src/ln.c:145
+#: src/ln.c:172 src/ln.c:205 src/ln.c:470 src/mv.c:165 src/mv.c:419
#, c-format
msgid "accessing %s"
msgstr "正在存取%s"
-#: src/cp.c:537
+#: src/cp.c:493 src/cp.c:536 src/cp.c:951 src/install.c:188 src/install.c:289
+#: src/install.c:350 src/ln.c:147 src/ln.c:472 src/ln.c:528 src/mv.c:167
+#: src/mv.c:421 src/mv.c:476
#, fuzzy, c-format
-msgid "%s: destination directory does not exist"
+msgid "target %s is not a directory"
msgstr "%s已存在但不是目錄"
-#: src/cp.c:540
+#: src/cp.c:511 src/install.c:326 src/ln.c:500 src/mv.c:452 src/shred.c:1667
+#: src/touch.c:407
+#, fuzzy
+msgid "missing file operand"
+msgstr "略過引數"
+
+#: src/cp.c:513 src/install.c:328 src/ln.c:514 src/mv.c:454
#, fuzzy, c-format
-msgid "%s: specified target is not a directory"
-msgstr "%s已存在但不是目錄"
+msgid "missing destination file operand after %s"
+msgstr "缺少了欄位數值"
-#: src/cp.c:544
-#, c-format
-msgid "copying multiple files, but last argument %s is not a directory"
-msgstr "複製多個檔案,但最後的引數%s並非目錄。"
+#: src/cp.c:522 src/install.c:337 src/mv.c:463
+#, fuzzy
+msgid "Cannot combine --target-directory (-t) and --no-target-directory (-T)"
+msgstr "%s已存在但不是目錄"
-#: src/cp.c:647
+#: src/cp.c:640
msgid "when preserving paths, the destination must be a directory"
msgstr "當保留路徑時,目的地必須是目錄"
-#: src/cp.c:874 src/install.c:217 src/ln.c:443 src/mv.c:406
+#: src/cp.c:843 src/install.c:235 src/ln.c:430 src/mv.c:389
#, c-format
msgid ""
"warning: --version-control (-V) is obsolete; support for it\n"
@@ -1425,156 +1458,162 @@ msgstr ""
"警告:--version-control (-V) 選項已經過時;將來的版本隨時可能不再支援\n"
"此選項。請使用 --backup=%s。"
-#: src/cp.c:968 src/ln.c:473
+#: src/cp.c:937 src/ln.c:460
#, fuzzy
msgid "symbolic links are not supported on this system"
msgstr "警告:此系統不支援 --pid=PID 選項"
-#: src/cp.c:1004
+#: src/cp.c:944 src/install.c:282 src/ln.c:465 src/mv.c:414
+#, fuzzy
+msgid "multiple target directories specified"
+msgstr "正在關閉輸出檔%s"
+
+#: src/cp.c:989
msgid "cannot make both hard and symbolic links"
msgstr "無法同時建立實際及符號鏈結"
-#: src/cp.c:1012 src/install.c:277 src/ln.c:539 src/mv.c:484
+#: src/cp.c:997 src/install.c:316 src/ln.c:541 src/mv.c:484
msgid "backup type"
msgstr "備份方式"
-#: src/csplit.c:275 src/csplit.c:1424 src/join.c:276 src/tac-pipe.c:57
-#: src/tee.c:197 src/tr.c:1607
+#: src/csplit.c:283 src/csplit.c:1429 src/join.c:276 src/tac-pipe.c:57
+#: src/tee.c:201 src/tr.c:1585
msgid "read error"
msgstr "讀取時發生錯誤"
-#: src/csplit.c:525
+#: src/csplit.c:533
msgid "input disappeared"
msgstr "輸入資料消失了"
-#: src/csplit.c:659 src/csplit.c:670
+#: src/csplit.c:667 src/csplit.c:678
#, c-format
msgid "%s: line number out of range"
msgstr "%s:行號超出範圍以外"
-#: src/csplit.c:699
+#: src/csplit.c:707
#, c-format
msgid "%s: `%s': line number out of range"
msgstr "%s:‘%s’:行號超出範圍以外"
-#: src/csplit.c:702 src/csplit.c:751
+#: src/csplit.c:710 src/csplit.c:759
#, fuzzy, c-format
msgid " on repetition %s\n"
msgstr "(在第 %d 次重覆時)\n"
-#: src/csplit.c:745
+#: src/csplit.c:753
#, c-format
msgid "%s: `%s': match not found"
msgstr "%s:‘%s’:找不到符合的字串"
-#: src/csplit.c:809 src/csplit.c:849 src/tac.c:261
+#: src/csplit.c:817 src/csplit.c:857 src/tac.c:269
msgid "error in regular expression search"
msgstr "在正規運算式搜尋時發生錯誤"
-#: src/csplit.c:969
+#: src/csplit.c:977
#, c-format
msgid "write error for `%s'"
msgstr "寫入‘%s’時發生錯誤"
-#: src/csplit.c:1045
+#: src/csplit.c:1053
#, fuzzy, c-format
msgid "%s: integer expected after delimiter"
msgstr "%s:‘%c’後面應該是整數"
-#: src/csplit.c:1061
+#: src/csplit.c:1069
#, c-format
msgid "%s: `}' is required in repeat count"
msgstr "%s:重覆的數目後應該是‘}’字元"
-#: src/csplit.c:1071
+#: src/csplit.c:1079
#, c-format
msgid "%s}: integer required between `{' and `}'"
msgstr "%s}:‘{’和‘}’之間必須是整數"
-#: src/csplit.c:1098
+#: src/csplit.c:1106
#, fuzzy, c-format
msgid "%s: closing delimiter `%c' missing"
msgstr "%s:缺少了封閉分隔符號‘%c’"
-#: src/csplit.c:1114
+#: src/csplit.c:1122
#, c-format
msgid "%s: invalid regular expression: %s"
msgstr "%s:無效的正規表示式:%s"
-#: src/csplit.c:1147
+#: src/csplit.c:1155
#, c-format
msgid "%s: invalid pattern"
msgstr "%s:無效的樣式"
-#: src/csplit.c:1150
+#: src/csplit.c:1158
#, c-format
msgid "%s: line number must be greater than zero"
msgstr "%s:行號必須大於零"
-#: src/csplit.c:1156
+#: src/csplit.c:1164
#, c-format
msgid "line number `%s' is smaller than preceding line number, %s"
msgstr "行號‘%s’小於之前的行號‘%s’"
-#: src/csplit.c:1162
+#: src/csplit.c:1170
#, c-format
msgid "warning: line number `%s' is the same as preceding line number"
msgstr "警告:行號‘%s’和之前的行號一樣"
-#: src/csplit.c:1215
+#: src/csplit.c:1223
#, fuzzy
msgid "invalid format width"
msgstr "%2$s的引數%1$s無效"
-#: src/csplit.c:1236
+#: src/csplit.c:1244
#, fuzzy
msgid "invalid format precision"
msgstr "無效的寬度選項:‘%s’"
-#: src/csplit.c:1257
+#: src/csplit.c:1265
msgid "missing conversion specifier in suffix"
msgstr "後置字串缺少了字串轉換字符"
-#: src/csplit.c:1263
+#: src/csplit.c:1271
#, c-format
msgid "invalid conversion specifier in suffix: %c"
msgstr "後置字串的字串轉換字符無效:%c"
-#: src/csplit.c:1266
+#: src/csplit.c:1274
#, c-format
msgid "invalid conversion specifier in suffix: \\%.3o"
msgstr "後置字串的字串轉換字符無效:\\%.3o"
-#: src/csplit.c:1289
+#: src/csplit.c:1297
#, c-format
msgid "too many %% conversion specifications in suffix"
msgstr "後置字串含有過多的 %% 字串轉換規格"
-#: src/csplit.c:1304
+#: src/csplit.c:1312
#, c-format
msgid "missing %% conversion specification in suffix"
msgstr "後置字串缺少了 %% 字串轉換規格"
-#: src/csplit.c:1354
+#: src/csplit.c:1356
#, c-format
msgid "%s: invalid number"
msgstr "%s:無效的號碼"
-#: src/csplit.c:1439
+#: src/csplit.c:1444
#, c-format
msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
msgstr "用法:%s [選項]... 檔案 樣式...\n"
-#: src/csplit.c:1443
+#: src/csplit.c:1448
+#, fuzzy
msgid ""
-"Output pieces of FILE separated by PATTERN(s) to files `xx01', `xx02', ...,\n"
+"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 ""
"根據 <樣式> 分割 <檔案>,並將之輸出至‘xx01’、‘xx02’等等的檔案,\n"
"同時在標準輸出顯示每個分割部份的位元組數目。\n"
-#: src/csplit.c:1451
+#: src/csplit.c:1456
#, fuzzy, c-format
msgid ""
" -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n"
@@ -1585,7 +1624,7 @@ msgstr ""
" -f, --prefix=前置字串 以 <前置字串> 代替‘xx’\n"
" -k, --keep-files 遇到錯誤時不移除輸出檔\n"
-#: src/csplit.c:1456
+#: src/csplit.c:1461
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"
@@ -1595,7 +1634,7 @@ msgstr ""
" -s, --quiet, --silent 不印出輸出檔的大小\n"
" -z, --elide-empty-files 移除空白的輸出檔\n"
-#: src/csplit.c:1463
+#: src/csplit.c:1468
msgid ""
"\n"
"Read standard input if FILE is -. Each PATTERN may be:\n"
@@ -1603,7 +1642,7 @@ msgstr ""
"\n"
"若 <檔案> 是 - 則由標準輸入讀取資料。每一個 <樣式> 可以是:\n"
-#: src/csplit.c:1467
+#: src/csplit.c:1472
msgid ""
"\n"
" INTEGER copy up to but not including specified line number\n"
@@ -1623,33 +1662,35 @@ msgstr ""
"\n"
"行號偏移值是一個(必須的)‘+’或‘-’字元加上一個正整數。\n"
-#: src/cut.c:182 src/df.c:714 src/expand.c:108 src/fold.c:66 src/head.c:113
-#: src/ls.c:3987 src/nl.c:176 src/paste.c:396 src/pr.c:2752 src/sort.c:276
-#: src/sum.c:59 src/tac.c:126 src/tail.c:238 src/tee.c:62 src/unexpand.c:377
-#: src/wc.c:135
+#: src/cut.c:188 src/df.c:711 src/expand.c:110 src/fold.c:68 src/head.c:113
+#: src/ls.c:4060 src/nl.c:172 src/paste.c:416 src/pr.c:2755 src/sort.c:277
+#: src/sum.c:59 src/tac.c:131 src/tail.c:223 src/tee.c:62 src/unexpand.c:122
+#: src/wc.c:132
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr "用法:%s [選項]... [檔案]...\n"
-#: src/cut.c:186
+#: src/cut.c:192
msgid ""
"Print selected parts of lines from each FILE to standard output.\n"
"\n"
msgstr "在標準輸出中顯示每個 <檔案> 每一行中指定的部份。\n"
-#: src/cut.c:193
+#: src/cut.c:199
+#, fuzzy
msgid ""
-" -b, --bytes=LIST output only these bytes\n"
-" -c, --characters=LIST output only these characters\n"
+" -b, --bytes=LIST select only these bytes\n"
+" -c, --characters=LIST select only these characters\n"
" -d, --delimiter=DELIM use DELIM instead of TAB for field delimiter\n"
msgstr ""
" -b, --bytes=LIST 只顯示指定的位元組\n"
" -c, --characters=LIST 只顯示指定的字元\n"
" -d, --delimiter=DELIM 以 DELIM 字元代替 TAB 作為欄位的分隔符號\n"
-#: src/cut.c:198
+#: src/cut.c:204
+#, fuzzy
msgid ""
-" -f, --fields=LIST output only these fields; also print any line\n"
+" -f, --fields=LIST select only these fields; also print any line\n"
" that contains no delimiter character, unless\n"
" the -s option is specified\n"
" -n (ignored)\n"
@@ -1658,7 +1699,13 @@ msgstr ""
" 每一行,除非使用了 -s 選項\n"
" -n (不會作任何處理)\n"
-#: src/cut.c:204
+#: src/cut.c:210
+msgid ""
+" --complement complement the set of selected bytes, characters\n"
+" or fields.\n"
+msgstr ""
+
+#: src/cut.c:214
msgid ""
" -s, --only-delimited do not print lines not containing delimiters\n"
" --output-delimiter=STRING use STRING as the output delimiter\n"
@@ -1668,11 +1715,14 @@ msgstr ""
" --output-delimiter=字串 以 <字串> 作為輸出資料的分隔符號\n"
" 預設是使用輸入資料的分隔符號\n"
-#: src/cut.c:211
+#: src/cut.c:221
+#, fuzzy
msgid ""
"\n"
"Use one, and only one of -b, -c or -f. Each LIST is made up of one\n"
-"range, or many ranges separated by commas. Each range is one of:\n"
+"range, or many ranges separated by commas. Selected input is written\n"
+"in the same order that it is read, and is written exactly once.\n"
+"Each range is one of:\n"
"\n"
" N N'th byte, character or field, counted from 1\n"
" N- from N'th byte, character or field, to end of line\n"
@@ -1692,48 +1742,48 @@ msgstr ""
"\n"
"如果沒有指定 <檔案> 或 <檔案> 是 -,則由標準輸入讀取資料。\n"
-#: src/cut.c:330 src/cut.c:362 src/cut.c:448
+#: src/cut.c:363 src/cut.c:395 src/cut.c:481
msgid "invalid byte or field list"
msgstr "無效的位元組或欄位選項"
-#: src/cut.c:436
+#: src/cut.c:469
#, fuzzy, c-format
msgid "byte offset %s is too large"
msgstr "%s 過長"
-#: src/cut.c:439
+#: src/cut.c:472
#, fuzzy, c-format
msgid "field number %s is too large"
msgstr "要比較的位元組數目無效"
-#: src/cut.c:756 src/cut.c:764
+#: src/cut.c:776 src/cut.c:784
msgid "only one type of list may be specified"
msgstr "指定位置時只能使用一種格式"
-#: src/cut.c:773
+#: src/cut.c:793
msgid "the delimiter must be a single character"
msgstr "分隔符號必須是恰好一個字元"
-#: src/cut.c:804
+#: src/cut.c:828
msgid "you must specify a list of bytes, characters, or fields"
msgstr "必須指定一系列的位元組、字元或欄位"
-#: src/cut.c:807
+#: src/cut.c:831
#, fuzzy
msgid "an input delimiter may be specified only when operating on fields"
msgstr "只有在處理欄位時才能指定分隔符號"
-#: src/cut.c:811
+#: src/cut.c:835
msgid ""
"suppressing non-delimited lines makes sense\n"
"\tonly when operating on fields"
msgstr "只有在處理欄位時才可以去除沒有分隔符號的每一行"
-#: src/cut.c:827
+#: src/cut.c:851
msgid "missing list of fields"
msgstr "缺少了欄位數值"
-#: src/cut.c:829
+#: src/cut.c:853
msgid "missing list of positions"
msgstr "缺少了表示位置的數值"
@@ -1861,33 +1911,28 @@ msgid ""
" `_' (underscore) pad the field with spaces\n"
msgstr ""
-#: src/date.c:239 src/dd.c:1290 src/dircolors.c:532 src/head.c:859
-#: src/md5sum.c:390 src/md5sum.c:732 src/od.c:931 src/od.c:1976 src/pr.c:1163
-#: src/pr.c:1370 src/pr.c:1492 src/stty.c:908 src/tac.c:483 src/tac.c:489
-#: src/tee.c:125 src/tr.c:1932 src/tsort.c:583 src/wc.c:210
+#: src/date.c:239 src/dd.c:1471 src/dircolors.c:525 src/head.c:859
+#: src/md5sum.c:397 src/md5sum.c:700 src/od.c:903 src/od.c:1927 src/pr.c:1159
+#: src/pr.c:1365 src/pr.c:1487 src/stty.c:833 src/tac.c:529 src/tee.c:126
+#: src/tr.c:1890 src/tsort.c:569 src/wc.c:209
msgid "standard input"
msgstr "標準輸出"
-#: src/date.c:267 src/date.c:457
+#: src/date.c:267 src/date.c:451
#, fuzzy, c-format
msgid "invalid date `%s'"
msgstr "無效的寬度:‘%s’"
-#: src/date.c:363
+#: src/date.c:361
#, fuzzy
msgid "the options to specify dates for printing are mutually exclusive"
msgstr "不能同時使用 --string 及 --check 選項"
-#: src/date.c:370
+#: src/date.c:368
msgid "the options to print and set the time may not be used together"
msgstr ""
-#: src/date.c:376
-#, fuzzy, c-format
-msgid "too many non-option arguments: %s%s"
-msgstr "非選項的引數過多"
-
-#: src/date.c:384
+#: src/date.c:381
#, c-format
msgid ""
"the argument `%s' lacks a leading `+';\n"
@@ -1895,40 +1940,44 @@ msgid ""
"argument must be a format string beginning with `+'."
msgstr ""
-#: src/date.c:396
+#: src/date.c:393
#, fuzzy
msgid ""
"a format string may not be specified when using the --rfc-2822 (-R) option"
msgstr "使用選項 --string 時不能再指定檔案"
-#: src/date.c:432
+#: src/date.c:426
msgid "undefined"
msgstr ""
-#: src/date.c:434 src/touch.c:404
+#: src/date.c:428 src/touch.c:400
#, fuzzy
msgid "cannot get time of day"
msgstr "不能用超過一種方式進行分割"
-#: src/date.c:465
+#: src/date.c:459
#, fuzzy
msgid "cannot set date"
msgstr "stat%s失敗"
-#: src/date.c:526
+#: src/date.c:520
#, fuzzy, c-format
msgid "time %s is out of range"
msgstr "%s:行號超出範圍以外"
-#: src/dd.c:316 src/tty.c:68 src/uname.c:109 src/whoami.c:53
+#: src/dd.c:366
#, fuzzy, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "用法:%s [選項] [檔案]...\n"
+msgid ""
+"Usage: %s [OPERAND]...\n"
+" or: %s OPTION\n"
+msgstr ""
+"用法:%s [檔案]...\n"
+" 或:%s [選項]\n"
-#: src/dd.c:317
+#: src/dd.c:371
#, fuzzy
msgid ""
-"Copy a file, converting and formatting according to the options.\n"
+"Copy a file, converting and formatting according to the operands.\n"
"\n"
" bs=BYTES force ibs=BYTES and obs=BYTES\n"
" cbs=BYTES convert BYTES bytes at a time\n"
@@ -1944,7 +1993,7 @@ msgstr ""
" count=區段數目 只複製指定 <區段數目> 的輸入資料\n"
" ibs=位元組 每次讀取指定的 <位元組>\n"
-#: src/dd.c:326
+#: src/dd.c:380
#, fuzzy
msgid ""
" if=FILE read from FILE instead of stdin\n"
@@ -1954,6 +2003,7 @@ msgid ""
" oflag=FLAGS write as per the comma separated symbol list\n"
" seek=BLOCKS skip BLOCKS obs-sized blocks at start of output\n"
" skip=BLOCKS skip BLOCKS ibs-sized blocks at start of input\n"
+" status=noxfer suppress transfer statistics\n"
msgstr ""
" if=檔案 讀取 <檔案> 內容而非標準輸入的資料\n"
" obs=位元組 每次寫入指定的 <位元組>\n"
@@ -1961,7 +2011,7 @@ msgstr ""
" seek=區段數目 先略過以 obs 為單位的指定 <區段數目> 的輸出資料\n"
" skip=區段數目 先略過以 ibs 為單位的指定 <區段數目> 的輸入資料\n"
-#: src/dd.c:337
+#: src/dd.c:390
#, fuzzy
msgid ""
"\n"
@@ -1978,11 +2028,12 @@ msgstr ""
"GB=1000000000,G=1073741824,還有 T、P、E、Z、Y 如此類推。\n"
"每個 <關鍵字> 可以是:\n"
-#: src/dd.c:346
+#: src/dd.c:399
+#, fuzzy
msgid ""
" ascii from EBCDIC to ASCII\n"
" ebcdic from ASCII to EBCDIC\n"
-" ibm from ASCII to alternated EBCDIC\n"
+" ibm from ASCII to alternate EBCDIC\n"
" block pad newline-terminated records with spaces to cbs-size\n"
" unblock replace trailing spaces in cbs-size records with newline\n"
" lcase change upper case to lower case\n"
@@ -1996,7 +2047,7 @@ msgstr ""
" 並轉換為一個 newline 字元\n"
" lcase 將大寫字元轉換為小寫\n"
-#: src/dd.c:354
+#: src/dd.c:407
#, fuzzy
msgid ""
" nocreat do not create the output file\n"
@@ -2017,7 +2068,7 @@ msgstr ""
" sync 將每個輸入資料區段以 NUL 字元填滿至 ibs 的大小;\n"
" 當配合 block 或 unblock 時,會以空格代替 NUL 字元填充\n"
-#: src/dd.c:366
+#: src/dd.c:419
msgid ""
"\n"
"Each FLAG symbol may be:\n"
@@ -2025,115 +2076,152 @@ msgid ""
" append append mode (makes sense only for output)\n"
msgstr ""
-#: src/dd.c:373
+#: src/dd.c:426
msgid " direct use direct I/O for data\n"
msgstr ""
-#: src/dd.c:375
+#: src/dd.c:428
msgid " dsync use synchronized I/O for data\n"
msgstr ""
-#: src/dd.c:377
+#: src/dd.c:430
msgid " sync likewise, but also for metadata\n"
msgstr ""
-#: src/dd.c:379
+#: src/dd.c:432
msgid " nonblock use non-blocking I/O\n"
msgstr ""
-#: src/dd.c:381
+#: src/dd.c:434
msgid " nofollow do not follow symlinks\n"
msgstr ""
-#: src/dd.c:382
+#: src/dd.c:436
+msgid " noctty do not assign controlling terminal from file\n"
+msgstr ""
+
+#: src/dd.c:438
msgid ""
"\n"
-"Note that sending a SIGUSR1 signal to a running `dd' process makes it\n"
-"print to standard error the number of records read and written so far,\n"
-"then to resume copying.\n"
+"Sending a SIGUSR1 signal to a running `dd' process makes it\n"
+"print I/O statistics to standard error, then to resume copying.\n"
"\n"
" $ dd if=/dev/zero of=/dev/null& pid=$!\n"
" $ kill -USR1 $pid; sleep 1; kill $pid\n"
-" 10899206+0 records in\n"
-" 10899206+0 records out\n"
+" 18335302+0 records in\n"
+" 18335302+0 records out\n"
+" 9387674624 bytes (9.4 GB) copied, 34.6279 seconds, 271 MB/s\n"
+"\n"
+"Options are:\n"
+"\n"
msgstr ""
-#: src/dd.c:424
+#: src/dd.c:492
#, c-format
msgid "%s+%s records in\n"
msgstr "讀入了 %s+%s 個區段\n"
-#: src/dd.c:426
+#: src/dd.c:494
#, c-format
msgid "%s+%s records out\n"
msgstr "輸出了 %s+%s 個區段\n"
-#: src/dd.c:433
+#: src/dd.c:501
msgid "truncated record"
msgstr "個被截斷了的區段"
-#: src/dd.c:434
+#: src/dd.c:502
msgid "truncated records"
msgstr "個被截斷了的區段"
-#: src/dd.c:444
+#: src/dd.c:513
+#, c-format
+msgid "%s byte (%s) copied"
+msgid_plural "%s bytes (%s) copied"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/dd.c:537
+msgid "Infinity"
+msgstr ""
+
+#: src/dd.c:542
+#, c-format
+msgid ", %g second, %s/s\n"
+msgid_plural ", %g seconds, %s/s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/dd.c:552
#, fuzzy, c-format
msgid "closing input file %s"
msgstr "正在建立檔案‘%s’\n"
-#: src/dd.c:447
+#: src/dd.c:555
#, c-format
msgid "closing output file %s"
msgstr "正在關閉輸出檔%s"
-#: src/dd.c:531
+#: src/dd.c:641
#, fuzzy, c-format
msgid "writing to %s"
msgstr "寫入 %s 時發生錯誤"
-#: src/dd.c:542
+#: src/dd.c:735
+#, fuzzy, c-format
+msgid "unrecognized operand %s"
+msgstr "無法識別的選項‘-%c’"
+
+#: src/dd.c:746
+#, fuzzy, c-format
+msgid "invalid conversion: %s"
+msgstr "無效的寬度選項:‘%s’"
+
+#: src/dd.c:749
#, fuzzy, c-format
msgid "invalid input flag: %s"
msgstr "無效的寬度:‘%s’"
-#: src/dd.c:543
+#: src/dd.c:752
#, fuzzy, c-format
msgid "invalid output flag: %s"
msgstr "無效的群組"
-#: src/dd.c:633
-#, fuzzy, c-format
-msgid "unrecognized option %s"
-msgstr "無法識別的選項‘-%c’"
-
-#: src/dd.c:644
+#: src/dd.c:755
#, fuzzy, c-format
-msgid "invalid conversion: %s"
-msgstr "無效的寬度選項:‘%s’"
+msgid "invalid status flag: %s"
+msgstr "無效的群組"
-#: src/dd.c:691
+#: src/dd.c:792
#, fuzzy, c-format
-msgid "unrecognized option %s=%s"
+msgid "unrecognized operand %s=%s"
msgstr "無法識別的選項‘-%c’"
-#: src/dd.c:697
+#: src/dd.c:798
#, fuzzy, c-format
msgid "invalid number %s"
msgstr "無效的數字"
-#: src/dd.c:717
+#: src/dd.c:818
+msgid "cannot combine any two of {ascii,ebcdic,ibm}"
+msgstr ""
+
+#: src/dd.c:820
#, fuzzy
-msgid "cannot combine excl and nocreat"
+msgid "cannot combine block and unblock"
msgstr "無法將 %s 的檔案指標重新定位"
-#: src/dd.c:732
+#: src/dd.c:822
#, fuzzy
-msgid "\tonly one conv in {ascii,ebcdic,ibm}, {lcase,ucase}, {block,unblock}"
-msgstr ""
-"每組只能選一項作為 conv 的關鍵字:\n"
-"{ascii,ebcdic,ibm}、{lcase,ucase}、{block,unblock}、{unblock,sync}"
+msgid "cannot combine lcase and ucase"
+msgstr "無法將 %s 的檔案指標重新定位"
+
+#: src/dd.c:824
+#, fuzzy
+msgid "cannot combine excl and nocreat"
+msgstr "無法將 %s 的檔案指標重新定位"
-#: src/dd.c:867
+#: src/dd.c:972
#, c-format
msgid ""
"warning: working around lseek kernel bug for file (%s)\n"
@@ -2142,32 +2230,51 @@ msgstr ""
"警告:暫時避免有關檔案 (%s) 的 lseek 核心錯誤,檔案的 mt_type=0x%0lx ─\n"
" 有關 mt_type 類型的清單請參考 <sys/mtio.h>"
-#: src/dd.c:1020
+#: src/dd.c:1025 src/dd.c:1081
+#, fuzzy, c-format
+msgid "%s: cannot seek"
+msgstr "%s:無法移除"
+
+#: src/dd.c:1061
+#, c-format
+msgid "offset overflow while reading file %s"
+msgstr ""
+
+#: src/dd.c:1073
+#, fuzzy
+msgid "warning: screwy file offset after failed read"
+msgstr "警告:指定了來源檔%s多於一次"
+
+#: src/dd.c:1077
+msgid "cannot work around kernel bug after all"
+msgstr ""
+
+#: src/dd.c:1188
#, fuzzy, c-format
msgid "setting flags for %s"
msgstr "正在設定%s的時間"
-#: src/dd.c:1230
+#: src/dd.c:1408
#, c-format
msgid "fdatasync failed for %s"
msgstr ""
-#: src/dd.c:1240
+#: src/dd.c:1418
#, fuzzy, c-format
msgid "fsync failed for %s"
msgstr "無法保留%s的時間"
-#: src/dd.c:1297 src/dd.c:1320
+#: src/dd.c:1477 src/dd.c:1505
#, fuzzy, c-format
msgid "opening %s"
msgstr "讀取 %s 時發生錯誤"
-#: src/dd.c:1328
+#: src/dd.c:1513
#, fuzzy
msgid "file offset out of range"
msgstr "%s:行號超出範圍以外"
-#: src/dd.c:1346
+#: src/dd.c:1531
#, c-format
msgid "advancing past %s bytes in output file %s"
msgstr "略過輸出檔%2$s的最初 %1$s 個位元組"
@@ -2212,33 +2319,35 @@ msgstr " %4s-區段 已用 可用 已用%%"
msgid " Mounted on\n"
msgstr " 掛載點\n"
-#: src/df.c:448
+#: src/df.c:445
#, fuzzy
msgid "cannot get current directory"
msgstr "無法建立目錄%s"
-#: src/df.c:458 src/df.c:472 src/df.c:500
+#: src/df.c:455 src/df.c:469 src/df.c:497
#, fuzzy, c-format
msgid "cannot change to directory %s"
msgstr "無法進入%s目錄"
-#: src/df.c:478
+#: src/df.c:475
#, fuzzy, c-format
msgid "cannot stat current directory (now %s)"
msgstr "無法建立目錄%s"
-#: src/df.c:715
+#: src/df.c:712
+#, fuzzy
msgid ""
-"Show information about the filesystem on which each FILE resides,\n"
-"or all filesystems by default.\n"
+"Show information about the file system on which each FILE resides,\n"
+"or all file systems by default.\n"
"\n"
msgstr ""
"顯示每個 <檔案> 所在的檔案系統的資訊,預設是顯示所有檔案系統。\n"
"\n"
-#: src/df.c:723
+#: src/df.c:720
+#, fuzzy
msgid ""
-" -a, --all include filesystems having 0 blocks\n"
+" -a, --all include file systems having 0 blocks\n"
" -B, --block-size=SIZE use SIZE-byte blocks\n"
" -h, --human-readable print sizes in human readable format (e.g., 1K 234M "
"2G)\n"
@@ -2249,11 +2358,12 @@ msgstr ""
" -h, --human-readable 以容易理解的格式印出檔案系統大小 (例如 1K 234M 2G)\n"
" -H, --si 類似 -h,但取 1000 的次方而不是 1024\n"
-#: src/df.c:729
+#: src/df.c:726
+#, fuzzy
msgid ""
" -i, --inodes list inode information instead of block usage\n"
" -k like --block-size=1K\n"
-" -l, --local limit listing to local filesystems\n"
+" -l, --local limit listing to local file systems\n"
" --no-sync do not invoke sync before getting usage info "
"(default)\n"
msgstr ""
@@ -2262,13 +2372,14 @@ msgstr ""
" -l, --local 只顯示本機的檔案系統\n"
" --no-sync 取得使用量資料前不進行 sync 動作 (預設)\n"
-#: src/df.c:735
+#: src/df.c:732
+#, fuzzy
msgid ""
" -P, --portability use the POSIX output format\n"
" --sync invoke sync before getting usage info\n"
-" -t, --type=TYPE limit listing to filesystems of type TYPE\n"
-" -T, --print-type print filesystem type\n"
-" -x, --exclude-type=TYPE limit listing to filesystems not of type TYPE\n"
+" -t, --type=TYPE limit listing to file systems of type TYPE\n"
+" -T, --print-type print file system type\n"
+" -x, --exclude-type=TYPE limit listing to file systems not of type TYPE\n"
" -v (ignored)\n"
msgstr ""
" -P, --portability 使用 POSIX 輸出格式\n"
@@ -2278,7 +2389,7 @@ msgstr ""
" -x, --exclude-type=類型 只印出不是指定 <類型> 的檔案系統資訊\n"
" -v (此選項不作處理)\n"
-#: src/df.c:745 src/du.c:220 src/ls.c:4105
+#: src/df.c:742 src/du.c:217 src/ls.c:4181
#, fuzzy
msgid ""
"\n"
@@ -2289,18 +2400,18 @@ msgstr ""
"<大小> 可以是以下的單位 (單位前可加上整數):\n"
"kB=1000,K=1024,MB=1000000,M=1048576,還有 G、T、P、E、Z、Y 如此類推。\n"
-#: src/df.c:863
+#: src/df.c:858
#, c-format
msgid "file system type %s both selected and excluded"
msgstr "不能同時選擇和排除檔案系統類型%s"
-#: src/df.c:907
+#: src/df.c:902
msgid "Warning: "
msgstr "警告:"
-#: src/df.c:910
-#, c-format
-msgid "%scannot read table of mounted filesystems"
+#: src/df.c:905
+#, fuzzy, c-format
+msgid "%scannot read table of mounted file systems"
msgstr "%s無法讀取已掛上的檔案系統的名單"
#: src/dircolors.c:104
@@ -2336,21 +2447,21 @@ msgstr ""
"否則,會使用一個預設的資料庫。如要瞭解此檔案格式的細節,請執行\n"
"‘dircolors --print-database’。\n"
-#: src/dircolors.c:291
+#: src/dircolors.c:288
#, fuzzy, c-format
msgid "%s:%lu: invalid line; missing second token"
msgstr "%s:無效的秒數"
-#: src/dircolors.c:363
+#: src/dircolors.c:360
#, fuzzy, c-format
msgid "%s:%lu: unrecognized keyword %s"
msgstr "%s:無法識別的選項‘%c%s’\n"
-#: src/dircolors.c:364
+#: src/dircolors.c:361
msgid "<internal>"
msgstr "<內部資料>"
-#: src/dircolors.c:460
+#: src/dircolors.c:457
msgid ""
"the options to output dircolors' internal database and\n"
"to select a shell syntax are mutually exclusive"
@@ -2358,17 +2469,15 @@ msgstr ""
"顯示 dircolors 內部資料庫的選項和選擇 shell 語法的選項\n"
"是互相抵觸的"
-#: src/dircolors.c:468
-msgid ""
-"no FILE arguments may be used with the option to output\n"
-"dircolors' internal database"
-msgstr "顯示 dircolors 的內部資料庫時不能加上 <檔案> 引數"
+#: src/dircolors.c:467
+msgid "File operands cannot be combined with --print-database (-p)."
+msgstr ""
-#: src/dircolors.c:497
+#: src/dircolors.c:490
msgid "no SHELL environment variable, and no shell type option given"
msgstr "沒有設定 SHELL 環境變數,也沒有指定 shell 類型的選項"
-#: src/dirname.c:45
+#: src/dirname.c:47
#, fuzzy, c-format
msgid ""
"Usage: %s NAME\n"
@@ -2377,14 +2486,14 @@ msgstr ""
"用法:%s [檔案]...\n"
" 或:%s [選項]\n"
-#: src/dirname.c:50
+#: src/dirname.c:52
msgid ""
"Print NAME with its trailing /component removed; if NAME contains no /'s,\n"
"output `.' (meaning the current directory).\n"
"\n"
msgstr ""
-#: src/du.c:170
+#: src/du.c:167
#, fuzzy, c-format
msgid ""
"Usage: %s [OPTION]... [FILE]...\n"
@@ -2393,7 +2502,7 @@ msgstr ""
"用法:%s [選項]... [檔案]...\n"
" 或:%s --traditional [檔案] [[+]偏移值 [[+]標號]]\n"
-#: src/du.c:174
+#: src/du.c:171
msgid ""
"Summarize disk usage of each FILE, recursively for directories.\n"
"\n"
@@ -2401,7 +2510,7 @@ msgstr ""
"總結每個 <檔案> 的磁碟用量,目錄則取總用量。\n"
"\n"
-#: src/du.c:181
+#: src/du.c:178
#, fuzzy
msgid ""
" -a, --all write counts for all files, not just directories\n"
@@ -2421,7 +2530,7 @@ msgstr ""
" -c, --total 印出所有項目相加後的總用量\n"
" -D, --dereference-args 只找出指令列中的符號鏈結指示的真正目的地\n"
-#: src/du.c:192
+#: src/du.c:189
#, fuzzy
msgid ""
" --files0-from=F summarize disk usage of the NUL-terminated file\n"
@@ -2440,7 +2549,7 @@ msgstr ""
" -k 即 --block-size=1K\n"
" -l, --count-links 連實際鏈結 (hard link) 的大小也計算在內\n"
-#: src/du.c:202
+#: src/du.c:199
#, fuzzy
msgid ""
" -L, --dereference dereference all symbolic links\n"
@@ -2455,9 +2564,10 @@ msgstr ""
" -S, --separate-dirs 不包括副目錄的佔用量\n"
" -s, --summarize 只分別計算指令列中每個引數所佔的總用量\n"
-#: src/du.c:209
+#: src/du.c:206
+#, fuzzy
msgid ""
-" -x, --one-file-system skip directories on different filesystems\n"
+" -x, --one-file-system skip directories on different file systems\n"
" -X FILE, --exclude-from=FILE Exclude files that match any pattern in "
"FILE.\n"
" --exclude=PATTERN Exclude files that match PATTERN.\n"
@@ -2474,45 +2584,44 @@ msgstr ""
" (若使用 --all 選項,也會顯示檔案的佔用量);\n"
" --max-depth=0 的效果等於 --summarize\n"
-#: src/du.c:532 src/ls.c:2317 src/wc.c:674
+#: src/du.c:522 src/ls.c:2365 src/wc.c:671
msgid "total"
msgstr "總計"
-#: src/du.c:614
+#: src/du.c:599
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:636
+#: src/du.c:623
#, fuzzy, c-format
msgid "invalid maximum depth %s"
msgstr "無效的寬度:‘%s’"
-#: src/du.c:710
+#: src/du.c:698
msgid "cannot both summarize and show all entries"
msgstr "不能只顯示總用量,同時又顯示每個項目"
-#: src/du.c:717
+#: src/du.c:705
msgid "warning: summarizing is the same as using --max-depth=0"
msgstr "警告:顯示總用量等於使用 --max-depth=0"
-#: src/du.c:723
-#, c-format
-msgid "warning: summarizing conflicts with --max-depth=%d"
+#: src/du.c:711
+#, fuzzy, c-format
+msgid "warning: summarizing conflicts with --max-depth=%lu"
msgstr "警告:顯示總用量的選項和 --max-depth=%d 互相抵觸"
-#: src/du.c:739
-#, c-format
-msgid "%s: you may not specify command-line arguments with --files0-from"
+#: src/du.c:728
+msgid "File operands cannot be combined with --files0-from."
msgstr ""
-#: src/du.c:750
+#: src/du.c:740
#, fuzzy, c-format
msgid "cannot read file names from %s"
msgstr "要比較的字串為%s及%s。"
-#: src/du.c:790 src/du.c:793
+#: src/du.c:780 src/du.c:783
#, fuzzy
msgid "invalid zero-length file name"
msgstr "%s:無效的後置字串長度"
@@ -2526,13 +2635,22 @@ msgstr "用法:%s [選項]... [檔案]...\n"
msgid ""
"Echo the STRING(s) to standard output.\n"
"\n"
-" -n do not output the trailing newline\n"
-" -e enable interpretation of the backslash-escaped characters\n"
-" listed below\n"
-" -E disable interpretation of those sequences in STRINGs\n"
+" -n do not output the trailing newline\n"
msgstr ""
-#: src/echo.c:75
+#: src/echo.c:71
+msgid ""
+" -e enable interpretation of backslash escapes (default)\n"
+" -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"
"If -e is in effect, the following sequences are recognized:\n"
@@ -2543,7 +2661,7 @@ msgid ""
" \\b backspace\n"
msgstr ""
-#: src/echo.c:84
+#: src/echo.c:89
msgid ""
" \\c suppress trailing newline\n"
" \\f form feed\n"
@@ -2572,7 +2690,7 @@ msgid ""
"A mere - implies -i. If no COMMAND, print the resulting environment.\n"
msgstr ""
-#: src/expand.c:112
+#: src/expand.c:114
msgid ""
"Convert tabs in each FILE to spaces, writing to standard output.\n"
"With no FILE, or when FILE is -, read standard input.\n"
@@ -2581,42 +2699,48 @@ msgstr ""
"將每個 <檔案> 中的 tab 轉換為空格,並在標準輸出顯示。\n"
"如果沒有指定 <檔案> 或 <檔案> 是 -,則由標準輸入讀取資料。\n"
-#: src/expand.c:120
+#: src/expand.c:122
+#, fuzzy
msgid ""
-" -i, --initial do not convert TABs after non whitespace\n"
+" -i, --initial do not convert tabs after non blanks\n"
" -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n"
msgstr ""
" -i, --initial 不轉換非空白字元後的 TAB 字元\n"
" -t, --tabs=數目 將 tab 轉換為指定 <數目> 的空格而不是 8 個\n"
-#: src/expand.c:124
+#: src/expand.c:126
msgid ""
" -t, --tabs=LIST use comma separated list of explicit tab positions\n"
msgstr " -t, --tabs=LIST 用以逗號分隔的數字來指定 tab 的位置\n"
-#: src/expand.c:180
+#: src/expand.c:180 src/unexpand.c:201
#, fuzzy, c-format
msgid "tab stop is too large %s"
msgstr "%s 過長"
-#: src/expand.c:189
+#: src/expand.c:190 src/unexpand.c:211
#, fuzzy, c-format
msgid "tab size contains invalid character(s): %s"
msgstr "tab 字元寬度含有無效的字元"
-#: src/expand.c:214 src/unexpand.c:170
+#: src/expand.c:216 src/unexpand.c:237
msgid "tab size cannot be 0"
msgstr "tab 字元寬度不可為 0"
-#: src/expand.c:216 src/unexpand.c:172
+#: src/expand.c:218 src/unexpand.c:239
msgid "tab sizes must be ascending"
msgstr "tab 字元位置必須由小至大"
-#: src/expand.c:410
+#: src/expand.c:338 src/expand.c:357 src/unexpand.c:388 src/unexpand.c:435
+#, fuzzy
+msgid "input line is too long"
+msgstr "%s:檔案過大"
+
+#: src/expand.c:431
msgid "`-LIST' option is obsolete; use `-t LIST'"
msgstr "‘-LIST’選項已經過時;請使用‘-t LIST’"
-#: src/expr.c:102
+#: src/expr.c:98
#, fuzzy, c-format
msgid ""
"Usage: %s EXPRESSION\n"
@@ -2625,7 +2749,7 @@ msgstr ""
"用法:%s [檔案]...\n"
" 或:%s [選項]\n"
-#: src/expr.c:110
+#: src/expr.c:106
msgid ""
"\n"
"Print the value of EXPRESSION to standard output. A blank line below\n"
@@ -2636,7 +2760,7 @@ msgid ""
" ARG1 & ARG2 ARG1 if neither argument is null or 0, otherwise 0\n"
msgstr ""
-#: src/expr.c:119
+#: src/expr.c:115
msgid ""
"\n"
" ARG1 < ARG2 ARG1 is less than ARG2\n"
@@ -2647,14 +2771,14 @@ msgid ""
" ARG1 > ARG2 ARG1 is greater than ARG2\n"
msgstr ""
-#: src/expr.c:128
+#: src/expr.c:124
msgid ""
"\n"
" ARG1 + ARG2 arithmetic sum of ARG1 and ARG2\n"
" ARG1 - ARG2 arithmetic difference of ARG1 and ARG2\n"
msgstr ""
-#: src/expr.c:133
+#: src/expr.c:129
#, c-format
msgid ""
"\n"
@@ -2663,7 +2787,7 @@ msgid ""
" ARG1 % ARG2 arithmetic remainder of ARG1 divided by ARG2\n"
msgstr ""
-#: src/expr.c:139
+#: src/expr.c:135
msgid ""
"\n"
" STRING : REGEXP anchored pattern match of REGEXP in STRING\n"
@@ -2674,7 +2798,7 @@ msgid ""
" length STRING length of STRING\n"
msgstr ""
-#: src/expr.c:148
+#: src/expr.c:144
msgid ""
" + TOKEN interpret TOKEN as a string, even if it is a\n"
" keyword like `match' or an operator like `/'\n"
@@ -2682,7 +2806,7 @@ msgid ""
" ( EXPRESSION ) value of EXPRESSION\n"
msgstr ""
-#: src/expr.c:154
+#: src/expr.c:150
msgid ""
"\n"
"Beware that many operators need to be escaped or quoted for shells.\n"
@@ -2692,28 +2816,36 @@ msgid ""
"0.\n"
msgstr ""
-#: src/expr.c:170
+#: src/expr.c:157
+msgid ""
+"\n"
+"Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
+"null\n"
+"or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
+msgstr ""
+
+#: src/expr.c:171
#, fuzzy
msgid "syntax error"
msgstr "標準錯誤輸出"
-#: src/expr.c:420
+#: src/expr.c:417
#, 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:632 src/expr.c:674
+#: src/expr.c:629 src/expr.c:671
#, fuzzy
msgid "non-numeric argument"
msgstr "限制引數"
-#: src/expr.c:638
+#: src/expr.c:635
msgid "division by zero"
msgstr ""
-#: src/factor.c:73
+#: src/factor.c:74
#, fuzzy, c-format
msgid ""
"Usage: %s [NUMBER]...\n"
@@ -2722,13 +2854,13 @@ msgstr ""
"用法:%s [檔案]...\n"
" 或:%s [選項]\n"
-#: src/factor.c:78
+#: src/factor.c:79
msgid ""
"Print the prime factors of each NUMBER.\n"
"\n"
msgstr ""
-#: src/factor.c:84
+#: src/factor.c:85
msgid ""
"\n"
" Print the prime factors of all specified integer NUMBERs. If no "
@@ -2736,12 +2868,12 @@ msgid ""
" are specified on the command line, they are read from standard input.\n"
msgstr ""
-#: src/factor.c:155
+#: src/factor.c:156
#, fuzzy, c-format
msgid "`%s' is too large"
msgstr "%s 過長"
-#: src/factor.c:157
+#: src/factor.c:158
#, c-format
msgid "`%s' is not a valid positive integer"
msgstr ""
@@ -2757,12 +2889,12 @@ msgid ""
"\n"
msgstr ""
-#: src/fmt.c:271
+#: src/fmt.c:273
#, c-format
msgid "Usage: %s [-DIGITS] [OPTION]... [FILE]...\n"
msgstr "用法:%s [-數字] [選項]... [檔案]...\n"
-#: src/fmt.c:272
+#: src/fmt.c:274
msgid ""
"Reformat each paragraph in the FILE(s), writing to standard output.\n"
"If no FILE or if FILE is `-', read standard input.\n"
@@ -2772,17 +2904,19 @@ msgstr ""
"如果沒有指定 <檔案> 或 <檔案> 是‘-’,則由標準輸入讀取資料。\n"
"\n"
-#: src/fmt.c:280
+#: src/fmt.c:282
+#, fuzzy
msgid ""
" -c, --crown-margin preserve indentation of first two lines\n"
-" -p, --prefix=STRING combine only lines having STRING as prefix\n"
+" -p, --prefix=STRING reformat only lines beginning with STRING,\n"
+" reattaching the prefix to reformatted lines\n"
" -s, --split-only split long lines, but do not refill\n"
msgstr ""
" -c, --crown-margin 保留最初兩行的縮排方式\n"
" -p, --prefix=字串 只合併含有指定前置 <字串> 的每一行\n"
" -s, --split-only 只將一行過長的資料分開,而不合併多於一行的資料\n"
-#: src/fmt.c:286
+#: src/fmt.c:289
#, fuzzy
msgid ""
" -t, --tagged-paragraph indentation of first line different from second\n"
@@ -2793,24 +2927,19 @@ msgstr ""
" -u, --uniform-spacing 每兩個字之間以一個空格分隔,句子後則用兩個空格\n"
" -w, --width=數字 最大的行寬 (預設為 75 個字元)\n"
-#: src/fmt.c:351
-#, fuzzy, c-format
-msgid "invalid width option: %s"
-msgstr "無效的寬度選項:‘%s’"
-
-#: src/fmt.c:367
+#: src/fmt.c:358
#, c-format
msgid ""
"invalid option -- %c; -WIDTH is recognized only when it is the first\n"
"option; use -w N instead"
msgstr ""
-#: src/fmt.c:393
+#: src/fmt.c:400
#, fuzzy, c-format
msgid "invalid width: %s"
msgstr "無效的寬度:‘%s’"
-#: src/fold.c:70
+#: src/fold.c:72
msgid ""
"Wrap input lines in each FILE (standard input by default), writing to\n"
"standard output.\n"
@@ -2819,7 +2948,7 @@ msgstr ""
"將 <檔案> (預設為標準輸入) 中的每一行進行自動斷行,並在標準輸出顯示結果。\n"
"\n"
-#: src/fold.c:78
+#: src/fold.c:80
msgid ""
" -b, --bytes count bytes rather than columns\n"
" -s, --spaces break at spaces\n"
@@ -2829,12 +2958,12 @@ msgstr ""
" -s, --spaces 只在空格位置斷開\n"
" -w, --width=寬度 使用指定的 <寬度> 作為行寬而非 80\n"
-#: src/fold.c:274
+#: src/fold.c:276
#, c-format
msgid "`%s' option is obsolete; use `%s'"
msgstr "‘%s’選項已過時;請使用‘%s’"
-#: src/fold.c:302
+#: src/fold.c:301
#, c-format
msgid "invalid number of columns: `%s'"
msgstr "無效的欄位數目:‘%s’"
@@ -2879,14 +3008,14 @@ msgstr ""
"<大小> 可以加上單位:b 表示 512,k 表示 1K,m 表示 1M。\n"
#: src/head.c:155 src/head.c:268 src/head.c:340 src/head.c:549 src/head.c:631
-#: src/head.c:703 src/head.c:768 src/head.c:796 src/tail.c:365 src/tail.c:446
-#: src/tail.c:495 src/tail.c:588 src/tail.c:716 src/tail.c:764 src/tail.c:803
-#: src/tail.c:1294 src/tail.c:1330 src/uniq.c:382
+#: src/head.c:703 src/head.c:768 src/head.c:796 src/tail.c:376 src/tail.c:464
+#: src/tail.c:513 src/tail.c:606 src/tail.c:734 src/tail.c:782 src/tail.c:821
+#: src/tail.c:1325 src/tail.c:1354 src/uniq.c:388
#, c-format
msgid "error reading %s"
msgstr "讀取 %s 時發生錯誤"
-#: src/head.c:158 src/uniq.c:385 src/uniq.c:389
+#: src/head.c:158 src/uniq.c:395 src/uniq.c:397
#, c-format
msgid "error writing %s"
msgstr "寫入 %s 時發生錯誤"
@@ -2906,7 +3035,7 @@ msgstr "位元組數目"
msgid "%s: cannot lseek back to original position"
msgstr "%s:無法搜尋至相對位置 %s%s"
-#: src/head.c:624 src/head.c:695 src/tail.c:396
+#: src/head.c:624 src/head.c:695 src/tail.c:414
#, fuzzy, c-format
msgid "%s: cannot seek to offset %s"
msgstr "%s:無法搜尋至位置 %s%s"
@@ -2916,24 +3045,24 @@ msgstr "%s:無法搜尋至位置 %s%s"
msgid "cannot reposition file pointer for %s"
msgstr "無法將 %s 的檔案指標重新定位"
-#: src/head.c:897 src/tail.c:1454
+#: src/head.c:897
#, c-format
msgid "%s: %s is so large that it is not representable"
msgstr "%s:%s過大,因此無法表示"
-#: src/head.c:898 src/tail.c:1456
+#: src/head.c:898
msgid "number of lines"
msgstr "行數"
-#: src/head.c:898 src/tail.c:1457
+#: src/head.c:898
msgid "number of bytes"
msgstr "位元組數目"
-#: src/head.c:905 src/tail.c:1543
+#: src/head.c:905 src/tail.c:1497
msgid "invalid number of lines"
msgstr "無效的行數"
-#: src/head.c:906 src/tail.c:1544
+#: src/head.c:906 src/tail.c:1498
msgid "invalid number of bytes"
msgstr "無效的位元組數目"
@@ -2942,17 +3071,17 @@ msgstr "無效的位元組數目"
msgid "unrecognized option `-%c'"
msgstr "無法識別的選項‘-%c’"
-#: src/head.c:1000
+#: src/head.c:1001
#, c-format
msgid "`-%s' option is obsolete; use `-%c %.*s%.*s%s'"
msgstr "‘-%s’選項已過時;請使用‘-%c %.*s%.*s%s’"
-#: src/head.c:1076
+#: src/head.c:1074
#, fuzzy, c-format
msgid "%s: number of bytes is too large"
msgstr "要比較的位元組數目無效"
-#: src/hostid.c:46
+#: src/hostid.c:48
#, c-format
msgid ""
"Usage: %s\n"
@@ -2961,7 +3090,7 @@ msgid ""
"\n"
msgstr ""
-#: src/hostname.c:70
+#: src/hostname.c:65
#, c-format
msgid ""
"Usage: %s [NAME]\n"
@@ -2970,26 +3099,26 @@ msgid ""
"\n"
msgstr ""
-#: src/hostname.c:108
+#: src/hostname.c:103
#, fuzzy, c-format
-msgid "cannot set hostname to `%s'"
+msgid "cannot set name to `%s'"
msgstr "無法對‘%s’執行輸出入控制 (ioctl)"
-#: src/hostname.c:114
+#: src/hostname.c:106
msgid "cannot set hostname; this system lacks the functionality"
msgstr ""
-#: src/hostname.c:121
+#: src/hostname.c:114
#, fuzzy
msgid "cannot determine hostname"
msgstr "無法設定%s的權限"
-#: src/id.c:86
+#: src/id.c:87
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [USERNAME]\n"
msgstr "用法:%s [選項]... SET1 [SET2]\n"
-#: src/id.c:87
+#: src/id.c:88
msgid ""
"Print information for USERNAME, or the current user.\n"
"\n"
@@ -3001,124 +3130,116 @@ msgid ""
" -u, --user print only the effective user ID\n"
msgstr ""
-#: src/id.c:99
+#: src/id.c:100
msgid ""
"\n"
"Without any OPTION, print some useful set of identified information.\n"
msgstr ""
-#: src/id.c:162
+#: src/id.c:161
#, fuzzy
msgid "cannot print only user and only group"
msgstr "不可同時省略使用者和所屬群組"
-#: src/id.c:166
+#: src/id.c:165
msgid "cannot print only names or real IDs in default format"
msgstr ""
-#: src/id.c:175
+#: src/id.c:177
#, c-format
msgid "%s: No such user"
msgstr ""
-#: src/id.c:212
+#: src/id.c:214
#, c-format
msgid "cannot find name for user ID %u"
msgstr ""
-#: src/id.c:235
+#: src/id.c:237
#, fuzzy, c-format
msgid "cannot find name for group ID %u"
msgstr "無法更改%s的擁有者和/或所屬群組"
-#: src/id.c:272
+#: src/id.c:278
#, fuzzy
msgid "cannot get supplemental group list"
msgstr "無法改變所屬群組至沒有名稱的群組"
-#: src/id.c:384
+#: src/id.c:382
msgid " groups="
msgstr ""
-#: src/install.c:271
+#: src/install.c:307
msgid "the strip option may not be used when installing a directory"
msgstr "安裝目錄時不能用 strip 選項"
-#: src/install.c:294 src/mkdir.c:141
+#: src/install.c:310
+#, fuzzy
+msgid "target directory not allowed when installing a directory"
+msgstr "安裝目錄時不能用 strip 選項"
+
+#: src/install.c:358 src/mkdir.c:139
#, fuzzy, c-format
msgid "invalid mode %s"
msgstr "無效的寬度:‘%s’"
-#: src/install.c:309 src/install.c:373
+#: src/install.c:373 src/install.c:422
#, fuzzy, c-format
msgid "creating directory %s"
msgstr "無法建立目錄%s"
-#: src/install.c:334
-#, c-format
-msgid "installing multiple files, but last argument, %s is not a directory"
-msgstr "正在安裝多個檔案,但最後的引數%s並非目錄。"
-
-#: src/install.c:437
-#, fuzzy, c-format
-msgid "%s is a directory"
-msgstr "%s已存在但不是目錄"
-
-#: src/install.c:473
+#: src/install.c:511
#, fuzzy, c-format
msgid "cannot change ownership of %s"
msgstr "無法更改%s的權限"
-#: src/install.c:497
+#: src/install.c:535
#, fuzzy, c-format
msgid "cannot obtain time stamps for %s"
msgstr "無法將 %s 的檔案指標重新定位"
-#: src/install.c:507
+#: src/install.c:545
#, fuzzy, c-format
msgid "cannot set time stamps for %s"
msgstr "無法建立目錄%s"
-#: src/install.c:528
+#: src/install.c:566
#, fuzzy
msgid "fork system call failed"
msgstr "區塊特殊檔案"
-#: src/install.c:532
+#: src/install.c:570
msgid "cannot run strip"
msgstr "無法執行 strip 指令"
-#: src/install.c:539
+#: src/install.c:577
#, fuzzy
msgid "strip failed"
msgstr "stat 時發生錯誤"
-#: src/install.c:560
+#: src/install.c:598
#, fuzzy, c-format
msgid "invalid user %s"
msgstr "無效的使用者"
-#: src/install.c:578
+#: src/install.c:635
#, fuzzy, c-format
-msgid "invalid group %s"
-msgstr "無效的群組"
-
-#: src/install.c:597
-#, c-format
msgid ""
-"Usage: %s [OPTION]... SOURCE DEST (1st format)\n"
-" or: %s [OPTION]... SOURCE... DIRECTORY (2nd format)\n"
-" or: %s -d [OPTION]... DIRECTORY... (3rd format)\n"
+"Usage: %s [OPTION]... [-T] SOURCE DEST\n"
+" or: %s [OPTION]... SOURCE... DIRECTORY\n"
+" or: %s [OPTION]... -t DIRECTORY SOURCE...\n"
+" or: %s [OPTION]... -d DIRECTORY...\n"
msgstr ""
-"用法:%s [選項]... 來源 目的地 (第一種格式)\n"
-" 或:%s [選項]... 來源... 目錄 (第二種格式)\n"
-" 或:%s -d [選項]... 目錄... (第三種格式)\n"
+"用法:%s [選項]... 來源 目的地\n"
+" 或:%s [選項]... 來源... 目錄\n"
+" 或:%s [選項]... --target-directory=目錄 來源...\n"
-#: src/install.c:603
+#: src/install.c:642
+#, fuzzy
msgid ""
-"In the first two formats, copy SOURCE to DEST or multiple SOURCE(s) to\n"
+"In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n"
"the existing DIRECTORY, while setting permission modes and owner/group.\n"
-"In the third format, create all components of the given DIRECTORY(ies).\n"
+"In the 4th form, create all components of the given DIRECTORY(ies).\n"
"\n"
msgstr ""
"在最初兩種格式中,會將 <來源> 複製至 <目的地> 或將多個 <來源>\n"
@@ -3126,7 +3247,7 @@ msgstr ""
"在第三種格式中,會建立所有指定的目錄及它們的所有上層目錄。\n"
"\n"
-#: src/install.c:612
+#: src/install.c:651
msgid ""
" --backup[=CONTROL] make a backup of each existing destination file\n"
" -b like --backup but does not accept an argument\n"
@@ -3140,11 +3261,12 @@ msgstr ""
" -d, --directory 所有引數都作為目錄處理;而且會建立指定目錄的所有主目"
"錄\n"
-#: src/install.c:619
+#: src/install.c:658
+#, fuzzy
msgid ""
" -D create all leading components of DEST except the "
"last,\n"
-" then copy SOURCE to DEST; useful in the 1st format\n"
+" then copy SOURCE to DEST\n"
" -g, --group=GROUP set group ownership, instead of process' current "
"group\n"
" -m, --mode=MODE set permission mode (as in chmod), instead of rwxr-xr-"
@@ -3157,13 +3279,17 @@ msgstr ""
" -m, --mode=模式 自行設定權限模式 (像 chmod),而不是 rwxr-xr-x\n"
" -o, --owner=擁有者 自行設定擁有者 (只適用於最大權力使用者)\n"
-#: src/install.c:626
+#: src/install.c:665
+#, fuzzy
msgid ""
" -p, --preserve-timestamps apply access/modification times of SOURCE "
"files\n"
" to corresponding destination files\n"
-" -s, --strip strip symbol tables, only for 1st and 2nd formats\n"
+" -s, --strip strip symbol tables\n"
" -S, --suffix=SUFFIX override the usual backup suffix\n"
+" -t, --target-directory=DIRECTORY copy all SOURCE arguments into "
+"DIRECTORY\n"
+" -T, --no-target-directory treat DEST as a normal file\n"
" -v, --verbose print the name of each directory as it is created\n"
msgstr ""
" -p, --preserve-timestamps 以 <來源> 檔案的存取/修改時間作為相應的目的\n"
@@ -3173,7 +3299,7 @@ msgstr ""
" -S, --suffix=字串 自行指定備份檔的後置 <字串>\n"
" -v, --verbose 處理每個檔案/目錄時印出名稱\n"
-#: src/install.c:635 src/ln.c:385 src/mv.c:348
+#: src/install.c:676 src/ln.c:377 src/mv.c:336
msgid ""
"\n"
"The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -3272,29 +3398,21 @@ msgstr "無效的欄位號碼:‘%s’"
msgid "invalid file number in field spec: `%s'"
msgstr "欄位規格中含有無效的檔案編號:‘%s’"
-#: src/join.c:739
-msgid "too many non-option arguments"
-msgstr "非選項的引數過多"
-
-#: src/join.c:781 src/join.c:811
+#: src/join.c:778 src/join.c:808
#, c-format
msgid "invalid field number: `%s'"
msgstr "無效的欄位號碼:‘%s’"
-#: src/join.c:799
+#: src/join.c:796
#, c-format
msgid "invalid field number for file 1: `%s'"
msgstr "檔案 1 的欄位號碼是無效的:‘%s’"
-#: src/join.c:805
+#: src/join.c:802
#, c-format
msgid "invalid field number for file 2: `%s'"
msgstr "檔案 2 的欄位號碼是無效的:‘%s’"
-#: src/join.c:851
-msgid "too few non-option arguments"
-msgstr "非選項的引數過少"
-
#: src/join.c:862
msgid "both files cannot be standard input"
msgstr "兩個檔案不能都是標準輸入"
@@ -3379,75 +3497,71 @@ msgstr ""
"透過調用 link 函式,建立連至 <檔案1> 的鏈結,鏈結名稱為 <檔案2>。\n"
"\n"
-#: src/link.c:99
+#: src/link.c:96
#, fuzzy, c-format
msgid "cannot create link %s to %s"
msgstr "無法建立目錄%s"
-#: src/ln.c:172
+#: src/ln.c:179
#, c-format
msgid "%s: warning: making a hard link to a symbolic link is not portable"
msgstr "%s:警告:將實際鏈結 (hard link) 連至符號鏈結不是所有系統都適用的功能"
-#: src/ln.c:179
+#: src/ln.c:186
#, c-format
msgid "%s: hard link not allowed for directory"
msgstr "%s: 不允許將實際鏈結 (hard link) 連至目錄"
-#: src/ln.c:250
+#: src/ln.c:240
#, fuzzy, c-format
msgid "%s: cannot overwrite directory"
msgstr "無法建立目錄%s"
-#: src/ln.c:255
+#: src/ln.c:245
#, c-format
msgid "%s: replace %s? "
msgstr "%s:是否置換%s? "
-#: src/ln.c:261
-#, c-format
-msgid "%s: File exists"
-msgstr "%s:檔案已存在"
-
-#: src/ln.c:310
+#: src/ln.c:273
#, fuzzy, c-format
msgid "create symbolic link %s to %s"
msgstr "符號連結"
-#: src/ln.c:311
+#: src/ln.c:274
#, c-format
msgid "create hard link %s to %s"
msgstr "建立連至%2$s的實際鏈結 (hard link)%1$s"
-#: src/ln.c:325
+#: src/ln.c:316
#, c-format
msgid "creating symbolic link %s to %s"
msgstr "正在建立連至%2$s的符號鏈結%1$s"
-#: src/ln.c:326
+#: src/ln.c:317
#, c-format
msgid "creating hard link %s to %s"
msgstr "正在建立連至%2$s的實際鏈結 (hard link)%1$s"
-#: src/ln.c:345
-#, c-format
+#: src/ln.c:336
+#, fuzzy, c-format
msgid ""
-"Usage: %s [OPTION]... TARGET [LINK_NAME]\n"
-" or: %s [OPTION]... TARGET... DIRECTORY\n"
-" or: %s [OPTION]... --target-directory=DIRECTORY TARGET...\n"
+"Usage: %s [OPTION]... [-T] TARGET LINK_NAME (1st form)\n"
+" or: %s [OPTION]... TARGET (2nd form)\n"
+" or: %s [OPTION]... TARGET... DIRECTORY (3rd form)\n"
+" or: %s [OPTION]... -t DIRECTORY TARGET... (4th form)\n"
msgstr ""
-"用法:%s [選項]... 目標 [鏈結名稱]\n"
-" 或:%s [選項]... 目標... 目錄\n"
-" 或:%s [選項]... --target-directory=目錄 目標...\n"
+"用法:%s [選項]... 來源 目的地 (第一種格式)\n"
+" 或:%s [選項]... 來源... 目錄 (第二種格式)\n"
+" 或:%s -d [選項]... 目錄... (第三種格式)\n"
-#: src/ln.c:351
+#: src/ln.c:343
+#, fuzzy
msgid ""
-"Create a link to the specified TARGET with optional LINK_NAME.\n"
-"If LINK_NAME is omitted, a link with the same basename as the TARGET is\n"
-"created in the current directory. When using the second form with more\n"
-"than one TARGET, the last argument must be a directory; create links\n"
-"in DIRECTORY to each TARGET. Create hard links by default, symbolic\n"
-"links with --symbolic. When creating hard links, each TARGET must exist.\n"
+"In the 1st form, create a link to TARGET with the name LINK_NAME.\n"
+"In the 2nd form, create a link to TARGET in the current directory.\n"
+"In the 3rd and 4th forms, create links to each TARGET in DIRECTORY.\n"
+"Create hard links by default, symbolic links with --symbolic.\n"
+"When creating hard links, each TARGET must exist.\n"
"\n"
msgstr ""
"建立連至指定 <目標> 的鏈結,並可選擇指定 <鏈結名稱>。\n"
@@ -3458,7 +3572,7 @@ msgstr ""
"都必須存在。\n"
"\n"
-#: src/ln.c:363
+#: src/ln.c:354
#, fuzzy
msgid ""
" --backup[=CONTROL] make a backup of each existing destination "
@@ -3477,7 +3591,7 @@ msgstr ""
"者)\n"
" -f, --force 強迫移除任何已存在的目的地檔案\n"
-#: src/ln.c:371
+#: src/ln.c:362
msgid ""
" -n, --no-dereference treat destination that is a symlink to a\n"
" directory as if it were a normal file\n"
@@ -3490,123 +3604,116 @@ msgstr ""
" -i, --interactive 確認是否移除目的地檔案\n"
" -s, --symbolic 建立符號鏈結而不是實際鏈結\n"
-#: src/ln.c:377
+#: src/ln.c:368
+#, fuzzy
msgid ""
" -S, --suffix=SUFFIX override the usual backup suffix\n"
-" --target-directory=DIRECTORY specify the DIRECTORY in which to "
+" -t, --target-directory=DIRECTORY specify the DIRECTORY in which to "
"create\n"
" the links\n"
+" -T, --no-target-directory treat LINK_NAME as a normal file\n"
" -v, --verbose print name of each file before linking\n"
msgstr ""
" -S, --suffix=後置字串 自行指定備份檔的 <後置字串>\n"
" --target-directory=目錄 在指定 <目錄> 中建立鏈結\n"
" -v, --verbose 連結前先印出每個檔案的名稱\n"
-#: src/ln.c:530
-#, fuzzy, c-format
-msgid "%s: specified target directory is not a directory"
+#: src/ln.c:508
+#, fuzzy
+msgid "Cannot combine --target-directory and --no-target-directory"
msgstr "%s已存在但不是目錄"
-#: src/ln.c:551
-msgid "when making multiple links, last argument must be a directory"
-msgstr "建立多個鏈結時,最後的引數必需為目錄"
-
-#: src/logname.c:48 src/pwd.c:65 src/sync.c:44
+#: src/logname.c:44 src/pwd.c:66 src/sync.c:45
#, fuzzy, c-format
msgid "Usage: %s [OPTION]\n"
msgstr "用法:%s [選項] [檔案]...\n"
-#: src/logname.c:49
+#: src/logname.c:45
msgid ""
"Print the name of the current user.\n"
"\n"
msgstr ""
-#: src/logname.c:104
+#: src/logname.c:89
#, fuzzy
msgid "no login name"
msgstr "%s:無效的號碼"
-#: src/ls.c:655
+#: src/ls.c:662
#, fuzzy
msgid "%b %e %Y"
msgstr "%Y-%m-%d %H:%M"
-#: src/ls.c:663
+#: src/ls.c:670
#, fuzzy
msgid "%b %e %H:%M"
msgstr "%Y-%m-%d %H:%M"
-#: src/ls.c:1376
+#: src/ls.c:1404
#, fuzzy, c-format
msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
msgstr "忽略無效的環境變數 QUOTING_STYLE 的變數值:%s"
-#: src/ls.c:1403
+#: src/ls.c:1431
#, c-format
msgid "ignoring invalid width in environment variable COLUMNS: %s"
msgstr "忽略無效的環境變數 COLUMNS 的寬度數值:%s"
-#: src/ls.c:1435
+#: src/ls.c:1461
#, c-format
msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
msgstr "忽略無效的環境變數 TABSIZE 的 tab 字元定位值:%s"
-#: src/ls.c:1552 src/ptx.c:2053
+#: src/ls.c:1573 src/ptx.c:2055
#, fuzzy, c-format
msgid "invalid line width: %s"
msgstr "無效的寬度:‘%s’"
-#: src/ls.c:1626
+#: src/ls.c:1647
#, fuzzy, c-format
msgid "invalid tab size: %s"
msgstr "無效的類型‘%s’"
-#: src/ls.c:1794
+#: src/ls.c:1824
#, fuzzy, c-format
msgid "invalid time style format %s"
msgstr "%2$s的引數%1$s無效"
-#: src/ls.c:2130
+#: src/ls.c:2160
#, fuzzy, c-format
msgid "unrecognized prefix: %s"
msgstr "無法識別的選項‘-%c’"
-#: src/ls.c:2153
+#: src/ls.c:2183
msgid "unparsable value for LS_COLORS environment variable"
msgstr "LS_COLORS 環境變數中存在無法分析的值"
-#: src/ls.c:2221
+#: src/ls.c:2275
#, fuzzy, c-format
msgid "cannot determine device and inode of %s"
msgstr "無法將 %s 的檔案指標重新定位"
-#: src/ls.c:2231
+#: src/ls.c:2283
#, fuzzy, c-format
-msgid "not listing already-listed directory: %s"
+msgid "%s: not listing already-listed directory"
msgstr "無法建立目錄%s"
-#: src/ls.c:2284 src/pwd.c:234 src/remove.c:941
+#: src/ls.c:2323 src/pwd.c:236 src/remove.c:972
#, fuzzy, c-format
msgid "reading directory %s"
msgstr "無法建立目錄%s"
-#: src/ls.c:2764
+#: src/ls.c:2333
+#, fuzzy, c-format
+msgid "closing directory %s"
+msgstr "無法進入%s目錄"
+
+#: src/ls.c:2820
#, fuzzy, c-format
msgid "cannot compare file names %s and %s"
msgstr "要比較的字串為%s及%s。"
-#: src/ls.c:3106
-#, fuzzy
-msgid "User name too long"
-msgstr "%s:檔案過大"
-
-#: src/ls.c:3127
-#, fuzzy
-msgid "Group name too long"
-msgstr "%s:檔案過大"
-
-#: src/ls.c:3988
+#: src/ls.c:4061
msgid ""
"List information about the FILEs (the current directory by default).\n"
"Sort entries alphabetically if none of -cftuSUX nor --sort.\n"
@@ -3616,11 +3723,12 @@ msgstr ""
"如果不指定 -cftuSUX 或 --sort 任何一個選項,則根據字母大小排序。\n"
"\n"
-#: src/ls.c:3996
+#: src/ls.c:4069
+#, fuzzy
msgid ""
-" -a, --all do not hide entries starting with .\n"
+" -a, --all do not ignore entries starting with .\n"
" -A, --almost-all do not list implied . and ..\n"
-" --author print the author of each file\n"
+" --author with -l, print the author of each file\n"
" -b, --escape print octal escapes for nongraphic characters\n"
msgstr ""
" -a, --all 不隱藏任何以 . 字元開始的項目\n"
@@ -3628,7 +3736,7 @@ msgstr ""
" --author 印出每個檔案的著作者\n"
" -b, --escape 以八進位溢出序列表示不可列印的字元\n"
-#: src/ls.c:4002
+#: src/ls.c:4075
msgid ""
" --block-size=SIZE use SIZE-byte blocks\n"
" -B, --ignore-backups do not list implied entries ending with ~\n"
@@ -3645,7 +3753,7 @@ msgstr ""
" 配合 -l :顯示 ctime 但根據名稱排序\n"
" 否則 :根據 ctime 排序\n"
-#: src/ls.c:4010
+#: src/ls.c:4083
#, fuzzy
msgid ""
" -C list entries by columns\n"
@@ -3663,7 +3771,7 @@ msgstr ""
" -d, --directory 當遇到目錄時列出目錄本身而非目錄內的檔案\n"
" -D, --dired 產生適合 Emacs 的 dired 模式使用的結果\n"
-#: src/ls.c:4018
+#: src/ls.c:4091
msgid ""
" -f do not sort, enable -aU, disable -lst\n"
" -F, --classify append indicator (one of */=@|) to entries\n"
@@ -3677,20 +3785,23 @@ msgstr ""
" single-column -1,verbose -l,vertical -C\n"
" --full-time 即 -l --time-style=full-iso\n"
-#: src/ls.c:4025
+#: src/ls.c:4098
#, fuzzy
msgid ""
" -g like -l, but do not list owner\n"
-" -G, --no-group inhibit display of group information\n"
-" -h, --human-readable print sizes in human readable format (e.g., 1K 234M "
-"2G)\n"
+" -G, --no-group like -l, but do not list group\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"
" -H, --dereference-command-line\n"
" follow symbolic links listed on the command "
"line\n"
" --dereference-command-line-symlink-to-dir\n"
" follow each command line symbolic link\n"
-" that points to a directory\n"
+" that points to a directory\n"
+" --hide=PATTERN do not list implied entries matching shell "
+"PATTERN\n"
+" (overridden by -a or -A)\n"
msgstr ""
" -g 類似 -l,但不列出擁有者\n"
" -G, --no-group 不列出任何有關群組的資訊\n"
@@ -3698,13 +3809,14 @@ msgstr ""
" --si 類似 -h,但取 1000 的次方而不是 1024\n"
" -H, --dereference-command-line 使用指令列中的符號鏈結指示的真正目的地\n"
-#: src/ls.c:4036
+#: src/ls.c:4112
+#, fuzzy
msgid ""
" --indicator-style=WORD append indicator with style WORD to entry "
"names:\n"
" none (default), classify (-F), file-type (-"
"p)\n"
-" -i, --inode print index number of each file\n"
+" -i, --inode with -l, print the index number of each file\n"
" -I, --ignore=PATTERN do not list implied entries matching shell "
"PATTERN\n"
" -k like --block-size=1K\n"
@@ -3715,7 +3827,7 @@ msgstr ""
" -I, --ignore=樣式 不印出任何符合 shell 萬用字元 <樣式> 的項目\n"
" -k 即 --block-size=1K\n"
-#: src/ls.c:4043
+#: src/ls.c:4119
msgid ""
" -l use a long listing format\n"
" -L, --dereference when showing file information for a symbolic\n"
@@ -3729,7 +3841,7 @@ msgstr ""
" 的目標而並非符號鏈結本身的資訊\n"
" -m 所有項目以逗號分隔,並填滿整行行寬\n"
-#: src/ls.c:4050
+#: src/ls.c:4126
msgid ""
" -n, --numeric-uid-gid like -l, but list numeric UIDs and GIDs\n"
" -N, --literal print raw entry names (don't treat e.g. "
@@ -3744,7 +3856,7 @@ msgstr ""
" -o 類似 -l,但不列出有關群組的資訊\n"
" -p, --file-type 加上檔案類型的指示符號 (/=@| 其中一個)\n"
-#: src/ls.c:4057
+#: src/ls.c:4133
msgid ""
" -q, --hide-control-chars print ? instead of non graphic characters\n"
" --show-control-chars show non graphic characters as-is (default\n"
@@ -3763,28 +3875,28 @@ msgstr ""
" literal、locale、shell、shell-always、c、"
"escape\n"
-#: src/ls.c:4065
+#: src/ls.c:4141
+#, fuzzy
msgid ""
" -r, --reverse reverse order while sorting\n"
" -R, --recursive list subdirectories recursively\n"
-" -s, --size print size of each file, in blocks\n"
+" -s, --size with -l, print size of each file, in blocks\n"
msgstr ""
" -r, --reverse 依相反次序排列\n"
" -R, --recursive 同時列出所有副目錄層\n"
" -s, --size 以區段大小為單位列出所有檔案的大小\n"
-#: src/ls.c:4070
+#: src/ls.c:4146
#, fuzzy
msgid ""
" -S sort by file size\n"
" --sort=WORD extension -X, none -U, size -S, time -t,\n"
-" version -v\n"
-" status -c, time -t, atime -u, access -u, use -"
-"u\n"
-" --time=WORD show time as WORD instead of modification "
-"time:\n"
-" atime, access, use, ctime or status; use\n"
-" specified time as sort key if --sort=time\n"
+" version -v, status -c, time -t, atime -u,\n"
+" access -u, use -u\n"
+" --time=WORD with -l, show time as WORD instead of "
+"modification\n"
+" time: atime, access, use, ctime or status; use\n"
+" specified time as sort key if --sort=time\n"
msgstr ""
" -S 根據檔案大小排序\n"
" --sort=WORD 以下是可選用的 WORD 和它們代表的相應選項:\n"
@@ -3797,10 +3909,11 @@ msgstr ""
" atime、access、use、ctime 或 status;加上\n"
" --sort=time 選項時會以指定時間作為排序索引\n"
-#: src/ls.c:4079
+#: src/ls.c:4155
+#, fuzzy
msgid ""
-" --time-style=STYLE show times using style STYLE:\n"
-" full-iso, long-iso, iso, locale, +FORMAT\n"
+" --time-style=STYLE with -l, show times using style STYLE:\n"
+" full-iso, long-iso, iso, locale, +FORMAT.\n"
" FORMAT is interpreted like `date'; if FORMAT "
"is\n"
" FORMAT1<newline>FORMAT2, FORMAT1 applies to\n"
@@ -3820,7 +3933,7 @@ msgstr ""
" -t 根據修改時間排序\n"
" -T, --tabsize=寬度 另行指定 tab 的 <寬度>,而非 8 個字元\n"
-#: src/ls.c:4090
+#: src/ls.c:4166
msgid ""
" -u with -lt: sort by, and show, access time\n"
" with -l: show access time and sort by name\n"
@@ -3834,7 +3947,7 @@ msgstr ""
" -U 不進行排序;依檔案系統原有的次序列出項目\n"
" -v 根據版本進行排序\n"
-#: src/ls.c:4097
+#: src/ls.c:4173
#, fuzzy
msgid ""
" -w, --width=COLS assume screen width instead of current value\n"
@@ -3846,7 +3959,7 @@ msgstr ""
" 每一行,除非使用了 -s 選項\n"
" -n (不會作任何處理)\n"
-#: src/ls.c:4109
+#: src/ls.c:4185
msgid ""
"\n"
"By default, color is not used to distinguish types of files. That is\n"
@@ -3860,7 +3973,13 @@ msgstr ""
"--color 選項但不指定 WHEN 引數等於 --color=always。當使用 --color=auto 時,\n"
"只當輸出至終端機畫面 (tty) 時才會顯示色彩。\n"
-#: src/md5sum.c:124
+#: src/ls.c:4193
+msgid ""
+"\n"
+"Exit status is 0 if OK, 1 if minor problems, 2 if serious trouble.\n"
+msgstr ""
+
+#: src/md5sum.c:131
#, c-format
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
@@ -3873,7 +3992,7 @@ msgstr ""
"印出或檢查 %s (%d 位元) 總和檢查值。\n"
"如果沒有指定 <檔案> 或 <檔案> 是 -,則由標準輸入讀取資料。\n"
-#: src/md5sum.c:133
+#: src/md5sum.c:140
#, c-format
msgid ""
"\n"
@@ -3889,7 +4008,7 @@ msgstr ""
" -t, --text 以文字模式讀入檔案 (預設模式)\n"
"\n"
-#: src/md5sum.c:141
+#: src/md5sum.c:148
msgid ""
"The following two options are useful only when verifying checksums:\n"
" --status don't output anything, status code shows success\n"
@@ -3900,7 +4019,7 @@ msgstr ""
" --status 不顯示任何結果,只用回傳值表示是否成功\n"
" -w, --warn 對於每一行含有不正確格式的總和檢查值都顯示警告\n"
-#: src/md5sum.c:149
+#: src/md5sum.c:156
#, c-format
msgid ""
"\n"
@@ -3914,83 +4033,71 @@ msgstr ""
"的輸出結果。預設模式是印出總和檢查值,一個代表檔案類型的字元 (‘*’表示二元\n"
"碼,‘ ’[空格] 表示文字),及每個 <檔案> 的名稱。\n"
-#: src/md5sum.c:435
-#, c-format
-msgid "%s: %lu: improperly formatted %s checksum line"
+#: src/md5sum.c:423
+#, fuzzy, c-format
+msgid "%s: too many checksum lines"
+msgstr "欄位規格出現不合法的字元"
+
+#: src/md5sum.c:444
+#, fuzzy, c-format
+msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
msgstr "%s:%lu:該行的 %s 總和檢查值格式不正確"
-#: src/md5sum.c:457
+#: src/md5sum.c:467
#, c-format
msgid "%s: FAILED open or read\n"
msgstr "%s:開啟或讀取時發生錯誤\n"
-#: src/md5sum.c:481
+#: src/md5sum.c:491
msgid "FAILED"
msgstr "錯誤"
-#: src/md5sum.c:481
+#: src/md5sum.c:491
msgid "OK"
msgstr "正確"
-#: src/md5sum.c:494 src/od.c:970
+#: src/md5sum.c:504 src/od.c:942 src/tac.c:238 src/tac.c:345 src/tac.c:475
+#: src/tac.c:559
#, c-format
msgid "%s: read error"
msgstr "%s:讀取時發生錯誤"
-#: src/md5sum.c:507
+#: src/md5sum.c:517
#, c-format
msgid "%s: no properly formatted %s checksum lines found"
msgstr "%s:找不到正確格式的 %s 總和檢查值"
-#: src/md5sum.c:520
-#, c-format
-msgid "WARNING: %d of %d listed %s could not be read"
-msgstr "警告:無法讀入 %2$d 個%3$s的其中 %1$d 個"
-
-#: src/md5sum.c:523
-msgid "file"
-msgstr "檔案"
-
-#: src/md5sum.c:523
-msgid "files"
-msgstr "檔案"
-
-#: src/md5sum.c:529
-#, c-format
-msgid "WARNING: %d of %d computed %s did NOT match"
-msgstr "警告:%2$d 個計算出來的%3$s的其中 %1$d 個並不匹配"
-
-#: src/md5sum.c:532
-msgid "checksum"
-msgstr "總和檢查值"
+#: src/md5sum.c:526
+#, fuzzy, 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] "警告:無法讀入 %2$d 個%3$s的其中 %1$d 個"
+msgstr[1] "警告:無法讀入 %2$d 個%3$s的其中 %1$d 個"
-#: src/md5sum.c:532
-msgid "checksums"
-msgstr "總和檢查值"
+#: src/md5sum.c:538
+#, fuzzy, c-format
+msgid "WARNING: %<PRIuMAX> of %<PRIuMAX> computed checksum did NOT match"
+msgid_plural ""
+"WARNING: %<PRIuMAX> of %<PRIuMAX> computed checksums did NOT match"
+msgstr[0] "警告:%2$d 個計算出來的%3$s的其中 %1$d 個並不匹配"
+msgstr[1] "警告:%2$d 個計算出來的%3$s的其中 %1$d 個並不匹配"
-#: src/md5sum.c:615
+#: src/md5sum.c:613
msgid ""
"the --binary and --text options are meaningless when verifying checksums"
msgstr "當驗證總和檢查值時,選項 --binary 及 --text 是沒有意義的"
-#: src/md5sum.c:623
-msgid "the --string and --check options are mutually exclusive"
-msgstr "不能同時使用 --string 及 --check 選項"
-
-#: src/md5sum.c:630
+#: src/md5sum.c:621
msgid "the --status option is meaningful only when verifying checksums"
msgstr "選項 --status 只有在驗證總和檢查值時才有意義"
-#: src/md5sum.c:637
+#: src/md5sum.c:628
msgid "the --warn option is meaningful only when verifying checksums"
msgstr "選項 --warn 只有在驗證總和檢查值時才有意義"
-#: src/md5sum.c:647
-msgid "no files may be specified when using --string"
-msgstr "使用選項 --string 時不能再指定檔案"
-
-#: src/md5sum.c:669
-msgid "only one argument may be specified when using --check"
+#: src/md5sum.c:638
+#, fuzzy
+msgid "Only one operand may be specified when using --check."
msgstr "使用選項 --check 時只能指定一個引數"
#: src/mkdir.c:61
@@ -4017,12 +4124,12 @@ msgstr ""
" -p, --parents 需要時建立上層目錄,如目錄早已存在則不當作錯誤\n"
" -v, --verbose 每次建立新目錄都顯示訊息\n"
-#: src/mkdir.c:114
+#: src/mkdir.c:112
#, fuzzy, c-format
msgid "created directory %s"
msgstr "無法建立目錄%s"
-#: src/mkdir.c:191
+#: src/mkdir.c:188
#, fuzzy, c-format
msgid "cannot set permissions of directory %s"
msgstr "無法更改%s的權限"
@@ -4045,16 +4152,16 @@ msgid ""
" -m, --mode=MODE set permission mode (as in chmod), not a=rw - umask\n"
msgstr " -m, --mode=模式 指定權限模式 (類似 chmod),而不是 a=rw 減 umask\n"
-#: src/mkfifo.c:94 src/mknod.c:207
+#: src/mkfifo.c:94 src/mknod.c:214
msgid "fifo files not supported"
msgstr "不支援 FIFO 檔案"
-#: src/mkfifo.c:124 src/mknod.c:128
+#: src/mkfifo.c:122 src/mknod.c:127
#, fuzzy
msgid "invalid mode"
msgstr "無效的數字"
-#: src/mkfifo.c:143
+#: src/mkfifo.c:141
#, fuzzy, c-format
msgid "cannot set permissions of fifo %s"
msgstr "無法更改%s的權限"
@@ -4097,57 +4204,52 @@ msgstr ""
" c, u 建立 (沒有緩衝的) 字元特殊檔案\n"
" p 建立 FIFO 特殊檔案\n"
-#: src/mknod.c:142
+#: src/mknod.c:148
#, fuzzy
-msgid "wrong number of arguments"
-msgstr "引數過少"
+msgid "Special files require major and minor device numbers."
+msgstr "建立區塊特殊檔案時,必需指定 major 和 minor 裝置編號"
-#: src/mknod.c:154
+#: src/mknod.c:158
+#, fuzzy
+msgid "Fifos do not have major and minor device numbers."
+msgstr "無效的開始行號:‘%s’"
+
+#: src/mknod.c:169
#, fuzzy
msgid "block special files not supported"
msgstr "區塊特殊檔案"
-#: src/mknod.c:163
+#: src/mknod.c:178
#, fuzzy
msgid "character special files not supported"
msgstr "字元特殊檔案"
-#: src/mknod.c:172
-msgid ""
-"when creating special files, major and minor device\n"
-"numbers must be specified"
-msgstr "建立區塊特殊檔案時,必需指定 major 和 minor 裝置編號"
-
-#: src/mknod.c:187
+#: src/mknod.c:194
#, fuzzy, c-format
msgid "invalid major device number %s"
msgstr "無效的開始行號:‘%s’"
-#: src/mknod.c:192
+#: src/mknod.c:199
#, fuzzy, c-format
msgid "invalid minor device number %s"
msgstr "無效的開始行號:‘%s’"
-#: src/mknod.c:197
+#: src/mknod.c:204
#, fuzzy, c-format
msgid "invalid device %s %s"
msgstr "%2$s的引數%1$s無效"
-#: src/mknod.c:211
-msgid "major and minor device numbers may not be specified for fifo files"
-msgstr "不能為 fifo 檔案指定 major 和 minor 裝置編號"
-
-#: src/mknod.c:221
+#: src/mknod.c:222
#, fuzzy, c-format
msgid "invalid device type %s"
msgstr "%2$s的引數%1$s無效"
-#: src/mknod.c:232
+#: src/mknod.c:233
#, fuzzy, c-format
msgid "cannot set permissions of %s"
msgstr "無法更改%s的權限"
-#: src/mv.c:317
+#: src/mv.c:304
msgid ""
"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
"\n"
@@ -4155,7 +4257,7 @@ msgstr ""
"將 <來源> 名稱更改為 <目的地> 名稱,或將 <來源> 檔案移動至 <目錄>。\n"
"\n"
-#: src/mv.c:324
+#: src/mv.c:311
#, fuzzy
msgid ""
" --backup[=CONTROL] make a backup of each existing destination "
@@ -4172,7 +4274,7 @@ msgstr ""
" -f, --force 覆寫檔案前不會進行確認,等於 --reply=yes\n"
" -i, --interactive 覆寫檔案前必須先確認,等於 --reply=query\n"
-#: src/mv.c:332
+#: src/mv.c:319
msgid ""
" --reply={yes,no,query} specify how to handle the prompt about an\n"
" existing destination file\n"
@@ -4184,10 +4286,12 @@ msgstr ""
" --strip-trailing-slashes 移除引數中所有 <來源> 檔案/目錄末端的斜號\n"
" -S, --suffix=後置字串 自行指定備份檔的 <後置字串>\n"
-#: src/mv.c:339
+#: src/mv.c:326
+#, fuzzy
msgid ""
-" --target-directory=DIRECTORY move all SOURCE arguments into "
+" -t, --target-directory=DIRECTORY move all SOURCE arguments into "
"DIRECTORY\n"
+" -T, --no-target-directory treat DEST as a normal file\n"
" -u, --update move only when the SOURCE file is newer\n"
" than the destination file or when the\n"
" destination file is missing\n"
@@ -4198,54 +4302,42 @@ msgstr ""
" 不存在時才會移動\n"
" -v, --verbose 詳細顯示進行的步驟\n"
-#: src/mv.c:468
-#, fuzzy, c-format
-msgid "specified target, %s is not a directory"
-msgstr "%s已存在但不是目錄"
-
-#: src/mv.c:476
-msgid "when moving multiple files, last argument must be a directory"
-msgstr "移動多個檔案時,最後的引數必須為目錄。"
-
-#: src/nice.c:69
+#: src/nice.c:73
#, fuzzy, c-format
msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n"
msgstr "用法:%s [選項] [檔案]...\n"
-#: src/nice.c:70
+#: src/nice.c:74
+#, c-format
msgid ""
-"Run COMMAND with an adjusted scheduling priority.\n"
-"With no COMMAND, print the current scheduling priority. ADJUST is 10\n"
-"by default. Range goes from -20 (highest priority) to 19 (lowest).\n"
+"Run COMMAND with an adjusted nice value, which affects the scheduling "
+"priority.\n"
+"With no COMMAND, print the current nice value. Nice values range from\n"
+"%d (most favorable scheduling) to %d (least favorable).\n"
"\n"
-" -n, --adjustment=ADJUST increment priority by ADJUST first\n"
+" -n, --adjustment=N add integer N to the nice value (default 10)\n"
msgstr ""
-#: src/nice.c:113 src/nice.c:126
+#: src/nice.c:157
#, fuzzy, c-format
-msgid "invalid option `%s'"
-msgstr "無效的寬度選項:‘%s’"
-
-#: src/nice.c:151
-#, fuzzy, c-format
-msgid "invalid priority `%s'"
-msgstr "無效的寬度:‘%s’"
+msgid "invalid adjustment `%s'"
+msgstr "%2$s的引數%1$s無效"
-#: src/nice.c:175
+#: src/nice.c:165
msgid "a command must be given with an adjustment"
msgstr ""
-#: src/nice.c:182 src/nice.c:191
+#: src/nice.c:172 src/nice.c:181
#, fuzzy
msgid "cannot get priority"
msgstr "無法建立目錄%s"
-#: src/nice.c:196
+#: src/nice.c:188
#, fuzzy
msgid "cannot set priority"
msgstr "無法建立目錄%s"
-#: src/nl.c:180
+#: src/nl.c:176
msgid ""
"Write each FILE to standard output, with line numbers added.\n"
"With no FILE, or when FILE is -, read standard input.\n"
@@ -4255,7 +4347,7 @@ msgstr ""
"如果沒有指定 <檔案> 或 <檔案> 是 -,則由標準輸入讀取資料。\n"
"\n"
-#: src/nl.c:188
+#: src/nl.c:184
msgid ""
" -b, --body-numbering=STYLE use STYLE for numbering body lines\n"
" -d, --section-delimiter=CC use CC for separating logical pages\n"
@@ -4265,7 +4357,7 @@ msgstr ""
" -d, --section-delimiter=CC 使用 CC 字元分辨標頭、內容和註腳\n"
" -f, --footer-numbering=方式 決定將註腳加上行號的 <方式>\n"
-#: src/nl.c:193
+#: src/nl.c:189
msgid ""
" -h, --header-numbering=STYLE use STYLE for numbering header lines\n"
" -i, --page-increment=NUMBER line number increment at each line\n"
@@ -4284,7 +4376,7 @@ msgstr ""
" -s, --number-separator=字串 以 <字串> 分隔行號和內容\n"
# I can't imagine manpage and --help output are so outdated -- Abel
-#: src/nl.c:201
+#: src/nl.c:197
msgid ""
" -v, --first-page=NUMBER first line number on each logical page\n"
" -w, --number-width=NUMBER use NUMBER columns for line numbers\n"
@@ -4292,7 +4384,7 @@ msgstr ""
" -v, --starting-line-number=數字 每頁第一行的行號\n"
" -w, --number-width=數字 以指定 <數字> 的字元作為顯示行數的寬度\n"
-#: src/nl.c:207
+#: src/nl.c:203
msgid ""
"\n"
"By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n"
@@ -4304,7 +4396,7 @@ msgstr ""
"分辨每頁的標頭、內容和註腳的字元;如果沒有指定第二個字元則表示是 :。\n"
"請輸入 \\\\ 表示 \\ 字元。<方式> 可以是以下其中一個:\n"
-#: src/nl.c:213
+#: src/nl.c:209
#, fuzzy
msgid ""
"\n"
@@ -4332,47 +4424,52 @@ msgstr ""
" rn 向右對齊,前面不加零補位\n"
" rz 向右對齊,前面加零補位\n"
-#: src/nl.c:492
+#: src/nl.c:276
+#, fuzzy
+msgid "line number overflow"
+msgstr "欄位是 0"
+
+#: src/nl.c:466
#, fuzzy, c-format
msgid "invalid header numbering style: %s"
msgstr "無效的欄位號碼:‘%s’"
-#: src/nl.c:500
+#: src/nl.c:474
#, fuzzy, c-format
msgid "invalid body numbering style: %s"
msgstr "無效的數字"
-#: src/nl.c:508
+#: src/nl.c:482
#, fuzzy, c-format
msgid "invalid footer numbering style: %s"
msgstr "欄位規格中含有無效的檔案編號:‘%s’"
-#: src/nl.c:520
+#: src/nl.c:491
#, fuzzy, c-format
msgid "invalid starting line number: %s"
msgstr "無效的開始行號:‘%s’"
-#: src/nl.c:536
+#: src/nl.c:500
#, fuzzy, c-format
msgid "invalid line number increment: %s"
msgstr "無效的行號增加值:‘%s’"
-#: src/nl.c:555
+#: src/nl.c:512
#, fuzzy, c-format
msgid "invalid number of blank lines: %s"
msgstr "無效的空白行數目:‘%s’"
-#: src/nl.c:574
+#: src/nl.c:526
#, fuzzy, c-format
msgid "invalid line number field width: %s"
msgstr "無效的行號欄位寬度:‘%s’"
-#: src/nl.c:593
+#: src/nl.c:545
#, fuzzy, c-format
msgid "invalid line numbering format: %s"
msgstr "無效的行號增加值:‘%s’"
-#: src/nohup.c:54
+#: src/nohup.c:55
#, fuzzy, c-format
msgid ""
"Usage: %s COMMAND [ARG]...\n"
@@ -4381,13 +4478,13 @@ msgstr ""
"用法:%s [檔案]...\n"
" 或:%s [選項]\n"
-#: src/nohup.c:60
+#: src/nohup.c:61
msgid ""
"Run COMMAND, ignoring hangup signals.\n"
"\n"
msgstr ""
-#: src/nohup.c:123 src/nohup.c:124
+#: src/nohup.c:121 src/nohup.c:123
#, fuzzy, c-format
msgid "failed to open %s"
msgstr "無法保留%s的時間"
@@ -4410,16 +4507,18 @@ msgstr ""
msgid "failed to redirect standard error"
msgstr ""
-#: src/od.c:286
-#, c-format
+#: src/od.c:301
+#, fuzzy, c-format
msgid ""
"Usage: %s [OPTION]... [FILE]...\n"
-" or: %s --traditional [FILE] [[+]OFFSET [[+]LABEL]]\n"
+" or: %s [-abcdfilosx]... [FILE] [[+]OFFSET[.][b]]\n"
+" or: %s --traditional [OPTION]... [FILE] [[+]OFFSET[.][b] [+][LABEL][.]"
+"[b]]\n"
msgstr ""
"用法:%s [選項]... [檔案]...\n"
" 或:%s --traditional [檔案] [[+]偏移值 [[+]標號]]\n"
-#: src/od.c:291
+#: src/od.c:307
msgid ""
"\n"
"Write an unambiguous representation, octal bytes by default,\n"
@@ -4435,11 +4534,11 @@ msgstr ""
"輸入讀取資料。\n"
"\n"
-#: src/od.c:298
+#: src/od.c:314
msgid "All arguments to long options are mandatory for short options.\n"
msgstr "長選項必須用的參數在使用短選項時也是必須的。\n"
-#: src/od.c:301
+#: src/od.c:317
msgid ""
" -A, --address-radix=RADIX decide how file offsets are printed\n"
" -j, --skip-bytes=BYTES skip BYTES input bytes first\n"
@@ -4447,10 +4546,11 @@ msgstr ""
" -A, --address-radix=RADIX 決定基準位址的單位\n"
" -j, --skip-bytes=位元組 先略過指定 <位元組> 的輸入資料\n"
-#: src/od.c:305
+#: src/od.c:321
+#, fuzzy
msgid ""
" -N, --read-bytes=BYTES limit dump to BYTES input bytes\n"
-" -s, --strings[=BYTES] output strings of at least BYTES graphic "
+" -S, --strings[=BYTES] output strings of at least BYTES graphic "
"chars\n"
" -t, --format=TYPE select output format or formats\n"
" -v, --output-duplicates do not use * to mark line suppression\n"
@@ -4464,14 +4564,15 @@ msgstr ""
" -w, --width[=位元組] 每行顯示指定的 <位元組> 數目\n"
" --traditional 接受舊式的選項\n"
-#: src/od.c:315
+#: src/od.c:331
+#, fuzzy
msgid ""
"\n"
"Traditional format specifications may be intermixed; they accumulate:\n"
" -a same as -t a, select named characters\n"
-" -b same as -t oC, select octal bytes\n"
+" -b same as -t o1, select octal bytes\n"
" -c same as -t c, select ASCII characters or backslash escapes\n"
-" -d same as -t u2, select unsigned decimal shorts\n"
+" -d same as -t u2, select unsigned decimal 2-byte units\n"
msgstr ""
"\n"
"舊式的規格可以混合使用,而且效果會累積:\n"
@@ -4480,14 +4581,15 @@ msgstr ""
" -c 等於 -t c, 顯示 ASCII 字元或反斜號溢出序列\n"
" -d 等於 -t u2, 顯示十進位 unsigned short\n"
-#: src/od.c:323
+#: src/od.c:339
+#, fuzzy
msgid ""
" -f same as -t fF, select floats\n"
-" -h same as -t x2, select hexadecimal shorts\n"
-" -i same as -t d2, select decimal shorts\n"
-" -l same as -t d4, select decimal longs\n"
-" -o same as -t o2, select octal shorts\n"
-" -x same as -t x2, select hexadecimal shorts\n"
+" -i same as -t dI, select decimal ints\n"
+" -l same as -t dL, select decimal longs\n"
+" -o same as -t o2, select octal 2-byte units\n"
+" -s same as -t d2, select decimal 2-byte units\n"
+" -x same as -t x2, select hexadecimal 2-byte units\n"
msgstr ""
" -f 等於 -t fF, 顯示浮點數\n"
" -h 等於 -t x2, 顯示十六進位 short integer\n"
@@ -4496,13 +4598,16 @@ msgstr ""
" -o 等於 -t o2, 顯示八進位 short integer\n"
" -x 等於 -t x2, 顯示十六進位 short integer\n"
-#: src/od.c:331
+#: src/od.c:347
+#, fuzzy
msgid ""
"\n"
-"For older syntax (second call format), OFFSET means -j OFFSET. LABEL\n"
-"is the pseudo-address at first byte printed, incremented when dump is\n"
-"progressing. For OFFSET and LABEL, a 0x or 0X prefix indicates\n"
-"hexadecimal, suffixes may be . for octal and b for multiply by 512.\n"
+"If first and second call formats both apply, the second format is assumed\n"
+"if the last operand begins with + or (if there are 2 operands) a digit.\n"
+"An OFFSET operand means -j OFFSET. LABEL is the pseudo-address\n"
+"at first byte printed, incremented when dump is progressing.\n"
+"For OFFSET and LABEL, a 0x or 0X prefix indicates hexadecimal;\n"
+"suffixes may be . for octal and b for multiply by 512.\n"
"\n"
"TYPE is made up of one or more of these specifications:\n"
"\n"
@@ -4520,7 +4625,7 @@ msgstr ""
" a ASCII 字元或以 ASCII 字元代表的控制字元\n"
" c ASCII 字兀或反斜號溢出序列\n"
-#: src/od.c:343
+#: src/od.c:361
msgid ""
" d[SIZE] signed decimal, SIZE bytes per integer\n"
" f[SIZE] floating point, SIZE bytes per integer\n"
@@ -4534,7 +4639,7 @@ msgstr ""
" u[大小] 無正負號的十進位數,每個整數佔指定 <大小> 的位元組\n"
" x[大小] 十六進位數,每個整數佔指定 <大小> 的位元組\n"
-#: src/od.c:350
+#: src/od.c:368
msgid ""
"\n"
"SIZE is a number. For TYPE in doux, SIZE may also be C for\n"
@@ -4548,7 +4653,7 @@ msgstr ""
"表示 sizeof(long) 的 L。如果 <格式> 是 f,<大小> 可以是表示 sizeof(float)\n"
"的 F、表示 sizeof(double) 的 D 或表示 sizeof(long double) 的 L。\n"
-#: src/od.c:357
+#: src/od.c:375
msgid ""
"\n"
"RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
@@ -4563,7 +4668,7 @@ msgstr ""
"後加上 b 字元表示將數字乘以 512,加上 k 表示乘以 1024,加上 m 表示乘以\n"
"1048576。在任何 <格式> 後加上 z 字元會在每行輸出後顯示相應的可列印字元。"
-#: src/od.c:365
+#: src/od.c:383
msgid ""
"--string without a number implies 3. --width without a number\n"
"implies 32. By default, od uses -A o -t d2 -w 16.\n"
@@ -4572,12 +4677,12 @@ msgstr ""
"--string 不加數字表示字串長度是 3。--width 不加數字表示寬度是 32。預設\n"
"od 使用的選項是 -A o -t d2 -w 16。\n"
-#: src/od.c:694 src/od.c:816
+#: src/od.c:675 src/od.c:794
#, c-format
msgid "invalid type string `%s'"
msgstr "無效的類型‘%s’"
-#: src/od.c:704
+#: src/od.c:685
#, c-format
msgid ""
"invalid type string `%s';\n"
@@ -4586,7 +4691,7 @@ msgstr ""
"‘%s’是無效的類型;\n"
"此系統不支援 %lu 位元組的整數"
-#: src/od.c:826
+#: src/od.c:804
#, c-format
msgid ""
"invalid type string `%s';\n"
@@ -4595,82 +4700,70 @@ msgstr ""
"‘%s’是無效的類型;\n"
"此系統不支援 %lu 位元組的浮點數"
-#: src/od.c:889
+#: src/od.c:862
#, c-format
msgid "invalid character `%c' in type string `%s'"
msgstr "類型‘%2$s’中含有無效的字元‘%1$c’。"
-#: src/od.c:1117
+#: src/od.c:1086
msgid "cannot skip past end of combined input"
msgstr "無法移至合併後的輸入資料的末端之後"
-#: src/od.c:1370
-msgid "old-style offset"
-msgstr "舊式的偏移量表示法"
-
-#: src/od.c:1682
+#: src/od.c:1637
#, c-format
msgid "invalid output address radix `%c'; it must be one character from [doxn]"
msgstr "輸出位址的基數‘%c’是無效的;基數必須是 [doxn] 四個字元其中之一"
-#: src/od.c:1692
+#: src/od.c:1648
msgid "skip argument"
msgstr "略過引數"
-#: src/od.c:1700
+#: src/od.c:1657
msgid "limit argument"
msgstr "限制引數"
-#: src/od.c:1710
+#: src/od.c:1668
msgid "minimum string length"
msgstr "最小字串長度"
-#: src/od.c:1715 src/od.c:1781
+#: src/od.c:1673 src/od.c:1742
#, c-format
msgid "%s is too large"
msgstr "%s 過長"
-#: src/od.c:1779
+#: src/od.c:1740
msgid "width specification"
msgstr "寬度規格"
-#: src/od.c:1801
+#: src/od.c:1762
msgid "no type may be specified when dumping strings"
msgstr "傾印字串時不能指定類型"
-#: src/od.c:1849
-#, c-format
-msgid "invalid second operand in compatibility mode `%s'"
-msgstr "在相容性模式下,第二個運算符號‘%s’是無效的"
-
-#: src/od.c:1870
-msgid "in compatibility mode, the last two arguments must be offsets"
-msgstr "在相容性模式下,最後兩個引數必須是偏移值"
-
-#: src/od.c:1877
-msgid "compatibility mode supports at most three arguments"
+#: src/od.c:1837
+#, fuzzy
+msgid "Compatibility mode supports at most one file."
msgstr "在相容性模式下,最多只能有三個引數"
-#: src/od.c:1898
+#: src/od.c:1858
#, fuzzy
msgid "skip-bytes + read-bytes is too large"
msgstr "要比較的位元組數目無效"
-#: src/od.c:1950
+#: src/od.c:1901
#, c-format
msgid "warning: invalid width %lu; using %d instead"
msgstr "警告:寬度 %lu 是無效的;以 %d 代替"
-#: src/od.c:1966
+#: src/od.c:1917
#, c-format
msgid "%d: fmt=\"%s\" width=%d\n"
msgstr "%d:格式=\"%s\" 寬度=%d\n"
-#: src/paste.c:189
+#: src/paste.c:202
msgid "standard input is closed"
msgstr "已關閉標準輸入"
-#: src/paste.c:400
+#: src/paste.c:420
msgid ""
"Write lines consisting of the sequentially corresponding lines from\n"
"each FILE, separated by TABs, to standard output.\n"
@@ -4680,7 +4773,7 @@ msgstr ""
"將每個 <檔案> 相應的每一行用 TAB 隔開,在標準輸出中並排顯示。\n"
"如果沒有指定 <檔案> 或 <檔案> 是 -,則由標準輸入讀取資料。\n"
-#: src/paste.c:409
+#: src/paste.c:429
msgid ""
" -d, --delimiters=LIST reuse characters from LIST instead of TABs\n"
" -s, --serial paste one file at a time instead of in parallel\n"
@@ -4688,107 +4781,102 @@ msgstr ""
" -d, --delimiters=列表 反覆使用 <列表> 中的字元代替 TAB\n"
" -s, --serial 每次合併一個檔案中的每一行,而非所有檔案的某一行\n"
-#: src/pathchk.c:140
+#: src/pathchk.c:92
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... NAME...\n"
msgstr "用法:%s [選項]... [檔案]...\n"
-#: src/pathchk.c:141
+#: src/pathchk.c:93
msgid ""
"Diagnose unportable constructs in NAME.\n"
"\n"
" -p, --portability check for all POSIX systems, not only this one\n"
msgstr ""
-#: src/pathchk.c:232
+#: src/pathchk.c:167
#, fuzzy, c-format
-msgid "path `%s' contains nonportable character `%c'"
-msgstr "tab 字元寬度含有無效的字元"
-
-#: src/pathchk.c:252
-#, fuzzy, c-format
-msgid "`%s' is not a directory"
-msgstr "%s已存在但不是目錄"
+msgid "nonportable character %s in file name %s"
+msgstr "類型‘%2$s’中含有無效的字元‘%1$c’。"
-#: src/pathchk.c:263
+#: src/pathchk.c:244
#, c-format
-msgid "directory `%s' is not searchable"
+msgid "%s: unable to determine maximum file name length"
msgstr ""
-#: src/pathchk.c:350
+#: src/pathchk.c:255
#, c-format
-msgid "name `%s' has length %ld; exceeds limit of %ld"
+msgid "limit %lu exceeded by length %lu of file name %s"
msgstr ""
-#: src/pathchk.c:376
+#: src/pathchk.c:354
#, c-format
-msgid "path `%s' has length %lu; exceeds limit of %ld"
+msgid "limit %lu exceeded by length %lu of file name component %s"
msgstr ""
-#: src/pinky.c:291
+#: src/pinky.c:330
#, c-format
msgid "Login name: "
msgstr ""
-#: src/pinky.c:294
+#: src/pinky.c:333
#, c-format
msgid "In real life: "
msgstr ""
-#: src/pinky.c:297
+#: src/pinky.c:336
msgid "???\n"
msgstr ""
-#: src/pinky.c:317
+#: src/pinky.c:356
#, fuzzy, c-format
msgid "Directory: "
msgstr "目錄"
-#: src/pinky.c:319
+#: src/pinky.c:358
#, c-format
msgid "Shell: "
msgstr ""
-#: src/pinky.c:340
+#: src/pinky.c:379
#, c-format
msgid "Project: "
msgstr ""
-#: src/pinky.c:366
+#: src/pinky.c:405
#, c-format
msgid "Plan:\n"
msgstr ""
-#: src/pinky.c:385
+#: src/pinky.c:424
msgid "Login"
msgstr ""
-#: src/pinky.c:387
+#: src/pinky.c:426
msgid "Name"
msgstr ""
-#: src/pinky.c:388
+#: src/pinky.c:427
msgid " TTY"
msgstr ""
-#: src/pinky.c:390
+#: src/pinky.c:429
msgid "Idle"
msgstr ""
-#: src/pinky.c:391
+#: src/pinky.c:430
msgid "When"
msgstr ""
-#: src/pinky.c:394
+#: src/pinky.c:433
msgid "Where"
msgstr ""
-#: src/pinky.c:468
+#: src/pinky.c:513
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [USER]...\n"
msgstr "用法:%s [選項]... [檔案]...\n"
-#: src/pinky.c:469
+#: src/pinky.c:514
msgid ""
"\n"
" -l produce long format output for the specified USERs\n"
@@ -4798,7 +4886,7 @@ msgid ""
" -s do short format output, this is the default\n"
msgstr ""
-#: src/pinky.c:477
+#: src/pinky.c:522
msgid ""
" -f omit the line of column headings in short format\n"
" -w omit the user's full name in short format\n"
@@ -4807,7 +4895,7 @@ msgid ""
" in short format\n"
msgstr ""
-#: src/pinky.c:486
+#: src/pinky.c:531
#, c-format
msgid ""
"\n"
@@ -4815,96 +4903,93 @@ msgid ""
"The utmp file will be %s.\n"
msgstr ""
-#: src/pinky.c:574
+#: src/pinky.c:615
#, fuzzy
msgid "no username specified; at least one must be specified when using -l"
msgstr "使用選項 --string 時不能再指定檔案"
-#: src/pr.c:803
+#: src/pr.c:828
#, c-format
-msgid "`--pages' invalid range of page numbers: `%s'"
-msgstr "‘--pages’的頁碼範圍無效:‘%s’"
-
-#: src/pr.c:815
-#, c-format
-msgid "`--pages' invalid starting page number: `%s'"
-msgstr "‘--pages’的開始頁碼無效:‘%s’"
-
-#: src/pr.c:827
-#, c-format
-msgid "`--pages' invalid ending page number: `%s'"
-msgstr "‘--pages’的結束頁碼無效:‘%s’"
+msgid "Page range `%s'"
+msgstr ""
-#: src/pr.c:834
-msgid "`--pages' starting page number is larger than ending page number"
-msgstr "‘--pages’的開始頁碼大於結束頁碼"
+#: src/pr.c:879
+#, fuzzy
+msgid "column count too large"
+msgstr "%s:數字‘%.*s’過大"
-#: src/pr.c:910
+#: src/pr.c:902
msgid "`--pages=FIRST_PAGE[:LAST_PAGE]' missing argument"
msgstr "‘--pages=開始頁碼[:結束頁碼]’缺少了引數"
-#: src/pr.c:921
+#: src/pr.c:904
+#, fuzzy, c-format
+msgid "Invalid page range `%s'"
+msgstr "無效的類型‘%s’"
+
+#: src/pr.c:915
#, c-format
msgid "`--columns=COLUMN' invalid number of columns: `%s'"
msgstr "‘--columns=欄位’的欄位數目無效:‘%s’"
-#: src/pr.c:975
+#: src/pr.c:970
#, c-format
msgid "`-l PAGE_LENGTH' invalid number of lines: `%s'"
msgstr "‘-l 每頁行數’的行數無效:‘%s’"
-#: src/pr.c:999
+#: src/pr.c:994
#, c-format
msgid "`-N NUMBER' invalid starting line number: `%s'"
msgstr "‘-N 行號’的開始行號無效:‘%s’"
-#: src/pr.c:1011
+#: src/pr.c:1006
#, c-format
msgid "`-o MARGIN' invalid line offset: `%s'"
msgstr "‘-o 邊界’的字元偏移值無效:‘%s’"
-#: src/pr.c:1052
+#: src/pr.c:1047
#, c-format
msgid "`-w PAGE_WIDTH' invalid number of characters: `%s'"
msgstr "‘-w 頁寬’的字元數目無效:‘%s’"
-#: src/pr.c:1064
+#: src/pr.c:1060
#, c-format
msgid "`-W PAGE_WIDTH' invalid number of characters: `%s'"
msgstr "‘-W 頁寬’的字元數目無效:‘%s’"
-#: src/pr.c:1078
-msgid "%b %e %H:%M %Y"
-msgstr "%Y-%m-%d %H:%M"
-
-#: src/pr.c:1087
+#: src/pr.c:1083
msgid "Cannot specify number of columns when printing in parallel."
msgstr "並排列印時不能同時指定欄位數目。"
-#: src/pr.c:1091
+#: src/pr.c:1087
msgid "Cannot specify both printing across and printing in parallel."
msgstr "不能同時指定橫向列印與並排列印。"
-#: src/pr.c:1187
+#: src/pr.c:1183
#, c-format
msgid "`-%c' extra characters or invalid number in the argument: `%s'"
msgstr "引數‘%2$s’含有多餘的字元‘-%1$c’或無效的數字"
-#: src/pr.c:1298
+#: src/pr.c:1294
msgid "page width too narrow"
msgstr "頁面太窄"
-#: src/pr.c:2360
+#: src/pr.c:2358
#, c-format
-msgid "starting page number larger than total number of pages: `%d'"
-msgstr "開始頁碼大於總頁數:‘%d’"
+msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>"
+msgstr ""
-#: src/pr.c:2391
+#: src/pr.c:2388
+#, fuzzy
+msgid "Page number overflow"
+msgstr "欄位是 0"
+
+#: src/pr.c:2393
#, c-format
-msgid "Page %d"
-msgstr "第 %d 頁"
+msgid "Page %<PRIuMAX>"
+msgstr ""
-#: src/pr.c:2757
+#: src/pr.c:2760
msgid ""
"Paginate or columnate FILE(s) for printing.\n"
"\n"
@@ -4912,7 +4997,7 @@ msgstr ""
"將 <檔案> 分頁或分欄以便列印。\n"
"\n"
-#: src/pr.c:2764
+#: src/pr.c:2767
#, fuzzy
msgid ""
" +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n"
@@ -4928,7 +5013,7 @@ msgstr ""
" 將輸出分為指定的 <欄數> 顯示,而每一欄都是向下列印的,\n"
" 除非使用 -a 選項。它也會平均分佈每頁中所有欄位的行數。\n"
-#: src/pr.c:2772
+#: src/pr.c:2775
msgid ""
" -a, --across print columns across rather than down, used together\n"
" with -COLUMN\n"
@@ -4945,7 +5030,7 @@ msgstr ""
" 隔行顯示結果\n"
# -F and -f are just the same, help text is ambiguous -- maddog
-#: src/pr.c:2780
+#: src/pr.c:2783
msgid ""
" -D, --date-format=FORMAT\n"
" use FORMAT for the header date\n"
@@ -4965,7 +5050,7 @@ msgstr ""
" 使用 form feed 而不是 newline 字元來分頁 (使用此選項\n"
" 時只會印出三行標頭,否則會印出五行標頭再加註腳)\n"
-#: src/pr.c:2790
+#: src/pr.c:2793
msgid ""
" -h HEADER, --header=HEADER\n"
" use a centered HEADER instead of filename in page "
@@ -4985,7 +5070,7 @@ msgstr ""
" -J, --join-lines 將每行資料完整地合併;會關閉 -W 選項將每行截斷的效果;\n"
" 不將每欄對齊;--sep-string[=字串] 選項可設定分隔字串\n"
-#: src/pr.c:2799
+#: src/pr.c:2802
msgid ""
" -l PAGE_LENGTH, --length=PAGE_LENGTH\n"
" set the page length to PAGE_LENGTH (66) lines\n"
@@ -4999,7 +5084,7 @@ msgstr ""
" -m, --merge 並排顯示所有檔案 (每欄一個檔案);會將資料截短至符合\n"
" 欄寬,但使用 -J 選項則不會截短任何一行\n"
-#: src/pr.c:2806
+#: src/pr.c:2809
msgid ""
" -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n"
" number lines, use DIGITS (5) digits, then SEP (TAB),\n"
@@ -5014,7 +5099,7 @@ msgstr ""
" -N 行號, --first-line-number=行號\n"
" 指定每個檔案第一行的 <行號> (請參考 +開始頁碼 的說明)\n"
-#: src/pr.c:2814
+#: src/pr.c:2817
msgid ""
" -o MARGIN, --indent=MARGIN\n"
" offset each line with MARGIN (zero) spaces, do not\n"
@@ -5028,7 +5113,7 @@ msgstr ""
" -r, --no-file-warnings\n"
" 無法開啟檔案時不會印出警告訊息\n"
-#: src/pr.c:2821
+#: src/pr.c:2824
msgid ""
" -s[CHAR],--separator[=CHAR]\n"
" separate columns by a single character, default for "
@@ -5044,11 +5129,11 @@ msgstr ""
" 和欄位有關的選項截斷每行的資料: -欄位、-a -欄位、\n"
" -m\n"
-#: src/pr.c:2828
+#: src/pr.c:2831
msgid " -SSTRING, --sep-string[=STRING]\n"
msgstr " -S字串, --sep-string[=字串]\n"
-#: src/pr.c:2831
+#: src/pr.c:2834
msgid ""
" separate columns by STRING,\n"
" without -S: Default separator <TAB> with -J and <space>\n"
@@ -5062,7 +5147,7 @@ msgstr ""
" 欄位有關的選項\n"
" -t, --omit-header 不印出標頭和註腳\n"
-#: src/pr.c:2837
+#: src/pr.c:2840
msgid ""
" -T, --omit-pagination\n"
" omit page headers and trailers, eliminate any "
@@ -5085,7 +5170,7 @@ msgstr ""
"元]\n"
" 會關閉此效果\n"
-#: src/pr.c:2847
+#: src/pr.c:2850
msgid ""
" -W PAGE_WIDTH, --page-width=PAGE_WIDTH\n"
" set page width to PAGE_WIDTH (72) characters always,\n"
@@ -5098,7 +5183,7 @@ msgstr ""
" 強行截短至符合頁寬,除非同時使用 -J 選項;不會影響 -S\n"
" 或 -s 選項\n"
-#: src/pr.c:2855
+#: src/pr.c:2858
msgid ""
"\n"
"-T implied by -l nn when nn <= 10 or <= 3 with -F. With no FILE, or when\n"
@@ -5108,7 +5193,7 @@ msgstr ""
"當 nn <= 10 (配合 -F 選項時 nn <= 3) 的時候,使用 -l nn 選項即表示 -T 選項\n"
"已生效。如果沒有指定 <檔案> 或 <檔案> 是 -,則由標準輸入讀取資料。\n"
-#: src/printenv.c:66
+#: src/printenv.c:61
#, c-format
msgid ""
"Usage: %s [VARIABLE]...\n"
@@ -5117,13 +5202,13 @@ msgid ""
"\n"
msgstr ""
-#: src/printf.c:82
+#: src/printf.c:86
#, c-format
msgid ""
"warning: %s: character(s) following character constant have been ignored"
msgstr ""
-#: src/printf.c:95
+#: src/printf.c:99
#, fuzzy, c-format
msgid ""
"Usage: %s FORMAT [ARGUMENT]...\n"
@@ -5132,13 +5217,13 @@ msgstr ""
"用法:%s [檔案]...\n"
" 或:%s [選項]\n"
-#: src/printf.c:100
+#: src/printf.c:104
msgid ""
"Print ARGUMENT(s) according to FORMAT.\n"
"\n"
msgstr ""
-#: src/printf.c:106
+#: src/printf.c:110
msgid ""
"\n"
"FORMAT controls the output as in C printf. Interpreted sequences are:\n"
@@ -5148,7 +5233,7 @@ msgid ""
" \\\\ backslash\n"
msgstr ""
-#: src/printf.c:114
+#: src/printf.c:118
msgid ""
" \\a alert (BEL)\n"
" \\b backspace\n"
@@ -5156,7 +5241,7 @@ msgid ""
" \\f form feed\n"
msgstr ""
-#: src/printf.c:120
+#: src/printf.c:124
msgid ""
" \\n new line\n"
" \\r carriage return\n"
@@ -5164,15 +5249,14 @@ msgid ""
" \\v vertical tab\n"
msgstr ""
-#: src/printf.c:126
+#: src/printf.c:130
msgid ""
-" \\xNN byte with hexadecimal value NN (1 to 2 digits)\n"
-"\n"
-" \\uNNNN character with hexadecimal value NNNN (4 digits)\n"
-" \\UNNNNNNNN character with hexadecimal value NNNNNNNN (8 digits)\n"
+" \\xHH byte with hexadecimal value HH (1 to 2 digits)\n"
+" \\uHHHH Unicode (ISO/IEC 10646) character with hex value HHHH (4 digits)\n"
+" \\UHHHHHHHH Unicode character with hex value HHHHHHHH (8 digits)\n"
msgstr ""
-#: src/printf.c:132
+#: src/printf.c:135
msgid ""
" %% a single %\n"
" %b ARGUMENT as a string with `\\' escapes interpreted,\n"
@@ -5182,61 +5266,56 @@ msgid ""
"ARGUMENTs converted to proper type first. Variable widths are handled.\n"
msgstr ""
-#: src/printf.c:156
+#: src/printf.c:159
#, c-format
msgid "%s: expected a numeric value"
msgstr ""
-#: src/printf.c:158
+#: src/printf.c:161
#, c-format
msgid "%s: value not completely converted"
msgstr ""
-#: src/printf.c:252 src/printf.c:279
+#: src/printf.c:255 src/printf.c:282
msgid "missing hexadecimal number in escape"
msgstr ""
-#: src/printf.c:291
+#: src/printf.c:294
#, fuzzy, c-format
msgid "invalid universal character name \\%c%0*x"
msgstr "無效的字元種類‘%s’"
-#: src/printf.c:471
+#: src/printf.c:552
#, fuzzy, c-format
msgid "invalid field width: %s"
msgstr "無效的寬度:‘%s’"
-#: src/printf.c:497
+#: src/printf.c:587
#, fuzzy, c-format
msgid "invalid precision: %s"
msgstr "無效的寬度選項:‘%s’"
-#: src/printf.c:518
+#: src/printf.c:614
#, fuzzy, c-format
-msgid "%%%c: invalid directive"
-msgstr "%s:無效的樣式"
-
-#: src/printf.c:576
-#, c-format
-msgid "Usage: %s format [argument...]\n"
-msgstr ""
+msgid "%.*s: invalid conversion specification"
+msgstr "%s:無效的欄位規格‘%s’"
-#: src/printf.c:594
+#: src/printf.c:685
#, c-format
msgid "warning: ignoring excess arguments, starting with `%s'"
msgstr ""
-#: src/ptx.c:40
+#: src/ptx.c:41
#, fuzzy
msgid "F. Pinard"
msgstr "由 %s 編寫。\n"
-#: src/ptx.c:404
+#: src/ptx.c:410
#, c-format
msgid "%s (for regexp `%s')"
msgstr "%s (對於正規表示式‘%s’)"
-#: src/ptx.c:1866
+#: src/ptx.c:1871
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT]... (without -G)\n"
@@ -5245,7 +5324,7 @@ msgstr ""
"用法:%s [選項]... [輸入]... (沒有 -G)\n"
" 或:%s -G [選項]... [輸入 [輸出]]\n"
-#: src/ptx.c:1870
+#: src/ptx.c:1875
msgid ""
"Output a permuted index, including context, of the words in the input "
"files.\n"
@@ -5254,7 +5333,7 @@ msgstr ""
"顯示輸入檔中所有字詞排列後的索引,並包括該字詞前後的文字。\n"
"\n"
-#: src/ptx.c:1877
+#: src/ptx.c:1882
msgid ""
" -A, --auto-reference output automatically generated references\n"
" -C, --copyright display Copyright and copying conditions\n"
@@ -5262,7 +5341,7 @@ msgid ""
" -F, --flag-truncation=STRING use STRING for flagging line truncations\n"
msgstr ""
-#: src/ptx.c:1883
+#: src/ptx.c:1888
msgid ""
" -M, --macro-name=STRING macro name to use instead of `xx'\n"
" -O, --format=roff generate output as roff directives\n"
@@ -5271,7 +5350,7 @@ msgid ""
" -T, --format=tex generate output as TeX directives\n"
msgstr ""
-#: src/ptx.c:1890
+#: src/ptx.c:1895
msgid ""
" -W, --word-regexp=REGEXP use REGEXP to match each keyword\n"
" -b, --break-file=FILE word break characters in this FILE\n"
@@ -5281,7 +5360,7 @@ msgid ""
" -o, --only-file=FILE read only word list from this FILE\n"
msgstr ""
-#: src/ptx.c:1898
+#: src/ptx.c:1903
msgid ""
" -r, --references first field of each line is a reference\n"
" -t, --typeset-mode - not implemented -\n"
@@ -5289,7 +5368,7 @@ msgid ""
"excluded\n"
msgstr ""
-#: src/ptx.c:1905
+#: src/ptx.c:1910
msgid ""
"\n"
"With no FILE or if FILE is -, read Standard Input. `-F /' by default.\n"
@@ -5298,7 +5377,7 @@ msgstr ""
"如果沒有指定 <檔案> 或 <檔案> 是 -,則由標準輸入讀入資料。\n"
"預設使用‘-F /’選項。\n"
-#: src/ptx.c:1987
+#: src/ptx.c:1989
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"
@@ -5311,7 +5390,7 @@ msgstr ""
"散佈及/或修改本軟體。\n"
"\n"
-#: src/ptx.c:1994
+#: src/ptx.c:1996
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"
@@ -5323,7 +5402,7 @@ msgstr ""
"適用於任何特定目的的保證。詳情請參考 GNU General Public License。\n"
"\n"
-#: src/ptx.c:2001
+#: src/ptx.c:2003
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"
@@ -5333,38 +5412,38 @@ msgstr ""
"Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
"MA 02111-1307, USA.\n"
-#: src/ptx.c:2026
+#: src/ptx.c:2028
#, fuzzy, c-format
msgid "invalid gap width: %s"
msgstr "無效的寬度:‘%s’"
-#: src/pwd.c:66
+#: src/pwd.c:67
msgid ""
"Print the full filename of the current working directory.\n"
"\n"
msgstr ""
-#: src/pwd.c:163 src/remove.c:819
+#: src/pwd.c:165 src/remove.c:850
#, fuzzy, c-format
msgid "cannot open directory %s"
msgstr "無法建立目錄%s"
-#: src/pwd.c:168
+#: src/pwd.c:170
#, fuzzy, c-format
msgid "failed to chdir to %s"
msgstr "無法保留%s的時間"
-#: src/pwd.c:172 src/pwd.c:278
+#: src/pwd.c:174 src/pwd.c:284
#, fuzzy, c-format
msgid "failed to stat %s"
msgstr "無法保留%s的時間"
-#: src/pwd.c:240
+#: src/pwd.c:242
#, c-format
msgid "couldn't find directory entry in %s with matching i-node"
msgstr ""
-#: src/pwd.c:310
+#: src/pwd.c:318
#, fuzzy
msgid "ignoring non-option arguments"
msgstr "非選項的引數過多"
@@ -5382,12 +5461,23 @@ msgstr ""
#: src/readlink.c:70
msgid ""
-" -f, --canonicalize canonicalize by following every symlink in every\n"
-" component of the given path recursively\n"
-" -n, --no-newline do not output the trailing newline\n"
+" -f, --canonicalize canonicalize by following every symlink in\n"
+" every component of the given path "
+"recursively;\n"
+" all but the last path component must exist\n"
+" -e, --canonicalize-existing canonicalize by following every symlink in\n"
+" every component of the given path "
+"recursively,\n"
+" all path components must exist\n"
+" -m, --canonicalize-missing canonicalize by following every symlink in\n"
+" every component of the given path "
+"recursively,\n"
+" without requirements on components "
+"existence\n"
+" -n, --no-newline do not output the trailing newline\n"
" -q, --quiet,\n"
-" -s, --silent suppress most error messages\n"
-" -v, --verbose report error messages\n"
+" -s, --silent suppress most error messages\n"
+" -v, --verbose report error messages\n"
msgstr ""
#: src/remove.c:403
@@ -5395,63 +5485,63 @@ msgstr ""
msgid "cannot chdir from %s to .."
msgstr "無法進入%s目錄"
-#: src/remove.c:409 src/remove.c:498
+#: src/remove.c:409 src/remove.c:505
#, c-format
msgid "cannot lstat `.' in %s"
msgstr "無法在%s中 lstat‘.’"
-#: src/remove.c:414 src/remove.c:502
+#: src/remove.c:414 src/remove.c:509
#, c-format
msgid "%s changed dev/ino"
msgstr "%s的所在裝置或 inode 改變了"
-#: src/remove.c:572 src/remove.c:717 src/remove.c:892 src/remove.c:1019
+#: src/remove.c:602 src/remove.c:748 src/remove.c:923 src/remove.c:1053
#, c-format
msgid "cannot lstat %s"
msgstr "lstat%s失敗"
-#: src/remove.c:579 src/remove.c:739 src/remove.c:756 src/remove.c:1005
-#: src/remove.c:1113
+#: src/remove.c:610 src/remove.c:770 src/remove.c:787 src/remove.c:1039
+#: src/remove.c:1140
#, fuzzy, c-format
msgid "cannot remove directory %s"
msgstr "無法建立目錄%s"
-#: src/remove.c:608
+#: src/remove.c:639
#, fuzzy, c-format
msgid "%s: descend into write-protected directory %s? "
msgstr "無法建立目錄%s"
-#: src/remove.c:609
+#: src/remove.c:640
#, fuzzy, c-format
msgid "%s: descend into directory %s? "
msgstr "無法進入%s目錄"
-#: src/remove.c:619
+#: src/remove.c:650
#, c-format
msgid "%s: remove write-protected %s %s? "
msgstr "%s:是否移除有防寫保護的%s%s? "
-#: src/remove.c:620
+#: src/remove.c:651
#, c-format
msgid "%s: remove %s %s? "
msgstr "%s:是否移除%s%s? "
-#: src/remove.c:644
+#: src/remove.c:675
#, c-format
msgid "removed %s\n"
msgstr "已移除%s\n"
-#: src/remove.c:659 src/remove.c:1108
+#: src/remove.c:690 src/remove.c:1135
#, fuzzy, c-format
msgid "removed directory: %s\n"
msgstr "無法建立目錄%s"
-#: src/remove.c:908 src/remove.c:1034
+#: src/remove.c:939 src/remove.c:1068
#, fuzzy, c-format
msgid "cannot chdir from %s to %s"
msgstr "無法進入%s目錄"
-#: src/remove.c:916
+#: src/remove.c:947
#, c-format
msgid ""
"WARNING: Circular directory structure.\n"
@@ -5466,16 +5556,16 @@ msgstr ""
"以下的目錄是循環的一部份:\n"
" %s\n"
-#: src/remove.c:1147
+#: src/remove.c:1174
msgid "cannot remove `.' or `..'"
msgstr "無法移除‘.’或‘..’"
-#: src/remove.c:1199
+#: src/remove.c:1228
#, fuzzy
msgid "cannot restore current working directory"
msgstr "無法建立目錄%s"
-#: src/rm.c:107 src/touch.c:230
+#: src/rm.c:107 src/touch.c:228
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... FILE...\n"
msgstr "用法:%s [選項]... [檔案]...\n"
@@ -5535,7 +5625,7 @@ msgstr ""
"請注意,如果使用 rm 來移除檔案,通常仍可以將該檔案恢復原狀。如果想保證\n"
"該檔案的內容無法還原,請考慮使用 shred。\n"
-#: src/rmdir.c:117 src/rmdir.c:219
+#: src/rmdir.c:117 src/rmdir.c:216
#, fuzzy, c-format
msgid "removing directory, %s"
msgstr "無法建立目錄%s"
@@ -5608,17 +5698,17 @@ msgstr ""
msgid "invalid floating point argument: %s"
msgstr "無效的開始行號:‘%s’"
-#: src/seq.c:386
+#: src/seq.c:379
#, fuzzy, c-format
msgid "invalid format string: `%s'"
msgstr "無效的類型‘%s’"
-#: src/seq.c:406
+#: src/seq.c:399
#, fuzzy
msgid "format string may not be specified when printing equal width strings"
msgstr "傾印字串時不能指定類型"
-#: src/setuidgid.c:50
+#: src/setuidgid.c:51
#, fuzzy, c-format
msgid ""
"Usage: %s USERNAME COMMAND [ARGUMENT]...\n"
@@ -5627,7 +5717,7 @@ msgstr ""
"用法:%s [檔案]...\n"
" 或:%s [選項]\n"
-#: src/setuidgid.c:56
+#: src/setuidgid.c:57
msgid ""
"Drop any supplemental groups, assume the user-ID and group-ID of\n"
"the specified USERNAME, and run COMMAND with any specified ARGUMENTs.\n"
@@ -5637,24 +5727,24 @@ msgid ""
"\n"
msgstr ""
-#: src/setuidgid.c:107
+#: src/setuidgid.c:105
#, c-format
msgid "unknown user-ID: %s"
msgstr ""
-#: src/setuidgid.c:110
+#: src/setuidgid.c:108
#, fuzzy
msgid "cannot set supplemental group"
msgstr "無法改變所屬群組至沒有名稱的群組"
-#: src/setuidgid.c:114
+#: src/setuidgid.c:112
#, fuzzy, c-format
-msgid "cannot set group-ID to %ld"
+msgid "cannot set group-ID to %lu"
msgstr "不可同時省略使用者和所屬群組"
-#: src/setuidgid.c:118
+#: src/setuidgid.c:116
#, fuzzy, c-format
-msgid "cannot set user-ID to %ld"
+msgid "cannot set user-ID to %lu"
msgstr "不可同時省略使用者和所屬群組"
#: src/shred.c:157
@@ -5688,7 +5778,6 @@ msgid ""
" -x, --exact do not round file sizes up to the next full block;\n"
" this is the default for non-regular files\n"
" -z, --zero add a final overwrite with zeros to hide shredding\n"
-" - shred standard output\n"
msgstr ""
" -u, --remove 覆寫後會截斷及移除該檔案\n"
" -v, --verbose 顯示進度\n"
@@ -5696,9 +5785,12 @@ msgstr ""
" -z, --zero 最後一次會使用 0 位元組進行覆寫來隱藏覆寫動作\n"
" - 覆寫標準輸出的資料\n"
-#: src/shred.c:181
+#: src/shred.c:180
+#, fuzzy
msgid ""
"\n"
+"If FILE is -, shred standard output.\n"
+"\n"
"Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n"
"the files because it is common to operate on device files like /dev/hda,\n"
"and those files usually should not be removed. When operating on regular\n"
@@ -5710,12 +5802,13 @@ msgstr ""
"因為覆寫像 /dev/hda 等的裝置檔案是很普遍的,而這些檔案通常不應移除。\n"
"當覆寫普通檔案時,絕大多數人都會使用 --remove 選項。\n"
-#: src/shred.c:189
+#: src/shred.c:190
+#, fuzzy
msgid ""
"CAUTION: Note that shred relies on a very important assumption:\n"
-"that the filesystem overwrites data in place. This is the traditional\n"
-"way to do things, but many modern filesystem designs do not satisfy this\n"
-"assumption. The following are examples of filesystems on which shred is\n"
+"that the file system overwrites data in place. This is the traditional\n"
+"way to do things, but many modern file system designs do not satisfy this\n"
+"assumption. The following are examples of file systems on which shred is\n"
"not effective:\n"
"\n"
msgstr ""
@@ -5724,15 +5817,16 @@ msgstr ""
"的檔案系統都不符合條件。以下是會令 shred 無效的檔案系統的例子:\n"
"\n"
-#: src/shred.c:197
+#: src/shred.c:198
+#, fuzzy
msgid ""
-"* log-structured or journaled filesystems, such as those supplied with\n"
+"* log-structured or journaled file systems, such as those supplied with\n"
" AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n"
"\n"
-"* filesystems that write redundant data and carry on even if some writes\n"
-" fail, such as RAID-based filesystems\n"
+"* file systems that write redundant data and carry on even if some writes\n"
+" fail, such as RAID-based file systems\n"
"\n"
-"* filesystems that make snapshots, such as Network Appliance's NFS server\n"
+"* file systems that make snapshots, such as Network Appliance's NFS server\n"
"\n"
msgstr ""
"● 有紀錄結構或是日誌式檔案系統,像 AIX 及 Solaris 使用的檔案系統 (以及\n"
@@ -5744,12 +5838,13 @@ msgstr ""
"● 會不時進行快照紀錄的檔案系統,像 Network Applicance 的 NFS 伺服器\n"
"\n"
-#: src/shred.c:207
+#: src/shred.c:208
+#, fuzzy
msgid ""
-"* filesystems that cache in temporary locations, such as NFS\n"
+"* file systems that cache in temporary locations, such as NFS\n"
" version 3 clients\n"
"\n"
-"* compressed filesystems\n"
+"* compressed file systems\n"
"\n"
"In addition, file system backups and remote mirrors may contain copies\n"
"of the file that cannot be removed, and that will allow a shredded file\n"
@@ -5762,122 +5857,122 @@ msgstr ""
"另外,檔案系統的備份及遠端的 mirror 都可能擁有該檔案的複製本,這些複製本\n"
"都是無法移除的,而且可能令已經用 shred 處理過的檔案恢復原狀。\n"
-#: src/shred.c:793
+#: src/shred.c:772
#, fuzzy, c-format
msgid "%s: fdatasync failed"
msgstr "關閉時發生錯誤"
-#: src/shred.c:804
+#: src/shred.c:783
#, fuzzy, c-format
msgid "%s: fsync failed"
msgstr "關閉時發生錯誤"
-#: src/shred.c:846
+#: src/shred.c:851
#, c-format
msgid "%s: cannot rewind"
msgstr "%s:無法向後搜尋"
-#: src/shred.c:872
+#: src/shred.c:877
#, c-format
msgid "%s: pass %lu/%lu (%s)..."
msgstr "%1$s:%3$lu 次之第 %2$lu 次 (%4$s)..."
-#: src/shred.c:909
+#: src/shred.c:928
#, fuzzy, c-format
msgid "%s: error writing at offset %s"
msgstr "寫入 %s 時發生錯誤"
-#: src/shred.c:928
+#: src/shred.c:948
#, fuzzy, c-format
msgid "%s: lseek failed"
msgstr "關閉時發生錯誤"
-#: src/shred.c:939
+#: src/shred.c:959
#, fuzzy, c-format
msgid "%s: file too large"
msgstr "%s:檔案過大"
-#: src/shred.c:962
+#: src/shred.c:982
#, c-format
msgid "%s: pass %lu/%lu (%s)...%s"
msgstr "%1$s:%3$lu 次之第 %2$lu 次 (%4$s)...%5$s"
-#: src/shred.c:978
+#: src/shred.c:998
#, 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:1230
+#: src/shred.c:1250
#, fuzzy, c-format
msgid "%s: fstat failed"
msgstr "stat 時發生錯誤"
-#: src/shred.c:1241
+#: src/shred.c:1261
#, fuzzy, c-format
msgid "%s: invalid file type"
msgstr "%s:無效的後置字串長度"
-#: src/shred.c:1258
+#: src/shred.c:1280
#, c-format
msgid "%s: file has negative size"
msgstr "%s:檔案的大小為負數"
-#: src/shred.c:1323
+#: src/shred.c:1345
#, fuzzy, c-format
msgid "%s: error truncating"
msgstr "%s:檔案被截斷了"
-#: src/shred.c:1339
+#: src/shred.c:1361
#, fuzzy, c-format
msgid "%s: fcntl failed"
msgstr "關閉時發生錯誤"
-#: src/shred.c:1344
+#: src/shred.c:1366
#, c-format
msgid "%s: cannot shred append-only file descriptor"
msgstr "%s:不能將只可加上資料的檔案描述子 (file descriptor) 進行 shred 動作"
-#: src/shred.c:1421
+#: src/shred.c:1446
#, c-format
msgid "%s: removing"
msgstr "%s:正在移除"
-#: src/shred.c:1445
+#: src/shred.c:1470
#, fuzzy, c-format
msgid "%s: renamed to %s"
msgstr "%s:讀取時發生錯誤"
-#: src/shred.c:1467
+#: src/shred.c:1492
#, fuzzy, c-format
msgid "%s: failed to remove"
msgstr "%s:檔案過大"
-#: src/shred.c:1471
+#: src/shred.c:1496
#, c-format
msgid "%s: removed"
msgstr "%s:已經移除"
-#: src/shred.c:1478 src/shred.c:1543
+#: src/shred.c:1503 src/shred.c:1568
#, fuzzy, c-format
msgid "%s: failed to close"
msgstr "%s:檔案過大"
-#: src/shred.c:1536
+#: src/shred.c:1561
#, fuzzy, c-format
msgid "%s: failed to open for writing"
msgstr "%s:檔案過大"
-#: src/shred.c:1595
+#: src/shred.c:1617
#, fuzzy, c-format
msgid "%s: invalid number of passes"
msgstr "%s:無效的秒數"
-#: src/shred.c:1612
+#: src/shred.c:1634
#, fuzzy, c-format
msgid "%s: invalid file size"
msgstr "%s:無效的後置字串長度"
-#: src/sleep.c:52
+#: src/sleep.c:47
#, c-format
msgid ""
"Usage: %s NUMBER[SUFFIX]...\n"
@@ -5890,17 +5985,17 @@ msgid ""
"\n"
msgstr ""
-#: src/sleep.c:156
+#: src/sleep.c:137
#, fuzzy, c-format
msgid "invalid time interval `%s'"
msgstr "無效的欄位號碼:‘%s’"
-#: src/sleep.c:167 src/tail.c:1069
+#: src/sleep.c:148 src/tail.c:1102
#, fuzzy
msgid "cannot read realtime clock"
msgstr "無法建立鏈結%s"
-#: src/sort.c:280
+#: src/sort.c:281
msgid ""
"Write sorted concatenation of all FILE(s) to standard output.\n"
"\n"
@@ -5912,7 +6007,7 @@ msgstr ""
"排序選項:\n"
"\n"
-#: src/sort.c:289
+#: src/sort.c:290
msgid ""
" -b, --ignore-leading-blanks ignore leading blanks\n"
" -d, --dictionary-order consider only blanks and alphanumeric "
@@ -5923,7 +6018,7 @@ msgstr ""
" -d, --dictionary-order 只考慮空白字元、英文字和數字\n"
" -f, --ignore-case 排序前先將小寫字元轉換為大寫\n"
-#: src/sort.c:294
+#: src/sort.c:295
msgid ""
" -g, --general-numeric-sort compare according to general numerical value\n"
" -i, --ignore-nonprinting consider only printable characters\n"
@@ -5939,7 +6034,7 @@ msgstr ""
" -r, --reverse 以相反的次序排列\n"
"\n"
-#: src/sort.c:302
+#: src/sort.c:303
msgid ""
"Other options:\n"
"\n"
@@ -5961,7 +6056,7 @@ msgstr ""
" -s, --stable 不進行最後的整行比較排序\n"
" -S, --buffer-size=大小 指定記憶緩衝區的 <大小>\n"
-#: src/sort.c:312
+#: src/sort.c:313
#, fuzzy, c-format
msgid ""
" -t, --field-separator=SEP use SEP instead of non-blank to blank "
@@ -5979,12 +6074,12 @@ msgstr ""
" -u, --unique 配合 -c:嚴格檢查資料是否依次序排列\n"
" 沒有 -c:遇到多行相同的資料時只顯示第一行\n"
-#: src/sort.c:319
+#: src/sort.c:320
msgid " -z, --zero-terminated end lines with 0 byte, not newline\n"
msgstr ""
" -z, --zero-terminated 以位元組 0 而非 newline 字元作為每行的結束字元\n"
-#: src/sort.c:324
+#: src/sort.c:325
msgid ""
"\n"
"POS is F[.C][OPTS], where F is the field number and C the character "
@@ -6002,7 +6097,7 @@ msgstr ""
"\n"
"<大小> 可以加上如下的單位:\n"
-#: src/sort.c:333
+#: src/sort.c:334
#, c-format
msgid ""
"% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
@@ -6022,118 +6117,131 @@ msgstr ""
"和語系有關的環境變數會影響排序結果。\n"
"如果要以位元組數值作為排列次序,請設定環境變數 LC_ALL=C。\n"
-#: src/sort.c:441
+#: src/sort.c:436
msgid "cannot create temporary file"
msgstr "無法建立暫存檔"
-#: src/sort.c:464
+#: src/sort.c:461
msgid "open failed"
msgstr "開啟時發生錯誤"
-#: src/sort.c:484 src/sort.c:2531
+#: src/sort.c:482
+#, fuzzy
+msgid "fflush failed"
+msgstr "關閉時發生錯誤"
+
+#: src/sort.c:487 src/sort.c:2637
msgid "close failed"
msgstr "關閉時發生錯誤"
-#: src/sort.c:492
+#: src/sort.c:495
msgid "write failed"
msgstr "寫入時發生錯誤"
-#: src/sort.c:635
+#: src/sort.c:532
+#, fuzzy, c-format
+msgid "warning: cannot remove: %s"
+msgstr "無法建立目錄%s"
+
+#: src/sort.c:649
msgid "sort size"
msgstr "排序記憶緩衝區"
-#: src/sort.c:714
+#: src/sort.c:728
msgid "stat failed"
msgstr "stat 時發生錯誤"
-#: src/sort.c:978
+#: src/sort.c:992
msgid "read failed"
msgstr "讀入時發生錯誤"
-#: src/sort.c:1560
+#: src/sort.c:1579
#, c-format
msgid "%s: %s:%s: disorder: "
msgstr "%s: %s:%s:次序不正確:"
-#: src/sort.c:1564
+#: src/sort.c:1583
msgid "standard error"
msgstr "標準錯誤輸出"
-#: src/sort.c:2060
+#: src/sort.c:2154
#, c-format
msgid "%s: invalid field specification `%s'"
msgstr "%s:無效的欄位規格‘%s’"
-#: src/sort.c:2087
+#: src/sort.c:2181
#, c-format
msgid "%s: count `%.*s' too large"
msgstr "%s:數字‘%.*s’過大"
-#: src/sort.c:2093
+#: src/sort.c:2187
#, c-format
msgid "%s: invalid count at start of `%s'"
msgstr "%s:‘%s’開始部份的數字無效"
-#: src/sort.c:2317
+#: src/sort.c:2409
msgid "invalid number after `-'"
msgstr "‘-’後的數字無效"
-#: src/sort.c:2320 src/sort.c:2366 src/sort.c:2393
+#: src/sort.c:2412 src/sort.c:2458 src/sort.c:2485
msgid "invalid number after `.'"
msgstr "‘.’後的數字無效"
-#: src/sort.c:2323 src/sort.c:2402
+#: src/sort.c:2415 src/sort.c:2494
msgid "stray character in field spec"
msgstr "欄位規格出現不合法的字元"
-#: src/sort.c:2357
+#: src/sort.c:2449
msgid "invalid number at field start"
msgstr "欄位規格開始部份的數字無效"
-#: src/sort.c:2361 src/sort.c:2389
+#: src/sort.c:2453 src/sort.c:2481
msgid "field number is zero"
msgstr "欄位是 0"
-#: src/sort.c:2370
+#: src/sort.c:2462
msgid "character offset is zero"
msgstr "字元偏移值是 0"
-#: src/sort.c:2385
+#: src/sort.c:2477
msgid "invalid number after `,'"
msgstr "‘,’後的數字無效"
-#: src/sort.c:2412
+#: src/sort.c:2504
#, fuzzy
msgid "multiple output files specified"
msgstr "正在關閉輸出檔%s"
-#: src/sort.c:2428
+#: src/sort.c:2520
msgid "empty tab"
msgstr ""
-#: src/sort.c:2439
+#: src/sort.c:2531
#, c-format
msgid "multi-character tab `%s'"
msgstr "分隔欄位字元‘%s’多於一個字元"
-#: src/sort.c:2444
+#: src/sort.c:2536
msgid "incompatible tabs"
msgstr ""
-#: src/sort.c:2514
-#, c-format
-msgid "extra operand `%s' not allowed with -c"
+#: src/sort.c:2621
+#, fuzzy, c-format
+msgid "extra operand %s not allowed with -c"
msgstr "使用 -c 時不允許指定額外的參數‘%s’"
-#: src/split.c:101
+#: src/split.c:109
#, c-format
msgid "Usage: %s [OPTION] [INPUT [PREFIX]]\n"
msgstr "用法:%s [選項] [輸入 [前置字串]]\n"
-#: src/split.c:105
+#: src/split.c:113
+#, fuzzy
msgid ""
"Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
-"PREFIX is `x'. With no INPUT, or when INPUT is -, read standard input.\n"
+"size is 1000 lines, and default PREFIX is `x'. With no INPUT, or when "
+"INPUT\n"
+"is -, read standard input.\n"
"\n"
msgstr ""
"將 <輸入> 資料分割為固定大小的部份,並將結果寫入‘<前置字串>aa’、\n"
@@ -6141,7 +6249,7 @@ msgstr ""
"或 <輸入> 是 -,則由標準輸入讀入資料。\n"
"\n"
-#: src/split.c:113
+#: src/split.c:122
#, fuzzy, c-format
msgid ""
" -a, --suffix-length=N use suffixes of length N (default %d)\n"
@@ -6156,13 +6264,13 @@ msgstr ""
" 超出指定位元組數目\n"
" -l, --lines=行數 每個輸出檔放入指定 <行數> 的資料\n"
-#: src/split.c:120
+#: src/split.c:129
msgid ""
" --verbose print a diagnostic to standard error just\n"
" before each output file is opened\n"
msgstr " --verbose 開啟每個輸出檔之前都在標準錯誤輸出顯示訊息\n"
-#: src/split.c:126
+#: src/split.c:135
msgid ""
"\n"
"SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n"
@@ -6170,66 +6278,67 @@ msgstr ""
"\n"
"<大小> 可以加上單位:b 表示 512,k 表示 1K,m 表示 1M。\n"
-#: src/split.c:187
+#: src/split.c:196
msgid "Output file suffixes exhausted"
msgstr "輸出檔的後置字串已用盡"
-#: src/split.c:205
+#: src/split.c:214
#, c-format
msgid "creating file `%s'\n"
msgstr "正在建立檔案‘%s’\n"
-#: src/split.c:362
+#: src/split.c:371
msgid "cannot split in more than one way"
msgstr "不能用超過一種方式進行分割"
-#: src/split.c:415
+#: src/split.c:421
#, c-format
msgid "%s: invalid suffix length"
msgstr "%s:無效的後置字串長度"
-#: src/split.c:429 src/split.c:453
+#: src/split.c:435 src/split.c:459
#, c-format
msgid "%s: invalid number of bytes"
msgstr "%s:無效的位元組數目"
-#: src/split.c:441
+#: src/split.c:447
#, c-format
msgid "%s: invalid number of lines"
msgstr "%s:無效的行數"
-#: src/split.c:483
+#: src/split.c:489
#, fuzzy, c-format
msgid "line count option -%s%c... is too large"
msgstr "%s:數字‘%.*s’過大"
-#: src/split.c:506
+#: src/split.c:516
#, fuzzy, c-format
msgid "`-%s' option is obsolete; use `-l %s'"
msgstr "‘-%d’選項已過時;請使用‘-l %d’"
-#: src/split.c:521
+#: src/split.c:531
#, fuzzy
msgid "invalid number of lines: 0"
msgstr "無效的行數"
-#: src/stat.c:624
+#: src/stat.c:572
#, fuzzy, c-format
msgid "cannot read file system information for %s"
msgstr "無法將 %s 的檔案指標重新定位"
-#: src/stat.c:700
+#: src/stat.c:647
#, fuzzy, c-format
msgid "Usage: %s [OPTION] FILE...\n"
msgstr "用法:%s [選項] [檔案]...\n"
# How come the real behavior of -L is exactly the opposite of what docs
# say? -- Abel
-#: src/stat.c:701
+#: src/stat.c:648
+#, fuzzy
msgid ""
-"Display file or filesystem status.\n"
+"Display file or file system status.\n"
"\n"
-" -f, --filesystem display filesystem status instead of file status\n"
+" -f, --file-system display file system status instead of file status\n"
" -c --format=FORMAT use the specified FORMAT instead of the default\n"
" -L, --dereference follow links\n"
" -t, --terse print the information in terse form\n"
@@ -6241,11 +6350,11 @@ msgstr ""
" -L, --dereference 讀取鏈結本身的資訊,而非鏈結指示的目標檔案/目錄\n"
" -t, --terse 只顯示簡略的資訊\n"
-#: src/stat.c:712
+#: src/stat.c:659
#, fuzzy
msgid ""
"\n"
-"The valid format sequences for files (without --filesystem):\n"
+"The valid format sequences for files (without --file-system):\n"
"\n"
" %A Access rights in human readable form\n"
" %a Access rights in octal\n"
@@ -6259,7 +6368,7 @@ msgstr ""
" %a - 以八進位數字方式表示存取權限\n"
" %b - 佔用的磁碟區段數目\n"
-#: src/stat.c:720
+#: src/stat.c:667
#, fuzzy
msgid ""
" %D Device number in hex\n"
@@ -6276,7 +6385,7 @@ msgstr ""
" %G - 所屬群組的名稱\n"
" %g - 所屬群組的號碼\n"
-#: src/stat.c:728
+#: src/stat.c:675
#, fuzzy
msgid ""
" %h Number of hard links\n"
@@ -6297,7 +6406,7 @@ msgstr ""
" %T - 特殊檔案或裝置檔案的十六進位 minor 號碼\n"
" %t - 特殊檔案或裝置檔案的十六進位 major 號碼\n"
-#: src/stat.c:738
+#: src/stat.c:685
#, fuzzy
msgid ""
" %U User name of owner\n"
@@ -6319,7 +6428,7 @@ msgstr ""
" %Z - 由 Epoch 時間至最後更改 inode 資訊的時間之間經過的秒數\n"
" %z - 最後更改 inode 資訊的時間\n"
-#: src/stat.c:750
+#: src/stat.c:697
#, fuzzy
msgid ""
"Valid format sequences for file systems:\n"
@@ -6338,7 +6447,7 @@ msgstr ""
" %d - 檔案系統剩餘可用的最大檔案數目\n"
" %f - 檔案系統的剩餘空間\n"
-#: src/stat.c:759
+#: src/stat.c:706
#, fuzzy
msgid ""
" %i File System id in hex\n"
@@ -6355,14 +6464,14 @@ msgstr ""
" %T - 以容易理解的方式表示的檔案系統類型\n"
" %t - 以十六進位表示的檔案系統類型\n"
-#: src/stat.c:799
+#: src/stat.c:747
#, fuzzy
msgid "Warning: `-l' is deprecated; use `-L' instead"
msgstr ""
"警告:--version-control (-V) 選項已經過時;將來的版本隨時可能不再支援\n"
"此選項。請使用 --backup=%s。"
-#: src/stty.c:492
+#: src/stty.c:499
#, c-format
msgid ""
"Usage: %s [-F DEVICE] [--file=DEVICE] [SETTING]...\n"
@@ -6370,7 +6479,7 @@ msgid ""
" or: %s [-F DEVICE] [--file=DEVICE] [-g|--save]\n"
msgstr ""
-#: src/stty.c:498
+#: src/stty.c:505
msgid ""
"Print or change terminal characteristics.\n"
"\n"
@@ -6379,14 +6488,14 @@ msgid ""
" -F, --file=DEVICE open and use the specified DEVICE instead of stdin\n"
msgstr ""
-#: src/stty.c:507
+#: src/stty.c:514
msgid ""
"\n"
"Optional - before SETTING indicates negation. An * marks non-POSIX\n"
"settings. The underlying system defines which settings are available.\n"
msgstr ""
-#: src/stty.c:512
+#: src/stty.c:519
msgid ""
"\n"
"Special characters:\n"
@@ -6395,7 +6504,7 @@ msgid ""
" eol CHAR CHAR will end the line\n"
msgstr ""
-#: src/stty.c:519
+#: src/stty.c:526
msgid ""
" * eol2 CHAR alternate CHAR for ending the line\n"
" erase CHAR CHAR will erase the last character typed\n"
@@ -6403,7 +6512,7 @@ msgid ""
" kill CHAR CHAR will erase the current line\n"
msgstr ""
-#: src/stty.c:525
+#: src/stty.c:532
msgid ""
" * lnext CHAR CHAR will enter the next character quoted\n"
" quit CHAR CHAR will send a quit signal\n"
@@ -6411,7 +6520,7 @@ msgid ""
" start CHAR CHAR will restart the output after stopping it\n"
msgstr ""
-#: src/stty.c:531
+#: src/stty.c:538
msgid ""
" stop CHAR CHAR will stop the output\n"
" susp CHAR CHAR will send a terminal stop signal\n"
@@ -6419,7 +6528,7 @@ msgid ""
" * werase CHAR CHAR will erase the last word typed\n"
msgstr ""
-#: src/stty.c:537
+#: src/stty.c:544
msgid ""
"\n"
"Special settings:\n"
@@ -6428,7 +6537,7 @@ msgid ""
" * columns N same as cols N\n"
msgstr ""
-#: src/stty.c:544
+#: src/stty.c:551
msgid ""
" ispeed N set the input speed to N\n"
" * line N use line discipline N\n"
@@ -6437,7 +6546,7 @@ msgid ""
" ospeed N set the output speed to N\n"
msgstr ""
-#: src/stty.c:550
+#: src/stty.c:557
msgid ""
" * rows N tell the kernel that the terminal has N rows\n"
" * size print the number of rows and columns according to the "
@@ -6446,7 +6555,7 @@ msgid ""
" time N with -icanon, set read timeout of N tenths of a second\n"
msgstr ""
-#: src/stty.c:556
+#: src/stty.c:563
msgid ""
"\n"
"Control settings:\n"
@@ -6456,7 +6565,7 @@ msgid ""
" csN set character size to N bits, N in [5..8]\n"
msgstr ""
-#: src/stty.c:564
+#: src/stty.c:571
msgid ""
" [-]cstopb use two stop bits per character (one with `-')\n"
" [-]hup send a hangup signal when the last process closes the tty\n"
@@ -6466,7 +6575,7 @@ msgid ""
" [-]parodd set odd parity (even with `-')\n"
msgstr ""
-#: src/stty.c:571
+#: src/stty.c:578
msgid ""
"\n"
"Input settings:\n"
@@ -6476,7 +6585,7 @@ msgid ""
" [-]igncr ignore carriage return\n"
msgstr ""
-#: src/stty.c:579
+#: src/stty.c:586
msgid ""
" [-]ignpar ignore characters with parity errors\n"
" * [-]imaxbel beep and do not flush a full input buffer on a character\n"
@@ -6485,11 +6594,11 @@ msgid ""
" [-]istrip clear high (8th) bit of input characters\n"
msgstr ""
-#: src/stty.c:586
+#: src/stty.c:593
msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n"
msgstr ""
-#: src/stty.c:589
+#: src/stty.c:596
msgid ""
" * [-]iuclc translate uppercase characters to lowercase\n"
" * [-]ixany let any character restart output, not only start character\n"
@@ -6499,7 +6608,7 @@ msgid ""
" [-]tandem same as [-]ixoff\n"
msgstr ""
-#: src/stty.c:597
+#: src/stty.c:604
msgid ""
"\n"
"Output settings:\n"
@@ -6509,7 +6618,7 @@ msgid ""
" * nlN newline delay style, N in [0..1]\n"
msgstr ""
-#: src/stty.c:605
+#: src/stty.c:612
msgid ""
" * [-]ocrnl translate carriage return to newline\n"
" * [-]ofdel use delete characters for fill instead of null characters\n"
@@ -6519,7 +6628,7 @@ msgid ""
" * [-]onlret newline performs a carriage return\n"
msgstr ""
-#: src/stty.c:613
+#: src/stty.c:620
msgid ""
" * [-]onocr do not print carriage returns in the first column\n"
" [-]opost postprocess output\n"
@@ -6529,7 +6638,7 @@ msgid ""
" * vtN vertical tab delay style, N in [0..1]\n"
msgstr ""
-#: src/stty.c:621
+#: src/stty.c:628
msgid ""
"\n"
"Local settings:\n"
@@ -6538,7 +6647,7 @@ msgid ""
" * -crtkill kill all line by obeying the echoctl and echok settings\n"
msgstr ""
-#: src/stty.c:628
+#: src/stty.c:635
msgid ""
" * [-]ctlecho echo control characters in hat notation (`^c')\n"
" [-]echo echo input characters\n"
@@ -6547,7 +6656,7 @@ msgid ""
" [-]echok echo a newline after a kill character\n"
msgstr ""
-#: src/stty.c:635
+#: src/stty.c:642
msgid ""
" * [-]echoke same as [-]crtkill\n"
" [-]echonl echo newline even if not echoing other characters\n"
@@ -6556,7 +6665,7 @@ msgid ""
" [-]iexten enable non-POSIX special characters\n"
msgstr ""
-#: src/stty.c:642
+#: src/stty.c:649
msgid ""
" [-]isig enable interrupt, quit, and suspend special characters\n"
" [-]noflsh disable flushing after interrupt and quit special "
@@ -6566,7 +6675,7 @@ msgid ""
" * [-]xcase with icanon, escape with `\\' for uppercase characters\n"
msgstr ""
-#: src/stty.c:649
+#: src/stty.c:656
msgid ""
"\n"
"Combination settings:\n"
@@ -6575,7 +6684,7 @@ msgid ""
" -cbreak same as icanon\n"
msgstr ""
-#: src/stty.c:656
+#: src/stty.c:663
msgid ""
" cooked same as brkint ignpar istrip icrnl ixon opost isig\n"
" icanon, eof and eol characters to their default values\n"
@@ -6583,7 +6692,7 @@ msgid ""
" crt same as echoe echoctl echoke\n"
msgstr ""
-#: src/stty.c:662
+#: src/stty.c:669
msgid ""
" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
" kill ^u\n"
@@ -6592,7 +6701,7 @@ msgid ""
" evenp same as parenb -parodd cs7\n"
msgstr ""
-#: src/stty.c:669
+#: src/stty.c:676
msgid ""
" -evenp same as -parenb cs8\n"
" * [-]lcase same as xcase iuclc olcuc\n"
@@ -6602,7 +6711,7 @@ msgid ""
" -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
msgstr ""
-#: src/stty.c:677
+#: src/stty.c:684
msgid ""
" oddp same as parenb parodd cs7\n"
" -oddp same as -parenb cs8\n"
@@ -6611,7 +6720,7 @@ msgid ""
" -pass8 same as parenb istrip cs7\n"
msgstr ""
-#: src/stty.c:684
+#: src/stty.c:691
msgid ""
" raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
" -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n"
@@ -6619,7 +6728,7 @@ msgid ""
" -raw same as cooked\n"
msgstr ""
-#: src/stty.c:690
+#: src/stty.c:697
msgid ""
" sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
" -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -6629,7 +6738,7 @@ msgid ""
" characters to their default values.\n"
msgstr ""
-#: src/stty.c:698
+#: src/stty.c:705
msgid ""
"\n"
"Handle the tty line connected to standard input. Without arguments,\n"
@@ -6638,88 +6747,93 @@ msgid ""
"127; special values ^- or undef used to disable special characters.\n"
msgstr ""
-#: src/stty.c:785
+#: src/stty.c:775
#, fuzzy
msgid "only one device may be specified"
msgstr "只能指定一個引數"
-#: src/stty.c:880
+#: src/stty.c:805
#, fuzzy
msgid ""
"the options for verbose and stty-readable output styles are\n"
"mutually exclusive"
msgstr "不能同時使用 --string 及 --check 選項"
-#: src/stty.c:886
+#: src/stty.c:811
msgid "when specifying an output style, modes may not be set"
msgstr ""
-#: src/stty.c:902
+#: src/stty.c:827
#, c-format
msgid "%s: couldn't reset non-blocking mode"
msgstr ""
-#: src/stty.c:956 src/stty.c:1063
+#: src/stty.c:878 src/stty.c:988
#, fuzzy, c-format
msgid "invalid argument `%s'"
msgstr "%2$s的引數%1$s無效"
-#: src/stty.c:967 src/stty.c:984 src/stty.c:996 src/stty.c:1009
-#: src/stty.c:1021 src/stty.c:1040
+#: src/stty.c:889 src/stty.c:906 src/stty.c:918 src/stty.c:931 src/stty.c:943
+#: src/stty.c:963
#, fuzzy, c-format
msgid "missing argument to `%s'"
msgstr "%2$s的引數%1$s不明確"
-#: src/stty.c:1116
+#: src/stty.c:969
+#, fuzzy, c-format
+msgid "invalid line discipline `%s'"
+msgstr "無效的欄位規格:‘%s’"
+
+#: src/stty.c:1040
#, c-format
msgid "%s: unable to perform all requested operations"
msgstr ""
-#: src/stty.c:1121
+#: src/stty.c:1045
#, c-format
msgid "new_mode: mode\n"
msgstr ""
-#: src/stty.c:1461
+#: src/stty.c:1386
#, c-format
msgid "%s: no size information for this device"
msgstr ""
-#: src/stty.c:1943
+#: src/stty.c:1882
#, fuzzy, c-format
msgid "invalid integer argument `%s'"
msgstr "無效的行號增加值:‘%s’"
-#: src/su.c:288
+#: src/su.c:265
msgid "Password:"
msgstr ""
-#: src/su.c:291
+#: src/su.c:268
#, fuzzy
msgid "getpass: cannot open /dev/tty"
msgstr "無法開啟目錄%s"
-#: src/su.c:349
+#: src/su.c:326
#, fuzzy
msgid "cannot set groups"
msgstr "不可同時省略使用者和所屬群組"
-#: src/su.c:353
+#: src/su.c:330
#, fuzzy
msgid "cannot set group id"
msgstr "不可同時省略使用者和所屬群組"
-#: src/su.c:355
+#: src/su.c:332
#, fuzzy
msgid "cannot set user id"
msgstr "不可同時省略使用者和所屬群組"
-#: src/su.c:436
+#: src/su.c:408
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n"
msgstr "用法:%s [選項]... [檔案]...\n"
-#: src/su.c:437
+#: src/su.c:409
msgid ""
"Change the effective user id and group id to that of USER.\n"
"\n"
@@ -6731,27 +6845,27 @@ msgid ""
" -s, --shell=SHELL run SHELL if /etc/shells allows it\n"
msgstr ""
-#: src/su.c:449
+#: src/su.c:421
msgid ""
"\n"
"A mere - implies -l. If USER not given, assume root.\n"
msgstr ""
-#: src/su.c:531
+#: src/su.c:498
#, c-format
msgid "user %s does not exist"
msgstr ""
-#: src/su.c:554
+#: src/su.c:521
msgid "incorrect password"
msgstr ""
-#: src/su.c:571
+#: src/su.c:538
#, c-format
msgid "using restricted shell %s"
msgstr ""
-#: src/su.c:582
+#: src/su.c:546
#, fuzzy, c-format
msgid "warning: cannot change directory to %s"
msgstr "無法建立目錄%s"
@@ -6768,7 +6882,7 @@ msgstr ""
" -r 令 -s 選項無效,使用 BSD 的演算法,用 1K 的區塊大小\n"
" -s, --sysv 使用 System V 的演算法,用 512 個位元組的區塊大小\n"
-#: src/sync.c:45
+#: src/sync.c:46
msgid ""
"Force changed blocks to disk, update the super block.\n"
"\n"
@@ -6776,20 +6890,20 @@ msgstr ""
"強迫將已更改的資料寫入磁碟,並更新 super block。\n"
"\n"
-#: src/sync.c:71 src/tty.c:119
+#: src/sync.c:74
#, fuzzy
msgid "ignoring all arguments"
msgstr "引數過多"
-#: src/system.h:617
+#: src/system.h:613
msgid " --help display this help and exit\n"
msgstr " --help 顯示此求助說明並離開\n"
-#: src/system.h:619
+#: src/system.h:615
msgid " --version output version information and exit\n"
msgstr " --version 顯示版本資訊並離開\n"
-#: src/tac.c:130
+#: src/tac.c:135
msgid ""
"Write each FILE to standard output, last line first.\n"
"With no FILE, or when FILE is -, read standard input.\n"
@@ -6799,7 +6913,7 @@ msgstr ""
"如果沒有指定 <檔案> 或 <檔案> 是 -,則由標準輸入讀取資料。\n"
"\n"
-#: src/tac.c:138
+#: src/tac.c:143
msgid ""
" -b, --before attach the separator before instead of after\n"
" -r, --regex interpret the separator as a regular expression\n"
@@ -6809,20 +6923,40 @@ msgstr ""
" -r, --regex 將分隔字串理解為正規表示式\n"
" -s, --separator=字串 用 <字串> 作為分隔字串,而不是 newline 字元\n"
-#: src/tac.c:229 src/tac.c:318
+#: src/tac.c:234 src/tac.c:331
#, fuzzy, c-format
msgid "%s: seek failed"
msgstr "關閉時發生錯誤"
-#: src/tac.c:453 src/tac.c:581
+#: src/tac.c:261
+#, fuzzy
+msgid "record too large"
+msgstr "%s:檔案過大"
+
+#: src/tac.c:453
+#, fuzzy, c-format
+msgid "cannot create temporary file %s"
+msgstr "無法建立暫存檔"
+
+#: src/tac.c:460
+#, fuzzy, c-format
+msgid "cannot open %s for writing"
+msgstr "無法開啟%s來讀取資料"
+
+#: src/tac.c:481 src/tac.c:488
+#, fuzzy, c-format
+msgid "%s: write error"
+msgstr "寫入時發生錯誤"
+
+#: src/tac.c:644
msgid "stdin: read error"
msgstr "標準輸入:讀取資料時發生錯誤"
-#: src/tac.c:628
+#: src/tac.c:694
msgid "separator cannot be empty"
msgstr "分隔字串不可以是空的"
-#: src/tail.c:242
+#: src/tail.c:227
#, c-format
msgid ""
"Print the last %d lines of each FILE to standard output.\n"
@@ -6835,18 +6969,21 @@ msgstr ""
"如果沒有指定 <檔案> 或 <檔案> 是 -,則由標準輸入讀取資料。\n"
"\n"
-#: src/tail.c:251
+#: src/tail.c:236
+#, fuzzy
msgid ""
" --retry keep trying to open a file even if it is\n"
" inaccessible when tail starts or if it becomes\n"
-" inaccessible later -- useful only with -f\n"
+" inaccessible later; useful when following by "
+"name,\n"
+" i.e., with --follow=name\n"
" -c, --bytes=N output the last N bytes\n"
msgstr ""
" --retry 即使執行 tail 時或一段時間後無法存取某檔案,仍然\n"
" 不斷嘗試開啟該檔案 ─ 只在配合 -f 選項時有用\n"
" -c, --bytes=N 輸出最後的 N 個位元組\n"
-#: src/tail.c:257
+#: src/tail.c:243
msgid ""
" -f, --follow[={name|descriptor}]\n"
" output appended data as the file grows;\n"
@@ -6860,7 +6997,7 @@ msgstr ""
" -F 等於 --follow=name --retry\n"
# --max-consecutive-size-changes is undocumented -- maddog
-#: src/tail.c:264
+#: src/tail.c:250
#, c-format
msgid ""
" -n, --lines=N output the last N lines, instead of the last %d\n"
@@ -6880,7 +7017,7 @@ msgstr ""
" 配合 --follow=name 時,如果 <檔案> 連續 N 次\n"
" 改變大小,則認定此檔案已經被改名。\n"
-#: src/tail.c:275
+#: src/tail.c:261
#, fuzzy
msgid ""
" --pid=PID with -f, terminate after process ID, PID dies\n"
@@ -6896,7 +7033,7 @@ msgstr ""
" (預設為 1 秒)\n"
" -v, --verbose 一定顯示任何標明檔案名稱的標頭\n"
-#: src/tail.c:284
+#: src/tail.c:270
#, fuzzy
msgid ""
"\n"
@@ -6912,7 +7049,7 @@ msgstr ""
"m 則是 1048576 (1M)。\n"
"\n"
-#: src/tail.c:292
+#: src/tail.c:278
msgid ""
"With --follow (-f), tail defaults to following the file descriptor, which\n"
"means that even if a tail'ed file is renamed, tail will continue to track\n"
@@ -6921,7 +7058,7 @@ msgstr ""
"若配合 --follow (-f) 選項,tail 預設會檢查檔案描述子 (file descriptor);\n"
"即是說,即使要 tail 的檔案已經改名,tail 仍會繼續檢查該檔案的末端。"
-#: src/tail.c:297
+#: src/tail.c:283
msgid ""
"This default behavior is not desirable when you really want to\n"
"track the actual name of the file, not the file descriptor (e.g., log\n"
@@ -6935,135 +7072,115 @@ msgstr ""
"的檔案,方法是重覆地開啟檔案,看看它是否已被移除和其它程式會否再產生該\n"
"檔案。\n"
-#: src/tail.c:335
+#: src/tail.c:343
#, c-format
msgid "closing %s (fd=%d)"
msgstr "正在關閉 %s (fd=%d)"
-#: src/tail.c:400
+#: src/tail.c:418
#, fuzzy, c-format
msgid "%s: cannot seek to relative offset %s"
msgstr "%s:無法搜尋至相對位置 %s%s"
-#: src/tail.c:404
+#: src/tail.c:422
#, fuzzy, c-format
msgid "%s: cannot seek to end-relative offset %s"
msgstr "%s:無法搜尋至末端相對位置 %s%s"
-#: src/tail.c:856
+#: src/tail.c:874
#, c-format
msgid "`%s' has become inaccessible"
msgstr "已無法存取‘%s’"
-#: src/tail.c:873
+#: src/tail.c:891
#, c-format
msgid "`%s' has been replaced with an untailable file; giving up on this name"
msgstr "%s:被一個無法 tail 的檔案取代;不會再檢查此檔案名稱"
-#: src/tail.c:894
+#: src/tail.c:912
#, c-format
msgid "`%s' has become accessible"
msgstr "已經可以存取‘%s’"
-#: src/tail.c:902
+#: src/tail.c:920
#, c-format
msgid "`%s' has appeared; following end of new file"
msgstr "‘%s’已出現;正在檢查新檔案的末端"
-#: src/tail.c:913
+#: src/tail.c:931
#, c-format
msgid "`%s' has been replaced; following end of new file"
msgstr "‘%s’已被取代;正在檢查新檔案的末端"
-#: src/tail.c:1038
+#: src/tail.c:1024
+#, fuzzy, c-format
+msgid "%s: cannot change nonblocking mode"
+msgstr "無法更改%s的擁有者和/或所屬群組"
+
+#: src/tail.c:1065
#, c-format
msgid "%s: file truncated"
msgstr "%s:檔案被截斷了"
-#: src/tail.c:1058
+#: src/tail.c:1088
msgid "no files remaining"
msgstr "已沒有任何剩餘的檔案"
-#: src/tail.c:1298
+#: src/tail.c:1329
#, c-format
msgid "%s: cannot follow end of this type of file; giving up on this name"
msgstr "%s:無法檢查此類檔案的末端;不會再檢查此檔案名稱"
-#: src/tail.c:1422
-#, c-format
-msgid "%c: invalid suffix character in obsolescent option"
-msgstr "%c:在已過時的選項中含有無效的後置字元"
-
-#: src/tail.c:1471
-#, c-format
-msgid ""
-"too many arguments; When using tail's obsolescent option syntax (%s)\n"
-"there may be no more than one file argument. Use the equivalent -n or -c\n"
-"option instead."
-msgstr ""
-"參數過多;當使用已過時的 tail 選項語法 (%s) 時,不可指定多於一個的檔案\n"
-"參數。請使用同等的 -n 或 -c 選項。"
-
-#: src/tail.c:1480
-#, c-format
-msgid ""
-"Warning: it is not portable to use two or more file arguments with\n"
-"tail's obsolescent option syntax (%s). Use the equivalent -n or -c\n"
-"option instead."
-msgstr ""
-"警告:將兩個或以上的檔案配合已過時的 tail 選項語法 (%s) 不是在所有系統\n"
-"都通用的。請使用同等的 -n 或 -c 選項。"
+#: src/tail.c:1445
+#, fuzzy, c-format
+msgid "number in `%s' is too large"
+msgstr "要比較的位元組數目無效"
-#: src/tail.c:1489
-#, c-format
-msgid "`%s' option is obsolete; use `%s-%c %.*s'"
+#: src/tail.c:1449
+#, fuzzy, c-format
+msgid "`%s' option is obsolete; use `%s-%c %<PRIuMAX>'"
msgstr "‘%s’選項已過時;請使用‘%s-%c %.*s’"
-#: src/tail.c:1561
+#: src/tail.c:1515
#, fuzzy
msgid "the --allow-missing option is deprecated; use --retry instead"
msgstr ""
"警告:--version-control (-V) 選項已經過時;將來的版本隨時可能不再支援\n"
"此選項。請使用 --backup=%s。"
-#: src/tail.c:1573
+#: src/tail.c:1529
#, c-format
msgid "%s: invalid maximum number of unchanged stats between opens"
msgstr "%s:開啟檔案前 stat 資料沒有改變的最大次數無效"
-#: src/tail.c:1585
-#, c-format
-msgid "%s: invalid maximum number of consecutive size changes"
-msgstr "%s:檔案連續改變大小的最大次數無效"
-
-#: src/tail.c:1597
+#: src/tail.c:1541
#, c-format
msgid "%s: invalid PID"
msgstr "%s:無效的 PID"
-#: src/tail.c:1616
+#: src/tail.c:1560
#, c-format
msgid "%s: invalid number of seconds"
msgstr "%s:無效的秒數"
-#: src/tail.c:1635
+#: src/tail.c:1579
msgid "warning: --retry is useful only when following by name"
msgstr "警告:只有檢查檔案名稱時 --retry 選項才會有效"
-#: src/tail.c:1639
+#: src/tail.c:1583
msgid "warning: PID ignored; --pid=PID is useful only when following"
msgstr "警告:會忽略 PID;--pid=PID 選項只在不斷檢查檔案時才會有效"
-#: src/tail.c:1642
+#: src/tail.c:1586
msgid "warning: --pid=PID is not supported on this system"
msgstr "警告:此系統不支援 --pid=PID 選項"
-#: src/tail.c:1723
+#: src/tail.c:1667
#, fuzzy, c-format
msgid "cannot follow %s by name"
msgstr "無法建立暫存檔"
-#: src/tail.c:1729
+#: src/tail.c:1673
msgid "warning: following standard input indefinitely is ineffective"
msgstr ""
@@ -7075,108 +7192,120 @@ msgid ""
" -i, --ignore-interrupts ignore interrupt signals\n"
msgstr ""
-#: src/test.c:202
-msgid "argument expected\n"
+#: src/tee.c:71
+#, fuzzy
+msgid ""
+"\n"
+"If a FILE is -, copy again to standard output.\n"
msgstr ""
+"\n"
+"如果沒有指定<檔案>或<檔案>是 -,則由標準輸入讀取資料。\n"
-#: src/test.c:210
+#: src/test.c:132
+#, fuzzy, c-format
+msgid "missing argument after %s"
+msgstr "%2$s的引數%1$s不明確"
+
+#: src/test.c:140
#, fuzzy, c-format
msgid "%s: integer expression expected\n"
msgstr "%s:無效的正規表示式:%s"
-#: src/test.c:340
+#: src/test.c:265
msgid "')' expected\n"
msgstr ""
-#: src/test.c:343
+#: src/test.c:268
#, c-format
msgid "')' expected, found %s\n"
msgstr ""
-#: src/test.c:360 src/test.c:887
+#: src/test.c:284 src/test.c:747
#, c-format
msgid "%s: unary operator expected\n"
msgstr ""
-#: src/test.c:410
+#: src/test.c:333
msgid "before -lt"
msgstr ""
-#: src/test.c:418
+#: src/test.c:341
msgid "after -lt"
msgstr ""
-#: src/test.c:432
+#: src/test.c:355
msgid "before -le"
msgstr ""
-#: src/test.c:439
+#: src/test.c:362
msgid "after -le"
msgstr ""
-#: src/test.c:455
+#: src/test.c:378
msgid "before -gt"
msgstr ""
-#: src/test.c:462
+#: src/test.c:385
msgid "after -gt"
msgstr ""
-#: src/test.c:476
+#: src/test.c:399
msgid "before -ge"
msgstr ""
-#: src/test.c:483
+#: src/test.c:406
msgid "after -ge"
msgstr ""
-#: src/test.c:498
+#: src/test.c:421
msgid "-nt does not accept -l\n"
msgstr ""
-#: src/test.c:512
+#: src/test.c:435
msgid "before -ne"
msgstr ""
-#: src/test.c:519
+#: src/test.c:442
msgid "after -ne"
msgstr ""
-#: src/test.c:535
+#: src/test.c:458
msgid "before -eq"
msgstr ""
-#: src/test.c:542
+#: src/test.c:465
msgid "after -eq"
msgstr ""
-#: src/test.c:553
+#: src/test.c:476
msgid "-ef does not accept -l\n"
msgstr ""
-#: src/test.c:572
+#: src/test.c:492
msgid "-ot does not accept -l\n"
msgstr ""
-#: src/test.c:581
+#: src/test.c:501
#, fuzzy
msgid "unknown binary operator\n"
msgstr "不明的系統錯誤"
-#: src/test.c:767
+#: src/test.c:629
msgid "after -t"
msgstr ""
-#: src/test.c:915
+#: src/test.c:775
#, c-format
msgid "%s: binary operator expected\n"
msgstr ""
-#: src/test.c:975
+#: src/test.c:835
#, fuzzy
msgid ""
"Usage: test EXPRESSION\n"
+" or: test\n"
" or: [ EXPRESSION ]\n"
+" or: [ ]\n"
" or: [ OPTION\n"
"Exit with the status determined by EXPRESSION.\n"
"\n"
@@ -7184,13 +7313,14 @@ msgstr ""
"用法:%s [檔案]...\n"
" 或:%s [選項]\n"
-#: src/test.c:984
+#: src/test.c:846
msgid ""
"\n"
+"An omitted EXPRESSION defaults to false. Otherwise,\n"
"EXPRESSION is true or false and sets exit status. It is one of:\n"
msgstr ""
-#: src/test.c:988
+#: src/test.c:851
msgid ""
"\n"
" ( EXPRESSION ) EXPRESSION is true\n"
@@ -7199,16 +7329,17 @@ msgid ""
" EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n"
msgstr ""
-#: src/test.c:995
+#: src/test.c:858
msgid ""
"\n"
-" [-n] STRING the length of STRING is nonzero\n"
+" -n STRING the length of STRING is nonzero\n"
+" STRING equivalent to -n STRING\n"
" -z STRING the length of STRING is zero\n"
" STRING1 = STRING2 the strings are equal\n"
" STRING1 != STRING2 the strings are not equal\n"
msgstr ""
-#: src/test.c:1002
+#: src/test.c:866
msgid ""
"\n"
" INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n"
@@ -7219,7 +7350,7 @@ msgid ""
" INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n"
msgstr ""
-#: src/test.c:1011
+#: src/test.c:875
msgid ""
"\n"
" FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n"
@@ -7227,7 +7358,7 @@ msgid ""
" FILE1 -ot FILE2 FILE1 is older than FILE2\n"
msgstr ""
-#: src/test.c:1017
+#: src/test.c:881
msgid ""
"\n"
" -b FILE FILE exists and is block special\n"
@@ -7236,78 +7367,78 @@ msgid ""
" -e FILE FILE exists\n"
msgstr ""
-#: src/test.c:1024
+#: src/test.c:888
msgid ""
" -f FILE FILE exists and is a regular file\n"
" -g FILE FILE exists and is set-group-ID\n"
-" -h FILE FILE exists and is a symbolic link (same as -L)\n"
" -G FILE FILE exists and is owned by the effective group ID\n"
+" -h FILE FILE exists and is a symbolic link (same as -L)\n"
" -k FILE FILE exists and has its sticky bit set\n"
msgstr ""
-#: src/test.c:1031
+#: src/test.c:895
msgid ""
" -L FILE FILE exists and is a symbolic link (same as -h)\n"
" -O FILE FILE exists and is owned by the effective user ID\n"
" -p FILE FILE exists and is a named pipe\n"
-" -r FILE FILE exists and is readable\n"
+" -r FILE FILE exists and read permission is granted\n"
" -s FILE FILE exists and has a size greater than zero\n"
msgstr ""
-#: src/test.c:1038
+#: src/test.c:902
msgid ""
" -S FILE FILE exists and is a socket\n"
-" -t [FD] file descriptor FD (stdout by default) is opened on a "
-"terminal\n"
+" -t FD file descriptor FD is opened on a terminal\n"
" -u FILE FILE exists and its set-user-ID bit is set\n"
-" -w FILE FILE exists and is writable\n"
-" -x FILE FILE exists and is executable\n"
+" -w FILE FILE exists and write permission is granted\n"
+" -x FILE FILE exists and execute (or search) permission is granted\n"
msgstr ""
-#: src/test.c:1045
+#: src/test.c:909
msgid ""
"\n"
+"Except for -h and -L, all FILE-related tests dereference symbolic links.\n"
"Beware that parentheses need to be escaped (e.g., by backslashes) for "
"shells.\n"
"INTEGER may also be -l STRING, which evaluates to the length of STRING.\n"
msgstr ""
-#: src/test.c:1104
+#: src/test.c:969
msgid "missing `]'\n"
msgstr ""
-#: src/test.c:1119
-#, fuzzy
-msgid "too many arguments\n"
-msgstr "引數過多"
+#: src/test.c:984
+#, fuzzy, c-format
+msgid "extra argument %s"
+msgstr "%2$s的引數%1$s無效"
-#: src/touch.c:117 src/touch.c:316
+#: src/touch.c:114 src/touch.c:311
#, fuzzy, c-format
msgid "invalid date format %s"
msgstr "%2$s的引數%1$s無效"
-#: src/touch.c:154 src/touch.c:170
+#: src/touch.c:153
#, fuzzy, c-format
msgid "creating %s"
msgstr "正在建立檔案‘%s’\n"
-#: src/touch.c:208
+#: src/touch.c:206
#, fuzzy, c-format
msgid "cannot touch %s"
msgstr "無法對‘%s’執行輸出入控制 (ioctl)"
-#: src/touch.c:214
+#: src/touch.c:212
#, c-format
msgid "setting times of %s"
msgstr "正在設定%s的時間"
-#: src/touch.c:231
+#: src/touch.c:229
msgid ""
"Update the access and modification times of each FILE to the current time.\n"
"\n"
msgstr "將每個 <檔案> 的存取及修改時間都更新為目前的時間。\n"
-#: src/touch.c:238
+#: src/touch.c:236
#, fuzzy
msgid ""
" -a change only the access time\n"
@@ -7322,13 +7453,14 @@ msgstr ""
" -f (此選項不作處理)\n"
" -m 只更改修改時間\n"
-#: src/touch.c:245
+#: src/touch.c:243
+#, fuzzy
msgid ""
" -r, --reference=FILE use this file's times instead of current time\n"
" -t STAMP use [[CC]YY]MMDDhhmm[.ss] instead of current time\n"
-" --time=WORD set time given by WORD: access atime use (same as -"
-"a)\n"
-" modify mtime (same as -m)\n"
+" --time=WORD change the specified time:\n"
+" WORD is access, atime, or use: equivalent to -a\n"
+" WORD is modify or mtime: equivalent to -m\n"
msgstr ""
" -r, --reference=檔案 使用指定 <檔案> 的時間屬性而非目前的時間\n"
" -t STAMP 使用 [[CC]YY]MMDDhhmm[.ss] 格式的時間而非目前的時"
@@ -7336,7 +7468,7 @@ msgstr ""
" --time=WORD 使用 WORD 指定的時間:access、atime、use 都等於 -a\n"
" 選項的效果,而 modify、mtime 等於 -m 選項的效果\n"
-#: src/touch.c:253
+#: src/touch.c:252
msgid ""
"\n"
"Note that the -d and -t options accept different time-date formats.\n"
@@ -7344,33 +7476,29 @@ msgstr ""
"\n"
"請注意,-d 和 -t 選項可接受不同的時間/日期格式。\n"
-#: src/touch.c:341
+#: src/touch.c:337
#, fuzzy
msgid "cannot specify times from more than one source"
msgstr "不能用超過一種方式進行分割"
-#: src/touch.c:386
+#: src/touch.c:383
#, fuzzy, c-format
msgid ""
"warning: `touch %s' is obsolete; use `touch -t %04ld%02d%02d%02d%02d.%02d'"
msgstr "警告:‘touch %s’已經過時;請使用‘touch -t %04d%02d%02d%02d%02d.%02d’"
-#: src/touch.c:411
-#, fuzzy
-msgid "file arguments missing"
-msgstr "引數過少"
-
-#: src/tr.c:309
+#: src/tr.c:290
#, c-format
msgid "Usage: %s [OPTION]... SET1 [SET2]\n"
msgstr "用法:%s [選項]... SET1 [SET2]\n"
-#: src/tr.c:313
+#: src/tr.c:294
+#, fuzzy
msgid ""
"Translate, squeeze, and/or delete characters from standard input,\n"
"writing to standard output.\n"
"\n"
-" -c, --complement first complement SET1\n"
+" -c, -C, --complement first complement SET1\n"
" -d, --delete delete characters in SET1, do not translate\n"
" -s, --squeeze-repeats replace each input sequence of a repeated "
"character\n"
@@ -7387,7 +7515,7 @@ msgstr ""
" 中連續重複出現,則將該段字元刪除至只剩一個\n"
" -t, --truncate-set1 先將 SET1 的長度截至跟 SET2 一樣\n"
-#: src/tr.c:326
+#: src/tr.c:307
msgid ""
"\n"
"SETs are specified as strings of characters. Most represent themselves.\n"
@@ -7414,7 +7542,7 @@ msgstr ""
" \\r 復位字元 (return)\n"
" \\t 水平定位字元 (tab)\n"
-#: src/tr.c:340
+#: src/tr.c:321
msgid ""
" \\v vertical tab\n"
" CHAR1-CHAR2 all characters from CHAR1 to CHAR2 in ascending order\n"
@@ -7437,7 +7565,7 @@ msgstr ""
" [:cntrl:] 所有控制字元\n"
" [:digit:] 所有數字\n"
-#: src/tr.c:351
+#: src/tr.c:332
msgid ""
" [:graph:] all printable characters, not including space\n"
" [:lower:] all lower case letters\n"
@@ -7457,7 +7585,7 @@ msgstr ""
" [:xdigit:] 所有十六進位數字\n"
" [=CHAR=] 所有和 CHAR 同等的字元\n"
-#: src/tr.c:361
+#: src/tr.c:342
msgid ""
"\n"
"Translation occurs if -d is not given and both SET1 and SET2 appear.\n"
@@ -7469,7 +7597,7 @@ msgstr ""
"-t 選項只能在置換操作時使用。有需要時,SET2 會將它的最後一個字元\n"
"重覆,直至 SET2 的長度和 SET1 的一樣。"
-#: src/tr.c:367
+#: src/tr.c:348
msgid ""
"Excess characters\n"
"of SET2 are ignored. Only [:lower:] and [:upper:] are guaranteed to\n"
@@ -7480,7 +7608,7 @@ msgstr ""
"只有 [:lower:] 及 [:upper:] 可保證展開的字元以升序排列;當在 SET2 中\n"
"使用作為置換操作的字元時,它們只能一起使用,表示置換大小寫。"
-#: src/tr.c:373
+#: src/tr.c:354
msgid ""
"-s uses SET1 if not\n"
"translating nor deleting; else squeezing uses SET2 and occurs after\n"
@@ -7490,7 +7618,7 @@ msgstr ""
"置換或刪除字元,-s 選項只會使用 SET1;另外壓縮字元會使用 SET2,並在\n"
"置換或刪除字元後才進行。\n"
-#: src/tr.c:535
+#: src/tr.c:518
#, c-format
msgid ""
"warning: the ambiguous octal escape \\%c%c%c is being\n"
@@ -7499,65 +7627,56 @@ msgstr ""
"警告:意義不明確的八進位溢出序列 \\%c%c%c 會\n"
"\t理解為兩個位元組的序列 \\0%c%c,‘%c’"
-#: src/tr.c:544
-msgid "invalid backslash escape at end of string"
-msgstr "字串末端的反斜號溢出序列無效"
-
-#: src/tr.c:550
-#, c-format
-msgid "invalid backslash escape `\\%c'"
-msgstr "反斜號溢出序列‘\\%c’無效"
-
-#: src/tr.c:703
+#: src/tr.c:681
#, c-format
msgid "range-endpoints of `%s-%s' are in reverse collating sequence order"
msgstr "‘%s-%s’範圍的端點和字元應有的排列次序相反"
-#: src/tr.c:859
+#: src/tr.c:837
#, c-format
msgid "invalid repeat count `%s' in [c*n] construct"
msgstr "[c*n] 結構中的重覆次數‘%s’無效"
-#: src/tr.c:940
+#: src/tr.c:918
msgid "missing character class name `[::]'"
msgstr "無效的字元種類名稱‘[::]’"
-#: src/tr.c:943
+#: src/tr.c:921
msgid "missing equivalence class character `[==]'"
msgstr "缺少了等價字元種類的字元‘[==]’"
-#: src/tr.c:958
+#: src/tr.c:936
#, c-format
msgid "invalid character class `%s'"
msgstr "無效的字元種類‘%s’"
-#: src/tr.c:977
+#: src/tr.c:955
#, c-format
msgid "%s: equivalence class operand must be a single character"
msgstr "%s:等價字元種類中的運算符必須是恰好一個字元"
-#: src/tr.c:1297
+#: src/tr.c:1275
#, fuzzy
msgid "too many characters in set"
msgstr "欄位規格出現不合法的字元"
-#: src/tr.c:1445
+#: src/tr.c:1423
msgid "the [c*] repeat construct may not appear in string1"
msgstr "重複結構 [c*] 不能在字串 1 出現"
-#: src/tr.c:1455
+#: src/tr.c:1433
msgid "only one [c*] repeat construct may appear in string2"
msgstr "重複結構 [c*] 只能在字串 2 出現一次"
-#: src/tr.c:1463
+#: src/tr.c:1441
msgid "[=c=] expressions may not appear in string2 when translating"
msgstr "進行置換時,[=c=] 表示式不能在字串 2 出現"
-#: src/tr.c:1476
+#: src/tr.c:1454
msgid "when not truncating set1, string2 must be non-empty"
msgstr "若不截斷(消除) set1,字串 2 不能是空的"
-#: src/tr.c:1485
+#: src/tr.c:1463
msgid ""
"when translating with complemented character classes,\n"
"string2 must map all characters in the domain to one"
@@ -7565,46 +7684,30 @@ msgstr ""
"取字元種類的餘集(complement)作置換時,只能將所有字元映射\n"
"至一個字元,即字串 2 只可含有一個字元"
-#: src/tr.c:1492
+#: src/tr.c:1470
msgid ""
"when translating, the only character classes that may appear in\n"
"string2 are `upper' and `lower'"
msgstr "置換時,可以在字串 2 出現的字元種類只有‘upper’或‘lower’"
-#: src/tr.c:1501
+#: src/tr.c:1479
msgid "the [c*] construct may appear in string2 only when translating"
msgstr "[c*] 結構只有在置換時方可在字串 2 出現"
-#: src/tr.c:1754
-msgid "two strings must be given when translating"
+#: src/tr.c:1731
+#, fuzzy
+msgid "Two strings must be given when translating."
msgstr "置換時必須指定兩個字串"
-#: src/tr.c:1757
-msgid "two strings must be given when both deleting and squeezing repeats"
-msgstr "同時刪除字元和壓縮重覆字時必須指定兩個字串"
-
-#: src/tr.c:1771
-msgid "only one string may be given when deleting without squeezing repeats"
+#: src/tr.c:1741
+#, fuzzy
+msgid "Only one string may be given when deleting without squeezing repeats."
msgstr "刪除但不壓縮重覆字時只能指定一個字串"
-#: src/tr.c:1777
-msgid "at least one string must be given when squeezing repeats"
-msgstr "壓縮重覆字時至少要指定一個字串"
-
-#: src/tr.c:1874
+#: src/tr.c:1841
msgid "misaligned [:upper:] and/or [:lower:] construct"
msgstr "[:upper:]、[:lower:]結構的位置沒有對齊"
-#: src/tr.c:1897
-msgid ""
-"invalid identity mapping; when translating, any [:lower:] or [:upper:]\n"
-"construct in string1 must be aligned with a corresponding construct\n"
-"([:upper:] or [:lower:], respectively) in string2"
-msgstr ""
-"無效的恆等映射 (identity mapping);進行置換時,對於字串 1 的任何\n"
-"[:lower:]、[:upper:] 結構,在字串 2 裡都必須有一個相應的結構。\n"
-"(分別為 [:upper:]、[:lower:]) "
-
#: src/true.c:32
#, c-format
msgid ""
@@ -7616,7 +7719,7 @@ msgid ""
"\n"
msgstr ""
-#: src/tsort.c:96
+#: src/tsort.c:89
#, c-format
msgid ""
"Usage: %s [OPTION] [FILE]\n"
@@ -7630,32 +7733,33 @@ msgstr ""
"<檔案> 是 -,則由標準輸入讀取資料。\n"
"\n"
-#: src/tsort.c:492
+#: src/tsort.c:486
#, fuzzy, c-format
msgid "%s: input contains an odd number of tokens"
msgstr "%s:將輸入資料排序時出現迴圈:"
-#: src/tsort.c:534
+#: src/tsort.c:527
#, c-format
msgid "%s: input contains a loop:"
msgstr "%s:將輸入資料排序時出現迴圈:"
-#: src/tsort.c:576
-msgid "only one argument may be specified"
-msgstr "只能指定一個引數"
+#: src/tty.c:69 src/uname.c:117 src/whoami.c:50
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "用法:%s [選項] [檔案]...\n"
-#: src/tty.c:69
+#: src/tty.c:70
msgid ""
"Print the file name of the terminal connected to standard input.\n"
"\n"
" -s, --silent, --quiet print nothing, only return an exit status\n"
msgstr ""
-#: src/tty.c:127
+#: src/tty.c:125
msgid "not a tty"
msgstr ""
-#: src/uname.c:110
+#: src/uname.c:118
msgid ""
"Print certain system information. With no OPTION, same as -s.\n"
"\n"
@@ -7665,7 +7769,7 @@ msgid ""
" -r, --kernel-release print the kernel release\n"
msgstr ""
-#: src/uname.c:118
+#: src/uname.c:126
msgid ""
" -v, --kernel-version print the kernel version\n"
" -m, --machine print the machine hardware name\n"
@@ -7674,18 +7778,15 @@ msgid ""
" -o, --operating-system print the operating system\n"
msgstr ""
-#: src/uname.c:229
+#: src/uname.c:235
#, fuzzy
msgid "cannot get system name"
msgstr "無法建立暫存檔"
-#: src/unexpand.c:152
-msgid "tab size contains an invalid character"
-msgstr "tab 字元寬度含有無效的字元"
-
-#: src/unexpand.c:381
+#: src/unexpand.c:126
+#, fuzzy
msgid ""
-"Convert spaces in each FILE to tabs, writing to standard output.\n"
+"Convert blanks in each FILE to tabs, writing to standard output.\n"
"With no FILE, or when FILE is -, read standard input.\n"
"\n"
msgstr ""
@@ -7693,13 +7794,11 @@ msgstr ""
"如果沒有指定 <檔案> 或 <檔案> 是 -,則由標準輸入讀取資料。\n"
"\n"
-#: src/unexpand.c:389
+#: src/unexpand.c:134
#, fuzzy
msgid ""
-" -a, --all convert all whitespace, instead of just initial "
-"whitespace\n"
-" --first-only convert only leading sequences of whitespace (overrides -"
-"a)\n"
+" -a, --all convert all blanks, instead of just initial blanks\n"
+" --first-only convert only leading sequences of blanks (overrides -a)\n"
" -t, --tabs=N have tabs N characters apart instead of 8 (enables -a)\n"
" -t, --tabs=LIST use comma separated LIST of tab positions (enables -a)\n"
msgstr ""
@@ -7707,16 +7806,20 @@ msgstr ""
" -t, --tabs=數字 將指定 <數字> 的空格轉換為 tab,而非 8 個\n"
" -t, --tabs=LIST 用以逗號分隔的數字特別指定 tab 的位置\n"
-#: src/unexpand.c:467
+#: src/unexpand.c:162
+msgid "tabs are too far apart"
+msgstr ""
+
+#: src/unexpand.c:530
msgid "`-LIST' option is obsolete; use `--first-only -t LIST'"
msgstr "‘-LIST’選項已過時;請使用‘--first-only -t LIST’"
-#: src/uniq.c:134
+#: src/uniq.c:135
#, c-format
msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
msgstr "用法:%s [選項]... [輸入 [輸出]]\n"
-#: src/uniq.c:138
+#: src/uniq.c:139
msgid ""
"Discard all but one of successive identical lines from INPUT (or\n"
"standard input), writing to OUTPUT (or standard output).\n"
@@ -7725,7 +7828,7 @@ msgstr ""
"將 <輸入> (預設為標準輸入) 的資料中每行連續相同的資料捨棄至只剩一行,\n"
"並在 <輸出> 顯示結果 (預設會在標準輸出顯示結果)。\n"
-#: src/uniq.c:146
+#: src/uniq.c:147
msgid ""
" -c, --count prefix lines by the number of occurrences\n"
" -d, --repeated only print duplicate lines\n"
@@ -7733,7 +7836,7 @@ msgstr ""
" -c, --count 每行前加上出現次數\n"
" -d, --repeated 只印出重覆的資料\n"
-#: src/uniq.c:150
+#: src/uniq.c:151
msgid ""
" -D, --all-repeated[=delimit-method] print all duplicate lines\n"
" delimit-method={none(default),prepend,separate}\n"
@@ -7752,11 +7855,11 @@ msgstr ""
" -s, --skip-chars=N 不比較最初的 N 個字元\n"
" -u, --unique 只印出沒有重覆的資料\n"
-#: src/uniq.c:159
+#: src/uniq.c:160
msgid " -w, --check-chars=N compare no more than N characters in lines\n"
msgstr " -w, --check-chars=N 每行比較不多於 N 個字元\n"
-#: src/uniq.c:164
+#: src/uniq.c:165
msgid ""
"\n"
"A field is a run of whitespace, then non-whitespace characters.\n"
@@ -7766,29 +7869,29 @@ msgstr ""
"一個欄位是由一組空白字元加上一組非空白的字元組成的。\n"
"當同時指定略過欄位和略過字元不作比較時,會先略過欄位。\n"
-#: src/uniq.c:438 src/uniq.c:455
-#, c-format
-msgid "extra operand `%s'"
-msgstr "多餘的參數‘%s’"
+#: src/uniq.c:352
+#, fuzzy
+msgid "too many repeated lines"
+msgstr "欄位規格出現不合法的字元"
-#: src/uniq.c:478 src/uniq.c:504
+#: src/uniq.c:487 src/uniq.c:513
msgid "invalid number of fields to skip"
msgstr "要略過的欄位數目無效"
-#: src/uniq.c:513
+#: src/uniq.c:522
msgid "invalid number of bytes to skip"
msgstr "要略過的位元組數目無效"
-#: src/uniq.c:522
+#: src/uniq.c:531
msgid "invalid number of bytes to compare"
msgstr "要比較的位元組數目無效"
-#: src/uniq.c:536
+#: src/uniq.c:545
#, c-format
msgid "`-%lu' option is obsolete; use `-f %lu'"
msgstr "‘-%lu’選項已過時;請使用‘-f %lu’"
-#: src/uniq.c:544
+#: src/uniq.c:553
msgid "printing all duplicated lines and repeat counts is meaningless"
msgstr "顯示每行重覆的資籵又計算該行的重覆次數是沒有意義的"
@@ -7809,58 +7912,63 @@ msgstr ""
"透過調用 unlink 函式來移除指定的 <檔案>。\n"
"\n"
-#: src/unlink.c:100
+#: src/unlink.c:92
#, fuzzy, c-format
msgid "cannot unlink %s"
msgstr "無法對‘%s’執行輸出入控制 (ioctl)"
-#: src/uptime.c:128
+#: src/uptime.c:109
msgid "couldn't get boot time"
msgstr ""
-#: src/uptime.c:136
+#: src/uptime.c:117
#, c-format
msgid " %2d:%02d%s up "
msgstr ""
-#: src/uptime.c:140
+#: src/uptime.c:121
msgid "am"
msgstr ""
-#: src/uptime.c:140
+#: src/uptime.c:121
msgid "pm"
msgstr ""
-#: src/uptime.c:142
+#: src/uptime.c:123
#, c-format
msgid " ??:???? up "
msgstr ""
-#: src/uptime.c:144
+#: src/uptime.c:125
#, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "???? days ??:??, "
+msgstr ""
+
+#: src/uptime.c:129
+#, c-format
+msgid "%ld day"
+msgid_plural "%ld days"
msgstr[0] ""
msgstr[1] ""
-#: src/uptime.c:146
+#: src/uptime.c:132
#, fuzzy, c-format
-msgid "%d user"
-msgid_plural "%d users"
+msgid "%lu user"
+msgid_plural "%lu users"
msgstr[0] "無效的使用者"
msgstr[1] "無效的使用者"
-#: src/uptime.c:159
+#: src/uptime.c:146
#, c-format
msgid ", load average: %.2f"
msgstr ""
-#: src/uptime.c:193 src/users.c:119
+#: src/uptime.c:179 src/users.c:107
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [ FILE ]\n"
msgstr "用法:%s [選項]... [檔案]...\n"
-#: src/uptime.c:194
+#: src/uptime.c:180
#, c-format
msgid ""
"Print the current time, the length of time the system has been up,\n"
@@ -7870,7 +7978,7 @@ msgid ""
"\n"
msgstr ""
-#: src/users.c:120
+#: src/users.c:108
#, c-format
msgid ""
"Output who is currently logged in according to FILE.\n"
@@ -7878,7 +7986,7 @@ msgid ""
"\n"
msgstr ""
-#: src/wc.c:139
+#: src/wc.c:136
#, fuzzy
msgid ""
"Print newline, word, and byte counts for each FILE, and a total line if\n"
@@ -7894,7 +8002,7 @@ msgstr ""
" -m, --chars 印出字元數目\n"
" -l, --lines 印出行數\n"
-#: src/wc.c:147
+#: src/wc.c:144
msgid ""
" -L, --max-line-length print the length of the longest line\n"
" -w, --words print the word counts\n"
@@ -7902,76 +8010,76 @@ msgstr ""
" -L, --max-line-length 印出最長一行的字數\n"
" -w, --words 印出字數\n"
-#: src/who.c:222
+#: src/who.c:218
msgid " old "
msgstr ""
-#: src/who.c:432 src/who.c:435
+#: src/who.c:442 src/who.c:444
msgid "id="
msgstr ""
-#: src/who.c:448 src/who.c:453
+#: src/who.c:457 src/who.c:462
msgid "term="
msgstr ""
-#: src/who.c:450 src/who.c:454
+#: src/who.c:459 src/who.c:463
msgid "exit="
msgstr ""
-#: src/who.c:491
+#: src/who.c:500
msgid "clock change"
msgstr ""
-#: src/who.c:503 src/who.c:504
+#: src/who.c:512 src/who.c:513
msgid "run-level"
msgstr ""
-#: src/who.c:507 src/who.c:508
+#: src/who.c:516 src/who.c:517
msgid "last="
msgstr ""
-#: src/who.c:537
+#: src/who.c:548
#, c-format
msgid ""
"\n"
-"# users=%u\n"
+"# users=%lu\n"
msgstr ""
-#: src/who.c:543
+#: src/who.c:554
msgid "NAME"
msgstr ""
-#: src/who.c:543
+#: src/who.c:554
msgid "LINE"
msgstr ""
-#: src/who.c:543
+#: src/who.c:554
msgid "TIME"
msgstr ""
-#: src/who.c:543
+#: src/who.c:554
#, fuzzy
msgid "IDLE"
msgstr "錯誤"
-#: src/who.c:543
+#: src/who.c:555
msgid "PID"
msgstr ""
-#: src/who.c:544
+#: src/who.c:555
msgid "COMMENT"
msgstr ""
-#: src/who.c:544
+#: src/who.c:555
msgid "EXIT"
msgstr ""
-#: src/who.c:621
+#: src/who.c:635
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n"
msgstr "用法:%s [選項]... 檔案1 檔案2\n"
-#: src/who.c:622
+#: src/who.c:636
msgid ""
"\n"
" -a, --all same as -b -d --login -p -r -t -T -u\n"
@@ -7980,21 +8088,21 @@ msgid ""
" -H, --heading print line of column headings\n"
msgstr ""
-#: src/who.c:629
+#: src/who.c:643
msgid ""
" -i, --idle add idle time as HOURS:MINUTES, . or old\n"
" (deprecated, use -u)\n"
" -l, --login print system login processes\n"
msgstr ""
-#: src/who.c:634
+#: src/who.c:648
msgid ""
" --lookup attempt to canonicalize hostnames via DNS\n"
" -m only hostname and user associated with stdin\n"
" -p, --process print active processes spawned by init\n"
msgstr ""
-#: src/who.c:639
+#: src/who.c:653
msgid ""
" -q, --count all login names and number of users logged on\n"
" -r, --runlevel print current runlevel\n"
@@ -8002,7 +8110,7 @@ msgid ""
" -t, --time print last system clock change\n"
msgstr ""
-#: src/who.c:645
+#: src/who.c:659
msgid ""
" -T, -w, --mesg add user's message status as +, - or ?\n"
" -u, --users list users logged in\n"
@@ -8010,7 +8118,7 @@ msgid ""
" --writable same as -T\n"
msgstr ""
-#: src/who.c:653
+#: src/who.c:667
#, c-format
msgid ""
"\n"
@@ -8018,24 +8126,24 @@ msgid ""
"If ARG1 ARG2 given, -m presumed: `am i' or `mom likes' are usual.\n"
msgstr ""
-#: src/who.c:756
+#: src/who.c:767
#, fuzzy
msgid "Warning: -i will be removed in a future release; use -u instead"
msgstr ""
"警告:--version-control (-V) 選項已經過時;將來的版本隨時可能不再支援\n"
"此選項。請使用 --backup=%s。"
-#: src/whoami.c:54
+#: src/whoami.c:51
msgid ""
"Print the user name associated with the current effective user id.\n"
"Same as id -un.\n"
"\n"
msgstr ""
-#: src/whoami.c:106
-#, c-format
-msgid "%s: cannot find username for UID %u\n"
-msgstr ""
+#: src/whoami.c:95
+#, fuzzy, c-format
+msgid "%s: cannot find username for UID %lu\n"
+msgstr "無法更改%s的擁有者和/或所屬群組"
#: src/yes.c:46
#, fuzzy, c-format
@@ -8052,8 +8160,256 @@ msgid ""
"\n"
msgstr ""
-#~ msgid "%s: cannot remove"
-#~ msgstr "%s:無法移除"
+#, fuzzy
+#~ msgid "<anonymous temporary file>"
+#~ msgstr "無法建立暫存檔"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [-T] SOURCE DEST (1st form)\n"
+#~ " or: %s [OPTION]... SOURCE... DIRECTORY (2nd form)\n"
+#~ " or: %s [OPTION]... -t DIRECTORY SOURCE... (3rd form)\n"
+#~ " or: %s [OPTION]... -d DIRECTORY... (4th form)\n"
+#~ msgstr ""
+#~ "用法:%s [選項]... 來源 目的地 (第一種格式)\n"
+#~ " 或:%s [選項]... 來源... 目錄 (第二種格式)\n"
+#~ " 或:%s -d [選項]... 目錄... (第三種格式)\n"
+
+#~ msgid "`--pages' invalid range of page numbers: `%s'"
+#~ msgstr "‘--pages’的頁碼範圍無效:‘%s’"
+
+#~ msgid "`--pages' invalid starting page number: `%s'"
+#~ msgstr "‘--pages’的開始頁碼無效:‘%s’"
+
+#~ msgid "`--pages' invalid ending page number: `%s'"
+#~ msgstr "‘--pages’的結束頁碼無效:‘%s’"
+
+#~ msgid "`--pages' starting page number is larger than ending page number"
+#~ msgstr "‘--pages’的開始頁碼大於結束頁碼"
+
+#~ msgid "starting page number larger than total number of pages: `%d'"
+#~ msgstr "開始頁碼大於總頁數:‘%d’"
+
+#~ msgid "Page %d"
+#~ msgstr "第 %d 頁"
+
+#, fuzzy
+#~ msgid "path `%s' contains nonportable character `%c'"
+#~ msgstr "tab 字元寬度含有無效的字元"
+
+#, fuzzy
+#~ msgid "`%s' is not a directory"
+#~ msgstr "%s已存在但不是目錄"
+
+#, fuzzy
+#~ msgid "invalid mode string: %s"
+#~ msgstr "無效的類型‘%s’"
+
+#~ msgid "the --string and --check options are mutually exclusive"
+#~ msgstr "不能同時使用 --string 及 --check 選項"
+
+#~ msgid "cannot omit both user and group"
+#~ msgstr "不可同時省略使用者和所屬群組"
+
+#, fuzzy
+#~ msgid "invalid group name %s"
+#~ msgstr "無效的群組"
+
+#~ msgid "group number"
+#~ msgstr "群組代號"
+
+#, fuzzy
+#~ msgid "invalid group number %s"
+#~ msgstr "無效的數字"
+
+#~ msgid ""
+#~ "Usage: %s [OPTION]... OWNER[:[GROUP]] FILE...\n"
+#~ " or: %s [OPTION]... :GROUP FILE...\n"
+#~ " or: %s [OPTION]... --reference=RFILE FILE...\n"
+#~ msgstr ""
+#~ "用法:%s [選項]... 擁有者[:[群組]] 檔案...\n"
+#~ " 或:%s [選項]... :群組 檔案...\n"
+#~ " 或:%s [選項]... --reference=參考檔 檔案...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\tonly one conv in {ascii,ebcdic,ibm}, {lcase,ucase}, {block,unblock}"
+#~ msgstr ""
+#~ "每組只能選一項作為 conv 的關鍵字:\n"
+#~ "{ascii,ebcdic,ibm}、{lcase,ucase}、{block,unblock}、{unblock,sync}"
+
+#, fuzzy
+#~ msgid "invalid width option: %s"
+#~ msgstr "無效的寬度選項:‘%s’"
+
+#, fuzzy
+#~ msgid "%s is a directory"
+#~ msgstr "%s已存在但不是目錄"
+
+#~ msgid "file"
+#~ msgstr "檔案"
+
+#~ msgid "files"
+#~ msgstr "檔案"
+
+#~ msgid "checksum"
+#~ msgstr "總和檢查值"
+
+#~ msgid "checksums"
+#~ msgstr "總和檢查值"
+
+#, fuzzy
+#~ msgid "invalid option `%s'"
+#~ msgstr "無效的寬度選項:‘%s’"
+
+#, fuzzy
+#~ msgid "invalid priority `%s'"
+#~ msgstr "無效的寬度:‘%s’"
+
+#~ msgid "old-style offset"
+#~ msgstr "舊式的偏移量表示法"
+
+#~ msgid "invalid second operand in compatibility mode `%s'"
+#~ msgstr "在相容性模式下,第二個運算符號‘%s’是無效的"
+
+#~ msgid "in compatibility mode, the last two arguments must be offsets"
+#~ msgstr "在相容性模式下,最後兩個引數必須是偏移值"
+
+#~ msgid "%c: invalid suffix character in obsolescent option"
+#~ msgstr "%c:在已過時的選項中含有無效的後置字元"
+
+#~ msgid "%s: invalid maximum number of consecutive size changes"
+#~ msgstr "%s:檔案連續改變大小的最大次數無效"
+
+#~ msgid "tab size contains an invalid character"
+#~ msgstr "tab 字元寬度含有無效的字元"
+
+#, fuzzy
+#~ msgid "%%%c: invalid directive"
+#~ msgstr "%s:無效的樣式"
+
+#~ msgid ""
+#~ "Usage: %s [OPTION]... TARGET [LINK_NAME]\n"
+#~ " or: %s [OPTION]... TARGET... DIRECTORY\n"
+#~ " or: %s [OPTION]... --target-directory=DIRECTORY TARGET...\n"
+#~ msgstr ""
+#~ "用法:%s [選項]... 目標 [鏈結名稱]\n"
+#~ " 或:%s [選項]... 目標... 目錄\n"
+#~ " 或:%s [選項]... --target-directory=目錄 目標...\n"
+
+#, fuzzy
+#~ msgid "%s: destination directory does not exist"
+#~ msgstr "%s已存在但不是目錄"
+
+#, fuzzy
+#~ msgid "%s: specified target is not a directory"
+#~ msgstr "%s已存在但不是目錄"
+
+#~ msgid "copying multiple files, but last argument %s is not a directory"
+#~ msgstr "複製多個檔案,但最後的引數%s並非目錄。"
+
+#~ msgid "installing multiple files, but last argument, %s is not a directory"
+#~ msgstr "正在安裝多個檔案,但最後的引數%s並非目錄。"
+
+#~ msgid "%s: File exists"
+#~ msgstr "%s:檔案已存在"
+
+#~ msgid "when making multiple links, last argument must be a directory"
+#~ msgstr "建立多個鏈結時,最後的引數必需為目錄"
+
+#, fuzzy
+#~ msgid "missing file operand after %s"
+#~ msgstr "%s:‘%c’後面應該是整數"
+
+#~ msgid "when moving multiple files, last argument must be a directory"
+#~ msgstr "移動多個檔案時,最後的引數必須為目錄。"
+
+#, fuzzy
+#~ msgid "User name too long"
+#~ msgstr "%s:檔案過大"
+
+#~ msgid "too few arguments"
+#~ msgstr "引數過少"
+
+#~ msgid "too many arguments"
+#~ msgstr "引數過多"
+
+#, fuzzy
+#~ msgid "too many non-option arguments: %s%s"
+#~ msgstr "非選項的引數過多"
+
+#~ msgid ""
+#~ "no FILE arguments may be used with the option to output\n"
+#~ "dircolors' internal database"
+#~ msgstr "顯示 dircolors 的內部資料庫時不能加上 <檔案> 引數"
+
+#~ msgid "too many non-option arguments"
+#~ msgstr "非選項的引數過多"
+
+#~ msgid "too few non-option arguments"
+#~ msgstr "非選項的引數過少"
+
+#~ msgid "no files may be specified when using --string"
+#~ msgstr "使用選項 --string 時不能再指定檔案"
+
+#, fuzzy
+#~ msgid "wrong number of arguments"
+#~ msgstr "引數過少"
+
+#~ msgid "major and minor device numbers may not be specified for fifo files"
+#~ msgstr "不能為 fifo 檔案指定 major 和 minor 裝置編號"
+
+#, fuzzy
+#~ msgid "too many arguments\n"
+#~ msgstr "引數過多"
+
+#, fuzzy
+#~ msgid "file arguments missing"
+#~ msgstr "引數過少"
+
+#~ msgid "two strings must be given when both deleting and squeezing repeats"
+#~ msgstr "同時刪除字元和壓縮重覆字時必須指定兩個字串"
+
+#~ msgid "at least one string must be given when squeezing repeats"
+#~ msgstr "壓縮重覆字時至少要指定一個字串"
+
+#~ msgid "only one argument may be specified"
+#~ msgstr "只能指定一個引數"
+
+#~ msgid "%b %e %H:%M %Y"
+#~ msgstr "%Y-%m-%d %H:%M"
+
+#~ msgid ""
+#~ "too many arguments; When using tail's obsolescent option syntax (%s)\n"
+#~ "there may be no more than one file argument. Use the equivalent -n or -"
+#~ "c\n"
+#~ "option instead."
+#~ msgstr ""
+#~ "參數過多;當使用已過時的 tail 選項語法 (%s) 時,不可指定多於一個的檔案\n"
+#~ "參數。請使用同等的 -n 或 -c 選項。"
+
+#~ msgid ""
+#~ "Warning: it is not portable to use two or more file arguments with\n"
+#~ "tail's obsolescent option syntax (%s). Use the equivalent -n or -c\n"
+#~ "option instead."
+#~ msgstr ""
+#~ "警告:將兩個或以上的檔案配合已過時的 tail 選項語法 (%s) 不是在所有系統\n"
+#~ "都通用的。請使用同等的 -n 或 -c 選項。"
+
+#~ msgid "invalid backslash escape at end of string"
+#~ msgstr "字串末端的反斜號溢出序列無效"
+
+#~ msgid "invalid backslash escape `\\%c'"
+#~ msgstr "反斜號溢出序列‘\\%c’無效"
+
+#~ msgid ""
+#~ "invalid identity mapping; when translating, any [:lower:] or [:upper:]\n"
+#~ "construct in string1 must be aligned with a corresponding construct\n"
+#~ "([:upper:] or [:lower:], respectively) in string2"
+#~ msgstr ""
+#~ "無效的恆等映射 (identity mapping);進行置換時,對於字串 1 的任何\n"
+#~ "[:lower:]、[:upper:] 結構,在字串 2 裡都必須有一個相應的結構。\n"
+#~ "(分別為 [:upper:]、[:lower:]) "
#, fuzzy
#~ msgid "%s+%s bytes in\n"
@@ -8284,10 +8640,6 @@ msgstr ""
#~ " -c, --bytes=大小 印出最初指定 <大小> 的位元組\n"
#~ " -n, --lines=行數 印出最初指定 <行數> 而非最初 10 行\n"
-#, fuzzy
-#~ msgid "missing operand after `%s'"
-#~ msgstr "%s:‘%c’後面應該是整數"
-
#~ msgid ""
#~ "\n"
#~ "In -wNUMBER, the letter `w' may be omitted.\n"
@@ -8338,10 +8690,6 @@ msgstr ""
#~ msgstr "lstat‘.’失敗"
#, fuzzy
-#~ msgid "closing directory %s"
-#~ msgstr "無法進入%s目錄"
-
-#, fuzzy
#~ msgid "%s: remove directory %s? "
#~ msgstr "無法建立目錄%s"