X-Git-Url: https://git.gag.com/?p=debian%2Ftar;a=blobdiff_plain;f=po%2Fzh_CN.po;h=07b62346f83c927749a5e75f6338bc4e9b4db4d3;hp=a1c7614a2563c927877a066d8230e280e39cdb03;hb=daa269958ad8d50ef8154ccb65e58acaf7a6dd99;hpb=1a44d77d50f4fb37c0410eed04b82303624ea2ec

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a1c7614a..07b62346 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the tar package.
 # Wang Li <charles@linux.net.cn>, 2002.
 # Rongjun Mu <rongjunmu+i18n@gmail.com>, 2004.
-# Ji ZhengYu <zhengyuji@gmail.com>, 2008, 2009, 2010.
+# Ji ZhengYu <zhengyuji@gmail.com>, 2008, 2009, 2010, 2011.
 #
-#: src/create.c:1552
+#: src/create.c:1572
 msgid ""
 msgstr ""
-"Project-Id-Version: tar 1.25\n"
+"Project-Id-Version: tar 1.26\n"
 "Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2011-03-12 11:53+0200\n"
-"PO-Revision-Date: 2010-11-12 09:33+0800\n"
+"POT-Creation-Date: 2013-10-05 23:10+0300\n"
+"PO-Revision-Date: 2011-04-28 20:42+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -31,64 +31,63 @@ msgid "ambiguous argument %s for %s"
 msgstr "%2$s 的参数 %1$s 具有歧义"
 
 #: gnu/argmatch.c:155
-#, c-format
 msgid "Valid arguments are:"
 msgstr "有效的参数为："
 
-#: gnu/argp-help.c:149
+#: gnu/argp-help.c:150
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: %s 的值小于或者等于 %s"
 
-#: gnu/argp-help.c:222
+#: gnu/argp-help.c:223
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: ARGP_HELP_FMT 参数需要一个值"
 
-#: gnu/argp-help.c:228
+#: gnu/argp-help.c:229
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: ARGP_HELP_FMT 参数值必须为正"
 
-#: gnu/argp-help.c:237
+#: gnu/argp-help.c:238
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: 未知的 ARGP_HELP_FMT 参数"
 
-#: gnu/argp-help.c:249
+#: gnu/argp-help.c:250
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "ARGP_HELP_FMT 中的参数错误: %s"
 
-#: gnu/argp-help.c:1248
+#: gnu/argp-help.c:1250
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
 msgstr "长选项和相应短选项具有相同的强制参数或可选参数。"
 
-#: gnu/argp-help.c:1641
+#: gnu/argp-help.c:1643
 msgid "Usage:"
 msgstr "用法:"
 
-#: gnu/argp-help.c:1645
+#: gnu/argp-help.c:1647
 msgid "  or: "
 msgstr " 或: "
 
-#: gnu/argp-help.c:1657
+#: gnu/argp-help.c:1659
 msgid " [OPTION...]"
 msgstr " [选项...]"
 
-#: gnu/argp-help.c:1684
-#, c-format
-msgid "Try `%s --help' or `%s --usage' for more information.\n"
+#: gnu/argp-help.c:1686
+#, fuzzy, c-format
+msgid "Try '%s --help' or '%s --usage' for more information.\n"
 msgstr "请用“%s --help”或“%s --usage”获得更多信息。\n"
 
-#: gnu/argp-help.c:1712
+#: gnu/argp-help.c:1714
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "将错误报告发送到 %s。\n"
 
-#: gnu/argp-help.c:1931 gnu/error.c:183
+#: gnu/argp-help.c:1933 gnu/error.c:190
 msgid "Unknown system error"
 msgstr "未知的系统错误"
 
@@ -100,7 +99,7 @@ msgstr "显示此帮助列表"
 msgid "give a short usage message"
 msgstr "显示简短的用法说明"
 
-#: gnu/argp-parse.c:85 src/tar.c:489 src/tar.c:491 src/tar.c:560
+#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606
 #: tests/genfile.c:130
 msgid "NAME"
 msgstr "名称"
@@ -121,17 +120,16 @@ msgstr "挂起 SECS 秒(默认 3600)"
 msgid "print program version"
 msgstr "打印程序版本"
 
-#: gnu/argp-parse.c:160
-#, c-format
+#: gnu/argp-parse.c:161
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(程序错误)未知版本！？"
 
-#: gnu/argp-parse.c:613
+#: gnu/argp-parse.c:614
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s：参数太多\n"
 
-#: gnu/argp-parse.c:756
+#: gnu/argp-parse.c:757
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(程序错误)选项可否被识别！？"
 
@@ -139,62 +137,62 @@ msgstr "(程序错误)选项可否被识别！？"
 msgid "write error"
 msgstr "写错误"
 
-#: gnu/getopt.c:529 gnu/getopt.c:545
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: gnu/getopt.c:549 gnu/getopt.c:578
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
 msgstr "%s: 选项\"%s\"具有歧义\n"
 
-#: gnu/getopt.c:578 gnu/getopt.c:582
+#: gnu/getopt.c:626 gnu/getopt.c:630
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: 选项\"--%s\"不需要参数\n"
 
-#: gnu/getopt.c:591 gnu/getopt.c:596
+#: gnu/getopt.c:639 gnu/getopt.c:644
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: 选项\"%c%s\"不需要参数\n"
 
-#: gnu/getopt.c:639 gnu/getopt.c:658
+#: gnu/getopt.c:687 gnu/getopt.c:706
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: 选项\"%s\"需要带参数\n"
 
-#: gnu/getopt.c:696 gnu/getopt.c:699
+#: gnu/getopt.c:744 gnu/getopt.c:747
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: 无法识别的选项\"--%s\"\n"
 
-#: gnu/getopt.c:707 gnu/getopt.c:710
+#: gnu/getopt.c:755 gnu/getopt.c:758
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: 无法识别的选项\"%c%s\"\n"
 
-#: gnu/getopt.c:759 gnu/getopt.c:762
+#: gnu/getopt.c:807 gnu/getopt.c:810
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: 无效选项 -- \"%c\"\n"
 
-#: gnu/getopt.c:812 gnu/getopt.c:829 gnu/getopt.c:1037 gnu/getopt.c:1055
+#: gnu/getopt.c:863 gnu/getopt.c:880 gnu/getopt.c:1090 gnu/getopt.c:1108
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: 选项需要参数 -- \"%c\"\n"
 
-#: gnu/getopt.c:885 gnu/getopt.c:901
+#: gnu/getopt.c:936 gnu/getopt.c:952
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: 选项\"-W %s\"具有歧义\n"
 
-#: gnu/getopt.c:925 gnu/getopt.c:943
+#: gnu/getopt.c:976 gnu/getopt.c:994
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: 选项\"-W %s\"不要参数\n"
 
-#: gnu/getopt.c:964 gnu/getopt.c:982
+#: gnu/getopt.c:1015 gnu/getopt.c:1033
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: 选项\"%s\"需要带参数\n"
 
-#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36
+#: gnu/obstack.c:415 gnu/obstack.c:417 gnu/xalloc-die.c:36
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
@@ -210,28 +208,30 @@ 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, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. 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 the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnu/quotearg.c:273
+#: gnu/quotearg.c:314
 msgid "`"
 msgstr "“"
 
-#: gnu/quotearg.c:274
+#: gnu/quotearg.c:315
 msgid "'"
 msgstr "”"
 
@@ -241,7 +241,7 @@ msgstr "”"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^yesexpr='
-#: gnu/rpmatch.c:149
+#: gnu/rpmatch.c:152
 msgid "^[yY]"
 msgstr "^[yY]"
 
@@ -251,7 +251,7 @@ msgstr "^[yY]"
 #. To enquire the regular expression that your system uses for this
 #. purpose, you can use the command
 #. locale -k LC_MESSAGES | grep '^noexpr='
-#: gnu/rpmatch.c:162
+#: gnu/rpmatch.c:165
 msgid "^[nN]"
 msgstr "^[nN]"
 
@@ -532,7 +532,12 @@ msgstr "标准输出"
 msgid "Cannot connect to %s: resolve failed"
 msgstr "无法连接至 %s: 解析失败"
 
-#: lib/rtapelib.c:515
+#: lib/rtapelib.c:502
+#, fuzzy, c-format
+msgid "Cannot redirect files for remote shell"
+msgstr "无法执行远程 shell"
+
+#: lib/rtapelib.c:516
 #, c-format
 msgid "Cannot execute remote shell"
 msgstr "无法执行远程 shell"
@@ -581,8 +586,8 @@ msgstr "参数异常"
 msgid "Manipulate a tape drive, accepting commands from a remote process"
 msgstr "接受远程程序的命令操作磁带机"
 
-#: rmt/rmt.c:696 src/tar.c:424 src/tar.c:428 src/tar.c:558 src/tar.c:573
-#: src/tar.c:704 src/tar.c:742 tests/genfile.c:166
+#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619
+#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166
 msgid "NUMBER"
 msgstr "NUMBER"
 
@@ -590,8 +595,8 @@ msgstr "NUMBER"
 msgid "set debug level"
 msgstr "设定调试级别"
 
-#: rmt/rmt.c:698 src/tar.c:422 src/tar.c:563 src/tar.c:639 src/tar.c:643
-#: src/tar.c:655 src/tar.c:665 src/tar.c:668 src/tar.c:670 src/tar.c:759
+#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689
+#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805
 #: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184
 #: tests/genfile.c:187 tests/genfile.c:193
 msgid "FILE"
@@ -606,7 +611,7 @@ msgstr "设定调试输出文件名"
 msgid "cannot open %s"
 msgstr "无法打开 %s"
 
-#: rmt/rmt.c:780 tests/genfile.c:884 tests/genfile.c:901
+#: rmt/rmt.c:780 tests/genfile.c:892 tests/genfile.c:909
 #, c-format
 msgid "too many arguments"
 msgstr "参数过多"
@@ -615,9 +620,9 @@ msgstr "参数过多"
 msgid "Garbage command"
 msgstr "垃圾命令"
 
-#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1321
-#: src/buffer.c:1367 src/buffer.c:1396 src/delete.c:211 src/list.c:245
-#: src/update.c:200
+#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322
+#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244
+#: src/update.c:188
 msgid "This does not look like a tar archive"
 msgstr "它似乎不像是一个 tar 归档文件"
 
@@ -655,61 +660,61 @@ msgstr "无法验证标准输入/标准输出归档文件"
 msgid "Archive is compressed. Use %s option"
 msgstr "归档被压缩。使用 %s 选项"
 
-#: src/buffer.c:760 src/tar.c:2448
+#: src/buffer.c:761 src/tar.c:2459
 msgid "Cannot update compressed archives"
 msgstr "无法更新压缩归档文件"
 
-#: src/buffer.c:853
+#: src/buffer.c:854
 msgid "At beginning of tape, quitting now"
 msgstr "处于磁带的起点，现在退出"
 
-#: src/buffer.c:859
+#: src/buffer.c:860
 msgid "Too many errors, quitting"
 msgstr "错误过多，退出"
 
-#: src/buffer.c:892
+#: src/buffer.c:893
 #, c-format
 msgid "Record size = %lu block"
 msgid_plural "Record size = %lu blocks"
 msgstr[0] "记录大小 = %lu 块"
 
-#: src/buffer.c:913
+#: src/buffer.c:914
 #, c-format
 msgid "Unaligned block (%lu byte) in archive"
 msgid_plural "Unaligned block (%lu bytes) in archive"
 msgstr[0] "归档中未对齐的块 (%lu 字节)s"
 
-#: src/buffer.c:990
+#: src/buffer.c:991
 msgid "Cannot backspace archive file; it may be unreadable without -i"
 msgstr "无法倒回归档文件；如果没有 -i 可能无法读入它"
 
-#: src/buffer.c:1022
+#: src/buffer.c:1023
 msgid "rmtlseek not stopped at a record boundary"
 msgstr "rmtlseek 未停在记录边界处"
 
-#: src/buffer.c:1073
+#: src/buffer.c:1074
 #, c-format
 msgid "%s: contains invalid volume number"
 msgstr "%s：包含无效的卷编号"
 
-#: src/buffer.c:1108
+#: src/buffer.c:1109
 msgid "Volume number overflow"
 msgstr "卷编号溢出"
 
-#: src/buffer.c:1123
+#: src/buffer.c:1124
 #, c-format
 msgid "Prepare volume #%d for %s and hit return: "
 msgstr "为 %2$s 准备卷 #%1$d 并按回车："
 
-#: src/buffer.c:1129
+#: src/buffer.c:1130
 msgid "EOF where user reply was expected"
 msgstr "需得到用户应答时文件结束"
 
-#: src/buffer.c:1134 src/buffer.c:1166
+#: src/buffer.c:1135 src/buffer.c:1167
 msgid "WARNING: Archive is incomplete"
 msgstr "警告：归档文件不完整"
 
-#: src/buffer.c:1148
+#: src/buffer.c:1149
 #, c-format
 msgid ""
 " n name        Give a new file name for the next (and subsequent) volume(s)\n"
@@ -720,621 +725,662 @@ msgstr ""
 " q\t\t终止 tar\n"
 " y or newline\t继续操作\n"
 
-#: src/buffer.c:1153
+#: src/buffer.c:1154
 #, c-format
 msgid " !             Spawn a subshell\n"
 msgstr " !             衍生出一个子 shell\n"
 
-#: src/buffer.c:1154
+#: src/buffer.c:1155
 #, c-format
 msgid " ?             Print this list\n"
 msgstr " ?             打印此列表\n"
 
-#: src/buffer.c:1161
+#: src/buffer.c:1162
 msgid "No new volume; exiting.\n"
 msgstr "没有新的卷；退出。\n"
 
-#: src/buffer.c:1194
+#: src/buffer.c:1195
 msgid "File name not specified. Try again.\n"
 msgstr "未指定文件名。重试。\n"
 
-#: src/buffer.c:1207
+#: src/buffer.c:1208
 #, c-format
 msgid "Invalid input. Type ? for help.\n"
 msgstr "无效输入。输入 ? 显示帮助。\n"
 
-#: src/buffer.c:1258
+#: src/buffer.c:1259
 #, c-format
 msgid "%s command failed"
 msgstr "%s 命令失败"
 
-#: src/buffer.c:1439
+#: src/buffer.c:1440
 #, c-format
 msgid "%s is possibly continued on this volume: header contains truncated name"
 msgstr "%s 在本卷可能连续: 头部包含截短的名字"
 
-#: src/buffer.c:1443
+#: src/buffer.c:1444
 #, c-format
 msgid "%s is not continued on this volume"
 msgstr "%s 在本卷中不连续"
 
-#: src/buffer.c:1457
+#: src/buffer.c:1458
 #, c-format
 msgid "%s is the wrong size (%s != %s + %s)"
 msgstr "%s 的大小错误 (%s != %s + %s)"
 
-#: src/buffer.c:1472
+#: src/buffer.c:1473
 #, c-format
 msgid "This volume is out of sequence (%s - %s != %s)"
 msgstr "此卷次序有误（%s - %s != %s）"
 
-#: src/buffer.c:1550 src/buffer.c:1576
+#: src/buffer.c:1551 src/buffer.c:1577
 #, c-format
 msgid "Archive not labeled to match %s"
 msgstr "归档未被标记为匹配 %s"
 
-#: src/buffer.c:1580
+#: src/buffer.c:1581
 #, c-format
 msgid "Volume %s does not match %s"
 msgstr "卷标 %s 不匹配 %s"
 
-#: src/buffer.c:1674
+#: src/buffer.c:1675
 #, c-format
 msgid ""
 "%s: file name too long to be stored in a GNU multivolume header, truncated"
 msgstr "%s: 文件名太长而无法贮存在 GNU 多卷头，已被截短"
 
-#: src/buffer.c:1865
+#: src/buffer.c:1866
 msgid "write did not end on a block boundary"
 msgstr "写操作未在记录边界处终止"
 
-#: src/compare.c:95
+#: src/compare.c:96
 #, c-format
 msgid "Could only read %lu of %lu byte"
 msgid_plural "Could only read %lu of %lu bytes"
 msgstr[0] "仅能读入 %2$lu 中的 %1$lu 个字节"
 
-#: src/compare.c:105 src/compare.c:383
+#: src/compare.c:106 src/compare.c:388
 msgid "Contents differ"
 msgstr "内容不同"
 
-#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456
-#: src/list.c:1388 src/xheader.c:711
+#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458
+#: src/list.c:1394 src/xheader.c:836
 msgid "Unexpected EOF in archive"
 msgstr "归档文件中异常的 EOF"
 
-#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407
+#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412
 msgid "File type differs"
 msgstr "文件类型不同"
 
-#: src/compare.c:182 src/compare.c:202 src/compare.c:323
+#: src/compare.c:183 src/compare.c:203 src/compare.c:324
 msgid "Mode differs"
 msgstr "访问模式不同"
 
-#: src/compare.c:205
+#: src/compare.c:206
 msgid "Uid differs"
 msgstr "Uid 不同"
 
-#: src/compare.c:207
+#: src/compare.c:208
 msgid "Gid differs"
 msgstr "Gid 不同"
 
-#: src/compare.c:211
+#: src/compare.c:212
 msgid "Mod time differs"
 msgstr "修改时间不同"
 
-#: src/compare.c:215 src/compare.c:415
+#: src/compare.c:216 src/compare.c:422
 msgid "Size differs"
 msgstr "大小不同"
 
-#: src/compare.c:264
+#: src/compare.c:265
 #, c-format
 msgid "Not linked to %s"
 msgstr "没有连接到 %s"
 
-#: src/compare.c:288
+#: src/compare.c:289
 msgid "Symlink differs"
 msgstr "符号连接不同"
 
-#: src/compare.c:317
+#: src/compare.c:318
 msgid "Device number differs"
 msgstr "设备号不同"
 
-#: src/compare.c:457
+#: src/compare.c:464
 #, c-format
 msgid "Verify "
 msgstr "校验"
 
-#: src/compare.c:464
-#, c-format
-msgid "%s: Unknown file type `%c', diffed as normal file"
+#: src/compare.c:471
+#, fuzzy, c-format
+msgid "%s: Unknown file type '%c', diffed as normal file"
 msgstr "%s：未知的文件类型“%c”，与普通文件不同"
 
-#: src/compare.c:520
+#: src/compare.c:527
 msgid "Archive contains file names with leading prefixes removed."
 msgstr "归档包含带有被移除前导字符的文件名。"
 
-#: src/compare.c:526
-#, fuzzy
+#: src/compare.c:533
 msgid "Archive contains transformed file names."
-msgstr "归档包含过时的 base-64 头"
+msgstr "归档中有文件被改名。"
 
-#: src/compare.c:531
+#: src/compare.c:538
 msgid "Verification may fail to locate original files."
 msgstr "位于原始文件中的验证可能失败。"
 
-#: src/compare.c:603
+#: src/compare.c:612
 #, c-format
 msgid "VERIFY FAILURE: %d invalid header detected"
 msgid_plural "VERIFY FAILURE: %d invalid headers detected"
 msgstr[0] "校验失败：检测到 %d 个无效的头"
 
-#: src/compare.c:621 src/list.c:222
+#: src/compare.c:630 src/list.c:221
 #, c-format
 msgid "A lone zero block at %s"
 msgstr "在 %s 处一个单独的零块"
 
-#: src/create.c:72
+#: src/create.c:73
 #, c-format
 msgid "%s: contains a cache directory tag %s; %s"
 msgstr "%s: 包含一个缓存目录标识 %s；%s"
 
-#: src/create.c:261
+#: src/create.c:262
 #, c-format
 msgid "value %s out of %s range %s..%s; substituting %s"
 msgstr "值 %s 超出了 %s 的范围 %s..%s；正在替换 %s"
 
-#: src/create.c:267
+#: src/create.c:268
 #, c-format
 msgid "value %s out of %s range %s..%s"
 msgstr "值 %s 超出了 %s 的范围 %s..%s"
 
-#: src/create.c:327
+#: src/create.c:328
 msgid "Generating negative octal headers"
 msgstr "正在生成负八进制头"
 
-#: src/create.c:612 src/create.c:675
+#: src/create.c:601 src/create.c:664
 #, c-format
 msgid "%s: file name is too long (max %d); not dumped"
 msgstr "%s：文件名太长(最长 %d)；未输出"
 
-#: src/create.c:622
+#: src/create.c:611
 #, c-format
 msgid "%s: file name is too long (cannot be split); not dumped"
 msgstr "%s：文件名太长(不能被分割)；未输出"
 
-#: src/create.c:649
+#: src/create.c:638
 #, c-format
 msgid "%s: link name is too long; not dumped"
 msgstr "%s：连接名太长；未输出"
 
-#: src/create.c:1064
+#: src/create.c:1084
 #, c-format
 msgid "%s: File shrank by %s byte; padding with zeros"
 msgid_plural "%s: File shrank by %s bytes; padding with zeros"
 msgstr[0] "%s：文件缩小 %s 字节；用零填充"
 
-#: src/create.c:1160
+#: src/create.c:1180
 #, c-format
 msgid "%s: file is on a different filesystem; not dumped"
 msgstr "%s：文件在不同的文件系统上；未输出"
 
-#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584
+#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617
 msgid "contents not dumped"
 msgstr "未输出内容"
 
-#: src/create.c:1418
+#: src/create.c:1438
 #, c-format
 msgid "%s: Unknown file type; file ignored"
 msgstr "%s：未知的文件类型；忽略文件"
 
-#: src/create.c:1529
+#: src/create.c:1549
 #, c-format
 msgid "Missing links to %s."
 msgstr "缺少到 %s 的连接。"
 
-#: src/create.c:1690
+#: src/create.c:1710
 #, c-format
 msgid "%s: file is unchanged; not dumped"
 msgstr "%s: 文件未改变；未输出"
 
-#: src/create.c:1699
+#: src/create.c:1719
 #, c-format
 msgid "%s: file is the archive; not dumped"
 msgstr "%s: 文件是归档文件；未输出"
 
-#: src/create.c:1723 src/incremen.c:571
+#: src/create.c:1747 src/incremen.c:603
 msgid "directory not dumped"
 msgstr "未输出目录"
 
-#: src/create.c:1795
+#: src/create.c:1819
 #, c-format
 msgid "%s: file changed as we read it"
 msgstr "%s: 在我们读入文件时文件发生了变化"
 
-#: src/create.c:1858
+#: src/create.c:1900
 #, c-format
 msgid "%s: socket ignored"
 msgstr "%s: 忽略套接字(socket)"
 
-#: src/create.c:1864
+#: src/create.c:1906
 #, c-format
 msgid "%s: door ignored"
 msgstr "%s: 忽略权限"
 
-#: src/delete.c:217 src/list.c:259 src/update.c:205
+#: src/delete.c:218 src/list.c:258 src/update.c:193
 msgid "Skipping to next header"
 msgstr "跳转到下一个头"
 
-#: src/delete.c:283
+#: src/delete.c:284
 msgid "Deleting non-header from archive"
 msgstr "从归档文件中删除非头信息"
 
-#: src/extract.c:277
+#: src/extract.c:302
 #, c-format
 msgid "%s: implausibly old time stamp %s"
 msgstr "%s：不可信的旧时间戳 %s"
 
-#: src/extract.c:295
+#: src/extract.c:320
 #, c-format
 msgid "%s: time stamp %s is %s s in the future"
 msgstr "%s：时间戳 %s 是未来的 %s 秒之后"
 
-#: src/extract.c:475
+#: src/extract.c:536
 #, c-format
 msgid "%s: Unexpected inconsistency when making directory"
 msgstr "%s：创建目录时出现意外的不一致"
 
-#: src/extract.c:721
+#: src/extract.c:705
+#, c-format
+msgid "%s: skipping existing file"
+msgstr ""
+
+#: src/extract.c:821
 #, c-format
 msgid "%s: Directory renamed before its status could be extracted"
 msgstr "%s：目录名在状态信息被获取之前改变了"
 
-#: src/extract.c:875
+#: src/extract.c:1010
 msgid "Extracting contiguous files as regular files"
 msgstr "展开紧邻的文件为普通文件"
 
-#: src/extract.c:1209
+#: src/extract.c:1365
 msgid "Attempting extraction of symbolic links as hard links"
 msgstr "正试图将符号连接展开为硬连接"
 
-#: src/extract.c:1365
+#: src/extract.c:1528
 #, c-format
 msgid "%s: Cannot extract -- file is continued from another volume"
 msgstr "%s：无法展开 -- 文件一直延伸至另一卷中"
 
-#: src/extract.c:1372 src/list.c:1121
+#: src/extract.c:1535 src/list.c:1135
 msgid "Unexpected long name header"
 msgstr "异常的长名字头部"
 
-#: src/extract.c:1379
-#, c-format
-msgid "%s: Unknown file type `%c', extracted as normal file"
+#: src/extract.c:1542
+#, fuzzy, c-format
+msgid "%s: Unknown file type '%c', extracted as normal file"
 msgstr "%s：未知的文件类型“%c”，作为普通文件展开"
 
-#: src/extract.c:1405
+#: src/extract.c:1568
 #, c-format
 msgid "Current %s is newer or same age"
 msgstr "当前的“%s”更新或一样新"
 
-#: src/extract.c:1457
+#: src/extract.c:1620
 #, c-format
 msgid "%s: Was unable to backup this file"
 msgstr "%s：无法备份该文件"
 
-#: src/extract.c:1594
+#: src/extract.c:1767
 #, c-format
 msgid "Cannot rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"
 
-#: src/incremen.c:473 src/incremen.c:517
+#: src/incremen.c:494 src/incremen.c:536
 #, c-format
 msgid "%s: Directory has been renamed from %s"
 msgstr "%s：目录已改名，不再是 %s"
 
-#: src/incremen.c:485
-#, c-format
-msgid "%s: Directory has been renamed"
-msgstr "%s：目录已被改名"
-
-#: src/incremen.c:530
+#: src/incremen.c:549
 #, c-format
 msgid "%s: Directory is new"
 msgstr "%s：目录是新的"
 
-#: src/incremen.c:951 src/incremen.c:968
+#: src/incremen.c:566
+#, fuzzy, c-format
+msgid "%s: directory is on a different filesystem; not dumped"
+msgstr "%s：文件在不同的文件系统上；未输出"
+
+#: src/incremen.c:587
+#, c-format
+msgid "%s: Directory has been renamed"
+msgstr "%s：目录已被改名"
+
+#: src/incremen.c:1001 src/incremen.c:1016
 msgid "Invalid time stamp"
 msgstr "无效的时间戳"
 
-#: src/incremen.c:1007
-msgid "Invalid modification time (seconds)"
+#: src/incremen.c:1045
+#, fuzzy
+msgid "Invalid modification time"
 msgstr "无效的修改时间(秒)"
 
-#: src/incremen.c:1022
+#: src/incremen.c:1055
 msgid "Invalid modification time (nanoseconds)"
 msgstr "无效的修改时间(纳秒)"
 
-#: src/incremen.c:1042
+#: src/incremen.c:1071
 msgid "Invalid device number"
 msgstr "无效的设备号"
 
-#: src/incremen.c:1057
+#: src/incremen.c:1079
 msgid "Invalid inode number"
 msgstr "无效的 inode 号"
 
-#: src/incremen.c:1108 src/incremen.c:1145
-msgid "Field too long while reading snapshot file"
-msgstr "读取目录文件时字段太长"
-
-#: src/incremen.c:1115 src/incremen.c:1153
-msgid "Read error in snapshot file"
-msgstr "目录文件读取错误"
+#: src/incremen.c:1135
+#, c-format
+msgid "%s: byte %s: %s %.*s... too long"
+msgstr ""
 
-#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209
-#: src/incremen.c:1267
+#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268
 msgid "Unexpected EOF in snapshot file"
 msgstr "目录文件中异常的文件结尾(EOF)"
 
-#: src/incremen.c:1124 src/incremen.c:1164
-msgid "Unexpected field value in snapshot file"
-msgstr "目录文件中异常的字段值"
+#: src/incremen.c:1157
+#, c-format
+msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x"
+msgstr ""
+
+#: src/incremen.c:1169
+#, c-format
+msgid ""
+"%s: byte %s: (valid range %s..%s)\n"
+"\t%s %s"
+msgstr ""
+
+#: src/incremen.c:1176
+#, c-format
+msgid "%s: byte %s: %s %s"
+msgstr ""
+
+#: src/incremen.c:1257
+#, c-format
+msgid "%s: byte %s: %s"
+msgstr ""
 
-#: src/incremen.c:1259
+#: src/incremen.c:1260
 msgid "Missing record terminator"
 msgstr "缺少记录终止符"
 
-#: src/incremen.c:1320 src/incremen.c:1323
+#: src/incremen.c:1366 src/incremen.c:1369
 msgid "Bad incremental file format"
 msgstr "文件格式错误增量"
 
-#: src/incremen.c:1342
+#: src/incremen.c:1388
 #, c-format
 msgid "Unsupported incremental format version: %<PRIuMAX>"
 msgstr "不支持增量格式版本: %<PRIuMAX>"
 
-#: src/incremen.c:1496
+#: src/incremen.c:1543
 #, c-format
 msgid "Malformed dumpdir: expected '%c' but found %#3o"
 msgstr "错误的 dumpdir: 需要“%c”但实际为 %#3o"
 
-#: src/incremen.c:1506
+#: src/incremen.c:1553
 msgid "Malformed dumpdir: 'X' duplicated"
 msgstr "错误的 dumpdir: 重复的“X”"
 
-#: src/incremen.c:1519
+#: src/incremen.c:1566
 msgid "Malformed dumpdir: empty name in 'R'"
 msgstr "错误的 dumpdir: “R”中有空名字"
 
-#: src/incremen.c:1532
+#: src/incremen.c:1579
 msgid "Malformed dumpdir: 'T' not preceeded by 'R'"
 msgstr "错误的 dumpdir: “R”后未紧接着用“T”"
 
-#: src/incremen.c:1538
+#: src/incremen.c:1585
 msgid "Malformed dumpdir: empty name in 'T'"
 msgstr "错误的 dumpdir: “T”中有空名字"
 
-#: src/incremen.c:1558
+#: src/incremen.c:1605
 #, c-format
 msgid "Malformed dumpdir: expected '%c' but found end of data"
 msgstr "错误的 dumpdir: 需要“%c”但实际为数据结尾"
 
-#: src/incremen.c:1565
+#: src/incremen.c:1612
 msgid "Malformed dumpdir: 'X' never used"
 msgstr "错误的 dumpdir: 从未用过“X”"
 
-#: src/incremen.c:1609
+#: src/incremen.c:1656
 #, c-format
 msgid "Cannot create temporary directory using template %s"
 msgstr "无法通过模板 %s 创建临时目录"
 
-#: src/incremen.c:1670
+#: src/incremen.c:1717
 #, c-format
 msgid "%s: Not purging directory: unable to stat"
 msgstr "%s：未清除目录：无法 stat"
 
-#: src/incremen.c:1683
+#: src/incremen.c:1730
 #, c-format
 msgid "%s: directory is on a different device: not purging"
 msgstr "%s: 目录在不同的设备上: 未清除"
 
-#: src/incremen.c:1691
+#: src/incremen.c:1738
 #, c-format
 msgid "%s: Deleting %s\n"
 msgstr "%s：正在删除 %s\n"
 
-#: src/incremen.c:1696
+#: src/incremen.c:1743
 #, c-format
 msgid "%s: Cannot remove"
 msgstr "%s：无法删除"
 
-#: src/list.c:190
+#: src/list.c:189
 #, c-format
 msgid "%s: Omitting"
 msgstr "%s：忽略"
 
-#: src/list.c:207
+#: src/list.c:206
 #, c-format
 msgid "block %s: ** Block of NULs **\n"
 msgstr "块 %s：** 空块 **\n"
 
-#: src/list.c:233
+#: src/list.c:232
 #, c-format
 msgid "block %s: ** End of File **\n"
 msgstr "块 %s：** 文件结束 **\n"
 
-#: src/list.c:256 src/list.c:1093 src/list.c:1356
+#: src/list.c:255 src/list.c:1107 src/list.c:1362
 #, c-format
 msgid "block %s: "
 msgstr "块 %s："
 
 #. TRANSLATORS: %s is type of the value (gid_t, uid_t,
 #. etc.)
-#: src/list.c:708
+#: src/list.c:722
 #, c-format
 msgid "Blanks in header where numeric %s value expected"
 msgstr "头中需要数值 %s 处为空白符"
 
 #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:763
+#: src/list.c:777
 #, c-format
 msgid "Archive octal value %.*s is out of %s range; assuming two's complement"
 msgstr "归档的八进制值 %.*s 超出范围 %s；假定为其二进制补码"
 
 #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:774
+#: src/list.c:788
 #, c-format
 msgid "Archive octal value %.*s is out of %s range"
 msgstr "归档八进制值 %.*s 超出 %s 的范围"
 
-#: src/list.c:795
+#: src/list.c:809
 msgid "Archive contains obsolescent base-64 headers"
 msgstr "归档包含过时的 base-64 头"
 
-#: src/list.c:809
+#: src/list.c:823
 #, c-format
 msgid "Archive signed base-64 string %s is out of %s range"
 msgstr "归档签署的 base-64 字符串 %s 超出范围 %s"
 
-#: src/list.c:840
+#: src/list.c:854
 #, c-format
 msgid "Archive base-256 value is out of %s range"
 msgstr "归档的 base-256 值超出范围 %s"
 
 #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.)
-#: src/list.c:869
+#: src/list.c:883
 #, c-format
 msgid "Archive contains %.*s where numeric %s value expected"
 msgstr "归档包含 %.*s 而需要数字值 %s"
 
 #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.)
-#: src/list.c:891
+#: src/list.c:905
 #, c-format
 msgid "Archive value %s is out of %s range %s..%s"
 msgstr "归档值 %s 超出 %s 的范围 %s..%s"
 
-#: src/list.c:1257
+#: src/list.c:1262
 #, c-format
 msgid " link to %s\n"
 msgstr " 连接到 %s\n"
 
-#: src/list.c:1265
+#: src/list.c:1270
 #, c-format
 msgid " unknown file type %s\n"
 msgstr " 未知的文件类型 %s\n"
 
-#: src/list.c:1283
+#: src/list.c:1288
 #, c-format
 msgid "--Long Link--\n"
 msgstr "--长连接--\n"
 
-#: src/list.c:1287
+#: src/list.c:1292
 #, c-format
 msgid "--Long Name--\n"
 msgstr "--长名--\n"
 
-#: src/list.c:1291
+#: src/list.c:1296
 #, c-format
 msgid "--Volume Header--\n"
 msgstr "--卷头--\n"
 
-#: src/list.c:1299
+#: src/list.c:1304
 #, c-format
 msgid "--Continued at byte %s--\n"
 msgstr "--从 %s 字节继续--\n"
 
-#: src/list.c:1361
+#: src/list.c:1367
 msgid "Creating directory:"
 msgstr "正在创建目录："
 
-#: src/misc.c:297
-msgid "Cannot get working directory"
-msgstr "无法获取工作目录"
-
-#: src/misc.c:570
+#: src/misc.c:721
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "将 %s 改名为 %s\n"
 
-#: src/misc.c:579 src/misc.c:598
+#: src/misc.c:730 src/misc.c:749
 #, c-format
 msgid "%s: Cannot rename to %s"
 msgstr "%s：无法重命名为 %s"
 
-#: src/misc.c:603
+#: src/misc.c:754
 #, c-format
 msgid "Renaming %s back to %s\n"
 msgstr "将 %s 的名字改回 %s\n"
 
-#: src/misc.c:850
+#: src/misc.c:1093
 #, c-format
 msgid "%s: File removed before we read it"
 msgstr "%s：文件在我们读入之前被删除了"
 
-#: src/misc.c:871
+#: src/misc.c:1114
 msgid "child process"
 msgstr "子进程"
 
-#: src/misc.c:880
+#: src/misc.c:1123
 msgid "interprocess channel"
 msgstr "进程内通道"
 
-#: src/names.c:590
+#: src/names.c:360
+#, fuzzy
+msgid "command line"
+msgstr "%s 命令失败"
+
+#: src/names.c:378
+#, fuzzy, c-format
+msgid "%s: file list requested from %s already read from %s"
+msgstr "%s: 文件列表已经读取"
+
+#: src/names.c:448
+#, fuzzy, c-format
+msgid "cannot split string '%s': %s"
+msgstr "无法设定“%s”的时间"
+
+#: src/names.c:490
+#, c-format
+msgid "%s: file name read contains nul character"
+msgstr "%s: 读取的文件名含有空字符"
+
+#: src/names.c:821
 msgid "Pattern matching characters used in file names"
 msgstr "文件名中所使用的字符匹配模式"
 
-#: src/names.c:592
+#: src/names.c:823
 msgid ""
 "Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
 "this warning"
 msgstr "使用 --wildcards 打开模式匹配，或是 --no-wildcards 来关闭之"
 
-#: src/names.c:610 src/names.c:626
+#: src/names.c:841 src/names.c:857
 #, c-format
 msgid "%s: Not found in archive"
 msgstr "%s：归档中找不到"
 
-#: src/names.c:611
+#: src/names.c:842
 #, c-format
 msgid "%s: Required occurrence not found in archive"
 msgstr "%s：没有在归档中找到需要的"
 
-#: src/names.c:645
+#: src/names.c:876
 #, c-format
 msgid "Archive label mismatch"
 msgstr "归档卷标不匹配"
 
-#: src/names.c:949
+#: src/names.c:1180
 msgid ""
 "Using -C option inside file list is not allowed with --listed-incremental"
 msgstr "在文件列表中 -C 选项与 --listed-incremental 选项不许合用"
 
-#: src/names.c:955
+#: src/names.c:1186
 msgid "Only one -C option is allowed with --listed-incremental"
 msgstr "仅一个 -C 选项允许与  --listed-incremental 合用"
 
-#: src/tar.c:81
-#, c-format
-msgid "Options `-%s' and `-%s' both want standard input"
+#: src/tar.c:86
+#, fuzzy, c-format
+msgid "Options '-%s' and '-%s' both want standard input"
 msgstr "选项“-%s”和“-%s”都需要标准输出"
 
-#: src/tar.c:158
+#: src/tar.c:163
 #, c-format
 msgid "%s: Invalid archive format"
 msgstr "%s：无效的归档格式"
 
-#: src/tar.c:182
+#: src/tar.c:187
 msgid "GNU features wanted on incompatible archive format"
 msgstr "在不兼容的归档格式上需要 GNU 特征"
 
-#: src/tar.c:250
-#, c-format
+#: src/tar.c:255
+#, fuzzy, c-format
 msgid ""
-"Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list."
+"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
 msgstr "未知的引用形式‘%s’。尝试用‘%s --quoting-style=help’获取列表。"
 
-#: src/tar.c:348
+#: src/tar.c:364
+#, fuzzy
 msgid ""
-"GNU `tar' saves many files together into a single tape or disk archive, and "
+"GNU 'tar' saves many files together into a single tape or disk archive, and "
 "can restore individual files from the archive.\n"
 "\n"
 "Examples:\n"
@@ -1352,9 +1398,10 @@ msgstr ""
 "件。\n"
 "  tar -xf archive.tar          # 展开归档文件 archive.tar 中的所有文件。\n"
 
-#: src/tar.c:357
+#: src/tar.c:373
+#, fuzzy
 msgid ""
-"The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
+"The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
 "The version control may be set with --backup or VERSION_CONTROL, values "
 "are:\n"
 "\n"
@@ -1371,79 +1418,79 @@ msgstr ""
 "  nil, existing   如果编号备份存在则进行编号备份，否则进行简单备份\n"
 "  never, simple   总是使用简单备份\n"
 
-#: src/tar.c:387
+#: src/tar.c:403
 msgid "Main operation mode:"
 msgstr "主操作模式:"
 
-#: src/tar.c:390
+#: src/tar.c:406
 msgid "list the contents of an archive"
 msgstr "列出归档内容"
 
-#: src/tar.c:392
+#: src/tar.c:408
 msgid "extract files from an archive"
 msgstr "从归档中解出文件"
 
-#: src/tar.c:395
+#: src/tar.c:411
 msgid "create a new archive"
 msgstr "创建一个新归档"
 
-#: src/tar.c:397
+#: src/tar.c:413
 msgid "find differences between archive and file system"
 msgstr "找出归档和文件系统的差异"
 
-#: src/tar.c:400
+#: src/tar.c:416
 msgid "append files to the end of an archive"
 msgstr "追加文件至归档结尾"
 
-#: src/tar.c:402
+#: src/tar.c:418
 msgid "only append files newer than copy in archive"
 msgstr "仅追加比归档中副本更新的文件"
 
-#: src/tar.c:404
+#: src/tar.c:420
 msgid "append tar files to an archive"
 msgstr "追加 tar 文件至归档"
 
-#: src/tar.c:407
+#: src/tar.c:423
 msgid "delete from the archive (not on mag tapes!)"
 msgstr "从归档(非磁带！)中删除"
 
-#: src/tar.c:409
+#: src/tar.c:425
 msgid "test the archive volume label and exit"
 msgstr "测试归档卷标并退出"
 
-#: src/tar.c:414
+#: src/tar.c:430
 msgid "Operation modifiers:"
 msgstr "操作修饰符:"
 
-#: src/tar.c:417
+#: src/tar.c:433
 msgid "handle sparse files efficiently"
 msgstr "高效处理离散文件"
 
-#: src/tar.c:418
+#: src/tar.c:434
 msgid "MAJOR[.MINOR]"
 msgstr "MAJOR[.MINOR]"
 
-#: src/tar.c:419
+#: src/tar.c:435
 msgid "set version of the sparse format to use (implies --sparse)"
 msgstr "设置所用的离散格式版本(隐含 --sparse)"
 
-#: src/tar.c:421
+#: src/tar.c:437
 msgid "handle old GNU-format incremental backup"
 msgstr "处理老式的 GNU 格式的增量备份"
 
-#: src/tar.c:423
+#: src/tar.c:439
 msgid "handle new GNU-format incremental backup"
 msgstr "处理新式的 GNU 格式的增量备份"
 
-#: src/tar.c:425
+#: src/tar.c:441
 msgid "dump level for created listed-incremental archive"
 msgstr "所创建的增量列表归档的输出级别"
 
-#: src/tar.c:427
+#: src/tar.c:443
 msgid "do not exit with nonzero on unreadable files"
 msgstr "当遇上不可读文件时不要以非零值退出"
 
-#: src/tar.c:429
+#: src/tar.c:445
 msgid ""
 "process only the NUMBERth occurrence of each file in the archive; this "
 "option is valid only in conjunction with one of the subcommands --delete, --"
@@ -1454,119 +1501,130 @@ msgstr ""
 "extract 或是 --list 中的一个联合使用时，此选项才有效。而且不管文件列表是以命"
 "令行形式给出或是通过 -T 选项指定的；NUMBER 值默认为 1"
 
-#: src/tar.c:435
+#: src/tar.c:451
 msgid "archive is seekable"
 msgstr "归档可检索"
 
-#: src/tar.c:437
+#: src/tar.c:453
 msgid "archive is not seekable"
 msgstr "归档不可检索"
 
-#: src/tar.c:439
+#: src/tar.c:455
 msgid "do not check device numbers when creating incremental archives"
 msgstr "当创建增量归档时不要检查设备号"
 
-#: src/tar.c:442
+#: src/tar.c:458
 msgid "check device numbers when creating incremental archives (default)"
 msgstr "当创建增量归档时检查设备号(默认)"
 
-#: src/tar.c:448
+#: src/tar.c:464
 msgid "Overwrite control:"
 msgstr "重写控制:"
 
-#: src/tar.c:451
+#: src/tar.c:467
 msgid "attempt to verify the archive after writing it"
 msgstr "在写入以后尝试校验归档"
 
-#: src/tar.c:453
+#: src/tar.c:469
 msgid "remove files after adding them to the archive"
 msgstr "在添加文件至归档后删除它们"
 
-#: src/tar.c:455
-msgid "don't replace existing files when extracting"
+#: src/tar.c:471
+#, fuzzy
+msgid "don't replace existing files when extracting, treat them as errors"
 msgstr "解压时不要替换存在的文件"
 
-#: src/tar.c:457
+#: src/tar.c:474
+#, fuzzy
+msgid "don't replace existing files when extracting, silently skip over them"
+msgstr "解压时不要替换存在的文件"
+
+#: src/tar.c:477
 msgid "don't replace existing files that are newer than their archive copies"
 msgstr "不要替换比归档中副本更新的已存在的文件"
 
-#: src/tar.c:459
+#: src/tar.c:479
 msgid "overwrite existing files when extracting"
 msgstr "解压时重写存在的文件"
 
-#: src/tar.c:461
+#: src/tar.c:481
 msgid "remove each file prior to extracting over it"
 msgstr "在解压要重写的文件之前先删除它们"
 
-#: src/tar.c:463
+#: src/tar.c:483
 msgid "empty hierarchies prior to extracting directory"
 msgstr "解压目录之前先清除目录层次"
 
-#: src/tar.c:465
+#: src/tar.c:485
 msgid "preserve metadata of existing directories"
 msgstr "保留已存在目录的元数据"
 
-#: src/tar.c:467
+#: src/tar.c:487
 msgid "overwrite metadata of existing directories when extracting (default)"
 msgstr "解压时重写已存在目录的元数据(默认)"
 
-#: src/tar.c:473
+#: src/tar.c:490
+#, fuzzy
+msgid "preserve existing symlinks to directories when extracting"
+msgstr "解压时重写存在的文件"
+
+#: src/tar.c:496
 msgid "Select output stream:"
 msgstr "选择输出流:"
 
-#: src/tar.c:476
+#: src/tar.c:499
 msgid "extract files to standard output"
 msgstr "解压文件至标准输出"
 
-#: src/tar.c:477 src/tar.c:536 src/tar.c:538 tests/genfile.c:190
+#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190
 msgid "COMMAND"
 msgstr "COMMAND"
 
-#: src/tar.c:478
+#: src/tar.c:501
 msgid "pipe extracted files to another program"
 msgstr "将解压的文件通过管道传送至另一个程序"
 
-#: src/tar.c:480
+#: src/tar.c:503
 msgid "ignore exit codes of children"
 msgstr "忽略子进程的退出代码"
 
-#: src/tar.c:482
+#: src/tar.c:505
 msgid "treat non-zero exit codes of children as error"
 msgstr "将子进程的非零退出代码认为发生错误"
 
-#: src/tar.c:487
+#: src/tar.c:510
 msgid "Handling of file attributes:"
 msgstr "操作文件属性:"
 
-#: src/tar.c:490
+#: src/tar.c:513
 msgid "force NAME as owner for added files"
 msgstr "强制将 NAME 作为所添加的文件的所有者"
 
-#: src/tar.c:492
+#: src/tar.c:515
 msgid "force NAME as group for added files"
 msgstr "强制将 NAME 作为所添加的文件的组所有者"
 
-#: src/tar.c:493 src/tar.c:690
+#: src/tar.c:516 src/tar.c:736
 msgid "DATE-OR-FILE"
 msgstr "DATE-OR-FILE"
 
-#: src/tar.c:494
+#: src/tar.c:517
 msgid "set mtime for added files from DATE-OR-FILE"
 msgstr "从 DATE-OR-FILE 中为添加的文件设置 mtime"
 
-#: src/tar.c:495
+#: src/tar.c:518
 msgid "CHANGES"
 msgstr "CHANGES"
 
-#: src/tar.c:496
+#: src/tar.c:519
 msgid "force (symbolic) mode CHANGES for added files"
 msgstr "强制将所添加的文件(符号)更改为权限 CHANGES"
 
-#: src/tar.c:498
+#: src/tar.c:521
 msgid "METHOD"
 msgstr "METHOD"
 
-#: src/tar.c:499
+#: src/tar.c:522
 msgid ""
 "preserve access times on dumped files, either by restoring the times after "
 "reading (METHOD='replace'; default) or by not setting the times in the first "
@@ -1575,440 +1633,487 @@ msgstr ""
 "在输出的文件上保留访问时间，要么通过在读取(默认 METHOD=‘replace’)后还原时间，"
 "要不就不要在第一次(METHOD=‘system’)设置时间"
 
-#: src/tar.c:503
+#: src/tar.c:526
 msgid "don't extract file modified time"
 msgstr "不要解压文件的修改时间"
 
-#: src/tar.c:505
+#: src/tar.c:528
 msgid ""
 "try extracting files with the same ownership as exists in the archive "
 "(default for superuser)"
 msgstr "尝试解压时保持所有者关系一致(超级用户默认此项)"
 
-#: src/tar.c:507
+#: src/tar.c:530
 msgid "extract files as yourself (default for ordinary users)"
 msgstr "将文件解压为您所有(普通用户默认此项)"
 
-#: src/tar.c:509
+#: src/tar.c:532
 msgid "always use numbers for user/group names"
 msgstr "总是以数字代表用户/组的名称"
 
-#: src/tar.c:511
+#: src/tar.c:534
 msgid "extract information about file permissions (default for superuser)"
 msgstr "解压文件权限信息(默认只为超级用户服务)"
 
-#: src/tar.c:515
+#: src/tar.c:538
 msgid ""
 "apply the user's umask when extracting permissions from the archive (default "
 "for ordinary users)"
 msgstr "从归档中解压权限时使用用户的掩码位(默认为普通用户服务)"
 
-#: src/tar.c:517
-msgid "sort names to extract to match archive"
-msgstr "为解压至匹配归档排序名称"
+#: src/tar.c:540
+msgid ""
+"member arguments are listed in the same order as the files in the archive"
+msgstr ""
 
-#: src/tar.c:520
+#: src/tar.c:544
 msgid "same as both -p and -s"
 msgstr "与 -p 和 -s 一样"
 
-#: src/tar.c:522
+#: src/tar.c:546
 msgid ""
 "delay setting modification times and permissions of extracted directories "
 "until the end of extraction"
 msgstr "直到解压结束才设置修改时间和所解目录的权限"
 
-#: src/tar.c:525
+#: src/tar.c:549
 msgid "cancel the effect of --delay-directory-restore option"
 msgstr "取消 --delay-directory-restore 选项的效果"
 
-#: src/tar.c:530
+#: src/tar.c:554
+#, fuzzy
+msgid "Handling of extended file attributes:"
+msgstr "操作文件属性:"
+
+#: src/tar.c:557
+msgid "Enable extended attributes support"
+msgstr ""
+
+#: src/tar.c:559
+msgid "Disable extended attributes support"
+msgstr ""
+
+#: src/tar.c:560 src/tar.c:562
+msgid "MASK"
+msgstr ""
+
+#: src/tar.c:561
+msgid "specify the include pattern for xattr keys"
+msgstr ""
+
+#: src/tar.c:563
+msgid "specify the exclude pattern for xattr keys"
+msgstr ""
+
+#: src/tar.c:565
+msgid "Enable the SELinux context support"
+msgstr ""
+
+#: src/tar.c:567
+msgid "Disable the SELinux context support"
+msgstr ""
+
+#: src/tar.c:569
+msgid "Enable the POSIX ACLs support"
+msgstr ""
+
+#: src/tar.c:571
+msgid "Disable the POSIX ACLs support"
+msgstr ""
+
+#: src/tar.c:576
 msgid "Device selection and switching:"
 msgstr "设备选择和切换:"
 
-#: src/tar.c:532
+#: src/tar.c:578
 msgid "ARCHIVE"
 msgstr "ARCHIVE"
 
-#: src/tar.c:533
+#: src/tar.c:579
 msgid "use archive file or device ARCHIVE"
 msgstr "使用归档文件或 ARCHIVE 设备"
 
-#: src/tar.c:535
+#: src/tar.c:581
 msgid "archive file is local even if it has a colon"
 msgstr "即使归档文件存在副本还是把它认为是本地归档"
 
-#: src/tar.c:537
+#: src/tar.c:583
 msgid "use given rmt COMMAND instead of rmt"
 msgstr "使用指定的 rmt COMMAND 代替 rmt"
 
-#: src/tar.c:539
+#: src/tar.c:585
 msgid "use remote COMMAND instead of rsh"
 msgstr "使用远程 COMMAND 代替 rsh"
 
-#: src/tar.c:543
+#: src/tar.c:589
 msgid "specify drive and density"
 msgstr "指定驱动器和压缩率"
 
-#: src/tar.c:557
+#: src/tar.c:603
 msgid "create/list/extract multi-volume archive"
 msgstr "创建/列出/解压多卷归档文件"
 
-#: src/tar.c:559
+#: src/tar.c:605
 msgid "change tape after writing NUMBER x 1024 bytes"
 msgstr "写入 NUMBER × 1024 字节后更换磁带"
 
-#: src/tar.c:561
+#: src/tar.c:607
 msgid "run script at end of each tape (implies -M)"
 msgstr "在每卷磁带最后运行脚本(隐含 -M)"
 
-#: src/tar.c:564
+#: src/tar.c:610
 msgid "use/update the volume number in FILE"
 msgstr "使用/更新 FILE 中的卷数"
 
-#: src/tar.c:569
+#: src/tar.c:615
 msgid "Device blocking:"
 msgstr "设备分块:"
 
-#: src/tar.c:571
+#: src/tar.c:617
 msgid "BLOCKS"
 msgstr "BLOCKS"
 
-#: src/tar.c:572
+#: src/tar.c:618
 msgid "BLOCKS x 512 bytes per record"
 msgstr "每个记录 BLOCKS x 512 字节"
 
-#: src/tar.c:574
+#: src/tar.c:620
 msgid "NUMBER of bytes per record, multiple of 512"
 msgstr "每个记录的字节数 NUMBER，乘以 512"
 
-#: src/tar.c:576
+#: src/tar.c:622
 msgid "ignore zeroed blocks in archive (means EOF)"
 msgstr "忽略归档中的零字节块(即文件结尾)"
 
-#: src/tar.c:578
+#: src/tar.c:624
 msgid "reblock as we read (for 4.2BSD pipes)"
 msgstr "读取时重新分块(只对 4.2BSD 管道有效)"
 
-#: src/tar.c:583
+#: src/tar.c:629
 msgid "Archive format selection:"
 msgstr "选择归档格式:"
 
-#: src/tar.c:585 tests/genfile.c:153
+#: src/tar.c:631 tests/genfile.c:153
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: src/tar.c:586
+#: src/tar.c:632
 msgid "create archive of the given format"
 msgstr "创建指定格式的归档"
 
-#: src/tar.c:588
+#: src/tar.c:634
 msgid "FORMAT is one of the following:"
 msgstr "FORMAT 是以下格式中的一种:"
 
-#: src/tar.c:589
+#: src/tar.c:635
 msgid "old V7 tar format"
 msgstr "old V7 tar 格式"
 
-#: src/tar.c:592
+#: src/tar.c:638
 msgid "GNU format as per tar <= 1.12"
 msgstr "GNU 格式 as per tar <= 1.12"
 
-#: src/tar.c:594
+#: src/tar.c:640
 msgid "GNU tar 1.13.x format"
 msgstr "GNU tar 1.13.x 格式"
 
-#: src/tar.c:596
+#: src/tar.c:642
 msgid "POSIX 1003.1-1988 (ustar) format"
 msgstr "POSIX 1003.1-1988 (ustar) 格式"
 
-#: src/tar.c:598
+#: src/tar.c:644
 msgid "POSIX 1003.1-2001 (pax) format"
 msgstr "POSIX 1003.1-2001 (pax) 格式"
 
-#: src/tar.c:599
+#: src/tar.c:645
 msgid "same as pax"
 msgstr "等同于 pax"
 
-#: src/tar.c:602
+#: src/tar.c:648
 msgid "same as --format=v7"
 msgstr "等同于 --format=v7"
 
-#: src/tar.c:605
+#: src/tar.c:651
 msgid "same as --format=posix"
 msgstr "等同于 --format=posix"
 
-#: src/tar.c:606
+#: src/tar.c:652
 msgid "keyword[[:]=value][,keyword[[:]=value]]..."
 msgstr "关键字[[:]=值][,关键字[[:]=值]]..."
 
-#: src/tar.c:607
+#: src/tar.c:653
 msgid "control pax keywords"
 msgstr "控制 pax 关键字"
 
-#: src/tar.c:608
+#: src/tar.c:654
 msgid "TEXT"
 msgstr "TEXT"
 
-#: src/tar.c:609
+#: src/tar.c:655
 msgid ""
 "create archive with volume name TEXT; at list/extract time, use TEXT as a "
 "globbing pattern for volume name"
 msgstr "创建带有卷名 TEXT 的归档；在列出/解压时，使用 TEXT 作为卷名的模式串"
 
-#: src/tar.c:614
+#: src/tar.c:660
 msgid "Compression options:"
 msgstr "压缩选项:"
 
-#: src/tar.c:616
+#: src/tar.c:662
 msgid "use archive suffix to determine the compression program"
 msgstr "使用归档后缀名来决定压缩程序"
 
-#: src/tar.c:618
+#: src/tar.c:664
 msgid "do not use archive suffix to determine the compression program"
 msgstr "不使用归档后缀名来决定压缩程序"
 
-#: src/tar.c:620
+#: src/tar.c:666
 msgid "PROG"
 msgstr "PROG"
 
-#: src/tar.c:621
+#: src/tar.c:667
 msgid "filter through PROG (must accept -d)"
 msgstr "通过 PROG 过滤(必须是能接受 -d 选项的程序)"
 
-#: src/tar.c:637
+#: src/tar.c:683
 msgid "Local file selection:"
 msgstr "本地文件选择:"
 
-#: src/tar.c:640
+#: src/tar.c:686
 msgid "add given FILE to the archive (useful if its name starts with a dash)"
 msgstr "添加指定的 FILE 至归档(如果名字以 - 开始会很有用的)"
 
-#: src/tar.c:641
+#: src/tar.c:687
 msgid "DIR"
 msgstr "DIR"
 
-#: src/tar.c:642
+#: src/tar.c:688
 msgid "change to directory DIR"
 msgstr "改变至目录 DIR"
 
-#: src/tar.c:644
+#: src/tar.c:690
 msgid "get names to extract or create from FILE"
 msgstr "从 FILE 中获取文件名来解压或创建文件"
 
-#: src/tar.c:646
+#: src/tar.c:692
 msgid "-T reads null-terminated names, disable -C"
 msgstr "-T 读取以空终止的名字，-C 禁用"
 
-#: src/tar.c:648
+#: src/tar.c:694
 msgid "disable the effect of the previous --null option"
 msgstr "禁用上一次的效果 --null 选项"
 
-#: src/tar.c:650
+#: src/tar.c:696
 msgid "unquote filenames read with -T (default)"
 msgstr "以 -T 读取的文件名作为引用结束(默认)"
 
-#: src/tar.c:652
+#: src/tar.c:698
 msgid "do not unquote filenames read with -T"
 msgstr "不以 -T 读取的文件名作为引用结束"
 
-#: src/tar.c:653 tests/genfile.c:136
+#: src/tar.c:699 tests/genfile.c:136
 msgid "PATTERN"
 msgstr "PATTERN"
 
-#: src/tar.c:654
+#: src/tar.c:700
 msgid "exclude files, given as a PATTERN"
 msgstr "排除以 PATTERN 指定的文件"
 
-#: src/tar.c:656
+#: src/tar.c:702
 msgid "exclude patterns listed in FILE"
 msgstr "排除 FILE 中列出的模式串"
 
-#: src/tar.c:658
+#: src/tar.c:704
 msgid ""
 "exclude contents of directories containing CACHEDIR.TAG, except for the tag "
 "file itself"
 msgstr "除标识文件本身外，排除包含 CACHEDIR.TAG 的目录中的内容"
 
-#: src/tar.c:661
+#: src/tar.c:707
 msgid "exclude everything under directories containing CACHEDIR.TAG"
 msgstr "排除包含 CACHEDIR.TAG 的目录中所有内容"
 
-#: src/tar.c:664
+#: src/tar.c:710
 msgid "exclude directories containing CACHEDIR.TAG"
 msgstr "排除包含 CACHEDIR.TAG 的目录"
 
-#: src/tar.c:666
+#: src/tar.c:712
 msgid "exclude contents of directories containing FILE, except for FILE itself"
 msgstr "除 FILE 自身外，排除包含 FILE 的目录中的内容"
 
-#: src/tar.c:669
+#: src/tar.c:715
 msgid "exclude everything under directories containing FILE"
 msgstr "排除包含 FILE 的目录中的所有内容"
 
-#: src/tar.c:671
+#: src/tar.c:717
 msgid "exclude directories containing FILE"
 msgstr "排除包含 FILE 的目录"
 
-#: src/tar.c:673
+#: src/tar.c:719
 msgid "exclude version control system directories"
 msgstr "排除版本控制系统目录"
 
-#: src/tar.c:675
+#: src/tar.c:721
 msgid "exclude backup and lock files"
 msgstr "排除备份和锁文件"
 
-#: src/tar.c:677
+#: src/tar.c:723
 msgid "avoid descending automatically in directories"
 msgstr "避免目录中的自动降级"
 
-#: src/tar.c:679
+#: src/tar.c:725
 msgid "stay in local file system when creating archive"
 msgstr "创建归档时保存在本地文件系统中"
 
-#: src/tar.c:681
+#: src/tar.c:727
 msgid "recurse into directories (default)"
 msgstr "目录递归(默认)"
 
-#: src/tar.c:683
-msgid "don't strip leading `/'s from file names"
+#: src/tar.c:729
+#, fuzzy
+msgid "don't strip leading '/'s from file names"
 msgstr "不要从文件名中清除引导符‘/’"
 
-#: src/tar.c:685
+#: src/tar.c:731
 msgid "follow symlinks; archive and dump the files they point to"
 msgstr "跟踪符号链接；将它们所指向的文件归档并输出"
 
-#: src/tar.c:687
+#: src/tar.c:733
 msgid "follow hard links; archive and dump the files they refer to"
 msgstr "跟踪硬链接；将它们所指向的文件归档并输出"
 
-#: src/tar.c:688
+#: src/tar.c:734
 msgid "MEMBER-NAME"
 msgstr "MEMBER-NAME"
 
-#: src/tar.c:689
-msgid "begin at member MEMBER-NAME in the archive"
+#: src/tar.c:735
+#, fuzzy
+msgid "begin at member MEMBER-NAME when reading the archive"
 msgstr "从归档中的 MEMBER-NAME 成员处开始"
 
-#: src/tar.c:691
+#: src/tar.c:737
 msgid "only store files newer than DATE-OR-FILE"
 msgstr "只保存比 DATE-OR-FILE 更新的文件"
 
-#: src/tar.c:693
+#: src/tar.c:739
 msgid "DATE"
 msgstr "DATE"
 
-#: src/tar.c:694
+#: src/tar.c:740
 msgid "compare date and time when data changed only"
 msgstr "当只有数据改变时比较数据和时间"
 
-#: src/tar.c:695
+#: src/tar.c:741
 msgid "CONTROL"
 msgstr "CONTROL"
 
-#: src/tar.c:696
+#: src/tar.c:742
 msgid "backup before removal, choose version CONTROL"
 msgstr "在删除前备份，选择 CONTROL 版本"
 
-#: src/tar.c:697 src/tar.c:776 src/tar.c:778 tests/genfile.c:169
+#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169
 msgid "STRING"
 msgstr "STRING"
 
-#: src/tar.c:698
+#: src/tar.c:744
 msgid ""
 "backup before removal, override usual suffix ('~' unless overridden by "
 "environment variable SIMPLE_BACKUP_SUFFIX)"
 msgstr ""
 "在删除前备份，除非被环境变量 SIMPLE_BACKUP_SUFFIX 覆盖，否则覆盖常用后缀(‘’)"
 
-#: src/tar.c:703
+#: src/tar.c:749
 msgid "File name transformations:"
 msgstr "文件名变换:"
 
-#: src/tar.c:705
+#: src/tar.c:751
 msgid "strip NUMBER leading components from file names on extraction"
 msgstr "解压时从文件名中清除 NUMBER 个引导部分"
 
-#: src/tar.c:707
+#: src/tar.c:753
 msgid "EXPRESSION"
 msgstr "EXPRESSION"
 
-#: src/tar.c:708
+#: src/tar.c:754
 msgid "use sed replace EXPRESSION to transform file names"
 msgstr "使用 sed 代替 EXPRESSION 来进行文件名变换"
 
-#: src/tar.c:714
+#: src/tar.c:760
 msgid "File name matching options (affect both exclude and include patterns):"
 msgstr "文件名匹配选项(同时影响排除和包括模式串):"
 
-#: src/tar.c:717
+#: src/tar.c:763
 msgid "ignore case"
 msgstr "忽略大小写"
 
-#: src/tar.c:719
+#: src/tar.c:765
 msgid "patterns match file name start"
 msgstr "模式串匹配文件名头部"
 
-#: src/tar.c:721
-msgid "patterns match after any `/' (default for exclusion)"
+#: src/tar.c:767
+#, fuzzy
+msgid "patterns match after any '/' (default for exclusion)"
 msgstr "模式串匹配任意‘/’后字符(默认对 exclusion 有效)"
 
-#: src/tar.c:723
+#: src/tar.c:769
 msgid "case sensitive matching (default)"
 msgstr "匹配大小写(默认)"
 
-#: src/tar.c:725
+#: src/tar.c:771
 msgid "use wildcards (default for exclusion)"
 msgstr "使用通配符(默认对 exclusion )"
 
-#: src/tar.c:727
+#: src/tar.c:773
 msgid "verbatim string matching"
 msgstr "逐字匹配字符串"
 
-#: src/tar.c:729
-msgid "wildcards do not match `/'"
+#: src/tar.c:775
+#, fuzzy
+msgid "wildcards do not match '/'"
 msgstr "通配符不匹配‘/’"
 
-#: src/tar.c:731
-msgid "wildcards match `/' (default for exclusion)"
+#: src/tar.c:777
+#, fuzzy
+msgid "wildcards match '/' (default for exclusion)"
 msgstr "通配符匹配‘/’(默认对排除操作有效)"
 
-#: src/tar.c:736
+#: src/tar.c:782
 msgid "Informative output:"
 msgstr "提示性输出:"
 
-#: src/tar.c:739
+#: src/tar.c:785
 msgid "verbosely list files processed"
 msgstr "详细地列出处理的文件"
 
-#: src/tar.c:740
+#: src/tar.c:786
 msgid "KEYWORD"
 msgstr "KEYWORD"
 
-#: src/tar.c:741
+#: src/tar.c:787
 msgid "warning control"
 msgstr "警告控制:"
 
-#: src/tar.c:743
+#: src/tar.c:789
 msgid "display progress messages every NUMBERth record (default 10)"
 msgstr "每隔 NUMBER 个记录显示进度信息(默认为 10 个)"
 
-#: src/tar.c:745
+#: src/tar.c:791
 msgid "ACTION"
 msgstr "ACTION"
 
-#: src/tar.c:746
+#: src/tar.c:792
 msgid "execute ACTION on each checkpoint"
 msgstr "在每个检查点上执行 ACTION"
 
-#: src/tar.c:749
+#: src/tar.c:795
 msgid "print a message if not all links are dumped"
 msgstr "只要不是所有链接都被输出就打印信息"
 
-#: src/tar.c:750
+#: src/tar.c:796
 msgid "SIGNAL"
 msgstr "SIGNAL"
 
-#: src/tar.c:751
+#: src/tar.c:797
 msgid ""
 "print total bytes after processing the archive; with an argument - print "
 "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2019,123 +2124,119 @@ msgstr ""
 "号为: SIGHUP，SIGQUIT，SIGINT，SIGUSR1 和 SIGUSR2；同时也接受不带 SIG 前缀的"
 "信号名称"
 
-#: src/tar.c:756
+#: src/tar.c:802
 msgid "print file modification times in UTC"
 msgstr "以 UTC 格式打印文件修改时间"
 
-#: src/tar.c:758
-#, fuzzy
+#: src/tar.c:804
 msgid "print file time to its full resolution"
-msgstr "将文件时间打印至显示器"
+msgstr "按文件原本时间格式打印"
 
-#: src/tar.c:760
+#: src/tar.c:806
 msgid "send verbose output to FILE"
 msgstr "将详细输出发送至 FILE"
 
-#: src/tar.c:762
+#: src/tar.c:808
 msgid "show block number within archive with each message"
 msgstr "每个信息都显示归档内的块数"
 
-#: src/tar.c:764
+#: src/tar.c:810
 msgid "ask for confirmation for every action"
 msgstr "每次操作都要求确认"
 
-#: src/tar.c:767
+#: src/tar.c:813
 msgid "show tar defaults"
 msgstr "显示 tar 默认选项"
 
-#: src/tar.c:769
+#: src/tar.c:815
+msgid "show valid ranges for snapshot-file fields"
+msgstr ""
+
+#: src/tar.c:817
 msgid ""
 "when listing or extracting, list each directory that does not match search "
 "criteria"
 msgstr "列表或解压时，列出每个不匹配查找标准的目录"
 
-#: src/tar.c:771
+#: src/tar.c:819
 msgid "show file or archive names after transformation"
 msgstr "显示变换后的文件名或归档名"
 
-#: src/tar.c:774
+#: src/tar.c:822
 msgid "STYLE"
 msgstr "STYLE"
 
-#: src/tar.c:775
+#: src/tar.c:823
 msgid "set name quoting style; see below for valid STYLE values"
 msgstr "设置名称引用风格；有效的 STYLE 值请参阅以下说明"
 
-#: src/tar.c:777
+#: src/tar.c:825
 msgid "additionally quote characters from STRING"
 msgstr "来自 STRING 的额外的引用字符"
 
-#: src/tar.c:779
+#: src/tar.c:827
 msgid "disable quoting for characters from STRING"
 msgstr "禁用来自 STRING 的字符引用"
 
-#: src/tar.c:784
+#: src/tar.c:832
 msgid "Compatibility options:"
 msgstr "兼容性选项:"
 
-#: src/tar.c:787
+#: src/tar.c:835
 msgid ""
 "when creating, same as --old-archive; when extracting, same as --no-same-"
 "owner"
 msgstr "创建归档时，相当于 --old-archive；展开归档时，相当于 --no-same-owner"
 
-#: src/tar.c:792
+#: src/tar.c:840
 msgid "Other options:"
 msgstr "其它选项:"
 
-#: src/tar.c:795
+#: src/tar.c:843
 msgid "disable use of some potentially harmful options"
 msgstr "禁用某些潜在的有危险的选项"
 
-#: src/tar.c:930
-msgid "You may not specify more than one `-Acdtrux' or `--test-label' option"
+#: src/tar.c:978
+#, fuzzy
+msgid ""
+"You may not specify more than one '-Acdtrux', '--delete' or  '--test-label' "
+"option"
 msgstr "您不能指定超过一个\"-Acdtrux\"或是\"--test-label\"外的选项"
 
-#: src/tar.c:940
+#: src/tar.c:988
 msgid "Conflicting compression options"
 msgstr "压缩选项冲突"
 
-#: src/tar.c:996
+#: src/tar.c:1047
 #, c-format
 msgid "Unknown signal name: %s"
 msgstr "未知的信号名称: %s"
 
-#: src/tar.c:1020
+#: src/tar.c:1071
 msgid "Date sample file not found"
 msgstr "找不到数据样板文件"
 
-#: src/tar.c:1028
+#: src/tar.c:1079
 #, c-format
 msgid "Substituting %s for unknown date format %s"
 msgstr "把未知的时间格式 %2$s 替换为 %1$s"
 
-#: src/tar.c:1057
-#, c-format
-msgid "Option %s: Treating date `%s' as %s"
+#: src/tar.c:1108
+#, fuzzy, c-format
+msgid "Option %s: Treating date '%s' as %s"
 msgstr "选项 %s: 将日期 ‘%s’ 当作 %s"
 
-#: src/tar.c:1135
-#, c-format
-msgid "%s: file list already read"
-msgstr "%s: 文件列表已经读取"
-
-#: src/tar.c:1201
-#, c-format
-msgid "%s: file name read contains nul character"
-msgstr "%s: 读取的文件名含有空字符"
-
-#: src/tar.c:1268 src/tar.c:1272 src/tar.c:1276 src/tar.c:1280 src/tar.c:1284
-#: src/tar.c:1288
+#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167
+#: src/tar.c:1171
 #, c-format
 msgid "filter the archive through %s"
 msgstr "通过 %s 过滤归档"
 
-#: src/tar.c:1296
+#: src/tar.c:1179
 msgid "Valid arguments for the --quoting-style option are:"
 msgstr "--quoting-style 选项的有效参数为:"
 
-#: src/tar.c:1300
+#: src/tar.c:1183
 msgid ""
 "\n"
 "*This* tar defaults to:\n"
@@ -2143,53 +2244,50 @@ msgstr ""
 "\n"
 "此 tar 默认为:\n"
 
-#: src/tar.c:1402
+#: src/tar.c:1295
+#, fuzzy
+msgid "Invalid owner or group ID"
+msgstr "无效的所有者"
+
+#: src/tar.c:1339
 #, fuzzy
 msgid "Invalid blocking factor"
 msgstr "无效的块因子"
 
-#: src/tar.c:1515
+#: src/tar.c:1452
 msgid "Invalid tape length"
 msgstr "无效的磁带长度"
 
-#: src/tar.c:1529
+#: src/tar.c:1466
 msgid "Invalid incremental level value"
 msgstr "无效的增量度"
 
-#: src/tar.c:1575
+#: src/tar.c:1512
 msgid "More than one threshold date"
 msgstr "多于一个时间阈值"
 
-#: src/tar.c:1630 src/tar.c:1633
+#: src/tar.c:1571 src/tar.c:1574
 #, fuzzy
 msgid "Invalid sparse version value"
 msgstr "无效的稀疏版本值"
 
-#: src/tar.c:1718
+#: src/tar.c:1659
 msgid "--atime-preserve='system' is not supported on this platform"
 msgstr "此平台不支持 --atime-preserve=‘system’ "
 
-#: src/tar.c:1743
+#: src/tar.c:1684
 msgid "--checkpoint value is not an integer"
 msgstr "--checkpoint 值不是个整数"
 
-#: src/tar.c:1848
-msgid "Invalid group"
-msgstr "无效的组"
-
-#: src/tar.c:1855
+#: src/tar.c:1801
 msgid "Invalid mode given on option"
 msgstr "选项中给出无效的访问模式"
 
-#: src/tar.c:1912
+#: src/tar.c:1858
 msgid "Invalid number"
 msgstr "无效的数字"
 
-#: src/tar.c:1934
-msgid "Invalid owner"
-msgstr "无效的所有者"
-
-#: src/tar.c:1964
+#: src/tar.c:1915
 msgid ""
 "The --preserve option is deprecated, use --preserve-permissions --preserve-"
 "order instead"
@@ -2197,119 +2295,149 @@ msgstr ""
 "--preserve 选项已经废弃了，请使用 --preserve-permissions --preserve-order 代"
 "替"
 
-#: src/tar.c:1975
+#: src/tar.c:1926
 msgid "Invalid record size"
 msgstr "无效的记录大小"
 
-#: src/tar.c:1978
+#: src/tar.c:1929
 #, c-format
 msgid "Record size must be a multiple of %d."
 msgstr "记录大小必须是 %d 的倍数。"
 
-#: src/tar.c:2019
+#: src/tar.c:1975
 msgid "Invalid number of elements"
 msgstr "无效的元素数"
 
-#: src/tar.c:2039
+#: src/tar.c:1995
 msgid "Only one --to-command option allowed"
 msgstr "仅允许使用一个 --to-command 选项"
 
-#: src/tar.c:2119
+#: src/tar.c:2107
 #, c-format
 msgid "Malformed density argument: %s"
 msgstr "错误的压缩参数: %s"
 
-#: src/tar.c:2145
-#, c-format
-msgid "Unknown density: `%c'"
+#: src/tar.c:2133
+#, fuzzy, c-format
+msgid "Unknown density: '%c'"
 msgstr "未知的压缩参数: ‘%c’"
 
-#: src/tar.c:2162
-#, c-format
-msgid "Options `-[0-7][lmh]' not supported by *this* tar"
+#: src/tar.c:2150
+#, fuzzy, c-format
+msgid "Options '-[0-7][lmh]' not supported by *this* tar"
 msgstr "本 tar 不支持选项“-[0-7][lmh]”"
 
-#: src/tar.c:2175
+#: src/tar.c:2163
 msgid "[FILE]..."
 msgstr "[FILE]..."
 
-#: src/tar.c:2293
-#, c-format
-msgid "Old option `%c' requires an argument."
+#: src/tar.c:2306
+#, fuzzy, c-format
+msgid "Old option '%c' requires an argument."
 msgstr "旧选项“%c”需要参数。"
 
-#: src/tar.c:2374
+#: src/tar.c:2386
 msgid "--occurrence is meaningless without a file list"
 msgstr "没有一个文件列表时 --occurrence 是没有意义的"
 
-#: src/tar.c:2380
-msgid "--occurrence cannot be used in the requested operation mode"
+#: src/tar.c:2389
+#, fuzzy, c-format
+msgid "--occurrence cannot be used with %s"
 msgstr "--occurrence 不能用于请求的操作模式中"
 
-#: src/tar.c:2398
-msgid "Multiple archive files require `-M' option"
+#: src/tar.c:2408
+#, fuzzy
+msgid "Multiple archive files require '-M' option"
 msgstr "多个归档文件需要使用“-M”选项"
 
-#: src/tar.c:2403
+#: src/tar.c:2413
 msgid "Cannot combine --listed-incremental with --newer"
 msgstr "无法在使用 --newer 的时候使用 --listed-incremental"
 
-#: src/tar.c:2406
+#: src/tar.c:2416
 msgid "--level is meaningless without --listed-incremental"
 msgstr "没有 --listed-incremental 选项的话 --level 选项是无意义的"
 
-#: src/tar.c:2423
+#: src/tar.c:2433
 #, c-format
 msgid "%s: Volume label is too long (limit is %lu byte)"
 msgid_plural "%s: Volume label is too long (limit is %lu bytes)"
 msgstr[0] "%s：卷标过长 (限制为 %lu 字节)"
 
-#: src/tar.c:2436
+#: src/tar.c:2446
 msgid "Cannot verify multi-volume archives"
 msgstr "无法检验多卷归档文件"
 
-#: src/tar.c:2438
+#: src/tar.c:2448
 msgid "Cannot verify compressed archives"
 msgstr "无法检验压缩归档文件"
 
-#: src/tar.c:2444
+#: src/tar.c:2450
+#, fuzzy, c-format
+msgid "--verify cannot be used with %s"
+msgstr "不能使用模式 %s"
+
+#: src/tar.c:2457
 msgid "Cannot use multi-volume compressed archives"
 msgstr "无法使用多卷压缩归档文件"
 
-#: src/tar.c:2450
+#: src/tar.c:2461
 msgid "Cannot concatenate compressed archives"
 msgstr "无法联结压缩归档文件"
 
-#: src/tar.c:2462
+#: src/tar.c:2471
 msgid "--pax-option can be used only on POSIX archives"
 msgstr "--pax-option 只能用于 POSIX 归档中"
 
-#: src/tar.c:2492
+#: src/tar.c:2478
+#, fuzzy
+msgid "--acls can be used only on POSIX archives"
+msgstr "--pax-option 只能用于 POSIX 归档中"
+
+#: src/tar.c:2483
+#, fuzzy
+msgid "--selinux can be used only on POSIX archives"
+msgstr "--pax-option 只能用于 POSIX 归档中"
+
+#: src/tar.c:2488
+#, fuzzy
+msgid "--xattrs can be used only on POSIX archives"
+msgstr "--pax-option 只能用于 POSIX 归档中"
+
+#: src/tar.c:2493
+#, fuzzy, c-format
+msgid "--%s option cannot be used with %s"
+msgstr "不能使用模式 %s"
+
+#: src/tar.c:2525
 msgid "Volume length cannot be less than record size"
 msgstr "卷长度不可小于记录大小"
 
-#: src/tar.c:2495
+#: src/tar.c:2528
 msgid "--preserve-order is not compatible with --listed-incremental"
 msgstr "--preserve-order 与 --listed-incremental 不匹配"
 
-#: src/tar.c:2506
+#: src/tar.c:2539
 msgid "Cowardly refusing to create an empty archive"
 msgstr "谨慎地拒绝创建空归档文件"
 
-#: src/tar.c:2532
-msgid "Options `-Aru' are incompatible with `-f -'"
+#: src/tar.c:2565
+#, fuzzy
+msgid "Options '-Aru' are incompatible with '-f -'"
 msgstr "选项“-Aru”与“-f -”不兼容"
 
-#: src/tar.c:2621
-msgid "You must specify one of the `-Acdtrux' or `--test-label'  options"
+#: src/tar.c:2660
+#, fuzzy
+msgid ""
+"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
 msgstr "您必须从\"-Acdtrux\"或是\"--test-label\"选项中指定一个"
 
-#: src/tar.c:2675
+#: src/tar.c:2715
 #, c-format
 msgid "Exiting with failure status due to previous errors"
 msgstr "由于前次错误，将以上次的错误状态退出"
 
-#: src/update.c:86
+#: src/update.c:87
 #, c-format
 msgid "%s: File shrank by %s byte"
 msgid_plural "%s: File shrank by %s bytes"
@@ -2320,114 +2448,110 @@ msgstr[0] "%s：文件缩小 %s 字节"
 msgid "Keyword %s is unknown or not yet implemented"
 msgstr "关键字 %s 未知或还未实现"
 
-#: src/xheader.c:174
+#: src/xheader.c:173
 msgid "Time stamp is out of allowed range"
 msgstr "时间标记超出允许范围"
 
-#: src/xheader.c:205
+#: src/xheader.c:204
 #, c-format
 msgid "Pattern %s cannot be used"
 msgstr "不能使用模式 %s"
 
-#: src/xheader.c:219
+#: src/xheader.c:218
 #, c-format
 msgid "Keyword %s cannot be overridden"
 msgstr "不能覆盖关键字 %s"
 
-#: src/xheader.c:542
+#: src/xheader.c:667
 msgid "Malformed extended header: missing length"
 msgstr "错误的扩展头: 缺少 length"
 
-#: src/xheader.c:550
-msgid "Extended header length is out of allowed range"
-msgstr "扩展头长度超出所允许的范围"
-
-#: src/xheader.c:557
+#: src/xheader.c:676
 #, c-format
 msgid "Extended header length %*s is out of range"
 msgstr "扩展头长度 %*s 超出范围"
 
-#: src/xheader.c:569
+#: src/xheader.c:688
 msgid "Malformed extended header: missing blank after length"
 msgstr "错误的扩展头: length 后缺少空白符"
 
-#: src/xheader.c:577
+#: src/xheader.c:696
 msgid "Malformed extended header: missing equal sign"
 msgstr "错误的扩展头: 缺少等于符号"
 
-#: src/xheader.c:583
+#: src/xheader.c:702
 msgid "Malformed extended header: missing newline"
 msgstr "错误的扩展头: 缺少空行"
 
-#: src/xheader.c:621
-#, c-format
-msgid "Ignoring unknown extended header keyword `%s'"
+#: src/xheader.c:740
+#, fuzzy, c-format
+msgid "Ignoring unknown extended header keyword '%s'"
 msgstr "忽略未知的扩展头关键字‘%s’"
 
-#: src/xheader.c:831
+#: src/xheader.c:1012
 #, c-format
 msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)"
 msgstr "生成的关键字/值对太长了(keyword=%s, length=%s)"
 
 #. TRANSLATORS: The first %s is the pax extended header keyword
 #. (atime, gid, etc.).
-#: src/xheader.c:863
+#: src/xheader.c:1042
 #, c-format
 msgid "Extended header %s=%s is out of range %s..%s"
 msgstr "扩展头 %s=%s 超出范围 %s..%s"
 
-#: src/xheader.c:994 src/xheader.c:1024 src/xheader.c:1338
+#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455
 #, c-format
 msgid "Malformed extended header: invalid %s=%s"
 msgstr "错误的扩展头: %s=%s 无效"
 
-#: src/xheader.c:1291 src/xheader.c:1316 src/xheader.c:1366
+#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488
 #, c-format
 msgid "Malformed extended header: excess %s=%s"
 msgstr "错误的扩展头: %s=%s 溢出"
 
-#: src/xheader.c:1379
+#: src/xheader.c:1501
 #, c-format
 msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
 msgstr "错误的扩展头: %s 无效: 非预期的分隔符 %c"
 
-#: src/xheader.c:1389
+#: src/xheader.c:1511
 #, c-format
 msgid "Malformed extended header: invalid %s: odd number of values"
 msgstr "错误的扩展头: %s 无效: 奇怪的数值"
 
-#: src/checkpoint.c:107
+#: src/checkpoint.c:109
 #, c-format
 msgid "%s: not a valid timeout"
 msgstr "%s: 无效的超时设置"
 
-#: src/checkpoint.c:112
+#: src/checkpoint.c:114
 #, c-format
 msgid "%s: unknown checkpoint action"
 msgstr "%s: 未知的检查点操作"
 
-#: src/checkpoint.c:132
+#: src/checkpoint.c:134
 msgid "write"
 msgstr "写入"
 
-#: src/checkpoint.c:132
+#: src/checkpoint.c:134
 msgid "read"
 msgstr "读取"
 
-#. TRANSLATORS: This is a ``checkpoint of write operation'',
-#. *not* ``Writing a checkpoint''.
-#. E.g. in Spanish ``Punto de comprobaci@'on de escritura'',
-#. *not* ``Escribiendo un punto de comprobaci@'on''
-#: src/checkpoint.c:222
+#. TRANSLATORS: This is a "checkpoint of write operation",
+#. *not* "Writing a checkpoint".
+#. E.g. in Spanish "Punto de comprobaci@'on de escritura",
+#. *not* "Escribiendo un punto de comprobaci@'on"
+#: src/checkpoint.c:224
 #, c-format
 msgid "Write checkpoint %u"
 msgstr "写入操作的检查点 %u"
 
-#. TRANSLATORS: This is a ``checkpoint of read operation'',
-#. *not* ``Reading a checkpoint''.
-#. E.g. in Spanish ``Punto de comprobaci@'on de lectura'',
-#. *not* ``Leyendo un punto de comprobaci@'on''
-#: src/checkpoint.c:228
+#. TRANSLATORS: This is a "checkpoint of read operation",
+#. *not* "Reading a checkpoint".
+#. E.g. in Spanish "Punto de comprobaci@'on de lectura",
+#. *not* "Leyendo un punto de comprobaci@'on"
+#: src/checkpoint.c:230
 #, c-format
 msgid "Read checkpoint %u"
 msgstr "读取操作的检查点 %u"
@@ -2564,7 +2688,7 @@ msgstr "数值超出所允许的范围: %s"
 msgid "Negative size: %s"
 msgstr "负值: %s"
 
-#: tests/genfile.c:265 tests/genfile.c:567
+#: tests/genfile.c:265 tests/genfile.c:569
 #, c-format
 msgid "stat(%s) failed"
 msgstr "stat(%s) 错误"
@@ -2593,8 +2717,8 @@ msgstr "未知的数据格式"
 msgid "[ARGS...]"
 msgstr "[ARGS...]"
 
-#: tests/genfile.c:428 tests/genfile.c:468 tests/genfile.c:521
-#: tests/genfile.c:671 tests/genfile.c:685
+#: tests/genfile.c:428 tests/genfile.c:468 tests/genfile.c:523
+#: tests/genfile.c:673 tests/genfile.c:687
 #, c-format
 msgid "cannot open `%s'"
 msgstr "无法打开“%s”"
@@ -2608,66 +2732,97 @@ msgstr "无法定位"
 msgid "file name contains null character"
 msgstr "文件名包含空字符"
 
-#: tests/genfile.c:516
+#: tests/genfile.c:518
 #, c-format
 msgid "cannot generate sparse files on standard output, use --file option"
 msgstr "使用 --file 选项无法在标准输出上生成离散文件"
 
-#: tests/genfile.c:594
+#: tests/genfile.c:596
 #, c-format
 msgid "incorrect mask (near `%s')"
 msgstr "不正确的掩码(“%s”附近)"
 
-#: tests/genfile.c:600 tests/genfile.c:633
+#: tests/genfile.c:602 tests/genfile.c:635
 #, c-format
 msgid "Unknown field `%s'"
 msgstr "未知的文件掩码位“%s”"
 
-#: tests/genfile.c:660
+#: tests/genfile.c:662
 #, c-format
 msgid "cannot set time on `%s'"
 msgstr "无法设定“%s”的时间"
 
-#: tests/genfile.c:699
+#: tests/genfile.c:692
+#, fuzzy, c-format
+msgid "cannot truncate `%s'"
+msgstr "无法删除 \"%s\""
+
+#: tests/genfile.c:701
+#, fuzzy, c-format
+msgid "command failed: %s"
+msgstr "%s 命令失败"
+
+#: tests/genfile.c:706
 #, c-format
 msgid "cannot unlink `%s'"
 msgstr "无法删除 \"%s\""
 
-#: tests/genfile.c:825
+#: tests/genfile.c:833
 #, c-format
 msgid "Command exited successfully\n"
 msgstr "命令成功退出\n"
 
-#: tests/genfile.c:827
+#: tests/genfile.c:835
 #, c-format
 msgid "Command failed with status %d\n"
 msgstr "命令出错，状态 %d\n"
 
-#: tests/genfile.c:831
+#: tests/genfile.c:839
 #, c-format
 msgid "Command terminated on signal %d\n"
 msgstr "命令由信号 %d 终止了\n"
 
-#: tests/genfile.c:833
+#: tests/genfile.c:841
 #, c-format
 msgid "Command stopped on signal %d\n"
 msgstr "命令由信号 %d 停止了\n"
 
-#: tests/genfile.c:836
+#: tests/genfile.c:844
 #, c-format
 msgid "Command dumped core\n"
 msgstr "命令输出 core\n"
 
-#: tests/genfile.c:839
+#: tests/genfile.c:847
 #, c-format
 msgid "Command terminated\n"
 msgstr "命令终止\n"
 
-#: tests/genfile.c:871
+#: tests/genfile.c:879
 #, c-format
 msgid "--stat requires file names"
 msgstr "--stat 选项需要文件名"
 
+#~ msgid "Cannot get working directory"
+#~ msgstr "无法获取工作目录"
+
+#~ msgid "sort names to extract to match archive"
+#~ msgstr "为解压至匹配归档排序名称"
+
+#~ msgid "Field too long while reading snapshot file"
+#~ msgstr "读取目录文件时字段太长"
+
+#~ msgid "Read error in snapshot file"
+#~ msgstr "目录文件读取错误"
+
+#~ msgid "Unexpected field value in snapshot file"
+#~ msgstr "目录文件中异常的字段值"
+
+#~ msgid "Extended header length is out of allowed range"
+#~ msgstr "扩展头长度超出所允许的范围"
+
+#~ msgid "Invalid group"
+#~ msgstr "无效的组"
+
 #~ msgid "%s: Directory removed before we read it"
 #~ msgstr "%s: 文件在读入之前被删除了"