X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=po%2Fzh_CN.po;h=30fb430010562a0f2dd982182cb10484ed867cab;hb=4aa85f09e755fc827cd5ab6225f20c83cd42245d;hp=5cb3c06c58f3e1d68fc7bde768d3df7eabdc481f;hpb=eb3ba7cb06fdd0f8627b8f117d8453e297e18b64;p=debian%2Ftar

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5cb3c06c..30fb4300 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,12 +5,12 @@
 # Rongjun Mu <rongjunmu+i18n@gmail.com>, 2004.
 # Ji ZhengYu <zhengyuji@gmail.com>, 2008, 2009, 2010, 2011.
 #
-#: src/create.c:1572
+#: src/create.c:1574
 msgid ""
 msgstr ""
 "Project-Id-Version: tar 1.26\n"
 "Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
-"POT-Creation-Date: 2013-11-17 18:20+0200\n"
+"POT-Creation-Date: 2014-07-27 23:35+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"
@@ -99,7 +99,7 @@ msgstr "显示此帮助列表"
 msgid "give a short usage message"
 msgstr "显示简短的用法说明"
 
-#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606
+#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630
 #: tests/genfile.c:130
 msgid "NAME"
 msgstr "名称"
@@ -432,7 +432,7 @@ msgstr "GNU 软件的通用帮助: <http://www.gnu.org/gethelp/>\n"
 #. Directly translating this to another language will not work, first because
 #. %s itself is not translated.
 #. Translate it as `%s: Function %s failed'.
-#: lib/paxerror.c:58 lib/paxerror.c:71
+#: lib/paxerror.c:60 lib/paxerror.c:73
 #, c-format
 msgid "%s: Cannot %s"
 msgstr "%s：无法 %s"
@@ -441,54 +441,54 @@ msgstr "%s：无法 %s"
 #. Directly translating this to another language will not work, first because
 #. %s itself is not translated.
 #. Translate it as `%s: Function %s failed'.
-#: lib/paxerror.c:84
+#: lib/paxerror.c:86
 #, c-format
 msgid "%s: Warning: Cannot %s"
 msgstr "%s：警告：无法 %s"
 
-#: lib/paxerror.c:93
+#: lib/paxerror.c:95
 #, c-format
 msgid "%s: Cannot change mode to %s"
 msgstr "%s：无法将模式改为 %s"
 
-#: lib/paxerror.c:101
+#: lib/paxerror.c:103
 #, c-format
 msgid "%s: Cannot change ownership to uid %lu, gid %lu"
 msgstr "%s：无法将所有权改为 uid %lu，gid %lu"
 
-#: lib/paxerror.c:127
+#: lib/paxerror.c:129
 #, c-format
 msgid "%s: Cannot hard link to %s"
 msgstr "%s：无法硬连接到 %s"
 
-#: lib/paxerror.c:179 lib/paxerror.c:211
+#: lib/paxerror.c:181 lib/paxerror.c:213
 #, c-format
 msgid "%s: Read error at byte %s, while reading %lu byte"
 msgid_plural "%s: Read error at byte %s, while reading %lu bytes"
 msgstr[0] "%1$s：读入 %3$lu 字节时，在 %2$s 字节处发生读错误"
 
-#: lib/paxerror.c:192
+#: lib/paxerror.c:194
 #, c-format
 msgid "%s: Warning: Read error at byte %s, while reading %lu byte"
 msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes"
 msgstr[0] "%1$s：警告：读入 %3$lu 字节时，在 %2$s 字节处发生读错误"
 
-#: lib/paxerror.c:259
+#: lib/paxerror.c:261
 #, c-format
 msgid "%s: Cannot seek to %s"
 msgstr "%s：无法定位到 %s"
 
-#: lib/paxerror.c:275
+#: lib/paxerror.c:277
 #, c-format
 msgid "%s: Warning: Cannot seek to %s"
 msgstr "%s：警告：无法定位到 %s"
 
-#: lib/paxerror.c:284
+#: lib/paxerror.c:286
 #, c-format
 msgid "%s: Cannot create symlink to %s"
 msgstr "%s：无法创建到 %s 的符号连接"
 
-#: lib/paxerror.c:349
+#: lib/paxerror.c:351
 #, c-format
 msgid "%s: Wrote only %lu of %lu byte"
 msgid_plural "%s: Wrote only %lu of %lu bytes"
@@ -586,8 +586,8 @@ msgstr "参数异常"
 msgid "Manipulate a tape drive, accepting commands from a remote process"
 msgstr "接受远程程序的命令操作磁带机"
 
-#: 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
+#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643
+#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166
 msgid "NUMBER"
 msgstr "NUMBER"
 
@@ -595,10 +595,10 @@ msgstr "NUMBER"
 msgid "set debug level"
 msgstr "设定调试级别"
 
-#: 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
+#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713
+#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744
+#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180
+#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193
 msgid "FILE"
 msgstr "FILE"
 
@@ -620,101 +620,109 @@ msgstr "参数过多"
 msgid "Garbage command"
 msgstr "垃圾命令"
 
-#: 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/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373
+#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273
 #: src/update.c:188
 msgid "This does not look like a tar archive"
 msgstr "它似乎不像是一个 tar 归档文件"
 
-#: src/buffer.c:521 src/buffer.c:530
-msgid "Total bytes written"
-msgstr "总计写入字节数"
-
-#: src/buffer.c:528 src/buffer.c:542
+#: src/buffer.c:574
 msgid "Total bytes read"
 msgstr "总计读取字节数"
 
-#: src/buffer.c:532
-#, c-format
-msgid "Total bytes deleted: %s\n"
+#: src/buffer.c:576
+msgid "Total bytes written"
+msgstr "总计写入字节数"
+
+#: src/buffer.c:577
+#, fuzzy
+msgid "Total bytes deleted"
 msgstr "总计删除字节数：%s\n"
 
-#: src/buffer.c:621
+#: src/buffer.c:656
 msgid "(pipe)"
 msgstr "(管道)"
 
-#: src/buffer.c:644
+#: src/buffer.c:680
+msgid "Refusing to read archive contents from terminal (missing -f option?)"
+msgstr ""
+
+#: src/buffer.c:682
+msgid "Refusing to write archive contents to terminal (missing -f option?)"
+msgstr ""
+
+#: src/buffer.c:695
 msgid "Invalid value for record_size"
 msgstr "record_size 的无效值"
 
-#: src/buffer.c:647
+#: src/buffer.c:698
 msgid "No archive name given"
 msgstr "未给出归档文件名"
 
-#: src/buffer.c:689
+#: src/buffer.c:741
 msgid "Cannot verify stdin/stdout archive"
 msgstr "无法验证标准输入/标准输出归档文件"
 
-#: src/buffer.c:703
+#: src/buffer.c:754
 #, c-format
 msgid "Archive is compressed. Use %s option"
 msgstr "归档被压缩。使用 %s 选项"
 
-#: src/buffer.c:761 src/tar.c:2459
+#: src/buffer.c:812 src/tar.c:2541
 msgid "Cannot update compressed archives"
 msgstr "无法更新压缩归档文件"
 
-#: src/buffer.c:854
+#: src/buffer.c:905
 msgid "At beginning of tape, quitting now"
 msgstr "处于磁带的起点，现在退出"
 
-#: src/buffer.c:860
+#: src/buffer.c:911
 msgid "Too many errors, quitting"
 msgstr "错误过多，退出"
 
-#: src/buffer.c:893
+#: src/buffer.c:944
 #, c-format
 msgid "Record size = %lu block"
 msgid_plural "Record size = %lu blocks"
 msgstr[0] "记录大小 = %lu 块"
 
-#: src/buffer.c:914
+#: src/buffer.c:965
 #, c-format
 msgid "Unaligned block (%lu byte) in archive"
 msgid_plural "Unaligned block (%lu bytes) in archive"
 msgstr[0] "归档中未对齐的块 (%lu 字节)s"
 
-#: src/buffer.c:991
+#: src/buffer.c:1042
 msgid "Cannot backspace archive file; it may be unreadable without -i"
 msgstr "无法倒回归档文件；如果没有 -i 可能无法读入它"
 
-#: src/buffer.c:1023
+#: src/buffer.c:1074
 msgid "rmtlseek not stopped at a record boundary"
 msgstr "rmtlseek 未停在记录边界处"
 
-#: src/buffer.c:1074
+#: src/buffer.c:1125
 #, c-format
 msgid "%s: contains invalid volume number"
 msgstr "%s：包含无效的卷编号"
 
-#: src/buffer.c:1109
+#: src/buffer.c:1160
 msgid "Volume number overflow"
 msgstr "卷编号溢出"
 
-#: src/buffer.c:1124
+#: src/buffer.c:1175
 #, c-format
 msgid "Prepare volume #%d for %s and hit return: "
 msgstr "为 %2$s 准备卷 #%1$d 并按回车："
 
-#: src/buffer.c:1130
+#: src/buffer.c:1181
 msgid "EOF where user reply was expected"
 msgstr "需得到用户应答时文件结束"
 
-#: src/buffer.c:1135 src/buffer.c:1167
+#: src/buffer.c:1186 src/buffer.c:1218
 msgid "WARNING: Archive is incomplete"
 msgstr "警告：归档文件不完整"
 
-#: src/buffer.c:1149
+#: src/buffer.c:1200
 #, c-format
 msgid ""
 " n name        Give a new file name for the next (and subsequent) volume(s)\n"
@@ -725,71 +733,71 @@ msgstr ""
 " q\t\t终止 tar\n"
 " y or newline\t继续操作\n"
 
-#: src/buffer.c:1154
+#: src/buffer.c:1205
 #, c-format
 msgid " !             Spawn a subshell\n"
 msgstr " !             衍生出一个子 shell\n"
 
-#: src/buffer.c:1155
+#: src/buffer.c:1206
 #, c-format
 msgid " ?             Print this list\n"
 msgstr " ?             打印此列表\n"
 
-#: src/buffer.c:1162
+#: src/buffer.c:1213
 msgid "No new volume; exiting.\n"
 msgstr "没有新的卷；退出。\n"
 
-#: src/buffer.c:1195
+#: src/buffer.c:1246
 msgid "File name not specified. Try again.\n"
 msgstr "未指定文件名。重试。\n"
 
-#: src/buffer.c:1208
+#: src/buffer.c:1259
 #, c-format
 msgid "Invalid input. Type ? for help.\n"
 msgstr "无效输入。输入 ? 显示帮助。\n"
 
-#: src/buffer.c:1259
+#: src/buffer.c:1310
 #, c-format
 msgid "%s command failed"
 msgstr "%s 命令失败"
 
-#: src/buffer.c:1440
+#: src/buffer.c:1491
 #, c-format
 msgid "%s is possibly continued on this volume: header contains truncated name"
 msgstr "%s 在本卷可能连续: 头部包含截短的名字"
 
-#: src/buffer.c:1444
+#: src/buffer.c:1495
 #, c-format
 msgid "%s is not continued on this volume"
 msgstr "%s 在本卷中不连续"
 
-#: src/buffer.c:1458
+#: src/buffer.c:1509
 #, c-format
 msgid "%s is the wrong size (%s != %s + %s)"
 msgstr "%s 的大小错误 (%s != %s + %s)"
 
-#: src/buffer.c:1473
+#: src/buffer.c:1524
 #, c-format
 msgid "This volume is out of sequence (%s - %s != %s)"
 msgstr "此卷次序有误（%s - %s != %s）"
 
-#: src/buffer.c:1551 src/buffer.c:1577
+#: src/buffer.c:1602 src/buffer.c:1628
 #, c-format
 msgid "Archive not labeled to match %s"
 msgstr "归档未被标记为匹配 %s"
 
-#: src/buffer.c:1581
+#: src/buffer.c:1632
 #, c-format
 msgid "Volume %s does not match %s"
 msgstr "卷标 %s 不匹配 %s"
 
-#: src/buffer.c:1675
+#: src/buffer.c:1726
 #, c-format
 msgid ""
 "%s: file name too long to be stored in a GNU multivolume header, truncated"
 msgstr "%s: 文件名太长而无法贮存在 GNU 多卷头，已被截短"
 
-#: src/buffer.c:1866
+#: src/buffer.c:1917
 msgid "write did not end on a block boundary"
 msgstr "写操作未在记录边界处终止"
 
@@ -799,16 +807,16 @@ 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:106 src/compare.c:388
+#: src/compare.c:106 src/compare.c:391
 msgid "Contents differ"
 msgstr "内容不同"
 
-#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458
-#: src/list.c:1394 src/xheader.c:836
+#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487
+#: src/list.c:1426 src/xheader.c:837
 msgid "Unexpected EOF in archive"
 msgstr "归档文件中异常的 EOF"
 
-#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412
+#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415
 msgid "File type differs"
 msgstr "文件类型不同"
 
@@ -828,7 +836,7 @@ msgstr "Gid 不同"
 msgid "Mod time differs"
 msgstr "修改时间不同"
 
-#: src/compare.c:216 src/compare.c:422
+#: src/compare.c:216 src/compare.c:425
 msgid "Size differs"
 msgstr "大小不同"
 
@@ -845,35 +853,35 @@ msgstr "符号连接不同"
 msgid "Device number differs"
 msgstr "设备号不同"
 
-#: src/compare.c:464
+#: src/compare.c:466
 #, c-format
 msgid "Verify "
 msgstr "校验"
 
-#: src/compare.c:471
+#: src/compare.c:473
 #, fuzzy, c-format
 msgid "%s: Unknown file type '%c', diffed as normal file"
 msgstr "%s：未知的文件类型“%c”，与普通文件不同"
 
-#: src/compare.c:527
+#: src/compare.c:529
 msgid "Archive contains file names with leading prefixes removed."
 msgstr "归档包含带有被移除前导字符的文件名。"
 
-#: src/compare.c:533
+#: src/compare.c:535
 msgid "Archive contains transformed file names."
 msgstr "归档中有文件被改名。"
 
-#: src/compare.c:538
+#: src/compare.c:540
 msgid "Verification may fail to locate original files."
 msgstr "位于原始文件中的验证可能失败。"
 
-#: src/compare.c:612
+#: src/compare.c:614
 #, c-format
 msgid "VERIFY FAILURE: %d invalid header detected"
 msgid_plural "VERIFY FAILURE: %d invalid headers detected"
 msgstr[0] "校验失败：检测到 %d 个无效的头"
 
-#: src/compare.c:630 src/list.c:221
+#: src/compare.c:632 src/list.c:250
 #, c-format
 msgid "A lone zero block at %s"
 msgstr "在 %s 处一个单独的零块"
@@ -918,55 +926,55 @@ 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:1180
+#: src/create.c:1182
 #, c-format
 msgid "%s: file is on a different filesystem; not dumped"
 msgstr "%s：文件在不同的文件系统上；未输出"
 
-#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617
+#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617
 msgid "contents not dumped"
 msgstr "未输出内容"
 
-#: src/create.c:1438
+#: src/create.c:1440
 #, c-format
 msgid "%s: Unknown file type; file ignored"
 msgstr "%s：未知的文件类型；忽略文件"
 
-#: src/create.c:1549
+#: src/create.c:1551
 #, c-format
 msgid "Missing links to %s."
 msgstr "缺少到 %s 的连接。"
 
-#: src/create.c:1710
+#: src/create.c:1712
 #, c-format
 msgid "%s: file is unchanged; not dumped"
 msgstr "%s: 文件未改变；未输出"
 
-#: src/create.c:1719
+#: src/create.c:1721
 #, c-format
 msgid "%s: file is the archive; not dumped"
 msgstr "%s: 文件是归档文件；未输出"
 
-#: src/create.c:1747 src/incremen.c:603
+#: src/create.c:1749 src/incremen.c:603
 msgid "directory not dumped"
 msgstr "未输出目录"
 
-#: src/create.c:1819
+#: src/create.c:1821
 #, c-format
 msgid "%s: file changed as we read it"
 msgstr "%s: 在我们读入文件时文件发生了变化"
 
-#: src/create.c:1900
+#: src/create.c:1902
 #, c-format
 msgid "%s: socket ignored"
 msgstr "%s: 忽略套接字(socket)"
 
-#: src/create.c:1906
+#: src/create.c:1908
 #, c-format
 msgid "%s: door ignored"
 msgstr "%s: 忽略权限"
 
-#: src/delete.c:218 src/list.c:258 src/update.c:193
+#: src/delete.c:218 src/list.c:287 src/update.c:193
 msgid "Skipping to next header"
 msgstr "跳转到下一个头"
 
@@ -1012,7 +1020,7 @@ msgstr "正试图将符号连接展开为硬连接"
 msgid "%s: Cannot extract -- file is continued from another volume"
 msgstr "%s：无法展开 -- 文件一直延伸至另一卷中"
 
-#: src/extract.c:1535 src/list.c:1135
+#: src/extract.c:1535 src/list.c:1167
 msgid "Unexpected long name header"
 msgstr "异常的长名字头部"
 
@@ -1056,250 +1064,250 @@ msgstr "%s：文件在不同的文件系统上；未输出"
 msgid "%s: Directory has been renamed"
 msgstr "%s：目录已被改名"
 
-#: src/incremen.c:1001 src/incremen.c:1016
+#: src/incremen.c:1003 src/incremen.c:1018
 msgid "Invalid time stamp"
 msgstr "无效的时间戳"
 
-#: src/incremen.c:1045
+#: src/incremen.c:1047
 #, fuzzy
 msgid "Invalid modification time"
 msgstr "无效的修改时间(秒)"
 
-#: src/incremen.c:1055
+#: src/incremen.c:1057
 msgid "Invalid modification time (nanoseconds)"
 msgstr "无效的修改时间(纳秒)"
 
-#: src/incremen.c:1071
+#: src/incremen.c:1073
 msgid "Invalid device number"
 msgstr "无效的设备号"
 
-#: src/incremen.c:1079
+#: src/incremen.c:1081
 msgid "Invalid inode number"
 msgstr "无效的 inode 号"
 
-#: src/incremen.c:1135
+#: src/incremen.c:1137
 #, c-format
 msgid "%s: byte %s: %s %.*s... too long"
 msgstr ""
 
-#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268
+#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270
 msgid "Unexpected EOF in snapshot file"
 msgstr "目录文件中异常的文件结尾(EOF)"
 
-#: src/incremen.c:1157
+#: src/incremen.c:1159
 #, c-format
 msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x"
 msgstr ""
 
-#: src/incremen.c:1169
+#: src/incremen.c:1171
 #, c-format
 msgid ""
 "%s: byte %s: (valid range %s..%s)\n"
 "\t%s %s"
 msgstr ""
 
-#: src/incremen.c:1176
+#: src/incremen.c:1178
 #, c-format
 msgid "%s: byte %s: %s %s"
 msgstr ""
 
-#: src/incremen.c:1257
+#: src/incremen.c:1259
 #, c-format
 msgid "%s: byte %s: %s"
 msgstr ""
 
-#: src/incremen.c:1260
+#: src/incremen.c:1262
 msgid "Missing record terminator"
 msgstr "缺少记录终止符"
 
-#: src/incremen.c:1366 src/incremen.c:1369
+#: src/incremen.c:1368 src/incremen.c:1371
 msgid "Bad incremental file format"
 msgstr "文件格式错误增量"
 
-#: src/incremen.c:1388
+#: src/incremen.c:1390
 #, c-format
 msgid "Unsupported incremental format version: %<PRIuMAX>"
 msgstr "不支持增量格式版本: %<PRIuMAX>"
 
-#: src/incremen.c:1543
+#: src/incremen.c:1545
 #, c-format
 msgid "Malformed dumpdir: expected '%c' but found %#3o"
 msgstr "错误的 dumpdir: 需要“%c”但实际为 %#3o"
 
-#: src/incremen.c:1553
+#: src/incremen.c:1555
 msgid "Malformed dumpdir: 'X' duplicated"
 msgstr "错误的 dumpdir: 重复的“X”"
 
-#: src/incremen.c:1566
+#: src/incremen.c:1568
 msgid "Malformed dumpdir: empty name in 'R'"
 msgstr "错误的 dumpdir: “R”中有空名字"
 
-#: src/incremen.c:1579
+#: src/incremen.c:1581
 msgid "Malformed dumpdir: 'T' not preceeded by 'R'"
 msgstr "错误的 dumpdir: “R”后未紧接着用“T”"
 
-#: src/incremen.c:1585
+#: src/incremen.c:1587
 msgid "Malformed dumpdir: empty name in 'T'"
 msgstr "错误的 dumpdir: “T”中有空名字"
 
-#: src/incremen.c:1605
+#: src/incremen.c:1607
 #, c-format
 msgid "Malformed dumpdir: expected '%c' but found end of data"
 msgstr "错误的 dumpdir: 需要“%c”但实际为数据结尾"
 
-#: src/incremen.c:1612
+#: src/incremen.c:1614
 msgid "Malformed dumpdir: 'X' never used"
 msgstr "错误的 dumpdir: 从未用过“X”"
 
-#: src/incremen.c:1656
+#: src/incremen.c:1658
 #, c-format
 msgid "Cannot create temporary directory using template %s"
 msgstr "无法通过模板 %s 创建临时目录"
 
-#: src/incremen.c:1717
+#: src/incremen.c:1719
 #, c-format
 msgid "%s: Not purging directory: unable to stat"
 msgstr "%s：未清除目录：无法 stat"
 
-#: src/incremen.c:1730
+#: src/incremen.c:1732
 #, c-format
 msgid "%s: directory is on a different device: not purging"
 msgstr "%s: 目录在不同的设备上: 未清除"
 
-#: src/incremen.c:1738
+#: src/incremen.c:1740
 #, c-format
 msgid "%s: Deleting %s\n"
 msgstr "%s：正在删除 %s\n"
 
-#: src/incremen.c:1743
+#: src/incremen.c:1745
 #, c-format
 msgid "%s: Cannot remove"
 msgstr "%s：无法删除"
 
-#: src/list.c:189
+#: src/list.c:217
 #, c-format
 msgid "%s: Omitting"
 msgstr "%s：忽略"
 
-#: src/list.c:206
+#: src/list.c:235
 #, c-format
 msgid "block %s: ** Block of NULs **\n"
 msgstr "块 %s：** 空块 **\n"
 
-#: src/list.c:232
+#: src/list.c:261
 #, c-format
 msgid "block %s: ** End of File **\n"
 msgstr "块 %s：** 文件结束 **\n"
 
-#: src/list.c:255 src/list.c:1107 src/list.c:1362
+#: src/list.c:284 src/list.c:1136 src/list.c:1394
 #, c-format
 msgid "block %s: "
 msgstr "块 %s："
 
 #. TRANSLATORS: %s is type of the value (gid_t, uid_t,
 #. etc.)
-#: src/list.c:722
+#: src/list.c:751
 #, 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:777
+#: src/list.c:806
 #, 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:788
+#: src/list.c:817
 #, c-format
 msgid "Archive octal value %.*s is out of %s range"
 msgstr "归档八进制值 %.*s 超出 %s 的范围"
 
-#: src/list.c:809
+#: src/list.c:838
 msgid "Archive contains obsolescent base-64 headers"
 msgstr "归档包含过时的 base-64 头"
 
-#: src/list.c:823
+#: src/list.c:852
 #, c-format
 msgid "Archive signed base-64 string %s is out of %s range"
 msgstr "归档签署的 base-64 字符串 %s 超出范围 %s"
 
-#: src/list.c:854
+#: src/list.c:883
 #, 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:883
+#: src/list.c:912
 #, 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:905
+#: src/list.c:934
 #, c-format
 msgid "Archive value %s is out of %s range %s..%s"
 msgstr "归档值 %s 超出 %s 的范围 %s..%s"
 
-#: src/list.c:1262
+#: src/list.c:1294
 #, c-format
 msgid " link to %s\n"
 msgstr " 连接到 %s\n"
 
-#: src/list.c:1270
+#: src/list.c:1302
 #, c-format
 msgid " unknown file type %s\n"
 msgstr " 未知的文件类型 %s\n"
 
-#: src/list.c:1288
+#: src/list.c:1320
 #, c-format
 msgid "--Long Link--\n"
 msgstr "--长连接--\n"
 
-#: src/list.c:1292
+#: src/list.c:1324
 #, c-format
 msgid "--Long Name--\n"
 msgstr "--长名--\n"
 
-#: src/list.c:1296
+#: src/list.c:1328
 #, c-format
 msgid "--Volume Header--\n"
 msgstr "--卷头--\n"
 
-#: src/list.c:1304
+#: src/list.c:1336
 #, c-format
 msgid "--Continued at byte %s--\n"
 msgstr "--从 %s 字节继续--\n"
 
-#: src/list.c:1367
+#: src/list.c:1399
 msgid "Creating directory:"
 msgstr "正在创建目录："
 
-#: src/misc.c:725
+#: src/misc.c:726
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "将 %s 改名为 %s\n"
 
-#: src/misc.c:734 src/misc.c:753
+#: src/misc.c:735 src/misc.c:754
 #, c-format
 msgid "%s: Cannot rename to %s"
 msgstr "%s：无法重命名为 %s"
 
-#: src/misc.c:758
+#: src/misc.c:759
 #, c-format
 msgid "Renaming %s back to %s\n"
 msgstr "将 %s 的名字改回 %s\n"
 
-#: src/misc.c:1100
+#: src/misc.c:1101
 #, c-format
 msgid "%s: File removed before we read it"
 msgstr "%s：文件在我们读入之前被删除了"
 
-#: src/misc.c:1121
+#: src/misc.c:1122
 msgid "child process"
 msgstr "子进程"
 
-#: src/misc.c:1130
+#: src/misc.c:1131
 msgid "interprocess channel"
 msgstr "进程内通道"
 
@@ -1313,7 +1321,7 @@ msgstr "%s 命令失败"
 msgid "%s: file list requested from %s already read from %s"
 msgstr "%s: 文件列表已经读取"
 
-#: src/names.c:448
+#: src/names.c:448 src/checkpoint.c:274
 #, fuzzy, c-format
 msgid "cannot split string '%s': %s"
 msgstr "无法设定“%s”的时间"
@@ -1323,61 +1331,61 @@ msgstr "无法设定“%s”的时间"
 msgid "%s: file name read contains nul character"
 msgstr "%s: 读取的文件名含有空字符"
 
-#: src/names.c:823
+#: src/names.c:824
 msgid "Pattern matching characters used in file names"
 msgstr "文件名中所使用的字符匹配模式"
 
-#: src/names.c:825
+#: src/names.c:826
 msgid ""
 "Use --wildcards to enable pattern matching, or --no-wildcards to suppress "
 "this warning"
 msgstr "使用 --wildcards 打开模式匹配，或是 --no-wildcards 来关闭之"
 
-#: src/names.c:843 src/names.c:859
+#: src/names.c:844 src/names.c:860
 #, c-format
 msgid "%s: Not found in archive"
 msgstr "%s：归档中找不到"
 
-#: src/names.c:844
+#: src/names.c:845
 #, c-format
 msgid "%s: Required occurrence not found in archive"
 msgstr "%s：没有在归档中找到需要的"
 
-#: src/names.c:878
+#: src/names.c:879
 #, c-format
 msgid "Archive label mismatch"
 msgstr "归档卷标不匹配"
 
-#: src/names.c:1182
+#: src/names.c:1183
 msgid ""
 "Using -C option inside file list is not allowed with --listed-incremental"
 msgstr "在文件列表中 -C 选项与 --listed-incremental 选项不许合用"
 
-#: src/names.c:1188
+#: src/names.c:1189
 msgid "Only one -C option is allowed with --listed-incremental"
 msgstr "仅一个 -C 选项允许与  --listed-incremental 合用"
 
-#: src/tar.c:86
+#: src/tar.c:87
 #, fuzzy, c-format
-msgid "Options '-%s' and '-%s' both want standard input"
+msgid "Options '%s' and '%s' both want standard input"
 msgstr "选项“-%s”和“-%s”都需要标准输出"
 
-#: src/tar.c:163
+#: src/tar.c:164
 #, c-format
 msgid "%s: Invalid archive format"
 msgstr "%s：无效的归档格式"
 
-#: src/tar.c:187
+#: src/tar.c:196
 msgid "GNU features wanted on incompatible archive format"
 msgstr "在不兼容的归档格式上需要 GNU 特征"
 
-#: src/tar.c:255
+#: src/tar.c:264
 #, fuzzy, c-format
 msgid ""
 "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list."
 msgstr "未知的引用形式‘%s’。尝试用‘%s --quoting-style=help’获取列表。"
 
-#: src/tar.c:364
+#: src/tar.c:378
 #, fuzzy
 msgid ""
 "GNU 'tar' saves many files together into a single tape or disk archive, and "
@@ -1398,7 +1406,7 @@ msgstr ""
 "件。\n"
 "  tar -xf archive.tar          # 展开归档文件 archive.tar 中的所有文件。\n"
 
-#: src/tar.c:373
+#: src/tar.c:387
 #, fuzzy
 msgid ""
 "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n"
@@ -1418,79 +1426,79 @@ msgstr ""
 "  nil, existing   如果编号备份存在则进行编号备份，否则进行简单备份\n"
 "  never, simple   总是使用简单备份\n"
 
-#: src/tar.c:403
+#: src/tar.c:417
 msgid "Main operation mode:"
 msgstr "主操作模式:"
 
-#: src/tar.c:406
+#: src/tar.c:420
 msgid "list the contents of an archive"
 msgstr "列出归档内容"
 
-#: src/tar.c:408
+#: src/tar.c:422
 msgid "extract files from an archive"
 msgstr "从归档中解出文件"
 
-#: src/tar.c:411
+#: src/tar.c:425
 msgid "create a new archive"
 msgstr "创建一个新归档"
 
-#: src/tar.c:413
+#: src/tar.c:427
 msgid "find differences between archive and file system"
 msgstr "找出归档和文件系统的差异"
 
-#: src/tar.c:416
+#: src/tar.c:430
 msgid "append files to the end of an archive"
 msgstr "追加文件至归档结尾"
 
-#: src/tar.c:418
+#: src/tar.c:432
 msgid "only append files newer than copy in archive"
 msgstr "仅追加比归档中副本更新的文件"
 
-#: src/tar.c:420
+#: src/tar.c:434
 msgid "append tar files to an archive"
 msgstr "追加 tar 文件至归档"
 
-#: src/tar.c:423
+#: src/tar.c:437
 msgid "delete from the archive (not on mag tapes!)"
 msgstr "从归档(非磁带！)中删除"
 
-#: src/tar.c:425
+#: src/tar.c:439
 msgid "test the archive volume label and exit"
 msgstr "测试归档卷标并退出"
 
-#: src/tar.c:430
+#: src/tar.c:444
 msgid "Operation modifiers:"
 msgstr "操作修饰符:"
 
-#: src/tar.c:433
+#: src/tar.c:447
 msgid "handle sparse files efficiently"
 msgstr "高效处理离散文件"
 
-#: src/tar.c:434
+#: src/tar.c:448
 msgid "MAJOR[.MINOR]"
 msgstr "MAJOR[.MINOR]"
 
-#: src/tar.c:435
+#: src/tar.c:449
 msgid "set version of the sparse format to use (implies --sparse)"
 msgstr "设置所用的离散格式版本(隐含 --sparse)"
 
-#: src/tar.c:437
+#: src/tar.c:451
 msgid "handle old GNU-format incremental backup"
 msgstr "处理老式的 GNU 格式的增量备份"
 
-#: src/tar.c:439
+#: src/tar.c:453
 msgid "handle new GNU-format incremental backup"
 msgstr "处理新式的 GNU 格式的增量备份"
 
-#: src/tar.c:441
+#: src/tar.c:455
 msgid "dump level for created listed-incremental archive"
 msgstr "所创建的增量列表归档的输出级别"
 
-#: src/tar.c:443
+#: src/tar.c:457
 msgid "do not exit with nonzero on unreadable files"
 msgstr "当遇上不可读文件时不要以非零值退出"
 
-#: src/tar.c:445
+#: src/tar.c:459
 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, --"
@@ -1501,130 +1509,138 @@ msgstr ""
 "extract 或是 --list 中的一个联合使用时，此选项才有效。而且不管文件列表是以命"
 "令行形式给出或是通过 -T 选项指定的；NUMBER 值默认为 1"
 
-#: src/tar.c:451
+#: src/tar.c:465
 msgid "archive is seekable"
 msgstr "归档可检索"
 
-#: src/tar.c:453
+#: src/tar.c:467
 msgid "archive is not seekable"
 msgstr "归档不可检索"
 
-#: src/tar.c:455
+#: src/tar.c:469
 msgid "do not check device numbers when creating incremental archives"
 msgstr "当创建增量归档时不要检查设备号"
 
-#: src/tar.c:458
+#: src/tar.c:472
 msgid "check device numbers when creating incremental archives (default)"
 msgstr "当创建增量归档时检查设备号(默认)"
 
-#: src/tar.c:464
+#: src/tar.c:478
 msgid "Overwrite control:"
 msgstr "重写控制:"
 
-#: src/tar.c:467
+#: src/tar.c:481
 msgid "attempt to verify the archive after writing it"
 msgstr "在写入以后尝试校验归档"
 
-#: src/tar.c:469
+#: src/tar.c:483
 msgid "remove files after adding them to the archive"
 msgstr "在添加文件至归档后删除它们"
 
-#: src/tar.c:471
+#: src/tar.c:485
 #, fuzzy
 msgid "don't replace existing files when extracting, treat them as errors"
 msgstr "解压时不要替换存在的文件"
 
-#: src/tar.c:474
+#: src/tar.c:488
 #, fuzzy
 msgid "don't replace existing files when extracting, silently skip over them"
 msgstr "解压时不要替换存在的文件"
 
-#: src/tar.c:477
+#: src/tar.c:491
 msgid "don't replace existing files that are newer than their archive copies"
 msgstr "不要替换比归档中副本更新的已存在的文件"
 
-#: src/tar.c:479
+#: src/tar.c:493
 msgid "overwrite existing files when extracting"
 msgstr "解压时重写存在的文件"
 
-#: src/tar.c:481
+#: src/tar.c:495
 msgid "remove each file prior to extracting over it"
 msgstr "在解压要重写的文件之前先删除它们"
 
-#: src/tar.c:483
+#: src/tar.c:497
 msgid "empty hierarchies prior to extracting directory"
 msgstr "解压目录之前先清除目录层次"
 
-#: src/tar.c:485
+#: src/tar.c:499
 msgid "preserve metadata of existing directories"
 msgstr "保留已存在目录的元数据"
 
-#: src/tar.c:487
+#: src/tar.c:501
 msgid "overwrite metadata of existing directories when extracting (default)"
 msgstr "解压时重写已存在目录的元数据(默认)"
 
-#: src/tar.c:490
+#: src/tar.c:504
 #, fuzzy
 msgid "preserve existing symlinks to directories when extracting"
 msgstr "解压时重写存在的文件"
 
-#: src/tar.c:496
+#: src/tar.c:506 src/tar.c:711
+msgid "DIR"
+msgstr "DIR"
+
+#: src/tar.c:507
+msgid "create a subdirectory to avoid having loose files extracted"
+msgstr ""
+
+#: src/tar.c:513
 msgid "Select output stream:"
 msgstr "选择输出流:"
 
-#: src/tar.c:499
+#: src/tar.c:516
 msgid "extract files to standard output"
 msgstr "解压文件至标准输出"
 
-#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190
+#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190
 msgid "COMMAND"
 msgstr "COMMAND"
 
-#: src/tar.c:501
+#: src/tar.c:518
 msgid "pipe extracted files to another program"
 msgstr "将解压的文件通过管道传送至另一个程序"
 
-#: src/tar.c:503
+#: src/tar.c:520
 msgid "ignore exit codes of children"
 msgstr "忽略子进程的退出代码"
 
-#: src/tar.c:505
+#: src/tar.c:522
 msgid "treat non-zero exit codes of children as error"
 msgstr "将子进程的非零退出代码认为发生错误"
 
-#: src/tar.c:510
+#: src/tar.c:527
 msgid "Handling of file attributes:"
 msgstr "操作文件属性:"
 
-#: src/tar.c:513
+#: src/tar.c:530
 msgid "force NAME as owner for added files"
 msgstr "强制将 NAME 作为所添加的文件的所有者"
 
-#: src/tar.c:515
+#: src/tar.c:532
 msgid "force NAME as group for added files"
 msgstr "强制将 NAME 作为所添加的文件的组所有者"
 
-#: src/tar.c:516 src/tar.c:736
+#: src/tar.c:533 src/tar.c:768
 msgid "DATE-OR-FILE"
 msgstr "DATE-OR-FILE"
 
-#: src/tar.c:517
+#: src/tar.c:534
 msgid "set mtime for added files from DATE-OR-FILE"
 msgstr "从 DATE-OR-FILE 中为添加的文件设置 mtime"
 
-#: src/tar.c:518
+#: src/tar.c:535
 msgid "CHANGES"
 msgstr "CHANGES"
 
-#: src/tar.c:519
+#: src/tar.c:536
 msgid "force (symbolic) mode CHANGES for added files"
 msgstr "强制将所添加的文件(符号)更改为权限 CHANGES"
 
-#: src/tar.c:521
+#: src/tar.c:538
 msgid "METHOD"
 msgstr "METHOD"
 
-#: src/tar.c:522
+#: src/tar.c:539
 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 "
@@ -1633,487 +1649,507 @@ msgstr ""
 "在输出的文件上保留访问时间，要么通过在读取(默认 METHOD=‘replace’)后还原时间，"
 "要不就不要在第一次(METHOD=‘system’)设置时间"
 
-#: src/tar.c:526
+#: src/tar.c:543
 msgid "don't extract file modified time"
 msgstr "不要解压文件的修改时间"
 
-#: src/tar.c:528
+#: src/tar.c:545
 msgid ""
 "try extracting files with the same ownership as exists in the archive "
 "(default for superuser)"
 msgstr "尝试解压时保持所有者关系一致(超级用户默认此项)"
 
-#: src/tar.c:530
+#: src/tar.c:547
 msgid "extract files as yourself (default for ordinary users)"
 msgstr "将文件解压为您所有(普通用户默认此项)"
 
-#: src/tar.c:532
+#: src/tar.c:549
 msgid "always use numbers for user/group names"
 msgstr "总是以数字代表用户/组的名称"
 
-#: src/tar.c:534
+#: src/tar.c:551
 msgid "extract information about file permissions (default for superuser)"
 msgstr "解压文件权限信息(默认只为超级用户服务)"
 
-#: src/tar.c:538
+#: src/tar.c:555
 msgid ""
 "apply the user's umask when extracting permissions from the archive (default "
 "for ordinary users)"
 msgstr "从归档中解压权限时使用用户的掩码位(默认为普通用户服务)"
 
-#: src/tar.c:540
+#: src/tar.c:557
 msgid ""
 "member arguments are listed in the same order as the files in the archive"
 msgstr ""
 
-#: src/tar.c:544
+#: src/tar.c:561
 msgid "same as both -p and -s"
 msgstr "与 -p 和 -s 一样"
 
-#: src/tar.c:546
+#: src/tar.c:563
 msgid ""
 "delay setting modification times and permissions of extracted directories "
 "until the end of extraction"
 msgstr "直到解压结束才设置修改时间和所解目录的权限"
 
-#: src/tar.c:549
+#: src/tar.c:566
 msgid "cancel the effect of --delay-directory-restore option"
 msgstr "取消 --delay-directory-restore 选项的效果"
 
-#: src/tar.c:554
+#: src/tar.c:567
+msgid "ORDER"
+msgstr ""
+
+#: src/tar.c:571
+msgid "directory sorting order: none (default) or name"
+msgstr ""
+
+#: src/tar.c:578
 #, fuzzy
 msgid "Handling of extended file attributes:"
 msgstr "操作文件属性:"
 
-#: src/tar.c:557
+#: src/tar.c:581
 msgid "Enable extended attributes support"
 msgstr ""
 
-#: src/tar.c:559
+#: src/tar.c:583
 msgid "Disable extended attributes support"
 msgstr ""
 
-#: src/tar.c:560 src/tar.c:562
+#: src/tar.c:584 src/tar.c:586
 msgid "MASK"
 msgstr ""
 
-#: src/tar.c:561
+#: src/tar.c:585
 msgid "specify the include pattern for xattr keys"
 msgstr ""
 
-#: src/tar.c:563
+#: src/tar.c:587
 msgid "specify the exclude pattern for xattr keys"
 msgstr ""
 
-#: src/tar.c:565
+#: src/tar.c:589
 msgid "Enable the SELinux context support"
 msgstr ""
 
-#: src/tar.c:567
+#: src/tar.c:591
 msgid "Disable the SELinux context support"
 msgstr ""
 
-#: src/tar.c:569
+#: src/tar.c:593
 msgid "Enable the POSIX ACLs support"
 msgstr ""
 
-#: src/tar.c:571
+#: src/tar.c:595
 msgid "Disable the POSIX ACLs support"
 msgstr ""
 
-#: src/tar.c:576
+#: src/tar.c:600
 msgid "Device selection and switching:"
 msgstr "设备选择和切换:"
 
-#: src/tar.c:578
+#: src/tar.c:602
 msgid "ARCHIVE"
 msgstr "ARCHIVE"
 
-#: src/tar.c:579
+#: src/tar.c:603
 msgid "use archive file or device ARCHIVE"
 msgstr "使用归档文件或 ARCHIVE 设备"
 
-#: src/tar.c:581
+#: src/tar.c:605
 msgid "archive file is local even if it has a colon"
 msgstr "即使归档文件存在副本还是把它认为是本地归档"
 
-#: src/tar.c:583
+#: src/tar.c:607
 msgid "use given rmt COMMAND instead of rmt"
 msgstr "使用指定的 rmt COMMAND 代替 rmt"
 
-#: src/tar.c:585
+#: src/tar.c:609
 msgid "use remote COMMAND instead of rsh"
 msgstr "使用远程 COMMAND 代替 rsh"
 
-#: src/tar.c:589
+#: src/tar.c:613
 msgid "specify drive and density"
 msgstr "指定驱动器和压缩率"
 
-#: src/tar.c:603
+#: src/tar.c:627
 msgid "create/list/extract multi-volume archive"
 msgstr "创建/列出/解压多卷归档文件"
 
-#: src/tar.c:605
+#: src/tar.c:629
 msgid "change tape after writing NUMBER x 1024 bytes"
 msgstr "写入 NUMBER × 1024 字节后更换磁带"
 
-#: src/tar.c:607
+#: src/tar.c:631
 msgid "run script at end of each tape (implies -M)"
 msgstr "在每卷磁带最后运行脚本(隐含 -M)"
 
-#: src/tar.c:610
+#: src/tar.c:634
 msgid "use/update the volume number in FILE"
 msgstr "使用/更新 FILE 中的卷数"
 
-#: src/tar.c:615
+#: src/tar.c:639
 msgid "Device blocking:"
 msgstr "设备分块:"
 
-#: src/tar.c:617
+#: src/tar.c:641
 msgid "BLOCKS"
 msgstr "BLOCKS"
 
-#: src/tar.c:618
+#: src/tar.c:642
 msgid "BLOCKS x 512 bytes per record"
 msgstr "每个记录 BLOCKS x 512 字节"
 
-#: src/tar.c:620
+#: src/tar.c:644
 msgid "NUMBER of bytes per record, multiple of 512"
 msgstr "每个记录的字节数 NUMBER，乘以 512"
 
-#: src/tar.c:622
+#: src/tar.c:646
 msgid "ignore zeroed blocks in archive (means EOF)"
 msgstr "忽略归档中的零字节块(即文件结尾)"
 
-#: src/tar.c:624
+#: src/tar.c:648
 msgid "reblock as we read (for 4.2BSD pipes)"
 msgstr "读取时重新分块(只对 4.2BSD 管道有效)"
 
-#: src/tar.c:629
+#: src/tar.c:653
 msgid "Archive format selection:"
 msgstr "选择归档格式:"
 
-#: src/tar.c:631 tests/genfile.c:153
+#: src/tar.c:655 tests/genfile.c:153
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: src/tar.c:632
+#: src/tar.c:656
 msgid "create archive of the given format"
 msgstr "创建指定格式的归档"
 
-#: src/tar.c:634
+#: src/tar.c:658
 msgid "FORMAT is one of the following:"
 msgstr "FORMAT 是以下格式中的一种:"
 
-#: src/tar.c:635
+#: src/tar.c:659
 msgid "old V7 tar format"
 msgstr "old V7 tar 格式"
 
-#: src/tar.c:638
+#: src/tar.c:662
 msgid "GNU format as per tar <= 1.12"
 msgstr "GNU 格式 as per tar <= 1.12"
 
-#: src/tar.c:640
+#: src/tar.c:664
 msgid "GNU tar 1.13.x format"
 msgstr "GNU tar 1.13.x 格式"
 
-#: src/tar.c:642
+#: src/tar.c:666
 msgid "POSIX 1003.1-1988 (ustar) format"
 msgstr "POSIX 1003.1-1988 (ustar) 格式"
 
-#: src/tar.c:644
+#: src/tar.c:668
 msgid "POSIX 1003.1-2001 (pax) format"
 msgstr "POSIX 1003.1-2001 (pax) 格式"
 
-#: src/tar.c:645
+#: src/tar.c:669
 msgid "same as pax"
 msgstr "等同于 pax"
 
-#: src/tar.c:648
+#: src/tar.c:672
 msgid "same as --format=v7"
 msgstr "等同于 --format=v7"
 
-#: src/tar.c:651
+#: src/tar.c:675
 msgid "same as --format=posix"
 msgstr "等同于 --format=posix"
 
-#: src/tar.c:652
+#: src/tar.c:676
 msgid "keyword[[:]=value][,keyword[[:]=value]]..."
 msgstr "关键字[[:]=值][,关键字[[:]=值]]..."
 
-#: src/tar.c:653
+#: src/tar.c:677
 msgid "control pax keywords"
 msgstr "控制 pax 关键字"
 
-#: src/tar.c:654
+#: src/tar.c:678
 msgid "TEXT"
 msgstr "TEXT"
 
-#: src/tar.c:655
+#: src/tar.c:679
 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:660
+#: src/tar.c:684
 msgid "Compression options:"
 msgstr "压缩选项:"
 
-#: src/tar.c:662
+#: src/tar.c:686
 msgid "use archive suffix to determine the compression program"
 msgstr "使用归档后缀名来决定压缩程序"
 
-#: src/tar.c:664
+#: src/tar.c:688
 msgid "do not use archive suffix to determine the compression program"
 msgstr "不使用归档后缀名来决定压缩程序"
 
-#: src/tar.c:666
+#: src/tar.c:690
 msgid "PROG"
 msgstr "PROG"
 
-#: src/tar.c:667
+#: src/tar.c:691
 msgid "filter through PROG (must accept -d)"
 msgstr "通过 PROG 过滤(必须是能接受 -d 选项的程序)"
 
-#: src/tar.c:683
+#: src/tar.c:707
 msgid "Local file selection:"
 msgstr "本地文件选择:"
 
-#: src/tar.c:686
+#: src/tar.c:710
 msgid "add given FILE to the archive (useful if its name starts with a dash)"
 msgstr "添加指定的 FILE 至归档(如果名字以 - 开始会很有用的)"
 
-#: src/tar.c:687
-msgid "DIR"
-msgstr "DIR"
-
-#: src/tar.c:688
+#: src/tar.c:712
 msgid "change to directory DIR"
 msgstr "改变至目录 DIR"
 
-#: src/tar.c:690
+#: src/tar.c:714
 msgid "get names to extract or create from FILE"
 msgstr "从 FILE 中获取文件名来解压或创建文件"
 
-#: src/tar.c:692
+#: src/tar.c:716
 msgid "-T reads null-terminated names, disable -C"
 msgstr "-T 读取以空终止的名字，-C 禁用"
 
-#: src/tar.c:694
+#: src/tar.c:718
 msgid "disable the effect of the previous --null option"
 msgstr "禁用上一次的效果 --null 选项"
 
-#: src/tar.c:696
-msgid "unquote filenames read with -T (default)"
+#: src/tar.c:720
+#, fuzzy
+msgid "unquote input file or member names (default)"
 msgstr "以 -T 读取的文件名作为引用结束(默认)"
 
-#: src/tar.c:698
-msgid "do not unquote filenames read with -T"
+#: src/tar.c:722
+#, fuzzy
+msgid "do not unquote input file or member names"
 msgstr "不以 -T 读取的文件名作为引用结束"
 
-#: src/tar.c:699 tests/genfile.c:136
+#: src/tar.c:723 tests/genfile.c:136
 msgid "PATTERN"
 msgstr "PATTERN"
 
-#: src/tar.c:700
+#: src/tar.c:724
 msgid "exclude files, given as a PATTERN"
 msgstr "排除以 PATTERN 指定的文件"
 
-#: src/tar.c:702
+#: src/tar.c:726
 msgid "exclude patterns listed in FILE"
 msgstr "排除 FILE 中列出的模式串"
 
-#: src/tar.c:704
+#: src/tar.c:728
 msgid ""
 "exclude contents of directories containing CACHEDIR.TAG, except for the tag "
 "file itself"
 msgstr "除标识文件本身外，排除包含 CACHEDIR.TAG 的目录中的内容"
 
-#: src/tar.c:707
+#: src/tar.c:731
 msgid "exclude everything under directories containing CACHEDIR.TAG"
 msgstr "排除包含 CACHEDIR.TAG 的目录中所有内容"
 
-#: src/tar.c:710
+#: src/tar.c:734
 msgid "exclude directories containing CACHEDIR.TAG"
 msgstr "排除包含 CACHEDIR.TAG 的目录"
 
-#: src/tar.c:712
+#: src/tar.c:736
 msgid "exclude contents of directories containing FILE, except for FILE itself"
 msgstr "除 FILE 自身外，排除包含 FILE 的目录中的内容"
 
-#: src/tar.c:715
+#: src/tar.c:739
+msgid "read exclude patterns for each directory from FILE, if it exists"
+msgstr ""
+
+#: src/tar.c:742
+msgid ""
+"read exclude patterns for each directory and its subdirectories from FILE, "
+"if it exists"
+msgstr ""
+
+#: src/tar.c:745
 msgid "exclude everything under directories containing FILE"
 msgstr "排除包含 FILE 的目录中的所有内容"
 
-#: src/tar.c:717
+#: src/tar.c:747
 msgid "exclude directories containing FILE"
 msgstr "排除包含 FILE 的目录"
 
-#: src/tar.c:719
+#: src/tar.c:749
 msgid "exclude version control system directories"
 msgstr "排除版本控制系统目录"
 
-#: src/tar.c:721
+#: src/tar.c:751
+msgid "read exclude patterns from the VCS ignore files"
+msgstr ""
+
+#: src/tar.c:753
 msgid "exclude backup and lock files"
 msgstr "排除备份和锁文件"
 
-#: src/tar.c:723
+#: src/tar.c:755
 msgid "avoid descending automatically in directories"
 msgstr "避免目录中的自动降级"
 
-#: src/tar.c:725
+#: src/tar.c:757
 msgid "stay in local file system when creating archive"
 msgstr "创建归档时保存在本地文件系统中"
 
-#: src/tar.c:727
+#: src/tar.c:759
 msgid "recurse into directories (default)"
 msgstr "目录递归(默认)"
 
-#: src/tar.c:729
+#: src/tar.c:761
 #, fuzzy
 msgid "don't strip leading '/'s from file names"
 msgstr "不要从文件名中清除引导符‘/’"
 
-#: src/tar.c:731
+#: src/tar.c:763
 msgid "follow symlinks; archive and dump the files they point to"
 msgstr "跟踪符号链接；将它们所指向的文件归档并输出"
 
-#: src/tar.c:733
+#: src/tar.c:765
 msgid "follow hard links; archive and dump the files they refer to"
 msgstr "跟踪硬链接；将它们所指向的文件归档并输出"
 
-#: src/tar.c:734
+#: src/tar.c:766
 msgid "MEMBER-NAME"
 msgstr "MEMBER-NAME"
 
-#: src/tar.c:735
+#: src/tar.c:767
 #, fuzzy
 msgid "begin at member MEMBER-NAME when reading the archive"
 msgstr "从归档中的 MEMBER-NAME 成员处开始"
 
-#: src/tar.c:737
+#: src/tar.c:769
 msgid "only store files newer than DATE-OR-FILE"
 msgstr "只保存比 DATE-OR-FILE 更新的文件"
 
-#: src/tar.c:739
+#: src/tar.c:771
 msgid "DATE"
 msgstr "DATE"
 
-#: src/tar.c:740
+#: src/tar.c:772
 msgid "compare date and time when data changed only"
 msgstr "当只有数据改变时比较数据和时间"
 
-#: src/tar.c:741
+#: src/tar.c:773
 msgid "CONTROL"
 msgstr "CONTROL"
 
-#: src/tar.c:742
+#: src/tar.c:774
 msgid "backup before removal, choose version CONTROL"
 msgstr "在删除前备份，选择 CONTROL 版本"
 
-#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169
+#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169
 msgid "STRING"
 msgstr "STRING"
 
-#: src/tar.c:744
+#: src/tar.c:776
 msgid ""
 "backup before removal, override usual suffix ('~' unless overridden by "
 "environment variable SIMPLE_BACKUP_SUFFIX)"
 msgstr ""
 "在删除前备份，除非被环境变量 SIMPLE_BACKUP_SUFFIX 覆盖，否则覆盖常用后缀(‘’)"
 
-#: src/tar.c:749
+#: src/tar.c:781
 msgid "File name transformations:"
 msgstr "文件名变换:"
 
-#: src/tar.c:751
+#: src/tar.c:783
 msgid "strip NUMBER leading components from file names on extraction"
 msgstr "解压时从文件名中清除 NUMBER 个引导部分"
 
-#: src/tar.c:753
+#: src/tar.c:785
 msgid "EXPRESSION"
 msgstr "EXPRESSION"
 
-#: src/tar.c:754
+#: src/tar.c:786
 msgid "use sed replace EXPRESSION to transform file names"
 msgstr "使用 sed 代替 EXPRESSION 来进行文件名变换"
 
-#: src/tar.c:760
+#: src/tar.c:792
 msgid "File name matching options (affect both exclude and include patterns):"
 msgstr "文件名匹配选项(同时影响排除和包括模式串):"
 
-#: src/tar.c:763
+#: src/tar.c:795
 msgid "ignore case"
 msgstr "忽略大小写"
 
-#: src/tar.c:765
+#: src/tar.c:797
 msgid "patterns match file name start"
 msgstr "模式串匹配文件名头部"
 
-#: src/tar.c:767
+#: src/tar.c:799
 #, fuzzy
 msgid "patterns match after any '/' (default for exclusion)"
 msgstr "模式串匹配任意‘/’后字符(默认对 exclusion 有效)"
 
-#: src/tar.c:769
+#: src/tar.c:801
 msgid "case sensitive matching (default)"
 msgstr "匹配大小写(默认)"
 
-#: src/tar.c:771
+#: src/tar.c:803
 msgid "use wildcards (default for exclusion)"
 msgstr "使用通配符(默认对 exclusion )"
 
-#: src/tar.c:773
+#: src/tar.c:805
 msgid "verbatim string matching"
 msgstr "逐字匹配字符串"
 
-#: src/tar.c:775
+#: src/tar.c:807
 #, fuzzy
 msgid "wildcards do not match '/'"
 msgstr "通配符不匹配‘/’"
 
-#: src/tar.c:777
+#: src/tar.c:809
 #, fuzzy
 msgid "wildcards match '/' (default for exclusion)"
 msgstr "通配符匹配‘/’(默认对排除操作有效)"
 
-#: src/tar.c:782
+#: src/tar.c:814
 msgid "Informative output:"
 msgstr "提示性输出:"
 
-#: src/tar.c:785
+#: src/tar.c:817
 msgid "verbosely list files processed"
 msgstr "详细地列出处理的文件"
 
-#: src/tar.c:786
+#: src/tar.c:818
 msgid "KEYWORD"
 msgstr "KEYWORD"
 
-#: src/tar.c:787
+#: src/tar.c:819
 msgid "warning control"
 msgstr "警告控制:"
 
-#: src/tar.c:789
+#: src/tar.c:821
 msgid "display progress messages every NUMBERth record (default 10)"
 msgstr "每隔 NUMBER 个记录显示进度信息(默认为 10 个)"
 
-#: src/tar.c:791
+#: src/tar.c:823
 msgid "ACTION"
 msgstr "ACTION"
 
-#: src/tar.c:792
+#: src/tar.c:824
 msgid "execute ACTION on each checkpoint"
 msgstr "在每个检查点上执行 ACTION"
 
-#: src/tar.c:795
+#: src/tar.c:827
 msgid "print a message if not all links are dumped"
 msgstr "只要不是所有链接都被输出就打印信息"
 
-#: src/tar.c:796
+#: src/tar.c:828
 msgid "SIGNAL"
 msgstr "SIGNAL"
 
-#: src/tar.c:797
+#: src/tar.c:829
 msgid ""
 "print total bytes after processing the archive; with an argument - print "
 "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, "
@@ -2124,119 +2160,119 @@ msgstr ""
 "号为: SIGHUP，SIGQUIT，SIGINT，SIGUSR1 和 SIGUSR2；同时也接受不带 SIG 前缀的"
 "信号名称"
 
-#: src/tar.c:802
+#: src/tar.c:834
 msgid "print file modification times in UTC"
 msgstr "以 UTC 格式打印文件修改时间"
 
-#: src/tar.c:804
+#: src/tar.c:836
 msgid "print file time to its full resolution"
 msgstr "按文件原本时间格式打印"
 
-#: src/tar.c:806
+#: src/tar.c:838
 msgid "send verbose output to FILE"
 msgstr "将详细输出发送至 FILE"
 
-#: src/tar.c:808
+#: src/tar.c:840
 msgid "show block number within archive with each message"
 msgstr "每个信息都显示归档内的块数"
 
-#: src/tar.c:810
+#: src/tar.c:842
 msgid "ask for confirmation for every action"
 msgstr "每次操作都要求确认"
 
-#: src/tar.c:813
+#: src/tar.c:845
 msgid "show tar defaults"
 msgstr "显示 tar 默认选项"
 
-#: src/tar.c:815
+#: src/tar.c:847
 msgid "show valid ranges for snapshot-file fields"
 msgstr ""
 
-#: src/tar.c:817
+#: src/tar.c:849
 msgid ""
 "when listing or extracting, list each directory that does not match search "
 "criteria"
 msgstr "列表或解压时，列出每个不匹配查找标准的目录"
 
-#: src/tar.c:819
+#: src/tar.c:851
 msgid "show file or archive names after transformation"
 msgstr "显示变换后的文件名或归档名"
 
-#: src/tar.c:822
+#: src/tar.c:854
 msgid "STYLE"
 msgstr "STYLE"
 
-#: src/tar.c:823
+#: src/tar.c:855
 msgid "set name quoting style; see below for valid STYLE values"
 msgstr "设置名称引用风格；有效的 STYLE 值请参阅以下说明"
 
-#: src/tar.c:825
+#: src/tar.c:857
 msgid "additionally quote characters from STRING"
 msgstr "来自 STRING 的额外的引用字符"
 
-#: src/tar.c:827
+#: src/tar.c:859
 msgid "disable quoting for characters from STRING"
 msgstr "禁用来自 STRING 的字符引用"
 
-#: src/tar.c:832
+#: src/tar.c:864
 msgid "Compatibility options:"
 msgstr "兼容性选项:"
 
-#: src/tar.c:835
+#: src/tar.c:867
 msgid ""
 "when creating, same as --old-archive; when extracting, same as --no-same-"
 "owner"
 msgstr "创建归档时，相当于 --old-archive；展开归档时，相当于 --no-same-owner"
 
-#: src/tar.c:840
+#: src/tar.c:872
 msgid "Other options:"
 msgstr "其它选项:"
 
-#: src/tar.c:843
+#: src/tar.c:875
 msgid "disable use of some potentially harmful options"
 msgstr "禁用某些潜在的有危险的选项"
 
-#: src/tar.c:978
+#: src/tar.c:1010
 #, fuzzy
 msgid ""
 "You may not specify more than one '-Acdtrux', '--delete' or  '--test-label' "
 "option"
 msgstr "您不能指定超过一个\"-Acdtrux\"或是\"--test-label\"外的选项"
 
-#: src/tar.c:988
+#: src/tar.c:1020
 msgid "Conflicting compression options"
 msgstr "压缩选项冲突"
 
-#: src/tar.c:1047
+#: src/tar.c:1079
 #, c-format
 msgid "Unknown signal name: %s"
 msgstr "未知的信号名称: %s"
 
-#: src/tar.c:1071
+#: src/tar.c:1103
 msgid "Date sample file not found"
 msgstr "找不到数据样板文件"
 
-#: src/tar.c:1079
+#: src/tar.c:1111
 #, c-format
 msgid "Substituting %s for unknown date format %s"
 msgstr "把未知的时间格式 %2$s 替换为 %1$s"
 
-#: src/tar.c:1108
+#: src/tar.c:1140
 #, fuzzy, c-format
 msgid "Option %s: Treating date '%s' as %s"
 msgstr "选项 %s: 将日期 ‘%s’ 当作 %s"
 
-#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167
-#: src/tar.c:1171
+#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199
+#: src/tar.c:1203 src/tar.c:1206
 #, c-format
 msgid "filter the archive through %s"
 msgstr "通过 %s 过滤归档"
 
-#: src/tar.c:1179
+#: src/tar.c:1214
 msgid "Valid arguments for the --quoting-style option are:"
 msgstr "--quoting-style 选项的有效参数为:"
 
-#: src/tar.c:1183
+#: src/tar.c:1218
 msgid ""
 "\n"
 "*This* tar defaults to:\n"
@@ -2244,50 +2280,50 @@ msgstr ""
 "\n"
 "此 tar 默认为:\n"
 
-#: src/tar.c:1295
+#: src/tar.c:1330
 #, fuzzy
 msgid "Invalid owner or group ID"
 msgstr "无效的所有者"
 
-#: src/tar.c:1339
+#: src/tar.c:1389
 #, fuzzy
 msgid "Invalid blocking factor"
 msgstr "无效的块因子"
 
-#: src/tar.c:1452
+#: src/tar.c:1507
 msgid "Invalid tape length"
 msgstr "无效的磁带长度"
 
-#: src/tar.c:1466
+#: src/tar.c:1521
 msgid "Invalid incremental level value"
 msgstr "无效的增量度"
 
-#: src/tar.c:1512
+#: src/tar.c:1567
 msgid "More than one threshold date"
 msgstr "多于一个时间阈值"
 
-#: src/tar.c:1571 src/tar.c:1574
+#: src/tar.c:1626 src/tar.c:1629
 #, fuzzy
 msgid "Invalid sparse version value"
 msgstr "无效的稀疏版本值"
 
-#: src/tar.c:1659
+#: src/tar.c:1714
 msgid "--atime-preserve='system' is not supported on this platform"
 msgstr "此平台不支持 --atime-preserve=‘system’ "
 
-#: src/tar.c:1684
+#: src/tar.c:1739
 msgid "--checkpoint value is not an integer"
 msgstr "--checkpoint 值不是个整数"
 
-#: src/tar.c:1801
+#: src/tar.c:1868
 msgid "Invalid mode given on option"
 msgstr "选项中给出无效的访问模式"
 
-#: src/tar.c:1858
+#: src/tar.c:1925
 msgid "Invalid number"
 msgstr "无效的数字"
 
-#: src/tar.c:1915
+#: src/tar.c:1982
 msgid ""
 "The --preserve option is deprecated, use --preserve-permissions --preserve-"
 "order instead"
@@ -2295,246 +2331,240 @@ msgstr ""
 "--preserve 选项已经废弃了，请使用 --preserve-permissions --preserve-order 代"
 "替"
 
-#: src/tar.c:1926
+#: src/tar.c:1993
 msgid "Invalid record size"
 msgstr "无效的记录大小"
 
-#: src/tar.c:1929
+#: src/tar.c:1996
 #, c-format
 msgid "Record size must be a multiple of %d."
 msgstr "记录大小必须是 %d 的倍数。"
 
-#: src/tar.c:1975
+#: src/tar.c:2042
 msgid "Invalid number of elements"
 msgstr "无效的元素数"
 
-#: src/tar.c:1995
+#: src/tar.c:2067
 msgid "Only one --to-command option allowed"
 msgstr "仅允许使用一个 --to-command 选项"
 
-#: src/tar.c:2107
+#: src/tar.c:2179
 #, c-format
 msgid "Malformed density argument: %s"
 msgstr "错误的压缩参数: %s"
 
-#: src/tar.c:2133
+#: src/tar.c:2205
 #, fuzzy, c-format
 msgid "Unknown density: '%c'"
 msgstr "未知的压缩参数: ‘%c’"
 
-#: src/tar.c:2150
+#: src/tar.c:2222
 #, fuzzy, c-format
 msgid "Options '-[0-7][lmh]' not supported by *this* tar"
 msgstr "本 tar 不支持选项“-[0-7][lmh]”"
 
-#: src/tar.c:2163
+#: src/tar.c:2235
 msgid "[FILE]..."
 msgstr "[FILE]..."
 
-#: src/tar.c:2306
+#. TRANSLATORS: Both %s in this statement are replaced with
+#. option names.
+#: src/tar.c:2303
+#, fuzzy, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "不能使用模式 %s"
+
+#: src/tar.c:2389
 #, fuzzy, c-format
 msgid "Old option '%c' requires an argument."
 msgstr "旧选项“%c”需要参数。"
 
-#: src/tar.c:2386
+#: src/tar.c:2469
 msgid "--occurrence is meaningless without a file list"
 msgstr "没有一个文件列表时 --occurrence 是没有意义的"
 
-#: src/tar.c:2389
-#, fuzzy, c-format
-msgid "--occurrence cannot be used with %s"
-msgstr "--occurrence 不能用于请求的操作模式中"
-
-#: src/tar.c:2408
+#: src/tar.c:2490
 #, fuzzy
 msgid "Multiple archive files require '-M' option"
 msgstr "多个归档文件需要使用“-M”选项"
 
-#: src/tar.c:2413
-msgid "Cannot combine --listed-incremental with --newer"
-msgstr "无法在使用 --newer 的时候使用 --listed-incremental"
-
-#: src/tar.c:2416
+#: src/tar.c:2498
 msgid "--level is meaningless without --listed-incremental"
 msgstr "没有 --listed-incremental 选项的话 --level 选项是无意义的"
 
-#: src/tar.c:2433
+#: src/tar.c:2515
 #, 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:2446
+#: src/tar.c:2528
 msgid "Cannot verify multi-volume archives"
 msgstr "无法检验多卷归档文件"
 
-#: src/tar.c:2448
+#: src/tar.c:2530
 msgid "Cannot verify compressed archives"
 msgstr "无法检验压缩归档文件"
 
-#: src/tar.c:2450
-#, fuzzy, c-format
-msgid "--verify cannot be used with %s"
-msgstr "不能使用模式 %s"
-
-#: src/tar.c:2457
+#: src/tar.c:2539
 msgid "Cannot use multi-volume compressed archives"
 msgstr "无法使用多卷压缩归档文件"
 
-#: src/tar.c:2461
+#: src/tar.c:2543
 msgid "Cannot concatenate compressed archives"
 msgstr "无法联结压缩归档文件"
 
-#: src/tar.c:2471
+#: src/tar.c:2553
 msgid "--pax-option can be used only on POSIX archives"
 msgstr "--pax-option 只能用于 POSIX 归档中"
 
-#: src/tar.c:2478
+#: src/tar.c:2560
 #, fuzzy
 msgid "--acls can be used only on POSIX archives"
 msgstr "--pax-option 只能用于 POSIX 归档中"
 
-#: src/tar.c:2483
+#: src/tar.c:2565
 #, fuzzy
 msgid "--selinux can be used only on POSIX archives"
 msgstr "--pax-option 只能用于 POSIX 归档中"
 
-#: src/tar.c:2488
+#: src/tar.c:2570
 #, 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:2597
+msgid ""
+"Cannot deduce top-level directory name; please set it explicitly with --one-"
+"top-level=DIR"
+msgstr ""
 
-#: src/tar.c:2525
+#: src/tar.c:2630
 msgid "Volume length cannot be less than record size"
 msgstr "卷长度不可小于记录大小"
 
-#: src/tar.c:2528
-msgid "--preserve-order is not compatible with --listed-incremental"
-msgstr "--preserve-order 与 --listed-incremental 不匹配"
-
-#: src/tar.c:2539
+#: src/tar.c:2643
 msgid "Cowardly refusing to create an empty archive"
 msgstr "谨慎地拒绝创建空归档文件"
 
-#: src/tar.c:2565
+#: src/tar.c:2669
 #, fuzzy
 msgid "Options '-Aru' are incompatible with '-f -'"
 msgstr "选项“-Aru”与“-f -”不兼容"
 
-#: src/tar.c:2660
+#: src/tar.c:2766
 #, fuzzy
 msgid ""
 "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options"
 msgstr "您必须从\"-Acdtrux\"或是\"--test-label\"选项中指定一个"
 
-#: src/tar.c:2715
+#: src/tar.c:2823
 #, c-format
 msgid "Exiting with failure status due to previous errors"
 msgstr "由于前次错误，将以上次的错误状态退出"
 
+#: src/tar.c:569
+msgid "directory sorting order: none (default), name or inode"
+msgstr ""
+
 #: src/update.c:87
 #, c-format
 msgid "%s: File shrank by %s byte"
 msgid_plural "%s: File shrank by %s bytes"
 msgstr[0] "%s：文件缩小 %s 字节"
 
-#: src/xheader.c:164
+#: src/xheader.c:165
 #, c-format
 msgid "Keyword %s is unknown or not yet implemented"
 msgstr "关键字 %s 未知或还未实现"
 
-#: src/xheader.c:173
+#: src/xheader.c:174
 msgid "Time stamp is out of allowed range"
 msgstr "时间标记超出允许范围"
 
-#: src/xheader.c:204
+#: src/xheader.c:205
 #, c-format
 msgid "Pattern %s cannot be used"
 msgstr "不能使用模式 %s"
 
-#: src/xheader.c:218
+#: src/xheader.c:219
 #, c-format
 msgid "Keyword %s cannot be overridden"
 msgstr "不能覆盖关键字 %s"
 
-#: src/xheader.c:667
+#: src/xheader.c:668
 msgid "Malformed extended header: missing length"
 msgstr "错误的扩展头: 缺少 length"
 
-#: src/xheader.c:676
+#: src/xheader.c:677
 #, c-format
 msgid "Extended header length %*s is out of range"
 msgstr "扩展头长度 %*s 超出范围"
 
-#: src/xheader.c:688
+#: src/xheader.c:689
 msgid "Malformed extended header: missing blank after length"
 msgstr "错误的扩展头: length 后缺少空白符"
 
-#: src/xheader.c:696
+#: src/xheader.c:697
 msgid "Malformed extended header: missing equal sign"
 msgstr "错误的扩展头: 缺少等于符号"
 
-#: src/xheader.c:702
+#: src/xheader.c:703
 msgid "Malformed extended header: missing newline"
 msgstr "错误的扩展头: 缺少空行"
 
-#: src/xheader.c:740
+#: src/xheader.c:741
 #, fuzzy, c-format
 msgid "Ignoring unknown extended header keyword '%s'"
 msgstr "忽略未知的扩展头关键字‘%s’"
 
-#: src/xheader.c:1012
+#: src/xheader.c:1013
 #, 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:1042
+#: src/xheader.c:1043
 #, c-format
 msgid "Extended header %s=%s is out of range %s..%s"
 msgstr "扩展头 %s=%s 超出范围 %s..%s"
 
-#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455
+#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456
 #, c-format
 msgid "Malformed extended header: invalid %s=%s"
 msgstr "错误的扩展头: %s=%s 无效"
 
-#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488
+#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489
 #, c-format
 msgid "Malformed extended header: excess %s=%s"
 msgstr "错误的扩展头: %s=%s 溢出"
 
-#: src/xheader.c:1501
+#: src/xheader.c:1502
 #, c-format
 msgid "Malformed extended header: invalid %s: unexpected delimiter %c"
 msgstr "错误的扩展头: %s 无效: 非预期的分隔符 %c"
 
-#: src/xheader.c:1511
+#: src/xheader.c:1512
 #, c-format
 msgid "Malformed extended header: invalid %s: odd number of values"
 msgstr "错误的扩展头: %s 无效: 奇怪的数值"
 
-#: src/checkpoint.c:109
+#: src/checkpoint.c:114
 #, c-format
 msgid "%s: not a valid timeout"
 msgstr "%s: 无效的超时设置"
 
-#: src/checkpoint.c:114
+#: src/checkpoint.c:121
 #, c-format
 msgid "%s: unknown checkpoint action"
 msgstr "%s: 未知的检查点操作"
 
-#: src/checkpoint.c:134
+#: src/checkpoint.c:202
 msgid "write"
 msgstr "写入"
 
-#: src/checkpoint.c:134
+#: src/checkpoint.c:202
 msgid "read"
 msgstr "读取"
 
@@ -2542,7 +2572,7 @@ msgstr "读取"
 #. *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
+#: src/checkpoint.c:218
 #, c-format
 msgid "Write checkpoint %u"
 msgstr "写入操作的检查点 %u"
@@ -2551,7 +2581,7 @@ msgstr "写入操作的检查点 %u"
 #. *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
+#: src/checkpoint.c:224
 #, c-format
 msgid "Read checkpoint %u"
 msgstr "读取操作的检查点 %u"
@@ -2802,12 +2832,19 @@ msgstr "命令终止\n"
 msgid "--stat requires file names"
 msgstr "--stat 选项需要文件名"
 
-#~ msgid "Cannot get working directory"
-#~ msgstr "无法获取工作目录"
-
 #~ msgid "sort names to extract to match archive"
 #~ msgstr "为解压至匹配归档排序名称"
 
+#, fuzzy
+#~ msgid "--occurrence cannot be used with %s"
+#~ msgstr "--occurrence 不能用于请求的操作模式中"
+
+#~ msgid "Cannot combine --listed-incremental with --newer"
+#~ msgstr "无法在使用 --newer 的时候使用 --listed-incremental"
+
+#~ msgid "--preserve-order is not compatible with --listed-incremental"
+#~ msgstr "--preserve-order 与 --listed-incremental 不匹配"
+
 #~ msgid "Field too long while reading snapshot file"
 #~ msgstr "读取目录文件时字段太长"
 
@@ -2817,12 +2854,15 @@ msgstr "--stat 选项需要文件名"
 #~ msgid "Unexpected field value in snapshot file"
 #~ msgstr "目录文件中异常的字段值"
 
-#~ msgid "Extended header length is out of allowed range"
-#~ msgstr "扩展头长度超出所允许的范围"
+#~ msgid "Cannot get working directory"
+#~ msgstr "无法获取工作目录"
 
 #~ msgid "Invalid group"
 #~ msgstr "无效的组"
 
+#~ msgid "Extended header length is out of allowed range"
+#~ msgstr "扩展头长度超出所允许的范围"
+
 #~ msgid "%s: Directory removed before we read it"
 #~ msgstr "%s: 文件在读入之前被删除了"