@matheusbsbs / matheus-bagliano / commits / 60638e9816

l10n: zh_CN: for git v2.13.0 l10n round 2

Translate 4 messages (3195t0f0u) for git v2.13.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed May 9, 2017 at 21:55 UTC 60638e9816d0aae40d4234d1a068f94fabc2fd4d
1 file changed +436 -429
po/zh_CN.po
+436 -429
@@ -135,8 +135,8 @@ msgid ""
135 msgstr ""
136 "Project-Id-Version: Git\n"
137 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
138 -"POT-Creation-Date: 2017-04-23 09:54+0800\n"
139 -"PO-Revision-Date: 2017-05-02 22:07+0800\n"
138 +"POT-Creation-Date: 2017-05-05 09:35+0800\n"
139 +"PO-Revision-Date: 2017-05-09 21:54+0800\n"
140 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
141 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
142 "Language: zh_CN\n"
@@ -704,7 +704,7 @@ msgstr[1] "修复空白错误后，应用了 %d 行。"
704 msgid "Unable to write new index file"
705 msgstr "无法写入新索引文件"
706
707 -#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280
707 +#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279
708 #: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
709 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
710 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
@@ -721,7 +721,7 @@ msgstr "不要应用与给出路径向匹配的变更"
721 msgid "apply changes matching the given path"
722 msgstr "应用与给出路径向匹配的变更"
723
724 -#: apply.c:4917 builtin/am.c:2286
724 +#: apply.c:4917 builtin/am.c:2285
725 msgid "num"
726 msgstr "数字"
727
@@ -773,7 +773,7 @@ msgstr "如果一个补丁不能应用则尝试三方合并"
773 msgid "build a temporary index based on embedded index information"
774 msgstr "创建一个临时索引基于嵌入的索引信息"
775
776 -#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508
776 +#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
777 msgid "paths are separated with NUL character"
778 msgstr "路径以 NUL 字符分隔"
779
@@ -781,7 +781,7 @@ msgstr "路径以 NUL 字符分隔"
781 msgid "ensure at least <n> lines of context match"
782 msgstr "确保至少匹配 <n> 行上下文"
783
784 -#: apply.c:4949 builtin/am.c:2265
784 +#: apply.c:4949 builtin/am.c:2264
785 msgid "action"
786 msgstr "动作"
787
@@ -823,7 +823,7 @@ msgstr "允许不正确的文件末尾换行符"
823 msgid "do not trust the line counts in the hunk headers"
824 msgstr "不信任补丁片段的头信息中的行号"
825
826 -#: apply.c:4973 builtin/am.c:2274
826 +#: apply.c:4973 builtin/am.c:2273
827 msgid "root"
828 msgstr "根目录"
829
@@ -870,9 +870,9 @@ msgstr "前缀"
870 msgid "prepend prefix to each pathname in the archive"
871 msgstr "为归档中每个路径名加上前缀"
872
873 -#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59
873 +#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60
874 #: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
875 -#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545
875 +#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552
876 #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
877 #: parse-options.h:153
878 msgid "file"
@@ -958,27 +958,27 @@ msgstr ""
958 "负值模版在 git attributes 中被忽略\n"
959 "当字符串确实要以感叹号开始时，使用 '\\!'。"
960
961 -#: bisect.c:443
961 +#: bisect.c:444
962 #, c-format
963 msgid "Could not open file '%s'"
964 msgstr "不能打开文件 '%s'"
965
966 -#: bisect.c:448
966 +#: bisect.c:449
967 #, c-format
968 msgid "Badly quoted content in file '%s': %s"
969 msgstr "文件 '%s' 包含错误的引用格式：%s"
970
971 -#: bisect.c:656
971 +#: bisect.c:657
972 #, c-format
973 msgid "We cannot bisect more!\n"
974 msgstr "我们无法进行更多的二分查找！\n"
975
976 -#: bisect.c:709
976 +#: bisect.c:710
977 #, c-format
978 msgid "Not a valid commit name %s"
979 msgstr "不是一个有效的提交名 %s"
980
981 -#: bisect.c:733
981 +#: bisect.c:734
982 #, c-format
983 msgid ""
984 "The merge base %s is bad.\n"
@@ -987,7 +987,7 @@ msgstr ""
987 "合并基线 %s 是坏的。\n"
988 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
989
990 -#: bisect.c:738
990 +#: bisect.c:739
991 #, c-format
992 msgid ""
993 "The merge base %s is new.\n"
@@ -996,7 +996,7 @@ msgstr ""
996 "合并基线 %s 是新的。\n"
997 "介于 %s 和 [%s] 之间的属性已经被修改。\n"
998
999 -#: bisect.c:743
999 +#: bisect.c:744
1000 #, c-format
1001 msgid ""
1002 "The merge base %s is %s.\n"
@@ -1005,7 +1005,7 @@ msgstr ""
1005 "合并基线 %s 是 %s。\n"
1006 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
1007
1008 -#: bisect.c:751
1008 +#: bisect.c:752
1009 #, c-format
1010 msgid ""
1011 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1016,7 +1016,7 @@ msgstr ""
1016 "这种情况下 git 二分查找无法正常工作。\n"
1017 "您可能弄错了 %s 和 %s 版本？\n"
1018
1019 -#: bisect.c:764
1019 +#: bisect.c:765
1020 #, c-format
1021 msgid ""
1022 "the merge base between %s and [%s] must be skipped.\n"
@@ -1027,36 +1027,36 @@ msgstr ""
1027 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1028 "我们仍旧继续。"
1029
1030 -#: bisect.c:799
1030 +#: bisect.c:800
1031 #, c-format
1032 msgid "Bisecting: a merge base must be tested\n"
1033 msgstr "二分查找中：合并基线必须是经过测试的\n"
1034
1035 -#: bisect.c:850
1035 +#: bisect.c:851
1036 #, c-format
1037 msgid "a %s revision is needed"
1038 msgstr "需要一个 %s 版本"
1039
1040 -#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255
1040 +#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
1041 #, c-format
1042 msgid "could not create file '%s'"
1043 msgstr "不能创建文件 '%s'"
1044
1045 -#: bisect.c:918
1045 +#: bisect.c:919
1046 #, c-format
1047 msgid "could not read file '%s'"
1048 msgstr "不能读取文件 '%s'"
1049
1050 -#: bisect.c:948
1050 +#: bisect.c:949
1051 msgid "reading bisect refs failed"
1052 msgstr "读取二分查找引用失败"
1053
1054 -#: bisect.c:968
1054 +#: bisect.c:969
1055 #, c-format
1056 msgid "%s was both %s and %s\n"
1057 msgstr "%s 同时为 %s 和 %s\n"
1058
1059 -#: bisect.c:976
1059 +#: bisect.c:977
1060 #, c-format
1061 msgid ""
1062 "No testable commit found.\n"
@@ -1065,7 +1065,7 @@ msgstr ""
1065 "没有发现可测试的提交。\n"
1066 "可能您在运行时使用了错误的路径参数？\n"
1067
1068 -#: bisect.c:995
1068 +#: bisect.c:996
1069 #, c-format
1070 msgid "(roughly %d step)"
1071 msgid_plural "(roughly %d steps)"
@@ -1074,7 +1074,7 @@ msgstr[1] "（大概 %d 步）"
1074
1075 #. TRANSLATORS: the last %s will be replaced with
1076 #. "(roughly %d steps)" translation
1077 -#: bisect.c:999
1077 +#: bisect.c:1000
1078 #, c-format
1079 msgid "Bisecting: %d revision left to test after this %s\n"
1080 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1224,7 +1224,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"
1224 msgid "unrecognized header: %s%s (%d)"
1225 msgstr "未能识别的包头：%s%s (%d)"
1226
1227 -#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777
1227 +#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
1228 #, c-format
1229 msgid "could not open '%s'"
1230 msgstr "不能打开 '%s'"
@@ -1233,7 +1233,7 @@ msgstr "不能打开 '%s'"
1233 msgid "Repository lacks these prerequisite commits:"
1234 msgstr "仓库中缺少这些必备的提交："
1235
1236 -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299
1236 +#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321
1237 #: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
1238 #: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
1239 #: builtin/merge.c:359 builtin/shortlog.c:176
@@ -1298,8 +1298,8 @@ msgstr "index-pack 终止"
1298 msgid "invalid color value: %.*s"
1299 msgstr "无效的颜色值：%.*s"
1300
1301 -#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457
1302 -#: builtin/am.c:1493 builtin/am.c:2127
1301 +#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
1302 +#: builtin/am.c:1489 builtin/am.c:2126
1303 #, c-format
1304 msgid "could not parse %s"
1305 msgstr "不能解析 %s"
@@ -1327,148 +1327,148 @@ msgstr "内存耗尽"
1327 msgid "relative config include conditionals must come from files"
1328 msgstr "包含相对路径的条件引用必须来自于文件"
1329
1330 -#: config.c:701
1330 +#: config.c:711
1331 #, c-format
1332 msgid "bad config line %d in blob %s"
1333 msgstr "数据对象 %2$s 中错误的配置行 %1$d"
1334
1335 -#: config.c:705
1335 +#: config.c:715
1336 #, c-format
1337 msgid "bad config line %d in file %s"
1338 msgstr "文件 %2$s 中错误的配置行 %1$d"
1339
1340 -#: config.c:709
1340 +#: config.c:719
1341 #, c-format
1342 msgid "bad config line %d in standard input"
1343 msgstr "标准输入中错误的配置行 %d"
1344
1345 -#: config.c:713
1345 +#: config.c:723
1346 #, c-format
1347 msgid "bad config line %d in submodule-blob %s"
1348 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
1349
1350 -#: config.c:717
1350 +#: config.c:727
1351 #, c-format
1352 msgid "bad config line %d in command line %s"
1353 msgstr "命令行 %2$s 中错误的配置行 %1$d"
1354
1355 -#: config.c:721
1355 +#: config.c:731
1356 #, c-format
1357 msgid "bad config line %d in %s"
1358 msgstr "在 %2$s 中错误的配置行 %1$d"
1359
1360 -#: config.c:840
1360 +#: config.c:859
1361 msgid "out of range"
1362 msgstr "超出范围"
1363
1364 -#: config.c:840
1364 +#: config.c:859
1365 msgid "invalid unit"
1366 msgstr "无效的单位"
1367
1368 -#: config.c:846
1368 +#: config.c:865
1369 #, c-format
1370 msgid "bad numeric config value '%s' for '%s': %s"
1371 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
1372
1373 -#: config.c:851
1373 +#: config.c:870
1374 #, c-format
1375 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1376 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
1377
1378 -#: config.c:854
1378 +#: config.c:873
1379 #, c-format
1380 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1381 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
1382
1383 -#: config.c:857
1383 +#: config.c:876
1384 #, c-format
1385 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1386 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
1387
1388 -#: config.c:860
1388 +#: config.c:879
1389 #, c-format
1390 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1391 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
1392
1393 -#: config.c:863
1393 +#: config.c:882
1394 #, c-format
1395 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1396 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
1397
1398 -#: config.c:866
1398 +#: config.c:885
1399 #, c-format
1400 msgid "bad numeric config value '%s' for '%s' in %s: %s"
1401 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
1402
1403 -#: config.c:953
1403 +#: config.c:980
1404 #, c-format
1405 msgid "failed to expand user dir in: '%s'"
1406 msgstr "无法扩展 '%s' 中的用户目录"
1407
1408 -#: config.c:1048 config.c:1059
1408 +#: config.c:1075 config.c:1086
1409 #, c-format
1410 msgid "bad zlib compression level %d"
1411 msgstr "错误的 zlib 压缩级别 %d"
1412
1413 -#: config.c:1176
1413 +#: config.c:1203
1414 #, c-format
1415 msgid "invalid mode for object creation: %s"
1416 msgstr "无效的对象创建模式：%s"
1417
1418 -#: config.c:1332
1418 +#: config.c:1359
1419 #, c-format
1420 msgid "bad pack compression level %d"
1421 msgstr "错误的打包压缩级别 %d"
1422
1423 -#: config.c:1522
1423 +#: config.c:1557
1424 msgid "unable to parse command-line config"
1425 msgstr "无法解析命令行中的配置"
1426
1427 -#: config.c:1572
1427 +#: config.c:1611
1428 msgid "unknown error occurred while reading the configuration files"
1429 msgstr "在读取配置文件时遇到未知错误"
1430
1431 -#: config.c:1931
1431 +#: config.c:1970
1432 #, c-format
1433 msgid "Invalid %s: '%s'"
1434 msgstr "无效 %s：'%s'"
1435
1436 -#: config.c:1952
1436 +#: config.c:1991
1437 #, c-format
1438 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
1439 msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"
1440
1441 -#: config.c:1978
1441 +#: config.c:2017
1442 #, c-format
1443 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1444 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
1445
1446 -#: config.c:1989
1446 +#: config.c:2028
1447 #, c-format
1448 msgid "unable to parse '%s' from command-line config"
1449 msgstr "无法解析命令行配置中的 '%s'"
1450
1451 -#: config.c:1991
1451 +#: config.c:2030
1452 #, c-format
1453 msgid "bad config variable '%s' in file '%s' at line %d"
1454 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
1455
1456 -#: config.c:2050
1456 +#: config.c:2089
1457 #, c-format
1458 msgid "%s has multiple values"
1459 msgstr "%s 有多个取值"
1460
1461 -#: config.c:2384 config.c:2609
1461 +#: config.c:2423 config.c:2648
1462 #, c-format
1463 msgid "fstat on %s failed"
1464 msgstr "对 %s 调用 fstat 失败"
1465
1466 -#: config.c:2502
1466 +#: config.c:2541
1467 #, c-format
1468 msgid "could not set '%s' to '%s'"
1469 msgstr "不能设置 '%s' 为 '%s'"
1470
1471 -#: config.c:2504 builtin/remote.c:774
1471 +#: config.c:2543 builtin/remote.c:774
1472 #, c-format
1473 msgid "could not unset '%s'"
1474 msgstr "不能取消设置 '%s'"
@@ -1712,171 +1712,176 @@ msgstr "git fetch-pack：应为 shallow 列表"
1712 msgid "git fetch-pack: expected ACK/NAK, got EOF"
1713 msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"
1714
1715 -#: fetch-pack.c:279
1715 +#: fetch-pack.c:280 builtin/archive.c:63
1716 +#, c-format
1717 +msgid "remote error: %s"
1718 +msgstr "远程错误：%s"
1719 +
1720 +#: fetch-pack.c:281
1721 #, c-format
1722 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
1723 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
1724
1720 -#: fetch-pack.c:331
1725 +#: fetch-pack.c:333
1726 msgid "--stateless-rpc requires multi_ack_detailed"
1727 msgstr "--stateless-rpc 需要 multi_ack_detailed"
1728
1724 -#: fetch-pack.c:417
1729 +#: fetch-pack.c:419
1730 #, c-format
1731 msgid "invalid shallow line: %s"
1732 msgstr "无效的 shallow 信息：%s"
1733
1729 -#: fetch-pack.c:423
1734 +#: fetch-pack.c:425
1735 #, c-format
1736 msgid "invalid unshallow line: %s"
1737 msgstr "无效的 unshallow 信息：%s"
1738
1734 -#: fetch-pack.c:425
1739 +#: fetch-pack.c:427
1740 #, c-format
1741 msgid "object not found: %s"
1742 msgstr "对象未找到：%s"
1743
1739 -#: fetch-pack.c:428
1744 +#: fetch-pack.c:430
1745 #, c-format
1746 msgid "error in object: %s"
1747 msgstr "对象中出错：%s"
1748
1744 -#: fetch-pack.c:430
1749 +#: fetch-pack.c:432
1750 #, c-format
1751 msgid "no shallow found: %s"
1752 msgstr "未发现 shallow：%s"
1753
1749 -#: fetch-pack.c:433
1754 +#: fetch-pack.c:435
1755 #, c-format
1756 msgid "expected shallow/unshallow, got %s"
1757 msgstr "应为 shallow/unshallow，却得到 %s"
1758
1754 -#: fetch-pack.c:472
1759 +#: fetch-pack.c:474
1760 #, c-format
1761 msgid "got %s %d %s"
1762 msgstr "得到 %s %d %s"
1763
1759 -#: fetch-pack.c:486
1764 +#: fetch-pack.c:488
1765 #, c-format
1766 msgid "invalid commit %s"
1767 msgstr "无效提交 %s"
1768
1764 -#: fetch-pack.c:519
1769 +#: fetch-pack.c:521
1770 msgid "giving up"
1771 msgstr "放弃"
1772
1768 -#: fetch-pack.c:529 progress.c:235
1773 +#: fetch-pack.c:531 progress.c:235
1774 msgid "done"
1775 msgstr "完成"
1776
1772 -#: fetch-pack.c:541
1777 +#: fetch-pack.c:543
1778 #, c-format
1779 msgid "got %s (%d) %s"
1780 msgstr "得到 %s (%d) %s"
1781
1777 -#: fetch-pack.c:587
1782 +#: fetch-pack.c:589
1783 #, c-format
1784 msgid "Marking %s as complete"
1785 msgstr "标记 %s 为完成"
1786
1782 -#: fetch-pack.c:735
1787 +#: fetch-pack.c:737
1788 #, c-format
1789 msgid "already have %s (%s)"
1790 msgstr "已经有 %s（%s）"
1791
1787 -#: fetch-pack.c:773
1792 +#: fetch-pack.c:775
1793 msgid "fetch-pack: unable to fork off sideband demultiplexer"
1794 msgstr "fetch-pack：无法派生 sideband 多路输出"
1795
1791 -#: fetch-pack.c:781
1796 +#: fetch-pack.c:783
1797 msgid "protocol error: bad pack header"
1798 msgstr "协议错误：坏的包头"
1799
1795 -#: fetch-pack.c:837
1800 +#: fetch-pack.c:839
1801 #, c-format
1802 msgid "fetch-pack: unable to fork off %s"
1803 msgstr "fetch-pack：无法派生进程 %s"
1804
1800 -#: fetch-pack.c:853
1805 +#: fetch-pack.c:855
1806 #, c-format
1807 msgid "%s failed"
1808 msgstr "%s 失败"
1809
1805 -#: fetch-pack.c:855
1810 +#: fetch-pack.c:857
1811 msgid "error in sideband demultiplexer"
1812 msgstr "sideband 多路输出出错"
1813
1809 -#: fetch-pack.c:882
1814 +#: fetch-pack.c:884
1815 msgid "Server does not support shallow clients"
1816 msgstr "服务器不支持 shalllow 客户端"
1817
1813 -#: fetch-pack.c:886
1818 +#: fetch-pack.c:888
1819 msgid "Server supports multi_ack_detailed"
1820 msgstr "服务器支持 multi_ack_detailed"
1821
1817 -#: fetch-pack.c:889
1822 +#: fetch-pack.c:891
1823 msgid "Server supports no-done"
1824 msgstr "服务器支持 no-done"
1825
1821 -#: fetch-pack.c:895
1826 +#: fetch-pack.c:897
1827 msgid "Server supports multi_ack"
1828 msgstr "服务器支持 multi_ack"
1829
1825 -#: fetch-pack.c:899
1830 +#: fetch-pack.c:901
1831 msgid "Server supports side-band-64k"
1832 msgstr "服务器支持 side-band-64k"
1833
1829 -#: fetch-pack.c:903
1834 +#: fetch-pack.c:905
1835 msgid "Server supports side-band"
1836 msgstr "服务器支持 side-band"
1837
1833 -#: fetch-pack.c:907
1838 +#: fetch-pack.c:909
1839 msgid "Server supports allow-tip-sha1-in-want"
1840 msgstr "服务器支持 allow-tip-sha1-in-want"
1841
1837 -#: fetch-pack.c:911
1842 +#: fetch-pack.c:913
1843 msgid "Server supports allow-reachable-sha1-in-want"
1844 msgstr "服务器支持 allow-reachable-sha1-in-want"
1845
1841 -#: fetch-pack.c:921
1846 +#: fetch-pack.c:923
1847 msgid "Server supports ofs-delta"
1848 msgstr "服务器支持 ofs-delta"
1849
1845 -#: fetch-pack.c:928
1850 +#: fetch-pack.c:930
1851 #, c-format
1852 msgid "Server version is %.*s"
1853 msgstr "服务器版本 %.*s"
1854
1850 -#: fetch-pack.c:934
1855 +#: fetch-pack.c:936
1856 msgid "Server does not support --shallow-since"
1857 msgstr "服务器不支持 --shallow-since"
1858
1854 -#: fetch-pack.c:938
1859 +#: fetch-pack.c:940
1860 msgid "Server does not support --shallow-exclude"
1861 msgstr "服务器不支持 --shallow-exclude"
1862
1858 -#: fetch-pack.c:940
1863 +#: fetch-pack.c:942
1864 msgid "Server does not support --deepen"
1865 msgstr "服务器不支持 --deepen"
1866
1862 -#: fetch-pack.c:951
1867 +#: fetch-pack.c:953
1868 msgid "no common commits"
1869 msgstr "没有共同的提交"
1870
1866 -#: fetch-pack.c:963
1871 +#: fetch-pack.c:965
1872 msgid "git fetch-pack: fetch failed."
1873 msgstr "git fetch-pack：获取失败。"
1874
1870 -#: fetch-pack.c:1125
1875 +#: fetch-pack.c:1127
1876 msgid "no matching remote head"
1877 msgstr "没有匹配的远程分支"
1878
1874 -#: fetch-pack.c:1147
1879 +#: fetch-pack.c:1149
1880 #, c-format
1881 msgid "no such remote ref %s"
1882 msgstr "没有这样的远程引用 %s"
1883
1879 -#: fetch-pack.c:1150
1884 +#: fetch-pack.c:1152
1885 #, c-format
1886 msgid "Server does not allow request for unadvertised object %s"
1887 msgstr "服务器不允许请求未公开的对象 %s"
@@ -2063,7 +2068,7 @@ msgstr "不能创建 '%s.lock'：%s"
2068 msgid "failed to read the cache"
2069 msgstr "无法读取缓存"
2070
2066 -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393
2071 +#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
2072 #: builtin/checkout.c:607 builtin/clone.c:749
2073 msgid "unable to write new index file"
2074 msgstr "无法写新的索引文件"
@@ -2397,7 +2402,7 @@ msgstr "-数字"
2402 msgid "malformed object name '%s'"
2403 msgstr "非法的对象名 '%s'"
2404
2400 -#: path.c:805
2405 +#: path.c:810
2406 #, c-format
2407 msgid "Could not make %s writable by group"
2408 msgstr "不能设置 %s 为组可写"
@@ -2490,7 +2495,7 @@ msgstr "路径规格 '%s' 位于符号链接中"
2495 msgid "unable to parse --pretty format"
2496 msgstr "不能解析 --pretty 格式"
2497
2493 -#: read-cache.c:1307
2498 +#: read-cache.c:1442
2499 #, c-format
2500 msgid ""
2501 "index.version set, but the value is invalid.\n"
@@ -2499,7 +2504,7 @@ msgstr ""
2504 "设置了 index.version，但是取值无效。\n"
2505 "使用版本 %i"
2506
2502 -#: read-cache.c:1317
2507 +#: read-cache.c:1452
2508 #, c-format
2509 msgid ""
2510 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2508,37 +2513,41 @@ msgstr ""
2513 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"
2514 "使用版本 %i"
2515
2511 -#: read-cache.c:2232
2516 +#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
2517 #, c-format
2513 -msgid "could not stat '%s"
2518 +msgid "could not stat '%s'"
2519 msgstr "不能对 '%s' 调用 stat"
2520
2516 -#: read-cache.c:2245
2521 +#: read-cache.c:2388
2522 #, c-format
2523 msgid "unable to open git dir: %s"
2524 msgstr "不能打开 git 目录：%s"
2525
2521 -#: read-cache.c:2257
2526 +#: read-cache.c:2400
2527 #, c-format
2528 msgid "unable to unlink: %s"
2529 msgstr "无法删除：%s"
2530
2526 -#: refs.c:619 builtin/merge.c:844
2531 +#: refs.c:620 builtin/merge.c:844
2532 #, c-format
2533 msgid "Could not open '%s' for writing"
2534 msgstr "无法打开 '%s' 进行写入"
2535
2531 -#: refs/files-backend.c:2531
2536 +#: refs.c:1667
2537 +msgid "ref updates forbidden inside quarantine environment"
2538 +msgstr "在隔离环境中禁止更新引用"
2539 +
2540 +#: refs/files-backend.c:1631
2541 #, c-format
2542 msgid "could not delete reference %s: %s"
2543 msgstr "无法删除引用 %s：%s"
2544
2536 -#: refs/files-backend.c:2534
2545 +#: refs/files-backend.c:1634
2546 #, c-format
2547 msgid "could not delete references: %s"
2548 msgstr "无法删除引用：%s"
2549
2541 -#: refs/files-backend.c:2543
2550 +#: refs/files-backend.c:1643
2551 #, c-format
2552 msgid "could not remove reference %s"
2553 msgstr "无法删除引用 %s"
@@ -2977,12 +2986,12 @@ msgstr ""
2986 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
2987 "对修正后的文件做标记，然后用 'git commit' 提交"
2988
2980 -#: sequencer.c:294 sequencer.c:1675
2989 +#: sequencer.c:294 sequencer.c:1682
2990 #, c-format
2991 msgid "could not lock '%s'"
2992 msgstr "不能锁定 '%s'"
2993
2985 -#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694
2994 +#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
2995 #, c-format
2996 msgid "could not write to '%s'"
2997 msgstr "不能写入 '%s'"
@@ -2992,12 +3001,12 @@ msgstr "不能写入 '%s'"
3001 msgid "could not write eol to '%s'"
3002 msgstr "不能将换行符写入 '%s'"
3003
2995 -#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682
3004 +#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
3005 #, c-format
3006 msgid "failed to finalize '%s'."
3007 msgstr "无法完成 '%s'。"
3008
3000 -#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259
3009 +#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
3010 #: builtin/commit.c:749 builtin/merge.c:1018
3011 #, c-format
3012 msgid "could not read '%s'"
@@ -3171,7 +3180,7 @@ msgstr "不能得到 %s 的提交说明"
3180 msgid "%s: cannot parse parent commit %s"
3181 msgstr "%s：不能解析父提交 %s"
3182
3174 -#: sequencer.c:1071 sequencer.c:1820
3183 +#: sequencer.c:1071 sequencer.c:1827
3184 #, c-format
3185 msgid "could not rename '%s' to '%s'"
3186 msgstr "不能将 '%s' 重命名为 '%s'"
@@ -3200,124 +3209,124 @@ msgstr "git %s：无法读取索引"
3209 msgid "git %s: failed to refresh the index"
3210 msgstr "git %s：无法刷新索引"
3211
3203 -#: sequencer.c:1302
3212 +#: sequencer.c:1303
3213 #, c-format
3214 msgid "invalid line %d: %.*s"
3215 msgstr "无效行 %d：%.*s"
3216
3208 -#: sequencer.c:1310
3217 +#: sequencer.c:1311
3218 #, c-format
3219 msgid "cannot '%s' without a previous commit"
3220 msgstr "没有父提交的情况下不能 '%s'"
3221
3213 -#: sequencer.c:1342
3222 +#: sequencer.c:1344
3223 #, c-format
3224 msgid "could not read '%s'."
3225 msgstr "不能读取 '%s'。"
3226
3218 -#: sequencer.c:1349
3227 +#: sequencer.c:1356
3228 msgid "please fix this using 'git rebase --edit-todo'."
3229 msgstr "请用 'git rebase --edit-todo' 来修改。"
3230
3222 -#: sequencer.c:1351
3231 +#: sequencer.c:1358
3232 #, c-format
3233 msgid "unusable instruction sheet: '%s'"
3234 msgstr "不可用的指令清单：'%s'"
3235
3227 -#: sequencer.c:1356
3236 +#: sequencer.c:1363
3237 msgid "no commits parsed."
3238 msgstr "没有解析提交。"
3239
3231 -#: sequencer.c:1367
3240 +#: sequencer.c:1374
3241 msgid "cannot cherry-pick during a revert."
3242 msgstr "不能在回退中执行拣选。"
3243
3235 -#: sequencer.c:1369
3244 +#: sequencer.c:1376
3245 msgid "cannot revert during a cherry-pick."
3246 msgstr "不能在拣选中执行回退。"
3247
3239 -#: sequencer.c:1432
3248 +#: sequencer.c:1439
3249 #, c-format
3250 msgid "invalid key: %s"
3251 msgstr "无效键名：%s"
3252
3244 -#: sequencer.c:1435
3253 +#: sequencer.c:1442
3254 #, c-format
3255 msgid "invalid value for %s: %s"
3256 msgstr "%s 的值无效：%s"
3257
3249 -#: sequencer.c:1492
3258 +#: sequencer.c:1499
3259 #, c-format
3260 msgid "malformed options sheet: '%s'"
3261 msgstr "非法的选项清单：'%s'"
3262
3254 -#: sequencer.c:1530
3263 +#: sequencer.c:1537
3264 msgid "a cherry-pick or revert is already in progress"
3265 msgstr "一个拣选或还原操作已在进行"
3266
3258 -#: sequencer.c:1531
3267 +#: sequencer.c:1538
3268 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
3269 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
3270
3262 -#: sequencer.c:1534
3271 +#: sequencer.c:1541
3272 #, c-format
3273 msgid "could not create sequencer directory '%s'"
3274 msgstr "不能创建序列目录 '%s'"
3275
3267 -#: sequencer.c:1548
3276 +#: sequencer.c:1555
3277 msgid "could not lock HEAD"
3278 msgstr "不能锁定 HEAD"
3279
3271 -#: sequencer.c:1604 sequencer.c:2159
3280 +#: sequencer.c:1611 sequencer.c:2181
3281 msgid "no cherry-pick or revert in progress"
3282 msgstr "拣选或还原操作并未进行"
3283
3275 -#: sequencer.c:1606
3284 +#: sequencer.c:1613
3285 msgid "cannot resolve HEAD"
3286 msgstr "不能解析 HEAD"
3287
3279 -#: sequencer.c:1608 sequencer.c:1642
3288 +#: sequencer.c:1615 sequencer.c:1649
3289 msgid "cannot abort from a branch yet to be born"
3290 msgstr "不能从尚未建立的分支终止"
3291
3283 -#: sequencer.c:1628 builtin/grep.c:910
3292 +#: sequencer.c:1635 builtin/grep.c:910
3293 #, c-format
3294 msgid "cannot open '%s'"
3295 msgstr "不能打开 '%s'"
3296
3288 -#: sequencer.c:1630
3297 +#: sequencer.c:1637
3298 #, c-format
3299 msgid "cannot read '%s': %s"
3300 msgstr "不能读取 '%s'：%s"
3301
3293 -#: sequencer.c:1631
3302 +#: sequencer.c:1638
3303 msgid "unexpected end of file"
3304 msgstr "意外的文件结束"
3305
3297 -#: sequencer.c:1637
3306 +#: sequencer.c:1644
3307 #, c-format
3308 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
3309 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
3310
3302 -#: sequencer.c:1648
3311 +#: sequencer.c:1655
3312 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
3313 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
3314
3306 -#: sequencer.c:1785 sequencer.c:2058
3315 +#: sequencer.c:1792 sequencer.c:2080
3316 msgid "cannot read HEAD"
3317 msgstr "不能读取 HEAD"
3318
3310 -#: sequencer.c:1825 builtin/difftool.c:616
3319 +#: sequencer.c:1832 builtin/difftool.c:616
3320 #, c-format
3321 msgid "could not copy '%s' to '%s'"
3322 msgstr "不能拷贝 '%s' 至 '%s'"
3323
3315 -#: sequencer.c:1841
3324 +#: sequencer.c:1848
3325 msgid "could not read index"
3326 msgstr "不能读取索引"
3327
3328 # 译者：注意保持前导空格
3320 -#: sequencer.c:1846
3329 +#: sequencer.c:1853
3330 #, c-format
3331 msgid ""
3332 "execution failed: %s\n"
@@ -3332,11 +3341,11 @@ msgstr ""
3341 " git rebase --continue\n"
3342 "\n"
3343
3335 -#: sequencer.c:1852
3344 +#: sequencer.c:1859
3345 msgid "and made changes to the index and/or the working tree\n"
3346 msgstr "并且修改索引和/或工作区\n"
3347
3339 -#: sequencer.c:1858
3348 +#: sequencer.c:1865
3349 #, c-format
3350 msgid ""
3351 "execution succeeded: %s\n"
@@ -3353,17 +3362,17 @@ msgstr ""
3362 " git rebase --continue\n"
3363 "\n"
3364
3356 -#: sequencer.c:1913 git-rebase.sh:168
3365 +#: sequencer.c:1920 git-rebase.sh:169
3366 #, c-format
3367 msgid "Applied autostash."
3368 msgstr "成功应用 autostash。"
3369
3361 -#: sequencer.c:1925
3370 +#: sequencer.c:1932
3371 #, c-format
3372 msgid "cannot store %s"
3373 msgstr "不能存储 %s"
3374
3366 -#: sequencer.c:1927 git-rebase.sh:172
3375 +#: sequencer.c:1934 git-rebase.sh:173
3376 #, c-format
3377 msgid ""
3378 "Applying autostash resulted in conflicts.\n"
@@ -3374,57 +3383,57 @@ msgstr ""
3383 "您的修改安全地保存在 stash 中。\n"
3384 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
3385
3377 -#: sequencer.c:2009
3386 +#: sequencer.c:2016
3387 #, c-format
3388 msgid "Stopped at %s... %.*s\n"
3389 msgstr "停止在 %s... %.*s\n"
3390
3382 -#: sequencer.c:2036
3391 +#: sequencer.c:2058
3392 #, c-format
3393 msgid "unknown command %d"
3394 msgstr "未知命令 %d"
3395
3387 -#: sequencer.c:2066
3396 +#: sequencer.c:2088
3397 msgid "could not read orig-head"
3398 msgstr "不能读取 orig-head"
3399
3391 -#: sequencer.c:2070
3400 +#: sequencer.c:2092
3401 msgid "could not read 'onto'"
3402 msgstr "不能读取 'onto'"
3403
3395 -#: sequencer.c:2077
3404 +#: sequencer.c:2099
3405 #, c-format
3406 msgid "could not update %s"
3407 msgstr "不能更新 %s"
3408
3400 -#: sequencer.c:2084
3409 +#: sequencer.c:2106
3410 #, c-format
3411 msgid "could not update HEAD to %s"
3412 msgstr "不能更新 HEAD 为 %s"
3413
3405 -#: sequencer.c:2168
3414 +#: sequencer.c:2190
3415 msgid "cannot rebase: You have unstaged changes."
3416 msgstr "不能变基：您有未暂存的变更。"
3417
3409 -#: sequencer.c:2173
3418 +#: sequencer.c:2195
3419 msgid "could not remove CHERRY_PICK_HEAD"
3420 msgstr "不能删除 CHERRY_PICK_HEAD"
3421
3413 -#: sequencer.c:2182
3422 +#: sequencer.c:2204
3423 msgid "cannot amend non-existing commit"
3424 msgstr "不能修补不存在的提交"
3425
3417 -#: sequencer.c:2184
3426 +#: sequencer.c:2206
3427 #, c-format
3428 msgid "invalid file: '%s'"
3429 msgstr "无效文件：'%s'"
3430
3422 -#: sequencer.c:2186
3431 +#: sequencer.c:2208
3432 #, c-format
3433 msgid "invalid contents: '%s'"
3434 msgstr "无效内容：'%s'"
3435
3427 -#: sequencer.c:2189
3436 +#: sequencer.c:2211
3437 msgid ""
3438 "\n"
3439 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3433,21 +3442,21 @@ msgstr ""
3442 "\n"
3443 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
3444
3436 -#: sequencer.c:2199
3445 +#: sequencer.c:2221
3446 msgid "could not commit staged changes."
3447 msgstr "不能提交暂存的修改。"
3448
3440 -#: sequencer.c:2279
3449 +#: sequencer.c:2301
3450 #, c-format
3451 msgid "%s: can't cherry-pick a %s"
3452 msgstr "%s：不能拣选一个%s"
3453
3445 -#: sequencer.c:2283
3454 +#: sequencer.c:2305
3455 #, c-format
3456 msgid "%s: bad revision"
3457 msgstr "%s：错误的版本"
3458
3450 -#: sequencer.c:2316
3459 +#: sequencer.c:2338
3460 msgid "can't revert as initial commit"
3461 msgstr "不能作为初始提交回退"
3462
@@ -3643,24 +3652,24 @@ msgstr "无法在子模组 '%s' 中执行 'git status'"
3652 msgid "submodule '%s' has dirty index"
3653 msgstr "子模组 '%s' 中有脏索引"
3654
3646 -#: submodule.c:1679
3655 +#: submodule.c:1678
3656 #, c-format
3657 msgid ""
3658 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
3659 msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
3660
3652 -#: submodule.c:1691 submodule.c:1747
3661 +#: submodule.c:1690 submodule.c:1746
3662 #, c-format
3663 msgid "could not lookup name for submodule '%s'"
3664 msgstr "不能查询子模组 '%s' 的名称"
3665
3657 -#: submodule.c:1695 builtin/submodule--helper.c:678
3666 +#: submodule.c:1694 builtin/submodule--helper.c:678
3667 #: builtin/submodule--helper.c:688
3668 #, c-format
3669 msgid "could not create directory '%s'"
3670 msgstr "不能创建目录 '%s'"
3671
3663 -#: submodule.c:1698
3672 +#: submodule.c:1697
3673 #, c-format
3674 msgid ""
3675 "Migrating git directory of '%s%s' from\n"
@@ -3671,20 +3680,20 @@ msgstr ""
3680 "'%s' 迁移至\n"
3681 "'%s'\n"
3682
3674 -#: submodule.c:1782
3683 +#: submodule.c:1781
3684 #, c-format
3685 msgid "could not recurse into submodule '%s'"
3686 msgstr "无法递归进子模组路径 '%s'"
3687
3679 -#: submodule.c:1826
3688 +#: submodule.c:1825
3689 msgid "could not start ls-files in .."
3690 msgstr "无法在 .. 中启动 ls-files"
3691
3683 -#: submodule.c:1846
3692 +#: submodule.c:1845
3693 msgid "BUG: returned path string doesn't match cwd?"
3694 msgstr "BUG：返回的路径和当前路径不匹配？"
3695
3687 -#: submodule.c:1865
3696 +#: submodule.c:1864
3697 #, c-format
3698 msgid "ls-tree returned unexpected return code %d"
3699 msgstr "ls-tree 返回未知返回值 %d"
@@ -4091,8 +4100,8 @@ msgstr "无法打开 '%s' 进行读写"
4100 msgid "could not open '%s' for writing"
4101 msgstr "无法打开 '%s' 进行写入"
4102
4094 -#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
4095 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015
4103 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757
4104 +#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015
4105 #: builtin/pull.c:341
4106 #, c-format
4107 msgid "could not open '%s' for reading"
@@ -4770,105 +4779,105 @@ msgstr "也许您想要执行 'git add .'？\n"
4779 msgid "index file corrupt"
4780 msgstr "索引文件损坏"
4781
4773 -#: builtin/am.c:414
4782 +#: builtin/am.c:412
4783 msgid "could not parse author script"
4784 msgstr "不能解析作者脚本"
4785
4777 -#: builtin/am.c:491
4786 +#: builtin/am.c:489
4787 #, c-format
4788 msgid "'%s' was deleted by the applypatch-msg hook"
4789 msgstr "'%s' 被 applypatch-msg 钩子删除"
4790
4782 -#: builtin/am.c:532
4791 +#: builtin/am.c:530
4792 #, c-format
4793 msgid "Malformed input line: '%s'."
4794 msgstr "非法的输入行：'%s'。"
4795
4787 -#: builtin/am.c:569
4796 +#: builtin/am.c:567
4797 #, c-format
4798 msgid "Failed to copy notes from '%s' to '%s'"
4799 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
4800
4792 -#: builtin/am.c:595
4801 +#: builtin/am.c:593
4802 msgid "fseek failed"
4803 msgstr "fseek 失败"
4804
4796 -#: builtin/am.c:775
4805 +#: builtin/am.c:777
4806 #, c-format
4807 msgid "could not parse patch '%s'"
4808 msgstr "无法解析补丁 '%s'"
4809
4801 -#: builtin/am.c:840
4810 +#: builtin/am.c:842
4811 msgid "Only one StGIT patch series can be applied at once"
4812 msgstr "一次只能有一个 StGIT 补丁队列被应用"
4813
4805 -#: builtin/am.c:887
4814 +#: builtin/am.c:889
4815 msgid "invalid timestamp"
4816 msgstr "无效的时间戳"
4817
4809 -#: builtin/am.c:890 builtin/am.c:898
4818 +#: builtin/am.c:892 builtin/am.c:900
4819 msgid "invalid Date line"
4820 msgstr "无效的日期行"
4821
4813 -#: builtin/am.c:895
4822 +#: builtin/am.c:897
4823 msgid "invalid timezone offset"
4824 msgstr "无效的时区偏移值"
4825
4817 -#: builtin/am.c:984
4826 +#: builtin/am.c:986
4827 msgid "Patch format detection failed."
4828 msgstr "补丁格式探测失败。"
4829
4821 -#: builtin/am.c:989 builtin/clone.c:397
4830 +#: builtin/am.c:991 builtin/clone.c:397
4831 #, c-format
4832 msgid "failed to create directory '%s'"
4833 msgstr "无法创建目录 '%s'"
4834
4826 -#: builtin/am.c:993
4835 +#: builtin/am.c:995
4836 msgid "Failed to split patches."
4837 msgstr "无法拆分补丁。"
4838
4830 -#: builtin/am.c:1125 builtin/commit.c:376
4839 +#: builtin/am.c:1127 builtin/commit.c:376
4840 msgid "unable to write index file"
4841 msgstr "无法写入索引文件"
4842
4834 -#: builtin/am.c:1176
4843 +#: builtin/am.c:1178
4844 #, c-format
4845 msgid "When you have resolved this problem, run \"%s --continue\"."
4846 msgstr "当您解决这一问题，执行 \"%s --continue\"。"
4847
4839 -#: builtin/am.c:1177
4848 +#: builtin/am.c:1179
4849 #, c-format
4850 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
4851 msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
4852
4844 -#: builtin/am.c:1178
4853 +#: builtin/am.c:1180
4854 #, c-format
4855 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
4856 msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
4857
4849 -#: builtin/am.c:1316
4858 +#: builtin/am.c:1315
4859 msgid "Patch is empty. Was it split wrong?"
4860 msgstr "补丁为空。是不是切分错误？"
4861
4853 -#: builtin/am.c:1390 builtin/log.c:1557
4862 +#: builtin/am.c:1386 builtin/log.c:1557
4863 #, c-format
4864 msgid "invalid ident line: %s"
4865 msgstr "包含无效的身份标识：%s"
4866
4858 -#: builtin/am.c:1417
4867 +#: builtin/am.c:1413
4868 #, c-format
4869 msgid "unable to parse commit %s"
4870 msgstr "不能解析提交 %s"
4871
4863 -#: builtin/am.c:1610
4872 +#: builtin/am.c:1606
4873 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4874 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4875
4867 -#: builtin/am.c:1612
4876 +#: builtin/am.c:1608
4877 msgid "Using index info to reconstruct a base tree..."
4878 msgstr "使用索引来重建一个（三方合并的）基础目录树..."
4879
4871 -#: builtin/am.c:1631
4880 +#: builtin/am.c:1627
4881 msgid ""
4882 "Did you hand edit your patch?\n"
4883 "It does not apply to blobs recorded in its index."
@@ -4876,37 +4885,37 @@ msgstr ""
4885 "您是否曾手动编辑过您的补丁？\n"
4886 "无法应用补丁到索引中的数据对象上。"
4887
4879 -#: builtin/am.c:1637
4888 +#: builtin/am.c:1633
4889 msgid "Falling back to patching base and 3-way merge..."
4890 msgstr "回落到基础版本上打补丁及进行三方合并..."
4891
4883 -#: builtin/am.c:1662
4892 +#: builtin/am.c:1658
4893 msgid "Failed to merge in the changes."
4894 msgstr "无法合并变更。"
4895
4887 -#: builtin/am.c:1686 builtin/merge.c:631
4896 +#: builtin/am.c:1682 builtin/merge.c:631
4897 msgid "git write-tree failed to write a tree"
4898 msgstr "git write-tree 无法写入一树对象"
4899
4891 -#: builtin/am.c:1693
4900 +#: builtin/am.c:1689
4901 msgid "applying to an empty history"
4902 msgstr "正应用到一个空历史上"
4903
4895 -#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
4904 +#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
4905 #: builtin/merge.c:827
4906 msgid "failed to write commit object"
4907 msgstr "无法写提交对象"
4908
4900 -#: builtin/am.c:1739 builtin/am.c:1743
4909 +#: builtin/am.c:1735 builtin/am.c:1739
4910 #, c-format
4911 msgid "cannot resume: %s does not exist."
4912 msgstr "无法继续：%s 不存在。"
4913
4905 -#: builtin/am.c:1759
4914 +#: builtin/am.c:1755
4915 msgid "cannot be interactive without stdin connected to a terminal."
4916 msgstr "标准输入没有和终端关联，不能进行交互式操作。"
4917
4909 -#: builtin/am.c:1764
4918 +#: builtin/am.c:1760
4919 msgid "Commit Body is:"
4920 msgstr "提交内容为："
4921
@@ -4915,35 +4924,35 @@ msgstr "提交内容为："
4924 #. in your translation. The program will only accept English
4925 #. input at this point.
4926 #.
4918 -#: builtin/am.c:1774
4927 +#: builtin/am.c:1770
4928 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
4929 msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
4930
4922 -#: builtin/am.c:1824
4931 +#: builtin/am.c:1820
4932 #, c-format
4933 msgid "Dirty index: cannot apply patches (dirty: %s)"
4934 msgstr "脏索引：不能应用补丁（脏文件：%s）"
4935
4927 -#: builtin/am.c:1861 builtin/am.c:1933
4936 +#: builtin/am.c:1860 builtin/am.c:1932
4937 #, c-format
4938 msgid "Applying: %.*s"
4939 msgstr "应用：%.*s"
4940
4932 -#: builtin/am.c:1877
4941 +#: builtin/am.c:1876
4942 msgid "No changes -- Patch already applied."
4943 msgstr "没有变更 —— 补丁已经应用过。"
4944
4936 -#: builtin/am.c:1885
4945 +#: builtin/am.c:1884
4946 #, c-format
4947 msgid "Patch failed at %s %.*s"
4948 msgstr "打补丁失败于 %s %.*s"
4949
4941 -#: builtin/am.c:1891
4950 +#: builtin/am.c:1890
4951 #, c-format
4952 msgid "The copy of the patch that failed is found in: %s"
4953 msgstr "失败的补丁文件副本位于：%s"
4954
4946 -#: builtin/am.c:1936
4955 +#: builtin/am.c:1935
4956 msgid ""
4957 "No changes - did you forget to use 'git add'?\n"
4958 "If there is nothing left to stage, chances are that something else\n"
@@ -4953,7 +4962,7 @@ msgstr ""
4962 "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
4963 "您也许想要跳过这个补丁。"
4964
4956 -#: builtin/am.c:1943
4965 +#: builtin/am.c:1942
4966 msgid ""
4967 "You still have unmerged paths in your index.\n"
4968 "Did you forget to use 'git add'?"
@@ -4961,91 +4970,91 @@ msgstr ""
4970 "您的索引中仍有未合并的路径。\n"
4971 "您是否忘了执行 'git add'？"
4972
4964 -#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
4973 +#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
4974 #: builtin/reset.c:316
4975 #, c-format
4976 msgid "Could not parse object '%s'."
4977 msgstr "不能解析对象 '%s'。"
4978
4970 -#: builtin/am.c:2103
4979 +#: builtin/am.c:2102
4980 msgid "failed to clean index"
4981 msgstr "无法清空索引"
4982
4974 -#: builtin/am.c:2137
4983 +#: builtin/am.c:2136
4984 msgid ""
4985 "You seem to have moved HEAD since the last 'am' failure.\n"
4986 "Not rewinding to ORIG_HEAD"
4987 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
4988
4980 -#: builtin/am.c:2200
4989 +#: builtin/am.c:2199
4990 #, c-format
4991 msgid "Invalid value for --patch-format: %s"
4992 msgstr "无效的 --patch-format 值：%s"
4993
4985 -#: builtin/am.c:2233
4994 +#: builtin/am.c:2232
4995 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
4996 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
4997
4989 -#: builtin/am.c:2234
4998 +#: builtin/am.c:2233
4999 msgid "git am [<options>] (--continue | --skip | --abort)"
5000 msgstr "git am [<选项>] (--continue | --skip | --abort)"
5001
4993 -#: builtin/am.c:2240
5002 +#: builtin/am.c:2239
5003 msgid "run interactively"
5004 msgstr "以交互式方式运行"
5005
4997 -#: builtin/am.c:2242
5006 +#: builtin/am.c:2241
5007 msgid "historical option -- no-op"
5008 msgstr "老的参数 —— 无作用"
5009
5001 -#: builtin/am.c:2244
5010 +#: builtin/am.c:2243
5011 msgid "allow fall back on 3way merging if needed"
5012 msgstr "如果必要，允许使用三方合并。"
5013
5005 -#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
5014 +#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
5015 #: builtin/repack.c:178
5016 msgid "be quiet"
5017 msgstr "静默模式"
5018
5010 -#: builtin/am.c:2247
5019 +#: builtin/am.c:2246
5020 msgid "add a Signed-off-by line to the commit message"
5021 msgstr "在提交说明中添加一个 Signed-off-by 签名"
5022
5014 -#: builtin/am.c:2250
5023 +#: builtin/am.c:2249
5024 msgid "recode into utf8 (default)"
5025 msgstr "使用 utf8 字符集（默认）"
5026
5018 -#: builtin/am.c:2252
5027 +#: builtin/am.c:2251
5028 msgid "pass -k flag to git-mailinfo"
5029 msgstr "向 git-mailinfo 传递 -k 参数"
5030
5022 -#: builtin/am.c:2254
5031 +#: builtin/am.c:2253
5032 msgid "pass -b flag to git-mailinfo"
5033 msgstr "向 git-mailinfo 传递 -b 参数"
5034
5026 -#: builtin/am.c:2256
5035 +#: builtin/am.c:2255
5036 msgid "pass -m flag to git-mailinfo"
5037 msgstr "向 git-mailinfo 传递 -m 参数"
5038
5030 -#: builtin/am.c:2258
5039 +#: builtin/am.c:2257
5040 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
5041 msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
5042
5034 -#: builtin/am.c:2261
5043 +#: builtin/am.c:2260
5044 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
5045 msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
5046
5038 -#: builtin/am.c:2264
5047 +#: builtin/am.c:2263
5048 msgid "strip everything before a scissors line"
5049 msgstr "丢弃裁切线前的所有内容"
5050
5042 -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
5043 -#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
5044 -#: builtin/am.c:2293
5051 +#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274
5052 +#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286
5053 +#: builtin/am.c:2292
5054 msgid "pass it through git-apply"
5055 msgstr "传递给 git-apply"
5056
5048 -#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
5057 +#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
5058 #: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
5059 #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
5060 #: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
@@ -5053,57 +5062,57 @@ msgstr "传递给 git-apply"
5062 msgid "n"
5063 msgstr "n"
5064
5056 -#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37
5057 -#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38
5065 +#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37
5066 +#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38
5067 msgid "format"
5068 msgstr "格式"
5069
5061 -#: builtin/am.c:2290
5070 +#: builtin/am.c:2289
5071 msgid "format the patch(es) are in"
5072 msgstr "补丁的格式"
5073
5065 -#: builtin/am.c:2296
5074 +#: builtin/am.c:2295
5075 msgid "override error message when patch failure occurs"
5076 msgstr "打补丁失败时显示的错误信息"
5077
5069 -#: builtin/am.c:2298
5078 +#: builtin/am.c:2297
5079 msgid "continue applying patches after resolving a conflict"
5080 msgstr "冲突解决后继续应用补丁"
5081
5073 -#: builtin/am.c:2301
5082 +#: builtin/am.c:2300
5083 msgid "synonyms for --continue"
5084 msgstr "和 --continue 同义"
5085
5077 -#: builtin/am.c:2304
5086 +#: builtin/am.c:2303
5087 msgid "skip the current patch"
5088 msgstr "跳过当前补丁"
5089
5081 -#: builtin/am.c:2307
5090 +#: builtin/am.c:2306
5091 msgid "restore the original branch and abort the patching operation."
5092 msgstr "恢复原始分支并终止打补丁操作。"
5093
5085 -#: builtin/am.c:2311
5094 +#: builtin/am.c:2310
5095 msgid "lie about committer date"
5096 msgstr "将作者日期作为提交日期"
5097
5089 -#: builtin/am.c:2313
5098 +#: builtin/am.c:2312
5099 msgid "use current timestamp for author date"
5100 msgstr "用当前时间作为作者日期"
5101
5093 -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232
5102 +#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
5103 #: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
5104 msgid "key-id"
5105 msgstr "key-id"
5106
5098 -#: builtin/am.c:2316
5107 +#: builtin/am.c:2315
5108 msgid "GPG-sign commits"
5109 msgstr "使用 GPG 签名提交"
5110
5102 -#: builtin/am.c:2319
5111 +#: builtin/am.c:2318
5112 msgid "(internal use for git-rebase)"
5113 msgstr "（内部使用，用于 git-rebase）"
5114
5106 -#: builtin/am.c:2334
5115 +#: builtin/am.c:2333
5116 msgid ""
5117 "The -b/--binary option has been a no-op for long time, and\n"
5118 "it will be removed. Please do not use it anymore."
@@ -5111,16 +5120,16 @@ msgstr ""
5120 "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
5121 "请不要再使用它了。"
5122
5114 -#: builtin/am.c:2341
5123 +#: builtin/am.c:2340
5124 msgid "failed to read the index"
5125 msgstr "无法读取索引"
5126
5118 -#: builtin/am.c:2356
5127 +#: builtin/am.c:2355
5128 #, c-format
5129 msgid "previous rebase directory %s still exists but mbox given."
5130 msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
5131
5123 -#: builtin/am.c:2380
5132 +#: builtin/am.c:2379
5133 #, c-format
5134 msgid ""
5135 "Stray %s directory found.\n"
@@ -5129,7 +5138,7 @@ msgstr ""
5138 "发现了错误的 %s 目录。\n"
5139 "使用 \"git am --abort\" 删除它。"
5140
5132 -#: builtin/am.c:2386
5141 +#: builtin/am.c:2385
5142 msgid "Resolve operation not in progress, we are not resuming."
5143 msgstr "解决操作未进行，我们不会继续。"
5144
@@ -5159,11 +5168,6 @@ msgstr "git archive：应为 ACK/NACK，却得到 EOF"
5168 msgid "git archive: NACK %s"
5169 msgstr "git archive：NACK %s"
5170
5162 -#: builtin/archive.c:63
5163 -#, c-format
5164 -msgid "remote error: %s"
5165 -msgstr "远程错误：%s"
5166 -
5171 #: builtin/archive.c:64
5172 msgid "git archive: protocol error"
5173 msgstr "git archive：协议错误"
@@ -5835,7 +5839,7 @@ msgstr "从标准输入读出文件名"
5839 msgid "terminate input and output records by a NUL character"
5840 msgstr "输入和输出的记录使用 NUL 字符终结"
5841
5838 -#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352
5842 +#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
5843 msgid "suppress progress reporting"
5844 msgstr "不显示进度报告"
5845
@@ -5927,7 +5931,7 @@ msgstr "将内容写入临时文件"
5931 #: builtin/checkout-index.c:174 builtin/column.c:30
5932 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
5933 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
5930 -#: builtin/worktree.c:472
5934 +#: builtin/worktree.c:477
5935 msgid "string"
5936 msgstr "字符串"
5937
@@ -6142,8 +6146,8 @@ msgid "Cannot switch branch to a non-commit '%s'"
6146 msgstr "不能切换分支到一个非提交 '%s'"
6147
6148 #: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
6145 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325
6146 -#: builtin/worktree.c:327
6149 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329
6150 +#: builtin/worktree.c:331
6151 msgid "branch"
6152 msgstr "分支"
6153
@@ -6159,7 +6163,7 @@ msgstr "创建/重置并检出一个分支"
6163 msgid "create reflog for new branch"
6164 msgstr "为新的分支创建引用日志"
6165
6162 -#: builtin/checkout.c:1164 builtin/worktree.c:329
6166 +#: builtin/checkout.c:1164 builtin/worktree.c:333
6167 msgid "detach HEAD at named commit"
6168 msgstr "HEAD 从指定的提交分离"
6169
@@ -6407,7 +6411,7 @@ msgid "remove whole directories"
6411 msgstr "删除整个目录"
6412
6413 #: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
6410 -#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348
6414 +#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348
6415 #: builtin/name-rev.c:350 builtin/show-ref.c:176
6416 msgid "pattern"
6417 msgstr "模式"
@@ -6660,7 +6664,7 @@ msgstr "无法执行 repack 来清理"
6664 msgid "cannot unlink temporary alternates file"
6665 msgstr "无法删除临时的 alternates 文件"
6666
6663 -#: builtin/clone.c:884 builtin/receive-pack.c:1901
6667 +#: builtin/clone.c:884 builtin/receive-pack.c:1900
6668 msgid "Too many arguments."
6669 msgstr "太多参数。"
6670
@@ -6698,7 +6702,7 @@ msgid "working tree '%s' already exists."
6702 msgstr "工作区 '%s' 已经存在。"
6703
6704 #: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
6701 -#: builtin/worktree.c:222 builtin/worktree.c:249
6705 +#: builtin/worktree.c:221 builtin/worktree.c:251
6706 #, c-format
6707 msgid "could not create leading directories of '%s'"
6708 msgstr "不能为 '%s' 创建先导目录"
@@ -7137,7 +7141,7 @@ msgid "version"
7141 msgstr "版本"
7142
7143 #: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
7140 -#: builtin/worktree.c:443
7144 +#: builtin/worktree.c:448
7145 msgid "machine-readable output"
7146 msgstr "机器可读的输出"
7147
@@ -7218,7 +7222,7 @@ msgstr "作者"
7222 msgid "override author for commit"
7223 msgstr "提交时覆盖作者"
7224
7221 -#: builtin/commit.c:1588 builtin/gc.c:353
7225 +#: builtin/commit.c:1588 builtin/gc.c:357
7226 msgid "date"
7227 msgstr "日期"
7228
@@ -7379,139 +7383,139 @@ msgstr ""
7383 msgid "git config [<options>]"
7384 msgstr "git config [<选项>]"
7385
7382 -#: builtin/config.c:55
7386 +#: builtin/config.c:56
7387 msgid "Config file location"
7388 msgstr "配置文件位置"
7389
7386 -#: builtin/config.c:56
7390 +#: builtin/config.c:57
7391 msgid "use global config file"
7392 msgstr "使用全局配置文件"
7393
7390 -#: builtin/config.c:57
7394 +#: builtin/config.c:58
7395 msgid "use system config file"
7396 msgstr "使用系统级配置文件"
7397
7394 -#: builtin/config.c:58
7398 +#: builtin/config.c:59
7399 msgid "use repository config file"
7400 msgstr "使用仓库级配置文件"
7401
7398 -#: builtin/config.c:59
7402 +#: builtin/config.c:60
7403 msgid "use given config file"
7404 msgstr "使用指定的配置文件"
7405
7402 -#: builtin/config.c:60
7406 +#: builtin/config.c:61
7407 msgid "blob-id"
7408 msgstr "数据对象 ID"
7409
7406 -#: builtin/config.c:60
7410 +#: builtin/config.c:61
7411 msgid "read config from given blob object"
7412 msgstr "从给定的数据对象读取配置"
7413
7410 -#: builtin/config.c:61
7414 +#: builtin/config.c:62
7415 msgid "Action"
7416 msgstr "操作"
7417
7414 -#: builtin/config.c:62
7418 +#: builtin/config.c:63
7419 msgid "get value: name [value-regex]"
7420 msgstr "获取值：name [value-regex]"
7421
7418 -#: builtin/config.c:63
7422 +#: builtin/config.c:64
7423 msgid "get all values: key [value-regex]"
7424 msgstr "获得所有的值：key [value-regex]"
7425
7422 -#: builtin/config.c:64
7426 +#: builtin/config.c:65
7427 msgid "get values for regexp: name-regex [value-regex]"
7428 msgstr "根据正则表达式获得值：name-regex [value-regex]"
7429
7426 -#: builtin/config.c:65
7430 +#: builtin/config.c:66
7431 msgid "get value specific for the URL: section[.var] URL"
7432 msgstr "获得 URL 取值：section[.var] URL"
7433
7430 -#: builtin/config.c:66
7434 +#: builtin/config.c:67
7435 msgid "replace all matching variables: name value [value_regex]"
7436 msgstr "替换所有匹配的变量：name value [value_regex]"
7437
7434 -#: builtin/config.c:67
7438 +#: builtin/config.c:68
7439 msgid "add a new variable: name value"
7440 msgstr "添加一个新的变量：name value"
7441
7438 -#: builtin/config.c:68
7442 +#: builtin/config.c:69
7443 msgid "remove a variable: name [value-regex]"
7444 msgstr "删除一个变量：name [value-regex]"
7445
7442 -#: builtin/config.c:69
7446 +#: builtin/config.c:70
7447 msgid "remove all matches: name [value-regex]"
7448 msgstr "删除所有匹配项：name [value-regex]"
7449
7446 -#: builtin/config.c:70
7450 +#: builtin/config.c:71
7451 msgid "rename section: old-name new-name"
7452 msgstr "重命名小节：old-name new-name"
7453
7450 -#: builtin/config.c:71
7454 +#: builtin/config.c:72
7455 msgid "remove a section: name"
7456 msgstr "删除一个小节：name"
7457
7454 -#: builtin/config.c:72
7458 +#: builtin/config.c:73
7459 msgid "list all"
7460 msgstr "列出所有"
7461
7458 -#: builtin/config.c:73
7462 +#: builtin/config.c:74
7463 msgid "open an editor"
7464 msgstr "打开一个编辑器"
7465
7462 -#: builtin/config.c:74
7466 +#: builtin/config.c:75
7467 msgid "find the color configured: slot [default]"
7468 msgstr "获得配置的颜色：配置 [默认]"
7469
7466 -#: builtin/config.c:75
7470 +#: builtin/config.c:76
7471 msgid "find the color setting: slot [stdout-is-tty]"
7472 msgstr "获得颜色设置：配置 [stdout-is-tty]"
7473
7470 -#: builtin/config.c:76
7474 +#: builtin/config.c:77
7475 msgid "Type"
7476 msgstr "类型"
7477
7474 -#: builtin/config.c:77
7478 +#: builtin/config.c:78
7479 msgid "value is \"true\" or \"false\""
7480 msgstr "值是 \"true\" 或 \"false\""
7481
7478 -#: builtin/config.c:78
7482 +#: builtin/config.c:79
7483 msgid "value is decimal number"
7484 msgstr "值是十进制数"
7485
7482 -#: builtin/config.c:79
7486 +#: builtin/config.c:80
7487 msgid "value is --bool or --int"
7488 msgstr "值是 --bool or --int"
7489
7486 -#: builtin/config.c:80
7490 +#: builtin/config.c:81
7491 msgid "value is a path (file or directory name)"
7492 msgstr "值是一个路径（文件或目录名）"
7493
7490 -#: builtin/config.c:81
7494 +#: builtin/config.c:82
7495 msgid "Other"
7496 msgstr "其它"
7497
7494 -#: builtin/config.c:82
7498 +#: builtin/config.c:83
7499 msgid "terminate values with NUL byte"
7500 msgstr "终止值是 NUL 字节"
7501
7498 -#: builtin/config.c:83
7502 +#: builtin/config.c:84
7503 msgid "show variable names only"
7504 msgstr "只显示变量名"
7505
7502 -#: builtin/config.c:84
7506 +#: builtin/config.c:85
7507 msgid "respect include directives on lookup"
7508 msgstr "查询时参照 include 指令递归查找"
7509
7506 -#: builtin/config.c:85
7510 +#: builtin/config.c:86
7511 msgid "show origin of config (file, standard input, blob, command line)"
7512 msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"
7513
7510 -#: builtin/config.c:327
7514 +#: builtin/config.c:328
7515 msgid "unable to parse default color value"
7516 msgstr "不能解析默认颜色值"
7517
7514 -#: builtin/config.c:471
7518 +#: builtin/config.c:472
7519 #, c-format
7520 msgid ""
7521 "# This is Git's per-user configuration file.\n"
@@ -7526,12 +7530,12 @@ msgstr ""
7530 "#\tname = %s\n"
7531 "#\temail = %s\n"
7532
7529 -#: builtin/config.c:611
7533 +#: builtin/config.c:615
7534 #, c-format
7535 msgid "cannot create configuration file %s"
7536 msgstr "不能创建配置文件 %s"
7537
7534 -#: builtin/config.c:623
7538 +#: builtin/config.c:627
7539 #, c-format
7540 msgid ""
7541 "cannot overwrite multiple values with a single value\n"
@@ -8320,12 +8324,12 @@ msgstr "git gc [<选项>]"
8324 msgid "Failed to fstat %s: %s"
8325 msgstr "对 %s 调用 fstat 失败：%s"
8326
8323 -#: builtin/gc.c:306
8327 +#: builtin/gc.c:310
8328 #, c-format
8329 msgid "Can't stat %s"
8330 msgstr "不能对 %s 调用 stat"
8331
8328 -#: builtin/gc.c:315
8332 +#: builtin/gc.c:319
8333 #, c-format
8334 msgid ""
8335 "The last gc run reported the following. Please correct the root cause\n"
@@ -8339,50 +8343,50 @@ msgstr ""
8343 "\n"
8344 "%s"
8345
8342 -#: builtin/gc.c:354
8346 +#: builtin/gc.c:358
8347 msgid "prune unreferenced objects"
8348 msgstr "清除未引用的对象"
8349
8346 -#: builtin/gc.c:356
8350 +#: builtin/gc.c:360
8351 msgid "be more thorough (increased runtime)"
8352 msgstr "更彻底（增加运行时间）"
8353
8350 -#: builtin/gc.c:357
8354 +#: builtin/gc.c:361
8355 msgid "enable auto-gc mode"
8356 msgstr "启用自动垃圾回收模式"
8357
8354 -#: builtin/gc.c:358
8358 +#: builtin/gc.c:362
8359 msgid "force running gc even if there may be another gc running"
8360 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
8361
8358 -#: builtin/gc.c:375
8362 +#: builtin/gc.c:379
8363 #, c-format
8364 msgid "Failed to parse gc.logexpiry value %s"
8365 msgstr "无法解析 gc.logexpiry 的值 %s"
8366
8363 -#: builtin/gc.c:403
8367 +#: builtin/gc.c:407
8368 #, c-format
8369 msgid "Auto packing the repository in background for optimum performance.\n"
8370 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
8371
8368 -#: builtin/gc.c:405
8372 +#: builtin/gc.c:409
8373 #, c-format
8374 msgid "Auto packing the repository for optimum performance.\n"
8375 msgstr "自动打包仓库以求最佳性能。\n"
8376
8373 -#: builtin/gc.c:406
8377 +#: builtin/gc.c:410
8378 #, c-format
8379 msgid "See \"git help gc\" for manual housekeeping.\n"
8380 msgstr "手工维护参见 \"git help gc\"。\n"
8381
8378 -#: builtin/gc.c:427
8382 +#: builtin/gc.c:431
8383 #, c-format
8384 msgid ""
8385 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
8386 msgstr ""
8387 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
8388
8385 -#: builtin/gc.c:471
8389 +#: builtin/gc.c:475
8390 msgid ""
8391 "There are too many unreachable loose objects; run 'git prune' to remove them."
8392 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
@@ -9575,103 +9579,103 @@ msgid ""
9579 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
9580 msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
9581
9578 -#: builtin/ls-files.c:461
9582 +#: builtin/ls-files.c:468
9583 msgid "git ls-files [<options>] [<file>...]"
9584 msgstr "git ls-files [<选项>] [<文件>...]"
9585
9582 -#: builtin/ls-files.c:510
9586 +#: builtin/ls-files.c:517
9587 msgid "identify the file status with tags"
9588 msgstr "用标签标识文件的状态"
9589
9586 -#: builtin/ls-files.c:512
9590 +#: builtin/ls-files.c:519
9591 msgid "use lowercase letters for 'assume unchanged' files"
9592 msgstr "使用小写字母表示 '假设未改变的' 文件"
9593
9590 -#: builtin/ls-files.c:514
9594 +#: builtin/ls-files.c:521
9595 msgid "show cached files in the output (default)"
9596 msgstr "显示缓存的文件（默认）"
9597
9594 -#: builtin/ls-files.c:516
9598 +#: builtin/ls-files.c:523
9599 msgid "show deleted files in the output"
9600 msgstr "显示已删除的文件"
9601
9598 -#: builtin/ls-files.c:518
9602 +#: builtin/ls-files.c:525
9603 msgid "show modified files in the output"
9604 msgstr "显示已修改的文件"
9605
9602 -#: builtin/ls-files.c:520
9606 +#: builtin/ls-files.c:527
9607 msgid "show other files in the output"
9608 msgstr "显示其它文件"
9609
9606 -#: builtin/ls-files.c:522
9610 +#: builtin/ls-files.c:529
9611 msgid "show ignored files in the output"
9612 msgstr "显示忽略的文件"
9613
9610 -#: builtin/ls-files.c:525
9614 +#: builtin/ls-files.c:532
9615 msgid "show staged contents' object name in the output"
9616 msgstr "显示暂存区内容的对象名称"
9617
9614 -#: builtin/ls-files.c:527
9618 +#: builtin/ls-files.c:534
9619 msgid "show files on the filesystem that need to be removed"
9620 msgstr "显示文件系统需要删除的文件"
9621
9618 -#: builtin/ls-files.c:529
9622 +#: builtin/ls-files.c:536
9623 msgid "show 'other' directories' names only"
9624 msgstr "只显示“其他”目录的名称"
9625
9622 -#: builtin/ls-files.c:531
9626 +#: builtin/ls-files.c:538
9627 msgid "show line endings of files"
9628 msgstr "显示文件换行符格式"
9629
9626 -#: builtin/ls-files.c:533
9630 +#: builtin/ls-files.c:540
9631 msgid "don't show empty directories"
9632 msgstr "不显示空目录"
9633
9630 -#: builtin/ls-files.c:536
9634 +#: builtin/ls-files.c:543
9635 msgid "show unmerged files in the output"
9636 msgstr "显示未合并的文件"
9637
9634 -#: builtin/ls-files.c:538
9638 +#: builtin/ls-files.c:545
9639 msgid "show resolve-undo information"
9640 msgstr "显示 resolve-undo 信息"
9641
9638 -#: builtin/ls-files.c:540
9642 +#: builtin/ls-files.c:547
9643 msgid "skip files matching pattern"
9644 msgstr "匹配排除文件的模式"
9645
9642 -#: builtin/ls-files.c:543
9646 +#: builtin/ls-files.c:550
9647 msgid "exclude patterns are read from <file>"
9648 msgstr "从 <文件> 中读取排除模式"
9649
9646 -#: builtin/ls-files.c:546
9650 +#: builtin/ls-files.c:553
9651 msgid "read additional per-directory exclude patterns in <file>"
9652 msgstr "从 <文件> 读取额外的每个目录的排除模式"
9653
9650 -#: builtin/ls-files.c:548
9654 +#: builtin/ls-files.c:555
9655 msgid "add the standard git exclusions"
9656 msgstr "添加标准的 git 排除"
9657
9654 -#: builtin/ls-files.c:551
9658 +#: builtin/ls-files.c:558
9659 msgid "make the output relative to the project top directory"
9660 msgstr "显示相对于顶级目录的文件名"
9661
9658 -#: builtin/ls-files.c:554
9662 +#: builtin/ls-files.c:561
9663 msgid "recurse through submodules"
9664 msgstr "在子模组中递归"
9665
9662 -#: builtin/ls-files.c:556
9666 +#: builtin/ls-files.c:563
9667 msgid "if any <file> is not in the index, treat this as an error"
9668 msgstr "如果任何 <文件> 都不在索引区，视为错误"
9669
9666 -#: builtin/ls-files.c:557
9670 +#: builtin/ls-files.c:564
9671 msgid "tree-ish"
9672 msgstr "树或提交"
9673
9670 -#: builtin/ls-files.c:558
9674 +#: builtin/ls-files.c:565
9675 msgid "pretend that paths removed since <tree-ish> are still present"
9676 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
9677
9674 -#: builtin/ls-files.c:560
9678 +#: builtin/ls-files.c:567
9679 msgid "show debugging data"
9680 msgstr "显示调试数据"
9681
@@ -11102,7 +11106,7 @@ msgstr "详见 git-pull(1)。"
11106 msgid "<remote>"
11107 msgstr "<远程>"
11108
11105 -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
11109 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
11110 #: git-parse-remote.sh:65
11111 msgid "<branch>"
11112 msgstr "<分支>"
@@ -11554,7 +11558,7 @@ msgstr "中止变基"
11558 msgid "git receive-pack <git-dir>"
11559 msgstr "git receive-pack <git-dir>"
11560
11557 -#: builtin/receive-pack.c:796
11561 +#: builtin/receive-pack.c:795
11562 msgid ""
11563 "By default, updating the current branch in a non-bare repository\n"
11564 "is denied, because it will make the index and work tree inconsistent\n"
@@ -11580,7 +11584,7 @@ msgstr ""
11584 "若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
11585 "配置变量为 'refuse'。"
11586
11583 -#: builtin/receive-pack.c:816
11587 +#: builtin/receive-pack.c:815
11588 msgid ""
11589 "By default, deleting the current branch is denied, because the next\n"
11590 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -11599,11 +11603,11 @@ msgstr ""
11603 "\n"
11604 "若要屏蔽此信息，您可以设置它为 'refuse'。"
11605
11602 -#: builtin/receive-pack.c:1889
11606 +#: builtin/receive-pack.c:1888
11607 msgid "quiet"
11608 msgstr "静默模式"
11609
11606 -#: builtin/receive-pack.c:1903
11610 +#: builtin/receive-pack.c:1902
11611 msgid "You must specify a directory."
11612 msgstr "您必须指定一个目录。"
11613
@@ -12232,67 +12236,67 @@ msgstr "git replace -d <对象>..."
12236 msgid "git replace [--format=<format>] [-l [<pattern>]]"
12237 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
12238
12235 -#: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395
12239 +#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
12240 #, c-format
12241 msgid "Not a valid object name: '%s'"
12242 msgstr "不是一个有效的对象名：'%s'"
12243
12240 -#: builtin/replace.c:359
12244 +#: builtin/replace.c:360
12245 #, c-format
12246 msgid "bad mergetag in commit '%s'"
12247 msgstr "提交 '%s' 中含有损坏的合并标签"
12248
12245 -#: builtin/replace.c:361
12249 +#: builtin/replace.c:362
12250 #, c-format
12251 msgid "malformed mergetag in commit '%s'"
12252 msgstr "提交 '%s' 中含有非法的合并标签"
12253
12250 -#: builtin/replace.c:372
12254 +#: builtin/replace.c:373
12255 #, c-format
12256 msgid ""
12257 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
12258 "instead of --graft"
12259 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft"
12260
12257 -#: builtin/replace.c:405
12261 +#: builtin/replace.c:406
12262 #, c-format
12263 msgid "the original commit '%s' has a gpg signature."
12264 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
12265
12262 -#: builtin/replace.c:406
12266 +#: builtin/replace.c:407
12267 msgid "the signature will be removed in the replacement commit!"
12268 msgstr "在替换的提交中签名将被移除！"
12269
12266 -#: builtin/replace.c:412
12270 +#: builtin/replace.c:413
12271 #, c-format
12272 msgid "could not write replacement commit for: '%s'"
12273 msgstr "不能为 '%s' 写替换提交"
12274
12271 -#: builtin/replace.c:436
12275 +#: builtin/replace.c:437
12276 msgid "list replace refs"
12277 msgstr "列出替换的引用"
12278
12275 -#: builtin/replace.c:437
12279 +#: builtin/replace.c:438
12280 msgid "delete replace refs"
12281 msgstr "删除替换的引用"
12282
12279 -#: builtin/replace.c:438
12283 +#: builtin/replace.c:439
12284 msgid "edit existing object"
12285 msgstr "编辑现存的对象"
12286
12283 -#: builtin/replace.c:439
12287 +#: builtin/replace.c:440
12288 msgid "change a commit's parents"
12289 msgstr "修改一个提交的父提交"
12290
12287 -#: builtin/replace.c:440
12291 +#: builtin/replace.c:441
12292 msgid "replace the ref if it exists"
12293 msgstr "如果存在则替换引用"
12294
12291 -#: builtin/replace.c:441
12295 +#: builtin/replace.c:442
12296 msgid "do not pretty-print contents for --edit"
12297 msgstr "不要为 --edit 操作美观显示内容"
12298
12295 -#: builtin/replace.c:442
12299 +#: builtin/replace.c:443
12300 msgid "use this format"
12301 msgstr "使用此格式"
12302
@@ -12900,7 +12904,7 @@ msgstr "相对路径的替代锚记（anchor）"
12904 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
12905 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
12906
12903 -#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:382
12907 +#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
12908 #, c-format
12909 msgid "No url found for submodule path '%s' in .gitmodules"
12910 msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
@@ -13208,30 +13212,6 @@ msgstr "无标签说明？"
13212 msgid "The tag message has been left in %s\n"
13213 msgstr "标签说明被保留在 %s\n"
13214
13211 -#: builtin/tag.c:312
13212 -msgid "tag: tagging "
13213 -msgstr "tag: tagging "
13214 -
13215 -#: builtin/tag.c:320
13216 -msgid "object of unknown type"
13217 -msgstr "未知类型的对象"
13218 -
13219 -#: builtin/tag.c:327
13220 -msgid "commit object"
13221 -msgstr "提交对象"
13222 -
13223 -#: builtin/tag.c:335
13224 -msgid "tree object"
13225 -msgstr "树对象"
13226 -
13227 -#: builtin/tag.c:338
13228 -msgid "blob object"
13229 -msgstr "数据对象"
13230 -
13231 -#: builtin/tag.c:341
13232 -msgid "other tag object"
13233 -msgstr "其它标签对象"
13234 -
13215 #: builtin/tag.c:397
13216 msgid "list tag names"
13217 msgstr "列出标签名称"
@@ -13660,27 +13640,27 @@ msgstr "git worktree prune [<选项>]"
13640 msgid "git worktree unlock <path>"
13641 msgstr "git worktree unlock <路径>"
13642
13663 -#: builtin/worktree.c:42
13643 +#: builtin/worktree.c:43
13644 #, c-format
13645 msgid "Removing worktrees/%s: not a valid directory"
13646 msgstr "删除工作区/%s：不是一个有效的目录"
13647
13668 -#: builtin/worktree.c:48
13648 +#: builtin/worktree.c:49
13649 #, c-format
13650 msgid "Removing worktrees/%s: gitdir file does not exist"
13651 msgstr "删除 worktrees/%s：gitdir 文件不存在"
13652
13673 -#: builtin/worktree.c:53
13653 +#: builtin/worktree.c:54
13654 #, c-format
13655 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
13656 msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
13657
13678 -#: builtin/worktree.c:64
13658 +#: builtin/worktree.c:65
13659 #, c-format
13660 msgid "Removing worktrees/%s: invalid gitdir file"
13661 msgstr "删除 worktrees/%s：无效的 gitdir 文件"
13662
13683 -#: builtin/worktree.c:80
13663 +#: builtin/worktree.c:81
13664 #, c-format
13665 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
13666 msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
@@ -13698,60 +13678,64 @@ msgstr "将早于 <time> 的工作区过期"
13678 msgid "'%s' already exists"
13679 msgstr "'%s' 已经存在"
13680
13701 -#: builtin/worktree.c:236
13681 +#: builtin/worktree.c:235
13682 #, c-format
13683 msgid "could not create directory of '%s'"
13684 msgstr "不能创建目录 '%s'"
13685
13706 -#: builtin/worktree.c:272
13686 +#: builtin/worktree.c:274
13687 #, c-format
13688 msgid "Preparing %s (identifier %s)"
13689 msgstr "准备 %s（标识符 %s）"
13690
13711 -#: builtin/worktree.c:324
13691 +#: builtin/worktree.c:328
13692 msgid "checkout <branch> even if already checked out in other worktree"
13693 msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
13694
13715 -#: builtin/worktree.c:326
13695 +#: builtin/worktree.c:330
13696 msgid "create a new branch"
13697 msgstr "创建一个新分支"
13698
13719 -#: builtin/worktree.c:328
13699 +#: builtin/worktree.c:332
13700 msgid "create or reset a branch"
13701 msgstr "创建或重置一个分支"
13702
13723 -#: builtin/worktree.c:330
13703 +#: builtin/worktree.c:334
13704 msgid "populate the new working tree"
13705 msgstr "生成新的工作区"
13706
13727 -#: builtin/worktree.c:338
13707 +#: builtin/worktree.c:335
13708 +msgid "keep the new working tree locked"
13709 +msgstr "锁定新工作区"
13710 +
13711 +#: builtin/worktree.c:343
13712 msgid "-b, -B, and --detach are mutually exclusive"
13713 msgstr "-b、-B 和 --detach 是互斥的"
13714
13731 -#: builtin/worktree.c:473
13715 +#: builtin/worktree.c:478
13716 msgid "reason for locking"
13717 msgstr "锁定原因"
13718
13735 -#: builtin/worktree.c:485 builtin/worktree.c:518
13719 +#: builtin/worktree.c:490 builtin/worktree.c:523
13720 #, c-format
13721 msgid "'%s' is not a working tree"
13722 msgstr "'%s' 不是一个工作区"
13723
13740 -#: builtin/worktree.c:487 builtin/worktree.c:520
13724 +#: builtin/worktree.c:492 builtin/worktree.c:525
13725 msgid "The main working tree cannot be locked or unlocked"
13726 msgstr "主工作区无法被加锁或解锁"
13727
13744 -#: builtin/worktree.c:492
13728 +#: builtin/worktree.c:497
13729 #, c-format
13730 msgid "'%s' is already locked, reason: %s"
13731 msgstr "'%s' 已被锁定，原因：%s"
13732
13749 -#: builtin/worktree.c:494
13733 +#: builtin/worktree.c:499
13734 #, c-format
13735 msgid "'%s' is already locked"
13736 msgstr "'%s' 已被锁定"
13737
13754 -#: builtin/worktree.c:522
13738 +#: builtin/worktree.c:527
13739 #, c-format
13740 msgid "'%s' is not locked"
13741 msgstr "'%s' 未被锁定"
@@ -13819,15 +13803,20 @@ msgstr ""
13803 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
13804 "帮助。"
13805
13822 -#: http.c:355
13806 +#: http.c:336
13807 +#, c-format
13808 +msgid "negative value for http.postbuffer; defaulting to %d"
13809 +msgstr "http.postbuffer 为负值，默认为 %d"
13810 +
13811 +#: http.c:357
13812 msgid "Delegation control is not supported with cURL < 7.22.0"
13813 msgstr "当 cURL < 7.22.0 时，不支持委托控制"
13814
13826 -#: http.c:364
13815 +#: http.c:366
13816 msgid "Public key pinning not supported with cURL < 7.44.0"
13817 msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
13818
13830 -#: http.c:1755
13819 +#: http.c:1766
13820 #, c-format
13821 msgid ""
13822 "unable to update url base from redirection:\n"
@@ -14206,7 +14195,7 @@ msgstr "尝试和 $pretty_name 的简单合并"
14195 msgid "Simple merge did not work, trying automatic merge."
14196 msgstr "简单合并未生效，尝试自动合并。"
14197
14209 -#: git-rebase.sh:57
14198 +#: git-rebase.sh:58
14199 msgid ""
14200 "When you have resolved this problem, run \"git rebase --continue\".\n"
14201 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -14217,37 +14206,37 @@ msgstr ""
14206 "如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n"
14207 "要恢复原分支并停止变基，执行 \"git rebase --abort\"。"
14208
14220 -#: git-rebase.sh:157 git-rebase.sh:396
14209 +#: git-rebase.sh:158 git-rebase.sh:397
14210 #, sh-format
14211 msgid "Could not move back to $head_name"
14212 msgstr "无法移回 $head_name"
14213
14225 -#: git-rebase.sh:171
14214 +#: git-rebase.sh:172
14215 #, sh-format
14216 msgid "Cannot store $stash_sha1"
14217 msgstr "无法保存 $stash_sha1"
14218
14230 -#: git-rebase.sh:211
14219 +#: git-rebase.sh:212
14220 msgid "The pre-rebase hook refused to rebase."
14221 msgstr "钩子 pre-rebase 拒绝变基操作。"
14222
14234 -#: git-rebase.sh:216
14223 +#: git-rebase.sh:217
14224 msgid "It looks like git-am is in progress. Cannot rebase."
14225 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
14226
14238 -#: git-rebase.sh:357
14227 +#: git-rebase.sh:358
14228 msgid "No rebase in progress?"
14229 msgstr "没有正在进行的变基？"
14230
14242 -#: git-rebase.sh:368
14231 +#: git-rebase.sh:369
14232 msgid "The --edit-todo action can only be used during interactive rebase."
14233 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
14234
14246 -#: git-rebase.sh:375
14235 +#: git-rebase.sh:376
14236 msgid "Cannot read HEAD"
14237 msgstr "不能读取 HEAD"
14238
14250 -#: git-rebase.sh:378
14239 +#: git-rebase.sh:379
14240 msgid ""
14241 "You must edit all merge conflicts and then\n"
14242 "mark them as resolved using git add"
@@ -14255,7 +14244,7 @@ msgstr ""
14244 "您必须编辑所有的合并冲突，然后通过 git add\n"
14245 "命令将它们标记为已解决"
14246
14258 -#: git-rebase.sh:418
14247 +#: git-rebase.sh:419
14248 #, sh-format
14249 msgid ""
14250 "It seems that there is already a $state_dir_base directory, and\n"
@@ -14274,64 +14263,64 @@ msgstr ""
14263 "\t$cmd_clear_stale_rebase\n"
14264 "然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。"
14265
14277 -#: git-rebase.sh:469
14266 +#: git-rebase.sh:470
14267 #, sh-format
14268 msgid "invalid upstream $upstream_name"
14269 msgstr "无效的上游 $upstream_name"
14270
14282 -#: git-rebase.sh:493
14271 +#: git-rebase.sh:494
14272 #, sh-format
14273 msgid "$onto_name: there are more than one merge bases"
14274 msgstr "$onto_name: 有一个以上的合并基准"
14275
14287 -#: git-rebase.sh:496 git-rebase.sh:500
14276 +#: git-rebase.sh:497 git-rebase.sh:501
14277 #, sh-format
14278 msgid "$onto_name: there is no merge base"
14279 msgstr "$onto_name: 没有合并基准"
14280
14292 -#: git-rebase.sh:505
14281 +#: git-rebase.sh:506
14282 #, sh-format
14283 msgid "Does not point to a valid commit: $onto_name"
14284 msgstr "没有指向一个有效的提交：$onto_name"
14285
14297 -#: git-rebase.sh:528
14286 +#: git-rebase.sh:529
14287 #, sh-format
14288 msgid "fatal: no such branch: $branch_name"
14289 msgstr "严重错误：无此分支：$branch_name"
14290
14302 -#: git-rebase.sh:561
14291 +#: git-rebase.sh:562
14292 msgid "Cannot autostash"
14293 msgstr "无法 autostash"
14294
14306 -#: git-rebase.sh:566
14295 +#: git-rebase.sh:567
14296 #, sh-format
14297 msgid "Created autostash: $stash_abbrev"
14298 msgstr "创建了 autostash: $stash_abbrev"
14299
14311 -#: git-rebase.sh:570
14300 +#: git-rebase.sh:571
14301 msgid "Please commit or stash them."
14302 msgstr "请提交或为它们保存进度。"
14303
14315 -#: git-rebase.sh:590
14304 +#: git-rebase.sh:591
14305 #, sh-format
14306 msgid "Current branch $branch_name is up to date."
14307 msgstr "当前分支 $branch_name 是最新的。"
14308
14320 -#: git-rebase.sh:594
14309 +#: git-rebase.sh:595
14310 #, sh-format
14311 msgid "Current branch $branch_name is up to date, rebase forced."
14312 msgstr "当前分支 $branch_name 是最新的，强制变基。"
14313
14325 -#: git-rebase.sh:605
14314 +#: git-rebase.sh:606
14315 #, sh-format
14316 msgid "Changes from $mb to $onto:"
14317 msgstr "变更从 $mb 到 $onto："
14318
14330 -#: git-rebase.sh:614
14319 +#: git-rebase.sh:615
14320 msgid "First, rewinding head to replay your work on top of it..."
14321 msgstr "首先，回退分支以便在上面重放您的工作..."
14322
14334 -#: git-rebase.sh:624
14323 +#: git-rebase.sh:625
14324 #, sh-format
14325 msgid "Fast-forwarded $branch_name to $onto_name."
14326 msgstr "快进 $branch_name 至 $onto_name。"
@@ -16037,6 +16026,24 @@ msgstr "略过 %s 含备份后缀 '%s'。\n"
16026 msgid "Do you really want to send %s? [y|N]: "
16027 msgstr "您真的要发送 %s？[y|N]："
16028
16029 +#~ msgid "tag: tagging "
16030 +#~ msgstr "tag: tagging "
16031 +
16032 +#~ msgid "object of unknown type"
16033 +#~ msgstr "未知类型的对象"
16034 +
16035 +#~ msgid "commit object"
16036 +#~ msgstr "提交对象"
16037 +
16038 +#~ msgid "tree object"
16039 +#~ msgstr "树对象"
16040 +
16041 +#~ msgid "blob object"
16042 +#~ msgstr "数据对象"
16043 +
16044 +#~ msgid "other tag object"
16045 +#~ msgstr "其它标签对象"
16046 +
16047 #~ msgid ""
16048 #~ "There is nothing to exclude from by :(exclude) patterns.\n"
16049 #~ "Perhaps you forgot to add either ':/' or '.' ?"