.

1 files changed, 244 insertions, 217 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 18b5c33c4..09235e293 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fileutils 4.1.9\n"
 "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2003-12-20 13:52+0100\n"
+"POT-Creation-Date: 2004-01-15 21:30+0100\n"
 "PO-Revision-Date: 2002-07-19 23:58+0800\n"
 "Last-Translator: Anthony Fok <anthony@thizlinux.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -27,12 +27,13 @@ msgid "ambiguous argument %s for %s"
 msgstr "%2$s 的参数 %1$s 不明确"
 
 #: lib/argmatch.c:152
+#, c-format
 msgid "Valid arguments are:"
 msgstr "有效的参数为："
 
 #: lib/closeout.c:88 src/cat.c:188 src/cat.c:271 src/cat.c:322 src/cksum.c:268
 #: src/head.c:304 src/head.c:354 src/head.c:774 src/head.c:819 src/od.c:1013
-#: src/tail.c:327 src/tail.c:1730 src/tr.c:1659 src/tr.c:1906 src/tr.c:2014
+#: src/tail.c:327 src/tail.c:1748 src/tr.c:1659 src/tr.c:1906 src/tr.c:2014
 msgid "write error"
 msgstr "写入时发生错误"
 
@@ -151,12 +152,12 @@ msgstr "块大小"
 msgid "failed to return to initial working directory"
 msgstr ""
 
-#: lib/makepath.c:152 src/copy.c:1321 src/mkdir.c:171
+#: lib/makepath.c:152 src/copy.c:1324 src/mkdir.c:171
 #, c-format
 msgid "cannot create directory %s"
 msgstr "无法创建目录%s"
 
-#: lib/makepath.c:158 lib/makepath.c:400 src/cp.c:440 src/cp.c:462
+#: lib/makepath.c:158 lib/makepath.c:400 src/cp.c:438 src/cp.c:460
 #, c-format
 msgid "%s exists but is not a directory"
 msgstr "%s存在但并非目录。"
@@ -366,22 +367,22 @@ msgid "The strings compared were %s and %s."
 msgstr "要比较的字串为 %s 和 %s。"
 
 #: src/basename.c:49 src/cat.c:87 src/chgrp.c:115 src/chmod.c:266
-#: src/chown.c:90 src/chroot.c:40 src/cksum.c:277 src/comm.c:68 src/cp.c:157
-#: src/csplit.c:1404 src/cut.c:177 src/date.c:115 src/dd.c:283 src/df.c:723
+#: src/chown.c:90 src/chroot.c:51 src/cksum.c:277 src/comm.c:68 src/cp.c:157
+#: src/csplit.c:1401 src/cut.c:177 src/date.c:115 src/dd.c:283 src/df.c:723
 #: src/dircolors.c:100 src/dirname.c:41 src/du.c:163 src/echo.c:72
-#: src/env.c:114 src/expand.c:107 src/expr.c:99 src/factor.c:69 src/fmt.c:267
+#: src/env.c:114 src/expand.c:104 src/expr.c:99 src/factor.c:69 src/fmt.c:267
 #: src/fold.c:62 src/head.c:109 src/hostid.c:40 src/hostname.c:62 src/id.c:82
-#: src/install.c:589 src/join.c:139 src/kill.c:90 src/link.c:47 src/ln.c:341
-#: src/logname.c:44 src/ls.c:3898 src/md5sum.c:120 src/mkdir.c:57
+#: src/install.c:589 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341
+#: src/logname.c:44 src/ls.c:3907 src/md5sum.c:120 src/mkdir.c:57
 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:302 src/nice.c:65 src/nl.c:172
-#: src/nohup.c:52 src/od.c:282 src/paste.c:405 src/pathchk.c:136
+#: src/nohup.c:52 src/od.c:282 src/paste.c:391 src/pathchk.c:136
 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:59 src/printf.c:91
 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:142
 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48
 #: src/sort.c:270 src/split.c:96 src/stat.c:691 src/stty.c:485 src/su.c:432
 #: src/sum.c:55 src/sync.c:40 src/tac.c:122 src/tail.c:234 src/tee.c:58
-#: src/test.c:972 src/touch.c:234 src/tr.c:316 src/tsort.c:92 src/tty.c:58
-#: src/uname.c:105 src/unexpand.c:372 src/uniq.c:130 src/unlink.c:47
+#: src/test.c:972 src/touch.c:244 src/tr.c:316 src/tsort.c:92 src/tty.c:58
+#: src/uname.c:105 src/unexpand.c:373 src/uniq.c:130 src/unlink.c:47
 #: src/uptime.c:186 src/users.c:115 src/wc.c:131 src/who.c:616 src/whoami.c:47
 #: src/yes.c:42
 #, c-format
@@ -405,22 +406,22 @@ msgid ""
 msgstr ""
 
 #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298
-#: src/chown.c:152 src/chroot.c:58 src/cksum.c:292 src/comm.c:85 src/cp.c:254
-#: src/csplit.c:1446 src/cut.c:222 src/date.c:217 src/dd.c:341 src/df.c:762
+#: src/chown.c:152 src/chroot.c:69 src/cksum.c:292 src/comm.c:85 src/cp.c:254
+#: src/csplit.c:1443 src/cut.c:222 src/date.c:217 src/dd.c:341 src/df.c:762
 #: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104
-#: src/env.c:133 src/expand.c:132 src/expr.c:162 src/factor.c:89
+#: src/env.c:133 src/expand.c:129 src/expr.c:162 src/factor.c:89
 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:53
-#: src/hostname.c:75 src/id.c:103 src/install.c:644 src/join.c:182
-#: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4032
+#: src/hostname.c:75 src/id.c:103 src/install.c:644 src/join.c:195
+#: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4041
 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:356
-#: src/nice.c:79 src/nl.c:227 src/nohup.c:68 src/od.c:369 src/paste.c:429
+#: src/nice.c:79 src/nl.c:227 src/nohup.c:68 src/od.c:369 src/paste.c:415
 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:72
 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141
 #: src/rmdir.c:162 src/seq.c:104 src/setuidgid.c:66 src/shred.c:219
 #: src/sleep.c:64 src/sort.c:341 src/split.c:129 src/stat.c:762 src/stty.c:699
 #: src/su.c:453 src/sum.c:75 src/sync.c:51 src/tac.c:145 src/tail.c:304
-#: src/tee.c:71 src/test.c:1051 src/touch.c:265 src/tr.c:389 src/true.c:43
-#: src/tsort.c:104 src/tty.c:70 src/uname.c:127 src/unexpand.c:396
+#: src/tee.c:71 src/test.c:1051 src/touch.c:275 src/tr.c:389 src/true.c:43
+#: src/tsort.c:104 src/tty.c:70 src/uname.c:127 src/unexpand.c:397
 #: src/uniq.c:169 src/unlink.c:58 src/uptime.c:201 src/users.c:128
 #: src/wc.c:153 src/who.c:657 src/whoami.c:59 src/yes.c:58
 #, fuzzy, c-format
@@ -432,7 +433,7 @@ msgstr ""
 "请向 <bug-fileutils@gnu.org> 报告错误。"
 
 #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264
-#: src/chroot.c:78 src/comm.c:280 src/csplit.c:1376 src/dirname.c:89
+#: src/chroot.c:89 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89
 #: src/expr.c:202 src/install.c:282 src/link.c:88 src/mkdir.c:125
 #: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:101 src/pathchk.c:189
 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:207 src/seq.c:375
@@ -599,7 +600,7 @@ msgid ""
 msgstr ""
 
 #: src/chgrp.c:254 src/chmod.c:408 src/chmod.c:416 src/chown.c:272
-#: src/chown.c:299 src/cp.c:300 src/rm.c:241 src/touch.c:154 src/touch.c:360
+#: src/chown.c:299 src/cp.c:299 src/rm.c:241 src/touch.c:164 src/touch.c:366
 #, c-format
 msgid "failed to get attributes of %s"
 msgstr "无法取得 %s 的属性"
@@ -824,7 +825,7 @@ msgstr ""
 "‘:’时<组>会更改为指定所有者的主要组。<所有者>和<组>可以是数字\n"
 "或名称。\n"
 
-#: src/chroot.c:44
+#: src/chroot.c:55
 #, fuzzy, c-format
 msgid ""
 "Usage: %s NEWROOT [COMMAND...]\n"
@@ -833,28 +834,33 @@ msgstr ""
 "用法：%s 文件\n"
 "  或：%s 选项\n"
 
-#: src/chroot.c:48
+#: src/chroot.c:59
 msgid ""
 "Run COMMAND with root directory set to NEWROOT.\n"
 "\n"
 msgstr ""
 
-#: src/chroot.c:54
+#: src/chroot.c:65
 msgid ""
 "\n"
 "If no command is given, run ``${SHELL} -i'' (default: /bin/sh).\n"
 msgstr ""
 
-#: src/chroot.c:84
+#: src/chroot.c:95
 #, fuzzy, c-format
 msgid "cannot change root directory to %s"
 msgstr "无法进入目录 %s"
 
-#: src/chroot.c:87
+#: src/chroot.c:98
 #, fuzzy
 msgid "cannot chdir to root directory"
 msgstr "无法切换到目录%s"
 
+#: src/chroot.c:122 src/nohup.c:190 src/setuidgid.c:132
+#, fuzzy, c-format
+msgid "cannot run command %s"
+msgstr "无法解除%s的链接"
+
 #: src/cksum.c:233
 #, fuzzy, c-format
 msgid "%s: file too long"
@@ -905,7 +911,7 @@ msgstr "无法 fstat%s"
 msgid "skipping file %s, as it was replaced while being copied"
 msgstr "略过文件%s，因为准备复制时它已被其他文件取代"
 
-#: src/copy.c:258 src/copy.c:886 src/copy.c:1067 src/copy.c:1157 src/ln.c:297
+#: src/copy.c:258 src/copy.c:886 src/copy.c:1070 src/copy.c:1160 src/ln.c:297
 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009
 #, c-format
 msgid "cannot remove %s"
@@ -1001,122 +1007,122 @@ msgstr "将%s备份会破坏来源文件，故不移动%s。"
 msgid "backing up %s would destroy source;  %s not copied"
 msgstr "将%s备份会破坏来源文件，故不复制%s。"
 
-#: src/copy.c:1046 src/ln.c:279
+#: src/copy.c:1049 src/ln.c:279
 #, c-format
 msgid "cannot backup %s"
 msgstr "无法备份%s"
 
-#: src/copy.c:1082 src/ln.c:314
+#: src/copy.c:1085 src/ln.c:314
 #, c-format
 msgid " (backup: %s)"
 msgstr " (备份：%s)"
 
-#: src/copy.c:1132
+#: src/copy.c:1135
 #, c-format
 msgid "cannot copy a directory, %s, into itself, %s"
 msgstr "无法将目录%s复制至原来位置%s"
 
-#: src/copy.c:1139
+#: src/copy.c:1142
 #, c-format
 msgid "will not create hard link %s to directory %s"
 msgstr "不会创建连至目录%2$s的硬链接%1$s"
 
-#: src/copy.c:1165
+#: src/copy.c:1168
 #, c-format
 msgid "cannot create hard link %s to %s"
 msgstr "无法创建连至%2$s的硬链接%1$s"
 
-#: src/copy.c:1219
+#: src/copy.c:1222
 #, c-format
 msgid "cannot move %s to a subdirectory of itself, %s"
 msgstr "无法将目录%s移动至本身的子目录%s下"
 
-#: src/copy.c:1262
+#: src/copy.c:1265
 #, c-format
 msgid "cannot move %s to %s"
 msgstr "无法移动%s至%s"
 
-#: src/copy.c:1274
+#: src/copy.c:1277
 #, c-format
 msgid "inter-device move failed: %s to %s; unable to remove target"
 msgstr "无法进行跨设备的移动 (%s至%s)；无法删除目标文件或目录"
 
-#: src/copy.c:1302
+#: src/copy.c:1305
 #, c-format
 msgid "cannot copy cyclic symbolic link %s"
 msgstr "无法复制循环的符号链接%s"
 
-#: src/copy.c:1379
+#: src/copy.c:1382
 #, c-format
 msgid "%s: can make relative symbolic links only in current directory"
 msgstr "%s：只能於目前的目录中创建相对符号链接"
 
-#: src/copy.c:1386
+#: src/copy.c:1389
 #, c-format
 msgid "cannot create symbolic link %s to %s"
 msgstr "无法创建连至%2$s的符号链接%1$s"
 
-#: src/copy.c:1397
+#: src/copy.c:1400
 #, c-format
 msgid "cannot create link %s"
 msgstr "无法创建链接%s"
 
-#: src/copy.c:1419 src/mkfifo.c:134
+#: src/copy.c:1422 src/mkfifo.c:134
 #, c-format
 msgid "cannot create fifo %s"
 msgstr "无法创建 fifo 文件%s"
 
-#: src/copy.c:1430
+#: src/copy.c:1433
 #, c-format
 msgid "cannot create special file %s"
 msgstr "无法创建特殊文件%s"
 
-#: src/copy.c:1442 src/ls.c:2561 src/stat.c:436
+#: src/copy.c:1445 src/ls.c:2560 src/stat.c:436
 #, c-format
 msgid "cannot read symbolic link %s"
 msgstr "无法读取符号链接%s"
 
-#: src/copy.c:1467
+#: src/copy.c:1470
 #, c-format
 msgid "cannot create symbolic link %s"
 msgstr "无法创建符号链接%s"
 
-#: src/copy.c:1483 src/copy.c:1544 src/cp.c:334
+#: src/copy.c:1486 src/copy.c:1547 src/cp.c:333
 #, c-format
 msgid "failed to preserve ownership for %s"
 msgstr "无法保留%s的所有者"
 
-#: src/copy.c:1498
+#: src/copy.c:1501
 #, c-format
 msgid "%s has unknown file type"
 msgstr "%s的文件类型不详"
 
-#: src/copy.c:1531
+#: src/copy.c:1534
 #, c-format
 msgid "preserving times for %s"
 msgstr "保留%s的时间"
 
-#: src/copy.c:1556
+#: src/copy.c:1559
 #, fuzzy, c-format
 msgid "failed to lookup file %s"
 msgstr "无法保留%s的时间"
 
-#: src/copy.c:1561
+#: src/copy.c:1564
 #, c-format
 msgid "failed to preserve authorship for %s"
 msgstr "无法保留%s的著作者"
 
-#: src/copy.c:1580
+#: src/copy.c:1583
 #, c-format
 msgid "setting permissions for %s"
 msgstr "设定%s的权限"
 
-#: src/copy.c:1602 src/ln.c:332
+#: src/copy.c:1605 src/ln.c:332
 #, c-format
 msgid "cannot un-backup %s"
 msgstr "无法将 %s 的备份还原"
 
-#: src/copy.c:1606
+#: src/copy.c:1609
 #, c-format
 msgid "%s -> %s (unbackup)\n"
 msgstr "%s → %s (还原备份)\n"
@@ -1140,12 +1146,12 @@ msgstr ""
 "将<来源>文件复制至<目的地>，或将多个<文件>复制至<目录>。\n"
 "\n"
 
-#: src/cp.c:171 src/csplit.c:1417 src/cut.c:189 src/df.c:733 src/du.c:172
-#: src/expand.c:120 src/fmt.c:277 src/fold.c:75 src/head.c:123
-#: src/install.c:605 src/kill.c:104 src/ln.c:360 src/ls.c:3908 src/mkdir.c:66
-#: src/mkfifo.c:60 src/mknod.c:61 src/mv.c:316 src/nl.c:185 src/paste.c:419
+#: src/cp.c:171 src/csplit.c:1414 src/cut.c:189 src/df.c:733 src/du.c:172
+#: src/expand.c:117 src/fmt.c:277 src/fold.c:75 src/head.c:123
+#: src/install.c:605 src/kill.c:104 src/ln.c:360 src/ls.c:3917 src/mkdir.c:66
+#: src/mkfifo.c:60 src/mknod.c:61 src/mv.c:316 src/nl.c:185 src/paste.c:405
 #: src/pr.c:2761 src/ptx.c:1882 src/shred.c:165 src/sort.c:284 src/split.c:109
-#: src/tac.c:135 src/tail.c:248 src/touch.c:243 src/unexpand.c:385
+#: src/tac.c:135 src/tail.c:248 src/touch.c:253 src/unexpand.c:386
 #: src/uniq.c:143
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1311,54 +1317,54 @@ msgstr ""
 "有一个特别情况：如果同时指定 --force 和 --backup 选项，而且<来源>和<目的地>\n"
 "是同一个已存在的一般文件的话，cp 会将<来源>文件备份。\n"
 
-#: src/cp.c:320
+#: src/cp.c:319
 #, c-format
 msgid "failed to preserve times for %s"
 msgstr "无法保留%s的时间"
 
-#: src/cp.c:344
+#: src/cp.c:343
 #, c-format
 msgid "failed to preserve permissions for %s"
 msgstr "无法保留%s的权限"
 
-#: src/cp.c:428
+#: src/cp.c:426
 #, c-format
 msgid "cannot make directory %s"
 msgstr "无法创建目录%s"
 
-#: src/cp.c:487 src/ln.c:496 src/mv.c:455 src/shred.c:1601
+#: src/cp.c:485 src/ln.c:496 src/mv.c:455 src/shred.c:1601
 msgid "missing file argument"
 msgstr "缺少了文件参数"
 
-#: src/cp.c:492
+#: src/cp.c:490
 msgid "missing destination file"
 msgstr "缺少了目的地文件"
 
-#: src/cp.c:517 src/ln.c:165 src/ln.c:188 src/ln.c:215 src/ln.c:303
+#: src/cp.c:515 src/ln.c:165 src/ln.c:188 src/ln.c:215 src/ln.c:303
 #, c-format
 msgid "accessing %s"
 msgstr "正在访问%s"
 
-#: src/cp.c:542
+#: src/cp.c:540
 #, fuzzy, c-format
 msgid "%s: specified destination directory does not exist"
 msgstr "%s：指定的目的地不是目录"
 
-#: src/cp.c:544
+#: src/cp.c:542
 #, c-format
 msgid "%s: specified target is not a directory"
 msgstr "%s：指定的目标不是目录"
 
-#: src/cp.c:547
+#: src/cp.c:545
 #, c-format
 msgid "copying multiple files, but last argument %s is not a directory"
 msgstr "复制多个文件，但最后的参数%s并非目录。"
 
-#: src/cp.c:646
+#: src/cp.c:644
 msgid "when preserving paths, the destination must be a directory"
 msgstr "当保留路径时，目的地必须是目录"
 
-#: src/cp.c:872 src/install.c:217 src/ln.c:443 src/mv.c:401
+#: src/cp.c:870 src/install.c:217 src/ln.c:443 src/mv.c:401
 #, c-format
 msgid ""
 "warning: --version-control (-V) is obsolete;  support for it\n"
@@ -1367,19 +1373,19 @@ msgstr ""
 "警告：--version-control (-V) 选项已经过时；将来的版本随时可能不再支持\n"
 "此选项。请使用 --backup=%s。"
 
-#: src/cp.c:966 src/ln.c:473
+#: src/cp.c:964 src/ln.c:473
 msgid "symbolic links are not supported on this system"
 msgstr "此系统并不支持符号链接"
 
-#: src/cp.c:1002
+#: src/cp.c:1000
 msgid "cannot make both hard and symbolic links"
 msgstr "无法同时创建实际及符号链接"
 
-#: src/cp.c:1010 src/install.c:273 src/ln.c:539 src/mv.c:479
+#: src/cp.c:1008 src/install.c:273 src/ln.c:539 src/mv.c:479
 msgid "backup type"
 msgstr "备份方式"
 
-#: src/csplit.c:267 src/csplit.c:1393 src/join.c:265 src/tac-pipe.c:57
+#: src/csplit.c:267 src/csplit.c:1390 src/join.c:276 src/tac-pipe.c:57
 #: src/tee.c:223 src/tr.c:1602 src/tr.c:1704 src/tr.c:1747
 #, fuzzy
 msgid "read error"
@@ -1418,103 +1424,103 @@ msgstr ""
 msgid "write error for `%s'"
 msgstr "写入时发生错误"
 
-#: src/csplit.c:1010
+#: src/csplit.c:1007
 #, fuzzy, c-format
 msgid "%s: integer expected after delimiter"
 msgstr "转换无效：%s"
 
-#: src/csplit.c:1026
+#: src/csplit.c:1023
 #, c-format
 msgid "%s: `}' is required in repeat count"
 msgstr ""
 
-#: src/csplit.c:1036
+#: src/csplit.c:1033
 #, c-format
 msgid "%s}: integer required between `{' and `}'"
 msgstr ""
 
-#: src/csplit.c:1063
+#: src/csplit.c:1060
 #, c-format
 msgid "%s: closing delimiter `%c' missing"
 msgstr ""
 
-#: src/csplit.c:1079
+#: src/csplit.c:1076
 #, fuzzy, c-format
 msgid "%s: invalid regular expression: %s"
 msgstr "转换无效：%s"
 
-#: src/csplit.c:1112
+#: src/csplit.c:1109
 #, fuzzy, c-format
 msgid "%s: invalid pattern"
 msgstr "%s：文件类型无效"
 
-#: src/csplit.c:1115
+#: src/csplit.c:1112
 #, c-format
 msgid "%s: line number must be greater than zero"
 msgstr ""
 
-#: src/csplit.c:1121
+#: src/csplit.c:1118
 #, c-format
 msgid "line number `%s' is smaller than preceding line number, %s"
 msgstr ""
 
-#: src/csplit.c:1127
+#: src/csplit.c:1124
 #, c-format
 msgid "warning: line number `%s' is the same as preceding line number"
 msgstr ""
 
-#: src/csplit.c:1180
+#: src/csplit.c:1177
 #, fuzzy
 msgid "invalid format width"
 msgstr "日期格式 %s 无效"
 
-#: src/csplit.c:1201
+#: src/csplit.c:1198
 #, fuzzy
 msgid "invalid format precision"
 msgstr "转换无效：%s"
 
-#: src/csplit.c:1222
+#: src/csplit.c:1219
 msgid "missing conversion specifier in suffix"
 msgstr ""
 
-#: src/csplit.c:1228
+#: src/csplit.c:1225
 #, fuzzy, c-format
 msgid "invalid conversion specifier in suffix: %c"
 msgstr "转换无效：%s"
 
-#: src/csplit.c:1231
+#: src/csplit.c:1228
 #, fuzzy, c-format
 msgid "invalid conversion specifier in suffix: \\%.3o"
 msgstr "转换无效：%s"
 
-#: src/csplit.c:1254
+#: src/csplit.c:1251
 #, c-format
 msgid "too many %% conversion specifications in suffix"
 msgstr ""
 
-#: src/csplit.c:1269
+#: src/csplit.c:1266
 #, c-format
 msgid "missing %% conversion specification in suffix"
 msgstr ""
 
-#: src/csplit.c:1353
+#: src/csplit.c:1350
 #, fuzzy, c-format
 msgid "%s: invalid number"
 msgstr "无效的号码 %s"
 
-#: src/csplit.c:1408
+#: src/csplit.c:1405
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
 msgstr "用法：%s [选项]... 目录...\n"
 
-#: src/csplit.c:1412
+#: src/csplit.c:1409
 msgid ""
 "Output pieces of FILE separated by PATTERN(s) to files `xx01', `xx02', ...,\n"
 "and output byte counts of each piece to standard output.\n"
 "\n"
 msgstr ""
 
-#: src/csplit.c:1420
+#: src/csplit.c:1417
 #, c-format
 msgid ""
 "  -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n"
@@ -1522,20 +1528,20 @@ msgid ""
 "  -k, --keep-files           do not remove output files on errors\n"
 msgstr ""
 
-#: src/csplit.c:1425
+#: src/csplit.c:1422
 msgid ""
 "  -n, --digits=DIGITS        use specified number of digits instead of 2\n"
 "  -s, --quiet, --silent      do not print counts of output file sizes\n"
 "  -z, --elide-empty-files    remove empty output files\n"
 msgstr ""
 
-#: src/csplit.c:1432
+#: src/csplit.c:1429
 msgid ""
 "\n"
 "Read standard input if FILE is -.  Each PATTERN may be:\n"
 msgstr ""
 
-#: src/csplit.c:1436
+#: src/csplit.c:1433
 msgid ""
 "\n"
 "  INTEGER            copy up to but not including specified line number\n"
@@ -1547,10 +1553,10 @@ msgid ""
 "A line OFFSET is a required `+' or `-' followed by a positive integer.\n"
 msgstr ""
 
-#: src/cut.c:181 src/df.c:727 src/du.c:167 src/expand.c:111 src/fold.c:66
-#: src/head.c:113 src/ls.c:3902 src/nl.c:176 src/paste.c:409 src/pr.c:2752
+#: src/cut.c:181 src/df.c:727 src/du.c:167 src/expand.c:108 src/fold.c:66
+#: src/head.c:113 src/ls.c:3911 src/nl.c:176 src/paste.c:395 src/pr.c:2752
 #: src/sort.c:274 src/sum.c:59 src/tac.c:126 src/tail.c:238 src/tee.c:62
-#: src/unexpand.c:376 src/wc.c:135
+#: src/unexpand.c:377 src/wc.c:135
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
 msgstr "用法：%s [选项]... [文件]...\n"
@@ -1819,7 +1825,7 @@ msgstr "安装目录时不能用 strip 选项"
 msgid "undefined"
 msgstr ""
 
-#: src/date.c:438 src/touch.c:402
+#: src/date.c:438 src/touch.c:423
 #, fuzzy
 msgid "cannot get time of day"
 msgstr "无法设定 %s 的时间标记"
@@ -2048,6 +2054,7 @@ msgid " %4s-blocks      Used Available Use%%"
 msgstr "   %4s-块        已用     可用 已用%%"
 
 #: src/df.c:198
+#, c-format
 msgid " Mounted on\n"
 msgstr " 挂载点\n"
 
@@ -2117,7 +2124,7 @@ msgstr ""
 "  -x, --exclude-type=类型   只印出不是指定<类型>的文件系统信息\n"
 "  -v                    (此选项不作处理)\n"
 
-#: src/df.c:758 src/du.c:210 src/ls.c:4020
+#: src/df.c:758 src/du.c:210 src/ls.c:4029
 #, fuzzy
 msgid ""
 "\n"
@@ -2252,10 +2259,12 @@ msgstr ""
 "  -D, --dereference-args  只找出命令列中的符号链接指示的真正目的地\n"
 
 #: src/du.c:186
+#, fuzzy
 msgid ""
 "  -h, --human-readable  print sizes in human readable format (e.g., 1K 234M "
 "2G)\n"
-"  -H, --si              likewise, but use powers of 1000 not 1024\n"
+"  -H, --si              likewise, but use powers of 1000 not 1024 "
+"(deprecated)\n"
 "  -k                    like --block-size=1K\n"
 "  -l, --count-links     count sizes many times if hard linked\n"
 msgstr ""
@@ -2299,7 +2308,7 @@ msgstr ""
 "                         (若使用 --all 选项，也会显示文件的占用量)；\n"
 "                         --max-depth=0 的效果等於 --summarize\n"
 
-#: src/du.c:524 src/ls.c:2231 src/wc.c:674
+#: src/du.c:524 src/ls.c:2230 src/wc.c:674
 msgid "total"
 msgstr "总用量"
 
@@ -2382,43 +2391,43 @@ msgid ""
 "A mere - implies -i.  If no COMMAND, print the resulting environment.\n"
 msgstr ""
 
-#: src/expand.c:115
+#: src/expand.c:112
 msgid ""
 "Convert tabs in each FILE to spaces, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 "\n"
 msgstr ""
 
-#: src/expand.c:123
+#: src/expand.c:120
 msgid ""
 "  -i, --initial       do not convert TABs after non whitespace\n"
 "  -t, --tabs=NUMBER   have tabs NUMBER characters apart, not 8\n"
 msgstr ""
 
-#: src/expand.c:127
+#: src/expand.c:124
 msgid ""
 "  -t, --tabs=LIST     use comma separated list of explicit tab positions\n"
 msgstr ""
 
-#: src/expand.c:184
+#: src/expand.c:180
 #, fuzzy, c-format
 msgid "tab stop is too large %s"
 msgstr "%s：文件过大"
 
-#: src/expand.c:193
+#: src/expand.c:189
 #, fuzzy, c-format
 msgid "tab size contains invalid character(s): %s"
 msgstr "权限模式字串 %2$s 中出现无效的字符 %1$s"
 
-#: src/expand.c:218 src/unexpand.c:169
+#: src/expand.c:214 src/unexpand.c:170
 msgid "tab size cannot be 0"
 msgstr ""
 
-#: src/expand.c:220 src/unexpand.c:171
+#: src/expand.c:216 src/unexpand.c:172
 msgid "tab sizes must be ascending"
 msgstr ""
 
-#: src/expand.c:414
+#: src/expand.c:410
 msgid "`-LIST' option is obsolete; use `-t LIST'"
 msgstr ""
 
@@ -2620,12 +2629,12 @@ msgid ""
 "  -w, --width=WIDTH   use WIDTH columns instead of 80\n"
 msgstr ""
 
-#: src/fold.c:266
+#: src/fold.c:274
 #, c-format
 msgid "`%s' option is obsolete; use `%s'"
 msgstr ""
 
-#: src/fold.c:294
+#: src/fold.c:302
 #, fuzzy, c-format
 msgid "invalid number of columns: `%s'"
 msgstr "无效的号码 %s"
@@ -2972,12 +2981,12 @@ msgstr ""
 "变量来选择。以下是可用的变量值：\n"
 "\n"
 
-#: src/join.c:143
+#: src/join.c:158
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
 msgstr "用法：%s [选项]... [文件]\n"
 
-#: src/join.c:147
+#: src/join.c:162
 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"
@@ -2988,24 +2997,22 @@ msgid ""
 "  -e EMPTY          replace missing input fields with EMPTY\n"
 msgstr ""
 
-#: src/join.c:156
+#: src/join.c:171
 msgid ""
 "  -i, --ignore-case ignore differences in case when comparing fields\n"
-"  -j FIELD          (obsolescent) equivalent to `-1 FIELD -2 FIELD'\n"
-"  -j1 FIELD         (obsolescent) equivalent to `-1 FIELD'\n"
-"  -j2 FIELD         (obsolescent) equivalent to `-2 FIELD'\n"
+"  -j FIELD          equivalent to `-1 FIELD -2 FIELD'\n"
 "  -o FORMAT         obey FORMAT while constructing output line\n"
 "  -t CHAR           use CHAR as input and output field separator\n"
 msgstr ""
 
-#: src/join.c:164
+#: src/join.c:177
 msgid ""
 "  -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 ""
 
-#: src/join.c:171
+#: src/join.c:184
 msgid ""
 "\n"
 "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -3018,42 +3025,52 @@ msgid ""
 "Important: FILE1 and FILE2 must be sorted on the join fields.\n"
 msgstr ""
 
-#: src/join.c:642
+#: src/join.c:648
+#, c-format
+msgid "value %s is so large that it is not representable"
+msgstr ""
+
+#: src/join.c:683
 #, fuzzy, c-format
 msgid "invalid field specifier: `%s'"
 msgstr "无效的 tab 字符定位值：%s"
 
-#: src/join.c:656 src/join.c:769 src/join.c:805
+#: src/join.c:692
 #, fuzzy, c-format
-msgid "invalid field number: `%s'"
+msgid "invalid field number: %s"
 msgstr "无效的号码 %s"
 
-#: src/join.c:669
+#: src/join.c:699
 #, fuzzy, c-format
 msgid "invalid file number in field spec: `%s'"
 msgstr "无效的号码 %s"
 
-#: src/join.c:789
+#: src/join.c:739
+#, fuzzy
+msgid "too many non-option arguments"
+msgstr "参数太多"
+
+#: src/join.c:781 src/join.c:811
+#, fuzzy, c-format
+msgid "invalid field number: `%s'"
+msgstr "无效的号码 %s"
+
+#: src/join.c:799
 #, fuzzy, c-format
 msgid "invalid field number for file 1: `%s'"
 msgstr "无效的号码 %s"
 
-#: src/join.c:798
+#: src/join.c:805
 #, fuzzy, c-format
 msgid "invalid field number for file 2: `%s'"
 msgstr "无效的号码 %s"
 
-#: src/join.c:830
-#, fuzzy
-msgid "too many non-option arguments"
-msgstr "参数太多"
-
-#: src/join.c:852
+#: src/join.c:851
 #, fuzzy
 msgid "too few non-option arguments"
 msgstr "参数太少"
 
-#: src/join.c:863
+#: src/join.c:862
 msgid "both files cannot be standard input"
 msgstr ""
 
@@ -3281,84 +3298,84 @@ msgstr ""
 msgid "no login name"
 msgstr ""
 
-#: src/ls.c:655
+#: src/ls.c:654
 msgid "%b %e  %Y"
 msgstr "%Y-%m-%d "
 
-#: src/ls.c:663
+#: src/ls.c:662
 msgid "%b %e %H:%M"
 msgstr "%b %e %H:%M"
 
-#: src/ls.c:1290
+#: src/ls.c:1289
 #, fuzzy, c-format
 msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
 msgstr "忽略无效的环境变量 QUOTING_STYLE 的变量值：%s"
 
-#: src/ls.c:1317
+#: src/ls.c:1316
 #, c-format
 msgid "ignoring invalid width in environment variable COLUMNS: %s"
 msgstr "忽略无效的环境变量 COLUMNS 的宽度数值：%s"
 
-#: src/ls.c:1349
+#: src/ls.c:1348
 #, c-format
 msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
 msgstr "忽略无效的环境变量 TABSIZE 的 tab 字符定位值：%s"
 
-#: src/ls.c:1466
+#: src/ls.c:1465
 #, c-format
 msgid "invalid line width: %s"
 msgstr "无效的行宽数值：%s"
 
-#: src/ls.c:1540
+#: src/ls.c:1539
 #, c-format
 msgid "invalid tab size: %s"
 msgstr "无效的 tab 字符定位值：%s"
 
-#: src/ls.c:1708
+#: src/ls.c:1707
 #, c-format
 msgid "invalid time style format %s"
 msgstr "无效的日期时间格式 %s"
 
-#: src/ls.c:2044
+#: src/ls.c:2043
 #, c-format
 msgid "unrecognized prefix: %s"
 msgstr "无法识别的文件种类：%s"
 
-#: src/ls.c:2067
+#: src/ls.c:2066
 msgid "unparsable value for LS_COLORS environment variable"
 msgstr "LS_COLORS 环境变量中存在无法分析的值"
 
-#: src/ls.c:2135
+#: src/ls.c:2134
 #, c-format
 msgid "cannot determine device and inode of %s"
 msgstr "无法决定 %s 所在的设备及 inode"
 
-#: src/ls.c:2145
+#: src/ls.c:2144
 #, c-format
 msgid "not listing already-listed directory: %s"
 msgstr "不会再列出已经列出的目录：%s"
 
-#: src/ls.c:2198 src/remove.c:938
+#: src/ls.c:2197 src/remove.c:938
 #, fuzzy, c-format
 msgid "reading directory %s"
 msgstr "正在创建目录%s"
 
-#: src/ls.c:2678
+#: src/ls.c:2677
 #, c-format
 msgid "cannot compare file names %s and %s"
 msgstr "无法比较文件名 %s 和 %s"
 
-#: src/ls.c:3020
+#: src/ls.c:3019
 #, fuzzy
 msgid "User name too long"
 msgstr "%s：文件过大"
 
-#: src/ls.c:3041
+#: src/ls.c:3040
 #, fuzzy
 msgid "Group name too long"
 msgstr "%s：文件过大"
 
-#: src/ls.c:3903
+#: src/ls.c:3912
 msgid ""
 "List information about the FILEs (the current directory by default).\n"
 "Sort entries alphabetically if none of -cftuSUX nor --sort.\n"
@@ -3368,7 +3385,7 @@ msgstr ""
 "如果不指定 -cftuSUX 或 --sort 任何一个选项，则根据字母大小排序。\n"
 "\n"
 
-#: src/ls.c:3911
+#: src/ls.c:3920
 msgid ""
 "  -a, --all                  do not hide entries starting with .\n"
 "  -A, --almost-all           do not list implied . and ..\n"
@@ -3380,7 +3397,7 @@ msgstr ""
 "      --author               印出每个文件著作者\n"
 "  -b, --escape               以八进制溢出序列表示不可打印的字符\n"
 
-#: src/ls.c:3917
+#: src/ls.c:3926
 msgid ""
 "      --block-size=SIZE      use SIZE-byte blocks\n"
 "  -B, --ignore-backups       do not list implied entries ending with ~\n"
@@ -3397,7 +3414,7 @@ msgstr ""
 "                               配合 -l：显示 ctime 但根据名称排序\n"
 "                               否则：根据 ctime 排序\n"
 
-#: src/ls.c:3925
+#: src/ls.c:3934
 #, fuzzy
 msgid ""
 "  -C                         list entries by columns\n"
@@ -3415,7 +3432,7 @@ msgstr ""
 "  -d, --directory            当遇到目录时列出目录本身而非目录内的文件\n"
 "  -D, --dired                产生适合 Emacs 的 dired 模式使用的结果\n"
 
-#: src/ls.c:3933
+#: src/ls.c:3942
 msgid ""
 "  -f                         do not sort, enable -aU, disable -lst\n"
 "  -F, --classify             append indicator (one of */=@|) to entries\n"
@@ -3429,7 +3446,7 @@ msgstr ""
 "                               single-column -1，verbose -l，vertical -C\n"
 "      --full-time            即 -l --time-style=full-iso\n"
 
-#: src/ls.c:3940
+#: src/ls.c:3949
 #, fuzzy
 msgid ""
 "  -g                         like -l, but do not list owner\n"
@@ -3450,7 +3467,7 @@ msgstr ""
 "      --si                   类似 -h，但取 1000 的次方而不是 1024\n"
 "  -H, --dereference-command-line    使用命令列中的符号链接指示的真正目的地\n"
 
-#: src/ls.c:3951
+#: src/ls.c:3960
 msgid ""
 "      --indicator-style=WORD append indicator with style WORD to entry "
 "names:\n"
@@ -3467,7 +3484,7 @@ msgstr ""
 "  -I, --ignore=样式          不印出任何符合 shell 万用字符<样式>的项目\n"
 "  -k                         即 --block-size=1K\n"
 
-#: src/ls.c:3958
+#: src/ls.c:3967
 msgid ""
 "  -l                         use a long listing format\n"
 "  -L, --dereference          when showing file information for a symbolic\n"
@@ -3481,7 +3498,7 @@ msgstr ""
 "                               的对象而并非符号链接本身的信息\n"
 "  -m                         所有项目以逗号分隔，并填满整行行宽\n"
 
-#: src/ls.c:3965
+#: src/ls.c:3974
 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. "
@@ -3496,7 +3513,7 @@ msgstr ""
 "  -o                         类似 -l，但不列出有关组的信息\n"
 "  -p, --file-type            加上文件类型的指示符号 (/=@| 其中一个)\n"
 
-#: src/ls.c:3972
+#: src/ls.c:3981
 msgid ""
 "  -q, --hide-control-chars   print ? instead of non graphic characters\n"
 "      --show-control-chars   show non graphic characters as-is (default\n"
@@ -3515,7 +3532,7 @@ msgstr ""
 "                               literal、locale、shell、shell-always、c、"
 "escape\n"
 
-#: src/ls.c:3980
+#: src/ls.c:3989
 msgid ""
 "  -r, --reverse              reverse order while sorting\n"
 "  -R, --recursive            list subdirectories recursively\n"
@@ -3525,7 +3542,7 @@ msgstr ""
 "  -R, --recursive            同时列出所有子目录层\n"
 "  -s, --size                 以块大小为单位列出所有文件的大小\n"
 
-#: src/ls.c:3985
+#: src/ls.c:3994
 #, fuzzy
 msgid ""
 "  -S                         sort by file size\n"
@@ -3549,7 +3566,7 @@ msgstr ""
 "                               atime、access、use、ctime 或 status；加上\n"
 "                               --sort=time 选项时会以指定时间作为排序索引\n"
 
-#: src/ls.c:3994
+#: src/ls.c:4003
 #, fuzzy
 msgid ""
 "      --time-style=STYLE     show times using style STYLE:\n"
@@ -3571,7 +3588,7 @@ msgstr ""
 "  -t                         根据修改时间排序\n"
 "  -T, --tabsize=宽度         自行指定 tab 的<宽度>，而非 8 个字符\n"
 
-#: src/ls.c:4005
+#: src/ls.c:4014
 msgid ""
 "  -u                         with -lt: sort by, and show, access time\n"
 "                               with -l: show access time and sort by name\n"
@@ -3585,7 +3602,7 @@ msgstr ""
 "  -U                         不进行排序；依文件系统原有的次序列出项目\n"
 "  -v                         根据版本进行排序\n"
 
-#: src/ls.c:4012
+#: src/ls.c:4021
 msgid ""
 "  -w, --width=COLS           assume screen width instead of current value\n"
 "  -x                         list entries by lines instead of by columns\n"
@@ -3597,7 +3614,7 @@ msgstr ""
 "  -X                         根据扩展名排序\n"
 "  -1                         每行只列出一个文件\n"
 
-#: src/ls.c:4024
+#: src/ls.c:4033
 msgid ""
 "\n"
 "By default, color is not used to distinguish types of files.  That is\n"
@@ -4106,11 +4123,6 @@ msgstr "正在更改 %s 的所属组"
 msgid "failed to redirect standard error"
 msgstr ""
 
-#: src/nohup.c:190 src/setuidgid.c:132
-#, fuzzy, c-format
-msgid "cannot run command %s"
-msgstr "无法解除%s的链接"
-
 #: src/od.c:286
 #, fuzzy, c-format
 msgid ""
@@ -4312,12 +4324,12 @@ msgstr ""
 msgid "%d: fmt=\"%s\" width=%d\n"
 msgstr ""
 
-#: src/paste.c:206
+#: src/paste.c:188
 #, fuzzy
 msgid "standard input is closed"
 msgstr "标准输入"
 
-#: src/paste.c:413
+#: src/paste.c:399
 msgid ""
 "Write lines consisting of the sequentially corresponding lines from\n"
 "each FILE, separated by TABs, to standard output.\n"
@@ -4325,7 +4337,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/paste.c:422
+#: src/paste.c:408
 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"
@@ -4369,10 +4381,12 @@ msgid "path `%s' has length %lu; exceeds limit of %ld"
 msgstr ""
 
 #: src/pinky.c:291
+#, c-format
 msgid "Login name: "
 msgstr ""
 
 #: src/pinky.c:294
+#, c-format
 msgid "In real life: "
 msgstr ""
 
@@ -4381,19 +4395,22 @@ msgid "???\n"
 msgstr ""
 
 #: src/pinky.c:317
-#, fuzzy
+#, fuzzy, c-format
 msgid "Directory: "
 msgstr "目录"
 
 #: src/pinky.c:319
+#, c-format
 msgid "Shell: "
 msgstr ""
 
 #: src/pinky.c:340
+#, c-format
 msgid "Project: "
 msgstr ""
 
 #: src/pinky.c:366
+#, c-format
 msgid "Plan:\n"
 msgstr ""
 
@@ -4998,7 +5015,7 @@ msgstr ""
 msgid "cannot remove `.' or `..'"
 msgstr "无法删除‘.’或‘..’"
 
-#: src/rm.c:108 src/touch.c:238
+#: src/rm.c:108 src/touch.c:248
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "用法：%s [选项]... 目录...\n"
@@ -5477,7 +5494,7 @@ msgstr "无法创建一般文件%s"
 msgid "open failed"
 msgstr "strip 出现错误"
 
-#: src/sort.c:485 src/sort.c:2580
+#: src/sort.c:485 src/sort.c:2574
 #, fuzzy
 msgid "close failed"
 msgstr "strip 出现错误"
@@ -5487,100 +5504,100 @@ msgstr "strip 出现错误"
 msgid "write failed"
 msgstr "strip 出现错误"
 
-#: src/sort.c:639
+#: src/sort.c:636
 #, fuzzy
 msgid "sort size"
 msgstr "块大小"
 
-#: src/sort.c:718
+#: src/sort.c:715
 #, fuzzy
 msgid "stat failed"
 msgstr "strip 出现错误"
 
-#: src/sort.c:992
+#: src/sort.c:989
 #, fuzzy
 msgid "read failed"
 msgstr "strip 出现错误"
 
-#: src/sort.c:1589
+#: src/sort.c:1583
 #, c-format
 msgid "%s: %s:%s: disorder: "
 msgstr ""
 
-#: src/sort.c:1593
+#: src/sort.c:1587
 #, fuzzy
 msgid "standard error"
 msgstr "标准输出"
 
-#: src/sort.c:2091
+#: src/sort.c:2085
 #, fuzzy, c-format
 msgid "%s: invalid field specification `%s'"
 msgstr "%s：文件大小无效"
 
-#: src/sort.c:2118
+#: src/sort.c:2112
 #, fuzzy, c-format
 msgid "%s: count `%.*s' too large"
 msgstr "%s：文件过大"
 
-#: src/sort.c:2124
+#: src/sort.c:2118
 #, fuzzy, c-format
 msgid "%s: invalid count at start of `%s'"
 msgstr "%s：覆盖次数无效"
 
-#: src/sort.c:2366
+#: src/sort.c:2360
 #, fuzzy
 msgid "invalid number after `-'"
 msgstr "无效的号码 %s"
 
-#: src/sort.c:2369 src/sort.c:2415 src/sort.c:2442
+#: src/sort.c:2363 src/sort.c:2409 src/sort.c:2436
 #, fuzzy
 msgid "invalid number after `.'"
 msgstr "无效的号码 %s"
 
-#: src/sort.c:2372 src/sort.c:2451
+#: src/sort.c:2366 src/sort.c:2445
 #, fuzzy
 msgid "stray character in field spec"
 msgstr "字符特殊文件"
 
-#: src/sort.c:2406
+#: src/sort.c:2400
 #, fuzzy
 msgid "invalid number at field start"
 msgstr "无效的号码 %s"
 
-#: src/sort.c:2410 src/sort.c:2438
+#: src/sort.c:2404 src/sort.c:2432
 #, fuzzy
 msgid "field number is zero"
 msgstr "无效的号码 %s"
 
-#: src/sort.c:2419
+#: src/sort.c:2413
 #, fuzzy
 msgid "character offset is zero"
 msgstr "字符特殊文件"
 
-#: src/sort.c:2434
+#: src/sort.c:2428
 #, fuzzy
 msgid "invalid number after `,'"
 msgstr "无效的号码 %s"
 
-#: src/sort.c:2461
+#: src/sort.c:2455
 #, fuzzy
 msgid "multiple output files specified"
 msgstr "正在关闭输出文件 %s"
 
-#: src/sort.c:2477
+#: src/sort.c:2471
 msgid "empty tab"
 msgstr ""
 
-#: src/sort.c:2488
+#: src/sort.c:2482
 #, c-format
 msgid "multi-character tab `%s'"
 msgstr ""
 
-#: src/sort.c:2493
+#: src/sort.c:2487
 msgid "incompatible tabs"
 msgstr ""
 
-#: src/sort.c:2563
+#: src/sort.c:2557
 #, c-format
 msgid "extra operand `%s' not allowed with -c"
 msgstr ""
@@ -6073,6 +6090,7 @@ msgid "%s: unable to perform all requested operations"
 msgstr ""
 
 #: src/stty.c:1114
+#, c-format
 msgid "new_mode: mode\n"
 msgstr ""
 
@@ -6172,11 +6190,11 @@ msgstr ""
 msgid "ignoring all arguments"
 msgstr "忽略任何参数"
 
-#: src/sys2.h:470
+#: src/system.h:777
 msgid "      --help     display this help and exit\n"
 msgstr "      --help     显示此帮助信息并离开\n"
 
-#: src/sys2.h:472
+#: src/system.h:779
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  显示版本信息并离开\n"
 
@@ -6400,6 +6418,15 @@ msgstr ""
 msgid "warning: --pid=PID is not supported on this system"
 msgstr "此系统并不支持符号链接"
 
+#: src/tail.c:1723
+#, c-format
+msgid "cannot follow %s by name"
+msgstr ""
+
+#: src/tail.c:1729
+msgid "warning: following standard input indefinitely is ineffective"
+msgstr ""
+
 #: src/tee.c:63
 msgid ""
 "Copy standard input to each FILE, and also to standard output.\n"
@@ -6614,28 +6641,33 @@ msgstr ""
 msgid "too many arguments\n"
 msgstr "参数太多"
 
-#: src/touch.c:149 src/touch.c:165
+#: src/touch.c:121 src/touch.c:334
+#, c-format
+msgid "invalid date format %s"
+msgstr "日期格式 %s 无效"
+
+#: src/touch.c:159 src/touch.c:175
 #, c-format
 msgid "creating %s"
 msgstr "正在创建目录 %s"
 
-#: src/touch.c:216
+#: src/touch.c:226
 #, fuzzy, c-format
 msgid "cannot touch %s"
 msgstr "无法解除%s的链接"
 
-#: src/touch.c:222
+#: src/touch.c:232
 #, c-format
 msgid "setting times of %s"
 msgstr "正在设定 %s 的时间"
 
-#: src/touch.c:239
+#: src/touch.c:249
 msgid ""
 "Update the access and modification times of each FILE to the current time.\n"
 "\n"
 msgstr "将每个<文件>的访问及修改时间都更新为目前的时间。\n"
 
-#: src/touch.c:246
+#: src/touch.c:256
 #, fuzzy
 msgid ""
 "  -a                     change only the access time\n"
@@ -6650,7 +6682,7 @@ msgstr ""
 "  -f                     (此选项不作处理)\n"
 "  -m                     只更改修改时间\n"
 
-#: src/touch.c:253
+#: src/touch.c:263
 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"
@@ -6664,7 +6696,7 @@ msgstr ""
 "  --time=WORD            使用 WORD 指定的时间：access、atime、use 都等於 -a\n"
 "                           选项的效果，而 modify、mtime 等於 -m 选项的效果\n"
 
-#: src/touch.c:261
+#: src/touch.c:271
 msgid ""
 "\n"
 "Note that the -d and -t options accept different time-date formats.\n"
@@ -6672,22 +6704,17 @@ msgstr ""
 "\n"
 "请注意，-d 和 -t 选项可接受不同的时间/日期格式。\n"
 
-#: src/touch.c:307 src/touch.c:327
-#, c-format
-msgid "invalid date format %s"
-msgstr "日期格式 %s 无效"
-
-#: src/touch.c:352
+#: src/touch.c:358
 msgid "cannot specify times from more than one source"
 msgstr "无法由多於一种的来源来指定时间"
 
-#: src/touch.c:376
+#: src/touch.c:397
 #, c-format
 msgid ""
 "warning: `touch %s' is obsolete; use `touch -t %04d%02d%02d%02d%02d.%02d'"
 msgstr "警告：‘touch %s’已经过时；请使用‘touch -t %04d%02d%02d%02d%02d.%02d’"
 
-#: src/touch.c:410
+#: src/touch.c:431
 msgid "file arguments missing"
 msgstr "缺少了文件参数"
 
@@ -6946,18 +6973,18 @@ msgstr ""
 msgid "cannot get system name"
 msgstr ""
 
-#: src/unexpand.c:151
+#: src/unexpand.c:152
 msgid "tab size contains an invalid character"
 msgstr ""
 
-#: src/unexpand.c:380
+#: src/unexpand.c:381
 msgid ""
 "Convert spaces in each FILE to tabs, writing to standard output.\n"
 "With no FILE, or when FILE is -, read standard input.\n"
 "\n"
 msgstr ""
 
-#: src/unexpand.c:388
+#: src/unexpand.c:389
 msgid ""
 "  -a, --all        convert all whitespace, instead of just initial "
 "whitespace\n"
@@ -6967,7 +6994,7 @@ msgid ""
 "  -t, --tabs=LIST  use comma separated LIST of tab positions (enables -a)\n"
 msgstr ""
 
-#: src/unexpand.c:466
+#: src/unexpand.c:467
 msgid "`-LIST' option is obsolete; use `--first-only -t LIST'"
 msgstr ""