summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2005-09-28 22:10:51 +0000
committerJim Meyering <jim@meyering.net>2005-09-28 22:10:51 +0000
commit3f2693ee63013a64c711edd446612fae339bae0c (patch)
tree671dddd4d5270f8f809fbbcf96651b8ac4e8ae68 /po/zh_CN.po
parent6f8ed252b419965e428587ee7cef14ccfb31b7ef (diff)
downloadcoreutils-3f2693ee63013a64c711edd446612fae339bae0c.tar.xz
.
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po3970
1 files changed, 1938 insertions, 2032 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cf1dca4cf..82d5985c6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,18 +3,20 @@
# Yip Chi Lap <clyip@cs.hku.hk>, 1998.
# Abel Cheung <maddog@linux.org.hk>, 2002.
# Anthony Fok <anthony@thizlinux.com>, 2002.
+# Funda Wang <fundawang@linux.net.cn>, 2004, 2005.
#
msgid ""
msgstr ""
-"Project-Id-Version: fileutils 4.1.9\n"
+"Project-Id-Version: coreutils 5.3.0\n"
"Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
-"POT-Creation-Date: 2005-01-08 11:56+0100\n"
-"PO-Revision-Date: 2002-07-19 23:58+0800\n"
-"Last-Translator: Anthony Fok <anthony@thizlinux.com>\n"
+"POT-Creation-Date: 2005-09-27 10:12+0200\n"
+"PO-Revision-Date: 2005-02-13 03:39+0800\n"
+"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: lib/argmatch.c:137
#, c-format
@@ -31,15 +33,15 @@ msgstr "%2$s 的参数 %1$s 不明确"
msgid "Valid arguments are:"
msgstr "有效的参数为:"
-#: 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
+#: lib/closeout.c:94 src/cat.c:193 src/cat.c:277 src/cat.c:327 src/cksum.c:255
+#: src/expand.c:336 src/expand.c:361 src/head.c:300 src/head.c:350
+#: src/head.c:758 src/head.c:799 src/od.c:966 src/paste.c:143 src/tail.c:318
+#: src/tail.c:1095 src/tr.c:1561 src/tr.c:1784 src/tr.c:1887
+#: src/unexpand.c:435 src/unexpand.c:451
msgid "write error"
-msgstr "写入时发生错误"
+msgstr "写入错误"
-#: lib/error.c:123
+#: lib/error.c:121
msgid "Unknown system error"
msgstr "未知的系统错误"
@@ -57,7 +59,7 @@ msgstr "目录"
#: lib/file-type.c:49
msgid "block special file"
-msgstr "区块特殊文件"
+msgstr "块特殊文件"
#: lib/file-type.c:52
msgid "character special file"
@@ -65,7 +67,7 @@ msgstr "字符特殊文件"
#: lib/file-type.c:55
msgid "fifo"
-msgstr "fifo"
+msgstr "先进先出"
#: lib/file-type.c:58
msgid "symbolic link"
@@ -94,127 +96,218 @@ msgstr "共享内存对象"
#: lib/file-type.c:75
msgid "weird file"
-msgstr "古怪的文件"
+msgstr "古怪文件"
+
+#: lib/gai_strerror.c:45
+#, fuzzy
+msgid "Address family for hostname not supported"
+msgstr "不支持 FIFO 文件"
+
+#: lib/gai_strerror.c:46
+msgid "Temporary failure in name resolution"
+msgstr ""
+
+#: lib/gai_strerror.c:47
+msgid "Bad value for ai_flags"
+msgstr ""
+
+#: lib/gai_strerror.c:48
+msgid "Non-recoverable failure in name resolution"
+msgstr ""
+
+#: lib/gai_strerror.c:49
+#, fuzzy
+msgid "ai_family not supported"
+msgstr "不支持 FIFO 文件"
+
+#: lib/gai_strerror.c:50
+msgid "Memory allocation failure"
+msgstr ""
+
+#: lib/gai_strerror.c:51
+msgid "No address associated with hostname"
+msgstr ""
+
+#: lib/gai_strerror.c:52
+msgid "Name or service not known"
+msgstr ""
+
+#: lib/gai_strerror.c:53
+msgid "Servname not supported for ai_socktype"
+msgstr ""
+
+#: lib/gai_strerror.c:54
+#, fuzzy
+msgid "ai_socktype not supported"
+msgstr "不支持 FIFO 文件"
+
+#: lib/gai_strerror.c:55
+#, fuzzy
+msgid "System error"
+msgstr "写入错误"
+
+#: lib/gai_strerror.c:57
+msgid "Processing request in progress"
+msgstr ""
+
+#: lib/gai_strerror.c:58
+msgid "Request canceled"
+msgstr ""
+
+#: lib/gai_strerror.c:59
+msgid "Request not canceled"
+msgstr ""
+
+#: lib/gai_strerror.c:60
+msgid "All requests done"
+msgstr ""
+
+#: lib/gai_strerror.c:61
+msgid "Interrupted by a signal"
+msgstr ""
+
+#: lib/gai_strerror.c:62
+msgid "Parameter string not correctly encoded"
+msgstr ""
+
+#: lib/gai_strerror.c:74
+#, fuzzy
+msgid "Unknown error"
+msgstr "未知的系统错误"
#: lib/getopt.c:551 lib/getopt.c:570
#, c-format
msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s:选项‘%s’不明确\n"
+msgstr "%s:选项“%s”不明确\n"
#: lib/getopt.c:603 lib/getopt.c:607
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s:选项‘--%s’不可配合参数使用\n"
+msgstr "%s:选项“--%s”不允许参数\n"
#: 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"
+msgstr "%s:选项“%c%s”不允许参数\n"
#: 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"
+msgstr "%s:选项“%s”需要参数\n"
#: lib/getopt.c:727 lib/getopt.c:730
#, c-format
msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s:无法识别的选项‘--%s’\n"
+msgstr "%s:无法识别的选项“--%s”\n"
#: lib/getopt.c:738 lib/getopt.c:741
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s:无法识别的选项‘%c%s’\n"
+msgstr "%s:无法识别的选项“%c%s”\n"
#: lib/getopt.c:796 lib/getopt.c:799
#, c-format
msgid "%s: illegal option -- %c\n"
-msgstr "%s:不合法的选项 ― %c\n"
+msgstr "%s:非法选项 -- %c\n"
#: lib/getopt.c:805 lib/getopt.c:808
#, c-format
msgid "%s: invalid option -- %c\n"
-msgstr "%s:无效的选项 ― %c\n"
+msgstr "%s:无效选项 -- %c\n"
#: 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"
+msgstr "%s:选项需要参数 -- %c\n"
#: lib/getopt.c:935 lib/getopt.c:954
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s:选项‘-W %s’不明确\n"
+msgstr "%s:选项“-W %s”不明确\n"
#: 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"
+msgstr "%s:选项“-W %s”不允许参数\n"
-#: lib/human.c:484
+#: lib/human.c:486
msgid "block size"
msgstr "块大小"
-#: lib/makepath.c:63 src/df.c:512
-msgid "failed to return to initial working directory"
-msgstr ""
-
-#: lib/makepath.c:113 src/copy.c:1353 src/mkdir.c:169
-#, c-format
-msgid "cannot create directory %s"
-msgstr "无法创建目录%s"
-
-#: lib/makepath.c:119 lib/makepath.c:359 src/cp.c:437 src/cp.c:459
+#: lib/mkdir-p.c:106 src/cp.c:430 src/cp.c:452
#, c-format
msgid "%s exists but is not a directory"
-msgstr "%s存在但并非目录。"
+msgstr "%s 存在但并非目录"
-#: lib/makepath.c:254 lib/makepath.c:316 lib/makepath.c:378
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
#, c-format
msgid "cannot change owner and/or group of %s"
-msgstr "无法更改%s的所有者及/或组"
+msgstr "无法更改 %s 的属主和/或组"
+
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266 src/copy.c:1438 src/mkdir.c:167
+#, c-format
+msgid "cannot create directory %s"
+msgstr "无法创建目录 %s"
-#: lib/makepath.c:276
+#: lib/mkdir-p.c:240
#, c-format
msgid "cannot chdir to directory %s"
-msgstr "无法切换到目录%s"
+msgstr "无法切换到目录 %s"
-#: lib/makepath.c:330 lib/makepath.c:345 lib/makepath.c:384 src/install.c:517
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332 src/install.c:524
#, c-format
msgid "cannot change permissions of %s"
-msgstr "无法更改%s的权限"
+msgstr "无法更改 %s 的权限"
-#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 src/csplit.c:233
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 src/csplit.c:237
msgid "memory exhausted"
msgstr "内存用尽"
-#: lib/openat.c:70
+#: lib/openat-die.c:36
#, fuzzy
-msgid "openat: unable to record current working directory"
-msgstr "无法创建目录%s"
+msgid "unable to record current working directory"
+msgstr "openat:无法记录目前工作的目录"
-#: lib/openat.c:85
-#, fuzzy
-msgid "openat: unable to restore working directory"
-msgstr "无法创建目录%s"
-
-#: lib/quotearg.c:240
+#: lib/openat-die.c:49 src/df.c:517
+msgid "failed to return to initial working directory"
+msgstr "返回到初始工作目录失败"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'". If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK). A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:245
msgid "`"
-msgstr "‘"
+msgstr "“"
-#: lib/quotearg.c:241
+#: lib/quotearg.c:246
msgid "'"
-msgstr "’"
+msgstr "”"
#: lib/root-dev-ino.h:19
#, c-format
msgid "it is dangerous to operate recursively on %s"
-msgstr ""
+msgstr "在 %s 进行递归操作十分危险"
#: lib/root-dev-ino.h:23
#, c-format
msgid "it is dangerous to operate recursively on %s (same as %s)"
-msgstr ""
+msgstr "在 %s 进行递归操作十分危险(与 %s 相同)"
#: lib/root-dev-ino.h:25
msgid "use --no-preserve-root to override this failsafe"
@@ -228,187 +321,213 @@ msgstr "^[yY]"
msgid "^[nN]"
msgstr "^[nN]"
-#: lib/unicodeio.c:147
+#: lib/unicodeio.c:157
msgid "iconv function not usable"
-msgstr "iconv 功能无法使用"
+msgstr "iconv 函数无法使用"
-#: lib/unicodeio.c:149
+#: lib/unicodeio.c:159
msgid "iconv function not available"
-msgstr "iconv 功能不存在"
+msgstr "iconv 函数不存在"
-#: lib/unicodeio.c:156
+#: lib/unicodeio.c:166
msgid "character out of range"
msgstr "字符值超出可接受的范围以外"
-#: lib/unicodeio.c:219
+#: lib/unicodeio.c:230
#, c-format
msgid "cannot convert U+%04X to local character set"
msgstr "无法将 U+%04X 转换至用户的字符集"
-#: lib/unicodeio.c:221
+#: lib/unicodeio.c:232
#, c-format
msgid "cannot convert U+%04X to local character set: %s"
msgstr "无法将 U+%04X 转换至用户的字符集:%s"
-#: lib/userspec.c:125
+#: lib/userspec.c:110
msgid "invalid user"
msgstr "无效的用户"
-#: lib/userspec.c:126
+#: lib/userspec.c:111
msgid "invalid group"
msgstr "无效的组"
-#: lib/userspec.c:128
+#: lib/userspec.c:113
msgid "cannot get the login group of a numeric UID"
msgstr "无法取得 UID 数值所表示的用户的主组"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale. Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:72
+msgid "(C)"
+msgstr ""
+
+#: lib/version-etc.c:74
+msgid ""
+"\n"
+"This is free software. You may redistribute copies of it under the terms "
+"of\n"
+"the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+
#. TRANSLATORS: %s denotes an author name.
-#: lib/version-etc.c:81
-#, fuzzy, c-format
+#: lib/version-etc.c:90
+#, c-format
msgid "Written by %s.\n"
msgstr "由 %s 编写。\n"
#. TRANSLATORS: Each %s denotes an author name.
-#: lib/version-etc.c:85
-#, fuzzy, c-format
+#: lib/version-etc.c:94
+#, c-format
msgid "Written by %s and %s.\n"
-msgstr "由 %s 编写。\n"
+msgstr "由 %s 和 %s 编写。\n"
#. TRANSLATORS: Each %s denotes an author name.
-#: lib/version-etc.c:89
-#, fuzzy, c-format
+#: lib/version-etc.c:98
+#, c-format
msgid "Written by %s, %s, and %s.\n"
-msgstr "由 %s 编写。\n"
+msgstr "由 %s、%s 和 %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:95
-#, fuzzy, c-format
+#: lib/version-etc.c:104
+#, c-format
msgid ""
"Written by %s, %s, %s,\n"
"and %s.\n"
-msgstr "由 %s 编写。\n"
+msgstr ""
+"由 %s、%s、%s 和\n"
+"%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:101
-#, fuzzy, c-format
+#: lib/version-etc.c:110
+#, c-format
msgid ""
"Written by %s, %s, %s,\n"
"%s, and %s.\n"
-msgstr "由 %s 编写。\n"
+msgstr ""
+"由 %s、%s、%s、\n"
+"%s 和 %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:107
-#, fuzzy, c-format
+#: lib/version-etc.c:116
+#, c-format
msgid ""
"Written by %s, %s, %s,\n"
"%s, %s, and %s.\n"
-msgstr "由 %s 编写。\n"
+msgstr ""
+"由 %s、%s、%s、\n"
+"%s、%s 和 %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:114
-#, fuzzy, c-format
+#: lib/version-etc.c:123
+#, c-format
msgid ""
"Written by %s, %s, %s,\n"
"%s, %s, %s, and %s.\n"
-msgstr "由 %s 编写。\n"
+msgstr ""
+"由 %s、%s、%s、\n"
+"%s、%s、%s 和 %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:121
-#, fuzzy, c-format
+#: lib/version-etc.c:130
+#, c-format
msgid ""
"Written by %s, %s, %s,\n"
"%s, %s, %s, %s,\n"
"and %s.\n"
-msgstr "由 %s 编写。\n"
+msgstr ""
+"由 %s、%s、%s、\n"
+"%s、%s、%s、%s\n"
+"和 %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:129
-#, fuzzy, c-format
+#: lib/version-etc.c:138
+#, c-format
msgid ""
"Written by %s, %s, %s,\n"
"%s, %s, %s, %s,\n"
"%s, and %s.\n"
-msgstr "由 %s 编写。\n"
+msgstr ""
+"由 %s、%s、%s、\n"
+"%s、%s、%s、%s、\n"
+"%s、和 %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:139
-#, fuzzy, c-format
+#: lib/version-etc.c:148
+#, c-format
msgid ""
"Written by %s, %s, %s,\n"
"%s, %s, %s, %s,\n"
"%s, %s, and others.\n"
-msgstr "由 %s 编写。\n"
-
-#: 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"
msgstr ""
-"这是自由软件;请参考原始码的版权声明。本软体不提供任何保证,甚至不会包括\n"
-"可售性或适用於任何特定目的的保证。\n"
+"由 %s、%s、%s、\n"
+"%s、%s、%s、%s、\n"
+"%s、%s、和其他人编写。\n"
#: lib/xfts.c:60
-#, fuzzy, c-format
+#, c-format
msgid "invalid argument: %s"
-msgstr "%2$s 的参数 %1$s 无效"
+msgstr "无效的参数:%s"
-#: lib/xmemcoll.c:50 src/expr.c:737
+#: lib/xmemcoll.c:50 src/expr.c:741
msgid "string comparison failed"
-msgstr "字串比较出现错误"
+msgstr "字符串比较出现错误"
-#: lib/xmemcoll.c:51 src/expr.c:738
+#: lib/xmemcoll.c:51 src/expr.c:742
msgid "Set LC_ALL='C' to work around the problem."
msgstr "请设定 LC_ALL='C' 避免问题出现。"
-#: lib/xmemcoll.c:53 src/expr.c:740
+#: lib/xmemcoll.c:53 src/expr.c:744
#, c-format
msgid "The strings compared were %s and %s."
-msgstr "要比较的字串为 %s 和 %s。"
-
-#: 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
+msgstr "要比较的字符串为 %s 和 %s。"
+
+#: src/basename.c:51 src/cat.c:91 src/chgrp.c:104 src/chmod.c:322
+#: src/chown.c:90 src/chroot.c:42 src/cksum.c:264 src/comm.c:69 src/cp.c:152
+#: src/csplit.c:1448 src/cut.c:184 src/date.c:128 src/dd.c:397 src/df.c:711
+#: src/dircolors.c:100 src/dirname.c:45 src/du.c:268 src/echo.c:60
+#: src/env.c:114 src/expand.c:107 src/expr.c:97 src/factor.c:71 src/fmt.c:269
+#: src/fold.c:66 src/head.c:105 src/hostid.c:44 src/hostname.c:61 src/id.c:74
+#: src/install.c:629 src/join.c:130 src/kill.c:90 src/link.c:47 src/ln.c:332
+#: src/logname.c:40 src/ls.c:4088 src/md5sum.c:104 src/mkdir.c:54
+#: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:294 src/nice.c:75 src/nl.c:168
+#: src/nohup.c:53 src/od.c:303 src/paste.c:413 src/pathchk.c:95
+#: src/pinky.c:510 src/pr.c:2764 src/printenv.c:57 src/printf.c:96
+#: src/ptx.c:1883 src/pwd.c:62 src/readlink.c:63 src/rm.c:131 src/rmdir.c:135
+#: src/seq.c:78 src/setuidgid.c:47 src/shred.c:151 src/sleep.c:44
+#: src/sort.c:277 src/split.c:103 src/stat.c:674 src/stty.c:507 src/su.c:404
+#: src/sum.c:55 src/sync.c:41 src/tac.c:128 src/tail.c:225 src/tee.c:58
+#: src/test.c:689 src/touch.c:229 src/tr.c:286 src/tsort.c:82 src/tty.c:65
+#: src/uname.c:113 src/unexpand.c:117 src/uniq.c:131 src/unlink.c:47
+#: src/uptime.c:176 src/users.c:104 src/wc.c:123 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"
+msgstr "请尝试执行“%s --help”来获取更多信息。\n"
#: src/basename.c:55
-#, fuzzy, c-format
+#, c-format
msgid ""
"Usage: %s NAME [SUFFIX]\n"
" or: %s OPTION\n"
msgstr ""
-"用法:%s 文件\n"
+"用法:%s 名称 [后缀]\n"
" 或:%s 选项\n"
#: src/basename.c:60
@@ -417,64 +536,73 @@ msgid ""
"If specified, also remove a trailing SUFFIX.\n"
"\n"
msgstr ""
+"去掉前导的目录部分后打印“名称”。\n"
+"如果指定的话,还会去掉尾随的“后缀”。\n"
-#: 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
-#, fuzzy, c-format
+#: src/basename.c:67
+#, c-format
+msgid ""
+"\n"
+"Examples:\n"
+" %s /usr/bin/sort Output \"sort\".\n"
+" %s include/stdio.h .h Output \"stdio\".\n"
+msgstr ""
+
+#: src/basename.c:74 src/cat.c:128 src/chgrp.c:159 src/chmod.c:353
+#: src/chown.c:159 src/chroot.c:60 src/cksum.c:279 src/comm.c:94 src/cp.c:251
+#: src/csplit.c:1490 src/cut.c:235 src/date.c:241 src/dd.c:499 src/df.c:750
+#: src/dircolors.c:121 src/dirname.c:68 src/du.c:335 src/echo.c:98
+#: src/env.c:133 src/expand.c:132 src/expr.c:165 src/factor.c:91 src/fmt.c:300
+#: src/fold.c:89 src/head.c:140 src/hostid.c:57 src/hostname.c:74 src/id.c:95
+#: src/install.c:687 src/join.c:171 src/kill.c:121 src/link.c:59 src/ln.c:390
+#: src/logname.c:51 src/ls.c:4233 src/md5sum.c:152 src/mkdir.c:73
+#: src/mkfifo.c:68 src/mknod.c:82 src/mv.c:345 src/nice.c:91 src/nl.c:224
+#: src/nohup.c:70 src/od.c:393 src/paste.c:437 src/pathchk.c:109
+#: src/pinky.c:537 src/pr.c:2876 src/printenv.c:71 src/printf.c:145
+#: src/ptx.c:1930 src/pwd.c:74 src/readlink.c:87 src/rm.c:174 src/rmdir.c:154
+#: src/seq.c:106 src/setuidgid.c:67 src/shred.c:224 src/sleep.c:60
+#: src/sort.c:350 src/split.c:137 src/stat.c:747 src/stty.c:724 src/su.c:425
+#: src/sum.c:75 src/sync.c:52 src/tac.c:151 src/tail.c:296 src/tee.c:75
+#: src/test.c:776 src/touch.c:263 src/tr.c:359 src/true.c:54 src/tsort.c:94
+#: src/tty.c:77 src/uname.c:136 src/unexpand.c:141 src/uniq.c:170
+#: src/unlink.c:58 src/uptime.c:191 src/users.c:117 src/wc.c:145 src/who.c:672
+#: src/whoami.c:58 src/yes.c:58
+#, c-format
msgid ""
"\n"
"Report bugs to <%s>.\n"
msgstr ""
"\n"
-"请向 <bug-fileutils@gnu.org> 报告错误。"
+"请向 <%s> 报告错误。\n"
-#: 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/basename.c:118 src/chgrp.c:268 src/chmod.c:473 src/chown.c:295
+#: src/chroot.c:84 src/comm.c:270 src/csplit.c:1385 src/dirname.c:95
+#: src/expr.c:203 src/join.c:914 src/link.c:83 src/mkdir.c:120
+#: src/mkfifo.c:111 src/mknod.c:140 src/nohup.c:96 src/pathchk.c:158
+#: src/printf.c:669 src/readlink.c:146 src/rm.c:265 src/rmdir.c:197
+#: src/seq.c:367 src/setuidgid.c:95 src/sleep.c:122 src/stat.c:805
#: src/tr.c:1723 src/unlink.c:81
-#, fuzzy
msgid "missing operand"
-msgstr "缺少了文件参数"
+msgstr "缺少了操作对象"
-#: 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
+#: src/basename.c:124 src/comm.c:278 src/cp.c:519 src/date.c:428
+#: src/dircolors.c:449 src/dirname.c:101 src/du.c:922 src/hostid.c:82
+#: src/hostname.c:120 src/id.c:160 src/install.c:326 src/join.c:748
+#: src/link.c:91 src/ln.c:510 src/logname.c:76 src/mknod.c:151 src/mv.c:458
+#: src/od.c:1840 src/ptx.c:2182 src/readlink.c:154 src/seq.c:373
+#: src/split.c:533 src/tr.c:1738 src/tsort.c:552 src/tty.c:117 src/uname.c:222
+#: src/uniq.c:435 src/uniq.c:452 src/unlink.c:87 src/uptime.c:223
+#: src/users.c:149 src/who.c:826 src/whoami.c:84
+#, c-format
msgid "extra operand %s"
-msgstr "无法保留%s的时间"
+msgstr "额外的操作对象 %s"
-#: src/cat.c:89
-#, fuzzy, c-format
+#: src/cat.c:95
+#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
-msgstr "用法:%s [选项] 文件...\n"
+msgstr "用法:%s [选项] [文件]...\n"
-#: src/cat.c:93
+#: src/cat.c:99
msgid ""
"Concatenate FILE(s), or standard input, to standard output.\n"
"\n"
@@ -486,7 +614,7 @@ msgid ""
" -s, --squeeze-blank never more than one single blank line\n"
msgstr ""
-#: src/cat.c:103
+#: src/cat.c:109
msgid ""
" -t equivalent to -vT\n"
" -T, --show-tabs display TAB characters as ^I\n"
@@ -494,49 +622,45 @@ msgid ""
" -v, --show-nonprinting use ^ and M- notation, except for LFD and TAB\n"
msgstr ""
-#: src/cat.c:111 src/fmt.c:296 src/sum.c:71
+#: src/cat.c:117 src/fmt.c:296 src/sum.c:71
msgid ""
"\n"
"With no FILE, or when FILE is -, read standard input.\n"
msgstr ""
-#: src/cat.c:116
+#: src/cat.c:121
+#, c-format
msgid ""
"\n"
-" -B, --binary use binary writes to the console device.\n"
-"\n"
+"Examples:\n"
+" %s f - g Output f's contents, then standard input, then g's contents.\n"
+" %s Copy standard input to standard output.\n"
msgstr ""
-#: src/cat.c:309
+#: src/cat.c:316
#, fuzzy, c-format
-msgid "cannot do ioctl on `%s'"
-msgstr "无法打开目录%s"
+msgid "cannot do ioctl on %s"
+msgstr "无法在“%s”上执行 ioctrl"
-#: src/cat.c:650 src/dd.c:1487 src/sort.c:265 src/tee.c:157 src/yes.c:92
+#: src/cat.c:625 src/dd.c:1630 src/sort.c:269 src/tee.c:163 src/yes.c:92
msgid "standard output"
msgstr "标准输出"
-#: src/cat.c:781
-#, fuzzy, c-format
+#: src/cat.c:702
+#, c-format
msgid "%s: input file is output file"
-msgstr "%s:文件大小无效"
+msgstr "%s:输入文件是输出文件"
-#: src/cat.c:846
-#, fuzzy
+#: src/cat.c:767
msgid "closing standard input"
-msgstr "标准输入"
+msgstr "关闭标准输入"
-#: src/cat.c:849
-#, fuzzy
-msgid "closing standard output"
-msgstr "标准输出"
-
-#: src/chgrp.c:95 src/install.c:616
+#: src/chgrp.c:91 src/install.c:614
#, c-format
msgid "invalid group %s"
msgstr "无效的组 %s"
-#: src/chgrp.c:112
+#: src/chgrp.c:108
#, c-format
msgid ""
"Usage: %s [OPTION]... GROUP FILE...\n"
@@ -545,7 +669,7 @@ msgstr ""
"用法:%s [选项]... 组 文件...\n"
" 或:%s [选项]... --reference=参考文件 文件...\n"
-#: src/chgrp.c:117
+#: src/chgrp.c:113
#, fuzzy
msgid ""
"Change the group of each FILE to GROUP.\n"
@@ -561,7 +685,7 @@ msgstr ""
" -c, --changes 像 --verbose,但只在有更改时才显示结果\n"
" --dereference 会影响符号链接所指示的对象,而非符号链接本身\n"
-#: src/chgrp.c:125 src/chown.c:107
+#: src/chgrp.c:121 src/chown.c:107
#, fuzzy
msgid ""
" -h, --no-dereference affect each symbolic link instead of any "
@@ -572,13 +696,13 @@ msgstr ""
" -h, --no-dereference 会影响符号链接本身,而非符号链接所指示的目的地\n"
" (当系统支持更改符号链接的所有者,此选项才有效)\n"
-#: src/chgrp.c:130 src/chown.c:119
+#: src/chgrp.c:126 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:134
+#: src/chgrp.c:130
#, fuzzy
msgid ""
" -f, --silent, --quiet suppress most error messages\n"
@@ -593,7 +717,7 @@ msgstr ""
" -R, --recursive 递归处理所有的文件及子目录\n"
" -v, --verbose 处理任何文件都会显示信息\n"
-#: src/chgrp.c:142 src/chown.c:131
+#: src/chgrp.c:138 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"
@@ -607,79 +731,92 @@ msgid ""
"\n"
msgstr ""
-#: src/chgrp.c:246 src/chown.c:268
-msgid "-R --dereference requires either -H or -L"
+#: src/chgrp.c:152
+#, c-format
+msgid ""
+"\n"
+"Examples:\n"
+" %s staff /u Change the group of /u to \"staff\".\n"
+" %s -hR staff /u Change the group of /u and subfiles to \"staff\".\n"
msgstr ""
-#: src/chgrp.c:252 src/chown.c:274
+#: src/chgrp.c:249 src/chown.c:276
+msgid "-R --dereference requires either -H or -L"
+msgstr "-R --dereference 需要 -H 或 -L 其中之一"
+
+#: src/chgrp.c:255 src/chown.c:282
msgid "-R -h requires -P"
-msgstr ""
+msgstr "-R -h 需要 -P"
-#: 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/chgrp.c:270 src/chmod.c:475 src/chown.c:297 src/comm.c:272
+#: src/csplit.c:1387 src/join.c:916 src/link.c:85 src/mknod.c:142
#: src/setuidgid.c:97 src/tr.c:1726
-#, fuzzy, c-format
+#, c-format
msgid "missing operand after %s"
-msgstr "缺少了文件参数"
+msgstr "%s 后缺少操作对象"
-#: 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
+#: src/chgrp.c:278 src/chmod.c:483 src/chmod.c:502 src/chown.c:305
+#: src/chown.c:334 src/cp.c:295 src/pwd.c:282 src/rm.c:275 src/touch.c:159
+#: src/touch.c:353
#, c-format
msgid "failed to get attributes of %s"
msgstr "无法取得 %s 的属性"
-#: src/chmod.c:120
+#: src/chmod.c:128
#, c-format
msgid "getting new attributes of %s"
-msgstr "正在检查 %s 的最新属性"
+msgstr "检查 %s 的新属性"
-#: src/chmod.c:142 src/chown-core.c:116
+#: src/chmod.c:150 src/chown-core.c:111
#, c-format
msgid "neither symbolic link %s nor referent has been changed\n"
msgstr "符号链接 %s 和该链接所指示的对象都没有更改\n"
-#: src/chmod.c:152
+#: src/chmod.c:160
#, c-format
msgid "mode of %s changed to %04lo (%s)\n"
msgstr "%s 的权限模式已更改为 %04lo (%s)\n"
-#: src/chmod.c:155
+#: src/chmod.c:163
#, c-format
msgid "failed to change mode of %s to %04lo (%s)\n"
msgstr "无法将 %s 的权限模式更改为 %04lo (%s)\n"
-#: src/chmod.c:158
+#: src/chmod.c:166
#, c-format
msgid "mode of %s retained as %04lo (%s)\n"
msgstr "%s 的权限模式保留为 %04lo (%s)\n"
-#: src/chmod.c:188 src/chown-core.c:278 src/copy.c:159 src/du.c:346
+#: src/chmod.c:196 src/chown-core.c:273 src/copy.c:164 src/du.c:486
#, c-format
msgid "cannot access %s"
-msgstr "无法访问%s"
+msgstr "无法访问 %s"
-#: src/chmod.c:193 src/chown-core.c:283 src/du.c:351
+#: src/chmod.c:201 src/chown-core.c:278 src/du.c:491
#, c-format
msgid "%s"
-msgstr ""
+msgstr "%s"
-#: src/chmod.c:198 src/chown-core.c:288 src/du.c:357
-#, fuzzy, c-format
+#: src/chmod.c:206 src/chown-core.c:283 src/du.c:497
+#, c-format
msgid "cannot read directory %s"
-msgstr "无法创建目录%s"
+msgstr "无法读取目录 %s"
-#: src/chmod.c:227
+#: src/chmod.c:233
#, c-format
msgid "changing permissions of %s"
-msgstr "正在更改 %s 的权限"
+msgstr "更改 %s 的权限"
-#: src/chmod.c:277 src/chown-core.c:472 src/du.c:505
-#, fuzzy
+#: src/chmod.c:267
+#, fuzzy, c-format
+msgid "%s: new permissions are %s, not %s"
+msgstr "设定 %s 的权限"
+
+#: src/chmod.c:301 src/chown-core.c:467 src/du.c:641
msgid "fts_read failed"
-msgstr "strip 出现错误"
+msgstr "fts_read 失败"
-#: src/chmod.c:302
+#: src/chmod.c:326
#, c-format
msgid ""
"Usage: %s [OPTION]... MODE[,MODE]... FILE...\n"
@@ -690,7 +827,7 @@ msgstr ""
" 或:%s [选项]... 八进制模式 文件...\n"
" 或:%s [选项]... --reference=参考文件 文件...\n"
-#: src/chmod.c:308
+#: src/chmod.c:332
msgid ""
"Change the mode of each FILE to MODE.\n"
"\n"
@@ -698,13 +835,13 @@ msgid ""
"made\n"
msgstr ""
-#: src/chmod.c:313
+#: src/chmod.c:337
msgid ""
" --no-preserve-root do not treat `/' specially (the default)\n"
" --preserve-root fail to operate recursively on `/'\n"
msgstr ""
-#: src/chmod.c:317
+#: src/chmod.c:341
#, fuzzy
msgid ""
" -f, --silent, --quiet suppress most error messages\n"
@@ -720,93 +857,88 @@ msgstr ""
" --reference=参考文件 使用<参考文件>的模式,而非自行指定权限模式\n"
" -R, --recursive 以递归方式更改所有的文件及子目录\n"
-#: src/chmod.c:325
+#: src/chmod.c:349
msgid ""
"\n"
-"Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
-"one or more of the letters rwxXstugo.\n"
+"Each MODE is of the form `[ugoa]*([-+=]([rwxXst]*|[ugo]))+'.\n"
msgstr ""
-"\n"
-"<模式>由三部份组成:一个或以上的 ugoa 字母,一个或以上的 +-= 符号,\n"
-"和一个或以上的 rwxXstugo 字母。\n"
-#: src/chmod.c:432
-#, fuzzy
+#: src/chmod.c:460
msgid "cannot combine mode and --reference options"
-msgstr "无法决定 %s 所在的设备及 inode"
+msgstr ""
-#: src/chmod.c:453
-#, fuzzy, c-format
+#: src/chmod.c:491
+#, c-format
msgid "invalid mode: %s"
-msgstr "无效的权限模式%s"
+msgstr "无效模式:%s"
-#: src/chown-core.c:142
+#: src/chown-core.c:137
#, c-format
msgid "changed ownership of %s to %s\n"
msgstr "%s 的所有者已更改为 %s\n"
-#: src/chown-core.c:143
+#: src/chown-core.c:138
#, c-format
msgid "changed group of %s to %s\n"
msgstr "%s 的所属组已更改为 %s\n"
-#: src/chown-core.c:144
-#, fuzzy, c-format
+#: src/chown-core.c:139
+#, c-format
msgid "no change to ownership of %s\n"
-msgstr "无法更改%s的权限"
+msgstr "%s 的归属关系未更改\n"
-#: src/chown-core.c:147
+#: src/chown-core.c:142
#, c-format
msgid "failed to change ownership of %s to %s\n"
msgstr "无法更改 %s 的所有者为 %s\n"
-#: src/chown-core.c:148
+#: src/chown-core.c:143
#, c-format
msgid "failed to change group of %s to %s\n"
msgstr "无法更改 %s 的所属组为 %s\n"
-#: src/chown-core.c:149
+#: src/chown-core.c:144
#, fuzzy, c-format
msgid "failed to change ownership of %s\n"
msgstr "无法更改 %s 的所有者为 %s\n"
-#: src/chown-core.c:152
+#: src/chown-core.c:147
#, c-format
msgid "ownership of %s retained as %s\n"
msgstr "%s 的所有者已保留为 %s\n"
-#: src/chown-core.c:153
+#: src/chown-core.c:148
#, c-format
msgid "group of %s retained as %s\n"
msgstr "%s 的所属组已保留为 %s\n"
-#: src/chown-core.c:154
+#: src/chown-core.c:149
#, fuzzy, c-format
msgid "ownership of %s retained\n"
msgstr "%s 的所有者已保留为 %s\n"
-#: src/chown-core.c:318
-#, fuzzy, c-format
+#: src/chown-core.c:313
+#, c-format
msgid "cannot dereference %s"
-msgstr "无法 lseek%s"
+msgstr "无法取消 %s 的引用"
-#: src/chown-core.c:405
+#: src/chown-core.c:400
#, c-format
msgid "changing ownership of %s"
msgstr "正在更改 %s 的所有者"
-#: src/chown-core.c:406
+#: src/chown-core.c:401
#, c-format
msgid "changing group of %s"
msgstr "正在更改 %s 的所属组"
#: src/chown.c:94
-#, fuzzy, c-format
+#, c-format
msgid ""
"Usage: %s [OPTION]... [OWNER][:[GROUP]] FILE...\n"
" or: %s [OPTION]... --reference=RFILE FILE...\n"
msgstr ""
-"用法:%s [选项]... 组 文件...\n"
+"用法:%s [选项]... [所有者][:[组]] 文件...\n"
" 或:%s [选项]... --reference=参考文件 文件...\n"
#: src/chown.c:99
@@ -866,16 +998,26 @@ msgid ""
msgstr ""
"\n"
"如果没有指定<所有者>,则不会更改。<组>若没有指定也不会更改,但当加上\n"
-"‘:’时<组>会更改为指定所有者的主要组。<所有者>和<组>可以是数字\n"
+"“:”时<组>会更改为指定所有者的主要组。<所有者>和<组>可以是数字\n"
"或名称。\n"
+#: src/chown.c:151
+#, c-format
+msgid ""
+"\n"
+"Examples:\n"
+" %s root /u Change the owner of /u to \"root\".\n"
+" %s root:staff /u Likewise, but also change its group to \"staff\".\n"
+" %s -hR root /u Change the owner of /u and subfiles to \"root\".\n"
+msgstr ""
+
#: src/chroot.c:46
-#, fuzzy, c-format
+#, c-format
msgid ""
"Usage: %s NEWROOT [COMMAND...]\n"
" or: %s OPTION\n"
msgstr ""
-"用法:%s 文件\n"
+"用法:%s 新根用户 [命令...]\n"
" 或:%s 选项\n"
#: src/chroot.c:50
@@ -891,44 +1033,45 @@ msgid ""
msgstr ""
#: src/chroot.c:89
-#, fuzzy, c-format
+#, c-format
msgid "cannot change root directory to %s"
-msgstr "无法进入目录 %s"
+msgstr "无法将根目录切换到 %s"
#: src/chroot.c:92
-#, fuzzy
msgid "cannot chdir to root directory"
-msgstr "无法切换到目录%s"
+msgstr "无法切换到根目录"
-#: src/chroot.c:115 src/nohup.c:181 src/setuidgid.c:124
+#: src/chroot.c:115 src/nohup.c:184 src/setuidgid.c:124
#, fuzzy, c-format
msgid "cannot run command %s"
msgstr "无法解除%s的链接"
-#: src/cksum.c:221
-#, fuzzy, c-format
+#: src/cksum.c:220
+#, c-format
msgid "%s: file too long"
-msgstr "%s:文件过大"
+msgstr "%s:文件太长"
-#: src/cksum.c:269
-#, fuzzy, c-format
+#: src/cksum.c:268
+#, c-format
msgid ""
"Usage: %s [FILE]...\n"
" or: %s [OPTION]\n"
msgstr ""
-"用法:%s 文件\n"
-" 或:%s 选项\n"
+"用法:%s [文件]...\n"
+" 或:%s [选项]\n"
-#: src/cksum.c:274
+#: src/cksum.c:273
msgid ""
"Print CRC checksum and byte counts of each FILE.\n"
"\n"
msgstr ""
+"打印每个文件的 CRC 校验和及字节统计。\n"
+"\n"
-#: src/comm.c:73 src/join.c:158
-#, fuzzy, c-format
+#: src/comm.c:73 src/join.c:134
+#, c-format
msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
-msgstr "用法:%s [选项]... [文件]\n"
+msgstr "用法:%s [选项]... [文件1] [文件2]\n"
#: src/comm.c:77
msgid "Compare sorted files FILE1 and FILE2 line by line.\n"
@@ -950,272 +1093,271 @@ msgid ""
" -3 suppress lines that appear in both files\n"
msgstr ""
-#: src/copy.c:221 src/du.c:734 src/fmt.c:431 src/head.c:866 src/tac.c:536
-#: src/tail.c:1299
+#: src/copy.c:229 src/csplit.c:647 src/du.c:929 src/fmt.c:431 src/head.c:849
+#: src/split.c:540 src/tac.c:543 src/tail.c:1293
#, c-format
msgid "cannot open %s for reading"
-msgstr "无法打开 %s 来读取数据"
+msgstr "无法打开 %s 读取数据"
-#: src/copy.c:227 src/copy.c:281 src/copy.c:301 src/dd.c:1516 src/tail.c:1131
-#: src/tail.c:1201
+#: src/copy.c:235 src/copy.c:289 src/copy.c:309 src/dd.c:1673 src/tail.c:1129
+#: src/tail.c:1195
#, c-format
msgid "cannot fstat %s"
-msgstr "无法 fstat%s"
+msgstr "无法 fstat %s"
-#: src/copy.c:237
+#: src/copy.c:245
#, c-format
msgid "skipping file %s, as it was replaced while being copied"
-msgstr "略过文件%s,因为准备复制时它已被其他文件取代"
+msgstr "跳过文件 %s,因为准备复制时它已被其它文件替代"
-#: 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
+#: src/copy.c:265 src/copy.c:984 src/copy.c:1173 src/copy.c:1274 src/ln.c:306
+#: src/remove.c:769 src/remove.c:806 src/remove.c:946 src/remove.c:1073
+#: src/remove.c:1192
#, c-format
msgid "cannot remove %s"
-msgstr "无法删除%s"
+msgstr "无法删除 %s"
-#: src/copy.c:272
+#: src/copy.c:280
#, c-format
msgid "cannot create regular file %s"
msgstr "无法创建一般文件%s"
-#: src/copy.c:330 src/dd.c:1017 src/dd.c:1276
+#: src/copy.c:338 src/dd.c:1153 src/dd.c:1432
#, c-format
msgid "reading %s"
-msgstr "正在读入%s"
+msgstr "读入 %s"
-#: src/copy.c:364 src/head.c:437
+#: src/copy.c:372 src/head.c:428
#, c-format
msgid "cannot lseek %s"
-msgstr "无法 lseek%s"
+msgstr "无法 lseek %s"
-#: src/copy.c:379 src/copy.c:403 src/dd.c:1333 src/dd.c:1395
+#: src/copy.c:387 src/copy.c:411 src/dd.c:1489 src/dd.c:1551
#, c-format
msgid "writing %s"
-msgstr "正在写入%s"
+msgstr "写入 %s"
-#: src/copy.c:411 src/copy.c:417 src/head.c:874
+#: src/copy.c:425 src/copy.c:1647
+#, c-format
+msgid "preserving times for %s"
+msgstr "保留 %s 的时间"
+
+#: src/copy.c:442 src/copy.c:1602 src/copy.c:1661 src/cp.c:324
+#, c-format
+msgid "failed to preserve ownership for %s"
+msgstr "保留 %s 的所有者失败"
+
+#: src/copy.c:468 src/copy.c:1698
+#, c-format
+msgid "setting permissions for %s"
+msgstr "设定 %s 的权限"
+
+#: src/copy.c:481 src/copy.c:487 src/head.c:857 src/touch.c:191
#, c-format
msgid "closing %s"
-msgstr "正在关闭%s"
+msgstr "关闭 %s"
-#: src/copy.c:636
+#: src/copy.c:706
#, c-format
msgid "%s: overwrite %s, overriding mode %04lo? "
-msgstr "%s:是否覆盖%s,而不理会权限模式 %04lo? "
+msgstr "%s:是否覆盖 %s,而不理会权限模式 %04lo?"
-#: src/copy.c:642
+#: src/copy.c:712
#, c-format
msgid "%s: overwrite %s? "
msgstr "%s:是否覆盖%s? "
-#: src/copy.c:836 src/copy.c:874 src/df.c:489 src/stat.c:600
+#: src/copy.c:927 src/copy.c:965 src/df.c:494 src/install.c:445 src/stat.c:631
#, c-format
msgid "cannot stat %s"
-msgstr "stat%s失败"
+msgstr "无法 stat %s"
-#: src/copy.c:846
+#: src/copy.c:937
#, c-format
msgid "omitting directory %s"
-msgstr "略过目录%s"
+msgstr "略过目录 %s"
-#: src/copy.c:860
+#: src/copy.c:951
#, c-format
msgid "warning: source file %s specified more than once"
-msgstr "警告:指定来源文件%s多於一次"
+msgstr "警告:指定来源文件 %s 多于一次"
-#: src/copy.c:905 src/ln.c:231
+#: src/copy.c:997 src/ln.c:230
#, c-format
msgid "%s and %s are the same file"
-msgstr "%s及%s为同一文件"
+msgstr "%s 及 %s 为同一文件"
-#: src/copy.c:915
+#: src/copy.c:1007
#, c-format
msgid "cannot overwrite non-directory %s with directory %s"
-msgstr "无法以目录%2$s来覆盖非目录%1$s"
+msgstr "无法以目录 %2$s 来覆盖非目录 %1$s"
-#: src/copy.c:932
+#: src/copy.c:1024
#, c-format
msgid "will not overwrite just-created %s with %s"
-msgstr "不会以%2$s覆盖刚创建的%1$s"
+msgstr "不会以 %2$s 覆盖刚创建的 %1$s"
-#: src/copy.c:943
+#: src/copy.c:1035
#, c-format
msgid "cannot overwrite directory %s with non-directory"
-msgstr "无法以非目录来覆盖目录%s"
+msgstr "无法以非目录来覆盖目录 %s"
-#: src/copy.c:1016
+#: src/copy.c:1101
#, c-format
msgid "cannot overwrite directory %s"
-msgstr "无法覆盖目录%s"
+msgstr "无法覆盖目录 %s"
-#: src/copy.c:1025
+#: src/copy.c:1110
#, c-format
msgid "cannot move directory onto non-directory: %s -> %s"
-msgstr "无法将目录移动至非目录:%s→%s"
+msgstr "无法将目录移动至非目录:%s -> %s"
-#: src/copy.c:1046
+#: src/copy.c:1131
#, c-format
msgid "backing up %s would destroy source; %s not moved"
-msgstr "将%s备份会破坏来源文件,故不移动%s。"
+msgstr "备份 %s 会破坏源文件;未移动 %s"
-#: src/copy.c:1047
+#: src/copy.c:1132
#, c-format
msgid "backing up %s would destroy source; %s not copied"
-msgstr "将%s备份会破坏来源文件,故不复制%s。"
+msgstr "备份 %s 会破坏源文件;未复制 %s"
-#: src/copy.c:1066 src/ln.c:261
+#: src/copy.c:1151 src/ln.c:261
#, c-format
msgid "cannot backup %s"
-msgstr "无法备份%s"
+msgstr "无法备份 %s"
-#: src/copy.c:1103 src/ln.c:277
+#: src/copy.c:1188 src/ln.c:277
#, c-format
msgid " (backup: %s)"
msgstr " (备份:%s)"
-#: src/copy.c:1166
+#: src/copy.c:1251
#, c-format
msgid "cannot copy a directory, %s, into itself, %s"
-msgstr "无法将目录%s复制至原来位置%s"
+msgstr "无法将目录 %s 复制到自己 %s"
-#: src/copy.c:1173
+#: src/copy.c:1258
#, c-format
msgid "will not create hard link %s to directory %s"
-msgstr "不会创建连至目录%2$s的硬链接%1$s"
+msgstr "不会创建指向目录 %2$s 的硬链接 %1$s"
-#: src/copy.c:1197
+#: src/copy.c:1282
#, c-format
msgid "cannot create hard link %s to %s"
-msgstr "无法创建连至%2$s的硬链接%1$s"
+msgstr "无法创建指向 %2$s 的硬链接 %1$s"
-#: src/copy.c:1251
+#: src/copy.c:1336
#, c-format
msgid "cannot move %s to a subdirectory of itself, %s"
-msgstr "无法将目录%s移动至本身的子目录%s下"
+msgstr "无法将目录 %s 移动至自身的子目录 %s 下"
-#: src/copy.c:1294
+#: src/copy.c:1379
#, c-format
msgid "cannot move %s to %s"
-msgstr "无法移动%s至%s"
+msgstr "无法将 %s 移动至 %s"
-#: src/copy.c:1306
+#: src/copy.c:1391
#, c-format
msgid "inter-device move failed: %s to %s; unable to remove target"
-msgstr "无法进行跨设备的移动 (%s至%s);无法删除目标文件或目录"
+msgstr "无法进行跨设备的移动:%s 至 %s;无法删除目标"
-#: src/copy.c:1334
+#: src/copy.c:1419
#, c-format
msgid "cannot copy cyclic symbolic link %s"
-msgstr "无法复制循环的符号链接%s"
+msgstr "无法复制循环的符号链接 %s"
-#: src/copy.c:1411
+#: src/copy.c:1496
#, c-format
msgid "%s: can make relative symbolic links only in current directory"
-msgstr "%s:只能於目前的目录中创建相对符号链接"
+msgstr "%s:只能于当前目录中创建相对的符号链接"
-#: src/copy.c:1418
+#: src/copy.c:1503
#, c-format
msgid "cannot create symbolic link %s to %s"
-msgstr "无法创建连至%2$s的符号链接%1$s"
+msgstr "无法创建指向 %2$s 的符号链接 %1$s"
-#: src/copy.c:1429
+#: src/copy.c:1514
#, c-format
msgid "cannot create link %s"
-msgstr "无法创建链接%s"
+msgstr "无法创建链接 %s"
-#: src/copy.c:1451 src/mkfifo.c:132
+#: src/copy.c:1536 src/mkfifo.c:129
#, c-format
msgid "cannot create fifo %s"
-msgstr "无法创建 fifo 文件%s"
+msgstr "无法创建先进先出文件 %s"
-#: src/copy.c:1462
+#: src/copy.c:1547
#, c-format
msgid "cannot create special file %s"
-msgstr "无法创建特殊文件%s"
+msgstr "无法创建特殊文件 %s"
-#: src/copy.c:1474 src/ls.c:2702 src/stat.c:387
+#: src/copy.c:1559 src/ls.c:2725 src/stat.c:417
#, c-format
msgid "cannot read symbolic link %s"
-msgstr "无法读取符号链接%s"
+msgstr "无法读取符号链接 %s"
-#: src/copy.c:1500
+#: src/copy.c:1585
#, c-format
msgid "cannot create symbolic link %s"
-msgstr "无法创建符号链接%s"
+msgstr "无法创建符号链接 %s"
-#: 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:1531
+#: src/copy.c:1617
#, c-format
msgid "%s has unknown file type"
-msgstr "%s的文件类型不详"
+msgstr "%s 的文件类型不详"
-#: src/copy.c:1564
+#: src/copy.c:1673
#, c-format
-msgid "preserving times for %s"
-msgstr "保留%s的时间"
-
-#: src/copy.c:1589
-#, fuzzy, c-format
msgid "failed to lookup file %s"
-msgstr "无法保留%s的时间"
+msgstr "查阅文件 %s 失败"
-#: src/copy.c:1594
+#: src/copy.c:1678
#, c-format
msgid "failed to preserve authorship for %s"
-msgstr "无法保留%s的著作者"
-
-#: src/copy.c:1613
-#, c-format
-msgid "setting permissions for %s"
-msgstr "设定%s的权限"
+msgstr "保留 %s 的作者失败"
-#: src/copy.c:1635 src/ln.c:323
+#: src/copy.c:1720 src/ln.c:323
#, c-format
msgid "cannot un-backup %s"
msgstr "无法将 %s 的备份还原"
-#: src/copy.c:1639
+#: src/copy.c:1724
#, c-format
msgid "%s -> %s (unbackup)\n"
-msgstr "%s → %s (还原备份)\n"
+msgstr "%s -> %s (还原备份)\n"
-#: src/cp.c:159 src/mv.c:298
-#, fuzzy, c-format
+#: src/cp.c:156 src/mv.c:298
+#, c-format
msgid ""
"Usage: %s [OPTION]... [-T] SOURCE DEST\n"
" or: %s [OPTION]... SOURCE... DIRECTORY\n"
" or: %s [OPTION]... -t DIRECTORY SOURCE...\n"
msgstr ""
-"用法:%s [选项]... 来源 目的地\n"
-" 或:%s [选项]... 来源... 目录\n"
-" 或:%s [选项]... --target-directory=目录 来源...\n"
+"用法:%s [选项]... [-T] 源 目的\n"
+" 或:%s [选项]... 源... 目录\n"
+" 或:%s [选项]... -t 目录 源...\n"
-#: src/cp.c:165
+#: src/cp.c:162
msgid ""
"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
"\n"
msgstr ""
-"将<来源>文件复制至<目的地>,或将多个<文件>复制至<目录>。\n"
+"将<源>文件复制至<目的>,或将多个<源>复制至<目录>。\n"
"\n"
-#: 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/cp.c:166 src/csplit.c:1461 src/cut.c:196 src/df.c:721 src/du.c:280
+#: src/expand.c:120 src/fmt.c:279 src/fold.c:79 src/head.c:119
+#: src/install.c:646 src/kill.c:104 src/ln.c:351 src/ls.c:4098 src/mkdir.c:63
+#: src/mkfifo.c:60 src/mknod.c:61 src/mv.c:308 src/nl.c:181 src/paste.c:427
+#: src/pr.c:2777 src/ptx.c:1895 src/shred.c:161 src/sort.c:289 src/split.c:117
+#: src/tac.c:141 src/tail.c:239 src/touch.c:238 src/unexpand.c:130
#: src/uniq.c:144
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "长选项必须用的参数在使用短选项时也是必须的。\n"
-#: src/cp.c:172
-#, fuzzy
+#: src/cp.c:169
msgid ""
" -a, --archive same as -dpR\n"
" --backup[=CONTROL] make a backup of each existing destination "
@@ -1226,15 +1368,15 @@ msgid ""
"recursive\n"
" -d same as --no-dereference --preserve=link\n"
msgstr ""
-" -a, --archive 等於 -dpR\n"
+" -a, --archive 等于 -dpR\n"
" --backup[=CONTROL] 为每个已存在的目的地文件创建备份文件\n"
" -b 类似 --backup,但不接受任何参数\n"
" --copy-contents 当使用递归模式时复制特殊文件的内容\n"
-" -d 等於 --no-dereference --preserve=link\n"
+" -d 等于 --no-dereference --preserve=link\n"
-#: src/cp.c:179
+#: src/cp.c:176
+#, fuzzy
msgid ""
-" --no-dereference never follow symbolic links\n"
" -f, --force if an existing destination file cannot be\n"
" opened, remove it and try again\n"
" -i, --interactive prompt before overwrite\n"
@@ -1246,10 +1388,19 @@ msgstr ""
" -i, --interactive 覆盖文件前需要确认\n"
" -H 使用命令列中的符号链接指示的真正目的地\n"
-#: src/cp.c:186
+#: src/cp.c:182
msgid ""
" -l, --link link files instead of copying\n"
" -L, --dereference always follow symbolic links\n"
+msgstr ""
+
+#: src/cp.c:186
+msgid " -P, --no-dereference never follow symbolic links\n"
+msgstr ""
+
+#: src/cp.c:189
+#, fuzzy
+msgid ""
" -p same as --preserve=mode,ownership,timestamps\n"
" --preserve[=ATTR_LIST] preserve the specified attributes (default:\n"
" mode,ownership,timestamps), if possible\n"
@@ -1257,20 +1408,20 @@ msgid ""
msgstr ""
" -l, --link 链接而非复制文件\n"
" -L, --dereference 一定先找出符号链接指示的真正目的地\n"
-" -p 等於 --preserve=mode,ownership,timestamps\n"
+" -p 等于 --preserve=mode,ownership,timestamps\n"
" --preserve[=ATTR_LIST] 若可能,保留指定的文件属性\n"
" (默认值为:mode,ownership,timestamps)\n"
" 额外的属性有:links、all\n"
-#: src/cp.c:194
+#: src/cp.c:195
+#, fuzzy
msgid ""
" --no-preserve=ATTR_LIST don't preserve the specified attributes\n"
-" --parents append source path to DIRECTORY\n"
-" -P same as `--no-dereference'\n"
+" --parents use full source file name under DIRECTORY\n"
msgstr ""
" --sno-preserve=ATTR_LIST 不保留指定的文件属性\n"
" --parents 复制前先在<目录>创建来源文件路径中的所有目录\n"
-" -P 等於‘--no-dereference’\n"
+" -P 等于“--no-dereference”\n"
#: src/cp.c:199
msgid ""
@@ -1284,18 +1435,17 @@ msgstr ""
" 文件 (与 --force 选项作对比)\n"
#: src/cp.c:204
+#, fuzzy
msgid ""
-" --reply={yes,no,query} specify how to handle the prompt about an\n"
-" existing destination file\n"
" --sparse=WHEN control creation of sparse files\n"
" --strip-trailing-slashes remove any trailing slashes from each SOURCE\n"
" argument\n"
msgstr ""
" --reply={yes,no,query} 指定如何处理已存在的目的地文件\n"
" --sparse=WHEN 控制创建 sparse 文件的方式\n"
-" --strip-trailing-slashes 删除参数中所有<来源>文件/目录末端的斜杠\n"
+" --strip-trailing-slashes 删除参数中所有<源>文件/目录末端的斜杠\n"
-#: src/cp.c:211
+#: src/cp.c:209
#, fuzzy
msgid ""
" -s, --symbolic-link make symbolic links instead of copying\n"
@@ -1306,9 +1456,9 @@ msgid ""
msgstr ""
" -s, --symbolic-link 只创建符号链接而不是复制文件\n"
" -S, --suffix=后缀 自行指定备份文件的<后缀>\n"
-" --target-directory=目录 将所有参数指定的<来源>文件/目录复制至<目录>\n"
+" --target-directory=目录 将所有参数指定的<源>文件/目录复制至<目录>\n"
-#: src/cp.c:217
+#: src/cp.c:215
msgid ""
" -u, --update copy only when the SOURCE file is newer\n"
" than the destination file or when the\n"
@@ -1316,12 +1466,12 @@ msgid ""
" -v, --verbose explain what is being done\n"
" -x, --one-file-system stay on this file system\n"
msgstr ""
-" -u, --update 只在<来源>文件比目的地文件新,或目的地文件\n"
+" -u, --update 只在<源>文件比目的地文件新,或目的地文件\n"
" 不存在时才进行复制\n"
" -v, --verbose 详细显示进行的步骤\n"
" -x, --one-file-system 不会跨越文件系统进行操作\n"
-#: src/cp.c:226
+#: src/cp.c:224
msgid ""
"\n"
"By default, sparse SOURCE files are detected by a crude heuristic and the\n"
@@ -1333,14 +1483,14 @@ msgid ""
"\n"
msgstr ""
"\n"
-"默认使用模式中,<来源>文件是否 sparse 文件会由一种粗略的方式决定,而且相应\n"
-"的<目的地>文件也会是 sparse 文件。此方式等於使用 --sparse=auto 选项。指定\n"
-"--sparse=always 则只要<来源>文件含有足够长的 0 字节都会产生 sparse 的\n"
+"默认使用模式中,<源>文件是否 sparse 文件会由一种粗略的方式决定,而且相应\n"
+"的<目的地>文件也会是 sparse 文件。此方式等于使用 --sparse=auto 选项。指定\n"
+"--sparse=always 则只要<源>文件含有足够长的 0 字节都会产生 sparse 的\n"
"<目的地>文件。\n"
"使用 --sparse=never 会禁止产生 sparse 文件。\n"
"\n"
-#: src/cp.c:235
+#: src/cp.c:233
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 "
@@ -1348,12 +1498,12 @@ msgid ""
"the VERSION_CONTROL environment variable. Here are the values:\n"
"\n"
msgstr ""
-"备份文件的后缀为‘~’,除非以 --suffix 选项或是 SIMPLE_BACKUP_SUFFIX\n"
+"备份文件的后缀为“~”,除非以 --suffix 选项或是 SIMPLE_BACKUP_SUFFIX\n"
"环境变量指定。版本控制的方式可透过 --backup 选项或 VERSION_CONTROL 环境\n"
"变量来选择。以下是可用的变量值:\n"
"\n"
-#: src/cp.c:241 src/install.c:683 src/ln.c:384 src/mv.c:343
+#: src/cp.c:239 src/install.c:681 src/ln.c:384 src/mv.c:339
msgid ""
" none, off never make backups (even if --backup is given)\n"
" numbered, t make numbered backups\n"
@@ -1366,7 +1516,7 @@ msgstr ""
"份\n"
" simple, never 永远使用普通方式备份\n"
-#: src/cp.c:247
+#: src/cp.c:245
msgid ""
"\n"
"As a special case, cp makes a backup of SOURCE when the force and backup\n"
@@ -1374,90 +1524,86 @@ msgid ""
"regular file.\n"
msgstr ""
"\n"
-"有一个特别情况:如果同时指定 --force 和 --backup 选项,而且<来源>和<目的地>\n"
-"是同一个已存在的一般文件的话,cp 会将<来源>文件备份。\n"
+"有一个特别情况:如果同时指定 --force 和 --backup 选项,而且<源>和<目的地>\n"
+"是同一个已存在的一般文件的话,cp 会将<源>文件备份。\n"
-#: src/cp.c:318
+#: src/cp.c:313
#, c-format
msgid "failed to preserve times for %s"
msgstr "无法保留%s的时间"
-#: src/cp.c:342
+#: src/cp.c:334
#, c-format
msgid "failed to preserve permissions for %s"
-msgstr "无法保留%s的权限"
+msgstr "保留 %s 的权限失败"
-#: src/cp.c:425
+#: src/cp.c:418
#, c-format
msgid "cannot make directory %s"
-msgstr "无法创建目录%s"
+msgstr "无法创建目录 %s"
-#: 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
+#: src/cp.c:482 src/cp.c:938 src/install.c:178 src/install.c:272 src/ln.c:144
+#: src/ln.c:171 src/ln.c:204 src/ln.c:463 src/mv.c:165 src/mv.c:410
#, c-format
msgid "accessing %s"
-msgstr "正在访问%s"
+msgstr "访问 %s"
-#: 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
+#: src/cp.c:486 src/cp.c:529 src/cp.c:940 src/install.c:180 src/install.c:274
+#: src/install.c:335 src/ln.c:146 src/ln.c:465 src/ln.c:521 src/mv.c:167
+#: src/mv.c:412 src/mv.c:467
+#, c-format
msgid "target %s is not a directory"
-msgstr "指定的目标%s不是目录"
+msgstr "目标 %s 不是目录"
-#: 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
+#: src/cp.c:504 src/install.c:311 src/ln.c:493 src/mv.c:443 src/shred.c:1558
+#: src/touch.c:411
msgid "missing file operand"
-msgstr "缺少了文件参数"
+msgstr "缺少了文件操作对象"
-#: src/cp.c:513 src/install.c:328 src/ln.c:514 src/mv.c:454
+#: src/cp.c:506 src/install.c:313 src/ln.c:507 src/mv.c:445
#, fuzzy, c-format
msgid "missing destination file operand after %s"
msgstr "缺少了目的地文件"
-#: src/cp.c:522 src/install.c:337 src/mv.c:463
-#, fuzzy
+#: src/cp.c:515 src/install.c:322 src/mv.c:454
msgid "Cannot combine --target-directory (-t) and --no-target-directory (-T)"
-msgstr "%s:指定的目的地不是目录"
+msgstr ""
-#: src/cp.c:640
-msgid "when preserving paths, the destination must be a directory"
+#: src/cp.c:634
+#, fuzzy
+msgid "with --parents, the destination must be a directory"
msgstr "当保留路径时,目的地必须是目录"
-#: 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"
-"will be removed in some future release. Use --backup=%s instead."
+#: src/cp.c:910 src/mv.c:398
+#, fuzzy
+msgid "the --reply option is deprecated; use -i or -f instead"
msgstr ""
"警告:--version-control (-V) 选项已经过时;将来的版本随时可能不再支持\n"
"此选项。请使用 --backup=%s。"
-#: src/cp.c:937 src/ln.c:460
+#: src/cp.c:926 src/ln.c:453
msgid "symbolic links are not supported on this system"
msgstr "此系统并不支持符号链接"
-#: src/cp.c:944 src/install.c:282 src/ln.c:465 src/mv.c:414
+#: src/cp.c:933 src/install.c:267 src/ln.c:458 src/mv.c:405
#, fuzzy
msgid "multiple target directories specified"
msgstr "正在关闭输出文件 %s"
-#: src/cp.c:989
+#: src/cp.c:978
msgid "cannot make both hard and symbolic links"
msgstr "无法同时创建实际及符号链接"
-#: src/cp.c:997 src/install.c:316 src/ln.c:541 src/mv.c:484
+#: src/cp.c:986 src/install.c:301 src/ln.c:534 src/mv.c:475
msgid "backup type"
msgstr "备份方式"
-#: 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
-#, fuzzy
+#: src/csplit.c:282 src/csplit.c:1437 src/join.c:250 src/tac-pipe.c:57
+#: src/tee.c:204 src/tr.c:1585
msgid "read error"
-msgstr "写入时发生错误"
+msgstr "读取错误"
-#: src/csplit.c:533
+#: src/csplit.c:539
msgid "input disappeared"
msgstr ""
@@ -1468,7 +1614,7 @@ msgstr "%s:覆盖次数无效"
#: src/csplit.c:707
#, fuzzy, c-format
-msgid "%s: `%s': line number out of range"
+msgid "%s: %s: line number out of range"
msgstr "%s:覆盖次数无效"
#: src/csplit.c:710 src/csplit.c:759
@@ -1478,115 +1624,115 @@ msgstr ""
#: src/csplit.c:753
#, c-format
-msgid "%s: `%s': match not found"
+msgid "%s: %s: match not found"
msgstr ""
-#: src/csplit.c:817 src/csplit.c:857 src/tac.c:269
+#: src/csplit.c:817 src/csplit.c:857 src/nl.c:349 src/tac.c:274
msgid "error in regular expression search"
msgstr ""
-#: src/csplit.c:977
+#: src/csplit.c:982
#, fuzzy, c-format
-msgid "write error for `%s'"
+msgid "write error for %s"
msgstr "写入时发生错误"
-#: src/csplit.c:1053
-#, fuzzy, c-format
+#: src/csplit.c:1058
+#, c-format
msgid "%s: integer expected after delimiter"
-msgstr "转换无效:%s"
+msgstr ""
-#: src/csplit.c:1069
+#: src/csplit.c:1074
#, c-format
msgid "%s: `}' is required in repeat count"
msgstr ""
-#: src/csplit.c:1079
+#: src/csplit.c:1084
#, c-format
msgid "%s}: integer required between `{' and `}'"
msgstr ""
-#: src/csplit.c:1106
+#: src/csplit.c:1111
#, c-format
msgid "%s: closing delimiter `%c' missing"
msgstr ""
-#: src/csplit.c:1122
+#: src/csplit.c:1127
#, fuzzy, c-format
msgid "%s: invalid regular expression: %s"
msgstr "转换无效:%s"
-#: src/csplit.c:1155
+#: src/csplit.c:1160
#, fuzzy, c-format
msgid "%s: invalid pattern"
msgstr "%s:文件类型无效"
-#: src/csplit.c:1158
+#: src/csplit.c:1163
#, c-format
msgid "%s: line number must be greater than zero"
msgstr ""
-#: src/csplit.c:1164
+#: src/csplit.c:1169
#, c-format
-msgid "line number `%s' is smaller than preceding line number, %s"
+msgid "line number %s is smaller than preceding line number, %s"
msgstr ""
-#: src/csplit.c:1170
+#: src/csplit.c:1175
#, c-format
-msgid "warning: line number `%s' is the same as preceding line number"
+msgid "warning: line number %s is the same as preceding line number"
msgstr ""
-#: src/csplit.c:1223
+#: src/csplit.c:1228
#, fuzzy
msgid "invalid format width"
msgstr "日期格式 %s 无效"
-#: src/csplit.c:1244
+#: src/csplit.c:1249
#, fuzzy
msgid "invalid format precision"
-msgstr "转换无效:%s"
+msgstr "权限模式字符串无效:%s "
-#: src/csplit.c:1265
+#: src/csplit.c:1270
msgid "missing conversion specifier in suffix"
msgstr ""
-#: src/csplit.c:1271
+#: src/csplit.c:1276
#, fuzzy, c-format
msgid "invalid conversion specifier in suffix: %c"
msgstr "转换无效:%s"
-#: src/csplit.c:1274
+#: src/csplit.c:1279
#, fuzzy, c-format
msgid "invalid conversion specifier in suffix: \\%.3o"
msgstr "转换无效:%s"
-#: src/csplit.c:1297
+#: src/csplit.c:1302
#, c-format
msgid "too many %% conversion specifications in suffix"
msgstr ""
-#: src/csplit.c:1312
+#: src/csplit.c:1317
#, c-format
msgid "missing %% conversion specification in suffix"
msgstr ""
-#: src/csplit.c:1356
+#: src/csplit.c:1361
#, fuzzy, c-format
msgid "%s: invalid number"
msgstr "无效的号码 %s"
-#: src/csplit.c:1444
+#: src/csplit.c:1452
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... FILE PATTERN...\n"
msgstr "用法:%s [选项]... 目录...\n"
-#: src/csplit.c:1448
+#: src/csplit.c:1456
msgid ""
"Output pieces of FILE separated by PATTERN(s) to files `xx00', `xx01', ...,\n"
"and output byte counts of each piece to standard output.\n"
"\n"
msgstr ""
-#: src/csplit.c:1456
+#: src/csplit.c:1464
#, c-format
msgid ""
" -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n"
@@ -1594,20 +1740,20 @@ msgid ""
" -k, --keep-files do not remove output files on errors\n"
msgstr ""
-#: src/csplit.c:1461
+#: src/csplit.c:1469
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:1468
+#: src/csplit.c:1476
msgid ""
"\n"
"Read standard input if FILE is -. Each PATTERN may be:\n"
msgstr ""
-#: src/csplit.c:1472
+#: src/csplit.c:1480
msgid ""
"\n"
" INTEGER copy up to but not including specified line number\n"
@@ -1619,10 +1765,10 @@ msgid ""
"A line OFFSET is a required `+' or `-' followed by a positive integer.\n"
msgstr ""
-#: 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
+#: src/cut.c:188 src/df.c:715 src/expand.c:111 src/fold.c:70 src/head.c:109
+#: src/ls.c:4092 src/nl.c:172 src/paste.c:417 src/pr.c:2768 src/sort.c:281
+#: src/sum.c:59 src/tac.c:132 src/tail.c:229 src/tee.c:62 src/unexpand.c:121
+#: src/wc.c:127
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr "用法:%s [选项]... [文件]...\n"
@@ -1682,115 +1828,113 @@ msgid ""
"With no FILE, or when FILE is -, read standard input.\n"
msgstr ""
-#: src/cut.c:363 src/cut.c:395 src/cut.c:481
+#: src/cut.c:363 src/cut.c:395 src/cut.c:478
#, fuzzy
msgid "invalid byte or field list"
msgstr "日期格式 %s 无效"
-#: src/cut.c:469
+#: src/cut.c:467
#, fuzzy, c-format
msgid "byte offset %s is too large"
msgstr "%s:文件过大"
-#: src/cut.c:472
+#: src/cut.c:470
#, fuzzy, c-format
msgid "field number %s is too large"
-msgstr "%s:覆盖次数无效"
+msgstr "无效的号码 %s"
-#: src/cut.c:776 src/cut.c:784
+#: src/cut.c:773 src/cut.c:781
msgid "only one type of list may be specified"
msgstr ""
-#: src/cut.c:793
+#: src/cut.c:790
msgid "the delimiter must be a single character"
msgstr ""
-#: src/cut.c:828
+#: src/cut.c:825
msgid "you must specify a list of bytes, characters, or fields"
msgstr ""
-#: src/cut.c:831
+#: src/cut.c:828
msgid "an input delimiter may be specified only when operating on fields"
msgstr ""
-#: src/cut.c:835
+#: src/cut.c:832
msgid ""
"suppressing non-delimited lines makes sense\n"
"\tonly when operating on fields"
msgstr ""
-#: src/cut.c:851
+#: src/cut.c:848
#, fuzzy
msgid "missing list of fields"
msgstr "缺少了目的地文件"
-#: src/cut.c:853
+#: src/cut.c:850
#, fuzzy
msgid "missing list of positions"
msgstr "缺少了目的地文件"
-#: src/date.c:121
+#: src/date.c:132
#, c-format
msgid ""
"Usage: %s [OPTION]... [+FORMAT]\n"
" or: %s [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]]\n"
msgstr ""
-#: src/date.c:126
+#: src/date.c:137
msgid ""
"Display the current time in the given FORMAT, or set the system date.\n"
"\n"
" -d, --date=STRING display time described by STRING, not `now'\n"
" -f, --file=DATEFILE like --date once for each line of DATEFILE\n"
-" --iso-8601[=TIMESPEC] output date/time in ISO 8601 format.\n"
-" TIMESPEC=`date' for date only (the default),\n"
-" `hours', `minutes', `seconds', or `ns' for date "
-"and\n"
-" time to the indicated precision.\n"
msgstr ""
-#: src/date.c:136
+#: src/date.c:143
msgid ""
" -r, --reference=FILE display the last modification time of FILE\n"
-" -R, --rfc-2822 output RFC-2822 compliant date string\n"
+" -R, --rfc-2822 output date and time in RFC 2822 format\n"
+" --rfc-3339=TIMESPEC output date and time in RFC 3339 format.\n"
+" TIMESPEC=`date', `seconds', or `ns' for\n"
+" date and time to the indicated precision.\n"
" -s, --set=STRING set time described by STRING\n"
" -u, --utc, --universal print or set Coordinated Universal Time\n"
msgstr ""
-#: src/date.c:144
+#: src/date.c:154
msgid ""
"\n"
"FORMAT controls the output. The only valid option for the second form\n"
"specifies Coordinated Universal Time. Interpreted sequences are:\n"
"\n"
" %% a literal %\n"
-" %a locale's abbreviated weekday name (Sun..Sat)\n"
+" %a locale's abbreviated weekday name (e.g., Sun)\n"
msgstr ""
-#: src/date.c:152
+#: src/date.c:162
msgid ""
-" %A locale's full weekday name, variable length (Sunday..Saturday)\n"
-" %b locale's abbreviated month name (Jan..Dec)\n"
-" %B locale's full month name, variable length (January..December)\n"
-" %c locale's date and time (Sat Nov 04 12:02:33 EST 1989)\n"
+" %A locale's full weekday name (e.g., Sunday)\n"
+" %b locale's abbreviated month name (e.g., Jan)\n"
+" %B locale's full month name (e.g., January)\n"
+" %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n"
msgstr ""
-#: src/date.c:158
+#: src/date.c:168
msgid ""
-" %C century (year divided by 100 and truncated to an integer) [00-99]\n"
-" %d day of month (01..31)\n"
-" %D date (mm/dd/yy)\n"
-" %e day of month, blank padded ( 1..31)\n"
+" %C century; like %Y, except omit last two digits (e.g., 21)\n"
+" %d day of month (e.g, 01)\n"
+" %D date; same as %m/%d/%y\n"
+" %e day of month, space padded; same as %_d\n"
msgstr ""
-#: src/date.c:164
+#: src/date.c:174
msgid ""
-" %F same as %Y-%m-%d\n"
-" %g the 2-digit year corresponding to the %V week number\n"
-" %G the 4-digit year corresponding to the %V week number\n"
+" %F full date; same as %Y-%m-%d\n"
+" %g the last two digits of the year corresponding to the %V week number\n"
+" %G the year corresponding to the %V week number\n"
msgstr ""
-#: src/date.c:169
+#: src/date.c:179
msgid ""
" %h same as %b\n"
" %H hour (00..23)\n"
@@ -1798,7 +1942,7 @@ msgid ""
" %j day of year (001..366)\n"
msgstr ""
-#: src/date.c:175
+#: src/date.c:185
msgid ""
" %k hour ( 0..23)\n"
" %l hour ( 1..12)\n"
@@ -1806,119 +1950,124 @@ msgid ""
" %M minute (00..59)\n"
msgstr ""
-#: src/date.c:181
+#: src/date.c:191
msgid ""
" %n a newline\n"
" %N nanoseconds (000000000..999999999)\n"
-" %p locale's upper case AM or PM indicator (blank in many locales)\n"
-" %P locale's lower case am or pm indicator (blank in many locales)\n"
-" %r time, 12-hour (hh:mm:ss [AP]M)\n"
-" %R time, 24-hour (hh:mm)\n"
-" %s seconds since `00:00:00 1970-01-01 UTC' (a GNU extension)\n"
+" %p locale's equivalent of either AM or PM; blank if not known\n"
+" %P like %p, but lower case\n"
+" %r locale's 12-hour clock time (e.g., 11:11:04 PM)\n"
+" %R 24-hour hour and minute; same as %H:%M\n"
+" %s seconds since 1970-01-01 00:00:00 UTC\n"
msgstr ""
-#: src/date.c:190
+#: src/date.c:200
msgid ""
-" %S second (00..60); the 60 is necessary to accommodate a leap second\n"
-" %t a horizontal tab\n"
-" %T time, 24-hour (hh:mm:ss)\n"
-" %u day of week (1..7); 1 represents Monday\n"
+" %S second (00..60)\n"
+" %t a tab\n"
+" %T time; same as %H:%M:%S\n"
+" %u day of week (1..7); 1 is Monday\n"
msgstr ""
-#: src/date.c:196
+#: src/date.c:206
msgid ""
" %U week number of year with Sunday as first day of week (00..53)\n"
" %V week number of year with Monday as first day of week (01..53)\n"
-" %w day of week (0..6); 0 represents Sunday\n"
+" %w day of week (0..6); 0 is Sunday\n"
" %W week number of year with Monday as first day of week (00..53)\n"
msgstr ""
-#: src/date.c:202
+#: src/date.c:212
msgid ""
-" %x locale's date representation (mm/dd/yy)\n"
-" %X locale's time representation (%H:%M:%S)\n"
+" %x locale's date representation (e.g., 12/31/99)\n"
+" %X locale's time representation (e.g., 23:13:48)\n"
" %y last two digits of year (00..99)\n"
-" %Y year (1970...)\n"
+" %Y year\n"
msgstr ""
-#: src/date.c:208
+#: src/date.c:218
msgid ""
-" %z RFC-2822 style numeric timezone (-0500) (a nonstandard extension)\n"
-" %Z time zone (e.g., EDT), or nothing if no time zone is determinable\n"
+" %z +hhmm numeric timezone (e.g., -0400)\n"
+" %:z +hh:mm numeric timezone (e.g., -04:00)\n"
+" %::z +hh:mm:ss numeric time zone (e.g., -04:00:00)\n"
+" %:::z numeric time zone with : to necessary precision (e.g., -04, +05:30)\n"
+" %Z alphabetic time zone abbreviation (e.g., EDT)\n"
"\n"
-"By default, date pads numeric fields with zeroes. GNU date recognizes\n"
-"the following modifiers between `%' and a numeric directive.\n"
+"By default, date pads numeric fields with zeroes.\n"
+"The following optional flags may follow `%':\n"
"\n"
-" `-' (hyphen) do not pad the field\n"
-" `_' (underscore) pad the field with spaces\n"
+" - (hyphen) do not pad the field\n"
+" _ (underscore) pad with spaces\n"
+" 0 (zero) pad with zeros\n"
+" ^ use upper case if possible\n"
+" # use opposite case if possible\n"
msgstr ""
-#: 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
+#: src/date.c:234
+msgid ""
+"\n"
+"After any flags comes an optional field width, as a decimal number;\n"
+"then an optional modifier, which is either\n"
+"E to use the locale's alternate representations if available, or\n"
+"O to use the locale's alternate numeric symbols if available.\n"
+msgstr ""
+
+#: src/date.c:262 src/dd.c:1614 src/head.c:840 src/md5sum.c:392
+#: src/md5sum.c:674 src/od.c:910 src/od.c:1932 src/pr.c:1178 src/pr.c:1381
+#: src/pr.c:1503 src/stty.c:841 src/tac.c:534 src/tee.c:126 src/tr.c:1893
+#: src/tsort.c:527 src/wc.c:204
msgid "standard input"
msgstr "标准输入"
-#: src/date.c:267 src/date.c:451
+#: src/date.c:290 src/date.c:510
#, fuzzy, c-format
-msgid "invalid date `%s'"
+msgid "invalid date %s"
msgstr "无效的权限模式%s"
-#: src/date.c:361
+#: src/date.c:401 src/date.c:435
+#, fuzzy
+msgid "multiple output formats specified"
+msgstr "正在关闭输出文件 %s"
+
+#: src/date.c:413
#, fuzzy
msgid "the options to specify dates for printing are mutually exclusive"
msgstr ""
"显示 dircolors 内部数据库的选项和选择 shell 语法的选项\n"
"是互相抵触的"
-#: src/date.c:368
+#: src/date.c:420
msgid "the options to print and set the time may not be used together"
msgstr ""
-#: src/date.c:381
+#: src/date.c:441
#, c-format
msgid ""
-"the argument `%s' lacks a leading `+';\n"
+"the argument %s lacks a leading `+';\n"
"When using an option to specify date(s), any non-option\n"
"argument must be a format string beginning with `+'."
msgstr ""
-#: src/date.c:393
-#, fuzzy
-msgid ""
-"a format string may not be specified when using the --rfc-2822 (-R) option"
-msgstr "安装目录时不能用 strip 选项"
-
-#: src/date.c:426
-msgid "undefined"
-msgstr ""
-
-#: src/date.c:428 src/touch.c:400
-#, fuzzy
-msgid "cannot get time of day"
-msgstr "无法设定 %s 的时间标记"
-
-#: src/date.c:459
+#: src/date.c:518
#, fuzzy
msgid "cannot set date"
msgstr "stat%s失败"
-#: src/date.c:520
+#: src/date.c:541 src/du.c:413
#, fuzzy, c-format
msgid "time %s is out of range"
msgstr "文件偏移值超出范围以外"
-#: src/dd.c:366
+#: src/dd.c:401
#, fuzzy, c-format
msgid ""
"Usage: %s [OPERAND]...\n"
" or: %s OPTION\n"
msgstr ""
-"用法:%s 文件\n"
+"用法:%s [字符串]...\n"
" 或:%s 选项\n"
-#: src/dd.c:371
+#: src/dd.c:406
#, fuzzy
msgid ""
"Copy a file, converting and formatting according to the operands.\n"
@@ -1937,7 +2086,7 @@ msgstr ""
" count=块数目 只复制指定<块数目>的输入数据\n"
" ibs=字节 每次读取指定的<字节>\n"
-#: src/dd.c:380
+#: src/dd.c:415
#, fuzzy
msgid ""
" if=FILE read from FILE instead of stdin\n"
@@ -1955,7 +2104,7 @@ msgstr ""
" seek=块数目 先略过以 obs 为单位的指定<块数目>的输出数据\n"
" skip=块数目 先略过以 ibs 为单位的指定<块数目>的输入数据\n"
-#: src/dd.c:390
+#: src/dd.c:425
#, fuzzy
msgid ""
"\n"
@@ -1972,7 +2121,7 @@ msgstr ""
"GB=1000000000,G=1073741824,还有 T、P、E、Z、Y 如此类推。\n"
"每个<关键字>可以是:\n"
-#: src/dd.c:399
+#: src/dd.c:434
#, fuzzy
msgid ""
" ascii from EBCDIC to ASCII\n"
@@ -1991,7 +2140,7 @@ msgstr ""
"符\n"
" lcase 将大写字符转换为小写\n"
-#: src/dd.c:407
+#: src/dd.c:442
#, fuzzy
msgid ""
" nocreat do not create the output file\n"
@@ -2012,7 +2161,7 @@ msgstr ""
" sync 将每个输入数据块以 NUL 字符填满至 ibs 的大小;当配合 block\n"
" 或 unblock 时,会以空格代替 NUL 字符填充\n"
-#: src/dd.c:419
+#: src/dd.c:454
msgid ""
"\n"
"Each FLAG symbol may be:\n"
@@ -2020,38 +2169,47 @@ msgid ""
" append append mode (makes sense only for output)\n"
msgstr ""
-#: src/dd.c:426
+#: src/dd.c:461
msgid " direct use direct I/O for data\n"
msgstr ""
-#: src/dd.c:428
+#: src/dd.c:463
msgid " dsync use synchronized I/O for data\n"
msgstr ""
-#: src/dd.c:430
+#: src/dd.c:465
msgid " sync likewise, but also for metadata\n"
msgstr ""
-#: src/dd.c:432
+#: src/dd.c:467
msgid " nonblock use non-blocking I/O\n"
msgstr ""
-#: src/dd.c:434
+#: src/dd.c:469
msgid " nofollow do not follow symlinks\n"
msgstr ""
-#: src/dd.c:436
+#: src/dd.c:471
msgid " noctty do not assign controlling terminal from file\n"
msgstr ""
-#: src/dd.c:438
+#: src/dd.c:474
+msgid " binary use binary I/O for data\n"
+msgstr ""
+
+#: src/dd.c:476
+msgid " text use text I/O for data\n"
+msgstr ""
+
+#: src/dd.c:480
+#, c-format
msgid ""
"\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"
+"Sending a %s signal to a running `dd' process makes it\n"
+"print I/O statistics to standard error and then resume copying.\n"
"\n"
" $ dd if=/dev/zero of=/dev/null& pid=$!\n"
-" $ kill -USR1 $pid; sleep 1; kill $pid\n"
+" $ kill -%s $pid; sleep 1; kill $pid\n"
" 18335302+0 records in\n"
" 18335302+0 records out\n"
" 9387674624 bytes (9.4 GB) copied, 34.6279 seconds, 271 MB/s\n"
@@ -2060,224 +2218,219 @@ msgid ""
"\n"
msgstr ""
-#: src/dd.c:492
+#: src/dd.c:536
#, c-format
-msgid "%s+%s records in\n"
-msgstr "读入了 %s+%s 个块\n"
-
-#: src/dd.c:494
-#, c-format
-msgid "%s+%s records out\n"
-msgstr "输出了 %s+%s 个块\n"
-
-#: src/dd.c:501
-msgid "truncated record"
-msgstr "个被截断了的块"
+msgid ""
+"%<PRIuMAX>+%<PRIuMAX> records in\n"
+"%<PRIuMAX>+%<PRIuMAX> records out\n"
+msgstr ""
-#: src/dd.c:502
-msgid "truncated records"
-msgstr "个被截断了的块"
+#: src/dd.c:542
+#, fuzzy, c-format
+msgid "1 truncated record\n"
+msgid_plural "%<PRIuMAX> truncated records\n"
+msgstr[0] "个被截断了的块"
-#: src/dd.c:513
+#: src/dd.c:554
#, c-format
-msgid "%s byte (%s) copied"
-msgid_plural "%s bytes (%s) copied"
+msgid "1 byte (1 B) copied"
+msgid_plural "%<PRIuMAX> bytes (%s) copied"
msgstr[0] ""
-msgstr[1] ""
-#: src/dd.c:537
-msgid "Infinity"
+#: src/dd.c:572
+msgid "Infinity B"
msgstr ""
-#: src/dd.c:542
+#: src/dd.c:576
#, c-format
msgid ", %g second, %s/s\n"
msgid_plural ", %g seconds, %s/s\n"
msgstr[0] ""
msgstr[1] ""
-#: src/dd.c:552
+#: src/dd.c:586
#, c-format
msgid "closing input file %s"
msgstr "正在关闭输入文件 %s"
-#: src/dd.c:555
+#: src/dd.c:593
#, c-format
msgid "closing output file %s"
msgstr "正在关闭输出文件 %s"
-#: src/dd.c:641
+#: src/dd.c:774 src/dd.c:1402
#, c-format
msgid "writing to %s"
msgstr "正在写入 %s"
-#: src/dd.c:735
+#: src/dd.c:868
#, fuzzy, c-format
msgid "unrecognized operand %s"
msgstr "无法识别的选项 %s"
-#: src/dd.c:746
+#: src/dd.c:879
#, c-format
msgid "invalid conversion: %s"
msgstr "转换无效:%s"
-#: src/dd.c:749
+#: src/dd.c:882
#, fuzzy, c-format
msgid "invalid input flag: %s"
msgstr "无效的行宽数值:%s"
-#: src/dd.c:752
+#: src/dd.c:885
#, fuzzy, c-format
msgid "invalid output flag: %s"
-msgstr "无效的组名称‘%s’"
+msgstr "无效的组名称 %s"
-#: src/dd.c:755
+#: src/dd.c:888
#, fuzzy, c-format
msgid "invalid status flag: %s"
-msgstr "无效的组名称‘%s’"
+msgstr "日期格式 %s 无效"
-#: src/dd.c:792
+#: src/dd.c:924
#, fuzzy, c-format
msgid "unrecognized operand %s=%s"
msgstr "无法识别的选项 %s=%s"
-#: src/dd.c:798
+#: src/dd.c:930
#, c-format
msgid "invalid number %s"
msgstr "无效的号码 %s"
-#: src/dd.c:818
+#: src/dd.c:950
msgid "cannot combine any two of {ascii,ebcdic,ibm}"
msgstr ""
-#: src/dd.c:820
+#: src/dd.c:952
#, fuzzy
msgid "cannot combine block and unblock"
-msgstr "无法决定 %s 所在的设备及 inode"
+msgstr "不可同时省略用户和所属组"
-#: src/dd.c:822
+#: src/dd.c:954
#, fuzzy
msgid "cannot combine lcase and ucase"
-msgstr "无法决定 %s 所在的设备及 inode"
+msgstr "无法比较文件名 %s 和 %s"
-#: src/dd.c:824
+#: src/dd.c:956
#, fuzzy
msgid "cannot combine excl and nocreat"
msgstr "无法决定 %s 所在的设备及 inode"
-#: src/dd.c:972
+#: src/dd.c:1104
#, c-format
msgid ""
"warning: working around lseek kernel bug for file (%s)\n"
" of mt_type=0x%0lx -- see <sys/mtio.h> for the list of types"
msgstr ""
-"警告:暂时避免有关文件 (%s) 的 lseek 核心错误,文件的 mt_type=0x%0lx ―\n"
+"警告:暂时避免有关文件 (%s) 的 lseek 核心错误,文件的 mt_type=0x%0lx --\n"
" 有关 mt_type 类型的列表请参考 <sys/mtio.h>"
-#: src/dd.c:1025 src/dd.c:1081
+#: src/dd.c:1161 src/dd.c:1218
#, fuzzy, c-format
msgid "%s: cannot seek"
msgstr "%s:无法删除"
-#: src/dd.c:1061
+#: src/dd.c:1198
#, c-format
msgid "offset overflow while reading file %s"
msgstr ""
-#: src/dd.c:1073
+#: src/dd.c:1210
#, fuzzy
msgid "warning: screwy file offset after failed read"
-msgstr "警告:指定来源文件%s多於一次"
+msgstr "警告:指定来源文件%s多于一次"
-#: src/dd.c:1077
+#: src/dd.c:1214
msgid "cannot work around kernel bug after all"
msgstr ""
-#: src/dd.c:1188
+#: src/dd.c:1325
#, fuzzy, c-format
msgid "setting flags for %s"
-msgstr "正在设定 %s 的时间"
+msgstr "设置 %s 的时间"
-#: src/dd.c:1408
+#: src/dd.c:1563
#, c-format
msgid "fdatasync failed for %s"
msgstr ""
-#: src/dd.c:1418
+#: src/dd.c:1573
#, fuzzy, c-format
msgid "fsync failed for %s"
msgstr "无法保留%s的时间"
-#: src/dd.c:1477 src/dd.c:1505
+#: src/dd.c:1620 src/dd.c:1649
#, c-format
msgid "opening %s"
msgstr "打开 %s"
-#: src/dd.c:1513
-msgid "file offset out of range"
-msgstr "文件偏移值超出范围以外"
-
-#: src/dd.c:1531
+#: src/dd.c:1658
#, c-format
-msgid "advancing past %s bytes in output file %s"
+msgid ""
+"offset too large: cannot truncate to a length of seek=%<PRIuMAX> (%lu-byte) "
+"blocks"
+msgstr ""
+
+#: src/dd.c:1679
+#, fuzzy, c-format
+msgid "truncating at %<PRIuMAX> bytes in output file %s"
msgstr "略过输出文件 %2$s 的最初 %1$s 个字节"
-#: src/df.c:149
-#, fuzzy
+#: src/df.c:148
msgid "Filesystem Type"
-msgstr "文件系统 "
+msgstr "文件系统 类型"
-#: src/df.c:151
-#, fuzzy
+#: src/df.c:150
msgid "Filesystem "
-msgstr "文件系统 "
+msgstr "文件系统 "
-#: src/df.c:154
+#: src/df.c:153
#, c-format
msgid " Inodes IUsed IFree IUse%%"
msgstr " Inode (I)已用 (I)可用 (I)已用%%"
-#: src/df.c:158
+#: src/df.c:157
#, c-format
msgid " Size Used Avail Use%%"
msgstr " 容量 已用 可用 已用%%"
-#: src/df.c:160
+#: src/df.c:159
#, c-format
msgid " Size Used Avail Use%%"
msgstr " 容量 已用 可用 已用%%"
-#: src/df.c:163
+#: src/df.c:162
#, fuzzy, c-format
msgid " %4s-blocks Used Available Capacity"
msgstr " %4d-块 已用 可用 容量"
-#: src/df.c:194
+#: src/df.c:193
#, c-format
msgid " %4s-blocks Used Available Use%%"
msgstr " %4s-块 已用 可用 已用%%"
-#: src/df.c:198
+#: src/df.c:197
#, c-format
msgid " Mounted on\n"
msgstr " 挂载点\n"
-#: src/df.c:445
+#: src/df.c:450
#, fuzzy
msgid "cannot get current directory"
msgstr "无法创建目录%s"
-#: src/df.c:455 src/df.c:469 src/df.c:497
+#: src/df.c:460 src/df.c:474 src/df.c:502
#, c-format
msgid "cannot change to directory %s"
msgstr "无法进入目录 %s"
-#: src/df.c:475
+#: src/df.c:480
#, fuzzy, c-format
msgid "cannot stat current directory (now %s)"
msgstr "无法创建目录%s"
-#: src/df.c:712
+#: src/df.c:716
#, fuzzy
msgid ""
"Show information about the file system on which each FILE resides,\n"
@@ -2287,7 +2440,7 @@ msgstr ""
"显示每个<文件>所在的文件系统的信息,默认是显示所有文件系统。\n"
"\n"
-#: src/df.c:720
+#: src/df.c:724
#, fuzzy
msgid ""
" -a, --all include file systems having 0 blocks\n"
@@ -2301,7 +2454,7 @@ msgstr ""
" -h, --human-readable 以容易理解的格式印出文件系统大小 (例如 1K 234M 2G)\n"
" -H, --si 类似 -h,但取 1000 的次方而不是 1024\n"
-#: src/df.c:726
+#: src/df.c:730
#, fuzzy
msgid ""
" -i, --inodes list inode information instead of block usage\n"
@@ -2315,7 +2468,7 @@ msgstr ""
" -l, --local 只显示本机的文件系统\n"
" --no-sync 取得使用量数据前不进行 sync 动作 (默认)\n"
-#: src/df.c:732
+#: src/df.c:736
#, fuzzy
msgid ""
" -P, --portability use the POSIX output format\n"
@@ -2332,7 +2485,7 @@ msgstr ""
" -x, --exclude-type=类型 只印出不是指定<类型>的文件系统信息\n"
" -v (此选项不作处理)\n"
-#: src/df.c:742 src/du.c:217 src/ls.c:4181
+#: src/df.c:746 src/du.c:331 src/ls.c:4216
#, fuzzy
msgid ""
"\n"
@@ -2343,16 +2496,16 @@ msgstr ""
"<大小>可以是以下的单位 (单位前可加上整数):\n"
"kB=1000,K=1024,MB=1000000,M=1048576,还有 G、T、P、E、Z、Y 如此类推。\n"
-#: src/df.c:858
+#: src/df.c:862
#, c-format
msgid "file system type %s both selected and excluded"
msgstr "不能同时选择和排除文件系统类型 %s"
-#: src/df.c:902
+#: src/df.c:906
msgid "Warning: "
msgstr "警告:"
-#: src/df.c:905
+#: src/df.c:909
#, fuzzy, c-format
msgid "%scannot read table of mounted file systems"
msgstr "%s无法读取已挂上的文件系统的名单"
@@ -2388,7 +2541,7 @@ msgstr ""
"\n"
"如果指定<文件>,则读取该文件的数据来决定文件类型及扩展名相应的颜色。\n"
"否则,会使用一个默认的数据库。如要了解此文件格式的细节,请执行\n"
-"‘dircolors --print-database’。\n"
+"“dircolors --print-database”。\n"
#: src/dircolors.c:288
#, c-format
@@ -2404,7 +2557,7 @@ msgstr "%s:%lu:无法识别的关键字 %s"
msgid "<internal>"
msgstr "<内部数据>"
-#: src/dircolors.c:457
+#: src/dircolors.c:442
msgid ""
"the options to output dircolors' internal database and\n"
"to select a shell syntax are mutually exclusive"
@@ -2412,15 +2565,15 @@ msgstr ""
"显示 dircolors 内部数据库的选项和选择 shell 语法的选项\n"
"是互相抵触的"
-#: src/dircolors.c:467
+#: src/dircolors.c:452
msgid "File operands cannot be combined with --print-database (-p)."
msgstr ""
-#: src/dircolors.c:490
+#: src/dircolors.c:475
msgid "no SHELL environment variable, and no shell type option given"
msgstr "没有设定 SHELL 环境变量,也没有指定 shell 类型的选项"
-#: src/dirname.c:47
+#: src/dirname.c:49
#, fuzzy, c-format
msgid ""
"Usage: %s NAME\n"
@@ -2429,14 +2582,23 @@ msgstr ""
"用法:%s 文件\n"
" 或:%s 选项\n"
-#: src/dirname.c:52
+#: src/dirname.c:54
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:167
+#: src/dirname.c:61
+#, c-format
+msgid ""
+"\n"
+"Examples:\n"
+" %s /usr/bin/sort Output \"/usr/bin\".\n"
+" %s stdio.h Output \".\".\n"
+msgstr ""
+
+#: src/du.c:272
#, fuzzy, c-format
msgid ""
"Usage: %s [OPTION]... [FILE]...\n"
@@ -2445,7 +2607,7 @@ msgstr ""
"用法:%s [选项]... 组 文件...\n"
" 或:%s [选项]... --reference=参考文件 文件...\n"
-#: src/du.c:171
+#: src/du.c:276
msgid ""
"Summarize disk usage of each FILE, recursively for directories.\n"
"\n"
@@ -2453,8 +2615,7 @@ msgstr ""
"总结每个<文件>的磁盘用量,目录则取总用量。\n"
"\n"
-#: src/du.c:178
-#, fuzzy
+#: src/du.c:283
msgid ""
" -a, --all write counts for all files, not just directories\n"
" --apparent-size print apparent sizes, rather than disk usage; "
@@ -2467,13 +2628,8 @@ msgid ""
" -c, --total produce a grand total\n"
" -D, --dereference-args dereference FILEs that are symbolic links\n"
msgstr ""
-" -a, --all 显示目录中所有文件的占用量,并非只是目录的总用量\n"
-" -B, --block-size=大小 块以指定<大小>的字节为单位\n"
-" -b, --bytes 以字节为单位印出占用量\n"
-" -c, --total 印出所有项目相加后的总用量\n"
-" -D, --dereference-args 只找出命令列中的符号链接指示的真正目的地\n"
-#: src/du.c:189
+#: src/du.c:294
#, fuzzy
msgid ""
" --files0-from=F summarize disk usage of the NUL-terminated file\n"
@@ -2492,7 +2648,7 @@ msgstr ""
" -k 即 --block-size=1K\n"
" -l, --count-links 连硬链接的大小也计算在内\n"
-#: src/du.c:199
+#: src/du.c:304
#, fuzzy
msgid ""
" -L, --dereference dereference all symbolic links\n"
@@ -2507,7 +2663,7 @@ msgstr ""
" -S, --separate-dirs 不包括子目录的占用量\n"
" -s, --summarize 只分别计算命令列中每个参数所占的总用量\n"
-#: src/du.c:206
+#: src/du.c:311
#, fuzzy
msgid ""
" -x, --one-file-system skip directories on different file systems\n"
@@ -2520,54 +2676,66 @@ msgid ""
" line argument; --max-depth=0 is the same as\n"
" --summarize\n"
msgstr ""
-" -x, --one-file-system 略过属於其他文件系统的目录\n"
+" -x, --one-file-system 略过属于其他文件系统的目录\n"
" -X 文件, --exclude-from=文件 由<文件>读取应排除的文件的样式\n"
" --exclude=PAT 排除符合指定<样式>的文件\n"
" --max-depth=N 只显示参数指定的目录 N 层或以内的子目录的总用量\n"
" (若使用 --all 选项,也会显示文件的占用量);\n"
-" --max-depth=0 的效果等於 --summarize\n"
+" --max-depth=0 的效果等于 --summarize\n"
-#: src/du.c:522 src/ls.c:2365 src/wc.c:671
+#: src/du.c:320
+msgid ""
+" --time show time of the last modification of any file in "
+"the\n"
+" directory, or any of its subdirectories\n"
+" --time=WORD show time as WORD instead of modification time:\n"
+" atime, access, use, ctime or status\n"
+" --time-style=STYLE show times using style STYLE:\n"
+" full-iso, long-iso, iso, +FORMAT\n"
+" FORMAT is interpreted like `date'\n"
+msgstr ""
+
+#: src/du.c:658 src/ls.c:2385 src/wc.c:657
msgid "total"
-msgstr "总用量"
+msgstr "总计"
-#: src/du.c:599
+#: src/du.c:735
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:623
+#: src/du.c:759
#, c-format
msgid "invalid maximum depth %s"
msgstr "目录最大深度 %s 无效"
-#: src/du.c:698
+#: src/du.c:846
msgid "cannot both summarize and show all entries"
msgstr "不能只显示总用量,同时又显示每个项目"
-#: src/du.c:705
+#: src/du.c:853
msgid "warning: summarizing is the same as using --max-depth=0"
-msgstr "警告:显示总用量等於使用 --max-depth=0"
+msgstr "警告:显示总用量等于使用 --max-depth=0"
-#: src/du.c:711
+#: src/du.c:859
#, fuzzy, c-format
msgid "warning: summarizing conflicts with --max-depth=%lu"
msgstr "警告:显示总用量的选项和 --max-depth=%d 互相抵触"
-#: src/du.c:728
+#: src/du.c:924
msgid "File operands cannot be combined with --files0-from."
msgstr ""
-#: src/du.c:740
+#: src/du.c:935
#, fuzzy, c-format
msgid "cannot read file names from %s"
msgstr "无法比较文件名 %s 和 %s"
-#: src/du.c:780 src/du.c:783
+#: src/du.c:975 src/du.c:978
#, fuzzy
msgid "invalid zero-length file name"
-msgstr "%s:文件类型无效"
+msgstr "无效的组名称 %s"
#: src/echo.c:64
#, fuzzy, c-format
@@ -2633,52 +2801,48 @@ msgid ""
"A mere - implies -i. If no COMMAND, print the resulting environment.\n"
msgstr ""
-#: src/expand.c:114
+#: src/expand.c:115
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:122
+#: src/expand.c:123
msgid ""
" -i, --initial do not convert tabs after non blanks\n"
" -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n"
msgstr ""
-#: src/expand.c:126
+#: src/expand.c:127
msgid ""
" -t, --tabs=LIST use comma separated list of explicit tab positions\n"
msgstr ""
-#: src/expand.c:180 src/unexpand.c:201
+#: src/expand.c:179 src/unexpand.c:199
#, fuzzy, c-format
msgid "tab stop is too large %s"
msgstr "%s:文件过大"
-#: src/expand.c:190 src/unexpand.c:211
+#: src/expand.c:187 src/unexpand.c:208
#, fuzzy, c-format
msgid "tab size contains invalid character(s): %s"
-msgstr "权限模式字串 %2$s 中出现无效的字符 %1$s"
+msgstr "权限模式字符串 %2$s 中出现无效的字符 %1$s"
-#: src/expand.c:216 src/unexpand.c:237
+#: src/expand.c:213 src/unexpand.c:234
msgid "tab size cannot be 0"
msgstr ""
-#: src/expand.c:218 src/unexpand.c:239
+#: src/expand.c:215 src/unexpand.c:236
msgid "tab sizes must be ascending"
msgstr ""
-#: src/expand.c:338 src/expand.c:357 src/unexpand.c:388 src/unexpand.c:435
+#: src/expand.c:332 src/expand.c:351 src/unexpand.c:382 src/unexpand.c:429
#, fuzzy
msgid "input line is too long"
msgstr "%s:文件过大"
-#: src/expand.c:431
-msgid "`-LIST' option is obsolete; use `-t LIST'"
-msgstr ""
-
-#: src/expr.c:98
+#: src/expr.c:101
#, fuzzy, c-format
msgid ""
"Usage: %s EXPRESSION\n"
@@ -2687,7 +2851,7 @@ msgstr ""
"用法:%s 文件\n"
" 或:%s 选项\n"
-#: src/expr.c:106
+#: src/expr.c:109
msgid ""
"\n"
"Print the value of EXPRESSION to standard output. A blank line below\n"
@@ -2698,7 +2862,7 @@ msgid ""
" ARG1 & ARG2 ARG1 if neither argument is null or 0, otherwise 0\n"
msgstr ""
-#: src/expr.c:115
+#: src/expr.c:118
msgid ""
"\n"
" ARG1 < ARG2 ARG1 is less than ARG2\n"
@@ -2709,14 +2873,14 @@ msgid ""
" ARG1 > ARG2 ARG1 is greater than ARG2\n"
msgstr ""
-#: src/expr.c:124
+#: src/expr.c:127
msgid ""
"\n"
" ARG1 + ARG2 arithmetic sum of ARG1 and ARG2\n"
" ARG1 - ARG2 arithmetic difference of ARG1 and ARG2\n"
msgstr ""
-#: src/expr.c:129
+#: src/expr.c:132
#, c-format
msgid ""
"\n"
@@ -2725,7 +2889,7 @@ msgid ""
" ARG1 % ARG2 arithmetic remainder of ARG1 divided by ARG2\n"
msgstr ""
-#: src/expr.c:135
+#: src/expr.c:138
msgid ""
"\n"
" STRING : REGEXP anchored pattern match of REGEXP in STRING\n"
@@ -2736,7 +2900,7 @@ msgid ""
" length STRING length of STRING\n"
msgstr ""
-#: src/expr.c:144
+#: src/expr.c:147
msgid ""
" + TOKEN interpret TOKEN as a string, even if it is a\n"
" keyword like `match' or an operator like `/'\n"
@@ -2744,7 +2908,7 @@ msgid ""
" ( EXPRESSION ) value of EXPRESSION\n"
msgstr ""
-#: src/expr.c:150
+#: src/expr.c:153
msgid ""
"\n"
"Beware that many operators need to be escaped or quoted for shells.\n"
@@ -2754,7 +2918,7 @@ msgid ""
"0.\n"
msgstr ""
-#: src/expr.c:157
+#: src/expr.c:160
msgid ""
"\n"
"Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is "
@@ -2762,28 +2926,33 @@ msgid ""
"or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n"
msgstr ""
-#: src/expr.c:171
+#: src/expr.c:174
#, fuzzy
msgid "syntax error"
msgstr "写入时发生错误"
-#: src/expr.c:417
+#: src/expr.c:424
#, c-format
msgid ""
-"warning: unportable BRE: `%s': using `^' as the first character\n"
+"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:629 src/expr.c:671
+#: src/expr.c:464 src/ptx.c:288
+#, fuzzy
+msgid "error in regular expression matcher"
+msgstr "转换无效:%s"
+
+#: src/expr.c:639 src/expr.c:681
#, fuzzy
msgid "non-numeric argument"
msgstr "参数数目错误"
-#: src/expr.c:635
+#: src/expr.c:645
msgid "division by zero"
msgstr ""
-#: src/factor.c:74
+#: src/factor.c:75
#, fuzzy, c-format
msgid ""
"Usage: %s [NUMBER]...\n"
@@ -2792,40 +2961,28 @@ msgstr ""
"用法:%s 文件\n"
" 或:%s 选项\n"
-#: src/factor.c:79
+#: src/factor.c:80
msgid ""
"Print the prime factors of each NUMBER.\n"
"\n"
msgstr ""
-#: src/factor.c:85
+#: src/factor.c:86
msgid ""
"\n"
-" Print the prime factors of all specified integer NUMBERs. If no "
-"arguments\n"
-" are specified on the command line, they are read from standard input.\n"
+"Print the prime factors of all specified integer NUMBERs. If no arguments\n"
+"are specified on the command line, they are read from standard input.\n"
msgstr ""
-#: src/factor.c:156
+#: src/factor.c:157 src/od.c:1678 src/od.c:1747
#, fuzzy, c-format
-msgid "`%s' is too large"
+msgid "%s is too large"
msgstr "%s:文件过大"
-#: src/factor.c:158
-#, c-format
-msgid "`%s' is not a valid positive integer"
-msgstr ""
-
-#: src/false.c:32
-#, c-format
-msgid ""
-"Usage: %s [ignored command line arguments]\n"
-" or: %s OPTION\n"
-"Exit with a status code indicating failure.\n"
-"\n"
-"These option names may not be abbreviated.\n"
-"\n"
-msgstr ""
+#: src/factor.c:159
+#, fuzzy, c-format
+msgid "%s is not a valid positive integer"
+msgstr "%s:文件类型无效"
#: src/fmt.c:273
#, fuzzy, c-format
@@ -2866,31 +3023,26 @@ msgstr ""
msgid "invalid width: %s"
msgstr "无效的行宽数值:%s"
-#: src/fold.c:72
+#: src/fold.c:74
msgid ""
"Wrap input lines in each FILE (standard input by default), writing to\n"
"standard output.\n"
"\n"
msgstr ""
-#: src/fold.c:80
+#: src/fold.c:82
msgid ""
" -b, --bytes count bytes rather than columns\n"
" -s, --spaces break at spaces\n"
" -w, --width=WIDTH use WIDTH columns instead of 80\n"
msgstr ""
-#: src/fold.c:276
-#, c-format
-msgid "`%s' option is obsolete; use `%s'"
-msgstr ""
-
-#: src/fold.c:301
+#: src/fold.c:291 src/pr.c:841
#, fuzzy, c-format
-msgid "invalid number of columns: `%s'"
+msgid "invalid number of columns: %s"
msgstr "无效的号码 %s"
-#: src/head.c:117
+#: src/head.c:113
msgid ""
"Print the first 10 lines of each FILE to standard output.\n"
"With more than one FILE, precede each with a header giving the file name.\n"
@@ -2898,7 +3050,7 @@ msgid ""
"\n"
msgstr ""
-#: src/head.c:126
+#: src/head.c:122
msgid ""
" -c, --bytes=[-]N print the first N bytes of each file;\n"
" with the leading `-', print all but the last\n"
@@ -2908,96 +3060,86 @@ msgid ""
" N lines of each file\n"
msgstr ""
-#: src/head.c:134
+#: src/head.c:130
msgid ""
" -q, --quiet, --silent never print headers giving file names\n"
" -v, --verbose always print headers giving file names\n"
msgstr ""
-#: src/head.c:140
+#: src/head.c:136
msgid ""
"\n"
"N may have a multiplier suffix: b 512, k 1024, m 1024*1024.\n"
msgstr ""
-#: 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: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
+#: src/head.c:151 src/head.c:264 src/head.c:336 src/head.c:540 src/head.c:622
+#: src/head.c:694 src/head.c:752 src/head.c:776 src/tail.c:380 src/tail.c:468
+#: src/tail.c:517 src/tail.c:610 src/tail.c:738 src/tail.c:786 src/tail.c:825
+#: src/tail.c:1319 src/tail.c:1348 src/uniq.c:377
#, fuzzy, c-format
msgid "error reading %s"
msgstr "正在读入%s"
-#: src/head.c:158 src/uniq.c:395 src/uniq.c:397
+#: src/head.c:154
#, fuzzy, c-format
msgid "error writing %s"
msgstr "正在写入%s"
-#: src/head.c:161
+#: src/head.c:157
#, c-format
msgid "%s: file has shrunk too much"
msgstr ""
-#: src/head.c:234
+#: src/head.c:230 src/head.c:1043
#, fuzzy, c-format
-msgid "%s: number of bytes is large"
-msgstr "参数数目错误"
+msgid "%s: number of bytes is too large"
+msgstr "%s:覆盖次数无效"
-#: src/head.c:452
+#: src/head.c:443
#, fuzzy, c-format
msgid "%s: cannot lseek back to original position"
msgstr "无法创建 fifo 文件%s"
-#: src/head.c:624 src/head.c:695 src/tail.c:414
+#: src/head.c:615 src/head.c:686 src/tail.c:418
#, fuzzy, c-format
msgid "%s: cannot seek to offset %s"
msgstr "无法 lseek%s"
-#: src/head.c:813
+#: src/head.c:793
#, fuzzy, c-format
msgid "cannot reposition file pointer for %s"
msgstr "无法取得 %s 的时间标记"
-#: src/head.c:897
+#: src/head.c:880
#, c-format
msgid "%s: %s is so large that it is not representable"
msgstr ""
-#: src/head.c:898
+#: src/head.c:881
#, fuzzy
msgid "number of lines"
msgstr "参数数目错误"
-#: src/head.c:898
+#: src/head.c:881
#, fuzzy
msgid "number of bytes"
msgstr "参数数目错误"
-#: src/head.c:905 src/tail.c:1497
+#: src/head.c:888 src/tail.c:1480
#, fuzzy
msgid "invalid number of lines"
msgstr "无效的号码 %s"
-#: src/head.c:906 src/tail.c:1498
+#: src/head.c:889 src/tail.c:1481
#, fuzzy
msgid "invalid number of bytes"
msgstr "无效的号码 %s"
-#: src/head.c:993
+#: src/head.c:976
#, fuzzy, c-format
msgid "unrecognized option `-%c'"
msgstr "无法识别的选项 %s"
-#: src/head.c:1001
-#, c-format
-msgid "`-%s' option is obsolete; use `-%c %.*s%.*s%s'"
-msgstr ""
-
-#: src/head.c:1074
-#, fuzzy, c-format
-msgid "%s: number of bytes is too large"
-msgstr "%s:覆盖次数无效"
-
#: src/hostid.c:48
#, c-format
msgid ""
@@ -3018,7 +3160,7 @@ msgstr ""
#: src/hostname.c:103
#, fuzzy, c-format
-msgid "cannot set name to `%s'"
+msgid "cannot set name to %s"
msgstr "无法设定 %s 的时间标记"
#: src/hostname.c:106
@@ -3030,12 +3172,12 @@ msgstr ""
msgid "cannot determine hostname"
msgstr "无法设定 %s 的权限"
-#: src/id.c:87
+#: src/id.c:78
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [USERNAME]\n"
msgstr "用法:%s [选项]... [文件]\n"
-#: src/id.c:88
+#: src/id.c:79
msgid ""
"Print information for USERNAME, or the current user.\n"
"\n"
@@ -3047,97 +3189,102 @@ msgid ""
" -u, --user print only the effective user ID\n"
msgstr ""
-#: src/id.c:100
+#: src/id.c:91
msgid ""
"\n"
"Without any OPTION, print some useful set of identified information.\n"
msgstr ""
-#: src/id.c:161
+#: src/id.c:152
#, fuzzy
msgid "cannot print only user and only group"
msgstr "不可同时省略用户和所属组"
-#: src/id.c:165
+#: src/id.c:156
msgid "cannot print only names or real IDs in default format"
msgstr ""
-#: src/id.c:177
+#: src/id.c:168
#, c-format
msgid "%s: No such user"
msgstr ""
-#: src/id.c:214
-#, c-format
-msgid "cannot find name for user ID %u"
-msgstr ""
+#: src/id.c:205
+#, fuzzy, c-format
+msgid "cannot find name for user ID %lu"
+msgstr "%s:找不到 UID %lu 的用户名\n"
-#: src/id.c:237
+#: src/id.c:229
#, fuzzy, c-format
-msgid "cannot find name for group ID %u"
+msgid "cannot find name for group ID %lu"
msgstr "无法更改%s的所有者及/或组"
-#: src/id.c:278
+#: src/id.c:271
#, fuzzy
msgid "cannot get supplemental group list"
msgstr "无法改变所属组至没有名称的组"
-#: src/id.c:382
+#: src/id.c:375
msgid " groups="
msgstr ""
-#: src/install.c:307
+#: src/install.c:292
msgid "the strip option may not be used when installing a directory"
msgstr "安装目录时不能用 strip 选项"
-#: src/install.c:310
+#: src/install.c:295
#, fuzzy
msgid "target directory not allowed when installing a directory"
msgstr "安装目录时不能用 strip 选项"
-#: src/install.c:358 src/mkdir.c:139
+#: src/install.c:343 src/mkdir.c:136
#, c-format
msgid "invalid mode %s"
msgstr "无效的权限模式%s"
-#: src/install.c:373 src/install.c:422
+#: src/install.c:358 src/mkdir.c:154
+#, fuzzy
+msgid "cannot return to working directory"
+msgstr "无法创建目录%s"
+
+#: src/install.c:364 src/install.c:416
#, c-format
msgid "creating directory %s"
msgstr "正在创建目录%s"
-#: src/install.c:511
+#: src/install.c:421
+#, fuzzy
+msgid "cannot return to current directory"
+msgstr "无法创建目录%s"
+
+#: src/install.c:518
#, fuzzy, c-format
msgid "cannot change ownership of %s"
msgstr "无法更改%s的权限"
-#: src/install.c:535
-#, c-format
-msgid "cannot obtain time stamps for %s"
-msgstr "无法取得 %s 的时间标记"
-
-#: src/install.c:545
+#: src/install.c:543
#, c-format
msgid "cannot set time stamps for %s"
msgstr "无法设定 %s 的时间标记"
-#: src/install.c:566
+#: src/install.c:564
msgid "fork system call failed"
msgstr "fork 系统进程出现错误"
-#: src/install.c:570
+#: src/install.c:568
msgid "cannot run strip"
msgstr "无法执行 strip 命令"
-#: src/install.c:577
+#: src/install.c:575
msgid "strip failed"
msgstr "strip 出现错误"
-#: src/install.c:598
+#: src/install.c:596
#, c-format
msgid "invalid user %s"
msgstr "无效的用户 %s"
-#: src/install.c:635
+#: src/install.c:633
#, fuzzy, c-format
msgid ""
"Usage: %s [OPTION]... [-T] SOURCE DEST\n"
@@ -3149,7 +3296,7 @@ msgstr ""
" 或:%s [选项]... 来源... 目录\n"
" 或:%s [选项]... --target-directory=目录 来源...\n"
-#: src/install.c:642
+#: src/install.c:640
#, fuzzy
msgid ""
"In the first three forms, copy SOURCE to DEST or multiple SOURCE(s) to\n"
@@ -3157,12 +3304,12 @@ msgid ""
"In the 4th form, create all components of the given DIRECTORY(ies).\n"
"\n"
msgstr ""
-"在最初两种格式中,会将<来源>复制至<目的地>或将多个<来源>文件复制至已存在的\n"
+"在最初两种格式中,会将<源>复制至<目的地>或将多个<源>文件复制至已存在的\n"
"<目录>,同时设定权限模式及所有者/所属组。在第三种格式中,会创建所有\n"
"指定的目录及它们的主目录。\n"
"\n"
-#: src/install.c:651
+#: src/install.c:649
msgid ""
" --backup[=CONTROL] make a backup of each existing destination file\n"
" -b like --backup but does not accept an argument\n"
@@ -3176,7 +3323,7 @@ msgstr ""
" -d, --directory 所有参数都作为目录处理;而且会创建指定目录的所有主目"
"录\n"
-#: src/install.c:658
+#: src/install.c:656
#, fuzzy
msgid ""
" -D create all leading components of DEST except the "
@@ -3188,13 +3335,13 @@ msgid ""
"x\n"
" -o, --owner=OWNER set ownership (super-user only)\n"
msgstr ""
-" -D 创建<目的地>前的所有主目录,然后将<来源>复制至\n"
+" -D 创建<目的地>前的所有主目录,然后将<源>复制至\n"
" <目的地>;在第一种使用格式中有用\n"
" -g, --group=组 自行设定所属组,而不是进程目前的所属组\n"
" -m, --mode=模式 自行设定权限模式 (像 chmod),而不是 rwxr-xr-x\n"
-" -o, --owner=所有者 自行设定所有者 (只适用於超级用户)\n"
+" -o, --owner=所有者 自行设定所有者 (只适用于超级用户)\n"
-#: src/install.c:665
+#: src/install.c:663
#, fuzzy
msgid ""
" -p, --preserve-timestamps apply access/modification times of SOURCE "
@@ -3207,14 +3354,14 @@ msgid ""
" -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"
+" -p, --preserve-timestamps 以<源>文件的访问/修改时间作为相应的目的\n"
" 地文件的时间属性\n"
-" -s, --strip 用 strip 命令删除 symbol table,只适用於第一及第二种\n"
+" -s, --strip 用 strip 命令删除 symbol table,只适用于第一及第二种\n"
" 使用格式\n"
" -S, --suffix=后缀 自行指定备份文件的<后缀>\n"
" -v, --verbose 处理每个文件/目录时印出名称\n"
-#: src/install.c:676 src/ln.c:377 src/mv.c:336
+#: src/install.c:674 src/ln.c:377 src/mv.c:332
msgid ""
"\n"
"The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -3224,12 +3371,12 @@ msgid ""
"\n"
msgstr ""
"\n"
-"备份文件的后缀为‘~’,除非以 --suffix 选项或是 SIMPLE_BACKUP_SUFFIX\n"
+"备份文件的后缀为“~”,除非以 --suffix 选项或是 SIMPLE_BACKUP_SUFFIX\n"
"环境变量指定。版本控制的方式可透过 --backup 选项或 VERSION_CONTROL 环境\n"
"变量来选择。以下是可用的变量值:\n"
"\n"
-#: src/join.c:162
+#: src/join.c:138
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"
@@ -3240,7 +3387,7 @@ msgid ""
" -e EMPTY replace missing input fields with EMPTY\n"
msgstr ""
-#: src/join.c:171
+#: src/join.c:147
msgid ""
" -i, --ignore-case ignore differences in case when comparing fields\n"
" -j FIELD equivalent to `-1 FIELD -2 FIELD'\n"
@@ -3248,14 +3395,14 @@ msgid ""
" -t CHAR use CHAR as input and output field separator\n"
msgstr ""
-#: src/join.c:177
+#: src/join.c:153
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:184
+#: src/join.c:160
msgid ""
"\n"
"Unless -t CHAR is given, leading blanks separate fields and are ignored,\n"
@@ -3268,42 +3415,49 @@ msgid ""
"Important: FILE1 and FILE2 must be sorted on the join fields.\n"
msgstr ""
-#: src/join.c:648
+#: src/join.c:622
#, 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:692
+#: src/join.c:627 src/join.c:822
#, fuzzy, c-format
msgid "invalid field number: %s"
msgstr "无效的号码 %s"
-#: src/join.c:699
+#: src/join.c:648 src/join.c:657
#, fuzzy, c-format
-msgid "invalid file number in field spec: `%s'"
-msgstr "无效的号码 %s"
+msgid "invalid field specifier: %s"
+msgstr "无效的 tab 字符定位值:%s"
-#: src/join.c:778 src/join.c:808
+#: src/join.c:664
#, fuzzy, c-format
-msgid "invalid field number: `%s'"
+msgid "invalid file number in field spec: %s"
msgstr "无效的号码 %s"
-#: src/join.c:796
-#, fuzzy, c-format
-msgid "invalid field number for file 1: `%s'"
-msgstr "无效的号码 %s"
+#: src/join.c:707
+#, c-format
+msgid "incompatible join fields %lu, %lu"
+msgstr ""
+
+#: src/join.c:833
+msgid "conflicting empty-field replacement strings"
+msgstr ""
-#: src/join.c:802
+#: src/join.c:874 src/sort.c:2351
+msgid "empty tab"
+msgstr ""
+
+#: src/join.c:880 src/sort.c:2362
#, fuzzy, c-format
-msgid "invalid field number for file 2: `%s'"
-msgstr "无效的号码 %s"
+msgid "multi-character tab %s"
+msgstr "权限模式字符串 %2$s 中出现无效的字符 %1$s"
+
+#: src/join.c:884 src/sort.c:2367
+msgid "incompatible tabs"
+msgstr ""
-#: src/join.c:862
+#: src/join.c:941
msgid "both files cannot be standard input"
msgstr ""
@@ -3338,35 +3492,35 @@ msgid ""
"PID is an integer; if negative it identifies a process group.\n"
msgstr ""
-#: src/kill.c:164
+#: src/kill.c:165
#, fuzzy, c-format
msgid "%s: invalid signal"
msgstr "%s:文件类型无效"
-#: src/kill.c:269
+#: src/kill.c:270
#, fuzzy, c-format
msgid "%s: invalid process id"
msgstr "%s:文件大小无效"
-#: src/kill.c:323
+#: src/kill.c:324
#, fuzzy, c-format
msgid "invalid option -- %c"
-msgstr "%s:无效的选项 ― %c\n"
+msgstr "%s:无效的选项 -- %c\n"
-#: src/kill.c:332
+#: src/kill.c:333
#, c-format
msgid "%s: multiple signals specified"
msgstr ""
-#: src/kill.c:346
+#: src/kill.c:347
msgid "multiple -l or -t options specified"
msgstr ""
-#: src/kill.c:363
+#: src/kill.c:364
msgid "cannot combine signal with -l or -t"
msgstr ""
-#: src/kill.c:369
+#: src/kill.c:370
msgid "no process ID specified"
msgstr ""
@@ -3388,24 +3542,24 @@ msgstr ""
#: src/link.c:96
#, c-format
msgid "cannot create link %s to %s"
-msgstr "无法创建连至%2$s的链接%1$s"
+msgstr "无法创建指向%2$s的链接%1$s"
-#: src/ln.c:179
+#: src/ln.c:178
#, c-format
msgid "%s: warning: making a hard link to a symbolic link is not portable"
-msgstr "%s:警告:将硬链接连至符号链接是不通用的功能"
+msgstr "%s:警告:将硬链接指向符号链接是不通用的功能"
-#: src/ln.c:186
+#: src/ln.c:185
#, c-format
msgid "%s: hard link not allowed for directory"
-msgstr "%s: 不允许将硬链接连至目录"
+msgstr "%s: 不允许将硬链接指向目录"
-#: src/ln.c:240
+#: src/ln.c:239
#, c-format
msgid "%s: cannot overwrite directory"
msgstr "%s:无法覆盖目录"
-#: src/ln.c:245
+#: src/ln.c:244
#, c-format
msgid "%s: replace %s? "
msgstr "%s:是否置换%s? "
@@ -3413,22 +3567,22 @@ msgstr "%s:是否置换%s? "
#: src/ln.c:273
#, c-format
msgid "create symbolic link %s to %s"
-msgstr "创建连至%2$s的符号链接%1$s"
+msgstr "创建指向%2$s的符号链接%1$s"
#: src/ln.c:274
#, c-format
msgid "create hard link %s to %s"
-msgstr "创建连至%2$s的硬链接%1$s"
+msgstr "创建指向%2$s的硬链接%1$s"
#: src/ln.c:316
#, c-format
msgid "creating symbolic link %s to %s"
-msgstr "正在创建连至%2$s的符号链接%1$s"
+msgstr "正在创建指向%2$s的符号链接%1$s"
#: src/ln.c:317
#, c-format
msgid "creating hard link %s to %s"
-msgstr "正在创建连至%2$s的硬链接%1$s"
+msgstr "正在创建指向%2$s的硬链接%1$s"
#: src/ln.c:336
#, fuzzy, c-format
@@ -3452,10 +3606,10 @@ msgid ""
"When creating hard links, each TARGET must exist.\n"
"\n"
msgstr ""
-"创建连至指定<目标>的链接,并可选择性指定<链接名>。\n"
+"创建指向指定<目标>的链接,并可选择性指定<链接名>。\n"
"如果没有指定<链接名>,会在目前的目录中创建一个和<目标>名称一样的链接。\n"
-"当使用第二种格式而<目标>多於一个时,最后的参数必须是目录;这样会在指定的\n"
-"<目录>中分别创建连至每个<目标>的链接。默认会创建硬链接,若\n"
+"当使用第二种格式而<目标>多于一个时,最后的参数必须是目录;这样会在指定的\n"
+"<目录>中分别创建指向每个<目标>的链接。默认会创建硬链接,若\n"
"使用 --symbolic 选项则创建符号链接。当创建硬链接时,每个<目标>都必须存\n"
"在。\n"
"\n"
@@ -3475,7 +3629,7 @@ msgid ""
msgstr ""
" --backup[=CONTROL] 为每个已存在的目的地文件创建备份文件\n"
" -b 类似 --backup,但不接受任何参数\n"
-" -d, -F, --directory 创建连至目录的硬链接 (只适用於超级用户)\n"
+" -d, -F, --directory 创建指向目录的硬链接 (只适用于超级用户)\n"
" -f, --force 强迫删除任何已存在的目的地文件\n"
#: src/ln.c:362
@@ -3505,7 +3659,7 @@ msgstr ""
" --target-directory=目录 在指定<目录>中创建链接\n"
" -v, --verbose 链接前先印出每个文件的名称\n"
-#: src/ln.c:508
+#: src/ln.c:501
#, fuzzy
msgid "Cannot combine --target-directory and --no-target-directory"
msgstr "%s:指定的目的地不是目录"
@@ -3520,84 +3674,86 @@ msgid ""
"Print the name of the current user.\n"
"\n"
msgstr ""
+"打印当前用户的名称。\n"
+"\n"
#: src/logname.c:89
msgid "no login name"
-msgstr ""
+msgstr "无登录名"
-#: src/ls.c:662
+#: src/ls.c:685
msgid "%b %e %Y"
-msgstr "%Y-%m-%d "
+msgstr "%Y-%m-%d"
-#: src/ls.c:670
+#: src/ls.c:693
msgid "%b %e %H:%M"
-msgstr "%b %e %H:%M"
+msgstr "%m-%d %H:%M"
-#: src/ls.c:1404
-#, fuzzy, c-format
+#: src/ls.c:1424
+#, c-format
msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s"
msgstr "忽略无效的环境变量 QUOTING_STYLE 的变量值:%s"
-#: src/ls.c:1431
+#: src/ls.c:1451
#, c-format
msgid "ignoring invalid width in environment variable COLUMNS: %s"
msgstr "忽略无效的环境变量 COLUMNS 的宽度数值:%s"
-#: src/ls.c:1461
+#: src/ls.c:1481
#, c-format
msgid "ignoring invalid tab size in environment variable TABSIZE: %s"
msgstr "忽略无效的环境变量 TABSIZE 的 tab 字符定位值:%s"
-#: src/ls.c:1573 src/ptx.c:2055
+#: src/ls.c:1593 src/ptx.c:2071
#, c-format
msgid "invalid line width: %s"
-msgstr "无效的行宽数值:%s"
+msgstr "无效的行宽:%s"
-#: src/ls.c:1647
+#: src/ls.c:1667
#, c-format
msgid "invalid tab size: %s"
-msgstr "无效的 tab 字符定位值:%s"
+msgstr "无效的制表位大小:%s"
-#: src/ls.c:1824
+#: src/ls.c:1844
#, c-format
msgid "invalid time style format %s"
msgstr "无效的日期时间格式 %s"
-#: src/ls.c:2160
+#: src/ls.c:2180
#, c-format
msgid "unrecognized prefix: %s"
-msgstr "无法识别的文件种类:%s"
+msgstr "无法识别的前缀:%s"
-#: src/ls.c:2183
+#: src/ls.c:2203
msgid "unparsable value for LS_COLORS environment variable"
msgstr "LS_COLORS 环境变量中存在无法分析的值"
-#: src/ls.c:2275
+#: src/ls.c:2295
#, c-format
msgid "cannot determine device and inode of %s"
msgstr "无法决定 %s 所在的设备及 inode"
-#: src/ls.c:2283
-#, fuzzy, c-format
+#: src/ls.c:2303
+#, c-format
msgid "%s: not listing already-listed directory"
-msgstr "不会再列出已经列出的目录:%s"
+msgstr "%s:不会再列出已经列出的目录"
-#: src/ls.c:2323 src/pwd.c:236 src/remove.c:972
-#, fuzzy, c-format
+#: src/ls.c:2343 src/pwd.c:238 src/remove.c:982
+#, c-format
msgid "reading directory %s"
-msgstr "正在创建目录%s"
+msgstr "读取目录 %s"
-#: src/ls.c:2333
-#, fuzzy, c-format
+#: src/ls.c:2353
+#, c-format
msgid "closing directory %s"
-msgstr "正在创建目录%s"
+msgstr "关闭目录 %s"
-#: src/ls.c:2820
+#: src/ls.c:2843
#, c-format
msgid "cannot compare file names %s and %s"
msgstr "无法比较文件名 %s 和 %s"
-#: src/ls.c:4061
+#: src/ls.c:4093
msgid ""
"List information about the FILEs (the current directory by default).\n"
"Sort entries alphabetically if none of -cftuSUX nor --sort.\n"
@@ -3607,7 +3763,7 @@ msgstr ""
"如果不指定 -cftuSUX 或 --sort 任何一个选项,则根据字母大小排序。\n"
"\n"
-#: src/ls.c:4069
+#: src/ls.c:4101
#, fuzzy
msgid ""
" -a, --all do not ignore entries starting with .\n"
@@ -3620,7 +3776,7 @@ msgstr ""
" --author 印出每个文件著作者\n"
" -b, --escape 以八进制溢出序列表示不可打印的字符\n"
-#: src/ls.c:4075
+#: src/ls.c:4107
msgid ""
" --block-size=SIZE use SIZE-byte blocks\n"
" -B, --ignore-backups do not list implied entries ending with ~\n"
@@ -3637,7 +3793,7 @@ msgstr ""
" 配合 -l:显示 ctime 但根据名称排序\n"
" 否则:根据 ctime 排序\n"
-#: src/ls.c:4083
+#: src/ls.c:4115
#, fuzzy
msgid ""
" -C list entries by columns\n"
@@ -3651,14 +3807,16 @@ msgid ""
msgstr ""
" -C 每栏由上至下列出项目\n"
" --color[=WHEN] 控制是否使用色彩分辨文件。WHEN 可以是\n"
-" ‘never’、‘always’或‘auto’其中之一\n"
+" “never”、“always”或“auto”其中之一\n"
" -d, --directory 当遇到目录时列出目录本身而非目录内的文件\n"
" -D, --dired 产生适合 Emacs 的 dired 模式使用的结果\n"
-#: src/ls.c:4091
+#: src/ls.c:4123
+#, fuzzy
msgid ""
" -f do not sort, enable -aU, disable -lst\n"
-" -F, --classify append indicator (one of */=@|) to entries\n"
+" -F, --classify append indicator (one of */=>@|) to entries\n"
+" --file-type likewise, except do not append `*'\n"
" --format=WORD across -x, commas -m, horizontal -x, long -l,\n"
" single-column -1, verbose -l, vertical -C\n"
" --full-time like -l --time-style=full-iso\n"
@@ -3669,7 +3827,7 @@ msgstr ""
" single-column -1,verbose -l,vertical -C\n"
" --full-time 即 -l --time-style=full-iso\n"
-#: src/ls.c:4098
+#: src/ls.c:4131
#, fuzzy
msgid ""
" -g like -l, but do not list owner\n"
@@ -3693,13 +3851,13 @@ msgstr ""
" --si 类似 -h,但取 1000 的次方而不是 1024\n"
" -H, --dereference-command-line 使用命令列中的符号链接指示的真正目的地\n"
-#: src/ls.c:4112
+#: src/ls.c:4145
#, fuzzy
msgid ""
" --indicator-style=WORD append indicator with style WORD to entry "
"names:\n"
-" none (default), classify (-F), file-type (-"
-"p)\n"
+" none (default), slash (-p),\n"
+" file-type (--file-type), classify (-F)\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"
@@ -3711,7 +3869,7 @@ msgstr ""
" -I, --ignore=样式 不印出任何符合 shell 万用字符<样式>的项目\n"
" -k 即 --block-size=1K\n"
-#: src/ls.c:4119
+#: src/ls.c:4153
msgid ""
" -l use a long listing format\n"
" -L, --dereference when showing file information for a symbolic\n"
@@ -3725,14 +3883,16 @@ msgstr ""
" 的对象而并非符号链接本身的信息\n"
" -m 所有项目以逗号分隔,并填满整行行宽\n"
-#: src/ls.c:4126
+#: src/ls.c:4160
+#, fuzzy
msgid ""
-" -n, --numeric-uid-gid like -l, but list numeric UIDs and GIDs\n"
+" -n, --numeric-uid-gid like -l, but list numeric user and group IDs\n"
" -N, --literal print raw entry names (don't treat e.g. "
"control\n"
" characters specially)\n"
" -o like -l, but do not list group information\n"
-" -p, --file-type append indicator (one of /=@|) to entries\n"
+" -p, --indicator-style=slash\n"
+" append / indicator to directories\n"
msgstr ""
" -n, --numeric-uid-gid 类似 -l,但列出 UID 及 GID 号\n"
" -N, --literal 印出未经处理的项目名称 (例如不特别处理控制字"
@@ -3740,7 +3900,7 @@ msgstr ""
" -o 类似 -l,但不列出有关组的信息\n"
" -p, --file-type 加上文件类型的指示符号 (/=@| 其中一个)\n"
-#: src/ls.c:4133
+#: src/ls.c:4168
msgid ""
" -q, --hide-control-chars print ? instead of non graphic characters\n"
" --show-control-chars show non graphic characters as-is (default\n"
@@ -3753,13 +3913,13 @@ msgid ""
msgstr ""
" -q, --hide-control-chars 以 ? 字符代替无法打印的字符\n"
" --show-control-chars 直接显示无法打印的字符 (这是默认方式,除非调用\n"
-" 的程序名称是‘ls’而且是在终端机画面输出结果)\n"
+" 的程序名称是“ls”而且是在终端机画面输出结果)\n"
" -Q, --quote-name 将项目名称括上双引号\n"
" --quoting-style=方式 使用指定的 quoting <方式>显示项目的名称:\n"
" literal、locale、shell、shell-always、c、"
"escape\n"
-#: src/ls.c:4141
+#: src/ls.c:4176
#, fuzzy
msgid ""
" -r, --reverse reverse order while sorting\n"
@@ -3770,7 +3930,7 @@ msgstr ""
" -R, --recursive 同时列出所有子目录层\n"
" -s, --size 以块大小为单位列出所有文件的大小\n"
-#: src/ls.c:4146
+#: src/ls.c:4181
#, fuzzy
msgid ""
" -S sort by file size\n"
@@ -3793,7 +3953,7 @@ msgstr ""
" atime、access、use、ctime 或 status;加上\n"
" --sort=time 选项时会以指定时间作为排序索引\n"
-#: src/ls.c:4155
+#: src/ls.c:4190
#, fuzzy
msgid ""
" --time-style=STYLE with -l, show times using style STYLE:\n"
@@ -3809,13 +3969,13 @@ msgid ""
msgstr ""
" --time-style=WORD 根据 WORD 代表的格式显示时间:\n"
" full-iso、iso、locale、posix-iso、+FORMAT\n"
-" FORMAT 即是‘date’所用的时间格式;如果 FORMAT\n"
-" 是 FORMAT1<newline>FORMAT2,FORMAT1 适用於较旧\n"
-" 的文件而 FORMAT2 适用於较新的文件\n"
+" FORMAT 即是“date”所用的时间格式;如果 FORMAT\n"
+" 是 FORMAT1<newline>FORMAT2,FORMAT1 适用于较旧\n"
+" 的文件而 FORMAT2 适用于较新的文件\n"
" -t 根据修改时间排序\n"
" -T, --tabsize=宽度 自行指定 tab 的<宽度>,而非 8 个字符\n"
-#: src/ls.c:4166
+#: src/ls.c:4201
msgid ""
" -u with -lt: sort by, and show, access time\n"
" with -l: show access time and sort by name\n"
@@ -3829,7 +3989,7 @@ msgstr ""
" -U 不进行排序;依文件系统原有的次序列出项目\n"
" -v 根据版本进行排序\n"
-#: src/ls.c:4173
+#: src/ls.c:4208
msgid ""
" -w, --width=COLS assume screen width instead of current value\n"
" -x list entries by lines instead of by columns\n"
@@ -3841,55 +4001,75 @@ msgstr ""
" -X 根据扩展名排序\n"
" -1 每行只列出一个文件\n"
-#: src/ls.c:4185
+#: src/ls.c:4220
+#, fuzzy
msgid ""
"\n"
"By default, color is not used to distinguish types of files. That is\n"
"equivalent to using --color=none. Using the --color option without the\n"
"optional WHEN argument is equivalent to using --color=always. With\n"
"--color=auto, color codes are output only if standard output is connected\n"
-"to a terminal (tty).\n"
+"to a terminal (tty). The environment variable LS_COLORS can influence the\n"
+"colors, and can be set easily by the dircolors command.\n"
msgstr ""
"\n"
-"默认是不会使用色彩来区别文件的。此方式等於使用了 --color=none 选项。若使用\n"
-"--color 选项但不指定 WHEN 参数等於 --color=always。当使用 --color=auto 时,\n"
+"默认是不会使用色彩来区别文件的。此方式等于使用了 --color=none 选项。若使用\n"
+"--color 选项但不指定 WHEN 参数等于 --color=always。当使用 --color=auto 时,\n"
"只当输出至终端机画面 (tty) 时才会显示色彩。\n"
-#: src/ls.c:4193
+#: src/ls.c:4229
msgid ""
"\n"
"Exit status is 0 if OK, 1 if minor problems, 2 if serious trouble.\n"
msgstr ""
-#: src/md5sum.c:131
+#: src/md5sum.c:108
#, c-format
msgid ""
"Usage: %s [OPTION] [FILE]...\n"
-" or: %s [OPTION] --check [FILE]\n"
"Print or check %s (%d-bit) checksums.\n"
"With no FILE, or when FILE is -, read standard input.\n"
+"\n"
msgstr ""
-#: src/md5sum.c:140
-#, c-format
+#: src/md5sum.c:118
msgid ""
+" -b, --binary read in binary mode (default unless reading tty "
+"stdin)\n"
+msgstr ""
+
+#: src/md5sum.c:122
+#, fuzzy
+msgid " -b, --binary read in binary mode\n"
+msgstr ""
"\n"
-" -b, --binary read files in binary mode (default on DOS/"
-"Windows)\n"
-" -c, --check check %s sums against given list\n"
-" -t, --text read files in text mode (default)\n"
+" -B, --binary 使用二进制写入到控制台设备。\n"
"\n"
+
+#: src/md5sum.c:125
+#, c-format
+msgid " -c, --check read %s sums from the FILEs and check them\n"
msgstr ""
-#: src/md5sum.c:148
+#: src/md5sum.c:129
msgid ""
+" -t, --text read in text mode (default if reading tty stdin)\n"
+msgstr ""
+
+#: src/md5sum.c:133
+msgid " -t, --text read in text mode (default)\n"
+msgstr ""
+
+#: src/md5sum.c:136
+msgid ""
+"\n"
"The following two options are useful only when verifying checksums:\n"
" --status don't output anything, status code shows success\n"
-" -w, --warn warn about improperly formated checksum lines\n"
+" -w, --warn warn about improperly formatted checksum lines\n"
"\n"
msgstr ""
-#: src/md5sum.c:156
+#: src/md5sum.c:145
#, c-format
msgid ""
"\n"
@@ -3899,48 +4079,48 @@ msgid ""
"text), and name for each FILE.\n"
msgstr ""
-#: src/md5sum.c:423
-#, fuzzy, c-format
+#: src/md5sum.c:417
+#, c-format
msgid "%s: too many checksum lines"
-msgstr "字符特殊文件"
+msgstr ""
-#: src/md5sum.c:444
+#: src/md5sum.c:439
#, c-format
msgid "%s: %<PRIuMAX>: improperly formatted %s checksum line"
msgstr ""
-#: src/md5sum.c:467
+#: src/md5sum.c:462
#, c-format
msgid "%s: FAILED open or read\n"
msgstr ""
-#: src/md5sum.c:491
+#: src/md5sum.c:486
msgid "FAILED"
msgstr ""
-#: src/md5sum.c:491
+#: src/md5sum.c:486
msgid "OK"
msgstr ""
-#: src/md5sum.c:504 src/od.c:942 src/tac.c:238 src/tac.c:345 src/tac.c:475
-#: src/tac.c:559
+#: src/md5sum.c:498 src/od.c:950 src/tac.c:239 src/tac.c:350 src/tac.c:480
+#: src/tac.c:556
#, fuzzy, c-format
msgid "%s: read error"
msgstr "%s:名称已更改为 %s"
-#: src/md5sum.c:517
+#: src/md5sum.c:511
#, c-format
msgid "%s: no properly formatted %s checksum lines found"
msgstr ""
-#: src/md5sum.c:526
+#: src/md5sum.c:520
#, c-format
msgid "WARNING: %<PRIuMAX> of %<PRIuMAX> listed file could not be read"
msgid_plural "WARNING: %<PRIuMAX> of %<PRIuMAX> listed files could not be read"
msgstr[0] ""
msgstr[1] ""
-#: src/md5sum.c:538
+#: src/md5sum.c:532
#, c-format
msgid "WARNING: %<PRIuMAX> of %<PRIuMAX> computed checksum did NOT match"
msgid_plural ""
@@ -3948,29 +4128,25 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/md5sum.c:613
+#: src/md5sum.c:596
msgid ""
"the --binary and --text options are meaningless when verifying checksums"
msgstr ""
-#: src/md5sum.c:621
+#: src/md5sum.c:604
msgid "the --status option is meaningful only when verifying checksums"
msgstr ""
-#: src/md5sum.c:628
+#: src/md5sum.c:611
msgid "the --warn option is meaningful only when verifying checksums"
msgstr ""
-#: src/md5sum.c:638
-msgid "Only one operand may be specified when using --check."
-msgstr ""
-
-#: src/mkdir.c:61
+#: src/mkdir.c:58
#, c-format
msgid "Usage: %s [OPTION] DIRECTORY...\n"
msgstr "用法:%s [选项] 目录...\n"
-#: src/mkdir.c:62
+#: src/mkdir.c:59
msgid ""
"Create the DIRECTORY(ies), if they do not already exist.\n"
"\n"
@@ -3978,7 +4154,7 @@ msgstr ""
"若目录不是已经存在则创建目录。\n"
"\n"
-#: src/mkdir.c:69
+#: src/mkdir.c:66
msgid ""
" -m, --mode=MODE set permission mode (as in chmod), not rwxrwxrwx - "
"umask\n"
@@ -3989,12 +4165,12 @@ msgstr ""
" -p, --parents 需要时创建上层目录,如目录早已存在则不当作错误\n"
" -v, --verbose 每次创建新目录都显示信息\n"
-#: src/mkdir.c:112
+#: src/mkdir.c:109
#, c-format
msgid "created directory %s"
msgstr "已创建目录 %s"
-#: src/mkdir.c:188
+#: src/mkdir.c:183
#, c-format
msgid "cannot set permissions of directory %s"
msgstr "无法设定目录 %s 的权限"
@@ -4017,15 +4193,15 @@ 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:214
+#: src/mkfifo.c:93 src/mknod.c:211
msgid "fifo files not supported"
msgstr "不支持 FIFO 文件"
-#: src/mkfifo.c:122 src/mknod.c:127
+#: src/mkfifo.c:120 src/mknod.c:125
msgid "invalid mode"
msgstr "权限模式无效"
-#: src/mkfifo.c:141
+#: src/mkfifo.c:138
#, c-format
msgid "cannot set permissions of fifo %s"
msgstr "无法设定 fifo 文件 %s 的权限"
@@ -4068,45 +4244,45 @@ msgstr ""
" c, u 创建(没有缓冲的)字符特殊文件\n"
" p 创建 FIFO 特殊文件\n"
-#: src/mknod.c:148
+#: src/mknod.c:145
#, fuzzy
msgid "Special files require major and minor device numbers."
msgstr "创建区块特殊文件时,必需指定 major 和 minor 设备号"
-#: src/mknod.c:158
+#: src/mknod.c:155
#, fuzzy
msgid "Fifos do not have major and minor device numbers."
msgstr "无效的 minor 设备号 %s"
-#: src/mknod.c:169
+#: src/mknod.c:166
msgid "block special files not supported"
msgstr "本系统不支持区块特殊文件"
-#: src/mknod.c:178
+#: src/mknod.c:175
msgid "character special files not supported"
msgstr "本系统不支持字符特殊文件"
-#: src/mknod.c:194
+#: src/mknod.c:191
#, c-format
msgid "invalid major device number %s"
msgstr "无效的 major 设备号 %s"
-#: src/mknod.c:199
+#: src/mknod.c:196
#, c-format
msgid "invalid minor device number %s"
msgstr "无效的 minor 设备号 %s"
-#: src/mknod.c:204
+#: src/mknod.c:201
#, c-format
msgid "invalid device %s %s"
msgstr "设备文件 %s %s 无效"
-#: src/mknod.c:222
+#: src/mknod.c:219
#, fuzzy, c-format
msgid "invalid device type %s"
msgstr "设备文件 %s %s 无效"
-#: src/mknod.c:233
+#: src/mknod.c:230
#, c-format
msgid "cannot set permissions of %s"
msgstr "无法设定 %s 的权限"
@@ -4116,7 +4292,7 @@ msgid ""
"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
"\n"
msgstr ""
-"将<来源>名称重命名为<目的地>名称,或将<来源>文件移动至<目录>。\n"
+"将<源>名称重命名为<目的地>名称,或将<源>文件移动至<目录>。\n"
"\n"
#: src/mv.c:311
@@ -4127,28 +4303,21 @@ msgid ""
" -b like --backup but does not accept an "
"argument\n"
" -f, --force do not prompt before overwriting\n"
-" (equivalent to --reply=yes)\n"
" -i, --interactive prompt before overwrite\n"
-" (equivalent to --reply=query)\n"
msgstr ""
" --backup[=CONTROL] 为每个已存在的目的地文件创建备份文件\n"
" -b 类似 --backup,但不接受任何参数\n"
-" -f, --force 覆盖文件前不会进行确认,等於 --reply=yes\n"
-" -i, --interactive 覆盖文件前必须先确认,等於 --reply=query\n"
+" -f, --force 覆盖文件前不会进行确认,等于 --reply=yes\n"
+" -i, --interactive 覆盖文件前必须先确认,等于 --reply=query\n"
-#: src/mv.c:319
+#: src/mv.c:317
msgid ""
-" --reply={yes,no,query} specify how to handle the prompt about an\n"
-" existing destination file\n"
" --strip-trailing-slashes remove any trailing slashes from each SOURCE\n"
" argument\n"
" -S, --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
-" --reply={yes,no,query} 指定如何处理已存在的目的地文件\n"
-" --strip-trailing-slashes 删除参数中所有<来源>文件/目录末端的斜杠\n"
-" -S, --suffix=后缀 自行指定备份文件的<后缀>\n"
-#: src/mv.c:326
+#: src/mv.c:322
#, fuzzy
msgid ""
" -t, --target-directory=DIRECTORY move all SOURCE arguments into "
@@ -4159,45 +4328,44 @@ msgid ""
" destination file is missing\n"
" -v, --verbose explain what is being done\n"
msgstr ""
-" --target-directory=目录 将所有参数指定的<来源>文件/目录移动至<目录>\n"
-" -u, --update 只在<来源>文件比目的地文件新,或目的地文件\n"
+" --target-directory=目录 将所有参数指定的<源>文件/目录移动至<目录>\n"
+" -u, --update 只在<源>文件比目的地文件新,或目的地文件\n"
" 不存在时才会移动\n"
" -v, --verbose 详细显示进行的步骤\n"
-#: src/nice.c:73
-#, fuzzy, c-format
+#: src/nice.c:79
+#, c-format
msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n"
-msgstr "用法:%s [选项] 名称...\n"
+msgstr "用法:%s [选项] [命令 [参数]...]\n"
-#: src/nice.c:74
+#: src/nice.c:80
#, c-format
msgid ""
-"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"
+"Run COMMAND with an adjusted niceness, which affects process scheduling.\n"
+"With no COMMAND, print the current niceness. Nicenesses range from\n"
"%d (most favorable scheduling) to %d (least favorable).\n"
"\n"
-" -n, --adjustment=N add integer N to the nice value (default 10)\n"
+" -n, --adjustment=N add integer N to the niceness (default 10)\n"
msgstr ""
-#: src/nice.c:157
+#: src/nice.c:158
#, fuzzy, c-format
-msgid "invalid adjustment `%s'"
+msgid "invalid adjustment %s"
msgstr "%2$s 的参数 %1$s 无效"
-#: src/nice.c:165
+#: src/nice.c:167
msgid "a command must be given with an adjustment"
msgstr ""
-#: src/nice.c:172 src/nice.c:181
+#: src/nice.c:174 src/nice.c:185
#, fuzzy
-msgid "cannot get priority"
-msgstr "无法进入目录 %s"
+msgid "cannot get niceness"
+msgstr "无法创建链接 %s"
-#: src/nice.c:188
+#: src/nice.c:189
#, fuzzy
-msgid "cannot set priority"
-msgstr "无法设定 %s 的权限"
+msgid "cannot set niceness"
+msgstr "stat%s失败"
#: src/nl.c:176
msgid ""
@@ -4261,47 +4429,47 @@ msgstr ""
msgid "line number overflow"
msgstr "无效的号码 %s"
-#: src/nl.c:466
+#: src/nl.c:474
#, fuzzy, c-format
msgid "invalid header numbering style: %s"
msgstr "无效的号码 %s"
-#: src/nl.c:474
+#: src/nl.c:482
#, fuzzy, c-format
msgid "invalid body numbering style: %s"
msgstr "无效的号码 %s"
-#: src/nl.c:482
+#: src/nl.c:490
#, fuzzy, c-format
msgid "invalid footer numbering style: %s"
msgstr "无效的号码 %s"
-#: src/nl.c:491
+#: src/nl.c:499
#, fuzzy, c-format
msgid "invalid starting line number: %s"
msgstr "无效的 major 设备号 %s"
-#: src/nl.c:500
+#: src/nl.c:508
#, fuzzy, c-format
msgid "invalid line number increment: %s"
msgstr "无效的行宽数值:%s"
-#: src/nl.c:512
+#: src/nl.c:520
#, fuzzy, c-format
msgid "invalid number of blank lines: %s"
msgstr "%s:覆盖次数无效"
-#: src/nl.c:526
+#: src/nl.c:534
#, fuzzy, c-format
msgid "invalid line number field width: %s"
msgstr "无效的行宽数值:%s"
-#: src/nl.c:545
+#: src/nl.c:553
#, fuzzy, c-format
msgid "invalid line numbering format: %s"
msgstr "无效的行宽数值:%s"
-#: src/nohup.c:55
+#: src/nohup.c:57
#, fuzzy, c-format
msgid ""
"Usage: %s COMMAND [ARG]...\n"
@@ -4310,23 +4478,18 @@ msgstr ""
"用法:%s 文件\n"
" 或:%s 选项\n"
-#: src/nohup.c:61
+#: src/nohup.c:63
msgid ""
"Run COMMAND, ignoring hangup signals.\n"
"\n"
msgstr ""
-#: src/nohup.c:121 src/nohup.c:123
+#: src/nohup.c:129 src/nohup.c:131
#, fuzzy, c-format
msgid "failed to open %s"
msgstr "无法保留%s的时间"
-#: src/nohup.c:132
-#, fuzzy
-msgid "failed to redirect standard output"
-msgstr "标准输出"
-
-#: src/nohup.c:134
+#: src/nohup.c:139
#, fuzzy, c-format
msgid "appending output to %s"
msgstr "正在更改 %s 的所属组"
@@ -4335,11 +4498,11 @@ msgstr "正在更改 %s 的所属组"
msgid "failed to set the copy of stderr to close on exec"
msgstr ""
-#: src/nohup.c:158
+#: src/nohup.c:161
msgid "failed to redirect standard error"
msgstr ""
-#: src/od.c:301
+#: src/od.c:307
#, fuzzy, c-format
msgid ""
"Usage: %s [OPTION]... [FILE]...\n"
@@ -4350,7 +4513,7 @@ msgstr ""
"用法:%s [选项]... 组 文件...\n"
" 或:%s [选项]... --reference=参考文件 文件...\n"
-#: src/od.c:307
+#: src/od.c:313
msgid ""
"\n"
"Write an unambiguous representation, octal bytes by default,\n"
@@ -4360,18 +4523,18 @@ msgid ""
"\n"
msgstr ""
-#: src/od.c:314
+#: src/od.c:320
#, fuzzy
msgid "All arguments to long options are mandatory for short options.\n"
msgstr "长选项必须用的参数在使用短选项时也是必须的。\n"
-#: src/od.c:317
+#: src/od.c:323
msgid ""
" -A, --address-radix=RADIX decide how file offsets are printed\n"
" -j, --skip-bytes=BYTES skip BYTES input bytes first\n"
msgstr ""
-#: src/od.c:321
+#: src/od.c:327
msgid ""
" -N, --read-bytes=BYTES limit dump to BYTES input bytes\n"
" -S, --strings[=BYTES] output strings of at least BYTES graphic "
@@ -4382,7 +4545,7 @@ msgid ""
" --traditional accept arguments in traditional form\n"
msgstr ""
-#: src/od.c:331
+#: src/od.c:337
msgid ""
"\n"
"Traditional format specifications may be intermixed; they accumulate:\n"
@@ -4392,7 +4555,7 @@ msgid ""
" -d same as -t u2, select unsigned decimal 2-byte units\n"
msgstr ""
-#: src/od.c:339
+#: src/od.c:345
msgid ""
" -f same as -t fF, select floats\n"
" -i same as -t dI, select decimal ints\n"
@@ -4402,7 +4565,7 @@ msgid ""
" -x same as -t x2, select hexadecimal 2-byte units\n"
msgstr ""
-#: src/od.c:347
+#: src/od.c:353
msgid ""
"\n"
"If first and second call formats both apply, the second format is assumed\n"
@@ -4418,7 +4581,7 @@ msgid ""
" c ASCII character or backslash escape\n"
msgstr ""
-#: src/od.c:361
+#: src/od.c:367
msgid ""
" d[SIZE] signed decimal, SIZE bytes per integer\n"
" f[SIZE] floating point, SIZE bytes per integer\n"
@@ -4427,7 +4590,7 @@ msgid ""
" x[SIZE] hexadecimal, SIZE bytes per integer\n"
msgstr ""
-#: src/od.c:368
+#: src/od.c:374
msgid ""
"\n"
"SIZE is a number. For TYPE in doux, SIZE may also be C for\n"
@@ -4436,7 +4599,7 @@ msgid ""
"for sizeof(double) or L for sizeof(long double).\n"
msgstr ""
-#: src/od.c:375
+#: src/od.c:381
msgid ""
"\n"
"RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n"
@@ -4446,87 +4609,81 @@ msgid ""
"of output. "
msgstr ""
-#: src/od.c:383
+#: src/od.c:389
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"
msgstr ""
-#: src/od.c:675 src/od.c:794
+#: src/od.c:681 src/od.c:800
#, fuzzy, c-format
-msgid "invalid type string `%s'"
-msgstr "权限模式字串无效:%s "
+msgid "invalid type string %s"
+msgstr "权限模式字符串无效:%s "
-#: src/od.c:685
+#: src/od.c:691
#, c-format
msgid ""
-"invalid type string `%s';\n"
+"invalid type string %s;\n"
"this system doesn't provide a %lu-byte integral type"
msgstr ""
-#: src/od.c:804
+#: src/od.c:810
#, c-format
msgid ""
-"invalid type string `%s';\n"
+"invalid type string %s;\n"
"this system doesn't provide a %lu-byte floating point type"
msgstr ""
-#: src/od.c:862
+#: src/od.c:869
#, fuzzy, c-format
-msgid "invalid character `%c' in type string `%s'"
-msgstr "权限模式字串 %2$s 中出现无效的字符 %1$s"
+msgid "invalid character `%c' in type string %s"
+msgstr "权限模式字符串 %2$s 中出现无效的字符 %1$s"
-#: src/od.c:1086
+#: src/od.c:1094
msgid "cannot skip past end of combined input"
msgstr ""
-#: src/od.c:1637
+#: src/od.c:1642
#, c-format
msgid "invalid output address radix `%c'; it must be one character from [doxn]"
msgstr ""
-#: src/od.c:1648
+#: src/od.c:1653
#, fuzzy
msgid "skip argument"
msgstr "缺少了文件参数"
-#: src/od.c:1657
+#: src/od.c:1662
#, fuzzy
msgid "limit argument"
msgstr "有效的参数为:"
-#: src/od.c:1668
+#: src/od.c:1673
msgid "minimum string length"
msgstr ""
-#: src/od.c:1673 src/od.c:1742
-#, fuzzy, c-format
-msgid "%s is too large"
-msgstr "%s:文件过大"
-
-#: src/od.c:1740
+#: src/od.c:1745
msgid "width specification"
msgstr ""
-#: src/od.c:1762
+#: src/od.c:1767
msgid "no type may be specified when dumping strings"
msgstr ""
-#: src/od.c:1837
+#: src/od.c:1842
msgid "Compatibility mode supports at most one file."
msgstr ""
-#: src/od.c:1858
-#, fuzzy
+#: src/od.c:1863
msgid "skip-bytes + read-bytes is too large"
-msgstr "%s:覆盖次数无效"
+msgstr ""
-#: src/od.c:1901
+#: src/od.c:1906
#, c-format
msgid "warning: invalid width %lu; using %d instead"
msgstr ""
-#: src/od.c:1917
+#: src/od.c:1922
#, c-format
msgid "%d: fmt=\"%s\" width=%d\n"
msgstr ""
@@ -4536,7 +4693,7 @@ msgstr ""
msgid "standard input is closed"
msgstr "标准输入"
-#: src/paste.c:420
+#: src/paste.c:421
msgid ""
"Write lines consisting of the sequentially corresponding lines from\n"
"each FILE, separated by TABs, to standard output.\n"
@@ -4544,108 +4701,120 @@ msgid ""
"\n"
msgstr ""
-#: src/paste.c:429
+#: src/paste.c:430
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"
msgstr ""
-#: src/pathchk.c:92
+#: src/pathchk.c:99
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... NAME...\n"
msgstr "用法:%s [选项] 名称...\n"
-#: src/pathchk.c:93
+#: src/pathchk.c:100
msgid ""
"Diagnose unportable constructs in NAME.\n"
"\n"
-" -p, --portability check for all POSIX systems, not only this one\n"
+" -p check for most POSIX systems\n"
+" -P check for empty names and leading \"-\"\n"
+" --portability check for all POSIX systems (equivalent to -p -P)\n"
+msgstr ""
+
+#: src/pathchk.c:180
+#, c-format
+msgid "leading `-' in a component of file name %s"
msgstr ""
-#: src/pathchk.c:167
+#: src/pathchk.c:206
#, fuzzy, c-format
msgid "nonportable character %s in file name %s"
-msgstr "权限模式字串 %2$s 中出现无效的字符 %1$s"
+msgstr "权限模式字符串 %2$s 中出现无效的字符 %1$s"
-#: src/pathchk.c:244
+#: src/pathchk.c:282
+#, fuzzy
+msgid "empty file name"
+msgstr "一般空文件"
+
+#: src/pathchk.c:324
#, c-format
msgid "%s: unable to determine maximum file name length"
msgstr ""
-#: src/pathchk.c:255
+#: src/pathchk.c:335
#, c-format
msgid "limit %lu exceeded by length %lu of file name %s"
msgstr ""
-#: src/pathchk.c:354
+#: src/pathchk.c:421
#, c-format
msgid "limit %lu exceeded by length %lu of file name component %s"
msgstr ""
-#: src/pinky.c:330
+#: src/pinky.c:331
#, c-format
msgid "Login name: "
msgstr ""
-#: src/pinky.c:333
+#: src/pinky.c:334
#, c-format
msgid "In real life: "
msgstr ""
-#: src/pinky.c:336
+#: src/pinky.c:337
msgid "???\n"
msgstr ""
-#: src/pinky.c:356
+#: src/pinky.c:357
#, fuzzy, c-format
msgid "Directory: "
msgstr "目录"
-#: src/pinky.c:358
+#: src/pinky.c:359
#, c-format
msgid "Shell: "
msgstr ""
-#: src/pinky.c:379
+#: src/pinky.c:380
#, c-format
msgid "Project: "
msgstr ""
-#: src/pinky.c:405
+#: src/pinky.c:406
#, c-format
msgid "Plan:\n"
msgstr ""
-#: src/pinky.c:424
+#: src/pinky.c:425
msgid "Login"
msgstr ""
-#: src/pinky.c:426
+#: src/pinky.c:427
msgid "Name"
msgstr ""
-#: src/pinky.c:427
+#: src/pinky.c:428
msgid " TTY"
msgstr ""
-#: src/pinky.c:429
+#: src/pinky.c:430
msgid "Idle"
msgstr ""
-#: src/pinky.c:430
+#: src/pinky.c:431
msgid "When"
msgstr ""
-#: src/pinky.c:433
+#: src/pinky.c:434
msgid "Where"
msgstr ""
-#: src/pinky.c:513
+#: src/pinky.c:514
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [USER]...\n"
msgstr "用法:%s [选项]... [文件]...\n"
-#: src/pinky.c:514
+#: src/pinky.c:515
msgid ""
"\n"
" -l produce long format output for the specified USERs\n"
@@ -4655,7 +4824,7 @@ msgid ""
" -s do short format output, this is the default\n"
msgstr ""
-#: src/pinky.c:522
+#: src/pinky.c:523
msgid ""
" -f omit the line of column headings in short format\n"
" -w omit the user's full name in short format\n"
@@ -4664,7 +4833,7 @@ msgid ""
" in short format\n"
msgstr ""
-#: src/pinky.c:531
+#: src/pinky.c:532
#, c-format
msgid ""
"\n"
@@ -4672,98 +4841,88 @@ msgid ""
"The utmp file will be %s.\n"
msgstr ""
-#: src/pinky.c:615
+#: src/pinky.c:616
msgid "no username specified; at least one must be specified when using -l"
msgstr ""
-#: src/pr.c:828
-#, c-format
-msgid "Page range `%s'"
-msgstr ""
-
-#: src/pr.c:879
+#: src/pr.c:807 src/pr.c:817
#, fuzzy
-msgid "column count too large"
-msgstr "%s:文件过大"
+msgid "page range"
+msgstr "权限模式字符串无效:%s "
-#: src/pr.c:902
+#: src/pr.c:914
msgid "`--pages=FIRST_PAGE[:LAST_PAGE]' missing argument"
msgstr ""
-#: src/pr.c:904
+#: src/pr.c:916
#, fuzzy, c-format
-msgid "Invalid page range `%s'"
-msgstr "权限模式字串无效:%s "
+msgid "Invalid page range %s"
+msgstr "权限模式字符串无效:%s "
-#: src/pr.c:915
-#, c-format
-msgid "`--columns=COLUMN' invalid number of columns: `%s'"
-msgstr ""
-
-#: src/pr.c:970
-#, c-format
-msgid "`-l PAGE_LENGTH' invalid number of lines: `%s'"
-msgstr ""
+#: src/pr.c:981
+#, fuzzy, c-format
+msgid "`-l PAGE_LENGTH' invalid number of lines: %s"
+msgstr "无效的号码 %s"
-#: src/pr.c:994
+#: src/pr.c:1005
#, fuzzy, c-format
-msgid "`-N NUMBER' invalid starting line number: `%s'"
+msgid "`-N NUMBER' invalid starting line number: %s"
msgstr "无效的 minor 设备号 %s"
-#: src/pr.c:1006
+#: src/pr.c:1017
#, fuzzy, c-format
-msgid "`-o MARGIN' invalid line offset: `%s'"
+msgid "`-o MARGIN' invalid line offset: %s"
msgstr "无效的行宽数值:%s"
-#: src/pr.c:1047
-#, c-format
-msgid "`-w PAGE_WIDTH' invalid number of characters: `%s'"
-msgstr ""
+#: src/pr.c:1058
+#, fuzzy, c-format
+msgid "`-w PAGE_WIDTH' invalid number of characters: %s"
+msgstr "%s:覆盖次数无效"
-#: src/pr.c:1060
-#, c-format
-msgid "`-W PAGE_WIDTH' invalid number of characters: `%s'"
-msgstr ""
+#: src/pr.c:1072
+#, fuzzy, c-format
+msgid "`-W PAGE_WIDTH' invalid number of characters: %s"
+msgstr "%s:覆盖次数无效"
-#: src/pr.c:1083
+#: src/pr.c:1102
msgid "Cannot specify number of columns when printing in parallel."
msgstr ""
-#: src/pr.c:1087
+#: src/pr.c:1106
msgid "Cannot specify both printing across and printing in parallel."
msgstr ""
-#: src/pr.c:1183
+#: src/pr.c:1202
#, c-format
-msgid "`-%c' extra characters or invalid number in the argument: `%s'"
+msgid "`-%c' extra characters or invalid number in the argument: %s"
msgstr ""
-#: src/pr.c:1294
+#: src/pr.c:1313
msgid "page width too narrow"
msgstr ""
-#: src/pr.c:2358
+#: src/pr.c:2377
#, c-format
msgid "starting page number %<PRIuMAX> exceeds page count %<PRIuMAX>"
msgstr ""
-#: src/pr.c:2388
+#: src/pr.c:2407
#, fuzzy
msgid "Page number overflow"
msgstr "无效的号码 %s"
-#: src/pr.c:2393
+#: src/pr.c:2412
#, c-format
msgid "Page %<PRIuMAX>"
msgstr ""
-#: src/pr.c:2760
+#: src/pr.c:2773
msgid ""
"Paginate or columnate FILE(s) for printing.\n"
"\n"
msgstr ""
-#: src/pr.c:2767
+#: src/pr.c:2780
msgid ""
" +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n"
" begin [stop] printing with page FIRST_[LAST_]PAGE\n"
@@ -4773,7 +4932,7 @@ msgid ""
" columns on each page.\n"
msgstr ""
-#: src/pr.c:2775
+#: src/pr.c:2788
msgid ""
" -a, --across print columns across rather than down, used together\n"
" with -COLUMN\n"
@@ -4783,7 +4942,7 @@ msgid ""
" double space the output\n"
msgstr ""
-#: src/pr.c:2783
+#: src/pr.c:2796
msgid ""
" -D, --date-format=FORMAT\n"
" use FORMAT for the header date\n"
@@ -4795,7 +4954,7 @@ msgid ""
" and trailer without -F)\n"
msgstr ""
-#: src/pr.c:2793
+#: src/pr.c:2806
msgid ""
" -h HEADER, --header=HEADER\n"
" use a centered HEADER instead of filename in page "
@@ -4808,7 +4967,7 @@ msgid ""
" alignment, --sep-string[=STRING] sets separators\n"
msgstr ""
-#: src/pr.c:2802
+#: src/pr.c:2815
msgid ""
" -l PAGE_LENGTH, --length=PAGE_LENGTH\n"
" set the page length to PAGE_LENGTH (66) lines\n"
@@ -4817,7 +4976,7 @@ msgid ""
" truncate lines, but join lines of full length with -J\n"
msgstr ""
-#: src/pr.c:2809
+#: src/pr.c:2822
msgid ""
" -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n"
" number lines, use DIGITS (5) digits, then SEP (TAB),\n"
@@ -4827,7 +4986,7 @@ msgid ""
" page printed (see +FIRST_PAGE)\n"
msgstr ""
-#: src/pr.c:2817
+#: src/pr.c:2830
msgid ""
" -o MARGIN, --indent=MARGIN\n"
" offset each line with MARGIN (zero) spaces, do not\n"
@@ -4836,7 +4995,7 @@ msgid ""
" omit warning when a file cannot be opened\n"
msgstr ""
-#: src/pr.c:2824
+#: src/pr.c:2837
msgid ""
" -s[CHAR],--separator[=CHAR]\n"
" separate columns by a single character, default for "
@@ -4846,11 +5005,11 @@ msgid ""
" options (-COLUMN|-a -COLUMN|-m) except -w is set\n"
msgstr ""
-#: src/pr.c:2831
+#: src/pr.c:2844
msgid " -SSTRING, --sep-string[=STRING]\n"
msgstr ""
-#: src/pr.c:2834
+#: src/pr.c:2847
msgid ""
" separate columns by STRING,\n"
" without -S: Default separator <TAB> with -J and <space>\n"
@@ -4859,7 +5018,7 @@ msgid ""
" -t, --omit-header omit page headers and trailers\n"
msgstr ""
-#: src/pr.c:2840
+#: src/pr.c:2853
msgid ""
" -T, --omit-pagination\n"
" omit page headers and trailers, eliminate any "
@@ -4873,7 +5032,7 @@ msgid ""
"(72)\n"
msgstr ""
-#: src/pr.c:2850
+#: src/pr.c:2863
msgid ""
" -W PAGE_WIDTH, --page-width=PAGE_WIDTH\n"
" set page width to PAGE_WIDTH (72) characters always,\n"
@@ -4882,7 +5041,7 @@ msgid ""
" with -S or -s\n"
msgstr ""
-#: src/pr.c:2858
+#: src/pr.c:2871
msgid ""
"\n"
"-T implied by -l nn when nn <= 10 or <= 3 with -F. With no FILE, or when\n"
@@ -4898,13 +5057,13 @@ msgid ""
"\n"
msgstr ""
-#: src/printf.c:86
+#: src/printf.c:87
#, c-format
msgid ""
"warning: %s: character(s) following character constant have been ignored"
msgstr ""
-#: src/printf.c:99
+#: src/printf.c:100
#, fuzzy, c-format
msgid ""
"Usage: %s FORMAT [ARGUMENT]...\n"
@@ -4913,13 +5072,13 @@ msgstr ""
"用法:%s 文件\n"
" 或:%s 选项\n"
-#: src/printf.c:104
+#: src/printf.c:105
msgid ""
"Print ARGUMENT(s) according to FORMAT.\n"
"\n"
msgstr ""
-#: src/printf.c:110
+#: src/printf.c:111
msgid ""
"\n"
"FORMAT controls the output as in C printf. Interpreted sequences are:\n"
@@ -4929,7 +5088,7 @@ msgid ""
" \\\\ backslash\n"
msgstr ""
-#: src/printf.c:118
+#: src/printf.c:119
msgid ""
" \\a alert (BEL)\n"
" \\b backspace\n"
@@ -4937,7 +5096,7 @@ msgid ""
" \\f form feed\n"
msgstr ""
-#: src/printf.c:124
+#: src/printf.c:125
msgid ""
" \\n new line\n"
" \\r carriage return\n"
@@ -4945,14 +5104,14 @@ msgid ""
" \\v vertical tab\n"
msgstr ""
-#: src/printf.c:130
+#: src/printf.c:131
msgid ""
" \\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:135
+#: src/printf.c:136
msgid ""
" %% a single %\n"
" %b ARGUMENT as a string with `\\' escapes interpreted,\n"
@@ -4962,70 +5121,69 @@ msgid ""
"ARGUMENTs converted to proper type first. Variable widths are handled.\n"
msgstr ""
-#: src/printf.c:159
+#: src/printf.c:161
#, c-format
msgid "%s: expected a numeric value"
msgstr ""
-#: src/printf.c:161
+#: src/printf.c:163
#, c-format
msgid "%s: value not completely converted"
msgstr ""
-#: src/printf.c:255 src/printf.c:282
+#: src/printf.c:257 src/printf.c:284
msgid "missing hexadecimal number in escape"
msgstr ""
-#: src/printf.c:294
+#: src/printf.c:296
#, c-format
msgid "invalid universal character name \\%c%0*x"
msgstr ""
-#: src/printf.c:552
+#: src/printf.c:554
#, fuzzy, c-format
msgid "invalid field width: %s"
msgstr "无效的行宽数值:%s"
-#: src/printf.c:587
+#: src/printf.c:589
#, fuzzy, c-format
msgid "invalid precision: %s"
msgstr "转换无效:%s"
-#: src/printf.c:614
+#: src/printf.c:616
#, fuzzy, c-format
msgid "%.*s: invalid conversion specification"
msgstr "%s:文件大小无效"
-#: src/printf.c:685
+#: src/printf.c:687
#, c-format
-msgid "warning: ignoring excess arguments, starting with `%s'"
+msgid "warning: ignoring excess arguments, starting with %s"
msgstr ""
#: src/ptx.c:41
-#, fuzzy
msgid "F. Pinard"
-msgstr "由 %s 编写。\n"
+msgstr ""
-#: src/ptx.c:410
+#: src/ptx.c:421
#, c-format
-msgid "%s (for regexp `%s')"
+msgid "%s (for regexp %s)"
msgstr ""
-#: src/ptx.c:1871
+#: src/ptx.c:1887
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT]... (without -G)\n"
" or: %s -G [OPTION]... [INPUT [OUTPUT]]\n"
msgstr ""
-#: src/ptx.c:1875
+#: src/ptx.c:1891
msgid ""
"Output a permuted index, including context, of the words in the input "
"files.\n"
"\n"
msgstr ""
-#: src/ptx.c:1882
+#: src/ptx.c:1898
msgid ""
" -A, --auto-reference output automatically generated references\n"
" -C, --copyright display Copyright and copying conditions\n"
@@ -5033,7 +5191,7 @@ msgid ""
" -F, --flag-truncation=STRING use STRING for flagging line truncations\n"
msgstr ""
-#: src/ptx.c:1888
+#: src/ptx.c:1904
msgid ""
" -M, --macro-name=STRING macro name to use instead of `xx'\n"
" -O, --format=roff generate output as roff directives\n"
@@ -5042,7 +5200,7 @@ msgid ""
" -T, --format=tex generate output as TeX directives\n"
msgstr ""
-#: src/ptx.c:1895
+#: src/ptx.c:1911
msgid ""
" -W, --word-regexp=REGEXP use REGEXP to match each keyword\n"
" -b, --break-file=FILE word break characters in this FILE\n"
@@ -5052,7 +5210,7 @@ msgid ""
" -o, --only-file=FILE read only word list from this FILE\n"
msgstr ""
-#: src/ptx.c:1903
+#: src/ptx.c:1919
msgid ""
" -r, --references first field of each line is a reference\n"
" -t, --typeset-mode - not implemented -\n"
@@ -5060,13 +5218,13 @@ msgid ""
"excluded\n"
msgstr ""
-#: src/ptx.c:1910
+#: src/ptx.c:1926
msgid ""
"\n"
"With no FILE or if FILE is -, read Standard Input. `-F /' by default.\n"
msgstr ""
-#: src/ptx.c:1989
+#: src/ptx.c:2005
msgid ""
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
@@ -5075,7 +5233,7 @@ msgid ""
"\n"
msgstr ""
-#: src/ptx.c:1996
+#: src/ptx.c:2012
msgid ""
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -5084,14 +5242,14 @@ msgid ""
"\n"
msgstr ""
-#: src/ptx.c:2003
+#: src/ptx.c:2019
msgid ""
"You should have received a copy of the GNU General Public License\n"
"along with this program; if not, write to the Free Software Foundation,\n"
-"Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
msgstr ""
-#: src/ptx.c:2028
+#: src/ptx.c:2044
#, fuzzy, c-format
msgid "invalid gap width: %s"
msgstr "无效的行宽数值:%s"
@@ -5102,27 +5260,27 @@ msgid ""
"\n"
msgstr ""
-#: src/pwd.c:165 src/remove.c:850
+#: src/pwd.c:167 src/remove.c:855
#, c-format
msgid "cannot open directory %s"
msgstr "无法打开目录%s"
-#: src/pwd.c:170
+#: src/pwd.c:172
#, fuzzy, c-format
msgid "failed to chdir to %s"
msgstr "无法保留%s的时间"
-#: src/pwd.c:174 src/pwd.c:284
+#: src/pwd.c:176 src/pwd.c:286
#, fuzzy, c-format
msgid "failed to stat %s"
msgstr "无法保留%s的时间"
-#: src/pwd.c:242
+#: src/pwd.c:244
#, c-format
msgid "couldn't find directory entry in %s with matching i-node"
msgstr ""
-#: src/pwd.c:318
+#: src/pwd.c:320
#, fuzzy
msgid "ignoring non-option arguments"
msgstr "忽略任何参数"
@@ -5141,15 +5299,15 @@ msgstr ""
#: src/readlink.c:70
msgid ""
" -f, --canonicalize canonicalize by following every symlink in\n"
-" every component of the given path "
+" every component of the given name "
"recursively;\n"
-" all but the last path component must exist\n"
+" all but the last component must exist\n"
" -e, --canonicalize-existing canonicalize by following every symlink in\n"
-" every component of the given path "
+" every component of the given name "
"recursively,\n"
-" all path components must exist\n"
+" all components must exist\n"
" -m, --canonicalize-missing canonicalize by following every symlink in\n"
-" every component of the given path "
+" every component of the given name "
"recursively,\n"
" without requirements on components "
"existence\n"
@@ -5159,68 +5317,68 @@ msgid ""
" -v, --verbose report error messages\n"
msgstr ""
-#: src/remove.c:403
+#: src/remove.c:401
#, c-format
msgid "cannot chdir from %s to .."
msgstr "无法从%s目录切换到 .. 目录"
-#: src/remove.c:409 src/remove.c:505
+#: src/remove.c:407 src/remove.c:503
#, c-format
msgid "cannot lstat `.' in %s"
-msgstr "无法在%s中 lstat‘.’"
+msgstr "无法在%s中 lstat“.”"
-#: src/remove.c:414 src/remove.c:509
+#: src/remove.c:412 src/remove.c:507
#, c-format
msgid "%s changed dev/ino"
msgstr "%s的 dev/ino 变了"
-#: src/remove.c:602 src/remove.c:748 src/remove.c:923 src/remove.c:1053
+#: src/remove.c:600 src/remove.c:790 src/remove.c:933 src/remove.c:1063
#, c-format
msgid "cannot lstat %s"
msgstr "lstat%s失败"
-#: src/remove.c:610 src/remove.c:770 src/remove.c:787 src/remove.c:1039
-#: src/remove.c:1140
+#: src/remove.c:608 src/remove.c:741 src/remove.c:813 src/remove.c:1049
+#: src/remove.c:1150
#, c-format
msgid "cannot remove directory %s"
msgstr "无法删除目录%s"
-#: src/remove.c:639
+#: src/remove.c:637
#, c-format
msgid "%s: descend into write-protected directory %s? "
msgstr "%s:是否进入有写保护的目录%s? "
-#: src/remove.c:640
+#: src/remove.c:638
#, c-format
msgid "%s: descend into directory %s? "
msgstr "%s:是否进入目录%s? "
-#: src/remove.c:650
+#: src/remove.c:648
#, c-format
msgid "%s: remove write-protected %s %s? "
msgstr "%s:是否删除有写保护的%s%s? "
-#: src/remove.c:651
+#: src/remove.c:649
#, c-format
msgid "%s: remove %s %s? "
msgstr "%s:是否删除%s%s? "
-#: src/remove.c:675
+#: src/remove.c:679
#, c-format
msgid "removed %s\n"
msgstr "已删除%s\n"
-#: src/remove.c:690 src/remove.c:1135
+#: src/remove.c:694 src/remove.c:1145
#, c-format
msgid "removed directory: %s\n"
msgstr "已删除目录:%s\n"
-#: src/remove.c:939 src/remove.c:1068
-#, c-format
+#: src/remove.c:949 src/remove.c:1078
+#, fuzzy, c-format
msgid "cannot chdir from %s to %s"
-msgstr "无法从%s切换到目录%s"
+msgstr "无法从%s目录切换到 .. 目录"
-#: src/remove.c:947
+#: src/remove.c:957
#, c-format
msgid ""
"WARNING: Circular directory structure.\n"
@@ -5235,21 +5393,26 @@ msgstr ""
"以下的目录是循环的一部份:\n"
" %s\n"
-#: src/remove.c:1174
+#: src/remove.c:1184
msgid "cannot remove `.' or `..'"
-msgstr "无法删除‘.’或‘..’"
+msgstr "无法删除“.”或“..”"
-#: src/remove.c:1228
+#: src/remove.c:1238
#, fuzzy
msgid "cannot restore current working directory"
msgstr "无法创建目录%s"
-#: src/rm.c:107 src/touch.c:228
+#: src/rm.c:118
+#, c-format
+msgid "Try `%s ./%s' to remove the file %s.\n"
+msgstr ""
+
+#: src/rm.c:136 src/touch.c:233
#, c-format
msgid "Usage: %s [OPTION]... FILE...\n"
msgstr "用法:%s [选项]... 目录...\n"
-#: src/rm.c:108
+#: src/rm.c:137
#, fuzzy
msgid ""
"Remove (unlink) the FILE(s).\n"
@@ -5268,15 +5431,31 @@ msgstr ""
" -r, -R, --recursive 同时删除该目录下的所有目录层\n"
" -v, --verbose 详细显示进行的步骤\n"
-#: src/rm.c:117
+#: src/rm.c:146
+#, fuzzy
msgid ""
" --no-preserve-root do not treat `/' specially (the default)\n"
" --preserve-root fail to operate recursively on `/'\n"
-" -r, -R, --recursive remove the contents of directories recursively\n"
+" -r, -R, --recursive remove directories and their contents recursively\n"
" -v, --verbose explain what is being done\n"
msgstr ""
+"删除指定的<文件>(即解除链接)。\n"
+"\n"
+" -d, --directory 删除可能仍有数据的目录 (只限超级用户)\n"
+" -f, --force 略过不存在的文件,不显示任何信息\n"
+" -i, --interactive 进行任何删除操作前必须先确认\n"
+" -r, -R, --recursive 同时删除该目录下的所有目录层\n"
+" -v, --verbose 详细显示进行的步骤\n"
+
+#: src/rm.c:154
+msgid ""
+"\n"
+"By default, rm does not remove directories. Use the --recursive (-r or -R)\n"
+"option to remove each listed directory, too, along with all of its "
+"contents.\n"
+msgstr ""
-#: src/rm.c:125
+#: src/rm.c:159
#, c-format
msgid ""
"\n"
@@ -5287,12 +5466,12 @@ msgid ""
" %s ./-foo\n"
msgstr ""
"\n"
-"要删除第一个字符为‘-’的文件 (例如‘-foo’),请使用以下其中一种方法:\n"
+"要删除第一个字符为“-”的文件 (例如“-foo”),请使用以下其中一种方法:\n"
" %s -- -foo\n"
"\n"
" %s ./-foo\n"
-#: src/rm.c:134
+#: src/rm.c:168
msgid ""
"\n"
"Note that if you use rm to remove a file, it is usually possible to recover\n"
@@ -5304,17 +5483,17 @@ msgstr ""
"请注意,如果使用 rm 来删除文件,通常仍可以将该文件恢复原状。如果想保证\n"
"该文件的内容无法还原,请考虑使用 shred。\n"
-#: src/rmdir.c:117 src/rmdir.c:216
+#: src/rmdir.c:109 src/rmdir.c:207
#, c-format
msgid "removing directory, %s"
-msgstr "正在删除目录 %s"
+msgstr "删除目录,%s"
-#: src/rmdir.c:147
+#: src/rmdir.c:139
#, c-format
msgid "Usage: %s [OPTION]... DIRECTORY...\n"
msgstr "用法:%s [选项]... 目录...\n"
-#: src/rmdir.c:148
+#: src/rmdir.c:140
msgid ""
"Remove the DIRECTORY(ies), if they are empty.\n"
"\n"
@@ -5327,15 +5506,16 @@ msgstr ""
" --ignore-fail-on-non-empty\n"
" 忽略任何因目录仍有数据而造成的错误\n"
-#: src/rmdir.c:155
+#: src/rmdir.c:147
+#, fuzzy
msgid ""
-" -p, --parents remove DIRECTORY, then try to remove each directory\n"
-" component of that path name. E.g., `rmdir -p a/b/c' is\n"
+" -p, --parents Remove DIRECTORY and its ancestors. E.g., `rmdir -p a/b/"
+"c' is\n"
" similar to `rmdir a/b/c a/b a'.\n"
" -v, --verbose output a diagnostic for every directory processed\n"
msgstr ""
" -p, --parents 删除<目录>,然后尝试删除指定路径中的所有上层目录。例如:\n"
-" ‘rmdir -p a/b/c’的效果等於‘rmdir a/b/c a/b a’。\n"
+" “rmdir -p a/b/c”的效果等于“rmdir a/b/c a/b a”。\n"
" -v, --verbose 处理每个目录时都显示信息\n"
#: src/seq.c:82
@@ -5380,8 +5560,8 @@ msgstr "日期格式 %s 无效"
#: src/seq.c:379
#, fuzzy, c-format
-msgid "invalid format string: `%s'"
-msgstr "权限模式字串无效:%s "
+msgid "invalid format string: %s"
+msgstr "权限模式字符串无效:%s "
#: src/seq.c:399
#, fuzzy
@@ -5389,21 +5569,21 @@ msgid "format string may not be specified when printing equal width strings"
msgstr "安装目录时不能用 strip 选项"
#: src/setuidgid.c:51
-#, fuzzy, c-format
+#, c-format
msgid ""
"Usage: %s USERNAME COMMAND [ARGUMENT]...\n"
" or: %s OPTION\n"
msgstr ""
-"用法:%s 文件\n"
+"用法:%s 用户名 命令 [参数]...\n"
" 或:%s 选项\n"
#: 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"
-"Exit with status 111 if unable to assume the required UID and GID.\n"
+"Exit with status 111 if unable to assume the required user and group ID.\n"
"Otherwise, exit with the exit status of COMMAND.\n"
-"This program is useful only when run by root (UID=0).\n"
+"This program is useful only when run by root (user ID zero).\n"
"\n"
msgstr ""
@@ -5427,19 +5607,19 @@ msgstr "无法改变所属组至没有名称的组"
msgid "cannot set user-ID to %lu"
msgstr "stat%s失败"
-#: src/shred.c:157
+#: src/shred.c:155
#, c-format
msgid "Usage: %s [OPTIONS] FILE [...]\n"
msgstr "用法:%s [选项] 文件 [...]\n"
-#: src/shred.c:158
+#: src/shred.c:156
msgid ""
"Overwrite the specified FILE(s) repeatedly, in order to make it harder\n"
"for even very expensive hardware probing to recover the data.\n"
"\n"
msgstr "重复覆盖<文件>,使得即使是昂贵的硬件探测仪器也难以将数据复原。\n"
-#: src/shred.c:166
+#: src/shred.c:164
#, c-format
msgid ""
" -f, --force change permissions to allow writing if necessary\n"
@@ -5450,7 +5630,7 @@ msgstr ""
" -n, --iterations=N 自行指定重复覆盖的次数 (默认为 %d 次)\n"
" -s, --size=N 覆盖指定的字节数目 (可接受 K、M、G 等等的单位)\n"
-#: src/shred.c:171
+#: src/shred.c:169
#, fuzzy
msgid ""
" -u, --remove truncate and remove file after overwriting\n"
@@ -5465,7 +5645,7 @@ msgstr ""
" -z, --zero 最后一次会使用 0 字节进行覆盖来隐藏覆盖动作\n"
" - 覆盖标准输出的数据\n"
-#: src/shred.c:180
+#: src/shred.c:178
#, fuzzy
msgid ""
"\n"
@@ -5482,14 +5662,15 @@ msgstr ""
"覆盖像 /dev/hda 等的设备文件是很普遍的,而这些文件通常不应删除。当覆盖\n"
"一般文件时,绝大多数人都会使用 --remove 选项。\n"
-#: src/shred.c:190
+#: src/shred.c:188
#, fuzzy
msgid ""
"CAUTION: Note that shred relies on a very important assumption:\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"
+"not effective, or is not guaranteed to be effective in all file system "
+"modes:\n"
"\n"
msgstr ""
"警告:请注意使用 shred 时有一个很重要的条件:\n"
@@ -5497,7 +5678,7 @@ msgstr ""
"的文件系统都不符合条件。以下是会令 shred 无效的文件系统的例子:\n"
"\n"
-#: src/shred.c:198
+#: src/shred.c:196
#, fuzzy
msgid ""
"* log-structured or journaled file systems, such as those supplied with\n"
@@ -5509,150 +5690,151 @@ msgid ""
"* file systems that make snapshots, such as Network Appliance's NFS server\n"
"\n"
msgstr ""
-"● 有纪录结构或是日志式文件系统,像 AIX 及 Solaris 使用的文件系统 (以及\n"
+"* 有纪录结构或是日志式文件系统,像 AIX 及 Solaris 使用的文件系统 (以及\n"
" JFS、ReiserFS、XFS、Ext3 等等)\n"
"\n"
-"● 会重复写入数据,及即使一部份写入动作失败后仍可继续的文件系统,像使用\n"
+"* 会重复写入数据,及即使一部份写入动作失败后仍可继续的文件系统,像使用\n"
" RAID 的文件系统\n"
"\n"
-"● 会不时进行快照纪录的文件系统,像 Network Applicance 的 NFS 服务器\n"
+"* 会不时进行快照纪录的文件系统,像 Network Applicance 的 NFS 服务器\n"
"\n"
-#: src/shred.c:208
-#, fuzzy
+#: src/shred.c:206
msgid ""
"* file systems that cache in temporary locations, such as NFS\n"
" version 3 clients\n"
"\n"
"* compressed file systems\n"
"\n"
+"In the case of ext3 file systems, the above disclaimer applies\n"
+"(and shred is thus of limited effectiveness) only in data=journal mode,\n"
+"which journals file data in addition to just metadata. In both the\n"
+"data=ordered (default) and data=writeback modes, shred works as usual.\n"
+"Ext3 journaling modes can be changed by adding the data=something option\n"
+"to the mount options for a particular file system in the /etc/fstab file,\n"
+"as documented in the mount man page (man mount).\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"
"to be recovered later.\n"
msgstr ""
-"● 会将快取记忆放入暂存位置的文件系统,像 NFS 第 3 版本的客户端程序\n"
-"\n"
-"● 会压缩数据的文件系统\n"
-"\n"
-"另外,文件系统的备份及远程的 mirror 都可能所有该文件的复制本,这些复制本\n"
-"都是无法删除的,而且可能令已经用 shred 处理过的文件恢复原状。\n"
-#: src/shred.c:772
+#: src/shred.c:685
#, fuzzy, c-format
msgid "%s: fdatasync failed"
msgstr "strip 出现错误"
-#: src/shred.c:783
+#: src/shred.c:696
#, fuzzy, c-format
msgid "%s: fsync failed"
msgstr "strip 出现错误"
-#: src/shred.c:851
+#: src/shred.c:764
#, c-format
msgid "%s: cannot rewind"
msgstr "%s:无法向后搜寻"
-#: src/shred.c:877
+#: src/shred.c:790
#, c-format
msgid "%s: pass %lu/%lu (%s)..."
msgstr "%1$s:%3$lu 次之第 %2$lu 次 (%4$s)..."
-#: src/shred.c:928
+#: src/shred.c:841
#, c-format
msgid "%s: error writing at offset %s"
msgstr "%s:在位置 %s 写入时出现错误 "
-#: src/shred.c:948
+#: src/shred.c:861
#, fuzzy, c-format
msgid "%s: lseek failed"
msgstr "strip 出现错误"
-#: src/shred.c:959
+#: src/shred.c:872
#, c-format
msgid "%s: file too large"
msgstr "%s:文件过大"
-#: src/shred.c:982
+#: src/shred.c:895
#, c-format
msgid "%s: pass %lu/%lu (%s)...%s"
msgstr "%1$s:%3$lu 次之第 %2$lu 次 (%4$s)...%5$s"
-#: src/shred.c:998
+#: src/shred.c:911
#, 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:1250
+#: src/shred.c:1163
#, fuzzy, c-format
msgid "%s: fstat failed"
msgstr "strip 出现错误"
-#: src/shred.c:1261
+#: src/shred.c:1174
#, c-format
msgid "%s: invalid file type"
msgstr "%s:文件类型无效"
-#: src/shred.c:1280
+#: src/shred.c:1193
#, c-format
msgid "%s: file has negative size"
msgstr "%s:文件的大小为负数"
-#: src/shred.c:1345
+#: src/shred.c:1258
#, c-format
msgid "%s: error truncating"
msgstr "%s:截断文件时出现错误"
-#: src/shred.c:1361
+#: src/shred.c:1274
#, fuzzy, c-format
msgid "%s: fcntl failed"
msgstr "strip 出现错误"
-#: src/shred.c:1366
+#: src/shred.c:1279
#, c-format
msgid "%s: cannot shred append-only file descriptor"
msgstr "%s:不能将只可加上数据的文件描述符 (file descriptor) 进行 shred 动作"
-#: src/shred.c:1446
+#: src/shred.c:1359
#, c-format
msgid "%s: removing"
-msgstr "%s:正在删除"
+msgstr "%s:删除中"
-#: src/shred.c:1470
+#: src/shred.c:1383
#, c-format
msgid "%s: renamed to %s"
-msgstr "%s:名称已更改为 %s"
+msgstr "%s:已重命名为 %s"
-#: src/shred.c:1492
+#: src/shred.c:1405
#, fuzzy, c-format
msgid "%s: failed to remove"
msgstr "%s:文件过大"
-#: src/shred.c:1496
+#: src/shred.c:1409
#, c-format
msgid "%s: removed"
-msgstr "%s:已经删除"
+msgstr "%s:已删除"
-#: src/shred.c:1503 src/shred.c:1568
+#: src/shred.c:1416 src/shred.c:1459
#, fuzzy, c-format
msgid "%s: failed to close"
msgstr "%s:文件过大"
-#: src/shred.c:1561
+#: src/shred.c:1452
#, fuzzy, c-format
msgid "%s: failed to open for writing"
msgstr "%s:文件过大"
-#: src/shred.c:1617
+#: src/shred.c:1508
#, c-format
msgid "%s: invalid number of passes"
msgstr "%s:覆盖次数无效"
-#: src/shred.c:1634
+#: src/shred.c:1525
#, c-format
msgid "%s: invalid file size"
msgstr "%s:文件大小无效"
-#: src/sleep.c:47
+#: src/sleep.c:48
#, c-format
msgid ""
"Usage: %s NUMBER[SUFFIX]...\n"
@@ -5665,33 +5847,37 @@ msgid ""
"\n"
msgstr ""
-#: src/sleep.c:137
+#: src/sleep.c:138
#, fuzzy, c-format
-msgid "invalid time interval `%s'"
+msgid "invalid time interval %s"
msgstr "无效的日期时间格式 %s"
-#: src/sleep.c:148 src/tail.c:1102
+#: src/sleep.c:149 src/tail.c:1104
#, fuzzy
msgid "cannot read realtime clock"
msgstr "无法创建链接%s"
-#: src/sort.c:281
+#: src/sort.c:285
msgid ""
"Write sorted concatenation of all FILE(s) to standard output.\n"
"\n"
+msgstr ""
+
+#: src/sort.c:292
+msgid ""
"Ordering options:\n"
"\n"
msgstr ""
-#: src/sort.c:290
+#: src/sort.c:296
msgid ""
-" -b, --ignore-leading-blanks ignore leading blanks\n"
+" -b, --ignore-leading-blanks ignore leading blanks\n"
" -d, --dictionary-order consider only blanks and alphanumeric "
"characters\n"
" -f, --ignore-case fold lower case to upper case characters\n"
msgstr ""
-#: src/sort.c:295
+#: src/sort.c:301
msgid ""
" -g, --general-numeric-sort compare according to general numerical value\n"
" -i, --ignore-nonprinting consider only printable characters\n"
@@ -5701,12 +5887,12 @@ msgid ""
"\n"
msgstr ""
-#: src/sort.c:303
+#: src/sort.c:309
msgid ""
"Other options:\n"
"\n"
" -c, --check check whether input is sorted; do not sort\n"
-" -k, --key=POS1[,POS2] start a key at POS1, end it at POS 2 (origin 1)\n"
+" -k, --key=POS1[,POS2] start a key at POS1, end it at POS2 (origin 1)\n"
" -m, --merge merge already sorted files; do not sort\n"
" -o, --output=FILE write result to FILE instead of standard output\n"
" -s, --stable stabilize sort by disabling last-resort "
@@ -5714,10 +5900,10 @@ msgid ""
" -S, --buffer-size=SIZE use SIZE for main memory buffer\n"
msgstr ""
-#: src/sort.c:313
+#: src/sort.c:319
#, c-format
msgid ""
-" -t, --field-separator=SEP use SEP instead of non-blank to blank "
+" -t, --field-separator=SEP use SEP instead of non-blank to blank "
"transition\n"
" -T, --temporary-directory=DIR use DIR for temporaries, not $TMPDIR or %"
"s;\n"
@@ -5727,11 +5913,11 @@ msgid ""
"run\n"
msgstr ""
-#: src/sort.c:320
+#: src/sort.c:326
msgid " -z, --zero-terminated end lines with 0 byte, not newline\n"
msgstr ""
-#: src/sort.c:325
+#: src/sort.c:331
msgid ""
"\n"
"POS is F[.C][OPTS], where F is the field number and C the character "
@@ -5743,7 +5929,7 @@ msgid ""
"SIZE may be followed by the following multiplicative suffixes:\n"
msgstr ""
-#: src/sort.c:334
+#: src/sort.c:340
#, c-format
msgid ""
"% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n"
@@ -5756,140 +5942,127 @@ msgid ""
"native byte values.\n"
msgstr ""
-#: src/sort.c:436
+#: src/sort.c:442
#, fuzzy
msgid "cannot create temporary file"
msgstr "无法创建一般文件%s"
-#: src/sort.c:461
+#: src/sort.c:469
#, fuzzy
msgid "open failed"
msgstr "strip 出现错误"
-#: src/sort.c:482
+#: src/sort.c:491
#, fuzzy
msgid "fflush failed"
msgstr "strip 出现错误"
-#: src/sort.c:487 src/sort.c:2637
+#: src/sort.c:496 src/sort.c:2468
#, fuzzy
msgid "close failed"
msgstr "strip 出现错误"
-#: src/sort.c:495
+#: src/sort.c:505
#, fuzzy
msgid "write failed"
msgstr "strip 出现错误"
-#: src/sort.c:532
+#: src/sort.c:542
#, fuzzy, c-format
msgid "warning: cannot remove: %s"
msgstr "无法删除%s"
-#: src/sort.c:649
+#: src/sort.c:659
#, fuzzy
msgid "sort size"
msgstr "块大小"
-#: src/sort.c:728
+#: src/sort.c:738
#, fuzzy
msgid "stat failed"
msgstr "strip 出现错误"
-#: src/sort.c:992
+#: src/sort.c:1002
#, fuzzy
msgid "read failed"
msgstr "strip 出现错误"
-#: src/sort.c:1579
+#: src/sort.c:1400
#, c-format
msgid "%s: %s:%s: disorder: "
msgstr ""
-#: src/sort.c:1583
+#: src/sort.c:1404
#, fuzzy
msgid "standard error"
msgstr "标准输出"
-#: src/sort.c:2154
+#: src/sort.c:1987
#, fuzzy, c-format
-msgid "%s: invalid field specification `%s'"
+msgid "%s: invalid field specification %s"
msgstr "%s:文件大小无效"
-#: src/sort.c:2181
+#: src/sort.c:2014
#, fuzzy, c-format
msgid "%s: count `%.*s' too large"
msgstr "%s:文件过大"
-#: src/sort.c:2187
+#: src/sort.c:2020
#, fuzzy, c-format
-msgid "%s: invalid count at start of `%s'"
+msgid "%s: invalid count at start of %s"
msgstr "%s:覆盖次数无效"
-#: src/sort.c:2409
+#: src/sort.c:2240
#, fuzzy
msgid "invalid number after `-'"
msgstr "无效的号码 %s"
-#: src/sort.c:2412 src/sort.c:2458 src/sort.c:2485
+#: src/sort.c:2243 src/sort.c:2289 src/sort.c:2316
#, fuzzy
msgid "invalid number after `.'"
msgstr "无效的号码 %s"
-#: src/sort.c:2415 src/sort.c:2494
+#: src/sort.c:2246 src/sort.c:2325
#, fuzzy
msgid "stray character in field spec"
msgstr "字符特殊文件"
-#: src/sort.c:2449
+#: src/sort.c:2280
#, fuzzy
msgid "invalid number at field start"
msgstr "无效的号码 %s"
-#: src/sort.c:2453 src/sort.c:2481
+#: src/sort.c:2284 src/sort.c:2312
#, fuzzy
msgid "field number is zero"
msgstr "无效的号码 %s"
-#: src/sort.c:2462
+#: src/sort.c:2293
#, fuzzy
msgid "character offset is zero"
msgstr "字符特殊文件"
-#: src/sort.c:2477
+#: src/sort.c:2308
#, fuzzy
msgid "invalid number after `,'"
msgstr "无效的号码 %s"
-#: src/sort.c:2504
+#: src/sort.c:2335
#, fuzzy
msgid "multiple output files specified"
msgstr "正在关闭输出文件 %s"
-#: src/sort.c:2520
-msgid "empty tab"
-msgstr ""
-
-#: src/sort.c:2531
-#, c-format
-msgid "multi-character tab `%s'"
-msgstr ""
-
-#: src/sort.c:2536
-msgid "incompatible tabs"
-msgstr ""
-
-#: src/sort.c:2621
+#: src/sort.c:2452
#, c-format
msgid "extra operand %s not allowed with -c"
msgstr ""
-#: src/split.c:109
-#, fuzzy, c-format
+#: src/split.c:107
+#, c-format
msgid "Usage: %s [OPTION] [INPUT [PREFIX]]\n"
-msgstr "用法:%s [选项]... [文件]\n"
+msgstr "用法:%s [选项] [输入 [前缀]]\n"
-#: src/split.c:113
+#: src/split.c:111
msgid ""
"Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n"
"size is 1000 lines, and default PREFIX is `x'. With no INPUT, or when "
@@ -5898,7 +6071,7 @@ msgid ""
"\n"
msgstr ""
-#: src/split.c:122
+#: src/split.c:120
#, c-format
msgid ""
" -a, --suffix-length=N use suffixes of length N (default %d)\n"
@@ -5908,36 +6081,36 @@ msgid ""
" -l, --lines=NUMBER put NUMBER lines per output file\n"
msgstr ""
-#: src/split.c:129
+#: src/split.c:127
msgid ""
" --verbose print a diagnostic to standard error just\n"
" before each output file is opened\n"
msgstr ""
-#: src/split.c:135
+#: src/split.c:133
msgid ""
"\n"
"SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n"
msgstr ""
-#: src/split.c:196
+#: src/split.c:194
msgid "Output file suffixes exhausted"
msgstr ""
-#: src/split.c:214
+#: src/split.c:212
#, fuzzy, c-format
-msgid "creating file `%s'\n"
-msgstr "正在创建目录 %s"
+msgid "creating file %s\n"
+msgstr "创建文件“%s”\n"
#: src/split.c:371
#, fuzzy
msgid "cannot split in more than one way"
-msgstr "无法由多於一种的来源来指定时间"
+msgstr "无法由多于一种的来源来指定时间"
#: src/split.c:421
-#, fuzzy, c-format
+#, c-format
msgid "%s: invalid suffix length"
-msgstr "%s:文件类型无效"
+msgstr "%s:无效的后缀长度"
#: src/split.c:435 src/split.c:459
#, fuzzy, c-format
@@ -5949,32 +6122,27 @@ msgstr "%s:覆盖次数无效"
msgid "%s: invalid number of lines"
msgstr "%s:覆盖次数无效"
-#: src/split.c:489
+#: src/split.c:488
#, fuzzy, c-format
msgid "line count option -%s%c... is too large"
msgstr "%s:文件过大"
-#: src/split.c:516
-#, c-format
-msgid "`-%s' option is obsolete; use `-l %s'"
-msgstr ""
-
-#: src/split.c:531
+#: src/split.c:519
#, fuzzy
msgid "invalid number of lines: 0"
msgstr "无效的号码 %s"
-#: src/stat.c:572
+#: src/stat.c:602
#, fuzzy, c-format
msgid "cannot read file system information for %s"
msgstr "无法创建 fifo 文件%s"
-#: src/stat.c:647
+#: src/stat.c:678
#, c-format
msgid "Usage: %s [OPTION] FILE...\n"
msgstr "用法:%s [选项] 文件...\n"
-#: src/stat.c:648
+#: src/stat.c:679
msgid ""
"Display file or file system status.\n"
"\n"
@@ -5984,53 +6152,53 @@ msgid ""
" -t, --terse print the information in terse form\n"
msgstr ""
-#: src/stat.c:659
+#: src/stat.c:690
msgid ""
"\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"
-" %B The size in bytes of each block reported by `%b'\n"
+" %A Access rights in human readable form\n"
" %b Number of blocks allocated (see %B)\n"
+" %B The size in bytes of each block reported by %b\n"
msgstr ""
-#: src/stat.c:667
+#: src/stat.c:698
msgid ""
-" %D Device number in hex\n"
" %d Device number in decimal\n"
-" %F File type\n"
+" %D Device number in hex\n"
" %f Raw mode in hex\n"
-" %G Group name of owner\n"
+" %F File type\n"
" %g Group ID of owner\n"
+" %G Group name of owner\n"
msgstr ""
-#: src/stat.c:675
+#: src/stat.c:706
msgid ""
" %h Number of hard links\n"
" %i Inode number\n"
-" %N Quoted File name with dereference if symbolic link\n"
" %n File name\n"
-" %o IO block size\n"
+" %N Quoted file name with dereference if symbolic link\n"
+" %o I/O block size\n"
" %s Total size, in bytes\n"
-" %T Minor device type in hex\n"
" %t Major device type in hex\n"
+" %T Minor device type in hex\n"
msgstr ""
-#: src/stat.c:685
+#: src/stat.c:716
msgid ""
-" %U User name of owner\n"
" %u User ID of owner\n"
-" %X Time of last access as seconds since Epoch\n"
+" %U User name of owner\n"
" %x Time of last access\n"
-" %Y Time of last modification as seconds since Epoch\n"
+" %X Time of last access as seconds since Epoch\n"
" %y Time of last modification\n"
-" %Z Time of last change as seconds since Epoch\n"
+" %Y Time of last modification as seconds since Epoch\n"
" %z Time of last change\n"
+" %Z Time of last change as seconds since Epoch\n"
"\n"
msgstr ""
-#: src/stat.c:697
+#: src/stat.c:728
msgid ""
"Valid format sequences for file systems:\n"
"\n"
@@ -6041,24 +6209,25 @@ msgid ""
" %f Free blocks in file system\n"
msgstr ""
-#: src/stat.c:706
+#: src/stat.c:737
msgid ""
-" %i File System id in hex\n"
+" %i File System ID in hex\n"
" %l Maximum length of filenames\n"
" %n File name\n"
-" %s Optimal transfer block size\n"
-" %T Type in human readable form\n"
+" %s Block size (for faster transfers)\n"
+" %S Fundamental block size (for block counts)\n"
" %t Type in hex\n"
+" %T Type in human readable form\n"
msgstr ""
-#: src/stat.c:747
+#: src/stat.c:780
#, fuzzy
msgid "Warning: `-l' is deprecated; use `-L' instead"
msgstr ""
"警告:--version-control (-V) 选项已经过时;将来的版本随时可能不再支持\n"
"此选项。请使用 --backup=%s。"
-#: src/stty.c:499
+#: src/stty.c:511
#, c-format
msgid ""
"Usage: %s [-F DEVICE] [--file=DEVICE] [SETTING]...\n"
@@ -6066,7 +6235,7 @@ msgid ""
" or: %s [-F DEVICE] [--file=DEVICE] [-g|--save]\n"
msgstr ""
-#: src/stty.c:505
+#: src/stty.c:517
msgid ""
"Print or change terminal characteristics.\n"
"\n"
@@ -6075,14 +6244,14 @@ msgid ""
" -F, --file=DEVICE open and use the specified DEVICE instead of stdin\n"
msgstr ""
-#: src/stty.c:514
+#: src/stty.c:526
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:519
+#: src/stty.c:531
msgid ""
"\n"
"Special characters:\n"
@@ -6091,7 +6260,7 @@ msgid ""
" eol CHAR CHAR will end the line\n"
msgstr ""
-#: src/stty.c:526
+#: src/stty.c:538
msgid ""
" * eol2 CHAR alternate CHAR for ending the line\n"
" erase CHAR CHAR will erase the last character typed\n"
@@ -6099,7 +6268,7 @@ msgid ""
" kill CHAR CHAR will erase the current line\n"
msgstr ""
-#: src/stty.c:532
+#: src/stty.c:544
msgid ""
" * lnext CHAR CHAR will enter the next character quoted\n"
" quit CHAR CHAR will send a quit signal\n"
@@ -6107,7 +6276,7 @@ msgid ""
" start CHAR CHAR will restart the output after stopping it\n"
msgstr ""
-#: src/stty.c:538
+#: src/stty.c:550
msgid ""
" stop CHAR CHAR will stop the output\n"
" susp CHAR CHAR will send a terminal stop signal\n"
@@ -6115,7 +6284,7 @@ msgid ""
" * werase CHAR CHAR will erase the last word typed\n"
msgstr ""
-#: src/stty.c:544
+#: src/stty.c:556
msgid ""
"\n"
"Special settings:\n"
@@ -6124,7 +6293,7 @@ msgid ""
" * columns N same as cols N\n"
msgstr ""
-#: src/stty.c:551
+#: src/stty.c:563
msgid ""
" ispeed N set the input speed to N\n"
" * line N use line discipline N\n"
@@ -6133,7 +6302,7 @@ msgid ""
" ospeed N set the output speed to N\n"
msgstr ""
-#: src/stty.c:557
+#: src/stty.c:569
msgid ""
" * rows N tell the kernel that the terminal has N rows\n"
" * size print the number of rows and columns according to the "
@@ -6142,7 +6311,7 @@ msgid ""
" time N with -icanon, set read timeout of N tenths of a second\n"
msgstr ""
-#: src/stty.c:563
+#: src/stty.c:575
msgid ""
"\n"
"Control settings:\n"
@@ -6152,7 +6321,7 @@ msgid ""
" csN set character size to N bits, N in [5..8]\n"
msgstr ""
-#: src/stty.c:571
+#: src/stty.c:583
msgid ""
" [-]cstopb use two stop bits per character (one with `-')\n"
" [-]hup send a hangup signal when the last process closes the tty\n"
@@ -6162,7 +6331,7 @@ msgid ""
" [-]parodd set odd parity (even with `-')\n"
msgstr ""
-#: src/stty.c:578
+#: src/stty.c:590
msgid ""
"\n"
"Input settings:\n"
@@ -6172,7 +6341,7 @@ msgid ""
" [-]igncr ignore carriage return\n"
msgstr ""
-#: src/stty.c:586
+#: src/stty.c:598
msgid ""
" [-]ignpar ignore characters with parity errors\n"
" * [-]imaxbel beep and do not flush a full input buffer on a character\n"
@@ -6181,11 +6350,11 @@ msgid ""
" [-]istrip clear high (8th) bit of input characters\n"
msgstr ""
-#: src/stty.c:593
+#: src/stty.c:605
msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n"
msgstr ""
-#: src/stty.c:596
+#: src/stty.c:608
msgid ""
" * [-]iuclc translate uppercase characters to lowercase\n"
" * [-]ixany let any character restart output, not only start character\n"
@@ -6195,7 +6364,7 @@ msgid ""
" [-]tandem same as [-]ixoff\n"
msgstr ""
-#: src/stty.c:604
+#: src/stty.c:616
msgid ""
"\n"
"Output settings:\n"
@@ -6205,7 +6374,7 @@ msgid ""
" * nlN newline delay style, N in [0..1]\n"
msgstr ""
-#: src/stty.c:612
+#: src/stty.c:624
msgid ""
" * [-]ocrnl translate carriage return to newline\n"
" * [-]ofdel use delete characters for fill instead of null characters\n"
@@ -6215,7 +6384,7 @@ msgid ""
" * [-]onlret newline performs a carriage return\n"
msgstr ""
-#: src/stty.c:620
+#: src/stty.c:632
msgid ""
" * [-]onocr do not print carriage returns in the first column\n"
" [-]opost postprocess output\n"
@@ -6225,7 +6394,7 @@ msgid ""
" * vtN vertical tab delay style, N in [0..1]\n"
msgstr ""
-#: src/stty.c:628
+#: src/stty.c:640
msgid ""
"\n"
"Local settings:\n"
@@ -6234,7 +6403,7 @@ msgid ""
" * -crtkill kill all line by obeying the echoctl and echok settings\n"
msgstr ""
-#: src/stty.c:635
+#: src/stty.c:647
msgid ""
" * [-]ctlecho echo control characters in hat notation (`^c')\n"
" [-]echo echo input characters\n"
@@ -6243,7 +6412,7 @@ msgid ""
" [-]echok echo a newline after a kill character\n"
msgstr ""
-#: src/stty.c:642
+#: src/stty.c:654
msgid ""
" * [-]echoke same as [-]crtkill\n"
" [-]echonl echo newline even if not echoing other characters\n"
@@ -6252,7 +6421,7 @@ msgid ""
" [-]iexten enable non-POSIX special characters\n"
msgstr ""
-#: src/stty.c:649
+#: src/stty.c:661
msgid ""
" [-]isig enable interrupt, quit, and suspend special characters\n"
" [-]noflsh disable flushing after interrupt and quit special "
@@ -6262,7 +6431,7 @@ msgid ""
" * [-]xcase with icanon, escape with `\\' for uppercase characters\n"
msgstr ""
-#: src/stty.c:656
+#: src/stty.c:668
msgid ""
"\n"
"Combination settings:\n"
@@ -6271,7 +6440,7 @@ msgid ""
" -cbreak same as icanon\n"
msgstr ""
-#: src/stty.c:663
+#: src/stty.c:675
msgid ""
" cooked same as brkint ignpar istrip icrnl ixon opost isig\n"
" icanon, eof and eol characters to their default values\n"
@@ -6279,7 +6448,7 @@ msgid ""
" crt same as echoe echoctl echoke\n"
msgstr ""
-#: src/stty.c:669
+#: src/stty.c:681
msgid ""
" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n"
" kill ^u\n"
@@ -6288,7 +6457,7 @@ msgid ""
" evenp same as parenb -parodd cs7\n"
msgstr ""
-#: src/stty.c:676
+#: src/stty.c:688
msgid ""
" -evenp same as -parenb cs8\n"
" * [-]lcase same as xcase iuclc olcuc\n"
@@ -6298,7 +6467,7 @@ msgid ""
" -nl same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n"
msgstr ""
-#: src/stty.c:684
+#: src/stty.c:696
msgid ""
" oddp same as parenb parodd cs7\n"
" -oddp same as -parenb cs8\n"
@@ -6307,7 +6476,7 @@ msgid ""
" -pass8 same as parenb istrip cs7\n"
msgstr ""
-#: src/stty.c:691
+#: src/stty.c:703
msgid ""
" raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n"
" -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n"
@@ -6315,7 +6484,7 @@ msgid ""
" -raw same as cooked\n"
msgstr ""
-#: src/stty.c:697
+#: src/stty.c:709
msgid ""
" sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n"
" -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n"
@@ -6325,7 +6494,7 @@ msgid ""
" characters to their default values.\n"
msgstr ""
-#: src/stty.c:705
+#: src/stty.c:717
msgid ""
"\n"
"Handle the tty line connected to standard input. Without arguments,\n"
@@ -6334,11 +6503,11 @@ msgid ""
"127; special values ^- or undef used to disable special characters.\n"
msgstr ""
-#: src/stty.c:775
+#: src/stty.c:786
msgid "only one device may be specified"
msgstr ""
-#: src/stty.c:805
+#: src/stty.c:816
#, fuzzy
msgid ""
"the options for verbose and stty-readable output styles are\n"
@@ -6347,49 +6516,49 @@ msgstr ""
"显示 dircolors 内部数据库的选项和选择 shell 语法的选项\n"
"是互相抵触的"
-#: src/stty.c:811
+#: src/stty.c:822
msgid "when specifying an output style, modes may not be set"
msgstr ""
-#: src/stty.c:827
+#: src/stty.c:837
#, c-format
msgid "%s: couldn't reset non-blocking mode"
msgstr ""
-#: src/stty.c:878 src/stty.c:988
+#: src/stty.c:885 src/stty.c:995
#, fuzzy, c-format
-msgid "invalid argument `%s'"
-msgstr "%2$s 的参数 %1$s 无效"
+msgid "invalid argument %s"
+msgstr "无效的参数:%s"
-#: src/stty.c:889 src/stty.c:906 src/stty.c:918 src/stty.c:931 src/stty.c:943
-#: src/stty.c:963
+#: src/stty.c:896 src/stty.c:913 src/stty.c:925 src/stty.c:938 src/stty.c:950
+#: src/stty.c:970
#, fuzzy, c-format
-msgid "missing argument to `%s'"
+msgid "missing argument to %s"
msgstr "缺少了文件参数"
-#: src/stty.c:969
+#: src/stty.c:976
#, fuzzy, c-format
-msgid "invalid line discipline `%s'"
+msgid "invalid line discipline %s"
msgstr "无效的 tab 字符定位值:%s"
-#: src/stty.c:1040
+#: src/stty.c:1047
#, c-format
msgid "%s: unable to perform all requested operations"
msgstr ""
-#: src/stty.c:1045
+#: src/stty.c:1052
#, c-format
msgid "new_mode: mode\n"
msgstr ""
-#: src/stty.c:1386
+#: src/stty.c:1393
#, c-format
msgid "%s: no size information for this device"
msgstr ""
-#: src/stty.c:1882
+#: src/stty.c:1889
#, fuzzy, c-format
-msgid "invalid integer argument `%s'"
+msgid "invalid integer argument %s"
msgstr "%2$s 的参数 %1$s 无效"
#: src/su.c:265
@@ -6478,62 +6647,67 @@ msgstr ""
msgid "ignoring all arguments"
msgstr "忽略任何参数"
-#: src/system.h:613
+#: src/system.h:577
+#, c-format
+msgid ""
+"\n"
+"NOTE: your shell may have its own version of %s, which usually supersedes\n"
+"the version described here. Please refer to your shell's documentation\n"
+"for details about the options it supports.\n"
+msgstr ""
+
+#: src/system.h:583
msgid " --help display this help and exit\n"
msgstr " --help 显示此帮助信息并离开\n"
-#: src/system.h:615
+#: src/system.h:585
msgid " --version output version information and exit\n"
msgstr " --version 显示版本信息并离开\n"
-#: src/tac.c:135
+#: src/tac.c:136
msgid ""
"Write each FILE to standard output, last line first.\n"
"With no FILE, or when FILE is -, read standard input.\n"
"\n"
msgstr ""
-#: src/tac.c:143
+#: src/tac.c:144
msgid ""
" -b, --before attach the separator before instead of after\n"
" -r, --regex interpret the separator as a regular expression\n"
" -s, --separator=STRING use STRING as the separator instead of newline\n"
msgstr ""
-#: src/tac.c:234 src/tac.c:331
+#: src/tac.c:235 src/tac.c:336
#, fuzzy, c-format
msgid "%s: seek failed"
msgstr "strip 出现错误"
-#: src/tac.c:261
+#: src/tac.c:264
#, fuzzy
msgid "record too large"
msgstr "%s:文件过大"
-#: src/tac.c:453
+#: src/tac.c:458
#, fuzzy, c-format
msgid "cannot create temporary file %s"
msgstr "无法创建一般文件%s"
-#: src/tac.c:460
+#: src/tac.c:465
#, fuzzy, c-format
msgid "cannot open %s for writing"
msgstr "无法打开 %s 来读取数据"
-#: src/tac.c:481 src/tac.c:488
+#: src/tac.c:486 src/tac.c:493
#, fuzzy, c-format
msgid "%s: write error"
-msgstr "写入时发生错误"
+msgstr "写入错误"
-#: src/tac.c:644
-msgid "stdin: read error"
-msgstr ""
-
-#: src/tac.c:694
+#: src/tac.c:600
msgid "separator cannot be empty"
msgstr ""
-#: src/tail.c:227
+#: src/tail.c:233
#, c-format
msgid ""
"Print the last %d lines of each FILE to standard output.\n"
@@ -6542,7 +6716,7 @@ msgid ""
"\n"
msgstr ""
-#: src/tail.c:236
+#: src/tail.c:242
msgid ""
" --retry keep trying to open a file even if it is\n"
" inaccessible when tail starts or if it becomes\n"
@@ -6552,7 +6726,7 @@ msgid ""
" -c, --bytes=N output the last N bytes\n"
msgstr ""
-#: src/tail.c:243
+#: src/tail.c:249
msgid ""
" -f, --follow[={name|descriptor}]\n"
" output appended data as the file grows;\n"
@@ -6561,7 +6735,7 @@ msgid ""
" -F same as --follow=name --retry\n"
msgstr ""
-#: src/tail.c:250
+#: src/tail.c:256
#, c-format
msgid ""
" -n, --lines=N output the last N lines, instead of the last %d\n"
@@ -6572,7 +6746,7 @@ msgid ""
" (this is the usual case of rotated log files)\n"
msgstr ""
-#: src/tail.c:261
+#: src/tail.c:267
msgid ""
" --pid=PID with -f, terminate after process ID, PID dies\n"
" -q, --quiet, --silent never output headers giving file names\n"
@@ -6581,7 +6755,7 @@ msgid ""
" -v, --verbose always output headers giving file names\n"
msgstr ""
-#: src/tail.c:270
+#: src/tail.c:276
msgid ""
"\n"
"If the first character of N (the number of bytes or lines) is a `+',\n"
@@ -6591,14 +6765,14 @@ msgid ""
"\n"
msgstr ""
-#: src/tail.c:278
+#: src/tail.c:284
msgid ""
"With --follow (-f), tail defaults to following the file descriptor, which\n"
"means that even if a tail'ed file is renamed, tail will continue to track\n"
"its end. "
msgstr ""
-#: src/tail.c:283
+#: src/tail.c:289
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"
@@ -6607,117 +6781,109 @@ msgid ""
"recreated by some other program.\n"
msgstr ""
-#: src/tail.c:343
+#: src/tail.c:347
#, fuzzy, c-format
msgid "closing %s (fd=%d)"
msgstr "正在关闭%s"
-#: src/tail.c:418
+#: src/tail.c:422
#, fuzzy, c-format
msgid "%s: cannot seek to relative offset %s"
msgstr "无法创建 fifo 文件%s"
-#: src/tail.c:422
+#: src/tail.c:426
#, fuzzy, c-format
msgid "%s: cannot seek to end-relative offset %s"
msgstr "无法创建 fifo 文件%s"
-#: src/tail.c:874
+#: src/tail.c:878
#, c-format
-msgid "`%s' has become inaccessible"
+msgid "%s has become inaccessible"
msgstr ""
-#: src/tail.c:891
+#: src/tail.c:895
#, c-format
-msgid "`%s' has been replaced with an untailable file; giving up on this name"
+msgid "%s has been replaced with an untailable file; giving up on this name"
msgstr ""
-#: src/tail.c:912
+#: src/tail.c:916
#, c-format
-msgid "`%s' has become accessible"
+msgid "%s has become accessible"
msgstr ""
-#: src/tail.c:920
+#: src/tail.c:924
#, c-format
-msgid "`%s' has appeared; following end of new file"
+msgid "%s has appeared; following end of new file"
msgstr ""
-#: src/tail.c:931
+#: src/tail.c:935
#, c-format
-msgid "`%s' has been replaced; following end of new file"
+msgid "%s has been replaced; following end of new file"
msgstr ""
-#: src/tail.c:1024
+#: src/tail.c:1028
#, fuzzy, c-format
msgid "%s: cannot change nonblocking mode"
-msgstr "无法改变所属组至没有名称的组"
+msgstr "无法更改为空组"
-#: src/tail.c:1065
+#: src/tail.c:1067
#, fuzzy, c-format
msgid "%s: file truncated"
msgstr "%s:截断文件时出现错误"
-#: src/tail.c:1088
+#: src/tail.c:1090
#, fuzzy
msgid "no files remaining"
msgstr "缺少了文件参数"
-#: src/tail.c:1329
+#: src/tail.c:1323
#, c-format
msgid "%s: cannot follow end of this type of file; giving up on this name"
msgstr ""
-#: src/tail.c:1445
+#: src/tail.c:1437
#, fuzzy, c-format
-msgid "number in `%s' is too large"
-msgstr "%s:覆盖次数无效"
-
-#: src/tail.c:1449
-#, c-format
-msgid "`%s' option is obsolete; use `%s-%c %<PRIuMAX>'"
-msgstr ""
+msgid "number in %s is too large"
+msgstr "无效的号码 %s"
-#: src/tail.c:1515
-#, fuzzy
+#: src/tail.c:1498
msgid "the --allow-missing option is deprecated; use --retry instead"
msgstr ""
-"警告:--version-control (-V) 选项已经过时;将来的版本随时可能不再支持\n"
-"此选项。请使用 --backup=%s。"
-#: src/tail.c:1529
+#: src/tail.c:1512
#, fuzzy, c-format
msgid "%s: invalid maximum number of unchanged stats between opens"
msgstr "%s:覆盖次数无效"
-#: src/tail.c:1541
+#: src/tail.c:1524
#, fuzzy, c-format
msgid "%s: invalid PID"
msgstr "%s:文件大小无效"
-#: src/tail.c:1560
+#: src/tail.c:1543
#, fuzzy, c-format
msgid "%s: invalid number of seconds"
msgstr "%s:覆盖次数无效"
-#: src/tail.c:1579
+#: src/tail.c:1562
msgid "warning: --retry is useful only when following by name"
msgstr ""
-#: src/tail.c:1583
+#: src/tail.c:1566
msgid "warning: PID ignored; --pid=PID is useful only when following"
msgstr ""
-#: src/tail.c:1586
+#: src/tail.c:1569
#, fuzzy
msgid "warning: --pid=PID is not supported on this system"
msgstr "此系统并不支持符号链接"
-#: src/tail.c:1667
+#: src/tail.c:1651
#, c-format
msgid "cannot follow %s by name"
msgstr ""
-#: src/tail.c:1673
+#: src/tail.c:1657
msgid "warning: following standard input indefinitely is ineffective"
msgstr ""
@@ -6735,105 +6901,53 @@ msgid ""
"If a FILE is -, copy again to standard output.\n"
msgstr ""
-#: src/test.c:132
+#: src/test.c:124
#, fuzzy, c-format
msgid "missing argument after %s"
msgstr "缺少了文件参数"
-#: src/test.c:140
+#: src/test.c:160
#, fuzzy, c-format
-msgid "%s: integer expression expected\n"
-msgstr "转换无效:%s"
+msgid "invalid integer %s\n"
+msgstr "无效的号码 %s"
-#: src/test.c:265
+#: src/test.c:241
msgid "')' expected\n"
msgstr ""
-#: src/test.c:268
+#: src/test.c:244
#, c-format
msgid "')' expected, found %s\n"
msgstr ""
-#: src/test.c:284 src/test.c:747
+#: src/test.c:260 src/test.c:605
#, c-format
msgid "%s: unary operator expected\n"
msgstr ""
-#: src/test.c:333
-msgid "before -lt"
-msgstr ""
-
-#: src/test.c:341
-msgid "after -lt"
-msgstr ""
-
-#: src/test.c:355
-msgid "before -le"
-msgstr ""
-
-#: src/test.c:362
-msgid "after -le"
-msgstr ""
-
-#: src/test.c:378
-msgid "before -gt"
-msgstr ""
-
-#: src/test.c:385
-msgid "after -gt"
-msgstr ""
-
-#: src/test.c:399
-msgid "before -ge"
-msgstr ""
-
-#: src/test.c:406
-msgid "after -ge"
-msgstr ""
-
-#: src/test.c:421
+#: src/test.c:329
msgid "-nt does not accept -l\n"
msgstr ""
-#: src/test.c:435
-msgid "before -ne"
-msgstr ""
-
-#: src/test.c:442
-msgid "after -ne"
-msgstr ""
-
-#: src/test.c:458
-msgid "before -eq"
-msgstr ""
-
-#: src/test.c:465
-msgid "after -eq"
-msgstr ""
-
-#: src/test.c:476
+#: src/test.c:342
msgid "-ef does not accept -l\n"
msgstr ""
-#: src/test.c:492
+#: src/test.c:358
msgid "-ot does not accept -l\n"
msgstr ""
-#: src/test.c:501
+#: src/test.c:367
#, fuzzy
msgid "unknown binary operator\n"
msgstr "未知的系统错误"
-#: src/test.c:629
-msgid "after -t"
-msgstr ""
-
-#: src/test.c:775
+#: src/test.c:633
#, c-format
msgid "%s: binary operator expected\n"
msgstr ""
-#: src/test.c:835
+#: src/test.c:693
#, fuzzy
msgid ""
"Usage: test EXPRESSION\n"
@@ -6841,20 +6955,24 @@ msgid ""
" or: [ EXPRESSION ]\n"
" or: [ ]\n"
" or: [ OPTION\n"
-"Exit with the status determined by EXPRESSION.\n"
-"\n"
msgstr ""
"用法:%s 文件\n"
" 或:%s 选项\n"
-#: src/test.c:846
+#: src/test.c:700
+msgid ""
+"Exit with the status determined by EXPRESSION.\n"
+"\n"
+msgstr ""
+
+#: src/test.c:706
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:851
+#: src/test.c:711
msgid ""
"\n"
" ( EXPRESSION ) EXPRESSION is true\n"
@@ -6863,7 +6981,7 @@ msgid ""
" EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n"
msgstr ""
-#: src/test.c:858
+#: src/test.c:718
msgid ""
"\n"
" -n STRING the length of STRING is nonzero\n"
@@ -6873,7 +6991,7 @@ msgid ""
" STRING1 != STRING2 the strings are not equal\n"
msgstr ""
-#: src/test.c:866
+#: src/test.c:726
msgid ""
"\n"
" INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n"
@@ -6884,7 +7002,7 @@ msgid ""
" INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n"
msgstr ""
-#: src/test.c:875
+#: src/test.c:735
msgid ""
"\n"
" FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n"
@@ -6892,7 +7010,7 @@ msgid ""
" FILE1 -ot FILE2 FILE1 is older than FILE2\n"
msgstr ""
-#: src/test.c:881
+#: src/test.c:741
msgid ""
"\n"
" -b FILE FILE exists and is block special\n"
@@ -6901,7 +7019,7 @@ msgid ""
" -e FILE FILE exists\n"
msgstr ""
-#: src/test.c:888
+#: src/test.c:748
msgid ""
" -f FILE FILE exists and is a regular file\n"
" -g FILE FILE exists and is set-group-ID\n"
@@ -6910,7 +7028,7 @@ msgid ""
" -k FILE FILE exists and has its sticky bit set\n"
msgstr ""
-#: src/test.c:895
+#: src/test.c:755
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"
@@ -6919,7 +7037,7 @@ msgid ""
" -s FILE FILE exists and has a size greater than zero\n"
msgstr ""
-#: src/test.c:902
+#: src/test.c:762
msgid ""
" -S FILE FILE exists and is a socket\n"
" -t FD file descriptor FD is opened on a terminal\n"
@@ -6928,7 +7046,7 @@ msgid ""
" -x FILE FILE exists and execute (or search) permission is granted\n"
msgstr ""
-#: src/test.c:909
+#: src/test.c:769
msgid ""
"\n"
"Except for -h and -L, all FILE-related tests dereference symbolic links.\n"
@@ -6937,43 +7055,48 @@ msgid ""
"INTEGER may also be -l STRING, which evaluates to the length of STRING.\n"
msgstr ""
-#: src/test.c:969
+#: src/test.c:775
+msgid "test and/or ["
+msgstr ""
+
+#: src/test.c:830
msgid "missing `]'\n"
msgstr ""
-#: src/test.c:984
+#: src/test.c:845
#, fuzzy, c-format
msgid "extra argument %s"
-msgstr "%2$s 的参数 %1$s 无效"
+msgstr "无效的参数:%s"
-#: src/touch.c:114 src/touch.c:311
+#: src/touch.c:112 src/touch.c:318
#, c-format
msgid "invalid date format %s"
msgstr "日期格式 %s 无效"
-#: src/touch.c:153
+#: src/touch.c:154
#, c-format
msgid "creating %s"
-msgstr "正在创建目录 %s"
+msgstr "创建 %s"
-#: src/touch.c:206
-#, fuzzy, c-format
+#: src/touch.c:211
+#, c-format
msgid "cannot touch %s"
-msgstr "无法解除%s的链接"
+msgstr "无法触碰 %s"
-#: src/touch.c:212
+#: src/touch.c:217
#, c-format
msgid "setting times of %s"
-msgstr "正在设定 %s 的时间"
+msgstr "设置 %s 的时间"
-#: src/touch.c:229
+#: src/touch.c:234
msgid ""
"Update the access and modification times of each FILE to the current time.\n"
"\n"
-msgstr "将每个<文件>的访问及修改时间都更新为目前的时间。\n"
+msgstr ""
+"将每个<文件>的访问及修改时间都更新为目前时间。\n"
+"\n"
-#: src/touch.c:236
-#, fuzzy
+#: src/touch.c:241
msgid ""
" -a change only the access time\n"
" -c, --no-create do not create any files\n"
@@ -6983,11 +7106,11 @@ msgid ""
msgstr ""
" -a 只更改访问时间\n"
" -c, --no-create 不创建任何文件\n"
-" -d, --date=字串 使用<字串>表示的时间而不是目前的时间\n"
+" -d, --date=字符串 使用<字符串>表示的时间而不是目前的时间\n"
" -f (此选项不作处理)\n"
" -m 只更改修改时间\n"
-#: src/touch.c:243
+#: src/touch.c:248
#, fuzzy
msgid ""
" -r, --reference=FILE use this file's times instead of current time\n"
@@ -6999,26 +7122,29 @@ msgstr ""
" -r, --reference=文件 使用指定<文件>的时间属性而非目前的时间\n"
" -t STAMP 使用 [[CC]YY]MMDDhhmm[.ss] 格式的时间而非目前的时"
"间\n"
-" --time=WORD 使用 WORD 指定的时间:access、atime、use 都等於 -a\n"
-" 选项的效果,而 modify、mtime 等於 -m 选项的效果\n"
+" --time=WORD 使用 WORD 指定的时间:access、atime、use 都等于 -a\n"
+" 选项的效果,而 modify、mtime 等于 -m 选项的效果\n"
-#: src/touch.c:252
+#: src/touch.c:257
+#, fuzzy
msgid ""
"\n"
"Note that the -d and -t options accept different time-date formats.\n"
+"\n"
+"If a FILE is -, touch standard output.\n"
msgstr ""
"\n"
"请注意,-d 和 -t 选项可接受不同的时间/日期格式。\n"
-#: src/touch.c:337
+#: src/touch.c:344
msgid "cannot specify times from more than one source"
-msgstr "无法由多於一种的来源来指定时间"
+msgstr "无法由多于一种的来源来指定时间"
-#: src/touch.c:383
+#: src/touch.c:388
#, 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’"
+msgstr "警告:“touch %s”已经过时;请使用“touch -t %04d%02d%02d%02d%02d.%02d”"
#: src/tr.c:290
#, fuzzy, c-format
@@ -7107,7 +7233,7 @@ msgstr ""
#, c-format
msgid ""
"warning: the ambiguous octal escape \\%c%c%c is being\n"
-"\tinterpreted as the 2-byte sequence \\0%c%c, `%c'"
+"\tinterpreted as the 2-byte sequence \\0%c%c, %c"
msgstr ""
#: src/tr.c:681
@@ -7117,7 +7243,7 @@ msgstr ""
#: src/tr.c:837
#, c-format
-msgid "invalid repeat count `%s' in [c*n] construct"
+msgid "invalid repeat count %s in [c*n] construct"
msgstr ""
#: src/tr.c:918
@@ -7130,8 +7256,8 @@ msgstr ""
#: src/tr.c:936
#, fuzzy, c-format
-msgid "invalid character class `%s'"
-msgstr "权限模式字串 %2$s 中出现无效的字符 %1$s"
+msgid "invalid character class %s"
+msgstr "权限模式字符串 %2$s 中出现无效的字符 %1$s"
#: src/tr.c:955
#, c-format
@@ -7183,22 +7309,28 @@ msgstr ""
msgid "Only one string may be given when deleting without squeezing repeats."
msgstr ""
-#: src/tr.c:1841
+#: src/tr.c:1844
msgid "misaligned [:upper:] and/or [:lower:] construct"
msgstr ""
-#: src/true.c:32
-#, c-format
+#: src/true.c:42
+#, fuzzy, c-format
msgid ""
"Usage: %s [ignored command line arguments]\n"
" or: %s OPTION\n"
-"Exit with a status code indicating success.\n"
-"\n"
-"These option names may not be abbreviated.\n"
-"\n"
+msgstr ""
+"用法:%s 文件\n"
+" 或:%s 选项\n"
+
+#: src/true.c:49
+msgid "Exit with a status code indicating success."
+msgstr ""
+
+#: src/true.c:50
+msgid "Exit with a status code indicating failure."
msgstr ""
-#: src/tsort.c:89
+#: src/tsort.c:86
#, c-format
msgid ""
"Usage: %s [OPTION] [FILE]\n"
@@ -7207,12 +7339,12 @@ msgid ""
"\n"
msgstr ""
-#: src/tsort.c:486
+#: src/tsort.c:474
#, fuzzy, c-format
msgid "%s: input contains an odd number of tokens"
msgstr "%s:覆盖次数无效"
-#: src/tsort.c:527
+#: src/tsort.c:515
#, c-format
msgid "%s: input contains a loop:"
msgstr ""
@@ -7237,33 +7369,34 @@ msgstr ""
msgid ""
"Print certain system information. With no OPTION, same as -s.\n"
"\n"
-" -a, --all print all information, in the following order:\n"
+" -a, --all print all information, in the following order,\n"
+" except omit -p and -i if unknown:\n"
" -s, --kernel-name print the kernel name\n"
" -n, --nodename print the network node hostname\n"
" -r, --kernel-release print the kernel release\n"
msgstr ""
-#: src/uname.c:126
+#: src/uname.c:127
msgid ""
" -v, --kernel-version print the kernel version\n"
" -m, --machine print the machine hardware name\n"
-" -p, --processor print the processor type\n"
-" -i, --hardware-platform print the hardware platform\n"
+" -p, --processor print the processor type or \"unknown\"\n"
+" -i, --hardware-platform print the hardware platform or \"unknown\"\n"
" -o, --operating-system print the operating system\n"
msgstr ""
-#: src/uname.c:235
+#: src/uname.c:236
msgid "cannot get system name"
msgstr ""
-#: src/unexpand.c:126
+#: src/unexpand.c:125
msgid ""
"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 ""
-#: src/unexpand.c:134
+#: src/unexpand.c:133
msgid ""
" -a, --all convert all blanks, instead of just initial blanks\n"
" --first-only convert only leading sequences of blanks (overrides -a)\n"
@@ -7271,18 +7404,19 @@ msgid ""
" -t, --tabs=LIST use comma separated LIST of tab positions (enables -a)\n"
msgstr ""
-#: src/unexpand.c:162
+#: src/unexpand.c:161
msgid "tabs are too far apart"
msgstr ""
-#: src/unexpand.c:530
-msgid "`-LIST' option is obsolete; use `--first-only -t LIST'"
-msgstr ""
+#: src/unexpand.c:513
+#, fuzzy
+msgid "tab stop value is too large"
+msgstr "%s:文件过大"
#: src/uniq.c:135
-#, fuzzy, c-format
+#, c-format
msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n"
-msgstr "用法:%s [选项]... [文件]\n"
+msgstr "用法:%s [选项]... [输入 [输出]]\n"
#: src/uniq.c:139
msgid ""
@@ -7319,32 +7453,27 @@ msgid ""
"Fields are skipped before chars.\n"
msgstr ""
-#: src/uniq.c:352
+#: src/uniq.c:341
#, fuzzy
msgid "too many repeated lines"
-msgstr "字符特殊文件"
+msgstr "参数太多"
-#: src/uniq.c:487 src/uniq.c:513
+#: src/uniq.c:476 src/uniq.c:503
#, fuzzy
msgid "invalid number of fields to skip"
msgstr "%s:覆盖次数无效"
-#: src/uniq.c:522
+#: src/uniq.c:512
#, fuzzy
msgid "invalid number of bytes to skip"
msgstr "%s:覆盖次数无效"
-#: src/uniq.c:531
+#: src/uniq.c:521
#, fuzzy
msgid "invalid number of bytes to compare"
msgstr "%s:覆盖次数无效"
-#: src/uniq.c:545
-#, c-format
-msgid "`-%lu' option is obsolete; use `-f %lu'"
-msgstr ""
-
-#: src/uniq.c:553
+#: src/uniq.c:536
msgid "printing all duplicated lines and repeat counts is meaningless"
msgstr ""
@@ -7366,7 +7495,7 @@ msgstr ""
#: src/unlink.c:92
#, c-format
msgid "cannot unlink %s"
-msgstr "无法解除%s的链接"
+msgstr "无法解除 %s 的链接"
#: src/uptime.c:109
msgid "couldn't get boot time"
@@ -7396,30 +7525,28 @@ msgid "???? days ??:??, "
msgstr ""
#: src/uptime.c:129
-#, c-format
+#, fuzzy, c-format
msgid "%ld day"
msgid_plural "%ld days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d 天"
#: src/uptime.c:132
-#, fuzzy, c-format
+#, c-format
msgid "%lu user"
msgid_plural "%lu users"
-msgstr[0] "无效的用户"
-msgstr[1] "无效的用户"
+msgstr[0] "%lu 个用户"
#: src/uptime.c:146
#, c-format
msgid ", load average: %.2f"
-msgstr ""
+msgstr ",平均负载:%.2f"
-#: src/uptime.c:179 src/users.c:107
-#, fuzzy, c-format
+#: src/uptime.c:180 src/users.c:108
+#, c-format
msgid "Usage: %s [OPTION]... [ FILE ]\n"
msgstr "用法:%s [选项]... [文件]\n"
-#: src/uptime.c:180
+#: src/uptime.c:181
#, c-format
msgid ""
"Print the current time, the length of time the system has been up,\n"
@@ -7429,7 +7556,7 @@ msgid ""
"\n"
msgstr ""
-#: src/users.c:108
+#: src/users.c:109
#, c-format
msgid ""
"Output who is currently logged in according to FILE.\n"
@@ -7437,7 +7564,7 @@ msgid ""
"\n"
msgstr ""
-#: src/wc.c:136
+#: src/wc.c:131
msgid ""
"Print newline, word, and byte counts for each FILE, and a total line if\n"
"more than one FILE is specified. With no FILE, or when FILE is -,\n"
@@ -7447,79 +7574,79 @@ msgid ""
" -l, --lines print the newline counts\n"
msgstr ""
-#: src/wc.c:144
+#: src/wc.c:139
msgid ""
" -L, --max-line-length print the length of the longest line\n"
" -w, --words print the word counts\n"
msgstr ""
-#: src/who.c:218
+#: src/who.c:216
msgid " old "
msgstr ""
-#: src/who.c:442 src/who.c:444
+#: src/who.c:441 src/who.c:443
msgid "id="
msgstr ""
-#: src/who.c:457 src/who.c:462
+#: src/who.c:456 src/who.c:461
msgid "term="
msgstr ""
-#: src/who.c:459 src/who.c:463
+#: src/who.c:458 src/who.c:462
msgid "exit="
msgstr ""
-#: src/who.c:500
+#: src/who.c:499
msgid "clock change"
msgstr ""
-#: src/who.c:512 src/who.c:513
+#: src/who.c:511 src/who.c:512
msgid "run-level"
msgstr ""
-#: src/who.c:516 src/who.c:517
+#: src/who.c:515 src/who.c:516
msgid "last="
msgstr ""
-#: src/who.c:548
+#: src/who.c:547
#, c-format
msgid ""
"\n"
"# users=%lu\n"
msgstr ""
-#: src/who.c:554
+#: src/who.c:553
msgid "NAME"
msgstr ""
-#: src/who.c:554
+#: src/who.c:553
msgid "LINE"
msgstr ""
-#: src/who.c:554
+#: src/who.c:553
msgid "TIME"
msgstr ""
-#: src/who.c:554
+#: src/who.c:553
msgid "IDLE"
msgstr ""
-#: src/who.c:555
+#: src/who.c:554
msgid "PID"
msgstr ""
-#: src/who.c:555
+#: src/who.c:554
msgid "COMMENT"
msgstr ""
-#: src/who.c:555
+#: src/who.c:554
msgid "EXIT"
msgstr ""
#: src/who.c:635
-#, fuzzy, c-format
+#, c-format
msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n"
-msgstr "用法:%s [选项]... [文件]\n"
+msgstr "用法:%s [选项]... [文件|参数1 参数2]\n"
#: src/who.c:636
msgid ""
@@ -7569,31 +7696,32 @@ msgid ""
msgstr ""
#: 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。"
+msgstr "警告:-i 即将在未来的版本删除;请换用 -u"
#: src/whoami.c:51
+#, fuzzy
msgid ""
-"Print the user name associated with the current effective user id.\n"
+"Print the user name associated with the current effective user ID.\n"
"Same as id -un.\n"
"\n"
msgstr ""
+"打印与当前生效的用户 ID 关联的用户名。\n"
+"与 id -un 相同。\n"
+"\n"
#: src/whoami.c:95
#, fuzzy, c-format
-msgid "%s: cannot find username for UID %lu\n"
-msgstr "无法更改%s的所有者及/或组"
+msgid "%s: cannot find name for user ID %lu\n"
+msgstr "%s:找不到 UID %lu 的用户名\n"
#: src/yes.c:46
-#, fuzzy, c-format
+#, c-format
msgid ""
"Usage: %s [STRING]...\n"
" or: %s OPTION\n"
msgstr ""
-"用法:%s 文件\n"
+"用法:%s [字符串]...\n"
" 或:%s 选项\n"
#: src/yes.c:52
@@ -7601,405 +7729,183 @@ msgid ""
"Repeatedly output a line with all specified STRING(s), or `y'.\n"
"\n"
msgstr ""
+"重复输出一行指定的<字符串>,或者重复“y”。\n"
+"\n"
-#, fuzzy
-#~ msgid "<anonymous temporary file>"
-#~ msgstr "无法创建一般文件%s"
+#~ msgid "cannot obtain time stamps for %s"
+#~ msgstr "无法取得 %s 的时间标记"
#, 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 "cannot open .. from %s"
+#~ msgstr "无法打开目录%s"
#, fuzzy
-#~ msgid "`--pages' invalid range of page numbers: `%s'"
-#~ msgstr "无效的组代号 %s"
+#~ msgid "cannot open %s from %s"
+#~ msgstr "无法打开目录%s"
#, fuzzy
-#~ msgid "`--pages' invalid ending page number: `%s'"
-#~ msgstr "无效的组代号 %s"
+#~ msgid "cannot open %s"
+#~ msgstr "无法删除 %s"
#, fuzzy
-#~ msgid "`%s' is not a directory"
-#~ msgstr "%s是目录"
-
-#~ msgid "invalid mode string: %s"
-#~ msgstr "权限模式字串无效:%s "
+#~ msgid "cannot open from %s to %s"
+#~ msgstr "无法从%s切换到目录%s"
-#~ msgid "cannot omit both user and group"
-#~ msgstr "不可同时省略用户和所属组"
+#, fuzzy
+#~ msgid ""
+#~ "a format string may not be specified when using the --rfc-2822 (-R) option"
+#~ msgstr "安装目录时不能用 strip 选项"
-#~ msgid "invalid group name %s"
-#~ msgstr "无效的组名称‘%s’"
+#~ msgid "file offset out of range"
+#~ msgstr "文件偏移值超出范围以外"
-#~ msgid "group number"
-#~ msgstr "组代号"
+#~ msgid "cannot get priority"
+#~ msgstr "无法获得优先级"
-#~ msgid "invalid group number %s"
-#~ msgstr "无效的组代号 %s"
+#~ msgid "cannot set priority"
+#~ msgstr "无法设定优先级"
#~ msgid ""
-#~ "Usage: %s [OPTION]... OWNER[:[GROUP]] FILE...\n"
-#~ " or: %s [OPTION]... :GROUP FILE...\n"
-#~ " or: %s [OPTION]... --reference=RFILE FILE...\n"
+#~ "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"
#~ msgstr ""
-#~ "用法:%s [选项]... 所有者[:[组]] 文件...\n"
-#~ " 或:%s [选项]... :组 文件...\n"
-#~ " 或:%s [选项]... --reference=参考文件 文件...\n"
+#~ "这是自由软件;请参见源代码中的复制条件。本软件不提供任何保证;甚至不会包"
+#~ "括\n"
+#~ "可售性或适用于任何特定目的的保证。\n"
#, fuzzy
#~ msgid ""
-#~ "\tonly one conv in {ascii,ebcdic,ibm}, {lcase,ucase}, {block,unblock}"
+#~ " --reply={yes,no,query} specify how to handle the prompt about an\n"
+#~ " existing destination file. Note that\n"
+#~ " --reply=no has an effect only when mv\n"
+#~ " would prompt without -i or equivalent, i."
+#~ "e.,\n"
+#~ " when a destination file exists and is "
+#~ "not\n"
+#~ " writable, standard input is a terminal, "
+#~ "and\n"
+#~ " no -f (or equivalent) option is "
+#~ "specified\n"
+#~ " --strip-trailing-slashes remove any trailing slashes from each "
+#~ "SOURCE\n"
+#~ " argument\n"
+#~ " -S, --suffix=SUFFIX override the usual backup suffix\n"
#~ msgstr ""
-#~ "每组只能选一项作为 conv 的关键字:\n"
-#~ "{ascii,ebcdic,ibm}、{lcase,ucase}、{block,unblock}、{unblock,sync}"
+#~ " --reply={yes,no,query} 指定如何处理已存在的目的地文件\n"
+#~ " --strip-trailing-slashes 删除参数中所有<源>文件/目录末端的斜杠\n"
+#~ " -S, --suffix=后缀 自行指定备份文件的<后缀>\n"
#, fuzzy
-#~ msgid "invalid width option: %s"
-#~ msgstr "无效的行宽数值:%s"
-
-#~ msgid "%s is a directory"
-#~ msgstr "%s是目录"
-
-#, fuzzy
-#~ msgid "invalid option `%s'"
-#~ msgstr "无效的组 %s"
-
-#, fuzzy
-#~ msgid "invalid priority `%s'"
-#~ msgstr "无效的组 %s"
-
-#, fuzzy
-#~ msgid "%c: invalid suffix character in obsolescent option"
-#~ msgstr "权限模式字串 %2$s 中出现无效的字符 %1$s"
-
-#, fuzzy
-#~ msgid "%s: invalid maximum number of consecutive size changes"
-#~ msgstr "%s:覆盖次数无效"
-
-#, fuzzy
-#~ msgid "%%%c: invalid directive"
-#~ msgstr "%s:文件大小无效"
+#~ msgid "failed to redirect standard output"
+#~ msgstr "标准输出"
#~ msgid ""
-#~ "Usage: %s [OPTION]... TARGET [LINK_NAME]\n"
-#~ " or: %s [OPTION]... TARGET... DIRECTORY\n"
-#~ " or: %s [OPTION]... --target-directory=DIRECTORY TARGET...\n"
+#~ "warning: --version-control (-V) is obsolete; support for it\n"
+#~ "will be removed in some future release. Use --backup=%s instead."
#~ msgstr ""
-#~ "用法:%s [选项]... 目标 [链接名]\n"
-#~ " 或:%s [选项]... 目标... 目录\n"
-#~ " 或:%s [选项]... --target-directory=目录 目标...\n"
+#~ "警告:--version-control (-V) 选项已经过时;将来的版本随时可能不再支持\n"
+#~ "此选项。请使用 --backup=%s。"
#, fuzzy
-#~ msgid "%s: destination directory does not exist"
-#~ msgstr "%s:指定的目的地不是目录"
-
-#~ 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 "缺少了文件参数"
-
-#~ msgid "when moving multiple files, last argument must be a directory"
-#~ msgstr "移动多个文件时,最后的参数必须为目录。"
-
-#, fuzzy
-#~ msgid "User name too long"
+#~ msgid "`%s' is too large"
#~ 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 内部数据库时不能加上<文件>参数"
-
-#, fuzzy
-#~ msgid "too many non-option arguments"
-#~ msgstr "参数太多"
-
-#, fuzzy
-#~ msgid "too few non-option arguments"
-#~ msgstr "参数太少"
-
-#~ 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 "参数太多"
-
-#~ msgid "file arguments missing"
-#~ msgstr "缺少了文件参数"
-
-#, fuzzy
-#~ msgid "%b %e %H:%M %Y"
-#~ msgstr "%b %e %H:%M"
-
-#, fuzzy
-#~ msgid "invalid backslash escape at end of string"
-#~ msgstr "权限模式字串 %2$s 中出现无效的字符 %1$s"
-
-#, fuzzy
-#~ msgid "%s+%s bytes in\n"
-#~ msgstr "读入了 %s+%s 个块\n"
-
-#, fuzzy
-#~ msgid "%s+%s bytes out\n"
-#~ msgstr "输出了 %s+%s 个块\n"
-
-#, fuzzy
-#~ msgid "unrecognized display= argument %s"
-#~ msgstr "无法识别的文件种类:%s"
-
-#, fuzzy
-#~ msgid "no files specified in %s"
-#~ msgstr "无效的 tab 字符定位值:%s"
-
-#, fuzzy
-#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n"
-#~ msgstr "用法:%s [选项]... [文件]\n"
-
-#, fuzzy
-#~ msgid "*** invalid date/time ***"
-#~ msgstr "无效的权限模式%s"
-
-#, fuzzy
-#~ msgid "Written by FIXME unknown."
-#~ msgstr "由 %s 编写。\n"
-
-#, fuzzy
-#~ msgid "Written by David MacKenzie and Jim Meyering."
-#~ msgstr "Mike Parker、David MacKenzie 和 Jim Meyering"
-
-#, fuzzy
-#~ msgid "Written by David MacKenzie."
-#~ msgstr "Mike Parker 和 David MacKenzie"
-
-#, fuzzy
-#~ msgid "Written by Roland McGrath."
-#~ msgstr "由 %s 编写。\n"
-
-#, fuzzy
-#~ msgid "Written by Q. Frank Xia."
-#~ msgstr "由 %s 编写。\n"
-
-#, fuzzy
-#~ msgid "Written by Richard Stallman and David MacKenzie."
-#~ msgstr "Richard Stallman 和 David MacKenzie"
-
-#, fuzzy
-#~ msgid "Written by Torbjorn Granlund, David MacKenzie, and Jim Meyering."
-#~ msgstr "Torbjorn Granlund、David MacKenzie 及 Jim Meyering"
-
-#, fuzzy
-#~ msgid "Written by Stuart Kemp and David MacKenzie."
-#~ msgstr "Mike Parker 和 David MacKenzie"
-
-#, fuzzy
-#~ msgid "Written by David Ihnat, David MacKenzie, and Jim Meyering."
-#~ msgstr "Mike Parker、David MacKenzie 和 Jim Meyering"
-
-#, fuzzy
-#~ msgid "Written by Paul Rubin, David MacKenzie, and Stuart Kemp."
-#~ msgstr "Paul Rubin、David MacKenzie 及 Stuart Kemp"
-
-#, fuzzy
-#~ msgid "Written by Torbjorn Granlund, David MacKenzie, and Paul Eggert."
-#~ msgstr "Torbjorn Granlund、David MacKenzie 及 Jim Meyering"
-
#, fuzzy
#~ msgid ""
-#~ "Written by Torbjorn Granlund, David MacKenzie, Paul Eggert, and Jim "
-#~ "Meyering."
-#~ msgstr "Torbjorn Granlund、David MacKenzie 及 Jim Meyering"
-
-#, fuzzy
-#~ msgid "Written by Richard Mlynarik and David MacKenzie."
-#~ msgstr "Richard Stallman 和 David MacKenzie"
-
-#, fuzzy
-#~ msgid "Written by Mike Parker."
-#~ msgstr "由 %s 编写。\n"
-
-#, fuzzy
-#~ msgid "Written by Paul Rubin."
-#~ msgstr "由 %s 编写。\n"
-
-#, fuzzy
-#~ msgid "Written by Jim Meyering."
-#~ msgstr "由 %s 编写。\n"
-
-#, fuzzy
-#~ msgid "Written by Ross Paterson."
-#~ msgstr "由 %s 编写。\n"
-
-#, fuzzy
-#~ msgid "Written by Arnold Robbins and David MacKenzie."
-#~ msgstr "Richard Stallman 和 David MacKenzie"
-
-#, fuzzy
-#~ msgid "Written by Mike Haertel."
-#~ msgstr "由 %s 编写。\n"
-
-#, fuzzy
-#~ msgid "Written by Paul Eggert."
-#~ msgstr "由 %s 编写。\n"
-
-#, fuzzy
-#~ msgid "Written by Michael Stone."
-#~ msgstr "由 %s 编写。\n"
-
-#, fuzzy
-#~ msgid "Written by Mike Parker and David MacKenzie."
-#~ msgstr "Mike Parker 和 David MacKenzie"
-
-#, fuzzy
-#~ msgid "Written by Mike Parker, David MacKenzie, and Jim Meyering."
-#~ msgstr "Mike Parker、David MacKenzie 和 Jim Meyering"
-
-#, fuzzy
-#~ msgid "Written by Scott Bartram and David MacKenzie."
-#~ msgstr "Richard Stallman 和 David MacKenzie"
+#~ "* file systems that cache in temporary locations, such as NFS\n"
+#~ " version 3 clients\n"
+#~ "\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"
+#~ "to be recovered later.\n"
+#~ msgstr ""
+#~ "* 会将快取记忆放入暂存位置的文件系统,像 NFS 第 3 版本的客户端程序\n"
+#~ "\n"
+#~ "* 会压缩数据的文件系统\n"
+#~ "\n"
+#~ "另外,文件系统的备份及远程的 mirror 都可能所有该文件的复制本,这些复制本\n"
+#~ "都是无法删除的,而且可能令已经用 shred 处理过的文件恢复原状。\n"
#, fuzzy
-#~ msgid "Written by David M. Ihnat and David MacKenzie."
-#~ msgstr "Mike Parker 和 David MacKenzie"
+#~ msgid "invalid argument `%s'"
+#~ msgstr "%2$s 的参数 %1$s 无效"
-#, fuzzy
-#~ msgid "Written by Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi."
-#~ msgstr "Mike Parker、David MacKenzie 和 Jim Meyering"
+#~ msgid "openat: unable to restore working directory"
+#~ msgstr "openat:无法恢复工作目录"
#, fuzzy
-#~ msgid "Written by David MacKenzie and Richard Mlynarik."
-#~ msgstr "Mike Parker、David MacKenzie 和 Jim Meyering"
+#~ msgid "fdopendir: unable to record current working directory"
+#~ msgstr "openat:无法记录目前工作的目录"
#, fuzzy
-#~ msgid ""
-#~ "Written by Paul Rubin, David MacKenzie, Richard Stallman, and Jim "
-#~ "Meyering."
-#~ msgstr "Mike Parker、David MacKenzie 和 Jim Meyering"
+#~ msgid "fdopendir: unable to restore working directory"
+#~ msgstr "openat:无法恢复工作目录"
#, fuzzy
-#~ msgid "Written by Colin Plumb."
-#~ msgstr "由 %s 编写。\n"
+#~ msgid "fstatat: unable to record current working directory"
+#~ msgstr "openat:无法记录目前工作的目录"
#, fuzzy
-#~ msgid "Written by Michael Meskes."
-#~ msgstr "由 %s 编写。\n"
+#~ msgid "fstatat: unable to restore working directory"
+#~ msgstr "openat:无法恢复工作目录"
#, fuzzy
-#~ msgid "Written by Kayvan Aghaiepour and David MacKenzie."
-#~ msgstr "Mike Parker 和 David MacKenzie"
-
-#, fuzzy
-#~ msgid "Written by Jay Lepreau and David MacKenzie."
-#~ msgstr "Mike Parker 和 David MacKenzie"
+#~ msgid "integer is too large: %s"
+#~ msgstr "%s:文件过大"
#, fuzzy
-#~ msgid ""
-#~ "Written by Paul Rubin, David MacKenzie, Ian Lance Taylor, and Jim "
-#~ "Meyering."
-#~ msgstr "Mike Parker、David MacKenzie 和 Jim Meyering"
+#~ msgid "%s: integer expression expected\n"
+#~ msgstr "转换无效:%s"
#, fuzzy
-#~ msgid "Written by Mike Parker, Richard M. Stallman, and David MacKenzie."
-#~ msgstr "Richard Stallman 和 David MacKenzie"
+#~ msgid "integer is too large: %s\n"
+#~ msgstr "%s:文件过大"
-#, fuzzy
#~ msgid ""
-#~ "Written by Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and "
-#~ "Randy Smith."
-#~ msgstr "Richard Stallman 和 David MacKenzie"
-
-#, fuzzy
-#~ msgid "Written by Mark Kettenis."
-#~ msgstr "由 %s 编写。\n"
-
-#, fuzzy
-#~ msgid "Written by Joseph Arceneaux and David MacKenzie."
-#~ msgstr "Mike Parker 和 David MacKenzie"
-
-#, fuzzy
-#~ msgid "Written by Paul Rubin and David MacKenzie."
-#~ msgstr "Mike Parker 和 David MacKenzie"
-
-#, fuzzy
-#~ msgid "Written by Joseph Arceneaux, David MacKenzie, and Michael Stone."
-#~ msgstr "Mike Parker、David MacKenzie 和 Jim Meyering"
+#~ "\n"
+#~ "Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
+#~ "one or more of the letters rwxXstugo.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "<模式>由三部份组成:一个或以上的 ugoa 字母,一个或以上的 +-= 符号,\n"
+#~ "和一个或以上的 rwxXstugo 字母。\n"
#, fuzzy
-#~ msgid "Written by Richard Mlynarik."
-#~ msgstr "Mike Parker、David MacKenzie 和 Jim Meyering"
+#~ msgid "invalid field number: `%s'"
+#~ msgstr "无效的号码 %s"
#, fuzzy
-#~ msgid "cannot change to parent of directory %s"
-#~ msgstr "无法进入目录 %s"
-
-#~ msgid "unable to restore permissions of %s"
-#~ msgstr "无法回复 %s 的权限"
+#~ msgid "invalid field number for file 1: `%s'"
+#~ msgstr "无效的号码 %s"
#, fuzzy
-#~ msgid "invalid number"
+#~ msgid "invalid field number for file 2: `%s'"
#~ msgstr "无效的号码 %s"
-#, fuzzy
-#~ msgid "\\%c: invalid escape"
-#~ msgstr "%s:文件大小无效"
+#~ msgid "closing standard output"
+#~ msgstr "关闭标准输出"
-#~ msgid "program error"
-#~ msgstr "程序错误"
+#~ msgid "%s+%s records in\n"
+#~ msgstr "读入了 %s+%s 个块\n"
-#~ msgid "stack overflow"
-#~ msgstr "堆栈溢出"
+#~ msgid "%s+%s records out\n"
+#~ msgstr "输出了 %s+%s 个块\n"
-#~ msgid " Type"
-#~ msgstr " 类型"
+#~ msgid "truncated records"
+#~ msgstr "个被截断了的块"
#, fuzzy
-#~ msgid "cannot convert time"
-#~ msgstr "stat%s失败"
+#~ msgid "column count too large"
+#~ msgstr "%s:文件过大"
#, fuzzy
-#~ msgid "cannot format time"
-#~ msgstr "stat%s失败"
-
-#~ msgid "cannot change to `..' from directory %s"
-#~ msgstr "无法由目录 %s 进入‘..’"
+#~ msgid "cannot get time of day"
+#~ msgstr "无法设定 %s 的时间标记"
#, fuzzy
-#~ msgid "environment variable, QUOTING_STYLE"
-#~ msgstr "忽略无效的环境变量 QUOTING_STYLE 的变量值:%s"
-
-#~ msgid "Try %s --help' for more information.\n"
-#~ msgstr "请尝试执行‘%s --help’来获取更多信息。\n"
+#~ msgid "%s: number of bytes is large"
+#~ msgstr "参数数目错误"