.

1 files changed, 178 insertions, 164 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index cc98c4657..0a0d73278 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: textutils 2.1\n"
-"POT-Creation-Date: 2003-02-08 21:32+0100\n"
+"POT-Creation-Date: 2003-02-21 18:14+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"
@@ -37,7 +37,7 @@ msgid "stack overflow"
 msgstr "堆疊溢位"
 
 #: lib/closeout.c:103 src/cat.c:189 src/cat.c:272 src/cat.c:326
-#: src/cksum.c:267 src/head.c:152 src/head.c:196 src/tail.c:323
+#: src/cksum.c:269 src/head.c:152 src/head.c:196 src/tail.c:323
 #: src/tail.c:1659 src/tr.c:1666 src/tr.c:1912 src/tr.c:2020
 msgid "write error"
 msgstr "寫入時發生錯誤"
@@ -158,7 +158,7 @@ msgstr "區塊大小錯誤"
 msgid "cannot create directory %s"
 msgstr "無法建立目錄%s"
 
-#: lib/makepath.c:173 lib/makepath.c:415 src/cp.c:446 src/cp.c:468
+#: lib/makepath.c:173 lib/makepath.c:415 src/cp.c:444 src/cp.c:466
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s已存在但不是目錄"
@@ -178,6 +178,10 @@ msgstr "無法進入%s目錄"
 msgid "cannot change permissions of %s"
 msgstr "無法更改%s的權限"
 
+#: lib/mmap-stack.h:31 lib/mmap-stack.h:45
+msgid "warning: unable to use large stack"
+msgstr ""
+
 #: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
@@ -263,9 +267,9 @@ msgid "The strings compared were %s and %s."
 msgstr "要比較的字串為%s及%s。"
 
 #: src/basename.c:50 src/cat.c:88 src/chgrp.c:122 src/chmod.c:238
-#: src/chown.c:95 src/chroot.c:41 src/cksum.c:276 src/comm.c:69 src/cp.c:160
-#: src/csplit.c:1492 src/cut.c:170 src/date.c:113 src/dd.c:284 src/df.c:719
-#: src/dircolors.c:99 src/dirname.c:42 src/du.c:167 src/echo.c:73
+#: src/chown.c:95 src/chroot.c:41 src/cksum.c:278 src/comm.c:69 src/cp.c:158
+#: src/csplit.c:1492 src/cut.c:170 src/date.c:113 src/dd.c:284 src/df.c:711
+#: src/dircolors.c:99 src/dirname.c:42 src/du.c:174 src/echo.c:73
 #: src/env.c:115 src/expand.c:106 src/expr.c:86 src/factor.c:70 src/fmt.c:267
 #: src/fold.c:63 src/head.c:84 src/hostid.c:44 src/hostname.c:63 src/id.c:83
 #: src/install.c:593 src/join.c:140 src/kill.c:89 src/link.c:47 src/ln.c:335
@@ -274,9 +278,9 @@ msgstr "要比較的字串為%s及%s。"
 #: src/od.c:283 src/paste.c:399 src/pathchk.c:142 src/pinky.c:465
 #: src/pr.c:2750 src/printenv.c:59 src/printf.c:93 src/ptx.c:1855 src/pwd.c:42
 #: src/readlink.c:65 src/rm.c:95 src/rmdir.c:142 src/seq.c:78 src/shred.c:156
-#: src/sleep.c:59 src/sort.c:272 src/split.c:91 src/stat.c:675 src/stty.c:494
+#: src/sleep.c:59 src/sort.c:272 src/split.c:92 src/stat.c:679 src/stty.c:494
 #: src/su.c:433 src/sum.c:56 src/sync.c:40 src/tac.c:123 src/tail.c:230
-#: src/tee.c:59 src/test.c:985 src/touch.c:240 src/tr.c:323 src/tsort.c:93
+#: src/tee.c:59 src/test.c:975 src/touch.c:240 src/tr.c:323 src/tsort.c:93
 #: src/tty.c:58 src/uname.c:106 src/unexpand.c:371 src/uniq.c:135
 #: src/unlink.c:47 src/uptime.c:187 src/users.c:114 src/wc.c:121 src/who.c:570
 #: src/whoami.c:48 src/yes.c:45
@@ -301,20 +305,20 @@ msgid ""
 msgstr ""
 
 #: src/basename.c:66 src/cat.c:124 src/chgrp.c:152 src/chmod.c:264
-#: src/chown.c:139 src/chroot.c:59 src/cksum.c:291 src/comm.c:86 src/cp.c:257
-#: src/csplit.c:1534 src/cut.c:215 src/date.c:215 src/dd.c:331 src/df.c:758
-#: src/dircolors.c:120 src/dirname.c:58 src/du.c:212 src/echo.c:105
+#: src/chown.c:139 src/chroot.c:59 src/cksum.c:293 src/comm.c:86 src/cp.c:255
+#: src/csplit.c:1534 src/cut.c:215 src/date.c:215 src/dd.c:331 src/df.c:750
+#: src/dircolors.c:120 src/dirname.c:58 src/du.c:223 src/echo.c:105
 #: src/env.c:134 src/expand.c:131 src/expr.c:149 src/factor.c:90
 #: src/false.c:45 src/fmt.c:297 src/fold.c:86 src/head.c:115 src/hostid.c:57
-#: src/hostname.c:76 src/id.c:104 src/install.c:648 src/join.c:180
+#: src/hostname.c:76 src/id.c:104 src/install.c:648 src/join.c:181
 #: src/kill.c:119 src/link.c:59 src/ln.c:390 src/logname.c:55 src/ls.c:3891
 #: src/md5sum.c:157 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:361
 #: src/nice.c:77 src/nl.c:227 src/od.c:370 src/paste.c:423 src/pathchk.c:154
 #: src/pinky.c:492 src/pr.c:2862 src/printenv.c:72 src/printf.c:141
 #: src/pwd.c:53 src/readlink.c:82 src/rm.c:127 src/rmdir.c:162 src/seq.c:104
-#: src/shred.c:219 src/sleep.c:75 src/sort.c:343 src/split.c:123
-#: src/stat.c:745 src/stty.c:708 src/su.c:454 src/sum.c:76 src/sync.c:51
-#: src/tac.c:146 src/tail.c:300 src/tee.c:72 src/test.c:1067 src/touch.c:271
+#: src/shred.c:219 src/sleep.c:75 src/sort.c:343 src/split.c:124
+#: src/stat.c:750 src/stty.c:708 src/su.c:454 src/sum.c:76 src/sync.c:51
+#: src/tac.c:146 src/tail.c:300 src/tee.c:72 src/test.c:1057 src/touch.c:271
 #: src/tr.c:396 src/true.c:45 src/tsort.c:105 src/tty.c:70 src/uname.c:128
 #: src/unexpand.c:395 src/uniq.c:174 src/unlink.c:58 src/uptime.c:202
 #: src/users.c:127 src/wc.c:143 src/who.c:613 src/whoami.c:60 src/yes.c:61
@@ -330,19 +334,19 @@ msgstr ""
 #: src/chroot.c:78 src/csplit.c:1464 src/dirname.c:89 src/expr.c:178
 #: src/install.c:284 src/link.c:87 src/mkdir.c:124 src/mkfifo.c:113
 #: src/mknod.c:137 src/pathchk.c:194 src/readlink.c:101 src/readlink.c:133
-#: src/rm.c:199 src/rmdir.c:206 src/seq.c:411 src/sleep.c:150 src/stat.c:796
+#: src/rm.c:199 src/rmdir.c:206 src/seq.c:411 src/sleep.c:150 src/stat.c:801
 #: src/unlink.c:88
 msgid "too few arguments"
 msgstr "引數過少"
 
 #: src/basename.c:115 src/dircolors.c:482 src/dirname.c:90 src/hostid.c:79
 #: src/hostname.c:122 src/link.c:93 src/mknod.c:139 src/readlink.c:141
-#: src/seq.c:417 src/split.c:503 src/tr.c:1848 src/unlink.c:94
+#: src/seq.c:417 src/split.c:502 src/tr.c:1848 src/unlink.c:94
 #: src/uptime.c:244 src/users.c:169 src/who.c:764
 msgid "too many arguments"
 msgstr "引數過多"
 
-#: src/cat.c:42 src/split.c:42
+#: src/cat.c:42 src/split.c:43
 msgid "Torbjorn Granlund and Richard M. Stallman"
 msgstr "Torbjorn Granlund 及 Richard M. Stallman"
 
@@ -491,7 +495,7 @@ msgstr ""
 "  -v, --verbose          處理任何檔案都會顯示訊息\n"
 
 #: src/chgrp.c:218 src/chmod.c:157 src/chmod.c:365 src/chown-core.c:235
-#: src/chown-core.c:247 src/chown.c:220 src/cp.c:303 src/touch.c:169
+#: src/chown-core.c:247 src/chown.c:220 src/cp.c:301 src/touch.c:169
 #: src/touch.c:363
 #, c-format
 msgid "failed to get attributes of %s"
@@ -722,7 +726,7 @@ msgstr "無法進入%s目錄"
 msgid "%s: file too long"
 msgstr "%s：檔案過大"
 
-#: src/cksum.c:280
+#: src/cksum.c:282
 #, c-format
 msgid ""
 "Usage: %s [FILE]...\n"
@@ -731,7 +735,7 @@ msgstr ""
 "用法：%s [檔案]...\n"
 "  或：%s [選項]\n"
 
-#: src/cksum.c:285
+#: src/cksum.c:287
 msgid ""
 "Print CRC checksum and byte counts of each FILE.\n"
 "\n"
@@ -762,7 +766,7 @@ msgstr ""
 "  -2              不顯示任何一行只在 RIGHT_FILE 出現過的資料\n"
 "  -3              不顯示兩個檔案中同時出現的任何一行\n"
 
-#: src/copy.c:162 src/du.c:334
+#: src/copy.c:162 src/du.c:335
 #, c-format
 msgid "cannot access %s"
 msgstr "無法存取%s"
@@ -823,7 +827,7 @@ msgstr "%s：是否覆寫%s，而不理會權限模式 %04lo? "
 msgid "%s: overwrite %s? "
 msgstr "%s：是否覆寫%s? "
 
-#: src/copy.c:810 src/copy.c:848 src/stat.c:633
+#: src/copy.c:810 src/copy.c:848 src/stat.c:637
 #, fuzzy, c-format
 msgid "cannot stat %s"
 msgstr "無法建立目錄%s"
@@ -958,7 +962,7 @@ msgstr "符號連結"
 msgid "cannot create symbolic link %s"
 msgstr "無法建立目錄%s"
 
-#: src/copy.c:1438 src/copy.c:1501 src/cp.c:339
+#: src/copy.c:1438 src/copy.c:1501 src/cp.c:337
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "無法保留%s的擁有者及所屬群組"
@@ -993,12 +997,12 @@ msgstr "無法將%s的備份還原"
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s→%s (還原備份)\n"
 
-#: src/cp.c:53
+#: src/cp.c:54
 #, fuzzy
 msgid "Torbjorn Granlund, David MacKenzie, and Jim Meyering"
 msgstr "David Ihnat、David MacKenzie 及 Jim Meyering"
 
-#: src/cp.c:164 src/mv.c:311
+#: src/cp.c:162 src/mv.c:311
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... SOURCE DEST\n"
@@ -1009,7 +1013,7 @@ msgstr ""
 "  或：%s [選項]... 來源... 目錄\n"
 "  或：%s [選項]... --target-directory=目錄 來源...\n"
 
-#: src/cp.c:170
+#: src/cp.c:168
 msgid ""
 "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 "\n"
@@ -1017,18 +1021,18 @@ msgstr ""
 "將 <來源> 檔案複製至 <目的地>，或將多個 <檔案> 複製至指定 <目錄>。\n"
 "\n"
 
-#: src/cp.c:174 src/csplit.c:1505 src/cut.c:182 src/df.c:729 src/du.c:176
+#: src/cp.c:172 src/csplit.c:1505 src/cut.c:182 src/df.c:721 src/du.c:183
 #: src/expand.c:119 src/fmt.c:277 src/fold.c:76 src/head.c:98
 #: src/install.c:609 src/kill.c:103 src/ln.c:354 src/ls.c:3767 src/mkdir.c:66
 #: src/mkfifo.c:60 src/mknod.c:61 src/mv.c:321 src/nl.c:185 src/paste.c:413
-#: src/pr.c:2763 src/ptx.c:1867 src/shred.c:166 src/sort.c:286 src/split.c:104
+#: src/pr.c:2763 src/ptx.c:1867 src/shred.c:166 src/sort.c:286 src/split.c:105
 #: src/tac.c:136 src/tail.c:244 src/touch.c:249 src/unexpand.c:384
 #: src/uniq.c:148
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "長選項必須用的引數在使用短選項時也是必須的。\n"
 
-#: src/cp.c:177
+#: src/cp.c:175
 msgid ""
 "  -a, --archive                same as -dpR\n"
 "      --backup[=CONTROL]       make a backup of each existing destination "
@@ -1045,7 +1049,7 @@ msgstr ""
 "      --copy-contents          當使用遞迴模式時複製特殊檔案的內容\n"
 "  -d                           等於 --no-dereference --preserve=link\n"
 
-#: src/cp.c:184
+#: src/cp.c:182
 msgid ""
 "      --no-dereference         never follow symbolic links\n"
 "  -f, --force                  if an existing destination file cannot be\n"
@@ -1059,7 +1063,7 @@ msgstr ""
 "  -i, --interactive            覆寫檔案前需要確認\n"
 "  -H                           使用指令列中的符號鏈結指示的真正目的地\n"
 
-#: src/cp.c:191
+#: src/cp.c:189
 msgid ""
 "  -l, --link                   link files instead of copying\n"
 "  -L, --dereference            always follow symbolic links\n"
@@ -1075,7 +1079,7 @@ msgstr ""
 "                                 (預設值為：mode,ownership,timestamps)\n"
 "                                 額外的屬性有：links、all\n"
 
-#: src/cp.c:199
+#: src/cp.c:197
 msgid ""
 "      --no-preserve=ATTR_LIST  don't preserve the specified attributes\n"
 "      --parents                append source path to DIRECTORY\n"
@@ -1085,7 +1089,7 @@ msgstr ""
 "      --parents                複製前先在 <目錄> 建立來源路徑中的所有目錄\n"
 "  -P                           等於‘--no-dereference’\n"
 
-#: src/cp.c:204
+#: src/cp.c:202
 msgid ""
 "  -R, -r, --recursive          copy directories recursively\n"
 "      --remove-destination     remove each existing destination file before\n"
@@ -1096,7 +1100,7 @@ msgstr ""
 "      --remove-destination     嘗試開啟目的地檔案前先移除已存在的目的地\n"
 "                               檔案 (與 --force 選項作對比)\n"
 
-#: src/cp.c:209
+#: src/cp.c:207
 msgid ""
 "      --reply={yes,no,query}   specify how to handle the prompt about an\n"
 "                                 existing destination file\n"
@@ -1108,7 +1112,7 @@ msgstr ""
 "      --sparse=WHEN            控制建立 sparse 檔案的方式\n"
 "      --strip-trailing-slashes 移除引數中所有 <來源> 檔案/目錄末端的斜號\n"
 
-#: src/cp.c:216
+#: src/cp.c:214
 msgid ""
 "  -s, --symbolic-link          make symbolic links instead of copying\n"
 "  -S, --suffix=SUFFIX          override the usual backup suffix\n"
@@ -1119,7 +1123,7 @@ msgstr ""
 "  -S, --suffix=後置字串        自行指定備份檔的 <後置字串>\n"
 "      --target-directory=目錄  將所有 <來源> 檔案/目錄複製至指定的 <目錄>\n"
 
-#: src/cp.c:221
+#: src/cp.c:219
 msgid ""
 "  -u, --update                 copy only when the SOURCE file is newer\n"
 "                                 than the destination file or when the\n"
@@ -1132,7 +1136,7 @@ msgstr ""
 "  -v, --verbose                詳細顯示進行的步驟\n"
 "  -x, --one-file-system        不會跨越檔案系統進行操作\n"
 
-#: src/cp.c:230
+#: src/cp.c:228
 msgid ""
 "\n"
 "By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -1151,7 +1155,7 @@ msgstr ""
 "使用 --sparse=never 會禁止產生 sparse 檔案。\n"
 "\n"
 
-#: src/cp.c:239
+#: src/cp.c:237
 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 "
@@ -1164,7 +1168,7 @@ msgstr ""
 "變數來選擇。以下是可用的變數值：\n"
 "\n"
 
-#: src/cp.c:245 src/install.c:642 src/ln.c:384 src/mv.c:355
+#: src/cp.c:243 src/install.c:642 src/ln.c:384 src/mv.c:355
 msgid ""
 "  none, off       never make backups (even if --backup is given)\n"
 "  numbered, t     make numbered backups\n"
@@ -1176,7 +1180,7 @@ msgstr ""
 "  existing, nil   若有數字的備份檔已經存在則使用數字，否則使用普通方式備份\n"
 "  simple, never   永遠使用普通方式備份\n"
 
-#: src/cp.c:251
+#: src/cp.c:249
 msgid ""
 "\n"
 "As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -1187,51 +1191,51 @@ msgstr ""
 "有一個特別情況：如果同時指定 --force 和 --backup 選項，而且 <來源> 和\n"
 "<目的地> 是同一個已存在的普通檔案的話，cp 會將 <來源> 檔案備份。\n"
 
-#: src/cp.c:325
+#: src/cp.c:323
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "無法保留%s的時間"
 
-#: src/cp.c:349
+#: src/cp.c:347
 #, fuzzy, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "無法更改%s的權限"
 
-#: src/cp.c:434
+#: src/cp.c:432
 #, fuzzy, c-format
 msgid "cannot make directory %s"
 msgstr "無法建立目錄%s"
 
-#: src/cp.c:493 src/ln.c:490 src/mv.c:459 src/shred.c:1599
+#: src/cp.c:491 src/ln.c:490 src/mv.c:459 src/shred.c:1599
 #, fuzzy
 msgid "missing file argument"
 msgstr "略過引數"
 
-#: src/cp.c:498
+#: src/cp.c:496
 #, fuzzy
 msgid "missing destination file"
 msgstr "缺少了欄位數值"
 
-#: src/cp.c:523 src/ln.c:161 src/ln.c:183 src/ln.c:210 src/ln.c:297
+#: src/cp.c:521 src/ln.c:161 src/ln.c:183 src/ln.c:210 src/ln.c:297
 #, c-format
 msgid "accessing %s"
 msgstr "正在存取%s"
 
-#: src/cp.c:546
+#: src/cp.c:544
 #, fuzzy, c-format
 msgid "%s: specified target is not a directory"
 msgstr "%s已存在但不是目錄"
 
-#: src/cp.c:554
+#: src/cp.c:552
 #, c-format
 msgid "copying multiple files, but last argument %s is not a directory"
 msgstr "複製多個檔案，但最後的引數%s並非目錄。"
 
-#: src/cp.c:652
+#: src/cp.c:650
 msgid "when preserving paths, the destination must be a directory"
 msgstr "當保留路徑時，目的地必須是目錄"
 
-#: src/cp.c:878 src/install.c:219 src/ln.c:434 src/mv.c:405
+#: src/cp.c:895 src/install.c:219 src/ln.c:434 src/mv.c:405
 #, c-format
 msgid ""
 "warning: --version-control (-V) is obsolete;  support for it\n"
@@ -1240,16 +1244,16 @@ msgstr ""
 "警告：--version-control (-V) 選項已經過時；將來的版本隨時可能不再支援\n"
 "此選項。請使用 --backup=%s。"
 
-#: src/cp.c:972 src/ln.c:464
+#: src/cp.c:989 src/ln.c:464
 #, fuzzy
 msgid "symbolic links are not supported on this system"
 msgstr "警告：此系統不支援 --pid=PID 選項"
 
-#: src/cp.c:1008
+#: src/cp.c:1025
 msgid "cannot make both hard and symbolic links"
 msgstr "無法同時建立實際及符號鏈結"
 
-#: src/cp.c:1016 src/install.c:275 src/ln.c:530 src/mv.c:483
+#: src/cp.c:1033 src/install.c:275 src/ln.c:530 src/mv.c:483
 msgid "backup type"
 msgstr "備份方式"
 
@@ -1441,7 +1445,7 @@ msgstr ""
 msgid "David Ihnat, David MacKenzie, and Jim Meyering"
 msgstr "David Ihnat、David MacKenzie 及 Jim Meyering"
 
-#: src/cut.c:174 src/df.c:723 src/du.c:171 src/expand.c:110 src/fold.c:67
+#: src/cut.c:174 src/df.c:715 src/du.c:178 src/expand.c:110 src/fold.c:67
 #: src/head.c:88 src/ls.c:3761 src/nl.c:176 src/paste.c:403 src/pr.c:2754
 #: src/sort.c:276 src/sum.c:60 src/tac.c:127 src/tail.c:234 src/tee.c:63
 #: src/unexpand.c:375 src/wc.c:125
@@ -1904,44 +1908,44 @@ msgstr "略過輸出檔%2$s的最初 %1$s 個位元組"
 msgid "Torbjorn Granlund, David MacKenzie, Larry McVoy, and Paul Eggert"
 msgstr "David Ihnat、David MacKenzie 及 Jim Meyering"
 
-#: src/df.c:152
-msgid "Filesystem "
-msgstr "檔案系統   "
-
-#: src/df.c:155
+#: src/df.c:151
 msgid "   Type"
 msgstr "   類型"
 
-#: src/df.c:160
+#: src/df.c:153
+msgid "Filesystem "
+msgstr "檔案系統   "
+
+#: src/df.c:163
 #, c-format
 msgid "    Inodes   IUsed   IFree IUse%%"
 msgstr "     Inode (I)已用 (I)可用 (I)已用%%"
 
-#: src/df.c:164
+#: src/df.c:167
 #, c-format
 msgid "    Size  Used Avail Use%%"
 msgstr "    容量  已用 可用 已用%%"
 
-#: src/df.c:166
+#: src/df.c:169
 #, c-format
 msgid "     Size   Used  Avail Use%%"
 msgstr "     容量   已用  可用 已用%%"
 
-#: src/df.c:169
+#: src/df.c:172
 #, fuzzy, c-format
 msgid " %4s-blocks      Used Available Capacity"
 msgstr "   %4d-區段      已用      可用 容量"
 
-#: src/df.c:200
+#: src/df.c:203
 #, c-format
 msgid " %4s-blocks      Used Available Use%%"
 msgstr "   %4s-區段      已用     可用 已用%%"
 
-#: src/df.c:204
+#: src/df.c:207
 msgid " Mounted on\n"
 msgstr " 掛載點\n"
 
-#: src/df.c:724
+#: src/df.c:716
 msgid ""
 "Show information about the filesystem on which each FILE resides,\n"
 "or all filesystems by default.\n"
@@ -1950,7 +1954,7 @@ msgstr ""
 "顯示每個 <檔案> 所在的檔案系統的資訊，預設是顯示所有檔案系統。\n"
 "\n"
 
-#: src/df.c:732
+#: src/df.c:724
 msgid ""
 "  -a, --all             include filesystems having 0 blocks\n"
 "  -B, --block-size=SIZE use SIZE-byte blocks\n"
@@ -1963,7 +1967,7 @@ msgstr ""
 "  -h, --human-readable  以容易理解的格式印出檔案系統大小 (例如 1K 234M 2G)\n"
 "  -H, --si              類似 -h，但取 1000 的次方而不是 1024\n"
 
-#: src/df.c:738
+#: src/df.c:730
 msgid ""
 "  -i, --inodes          list inode information instead of block usage\n"
 "  -k                    like --block-size=1K\n"
@@ -1976,7 +1980,7 @@ msgstr ""
 "  -l, --local           只顯示本機的檔案系統\n"
 "      --no-sync         取得使用量資料前不進行 sync 動作 (預設)\n"
 
-#: src/df.c:744
+#: src/df.c:736
 msgid ""
 "  -P, --portability     use the POSIX output format\n"
 "      --sync            invoke sync before getting usage info\n"
@@ -1992,7 +1996,7 @@ msgstr ""
 "  -x, --exclude-type=類型   只印出不是指定 <類型> 的檔案系統資訊\n"
 "  -v                    (此選項不作處理)\n"
 
-#: src/df.c:754 src/du.c:208 src/ls.c:3879
+#: src/df.c:746 src/du.c:219 src/ls.c:3879
 msgid ""
 "\n"
 "SIZE may be (or may be an integer optionally followed by) one of following:\n"
@@ -2002,16 +2006,16 @@ msgstr ""
 "<大小> 可以是以下的單位 (單位前可加上整數)：\n"
 "kB=1000，K=1024，MB=1000000，M=1048576，還有 G、T、P、E、Z、Y 如此類推。\n"
 
-#: src/df.c:871
+#: src/df.c:863
 #, c-format
 msgid "file system type %s both selected and excluded"
 msgstr "不能同時選擇和排除檔案系統類型%s"
 
-#: src/df.c:915
+#: src/df.c:907
 msgid "Warning: "
 msgstr "警告："
 
-#: src/df.c:918
+#: src/df.c:910
 #, c-format
 msgid "%scannot read table of mounted filesystems"
 msgstr "%s無法讀取已掛上的檔案系統的名單"
@@ -2102,14 +2106,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/du.c:49
+#: src/du.c:50
 #, fuzzy
 msgid ""
 "Torbjorn Granlund, David MacKenzie, Larry McVoy, Paul Eggert, and Jim "
 "Meyering"
 msgstr "David Ihnat、David MacKenzie 及 Jim Meyering"
 
-#: src/du.c:172
+#: src/du.c:179
 msgid ""
 "Summarize disk usage of each FILE, recursively for directories.\n"
 "\n"
@@ -2117,12 +2121,17 @@ msgstr ""
 "總結每個 <檔案> 的磁碟用量，目錄則取總用量。\n"
 "\n"
 
-#: src/du.c:179
+#: src/du.c:186
 #, fuzzy
 msgid ""
 "  -a, --all             write counts for all files, not just directories\n"
+"      --apparent-size   print apparent sizes, rather than disk usage; "
+"although\n"
+"                          the apparent size is usually smaller, it may be\n"
+"                          larger due to holes in (`sparse') files, internal\n"
+"                          fragmentation, indirect blocks, and the like\n"
 "  -B, --block-size=SIZE use SIZE-byte blocks\n"
-"  -b, --bytes           print size in bytes\n"
+"  -b, --bytes           equivalent to `--apparent-size --block-size=1'\n"
 "  -c, --total           produce a grand total\n"
 "  -D, --dereference-args  dereference FILEs that are symbolic links\n"
 msgstr ""
@@ -2132,7 +2141,7 @@ msgstr ""
 "  -c, --total           印出所有項目相加後的總用量\n"
 "  -D, --dereference-args  只找出指令列中的符號鏈結指示的真正目的地\n"
 
-#: src/du.c:186
+#: src/du.c:197
 msgid ""
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
@@ -2145,7 +2154,7 @@ msgstr ""
 "  -k                    即 --block-size=1K\n"
 "  -l, --count-links     連實際鏈結 (hard link) 的大小也計算在內\n"
 
-#: src/du.c:192
+#: src/du.c:203
 msgid ""
 "  -L, --dereference     dereference all symbolic links\n"
 "  -S, --separate-dirs   do not include size of subdirectories\n"
@@ -2155,7 +2164,7 @@ msgstr ""
 "  -S, --separate-dirs   不包括副目錄的佔用量\n"
 "  -s, --summarize       只分別計算指令列中每個引數所佔的總用量\n"
 
-#: src/du.c:197
+#: src/du.c:208
 msgid ""
 "  -x, --one-file-system  skip directories on different filesystems\n"
 "  -X FILE, --exclude-from=FILE  Exclude files that match any pattern in "
@@ -2174,39 +2183,39 @@ msgstr ""
 "                        (若使用 --all 選項，也會顯示檔案的佔用量)；\n"
 "                        --max-depth=0 的效果等於 --summarize\n"
 
-#: src/du.c:339
+#: src/du.c:340
 #, fuzzy, c-format
 msgid "cannot change to parent of directory %s"
 msgstr "無法進入%s目錄"
 
-#: src/du.c:347
+#: src/du.c:348
 #, fuzzy, c-format
 msgid "cannot change to directory %s"
 msgstr "無法進入%s目錄"
 
-#: src/du.c:354
+#: src/du.c:355
 #, fuzzy, c-format
 msgid "cannot read directory %s"
 msgstr "無法建立目錄%s"
 
-#: src/du.c:545 src/ls.c:2241 src/wc.c:591
+#: src/du.c:546 src/ls.c:2241 src/wc.c:591
 msgid "total"
 msgstr "總計"
 
-#: src/du.c:627
+#: src/du.c:633
 #, fuzzy, c-format
 msgid "invalid maximum depth %s"
 msgstr "無效的寬度：‘%s’"
 
-#: src/du.c:693
+#: src/du.c:699
 msgid "cannot both summarize and show all entries"
 msgstr "不能只顯示總用量，同時又顯示每個項目"
 
-#: src/du.c:700
+#: src/du.c:706
 msgid "warning: summarizing is the same as using --max-depth=0"
 msgstr "警告：顯示總用量等於使用 --max-depth=0"
 
-#: src/du.c:706
+#: src/du.c:712
 #, c-format
 msgid "warning: summarizing conflicts with --max-depth=%d"
 msgstr "警告：顯示總用量的選項和 --max-depth=%d 互相抵觸"
@@ -2554,7 +2563,7 @@ msgstr ""
 "  -q, --quiet, --silent    絕不顯示含有檔案名稱的標頭\n"
 "  -v, --verbose            一定顯示含有檔案名稱的標頭\n"
 
-#: src/head.c:111 src/split.c:119
+#: src/head.c:111 src/split.c:120
 msgid ""
 "\n"
 "SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n"
@@ -2840,12 +2849,14 @@ msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "用法：%s [選項]... 檔案1 檔案2\n"
 
 #: src/join.c:148
+#, fuzzy
 msgid ""
 "For each pair of input lines with identical join fields, write a line to\n"
 "standard output.  The default join field is the first, delimited\n"
 "by whitespace.  When FILE1 or FILE2 (not both) is -, read standard input.\n"
 "\n"
-"  -a SIDE           print unpairable lines coming from file SIDE\n"
+"  -a FILENUM        print unpairable lines coming from file FILENUM, where\n"
+"                      FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n"
 "  -e EMPTY          replace missing input fields with EMPTY\n"
 msgstr ""
 "當兩個檔案指定要合併的欄位相同時，並在標準輸出顯示結果。預設的合併欄位是\n"
@@ -2855,7 +2866,7 @@ msgstr ""
 "  -a SIDE           當某行遇到無法配對的欄位時，取其中一個檔案印出該行\n"
 "  -e 字串           當缺少輸入欄位時，以 <字串> 代替\n"
 
-#: src/join.c:156
+#: src/join.c:157
 msgid ""
 "  -i, --ignore-case ignore differences in case when comparing fields\n"
 "  -j FIELD          (obsolescent) equivalent to `-1 FIELD -2 FIELD'\n"
@@ -2871,9 +2882,10 @@ msgstr ""
 "  -o 格式           當輸出時遵從指定 <格式>\n"
 "  -t 字元           以 <字元> 作為輸入和輸出的欄位分隔符號\n"
 
-#: src/join.c:164
+#: src/join.c:165
+#, fuzzy
 msgid ""
-"  -v SIDE           like -a SIDE, but suppress joined output lines\n"
+"  -v FILENUM        like -a FILENUM, but suppress joined output lines\n"
 "  -1 FIELD          join on this FIELD of file 1\n"
 "  -2 FIELD          join on this FIELD of file 2\n"
 msgstr ""
@@ -2881,13 +2893,14 @@ msgstr ""
 "  -1 欄位           以檔案 1 的指定 <欄位> 來合併\n"
 "  -2 欄位           以檔案 2 的指定 <欄位> 來合併\n"
 
-#: src/join.c:171
+#: src/join.c:172
+#, fuzzy
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
 "else fields are separated by CHAR.  Any FIELD is a field number counted\n"
 "from 1.  FORMAT is one or more comma or blank separated specifications,\n"
-"each being `SIDE.FIELD' or `0'.  Default FORMAT outputs the join field,\n"
+"each being `FILENUM.FIELD' or `0'.  Default FORMAT outputs the join field,\n"
 "the remaining fields from FILE1, the remaining fields from FILE2, all\n"
 "separated by CHAR.\n"
 msgstr ""
@@ -2898,40 +2911,40 @@ msgstr ""
 "的索引，然後是 <檔案1>的其它欄位，最後是 <檔案2> 的其它欄位，全部皆以\n"
 "<字元> 來分隔。\n"
 
-#: src/join.c:644
+#: src/join.c:645
 #, c-format
 msgid "invalid field specifier: `%s'"
 msgstr "無效的欄位規格：‘%s’"
 
-#: src/join.c:658 src/join.c:771 src/join.c:807
+#: src/join.c:659 src/join.c:772 src/join.c:808
 #, c-format
 msgid "invalid field number: `%s'"
 msgstr "無效的欄位號碼：‘%s’"
 
-#: src/join.c:671
+#: src/join.c:672
 #, c-format
 msgid "invalid file number in field spec: `%s'"
 msgstr "欄位規格中含有無效的檔案編號：‘%s’"
 
-#: src/join.c:791
+#: src/join.c:792
 #, c-format
 msgid "invalid field number for file 1: `%s'"
 msgstr "檔案 1 的欄位號碼是無效的：‘%s’"
 
-#: src/join.c:800
+#: src/join.c:801
 #, c-format
 msgid "invalid field number for file 2: `%s'"
 msgstr "檔案 2 的欄位號碼是無效的：‘%s’"
 
-#: src/join.c:832
+#: src/join.c:833
 msgid "too many non-option arguments"
 msgstr "非選項的引數過多"
 
-#: src/join.c:854
+#: src/join.c:855
 msgid "too few non-option arguments"
 msgstr "非選項的引數過少"
 
-#: src/join.c:865
+#: src/join.c:866
 msgid "both files cannot be standard input"
 msgstr "兩個檔案不能都是標準輸入"
 
@@ -5600,12 +5613,12 @@ msgstr "分隔欄位字元‘%s’多於一個字元"
 msgid "extra operand `%s' not allowed with -c"
 msgstr "使用 -c 時不允許指定額外的參數‘%s’"
 
-#: src/split.c:95
+#: src/split.c:96
 #, c-format
 msgid "Usage: %s [OPTION] [INPUT [PREFIX]]\n"
 msgstr "用法：%s [選項] [輸入 [前置字串]]\n"
 
-#: src/split.c:99
+#: src/split.c:100
 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"
@@ -5616,7 +5629,7 @@ msgstr ""
 "或 <輸入> 是 -，則由標準輸入讀入資料。\n"
 "\n"
 
-#: src/split.c:107
+#: src/split.c:108
 #, c-format
 msgid ""
 "  -a, --suffix-length=N   use suffixes of length N (default %d)\n"
@@ -5630,46 +5643,46 @@ msgstr ""
 "                          超出指定位元組數目\n"
 "  -l, --lines=行數        每個輸出檔放入指定 <行數> 的資料\n"
 
-#: src/split.c:113
+#: src/split.c:114
 msgid ""
 "      --verbose           print a diagnostic to standard error just\n"
 "                            before each output file is opened\n"
 msgstr "      --verbose           開啟每個輸出檔之前都在標準錯誤輸出顯示訊息\n"
 
-#: src/split.c:170
+#: src/split.c:171
 msgid "Output file suffixes exhausted"
 msgstr "輸出檔的後置字串已用盡"
 
-#: src/split.c:188
+#: src/split.c:189
 #, c-format
 msgid "creating file `%s'\n"
 msgstr "正在建立檔案‘%s’\n"
 
-#: src/split.c:342
+#: src/split.c:341
 msgid "cannot split in more than one way"
 msgstr "不能用超過一種方式進行分割"
 
-#: src/split.c:395
+#: src/split.c:394
 #, c-format
 msgid "%s: invalid suffix length"
 msgstr "%s：無效的後置字串長度"
 
-#: src/split.c:409 src/split.c:435
+#: src/split.c:408 src/split.c:434
 #, c-format
 msgid "%s: invalid number of bytes"
 msgstr "%s：無效的位元組數目"
 
-#: src/split.c:422
+#: src/split.c:421
 #, c-format
 msgid "%s: invalid number of lines"
 msgstr "%s：無效的行數"
 
-#: src/split.c:475
+#: src/split.c:474
 #, c-format
 msgid "`-%d' option is obsolete; use `-l %d'"
 msgstr "‘-%d’選項已過時；請使用‘-l %d’"
 
-#: src/split.c:488
+#: src/split.c:487
 msgid "invalid number"
 msgstr "無效的數字"
 
@@ -5678,19 +5691,19 @@ msgstr "無效的數字"
 msgid "*** invalid date/time ***"
 msgstr "無效的寬度：‘%s’"
 
-#: src/stat.c:603
+#: src/stat.c:607
 #, fuzzy, c-format
 msgid "cannot read file system information for %s"
 msgstr "無法將 %s 的檔案指標重新定位"
 
-#: src/stat.c:679
+#: src/stat.c:683
 #, 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:680
+#: src/stat.c:684
 msgid ""
 "Display file or filesystem status.\n"
 "\n"
@@ -5706,7 +5719,7 @@ msgstr ""
 "  -L, --dereference     讀取鏈結本身的資訊，而非鏈結指示的目標檔案/目錄\n"
 "  -t, --terse           只顯示簡略的資訊\n"
 
-#: src/stat.c:691
+#: src/stat.c:695
 #, fuzzy
 msgid ""
 "\n"
@@ -5714,7 +5727,8 @@ msgid ""
 "\n"
 "  %A   Access rights in human readable form\n"
 "  %a   Access rights in octal\n"
-"  %b   Number of blocks allocated\n"
+"  %B   The size in bytes of each block reported by `%b'\n"
+"  %b   Number of blocks allocated (see %B)\n"
 msgstr ""
 "\n"
 "適用於擷取檔案資訊 (即是不使用 --filesystem 選項) 的格式：\n"
@@ -5723,7 +5737,7 @@ msgstr ""
 "  %a - 以八進位數字方式表示存取權限\n"
 "  %b - 佔用的磁碟區段數目\n"
 
-#: src/stat.c:698
+#: src/stat.c:703
 #, fuzzy
 msgid ""
 "  %D   Device number in hex\n"
@@ -5740,7 +5754,7 @@ msgstr ""
 "  %G - 所屬群組的名稱\n"
 "  %g - 所屬群組的號碼\n"
 
-#: src/stat.c:706
+#: src/stat.c:711
 #, fuzzy
 msgid ""
 "  %h   Number of hard links\n"
@@ -5761,7 +5775,7 @@ msgstr ""
 "  %T - 特殊檔案或裝置檔案的十六進位 minor 號碼\n"
 "  %t - 特殊檔案或裝置檔案的十六進位 major 號碼\n"
 
-#: src/stat.c:716
+#: src/stat.c:721
 #, fuzzy
 msgid ""
 "  %U   User name of owner\n"
@@ -5783,7 +5797,7 @@ msgstr ""
 "  %Z - 由 Epoch 時間至最後更改 inode 資訊的時間之間經過的秒數\n"
 "  %z - 最後更改 inode 資訊的時間\n"
 
-#: src/stat.c:728
+#: src/stat.c:733
 #, fuzzy
 msgid ""
 "Valid format sequences for file systems:\n"
@@ -5802,7 +5816,7 @@ msgstr ""
 "  %d - 檔案系統剩餘可用的最大檔案數目\n"
 "  %f - 檔案系統的剩餘空間\n"
 
-#: src/stat.c:737
+#: src/stat.c:742
 #, fuzzy
 msgid ""
 "  %i   File System id in hex\n"
@@ -6533,104 +6547,104 @@ msgid ""
 "  -i, --ignore-interrupts   ignore interrupt signals\n"
 msgstr ""
 
-#: src/test.c:226
+#: src/test.c:216
 msgid "argument expected\n"
 msgstr ""
 
-#: src/test.c:234
+#: src/test.c:224
 #, c-format
 msgid "integer expression expected %s\n"
 msgstr ""
 
-#: src/test.c:352
+#: src/test.c:342
 msgid "')' expected\n"
 msgstr ""
 
-#: src/test.c:355
+#: src/test.c:345
 #, c-format
 msgid "')' expected, found %s\n"
 msgstr ""
 
-#: src/test.c:371 src/test.c:904
+#: src/test.c:361 src/test.c:894
 #, c-format
 msgid "%s: unary operator expected\n"
 msgstr ""
 
-#: src/test.c:399 src/test.c:930
+#: src/test.c:389 src/test.c:920
 #, c-format
 msgid "%s: binary operator expected\n"
 msgstr ""
 
-#: src/test.c:434
+#: src/test.c:424
 msgid "before -lt"
 msgstr ""
 
-#: src/test.c:442
+#: src/test.c:432
 msgid "after -lt"
 msgstr ""
 
-#: src/test.c:456
+#: src/test.c:446
 msgid "before -le"
 msgstr ""
 
-#: src/test.c:463
+#: src/test.c:453
 msgid "after -le"
 msgstr ""
 
-#: src/test.c:479
+#: src/test.c:469
 msgid "before -gt"
 msgstr ""
 
-#: src/test.c:486
+#: src/test.c:476
 msgid "after -gt"
 msgstr ""
 
-#: src/test.c:500
+#: src/test.c:490
 msgid "before -ge"
 msgstr ""
 
-#: src/test.c:507
+#: src/test.c:497
 msgid "after -ge"
 msgstr ""
 
-#: src/test.c:522
+#: src/test.c:512
 msgid "-nt does not accept -l\n"
 msgstr ""
 
-#: src/test.c:536
+#: src/test.c:526
 msgid "before -ne"
 msgstr ""
 
-#: src/test.c:543
+#: src/test.c:533
 msgid "after -ne"
 msgstr ""
 
-#: src/test.c:559
+#: src/test.c:549
 msgid "before -eq"
 msgstr ""
 
-#: src/test.c:566
+#: src/test.c:556
 msgid "after -eq"
 msgstr ""
 
-#: src/test.c:577
+#: src/test.c:567
 msgid "-ef does not accept -l\n"
 msgstr ""
 
-#: src/test.c:596
+#: src/test.c:586
 msgid "-ot does not accept -l\n"
 msgstr ""
 
-#: src/test.c:603
+#: src/test.c:593
 #, fuzzy
 msgid "unknown binary operator"
 msgstr "不明的系統錯誤"
 
-#: src/test.c:791
+#: src/test.c:781
 msgid "after -t"
 msgstr ""
 
-#: src/test.c:989
+#: src/test.c:979
 #, fuzzy, c-format
 msgid ""
 "Usage: %s EXPRESSION\n"
@@ -6640,19 +6654,19 @@ msgstr ""
 "用法：%s [檔案]...\n"
 "  或：%s [選項]\n"
 
-#: src/test.c:995
+#: src/test.c:985
 msgid ""
 "Exit with the status determined by EXPRESSION.\n"
 "\n"
 msgstr ""
 
-#: src/test.c:1001
+#: src/test.c:991
 msgid ""
 "\n"
 "EXPRESSION is true or false and sets exit status.  It is one of:\n"
 msgstr ""
 
-#: src/test.c:1005
+#: src/test.c:995
 msgid ""
 "\n"
 "  ( EXPRESSION )               EXPRESSION is true\n"
@@ -6661,7 +6675,7 @@ msgid ""
 "  EXPRESSION1 -o EXPRESSION2   either EXPRESSION1 or EXPRESSION2 is true\n"
 msgstr ""
 
-#: src/test.c:1012
+#: src/test.c:1002
 msgid ""
 "\n"
 "  [-n] STRING          the length of STRING is nonzero\n"
@@ -6670,7 +6684,7 @@ msgid ""
 "  STRING1 != STRING2   the strings are not equal\n"
 msgstr ""
 
-#: src/test.c:1019
+#: src/test.c:1009
 msgid ""
 "\n"
 "  INTEGER1 -eq INTEGER2   INTEGER1 is equal to INTEGER2\n"
@@ -6681,7 +6695,7 @@ msgid ""
 "  INTEGER1 -ne INTEGER2   INTEGER1 is not equal to INTEGER2\n"
 msgstr ""
 
-#: src/test.c:1028
+#: src/test.c:1018
 msgid ""
 "\n"
 "  FILE1 -ef FILE2   FILE1 and FILE2 have the same device and inode numbers\n"
@@ -6689,7 +6703,7 @@ msgid ""
 "  FILE1 -ot FILE2   FILE1 is older than FILE2\n"
 msgstr ""
 
-#: src/test.c:1034
+#: src/test.c:1024
 msgid ""
 "\n"
 "  -b FILE     FILE exists and is block special\n"
@@ -6698,7 +6712,7 @@ msgid ""
 "  -e FILE     FILE exists\n"
 msgstr ""
 
-#: src/test.c:1041
+#: src/test.c:1031
 msgid ""
 "  -f FILE     FILE exists and is a regular file\n"
 "  -g FILE     FILE exists and is set-group-ID\n"
@@ -6707,7 +6721,7 @@ msgid ""
 "  -k FILE     FILE exists and has its sticky bit set\n"
 msgstr ""
 
-#: src/test.c:1048
+#: src/test.c:1038
 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"
@@ -6716,7 +6730,7 @@ msgid ""
 "  -s FILE     FILE exists and has a size greater than zero\n"
 msgstr ""
 
-#: src/test.c:1055
+#: src/test.c:1045
 msgid ""
 "  -S FILE     FILE exists and is a socket\n"
 "  -t [FD]     file descriptor FD (stdout by default) is opened on a "
@@ -6726,7 +6740,7 @@ msgid ""
 "  -x FILE     FILE exists and is executable\n"
 msgstr ""
 
-#: src/test.c:1062
+#: src/test.c:1052
 msgid ""
 "\n"
 "Beware that parentheses need to be escaped (e.g., by backslashes) for "
@@ -6734,15 +6748,15 @@ msgid ""
 "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n"
 msgstr ""
 
-#: src/test.c:1077
+#: src/test.c:1067
 msgid "FIXME: ksb and mjb"
 msgstr ""
 
-#: src/test.c:1121
+#: src/test.c:1111
 msgid "missing `]'\n"
 msgstr ""
 
-#: src/test.c:1135
+#: src/test.c:1125
 #, fuzzy
 msgid "too many arguments\n"
 msgstr "引數過多"