@matheusbsbs / matheus-bagliano / commits / ec3d4607ae

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

Translate 48 new messages (5230t0f0u) for git 2.33.0, and also fixed typos found by "git-po-helper". Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Fangyi Zhou <me@fangyi.io>

Jiang Xin committed Aug 2, 2021 at 08:25 UTC ec3d4607ae16f26a3ce686a441bd3c91f175b89f
1 file changed +2345 -2202
po/zh_CN.po
+2345 -2202
@@ -141,8 +141,8 @@ msgid ""
141 msgstr ""
142 "Project-Id-Version: Git\n"
143 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
144 -"POT-Creation-Date: 2021-05-17 16:02+0800\n"
145 -"PO-Revision-Date: 2021-07-01 16:01+0800\n"
144 +"POT-Creation-Date: 2021-08-14 07:56+0800\n"
145 +"PO-Revision-Date: 2021-08-14 17:27+0800\n"
146 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
147 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
148 "Language: zh_CN\n"
@@ -156,8 +156,8 @@ msgstr ""
156 msgid "Huh (%s)?"
157 msgstr "嗯（%s）？"
158
159 -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
160 -#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
159 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
160 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
161 #: builtin/rebase.c:1953
162 msgid "could not read index"
163 msgstr "不能读取索引"
@@ -186,7 +186,7 @@ msgstr "更新"
186 msgid "could not stage '%s'"
187 msgstr "不能暂存 '%s'"
188
189 -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
189 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
190 msgid "could not write index"
191 msgstr "不能写入索引"
192
@@ -244,12 +244,12 @@ msgstr[1] "增加了 %d 个路径\n"
244 msgid "ignoring unmerged: %s"
245 msgstr "忽略未合入的：%s"
246
247 -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
247 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
248 #, c-format
249 msgid "Only binary files changed.\n"
250 msgstr "只有二进制文件被修改。\n"
251
252 -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
252 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
253 #, c-format
254 msgid "No changes.\n"
255 msgstr "没有修改。\n"
@@ -326,11 +326,11 @@ msgstr "选择一个编号条目"
326 msgid "(empty) select nothing"
327 msgstr "（空）不选择任何内容"
328
329 -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
329 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
330 msgid "*** Commands ***"
331 msgstr "*** 命令 ***"
332
333 -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
333 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
334 msgid "What now"
335 msgstr "请选择"
336
@@ -342,12 +342,13 @@ msgstr "缓存"
342 msgid "unstaged"
343 msgstr "未缓存"
344
345 -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
346 -#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
345 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
346 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
347 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
348 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
349 -#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
350 -#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
348 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
349 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
350 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
351 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
352 #: git-add--interactive.perl:213
353 msgid "path"
354 msgstr "路径"
@@ -356,7 +357,7 @@ msgstr "路径"
357 msgid "could not refresh index"
358 msgstr "不能刷新索引"
359
359 -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
360 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
361 #, c-format
362 msgid "Bye.\n"
363 msgstr "再见。\n"
@@ -647,40 +648,40 @@ msgstr ""
648 "a - 应用该块和本文件中后面的全部块\n"
649 "d - 不要应用该块和本文件中后面的全部块\n"
650
650 -#: add-patch.c:342
651 +#: add-patch.c:343
652 #, c-format
653 msgid "could not parse hunk header '%.*s'"
654 msgstr "无法解析数据块头信息 '%.*s'"
655
655 -#: add-patch.c:361 add-patch.c:365
656 +#: add-patch.c:362 add-patch.c:366
657 #, c-format
658 msgid "could not parse colored hunk header '%.*s'"
659 msgstr "无法解析彩色数据块头信息 '%.*s'"
660
660 -#: add-patch.c:419
661 +#: add-patch.c:420
662 msgid "could not parse diff"
663 msgstr "不能解析差异信息"
664
664 -#: add-patch.c:438
665 +#: add-patch.c:439
666 msgid "could not parse colored diff"
667 msgstr "不能解析彩色差异信息"
668
668 -#: add-patch.c:452
669 +#: add-patch.c:453
670 #, c-format
671 msgid "failed to run '%s'"
672 msgstr "运行 '%s' 失败"
673
673 -#: add-patch.c:611
674 +#: add-patch.c:612
675 msgid "mismatched output from interactive.diffFilter"
676 msgstr "interactive.diffFilter 的输出不匹配"
677
677 -#: add-patch.c:612
678 +#: add-patch.c:613
679 msgid ""
680 "Your filter must maintain a one-to-one correspondence\n"
681 "between its input and output lines."
682 msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
683
683 -#: add-patch.c:790
684 +#: add-patch.c:791
685 #, c-format
686 msgid ""
687 "expected context line #%d in\n"
@@ -689,7 +690,7 @@ msgstr ""
690 "预期上下文行 #%d 于\n"
691 "%.*s"
692
692 -#: add-patch.c:805
693 +#: add-patch.c:806
694 #, c-format
695 msgid ""
696 "hunks do not overlap:\n"
@@ -702,11 +703,11 @@ msgstr ""
703 "\t不是结尾于：\n"
704 "%.*s"
705
705 -#: add-patch.c:1081 git-add--interactive.perl:1115
706 +#: add-patch.c:1082 git-add--interactive.perl:1115
707 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
708 msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
709
709 -#: add-patch.c:1085
710 +#: add-patch.c:1086
711 #, c-format
712 msgid ""
713 "---\n"
@@ -720,7 +721,7 @@ msgstr ""
721 "以 %c 开始的行将被删除。\n"
722
723 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
723 -#: add-patch.c:1099 git-add--interactive.perl:1129
724 +#: add-patch.c:1100 git-add--interactive.perl:1129
725 msgid ""
726 "If it does not apply cleanly, you will be given an opportunity to\n"
727 "edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -729,11 +730,11 @@ msgstr ""
730 "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
731 "此次编辑被终止，该块不会被修改。\n"
732
732 -#: add-patch.c:1132
733 +#: add-patch.c:1133
734 msgid "could not parse hunk header"
735 msgstr "无法解析数据块头信息"
736
736 -#: add-patch.c:1177
737 +#: add-patch.c:1178
738 msgid "'git apply --cached' failed"
739 msgstr "'git apply --cached' 失败"
740
@@ -749,24 +750,24 @@ msgstr "'git apply --cached' 失败"
750 #. Consider translating (saying "no" discards!) as
751 #. (saying "n" for "no" discards!) if the translation
752 #. of the word "no" does not start with n.
752 -#: add-patch.c:1246 git-add--interactive.perl:1242
753 +#: add-patch.c:1247 git-add--interactive.perl:1242
754 msgid ""
755 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
756 msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
757
757 -#: add-patch.c:1289
758 +#: add-patch.c:1290
759 msgid "The selected hunks do not apply to the index!"
760 msgstr "选中的块不能应用到索引！"
761
761 -#: add-patch.c:1290 git-add--interactive.perl:1346
762 +#: add-patch.c:1291 git-add--interactive.perl:1346
763 msgid "Apply them to the worktree anyway? "
764 msgstr "无论如何都要应用到工作区么？"
765
765 -#: add-patch.c:1297 git-add--interactive.perl:1349
766 +#: add-patch.c:1298 git-add--interactive.perl:1349
767 msgid "Nothing was applied.\n"
768 msgstr "未应用。\n"
769
769 -#: add-patch.c:1354
770 +#: add-patch.c:1355
771 msgid ""
772 "j - leave this hunk undecided, see next undecided hunk\n"
773 "J - leave this hunk undecided, see next hunk\n"
@@ -788,69 +789,69 @@ msgstr ""
789 "e - 手动编辑当前块\n"
790 "? - 显示帮助\n"
791
791 -#: add-patch.c:1516 add-patch.c:1526
792 +#: add-patch.c:1517 add-patch.c:1527
793 msgid "No previous hunk"
794 msgstr "没有前一个块"
795
795 -#: add-patch.c:1521 add-patch.c:1531
796 +#: add-patch.c:1522 add-patch.c:1532
797 msgid "No next hunk"
798 msgstr "没有下一个块"
799
799 -#: add-patch.c:1537
800 +#: add-patch.c:1538
801 msgid "No other hunks to goto"
802 msgstr "没有其它可供跳转的块"
803
803 -#: add-patch.c:1548 git-add--interactive.perl:1606
804 +#: add-patch.c:1549 git-add--interactive.perl:1606
805 msgid "go to which hunk (<ret> to see more)? "
806 msgstr "跳转到哪个块（<回车> 查看更多）？ "
807
807 -#: add-patch.c:1549 git-add--interactive.perl:1608
808 +#: add-patch.c:1550 git-add--interactive.perl:1608
809 msgid "go to which hunk? "
810 msgstr "跳转到哪个块？"
811
811 -#: add-patch.c:1560
812 +#: add-patch.c:1561
813 #, c-format
814 msgid "Invalid number: '%s'"
815 msgstr "无效数字：'%s'"
816
816 -#: add-patch.c:1565
817 +#: add-patch.c:1566
818 #, c-format
819 msgid "Sorry, only %d hunk available."
820 msgid_plural "Sorry, only %d hunks available."
821 msgstr[0] "对不起，只有 %d 个可用块。"
822 msgstr[1] "对不起，只有 %d 个可用块。"
823
823 -#: add-patch.c:1574
824 +#: add-patch.c:1575
825 msgid "No other hunks to search"
826 msgstr "没有其它可供查找的块"
827
827 -#: add-patch.c:1580 git-add--interactive.perl:1661
828 +#: add-patch.c:1581 git-add--interactive.perl:1661
829 msgid "search for regex? "
830 msgstr "使用正则表达式搜索？"
831
831 -#: add-patch.c:1595
832 +#: add-patch.c:1596
833 #, c-format
834 msgid "Malformed search regexp %s: %s"
835 msgstr "错误的正则表达式 %s：%s"
836
836 -#: add-patch.c:1612
837 +#: add-patch.c:1613
838 msgid "No hunk matches the given pattern"
839 msgstr "没有和给定模式相匹配的块"
840
840 -#: add-patch.c:1619
841 +#: add-patch.c:1620
842 msgid "Sorry, cannot split this hunk"
843 msgstr "对不起，不能拆分这个块"
844
844 -#: add-patch.c:1623
845 +#: add-patch.c:1624
846 #, c-format
847 msgid "Split into %d hunks."
848 msgstr "拆分为 %d 块。"
849
849 -#: add-patch.c:1627
850 +#: add-patch.c:1628
851 msgid "Sorry, cannot edit this hunk"
852 msgstr "对不起，不能编辑这个块"
853
853 -#: add-patch.c:1679
854 +#: add-patch.c:1680
855 msgid "'git apply' failed"
856 msgstr "'git apply' 失败"
857
@@ -905,7 +906,7 @@ msgstr ""
906 msgid "Exiting because of an unresolved conflict."
907 msgstr "因为存在未解决的冲突而退出。"
908
908 -#: advice.c:283 builtin/merge.c:1374
909 +#: advice.c:283 builtin/merge.c:1375
910 msgid "You have not concluded your merge (MERGE_HEAD exists)."
911 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
912
@@ -923,7 +924,8 @@ msgid ""
924 "The following pathspecs didn't match any eligible path, but they do match "
925 "index\n"
926 "entries outside the current sparse checkout:\n"
926 -msgstr "以下路径规格不匹配任何适合的路径，但它们和当前稀疏检出之外的索引条目匹配：\n"
927 +msgstr ""
928 +"以下路径规格不匹配任何适合的路径，但它们和当前稀疏检出之外的索引条目匹配：\n"
929
930 #: advice.c:303
931 msgid ""
@@ -1278,8 +1280,8 @@ msgstr "%s：错误类型"
1280 msgid "%s has type %o, expected %o"
1281 msgstr "%s 的类型是 %o，应为 %o"
1282
1281 -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
1282 -#: read-cache.c:1351
1283 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
1284 +#: read-cache.c:1353
1285 #, c-format
1286 msgid "invalid path '%s'"
1287 msgstr "无效路径 '%s'"
@@ -1369,7 +1371,7 @@ msgstr "不能为新建文件 %s 创建后端存储"
1371 msgid "unable to add cache entry for %s"
1372 msgstr "无法为 %s 添加缓存条目"
1373
1372 -#: apply.c:4376 builtin/bisect--helper.c:523
1374 +#: apply.c:4376 builtin/bisect--helper.c:525
1375 #, c-format
1376 msgid "failed to write to '%s'"
1377 msgstr "写入 '%s' 失败"
@@ -1459,7 +1461,7 @@ msgid_plural "%d lines applied after fixing whitespace errors."
1461 msgstr[0] "修复空白错误后，应用了 %d 行。"
1462 msgstr[1] "修复空白错误后，应用了 %d 行。"
1463
1462 -#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
1464 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
1465 msgid "Unable to write new index file"
1466 msgstr "无法写入新索引文件"
1467
@@ -1471,7 +1473,7 @@ msgstr "不要应用与给出路径向匹配的变更"
1473 msgid "apply changes matching the given path"
1474 msgstr "应用与给出路径向匹配的变更"
1475
1474 -#: apply.c:5000 builtin/am.c:2317
1476 +#: apply.c:5000 builtin/am.c:2318
1477 msgid "num"
1478 msgstr "数字"
1479
@@ -1535,9 +1537,9 @@ msgstr "路径以 NUL 字符分隔"
1537 msgid "ensure at least <n> lines of context match"
1538 msgstr "确保至少匹配 <n> 行上下文"
1539
1538 -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296
1540 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
1541 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
1540 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831
1542 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
1543 #: builtin/rebase.c:1347
1544 msgid "action"
1545 msgstr "动作"
@@ -1567,8 +1569,8 @@ msgid "allow overlapping hunks"
1569 msgstr "允许重叠的补丁片段"
1570
1571 #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
1570 -#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
1571 -#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
1572 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
1573 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
1574 msgid "be verbose"
1575 msgstr "冗长输出"
1576
@@ -1580,7 +1582,7 @@ msgstr "允许不正确的文件末尾换行符"
1582 msgid "do not trust the line counts in the hunk headers"
1583 msgstr "不信任补丁片段的头信息中的行号"
1584
1583 -#: apply.c:5059 builtin/am.c:2305
1585 +#: apply.c:5059 builtin/am.c:2306
1586 msgid "root"
1587 msgstr "根目录"
1588
@@ -1622,7 +1624,7 @@ msgstr "路径不是有效的 UTF-8：%s"
1624 msgid "path too long (%d chars, SHA1: %s): %s"
1625 msgstr "路径太长（%d 字符，SHA1：%s）：%s"
1626
1625 -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
1627 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
1628 #, c-format
1629 msgid "deflate error (%d)"
1630 msgstr "压缩错误 (%d)"
@@ -1656,13 +1658,13 @@ msgid "cannot read %s"
1658 msgstr "不能读取 %s"
1659
1660 #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
1659 -#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
1660 -#: builtin/merge.c:1143
1661 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
1662 +#: builtin/merge.c:1144
1663 #, c-format
1664 msgid "could not read '%s'"
1665 msgstr "不能读取 '%s'"
1666
1665 -#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
1667 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
1668 #, c-format
1669 msgid "pathspec '%s' did not match any files"
1670 msgstr "路径规格 '%s' 未匹配任何文件"
@@ -1704,7 +1706,7 @@ msgstr "格式"
1706 msgid "archive format"
1707 msgstr "归档格式"
1708
1707 -#: archive.c:553 builtin/log.c:1772
1709 +#: archive.c:553 builtin/log.c:1775
1710 msgid "prefix"
1711 msgstr "前缀"
1712
@@ -1715,7 +1717,7 @@ msgstr "为归档中每个路径名加上前缀"
1717 #: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
1718 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
1719 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209
1718 -#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
1720 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
1721 #: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
1722 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
1723 msgid "file"
@@ -1746,7 +1748,8 @@ msgid "list supported archive formats"
1748 msgstr "列出支持的归档格式"
1749
1750 #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
1749 -#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
1751 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
1752 +#: builtin/submodule--helper.c:2902
1753 msgid "repo"
1754 msgstr "仓库"
1755
@@ -1754,7 +1757,7 @@ msgstr "仓库"
1757 msgid "retrieve the archive from remote repository <repo>"
1758 msgstr "从远程仓库（<仓库>）提取归档文件"
1759
1757 -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
1760 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
1761 #: builtin/notes.c:498
1762 msgid "command"
1763 msgstr "命令"
@@ -1938,11 +1941,11 @@ msgstr "不能将 --contents 和最终的提交对象名共用"
1941 msgid "--reverse and --first-parent together require specified latest commit"
1942 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
1943
1941 -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
1942 -#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
1943 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
1944 -#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
1945 -#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
1944 +#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
1945 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
1946 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
1947 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
1948 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
1949 msgid "revision walk setup failed"
1950 msgstr "版本遍历设置失败"
1951
@@ -2094,118 +2097,118 @@ msgstr "'%s' 已经检出到 '%s'"
2097 msgid "HEAD of working tree %s is not updated"
2098 msgstr "工作区 %s 的 HEAD 指向没有被更新"
2099
2097 -#: bundle.c:41
2100 +#: bundle.c:44
2101 #, c-format
2102 msgid "unrecognized bundle hash algorithm: %s"
2103 msgstr "未能识别的归档包哈希算法：%s"
2104
2102 -#: bundle.c:45
2105 +#: bundle.c:48
2106 #, c-format
2107 msgid "unknown capability '%s'"
2108 msgstr "未知能力 '%s'"
2109
2107 -#: bundle.c:71
2110 +#: bundle.c:74
2111 #, c-format
2112 msgid "'%s' does not look like a v2 or v3 bundle file"
2113 msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"
2114
2112 -#: bundle.c:110
2115 +#: bundle.c:113
2116 #, c-format
2117 msgid "unrecognized header: %s%s (%d)"
2118 msgstr "未能识别的包头：%s%s (%d)"
2119
2117 -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
2120 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
2121 #: builtin/commit.c:861
2122 #, c-format
2123 msgid "could not open '%s'"
2124 msgstr "不能打开 '%s'"
2125
2123 -#: bundle.c:189
2126 +#: bundle.c:198
2127 msgid "Repository lacks these prerequisite commits:"
2128 msgstr "仓库中缺少这些必备的提交："
2129
2127 -#: bundle.c:192
2130 +#: bundle.c:201
2131 msgid "need a repository to verify a bundle"
2132 msgstr "需要一个仓库来校验一个归档包"
2133
2131 -#: bundle.c:243
2134 +#: bundle.c:257
2135 #, c-format
2136 msgid "The bundle contains this ref:"
2137 msgid_plural "The bundle contains these %d refs:"
2138 msgstr[0] "这个归档包中含有这个引用："
2139 msgstr[1] "这个归档包中含有 %d 个引用："
2140
2138 -#: bundle.c:250
2141 +#: bundle.c:264
2142 msgid "The bundle records a complete history."
2143 msgstr "这个归档包记录一个完整历史。"
2144
2142 -#: bundle.c:252
2145 +#: bundle.c:266
2146 #, c-format
2147 msgid "The bundle requires this ref:"
2148 msgid_plural "The bundle requires these %d refs:"
2149 msgstr[0] "这个归档包需要这个引用："
2150 msgstr[1] "这个归档包需要 %d 个引用："
2151
2149 -#: bundle.c:319
2152 +#: bundle.c:333
2153 msgid "unable to dup bundle descriptor"
2154 msgstr "无法复制归档包描述符"
2155
2153 -#: bundle.c:326
2156 +#: bundle.c:340
2157 msgid "Could not spawn pack-objects"
2158 msgstr "不能生成 pack-objects 进程"
2159
2157 -#: bundle.c:337
2160 +#: bundle.c:351
2161 msgid "pack-objects died"
2162 msgstr "pack-objects 终止"
2163
2161 -#: bundle.c:386
2164 +#: bundle.c:400
2165 #, c-format
2166 msgid "ref '%s' is excluded by the rev-list options"
2167 msgstr "引用 '%s' 被 rev-list 选项排除"
2168
2166 -#: bundle.c:490
2169 +#: bundle.c:504
2170 #, c-format
2171 msgid "unsupported bundle version %d"
2172 msgstr "不支持的归档包版本 %d"
2173
2171 -#: bundle.c:492
2174 +#: bundle.c:506
2175 #, c-format
2176 msgid "cannot write bundle version %d with algorithm %s"
2177 msgstr "不能写入，归档包版本 %d 不支持算法 %s"
2178
2176 -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
2179 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
2180 #, c-format
2181 msgid "unrecognized argument: %s"
2182 msgstr "未能识别的参数：%s"
2183
2181 -#: bundle.c:539
2184 +#: bundle.c:553
2185 msgid "Refusing to create empty bundle."
2186 msgstr "不能创建空的归档包。"
2187
2185 -#: bundle.c:549
2188 +#: bundle.c:563
2189 #, c-format
2190 msgid "cannot create '%s'"
2191 msgstr "不能创建 '%s'"
2192
2190 -#: bundle.c:574
2193 +#: bundle.c:588
2194 msgid "index-pack died"
2195 msgstr "index-pack 终止"
2196
2194 -#: chunk-format.c:113
2197 +#: chunk-format.c:117
2198 msgid "terminating chunk id appears earlier than expected"
2199 msgstr "终止块 ID 比预期更早出现"
2200
2198 -#: chunk-format.c:122
2201 +#: chunk-format.c:126
2202 #, c-format
2203 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
2204 msgstr "不正确的块偏移 %<PRIx64> 和 %<PRIx64>"
2205
2203 -#: chunk-format.c:129
2206 +#: chunk-format.c:133
2207 #, c-format
2208 msgid "duplicate chunk ID %<PRIx32> found"
2209 msgstr "发现重复的块ID %<PRIx32>"
2210
2208 -#: chunk-format.c:143
2211 +#: chunk-format.c:147
2212 #, c-format
2213 msgid "final chunk has non-zero id %<PRIx32>"
2214 msgstr "最终块有非零 ID %<PRIx32>"
@@ -2273,12 +2276,12 @@ msgstr "无法找到提交 %s"
2276 msgid "commit-graph requires overflow generation data but has none"
2277 msgstr "提交图需要溢出世代数据，但是没有"
2278
2276 -#: commit-graph.c:1075 builtin/am.c:1340
2279 +#: commit-graph.c:1075 builtin/am.c:1341
2280 #, c-format
2281 msgid "unable to parse commit %s"
2282 msgstr "不能解析提交 %s"
2283
2281 -#: commit-graph.c:1337 builtin/pack-objects.c:2897
2284 +#: commit-graph.c:1337 builtin/pack-objects.c:3057
2285 #, c-format
2286 msgid "unable to get type of object %s"
2287 msgstr "无法获得对象 %s 类型"
@@ -2340,7 +2343,7 @@ msgstr "正在查找提交图中额外的边"
2343 msgid "failed to write correct number of base graph ids"
2344 msgstr "无法写入正确数量的基础图形 ID"
2345
2343 -#: commit-graph.c:1812 midx.c:906
2346 +#: commit-graph.c:1812 midx.c:911
2347 #, c-format
2348 msgid "unable to create leading directories of %s"
2349 msgstr "不能为 %s 创建先导目录"
@@ -2389,78 +2392,78 @@ msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
2392 msgid "too many commits to write graph"
2393 msgstr "提交太多不能画图"
2394
2392 -#: commit-graph.c:2450
2395 +#: commit-graph.c:2449
2396 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2397 msgstr "提交图文件的校验码错误，可能已经损坏"
2398
2396 -#: commit-graph.c:2460
2399 +#: commit-graph.c:2459
2400 #, c-format
2401 msgid "commit-graph has incorrect OID order: %s then %s"
2402 msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
2403
2401 -#: commit-graph.c:2470 commit-graph.c:2485
2404 +#: commit-graph.c:2469 commit-graph.c:2484
2405 #, c-format
2406 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2407 msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
2408
2406 -#: commit-graph.c:2477
2409 +#: commit-graph.c:2476
2410 #, c-format
2411 msgid "failed to parse commit %s from commit-graph"
2412 msgstr "无法从提交图形中解析提交 %s"
2413
2411 -#: commit-graph.c:2495
2414 +#: commit-graph.c:2494
2415 msgid "Verifying commits in commit graph"
2416 msgstr "正在校验提交图中的提交"
2417
2415 -#: commit-graph.c:2510
2418 +#: commit-graph.c:2509
2419 #, c-format
2420 msgid "failed to parse commit %s from object database for commit-graph"
2421 msgstr "无法从提交图形的对象库中解析提交 %s"
2422
2420 -#: commit-graph.c:2517
2423 +#: commit-graph.c:2516
2424 #, c-format
2425 msgid "root tree OID for commit %s in commit-graph is %s != %s"
2426 msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
2427
2425 -#: commit-graph.c:2527
2428 +#: commit-graph.c:2526
2429 #, c-format
2430 msgid "commit-graph parent list for commit %s is too long"
2431 msgstr "提交 %s 的提交图形父提交列表太长了"
2432
2430 -#: commit-graph.c:2536
2433 +#: commit-graph.c:2535
2434 #, c-format
2435 msgid "commit-graph parent for %s is %s != %s"
2436 msgstr "%s 的提交图形父提交是 %s != %s"
2437
2435 -#: commit-graph.c:2550
2438 +#: commit-graph.c:2549
2439 #, c-format
2440 msgid "commit-graph parent list for commit %s terminates early"
2441 msgstr "提交 %s 的提交图形父提交列表过早终止"
2442
2440 -#: commit-graph.c:2555
2443 +#: commit-graph.c:2554
2444 #, c-format
2445 msgid ""
2446 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2447 msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
2448
2446 -#: commit-graph.c:2559
2449 +#: commit-graph.c:2558
2450 #, c-format
2451 msgid ""
2452 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2453 msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
2454
2452 -#: commit-graph.c:2576
2455 +#: commit-graph.c:2575
2456 #, c-format
2457 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
2458 msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
2459
2457 -#: commit-graph.c:2582
2460 +#: commit-graph.c:2581
2461 #, c-format
2462 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2463 msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2464
2462 -#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
2463 -#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457
2465 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
2466 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
2467 #, c-format
2468 msgid "could not parse %s"
2469 msgstr "不能解析 %s"
@@ -2742,7 +2745,7 @@ msgstr "%s 的取值格式错误：%s"
2745 msgid "must be one of nothing, matching, simple, upstream or current"
2746 msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
2747
2745 -#: config.c:1687 builtin/pack-objects.c:3924
2748 +#: config.c:1687 builtin/pack-objects.c:4084
2749 #, c-format
2750 msgid "bad pack compression level %d"
2751 msgstr "错误的打包压缩级别 %d"
@@ -2762,110 +2765,110 @@ msgstr "引用 '%s' 没有指向一个数据对象"
2765 msgid "unable to resolve config blob '%s'"
2766 msgstr "不能解析配置对象 '%s'"
2767
2765 -#: config.c:1873
2768 +#: config.c:1874
2769 #, c-format
2770 msgid "failed to parse %s"
2771 msgstr "解析 %s 失败"
2772
2770 -#: config.c:1929
2773 +#: config.c:1930
2774 msgid "unable to parse command-line config"
2775 msgstr "无法解析命令行中的配置"
2776
2774 -#: config.c:2293
2777 +#: config.c:2294
2778 msgid "unknown error occurred while reading the configuration files"
2779 msgstr "在读取配置文件时遇到未知错误"
2780
2778 -#: config.c:2467
2781 +#: config.c:2468
2782 #, c-format
2783 msgid "Invalid %s: '%s'"
2784 msgstr "无效 %s：'%s'"
2785
2783 -#: config.c:2512
2786 +#: config.c:2513
2787 #, c-format
2788 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2789 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
2790
2788 -#: config.c:2558
2791 +#: config.c:2559
2792 #, c-format
2793 msgid "unable to parse '%s' from command-line config"
2794 msgstr "无法解析命令行配置中的 '%s'"
2795
2793 -#: config.c:2560
2796 +#: config.c:2561
2797 #, c-format
2798 msgid "bad config variable '%s' in file '%s' at line %d"
2799 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
2800
2798 -#: config.c:2644
2801 +#: config.c:2645
2802 #, c-format
2803 msgid "invalid section name '%s'"
2804 msgstr "无效的小节名称 '%s'"
2805
2803 -#: config.c:2676
2806 +#: config.c:2677
2807 #, c-format
2808 msgid "%s has multiple values"
2809 msgstr "%s 有多个取值"
2810
2808 -#: config.c:2705
2811 +#: config.c:2706
2812 #, c-format
2813 msgid "failed to write new configuration file %s"
2814 msgstr "写入新的配置文件 %s 失败"
2815
2813 -#: config.c:2957 config.c:3283
2816 +#: config.c:2958 config.c:3285
2817 #, c-format
2818 msgid "could not lock config file %s"
2819 msgstr "不能锁定配置文件 %s"
2820
2818 -#: config.c:2968
2821 +#: config.c:2969
2822 #, c-format
2823 msgid "opening %s"
2824 msgstr "打开 %s"
2825
2823 -#: config.c:3005 builtin/config.c:361
2826 +#: config.c:3006 builtin/config.c:361
2827 #, c-format
2828 msgid "invalid pattern: %s"
2829 msgstr "无效模式：%s"
2830
2828 -#: config.c:3030
2831 +#: config.c:3031
2832 #, c-format
2833 msgid "invalid config file %s"
2834 msgstr "无效的配置文件 %s"
2835
2833 -#: config.c:3043 config.c:3296
2836 +#: config.c:3044 config.c:3298
2837 #, c-format
2838 msgid "fstat on %s failed"
2839 msgstr "对 %s 调用 fstat 失败"
2840
2838 -#: config.c:3054
2841 +#: config.c:3055
2842 #, c-format
2840 -msgid "unable to mmap '%s'"
2841 -msgstr "不能 mmap '%s'"
2843 +msgid "unable to mmap '%s'%s"
2844 +msgstr "不能 mmap '%s'%s"
2845
2843 -#: config.c:3063 config.c:3301
2846 +#: config.c:3065 config.c:3303
2847 #, c-format
2848 msgid "chmod on %s failed"
2849 msgstr "对 %s 调用 chmod 失败"
2850
2848 -#: config.c:3148 config.c:3398
2851 +#: config.c:3150 config.c:3400
2852 #, c-format
2853 msgid "could not write config file %s"
2854 msgstr "不能写入配置文件 %s"
2855
2853 -#: config.c:3182
2856 +#: config.c:3184
2857 #, c-format
2858 msgid "could not set '%s' to '%s'"
2859 msgstr "不能设置 '%s' 为 '%s'"
2860
2858 -#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
2861 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
2862 #, c-format
2863 msgid "could not unset '%s'"
2864 msgstr "不能取消设置 '%s'"
2865
2863 -#: config.c:3274
2866 +#: config.c:3276
2867 #, c-format
2868 msgid "invalid section name: %s"
2869 msgstr "无效的小节名称：%s"
2870
2868 -#: config.c:3441
2871 +#: config.c:3443
2872 #, c-format
2873 msgid "missing value for '%s'"
2874 msgstr "%s 的取值缺失"
@@ -3041,7 +3044,7 @@ msgstr "已阻止奇怪的路径名 '%s'"
3044 msgid "unable to fork"
3045 msgstr "无法 fork"
3046
3044 -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
3047 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
3048 msgid "Checking connectivity"
3049 msgstr "正在检查连通性"
3050
@@ -3160,23 +3163,23 @@ msgstr "意外的过滤类型"
3163 msgid "path name too long for external filter"
3164 msgstr "外部过滤器的路径名太长"
3165
3163 -#: convert.c:934
3166 +#: convert.c:935
3167 #, c-format
3168 msgid ""
3169 "external filter '%s' is not available anymore although not all paths have "
3170 "been filtered"
3171 msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤"
3172
3170 -#: convert.c:1234
3173 +#: convert.c:1236
3174 msgid "true/false are no valid working-tree-encodings"
3175 msgstr "true/false 不是有效的工作区编码"
3176
3174 -#: convert.c:1414 convert.c:1447
3177 +#: convert.c:1416 convert.c:1449
3178 #, c-format
3179 msgid "%s: clean filter '%s' failed"
3180 msgstr "%s：clean 过滤器 '%s' 失败"
3181
3179 -#: convert.c:1490
3182 +#: convert.c:1492
3183 #, c-format
3184 msgid "%s: smudge filter %s failed"
3185 msgstr "%s：smudge 过滤器 %s 失败"
@@ -3301,36 +3304,36 @@ msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多
3304 msgid "Marked %d islands, done.\n"
3305 msgstr "已标记 %d 个数据岛，结束。\n"
3306
3304 -#: diff-merges.c:80
3307 +#: diff-merges.c:70
3308 #, c-format
3309 msgid "unknown value for --diff-merges: %s"
3310 msgstr "未知的 --diff-merges 取值：%s"
3311
3309 -#: diff-lib.c:538
3312 +#: diff-lib.c:557
3313 msgid "--merge-base does not work with ranges"
3314 msgstr "--merge-base 不适用于范围"
3315
3313 -#: diff-lib.c:540
3316 +#: diff-lib.c:559
3317 msgid "--merge-base only works with commits"
3318 msgstr "--merge-base 仅适用于提交"
3319
3317 -#: diff-lib.c:557
3320 +#: diff-lib.c:576
3321 msgid "unable to get HEAD"
3322 msgstr "不能解析 HEAD"
3323
3321 -#: diff-lib.c:564
3324 +#: diff-lib.c:583
3325 msgid "no merge base found"
3326 msgstr "未找到合并基线"
3327
3325 -#: diff-lib.c:566
3328 +#: diff-lib.c:585
3329 msgid "multiple merge bases found"
3330 msgstr "找到了多条合并基线"
3331
3329 -#: diff-no-index.c:238
3332 +#: diff-no-index.c:237
3333 msgid "git diff --no-index [<options>] <path> <path>"
3334 msgstr "git diff --no-index [<选项>] <路径> <路径>"
3335
3333 -#: diff-no-index.c:263
3336 +#: diff-no-index.c:262
3337 msgid ""
3338 "Not a git repository. Use --no-index to compare two paths outside a working "
3339 "tree"
@@ -3353,7 +3356,7 @@ msgid ""
3356 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3357 "'dimmed-zebra', 'plain'"
3358 msgstr ""
3356 -"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "
3359 +"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 "
3360 "'plain'"
3361
3362 #: diff.c:325
@@ -3385,35 +3388,46 @@ msgstr ""
3388 "发现配置变量 'diff.dirstat' 中的错误：\n"
3389 "%s"
3390
3388 -#: diff.c:4278
3391 +#: diff.c:4282
3392 #, c-format
3393 msgid "external diff died, stopping at %s"
3394 msgstr "外部 diff 退出，停止在 %s"
3395
3393 -#: diff.c:4630
3396 +#: diff.c:4634
3397 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
3398 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
3399
3397 -#: diff.c:4633
3400 +#: diff.c:4637
3401 msgid "-G, -S and --find-object are mutually exclusive"
3402 msgstr "-G、-S 和 --find-object 是互斥的"
3403
3401 -#: diff.c:4712
3404 +#: diff.c:4640
3405 +msgid ""
3406 +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
3407 +msgstr "-G 和 --pickaxe-regex 互斥，使用 --pickaxe-regex 和 -S"
3408 +
3409 +#: diff.c:4643
3410 +msgid ""
3411 +"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
3412 +"with -G and -S"
3413 +msgstr "---pickaxe-all 和 --find-object 互斥，使用 --pickaxe-all 与 -G 和 -S"
3414 +
3415 +#: diff.c:4722
3416 msgid "--follow requires exactly one pathspec"
3417 msgstr "--follow 明确要求只跟一个路径规格"
3418
3405 -#: diff.c:4760
3419 +#: diff.c:4770
3420 #, c-format
3421 msgid "invalid --stat value: %s"
3422 msgstr "无效的 --stat 值：%s"
3423
3410 -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
3424 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
3425 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
3426 #, c-format
3427 msgid "%s expects a numerical value"
3428 msgstr "%s 期望一个数字值"
3429
3416 -#: diff.c:4797
3430 +#: diff.c:4807
3431 #, c-format
3432 msgid ""
3433 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3422,200 +3436,200 @@ msgstr ""
3436 "无法解析 --dirstat/-X 选项的参数：\n"
3437 "%s"
3438
3425 -#: diff.c:4882
3439 +#: diff.c:4892
3440 #, c-format
3441 msgid "unknown change class '%c' in --diff-filter=%s"
3442 msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
3443
3430 -#: diff.c:4906
3444 +#: diff.c:4916
3445 #, c-format
3446 msgid "unknown value after ws-error-highlight=%.*s"
3447 msgstr "ws-error-highlight=%.*s 之后未知的值"
3448
3435 -#: diff.c:4920
3449 +#: diff.c:4930
3450 #, c-format
3451 msgid "unable to resolve '%s'"
3452 msgstr "不能解析 '%s'"
3453
3440 -#: diff.c:4970 diff.c:4976
3454 +#: diff.c:4980 diff.c:4986
3455 #, c-format
3456 msgid "%s expects <n>/<m> form"
3457 msgstr "%s 期望 <n>/<m> 格式"
3458
3445 -#: diff.c:4988
3459 +#: diff.c:4998
3460 #, c-format
3461 msgid "%s expects a character, got '%s'"
3462 msgstr "%s 期望一个字符，得到 '%s'"
3463
3450 -#: diff.c:5009
3464 +#: diff.c:5019
3465 #, c-format
3466 msgid "bad --color-moved argument: %s"
3467 msgstr "坏的 --color-moved 参数：%s"
3468
3455 -#: diff.c:5028
3469 +#: diff.c:5038
3470 #, c-format
3471 msgid "invalid mode '%s' in --color-moved-ws"
3472 msgstr "--color-moved-ws 中的无效模式 '%s' "
3473
3460 -#: diff.c:5068
3474 +#: diff.c:5078
3475 msgid ""
3476 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3477 "\"histogram\""
3478 msgstr ""
3479 "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3480
3467 -#: diff.c:5104 diff.c:5124
3481 +#: diff.c:5114 diff.c:5134
3482 #, c-format
3483 msgid "invalid argument to %s"
3484 msgstr "%s 的参数无效"
3485
3472 -#: diff.c:5228
3486 +#: diff.c:5238
3487 #, c-format
3488 msgid "invalid regex given to -I: '%s'"
3489 msgstr "选项 -I 的正则表达式无效：'%s'"
3490
3477 -#: diff.c:5277
3491 +#: diff.c:5287
3492 #, c-format
3493 msgid "failed to parse --submodule option parameter: '%s'"
3494 msgstr "无法解析 --submodule 选项的参数：'%s'"
3495
3482 -#: diff.c:5333
3496 +#: diff.c:5343
3497 #, c-format
3498 msgid "bad --word-diff argument: %s"
3499 msgstr "坏的 --word-diff 参数：%s"
3500
3487 -#: diff.c:5369
3501 +#: diff.c:5379
3502 msgid "Diff output format options"
3503 msgstr "差异输出格式化选项"
3504
3491 -#: diff.c:5371 diff.c:5377
3505 +#: diff.c:5381 diff.c:5387
3506 msgid "generate patch"
3507 msgstr "生成补丁"
3508
3495 -#: diff.c:5374 builtin/log.c:179
3509 +#: diff.c:5384 builtin/log.c:179
3510 msgid "suppress diff output"
3511 msgstr "不显示差异输出"
3512
3499 -#: diff.c:5379 diff.c:5493 diff.c:5500
3513 +#: diff.c:5389 diff.c:5503 diff.c:5510
3514 msgid "<n>"
3515 msgstr "<n>"
3516
3503 -#: diff.c:5380 diff.c:5383
3517 +#: diff.c:5390 diff.c:5393
3518 msgid "generate diffs with <n> lines context"
3519 msgstr "生成含 <n> 行上下文的差异"
3520
3507 -#: diff.c:5385
3521 +#: diff.c:5395
3522 msgid "generate the diff in raw format"
3523 msgstr "生成原始格式的差异"
3524
3511 -#: diff.c:5388
3525 +#: diff.c:5398
3526 msgid "synonym for '-p --raw'"
3527 msgstr "和 '-p --raw' 同义"
3528
3515 -#: diff.c:5392
3529 +#: diff.c:5402
3530 msgid "synonym for '-p --stat'"
3531 msgstr "和 '-p --stat' 同义"
3532
3519 -#: diff.c:5396
3533 +#: diff.c:5406
3534 msgid "machine friendly --stat"
3535 msgstr "机器友好的 --stat"
3536
3523 -#: diff.c:5399
3537 +#: diff.c:5409
3538 msgid "output only the last line of --stat"
3539 msgstr "只输出 --stat 的最后一行"
3540
3527 -#: diff.c:5401 diff.c:5409
3541 +#: diff.c:5411 diff.c:5419
3542 msgid "<param1,param2>..."
3543 msgstr "<参数1,参数2>..."
3544
3531 -#: diff.c:5402
3545 +#: diff.c:5412
3546 msgid ""
3547 "output the distribution of relative amount of changes for each sub-directory"
3548 msgstr "输出每个子目录相对变更的分布"
3549
3536 -#: diff.c:5406
3550 +#: diff.c:5416
3551 msgid "synonym for --dirstat=cumulative"
3552 msgstr "和 --dirstat=cumulative 同义"
3553
3540 -#: diff.c:5410
3554 +#: diff.c:5420
3555 msgid "synonym for --dirstat=files,param1,param2..."
3556 msgstr "是 --dirstat=files,param1,param2... 的同义词"
3557
3544 -#: diff.c:5414
3558 +#: diff.c:5424
3559 msgid "warn if changes introduce conflict markers or whitespace errors"
3560 msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
3561
3548 -#: diff.c:5417
3562 +#: diff.c:5427
3563 msgid "condensed summary such as creations, renames and mode changes"
3564 msgstr "精简摘要，例如创建、重命名和模式变更"
3565
3552 -#: diff.c:5420
3566 +#: diff.c:5430
3567 msgid "show only names of changed files"
3568 msgstr "只显示变更文件的文件名"
3569
3556 -#: diff.c:5423
3570 +#: diff.c:5433
3571 msgid "show only names and status of changed files"
3572 msgstr "只显示变更文件的文件名和状态"
3573
3560 -#: diff.c:5425
3574 +#: diff.c:5435
3575 msgid "<width>[,<name-width>[,<count>]]"
3576 msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
3577
3564 -#: diff.c:5426
3578 +#: diff.c:5436
3579 msgid "generate diffstat"
3580 msgstr "生成差异统计（diffstat）"
3581
3568 -#: diff.c:5428 diff.c:5431 diff.c:5434
3582 +#: diff.c:5438 diff.c:5441 diff.c:5444
3583 msgid "<width>"
3584 msgstr "<宽度>"
3585
3572 -#: diff.c:5429
3586 +#: diff.c:5439
3587 msgid "generate diffstat with a given width"
3588 msgstr "使用给定的长度生成差异统计"
3589
3576 -#: diff.c:5432
3590 +#: diff.c:5442
3591 msgid "generate diffstat with a given name width"
3592 msgstr "使用给定的文件名长度生成差异统计"
3593
3580 -#: diff.c:5435
3594 +#: diff.c:5445
3595 msgid "generate diffstat with a given graph width"
3596 msgstr "使用给定的图形长度生成差异统计"
3597
3584 -#: diff.c:5437
3598 +#: diff.c:5447
3599 msgid "<count>"
3600 msgstr "<次数>"
3601
3588 -#: diff.c:5438
3602 +#: diff.c:5448
3603 msgid "generate diffstat with limited lines"
3604 msgstr "生成有限行数的差异统计"
3605
3592 -#: diff.c:5441
3606 +#: diff.c:5451
3607 msgid "generate compact summary in diffstat"
3608 msgstr "生成差异统计的简洁摘要"
3609
3596 -#: diff.c:5444
3610 +#: diff.c:5454
3611 msgid "output a binary diff that can be applied"
3612 msgstr "输出一个可以应用的二进制差异"
3613
3600 -#: diff.c:5447
3614 +#: diff.c:5457
3615 msgid "show full pre- and post-image object names on the \"index\" lines"
3616 msgstr "在 \"index\" 行显示完整的前后对象名称"
3617
3604 -#: diff.c:5449
3618 +#: diff.c:5459
3619 msgid "show colored diff"
3620 msgstr "显示带颜色的差异"
3621
3608 -#: diff.c:5450
3622 +#: diff.c:5460
3623 msgid "<kind>"
3624 msgstr "<类型>"
3625
3612 -#: diff.c:5451
3626 +#: diff.c:5461
3627 msgid ""
3628 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3629 "diff"
3630 msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
3631
3618 -#: diff.c:5454
3632 +#: diff.c:5464
3633 msgid ""
3634 "do not munge pathnames and use NULs as output field terminators in --raw or "
3635 "--numstat"
@@ -3623,311 +3637,311 @@ msgstr ""
3637 "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
3638 "符"
3639
3626 -#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
3640 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
3641 msgid "<prefix>"
3642 msgstr "<前缀>"
3643
3630 -#: diff.c:5458
3644 +#: diff.c:5468
3645 msgid "show the given source prefix instead of \"a/\""
3646 msgstr "显示给定的源前缀取代 \"a/\""
3647
3634 -#: diff.c:5461
3648 +#: diff.c:5471
3649 msgid "show the given destination prefix instead of \"b/\""
3650 msgstr "显示给定的目标前缀取代 \"b/\""
3651
3638 -#: diff.c:5464
3652 +#: diff.c:5474
3653 msgid "prepend an additional prefix to every line of output"
3654 msgstr "输出的每一行附加前缀"
3655
3642 -#: diff.c:5467
3656 +#: diff.c:5477
3657 msgid "do not show any source or destination prefix"
3658 msgstr "不显示任何源和目标前缀"
3659
3646 -#: diff.c:5470
3660 +#: diff.c:5480
3661 msgid "show context between diff hunks up to the specified number of lines"
3662 msgstr "显示指定行数的差异块间的上下文"
3663
3650 -#: diff.c:5474 diff.c:5479 diff.c:5484
3664 +#: diff.c:5484 diff.c:5489 diff.c:5494
3665 msgid "<char>"
3666 msgstr "<字符>"
3667
3654 -#: diff.c:5475
3668 +#: diff.c:5485
3669 msgid "specify the character to indicate a new line instead of '+'"
3670 msgstr "指定一个字符取代 '+' 来表示新的一行"
3671
3658 -#: diff.c:5480
3672 +#: diff.c:5490
3673 msgid "specify the character to indicate an old line instead of '-'"
3674 msgstr "指定一个字符取代 '-' 来表示旧的一行"
3675
3662 -#: diff.c:5485
3676 +#: diff.c:5495
3677 msgid "specify the character to indicate a context instead of ' '"
3678 msgstr "指定一个字符取代 ' ' 来表示一行上下文"
3679
3666 -#: diff.c:5488
3680 +#: diff.c:5498
3681 msgid "Diff rename options"
3682 msgstr "差异重命名选项"
3683
3670 -#: diff.c:5489
3684 +#: diff.c:5499
3685 msgid "<n>[/<m>]"
3686 msgstr "<n>[/<m>]"
3687
3674 -#: diff.c:5490
3688 +#: diff.c:5500
3689 msgid "break complete rewrite changes into pairs of delete and create"
3690 msgstr "将完全重写的变更打破为成对的删除和创建"
3691
3678 -#: diff.c:5494
3692 +#: diff.c:5504
3693 msgid "detect renames"
3694 msgstr "检测重命名"
3695
3682 -#: diff.c:5498
3696 +#: diff.c:5508
3697 msgid "omit the preimage for deletes"
3698 msgstr "省略删除操作的差异输出"
3699
3686 -#: diff.c:5501
3700 +#: diff.c:5511
3701 msgid "detect copies"
3702 msgstr "检测拷贝"
3703
3690 -#: diff.c:5505
3704 +#: diff.c:5515
3705 msgid "use unmodified files as source to find copies"
3706 msgstr "使用未修改的文件做为发现拷贝的源"
3707
3694 -#: diff.c:5507
3708 +#: diff.c:5517
3709 msgid "disable rename detection"
3710 msgstr "禁用重命名探测"
3711
3698 -#: diff.c:5510
3712 +#: diff.c:5520
3713 msgid "use empty blobs as rename source"
3714 msgstr "使用空的数据对象做为重命名的源"
3715
3702 -#: diff.c:5512
3716 +#: diff.c:5522
3717 msgid "continue listing the history of a file beyond renames"
3718 msgstr "继续列出文件重命名以外的历史记录"
3719
3706 -#: diff.c:5515
3720 +#: diff.c:5525
3721 msgid ""
3722 "prevent rename/copy detection if the number of rename/copy targets exceeds "
3723 "given limit"
3724 msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
3725
3712 -#: diff.c:5517
3726 +#: diff.c:5527
3727 msgid "Diff algorithm options"
3728 msgstr "差异算法选项"
3729
3716 -#: diff.c:5519
3730 +#: diff.c:5529
3731 msgid "produce the smallest possible diff"
3732 msgstr "生成尽可能小的差异"
3733
3720 -#: diff.c:5522
3734 +#: diff.c:5532
3735 msgid "ignore whitespace when comparing lines"
3736 msgstr "行比较时忽略空白字符"
3737
3724 -#: diff.c:5525
3738 +#: diff.c:5535
3739 msgid "ignore changes in amount of whitespace"
3740 msgstr "忽略空白字符的变更"
3741
3728 -#: diff.c:5528
3742 +#: diff.c:5538
3743 msgid "ignore changes in whitespace at EOL"
3744 msgstr "忽略行尾的空白字符变更"
3745
3732 -#: diff.c:5531
3746 +#: diff.c:5541
3747 msgid "ignore carrier-return at the end of line"
3748 msgstr "忽略行尾的回车符（CR）"
3749
3736 -#: diff.c:5534
3750 +#: diff.c:5544
3751 msgid "ignore changes whose lines are all blank"
3752 msgstr "忽略整行都是空白的变更"
3753
3740 -#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
3754 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
3755 msgid "<regex>"
3756 msgstr "<正则>"
3757
3744 -#: diff.c:5537
3758 +#: diff.c:5547
3759 msgid "ignore changes whose all lines match <regex>"
3760 msgstr "忽略所有行都和正则表达式匹配的变更"
3761
3748 -#: diff.c:5540
3762 +#: diff.c:5550
3763 msgid "heuristic to shift diff hunk boundaries for easy reading"
3764 msgstr "启发式转换差异边界以便阅读"
3765
3752 -#: diff.c:5543
3766 +#: diff.c:5553
3767 msgid "generate diff using the \"patience diff\" algorithm"
3768 msgstr "使用 \"patience diff\" 算法生成差异"
3769
3756 -#: diff.c:5547
3770 +#: diff.c:5557
3771 msgid "generate diff using the \"histogram diff\" algorithm"
3772 msgstr "使用 \"histogram diff\" 算法生成差异"
3773
3760 -#: diff.c:5549
3774 +#: diff.c:5559
3775 msgid "<algorithm>"
3776 msgstr "<算法>"
3777
3764 -#: diff.c:5550
3778 +#: diff.c:5560
3779 msgid "choose a diff algorithm"
3780 msgstr "选择一个差异算法"
3781
3768 -#: diff.c:5552
3782 +#: diff.c:5562
3783 msgid "<text>"
3784 msgstr "<文本>"
3785
3772 -#: diff.c:5553
3786 +#: diff.c:5563
3787 msgid "generate diff using the \"anchored diff\" algorithm"
3788 msgstr "使用 \"anchored diff\" 算法生成差异"
3789
3776 -#: diff.c:5555 diff.c:5564 diff.c:5567
3790 +#: diff.c:5565 diff.c:5574 diff.c:5577
3791 msgid "<mode>"
3792 msgstr "<模式>"
3793
3780 -#: diff.c:5556
3794 +#: diff.c:5566
3795 msgid "show word diff, using <mode> to delimit changed words"
3796 msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
3797
3784 -#: diff.c:5559
3798 +#: diff.c:5569
3799 msgid "use <regex> to decide what a word is"
3800 msgstr "使用 <正则表达式> 确定何为一个词"
3801
3788 -#: diff.c:5562
3802 +#: diff.c:5572
3803 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3804 msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
3805
3792 -#: diff.c:5565
3806 +#: diff.c:5575
3807 msgid "moved lines of code are colored differently"
3808 msgstr "移动的代码行用不同方式着色"
3809
3796 -#: diff.c:5568
3810 +#: diff.c:5578
3811 msgid "how white spaces are ignored in --color-moved"
3812 msgstr "在 --color-moved 下如何忽略空白字符"
3813
3800 -#: diff.c:5571
3814 +#: diff.c:5581
3815 msgid "Other diff options"
3816 msgstr "其它差异选项"
3817
3804 -#: diff.c:5573
3818 +#: diff.c:5583
3819 msgid "when run from subdir, exclude changes outside and show relative paths"
3820 msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
3821
3808 -#: diff.c:5577
3822 +#: diff.c:5587
3823 msgid "treat all files as text"
3824 msgstr "把所有文件当做文本处理"
3825
3812 -#: diff.c:5579
3826 +#: diff.c:5589
3827 msgid "swap two inputs, reverse the diff"
3828 msgstr "交换两个输入，反转差异"
3829
3816 -#: diff.c:5581
3830 +#: diff.c:5591
3831 msgid "exit with 1 if there were differences, 0 otherwise"
3832 msgstr "有差异时退出码为 1，否则为 0"
3833
3820 -#: diff.c:5583
3834 +#: diff.c:5593
3835 msgid "disable all output of the program"
3836 msgstr "禁用本程序的所有输出"
3837
3824 -#: diff.c:5585
3838 +#: diff.c:5595
3839 msgid "allow an external diff helper to be executed"
3840 msgstr "允许执行一个外置的差异助手"
3841
3828 -#: diff.c:5587
3842 +#: diff.c:5597
3843 msgid "run external text conversion filters when comparing binary files"
3844 msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
3845
3832 -#: diff.c:5589
3846 +#: diff.c:5599
3847 msgid "<when>"
3848 msgstr "<何时>"
3849
3836 -#: diff.c:5590
3850 +#: diff.c:5600
3851 msgid "ignore changes to submodules in the diff generation"
3852 msgstr "在生成差异时，忽略子模组的更改"
3853
3840 -#: diff.c:5593
3854 +#: diff.c:5603
3855 msgid "<format>"
3856 msgstr "<格式>"
3857
3844 -#: diff.c:5594
3858 +#: diff.c:5604
3859 msgid "specify how differences in submodules are shown"
3860 msgstr "指定子模组的差异如何显示"
3861
3848 -#: diff.c:5598
3862 +#: diff.c:5608
3863 msgid "hide 'git add -N' entries from the index"
3864 msgstr "隐藏索引中 'git add -N' 条目"
3865
3852 -#: diff.c:5601
3866 +#: diff.c:5611
3867 msgid "treat 'git add -N' entries as real in the index"
3868 msgstr "将索引中 'git add -N' 条目当做真实的"
3869
3856 -#: diff.c:5603
3870 +#: diff.c:5613
3871 msgid "<string>"
3872 msgstr "<字符串>"
3873
3860 -#: diff.c:5604
3874 +#: diff.c:5614
3875 msgid ""
3876 "look for differences that change the number of occurrences of the specified "
3877 "string"
3878 msgstr "查找改变了指定字符串出现次数的差异"
3879
3866 -#: diff.c:5607
3880 +#: diff.c:5617
3881 msgid ""
3882 "look for differences that change the number of occurrences of the specified "
3883 "regex"
3884 msgstr "查找改变指定正则匹配出现次数的差异"
3885
3872 -#: diff.c:5610
3886 +#: diff.c:5620
3887 msgid "show all changes in the changeset with -S or -G"
3888 msgstr "显示使用 -S 或 -G 的变更集的所有变更"
3889
3876 -#: diff.c:5613
3890 +#: diff.c:5623
3891 msgid "treat <string> in -S as extended POSIX regular expression"
3892 msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
3893
3880 -#: diff.c:5616
3894 +#: diff.c:5626
3895 msgid "control the order in which files appear in the output"
3896 msgstr "控制输出中的文件显示顺序"
3897
3884 -#: diff.c:5617 diff.c:5620
3898 +#: diff.c:5627 diff.c:5630
3899 msgid "<path>"
3900 msgstr "<路径>"
3901
3888 -#: diff.c:5618
3902 +#: diff.c:5628
3903 msgid "show the change in the specified path first"
3904 msgstr "先显示指定路径的变更"
3905
3892 -#: diff.c:5621
3906 +#: diff.c:5631
3907 msgid "skip the output to the specified path"
3908 msgstr "跳过指定路径的输出"
3909
3896 -#: diff.c:5623
3910 +#: diff.c:5633
3911 msgid "<object-id>"
3912 msgstr "<对象 ID>"
3913
3900 -#: diff.c:5624
3914 +#: diff.c:5634
3915 msgid ""
3916 "look for differences that change the number of occurrences of the specified "
3917 "object"
3918 msgstr "查找改变指定对象出现次数的差异"
3919
3906 -#: diff.c:5626
3920 +#: diff.c:5636
3921 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3922 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3923
3910 -#: diff.c:5627
3924 +#: diff.c:5637
3925 msgid "select files by diff type"
3926 msgstr "通过差异类型选择文件"
3927
3914 -#: diff.c:5629
3928 +#: diff.c:5639
3929 msgid "<file>"
3930 msgstr "<文件>"
3931
3918 -#: diff.c:5630
3932 +#: diff.c:5640
3933 msgid "Output to a specific file"
3934 msgstr "输出到一个指定的文件"
3935
3922 -#: diff.c:6287
3923 -msgid "inexact rename detection was skipped due to too many files."
3924 -msgstr "因为文件太多，略过不严格的重命名检查。"
3936 +#: diff.c:6298
3937 +msgid "exhaustive rename detection was skipped due to too many files."
3938 +msgstr "由于文件太多，跳过详尽的重命名检查。"
3939
3926 -#: diff.c:6290
3940 +#: diff.c:6301
3941 msgid "only found copies from modified paths due to too many files."
3928 -msgstr "因为文件太多，只在修改的路径中查找拷贝。"
3942 +msgstr "由于文件太多，只在修改的路径中找到了拷贝。"
3943
3930 -#: diff.c:6293
3944 +#: diff.c:6304
3945 #, c-format
3946 msgid ""
3947 "you may want to set your %s variable to at least %d and retry the command."
@@ -3938,7 +3952,7 @@ msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令
3952 msgid "failed to read orderfile '%s'"
3953 msgstr "读取排序文件 '%s' 失败"
3954
3941 -#: diffcore-rename.c:1418
3955 +#: diffcore-rename.c:1514
3956 msgid "Performing inexact rename detection"
3957 msgstr "正在进行非精确的重命名探测"
3958
@@ -3947,59 +3961,59 @@ msgstr "正在进行非精确的重命名探测"
3961 msgid "No such path '%s' in the diff"
3962 msgstr "在差异中无此路径 '%s'"
3963
3950 -#: dir.c:578
3964 +#: dir.c:593
3965 #, c-format
3966 msgid "pathspec '%s' did not match any file(s) known to git"
3967 msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
3968
3955 -#: dir.c:718 dir.c:747 dir.c:760
3969 +#: dir.c:733 dir.c:762 dir.c:775
3970 #, c-format
3971 msgid "unrecognized pattern: '%s'"
3972 msgstr "未识别的模式：'%s'"
3973
3960 -#: dir.c:777 dir.c:791
3974 +#: dir.c:790 dir.c:804
3975 #, c-format
3976 msgid "unrecognized negative pattern: '%s'"
3977 msgstr "未识别的反向模式：'%s'"
3978
3965 -#: dir.c:809
3979 +#: dir.c:820
3980 #, c-format
3981 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3982 msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'"
3983
3970 -#: dir.c:819
3984 +#: dir.c:830
3985 msgid "disabling cone pattern matching"
3986 msgstr "禁止 cone 模式匹配"
3987
3974 -#: dir.c:1206
3988 +#: dir.c:1214
3989 #, c-format
3990 msgid "cannot use %s as an exclude file"
3991 msgstr "不能将 %s 用作排除文件"
3992
3979 -#: dir.c:2314
3993 +#: dir.c:2351
3994 #, c-format
3995 msgid "could not open directory '%s'"
3996 msgstr "不能打开目录 '%s'"
3997
3984 -#: dir.c:2614
3998 +#: dir.c:2653
3999 msgid "failed to get kernel name and information"
4000 msgstr "无法获得内核名称和信息"
4001
3988 -#: dir.c:2738
4002 +#: dir.c:2777
4003 msgid "untracked cache is disabled on this system or location"
4004 msgstr "缓存未跟踪文件在本系统或位置中被禁用"
4005
3992 -#: dir.c:3543
4006 +#: dir.c:3610
4007 #, c-format
4008 msgid "index file corrupt in repo %s"
4009 msgstr "仓库 %s 中的索引文件损坏"
4010
3997 -#: dir.c:3590 dir.c:3595
4011 +#: dir.c:3657 dir.c:3662
4012 #, c-format
4013 msgid "could not create directories for %s"
4014 msgstr "不能为 %s 创建目录"
4015
4002 -#: dir.c:3624
4016 +#: dir.c:3691
4017 #, c-format
4018 msgid "could not migrate git directory from '%s' to '%s'"
4019 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
@@ -4009,11 +4023,11 @@ msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
4023 msgid "hint: Waiting for your editor to close the file...%c"
4024 msgstr "提示：等待您的编辑器关闭文件...%c"
4025
4012 -#: entry.c:179
4026 +#: entry.c:176
4027 msgid "Filtering content"
4028 msgstr "过滤内容"
4029
4016 -#: entry.c:500
4030 +#: entry.c:497
4031 #, c-format
4032 msgid "could not stat file '%s'"
4033 msgstr "不能对文件 '%s' 调用 stat"
@@ -4023,7 +4037,7 @@ msgstr "不能对文件 '%s' 调用 stat"
4037 msgid "bad git namespace path \"%s\""
4038 msgstr "错误的 git 名字空间路径 \"%s\""
4039
4026 -#: environment.c:335
4040 +#: environment.c:334
4041 #, c-format
4042 msgid "could not set GIT_DIR to '%s'"
4043 msgstr "不能设置 GIT_DIR 为 '%s'"
@@ -4188,7 +4202,7 @@ msgstr "没有共同的提交"
4202 msgid "source repository is shallow, reject to clone."
4203 msgstr "源仓库是浅克隆，拒绝克隆。"
4204
4191 -#: fetch-pack.c:1128 fetch-pack.c:1651
4205 +#: fetch-pack.c:1128 fetch-pack.c:1660
4206 msgid "git fetch-pack: fetch failed."
4207 msgstr "git fetch-pack：获取失败。"
4208
@@ -4210,7 +4224,7 @@ msgstr "服务器不支持浅克隆请求"
4224 msgid "Server supports filter"
4225 msgstr "服务器支持 filter"
4226
4213 -#: fetch-pack.c:1329 fetch-pack.c:2034
4227 +#: fetch-pack.c:1329 fetch-pack.c:2043
4228 msgid "unable to write request to remote"
4229 msgstr "无法将请求写到远程"
4230
@@ -4266,24 +4280,24 @@ msgstr "处理要获取的引用出错：%d"
4280 msgid "git fetch-pack: expected response end packet"
4281 msgstr "git fetch-pack：预期响应结束包"
4282
4269 -#: fetch-pack.c:1930
4283 +#: fetch-pack.c:1939
4284 msgid "no matching remote head"
4285 msgstr "没有匹配的远程分支"
4286
4273 -#: fetch-pack.c:1953 builtin/clone.c:697
4287 +#: fetch-pack.c:1962 builtin/clone.c:697
4288 msgid "remote did not send all necessary objects"
4289 msgstr "远程没有发送所有必需的对象"
4290
4277 -#: fetch-pack.c:2056
4291 +#: fetch-pack.c:2065
4292 msgid "unexpected 'ready' from remote"
4293 msgstr "来自远程的意外的 'ready'"
4294
4281 -#: fetch-pack.c:2079
4295 +#: fetch-pack.c:2088
4296 #, c-format
4297 msgid "no such remote ref %s"
4298 msgstr "没有这样的远程引用 %s"
4299
4286 -#: fetch-pack.c:2082
4300 +#: fetch-pack.c:2091
4301 #, c-format
4302 msgid "Server does not allow request for unadvertised object %s"
4303 msgstr "服务器不允许请求未公开的对象 %s"
@@ -4303,7 +4317,7 @@ msgstr "gpg 数据签名失败"
4317
4318 #: graph.c:98
4319 #, c-format
4306 -msgid "ignore invalid color '%.*s' in log.graphColors"
4320 +msgid "ignored invalid color '%.*s' in log.graphColors"
4321 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
4322
4323 #: grep.c:531
@@ -4314,18 +4328,18 @@ msgstr ""
4328 "给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"
4329 "功能"
4330
4317 -#: grep.c:1893
4331 +#: grep.c:1895
4332 #, c-format
4333 msgid "'%s': unable to read %s"
4334 msgstr "'%s'：无法读取 %s"
4335
4322 -#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
4336 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
4337 #: builtin/rm.c:136
4338 #, c-format
4339 msgid "failed to stat '%s'"
4340 msgstr "对 '%s' 调用 stat 失败"
4341
4328 -#: grep.c:1921
4342 +#: grep.c:1923
4343 #, c-format
4344 msgid "'%s': short read"
4345 msgstr "'%s'：读取不完整"
@@ -4562,7 +4576,7 @@ msgstr "sparse:path 过滤器支持已被删除"
4576
4577 #: list-objects-filter-options.c:105
4578 #, c-format
4565 -msgid "'%s' for 'object:type=<type>' isnot a valid object type"
4579 +msgid "'%s' for 'object:type=<type>' is not a valid object type"
4580 msgstr "'object:type=<type>' 的值 '%s' 不是有效的对象类型"
4581
4582 #: list-objects-filter-options.c:124
@@ -4607,7 +4621,7 @@ msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式，但不是一个树对
4621 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4622 msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一个数据对象"
4623
4610 -#: list-objects.c:395
4624 +#: list-objects.c:398
4625 #, c-format
4626 msgid "unable to load root tree for commit %s"
4627 msgstr "无法为提交 %s 加载根树"
@@ -4653,32 +4667,32 @@ msgstr "检测到被引用的 CRLF"
4667 msgid "bad action '%s' for '%s'"
4668 msgstr "'%2$s' 的错误动作 '%1$s'"
4669
4656 -#: merge-ort.c:1116 merge-recursive.c:1205
4670 +#: merge-ort.c:1569 merge-recursive.c:1201
4671 #, c-format
4672 msgid "Failed to merge submodule %s (not checked out)"
4673 msgstr "无法合并子模组 %s （没有检出）"
4674
4661 -#: merge-ort.c:1125 merge-recursive.c:1212
4675 +#: merge-ort.c:1578 merge-recursive.c:1208
4676 #, c-format
4677 msgid "Failed to merge submodule %s (commits not present)"
4678 msgstr "无法合并子模组 %s（提交不存在）"
4679
4666 -#: merge-ort.c:1134 merge-recursive.c:1219
4680 +#: merge-ort.c:1587 merge-recursive.c:1215
4681 #, c-format
4682 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4683 msgstr "无法合并子模组 %s （提交未跟随合并基线）"
4684
4671 -#: merge-ort.c:1144 merge-ort.c:1151
4685 +#: merge-ort.c:1597 merge-ort.c:1604
4686 #, c-format
4687 msgid "Note: Fast-forwarding submodule %s to %s"
4688 msgstr "注意：快进子模组 %s 到 %s"
4689
4676 -#: merge-ort.c:1172
4690 +#: merge-ort.c:1625
4691 #, c-format
4692 msgid "Failed to merge submodule %s"
4693 msgstr "无法合并子模组 %s"
4694
4681 -#: merge-ort.c:1179
4695 +#: merge-ort.c:1632
4696 #, c-format
4697 msgid ""
4698 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4687,7 +4701,7 @@ msgstr ""
4701 "无法合并子模组 %s，但是存在一个可能的合并方案：\n"
4702 "%s\n"
4703
4690 -#: merge-ort.c:1183 merge-recursive.c:1273
4704 +#: merge-ort.c:1636 merge-recursive.c:1269
4705 #, c-format
4706 msgid ""
4707 "If this is correct simply add it to the index for example\n"
@@ -4703,7 +4717,7 @@ msgstr ""
4717 "\n"
4718 "以接受此建议。\n"
4719
4706 -#: merge-ort.c:1196
4720 +#: merge-ort.c:1649
4721 #, c-format
4722 msgid ""
4723 "Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4712,21 +4726,21 @@ msgstr ""
4726 "无法合并子模组 %s，但是存在多个可能的合并：\n"
4727 "%s"
4728
4715 -#: merge-ort.c:1415 merge-recursive.c:1362
4729 +#: merge-ort.c:1868 merge-recursive.c:1358
4730 msgid "Failed to execute internal merge"
4731 msgstr "无法执行内部合并"
4732
4719 -#: merge-ort.c:1420 merge-recursive.c:1367
4733 +#: merge-ort.c:1873 merge-recursive.c:1363
4734 #, c-format
4735 msgid "Unable to add %s to database"
4736 msgstr "不能添加 %s 至对象库"
4737
4724 -#: merge-ort.c:1427 merge-recursive.c:1400
4738 +#: merge-ort.c:1880 merge-recursive.c:1396
4739 #, c-format
4740 msgid "Auto-merging %s"
4741 msgstr "自动合并 %s"
4742
4729 -#: merge-ort.c:1566 merge-recursive.c:2122
4743 +#: merge-ort.c:2019 merge-recursive.c:2118
4744 #, c-format
4745 msgid ""
4746 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4735,7 +4749,7 @@ msgstr ""
4749 "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
4750 "在：%s。"
4751
4738 -#: merge-ort.c:1576 merge-recursive.c:2132
4752 +#: merge-ort.c:2029 merge-recursive.c:2128
4753 #, c-format
4754 msgid ""
4755 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4744,7 +4758,7 @@ msgstr ""
4758 "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"
4759 "径放置于此：%s"
4760
4747 -#: merge-ort.c:1634
4761 +#: merge-ort.c:2087
4762 #, c-format
4763 msgid ""
4764 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4754,14 +4768,14 @@ msgstr ""
4768 "冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目"
4769 "录中，没有一个目标目录中包含多数文件。"
4770
4757 -#: merge-ort.c:1788 merge-recursive.c:2468
4771 +#: merge-ort.c:2241 merge-recursive.c:2464
4772 #, c-format
4773 msgid ""
4774 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4775 "renamed."
4776 msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"
4777
4764 -#: merge-ort.c:1932 merge-recursive.c:3244
4778 +#: merge-ort.c:2385 merge-recursive.c:3247
4779 #, c-format
4780 msgid ""
4781 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4769,7 +4783,7 @@ msgid ""
4783 msgstr ""
4784 "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"
4785
4772 -#: merge-ort.c:1939 merge-recursive.c:3251
4786 +#: merge-ort.c:2392 merge-recursive.c:3254
4787 #, c-format
4788 msgid ""
4789 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4778,7 +4792,7 @@ msgstr ""
4792 "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
4793 "动到 %5$s。"
4794
4781 -#: merge-ort.c:1952 merge-recursive.c:3247
4795 +#: merge-ort.c:2405 merge-recursive.c:3250
4796 #, c-format
4797 msgid ""
4798 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4787,7 +4801,7 @@ msgstr ""
4801 "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"
4802 "到 %s。"
4803
4790 -#: merge-ort.c:1960 merge-recursive.c:3254
4804 +#: merge-ort.c:2413 merge-recursive.c:3257
4805 #, c-format
4806 msgid ""
4807 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4796,13 +4810,13 @@ msgstr ""
4810 "冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"
4811 "建议将其移动到 %5$s。"
4812
4799 -#: merge-ort.c:2103
4813 +#: merge-ort.c:2569
4814 #, c-format
4815 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
4816 msgstr ""
4817 "冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。"
4818
4805 -#: merge-ort.c:2198
4819 +#: merge-ort.c:2664
4820 #, c-format
4821 msgid ""
4822 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4812,60 +4826,64 @@ msgstr ""
4826 "冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这"
4827 "可能导致嵌套的冲突标签。"
4828
4815 -#: merge-ort.c:2217 merge-ort.c:2241
4829 +#: merge-ort.c:2683 merge-ort.c:2707
4830 #, c-format
4831 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
4832 msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。"
4833
4820 -#: merge-ort.c:2550 merge-recursive.c:3002
4834 +#: merge-ort.c:3182 merge-recursive.c:3008
4835 #, c-format
4836 msgid "cannot read object %s"
4837 msgstr "不能读取对象 %s"
4838
4825 -#: merge-ort.c:2553 merge-recursive.c:3005
4839 +#: merge-ort.c:3185 merge-recursive.c:3011
4840 #, c-format
4841 msgid "object %s is not a blob"
4842 msgstr "对象 %s 不是一个数据对象"
4843
4830 -#: merge-ort.c:2981
4844 +#: merge-ort.c:3613
4845 #, c-format
4846 msgid ""
4847 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
4848 "%s instead."
4849 msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。"
4850
4837 -#: merge-ort.c:3055
4851 +#: merge-ort.c:3689
4852 #, c-format
4853 msgid ""
4854 "CONFLICT (distinct types): %s had different types on each side; renamed both "
4855 "of them so each can be recorded somewhere."
4842 -msgstr "冲突（不同类型）：%s 在两侧有不同的类型，将两者都重命名以便它们能记录在不同位置。"
4856 +msgstr ""
4857 +"冲突（不同类型）：%s 在两侧有不同的类型，将两者都重命名以便它们能记录在不同位"
4858 +"置。"
4859
4844 -#: merge-ort.c:3062
4860 +#: merge-ort.c:3696
4861 #, c-format
4862 msgid ""
4863 "CONFLICT (distinct types): %s had different types on each side; renamed one "
4864 "of them so each can be recorded somewhere."
4849 -msgstr "冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同位置。"
4865 +msgstr ""
4866 +"冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同"
4867 +"位置。"
4868
4851 -#: merge-ort.c:3162 merge-recursive.c:3081
4869 +#: merge-ort.c:3796 merge-recursive.c:3087
4870 msgid "content"
4871 msgstr "内容"
4872
4855 -#: merge-ort.c:3164 merge-recursive.c:3085
4873 +#: merge-ort.c:3798 merge-recursive.c:3091
4874 msgid "add/add"
4875 msgstr "添加/添加"
4876
4859 -#: merge-ort.c:3166 merge-recursive.c:3130
4877 +#: merge-ort.c:3800 merge-recursive.c:3136
4878 msgid "submodule"
4879 msgstr "子模组"
4880
4863 -#: merge-ort.c:3168 merge-recursive.c:3131
4881 +#: merge-ort.c:3802 merge-recursive.c:3137
4882 #, c-format
4883 msgid "CONFLICT (%s): Merge conflict in %s"
4884 msgstr "冲突（%s）：合并冲突于 %s"
4885
4868 -#: merge-ort.c:3198
4886 +#: merge-ort.c:3833
4887 #, c-format
4888 msgid ""
4889 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4874,7 +4892,7 @@ msgstr ""
4892 "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本"
4893 "在树中被保留。"
4894
4877 -#: merge-ort.c:3433
4895 +#: merge-ort.c:4120
4896 #, c-format
4897 msgid ""
4898 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4884,12 +4902,12 @@ msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副
4902 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
4903 #. base, and 2-3) the trees for the two trees we're merging.
4904 #.
4887 -#: merge-ort.c:3730
4905 +#: merge-ort.c:4487
4906 #, c-format
4907 msgid "collecting merge info failed for trees %s, %s, %s"
4908 msgstr "无法收集树 %s、%s、%s 的合并信息"
4909
4892 -#: merge-ort-wrappers.c:13 merge-recursive.c:3699
4910 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702
4911 #, c-format
4912 msgid ""
4913 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4898,103 +4916,103 @@ msgstr ""
4916 "您对下列文件的本地修改将被合并操作覆盖：\n"
4917 " %s"
4918
4901 -#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
4919 +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
4920 msgid "Already up to date."
4921 msgstr "已经是最新的。"
4922
4905 -#: merge-recursive.c:356
4923 +#: merge-recursive.c:352
4924 msgid "(bad commit)\n"
4925 msgstr "（坏提交）\n"
4926
4909 -#: merge-recursive.c:379
4927 +#: merge-recursive.c:375
4928 #, c-format
4929 msgid "add_cacheinfo failed for path '%s'; merge aborting."
4930 msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"
4931
4914 -#: merge-recursive.c:388
4932 +#: merge-recursive.c:384
4933 #, c-format
4934 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
4935 msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"
4936
4919 -#: merge-recursive.c:876
4937 +#: merge-recursive.c:872
4938 #, c-format
4939 msgid "failed to create path '%s'%s"
4940 msgstr "创建路径 '%s'%s 失败"
4941
4924 -#: merge-recursive.c:887
4942 +#: merge-recursive.c:883
4943 #, c-format
4944 msgid "Removing %s to make room for subdirectory\n"
4945 msgstr "删除 %s 以便为子目录留出空间\n"
4946
4929 -#: merge-recursive.c:901 merge-recursive.c:920
4947 +#: merge-recursive.c:897 merge-recursive.c:916
4948 msgid ": perhaps a D/F conflict?"
4949 msgstr "：可能是一个目录/文件冲突？"
4950
4933 -#: merge-recursive.c:910
4951 +#: merge-recursive.c:906
4952 #, c-format
4953 msgid "refusing to lose untracked file at '%s'"
4954 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
4955
4938 -#: merge-recursive.c:951 builtin/cat-file.c:41
4956 +#: merge-recursive.c:947 builtin/cat-file.c:41
4957 #, c-format
4958 msgid "cannot read object %s '%s'"
4959 msgstr "不能读取对象 %s '%s'"
4960
4943 -#: merge-recursive.c:956
4961 +#: merge-recursive.c:952
4962 #, c-format
4963 msgid "blob expected for %s '%s'"
4964 msgstr "%s '%s' 应为数据对象"
4965
4948 -#: merge-recursive.c:981
4966 +#: merge-recursive.c:977
4967 #, c-format
4968 msgid "failed to open '%s': %s"
4969 msgstr "打开 '%s' 失败：%s"
4970
4953 -#: merge-recursive.c:992
4971 +#: merge-recursive.c:988
4972 #, c-format
4973 msgid "failed to symlink '%s': %s"
4974 msgstr "创建符号链接 '%s' 失败：%s"
4975
4958 -#: merge-recursive.c:997
4976 +#: merge-recursive.c:993
4977 #, c-format
4978 msgid "do not know what to do with %06o %s '%s'"
4979 msgstr "不知道如何处理 %06o %s '%s'"
4980
4963 -#: merge-recursive.c:1227 merge-recursive.c:1239
4981 +#: merge-recursive.c:1223 merge-recursive.c:1235
4982 #, c-format
4983 msgid "Fast-forwarding submodule %s to the following commit:"
4984 msgstr "子模组 %s 快进到如下提交："
4985
4968 -#: merge-recursive.c:1230 merge-recursive.c:1242
4986 +#: merge-recursive.c:1226 merge-recursive.c:1238
4987 #, c-format
4988 msgid "Fast-forwarding submodule %s"
4989 msgstr "快进子模组 %s"
4990
4973 -#: merge-recursive.c:1265
4991 +#: merge-recursive.c:1261
4992 #, c-format
4993 msgid "Failed to merge submodule %s (merge following commits not found)"
4994 msgstr "无法合并子模组 %s （没发现合并跟随的提交）"
4995
4978 -#: merge-recursive.c:1269
4996 +#: merge-recursive.c:1265
4997 #, c-format
4998 msgid "Failed to merge submodule %s (not fast-forward)"
4999 msgstr "无法合并子模组 %s（非快进）"
5000
4983 -#: merge-recursive.c:1270
5001 +#: merge-recursive.c:1266
5002 msgid "Found a possible merge resolution for the submodule:\n"
5003 msgstr "找到子模组的一个可能的合并方案：\n"
5004
4987 -#: merge-recursive.c:1282
5005 +#: merge-recursive.c:1278
5006 #, c-format
5007 msgid "Failed to merge submodule %s (multiple merges found)"
5008 msgstr "无法合并子模组 %s （发现多个合并）"
5009
4992 -#: merge-recursive.c:1424
5010 +#: merge-recursive.c:1420
5011 #, c-format
5012 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
5013 msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"
5014
4997 -#: merge-recursive.c:1496
5015 +#: merge-recursive.c:1492
5016 #, c-format
5017 msgid ""
5018 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5003,7 +5021,7 @@ msgstr ""
5021 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
5022 "本被保留。"
5023
5006 -#: merge-recursive.c:1501
5024 +#: merge-recursive.c:1497
5025 #, c-format
5026 msgid ""
5027 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5012,7 +5030,7 @@ msgstr ""
5030 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
5031 "%7$s 版本被保留。"
5032
5015 -#: merge-recursive.c:1508
5033 +#: merge-recursive.c:1504
5034 #, c-format
5035 msgid ""
5036 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5021,7 +5039,7 @@ msgstr ""
5039 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
5040 "本保留在 %8$s 中。"
5041
5024 -#: merge-recursive.c:1513
5042 +#: merge-recursive.c:1509
5043 #, c-format
5044 msgid ""
5045 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5030,40 +5048,40 @@ msgstr ""
5048 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
5049 "%7$s 版本保留在 %9$s 中。"
5050
5033 -#: merge-recursive.c:1548
5051 +#: merge-recursive.c:1544
5052 msgid "rename"
5053 msgstr "重命名"
5054
5037 -#: merge-recursive.c:1548
5055 +#: merge-recursive.c:1544
5056 msgid "renamed"
5057 msgstr "重命名"
5058
5041 -#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
5059 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
5060 #, c-format
5061 msgid "Refusing to lose dirty file at %s"
5062 msgstr "拒绝丢失脏文件 '%s'"
5063
5046 -#: merge-recursive.c:1609
5064 +#: merge-recursive.c:1605
5065 #, c-format
5066 msgid "Refusing to lose untracked file at %s, even though it's in the way."
5067 msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
5068
5051 -#: merge-recursive.c:1667
5069 +#: merge-recursive.c:1663
5070 #, c-format
5071 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
5072 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
5073
5056 -#: merge-recursive.c:1698
5074 +#: merge-recursive.c:1694
5075 #, c-format
5076 msgid "%s is a directory in %s adding as %s instead"
5077 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
5078
5061 -#: merge-recursive.c:1703
5079 +#: merge-recursive.c:1699
5080 #, c-format
5081 msgid "Refusing to lose untracked file at %s; adding as %s instead"
5082 msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"
5083
5066 -#: merge-recursive.c:1730
5084 +#: merge-recursive.c:1726
5085 #, c-format
5086 msgid ""
5087 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5072,18 +5090,18 @@ msgstr ""
5090 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
5091 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
5092
5075 -#: merge-recursive.c:1735
5093 +#: merge-recursive.c:1731
5094 msgid " (left unresolved)"
5095 msgstr "（留下未解决）"
5096
5079 -#: merge-recursive.c:1827
5097 +#: merge-recursive.c:1823
5098 #, c-format
5099 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5100 msgstr ""
5101 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
5102 "%5$s"
5103
5086 -#: merge-recursive.c:2090
5104 +#: merge-recursive.c:2086
5105 #, c-format
5106 msgid ""
5107 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5093,7 +5111,7 @@ msgstr ""
5111 "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
5112 "其它目录，没有目录包含大部分文件。"
5113
5096 -#: merge-recursive.c:2224
5114 +#: merge-recursive.c:2220
5115 #, c-format
5116 msgid ""
5117 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5102,78 +5120,78 @@ msgstr ""
5120 "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
5121 "%4$s->%5$s"
5122
5105 -#: merge-recursive.c:3069
5123 +#: merge-recursive.c:3075
5124 msgid "modify"
5125 msgstr "修改"
5126
5109 -#: merge-recursive.c:3069
5127 +#: merge-recursive.c:3075
5128 msgid "modified"
5129 msgstr "修改"
5130
5113 -#: merge-recursive.c:3108
5131 +#: merge-recursive.c:3114
5132 #, c-format
5133 msgid "Skipped %s (merged same as existing)"
5134 msgstr "略过 %s（已经做过相同合并）"
5135
5118 -#: merge-recursive.c:3161
5136 +#: merge-recursive.c:3167
5137 #, c-format
5138 msgid "Adding as %s instead"
5139 msgstr "而是以 %s 为名添加"
5140
5123 -#: merge-recursive.c:3368
5141 +#: merge-recursive.c:3371
5142 #, c-format
5143 msgid "Removing %s"
5144 msgstr "删除 %s"
5145
5128 -#: merge-recursive.c:3391
5146 +#: merge-recursive.c:3394
5147 msgid "file/directory"
5148 msgstr "文件/目录"
5149
5132 -#: merge-recursive.c:3396
5150 +#: merge-recursive.c:3399
5151 msgid "directory/file"
5152 msgstr "目录/文件"
5153
5136 -#: merge-recursive.c:3403
5154 +#: merge-recursive.c:3406
5155 #, c-format
5156 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
5157 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
5158
5141 -#: merge-recursive.c:3412
5159 +#: merge-recursive.c:3415
5160 #, c-format
5161 msgid "Adding %s"
5162 msgstr "添加 %s"
5163
5146 -#: merge-recursive.c:3421
5164 +#: merge-recursive.c:3424
5165 #, c-format
5166 msgid "CONFLICT (add/add): Merge conflict in %s"
5167 msgstr "冲突（add/add）：合并冲突于 %s"
5168
5151 -#: merge-recursive.c:3474
5169 +#: merge-recursive.c:3477
5170 #, c-format
5171 msgid "merging of trees %s and %s failed"
5172 msgstr "无法合并树 %s 和 %s"
5173
5156 -#: merge-recursive.c:3568
5174 +#: merge-recursive.c:3571
5175 msgid "Merging:"
5176 msgstr "合并："
5177
5160 -#: merge-recursive.c:3581
5178 +#: merge-recursive.c:3584
5179 #, c-format
5180 msgid "found %u common ancestor:"
5181 msgid_plural "found %u common ancestors:"
5182 msgstr[0] "发现 %u 个共同祖先："
5183 msgstr[1] "发现 %u 个共同祖先："
5184
5167 -#: merge-recursive.c:3631
5185 +#: merge-recursive.c:3634
5186 msgid "merge returned no commit"
5187 msgstr "合并未返回提交"
5188
5171 -#: merge-recursive.c:3796
5189 +#: merge-recursive.c:3799
5190 #, c-format
5191 msgid "Could not parse object '%s'"
5192 msgstr "不能解析对象 '%s'"
5193
5176 -#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
5194 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
5195 #: builtin/stash.c:473
5196 msgid "Unable to write index."
5197 msgstr "不能写入索引。"
@@ -5182,8 +5200,8 @@ msgstr "不能写入索引。"
5200 msgid "failed to read the cache"
5201 msgstr "读取缓存失败"
5202
5185 -#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
5186 -#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
5203 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
5204 +#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
5205 #: builtin/stash.c:267
5206 msgid "unable to write new index file"
5207 msgstr "无法写新的索引文件"
@@ -5257,106 +5275,114 @@ msgstr "打开包索引 '%s' 失败"
5275 msgid "failed to locate object %d in packfile"
5276 msgstr "在包文件中定位对象 %d 失败"
5277
5260 -#: midx.c:880 builtin/index-pack.c:1535
5278 +#: midx.c:880 builtin/index-pack.c:1533
5279 msgid "cannot store reverse index file"
5280 msgstr "无法存储反向索引文件"
5281
5264 -#: midx.c:933
5282 +#: midx.c:920
5283 +msgid "ignoring existing multi-pack-index; checksum mismatch"
5284 +msgstr "忽略已存在的多包索引，校验码不匹配"
5285 +
5286 +#: midx.c:943
5287 msgid "Adding packfiles to multi-pack-index"
5288 msgstr "添加包文件到多包索引"
5289
5268 -#: midx.c:979
5290 +#: midx.c:989
5291 #, c-format
5292 msgid "did not see pack-file %s to drop"
5293 msgstr "没有看到要丢弃的包文件 %s"
5294
5273 -#: midx.c:1024
5295 +#: midx.c:1034
5296 #, c-format
5297 msgid "unknown preferred pack: '%s'"
5298 msgstr "未知的首选包：'%s'"
5299
5278 -#: midx.c:1029
5300 +#: midx.c:1039
5301 #, c-format
5302 msgid "preferred pack '%s' is expired"
5303 msgstr "首选包 '%s' 已过期"
5304
5283 -#: midx.c:1045
5305 +#: midx.c:1055
5306 msgid "no pack files to index."
5307 msgstr "没有要索引的包文件。"
5308
5287 -#: midx.c:1125 builtin/clean.c:37
5309 +#: midx.c:1135 builtin/clean.c:37
5310 #, c-format
5311 msgid "failed to remove %s"
5312 msgstr "删除 %s 失败"
5313
5292 -#: midx.c:1156
5314 +#: midx.c:1166
5315 #, c-format
5316 msgid "failed to clear multi-pack-index at %s"
5317 msgstr "清理位于 %s 的多包索引失败"
5318
5297 -#: midx.c:1214
5319 +#: midx.c:1225
5320 msgid "multi-pack-index file exists, but failed to parse"
5321 msgstr "多包索引文件存在，但无法解析"
5322
5301 -#: midx.c:1222
5323 +#: midx.c:1233
5324 +msgid "incorrect checksum"
5325 +msgstr "不正确的校验码"
5326 +
5327 +#: midx.c:1236
5328 msgid "Looking for referenced packfiles"
5329 msgstr "正在查找引用的包文件"
5330
5305 -#: midx.c:1237
5331 +#: midx.c:1251
5332 #, c-format
5333 msgid ""
5334 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5335 msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5336
5311 -#: midx.c:1242
5337 +#: midx.c:1256
5338 msgid "the midx contains no oid"
5339 msgstr "midx 不包含 oid"
5340
5315 -#: midx.c:1251
5341 +#: midx.c:1265
5342 msgid "Verifying OID order in multi-pack-index"
5343 msgstr "校验多包索引中的 OID 顺序"
5344
5319 -#: midx.c:1260
5345 +#: midx.c:1274
5346 #, c-format
5347 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
5348 msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
5349
5324 -#: midx.c:1280
5350 +#: midx.c:1294
5351 msgid "Sorting objects by packfile"
5352 msgstr "通过包文件为对象排序"
5353
5328 -#: midx.c:1287
5354 +#: midx.c:1301
5355 msgid "Verifying object offsets"
5356 msgstr "校验对象偏移"
5357
5332 -#: midx.c:1303
5358 +#: midx.c:1317
5359 #, c-format
5360 msgid "failed to load pack entry for oid[%d] = %s"
5361 msgstr "为 oid[%d] = %s 加载包条目失败"
5362
5337 -#: midx.c:1309
5363 +#: midx.c:1323
5364 #, c-format
5365 msgid "failed to load pack-index for packfile %s"
5366 msgstr "为包文件 %s 加载包索引失败"
5367
5342 -#: midx.c:1318
5368 +#: midx.c:1332
5369 #, c-format
5370 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
5371 msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
5372
5347 -#: midx.c:1343
5373 +#: midx.c:1357
5374 msgid "Counting referenced objects"
5375 msgstr "正在对引用对象计数"
5376
5351 -#: midx.c:1353
5377 +#: midx.c:1367
5378 msgid "Finding and deleting unreferenced packfiles"
5379 msgstr "正在查找和删除未引用的包文件"
5380
5355 -#: midx.c:1544
5381 +#: midx.c:1558
5382 msgid "could not start pack-objects"
5383 msgstr "不能开始 pack-objects"
5384
5359 -#: midx.c:1564
5385 +#: midx.c:1578
5386 msgid "could not finish pack-objects"
5387 msgstr "不能结束 pack-objects"
5388
@@ -5419,265 +5445,266 @@ msgstr "坏的 %s 值：'%s'"
5445 msgid "object directory %s does not exist; check .git/objects/info/alternates"
5446 msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
5447
5422 -#: object-file.c:577
5448 +#: object-file.c:584
5449 #, c-format
5450 msgid "unable to normalize alternate object path: %s"
5451 msgstr "无法规范化备用对象路径：%s"
5452
5427 -#: object-file.c:649
5453 +#: object-file.c:658
5454 #, c-format
5455 msgid "%s: ignoring alternate object stores, nesting too deep"
5456 msgstr "%s：忽略备用对象库，嵌套太深"
5457
5432 -#: object-file.c:656
5458 +#: object-file.c:665
5459 #, c-format
5460 msgid "unable to normalize object directory: %s"
5461 msgstr "无法规范化对象目录: %s"
5462
5437 -#: object-file.c:699
5463 +#: object-file.c:708
5464 msgid "unable to fdopen alternates lockfile"
5465 msgstr "无法 fdopen 替换锁文件"
5466
5441 -#: object-file.c:717
5467 +#: object-file.c:726
5468 msgid "unable to read alternates file"
5469 msgstr "无法读取替代文件"
5470
5445 -#: object-file.c:724
5471 +#: object-file.c:733
5472 msgid "unable to move new alternates file into place"
5473 msgstr "无法将新的替代文件移动到位"
5474
5449 -#: object-file.c:759
5475 +#: object-file.c:768
5476 #, c-format
5477 msgid "path '%s' does not exist"
5478 msgstr "路径 '%s' 不存在"
5479
5454 -#: object-file.c:780
5480 +#: object-file.c:789
5481 #, c-format
5482 msgid "reference repository '%s' as a linked checkout is not supported yet."
5483 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
5484
5459 -#: object-file.c:786
5485 +#: object-file.c:795
5486 #, c-format
5487 msgid "reference repository '%s' is not a local repository."
5488 msgstr "参考仓库 '%s' 不是一个本地仓库。"
5489
5464 -#: object-file.c:792
5490 +#: object-file.c:801
5491 #, c-format
5492 msgid "reference repository '%s' is shallow"
5493 msgstr "参考仓库 '%s' 是一个浅克隆"
5494
5469 -#: object-file.c:800
5495 +#: object-file.c:809
5496 #, c-format
5497 msgid "reference repository '%s' is grafted"
5498 msgstr "参考仓库 '%s' 已被移植"
5499
5474 -#: object-file.c:860
5500 +#: object-file.c:869
5501 #, c-format
5502 msgid "invalid line while parsing alternate refs: %s"
5503 msgstr "解析备用引用时无效的行：%s"
5504
5479 -#: object-file.c:1010
5505 +#: object-file.c:1019
5506 #, c-format
5507 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
5508 msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
5509
5484 -#: object-file.c:1031
5485 -msgid "mmap failed"
5486 -msgstr "mmap 失败"
5510 +#: object-file.c:1054
5511 +#, c-format
5512 +msgid "mmap failed%s"
5513 +msgstr "mmap 失败%s"
5514
5488 -#: object-file.c:1195
5515 +#: object-file.c:1218
5516 #, c-format
5517 msgid "object file %s is empty"
5518 msgstr "对象文件 %s 为空"
5519
5493 -#: object-file.c:1330 object-file.c:2524
5520 +#: object-file.c:1353 object-file.c:2548
5521 #, c-format
5522 msgid "corrupt loose object '%s'"
5523 msgstr "损坏的松散对象 '%s'"
5524
5498 -#: object-file.c:1332 object-file.c:2528
5525 +#: object-file.c:1355 object-file.c:2552
5526 #, c-format
5527 msgid "garbage at end of loose object '%s'"
5528 msgstr "松散对象 '%s' 后面有垃圾数据"
5529
5503 -#: object-file.c:1374
5530 +#: object-file.c:1397
5531 msgid "invalid object type"
5532 msgstr "无效的对象类型"
5533
5507 -#: object-file.c:1458
5534 +#: object-file.c:1481
5535 #, c-format
5536 msgid "unable to unpack %s header with --allow-unknown-type"
5537 msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
5538
5512 -#: object-file.c:1461
5539 +#: object-file.c:1484
5540 #, c-format
5541 msgid "unable to unpack %s header"
5542 msgstr "无法解开 %s 头部"
5543
5517 -#: object-file.c:1467
5544 +#: object-file.c:1490
5545 #, c-format
5546 msgid "unable to parse %s header with --allow-unknown-type"
5547 msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
5548
5522 -#: object-file.c:1470
5549 +#: object-file.c:1493
5550 #, c-format
5551 msgid "unable to parse %s header"
5552 msgstr "无法解析 %s 头部"
5553
5527 -#: object-file.c:1697
5554 +#: object-file.c:1717
5555 #, c-format
5556 msgid "failed to read object %s"
5557 msgstr "读取对象 %s 失败"
5558
5532 -#: object-file.c:1701
5559 +#: object-file.c:1721
5560 #, c-format
5561 msgid "replacement %s not found for %s"
5562 msgstr "找不到 %2$s 的替代 %1$s"
5563
5537 -#: object-file.c:1705
5564 +#: object-file.c:1725
5565 #, c-format
5566 msgid "loose object %s (stored in %s) is corrupt"
5567 msgstr "松散对象 %s（保存在 %s）已损坏"
5568
5542 -#: object-file.c:1709
5569 +#: object-file.c:1729
5570 #, c-format
5571 msgid "packed object %s (stored in %s) is corrupt"
5572 msgstr "打包对象 %s（保存在 %s）已损坏"
5573
5547 -#: object-file.c:1814
5574 +#: object-file.c:1834
5575 #, c-format
5576 msgid "unable to write file %s"
5577 msgstr "无法写文件 %s"
5578
5552 -#: object-file.c:1821
5579 +#: object-file.c:1841
5580 #, c-format
5581 msgid "unable to set permission to '%s'"
5582 msgstr "无法为 '%s' 设置权限"
5583
5557 -#: object-file.c:1828
5584 +#: object-file.c:1848
5585 msgid "file write error"
5586 msgstr "文件写错误"
5587
5561 -#: object-file.c:1848
5588 +#: object-file.c:1868
5589 msgid "error when closing loose object file"
5590 msgstr "关闭松散对象文件时出错"
5591
5565 -#: object-file.c:1913
5592 +#: object-file.c:1933
5593 #, c-format
5594 msgid "insufficient permission for adding an object to repository database %s"
5595 msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
5596
5570 -#: object-file.c:1915
5597 +#: object-file.c:1935
5598 msgid "unable to create temporary file"
5599 msgstr "无法创建临时文件"
5600
5574 -#: object-file.c:1939
5601 +#: object-file.c:1959
5602 msgid "unable to write loose object file"
5603 msgstr "不能写松散对象文件"
5604
5578 -#: object-file.c:1945
5605 +#: object-file.c:1965
5606 #, c-format
5607 msgid "unable to deflate new object %s (%d)"
5608 msgstr "不能压缩新对象 %s（%d）"
5609
5583 -#: object-file.c:1949
5610 +#: object-file.c:1969
5611 #, c-format
5612 msgid "deflateEnd on object %s failed (%d)"
5613 msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
5614
5588 -#: object-file.c:1953
5615 +#: object-file.c:1973
5616 #, c-format
5617 msgid "confused by unstable object source data for %s"
5618 msgstr "被 %s 的不稳定对象源数据搞糊涂了"
5619
5593 -#: object-file.c:1963 builtin/pack-objects.c:1097
5620 +#: object-file.c:1983 builtin/pack-objects.c:1237
5621 #, c-format
5622 msgid "failed utime() on %s"
5623 msgstr "在 %s 上调用 utime() 失败"
5624
5598 -#: object-file.c:2040
5625 +#: object-file.c:2060
5626 #, c-format
5627 msgid "cannot read object for %s"
5628 msgstr "不能读取对象 %s"
5629
5603 -#: object-file.c:2091
5630 +#: object-file.c:2111
5631 msgid "corrupt commit"
5632 msgstr "损坏的提交"
5633
5607 -#: object-file.c:2099
5634 +#: object-file.c:2119
5635 msgid "corrupt tag"
5636 msgstr "损坏的标签"
5637
5611 -#: object-file.c:2199
5638 +#: object-file.c:2219
5639 #, c-format
5640 msgid "read error while indexing %s"
5641 msgstr "索引 %s 时读取错误"
5642
5616 -#: object-file.c:2202
5643 +#: object-file.c:2222
5644 #, c-format
5645 msgid "short read while indexing %s"
5646 msgstr "索引 %s 时读入不完整"
5647
5621 -#: object-file.c:2275 object-file.c:2285
5648 +#: object-file.c:2295 object-file.c:2305
5649 #, c-format
5650 msgid "%s: failed to insert into database"
5651 msgstr "%s：插入数据库失败"
5652
5626 -#: object-file.c:2291
5653 +#: object-file.c:2311
5654 #, c-format
5655 msgid "%s: unsupported file type"
5656 msgstr "%s：不支持的文件类型"
5657
5631 -#: object-file.c:2315
5658 +#: object-file.c:2335
5659 #, c-format
5660 msgid "%s is not a valid object"
5661 msgstr "%s 不是一个有效的对象"
5662
5636 -#: object-file.c:2317
5663 +#: object-file.c:2337
5664 #, c-format
5665 msgid "%s is not a valid '%s' object"
5666 msgstr "%s 不是一个有效的 '%s' 对象"
5667
5641 -#: object-file.c:2344 builtin/index-pack.c:192
5668 +#: object-file.c:2364 builtin/index-pack.c:192
5669 #, c-format
5670 msgid "unable to open %s"
5671 msgstr "不能打开 %s"
5672
5646 -#: object-file.c:2535 object-file.c:2588
5673 +#: object-file.c:2559 object-file.c:2612
5674 #, c-format
5675 msgid "hash mismatch for %s (expected %s)"
5676 msgstr "%s 的哈希值不匹配（预期 %s）"
5677
5651 -#: object-file.c:2559
5678 +#: object-file.c:2583
5679 #, c-format
5680 msgid "unable to mmap %s"
5681 msgstr "不能 mmap %s"
5682
5656 -#: object-file.c:2564
5683 +#: object-file.c:2588
5684 #, c-format
5685 msgid "unable to unpack header of %s"
5686 msgstr "无法解压缩 %s 的头部"
5687
5661 -#: object-file.c:2570
5688 +#: object-file.c:2594
5689 #, c-format
5690 msgid "unable to parse header of %s"
5691 msgstr "无法解析 %s 的头部"
5692
5666 -#: object-file.c:2581
5693 +#: object-file.c:2605
5694 #, c-format
5695 msgid "unable to unpack contents of %s"
5696 msgstr "无法解压缩 %s 的内容"
5697
5671 -#: object-name.c:486
5698 +#: object-name.c:480
5699 #, c-format
5700 msgid "short object ID %s is ambiguous"
5701 msgstr "短对象ID %s 存在歧义"
5702
5676 -#: object-name.c:497
5703 +#: object-name.c:491
5704 msgid "The candidates are:"
5705 msgstr "候选者有："
5706
5680 -#: object-name.c:796
5707 +#: object-name.c:790
5708 msgid ""
5709 "Git normally never creates a ref that ends with 40 hex characters\n"
5710 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5698,22 +5725,22 @@ msgstr ""
5725 "引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
5726 "false\" 命令关闭本消息通知。"
5727
5701 -#: object-name.c:916
5728 +#: object-name.c:910
5729 #, c-format
5730 msgid "log for '%.*s' only goes back to %s"
5731 msgstr "'%.*s' 的日志仅能回到 %s"
5732
5706 -#: object-name.c:924
5733 +#: object-name.c:918
5734 #, c-format
5735 msgid "log for '%.*s' only has %d entries"
5736 msgstr "'%.*s' 的日志仅有 %d 个条目"
5737
5711 -#: object-name.c:1702
5738 +#: object-name.c:1696
5739 #, c-format
5740 msgid "path '%s' exists on disk, but not in '%.*s'"
5741 msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中"
5742
5716 -#: object-name.c:1708
5743 +#: object-name.c:1702
5744 #, c-format
5745 msgid ""
5746 "path '%s' exists, but not '%s'\n"
@@ -5722,12 +5749,12 @@ msgstr ""
5749 "路径 '%s' 存在，而 '%s' 不存在\n"
5750 "提示：您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'？"
5751
5725 -#: object-name.c:1717
5752 +#: object-name.c:1711
5753 #, c-format
5754 msgid "path '%s' does not exist in '%.*s'"
5755 msgstr "路径 '%s' 不在 '%.*s' 中"
5756
5730 -#: object-name.c:1745
5757 +#: object-name.c:1739
5758 #, c-format
5759 msgid ""
5760 "path '%s' is in the index, but not at stage %d\n"
@@ -5736,7 +5763,7 @@ msgstr ""
5763 "路径 '%s' 在索引中，但不在暂存区 %d 中\n"
5764 "提示：您的意思是 ':%d:%s'？"
5765
5739 -#: object-name.c:1761
5766 +#: object-name.c:1755
5767 #, c-format
5768 msgid ""
5769 "path '%s' is in the index, but not '%s'\n"
@@ -5745,21 +5772,21 @@ msgstr ""
5772 "路径 '%s' 在索引中，但 '%s' 不在\n"
5773 "提示：您的意思是 ':%d:%s' 亦即 ':%d:./%s'？"
5774
5748 -#: object-name.c:1769
5775 +#: object-name.c:1763
5776 #, c-format
5777 msgid "path '%s' exists on disk, but not in the index"
5778 msgstr "路径 '%s' 在磁盘上，但不在索引里"
5779
5753 -#: object-name.c:1771
5780 +#: object-name.c:1765
5781 #, c-format
5782 msgid "path '%s' does not exist (neither on disk nor in the index)"
5783 msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）"
5784
5758 -#: object-name.c:1784
5785 +#: object-name.c:1778
5786 msgid "relative path syntax can't be used outside working tree"
5787 msgstr "不能在工作区之外使用相对路径语法"
5788
5762 -#: object-name.c:1922
5789 +#: object-name.c:1916
5790 #, c-format
5791 msgid "invalid object name '%.*s'."
5792 msgstr "无效的对象名 '%.*s'。"
@@ -5774,27 +5801,27 @@ msgstr "无效的对象类型 \"%s\""
5801 msgid "object %s is a %s, not a %s"
5802 msgstr "对象 %s 是一个 %s，不是一个 %s"
5803
5777 -#: object.c:232
5804 +#: object.c:250
5805 #, c-format
5806 msgid "object %s has unknown type id %d"
5807 msgstr "对象 %s 有未知的类型 id %d"
5808
5782 -#: object.c:245
5809 +#: object.c:263
5810 #, c-format
5811 msgid "unable to parse object: %s"
5812 msgstr "不能解析对象：%s"
5813
5787 -#: object.c:265 object.c:277
5814 +#: object.c:283 object.c:295
5815 #, c-format
5816 msgid "hash mismatch %s"
5817 msgstr "哈希值与 %s 不匹配"
5818
5792 -#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
5819 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
5820 #, c-format
5821 msgid "unable to get size of %s"
5822 msgstr "无法得到 %s 的大小"
5823
5797 -#: pack-bitmap.c:1547 builtin/rev-list.c:92
5824 +#: pack-bitmap.c:1571 builtin/rev-list.c:92
5825 #, c-format
5826 msgid "unable to get disk usage of %s"
5827 msgstr "无法得到 %s 的磁盘使用量"
@@ -5847,12 +5874,17 @@ msgstr "无法写入 '%s' 承诺者文件"
5874 msgid "offset before end of packfile (broken .idx?)"
5875 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
5876
5850 -#: packfile.c:1937
5877 +#: packfile.c:655
5878 +#, c-format
5879 +msgid "packfile %s cannot be mapped%s"
5880 +msgstr "包文件 %s 不能被映射%s"
5881 +
5882 +#: packfile.c:1934
5883 #, c-format
5884 msgid "offset before start of pack index for %s (corrupt index?)"
5885 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
5886
5855 -#: packfile.c:1941
5887 +#: packfile.c:1938
5888 #, c-format
5889 msgid "offset beyond end of pack index for %s (truncated index?)"
5890 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
@@ -6054,8 +6086,8 @@ msgid "unable to write delim packet"
6086 msgstr "无法写 delim 包"
6087
6088 #: pkt-line.c:106
6057 -msgid "unable to write stateless separator packet"
6058 -msgstr "无法写入无状态分隔符数据包"
6089 +msgid "unable to write response end packet"
6090 +msgstr "无法写入响应结束数据包"
6091
6092 #: pkt-line.c:113
6093 msgid "flush packet write failed"
@@ -6114,19 +6146,19 @@ msgstr "无法创建线程 lstat：%s"
6146 msgid "unable to parse --pretty format"
6147 msgstr "不能解析 --pretty 格式"
6148
6117 -#: promisor-remote.c:30
6149 +#: promisor-remote.c:31
6150 msgid "promisor-remote: unable to fork off fetch subprocess"
6151 msgstr "promisor-remote：无法派生 fetch 子进程"
6152
6121 -#: promisor-remote.c:35 promisor-remote.c:37
6153 +#: promisor-remote.c:38 promisor-remote.c:40
6154 msgid "promisor-remote: could not write to fetch subprocess"
6155 msgstr "promisor-remote：无法向 fetch 子进程写入"
6156
6125 -#: promisor-remote.c:41
6157 +#: promisor-remote.c:44
6158 msgid "promisor-remote: could not close stdin to fetch subprocess"
6159 msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入"
6160
6129 -#: promisor-remote.c:53
6161 +#: promisor-remote.c:54
6162 #, c-format
6163 msgid "promisor remote name cannot begin with '/': %s"
6164 msgstr "promisor 远程名称不能以 '/' 开始：%s"
@@ -6147,7 +6179,7 @@ msgstr "不能启动 `log`"
6179 msgid "could not read `log` output"
6180 msgstr "不能读取 `log` 的输出"
6181
6150 -#: range-diff.c:101 sequencer.c:5551
6182 +#: range-diff.c:101 sequencer.c:5550
6183 #, c-format
6184 msgid "could not parse commit '%s'"
6185 msgstr "不能解析提交 '%s'"
@@ -6164,63 +6196,63 @@ msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'"
6196 msgid "could not parse git header '%.*s'"
6197 msgstr "无法解析 git 头 '%.*s'"
6198
6167 -#: range-diff.c:306
6199 +#: range-diff.c:307
6200 msgid "failed to generate diff"
6201 msgstr "生成 diff 失败"
6202
6171 -#: range-diff.c:558
6203 +#: range-diff.c:559
6204 msgid "--left-only and --right-only are mutually exclusive"
6205 msgstr "--left-only 和 --right-only 互斥"
6206
6175 -#: range-diff.c:561 range-diff.c:563
6207 +#: range-diff.c:562 range-diff.c:564
6208 #, c-format
6209 msgid "could not parse log for '%s'"
6210 msgstr "不能解析 '%s' 的日志"
6211
6180 -#: read-cache.c:708
6212 +#: read-cache.c:710
6213 #, c-format
6214 msgid "will not add file alias '%s' ('%s' already exists in index)"
6215 msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）"
6216
6185 -#: read-cache.c:724
6217 +#: read-cache.c:726
6218 msgid "cannot create an empty blob in the object database"
6219 msgstr "不能在对象数据库中创建空的数据对象"
6220
6189 -#: read-cache.c:746
6221 +#: read-cache.c:748
6222 #, c-format
6223 msgid "%s: can only add regular files, symbolic links or git-directories"
6224 msgstr "%s：只能添加常规文件、符号链接或 git 目录"
6225
6194 -#: read-cache.c:751
6226 +#: read-cache.c:753
6227 #, c-format
6228 msgid "'%s' does not have a commit checked out"
6229 msgstr "'%s' 没有检出一个提交"
6230
6199 -#: read-cache.c:803
6231 +#: read-cache.c:805
6232 #, c-format
6233 msgid "unable to index file '%s'"
6234 msgstr "无法索引文件 '%s'"
6235
6204 -#: read-cache.c:822
6236 +#: read-cache.c:824
6237 #, c-format
6238 msgid "unable to add '%s' to index"
6239 msgstr "无法在索引中添加 '%s'"
6240
6209 -#: read-cache.c:833
6241 +#: read-cache.c:835
6242 #, c-format
6243 msgid "unable to stat '%s'"
6244 msgstr "无法对 %s 执行 stat"
6245
6214 -#: read-cache.c:1356
6246 +#: read-cache.c:1358
6247 #, c-format
6248 msgid "'%s' appears as both a file and as a directory"
6249 msgstr "'%s' 看起来既是文件又是目录"
6250
6219 -#: read-cache.c:1571
6251 +#: read-cache.c:1573
6252 msgid "Refresh index"
6253 msgstr "刷新索引"
6254
6223 -#: read-cache.c:1700
6255 +#: read-cache.c:1705
6256 #, c-format
6257 msgid ""
6258 "index.version set, but the value is invalid.\n"
@@ -6229,7 +6261,7 @@ msgstr ""
6261 "设置了 index.version，但是取值无效。\n"
6262 "使用版本 %i"
6263
6232 -#: read-cache.c:1710
6264 +#: read-cache.c:1715
6265 #, c-format
6266 msgid ""
6267 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6238,144 +6270,144 @@ msgstr ""
6270 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"
6271 "使用版本 %i"
6272
6241 -#: read-cache.c:1766
6273 +#: read-cache.c:1771
6274 #, c-format
6275 msgid "bad signature 0x%08x"
6276 msgstr "坏的签名 0x%08x"
6277
6246 -#: read-cache.c:1769
6278 +#: read-cache.c:1774
6279 #, c-format
6280 msgid "bad index version %d"
6281 msgstr "坏的索引版本 %d"
6282
6251 -#: read-cache.c:1778
6283 +#: read-cache.c:1783
6284 msgid "bad index file sha1 signature"
6285 msgstr "坏的索引文件 sha1 签名"
6286
6255 -#: read-cache.c:1812
6287 +#: read-cache.c:1817
6288 #, c-format
6289 msgid "index uses %.4s extension, which we do not understand"
6290 msgstr "索引使用不被支持的 %.4s 扩展"
6291
6292 #
6261 -#: read-cache.c:1814
6293 +#: read-cache.c:1819
6294 #, c-format
6295 msgid "ignoring %.4s extension"
6296 msgstr "忽略 %.4s 扩展"
6297
6266 -#: read-cache.c:1851
6298 +#: read-cache.c:1856
6299 #, c-format
6300 msgid "unknown index entry format 0x%08x"
6301 msgstr "未知的索引条目格式 0x%08x"
6302
6271 -#: read-cache.c:1867
6303 +#: read-cache.c:1872
6304 #, c-format
6305 msgid "malformed name field in the index, near path '%s'"
6306 msgstr "索引中靠近路径 '%s' 有错误的名称字段"
6307
6276 -#: read-cache.c:1924
6308 +#: read-cache.c:1929
6309 msgid "unordered stage entries in index"
6310 msgstr "索引中有未排序的暂存条目"
6311
6280 -#: read-cache.c:1927
6312 +#: read-cache.c:1932
6313 #, c-format
6314 msgid "multiple stage entries for merged file '%s'"
6315 msgstr "合并文件 '%s' 有多个暂存条目"
6316
6285 -#: read-cache.c:1930
6317 +#: read-cache.c:1935
6318 #, c-format
6319 msgid "unordered stage entries for '%s'"
6320 msgstr "'%s' 的未排序暂存条目"
6321
6290 -#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
6291 -#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
6292 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
6322 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
6323 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
6324 +#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
6325 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
6326 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
6295 -#: builtin/submodule--helper.c:332
6327 +#: builtin/submodule--helper.c:333
6328 msgid "index file corrupt"
6329 msgstr "索引文件损坏"
6330
6299 -#: read-cache.c:2180
6331 +#: read-cache.c:2185
6332 #, c-format
6333 msgid "unable to create load_cache_entries thread: %s"
6334 msgstr "无法创建 load_cache_entries 线程：%s"
6335
6304 -#: read-cache.c:2193
6336 +#: read-cache.c:2198
6337 #, c-format
6338 msgid "unable to join load_cache_entries thread: %s"
6339 msgstr "无法加入 load_cache_entries 线程：%s"
6340
6309 -#: read-cache.c:2226
6341 +#: read-cache.c:2231
6342 #, c-format
6343 msgid "%s: index file open failed"
6344 msgstr "%s：打开索引文件失败"
6345
6314 -#: read-cache.c:2230
6346 +#: read-cache.c:2235
6347 #, c-format
6348 msgid "%s: cannot stat the open index"
6349 msgstr "%s：不能对打开的索引执行 stat 操作"
6350
6319 -#: read-cache.c:2234
6351 +#: read-cache.c:2239
6352 #, c-format
6353 msgid "%s: index file smaller than expected"
6354 msgstr "%s：索引文件比预期的小"
6355
6324 -#: read-cache.c:2238
6356 +#: read-cache.c:2243
6357 #, c-format
6326 -msgid "%s: unable to map index file"
6327 -msgstr "%s：无法对索引文件执行 map 操作"
6358 +msgid "%s: unable to map index file%s"
6359 +msgstr "%s：无法映射索引文件%s"
6360
6329 -#: read-cache.c:2280
6361 +#: read-cache.c:2286
6362 #, c-format
6363 msgid "unable to create load_index_extensions thread: %s"
6364 msgstr "无法创建 load_index_extensions 线程：%s"
6365
6334 -#: read-cache.c:2307
6366 +#: read-cache.c:2313
6367 #, c-format
6368 msgid "unable to join load_index_extensions thread: %s"
6369 msgstr "无法加入 load_index_extensions 线程：%s"
6370
6339 -#: read-cache.c:2345
6371 +#: read-cache.c:2351
6372 #, c-format
6373 msgid "could not freshen shared index '%s'"
6374 msgstr "无法刷新共享索引 '%s'"
6375
6344 -#: read-cache.c:2392
6376 +#: read-cache.c:2398
6377 #, c-format
6378 msgid "broken index, expect %s in %s, got %s"
6379 msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
6380
6349 -#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
6381 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
6382 #, c-format
6383 msgid "could not close '%s'"
6384 msgstr "不能关闭 '%s'"
6385
6354 -#: read-cache.c:3138
6386 +#: read-cache.c:3075
6387 msgid "failed to convert to a sparse-index"
6388 msgstr "无法转换为稀疏索引"
6389
6358 -#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
6390 +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
6391 #, c-format
6392 msgid "could not stat '%s'"
6393 msgstr "不能对 '%s' 调用 stat"
6394
6363 -#: read-cache.c:3222
6395 +#: read-cache.c:3159
6396 #, c-format
6397 msgid "unable to open git dir: %s"
6398 msgstr "不能打开 git 目录：%s"
6399
6368 -#: read-cache.c:3234
6400 +#: read-cache.c:3171
6401 #, c-format
6402 msgid "unable to unlink: %s"
6403 msgstr "无法删除：%s"
6404
6373 -#: read-cache.c:3263
6405 +#: read-cache.c:3200
6406 #, c-format
6407 msgid "cannot fix permission bits on '%s'"
6408 msgstr "不能修复 '%s' 的权限位"
6409
6378 -#: read-cache.c:3412
6410 +#: read-cache.c:3349
6411 #, c-format
6412 msgid "%s: cannot drop to stage #0"
6413 msgstr "%s：不能落到暂存区 #0"
@@ -6488,8 +6520,8 @@ msgstr ""
6520 "然而，如果您删除全部内容，变基操作将会终止。\n"
6521 "\n"
6522
6491 -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816
6492 -#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
6523 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
6524 +#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
6525 #, c-format
6526 msgid "could not write '%s'"
6527 msgstr "不能写入 '%s'"
@@ -6532,7 +6564,7 @@ msgstr ""
6564 msgid "could not read '%s'."
6565 msgstr "不能读取 '%s'。"
6566
6535 -#: ref-filter.c:42 wt-status.c:1978
6567 +#: ref-filter.c:42 wt-status.c:2036
6568 msgid "gone"
6569 msgstr "丢失"
6570
@@ -6551,247 +6583,247 @@ msgstr "落后 %d"
6583 msgid "ahead %d, behind %d"
6584 msgstr "领先 %d，落后 %d"
6585
6554 -#: ref-filter.c:175
6586 +#: ref-filter.c:230
6587 #, c-format
6588 msgid "expected format: %%(color:<color>)"
6589 msgstr "期望的格式：%%(color:<颜色>)"
6590
6559 -#: ref-filter.c:177
6591 +#: ref-filter.c:232
6592 #, c-format
6593 msgid "unrecognized color: %%(color:%s)"
6594 msgstr "未能识别的颜色：%%(color:%s)"
6595
6564 -#: ref-filter.c:199
6596 +#: ref-filter.c:254
6597 #, c-format
6598 msgid "Integer value expected refname:lstrip=%s"
6599 msgstr "期望整数值 refname:lstrip=%s"
6600
6569 -#: ref-filter.c:203
6601 +#: ref-filter.c:258
6602 #, c-format
6603 msgid "Integer value expected refname:rstrip=%s"
6604 msgstr "期望整数值 refname:rstrip=%s"
6605
6574 -#: ref-filter.c:205
6606 +#: ref-filter.c:260
6607 #, c-format
6608 msgid "unrecognized %%(%s) argument: %s"
6609 msgstr "未能识别的 %%(%s) 参数：%s"
6610
6579 -#: ref-filter.c:260
6611 +#: ref-filter.c:315
6612 #, c-format
6613 msgid "%%(objecttype) does not take arguments"
6614 msgstr "%%(objecttype) 不带参数"
6615
6584 -#: ref-filter.c:282
6616 +#: ref-filter.c:339
6617 #, c-format
6618 msgid "unrecognized %%(objectsize) argument: %s"
6619 msgstr "未能识别的 %%(objectsize) 参数：%s"
6620
6589 -#: ref-filter.c:290
6621 +#: ref-filter.c:347
6622 #, c-format
6623 msgid "%%(deltabase) does not take arguments"
6624 msgstr "%%(deltabase) 不带参数"
6625
6594 -#: ref-filter.c:302
6626 +#: ref-filter.c:359
6627 #, c-format
6628 msgid "%%(body) does not take arguments"
6629 msgstr "%%(body) 不带参数"
6630
6599 -#: ref-filter.c:315
6631 +#: ref-filter.c:372
6632 #, c-format
6633 msgid "unrecognized %%(subject) argument: %s"
6634 msgstr "未能识别的 %%(subject) 参数：%s"
6635
6604 -#: ref-filter.c:334
6636 +#: ref-filter.c:391
6637 #, c-format
6638 msgid "expected %%(trailers:key=<value>)"
6639 msgstr "预期 %%(trailers:key=<值>)"
6640
6609 -#: ref-filter.c:336
6641 +#: ref-filter.c:393
6642 #, c-format
6643 msgid "unknown %%(trailers) argument: %s"
6644 msgstr "未知的 %%(trailers) 参数：%s"
6645
6614 -#: ref-filter.c:367
6646 +#: ref-filter.c:424
6647 #, c-format
6648 msgid "positive value expected contents:lines=%s"
6649 msgstr "期望一个正数 contents:lines=%s"
6650
6619 -#: ref-filter.c:369
6651 +#: ref-filter.c:426
6652 #, c-format
6653 msgid "unrecognized %%(contents) argument: %s"
6654 msgstr "未能识别的 %%(contents) 参数：%s"
6655
6624 -#: ref-filter.c:384
6656 +#: ref-filter.c:441
6657 #, c-format
6658 msgid "positive value expected '%s' in %%(%s)"
6659 msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"
6660
6629 -#: ref-filter.c:388
6661 +#: ref-filter.c:445
6662 #, c-format
6663 msgid "unrecognized argument '%s' in %%(%s)"
6664 msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'"
6665
6634 -#: ref-filter.c:402
6666 +#: ref-filter.c:459
6667 #, c-format
6668 msgid "unrecognized email option: %s"
6669 msgstr "未识别的邮件选项：%s"
6670
6639 -#: ref-filter.c:432
6671 +#: ref-filter.c:489
6672 #, c-format
6673 msgid "expected format: %%(align:<width>,<position>)"
6674 msgstr "期望的格式：%%(align:<宽度>,<位置>)"
6675
6644 -#: ref-filter.c:444
6676 +#: ref-filter.c:501
6677 #, c-format
6678 msgid "unrecognized position:%s"
6679 msgstr "未能识别的位置：%s"
6680
6649 -#: ref-filter.c:451
6681 +#: ref-filter.c:508
6682 #, c-format
6683 msgid "unrecognized width:%s"
6684 msgstr "未能识别的宽度：%s"
6685
6654 -#: ref-filter.c:460
6686 +#: ref-filter.c:517
6687 #, c-format
6688 msgid "unrecognized %%(align) argument: %s"
6689 msgstr "未能识别的 %%(align) 参数：%s"
6690
6659 -#: ref-filter.c:468
6691 +#: ref-filter.c:525
6692 #, c-format
6693 msgid "positive width expected with the %%(align) atom"
6694 msgstr "元素 %%(align) 需要一个正数的宽度"
6695
6664 -#: ref-filter.c:486
6696 +#: ref-filter.c:543
6697 #, c-format
6698 msgid "unrecognized %%(if) argument: %s"
6699 msgstr "未能识别的 %%(if) 参数：%s"
6700
6669 -#: ref-filter.c:588
6701 +#: ref-filter.c:645
6702 #, c-format
6703 msgid "malformed field name: %.*s"
6704 msgstr "格式错误的字段名：%.*s"
6705
6674 -#: ref-filter.c:615
6706 +#: ref-filter.c:672
6707 #, c-format
6708 msgid "unknown field name: %.*s"
6709 msgstr "未知的字段名：%.*s"
6710
6679 -#: ref-filter.c:619
6711 +#: ref-filter.c:676
6712 #, c-format
6713 msgid ""
6714 "not a git repository, but the field '%.*s' requires access to object data"
6715 msgstr "不是 git 仓库，但是字段 '%.*s' 需要访问对象数据"
6716
6685 -#: ref-filter.c:743
6717 +#: ref-filter.c:801
6718 #, c-format
6719 msgid "format: %%(if) atom used without a %%(then) atom"
6720 msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"
6721
6690 -#: ref-filter.c:807
6722 +#: ref-filter.c:865
6723 #, c-format
6724 msgid "format: %%(then) atom used without an %%(if) atom"
6725 msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"
6726
6695 -#: ref-filter.c:809
6727 +#: ref-filter.c:867
6728 #, c-format
6729 msgid "format: %%(then) atom used more than once"
6730 msgstr "格式：%%(then) 元素用了多次"
6731
6700 -#: ref-filter.c:811
6732 +#: ref-filter.c:869
6733 #, c-format
6734 msgid "format: %%(then) atom used after %%(else)"
6735 msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
6736
6705 -#: ref-filter.c:839
6737 +#: ref-filter.c:897
6738 #, c-format
6739 msgid "format: %%(else) atom used without an %%(if) atom"
6740 msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"
6741
6710 -#: ref-filter.c:841
6742 +#: ref-filter.c:899
6743 #, c-format
6744 msgid "format: %%(else) atom used without a %%(then) atom"
6745 msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"
6746
6715 -#: ref-filter.c:843
6747 +#: ref-filter.c:901
6748 #, c-format
6749 msgid "format: %%(else) atom used more than once"
6750 msgstr "格式：%%(else) 元素用了多次"
6751
6720 -#: ref-filter.c:858
6752 +#: ref-filter.c:916
6753 #, c-format
6754 msgid "format: %%(end) atom used without corresponding atom"
6755 msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
6756
6725 -#: ref-filter.c:915
6757 +#: ref-filter.c:973
6758 #, c-format
6759 msgid "malformed format string %s"
6760 msgstr "错误的格式化字符串 %s"
6761
6730 -#: ref-filter.c:1556
6762 +#: ref-filter.c:1621
6763 #, c-format
6764 msgid "(no branch, rebasing %s)"
6765 msgstr "（非分支，正变基 %s）"
6766
6735 -#: ref-filter.c:1559
6767 +#: ref-filter.c:1624
6768 #, c-format
6769 msgid "(no branch, rebasing detached HEAD %s)"
6770 msgstr "（非分支，正变基分离头指针 %s）"
6771
6740 -#: ref-filter.c:1562
6772 +#: ref-filter.c:1627
6773 #, c-format
6774 msgid "(no branch, bisect started on %s)"
6775 msgstr "（非分支，二分查找开始于 %s）"
6776
6745 -#: ref-filter.c:1566
6777 +#: ref-filter.c:1631
6778 #, c-format
6779 msgid "(HEAD detached at %s)"
6780 msgstr "（头指针在 %s 分离）"
6781
6750 -#: ref-filter.c:1569
6782 +#: ref-filter.c:1634
6783 #, c-format
6784 msgid "(HEAD detached from %s)"
6785 msgstr "（头指针自 %s 分离）"
6786
6755 -#: ref-filter.c:1572
6787 +#: ref-filter.c:1637
6788 msgid "(no branch)"
6789 msgstr "（非分支）"
6790
6759 -#: ref-filter.c:1604 ref-filter.c:1813
6791 +#: ref-filter.c:1669 ref-filter.c:1880
6792 #, c-format
6793 msgid "missing object %s for %s"
6794 msgstr "缺失 %2$s 的对象 %1$s"
6795
6764 -#: ref-filter.c:1614
6796 +#: ref-filter.c:1679
6797 #, c-format
6798 msgid "parse_object_buffer failed on %s for %s"
6799 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
6800
6769 -#: ref-filter.c:1997
6801 +#: ref-filter.c:2064
6802 #, c-format
6803 msgid "malformed object at '%s'"
6804 msgstr "格式错误的对象 '%s'"
6805
6774 -#: ref-filter.c:2086
6806 +#: ref-filter.c:2153
6807 #, c-format
6808 msgid "ignoring ref with broken name %s"
6809 msgstr "忽略带有错误名称 %s 的引用"
6810
6779 -#: ref-filter.c:2091 refs.c:676
6811 +#: ref-filter.c:2158 refs.c:676
6812 #, c-format
6813 msgid "ignoring broken ref %s"
6814 msgstr "忽略损坏的引用 %s"
6815
6784 -#: ref-filter.c:2431
6816 +#: ref-filter.c:2502
6817 #, c-format
6818 msgid "format: %%(end) atom missing"
6819 msgstr "格式：缺少 %%(end) 元素"
6820
6789 -#: ref-filter.c:2525
6821 +#: ref-filter.c:2596
6822 #, c-format
6823 msgid "malformed object name %s"
6824 msgstr "格式错误的对象名 %s"
6825
6794 -#: ref-filter.c:2530
6826 +#: ref-filter.c:2601
6827 #, c-format
6828 msgid "option `%s' must point to a commit"
6829 msgstr "选项 `%s' 必须指向一个提交"
@@ -7241,8 +7273,8 @@ msgstr "不能删除 stray '%s'"
7273 msgid "Recorded preimage for '%s'"
7274 msgstr "为 '%s' 记录 preimage"
7275
7244 -#: rerere.c:865 submodule.c:2089 builtin/log.c:2000
7245 -#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
7276 +#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
7277 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
7278 #, c-format
7279 msgid "could not create directory '%s'"
7280 msgstr "不能创建目录 '%s'"
@@ -7280,38 +7312,38 @@ msgstr "不能打开 rr-cache 目录"
7312 msgid "could not determine HEAD revision"
7313 msgstr "不能确定 HEAD 版本"
7314
7283 -#: reset.c:70 reset.c:76 sequencer.c:3669
7315 +#: reset.c:69 reset.c:75 sequencer.c:3689
7316 #, c-format
7317 msgid "failed to find tree of %s"
7318 msgstr "无法找到 %s 指向的树。"
7319
7288 -#: revision.c:2343
7320 +#: revision.c:2344
7321 msgid "--unpacked=<packfile> no longer supported"
7322 msgstr "不再支持 --unpacked=<packfile>"
7323
7292 -#: revision.c:2683
7324 +#: revision.c:2684
7325 msgid "your current branch appears to be broken"
7326 msgstr "您的当前分支好像被损坏"
7327
7296 -#: revision.c:2686
7328 +#: revision.c:2687
7329 #, c-format
7330 msgid "your current branch '%s' does not have any commits yet"
7331 msgstr "您的当前分支 '%s' 尚无任何提交"
7332
7301 -#: revision.c:2892
7333 +#: revision.c:2893
7334 msgid "-L does not yet support diff formats besides -p and -s"
7335 msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
7336
7305 -#: run-command.c:767
7337 +#: run-command.c:766
7338 msgid "open /dev/null failed"
7339 msgstr "不能打开 /dev/null"
7340
7309 -#: run-command.c:1275
7341 +#: run-command.c:1274
7342 #, c-format
7343 msgid "cannot create async thread: %s"
7344 msgstr "不能创建 async 线程：%s"
7345
7314 -#: run-command.c:1345
7346 +#: run-command.c:1344
7347 #, c-format
7348 msgid ""
7349 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -7346,25 +7378,25 @@ msgstr "send-pack：无法派生 fetch 子进程"
7378 msgid "push negotiation failed; proceeding anyway with push"
7379 msgstr "推送协商失败，但还是继续推送"
7380
7349 -#: send-pack.c:520
7381 +#: send-pack.c:526
7382 msgid "the receiving end does not support this repository's hash algorithm"
7383 msgstr "接收端不支持这个仓库的哈希算法"
7384
7353 -#: send-pack.c:529
7385 +#: send-pack.c:535
7386 msgid "the receiving end does not support --signed push"
7355 -msgstr "接收端不支持签名推送"
7387 +msgstr "接收端不支持签名推送（--signed）"
7388
7357 -#: send-pack.c:531
7389 +#: send-pack.c:537
7390 msgid ""
7391 "not sending a push certificate since the receiving end does not support --"
7392 "signed push"
7361 -msgstr "未发送推送证书，因为接收端不支持签名推送"
7393 +msgstr "未发送推送证书，因为接收端不支持签名推送（--signed）"
7394
7363 -#: send-pack.c:543
7395 +#: send-pack.c:544
7396 msgid "the receiving end does not support --atomic push"
7365 -msgstr "接收端不支持原子推送"
7397 +msgstr "接收端不支持原子推送（--atomic）"
7398
7367 -#: send-pack.c:548
7399 +#: send-pack.c:549
7400 msgid "the receiving end does not support push options"
7401 msgstr "接收端不支持推送选项"
7402
@@ -7423,7 +7455,7 @@ msgid "could not lock '%s'"
7455 msgstr "不能锁定 '%s'"
7456
7457 #: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
7426 -#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
7458 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
7459 #, c-format
7460 msgid "could not write to '%s'"
7461 msgstr "不能写入 '%s'"
@@ -7434,7 +7466,7 @@ msgid "could not write eol to '%s'"
7466 msgstr "不能将换行符写入 '%s'"
7467
7468 #: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
7437 -#: sequencer.c:3554
7469 +#: sequencer.c:3555
7470 #, c-format
7471 msgid "failed to finalize '%s'"
7472 msgstr "无法完成 '%s'"
@@ -7484,8 +7516,8 @@ msgstr "在 '%.*s' 中没有 key"
7516 msgid "unable to dequote value of '%s'"
7517 msgstr "无法为 '%s' 的值去引号"
7518
7487 -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
7488 -#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
7519 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
7520 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
7521 #, c-format
7522 msgid "could not open '%s' for reading"
7523 msgstr "无法打开 '%s' 进行读取"
@@ -7629,7 +7661,7 @@ msgstr "不能解析 HEAD"
7661 msgid "HEAD %s is not a commit!"
7662 msgstr "HEAD %s 不是一个提交！"
7663
7632 -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
7664 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
7665 msgid "could not parse HEAD commit"
7666 msgstr "不能解析 HEAD 提交"
7667
@@ -7637,7 +7669,7 @@ msgstr "不能解析 HEAD 提交"
7669 msgid "unable to parse commit author"
7670 msgstr "不能解析提交作者"
7671
7640 -#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
7672 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
7673 msgid "git write-tree failed to write a tree"
7674 msgstr "git write-tree 无法写入树对象"
7675
@@ -7655,12 +7687,13 @@ msgstr "无效的作者身份 '%s'"
7687 msgid "corrupt author: missing date information"
7688 msgstr "损坏的作者：缺失日期信息"
7689
7658 -#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
7659 -#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78
7690 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
7691 +#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
7692 msgid "failed to write commit object"
7693 msgstr "写提交对象失败"
7694
7663 -#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
7695 +#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
7696 +#: t/helper/test-fast-rebase.c:217
7697 #, c-format
7698 msgid "could not update %s"
7699 msgstr "不能更新 %s"
@@ -7712,7 +7745,7 @@ msgstr "不能写 '%s'"
7745 msgid "need a HEAD to fixup"
7746 msgstr "需要一个 HEAD 来修复"
7747
7715 -#: sequencer.c:1936 sequencer.c:3581
7748 +#: sequencer.c:1936 sequencer.c:3582
7749 msgid "could not read HEAD"
7750 msgstr "不能读取 HEAD"
7751
@@ -7853,7 +7886,7 @@ msgstr "不可用的 squash-onto"
7886 msgid "malformed options sheet: '%s'"
7887 msgstr "格式错误的选项清单：'%s'"
7888
7856 -#: sequencer.c:3012 sequencer.c:4869
7889 +#: sequencer.c:3012 sequencer.c:4868
7890 msgid "empty commit set passed"
7891 msgstr "提供了空的提交集"
7892
@@ -7884,7 +7917,7 @@ msgstr "不能创建序列目录 '%s'"
7917 msgid "could not lock HEAD"
7918 msgstr "不能锁定 HEAD"
7919
7887 -#: sequencer.c:3125 sequencer.c:4582
7920 +#: sequencer.c:3125 sequencer.c:4581
7921 msgid "no cherry-pick or revert in progress"
7922 msgstr "拣选或还原操作并未进行"
7923
@@ -7896,7 +7929,7 @@ msgstr "不能解析 HEAD"
7929 msgid "cannot abort from a branch yet to be born"
7930 msgstr "不能从尚未建立的分支终止"
7931
7899 -#: sequencer.c:3159 builtin/grep.c:759
7932 +#: sequencer.c:3159 builtin/grep.c:758
7933 #, c-format
7934 msgid "cannot open '%s'"
7935 msgstr "不能打开 '%s'"
@@ -7944,7 +7977,7 @@ msgstr ""
7977 "您已经提交了么？\n"
7978 "试试 \"git %s --continue\""
7979
7947 -#: sequencer.c:3411 sequencer.c:4473
7980 +#: sequencer.c:3411 sequencer.c:4472
7981 msgid "cannot read HEAD"
7982 msgstr "不能读取 HEAD"
7983
@@ -8028,90 +8061,90 @@ msgstr ""
8061 " git rebase --continue\n"
8062 "\n"
8063
8031 -#: sequencer.c:3571
8064 +#: sequencer.c:3572
8065 #, c-format
8066 msgid "illegal label name: '%.*s'"
8067 msgstr "非法的标签名称：'%.*s'"
8068
8036 -#: sequencer.c:3625
8069 +#: sequencer.c:3645
8070 msgid "writing fake root commit"
8071 msgstr "写伪根提交"
8072
8040 -#: sequencer.c:3630
8073 +#: sequencer.c:3650
8074 msgid "writing squash-onto"
8075 msgstr "写入 squash-onto"
8076
8044 -#: sequencer.c:3714
8077 +#: sequencer.c:3734
8078 #, c-format
8079 msgid "could not resolve '%s'"
8080 msgstr "无法解析 '%s'"
8081
8049 -#: sequencer.c:3747
8082 +#: sequencer.c:3767
8083 msgid "cannot merge without a current revision"
8084 msgstr "没有当前版本不能合并"
8085
8053 -#: sequencer.c:3769
8086 +#: sequencer.c:3789
8087 #, c-format
8088 msgid "unable to parse '%.*s'"
8089 msgstr "无法解析 '%.*s'"
8090
8058 -#: sequencer.c:3778
8091 +#: sequencer.c:3798
8092 #, c-format
8093 msgid "nothing to merge: '%.*s'"
8094 msgstr "无可用合并：'%.*s'"
8095
8063 -#: sequencer.c:3790
8096 +#: sequencer.c:3810
8097 msgid "octopus merge cannot be executed on top of a [new root]"
8098 msgstr "章鱼合并不能在一个新的根提交上执行"
8099
8067 -#: sequencer.c:3806
8100 +#: sequencer.c:3826
8101 #, c-format
8102 msgid "could not get commit message of '%s'"
8103 msgstr "不能获取 '%s' 的提交说明"
8104
8072 -#: sequencer.c:3989
8105 +#: sequencer.c:4009
8106 #, c-format
8107 msgid "could not even attempt to merge '%.*s'"
8108 msgstr "甚至不能尝试合并 '%.*s'"
8109
8077 -#: sequencer.c:4005
8110 +#: sequencer.c:4025
8111 msgid "merge: Unable to write new index file"
8112 msgstr "合并：无法写入新索引文件"
8113
8081 -#: sequencer.c:4079
8114 +#: sequencer.c:4099
8115 msgid "Cannot autostash"
8083 -msgstr "无法 autostash"
8116 +msgstr "无法自动贮藏"
8117
8085 -#: sequencer.c:4082
8118 +#: sequencer.c:4102
8119 #, c-format
8120 msgid "Unexpected stash response: '%s'"
8088 -msgstr "意外的 stash 响应：'%s'"
8121 +msgstr "意外的贮藏响应：'%s'"
8122
8090 -#: sequencer.c:4088
8123 +#: sequencer.c:4108
8124 #, c-format
8125 msgid "Could not create directory for '%s'"
8126 msgstr "不能为 '%s' 创建目录"
8127
8095 -#: sequencer.c:4091
8128 +#: sequencer.c:4111
8129 #, c-format
8130 msgid "Created autostash: %s\n"
8098 -msgstr "创建了 autostash：%s\n"
8131 +msgstr "创建了自动贮藏：%s\n"
8132
8100 -#: sequencer.c:4095
8133 +#: sequencer.c:4115
8134 msgid "could not reset --hard"
8102 -msgstr "无法 reset --hard"
8135 +msgstr "无法硬性重置（reset --hard）"
8136
8104 -#: sequencer.c:4120
8137 +#: sequencer.c:4140
8138 #, c-format
8139 msgid "Applied autostash.\n"
8107 -msgstr "已应用 autostash。\n"
8140 +msgstr "已应用自动贮藏。\n"
8141
8109 -#: sequencer.c:4132
8142 +#: sequencer.c:4152
8143 #, c-format
8144 msgid "cannot store %s"
8145 msgstr "不能存储 %s"
8146
8114 -#: sequencer.c:4135
8147 +#: sequencer.c:4155
8148 #, c-format
8149 msgid ""
8150 "%s\n"
@@ -8122,29 +8155,29 @@ msgstr ""
8155 "您的修改在贮藏区中很安全。\n"
8156 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
8157
8125 -#: sequencer.c:4140
8158 +#: sequencer.c:4160
8159 msgid "Applying autostash resulted in conflicts."
8160 msgstr "应用自动贮藏导致冲突。"
8161
8129 -#: sequencer.c:4141
8162 +#: sequencer.c:4161
8163 msgid "Autostash exists; creating a new stash entry."
8164 msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。"
8165
8133 -#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
8166 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
8167 msgid "could not detach HEAD"
8168 msgstr "不能分离头指针"
8169
8137 -#: sequencer.c:4249
8170 +#: sequencer.c:4248
8171 #, c-format
8172 msgid "Stopped at HEAD\n"
8173 msgstr "停止在 HEAD\n"
8174
8142 -#: sequencer.c:4251
8175 +#: sequencer.c:4250
8176 #, c-format
8177 msgid "Stopped at %s\n"
8178 msgstr "停止在 %s\n"
8179
8147 -#: sequencer.c:4259
8180 +#: sequencer.c:4258
8181 #, c-format
8182 msgid ""
8183 "Could not execute the todo command\n"
@@ -8164,58 +8197,58 @@ msgstr ""
8197 " git rebase --edit-todo\n"
8198 " git rebase --continue\n"
8199
8167 -#: sequencer.c:4305
8200 +#: sequencer.c:4304
8201 #, c-format
8202 msgid "Rebasing (%d/%d)%s"
8203 msgstr "正在变基（%d/%d）%s"
8204
8172 -#: sequencer.c:4351
8205 +#: sequencer.c:4350
8206 #, c-format
8207 msgid "Stopped at %s... %.*s\n"
8208 msgstr "停止在 %s... %.*s\n"
8209
8177 -#: sequencer.c:4422
8210 +#: sequencer.c:4421
8211 #, c-format
8212 msgid "unknown command %d"
8213 msgstr "未知命令 %d"
8214
8182 -#: sequencer.c:4481
8215 +#: sequencer.c:4480
8216 msgid "could not read orig-head"
8217 msgstr "不能读取 orig-head"
8218
8186 -#: sequencer.c:4486
8219 +#: sequencer.c:4485
8220 msgid "could not read 'onto'"
8221 msgstr "不能读取 'onto'"
8222
8190 -#: sequencer.c:4500
8223 +#: sequencer.c:4499
8224 #, c-format
8225 msgid "could not update HEAD to %s"
8226 msgstr "不能更新 HEAD 为 %s"
8227
8195 -#: sequencer.c:4560
8228 +#: sequencer.c:4559
8229 #, c-format
8230 msgid "Successfully rebased and updated %s.\n"
8231 msgstr "成功变基并更新 %s。\n"
8232
8200 -#: sequencer.c:4612
8233 +#: sequencer.c:4611
8234 msgid "cannot rebase: You have unstaged changes."
8235 msgstr "不能变基：您有未暂存的变更。"
8236
8204 -#: sequencer.c:4621
8237 +#: sequencer.c:4620
8238 msgid "cannot amend non-existing commit"
8239 msgstr "不能修补不存在的提交"
8240
8208 -#: sequencer.c:4623
8241 +#: sequencer.c:4622
8242 #, c-format
8243 msgid "invalid file: '%s'"
8244 msgstr "无效文件：'%s'"
8245
8213 -#: sequencer.c:4625
8246 +#: sequencer.c:4624
8247 #, c-format
8248 msgid "invalid contents: '%s'"
8249 msgstr "无效内容：'%s'"
8250
8218 -#: sequencer.c:4628
8251 +#: sequencer.c:4627
8252 msgid ""
8253 "\n"
8254 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8224,50 +8257,50 @@ msgstr ""
8257 "\n"
8258 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
8259
8227 -#: sequencer.c:4664 sequencer.c:4703
8260 +#: sequencer.c:4663 sequencer.c:4702
8261 #, c-format
8262 msgid "could not write file: '%s'"
8263 msgstr "不能写入文件：'%s'"
8264
8232 -#: sequencer.c:4719
8265 +#: sequencer.c:4718
8266 msgid "could not remove CHERRY_PICK_HEAD"
8267 msgstr "不能删除 CHERRY_PICK_HEAD"
8268
8236 -#: sequencer.c:4726
8269 +#: sequencer.c:4725
8270 msgid "could not commit staged changes."
8271 msgstr "不能提交暂存的修改。"
8272
8240 -#: sequencer.c:4846
8273 +#: sequencer.c:4845
8274 #, c-format
8275 msgid "%s: can't cherry-pick a %s"
8276 msgstr "%s：不能拣选一个%s"
8277
8245 -#: sequencer.c:4850
8278 +#: sequencer.c:4849
8279 #, c-format
8280 msgid "%s: bad revision"
8281 msgstr "%s：错误的版本"
8282
8250 -#: sequencer.c:4885
8283 +#: sequencer.c:4884
8284 msgid "can't revert as initial commit"
8285 msgstr "不能作为初始提交回退"
8286
8254 -#: sequencer.c:5362
8287 +#: sequencer.c:5361
8288 msgid "make_script: unhandled options"
8289 msgstr "make_script：有未能处理的选项"
8290
8258 -#: sequencer.c:5365
8291 +#: sequencer.c:5364
8292 msgid "make_script: error preparing revisions"
8293 msgstr "make_script：准备版本时错误"
8294
8262 -#: sequencer.c:5615 sequencer.c:5632
8295 +#: sequencer.c:5614 sequencer.c:5631
8296 msgid "nothing to do"
8297 msgstr "无事可做"
8298
8266 -#: sequencer.c:5651
8299 +#: sequencer.c:5650
8300 msgid "could not skip unnecessary pick commands"
8301 msgstr "无法跳过不必要的拣选"
8302
8270 -#: sequencer.c:5751
8303 +#: sequencer.c:5750
8304 msgid "the script was already rearranged."
8305 msgstr "脚本已经重新编排。"
8306
@@ -8316,92 +8349,96 @@ msgstr ""
8349 msgid "unable to set up work tree using invalid config"
8350 msgstr "无法使用无效配置来创建工作区"
8351
8319 -#: setup.c:423
8352 +#: setup.c:423 builtin/rev-parse.c:895
8353 msgid "this operation must be run in a work tree"
8354 msgstr "该操作必须在一个工作区中运行"
8355
8323 -#: setup.c:661
8356 +#: setup.c:658
8357 #, c-format
8358 msgid "Expected git repo version <= %d, found %d"
8359 msgstr "期望 git 仓库版本 <= %d，却得到 %d"
8360
8328 -#: setup.c:669
8329 -msgid "unknown repository extensions found:"
8330 -msgstr "发现未知的仓库扩展："
8361 +#: setup.c:666
8362 +msgid "unknown repository extension found:"
8363 +msgid_plural "unknown repository extensions found:"
8364 +msgstr[0] "发现未知的仓库扩展："
8365 +msgstr[1] "发现未知的仓库扩展："
8366
8332 -#: setup.c:681
8333 -msgid "repo version is 0, but v1-only extensions found:"
8334 -msgstr "仓库的版本是 0，但是发现仅用于 v1 的扩展："
8367 +#: setup.c:680
8368 +msgid "repo version is 0, but v1-only extension found:"
8369 +msgid_plural "repo version is 0, but v1-only extensions found:"
8370 +msgstr[0] "仓库的版本是 0，但是发现仅用于 v1 的扩展："
8371 +msgstr[1] "仓库的版本是 0，但是发现仅用于 v1 的扩展："
8372
8336 -#: setup.c:700
8373 +#: setup.c:701
8374 #, c-format
8375 msgid "error opening '%s'"
8376 msgstr "打开 '%s' 出错"
8377
8341 -#: setup.c:702
8378 +#: setup.c:703
8379 #, c-format
8380 msgid "too large to be a .git file: '%s'"
8381 msgstr "文件太大，无法作为 .git 文件：'%s'"
8382
8346 -#: setup.c:704
8383 +#: setup.c:705
8384 #, c-format
8385 msgid "error reading %s"
8386 msgstr "读取 %s 出错"
8387
8351 -#: setup.c:706
8388 +#: setup.c:707
8389 #, c-format
8390 msgid "invalid gitfile format: %s"
8391 msgstr "无效的 gitfile 格式：%s"
8392
8356 -#: setup.c:708
8393 +#: setup.c:709
8394 #, c-format
8395 msgid "no path in gitfile: %s"
8396 msgstr "在 gitfile 中没有路径：%s"
8397
8361 -#: setup.c:710
8398 +#: setup.c:711
8399 #, c-format
8400 msgid "not a git repository: %s"
8401 msgstr "不是 git 仓库：%s"
8402
8366 -#: setup.c:812
8403 +#: setup.c:813
8404 #, c-format
8405 msgid "'$%s' too big"
8406 msgstr "'$%s' 太大"
8407
8371 -#: setup.c:826
8408 +#: setup.c:827
8409 #, c-format
8410 msgid "not a git repository: '%s'"
8411 msgstr "不是 git 仓库：'%s'"
8412
8376 -#: setup.c:855 setup.c:857 setup.c:888
8413 +#: setup.c:856 setup.c:858 setup.c:889
8414 #, c-format
8415 msgid "cannot chdir to '%s'"
8416 msgstr "不能切换目录到 '%s'"
8417
8381 -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
8418 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
8419 msgid "cannot come back to cwd"
8420 msgstr "无法返回当前工作目录"
8421
8385 -#: setup.c:987
8422 +#: setup.c:988
8423 #, c-format
8424 msgid "failed to stat '%*s%s%s'"
8425 msgstr "获取 '%*s%s%s' 状态（stat）失败"
8426
8390 -#: setup.c:1225
8427 +#: setup.c:1231
8428 msgid "Unable to read current working directory"
8429 msgstr "不能读取当前工作目录"
8430
8394 -#: setup.c:1234 setup.c:1240
8431 +#: setup.c:1240 setup.c:1246
8432 #, c-format
8433 msgid "cannot change to '%s'"
8434 msgstr "不能切换到 '%s'"
8435
8399 -#: setup.c:1245
8436 +#: setup.c:1251
8437 #, c-format
8438 msgid "not a git repository (or any of the parent directories): %s"
8439 msgstr "不是 git 仓库（或者任何父目录）：%s"
8440
8404 -#: setup.c:1251
8441 +#: setup.c:1257
8442 #, c-format
8443 msgid ""
8444 "not a git repository (or any parent up to mount point %s)\n"
@@ -8410,7 +8447,7 @@ msgstr ""
8447 "不是 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
8448 "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
8449
8413 -#: setup.c:1370
8450 +#: setup.c:1381
8451 #, c-format
8452 msgid ""
8453 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8419,27 +8456,27 @@ msgstr ""
8456 "参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"
8457 "文件属主必须始终拥有读写权限。"
8458
8422 -#: setup.c:1417
8459 +#: setup.c:1430
8460 msgid "open /dev/null or dup failed"
8461 msgstr "不能打开或者复制 /dev/null"
8462
8426 -#: setup.c:1432
8463 +#: setup.c:1445
8464 msgid "fork failed"
8465 msgstr "fork 失败"
8466
8430 -#: setup.c:1437 t/helper/test-simple-ipc.c:285
8467 +#: setup.c:1450 t/helper/test-simple-ipc.c:285
8468 msgid "setsid failed"
8469 msgstr "setsid 失败"
8470
8434 -#: sparse-index.c:151
8471 +#: sparse-index.c:162
8472 msgid "attempting to use sparse-index without cone mode"
8473 msgstr "尝试在没有 cone 模式下使用稀疏索引"
8474
8438 -#: sparse-index.c:156
8475 +#: sparse-index.c:176
8476 msgid "unable to update cache-tree, staying full"
8477 msgstr "不能更新缓存树，保持完整"
8478
8442 -#: sparse-index.c:239
8479 +#: sparse-index.c:263
8480 #, c-format
8481 msgid "index entry is a directory, but not sparse (%08x)"
8482 msgstr "索引条目是一个目录，但不是稀疏的 (%08x)"
@@ -8496,7 +8533,7 @@ msgid_plural "%u bytes/s"
8533 msgstr[0] "%u 字节/秒"
8534 msgstr[1] "%u 字节/秒"
8535
8499 -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
8536 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
8537 #: builtin/rebase.c:866
8538 #, c-format
8539 msgid "could not open '%s' for writing"
@@ -8564,55 +8601,55 @@ msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
8601 msgid "bad --ignore-submodules argument: %s"
8602 msgstr "坏的 --ignore-submodules 参数：%s"
8603
8567 -#: submodule.c:818
8604 +#: submodule.c:805
8605 #, c-format
8606 msgid ""
8607 "Submodule in commit %s at path: '%s' collides with a submodule named the "
8608 "same. Skipping it."
8609 msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。"
8610
8574 -#: submodule.c:921
8611 +#: submodule.c:908
8612 #, c-format
8613 msgid "submodule entry '%s' (%s) is a %s, not a commit"
8614 msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"
8615
8579 -#: submodule.c:1006
8616 +#: submodule.c:993
8617 #, c-format
8618 msgid ""
8619 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
8620 "submodule %s"
8621 msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'"
8622
8586 -#: submodule.c:1129
8623 +#: submodule.c:1116
8624 #, c-format
8625 msgid "process for submodule '%s' failed"
8626 msgstr "处理子模组 '%s' 失败"
8627
8591 -#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
8628 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
8629 msgid "Failed to resolve HEAD as a valid ref."
8630 msgstr "无法将 HEAD 解析为有效引用。"
8631
8595 -#: submodule.c:1169
8632 +#: submodule.c:1156
8633 #, c-format
8634 msgid "Pushing submodule '%s'\n"
8635 msgstr "正在推送子模组 '%s'\n"
8636
8600 -#: submodule.c:1172
8637 +#: submodule.c:1159
8638 #, c-format
8639 msgid "Unable to push submodule '%s'\n"
8640 msgstr "无法推送子模组 '%s'\n"
8641
8605 -#: submodule.c:1464
8642 +#: submodule.c:1451
8643 #, c-format
8644 msgid "Fetching submodule %s%s\n"
8645 msgstr "正在获取子模组 %s%s\n"
8646
8610 -#: submodule.c:1498
8647 +#: submodule.c:1485
8648 #, c-format
8649 msgid "Could not access submodule '%s'\n"
8650 msgstr "无法访问子模组 '%s'\n"
8651
8615 -#: submodule.c:1653
8652 +#: submodule.c:1640
8653 #, c-format
8654 msgid ""
8655 "Errors during submodule fetch:\n"
@@ -8621,77 +8658,77 @@ msgstr ""
8658 "获取子模组时的错误：\n"
8659 "%s"
8660
8624 -#: submodule.c:1678
8661 +#: submodule.c:1665
8662 #, c-format
8663 msgid "'%s' not recognized as a git repository"
8664 msgstr "无法将 '%s' 识别为 git 仓库"
8665
8629 -#: submodule.c:1695
8666 +#: submodule.c:1682
8667 #, c-format
8668 msgid "Could not run 'git status --porcelain=2' in submodule %s"
8669 msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'"
8670
8634 -#: submodule.c:1736
8671 +#: submodule.c:1723
8672 #, c-format
8673 msgid "'git status --porcelain=2' failed in submodule %s"
8674 msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败"
8675
8639 -#: submodule.c:1811
8676 +#: submodule.c:1798
8677 #, c-format
8678 msgid "could not start 'git status' in submodule '%s'"
8679 msgstr "无法在子模组 '%s' 中启动 'git status'"
8680
8644 -#: submodule.c:1824
8681 +#: submodule.c:1811
8682 #, c-format
8683 msgid "could not run 'git status' in submodule '%s'"
8684 msgstr "无法在子模组 '%s' 中执行 'git status'"
8685
8649 -#: submodule.c:1839
8686 +#: submodule.c:1826
8687 #, c-format
8688 msgid "Could not unset core.worktree setting in submodule '%s'"
8689 msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
8690
8654 -#: submodule.c:1866 submodule.c:2176
8691 +#: submodule.c:1853 submodule.c:2163
8692 #, c-format
8693 msgid "could not recurse into submodule '%s'"
8694 msgstr "无法递归进子模组路径 '%s'"
8695
8659 -#: submodule.c:1887
8696 +#: submodule.c:1874
8697 msgid "could not reset submodule index"
8698 msgstr "无法重置子模组索引"
8699
8663 -#: submodule.c:1929
8700 +#: submodule.c:1916
8701 #, c-format
8702 msgid "submodule '%s' has dirty index"
8703 msgstr "子模组 '%s' 中有脏索引"
8704
8668 -#: submodule.c:1981
8705 +#: submodule.c:1968
8706 #, c-format
8707 msgid "Submodule '%s' could not be updated."
8708 msgstr "子模组 '%s' 无法被更新。"
8709
8673 -#: submodule.c:2049
8710 +#: submodule.c:2036
8711 #, c-format
8712 msgid "submodule git dir '%s' is inside git dir '%.*s'"
8713 msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
8714
8678 -#: submodule.c:2070
8715 +#: submodule.c:2057
8716 #, c-format
8717 msgid ""
8718 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
8719 msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
8720
8684 -#: submodule.c:2082 submodule.c:2141
8721 +#: submodule.c:2069 submodule.c:2128
8722 #, c-format
8723 msgid "could not lookup name for submodule '%s'"
8724 msgstr "不能查询子模组 '%s' 的名称"
8725
8689 -#: submodule.c:2086
8726 +#: submodule.c:2073
8727 #, c-format
8728 msgid "refusing to move '%s' into an existing git dir"
8729 msgstr "禁止移动 '%s' 到现存 git 目录中"
8730
8694 -#: submodule.c:2093
8731 +#: submodule.c:2080
8732 #, c-format
8733 msgid ""
8734 "Migrating git directory of '%s%s' from\n"
@@ -8702,11 +8739,11 @@ msgstr ""
8739 "'%s' 迁移至\n"
8740 "'%s'\n"
8741
8705 -#: submodule.c:2221
8742 +#: submodule.c:2208
8743 msgid "could not start ls-files in .."
8744 msgstr "无法在 .. 中启动 ls-files"
8745
8709 -#: submodule.c:2261
8746 +#: submodule.c:2248
8747 #, c-format
8748 msgid "ls-tree returned unexpected return code %d"
8749 msgstr "ls-tree 返回未知返回值 %d"
@@ -8743,7 +8780,7 @@ msgstr "尾注 '%.*s' 的键为空"
8780 msgid "could not read input file '%s'"
8781 msgstr "不能读取输入文件 '%s'"
8782
8746 -#: trailer.c:766 builtin/mktag.c:88
8783 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
8784 msgid "could not read from stdin"
8785 msgstr "不能自标准输入读取"
8786
@@ -8831,7 +8868,7 @@ msgstr "协议不支持设置远程服务路径"
8868 msgid "invalid remote service path"
8869 msgstr "无效的远程服务路径"
8870
8834 -#: transport-helper.c:661 transport.c:1471
8871 +#: transport-helper.c:661 transport.c:1477
8872 msgid "operation not supported by protocol"
8873 msgstr "协议不支持该操作"
8874
@@ -8840,7 +8877,7 @@ msgstr "协议不支持该操作"
8877 msgid "can't connect to subservice %s"
8878 msgstr "不能连接到子服务 %s"
8879
8843 -#: transport-helper.c:693 transport.c:397
8880 +#: transport-helper.c:693 transport.c:400
8881 msgid "--negotiate-only requires protocol v2"
8882 msgstr "--negotiate-only 需要协议 v2"
8883
@@ -8973,53 +9010,53 @@ msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
9010 msgid "could not read bundle '%s'"
9011 msgstr "无法读取归档包 '%s'"
9012
8976 -#: transport.c:220
9013 +#: transport.c:223
9014 #, c-format
9015 msgid "transport: invalid depth option '%s'"
9016 msgstr "传输：无效的深度选项 '%s'"
9017
8981 -#: transport.c:272
9018 +#: transport.c:275
9019 msgid "see protocol.version in 'git help config' for more details"
9020 msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
9021
8985 -#: transport.c:273
9022 +#: transport.c:276
9023 msgid "server options require protocol version 2 or later"
9024 msgstr "服务端选项需要版本 2 协议或更高"
9025
8989 -#: transport.c:400
9026 +#: transport.c:403
9027 msgid "server does not support wait-for-done"
9028 msgstr "服务器不支持 wait-for-done"
9029
8993 -#: transport.c:751
9030 +#: transport.c:755
9031 msgid "could not parse transport.color.* config"
9032 msgstr "不能解析 transport.color.* 配置"
9033
8997 -#: transport.c:826
9034 +#: transport.c:830
9035 msgid "support for protocol v2 not implemented yet"
9036 msgstr "协议 v2 的支持尚未实现"
9037
9001 -#: transport.c:960
9038 +#: transport.c:965
9039 #, c-format
9040 msgid "unknown value for config '%s': %s"
9041 msgstr "配置 '%s' 的取值未知：%s"
9042
9006 -#: transport.c:1026
9043 +#: transport.c:1031
9044 #, c-format
9045 msgid "transport '%s' not allowed"
9046 msgstr "传输 '%s' 不允许"
9047
9011 -#: transport.c:1079
9048 +#: transport.c:1084
9049 msgid "git-over-rsync is no longer supported"
9050 msgstr "不再支持 git-over-rsync"
9051
9015 -#: transport.c:1181
9052 +#: transport.c:1187
9053 #, c-format
9054 msgid ""
9055 "The following submodule paths contain changes that can\n"
9056 "not be found on any remote:\n"
9057 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
9058
9022 -#: transport.c:1185
9059 +#: transport.c:1191
9060 #, c-format
9061 msgid ""
9062 "\n"
@@ -9046,11 +9083,11 @@ msgstr ""
9083 "以推送至远程。\n"
9084 "\n"
9085
9049 -#: transport.c:1193
9086 +#: transport.c:1199
9087 msgid "Aborting."
9088 msgstr "正在终止。"
9089
9053 -#: transport.c:1340
9090 +#: transport.c:1346
9091 msgid "failed to push all needed submodules"
9092 msgstr "不能推送全部需要的子模组"
9093
@@ -9311,11 +9348,11 @@ msgstr ""
9348 "以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n"
9349 "并且碰撞组中只有一个文件存在工作区中：\n"
9350
9314 -#: unpack-trees.c:1519
9351 +#: unpack-trees.c:1618
9352 msgid "Updating index flags"
9353 msgstr "正在更新索引标志"
9354
9318 -#: unpack-trees.c:2608
9355 +#: unpack-trees.c:2718
9356 #, c-format
9357 msgid "worktree and untracked commit have duplicate entries: %s"
9358 msgstr "工作树和未跟踪提交具有重复条目：%s"
@@ -9357,99 +9394,99 @@ msgstr "无效的 '..' 路径片段"
9394 msgid "Fetching objects"
9395 msgstr "正在获取对象"
9396
9360 -#: worktree.c:238 builtin/am.c:2151
9397 +#: worktree.c:236 builtin/am.c:2152
9398 #, c-format
9399 msgid "failed to read '%s'"
9400 msgstr "读取 '%s' 失败"
9401
9365 -#: worktree.c:304
9402 +#: worktree.c:303
9403 #, c-format
9404 msgid "'%s' at main working tree is not the repository directory"
9405 msgstr "在主工作区的 '%s' 不是仓库目录"
9406
9370 -#: worktree.c:315
9407 +#: worktree.c:314
9408 #, c-format
9409 msgid "'%s' file does not contain absolute path to the working tree location"
9410 msgstr "文件 '%s' 不包含工作区的绝对路径"
9411
9375 -#: worktree.c:327
9412 +#: worktree.c:326
9413 #, c-format
9414 msgid "'%s' does not exist"
9415 msgstr "'%s' 不存在"
9416
9380 -#: worktree.c:333
9417 +#: worktree.c:332
9418 #, c-format
9419 msgid "'%s' is not a .git file, error code %d"
9420 msgstr "'%s' 不是一个 .git 文件，错误码 %d"
9421
9385 -#: worktree.c:342
9422 +#: worktree.c:341
9423 #, c-format
9424 msgid "'%s' does not point back to '%s'"
9425 msgstr "'%s' 没有指回到 '%s'"
9426
9390 -#: worktree.c:608
9427 +#: worktree.c:603
9428 msgid "not a directory"
9429 msgstr "不是一个目录"
9430
9394 -#: worktree.c:617
9431 +#: worktree.c:612
9432 msgid ".git is not a file"
9433 msgstr ".git 不是一个文件"
9434
9398 -#: worktree.c:619
9435 +#: worktree.c:614
9436 msgid ".git file broken"
9437 msgstr ".git 文件损坏"
9438
9402 -#: worktree.c:621
9439 +#: worktree.c:616
9440 msgid ".git file incorrect"
9441 msgstr ".git 文件不正确"
9442
9406 -#: worktree.c:727
9443 +#: worktree.c:722
9444 msgid "not a valid path"
9445 msgstr "不是一个有效的路径"
9446
9410 -#: worktree.c:733
9447 +#: worktree.c:728
9448 msgid "unable to locate repository; .git is not a file"
9449 msgstr "无法定位仓库，.git 不是一个文件"
9450
9414 -#: worktree.c:737
9451 +#: worktree.c:732
9452 msgid "unable to locate repository; .git file does not reference a repository"
9453 msgstr "无法定位仓库，.git 文件没有指向一个仓库"
9454
9418 -#: worktree.c:741
9455 +#: worktree.c:736
9456 msgid "unable to locate repository; .git file broken"
9457 msgstr "无法定位仓库，.git 文件损坏"
9458
9422 -#: worktree.c:747
9459 +#: worktree.c:742
9460 msgid "gitdir unreadable"
9461 msgstr "gitdir 不可读"
9462
9426 -#: worktree.c:751
9463 +#: worktree.c:746
9464 msgid "gitdir incorrect"
9465 msgstr "gitdir 不正确"
9466
9430 -#: worktree.c:776
9467 +#: worktree.c:771
9468 msgid "not a valid directory"
9469 msgstr "不是一个有效的目录"
9470
9434 -#: worktree.c:782
9471 +#: worktree.c:777
9472 msgid "gitdir file does not exist"
9473 msgstr "gitdir 文件不存在"
9474
9438 -#: worktree.c:787 worktree.c:796
9475 +#: worktree.c:782 worktree.c:791
9476 #, c-format
9477 msgid "unable to read gitdir file (%s)"
9478 msgstr "无法读取 gitdir 文件（%s）"
9479
9443 -#: worktree.c:806
9480 +#: worktree.c:801
9481 #, c-format
9482 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
9483 msgstr "读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）"
9484
9448 -#: worktree.c:814
9485 +#: worktree.c:809
9486 msgid "invalid gitdir file"
9487 msgstr "无效的 gitdir 文件"
9488
9452 -#: worktree.c:822
9489 +#: worktree.c:817
9490 msgid "gitdir file points to non-existent location"
9491 msgstr "gitdir 文件指向一个不存在的位置"
9492
@@ -9502,11 +9539,11 @@ msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
9539 msgid " (use \"git rm <file>...\" to mark resolution)"
9540 msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
9541
9505 -#: wt-status.c:211 wt-status.c:1075
9542 +#: wt-status.c:211 wt-status.c:1125
9543 msgid "Changes to be committed:"
9544 msgstr "要提交的变更："
9545
9509 -#: wt-status.c:234 wt-status.c:1084
9546 +#: wt-status.c:234 wt-status.c:1134
9547 msgid "Changes not staged for commit:"
9548 msgstr "尚未暂存以备提交的变更："
9549
@@ -9612,22 +9649,22 @@ msgstr "修改的内容, "
9649 msgid "untracked content, "
9650 msgstr "未跟踪的内容, "
9651
9615 -#: wt-status.c:908
9652 +#: wt-status.c:958
9653 #, c-format
9654 msgid "Your stash currently has %d entry"
9655 msgid_plural "Your stash currently has %d entries"
9656 msgstr[0] "您的贮藏区当前有 %d 条记录"
9657 msgstr[1] "您的贮藏区当前有 %d 条记录"
9658
9622 -#: wt-status.c:939
9659 +#: wt-status.c:989
9660 msgid "Submodules changed but not updated:"
9661 msgstr "子模组已修改但尚未更新："
9662
9626 -#: wt-status.c:941
9663 +#: wt-status.c:991
9664 msgid "Submodule changes to be committed:"
9665 msgstr "要提交的子模组变更："
9666
9630 -#: wt-status.c:1023
9667 +#: wt-status.c:1073
9668 msgid ""
9669 "Do not modify or remove the line above.\n"
9670 "Everything below it will be ignored."
@@ -9635,7 +9672,7 @@ msgstr ""
9672 "不要改动或删除上面的一行。\n"
9673 "其下所有内容都将被忽略。"
9674
9638 -#: wt-status.c:1115
9675 +#: wt-status.c:1165
9676 #, c-format
9677 msgid ""
9678 "\n"
@@ -9646,77 +9683,77 @@ msgstr ""
9683 "花了 %.2f 秒才计算出分支的领先/落后范围。\n"
9684 "为避免，您可以使用 '--no-ahead-behind'。\n"
9685
9649 -#: wt-status.c:1145
9686 +#: wt-status.c:1195
9687 msgid "You have unmerged paths."
9688 msgstr "您有尚未合并的路径。"
9689
9690 # 译者：注意保持前导空格
9654 -#: wt-status.c:1148
9691 +#: wt-status.c:1198
9692 msgid " (fix conflicts and run \"git commit\")"
9693 msgstr " （解决冲突并运行 \"git commit\"）"
9694
9695 # 译者：注意保持前导空格
9659 -#: wt-status.c:1150
9696 +#: wt-status.c:1200
9697 msgid " (use \"git merge --abort\" to abort the merge)"
9698 msgstr " （使用 \"git merge --abort\" 终止合并）"
9699
9663 -#: wt-status.c:1154
9700 +#: wt-status.c:1204
9701 msgid "All conflicts fixed but you are still merging."
9702 msgstr "所有冲突已解决但您仍处于合并中。"
9703
9704 # 译者：注意保持前导空格
9668 -#: wt-status.c:1157
9705 +#: wt-status.c:1207
9706 msgid " (use \"git commit\" to conclude merge)"
9707 msgstr " （使用 \"git commit\" 结束合并）"
9708
9672 -#: wt-status.c:1166
9709 +#: wt-status.c:1216
9710 msgid "You are in the middle of an am session."
9711 msgstr "您正处于 am 操作过程中。"
9712
9676 -#: wt-status.c:1169
9713 +#: wt-status.c:1219
9714 msgid "The current patch is empty."
9715 msgstr "当前的补丁为空。"
9716
9717 # 译者：注意保持前导空格
9681 -#: wt-status.c:1173
9718 +#: wt-status.c:1223
9719 msgid " (fix conflicts and then run \"git am --continue\")"
9720 msgstr " （解决冲突，然后运行 \"git am --continue\"）"
9721
9722 # 译者：注意保持前导空格
9686 -#: wt-status.c:1175
9723 +#: wt-status.c:1225
9724 msgid " (use \"git am --skip\" to skip this patch)"
9725 msgstr " （使用 \"git am --skip\" 跳过此补丁）"
9726
9727 # 译者：注意保持前导空格
9691 -#: wt-status.c:1177
9728 +#: wt-status.c:1227
9729 msgid " (use \"git am --abort\" to restore the original branch)"
9730 msgstr " （使用 \"git am --abort\" 恢复原有分支）"
9731
9695 -#: wt-status.c:1310
9732 +#: wt-status.c:1360
9733 msgid "git-rebase-todo is missing."
9734 msgstr "git-rebase-todo 丢失。"
9735
9699 -#: wt-status.c:1312
9736 +#: wt-status.c:1362
9737 msgid "No commands done."
9738 msgstr "没有命令被执行。"
9739
9703 -#: wt-status.c:1315
9740 +#: wt-status.c:1365
9741 #, c-format
9742 msgid "Last command done (%d command done):"
9743 msgid_plural "Last commands done (%d commands done):"
9744 msgstr[0] "最后一条命令已完成（%d 条命令被执行）："
9745 msgstr[1] "最后的命令已完成（%d 条命令被执行）："
9746
9710 -#: wt-status.c:1326
9747 +#: wt-status.c:1376
9748 #, c-format
9749 msgid " (see more in file %s)"
9750 msgstr " （更多参见文件 %s）"
9751
9715 -#: wt-status.c:1331
9752 +#: wt-status.c:1381
9753 msgid "No commands remaining."
9754 msgstr "未剩下任何命令。"
9755
9719 -#: wt-status.c:1334
9756 +#: wt-status.c:1384
9757 #, c-format
9758 msgid "Next command to do (%d remaining command):"
9759 msgid_plural "Next commands to do (%d remaining commands):"
@@ -9724,202 +9761,206 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）："
9761 msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："
9762
9763 # 译者：注意保持前导空格
9727 -#: wt-status.c:1342
9764 +#: wt-status.c:1392
9765 msgid " (use \"git rebase --edit-todo\" to view and edit)"
9766 msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"
9767
9731 -#: wt-status.c:1354
9768 +#: wt-status.c:1404
9769 #, c-format
9770 msgid "You are currently rebasing branch '%s' on '%s'."
9771 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
9772
9736 -#: wt-status.c:1359
9773 +#: wt-status.c:1409
9774 msgid "You are currently rebasing."
9775 msgstr "您在执行变基操作。"
9776
9777 # 译者：注意保持前导空格
9741 -#: wt-status.c:1372
9778 +#: wt-status.c:1422
9779 msgid " (fix conflicts and then run \"git rebase --continue\")"
9780 msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
9781
9782 # 译者：注意保持前导空格
9746 -#: wt-status.c:1374
9783 +#: wt-status.c:1424
9784 msgid " (use \"git rebase --skip\" to skip this patch)"
9785 msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
9786
9787 # 译者：注意保持前导空格
9751 -#: wt-status.c:1376
9788 +#: wt-status.c:1426
9789 msgid " (use \"git rebase --abort\" to check out the original branch)"
9790 msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
9791
9792 # 译者：注意保持前导空格
9756 -#: wt-status.c:1383
9793 +#: wt-status.c:1433
9794 msgid " (all conflicts fixed: run \"git rebase --continue\")"
9795 msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
9796
9760 -#: wt-status.c:1387
9797 +#: wt-status.c:1437
9798 #, c-format
9799 msgid ""
9800 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
9801 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
9802
9766 -#: wt-status.c:1392
9803 +#: wt-status.c:1442
9804 msgid "You are currently splitting a commit during a rebase."
9805 msgstr "您在执行变基操作时拆分提交。"
9806
9807 # 译者：注意保持前导空格
9771 -#: wt-status.c:1395
9808 +#: wt-status.c:1445
9809 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
9810 msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
9811
9775 -#: wt-status.c:1399
9812 +#: wt-status.c:1449
9813 #, c-format
9814 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
9815 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
9816
9780 -#: wt-status.c:1404
9817 +#: wt-status.c:1454
9818 msgid "You are currently editing a commit during a rebase."
9819 msgstr "您在执行变基操作时编辑提交。"
9820
9821 # 译者：注意保持前导空格
9785 -#: wt-status.c:1407
9822 +#: wt-status.c:1457
9823 msgid " (use \"git commit --amend\" to amend the current commit)"
9824 msgstr " （使用 \"git commit --amend\" 修补当前提交）"
9825
9826 # 译者：注意保持前导空格
9790 -#: wt-status.c:1409
9827 +#: wt-status.c:1459
9828 msgid ""
9829 " (use \"git rebase --continue\" once you are satisfied with your changes)"
9830 msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
9831
9795 -#: wt-status.c:1420
9832 +#: wt-status.c:1470
9833 msgid "Cherry-pick currently in progress."
9834 msgstr "拣选操作正在进行中。"
9835
9799 -#: wt-status.c:1423
9836 +#: wt-status.c:1473
9837 #, c-format
9838 msgid "You are currently cherry-picking commit %s."
9839 msgstr "您在执行拣选提交 %s 的操作。"
9840
9841 # 译者：注意保持前导空格
9805 -#: wt-status.c:1430
9842 +#: wt-status.c:1480
9843 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
9844 msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
9845
9846 # 译者：注意保持前导空格
9810 -#: wt-status.c:1433
9847 +#: wt-status.c:1483
9848 msgid " (run \"git cherry-pick --continue\" to continue)"
9849 msgstr " （执行 \"git cherry-pick --continue\" 以继续）"
9850
9851 # 译者：注意保持前导空格
9815 -#: wt-status.c:1436

This file is too large to show in full.