# tagger | 打标签者
# topic branch | 主题分支
# track | 跟踪
-# trailer | 尾部署名
+# trailer | 尾注
# tree | 树（工作区或树对象）
# tree object | 树对象
# tree-ish (also treeish) | 树对象（或可以解析为一树对象）
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-10-10 09:32+0800\n"
-"PO-Revision-Date: 2020-10-10 09:43+0800\n"
+"POT-Creation-Date: 2020-12-21 07:10+0800\n"
+"PO-Revision-Date: 2020-12-26 21:43+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: add-interactive.c:368
+#: add-interactive.c:376
#, c-format
msgid "Huh (%s)?"
msgstr "嗯（%s）？"
-#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250
-#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526
-#: builtin/rebase.c:1944
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284
+#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532
+#: builtin/rebase.c:1955
msgid "could not read index"
msgstr "不能读取索引"
-#: add-interactive.c:576 git-add--interactive.perl:269
+#: add-interactive.c:584 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "二进制"
-#: add-interactive.c:634 git-add--interactive.perl:278
+#: add-interactive.c:642 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "无"
-#: add-interactive.c:635 git-add--interactive.perl:314
+#: add-interactive.c:643 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "没有修改"
-#: add-interactive.c:672 git-add--interactive.perl:643
+#: add-interactive.c:680 git-add--interactive.perl:641
msgid "Update"
msgstr "更新"
-#: add-interactive.c:689 add-interactive.c:877
+#: add-interactive.c:697 add-interactive.c:885
#, c-format
msgid "could not stage '%s'"
msgstr "不能暂存 '%s'"
-#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478
msgid "could not write index"
msgstr "不能写入索引"
-#: add-interactive.c:698 git-add--interactive.perl:628
+#: add-interactive.c:706 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "更新了 %d 个路径\n"
msgstr[1] "更新了 %d 个路径\n"
-#: add-interactive.c:716 git-add--interactive.perl:678
+#: add-interactive.c:724 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "说明：%s 现已成为未跟踪的。\n"
-#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295
+#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295
#: builtin/reset.c:145
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
-#: add-interactive.c:751 git-add--interactive.perl:655
+#: add-interactive.c:759 git-add--interactive.perl:653
msgid "Revert"
msgstr "还原"
-#: add-interactive.c:767
+#: add-interactive.c:775
msgid "Could not parse HEAD^{tree}"
msgstr "不能解析 HEAD^{tree}"
-#: add-interactive.c:805 git-add--interactive.perl:631
+#: add-interactive.c:813 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "还原了 %d 个路径\n"
msgstr[1] "还原了 %d 个路径\n"
-#: add-interactive.c:856 git-add--interactive.perl:695
+#: add-interactive.c:864 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "没有未跟踪的文件。\n"
-#: add-interactive.c:860 git-add--interactive.perl:689
+#: add-interactive.c:868 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "添加未跟踪的"
-#: add-interactive.c:887 git-add--interactive.perl:625
+#: add-interactive.c:895 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "增加了 %d 个路径\n"
msgstr[1] "增加了 %d 个路径\n"
-#: add-interactive.c:917
+#: add-interactive.c:925
#, c-format
msgid "ignoring unmerged: %s"
msgstr "忽略未合入的：%s"
-#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "只有二进制文件被修改。\n"
-#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "没有修改。\n"
-#: add-interactive.c:935 git-add--interactive.perl:1381
+#: add-interactive.c:943 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "补丁更新"
-#: add-interactive.c:974 git-add--interactive.perl:1794
+#: add-interactive.c:982 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "检视 diff"
-#: add-interactive.c:1002
+#: add-interactive.c:1010
msgid "show paths with changes"
msgstr "显示含变更的路径"
-#: add-interactive.c:1004
+#: add-interactive.c:1012
msgid "add working tree state to the staged set of changes"
msgstr "将工作区状态添加到暂存区修改集中"
-#: add-interactive.c:1006
+#: add-interactive.c:1014
msgid "revert staged set of changes back to the HEAD version"
msgstr "将暂存的修改集恢复为 HEAD 版本"
-#: add-interactive.c:1008
+#: add-interactive.c:1016
msgid "pick hunks and update selectively"
msgstr "挑选数据块并有选择地更新"
-#: add-interactive.c:1010
+#: add-interactive.c:1018
msgid "view diff between HEAD and index"
msgstr "显示 HEAD 和索引的差异"
-#: add-interactive.c:1012
+#: add-interactive.c:1020
msgid "add contents of untracked files to the staged set of changes"
msgstr "将未跟踪文件的内容添加到暂存区修改集中"
-#: add-interactive.c:1020 add-interactive.c:1069
+#: add-interactive.c:1028 add-interactive.c:1077
msgid "Prompt help:"
msgstr "帮助："
-#: add-interactive.c:1022
+#: add-interactive.c:1030
msgid "select a single item"
msgstr "选择一个条目"
-#: add-interactive.c:1024
+#: add-interactive.c:1032
msgid "select a range of items"
msgstr "选择一系列条目"
-#: add-interactive.c:1026
+#: add-interactive.c:1034
msgid "select multiple ranges"
msgstr "选择多个范围"
-#: add-interactive.c:1028 add-interactive.c:1073
+#: add-interactive.c:1036 add-interactive.c:1081
msgid "select item based on unique prefix"
msgstr "基于唯一前缀选择条目"
-#: add-interactive.c:1030
+#: add-interactive.c:1038
msgid "unselect specified items"
msgstr "反选指定的条目"
-#: add-interactive.c:1032
+#: add-interactive.c:1040
msgid "choose all items"
msgstr "选择所有条目"
-#: add-interactive.c:1034
+#: add-interactive.c:1042
msgid "(empty) finish selecting"
msgstr "（空）结束选择"
-#: add-interactive.c:1071
+#: add-interactive.c:1079
msgid "select a numbered item"
msgstr "选择一个编号条目"
-#: add-interactive.c:1075
+#: add-interactive.c:1083
msgid "(empty) select nothing"
msgstr "（空）不选择任何内容"
-#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
msgid "What now"
msgstr "请选择"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "staged"
msgstr "缓存"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "unstaged"
msgstr "未缓存"
-#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270
-#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123
-#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190
+#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190
#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818
#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
msgid "path"
msgstr "路径"
-#: add-interactive.c:1143
+#: add-interactive.c:1151
msgid "could not refresh index"
msgstr "不能刷新索引"
-#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "再见。\n"
-#: add-patch.c:34 git-add--interactive.perl:1433
+#: add-patch.c:34 git-add--interactive.perl:1431
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1434
+#: add-patch.c:35 git-add--interactive.perl:1432
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:36 git-add--interactive.perl:1435
+#: add-patch.c:36 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:37 git-add--interactive.perl:1436
+#: add-patch.c:37 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "暂存该块 [y,n,q,a,d%s,?]? "
"a - 暂存该块和本文件中后面的全部块\n"
"d - 不暂存该块和本文件中后面的全部块\n"
-#: add-patch.c:56 git-add--interactive.perl:1439
+#: add-patch.c:56 git-add--interactive.perl:1437
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:57 git-add--interactive.perl:1440
+#: add-patch.c:57 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:58 git-add--interactive.perl:1441
+#: add-patch.c:58 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:59 git-add--interactive.perl:1442
+#: add-patch.c:59 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
"a - 贮藏该块和本文件中后面的全部块\n"
"d - 不贮藏该块和本文件中后面的全部块\n"
-#: add-patch.c:80 git-add--interactive.perl:1445
+#: add-patch.c:80 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:81 git-add--interactive.perl:1446
+#: add-patch.c:81 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:82 git-add--interactive.perl:1447
+#: add-patch.c:82 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:83 git-add--interactive.perl:1448
+#: add-patch.c:83 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
"a - 取消暂存该块和本文件中后面的全部块\n"
"d - 不要取消暂存该块和本文件中后面的全部块\n"
-#: add-patch.c:103 git-add--interactive.perl:1451
+#: add-patch.c:103 git-add--interactive.perl:1449
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:104 git-add--interactive.perl:1452
+#: add-patch.c:104 git-add--interactive.perl:1450
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:105 git-add--interactive.perl:1453
+#: add-patch.c:105 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:106 git-add--interactive.perl:1454
+#: add-patch.c:106 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块\n"
-#: add-patch.c:126 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:127 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:127 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:128 git-add--interactive.perl:1459
-#: git-add--interactive.perl:1477
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:129 git-add--interactive.perl:1460
-#: git-add--interactive.perl:1478
+#: add-patch.c:129 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块\n"
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块\n"
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
"between its input and output lines."
msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
-#: add-patch.c:785
+#: add-patch.c:790
#, c-format
msgid ""
"expected context line #%d in\n"
"预期上下文行 #%d 于\n"
"%.*s"
-#: add-patch.c:800
+#: add-patch.c:805
#, c-format
msgid ""
"hunks do not overlap:\n"
"\t不是结尾于：\n"
"%.*s"
-#: add-patch.c:1076 git-add--interactive.perl:1117
+#: add-patch.c:1081 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
-#: add-patch.c:1080
+#: add-patch.c:1085
#, c-format
msgid ""
"---\n"
"以 %c 开始的行将被删除。\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1094 git-add--interactive.perl:1131
+#: add-patch.c:1099 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
"此次编辑被终止，该块不会被修改。\n"
-#: add-patch.c:1127
+#: add-patch.c:1132
msgid "could not parse hunk header"
msgstr "无法解析数据块头信息"
-#: add-patch.c:1172
+#: add-patch.c:1177
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' 失败"
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1241 git-add--interactive.perl:1244
+#: add-patch.c:1246 git-add--interactive.perl:1242
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
-#: add-patch.c:1284
+#: add-patch.c:1289
msgid "The selected hunks do not apply to the index!"
msgstr "选中的块不能应用到索引！"
-#: add-patch.c:1285 git-add--interactive.perl:1348
+#: add-patch.c:1290 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
msgstr "无论如何都要应用到工作区么？"
-#: add-patch.c:1292 git-add--interactive.perl:1351
+#: add-patch.c:1297 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
msgstr "未应用。\n"
-#: add-patch.c:1349
+#: add-patch.c:1354
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
"e - 手动编辑当前块\n"
"? - 显示帮助\n"
-#: add-patch.c:1511 add-patch.c:1521
+#: add-patch.c:1516 add-patch.c:1526
msgid "No previous hunk"
msgstr "没有前一个块"
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1521 add-patch.c:1531
msgid "No next hunk"
msgstr "没有下一个块"
-#: add-patch.c:1532
+#: add-patch.c:1537
msgid "No other hunks to goto"
msgstr "没有其它可供跳转的块"
-#: add-patch.c:1543 git-add--interactive.perl:1608
+#: add-patch.c:1548 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
msgstr "跳转到哪个块（<回车> 查看更多）？ "
-#: add-patch.c:1544 git-add--interactive.perl:1610
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk? "
msgstr "跳转到哪个块？"
-#: add-patch.c:1555
+#: add-patch.c:1560
#, c-format
msgid "Invalid number: '%s'"
msgstr "无效数字：'%s'"
-#: add-patch.c:1560
+#: add-patch.c:1565
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "对不起，只有 %d 个可用块。"
msgstr[1] "对不起，只有 %d 个可用块。"
-#: add-patch.c:1569
+#: add-patch.c:1574
msgid "No other hunks to search"
msgstr "没有其它可供查找的块"
-#: add-patch.c:1575 git-add--interactive.perl:1663
+#: add-patch.c:1580 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr "使用正则表达式搜索？"
-#: add-patch.c:1590
+#: add-patch.c:1595
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "错误的正则表达式 %s：%s"
-#: add-patch.c:1607
+#: add-patch.c:1612
msgid "No hunk matches the given pattern"
msgstr "没有和给定模式相匹配的块"
-#: add-patch.c:1614
+#: add-patch.c:1619
msgid "Sorry, cannot split this hunk"
msgstr "对不起，不能拆分这个块"
-#: add-patch.c:1618
+#: add-patch.c:1623
#, c-format
msgid "Split into %d hunks."
msgstr "拆分为 %d 块。"
-#: add-patch.c:1622
+#: add-patch.c:1627
msgid "Sorry, cannot edit this hunk"
msgstr "对不起，不能编辑这个块"
-#: add-patch.c:1674
+#: add-patch.c:1679
msgid "'git apply' failed"
msgstr "'git apply' 失败"
-#: advice.c:140
+#: advice.c:143
#, c-format
msgid ""
"\n"
"\n"
"使用 \"git config advice.%s false\" 来关闭此消息"
-#: advice.c:156
+#: advice.c:159
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示：%.*s%s\n"
-#: advice.c:247
+#: advice.c:250
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "无法拣选，因为您有未合并的文件。"
-#: advice.c:249
+#: advice.c:252
msgid "Committing is not possible because you have unmerged files."
msgstr "无法提交，因为您有未合并的文件。"
-#: advice.c:251
+#: advice.c:254
msgid "Merging is not possible because you have unmerged files."
msgstr "无法合并，因为您有未合并的文件。"
-#: advice.c:253
+#: advice.c:256
msgid "Pulling is not possible because you have unmerged files."
msgstr "无法拉取，因为您有未合并的文件。"
-#: advice.c:255
+#: advice.c:258
msgid "Reverting is not possible because you have unmerged files."
msgstr "无法回退，因为您有未合并的文件。"
-#: advice.c:257
+#: advice.c:260
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "无法 %s，因为您有未合并的文件。"
-#: advice.c:265
+#: advice.c:268
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
"请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
"解决方案并提交。"
-#: advice.c:273
+#: advice.c:276
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
-#: advice.c:278 builtin/merge.c:1349
+#: advice.c:281 builtin/merge.c:1369
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
-#: advice.c:280
+#: advice.c:283
msgid "Please, commit your changes before merging."
msgstr "请在合并前先提交您的修改。"
-#: advice.c:281
+#: advice.c:284
msgid "Exiting because of unfinished merge."
msgstr "因为存在未完成的合并而退出。"
-#: advice.c:287
+#: advice.c:290
#, c-format
msgid ""
"Note: switching to '%s'.\n"
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
msgid "%s: does not exist in index"
msgstr "%s：不存在于索引中"
-#: apply.c:3537 apply.c:3708 apply.c:3953
+#: apply.c:3537 apply.c:3708 apply.c:3952
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不匹配"
msgid "%s: already exists in index"
msgstr "%s：已经存在于索引中"
-#: apply.c:3956
+#: apply.c:3954
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已经存在于工作区中"
-#: apply.c:3976
+#: apply.c:3974
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
-#: apply.c:3981
+#: apply.c:3979
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
-#: apply.c:4001
+#: apply.c:3999
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"
-#: apply.c:4005
+#: apply.c:4003
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：补丁未应用"
-#: apply.c:4020
+#: apply.c:4018
#, c-format
msgid "Checking patch %s..."
msgstr "正在检查补丁 %s..."
-#: apply.c:4112
+#: apply.c:4110
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模组 %s 的 sha1 信息缺失或无效"
-#: apply.c:4119
+#: apply.c:4117
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式变更，但它不在当前 HEAD 中"
-#: apply.c:4122
+#: apply.c:4120
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效（%s）。"
-#: apply.c:4131
+#: apply.c:4129
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在临时索引中添加 %s"
-#: apply.c:4141
+#: apply.c:4139
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把临时索引写入到 %s"
-#: apply.c:4279
+#: apply.c:4277
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-#: apply.c:4313
+#: apply.c:4311
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
-#: apply.c:4319
+#: apply.c:4317
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能对新建文件 '%s' 调用 stat"
-#: apply.c:4327
+#: apply.c:4325
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4331 apply.c:4476
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
-#: apply.c:4376 builtin/bisect--helper.c:537
+#: apply.c:4374 builtin/bisect--helper.c:524
#, c-format
msgid "failed to write to '%s'"
msgstr "写入 '%s' 失败"
-#: apply.c:4380
+#: apply.c:4378
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: apply.c:4450
+#: apply.c:4448
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
-#: apply.c:4548
+#: apply.c:4546
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
-#: apply.c:4556
+#: apply.c:4554
msgid "internal error"
msgstr "内部错误"
-#: apply.c:4559
+#: apply.c:4557
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
-#: apply.c:4570
+#: apply.c:4568
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228
+#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
-#: apply.c:4592
+#: apply.c:4590
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
-#: apply.c:4596
+#: apply.c:4594
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
-#: apply.c:4715
+#: apply.c:4718
#, c-format
msgid "Skipped patch '%s'."
msgstr "略过补丁 '%s'。"
-#: apply.c:4723
+#: apply.c:4726
msgid "unrecognized input"
msgstr "未能识别的输入"
-#: apply.c:4743
+#: apply.c:4746
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: apply.c:4900
+#: apply.c:4903
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s'：%s"
-#: apply.c:4927
+#: apply.c:4930
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: apply.c:4933 apply.c:4948
+#: apply.c:4936 apply.c:4951
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字符误用。"
msgstr[1] "%d 行新增了空白字符误用。"
-#: apply.c:4941
+#: apply.c:4944
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "修复空白错误后，应用了 %d 行。"
msgstr[1] "修复空白错误后，应用了 %d 行。"
-#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406
+#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: apply.c:4985
+#: apply.c:4988
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
-#: apply.c:4988
+#: apply.c:4991
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: apply.c:4990 builtin/am.c:2279
+#: apply.c:4993 builtin/am.c:2266
msgid "num"
msgstr "数字"
-#: apply.c:4991
+#: apply.c:4994
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: apply.c:4994
+#: apply.c:4997
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
-#: apply.c:4996
+#: apply.c:4999
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
-#: apply.c:5000
+#: apply.c:5003
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
-#: apply.c:5002
+#: apply.c:5005
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁，而是显示输入的概要"
-#: apply.c:5004
+#: apply.c:5007
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁，而是查看补丁是否可应用"
-#: apply.c:5006
+#: apply.c:5009
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
-#: apply.c:5008
+#: apply.c:5011
msgid "mark new files with `git add --intent-to-add`"
msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
-#: apply.c:5010
+#: apply.c:5013
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
-#: apply.c:5012
+#: apply.c:5015
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
-#: apply.c:5015
+#: apply.c:5018
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
-#: apply.c:5017
+#: apply.c:5020
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三方合并"
-#: apply.c:5019
+#: apply.c:5022
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525
+#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: apply.c:5024
+#: apply.c:5027
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98
+#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3562 builtin/rebase.c:1340
+#: builtin/pack-objects.c:3562 builtin/rebase.c:1346
msgid "action"
msgstr "动作"
-#: apply.c:5026
+#: apply.c:5029
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: apply.c:5029 apply.c:5032
+#: apply.c:5032 apply.c:5035
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
-#: apply.c:5035
+#: apply.c:5038
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
-#: apply.c:5037
+#: apply.c:5040
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: apply.c:5039
+#: apply.c:5042
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: apply.c:5041
+#: apply.c:5044
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22
+#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22
#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775
-#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128
+#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "冗长输出"
-#: apply.c:5044
+#: apply.c:5047
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
-#: apply.c:5047
+#: apply.c:5050
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: apply.c:5049 builtin/am.c:2267
+#: apply.c:5052 builtin/am.c:2254
msgid "root"
msgstr "根目录"
-#: apply.c:5050
+#: apply.c:5053
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "不支持的文件模式：0%o (SHA1: %s)"
-#: archive-tar.c:449
+#: archive-tar.c:450
#, c-format
msgid "unable to start '%s' filter"
msgstr "无法启动 '%s' 过滤器"
-#: archive-tar.c:452
+#: archive-tar.c:453
msgid "unable to redirect descriptor"
msgstr "无法重定向描述符"
-#: archive-tar.c:459
+#: archive-tar.c:460
#, c-format
msgid "'%s' filter reported error"
msgstr "'%s' 过滤器报告了错误"
msgid "cannot read %s"
msgstr "不能读取 %s"
-#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852
-#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786
-#: builtin/merge.c:1124
+#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886
+#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1138
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
msgid "Not a regular file: %s"
msgstr "不是一个常规文件：%s"
-#: archive.c:553
+#: archive.c:555
msgid "fmt"
msgstr "格式"
-#: archive.c:553
+#: archive.c:555
msgid "archive format"
msgstr "归档格式"
-#: archive.c:554 builtin/log.c:1760
+#: archive.c:556 builtin/log.c:1765
msgid "prefix"
msgstr "前缀"
-#: archive.c:555
+#: archive.c:557
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
-#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105
+#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890
+#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105
#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412
#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
msgid "file"
msgstr "文件"
-#: archive.c:557
+#: archive.c:559
msgid "add untracked file to archive"
msgstr "将未跟踪文件添加到归档"
-#: archive.c:560 builtin/archive.c:90
+#: archive.c:562 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "归档写入此文件"
-#: archive.c:562
+#: archive.c:564
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
-#: archive.c:563
+#: archive.c:565
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
-#: archive.c:564
-msgid "store only"
-msgstr "只存储"
-
-#: archive.c:565
-msgid "compress faster"
-msgstr "压缩速度更快"
-
-#: archive.c:573
-msgid "compress better"
-msgstr "压缩效果更好"
+#: archive.c:567
+msgid "set compression level"
+msgstr "设置压缩级别"
-#: archive.c:576
+#: archive.c:570
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
-#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
msgid "repo"
msgstr "仓库"
-#: archive.c:579 builtin/archive.c:92
+#: archive.c:573 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库（<仓库>）提取归档文件"
-#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715
+#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
#: builtin/notes.c:498
msgid "command"
msgstr "命令"
-#: archive.c:581 builtin/archive.c:94
+#: archive.c:575 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
-#: archive.c:588
+#: archive.c:582
msgid "Unexpected option --remote"
msgstr "未知参数 --remote"
-#: archive.c:590
+#: archive.c:584
msgid "Option --exec can only be used together with --remote"
msgstr "选项 --exec 只能和 --remote 同时使用"
-#: archive.c:592
+#: archive.c:586
msgid "Unexpected option --output"
msgstr "未知参数 --output"
-#: archive.c:594
+#: archive.c:588
msgid "Options --add-file and --remote cannot be used together"
msgstr "选项 --add-file 和 --remote 不能同时使用"
-#: archive.c:616
+#: archive.c:610
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知归档格式 '%s'"
-#: archive.c:623
+#: archive.c:619
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "参数不支持此格式 '%s'：-%d"
-#: attr.c:212
+#: attr.c:202
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是一个有效的属性名"
-#: attr.c:369
+#: attr.c:359
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "不允许 %s：%s:%d"
-#: attr.c:409
+#: attr.c:399
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时，使用 '\\!'。"
-#: bisect.c:476
+#: bisect.c:489
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "文件 '%s' 包含错误的引用格式：%s"
-#: bisect.c:686
+#: bisect.c:699
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我们无法进行更多的二分查找！\n"
-#: bisect.c:753
+#: bisect.c:766
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一个有效的提交名 %s"
-#: bisect.c:778
+#: bisect.c:791
#, c-format
msgid ""
"The merge base %s is bad.\n"
"合并基线 %s 是坏的。\n"
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
-#: bisect.c:783
+#: bisect.c:796
#, c-format
msgid ""
"The merge base %s is new.\n"
"合并基线 %s 是新的。\n"
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
-#: bisect.c:788
+#: bisect.c:801
#, c-format
msgid ""
"The merge base %s is %s.\n"
"合并基线 %s 是 %s。\n"
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
-#: bisect.c:796
+#: bisect.c:809
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"这种情况下 git 二分查找无法正常工作。\n"
"您可能弄错了 %s 和 %s 版本？\n"
-#: bisect.c:809
+#: bisect.c:822
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
"我们仍旧继续。"
-#: bisect.c:848
+#: bisect.c:861
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中：合并基线必须是经过测试的\n"
-#: bisect.c:898
+#: bisect.c:911
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
-#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
-#: bisect.c:974 builtin/merge.c:150
+#: bisect.c:987 builtin/merge.c:152
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
-#: bisect.c:1014
+#: bisect.c:1027
msgid "reading bisect refs failed"
msgstr "读取二分查找引用失败"
-#: bisect.c:1044
+#: bisect.c:1057
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同时为 %s 和 %s\n"
-#: bisect.c:1053
+#: bisect.c:1066
#, c-format
msgid ""
"No testable commit found.\n"
"没有发现可测试的提交。\n"
"可能您在运行时使用了错误的路径参数？\n"
-#: bisect.c:1082
+#: bisect.c:1095
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1088
+#: bisect.c:1101
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
-#: blame.c:2778
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
-#: blame.c:2792
+#: blame.c:2791
msgid "cannot use --contents with final commit object name"
msgstr "不能将 --contents 和最终的提交对象名共用"
-#: blame.c:2813
+#: blame.c:2812
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105
-#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404
-#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319
-#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395
-#: builtin/shortlog.c:320
+#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138
+#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409
+#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336
+#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395
+#: builtin/shortlog.c:267
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
-#: blame.c:2840
+#: blame.c:2839
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
-#: blame.c:2851
+#: blame.c:2850
#, c-format
msgid "no such path %s in %s"
msgstr "在 %2$s 中无此路径 %1$s"
-#: blame.c:2862
+#: blame.c:2861
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "不能为路径 %2$s 读取数据对象 %1$s"
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头：%s%s (%d)"
-#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142
+#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176
#: builtin/commit.c:814
#, c-format
msgid "could not open '%s'"
msgid "cannot write bundle version %d with algorithm %s"
msgstr "不能写入，归档包版本 %d 不支持算法 %s"
-#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461
+#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
msgid "invalid color value: %.*s"
msgstr "无效的颜色值：%.*s"
-#: commit-graph.c:188 midx.c:46
+#: commit-graph.c:188 midx.c:47
msgid "invalid hash version"
msgstr "无效的哈希版本"
msgid "could not find commit %s"
msgstr "无法找到提交 %s"
-#: commit-graph.c:1042 builtin/am.c:1306
+#: commit-graph.c:1036 builtin/am.c:1292
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: commit-graph.c:1265 builtin/pack-objects.c:2864
+#: commit-graph.c:1252 builtin/pack-objects.c:2864
#, c-format
msgid "unable to get type of object %s"
msgstr "无法获得对象 %s 类型"
-#: commit-graph.c:1301
+#: commit-graph.c:1283
msgid "Loading known commits in commit graph"
msgstr "正在加载提交图中的已知提交"
-#: commit-graph.c:1318
+#: commit-graph.c:1300
msgid "Expanding reachable commits in commit graph"
msgstr "正在扩展提交图中的可达提交"
-#: commit-graph.c:1338
+#: commit-graph.c:1320
msgid "Clearing commit marks in commit graph"
msgstr "正在清除提交图中的提交标记"
-#: commit-graph.c:1357
+#: commit-graph.c:1339
msgid "Computing commit graph generation numbers"
msgstr "正在计算提交图世代数字"
-#: commit-graph.c:1424
+#: commit-graph.c:1406
msgid "Computing commit changed paths Bloom filters"
msgstr "计算提交变更路径的布隆过滤器"
-#: commit-graph.c:1501
+#: commit-graph.c:1483
msgid "Collecting referenced commits"
msgstr "正在收集引用的提交"
-#: commit-graph.c:1526
+#: commit-graph.c:1508
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "正在 %d 个包中查找提交图的提交"
msgstr[1] "正在 %d 个包中查找提交图的提交"
-#: commit-graph.c:1539
+#: commit-graph.c:1521
#, c-format
msgid "error adding pack %s"
msgstr "添加包 %s 出错"
-#: commit-graph.c:1543
+#: commit-graph.c:1525
#, c-format
msgid "error opening index for %s"
msgstr "为 %s 打开索引出错"
-#: commit-graph.c:1582
+#: commit-graph.c:1562
msgid "Finding commits for commit graph among packed objects"
msgstr "正在打包对象中查找提交图的提交"
-#: commit-graph.c:1597
-msgid "Counting distinct commits in commit graph"
-msgstr "正在计算提交图中不同的提交"
-
-#: commit-graph.c:1629
+#: commit-graph.c:1580
msgid "Finding extra edges in commit graph"
msgstr "正在查找提交图中额外的边"
-#: commit-graph.c:1678
+#: commit-graph.c:1628
msgid "failed to write correct number of base graph ids"
msgstr "无法写入正确数量的基础图形 ID"
-#: commit-graph.c:1720 midx.c:826
+#: commit-graph.c:1670 midx.c:819
#, c-format
msgid "unable to create leading directories of %s"
msgstr "不能为 %s 创建先导目录"
-#: commit-graph.c:1733
+#: commit-graph.c:1683
msgid "unable to create temporary graph layer"
msgstr "无法创建临时图层"
-#: commit-graph.c:1738
+#: commit-graph.c:1688
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "无法为 '%s' 调整共享权限"
-#: commit-graph.c:1808
+#: commit-graph.c:1758
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "正在用 %d 步写出提交图"
msgstr[1] "正在用 %d 步写出提交图"
-#: commit-graph.c:1853
+#: commit-graph.c:1803
msgid "unable to open commit-graph chain file"
msgstr "无法打开提交图形链文件"
-#: commit-graph.c:1869
+#: commit-graph.c:1819
msgid "failed to rename base commit-graph file"
msgstr "无法重命名基础提交图形文件"
-#: commit-graph.c:1889
+#: commit-graph.c:1839
msgid "failed to rename temporary commit-graph file"
msgstr "无法重命名临时提交图形文件"
-#: commit-graph.c:2015
+#: commit-graph.c:1965
msgid "Scanning merged commits"
msgstr "正在扫描合并提交"
-#: commit-graph.c:2026
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "意外的重复提交 ID %s"
-
-#: commit-graph.c:2049
+#: commit-graph.c:2009
msgid "Merging commit-graph"
msgstr "正在合并提交图形"
-#: commit-graph.c:2259
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "提交图格式不能写入 %d 个提交"
+#: commit-graph.c:2115
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
-#: commit-graph.c:2270
+#: commit-graph.c:2214
msgid "too many commits to write graph"
msgstr "提交太多不能画图"
-#: commit-graph.c:2363
+#: commit-graph.c:2307
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "提交图文件的校验码错误，可能已经损坏"
-#: commit-graph.c:2373
+#: commit-graph.c:2317
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
-#: commit-graph.c:2383 commit-graph.c:2398
+#: commit-graph.c:2327 commit-graph.c:2342
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
-#: commit-graph.c:2390
+#: commit-graph.c:2334
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "无法从提交图形中解析提交 %s"
-#: commit-graph.c:2408
+#: commit-graph.c:2352
msgid "Verifying commits in commit graph"
msgstr "正在校验提交图中的提交"
-#: commit-graph.c:2423
+#: commit-graph.c:2367
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr "无法从提交图形的对象库中解析提交 %s"
-#: commit-graph.c:2430
+#: commit-graph.c:2374
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
-#: commit-graph.c:2440
+#: commit-graph.c:2384
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "提交 %s 的提交图形父提交列表太长了"
-#: commit-graph.c:2449
+#: commit-graph.c:2393
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "%s 的提交图形父提交是 %s != %s"
-#: commit-graph.c:2463
+#: commit-graph.c:2407
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "提交 %s 的提交图形父提交列表过早终止"
-#: commit-graph.c:2468
+#: commit-graph.c:2412
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
-#: commit-graph.c:2472
+#: commit-graph.c:2416
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
-#: commit-graph.c:2488
+#: commit-graph.c:2432
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
-#: commit-graph.c:2494
+#: commit-graph.c:2438
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417
-#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457
+#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
msgid "key does not contain variable name: %s"
msgstr "键名没有包含变量名：%s"
-#: config.c:408 sequencer.c:2547
+#: config.c:408 sequencer.c:2580
#, c-format
msgid "invalid key: %s"
msgstr "无效键名：%s"
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: config.c:2470
+#: config.c:2473
#, c-format
msgid "invalid section name '%s'"
msgstr "无效的小节名称 '%s'"
-#: config.c:2502
+#: config.c:2505
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
-#: config.c:2531
+#: config.c:2534
#, c-format
msgid "failed to write new configuration file %s"
msgstr "写入新的配置文件 %s 失败"
-#: config.c:2783 config.c:3107
+#: config.c:2786 config.c:3112
#, c-format
msgid "could not lock config file %s"
msgstr "不能锁定配置文件 %s"
-#: config.c:2794
+#: config.c:2797
#, c-format
msgid "opening %s"
msgstr "打开 %s"
-#: config.c:2829 builtin/config.c:354
+#: config.c:2834 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "无效模式：%s"
-#: config.c:2854
+#: config.c:2859
#, c-format
msgid "invalid config file %s"
msgstr "无效的配置文件 %s"
-#: config.c:2867 config.c:3120
+#: config.c:2872 config.c:3125
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
-#: config.c:2878
+#: config.c:2883
#, c-format
msgid "unable to mmap '%s'"
msgstr "不能 mmap '%s'"
-#: config.c:2887 config.c:3125
+#: config.c:2892 config.c:3130
#, c-format
msgid "chmod on %s failed"
msgstr "对 %s 调用 chmod 失败"
-#: config.c:2972 config.c:3222
+#: config.c:2977 config.c:3227
#, c-format
msgid "could not write config file %s"
msgstr "不能写入配置文件 %s"
-#: config.c:3006
+#: config.c:3011
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
-#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858
+#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
-#: config.c:3098
+#: config.c:3103
#, c-format
msgid "invalid section name: %s"
msgstr "无效的小节名称：%s"
-#: config.c:3265
+#: config.c:3270
#, c-format
msgid "missing value for '%s'"
msgstr "%s 的取值缺失"
msgid "Marked %d islands, done.\n"
msgstr "已标记 %d 个数据岛，结束。\n"
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base 不适用于范围"
+
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr "--merge-base 仅适用于提交"
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr "不能解析 HEAD"
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr "未找到合并基线"
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr "找到了多条合并基线"
+
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git diff --no-index [<选项>] <路径> <路径>"
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"
-#: diff.c:4269
+#: diff.c:4276
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出，停止在 %s"
-#: diff.c:4618
+#: diff.c:4625
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: diff.c:4621
+#: diff.c:4628
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G、-S 和 --find-object 是互斥的"
-#: diff.c:4699
+#: diff.c:4707
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"
-#: diff.c:4747
+#: diff.c:4755
#, c-format
msgid "invalid --stat value: %s"
msgstr "无效的 --stat 值：%s"
-#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279
+#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303
#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
#, c-format
msgid "%s expects a numerical value"
msgstr "%s 期望一个数字值"
-#: diff.c:4784
+#: diff.c:4792
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"
-#: diff.c:4869
+#: diff.c:4877
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
-#: diff.c:4893
+#: diff.c:4901
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "ws-error-highlight=%.*s 之后未知的值"
-#: diff.c:4907
+#: diff.c:4915
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析 '%s'"
-#: diff.c:4957 diff.c:4963
+#: diff.c:4965 diff.c:4971
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s 期望 <n>/<m> 格式"
-#: diff.c:4975
+#: diff.c:4983
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s 期望一个字符，得到 '%s'"
-#: diff.c:4996
+#: diff.c:5004
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "坏的 --color-moved 参数：%s"
-#: diff.c:5015
+#: diff.c:5023
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "--color-moved-ws 中的无效模式 '%s' "
-#: diff.c:5055
+#: diff.c:5063
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
-#: diff.c:5091 diff.c:5111
+#: diff.c:5099 diff.c:5119
#, c-format
msgid "invalid argument to %s"
msgstr "%s 的参数无效"
-#: diff.c:5248
+#: diff.c:5223
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "选项 -I 的正则表达式无效：'%s'"
+
+#: diff.c:5272
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数：'%s'"
-#: diff.c:5304
+#: diff.c:5328
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "坏的 --word-diff 参数：%s"
-#: diff.c:5327
+#: diff.c:5351
msgid "Diff output format options"
msgstr "差异输出格式化选项"
-#: diff.c:5329 diff.c:5335
+#: diff.c:5353 diff.c:5359
msgid "generate patch"
msgstr "生成补丁"
-#: diff.c:5332 builtin/log.c:176
+#: diff.c:5356 builtin/log.c:178
msgid "suppress diff output"
msgstr "不显示差异输出"
-#: diff.c:5337 diff.c:5451 diff.c:5458
+#: diff.c:5361 diff.c:5475 diff.c:5482
msgid "<n>"
msgstr "<n>"
-#: diff.c:5338 diff.c:5341
+#: diff.c:5362 diff.c:5365
msgid "generate diffs with <n> lines context"
msgstr "生成含 <n> 行上下文的差异"
-#: diff.c:5343
+#: diff.c:5367
msgid "generate the diff in raw format"
msgstr "生成原始格式的差异"
-#: diff.c:5346
+#: diff.c:5370
msgid "synonym for '-p --raw'"
msgstr "和 '-p --raw' 同义"
-#: diff.c:5350
+#: diff.c:5374
msgid "synonym for '-p --stat'"
msgstr "和 '-p --stat' 同义"
-#: diff.c:5354
+#: diff.c:5378
msgid "machine friendly --stat"
msgstr "机器友好的 --stat"
-#: diff.c:5357
+#: diff.c:5381
msgid "output only the last line of --stat"
msgstr "只输出 --stat 的最后一行"
-#: diff.c:5359 diff.c:5367
+#: diff.c:5383 diff.c:5391
msgid "<param1,param2>..."
msgstr "<参数1,参数2>..."
-#: diff.c:5360
+#: diff.c:5384
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "输出每个子目录相对变更的分布"
-#: diff.c:5364
+#: diff.c:5388
msgid "synonym for --dirstat=cumulative"
msgstr "和 --dirstat=cumulative 同义"
-#: diff.c:5368
+#: diff.c:5392
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "是 --dirstat=files,param1,param2... 的同义词"
-#: diff.c:5372
+#: diff.c:5396
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
-#: diff.c:5375
+#: diff.c:5399
msgid "condensed summary such as creations, renames and mode changes"
msgstr "精简摘要，例如创建、重命名和模式变更"
-#: diff.c:5378
+#: diff.c:5402
msgid "show only names of changed files"
msgstr "只显示变更文件的文件名"
-#: diff.c:5381
+#: diff.c:5405
msgid "show only names and status of changed files"
msgstr "只显示变更文件的文件名和状态"
-#: diff.c:5383
+#: diff.c:5407
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
-#: diff.c:5384
+#: diff.c:5408
msgid "generate diffstat"
msgstr "生成差异统计（diffstat）"
-#: diff.c:5386 diff.c:5389 diff.c:5392
+#: diff.c:5410 diff.c:5413 diff.c:5416
msgid "<width>"
msgstr "<宽度>"
-#: diff.c:5387
+#: diff.c:5411
msgid "generate diffstat with a given width"
msgstr "使用给定的长度生成差异统计"
-#: diff.c:5390
+#: diff.c:5414
msgid "generate diffstat with a given name width"
msgstr "使用给定的文件名长度生成差异统计"
-#: diff.c:5393
+#: diff.c:5417
msgid "generate diffstat with a given graph width"
msgstr "使用给定的图形长度生成差异统计"
-#: diff.c:5395
+#: diff.c:5419
msgid "<count>"
msgstr "<次数>"
-#: diff.c:5396
+#: diff.c:5420
msgid "generate diffstat with limited lines"
msgstr "生成有限行数的差异统计"
-#: diff.c:5399
+#: diff.c:5423
msgid "generate compact summary in diffstat"
msgstr "生成差异统计的简洁摘要"
-#: diff.c:5402
+#: diff.c:5426
msgid "output a binary diff that can be applied"
msgstr "输出一个可以应用的二进制差异"
-#: diff.c:5405
+#: diff.c:5429
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "在 \"index\" 行显示完整的前后对象名称"
-#: diff.c:5407
+#: diff.c:5431
msgid "show colored diff"
msgstr "显示带颜色的差异"
-#: diff.c:5408
+#: diff.c:5432
msgid "<kind>"
msgstr "<类型>"
-#: diff.c:5409
+#: diff.c:5433
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
-#: diff.c:5412
+#: diff.c:5436
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
"符"
-#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527
+#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554
msgid "<prefix>"
msgstr "<前缀>"
-#: diff.c:5416
+#: diff.c:5440
msgid "show the given source prefix instead of \"a/\""
msgstr "显示给定的源前缀取代 \"a/\""
-#: diff.c:5419
+#: diff.c:5443
msgid "show the given destination prefix instead of \"b/\""
msgstr "显示给定的目标前缀取代 \"b/\""
-#: diff.c:5422
+#: diff.c:5446
msgid "prepend an additional prefix to every line of output"
msgstr "输出的每一行附加前缀"
-#: diff.c:5425
+#: diff.c:5449
msgid "do not show any source or destination prefix"
msgstr "不显示任何源和目标前缀"
-#: diff.c:5428
+#: diff.c:5452
msgid "show context between diff hunks up to the specified number of lines"
msgstr "显示指定行数的差异块间的上下文"
-#: diff.c:5432 diff.c:5437 diff.c:5442
+#: diff.c:5456 diff.c:5461 diff.c:5466
msgid "<char>"
msgstr "<字符>"
-#: diff.c:5433
+#: diff.c:5457
msgid "specify the character to indicate a new line instead of '+'"
msgstr "指定一个字符取代 '+' 来表示新的一行"
-#: diff.c:5438
+#: diff.c:5462
msgid "specify the character to indicate an old line instead of '-'"
msgstr "指定一个字符取代 '-' 来表示旧的一行"
-#: diff.c:5443
+#: diff.c:5467
msgid "specify the character to indicate a context instead of ' '"
msgstr "指定一个字符取代 ' ' 来表示一行上下文"
-#: diff.c:5446
+#: diff.c:5470
msgid "Diff rename options"
msgstr "差异重命名选项"
-#: diff.c:5447
+#: diff.c:5471
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5448
+#: diff.c:5472
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "将完全重写的变更打破为成对的删除和创建"
-#: diff.c:5452
+#: diff.c:5476
msgid "detect renames"
msgstr "检测重命名"
-#: diff.c:5456
+#: diff.c:5480
msgid "omit the preimage for deletes"
msgstr "省略删除操作的差异输出"
-#: diff.c:5459
+#: diff.c:5483
msgid "detect copies"
msgstr "检测拷贝"
-#: diff.c:5463
+#: diff.c:5487
msgid "use unmodified files as source to find copies"
msgstr "使用未修改的文件做为发现拷贝的源"
-#: diff.c:5465
+#: diff.c:5489
msgid "disable rename detection"
msgstr "禁用重命名探测"
-#: diff.c:5468
+#: diff.c:5492
msgid "use empty blobs as rename source"
msgstr "使用空的数据对象做为重命名的源"
-#: diff.c:5470
+#: diff.c:5494
msgid "continue listing the history of a file beyond renames"
msgstr "继续列出文件重命名以外的历史记录"
-#: diff.c:5473
+#: diff.c:5497
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
-#: diff.c:5475
+#: diff.c:5499
msgid "Diff algorithm options"
msgstr "差异算法选项"
-#: diff.c:5477
+#: diff.c:5501
msgid "produce the smallest possible diff"
msgstr "生成尽可能小的差异"
-#: diff.c:5480
+#: diff.c:5504
msgid "ignore whitespace when comparing lines"
msgstr "行比较时忽略空白字符"
-#: diff.c:5483
+#: diff.c:5507
msgid "ignore changes in amount of whitespace"
msgstr "忽略空白字符的变更"
-#: diff.c:5486
+#: diff.c:5510
msgid "ignore changes in whitespace at EOL"
msgstr "忽略行尾的空白字符变更"
-#: diff.c:5489
+#: diff.c:5513
msgid "ignore carrier-return at the end of line"
msgstr "忽略行尾的回车符（CR）"
-#: diff.c:5492
+#: diff.c:5516
msgid "ignore changes whose lines are all blank"
msgstr "忽略整行都是空白的变更"
-#: diff.c:5495
+#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588
+msgid "<regex>"
+msgstr "<正则>"
+
+#: diff.c:5519
+msgid "ignore changes whose all lines match <regex>"
+msgstr "忽略所有行都和正则表达式匹配的变更"
+
+#: diff.c:5522
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "启发式转换差异边界以便阅读"
-#: diff.c:5498
+#: diff.c:5525
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "使用 \"patience diff\" 算法生成差异"
-#: diff.c:5502
+#: diff.c:5529
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "使用 \"histogram diff\" 算法生成差异"
-#: diff.c:5504
+#: diff.c:5531
msgid "<algorithm>"
msgstr "<算法>"
-#: diff.c:5505
+#: diff.c:5532
msgid "choose a diff algorithm"
msgstr "选择一个差异算法"
-#: diff.c:5507
+#: diff.c:5534
msgid "<text>"
msgstr "<文本>"
-#: diff.c:5508
+#: diff.c:5535
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "使用 \"anchored diff\" 算法生成差异"
-#: diff.c:5510 diff.c:5519 diff.c:5522
+#: diff.c:5537 diff.c:5546 diff.c:5549
msgid "<mode>"
msgstr "<模式>"
-#: diff.c:5511
+#: diff.c:5538
msgid "show word diff, using <mode> to delimit changed words"
msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
-#: diff.c:5513 diff.c:5516 diff.c:5561
-msgid "<regex>"
-msgstr "<正则>"
-
-#: diff.c:5514
+#: diff.c:5541
msgid "use <regex> to decide what a word is"
msgstr "使用 <正则表达式> 确定何为一个词"
-#: diff.c:5517
+#: diff.c:5544
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
-#: diff.c:5520
+#: diff.c:5547
msgid "moved lines of code are colored differently"
msgstr "移动的代码行用不同方式着色"
-#: diff.c:5523
+#: diff.c:5550
msgid "how white spaces are ignored in --color-moved"
msgstr "在 --color-moved 下如何忽略空白字符"
-#: diff.c:5526
+#: diff.c:5553
msgid "Other diff options"
msgstr "其它差异选项"
-#: diff.c:5528
+#: diff.c:5555
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
-#: diff.c:5532
+#: diff.c:5559
msgid "treat all files as text"
msgstr "把所有文件当做文本处理"
-#: diff.c:5534
+#: diff.c:5561
msgid "swap two inputs, reverse the diff"
msgstr "交换两个输入，反转差异"
-#: diff.c:5536
+#: diff.c:5563
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "有差异时退出码为 1，否则为 0"
-#: diff.c:5538
+#: diff.c:5565
msgid "disable all output of the program"
msgstr "禁用本程序的所有输出"
-#: diff.c:5540
+#: diff.c:5567
msgid "allow an external diff helper to be executed"
msgstr "允许执行一个外置的差异助手"
-#: diff.c:5542
+#: diff.c:5569
msgid "run external text conversion filters when comparing binary files"
msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
-#: diff.c:5544
+#: diff.c:5571
msgid "<when>"
msgstr "<何时>"
-#: diff.c:5545
+#: diff.c:5572
msgid "ignore changes to submodules in the diff generation"
msgstr "在生成差异时，忽略子模组的更改"
-#: diff.c:5548
+#: diff.c:5575
msgid "<format>"
msgstr "<格式>"
-#: diff.c:5549
+#: diff.c:5576
msgid "specify how differences in submodules are shown"
msgstr "指定子模组的差异如何显示"
-#: diff.c:5553
+#: diff.c:5580
msgid "hide 'git add -N' entries from the index"
msgstr "隐藏索引中 'git add -N' 条目"
-#: diff.c:5556
+#: diff.c:5583
msgid "treat 'git add -N' entries as real in the index"
msgstr "将索引中 'git add -N' 条目当做真实的"
-#: diff.c:5558
+#: diff.c:5585
msgid "<string>"
msgstr "<字符串>"
-#: diff.c:5559
+#: diff.c:5586
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "查找改变了指定字符串出现次数的差异"
-#: diff.c:5562
+#: diff.c:5589
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "查找改变指定正则匹配出现次数的差异"
-#: diff.c:5565
+#: diff.c:5592
msgid "show all changes in the changeset with -S or -G"
msgstr "显示使用 -S 或 -G 的变更集的所有变更"
-#: diff.c:5568
+#: diff.c:5595
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
-#: diff.c:5571
+#: diff.c:5598
msgid "control the order in which files appear in the output"
msgstr "控制输出中的文件显示顺序"
-#: diff.c:5572
+#: diff.c:5599
msgid "<object-id>"
msgstr "<对象 ID>"
-#: diff.c:5573
+#: diff.c:5600
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "查找改变指定对象出现次数的差异"
-#: diff.c:5575
+#: diff.c:5602
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5576
+#: diff.c:5603
msgid "select files by diff type"
msgstr "通过差异类型选择文件"
-#: diff.c:5578
+#: diff.c:5605
msgid "<file>"
msgstr "<文件>"
-#: diff.c:5579
+#: diff.c:5606
msgid "Output to a specific file"
msgstr "输出到一个指定的文件"
-#: diff.c:6236
+#: diff.c:6263
msgid "inexact rename detection was skipped due to too many files."
msgstr "因为文件太多，略过不严格的重命名检查。"
-#: diff.c:6239
+#: diff.c:6266
msgid "only found copies from modified paths due to too many files."
msgstr "因为文件太多，只在修改的路径中查找拷贝。"
-#: diff.c:6242
+#: diff.c:6269
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgid "too many args to run %s"
msgstr "执行 %s 的参数太多"
-#: fetch-pack.c:176
+#: fetch-pack.c:177
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack：应为 shallow 列表"
-#: fetch-pack.c:179
+#: fetch-pack.c:180
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"
-#: fetch-pack.c:190
+#: fetch-pack.c:191
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"
-#: fetch-pack.c:210
+#: fetch-pack.c:211
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-#: fetch-pack.c:221
+#: fetch-pack.c:222
msgid "unable to write to remote"
msgstr "无法写到远程"
-#: fetch-pack.c:282
+#: fetch-pack.c:283
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
-#: fetch-pack.c:375 fetch-pack.c:1397
+#: fetch-pack.c:378 fetch-pack.c:1406
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息：%s"
-#: fetch-pack.c:381 fetch-pack.c:1403
+#: fetch-pack.c:384 fetch-pack.c:1412
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息：%s"
-#: fetch-pack.c:383 fetch-pack.c:1405
+#: fetch-pack.c:386 fetch-pack.c:1414
#, c-format
msgid "object not found: %s"
msgstr "对象未找到：%s"
-#: fetch-pack.c:386 fetch-pack.c:1408
+#: fetch-pack.c:389 fetch-pack.c:1417
#, c-format
msgid "error in object: %s"
msgstr "对象中出错：%s"
-#: fetch-pack.c:388 fetch-pack.c:1410
+#: fetch-pack.c:391 fetch-pack.c:1419
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow：%s"
-#: fetch-pack.c:391 fetch-pack.c:1414
+#: fetch-pack.c:394 fetch-pack.c:1423
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow，却得到 %s"
-#: fetch-pack.c:431
+#: fetch-pack.c:434
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:448
+#: fetch-pack.c:451
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"
-#: fetch-pack.c:479
+#: fetch-pack.c:482
msgid "giving up"
msgstr "放弃"
-#: fetch-pack.c:492 progress.c:339
+#: fetch-pack.c:495 progress.c:339
msgid "done"
msgstr "完成"
-#: fetch-pack.c:504
+#: fetch-pack.c:507
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:540
+#: fetch-pack.c:543
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"
-#: fetch-pack.c:755
+#: fetch-pack.c:758
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s（%s）"
-#: fetch-pack.c:824
+#: fetch-pack.c:827
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：无法派生 sideband 多路输出"
-#: fetch-pack.c:832
+#: fetch-pack.c:835
msgid "protocol error: bad pack header"
msgstr "协议错误：坏的包头"
-#: fetch-pack.c:916
+#: fetch-pack.c:919
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack：无法派生进程 %s"
-#: fetch-pack.c:933
+#: fetch-pack.c:937
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: fetch-pack.c:935
+#: fetch-pack.c:939
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
-#: fetch-pack.c:978
+#: fetch-pack.c:982
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
-#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998
-#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014
-#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030
-#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052
+#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005
+#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021
+#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059
#, c-format
msgid "Server supports %s"
msgstr "服务器支持 %s"
-#: fetch-pack.c:985
+#: fetch-pack.c:992
msgid "Server does not support shallow clients"
msgstr "服务器不支持 shalllow 客户端"
-#: fetch-pack.c:1045
+#: fetch-pack.c:1052
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
-#: fetch-pack.c:1050
+#: fetch-pack.c:1057
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
-#: fetch-pack.c:1054
+#: fetch-pack.c:1061
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
-#: fetch-pack.c:1056
+#: fetch-pack.c:1063
msgid "Server does not support this repository's object format"
msgstr "服务器不支持这个仓库的对象格式"
-#: fetch-pack.c:1069
+#: fetch-pack.c:1076
msgid "no common commits"
msgstr "没有共同的提交"
-#: fetch-pack.c:1081 fetch-pack.c:1619
+#: fetch-pack.c:1088 fetch-pack.c:1628
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：获取失败。"
-#: fetch-pack.c:1205
+#: fetch-pack.c:1214
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "不匹配的算法：客户端 %s，服务端 %s"
-#: fetch-pack.c:1209
+#: fetch-pack.c:1218
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "服务器不支持算法 '%s'"
-#: fetch-pack.c:1229
+#: fetch-pack.c:1238
msgid "Server does not support shallow requests"
msgstr "服务器不支持 shalllow 请求"
-#: fetch-pack.c:1236
+#: fetch-pack.c:1245
msgid "Server supports filter"
msgstr "服务器支持 filter"
-#: fetch-pack.c:1275
+#: fetch-pack.c:1284
msgid "unable to write request to remote"
msgstr "无法将请求写到远程"
-#: fetch-pack.c:1293
+#: fetch-pack.c:1302
#, c-format
msgid "error reading section header '%s'"
msgstr "读取节标题 '%s' 出错"
-#: fetch-pack.c:1299
+#: fetch-pack.c:1308
#, c-format
msgid "expected '%s', received '%s'"
msgstr "预期 '%s'，得到 '%s'"
-#: fetch-pack.c:1360
+#: fetch-pack.c:1369
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "意外的确认行：'%s'"
-#: fetch-pack.c:1365
+#: fetch-pack.c:1374
#, c-format
msgid "error processing acks: %d"
msgstr "处理 ack 出错：%d"
-#: fetch-pack.c:1375
+#: fetch-pack.c:1384
msgid "expected packfile to be sent after 'ready'"
msgstr "预期在 'ready' 之后发送 packfile"
-#: fetch-pack.c:1377
+#: fetch-pack.c:1386
msgid "expected no other sections to be sent after no 'ready'"
msgstr "在没有 'ready' 不应该发送其它小节"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1428
#, c-format
msgid "error processing shallow info: %d"
msgstr "处理浅克隆信息出错：%d"
-#: fetch-pack.c:1466
+#: fetch-pack.c:1475
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "预期 wanted-ref，得到 '%s'"
-#: fetch-pack.c:1471
+#: fetch-pack.c:1480
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "意外的 wanted-ref：'%s'"
-#: fetch-pack.c:1476
+#: fetch-pack.c:1485
#, c-format
msgid "error processing wanted refs: %d"
msgstr "处理要获取的引用出错：%d"
-#: fetch-pack.c:1506
+#: fetch-pack.c:1515
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack：预期响应结束包"
-#: fetch-pack.c:1887
+#: fetch-pack.c:1897
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
-#: fetch-pack.c:1910 builtin/clone.c:692
+#: fetch-pack.c:1920 builtin/clone.c:693
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必需的对象"
-#: fetch-pack.c:1937
+#: fetch-pack.c:1947
#, c-format
msgid "no such remote ref %s"
msgstr "没有这样的远程引用 %s"
-#: fetch-pack.c:1940
+#: fetch-pack.c:1950
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "服务器不允许请求未公开的对象 %s"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
-#: grep.c:668
+#: grep.c:640
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
"给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"
"功能"
-#: grep.c:2128
+#: grep.c:2100
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：无法读取 %s"
-#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89
+#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "对 '%s' 调用 stat 失败"
-#: grep.c:2156
+#: grep.c:2128
#, c-format
msgid "'%s': short read"
msgstr "'%s'：读取不完整"
msgid "Command aliases"
msgstr "命令别名"
-#: help.c:513
+#: help.c:527
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"'%s' 像是一个 git 命令，但却无法运行。\n"
"可能是 git-%s 受损？"
-#: help.c:572
+#: help.c:543 help.c:631
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
+
+#: help.c:591
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "唉呀，您的系统中未发现 Git 命令。"
-#: help.c:594
+#: help.c:613
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
-#: help.c:599
+#: help.c:618
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "假定你想要的是 '%s' 并继续。"
-#: help.c:604
+#: help.c:623
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
-#: help.c:612
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
-
-#: help.c:616
+#: help.c:635
msgid ""
"\n"
"The most similar command is"
"\n"
"最相似的命令是"
-#: help.c:656
+#: help.c:675
msgid "git version [<options>]"
msgstr "git version [<选项>]"
-#: help.c:711
+#: help.c:730
#, c-format
msgid "%s: %s - %s"
msgstr "%s：%s - %s"
-#: help.c:715
+#: help.c:734
msgid ""
"\n"
"Did you mean this?"
msgid "expected flush after ls-refs arguments"
msgstr "在 ls-refs 参数后应该有一个 flush 包"
+#: merge-ort-wrappers.c:13 merge-recursive.c:3672
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
+msgstr ""
+"您对下列文件的本地修改将被合并操作覆盖：\n"
+" %s"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr "已经是最新的！"
+
#: merge-recursive.c:356
msgid "(bad commit)\n"
msgstr "（坏提交）\n"
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "冲突（add/add）：合并冲突于 %s"
-#: merge-recursive.c:3436
-msgid "Already up to date!"
-msgstr "已经是最新的！"
-
#: merge-recursive.c:3445
#, c-format
msgid "merging of trees %s and %s failed"
msgid "merge returned no commit"
msgstr "合并未返回提交"
-#: merge-recursive.c:3672
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-"您对下列文件的本地修改将被合并操作覆盖：\n"
-" %s"
-
#: merge-recursive.c:3769
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881
+#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895
msgid "Unable to write index."
msgstr "不能写入索引。"
msgid "failed to read the cache"
msgstr "读取缓存失败"
-#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930
-#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816
+#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917
+#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817
#: builtin/stash.c:265
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
-#: midx.c:79
+#: midx.c:80
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "多包索引文件 %s 太小"
-#: midx.c:95
+#: midx.c:96
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
-#: midx.c:100
+#: midx.c:101
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index 版本 %d 不能被识别"
-#: midx.c:105
+#: midx.c:106
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"
-#: midx.c:122
+#: midx.c:123
msgid "invalid chunk offset (too large)"
msgstr "无效的块偏移（太大）"
-#: midx.c:146
+#: midx.c:147
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr "终止多包索引块 id 出现时间早于预期"
-#: midx.c:159
+#: midx.c:160
msgid "multi-pack-index missing required pack-name chunk"
msgstr "多包索引缺少必需的包名块"
-#: midx.c:161
+#: midx.c:162
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "多包索引缺少必需的对象 ID 扇出块"
-#: midx.c:163
+#: midx.c:164
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "多包索引缺少必需的对象 ID 查询块"
-#: midx.c:165
+#: midx.c:166
msgid "multi-pack-index missing required object offsets chunk"
msgstr "多包索引缺少必需的对象偏移块"
-#: midx.c:179
+#: midx.c:180
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
-#: midx.c:222
+#: midx.c:223
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "错的 pack-int-id：%u（共有 %u 个包）"
-#: midx.c:272
+#: midx.c:273
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
-#: midx.c:300
-msgid "error preparing packfile from multi-pack-index"
-msgstr "从多包索引准备 packfile 出错"
-
-#: midx.c:485
+#: midx.c:480
#, c-format
msgid "failed to add packfile '%s'"
msgstr "添加包文件 '%s' 失败"
-#: midx.c:491
+#: midx.c:486
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "打开包索引 '%s' 失败"
-#: midx.c:551
+#: midx.c:546
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "在包文件中定位对象 %d 失败"
-#: midx.c:853
+#: midx.c:846
msgid "Adding packfiles to multi-pack-index"
msgstr "添加包文件到多包索引"
-#: midx.c:886
+#: midx.c:879
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "没有看到要丢弃的包文件 %s"
-#: midx.c:938
+#: midx.c:931
msgid "no pack files to index."
msgstr "没有要索引的包文件。"
-#: midx.c:990
+#: midx.c:982
msgid "Writing chunks to multi-pack-index"
msgstr "写入块到多包索引"
-#: midx.c:1068
+#: midx.c:1060
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "清理位于 %s 的多包索引失败"
-#: midx.c:1124
+#: midx.c:1116
msgid "multi-pack-index file exists, but failed to parse"
msgstr "多包索引文件存在，但无法解析"
-#: midx.c:1132
+#: midx.c:1124
msgid "Looking for referenced packfiles"
msgstr "正在查找引用的包文件"
-#: midx.c:1147
+#: midx.c:1139
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1152
+#: midx.c:1144
msgid "the midx contains no oid"
msgstr "midx 不包含 oid"
-#: midx.c:1161
+#: midx.c:1153
msgid "Verifying OID order in multi-pack-index"
msgstr "校验多包索引中的 OID 顺序"
-#: midx.c:1170
+#: midx.c:1162
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1190
+#: midx.c:1182
msgid "Sorting objects by packfile"
msgstr "通过包文件为对象排序"
-#: midx.c:1197
+#: midx.c:1189
msgid "Verifying object offsets"
msgstr "校验对象偏移"
-#: midx.c:1213
+#: midx.c:1205
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "为 oid[%d] = %s 加载包条目失败"
-#: midx.c:1219
+#: midx.c:1211
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "为包文件 %s 加载包索引失败"
-#: midx.c:1228
+#: midx.c:1220
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
-#: midx.c:1253
+#: midx.c:1245
msgid "Counting referenced objects"
msgstr "正在对引用对象计数"
-#: midx.c:1263
+#: midx.c:1255
msgid "Finding and deleting unreferenced packfiles"
msgstr "正在查找和删除未引用的包文件"
-#: midx.c:1454
+#: midx.c:1446
msgid "could not start pack-objects"
msgstr "不能开始 pack-objects"
-#: midx.c:1474
+#: midx.c:1466
msgid "could not finish pack-objects"
msgstr "不能结束 pack-objects"
msgid "unable to get size of %s"
msgstr "无法得到 %s 的大小"
-#: packfile.c:630
+#: packfile.c:615
msgid "offset before end of packfile (broken .idx?)"
msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
-#: packfile.c:1922
+#: packfile.c:1907
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
-#: packfile.c:1926
+#: packfile.c:1911
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
msgid "protocol error: bad line length %d"
msgstr "协议错误：错误的行长度 %d"
-#: pkt-line.c:373 sideband.c:150
+#: pkt-line.c:373 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "远程错误：%s"
msgid "could not read `log` output"
msgstr "不能读取 `log` 的输出"
-#: range-diff.c:98 sequencer.c:5283
+#: range-diff.c:98 sequencer.c:5310
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
msgid "could not parse git header '%.*s'"
msgstr "无法解析 git 头 '%.*s'"
-#: range-diff.c:301
+#: range-diff.c:299
msgid "failed to generate diff"
msgstr "生成 diff 失败"
-#: range-diff.c:534 range-diff.c:536
+#: range-diff.c:532 range-diff.c:534
#, c-format
msgid "could not parse log for '%s'"
msgstr "不能解析 '%s' 的日志"
#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111
#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181
-#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991
-#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
+#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507
#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290
#: builtin/submodule--helper.c:332
msgid "index file corrupt"
msgid "broken index, expect %s in %s, got %s"
msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
-#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126
+#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
-#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185
+#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231
#, c-format
msgid "could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
"然而，如果您删除全部内容，变基操作将会终止。\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571
-#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607
+#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270
#, c-format
msgid "could not write '%s'"
msgstr "不能写入 '%s'"
-#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222
-#: builtin/rebase.c:246
+#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228
+#: builtin/rebase.c:252
#, c-format
msgid "could not write '%s'."
msgstr "不能写入 '%s'。"
"可选值有：ignore、warn、error。\n"
"\n"
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361
-#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233
-#: builtin/rebase.c:258
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394
+#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239
+#: builtin/rebase.c:264
#, c-format
msgid "could not read '%s'."
msgstr "不能读取 '%s'。"
msgid "malformed format string %s"
msgstr "错误的格式化字符串 %s"
-#: ref-filter.c:1541
+#: ref-filter.c:1549
#, c-format
msgid "no branch, rebasing %s"
msgstr "非分支，正变基 %s"
-#: ref-filter.c:1544
+#: ref-filter.c:1552
#, c-format
msgid "no branch, rebasing detached HEAD %s"
msgstr "非分支，正变基分离头指针 %s"
-#: ref-filter.c:1547
+#: ref-filter.c:1555
#, c-format
msgid "no branch, bisect started on %s"
msgstr "非分支，二分查找开始于 %s"
-#: ref-filter.c:1557
+#: ref-filter.c:1565
msgid "no branch"
msgstr "非分支"
-#: ref-filter.c:1591 ref-filter.c:1800
+#: ref-filter.c:1599 ref-filter.c:1808
#, c-format
msgid "missing object %s for %s"
msgstr "缺失 %2$s 的对象 %1$s"
-#: ref-filter.c:1601
+#: ref-filter.c:1609
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
-#: ref-filter.c:2054
+#: ref-filter.c:2062
#, c-format
msgid "malformed object at '%s'"
msgstr "格式错误的对象 '%s'"
-#: ref-filter.c:2143
+#: ref-filter.c:2151
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略带有错误名称 %s 的引用"
-#: ref-filter.c:2148 refs.c:657
+#: ref-filter.c:2156 refs.c:676
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略损坏的引用 %s"
-#: ref-filter.c:2464
+#: ref-filter.c:2472
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式：缺少 %%(end) 元素"
-#: ref-filter.c:2563
+#: ref-filter.c:2571
#, c-format
msgid "malformed object name %s"
msgstr "格式错误的对象名 %s"
-#: ref-filter.c:2568
+#: ref-filter.c:2576
#, c-format
msgid "option `%s' must point to a commit"
msgstr "选项 `%s' 必须指向一个提交"
msgid "%s does not point to a valid object!"
msgstr "%s 没有指向一个有效的对象！"
-#: refs.c:572
+#: refs.c:566
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"使用 '%s' 作为初始分支的名称。这个默认分支名称可能会更改。要在新仓库中\n"
+"配置使用初始分支名，并消除这条警告，请执行：\n"
+"\n"
+"\tgit config --global init.defaultBranch <名称>\n"
+"\n"
+"除了 'master' 之外，通常选定的名字有 'main'、'trunk' 和 'development'。\n"
+"可以通过以下命令重命名刚创建的分支：\n"
+"\n"
+"\tgit branch -m <name>\n"
+
+#: refs.c:588
#, c-format
msgid "could not retrieve `%s`"
msgstr "无法获取 `%s`"
-#: refs.c:579
+#: refs.c:598
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "无效的分支名：%s = %s"
-#: refs.c:655
+#: refs.c:674
#, c-format
msgid "ignoring dangling symref %s"
msgstr "忽略悬空符号引用 %s"
-#: refs.c:892
+#: refs.c:911
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "引用 %s 的日志在 %s 之后有缺口"
-#: refs.c:898
+#: refs.c:917
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "引用 %s 的日志意外终止于 %s "
-#: refs.c:957
+#: refs.c:976
#, c-format
msgid "log for %s is empty"
msgstr "%s 的日志为空"
-#: refs.c:1049
+#: refs.c:1068
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "拒绝更新有错误名称 '%s' 的引用"
-#: refs.c:1120
+#: refs.c:1139
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "对引用 '%s' 执行 update_ref 失败：%s"
-#: refs.c:1944
+#: refs.c:1963
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "不允许对引用 '%s' 多次更新"
-#: refs.c:2024
+#: refs.c:2043
msgid "ref updates forbidden inside quarantine environment"
msgstr "在隔离环境中禁止更新引用"
-#: refs.c:2035
+#: refs.c:2054
msgid "ref updates aborted by hook"
msgstr "引用更新被钩子中止"
-#: refs.c:2135 refs.c:2165
+#: refs.c:2154 refs.c:2184
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' 已存在，无法创建 '%s'"
-#: refs.c:2141 refs.c:2176
+#: refs.c:2160 refs.c:2195
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "无法同时处理 '%s' 和 '%s'"
msgid "could not delete references: %s"
msgstr "无法删除引用：%s"
-#: refspec.c:167
+#: refspec.c:170
#, c-format
msgid "invalid refspec '%s'"
msgstr "无效的引用表达式：'%s'"
msgid "dst ref %s receives from more than one src"
msgstr "目标引用 %s 接收超过一个源"
-#: remote.c:1703 remote.c:1804
+#: remote.c:1714 remote.c:1815
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
-#: remote.c:1712
+#: remote.c:1723
#, c-format
msgid "no such branch: '%s'"
msgstr "没有此分支：'%s'"
-#: remote.c:1715
+#: remote.c:1726
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
-#: remote.c:1721
+#: remote.c:1732
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: remote.c:1736
+#: remote.c:1747
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
-#: remote.c:1748
+#: remote.c:1759
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 没有设置要推送的远程服务器"
-#: remote.c:1758
+#: remote.c:1769
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用规格未包含 '%s'"
-#: remote.c:1771
+#: remote.c:1782
msgid "push has no destination (push.default is 'nothing')"
msgstr "推送无目标（push.default 是 'nothing'）"
-#: remote.c:1793
+#: remote.c:1804
msgid "cannot resolve 'simple' push to a single destination"
msgstr "无法解析 'simple' 推送至一个单独的目标"
-#: remote.c:1922
+#: remote.c:1933
#, c-format
msgid "couldn't find remote ref %s"
msgstr "无法找到远程引用 %s"
-#: remote.c:1935
+#: remote.c:1946
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* 在本地忽略可笑的引用 '%s'"
-#: remote.c:2098
+#: remote.c:2109
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
-#: remote.c:2102
+#: remote.c:2113
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
-#: remote.c:2105
+#: remote.c:2116
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: remote.c:2109
+#: remote.c:2120
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "您的分支和 '%s' 指向不同的提交。\n"
-#: remote.c:2112
+#: remote.c:2123
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " （使用 \"%s\" 查看详情）\n"
-#: remote.c:2116
+#: remote.c:2127
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
-#: remote.c:2122
+#: remote.c:2133
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
-#: remote.c:2125
+#: remote.c:2136
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
# 译者：注意保持前导空格
-#: remote.c:2133
+#: remote.c:2144
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
-#: remote.c:2136
+#: remote.c:2147
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"并且分别有 %d 和 %d 处不同的提交。\n"
# 译者：注意保持前导空格
-#: remote.c:2146
+#: remote.c:2157
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " （使用 \"git pull\" 来合并远程分支）\n"
-#: remote.c:2337
+#: remote.c:2349
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "无法解析期望的对象名 '%s'"
msgid "Recorded preimage for '%s'"
msgstr "为 '%s' 记录 preimage"
-#: rerere.c:881 submodule.c:2082 builtin/log.c:1975
+#: rerere.c:881 submodule.c:2082 builtin/log.c:1992
#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
#, c-format
msgid "could not create directory '%s'"
msgid "could not determine HEAD revision"
msgstr "不能确定 HEAD 版本"
-#: reset.c:70 reset.c:76 sequencer.c:3426
+#: reset.c:70 reset.c:76 sequencer.c:3460
#, c-format
msgid "failed to find tree of %s"
msgstr "无法找到 %s 指向的树。"
-#: revision.c:2344
+#: revision.c:2336
msgid "--unpacked=<packfile> no longer supported"
msgstr "不再支持 --unpacked=<packfile>"
-#: revision.c:2364
+#: revision.c:2356
#, c-format
msgid "unknown value for --diff-merges: %s"
msgstr "未知的 --diff-merges 取值：%s"
-#: revision.c:2702
+#: revision.c:2694
msgid "your current branch appears to be broken"
msgstr "您的当前分支好像被损坏"
-#: revision.c:2705
+#: revision.c:2697
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当前分支 '%s' 尚无任何提交"
-#: revision.c:2915
+#: revision.c:2907
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
-#: run-command.c:763
+#: run-command.c:764
msgid "open /dev/null failed"
msgstr "不能打开 /dev/null"
-#: run-command.c:1270
+#: run-command.c:1271
#, c-format
msgid "cannot create async thread: %s"
msgstr "不能创建 async 线程：%s"
-#: run-command.c:1334
+#: run-command.c:1335
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
-#: send-pack.c:145
+#: send-pack.c:146
msgid "unexpected flush packet while reading remote unpack status"
msgstr "读取远程解包状态时收到意外的 flush 包"
-#: send-pack.c:147
+#: send-pack.c:148
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "不能解析远程解包状态：%s"
-#: send-pack.c:149
+#: send-pack.c:150
#, c-format
msgid "remote unpack failed: %s"
msgstr "远程解包失败：%s"
-#: send-pack.c:372
+#: send-pack.c:374
msgid "failed to sign the push certificate"
msgstr "为推送证书签名失败"
-#: send-pack.c:460
+#: send-pack.c:467
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "接收端不支持这个仓库的哈希算法"
-#: send-pack.c:469
+#: send-pack.c:476
msgid "the receiving end does not support --signed push"
msgstr "接收端不支持签名推送"
-#: send-pack.c:471
+#: send-pack.c:478
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未发送推送证书，因为接收端不支持签名推送"
-#: send-pack.c:483
+#: send-pack.c:490
msgid "the receiving end does not support --atomic push"
msgstr "接收端不支持原子推送"
-#: send-pack.c:488
+#: send-pack.c:495
msgid "the receiving end does not support push options"
msgstr "接收端不支持推送选项"
-#: sequencer.c:194
+#: sequencer.c:195
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "无效的提交信息清理模式 '%s'"
-#: sequencer.c:308
+#: sequencer.c:323
#, c-format
msgid "could not delete '%s'"
msgstr "无法删除 '%s'"
-#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385
+#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "无法删除 '%s'"
-#: sequencer.c:339
+#: sequencer.c:353
msgid "revert"
msgstr "还原"
-#: sequencer.c:341
+#: sequencer.c:355
msgid "cherry-pick"
msgstr "拣选"
-#: sequencer.c:343
+#: sequencer.c:357
msgid "rebase"
msgstr "变基"
-#: sequencer.c:345
+#: sequencer.c:359
#, c-format
msgid "unknown action: %d"
msgstr "未知动作：%d"
-#: sequencer.c:404
+#: sequencer.c:418
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"命令标记修正后的文件"
-#: sequencer.c:407
+#: sequencer.c:421
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"对修正后的文件做标记，然后用 'git commit' 提交"
-#: sequencer.c:420 sequencer.c:3028
+#: sequencer.c:434 sequencer.c:3062
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
-#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046
-#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631
+#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080
+#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631
#, c-format
msgid "could not write to '%s'"
msgstr "不能写入 '%s'"
-#: sequencer.c:427
+#: sequencer.c:441
#, c-format
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
-#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048
-#: sequencer.c:3311
+#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082
+#: sequencer.c:3345
#, c-format
msgid "failed to finalize '%s'"
msgstr "无法完成 '%s'"
-#: sequencer.c:471
+#: sequencer.c:485
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "您的本地修改将被%s覆盖。"
-#: sequencer.c:475
+#: sequencer.c:489
msgid "commit your changes or stash them to proceed."
msgstr "提交您的修改或贮藏后再继续。"
-#: sequencer.c:507
+#: sequencer.c:521
#, c-format
msgid "%s: fast-forward"
msgstr "%s：快进"
-#: sequencer.c:546 builtin/tag.c:566
+#: sequencer.c:560 builtin/tag.c:566
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:640
+#: sequencer.c:670
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s：无法写入新索引文件"
-#: sequencer.c:657
+#: sequencer.c:687
msgid "unable to update cache tree"
msgstr "不能更新缓存树"
-#: sequencer.c:671
+#: sequencer.c:701
msgid "could not resolve HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:751
+#: sequencer.c:781
#, c-format
msgid "no key present in '%.*s'"
msgstr "在 '%.*s' 中没有 key"
-#: sequencer.c:762
+#: sequencer.c:792
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "无法为 '%s' 的值去引号"
-#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724
-#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902
+#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读取"
-#: sequencer.c:809
+#: sequencer.c:839
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "已经给出 'GIT_AUTHOR_NAME'"
-#: sequencer.c:814
+#: sequencer.c:844
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:819
+#: sequencer.c:849
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "已经给出 'GIT_AUTHOR_DATE'"
-#: sequencer.c:823
+#: sequencer.c:853
#, c-format
msgid "unknown variable '%s'"
msgstr "未知变量 '%s'"
-#: sequencer.c:828
+#: sequencer.c:858
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "缺少 'GIT_AUTHOR_NAME'"
-#: sequencer.c:830
+#: sequencer.c:860
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "缺少 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:832
+#: sequencer.c:862
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "缺少 'GIT_AUTHOR_DATE'"
-#: sequencer.c:897
+#: sequencer.c:927
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:1178
+#: sequencer.c:1208
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' 钩子失败"
-#: sequencer.c:1184
+#: sequencer.c:1214
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1197
+#: sequencer.c:1227
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1239
+#: sequencer.c:1269
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
-#: sequencer.c:1241
+#: sequencer.c:1271
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
-#: sequencer.c:1287
+#: sequencer.c:1317
msgid "unable to resolve HEAD after creating commit"
msgstr "创建提交后，不能解析 HEAD"
-#: sequencer.c:1289
+#: sequencer.c:1319
msgid "detached HEAD"
msgstr "分离头指针"
# 译者：中文字符串拼接，可删除前导空格
-#: sequencer.c:1293
+#: sequencer.c:1323
msgid " (root-commit)"
msgstr "（根提交）"
-#: sequencer.c:1314
+#: sequencer.c:1344
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1316
+#: sequencer.c:1346
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一个提交！"
-#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577
+#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:1373 sequencer.c:2067
+#: sequencer.c:1403 sequencer.c:2100
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
-#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692
+#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入树对象"
-#: sequencer.c:1417 sequencer.c:1535
+#: sequencer.c:1447 sequencer.c:1565
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能从 '%s' 读取提交说明"
-#: sequencer.c:1446 sequencer.c:1478
+#: sequencer.c:1476 sequencer.c:1508
#, c-format
msgid "invalid author identity '%s'"
msgstr "无效的作者身份 '%s'"
-#: sequencer.c:1452
+#: sequencer.c:1482
msgid "corrupt author: missing date information"
msgstr "损坏的作者：缺失日期信息"
-#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890
-#: builtin/merge.c:915
+#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904
+#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "写提交对象失败"
-#: sequencer.c:1518 sequencer.c:4237
+#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:1567
+#: sequencer.c:1597
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
-#: sequencer.c:1572
+#: sequencer.c:1602
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
-#: sequencer.c:1655 sequencer.c:1766
+#: sequencer.c:1685 sequencer.c:1796
#, c-format
msgid "unknown command: %d"
msgstr "未知命令：%d"
-#: sequencer.c:1713 sequencer.c:1738
+#: sequencer.c:1743 sequencer.c:1768
#, c-format
msgid "This is a combination of %d commits."
msgstr "这是一个 %d 个提交的组合。"
-#: sequencer.c:1723
+#: sequencer.c:1753
msgid "need a HEAD to fixup"
msgstr "需要一个 HEAD 来修复"
-#: sequencer.c:1725 sequencer.c:3338
+#: sequencer.c:1755 sequencer.c:3372
msgid "could not read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:1727
+#: sequencer.c:1757
msgid "could not read HEAD's commit message"
msgstr "不能读取 HEAD 的提交说明"
-#: sequencer.c:1733
+#: sequencer.c:1763
#, c-format
msgid "cannot write '%s'"
msgstr "不能写 '%s'"
-#: sequencer.c:1740 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1770 git-rebase--preserve-merges.sh:486
msgid "This is the 1st commit message:"
msgstr "这是第一个提交说明："
-#: sequencer.c:1748
+#: sequencer.c:1778
#, c-format
msgid "could not read commit message of %s"
msgstr "不能读取 %s 的提交说明"
-#: sequencer.c:1755
+#: sequencer.c:1785
#, c-format
msgid "This is the commit message #%d:"
msgstr "这是提交说明 #%d："
-#: sequencer.c:1761
+#: sequencer.c:1791
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交说明 #%d 将被跳过："
-#: sequencer.c:1849
+#: sequencer.c:1879
msgid "your index file is unmerged."
msgstr "您的索引文件未完成合并。"
-#: sequencer.c:1856
+#: sequencer.c:1886
msgid "cannot fixup root commit"
msgstr "不能修复根提交"
-#: sequencer.c:1875
+#: sequencer.c:1905
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: sequencer.c:1883 sequencer.c:1891
+#: sequencer.c:1913 sequencer.c:1921
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 没有第 %d 个父提交"
-#: sequencer.c:1897
+#: sequencer.c:1927
#, c-format
msgid "cannot get commit message for %s"
msgstr "不能得到 %s 的提交说明"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1916
+#: sequencer.c:1946
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:1981
+#: sequencer.c:2011
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
-#: sequencer.c:2038
+#: sequencer.c:2071
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
-#: sequencer.c:2039
+#: sequencer.c:2072
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
-#: sequencer.c:2059
+#: sequencer.c:2092
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
-#: sequencer.c:2117
+#: sequencer.c:2150
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：无法读取索引"
-#: sequencer.c:2124
+#: sequencer.c:2157
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：无法刷新索引"
-#: sequencer.c:2201
+#: sequencer.c:2234
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受参数：'%s'"
-#: sequencer.c:2210
+#: sequencer.c:2243
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的参数"
-#: sequencer.c:2241
+#: sequencer.c:2274
#, c-format
msgid "could not parse '%s'"
msgstr "无法解析 '%s'"
-#: sequencer.c:2302
+#: sequencer.c:2335
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d：%.*s"
-#: sequencer.c:2313
+#: sequencer.c:2346
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
-#: sequencer.c:2399
+#: sequencer.c:2432
msgid "cancelling a cherry picking in progress"
msgstr "正在取消一个进行中的拣选"
-#: sequencer.c:2408
+#: sequencer.c:2441
msgid "cancelling a revert in progress"
msgstr "正在取消一个进行中的还原"
-#: sequencer.c:2452
+#: sequencer.c:2485
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: sequencer.c:2454
+#: sequencer.c:2487
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单：'%s'"
-#: sequencer.c:2459
+#: sequencer.c:2492
msgid "no commits parsed."
msgstr "没有解析提交。"
-#: sequencer.c:2470
+#: sequencer.c:2503
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
-#: sequencer.c:2472
+#: sequencer.c:2505
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
-#: sequencer.c:2550
+#: sequencer.c:2583
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效：%s"
-#: sequencer.c:2657
+#: sequencer.c:2690
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
-#: sequencer.c:2677
+#: sequencer.c:2710
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式错误的选项清单：'%s'"
-#: sequencer.c:2769 sequencer.c:4609
+#: sequencer.c:2803 sequencer.c:4636
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:2786
+#: sequencer.c:2820
msgid "revert is already in progress"
msgstr "一个还原操作已在进行"
-#: sequencer.c:2788
+#: sequencer.c:2822
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2791
+#: sequencer.c:2825
msgid "cherry-pick is already in progress"
msgstr "拣选操作已在进行"
-#: sequencer.c:2793
+#: sequencer.c:2827
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2807
+#: sequencer.c:2841
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
-#: sequencer.c:2822
+#: sequencer.c:2856
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
-#: sequencer.c:2882 sequencer.c:4325
+#: sequencer.c:2916 sequencer.c:4371
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
-#: sequencer.c:2884 sequencer.c:2895
+#: sequencer.c:2918 sequencer.c:2929
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:2886 sequencer.c:2930
+#: sequencer.c:2920 sequencer.c:2964
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:2916 builtin/grep.c:745
+#: sequencer.c:2950 builtin/grep.c:756
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: sequencer.c:2918
+#: sequencer.c:2952
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s'：%s"
-#: sequencer.c:2919
+#: sequencer.c:2953
msgid "unexpected end of file"
msgstr "意外的文件结束"
-#: sequencer.c:2925
+#: sequencer.c:2959
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: sequencer.c:2936
+#: sequencer.c:2970
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
-#: sequencer.c:2977
+#: sequencer.c:3011
msgid "no revert in progress"
msgstr "没有正在进行的还原"
-#: sequencer.c:2986
+#: sequencer.c:3020
msgid "no cherry-pick in progress"
msgstr "没有正在进行的拣选"
-#: sequencer.c:2996
+#: sequencer.c:3030
msgid "failed to skip the commit"
msgstr "无法跳过这个提交"
-#: sequencer.c:3003
+#: sequencer.c:3037
msgid "there is nothing to skip"
msgstr "没有要跳过的"
-#: sequencer.c:3006
+#: sequencer.c:3040
#, c-format
msgid ""
"have you committed already?\n"
"您已经提交了么？\n"
"试试 \"git %s --continue\""
-#: sequencer.c:3168 sequencer.c:4217
+#: sequencer.c:3202 sequencer.c:4263
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:3185
+#: sequencer.c:3219
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "无法拷贝 '%s' 至 '%s'"
-#: sequencer.c:3193
+#: sequencer.c:3227
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:3203
+#: sequencer.c:3237
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "不能应用 %s... %.*s"
-#: sequencer.c:3210
+#: sequencer.c:3244
#, c-format
msgid "Could not merge %.*s"
msgstr "不能合并 %.*s"
-#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641
+#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
-#: sequencer.c:3240
+#: sequencer.c:3274
#, c-format
msgid "Executing: %s\n"
msgstr "正在执行：%s\n"
# 译者：注意保持前导空格
-#: sequencer.c:3255
+#: sequencer.c:3289
#, c-format
msgid ""
"execution failed: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3261
+#: sequencer.c:3295
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
-#: sequencer.c:3267
+#: sequencer.c:3301
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3328
+#: sequencer.c:3362
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "非法的标签名称：'%.*s'"
-#: sequencer.c:3382
+#: sequencer.c:3416
msgid "writing fake root commit"
msgstr "写伪根提交"
-#: sequencer.c:3387
+#: sequencer.c:3421
msgid "writing squash-onto"
msgstr "写入 squash-onto"
-#: sequencer.c:3471
+#: sequencer.c:3505
#, c-format
msgid "could not resolve '%s'"
msgstr "无法解析 '%s'"
-#: sequencer.c:3502
+#: sequencer.c:3538
msgid "cannot merge without a current revision"
msgstr "没有当前版本不能合并"
-#: sequencer.c:3524
+#: sequencer.c:3560
#, c-format
msgid "unable to parse '%.*s'"
msgstr "无法解析 '%.*s'"
-#: sequencer.c:3533
+#: sequencer.c:3569
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "无可用合并：'%.*s'"
-#: sequencer.c:3545
+#: sequencer.c:3581
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "章鱼合并不能在一个新的根提交上执行"
-#: sequencer.c:3561
+#: sequencer.c:3597
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能获取 '%s' 的提交说明"
-#: sequencer.c:3730
+#: sequencer.c:3780
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能尝试合并 '%.*s'"
-#: sequencer.c:3746
+#: sequencer.c:3796
msgid "merge: Unable to write new index file"
msgstr "合并：无法写入新索引文件"
-#: sequencer.c:3820
+#: sequencer.c:3870
msgid "Cannot autostash"
msgstr "无法 autostash"
-#: sequencer.c:3823
+#: sequencer.c:3873
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "意外的 stash 响应：'%s'"
-#: sequencer.c:3829
+#: sequencer.c:3879
#, c-format
msgid "Could not create directory for '%s'"
msgstr "不能为 '%s' 创建目录"
-#: sequencer.c:3832
+#: sequencer.c:3882
#, c-format
msgid "Created autostash: %s\n"
msgstr "创建了 autostash：%s\n"
-#: sequencer.c:3836
+#: sequencer.c:3886
msgid "could not reset --hard"
msgstr "无法 reset --hard"
-#: sequencer.c:3861
+#: sequencer.c:3911
#, c-format
msgid "Applied autostash.\n"
msgstr "已应用 autostash。\n"
-#: sequencer.c:3873
+#: sequencer.c:3923
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
-#: sequencer.c:3876
+#: sequencer.c:3926
#, c-format
msgid ""
"%s\n"
"您的修改在贮藏区中很安全。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:3881
+#: sequencer.c:3931
msgid "Applying autostash resulted in conflicts."
msgstr "应用自动贮藏导致冲突。"
-#: sequencer.c:3882
+#: sequencer.c:3932
msgid "Autostash exists; creating a new stash entry."
msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。"
-#: sequencer.c:3974
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s：不是一个有效的对象 ID"
-
-#: sequencer.c:3979 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4025 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr "不能分离头指针"
-#: sequencer.c:3994
+#: sequencer.c:4040
#, c-format
msgid "Stopped at HEAD\n"
msgstr "停止在 HEAD\n"
-#: sequencer.c:3996
+#: sequencer.c:4042
#, c-format
msgid "Stopped at %s\n"
msgstr "停止在 %s\n"
-#: sequencer.c:4004
+#: sequencer.c:4050
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4050
+#: sequencer.c:4096
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "正在变基（%d/%d）%s"
-#: sequencer.c:4095
+#: sequencer.c:4141
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:4166
+#: sequencer.c:4212
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
-#: sequencer.c:4225
+#: sequencer.c:4271
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
-#: sequencer.c:4230
+#: sequencer.c:4276
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
-#: sequencer.c:4244
+#: sequencer.c:4290
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
-#: sequencer.c:4304
+#: sequencer.c:4350
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "成功变基并更新 %s。\n"
-#: sequencer.c:4337
+#: sequencer.c:4383
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基：您有未暂存的变更。"
-#: sequencer.c:4346
+#: sequencer.c:4392
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
-#: sequencer.c:4348
+#: sequencer.c:4394
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件：'%s'"
-#: sequencer.c:4350
+#: sequencer.c:4396
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容：'%s'"
-#: sequencer.c:4353
+#: sequencer.c:4399
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"\n"
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: sequencer.c:4389 sequencer.c:4428
+#: sequencer.c:4435 sequencer.c:4474
#, c-format
msgid "could not write file: '%s'"
msgstr "不能写入文件：'%s'"
-#: sequencer.c:4444
+#: sequencer.c:4490
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: sequencer.c:4451
+#: sequencer.c:4497
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: sequencer.c:4477
-#, c-format
-msgid "invalid committer '%s'"
-msgstr "无效的提交者 '%s'"
-
-#: sequencer.c:4586
+#: sequencer.c:4613
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能拣选一个%s"
-#: sequencer.c:4590
+#: sequencer.c:4617
#, c-format
msgid "%s: bad revision"
msgstr "%s：错误的版本"
-#: sequencer.c:4625
+#: sequencer.c:4652
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
-#: sequencer.c:5102
+#: sequencer.c:5129
msgid "make_script: unhandled options"
msgstr "make_script：有未能处理的选项"
-#: sequencer.c:5105
+#: sequencer.c:5132
msgid "make_script: error preparing revisions"
msgstr "make_script：准备版本时错误"
-#: sequencer.c:5347 sequencer.c:5364
+#: sequencer.c:5374 sequencer.c:5391
msgid "nothing to do"
msgstr "无事可做"
-#: sequencer.c:5383
+#: sequencer.c:5410
msgid "could not skip unnecessary pick commands"
msgstr "无法跳过不必要的拣选"
-#: sequencer.c:5480
+#: sequencer.c:5504
msgid "the script was already rearranged."
msgstr "脚本已经重新编排。"
msgid "setsid failed"
msgstr "setsid 失败"
-#: sha1-file.c:470
+#: sha1-file.c:480
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
-#: sha1-file.c:521
+#: sha1-file.c:531
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "无法规范化备用对象路径：%s"
-#: sha1-file.c:593
+#: sha1-file.c:603
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s：忽略备用对象库，嵌套太深"
-#: sha1-file.c:600
+#: sha1-file.c:610
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "无法规范化对象目录: %s"
-#: sha1-file.c:643
+#: sha1-file.c:653
msgid "unable to fdopen alternates lockfile"
msgstr "无法 fdopen 替换锁文件"
-#: sha1-file.c:661
+#: sha1-file.c:671
msgid "unable to read alternates file"
msgstr "无法读取替代文件"
-#: sha1-file.c:668
+#: sha1-file.c:678
msgid "unable to move new alternates file into place"
msgstr "无法将新的替代文件移动到位"
-#: sha1-file.c:703
+#: sha1-file.c:713
#, c-format
msgid "path '%s' does not exist"
msgstr "路径 '%s' 不存在"
-#: sha1-file.c:724
+#: sha1-file.c:734
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
-#: sha1-file.c:730
+#: sha1-file.c:740
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "参考仓库 '%s' 不是一个本地仓库。"
-#: sha1-file.c:736
+#: sha1-file.c:746
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "参考仓库 '%s' 是一个浅克隆"
-#: sha1-file.c:744
+#: sha1-file.c:754
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "参考仓库 '%s' 已被移植"
-#: sha1-file.c:804
+#: sha1-file.c:814
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "解析备用引用时无效的行：%s"
-#: sha1-file.c:954
+#: sha1-file.c:964
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
-#: sha1-file.c:975
+#: sha1-file.c:985
msgid "mmap failed"
msgstr "mmap 失败"
-#: sha1-file.c:1139
+#: sha1-file.c:1149
#, c-format
msgid "object file %s is empty"
msgstr "对象文件 %s 为空"
-#: sha1-file.c:1274 sha1-file.c:2467
+#: sha1-file.c:1284 sha1-file.c:2477
#, c-format
msgid "corrupt loose object '%s'"
msgstr "损坏的松散对象 '%s'"
-#: sha1-file.c:1276 sha1-file.c:2471
+#: sha1-file.c:1286 sha1-file.c:2481
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "松散对象 '%s' 后面有垃圾数据"
-#: sha1-file.c:1318
+#: sha1-file.c:1328
msgid "invalid object type"
msgstr "无效的对象类型"
-#: sha1-file.c:1402
+#: sha1-file.c:1412
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
-#: sha1-file.c:1405
+#: sha1-file.c:1415
#, c-format
msgid "unable to unpack %s header"
msgstr "无法解开 %s 头部"
-#: sha1-file.c:1411
+#: sha1-file.c:1421
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
-#: sha1-file.c:1414
+#: sha1-file.c:1424
#, c-format
msgid "unable to parse %s header"
msgstr "无法解析 %s 头部"
-#: sha1-file.c:1641
+#: sha1-file.c:1651
#, c-format
msgid "failed to read object %s"
msgstr "读取对象 %s 失败"
-#: sha1-file.c:1645
+#: sha1-file.c:1655
#, c-format
msgid "replacement %s not found for %s"
msgstr "找不到 %2$s 的替代 %1$s"
-#: sha1-file.c:1649
+#: sha1-file.c:1659
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "松散对象 %s（保存在 %s）已损坏"
-#: sha1-file.c:1653
+#: sha1-file.c:1663
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "打包对象 %s（保存在 %s）已损坏"
-#: sha1-file.c:1758
+#: sha1-file.c:1768
#, c-format
msgid "unable to write file %s"
msgstr "无法写文件 %s"
-#: sha1-file.c:1765
+#: sha1-file.c:1775
#, c-format
msgid "unable to set permission to '%s'"
msgstr "无法为 '%s' 设置权限"
-#: sha1-file.c:1772
+#: sha1-file.c:1782
msgid "file write error"
msgstr "文件写错误"
-#: sha1-file.c:1792
+#: sha1-file.c:1802
msgid "error when closing loose object file"
msgstr "关闭松散对象文件时出错"
-#: sha1-file.c:1857
+#: sha1-file.c:1867
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
-#: sha1-file.c:1859
+#: sha1-file.c:1869
msgid "unable to create temporary file"
msgstr "无法创建临时文件"
-#: sha1-file.c:1883
+#: sha1-file.c:1893
msgid "unable to write loose object file"
msgstr "不能写松散对象文件"
-#: sha1-file.c:1889
+#: sha1-file.c:1899
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "不能压缩新对象 %s（%d）"
-#: sha1-file.c:1893
+#: sha1-file.c:1903
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
-#: sha1-file.c:1897
+#: sha1-file.c:1907
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "被 %s 的不稳定对象源数据搞糊涂了"
-#: sha1-file.c:1907 builtin/pack-objects.c:1086
+#: sha1-file.c:1917 builtin/pack-objects.c:1086
#, c-format
msgid "failed utime() on %s"
msgstr "在 %s 上调用 utime() 失败"
-#: sha1-file.c:1984
+#: sha1-file.c:1994
#, c-format
msgid "cannot read object for %s"
msgstr "不能读取对象 %s"
-#: sha1-file.c:2035
+#: sha1-file.c:2045
msgid "corrupt commit"
msgstr "损坏的提交"
-#: sha1-file.c:2043
+#: sha1-file.c:2053
msgid "corrupt tag"
msgstr "损坏的标签"
-#: sha1-file.c:2143
+#: sha1-file.c:2153
#, c-format
msgid "read error while indexing %s"
msgstr "索引 %s 时读取错误"
-#: sha1-file.c:2146
+#: sha1-file.c:2156
#, c-format
msgid "short read while indexing %s"
msgstr "索引 %s 时读入不完整"
-#: sha1-file.c:2219 sha1-file.c:2229
+#: sha1-file.c:2229 sha1-file.c:2239
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s：插入数据库失败"
-#: sha1-file.c:2235
+#: sha1-file.c:2245
#, c-format
msgid "%s: unsupported file type"
msgstr "%s：不支持的文件类型"
-#: sha1-file.c:2259
+#: sha1-file.c:2269
#, c-format
msgid "%s is not a valid object"
msgstr "%s 不是一个有效的对象"
-#: sha1-file.c:2261
+#: sha1-file.c:2271
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一个有效的 '%s' 对象"
-#: sha1-file.c:2288 builtin/index-pack.c:192
+#: sha1-file.c:2298 builtin/index-pack.c:192
#, c-format
msgid "unable to open %s"
msgstr "不能打开 %s"
-#: sha1-file.c:2478 sha1-file.c:2531
+#: sha1-file.c:2488 sha1-file.c:2541
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s 的哈希值不匹配（预期 %s）"
-#: sha1-file.c:2502
+#: sha1-file.c:2512
#, c-format
msgid "unable to mmap %s"
msgstr "不能 mmap %s"
-#: sha1-file.c:2507
+#: sha1-file.c:2517
#, c-format
msgid "unable to unpack header of %s"
msgstr "无法解压缩 %s 的头部"
-#: sha1-file.c:2513
+#: sha1-file.c:2523
#, c-format
msgid "unable to parse header of %s"
msgstr "无法解析 %s 的头部"
-#: sha1-file.c:2524
+#: sha1-file.c:2534
#, c-format
msgid "unable to unpack contents of %s"
msgstr "无法解压缩 %s 的内容"
msgstr[0] "%u 字节/秒"
msgstr[1] "%u 字节/秒"
-#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733
-#: builtin/rebase.c:858
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:864
#, c-format
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
msgid "process for submodule '%s' failed"
msgstr "处理子模组 '%s' 失败"
-#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469
+#: submodule.c:1156 builtin/branch.c:680 builtin/submodule--helper.c:2469
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
msgid "unknown value '%s' for key '%s'"
msgstr "键 '%2$s' 的未知取值 '%1$s'"
-#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323
+#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
#, c-format
msgid "more than one %s"
msgstr "多于一个 %s"
#: trailer.c:728
#, c-format
msgid "empty trailer token in trailer '%.*s'"
-msgstr "签名 '%.*s' 的键为空"
+msgstr "尾注 '%.*s' 的键为空"
#: trailer.c:748
#, c-format
msgid "error while running fast-import"
msgstr "执行 fast-import 出错"
-#: transport-helper.c:549 transport-helper.c:1226
+#: transport-helper.c:549 transport-helper.c:1236
#, c-format
msgid "could not read ref %s"
msgstr "无法读取引用 %s"
msgid "invalid remote service path"
msgstr "无效的远程服务路径"
-#: transport-helper.c:661 transport.c:1428
+#: transport-helper.c:661 transport.c:1446
msgid "operation not supported by protocol"
msgstr "协议不支持该操作"
msgid "expected ok/error, helper said '%s'"
msgstr "预期 ok/error，助手说 '%s'"
-#: transport-helper.c:841
+#: transport-helper.c:845
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "助手报告 %s 的意外状态"
-#: transport-helper.c:924
+#: transport-helper.c:928
#, c-format
msgid "helper %s does not support dry-run"
msgstr "助手 %s 不支持 dry-run"
-#: transport-helper.c:927
+#: transport-helper.c:931
#, c-format
msgid "helper %s does not support --signed"
msgstr "助手 %s 不支持 --signed"
-#: transport-helper.c:930
+#: transport-helper.c:934
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "助手 %s 不支持 --signed=if-asked"
-#: transport-helper.c:935
+#: transport-helper.c:939
#, c-format
msgid "helper %s does not support --atomic"
msgstr "助手 %s 不支持 --atomic"
-#: transport-helper.c:941
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "助手 %s 不支持 --%s"
+
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "助手 %s 不支持 'push-option'"
-#: transport-helper.c:1040
+#: transport-helper.c:1050
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-heper 不支持 push，需要引用表达式"
-#: transport-helper.c:1045
+#: transport-helper.c:1055
#, c-format
msgid "helper %s does not support 'force'"
msgstr "助手 %s 不支持 'force'"
-#: transport-helper.c:1092
+#: transport-helper.c:1102
msgid "couldn't run fast-export"
msgstr "无法执行 fast-export"
-#: transport-helper.c:1097
+#: transport-helper.c:1107
msgid "error while running fast-export"
msgstr "执行 fast-export 时出错"
-#: transport-helper.c:1122
+#: transport-helper.c:1132
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"没有共同的引用并且也没有指定，什么也不会做。\n"
"也许您应该指定一个分支。\n"
-#: transport-helper.c:1203
+#: transport-helper.c:1213
#, c-format
msgid "unsupported object format '%s'"
msgstr "不支持的对象格式 '%s'"
-#: transport-helper.c:1212
+#: transport-helper.c:1222
#, c-format
msgid "malformed response in ref list: %s"
msgstr "引用列表中格式错误的响应：%s"
-#: transport-helper.c:1364
+#: transport-helper.c:1374
#, c-format
msgid "read(%s) failed"
msgstr "读取（%s）失败"
-#: transport-helper.c:1391
+#: transport-helper.c:1401
#, c-format
msgid "write(%s) failed"
msgstr "写（%s）失败"
-#: transport-helper.c:1440
+#: transport-helper.c:1450
#, c-format
msgid "%s thread failed"
msgstr "%s 线程失败"
-#: transport-helper.c:1444
+#: transport-helper.c:1454
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s 线程等待失败：%s"
-#: transport-helper.c:1463 transport-helper.c:1467
+#: transport-helper.c:1473 transport-helper.c:1477
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "不能启动线程来拷贝数据：%s"
-#: transport-helper.c:1504
+#: transport-helper.c:1514
#, c-format
msgid "%s process failed to wait"
msgstr "%s 进程等待失败"
-#: transport-helper.c:1508
+#: transport-helper.c:1518
#, c-format
msgid "%s process failed"
msgstr "%s 进程失败"
-#: transport-helper.c:1526 transport-helper.c:1535
+#: transport-helper.c:1536 transport-helper.c:1545
msgid "can't start thread for copying data"
msgstr "不能启动线程来拷贝数据"
msgid "server options require protocol version 2 or later"
msgstr "服务端选项需要版本 2 协议或更高"
-#: transport.c:712
+#: transport.c:727
msgid "could not parse transport.color.* config"
msgstr "不能解析 transport.color.* 配置"
-#: transport.c:785
+#: transport.c:802
msgid "support for protocol v2 not implemented yet"
msgstr "协议 v2 的支持尚未实现"
-#: transport.c:919
+#: transport.c:936
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "配置 '%s' 的取值未知：%s"
-#: transport.c:985
+#: transport.c:1002
#, c-format
msgid "transport '%s' not allowed"
msgstr "传输 '%s' 不允许"
-#: transport.c:1038
+#: transport.c:1055
msgid "git-over-rsync is no longer supported"
msgstr "不再支持 git-over-rsync"
-#: transport.c:1140
+#: transport.c:1157
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
-#: transport.c:1144
+#: transport.c:1161
#, c-format
msgid ""
"\n"
"以推送至远程。\n"
"\n"
-#: transport.c:1152
+#: transport.c:1169
msgid "Aborting."
msgstr "正在终止。"
-#: transport.c:1297
+#: transport.c:1315
msgid "failed to push all needed submodules"
msgstr "不能推送全部需要的子模组"
msgid "Updating index flags"
msgstr "正在更新索引标志"
-#: upload-pack.c:1516
+#: upload-pack.c:1550
msgid "expected flush after fetch arguments"
msgstr "在 fetch 参数之后应该有一个 flush 包"
msgid "Fetching objects"
msgstr "正在获取对象"
-#: worktree.c:236 builtin/am.c:2116
+#: worktree.c:236 builtin/am.c:2103
#, c-format
msgid "failed to read '%s'"
msgstr "读取 '%s' 失败"
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s：您的索引中包含未提交的变更。"
-#: compat/precompose_utf8.c:58 builtin/clone.c:456
+#: compat/precompose_utf8.c:58 builtin/clone.c:457
#, c-format
msgid "failed to unlink '%s'"
msgstr "删除 '%s' 失败"
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更："
-#: builtin/add.c:272 builtin/rev-parse.c:904
+#: builtin/add.c:272 builtin/rev-parse.c:908
msgid "Could not read the index"
msgstr "不能读取索引"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538
-#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
msgid "dry run"
msgstr "演习"
msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308
+#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
msgid "--chmod param '%s' must be either -x or +x"
msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
-#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351
-#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503
+#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file 与路径表达式参数不兼容"
-#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357
-#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509
+#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
"运行下面的命令来关闭本消息\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:160
-#, c-format
-msgid "invalid committer: %s"
-msgstr "无效的提交者：%s"
-
-#: builtin/am.c:366
+#: builtin/am.c:352
msgid "could not parse author script"
msgstr "不能解析作者脚本"
-#: builtin/am.c:450
+#: builtin/am.c:436
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 钩子删除"
-#: builtin/am.c:492
+#: builtin/am.c:478
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行：'%s'。"
-#: builtin/am.c:530
+#: builtin/am.c:516
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/am.c:556
+#: builtin/am.c:542
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:744
+#: builtin/am.c:730
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解析补丁 '%s'"
-#: builtin/am.c:809
+#: builtin/am.c:795
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
-#: builtin/am.c:857
+#: builtin/am.c:843
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:862 builtin/am.c:874
+#: builtin/am.c:848 builtin/am.c:860
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:869
+#: builtin/am.c:855
msgid "invalid timezone offset"
msgstr "无效的时区偏移值"
-#: builtin/am.c:962
+#: builtin/am.c:948
msgid "Patch format detection failed."
msgstr "补丁格式探测失败。"
-#: builtin/am.c:967 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:410
#, c-format
msgid "failed to create directory '%s'"
msgstr "创建目录 '%s' 失败"
-#: builtin/am.c:972
+#: builtin/am.c:958
msgid "Failed to split patches."
msgstr "拆分补丁失败。"
-#: builtin/am.c:1103
+#: builtin/am.c:1089
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题，执行 \"%s --continue\"。"
-#: builtin/am.c:1104
+#: builtin/am.c:1090
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
-#: builtin/am.c:1105
+#: builtin/am.c:1091
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
-#: builtin/am.c:1188
+#: builtin/am.c:1174
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。"
-#: builtin/am.c:1216
+#: builtin/am.c:1202
msgid "Patch is empty."
msgstr "补丁为空。"
-#: builtin/am.c:1281
+#: builtin/am.c:1267
#, c-format
msgid "missing author line in commit %s"
msgstr "在提交 %s 中缺失作者行"
-#: builtin/am.c:1284
+#: builtin/am.c:1270
#, c-format
msgid "invalid ident line: %.*s"
msgstr "无效的身份标识：%.*s"
-#: builtin/am.c:1503
+#: builtin/am.c:1489
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: builtin/am.c:1505
+#: builtin/am.c:1491
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个（三方合并的）基础目录树..."
-#: builtin/am.c:1524
+#: builtin/am.c:1510
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"您是否曾手动编辑过您的补丁？\n"
"无法应用补丁到索引中的数据对象上。"
-#: builtin/am.c:1530
+#: builtin/am.c:1516
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/am.c:1556
+#: builtin/am.c:1542
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
-#: builtin/am.c:1588
+#: builtin/am.c:1574
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
-#: builtin/am.c:1639 builtin/am.c:1643
+#: builtin/am.c:1626 builtin/am.c:1630
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续：%s 不存在。"
-#: builtin/am.c:1661
+#: builtin/am.c:1648
msgid "Commit Body is:"
msgstr "提交内容为："
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1671
+#: builtin/am.c:1658
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
-#: builtin/am.c:1717 builtin/commit.c:395
+#: builtin/am.c:1704 builtin/commit.c:395
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:1721
+#: builtin/am.c:1708
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引：不能应用补丁（脏文件：%s）"
-#: builtin/am.c:1761 builtin/am.c:1829
+#: builtin/am.c:1748 builtin/am.c:1816
#, c-format
msgid "Applying: %.*s"
msgstr "应用：%.*s"
-#: builtin/am.c:1778
+#: builtin/am.c:1765
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/am.c:1784
+#: builtin/am.c:1771
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
-#: builtin/am.c:1788
+#: builtin/am.c:1775
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
-#: builtin/am.c:1832
+#: builtin/am.c:1819
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
"您也许想要跳过这个补丁。"
-#: builtin/am.c:1839
+#: builtin/am.c:1826
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
-#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/am.c:1998
+#: builtin/am.c:1985
msgid "failed to clean index"
msgstr "清空索引失败"
-#: builtin/am.c:2042
+#: builtin/am.c:2029
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
-#: builtin/am.c:2149
+#: builtin/am.c:2136
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值：%s"
-#: builtin/am.c:2191
+#: builtin/am.c:2178
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "无效的 --show-current-patch 值：%s"
-#: builtin/am.c:2195
+#: builtin/am.c:2182
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容"
-#: builtin/am.c:2226
+#: builtin/am.c:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2227
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2233
+#: builtin/am.c:2220
msgid "run interactively"
msgstr "以交互式方式运行"
-#: builtin/am.c:2235
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
-#: builtin/am.c:2237
+#: builtin/am.c:2224
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要，允许使用三方合并。"
-#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16
-#: builtin/repack.c:309 builtin/stash.c:816
+#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
+#: builtin/repack.c:335 builtin/stash.c:815
msgid "be quiet"
msgstr "静默模式"
-#: builtin/am.c:2240
-msgid "add a Signed-off-by line to the commit message"
-msgstr "在提交说明中添加一个 Signed-off-by 签名"
+#: builtin/am.c:2227
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "在提交说明中添加 Signed-off-by 尾注"
-#: builtin/am.c:2243
+#: builtin/am.c:2230
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集（默认）"
-#: builtin/am.c:2245
+#: builtin/am.c:2232
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/am.c:2247
+#: builtin/am.c:2234
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/am.c:2249
+#: builtin/am.c:2236
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
-#: builtin/am.c:2251
+#: builtin/am.c:2238
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/am.c:2254
+#: builtin/am.c:2241
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
-#: builtin/am.c:2257
+#: builtin/am.c:2244
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
-#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268
-#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/am.c:2286
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251
+#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260
#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324
-#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350
+#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172
#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135
+#: builtin/am.c:2269 builtin/branch.c:661 builtin/bugreport.c:136
#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438
#: builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
-#: builtin/am.c:2283
+#: builtin/am.c:2270
msgid "format the patch(es) are in"
msgstr "补丁的格式"
-#: builtin/am.c:2289
+#: builtin/am.c:2276
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
-#: builtin/am.c:2291
+#: builtin/am.c:2278
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
-#: builtin/am.c:2294
+#: builtin/am.c:2281
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
-#: builtin/am.c:2297
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr "跳过当前补丁"
-#: builtin/am.c:2300
+#: builtin/am.c:2287
msgid "restore the original branch and abort the patching operation."
msgstr "恢复原始分支并终止打补丁操作。"
-#: builtin/am.c:2303
+#: builtin/am.c:2290
msgid "abort the patching operation but keep HEAD where it is."
msgstr "终止补丁操作但保持 HEAD 不变。"
-#: builtin/am.c:2307
+#: builtin/am.c:2294
msgid "show the patch being applied"
msgstr "显示正在应用的补丁"
-#: builtin/am.c:2312
+#: builtin/am.c:2299
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
-#: builtin/am.c:2314
+#: builtin/am.c:2301
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
-#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515
-#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530
-#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419
+#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536
+#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389
+#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
-#: builtin/am.c:2320
+#: builtin/am.c:2307
msgid "(internal use for git-rebase)"
msgstr "（内部使用，用于 git-rebase）"
-#: builtin/am.c:2338
+#: builtin/am.c:2325
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
"请不要再使用它了。"
-#: builtin/am.c:2345
+#: builtin/am.c:2332
msgid "failed to read the index"
msgstr "读取索引失败"
-#: builtin/am.c:2360
+#: builtin/am.c:2347
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
-#: builtin/am.c:2384
+#: builtin/am.c:2371
#, c-format
msgid ""
"Stray %s directory found.\n"
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2390
+#: builtin/am.c:2377
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"
-#: builtin/am.c:2400
+#: builtin/am.c:2387
msgid "interactive mode requires patches on the command line"
msgstr "交互式模式需要命令行上提供补丁"
msgstr "git archive：应有一个 flush 包"
#: builtin/bisect--helper.c:23
-msgid "git bisect--helper --next-all"
-msgstr "git bisect--helper --next-all"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
-
-#: builtin/bisect--helper.c:25
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:26
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<提交>]"
-#: builtin/bisect--helper.c:27
+#: builtin/bisect--helper.c:24
msgid ""
"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
"<bad_term>"
"git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语"
">"
-#: builtin/bisect--helper.c:28
+#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
"<bad_term>"
msgstr ""
"git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>"
-#: builtin/bisect--helper.c:29
+#: builtin/bisect--helper.c:26
msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c:27
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
-#: builtin/bisect--helper.c:31
+#: builtin/bisect--helper.c:28
msgid ""
"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
"git bisect--helper --bisect-start [--term-{new,bad}=<术语> --term-{old,good}"
"=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径>...]"
-#: builtin/bisect--helper.c:33
+#: builtin/bisect--helper.c:30
msgid "git bisect--helper --bisect-next"
msgstr "git bisect--helper --bisect-next"
-#: builtin/bisect--helper.c:34
+#: builtin/bisect--helper.c:31
msgid "git bisect--helper --bisect-auto-next"
msgstr "git bisect--helper --bisect-auto-next"
-#: builtin/bisect--helper.c:35
-msgid "git bisect--helper --bisect-autostart"
-msgstr "git bisect--helper --bisect-autostart"
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr "git bisect--helper --bisect-state (bad|new) [<版本>]"
+
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<版本>...]"
-#: builtin/bisect--helper.c:97
+#: builtin/bisect--helper.c:108
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "不能以 '%2$s' 模式打开文件 '%1$s'"
-#: builtin/bisect--helper.c:104
+#: builtin/bisect--helper.c:115
#, c-format
msgid "could not write to file '%s'"
msgstr "不能写入文件 '%s'"
-#: builtin/bisect--helper.c:143
+#: builtin/bisect--helper.c:154
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' 不是一个有效的术语"
-#: builtin/bisect--helper.c:147
+#: builtin/bisect--helper.c:158
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "不能使用内置命令 '%s' 作为术语"
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:168
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "不能修改术语 '%s' 的含义"
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:178
msgid "please use two different terms"
msgstr "请使用两个不同的术语"
-#: builtin/bisect--helper.c:207
+#: builtin/bisect--helper.c:194
#, c-format
msgid "We are not bisecting.\n"
msgstr "我们没有在二分查找。\n"
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:202
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' 不是一个有效的提交"
-#: builtin/bisect--helper.c:224
+#: builtin/bisect--helper.c:211
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
-#: builtin/bisect--helper.c:268
+#: builtin/bisect--helper.c:255
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "坏的 bisect_write 参数：%s"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:260
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "无法获取版本 '%s' 的对象 ID"
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:272
#, c-format
msgid "couldn't open the file '%s'"
msgstr "无法打开文件 '%s'"
-#: builtin/bisect--helper.c:311
+#: builtin/bisect--helper.c:298
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中"
-#: builtin/bisect--helper.c:338
+#: builtin/bisect--helper.c:325
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
"您需要给我至少一个 %s 和一个 %s 版本。\n"
"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
-#: builtin/bisect--helper.c:342
+#: builtin/bisect--helper.c:329
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
-#: builtin/bisect--helper.c:362
+#: builtin/bisect--helper.c:349
#, c-format
msgid "bisecting only with a %s commit"
msgstr "在只有一个 %s 提交的情况下二分查找"
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:370
+#: builtin/bisect--helper.c:357
msgid "Are you sure [Y/n]? "
msgstr "您确认么[Y/n]？ "
-#: builtin/bisect--helper.c:431
+#: builtin/bisect--helper.c:418
msgid "no terms defined"
msgstr "未定义术语"
-#: builtin/bisect--helper.c:434
+#: builtin/bisect--helper.c:421
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n"
-#: builtin/bisect--helper.c:444
+#: builtin/bisect--helper.c:431
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
"命令 'git bisect terms' 的参数 %s 无效。\n"
"支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:498
msgid "revision walk setup failed\n"
msgstr "版本遍历设置失败\n"
-#: builtin/bisect--helper.c:533
+#: builtin/bisect--helper.c:520
#, c-format
msgid "could not open '%s' for appending"
msgstr "无法打开 '%s' 进行追加"
-#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664
+#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652
msgid "'' is not a valid term"
msgstr "'' 不是一个有效的术语"
-#: builtin/bisect--helper.c:674
+#: builtin/bisect--helper.c:662
#, c-format
msgid "unrecognized option: '%s'"
msgstr "未识别的选项：'%s'"
-#: builtin/bisect--helper.c:678
+#: builtin/bisect--helper.c:666
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' 看起来不是一个有效的版本"
-#: builtin/bisect--helper.c:709
+#: builtin/bisect--helper.c:697
msgid "bad HEAD - I need a HEAD"
msgstr "坏的 HEAD - 我需要一个 HEAD"
-#: builtin/bisect--helper.c:724
+#: builtin/bisect--helper.c:712
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
-#: builtin/bisect--helper.c:745
+#: builtin/bisect--helper.c:733
msgid "won't bisect on cg-seek'ed tree"
msgstr "不会在做了 cg-seek 的树上做二分查找"
-#: builtin/bisect--helper.c:748
+#: builtin/bisect--helper.c:736
msgid "bad HEAD - strange symbolic ref"
msgstr "坏的 HEAD - 奇怪的符号引用"
-#: builtin/bisect--helper.c:775
+#: builtin/bisect--helper.c:756
#, c-format
msgid "invalid ref: '%s'"
msgstr "无效的引用：'%s'"
-#: builtin/bisect--helper.c:827
+#: builtin/bisect--helper.c:814
msgid "You need to start by \"git bisect start\"\n"
msgstr "您需要执行 \"git bisect start\" 来开始\n"
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:838
+#: builtin/bisect--helper.c:825
msgid "Do you want me to do it for you [Y/n]? "
msgstr "您想让我为您这样做么[Y/n]？ "
-#: builtin/bisect--helper.c:866
-msgid "perform 'git bisect next'"
-msgstr "执行 'git bisect next'"
+#: builtin/bisect--helper.c:843
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "请使用至少一个参数调用 `--bisect-state`"
-#: builtin/bisect--helper.c:868
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "将术语写入 .git/BISECT_TERMS"
-
-#: builtin/bisect--helper.c:870
-msgid "cleanup the bisection state"
-msgstr "清除二分查找状态"
+#: builtin/bisect--helper.c:856
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect %s' 只能带一个参数。"
-#: builtin/bisect--helper.c:872
-msgid "check for expected revs"
-msgstr "检查预期的版本"
+#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "坏的版本输入：%s"
-#: builtin/bisect--helper.c:874
+#: builtin/bisect--helper.c:924
msgid "reset the bisection state"
msgstr "清除二分查找状态"
-#: builtin/bisect--helper.c:876
+#: builtin/bisect--helper.c:926
msgid "write out the bisection state in BISECT_LOG"
msgstr "将二分查找的状态写入 BISECT_LOG"
-#: builtin/bisect--helper.c:878
+#: builtin/bisect--helper.c:928
msgid "check and set terms in a bisection state"
msgstr "在一个二分查找状态中检查和设置术语"
-#: builtin/bisect--helper.c:880
+#: builtin/bisect--helper.c:930
msgid "check whether bad or good terms exist"
msgstr "检查坏的或好的术语是否存在"
-#: builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:932
msgid "print out the bisect terms"
msgstr "打印二分查找术语"
-#: builtin/bisect--helper.c:884
+#: builtin/bisect--helper.c:934
msgid "start the bisect session"
msgstr "启动二分查找过程"
-#: builtin/bisect--helper.c:886
+#: builtin/bisect--helper.c:936
msgid "find the next bisection commit"
msgstr "查询下一个二分查找提交"
-#: builtin/bisect--helper.c:888
+#: builtin/bisect--helper.c:938
msgid "verify the next bisection state then checkout the next bisection commit"
msgstr "校验下一个二分查找状态然后检出下一个二分查找提交"
-#: builtin/bisect--helper.c:890
-msgid "start the bisection if it has not yet been started"
-msgstr "如果二分查找尚未启动，则启动之"
+#: builtin/bisect--helper.c:940
+msgid "mark the state of ref (or refs)"
+msgstr "标记引用的状态"
-#: builtin/bisect--helper.c:892
+#: builtin/bisect--helper.c:942
msgid "no log for BISECT_WRITE"
msgstr "BISECT_WRITE 无日志"
-#: builtin/bisect--helper.c:910
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms 需要两个参数"
-
-#: builtin/bisect--helper.c:914
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state 不带参数"
-
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:957
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset 无需参数或者需要一个提交"
-#: builtin/bisect--helper.c:925
+#: builtin/bisect--helper.c:961
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr "--bisect-write 需要 4 或 5 个参数"
-#: builtin/bisect--helper.c:931
+#: builtin/bisect--helper.c:967
msgid "--check-and-set-terms requires 3 arguments"
msgstr "--check-and-set-terms 需要 3 个参数"
-#: builtin/bisect--helper.c:937
+#: builtin/bisect--helper.c:973
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check 需要 2 或 3 个参数"
-#: builtin/bisect--helper.c:943
+#: builtin/bisect--helper.c:979
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms 需要 0 或 1 个参数"
-#: builtin/bisect--helper.c:952
+#: builtin/bisect--helper.c:988
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next 需要 0 个参数"
-#: builtin/bisect--helper.c:958
+#: builtin/bisect--helper.c:994
msgid "--bisect-auto-next requires 0 arguments"
msgstr "--bisect-auto-next 需要 0 个参数"
-#: builtin/bisect--helper.c:964
-msgid "--bisect-autostart does not accept arguments"
-msgstr "--bisect-autostart 不带参数"
-
#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
msgid "invalid value for blame.coloring"
msgstr "设置 blame.coloring 中的无效取值"
-#: builtin/blame.c:845
+#: builtin/blame.c:847
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "不能找到要忽略的版本 %s"
-#: builtin/blame.c:867
+#: builtin/blame.c:869
msgid "Show blame entries as we find them, incrementally"
msgstr "增量式地显示发现的 blame 条目"
-#: builtin/blame.c:868
+#: builtin/blame.c:870
msgid "Do not show object names of boundary commits (Default: off)"
msgstr "不显示边界提交的对象名（默认：关闭）"
-#: builtin/blame.c:869
+#: builtin/blame.c:871
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "不把根提交作为边界（默认：关闭）"
-#: builtin/blame.c:870
+#: builtin/blame.c:872
msgid "Show work cost statistics"
msgstr "显示命令消耗统计"
-#: builtin/blame.c:871
+#: builtin/blame.c:873
msgid "Force progress reporting"
msgstr "强制进度显示"
-#: builtin/blame.c:872
+#: builtin/blame.c:874
msgid "Show output score for blame entries"
msgstr "显示判断 blame 条目位移的得分诊断信息"
-#: builtin/blame.c:873
+#: builtin/blame.c:875
msgid "Show original filename (Default: auto)"
msgstr "显示原始文件名（默认：自动）"
-#: builtin/blame.c:874
+#: builtin/blame.c:876
msgid "Show original linenumber (Default: off)"
msgstr "显示原始的行号（默认：关闭）"
-#: builtin/blame.c:875
+#: builtin/blame.c:877
msgid "Show in a format designed for machine consumption"
msgstr "显示为一个适合机器读取的格式"
-#: builtin/blame.c:876
+#: builtin/blame.c:878
msgid "Show porcelain format with per-line commit information"
msgstr "为每一行显示机器适用的提交信息"
-#: builtin/blame.c:877
+#: builtin/blame.c:879
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
-#: builtin/blame.c:878
+#: builtin/blame.c:880
msgid "Show raw timestamp (Default: off)"
msgstr "显示原始时间戳（默认：关闭）"
-#: builtin/blame.c:879
+#: builtin/blame.c:881
msgid "Show long commit SHA1 (Default: off)"
msgstr "显示长的 SHA1 提交号（默认：关闭）"
-#: builtin/blame.c:880
+#: builtin/blame.c:882
msgid "Suppress author name and timestamp (Default: off)"
msgstr "隐藏作者名字和时间戳（默认：关闭）"
-#: builtin/blame.c:881
+#: builtin/blame.c:883
msgid "Show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而不是名字（默认：关闭）"
-#: builtin/blame.c:882
+#: builtin/blame.c:884
msgid "Ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:883 builtin/log.c:1808
+#: builtin/blame.c:885 builtin/log.c:1813
msgid "rev"
msgstr "版本"
-#: builtin/blame.c:883
+#: builtin/blame.c:885
msgid "Ignore <rev> when blaming"
msgstr "在执行 blame 操作时忽略 <版本>"
-#: builtin/blame.c:884
+#: builtin/blame.c:886
msgid "Ignore revisions from <file>"
msgstr "忽略来自 <文件> 中的版本"
-#: builtin/blame.c:885
+#: builtin/blame.c:887
msgid "color redundant metadata from previous line differently"
msgstr "使用颜色间隔输出与前一行不同的重复元信息"
-#: builtin/blame.c:886
+#: builtin/blame.c:888
msgid "color lines by age"
msgstr "依据时间着色"
-#: builtin/blame.c:887
+#: builtin/blame.c:889
msgid "Spend extra cycles to find better match"
msgstr "花费额外的循环来找到更好的匹配"
-#: builtin/blame.c:888
+#: builtin/blame.c:890
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
-#: builtin/blame.c:889
+#: builtin/blame.c:891
msgid "Use <file>'s contents as the final image"
msgstr "使用 <文件> 的内容作为最终的图片"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:892 builtin/blame.c:893
msgid "score"
msgstr "得分"
-#: builtin/blame.c:890
+#: builtin/blame.c:892
msgid "Find line copies within and across files"
msgstr "找到文件内及跨文件的行拷贝"
-#: builtin/blame.c:891
+#: builtin/blame.c:893
msgid "Find line movements within and across files"
msgstr "找到文件内及跨文件的行移动"
-#: builtin/blame.c:892
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:894
+msgid "range"
+msgstr "范围"
-#: builtin/blame.c:892
-msgid "Process only line range n,m, counting from 1"
-msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
+#: builtin/blame.c:895
+msgid "Process only line range <start>,<end> or function :<funcname>"
+msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数名>"
-#: builtin/blame.c:944
+#: builtin/blame.c:947
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
msgid "4 years, 11 months ago"
msgstr "4 年 11 个月前"
-#: builtin/blame.c:1110
+#: builtin/blame.c:1114
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "文件 %s 只有 %lu 行"
msgstr[1] "文件 %s 只有 %lu 行"
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
msgid "Blaming lines"
msgstr "追踪代码行"
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名：'%s'"
-#: builtin/branch.c:542
+#: builtin/branch.c:544
msgid "Branch rename failed"
msgstr "分支重命名失败"
-#: builtin/branch.c:544
+#: builtin/branch.c:546
msgid "Branch copy failed"
msgstr "分支拷贝失败"
-#: builtin/branch.c:548
+#: builtin/branch.c:550
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "已为错误命名的分支 '%s' 创建了一个副本"
-#: builtin/branch.c:551
+#: builtin/branch.c:553
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "已将错误命名的分支 '%s' 重命名"
-#: builtin/branch.c:557
+#: builtin/branch.c:559
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s，但 HEAD 没有更新！"
-#: builtin/branch.c:566
+#: builtin/branch.c:568
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名，但更新配置文件失败"
-#: builtin/branch.c:568
+#: builtin/branch.c:570
msgid "Branch is copied, but update of config-file failed"
msgstr "分支已拷贝，但更新配置文件失败"
-#: builtin/branch.c:584
+#: builtin/branch.c:586
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"以 '%c' 开头的行将被过滤。\n"
-#: builtin/branch.c:618
+#: builtin/branch.c:620
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:620
+#: builtin/branch.c:622
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
-#: builtin/branch.c:621
+#: builtin/branch.c:623
msgid "suppress informational messages"
msgstr "不显示信息"
-#: builtin/branch.c:622
+#: builtin/branch.c:624
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模式（参见 git-pull(1)）"
-#: builtin/branch.c:624
+#: builtin/branch.c:626
msgid "do not use"
msgstr "不要使用"
-#: builtin/branch.c:626 builtin/rebase.c:526
+#: builtin/branch.c:628 builtin/rebase.c:532
msgid "upstream"
msgstr "上游"
-#: builtin/branch.c:626
+#: builtin/branch.c:628
msgid "change the upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:627
+#: builtin/branch.c:629
msgid "unset the upstream info"
msgstr "取消上游信息的设置"
-#: builtin/branch.c:628
+#: builtin/branch.c:630
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:629
+#: builtin/branch.c:631
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:631 builtin/branch.c:633
+#: builtin/branch.c:633 builtin/branch.c:635
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
-#: builtin/branch.c:632 builtin/branch.c:634
+#: builtin/branch.c:634 builtin/branch.c:636
msgid "print only branches that don't contain the commit"
msgstr "只打印不包含该提交的分支"
-#: builtin/branch.c:637
+#: builtin/branch.c:639
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作："
-#: builtin/branch.c:638
+#: builtin/branch.c:640
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
-#: builtin/branch.c:640
+#: builtin/branch.c:642
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
-#: builtin/branch.c:641
+#: builtin/branch.c:643
msgid "delete branch (even if not merged)"
msgstr "删除分支（即使没有合并）"
-#: builtin/branch.c:642
+#: builtin/branch.c:644
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支，以及它的引用日志"
-#: builtin/branch.c:643
+#: builtin/branch.c:645
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支，即使目标已存在"
-#: builtin/branch.c:644
+#: builtin/branch.c:646
msgid "copy a branch and its reflog"
msgstr "拷贝一个分支和它的引用日志"
-#: builtin/branch.c:645
+#: builtin/branch.c:647
msgid "copy a branch, even if target exists"
msgstr "拷贝一个分支，即使目标已存在"
-#: builtin/branch.c:646
+#: builtin/branch.c:648
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:647
+#: builtin/branch.c:649
msgid "show current branch name"
msgstr "显示当前分支名"
-#: builtin/branch.c:648
+#: builtin/branch.c:650
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:650
+#: builtin/branch.c:652
msgid "edit the description for the branch"
msgstr "标记分支的描述"
-#: builtin/branch.c:651
+#: builtin/branch.c:653
msgid "force creation, move/rename, deletion"
msgstr "强制创建、移动/重命名、删除"
-#: builtin/branch.c:652
+#: builtin/branch.c:654
msgid "print only branches that are merged"
msgstr "只打印已经合并的分支"
-#: builtin/branch.c:653
+#: builtin/branch.c:655
msgid "print only branches that are not merged"
msgstr "只打印尚未合并的分支"
-#: builtin/branch.c:654
+#: builtin/branch.c:656
msgid "list branches in columns"
msgstr "以列的方式显示分支"
-#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:658 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
#: builtin/tag.c:434
msgid "object"
msgstr "对象"
-#: builtin/branch.c:657
+#: builtin/branch.c:659
msgid "print only branches of the object"
msgstr "只打印指向该对象的分支"
-#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:441
msgid "sorting and filtering are case insensitive"
msgstr "排序和过滤属于大小写不敏感"
-#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:439
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "输出格式"
-#: builtin/branch.c:682 builtin/clone.c:789
+#: builtin/branch.c:684 builtin/clone.c:790
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
-#: builtin/branch.c:706
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
-#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "必须提供分支名"
-#: builtin/branch.c:751
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
-#: builtin/branch.c:756
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
-#: builtin/branch.c:763
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
-#: builtin/branch.c:766
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:781
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "为拷贝操作提供了太多的分支名"
-#: builtin/branch.c:790
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "为重命名操作提供了太多的参数"
-#: builtin/branch.c:795
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "为设置新上游提供了太多的参数"
-#: builtin/branch.c:799
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
-#: builtin/branch.c:802 builtin/branch.c:825
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:806
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:819
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "为取消上游设置操作提供了太多的参数"
-#: builtin/branch.c:823
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
-#: builtin/branch.c:829
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
-#: builtin/branch.c:839
+#: builtin/branch.c:841
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
"'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
"您是否想要使用：-a|-r --list <模式>？"
-#: builtin/branch.c:843
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
"请检查下面错误报告中余下的内容。\n"
"您可以删除任何您不想共享的内容。\n"
-#: builtin/bugreport.c:134
+#: builtin/bugreport.c:135
msgid "specify a destination for the bugreport file"
msgstr "指定错误报告文件的目标位置"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:137
msgid "specify a strftime format suffix for the filename"
msgstr "指定文件的 strftime 格式后缀"
-#: builtin/bugreport.c:158
+#: builtin/bugreport.c:159
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/bugreport.c:165
+#: builtin/bugreport.c:166
msgid "System Info"
msgstr "系统信息"
-#: builtin/bugreport.c:168
+#: builtin/bugreport.c:169
msgid "Enabled Hooks"
msgstr "启用的钩子"
-#: builtin/bugreport.c:175
+#: builtin/bugreport.c:176
#, c-format
msgid "couldn't create a new file at '%s'"
msgstr "不能在 '%s' 创建新文件"
-#: builtin/bugreport.c:178
+#: builtin/bugreport.c:179
#, c-format
msgid "unable to write to %s"
msgstr "无法写入 %s"
-#: builtin/bugreport.c:188
+#: builtin/bugreport.c:189
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "在 '%s' 创建了新报告。\n"
msgid "Need a repository to unbundle."
msgstr "需要一个仓库来解开归档包。"
-#: builtin/bundle.c:171 builtin/remote.c:1687
+#: builtin/bundle.c:171 builtin/remote.c:1700
msgid "be verbose; must be placed before a subcommand"
msgstr "冗长输出；必须置于子命令之前"
-#: builtin/bundle.c:193 builtin/remote.c:1718
+#: builtin/bundle.c:193 builtin/remote.c:1731
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子命令：%s"
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538
+#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541
#: builtin/worktree.c:561
msgid "suppress progress reporting"
msgstr "不显示进度报告"
msgid "no contacts specified"
msgstr "未指定联系地址"
-#: builtin/checkout-index.c:131
+#: builtin/checkout-index.c:139
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<选项>] [--] [<文件>...]"
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:156
msgid "stage should be between 1 and 3 or all"
msgstr "索引值应该取值 1 到 3 或者 all"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:173
msgid "check out all files in the index"
msgstr "检出索引区的所有文件"
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:174
msgid "force overwrite of existing files"
msgstr "强制覆盖现有的文件"
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:176
msgid "no warning for existing files and files not in index"
msgstr "存在或不在索引中的文件都没有警告"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:178
msgid "don't checkout new files"
msgstr "不检出新文件"
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:180
msgid "update stat information in the index file"
msgstr "更新索引中文件的状态信息"
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:184
msgid "read list of paths from the standard input"
msgstr "从标准输入读取路径列表"
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:186
msgid "write the content to temporary files"
msgstr "将内容写入临时文件"
-#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/checkout-index.c:187 builtin/column.c:31
#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827
#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333
-#: builtin/worktree.c:754
+#: builtin/worktree.c:757
msgid "string"
msgstr "字符串"
-#: builtin/checkout-index.c:179
+#: builtin/checkout-index.c:188
msgid "when creating files, prepend <string>"
msgstr "在创建文件时，在前面加上 <字符串>"
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:190
msgid "copy out the files from named stage"
msgstr "从指定暂存区中拷出文件"
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
-#: builtin/checkout.c:528 builtin/checkout.c:535
+#: builtin/checkout.c:541 builtin/checkout.c:548
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:703
+#: builtin/checkout.c:716
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:757
+#: builtin/checkout.c:770
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"不能继续，下列文件有暂存的修改：\n"
"%s"
-#: builtin/checkout.c:853
+#: builtin/checkout.c:866
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
-#: builtin/checkout.c:895
+#: builtin/checkout.c:908
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:899 builtin/clone.c:720
+#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:903
+#: builtin/checkout.c:916
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:906
+#: builtin/checkout.c:919
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:910
+#: builtin/checkout.c:923
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:912 builtin/checkout.c:1338
+#: builtin/checkout.c:925 builtin/checkout.c:1356
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:914
+#: builtin/checkout.c:927
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
-#: builtin/checkout.c:965
+#: builtin/checkout.c:978
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
-#: builtin/checkout.c:971
+#: builtin/checkout.c:984
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:990
+#: builtin/checkout.c:1003
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:1025
+#: builtin/checkout.c:1038
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:1029
+#: builtin/checkout.c:1042
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:1069 builtin/checkout.c:1333
+#: builtin/checkout.c:1082 builtin/checkout.c:1351
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1164
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n"
"请使用 --（和可选的 --no-guess）来消除歧义"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1171
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n"
"名称，可以在配置中设置 checkout.defaultRemote=origin。"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1181
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' 匹配多个（%d 个）远程跟踪分支"
-#: builtin/checkout.c:1229
+#: builtin/checkout.c:1247
msgid "only one reference expected"
msgstr "只期望一个引用"
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1264
#, c-format
msgid "only one reference expected, %d given."
msgstr "应只有一个引用，却给出了 %d 个"
-#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510
+#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
-#: builtin/checkout.c:1305 builtin/checkout.c:1671
+#: builtin/checkout.c:1323 builtin/checkout.c:1689
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1370
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "期望一个分支，得到标签 '%s'"
-#: builtin/checkout.c:1354
+#: builtin/checkout.c:1372
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "期望一个分支，得到远程分支 '%s'"
-#: builtin/checkout.c:1355 builtin/checkout.c:1363
+#: builtin/checkout.c:1373 builtin/checkout.c:1381
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "期望一个分支，得到 '%s'"
-#: builtin/checkout.c:1358
+#: builtin/checkout.c:1376
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "期望一个分支，得到提交 '%s'"
-#: builtin/checkout.c:1374
+#: builtin/checkout.c:1392
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
"不能在合并时切换分支\n"
"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1378
+#: builtin/checkout.c:1396
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
"不能在一个 am 会话期间切换分支\n"
"考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1382
+#: builtin/checkout.c:1400
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
"不能在变基时切换分支\n"
"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1386
+#: builtin/checkout.c:1404
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
"不能在拣选时切换分支\n"
"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1390
+#: builtin/checkout.c:1408
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
"不能在还原时切换分支\n"
"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1394
+#: builtin/checkout.c:1412
msgid "you are switching branch while bisecting"
msgstr "您在执行二分查找时切换分支"
-#: builtin/checkout.c:1401
+#: builtin/checkout.c:1419
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412
+#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422
-#: builtin/checkout.c:1427 builtin/checkout.c:1432
+#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440
+#: builtin/checkout.c:1445 builtin/checkout.c:1450
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1429
+#: builtin/checkout.c:1447
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' 不带 <起始点>"
-#: builtin/checkout.c:1437
+#: builtin/checkout.c:1455
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1444
+#: builtin/checkout.c:1462
msgid "missing branch or commit argument"
msgstr "缺少分支或提交参数"
-#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84
-#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287
-#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551
-#: builtin/send-pack.c:192
+#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84
+#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296
+#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575
+#: builtin/send-pack.c:198
msgid "force progress reporting"
msgstr "强制显示进度报告"
-#: builtin/checkout.c:1487
+#: builtin/checkout.c:1505
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方合并"
-#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322
+#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1489
+#: builtin/checkout.c:1507
msgid "conflict style (merge or diff3)"
msgstr "冲突输出风格（merge 或 diff3）"
-#: builtin/checkout.c:1501 builtin/worktree.c:558
+#: builtin/checkout.c:1519 builtin/worktree.c:558
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
-#: builtin/checkout.c:1502
+#: builtin/checkout.c:1520
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信息"
-#: builtin/checkout.c:1504
+#: builtin/checkout.c:1522
msgid "force checkout (throw away local modifications)"
msgstr "强制检出（丢弃本地修改）"
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1524
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1524
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1508 builtin/merge.c:291
+#: builtin/checkout.c:1526 builtin/merge.c:300
msgid "update ignored files (default)"
msgstr "更新忽略的文件（默认）"
-#: builtin/checkout.c:1511
+#: builtin/checkout.c:1529
msgid "do not check if another worktree is holding the given ref"
msgstr "不检查指定的引用是否被其他工作区所占用"
-#: builtin/checkout.c:1524
+#: builtin/checkout.c:1542
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1527
+#: builtin/checkout.c:1545
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1531
+#: builtin/checkout.c:1549
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
-#: builtin/checkout.c:1586
+#: builtin/checkout.c:1604
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-%c、-%c 和 --orphan 是互斥的"
-#: builtin/checkout.c:1590
+#: builtin/checkout.c:1608
msgid "-p and --overlay are mutually exclusive"
msgstr "-p 和 --overlay 互斥"
-#: builtin/checkout.c:1627
+#: builtin/checkout.c:1645
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1632
+#: builtin/checkout.c:1650
#, c-format
msgid "missing branch name; try -%c"
msgstr "缺少分支名，尝试 -%c"
-#: builtin/checkout.c:1664
+#: builtin/checkout.c:1682
#, c-format
msgid "could not resolve %s"
msgstr "无法解析 %s"
-#: builtin/checkout.c:1680
+#: builtin/checkout.c:1698
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1687
+#: builtin/checkout.c:1705
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"
-#: builtin/checkout.c:1691
+#: builtin/checkout.c:1709
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1718
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file 与 --detach 不兼容"
-#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500
+#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file 与 --patch 不兼容"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1734
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1739
msgid "you must specify path(s) to restore"
msgstr "您必须指定一个要恢复的路径"
-#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798
-#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816
+#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170
#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554
#: builtin/worktree.c:556
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1748
+#: builtin/checkout.c:1766
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1768
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
-#: builtin/checkout.c:1751
+#: builtin/checkout.c:1769
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1753
+#: builtin/checkout.c:1771
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "二次猜测 'git checkout <无此分支>'（默认）"
-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1772
msgid "use overlay mode (default)"
msgstr "使用叠加模式（默认）"
-#: builtin/checkout.c:1799
+#: builtin/checkout.c:1817
msgid "create and switch to a new branch"
msgstr "创建并切换一个新分支"
-#: builtin/checkout.c:1801
+#: builtin/checkout.c:1819
msgid "create/reset and switch to a branch"
msgstr "创建/重置并切换一个分支"
-#: builtin/checkout.c:1803
+#: builtin/checkout.c:1821
msgid "second guess 'git switch <no-such-branch>'"
msgstr "二次猜测 'git switch <无此分支>'"
-#: builtin/checkout.c:1805
+#: builtin/checkout.c:1823
msgid "throw away local modifications"
msgstr "丢弃本地修改"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1857
msgid "which tree-ish to checkout from"
msgstr "要检出哪一个树"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1859
msgid "restore the index"
msgstr "恢复索引"
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1861
msgid "restore the working tree (default)"
msgstr "恢复工作区（默认）"
-#: builtin/checkout.c:1845
+#: builtin/checkout.c:1863
msgid "ignore unmerged entries"
msgstr "忽略未合并条目"
-#: builtin/checkout.c:1846
+#: builtin/checkout.c:1864
msgid "use overlay mode"
msgstr "使用叠加模式"
msgid "could not lstat %s\n"
msgstr "不能对 %s 调用 lstat\n"
-#: builtin/clean.c:302 git-add--interactive.perl:595
+#: builtin/clean.c:302 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"foo - 通过唯一前缀选择一个选项\n"
" - （空）什么也不选择\n"
-#: builtin/clean.c:306 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* - 选择所有选项\n"
" - （空）结束选择\n"
-#: builtin/clean.c:521 git-add--interactive.perl:570
-#: git-add--interactive.perl:575
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "嗯（%s）？\n"
msgstr "删除整个目录"
#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183
+#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185
#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "don't create a checkout"
msgstr "不创建一个检出"
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553
+#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
msgid "create a bare repository"
msgstr "创建一个纯仓库"
-#: builtin/clone.c:98
+#: builtin/clone.c:99
msgid "create a mirror repository (implies bare)"
msgstr "创建一个镜像仓库（也是纯仓库）"
-#: builtin/clone.c:100
+#: builtin/clone.c:101
msgid "to clone from a local repository"
msgstr "从本地仓库克隆"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "don't use local hardlinks, always copy"
msgstr "不使用本地硬链接，始终复制"
-#: builtin/clone.c:104
+#: builtin/clone.c:105
msgid "setup as shared repository"
msgstr "设置为共享仓库"
-#: builtin/clone.c:106
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "路径规格"
-#: builtin/clone.c:106
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "在克隆时初始化子模组"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "number of submodules cloned in parallel"
msgstr "并发克隆的子模组的数量"
-#: builtin/clone.c:111 builtin/init-db.c:550
+#: builtin/clone.c:112 builtin/init-db.c:552
msgid "template-directory"
msgstr "模板目录"
-#: builtin/clone.c:112 builtin/init-db.c:551
+#: builtin/clone.c:113 builtin/init-db.c:553
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831
+#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
#: builtin/submodule--helper.c:2336
msgid "reference repository"
msgstr "参考仓库"
-#: builtin/clone.c:118 builtin/submodule--helper.c:1833
+#: builtin/clone.c:119 builtin/submodule--helper.c:1833
#: builtin/submodule--helper.c:2338
msgid "use --reference only while cloning"
msgstr "仅在克隆时参考 --reference 指向的本地仓库"
-#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358
msgid "name"
msgstr "名称"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
-#: builtin/clone.c:122
+#: builtin/clone.c:123
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "检出 <分支> 而不是远程 HEAD"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849
+#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860
#: builtin/pull.c:208
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535
+#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535
#: builtin/pull.c:211
msgid "time"
msgstr "时间"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "create a shallow clone since a specific time"
msgstr "从一个特定时间创建一个浅克隆"
-#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311
+#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317
msgid "revision"
msgstr "版本"
-#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215
+#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化浅克隆的历史，除了特定版本"
-#: builtin/clone.c:132 builtin/submodule--helper.c:1843
+#: builtin/clone.c:133 builtin/submodule--helper.c:1843
#: builtin/submodule--helper.c:2352
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
-#: builtin/clone.c:134
+#: builtin/clone.c:135
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"
-#: builtin/clone.c:136
+#: builtin/clone.c:137
msgid "any cloned submodules will be shallow"
msgstr "子模组将以浅下载模式克隆"
-#: builtin/clone.c:137 builtin/init-db.c:559
+#: builtin/clone.c:138 builtin/init-db.c:561
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:138 builtin/init-db.c:560
+#: builtin/clone.c:139 builtin/init-db.c:562
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
-#: builtin/clone.c:139
+#: builtin/clone.c:140
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:140
+#: builtin/clone.c:141
msgid "set config inside the new repository"
msgstr "在新仓库中设置配置信息"
-#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76
-#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190
+#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
msgid "server-specific"
msgstr "server-specific"
-#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76
-#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191
+#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
msgid "option to transmit"
msgstr "传输选项"
-#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234
-#: builtin/push.c:561
+#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234
+#: builtin/push.c:585
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 地址"
-#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237
-#: builtin/push.c:563
+#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237
+#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 地址"
-#: builtin/clone.c:149
+#: builtin/clone.c:150
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
-#: builtin/clone.c:151
+#: builtin/clone.c:152
msgid "initialize sparse-checkout file to include only files at root"
msgstr "初始化稀疏检出文件，只包含根目录文件"
-#: builtin/clone.c:287
+#: builtin/clone.c:288
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"无法猜到目录名。\n"
"请在命令行指定一个目录"
-#: builtin/clone.c:340
+#: builtin/clone.c:341
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
-#: builtin/clone.c:413
+#: builtin/clone.c:414
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:431
+#: builtin/clone.c:432
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "无法在 '%s' 上启动迭代器"
-#: builtin/clone.c:462
+#: builtin/clone.c:463
#, c-format
msgid "failed to create link '%s'"
msgstr "创建链接 '%s' 失败"
-#: builtin/clone.c:466
+#: builtin/clone.c:467
#, c-format
msgid "failed to copy file to '%s'"
msgstr "拷贝文件至 '%s' 失败"
-#: builtin/clone.c:471
+#: builtin/clone.c:472
#, c-format
msgid "failed to iterate over '%s'"
msgstr "无法在 '%s' 上迭代"
-#: builtin/clone.c:498
+#: builtin/clone.c:499
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:512
+#: builtin/clone.c:513
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
"'git restore --source=HEAD :/' 重试\n"
-#: builtin/clone.c:589
+#: builtin/clone.c:590
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:708
+#: builtin/clone.c:709
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:756
+#: builtin/clone.c:757
msgid "failed to initialize sparse-checkout"
msgstr "无法初始化稀疏检出"
-#: builtin/clone.c:779
+#: builtin/clone.c:780
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
-#: builtin/clone.c:811
+#: builtin/clone.c:812
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:868
+#: builtin/clone.c:887
msgid "unable to write parameters to config file"
msgstr "无法将参数写入配置文件"
-#: builtin/clone.c:931
+#: builtin/clone.c:950
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
-#: builtin/clone.c:933
+#: builtin/clone.c:952
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:970 builtin/receive-pack.c:2434
+#: builtin/clone.c:992 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:974
+#: builtin/clone.c:996
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
-#: builtin/clone.c:987
+#: builtin/clone.c:1009
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:990
+#: builtin/clone.c:1012
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:1006
+#: builtin/clone.c:1025
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:1010 builtin/fetch.c:1841
+#: builtin/clone.c:1029 builtin/fetch.c:1841
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
-#: builtin/clone.c:1020
+#: builtin/clone.c:1039
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:1026
+#: builtin/clone.c:1045
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "仓库路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:1040
+#: builtin/clone.c:1059
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271
-#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386
+#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271
+#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:1060
+#: builtin/clone.c:1079
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
-#: builtin/clone.c:1080
+#: builtin/clone.c:1099
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:1082
+#: builtin/clone.c:1101
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:1106
+#: builtin/clone.c:1125
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
-#: builtin/clone.c:1170
+#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' 不是一个有效的远程名称"
+
+#: builtin/clone.c:1210
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1172
+#: builtin/clone.c:1212
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1174
+#: builtin/clone.c:1214
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1176
+#: builtin/clone.c:1216
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1179
+#: builtin/clone.c:1219
msgid "source repository is shallow, ignoring --local"
msgstr "源仓库是浅克隆，忽略 --local"
-#: builtin/clone.c:1184
+#: builtin/clone.c:1224
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1268 builtin/clone.c:1276
+#: builtin/clone.c:1311 builtin/clone.c:1319
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:1279
+#: builtin/clone.c:1322
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
msgstr "无法找到和 %s 匹配的对象目录"
#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764
+#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769
msgid "dir"
msgstr "目录"
msgid "duplicate parent %s ignored"
msgstr "忽略重复的父提交 %s"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555
#, c-format
msgid "not a valid object name %s"
msgstr "不是一个有效的对象名 %s"
msgid "id of a parent commit object"
msgstr "父提交对象 ID"
-#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470
#: builtin/tag.c:413
msgid "message"
msgstr "说明"
msgid "read commit log message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298
#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG 提交签名"
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
-#: builtin/commit.c:729 builtin/shortlog.c:478
+#: builtin/commit.c:729 builtin/shortlog.c:425
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正从标准输入中读取日志信息）\n"
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539
-#: builtin/worktree.c:722
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:725
msgid "machine-readable output"
msgstr "机器可读的输出"
msgstr "条目以 NUL 字符结尾"
#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1406 parse-options.h:336
msgid "mode"
msgstr "模式"
msgid "Commit message options"
msgstr "提交说明选项"
-#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415
+#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415
msgid "read message from file"
msgstr "从文件中读取提交说明"
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1503 builtin/gc.c:539
+#: builtin/commit.c:1503 builtin/gc.c:542
msgid "date"
msgstr "日期"
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292
+#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301
#: builtin/pull.c:145 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "添加 Signed-off-by: 签名"
+msgid "add a Signed-off-by trailer"
+msgstr "添加 Signed-off-by 尾注"
#: builtin/commit.c:1511
msgid "use specified template file"
msgid "git config [<options>]"
msgstr "git config [<选项>]"
-#: builtin/config.c:107 builtin/env--helper.c:27
+#: builtin/config.c:109 builtin/env--helper.c:27
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "未能识别的 --type 参数，%s"
-#: builtin/config.c:119
+#: builtin/config.c:121
msgid "only one type at a time"
msgstr "一次只能一个类型"
-#: builtin/config.c:128
+#: builtin/config.c:130
msgid "Config file location"
msgstr "配置文件位置"
-#: builtin/config.c:129
+#: builtin/config.c:131
msgid "use global config file"
msgstr "使用全局配置文件"
-#: builtin/config.c:130
+#: builtin/config.c:132
msgid "use system config file"
msgstr "使用系统级配置文件"
-#: builtin/config.c:131
+#: builtin/config.c:133
msgid "use repository config file"
msgstr "使用仓库级配置文件"
-#: builtin/config.c:132
+#: builtin/config.c:134
msgid "use per-worktree config file"
msgstr "使用工作区级别的配置文件"
-#: builtin/config.c:133
+#: builtin/config.c:135
msgid "use given config file"
msgstr "使用指定的配置文件"
-#: builtin/config.c:134
+#: builtin/config.c:136
msgid "blob-id"
msgstr "数据对象 ID"
-#: builtin/config.c:134
+#: builtin/config.c:136
msgid "read config from given blob object"
msgstr "从给定的数据对象读取配置"
-#: builtin/config.c:135
+#: builtin/config.c:137
msgid "Action"
msgstr "操作"
-#: builtin/config.c:136
-msgid "get value: name [value-regex]"
-msgstr "获取值：name [value-regex]"
-
-#: builtin/config.c:137
-msgid "get all values: key [value-regex]"
-msgstr "获得所有的值：key [value-regex]"
-
#: builtin/config.c:138
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "根据正则表达式获得值：name-regex [value-regex]"
+msgid "get value: name [value-pattern]"
+msgstr "获取值：名称 [值模式]"
#: builtin/config.c:139
-msgid "get value specific for the URL: section[.var] URL"
-msgstr "获得 URL 取值：section[.var] URL"
+msgid "get all values: key [value-pattern]"
+msgstr "获得所有的值：键 [值模式]"
#: builtin/config.c:140
-msgid "replace all matching variables: name value [value_regex]"
-msgstr "æ\9b¿æ\8d¢æ\89\80æ\9c\89å\8c¹é\85\8dç\9a\84å\8f\98é\87\8fï¼\9aname value [value_regex]"
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "æ ¹æ\8d®æ£å\88\99表达å¼\8fè\8e·å¾\97å\80¼ï¼\9aå\90\8d称æ£å\88\99 [å\80¼æ¨¡å¼\8f]"
#: builtin/config.c:141
-msgid "add a new variable: name value"
-msgstr "添加一个新的变量：name value"
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "获得 URL 取值：section[.var] URL"
#: builtin/config.c:142
-msgid "remove a variable: name [value-regex]"
-msgstr "删除一个变量：name [value-regex]"
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "替换所有匹配的变量：名称 值 [值模式]"
#: builtin/config.c:143
-msgid "remove all matches: name [value-regex]"
-msgstr "删除所有匹配项：name [value-regex]"
+msgid "add a new variable: name value"
+msgstr "添加一个新的变量：名称 值"
#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "删除一个变量：名称 [值模式]"
+
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "删除所有匹配项：名称 [值模式]"
+
+#: builtin/config.c:146
msgid "rename section: old-name new-name"
msgstr "重命名小节：old-name new-name"
-#: builtin/config.c:145
+#: builtin/config.c:147
msgid "remove a section: name"
msgstr "删除一个小节：name"
-#: builtin/config.c:146
+#: builtin/config.c:148
msgid "list all"
msgstr "列出所有"
-#: builtin/config.c:147
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "在比较值与 '值模式' 时，使用字符串字面比较"
+
+#: builtin/config.c:150
msgid "open an editor"
msgstr "打开一个编辑器"
-#: builtin/config.c:148
+#: builtin/config.c:151
msgid "find the color configured: slot [default]"
msgstr "获得配置的颜色：配置 [默认]"
-#: builtin/config.c:149
+#: builtin/config.c:152
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "获得颜色设置：配置 [stdout-is-tty]"
-#: builtin/config.c:150
+#: builtin/config.c:153
msgid "Type"
msgstr "类型"
-#: builtin/config.c:151 builtin/env--helper.c:43
+#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "取值为该类型"
-#: builtin/config.c:152
+#: builtin/config.c:155
msgid "value is \"true\" or \"false\""
msgstr "值是 \"true\" 或 \"false\""
-#: builtin/config.c:153
+#: builtin/config.c:156
msgid "value is decimal number"
msgstr "值是十进制数"
-#: builtin/config.c:154
+#: builtin/config.c:157
msgid "value is --bool or --int"
msgstr "值是 --bool 或 --int"
-#: builtin/config.c:155
+#: builtin/config.c:158
msgid "value is --bool or string"
msgstr "值是 --bool 或字符串"
-#: builtin/config.c:156
+#: builtin/config.c:159
msgid "value is a path (file or directory name)"
msgstr "值是一个路径（文件或目录名）"
-#: builtin/config.c:157
+#: builtin/config.c:160
msgid "value is an expiry date"
msgstr "值是一个到期日期"
-#: builtin/config.c:158
+#: builtin/config.c:161
msgid "Other"
msgstr "其它"
-#: builtin/config.c:159
+#: builtin/config.c:162
msgid "terminate values with NUL byte"
msgstr "终止值是 NUL 字节"
-#: builtin/config.c:160
+#: builtin/config.c:163
msgid "show variable names only"
msgstr "只显示变量名"
-#: builtin/config.c:161
+#: builtin/config.c:164
msgid "respect include directives on lookup"
msgstr "查询时参照 include 指令递归查找"
-#: builtin/config.c:162
+#: builtin/config.c:165
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"
-#: builtin/config.c:163
+#: builtin/config.c:166
msgid "show scope of config (worktree, local, global, system, command)"
msgstr "显示配置的作用域（工作区、本地、全局、系统、命令）"
-#: builtin/config.c:164 builtin/env--helper.c:45
+#: builtin/config.c:167 builtin/env--helper.c:45
msgid "value"
msgstr "取值"
-#: builtin/config.c:164
+#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
msgstr "使用 --get 参数，当缺少设置时使用默认值"
-#: builtin/config.c:178
+#: builtin/config.c:181
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "错误的参数个数，应该为 %d 个"
-#: builtin/config.c:180
+#: builtin/config.c:183
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "错误的参数个数，应该为从 %d 个到 %d 个"
-#: builtin/config.c:334
+#: builtin/config.c:339
#, c-format
msgid "invalid key pattern: %s"
msgstr "无效键名模式：%s"
-#: builtin/config.c:370
+#: builtin/config.c:377
#, c-format
msgid "failed to format default config value: %s"
msgstr "格式化默认配置值失败：%s"
-#: builtin/config.c:434
+#: builtin/config.c:441
#, c-format
msgid "cannot parse color '%s'"
msgstr "无法解析颜色 '%s'"
-#: builtin/config.c:476
+#: builtin/config.c:483
msgid "unable to parse default color value"
msgstr "无法解析默认颜色值"
-#: builtin/config.c:529 builtin/config.c:789
+#: builtin/config.c:536 builtin/config.c:833
msgid "not in a git directory"
msgstr "不在 git 仓库中"
-#: builtin/config.c:532
+#: builtin/config.c:539
msgid "writing to stdin is not supported"
msgstr "不支持写到标准输入"
-#: builtin/config.c:535
+#: builtin/config.c:542
msgid "writing config blobs is not supported"
msgstr "不支持写到配置数据对象"
-#: builtin/config.c:620
+#: builtin/config.c:627
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:644
+#: builtin/config.c:652
msgid "only one config file at a time"
msgstr "一次只能有一个配置文件"
-#: builtin/config.c:650
+#: builtin/config.c:658
msgid "--local can only be used inside a git repository"
msgstr "--local 只能在 git 仓库内使用"
-#: builtin/config.c:652
+#: builtin/config.c:660
msgid "--blob can only be used inside a git repository"
msgstr "--blob 只能在 git 仓库内使用"
-#: builtin/config.c:654
+#: builtin/config.c:662
msgid "--worktree can only be used inside a git repository"
msgstr "--worktree 只能在 git 仓库内使用"
-#: builtin/config.c:676
+#: builtin/config.c:684
msgid "$HOME not set"
msgstr "$HOME 未设置"
-#: builtin/config.c:700
+#: builtin/config.c:708
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
"不能和多个工作区一起使用 --worktree，除非启用 worktreeConfig 配置扩展。\n"
"详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
-#: builtin/config.c:735
+#: builtin/config.c:743
msgid "--get-color and variable type are incoherent"
msgstr "--get-color 和变量类型不兼容"
-#: builtin/config.c:740
+#: builtin/config.c:748
msgid "only one action at a time"
msgstr "一次只能有一个动作"
-#: builtin/config.c:753
+#: builtin/config.c:761
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only 仅适用于 --list 或 --get-regexp"
-#: builtin/config.c:759
+#: builtin/config.c:767
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
-#: builtin/config.c:765
+#: builtin/config.c:773
msgid "--default is only applicable to --get"
msgstr "--default 仅适用于 --get"
-#: builtin/config.c:778
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value 仅适用于有 '值模式'"
+
+#: builtin/config.c:822
#, c-format
msgid "unable to read config file '%s'"
msgstr "无法读取配置文件 '%s'"
-#: builtin/config.c:781
+#: builtin/config.c:825
msgid "error processing config file(s)"
msgstr "处理配置文件出错"
-#: builtin/config.c:791
+#: builtin/config.c:835
msgid "editing stdin is not supported"
msgstr "不支持编辑标准输入"
-#: builtin/config.c:793
+#: builtin/config.c:837
msgid "editing blobs is not supported"
msgstr "不支持编辑数据对象"
-#: builtin/config.c:807
+#: builtin/config.c:851
#, c-format
msgid "cannot create configuration file %s"
msgstr "不能创建配置文件 %s"
-#: builtin/config.c:820
+#: builtin/config.c:864
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
"无法用一个值覆盖多个值\n"
" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
-#: builtin/config.c:894 builtin/config.c:905
+#: builtin/config.c:943 builtin/config.c:954
#, c-format
msgid "no such section: %s"
msgstr "无此小节：%s"
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache 不可用，不支持 unix 套接字"
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "无法在 %d ms 获得凭证存储锁"
+
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<选项>] [<提交号>...]"
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken 与提交号不兼容"
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin 和 --merge-base 是互斥的"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base 仅适用于两个提交"
+
#: builtin/diff.c:91
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s'：不是一个正规文件或符号链接"
-#: builtin/diff.c:241
+#: builtin/diff.c:258
#, c-format
msgid "invalid option: %s"
msgstr "无效选项：%s"
-#: builtin/diff.c:358
+#: builtin/diff.c:375
#, c-format
msgid "%s...%s: no merge base"
msgstr "%s...%s：无合并基线"
-#: builtin/diff.c:468
+#: builtin/diff.c:485
msgid "Not a git repository"
msgstr "不是 git 仓库"
-#: builtin/diff.c:513
+#: builtin/diff.c:530 builtin/grep.c:681
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"
-#: builtin/diff.c:524
+#: builtin/diff.c:541
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "提供了超过两个数据对象：'%s'"
-#: builtin/diff.c:529
+#: builtin/diff.c:546
#, c-format
msgid "unhandled object '%s' given."
msgstr "无法处理的对象 '%s'。"
-#: builtin/diff.c:563
+#: builtin/diff.c:580
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s：多条合并基线，使用 %s"
msgid "could not read object %s for symlink %s"
msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
"不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--"
"cc'）。"
-#: builtin/difftool.c:634
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "两个文件都被修改：'%s' 和 '%s'。"
-#: builtin/difftool.c:636
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "工作区文件被留了下来。"
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "临时文件存在于 '%s'。"
-#: builtin/difftool.c:648
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "您可能想要清理或者恢复它们。"
-#: builtin/difftool.c:697
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "执行一个全目录差异比较"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "启动差异比较工具之前不提示"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "在 dir-diff 模式中使用符号链接"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:706
msgid "tool"
msgstr "工具"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "使用指定的差异比较工具"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
-#: builtin/difftool.c:713
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "指定一个用于查看差异的自定义命令"
-#: builtin/difftool.c:717
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "传递给 `diff`"
-#: builtin/difftool.c:732
+#: builtin/difftool.c:731
msgid "difftool requires worktree or --no-index"
msgstr "difftool 要求工作区或者 --no-index"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:738
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff 和 --no-index 不兼容"
-#: builtin/difftool.c:742
+#: builtin/difftool.c:741
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui、--tool 和 --extcmd 互斥"
-#: builtin/difftool.c:750
+#: builtin/difftool.c:749
msgid "no <tool> given for --tool=<tool>"
msgstr "没有为 --tool=<工具> 参数提供 <工具>"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:756
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr "错误：除非指定 --mark-tags，否则无法导出嵌套标签。"
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1177
msgid "--anonymize-map token cannot be empty"
msgstr "--anonymize-map 取值不能为空"
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1197
msgid "show progress after <n> objects"
msgstr "在 <n> 个对象之后显示进度"
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1199
msgid "select handling of signed tags"
msgstr "选择如何处理签名标签"
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1202
msgid "select handling of tags that tag filtered objects"
msgstr "选择当标签指向被过滤对象时该标签的处理方式"
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1205
msgid "select handling of commit messages in an alternate encoding"
msgstr "选择使用备用编码处理提交说明"
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1208
msgid "Dump marks to this file"
msgstr "把标记存储到这个文件"
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1210
msgid "Import marks from this file"
msgstr "从这个文件导入标记"
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1214
msgid "Import marks from this file if it exists"
msgstr "从该文件导入标记（如果存在的话）"
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1216
msgid "Fake a tagger when tags lack one"
msgstr "当标签缺少标记者字段时，假装提供一个"
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1218
msgid "Output full tree for each commit"
msgstr "每次提交都输出整个树"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1220
msgid "Use the done feature to terminate the stream"
msgstr "使用 done 功能来终止流"
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1221
msgid "Skip output of blob data"
msgstr "跳过数据对象的输出"
-#: builtin/fast-export.c:1223 builtin/log.c:1811
+#: builtin/fast-export.c:1222 builtin/log.c:1816
msgid "refspec"
msgstr "引用规格"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1223
msgid "Apply refspec to exported refs"
msgstr "对导出的引用应用引用规格"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1224
msgid "anonymize output"
msgstr "匿名输出"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1225
msgid "from:to"
msgstr "from:to"
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1226
msgid "convert <from> to <to> in anonymized output"
msgstr "在匿名输出中将 <from> 转换为 <to>"
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1229
msgid "Reference parents which are not in fast-export stream by object id"
msgstr "引用父对象 ID 不在 fast-export 流中"
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1231
msgid "Show original object ids of blobs/commits"
msgstr "显示数据对象/提交的原始对象 ID"
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1233
msgid "Label tags with mark ids"
msgstr "对带有标记 ID 的标签做标记"
-#: builtin/fast-export.c:1257
+#: builtin/fast-export.c:1256
msgid "--anonymize-map without --anonymize does not make sense"
msgstr "--anonymize-map 而没有 --anonymize 没有意义"
-#: builtin/fast-export.c:1272
+#: builtin/fast-export.c:1271
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists"
-#: builtin/fast-import.c:3086
+#: builtin/fast-import.c:3088
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "子模组 '%s' 缺少 from 标记"
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "子模组 '%s' 缺少 to 标记"
-#: builtin/fast-import.c:3223
+#: builtin/fast-import.c:3225
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "预期 'mark' 命令，得到 %s"
-#: builtin/fast-import.c:3228
+#: builtin/fast-import.c:3230
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "预期 'to' 命令，得到 %s"
-#: builtin/fast-import.c:3320
+#: builtin/fast-import.c:3322
msgid "Expected format name:filename for submodule rewrite option"
msgstr "子模组重写选项的预期格式为 name:filename"
-#: builtin/fast-import.c:3374
+#: builtin/fast-import.c:3377
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:1195 builtin/remote.c:1113
+#: builtin/fetch.c:1195 builtin/remote.c:1118
msgid "(none)"
msgstr "（无）"
msgid "print only refs which don't contain the commit"
msgstr "只打印不包含该提交的引用"
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<配置> <命令参数>"
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr "配置"
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr "存储着仓库路径列表的配置项键名"
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr "缺少 --config=<配置>"
+
#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149
msgid "unknown"
msgstr "未知"
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "无效的参数：期望 sha1，得到 '%s'"
-#: builtin/gc.c:36
+#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<选项>]"
-#: builtin/gc.c:91
+#: builtin/gc.c:94
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "对 %s 调用 fstat 失败：%s"
-#: builtin/gc.c:127
+#: builtin/gc.c:130
#, c-format
msgid "failed to parse '%s' value '%s'"
msgstr "无法解析 '%s' 值 '%s'"
-#: builtin/gc.c:476 builtin/init-db.c:58
+#: builtin/gc.c:479 builtin/init-db.c:58
#, c-format
msgid "cannot stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530
+#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530
#, c-format
msgid "cannot read '%s'"
msgstr "不能读取 '%s'"
-#: builtin/gc.c:492
+#: builtin/gc.c:495
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
-#: builtin/gc.c:540
+#: builtin/gc.c:543
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
-#: builtin/gc.c:542
+#: builtin/gc.c:545
msgid "be more thorough (increased runtime)"
msgstr "更彻底（增加运行时间）"
-#: builtin/gc.c:543
+#: builtin/gc.c:546
msgid "enable auto-gc mode"
msgstr "启用自动垃圾回收模式"
-#: builtin/gc.c:546
+#: builtin/gc.c:549
msgid "force running gc even if there may be another gc running"
msgstr "强制执行 gc 即使另外一个 gc 正在执行"
-#: builtin/gc.c:549
+#: builtin/gc.c:552
msgid "repack all other packs except the largest pack"
msgstr "除了最大的包之外，对所有其它包文件重新打包"
-#: builtin/gc.c:566
+#: builtin/gc.c:569
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "解析 gc.logexpiry 的值 %s 失败"
-#: builtin/gc.c:577
+#: builtin/gc.c:580
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "解析清除期限值 %s 失败"
-#: builtin/gc.c:597
+#: builtin/gc.c:600
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自动在后台执行仓库打包以求最佳性能。\n"
-#: builtin/gc.c:599
+#: builtin/gc.c:602
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包仓库以求最佳性能。\n"
-#: builtin/gc.c:600
+#: builtin/gc.c:603
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手工维护参见 \"git help gc\"。\n"
-#: builtin/gc.c:640
+#: builtin/gc.c:643
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
-#: builtin/gc.c:695
+#: builtin/gc.c:698
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
-#: builtin/gc.c:705
-msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]"
-msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<任务>]"
+#: builtin/gc.c:708
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<任务>] [--schedule]"
+
+#: builtin/gc.c:738
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule 不被允许"
+
+#: builtin/gc.c:743
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "无法识别的 --schedule 参数 '%s'"
-#: builtin/gc.c:812
+#: builtin/gc.c:862
msgid "failed to write commit-graph"
msgstr "无法写入提交图"
-#: builtin/gc.c:905
+#: builtin/gc.c:901
+msgid "failed to fill remotes"
+msgstr "无法填充远程仓库"
+
+#: builtin/gc.c:1024
+msgid "failed to start 'git pack-objects' process"
+msgstr "无法启动 'git pack-objects' 进程"
+
+#: builtin/gc.c:1041
+msgid "failed to finish 'git pack-objects' process"
+msgstr "无法完成 'git pack-objects' 进程"
+
+#: builtin/gc.c:1093
+msgid "failed to write multi-pack-index"
+msgstr "无法写入多包索引"
+
+#: builtin/gc.c:1111
+msgid "'git multi-pack-index expire' failed"
+msgstr "'git multi-pack-index expire' 失败"
+
+#: builtin/gc.c:1172
+msgid "'git multi-pack-index repack' failed"
+msgstr "'git multi-pack-index repack' 失败"
+
+#: builtin/gc.c:1181
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr "跳过增量重新打包任务，因为 core.multiPackIndex 被禁用"
+
+#: builtin/gc.c:1279
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "锁文件 '%s' 已存在，跳过维护"
-#: builtin/gc.c:932
+#: builtin/gc.c:1309
#, c-format
msgid "task '%s' failed"
msgstr "任务 '%s' 失败"
-#: builtin/gc.c:979
+#: builtin/gc.c:1389
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' 不是一个有效的任务"
-#: builtin/gc.c:984
+#: builtin/gc.c:1394
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "任务 '%s' 不能被多次选择"
-#: builtin/gc.c:999
+#: builtin/gc.c:1409
msgid "run tasks based on the state of the repository"
msgstr "基于仓库状态来运行任务"
-#: builtin/gc.c:1001
+#: builtin/gc.c:1410
+msgid "frequency"
+msgstr "频率"
+
+#: builtin/gc.c:1411
+msgid "run tasks based on frequency"
+msgstr "基于频率运行任务"
+
+#: builtin/gc.c:1414
msgid "do not report progress or other information over stderr"
msgstr "不通过标准错误报告进度或其它信息"
-#: builtin/gc.c:1002
+#: builtin/gc.c:1415
msgid "task"
msgstr "任务"
-#: builtin/gc.c:1003
+#: builtin/gc.c:1416
msgid "run a specific task"
msgstr "运行一个特定的任务"
-#: builtin/gc.c:1026
-msgid "git maintenance run [<options>]"
-msgstr "git maintenance run [<选项>]"
+#: builtin/gc.c:1433
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
+
+#: builtin/gc.c:1467
+msgid "failed to run 'git config'"
+msgstr "无法运行 'git config'"
+
+#: builtin/gc.c:1512
+msgid "another process is scheduling background maintenance"
+msgstr "另外一个进程正运行于后台维护"
-#: builtin/gc.c:1037
+#: builtin/gc.c:1525
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr "无法执行 'crontab -l'，您的系统可能不支持 'cron'"
+
+#: builtin/gc.c:1544
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'"
+
+#: builtin/gc.c:1550
+msgid "failed to open stdin of 'crontab'"
+msgstr "无法打开 'crontab' 的标准输入"
+
+#: builtin/gc.c:1592
+msgid "'crontab' died"
+msgstr "'crontab' 终止"
+
+#: builtin/gc.c:1605
+msgid "failed to add repo to global config"
+msgstr "无法将仓库添加到全局配置"
+
+#: builtin/gc.c:1615
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <子命令> [<选项>]"
+
+#: builtin/gc.c:1634
#, c-format
msgid "invalid subcommand: %s"
msgstr "无效子命令：%s"
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/grep.c:725
+#: builtin/grep.c:736
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:824
+#: builtin/grep.c:835
msgid "search in index instead of in the work tree"
msgstr "在索引区搜索而不是在工作区"
-#: builtin/grep.c:826
+#: builtin/grep.c:837
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的内容中查找"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/grep.c:828
+#: builtin/grep.c:839
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/grep.c:830
+#: builtin/grep.c:841
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/grep.c:832
+#: builtin/grep.c:843
msgid "recursively search in each submodule"
msgstr "在每一个子模组中递归搜索"
-#: builtin/grep.c:835
+#: builtin/grep.c:846
msgid "show non-matching lines"
msgstr "显示未匹配的行"
-#: builtin/grep.c:837
+#: builtin/grep.c:848
msgid "case insensitive matching"
msgstr "不区分大小写匹配"
-#: builtin/grep.c:839
+#: builtin/grep.c:850
msgid "match patterns only at word boundaries"
msgstr "只在单词边界匹配模式"
-#: builtin/grep.c:841
+#: builtin/grep.c:852
msgid "process binary files as text"
msgstr "把二进制文件当做文本处理"
-#: builtin/grep.c:843
+#: builtin/grep.c:854
msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
-#: builtin/grep.c:846
+#: builtin/grep.c:857
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/grep.c:848
+#: builtin/grep.c:859
msgid "search in subdirectories (default)"
msgstr "在子目录中寻找（默认）"
-#: builtin/grep.c:850
+#: builtin/grep.c:861
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
-#: builtin/grep.c:854
+#: builtin/grep.c:865
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/grep.c:857
+#: builtin/grep.c:868
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式（默认）"
-#: builtin/grep.c:860
+#: builtin/grep.c:871
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
-#: builtin/grep.c:863
+#: builtin/grep.c:874
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/grep.c:866
+#: builtin/grep.c:877
msgid "show line numbers"
msgstr "显示行号"
-#: builtin/grep.c:867
+#: builtin/grep.c:878
msgid "show column number of first match"
msgstr "显示第一个匹配的列号"
-#: builtin/grep.c:868
+#: builtin/grep.c:879
msgid "don't show filenames"
msgstr "不显示文件名"
-#: builtin/grep.c:869
+#: builtin/grep.c:880
msgid "show filenames"
msgstr "显示文件名"
-#: builtin/grep.c:871
+#: builtin/grep.c:882
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/grep.c:873
+#: builtin/grep.c:884
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
-#: builtin/grep.c:875
+#: builtin/grep.c:886
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
-#: builtin/grep.c:878
+#: builtin/grep.c:889
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
-#: builtin/grep.c:880
+#: builtin/grep.c:891
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
-#: builtin/grep.c:883
+#: builtin/grep.c:894
msgid "show only matching parts of a line"
msgstr "只显示行中的匹配的部分"
-#: builtin/grep.c:885
+#: builtin/grep.c:896
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数，而不显示匹配的行"
-#: builtin/grep.c:886
+#: builtin/grep.c:897
msgid "highlight matches"
msgstr "高亮显示匹配项"
-#: builtin/grep.c:888
+#: builtin/grep.c:899
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/grep.c:890
+#: builtin/grep.c:901
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/grep.c:893
+#: builtin/grep.c:904
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/grep.c:896
+#: builtin/grep.c:907
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/grep.c:898
+#: builtin/grep.c:909
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/grep.c:900
+#: builtin/grep.c:911
msgid "use <n> worker threads"
msgstr "使用 <n> 个工作线程"
-#: builtin/grep.c:901
+#: builtin/grep.c:912
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
-#: builtin/grep.c:904
+#: builtin/grep.c:915
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
-#: builtin/grep.c:906
+#: builtin/grep.c:917
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
-#: builtin/grep.c:909
+#: builtin/grep.c:920
msgid "read patterns from file"
msgstr "从文件读取模式"
-#: builtin/grep.c:911
+#: builtin/grep.c:922
msgid "match <pattern>"
msgstr "匹配 <模式>"
-#: builtin/grep.c:913
+#: builtin/grep.c:924
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
-#: builtin/grep.c:925
+#: builtin/grep.c:936
msgid "indicate hit with exit status without output"
msgstr "不输出，而用退出码标识命中状态"
-#: builtin/grep.c:927
+#: builtin/grep.c:938
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
-#: builtin/grep.c:929
+#: builtin/grep.c:940
msgid "show parse tree for grep expression"
msgstr "显示 grep 表达式的解析树"
-#: builtin/grep.c:933
+#: builtin/grep.c:944
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:933
+#: builtin/grep.c:944
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
-#: builtin/grep.c:937
+#: builtin/grep.c:948
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)（本次构建忽略）"
-#: builtin/grep.c:1004
+#: builtin/grep.c:1014
msgid "no pattern given"
msgstr "未提供匹配模式"
-#: builtin/grep.c:1040
+#: builtin/grep.c:1050
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同时使用"
-#: builtin/grep.c:1048
+#: builtin/grep.c:1058
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本：%s"
-#: builtin/grep.c:1078
+#: builtin/grep.c:1088
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked 不支持和 --recurse-submodules 共用"
-#: builtin/grep.c:1082
+#: builtin/grep.c:1092
msgid "invalid option combination, ignoring --threads"
msgstr "无效的选项组合，忽略 --threads"
-#: builtin/grep.c:1085 builtin/pack-objects.c:3655
+#: builtin/grep.c:1095 builtin/pack-objects.c:3655
msgid "no threads support, ignoring --threads"
msgstr "没有线程支持，忽略 --threads"
-#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933
+#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效（%d）"
-#: builtin/grep.c:1122
+#: builtin/grep.c:1132
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:1148
+#: builtin/grep.c:1158
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
-#: builtin/grep.c:1154
+#: builtin/grep.c:1164
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
-#: builtin/grep.c:1162
+#: builtin/grep.c:1172
msgid "both --cached and trees are given"
msgstr "同时给出了 --cached 和树对象"
msgid "pack exceeds maximum allowed size"
msgstr "包超过了最大允许值"
-#: builtin/index-pack.c:342 builtin/repack.c:254
+#: builtin/index-pack.c:342 builtin/repack.c:286
#, c-format
msgid "unable to create '%s'"
msgstr "不能创建 '%s'"
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623
+#: builtin/index-pack.c:1806 builtin/init-db.c:392 builtin/init-db.c:625
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "未知的哈希算法 '%s'"
msgid "not copying templates from '%s': %s"
msgstr "没有从 '%s' 复制模版：%s"
-#: builtin/init-db.c:274
+#: builtin/init-db.c:275
#, c-format
msgid "invalid initial branch name: '%s'"
msgstr "无效的初始分支名：'%s'"
-#: builtin/init-db.c:366
+#: builtin/init-db.c:367
#, c-format
msgid "unable to handle file type %d"
msgstr "不能处理 %d 类型的文件"
-#: builtin/init-db.c:369
+#: builtin/init-db.c:370
#, c-format
msgid "unable to move %s to %s"
msgstr "不能移动 %s 至 %s"
-#: builtin/init-db.c:385
+#: builtin/init-db.c:386
msgid "attempt to reinitialize repository with different hash"
msgstr "尝试用不同的哈希算法重新初始化仓库"
-#: builtin/init-db.c:409 builtin/init-db.c:412
+#: builtin/init-db.c:410 builtin/init-db.c:413
#, c-format
msgid "%s already exists"
msgstr "%s 已经存在"
-#: builtin/init-db.c:443
+#: builtin/init-db.c:445
#, c-format
msgid "re-init: ignored --initial-branch=%s"
msgstr "re-init：已忽略 --initial-branch=%s"
-#: builtin/init-db.c:474
+#: builtin/init-db.c:476
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
-#: builtin/init-db.c:475
+#: builtin/init-db.c:477
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
-#: builtin/init-db.c:479
+#: builtin/init-db.c:481
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
-#: builtin/init-db.c:480
+#: builtin/init-db.c:482
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "已初始化空的 Git 仓库于 %s%s\n"
-#: builtin/init-db.c:529
+#: builtin/init-db.c:531
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
"[<目录>]"
-#: builtin/init-db.c:555
+#: builtin/init-db.c:557
msgid "permissions"
msgstr "权限"
-#: builtin/init-db.c:556
+#: builtin/init-db.c:558
msgid "specify that the git repository is to be shared amongst several users"
msgstr "指定 git 仓库是多个用户之间共享的"
-#: builtin/init-db.c:562
+#: builtin/init-db.c:564
msgid "override the name of the initial branch"
msgstr "覆盖初始分支名称"
-#: builtin/init-db.c:563 builtin/verify-pack.c:74
+#: builtin/init-db.c:565 builtin/verify-pack.c:74
msgid "hash"
msgstr "hash"
-#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
msgid "specify the hash algorithm to use"
msgstr "指定要使用的哈希算法"
-#: builtin/init-db.c:571
+#: builtin/init-db.c:573
msgid "--separate-git-dir and --bare are mutually exclusive"
msgstr "--separate-git-dir 和 --bare 是互斥的"
-#: builtin/init-db.c:600 builtin/init-db.c:605
+#: builtin/init-db.c:602 builtin/init-db.c:607
#, c-format
msgid "cannot mkdir %s"
msgstr "不能创建目录 %s"
-#: builtin/init-db.c:609 builtin/init-db.c:664
+#: builtin/init-db.c:611 builtin/init-db.c:666
#, c-format
msgid "cannot chdir to %s"
msgstr "不能切换目录到 %s"
-#: builtin/init-db.c:636
+#: builtin/init-db.c:638
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
-#: builtin/init-db.c:688
+#: builtin/init-db.c:690
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "不能访问工作区 '%s'"
-#: builtin/init-db.c:693
+#: builtin/init-db.c:695
msgid "--separate-git-dir incompatible with bare repository"
msgstr "--separate-git-dir 不能用于纯仓库"
#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
-msgstr "删除空的尾部署名"
+msgstr "删除空的尾注"
#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
-msgstr "在哪里放置新的尾部署名"
+msgstr "在哪里放置新的尾注"
#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
-msgstr "当尾部署名已经存在时所采取的动作"
+msgstr "当尾注已经存在时所采取的动作"
#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
-msgstr "当尾部署名缺失时所采取的动作"
+msgstr "当尾注缺失时所采取的动作"
#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
-msgstr "只输出尾部署名"
+msgstr "只输出尾注"
#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
#: builtin/interpret-trailers.c:111
msgid "trailer"
-msgstr "尾部署名"
+msgstr "尾注"
#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
-msgstr "要添加的尾部署名"
+msgstr "要添加的尾注"
#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgid "no input file given for in-place editing"
msgstr "没有给出要原位编辑的文件"
-#: builtin/log.c:56
+#: builtin/log.c:58
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
-#: builtin/log.c:57
+#: builtin/log.c:59
msgid "git show [<options>] <object>..."
msgstr "git show [<选项>] <对象>..."
-#: builtin/log.c:110
+#: builtin/log.c:112
#, c-format
msgid "invalid --decorate option: %s"
msgstr "无效的 --decorate 选项：%s"
-#: builtin/log.c:177
+#: builtin/log.c:179
msgid "show source"
msgstr "显示源"
-#: builtin/log.c:178
+#: builtin/log.c:180
msgid "Use mail map file"
msgstr "使用邮件映射文件"
-#: builtin/log.c:181
+#: builtin/log.c:183
msgid "only decorate refs that match <pattern>"
msgstr "只修饰与 <模式> 匹配的引用"
-#: builtin/log.c:183
+#: builtin/log.c:185
msgid "do not decorate refs that match <pattern>"
msgstr "不修饰和 <模式> 匹配的引用"
-#: builtin/log.c:184
+#: builtin/log.c:186
msgid "decorate options"
msgstr "修饰选项"
-#: builtin/log.c:187
-msgid "Process line range n,m in file, counting from 1"
-msgstr "处理文件中第 n 到 m 之间的行，从 1 开始"
+#: builtin/log.c:189
+msgid ""
+"Trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变"
+
+#: builtin/log.c:212
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<范围>:<文件> 不能和路径表达式共用"
-#: builtin/log.c:297
+#: builtin/log.c:302
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出：%d %s\n"
-#: builtin/log.c:555
+#: builtin/log.c:564
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 损坏的文件"
-#: builtin/log.c:570 builtin/log.c:665
+#: builtin/log.c:579 builtin/log.c:674
#, c-format
msgid "could not read object %s"
msgstr "不能读取对象 %s"
-#: builtin/log.c:690
+#: builtin/log.c:699
#, c-format
msgid "unknown type: %d"
msgstr "未知类型：%d"
-#: builtin/log.c:839
+#: builtin/log.c:848
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s：从描述生成附函的模式无效"
-#: builtin/log.c:846
+#: builtin/log.c:855
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:965
-msgid "name of output directory is too long"
-msgstr "输出目录名太长"
-
-#: builtin/log.c:981
+#: builtin/log.c:984
#, c-format
msgid "cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
-#: builtin/log.c:998
+#: builtin/log.c:1001
msgid "need exactly one range"
msgstr "只需要一个范围"
-#: builtin/log.c:1008
+#: builtin/log.c:1011
msgid "not a range"
msgstr "不是一个范围"
-#: builtin/log.c:1172
+#: builtin/log.c:1175
msgid "cover letter needs email format"
msgstr "附函需要邮件地址格式"
-#: builtin/log.c:1178
+#: builtin/log.c:1181
msgid "failed to create cover-letter file"
msgstr "无法创建附函文件"
-#: builtin/log.c:1259
+#: builtin/log.c:1262
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:1286
+#: builtin/log.c:1289
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1344
+#: builtin/log.c:1347
msgid "two output directories?"
msgstr "两个输出目录？"
-#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315
+#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332
#, c-format
msgid "unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1506 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1509 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "无法将 '%s' 解析为一个有效引用"
-#: builtin/log.c:1515
+#: builtin/log.c:1518
msgid "could not find exact merge base"
msgstr "不能找到准确的合并基线"
-#: builtin/log.c:1525
+#: builtin/log.c:1528
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
"参数 --base=<基线提交> 手动指定一个基线提交"
-#: builtin/log.c:1548
+#: builtin/log.c:1551
msgid "failed to find exact merge base"
msgstr "无法找到准确的合并基线"
-#: builtin/log.c:1565
+#: builtin/log.c:1568
msgid "base commit should be the ancestor of revision list"
msgstr "基线提交应该是版本列表的祖先"
-#: builtin/log.c:1575
+#: builtin/log.c:1578
msgid "base commit shouldn't be in revision list"
msgstr "基线提交不应该出现在版本列表中"
-#: builtin/log.c:1633
+#: builtin/log.c:1636
msgid "cannot get patch id"
msgstr "无法得到补丁 id"
-#: builtin/log.c:1690
+#: builtin/log.c:1693
msgid "failed to infer range-diff origin of current series"
msgstr "无法推断当前系列的 range-diff 起始"
-#: builtin/log.c:1692
+#: builtin/log.c:1695
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "使用 '%s' 作为当前系列的 range-diff 源"
-#: builtin/log.c:1736
+#: builtin/log.c:1739
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m]，即使只有一个补丁"
-#: builtin/log.c:1739
+#: builtin/log.c:1742
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH]，即使有多个补丁"
-#: builtin/log.c:1743
+#: builtin/log.c:1746
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
-#: builtin/log.c:1745
+#: builtin/log.c:1748
msgid "generate a cover letter"
msgstr "生成一封附函"
-#: builtin/log.c:1747
+#: builtin/log.c:1750
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/log.c:1748
+#: builtin/log.c:1751
msgid "sfx"
msgstr "后缀"
-#: builtin/log.c:1749
+#: builtin/log.c:1752
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/log.c:1751
+#: builtin/log.c:1754
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号，而不是1"
-#: builtin/log.c:1753
+#: builtin/log.c:1756
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
-#: builtin/log.c:1755
+#: builtin/log.c:1758
+msgid "max length of output filename"
+msgstr "输出文件名的最大长度"
+
+#: builtin/log.c:1760
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
-#: builtin/log.c:1758
+#: builtin/log.c:1763
msgid "cover-from-description-mode"
msgstr "从分支描述获取附函的模式"
-#: builtin/log.c:1759
+#: builtin/log.c:1764
msgid "generate parts of a cover letter based on a branch's description"
msgstr "基于一个分支描述生成部分附函"
-#: builtin/log.c:1761
+#: builtin/log.c:1766
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/log.c:1764
+#: builtin/log.c:1769
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
-#: builtin/log.c:1767
+#: builtin/log.c:1772
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
-#: builtin/log.c:1770
+#: builtin/log.c:1775
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
-#: builtin/log.c:1772
+#: builtin/log.c:1777
msgid "output all-zero hash in From header"
msgstr "在 From 头信息中输出全为零的哈希值"
-#: builtin/log.c:1774
+#: builtin/log.c:1779
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
-#: builtin/log.c:1776
+#: builtin/log.c:1781
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的（补丁+状态）"
-#: builtin/log.c:1778
+#: builtin/log.c:1783
msgid "Messaging"
msgstr "邮件发送"
-#: builtin/log.c:1779
+#: builtin/log.c:1784
msgid "header"
msgstr "header"
-#: builtin/log.c:1780
+#: builtin/log.c:1785
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1781 builtin/log.c:1782
+#: builtin/log.c:1786 builtin/log.c:1787
msgid "email"
msgstr "邮件地址"
-#: builtin/log.c:1781
+#: builtin/log.c:1786
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1782
+#: builtin/log.c:1787
msgid "add Cc: header"
msgstr "添加抄送"
-#: builtin/log.c:1783
+#: builtin/log.c:1788
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1784
+#: builtin/log.c:1789
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
-#: builtin/log.c:1786
+#: builtin/log.c:1791
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1787
+#: builtin/log.c:1792
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <邮件标识> 的回复"
-#: builtin/log.c:1788 builtin/log.c:1791
+#: builtin/log.c:1793 builtin/log.c:1796
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1789
+#: builtin/log.c:1794
msgid "attach the patch"
msgstr "附件方式添加补丁"
-#: builtin/log.c:1792
+#: builtin/log.c:1797
msgid "inline the patch"
msgstr "内联显示补丁"
-#: builtin/log.c:1796
+#: builtin/log.c:1801
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索，风格：浅，深"
-#: builtin/log.c:1798
+#: builtin/log.c:1803
msgid "signature"
msgstr "签名"
-#: builtin/log.c:1799
+#: builtin/log.c:1804
msgid "add a signature"
msgstr "添加一个签名"
-#: builtin/log.c:1800
+#: builtin/log.c:1805
msgid "base-commit"
msgstr "基线提交"
-#: builtin/log.c:1801
+#: builtin/log.c:1806
msgid "add prerequisite tree info to the patch series"
msgstr "为补丁列表添加前置树信息"
-#: builtin/log.c:1804
+#: builtin/log.c:1809
msgid "add a signature from a file"
msgstr "从文件添加一个签名"
-#: builtin/log.c:1805
+#: builtin/log.c:1810
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
-#: builtin/log.c:1807
+#: builtin/log.c:1812
msgid "show progress while generating patches"
msgstr "在生成补丁时显示进度"
-#: builtin/log.c:1809
+#: builtin/log.c:1814
msgid "show changes against <rev> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <rev> 的差异"
-#: builtin/log.c:1812
+#: builtin/log.c:1817
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <refspec> 的差异"
-#: builtin/log.c:1814
+#: builtin/log.c:1819
msgid "percentage by which creation is weighted"
msgstr "创建权重的百分比"
-#: builtin/log.c:1896
+#: builtin/log.c:1905
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识：%s"
-#: builtin/log.c:1911
+#: builtin/log.c:1920
msgid "-n and -k are mutually exclusive"
msgstr "-n 和 -k 互斥"
-#: builtin/log.c:1913
+#: builtin/log.c:1922
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc 和 -k 互斥"
-#: builtin/log.c:1921
+#: builtin/log.c:1930
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1923
+#: builtin/log.c:1932
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1925
+#: builtin/log.c:1934
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1958
-msgid "standard output, or directory, which one?"
-msgstr "标准输出或目录，哪一个？"
+#: builtin/log.c:1956
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "--stdout、--output 和 --output-directory 是互斥的"
-#: builtin/log.c:2062
+#: builtin/log.c:2079
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff 需要 --cover-letter 或单一补丁"
-#: builtin/log.c:2066
+#: builtin/log.c:2083
msgid "Interdiff:"
msgstr "版本间差异："
-#: builtin/log.c:2067
+#: builtin/log.c:2084
#, c-format
msgid "Interdiff against v%d:"
msgstr "对 v%d 的版本差异："
-#: builtin/log.c:2073
+#: builtin/log.c:2090
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor 需要 --range-diff"
-#: builtin/log.c:2077
+#: builtin/log.c:2094
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff 需要 --cover-letter 或单一补丁"
-#: builtin/log.c:2085
+#: builtin/log.c:2102
msgid "Range-diff:"
msgstr "范围差异："
-#: builtin/log.c:2086
+#: builtin/log.c:2103
#, c-format
msgid "Range-diff against v%d:"
msgstr "对 v%d 的范围差异："
-#: builtin/log.c:2097
+#: builtin/log.c:2114
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读取签名文件 '%s'"
-#: builtin/log.c:2133
+#: builtin/log.c:2150
msgid "Generating patches"
msgstr "生成补丁"
-#: builtin/log.c:2177
+#: builtin/log.c:2194
msgid "failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:2236
+#: builtin/log.c:2253
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/log.c:2290
+#: builtin/log.c:2307
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgid "do not print remote URL"
msgstr "不打印远程 URL"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398
msgid "exec"
msgstr "exec"
msgid "Merging %s with %s\n"
msgstr "合并 %s 和 %s\n"
-#: builtin/merge.c:56
+#: builtin/merge.c:57
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<选项>] [<提交>...]"
-#: builtin/merge.c:57
+#: builtin/merge.c:58
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:120
+#: builtin/merge.c:122
msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值"
-#: builtin/merge.c:143
+#: builtin/merge.c:145
#, c-format
msgid "option `%s' requires a value"
msgstr "选项 `%s' 需要一个值"
-#: builtin/merge.c:189
+#: builtin/merge.c:198
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合并策略 '%s'。\n"
-#: builtin/merge.c:190
+#: builtin/merge.c:199
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有："
-#: builtin/merge.c:195
+#: builtin/merge.c:204
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有："
-#: builtin/merge.c:246 builtin/pull.c:133
+#: builtin/merge.c:255 builtin/pull.c:133
msgid "do not show a diffstat at the end of the merge"
msgstr "在合并的最后不显示差异统计"
-#: builtin/merge.c:249 builtin/pull.c:136
+#: builtin/merge.c:258 builtin/pull.c:136
msgid "show a diffstat at the end of the merge"
msgstr "在合并的最后显示差异统计"
-#: builtin/merge.c:250 builtin/pull.c:139
+#: builtin/merge.c:259 builtin/pull.c:139
msgid "(synonym to --stat)"
msgstr "（和 --stat 同义）"
-#: builtin/merge.c:252 builtin/pull.c:142
+#: builtin/merge.c:261 builtin/pull.c:142
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
-#: builtin/merge.c:255 builtin/pull.c:148
+#: builtin/merge.c:264 builtin/pull.c:148
msgid "create a single commit instead of doing a merge"
msgstr "创建一个单独的提交而不是做一次合并"
-#: builtin/merge.c:257 builtin/pull.c:151
+#: builtin/merge.c:266 builtin/pull.c:151
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合并成功，执行一次提交（默认）"
-#: builtin/merge.c:259 builtin/pull.c:154
+#: builtin/merge.c:268 builtin/pull.c:154
msgid "edit message before committing"
msgstr "在提交前编辑提交说明"
-#: builtin/merge.c:261
+#: builtin/merge.c:270
msgid "allow fast-forward (default)"
msgstr "允许快进（默认）"
-#: builtin/merge.c:263 builtin/pull.c:161
+#: builtin/merge.c:272 builtin/pull.c:161
msgid "abort if fast-forward is not possible"
msgstr "如果不能快进就放弃合并"
-#: builtin/merge.c:267 builtin/pull.c:164
+#: builtin/merge.c:276 builtin/pull.c:164
msgid "verify that the named commit has a valid GPG signature"
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114
+#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:269 builtin/pull.c:169
+#: builtin/merge.c:278 builtin/pull.c:169
msgid "merge strategy to use"
msgstr "要使用的合并策略"
-#: builtin/merge.c:270 builtin/pull.c:172
+#: builtin/merge.c:279 builtin/pull.c:172
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:271 builtin/pull.c:173
+#: builtin/merge.c:280 builtin/pull.c:173
msgid "option for selected merge strategy"
msgstr "所选的合并策略的选项"
-#: builtin/merge.c:273
+#: builtin/merge.c:282
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "合并的提交说明（针对非快进式合并）"
-#: builtin/merge.c:280
+#: builtin/merge.c:289
msgid "abort the current in-progress merge"
msgstr "放弃当前正在进行的合并"
#
-#: builtin/merge.c:282
+#: builtin/merge.c:291
msgid "--abort but leave index and working tree alone"
msgstr "--abort，但是保留索引和工作区"
-#: builtin/merge.c:284
+#: builtin/merge.c:293
msgid "continue the current in-progress merge"
msgstr "继续当前正在进行的合并"
-#: builtin/merge.c:286 builtin/pull.c:180
+#: builtin/merge.c:295 builtin/pull.c:180
msgid "allow merging unrelated histories"
msgstr "允许合并不相关的历史"
-#: builtin/merge.c:293
+#: builtin/merge.c:302
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
-#: builtin/merge.c:310
+#: builtin/merge.c:319
msgid "could not run stash."
msgstr "不能运行贮藏。"
-#: builtin/merge.c:315
+#: builtin/merge.c:324
msgid "stash failed"
msgstr "贮藏失败"
-#: builtin/merge.c:320
+#: builtin/merge.c:329
#, c-format
msgid "not a valid object: %s"
msgstr "不是一个有效对象：%s"
-#: builtin/merge.c:342 builtin/merge.c:359
+#: builtin/merge.c:351 builtin/merge.c:368
msgid "read-tree failed"
msgstr "读取树失败"
# 译者：注意保持前导空格
-#: builtin/merge.c:389
+#: builtin/merge.c:398
msgid " (nothing to squash)"
msgstr " （无可压缩）"
-#: builtin/merge.c:400
+#: builtin/merge.c:409
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "压缩提交 -- 未更新 HEAD\n"
-#: builtin/merge.c:450
+#: builtin/merge.c:459
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "无合并信息 -- 未更新 HEAD\n"
-#: builtin/merge.c:501
+#: builtin/merge.c:510
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 没有指向一个提交"
-#: builtin/merge.c:588
+#: builtin/merge.c:597
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
-#: builtin/merge.c:713
+#: builtin/merge.c:723
msgid "Not handling anything other than two heads merge."
msgstr "未处理两个头合并之外的任何操作。"
-#: builtin/merge.c:726
+#: builtin/merge.c:736
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive 的未知选项：-X%s"
-#: builtin/merge.c:741
+#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209
#, c-format
msgid "unable to write %s"
msgstr "不能写 %s"
-#: builtin/merge.c:793
+#: builtin/merge.c:807
#, c-format
msgid "Could not read from '%s'"
msgstr "不能从 '%s' 读取"
-#: builtin/merge.c:802
+#: builtin/merge.c:816
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
-#: builtin/merge.c:808
+#: builtin/merge.c:822
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"合并到主题分支。\n"
"\n"
-#: builtin/merge.c:813
+#: builtin/merge.c:827
msgid "An empty message aborts the commit.\n"
msgstr "空的提交说明会终止提交。\n"
-#: builtin/merge.c:816
+#: builtin/merge.c:830
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n"
-#: builtin/merge.c:869
+#: builtin/merge.c:883
msgid "Empty commit message."
msgstr "空提交信息。"
-#: builtin/merge.c:884
+#: builtin/merge.c:898
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:945
+#: builtin/merge.c:959
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
-#: builtin/merge.c:984
+#: builtin/merge.c:998
msgid "No current branch."
msgstr "没有当前分支。"
-#: builtin/merge.c:986
+#: builtin/merge.c:1000
msgid "No remote for the current branch."
msgstr "当前分支没有对应的远程仓库。"
-#: builtin/merge.c:988
+#: builtin/merge.c:1002
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
-#: builtin/merge.c:993
+#: builtin/merge.c:1007
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-#: builtin/merge.c:1050
+#: builtin/merge.c:1064
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
-#: builtin/merge.c:1153
+#: builtin/merge.c:1167
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合并：%s"
-#: builtin/merge.c:1187
+#: builtin/merge.c:1201
msgid "not something we can merge"
msgstr "不能合并"
-#: builtin/merge.c:1291
+#: builtin/merge.c:1311
msgid "--abort expects no arguments"
msgstr "--abort 不带参数"
-#: builtin/merge.c:1295
+#: builtin/merge.c:1315
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1313
+#: builtin/merge.c:1333
msgid "--quit expects no arguments"
msgstr "--quit 不带参数"
-#: builtin/merge.c:1326
+#: builtin/merge.c:1346
msgid "--continue expects no arguments"
msgstr "--continue 不带参数"
-#: builtin/merge.c:1330
+#: builtin/merge.c:1350
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1346
+#: builtin/merge.c:1366
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1353
+#: builtin/merge.c:1373
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1376
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
-#: builtin/merge.c:1370
+#: builtin/merge.c:1390
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能将 --squash 和 --no-ff 组合使用。"
-#: builtin/merge.c:1372
+#: builtin/merge.c:1392
msgid "You cannot combine --squash with --commit."
msgstr "您不能将 --squash 和 --commit 组合使用。"
-#: builtin/merge.c:1388
+#: builtin/merge.c:1408
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1405
+#: builtin/merge.c:1425
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"
-#: builtin/merge.c:1407
+#: builtin/merge.c:1427
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
-#: builtin/merge.c:1412
+#: builtin/merge.c:1432
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
-#: builtin/merge.c:1414
+#: builtin/merge.c:1434
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"
-#: builtin/merge.c:1495
+#: builtin/merge.c:1515
msgid "refusing to merge unrelated histories"
msgstr "拒绝合并无关的历史"
-#: builtin/merge.c:1504
+#: builtin/merge.c:1524
msgid "Already up to date."
msgstr "已经是最新的。"
-#: builtin/merge.c:1514
+#: builtin/merge.c:1534
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1560
+#: builtin/merge.c:1580
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
-#: builtin/merge.c:1567
+#: builtin/merge.c:1587
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1592
+#: builtin/merge.c:1612
msgid "Already up to date. Yeeah!"
msgstr "已经是最新的。耶！"
-#: builtin/merge.c:1598
+#: builtin/merge.c:1618
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进，终止。"
-#: builtin/merge.c:1626 builtin/merge.c:1691
+#: builtin/merge.c:1646 builtin/merge.c:1711
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
-#: builtin/merge.c:1630
+#: builtin/merge.c:1650
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
-#: builtin/merge.c:1682
+#: builtin/merge.c:1702
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
-#: builtin/merge.c:1684
+#: builtin/merge.c:1704
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
-#: builtin/merge.c:1693
+#: builtin/merge.c:1713
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/merge.c:1707
+#: builtin/merge.c:1727
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利，按要求在提交前停止\n"
msgid "Renaming %s to %s\n"
msgstr "重命名 %s 至 %s\n"
-#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1034 builtin/stash.c:1605
+#: builtin/notes.c:1034 builtin/stash.c:1604
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子命令：%s"
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用变基操作取代合并操作以合入修改"
-#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "允许快进式"
"您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
"分支默认的远程仓库，您必须在命令行中指定一个分支名。"
-#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73
+#: builtin/pull.c:469 builtin/rebase.c:1246
msgid "You are not currently on a branch."
msgstr "您当前不在一个分支上。"
-#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79
+#: builtin/pull.c:471 builtin/pull.c:486
msgid "Please specify which branch you want to rebase against."
msgstr "请指定您要变基到哪一个分支。"
-#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82
+#: builtin/pull.c:473 builtin/pull.c:488
msgid "Please specify which branch you want to merge with."
msgstr "请指定您要合并哪一个分支。"
msgstr "详见 git-pull(1)。"
#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491
-#: builtin/rebase.c:1246 git-parse-remote.sh:64
+#: builtin/rebase.c:1252
msgid "<remote>"
msgstr "<远程>"
#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496
-#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75
+#: builtin/pull.c:484 builtin/rebase.c:1244
msgid "There is no tracking information for the current branch."
msgstr "当前分支没有跟踪信息。"
-#: builtin/pull.c:493 git-parse-remote.sh:95
+#: builtin/pull.c:493
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "如果您想要为此分支创建跟踪信息，您可以执行："
msgid "unable to access commit %s"
msgstr "无法访问提交 %s"
-#: builtin/pull.c:894
+#: builtin/pull.c:915
msgid "ignoring --verify-signatures for rebase"
msgstr "为变基操作忽略 --verify-signatures"
-#: builtin/pull.c:954
+#: builtin/pull.c:972
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未诞生的分支，变更添加至索引。"
-#: builtin/pull.c:958
+#: builtin/pull.c:976
msgid "pull with rebase"
msgstr "变基式拉取"
-#: builtin/pull.c:959
+#: builtin/pull.c:977
msgid "please commit or stash them."
msgstr "请提交或贮藏它们。"
-#: builtin/pull.c:984
+#: builtin/pull.c:1002
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"fetch 更新了当前的分支。快进您的工作区\n"
"至提交 %s。"
-#: builtin/pull.c:990
+#: builtin/pull.c:1008
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"恢复之前的状态。"
-#: builtin/pull.c:1005
+#: builtin/pull.c:1023
msgid "Cannot merge multiple branches into empty head."
msgstr "无法将多个分支合并到空分支。"
-#: builtin/pull.c:1009
+#: builtin/pull.c:1027
msgid "Cannot rebase onto multiple branches."
msgstr "无法变基到多个分支。"
-#: builtin/pull.c:1017
+#: builtin/pull.c:1041
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本地子模组中有修改，无法变基"
"如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"
"也不能更新远程引用让其指向一个非提交对象。\n"
-#: builtin/push.c:351
+#: builtin/push.c:294
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+"更新被拒绝，因为远程跟踪分支的最新提交自从上次检出之后已被更新。\n"
+"在强制更新前，您可能想将这些变更整合到本地（如 'git pull ...'）。\n"
+
+#: builtin/push.c:364
#, c-format
msgid "Pushing to %s\n"
msgstr "推送到 %s\n"
-#: builtin/push.c:358
+#: builtin/push.c:371
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "推送一些引用到 '%s' 失败"
-#: builtin/push.c:532
+#: builtin/push.c:553
msgid "repository"
msgstr "仓库"
-#: builtin/push.c:533 builtin/send-pack.c:183
+#: builtin/push.c:554 builtin/send-pack.c:189
msgid "push all refs"
msgstr "推送所有引用"
-#: builtin/push.c:534 builtin/send-pack.c:185
+#: builtin/push.c:555 builtin/send-pack.c:191
msgid "mirror all refs"
msgstr "镜像所有引用"
-#: builtin/push.c:536
+#: builtin/push.c:557
msgid "delete refs"
msgstr "删除引用"
-#: builtin/push.c:537
+#: builtin/push.c:558
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推送标签（不能使用 --all or --mirror）"
-#: builtin/push.c:540 builtin/send-pack.c:186
+#: builtin/push.c:561 builtin/send-pack.c:192
msgid "force updates"
msgstr "强制更新"
-#: builtin/push.c:541 builtin/send-pack.c:198
+#: builtin/push.c:562 builtin/send-pack.c:204
msgid "<refname>:<expect>"
msgstr "<引用名>:<期望值>"
-#: builtin/push.c:542 builtin/send-pack.c:199
+#: builtin/push.c:563 builtin/send-pack.c:205
msgid "require old value of ref to be at this value"
msgstr "要求引用旧的取值为设定值"
-#: builtin/push.c:545
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "要求远程更新在本地被整合"
+
+#: builtin/push.c:569
msgid "control recursive pushing of submodules"
msgstr "控制子模组的递归推送"
-#: builtin/push.c:546 builtin/send-pack.c:193
+#: builtin/push.c:570 builtin/send-pack.c:199
msgid "use thin pack"
msgstr "使用精简打包"
-#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180
-#: builtin/send-pack.c:181
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
msgid "receive pack program"
msgstr "接收包程序"
-#: builtin/push.c:549
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "设置 git pull/status 的上游"
-#: builtin/push.c:552
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "清除本地删除的引用"
-#: builtin/push.c:554
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "绕过 pre-push 钩子"
-#: builtin/push.c:555
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "推送缺失但有关的标签"
-#: builtin/push.c:557 builtin/send-pack.c:187
+#: builtin/push.c:581 builtin/send-pack.c:193
msgid "GPG sign the push"
msgstr "用 GPG 为推送签名"
-#: builtin/push.c:559 builtin/send-pack.c:194
+#: builtin/push.c:583 builtin/send-pack.c:200
msgid "request atomic transaction on remote side"
msgstr "需要远端支持原子事务"
-#: builtin/push.c:577
+#: builtin/push.c:601
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
-#: builtin/push.c:579
+#: builtin/push.c:603
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有意义"
-#: builtin/push.c:599
+#: builtin/push.c:623
#, c-format
msgid "bad repository '%s'"
msgstr "坏的仓库 '%s'"
-#: builtin/push.c:600
+#: builtin/push.c:624
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
"\n"
" git push <名称>\n"
-#: builtin/push.c:615
+#: builtin/push.c:639
msgid "--all and --tags are incompatible"
msgstr "--all 和 --tags 不兼容"
-#: builtin/push.c:617
+#: builtin/push.c:641
msgid "--all can't be combined with refspecs"
msgstr "--all 不能和引用规格同时使用"
-#: builtin/push.c:621
+#: builtin/push.c:645
msgid "--mirror and --tags are incompatible"
msgstr "--mirror 和 --tags 不兼容"
-#: builtin/push.c:623
+#: builtin/push.c:647
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 不能和引用规格同时使用"
-#: builtin/push.c:626
+#: builtin/push.c:650
msgid "--all and --mirror are incompatible"
msgstr "--all 和 --mirror 不兼容"
-#: builtin/push.c:630
+#: builtin/push.c:657
msgid "push options must not have new line characters"
msgstr "推送选项不能有换行符"
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238
+#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244
#, c-format
msgid "unusable todo list: '%s'"
msgstr "不可用的待办列表：'%s'"
-#: builtin/rebase.c:304
+#: builtin/rebase.c:310
#, c-format
msgid "could not create temporary %s"
msgstr "无法创建临时的 %s"
-#: builtin/rebase.c:310
+#: builtin/rebase.c:316
msgid "could not mark as interactive"
msgstr "无法标记为交互式"
-#: builtin/rebase.c:364
+#: builtin/rebase.c:369
msgid "could not generate todo list"
msgstr "无法生成待办列表"
-#: builtin/rebase.c:405
+#: builtin/rebase.c:411
msgid "a base commit must be provided with --upstream or --onto"
msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
-#: builtin/rebase.c:474
+#: builtin/rebase.c:480
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<选项>]"
-#: builtin/rebase.c:487 builtin/rebase.c:1382
+#: builtin/rebase.c:493 builtin/rebase.c:1388
msgid "keep commits which start empty"
msgstr "保留初始为空的提交"
-#: builtin/rebase.c:491 builtin/revert.c:128
+#: builtin/rebase.c:497 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "允许提交说明为空"
-#: builtin/rebase.c:493
+#: builtin/rebase.c:499
msgid "rebase merge commits"
msgstr "对合并提交变基"
-#: builtin/rebase.c:495
+#: builtin/rebase.c:501
msgid "keep original branch points of cousins"
msgstr "保持兄弟提交的原始分支点"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:503
msgid "move commits that begin with squash!/fixup!"
msgstr "移动以 squash!/fixup! 开头的提交"
-#: builtin/rebase.c:498
+#: builtin/rebase.c:504
msgid "sign commits"
msgstr "签名提交"
-#: builtin/rebase.c:500 builtin/rebase.c:1321
+#: builtin/rebase.c:506 builtin/rebase.c:1327
msgid "display a diffstat of what changed upstream"
msgstr "显示上游变化的差异统计"
-#: builtin/rebase.c:502
+#: builtin/rebase.c:508
msgid "continue rebase"
msgstr "继续变基"
-#: builtin/rebase.c:504
+#: builtin/rebase.c:510
msgid "skip commit"
msgstr "跳过提交"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:511
msgid "edit the todo list"
msgstr "变基待办列表"
-#: builtin/rebase.c:507
+#: builtin/rebase.c:513
msgid "show the current patch"
msgstr "显示当前补丁"
-#: builtin/rebase.c:510
+#: builtin/rebase.c:516
msgid "shorten commit ids in the todo list"
msgstr "缩短待办列表中的提交号"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:518
msgid "expand commit ids in the todo list"
msgstr "扩展待办列表中的提交号"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:520
msgid "check the todo list"
msgstr "检查待办列表"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:522
msgid "rearrange fixup/squash lines"
msgstr "重新排列 fixup/squash 行"
-#: builtin/rebase.c:518
+#: builtin/rebase.c:524
msgid "insert exec commands in todo list"
msgstr "在待办列表中插入 exec 执行命令"
-#: builtin/rebase.c:519
+#: builtin/rebase.c:525
msgid "onto"
msgstr "onto"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:528
msgid "restrict-revision"
msgstr "restrict-revision"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:528
msgid "restrict revision"
msgstr "限制版本"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:530
msgid "squash-onto"
msgstr "squash-onto"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:531
msgid "squash onto"
msgstr "squash onto"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:533
msgid "the upstream commit"
msgstr "上游提交"
-#: builtin/rebase.c:529
+#: builtin/rebase.c:535
msgid "head-name"
msgstr "head-name"
-#: builtin/rebase.c:529
+#: builtin/rebase.c:535
msgid "head name"
msgstr "head 名称"
-#: builtin/rebase.c:534
+#: builtin/rebase.c:540
msgid "rebase strategy"
msgstr "变基策略"
-#: builtin/rebase.c:535
+#: builtin/rebase.c:541
msgid "strategy-opts"
msgstr "strategy-opts"
-#: builtin/rebase.c:536
+#: builtin/rebase.c:542
msgid "strategy options"
msgstr "策略选项"
-#: builtin/rebase.c:537
+#: builtin/rebase.c:543
msgid "switch-to"
msgstr "切换到"
-#: builtin/rebase.c:538
+#: builtin/rebase.c:544
msgid "the branch or commit to checkout"
msgstr "要检出的分支或提交"
-#: builtin/rebase.c:539
+#: builtin/rebase.c:545
msgid "onto-name"
msgstr "onto-name"
-#: builtin/rebase.c:539
+#: builtin/rebase.c:545
msgid "onto name"
msgstr "onto name"
-#: builtin/rebase.c:540
+#: builtin/rebase.c:546
msgid "cmd"
msgstr "cmd"
-#: builtin/rebase.c:540
+#: builtin/rebase.c:546
msgid "the command to run"
msgstr "要执行的命令"
-#: builtin/rebase.c:543 builtin/rebase.c:1415
+#: builtin/rebase.c:549 builtin/rebase.c:1421
msgid "automatically re-schedule any `exec` that fails"
msgstr "自动重新安排任何失败的 `exec`"
-#: builtin/rebase.c:559
+#: builtin/rebase.c:565
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果"
-#: builtin/rebase.c:575
+#: builtin/rebase.c:581
#, c-format
msgid "%s requires the merge backend"
msgstr "%s 需要合并后端"
-#: builtin/rebase.c:618
+#: builtin/rebase.c:624
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "无法获取 'onto'：'%s'"
-#: builtin/rebase.c:635
+#: builtin/rebase.c:641
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "无效的原始 head：'%s'"
-#: builtin/rebase.c:660
+#: builtin/rebase.c:666
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "忽略无效的 allow_rerere_autoupdate：'%s'"
-#: builtin/rebase.c:805 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:811 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
"\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
-#: builtin/rebase.c:888
+#: builtin/rebase.c:894
#, c-format
msgid ""
"\n"
"\n"
"因此 git 无法对其变基。"
-#: builtin/rebase.c:1214
+#: builtin/rebase.c:1220
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"ask\"。"
-#: builtin/rebase.c:1232
+#: builtin/rebase.c:1238
#, c-format
msgid ""
"%s\n"
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:1248
+#: builtin/rebase.c:1254
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:1278
+#: builtin/rebase.c:1284
msgid "exec commands cannot contain newlines"
msgstr "exec 命令不能包含换行符"
-#: builtin/rebase.c:1282
+#: builtin/rebase.c:1288
msgid "empty exec command"
msgstr "空的 exec 命令"
-#: builtin/rebase.c:1312
+#: builtin/rebase.c:1318
msgid "rebase onto given branch instead of upstream"
msgstr "变基到给定的分支而非上游"
-#: builtin/rebase.c:1314
+#: builtin/rebase.c:1320
msgid "use the merge-base of upstream and branch as the current base"
msgstr "使用上游和分支的合并基线做为当前基线"
-#: builtin/rebase.c:1316
+#: builtin/rebase.c:1322
msgid "allow pre-rebase hook to run"
msgstr "允许执行 pre-rebase 钩子"
-#: builtin/rebase.c:1318
+#: builtin/rebase.c:1324
msgid "be quiet. implies --no-stat"
msgstr "安静。暗示 --no-stat"
-#: builtin/rebase.c:1324
+#: builtin/rebase.c:1330
msgid "do not show diffstat of what changed upstream"
msgstr "不显示上游变化的差异统计"
-#: builtin/rebase.c:1327
-msgid "add a Signed-off-by: line to each commit"
-msgstr "为每一个提交添加一个 Signed-off-by: 签名"
+#: builtin/rebase.c:1333
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "为每一个提交添加 Signed-off-by 尾注"
-#: builtin/rebase.c:1330
+#: builtin/rebase.c:1336
msgid "make committer date match author date"
msgstr "使提交者日期和作者日期一致"
-#: builtin/rebase.c:1332
+#: builtin/rebase.c:1338
msgid "ignore author date and use current date"
msgstr "忽略作者日期，使用当前日期"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1340
msgid "synonym of --reset-author-date"
msgstr "--reset-author-date 的同义词"
-#: builtin/rebase.c:1336 builtin/rebase.c:1340
+#: builtin/rebase.c:1342 builtin/rebase.c:1346
msgid "passed to 'git apply'"
msgstr "传递给 'git apply'"
-#: builtin/rebase.c:1338
+#: builtin/rebase.c:1344
msgid "ignore changes in whitespace"
msgstr "忽略空白字符的变更"
-#: builtin/rebase.c:1342 builtin/rebase.c:1345
+#: builtin/rebase.c:1348 builtin/rebase.c:1351
msgid "cherry-pick all commits, even if unchanged"
msgstr "拣选所有提交，即使未修改"
-#: builtin/rebase.c:1347
+#: builtin/rebase.c:1353
msgid "continue"
msgstr "继续"
-#: builtin/rebase.c:1350
+#: builtin/rebase.c:1356
msgid "skip current patch and continue"
msgstr "跳过当前补丁并继续"
# 译者：注意保持前导空格
-#: builtin/rebase.c:1352
+#: builtin/rebase.c:1358
msgid "abort and check out the original branch"
msgstr "终止并检出原有分支"
-#: builtin/rebase.c:1355
+#: builtin/rebase.c:1361
msgid "abort but keep HEAD where it is"
msgstr "终止但保持 HEAD 不变"
-#: builtin/rebase.c:1356
+#: builtin/rebase.c:1362
msgid "edit the todo list during an interactive rebase"
msgstr "在交互式变基中编辑待办列表"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1365
msgid "show the patch file being applied or merged"
msgstr "显示正在应用或合并的补丁文件"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1368
msgid "use apply strategies to rebase"
msgstr "使用应用策略进行变基"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1372
msgid "use merging strategies to rebase"
msgstr "使用合并策略进行变基"
-#: builtin/rebase.c:1370
+#: builtin/rebase.c:1376
msgid "let the user edit the list of commits to rebase"
msgstr "让用户编辑要变基的提交列表"
-#: builtin/rebase.c:1374
+#: builtin/rebase.c:1380
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "（已弃用）尝试重建合并提交而非忽略它们"
-#: builtin/rebase.c:1379
+#: builtin/rebase.c:1385
msgid "how to handle commits that become empty"
msgstr "如何处理成为空提交的提交"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1392
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1399
msgid "add exec lines after each commit of the editable list"
msgstr "可编辑列表的每一个提交下面增加一行 exec"
-#: builtin/rebase.c:1397
+#: builtin/rebase.c:1403
msgid "allow rebasing commits with empty messages"
msgstr "允许针对空提交说明的提交变基"
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1407
msgid "try to rebase merges instead of skipping them"
msgstr "尝试对合并提交变基而不是忽略它们"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1410
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "使用 'merge-base --fork-point' 来优化上游"
-#: builtin/rebase.c:1406
+#: builtin/rebase.c:1412
msgid "use the given merge strategy"
msgstr "使用给定的合并策略"
-#: builtin/rebase.c:1408 builtin/revert.c:115
+#: builtin/rebase.c:1414 builtin/revert.c:115
msgid "option"
msgstr "选项"
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1415
msgid "pass the argument through to the merge strategy"
msgstr "将参数传递给合并策略"
-#: builtin/rebase.c:1412
+#: builtin/rebase.c:1418
msgid "rebase all reachable commits up to the root(s)"
msgstr "将所有可达的提交变基到根提交"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1423
msgid "apply all changes, even those already present upstream"
msgstr "应用所有更改，甚至那些已在上游存在的"
-#: builtin/rebase.c:1434
+#: builtin/rebase.c:1440
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
"对 rebase.useBuiltin 的支持已被删除！\n"
"详见 'git help config' 中的条目。"
-#: builtin/rebase.c:1440
+#: builtin/rebase.c:1446
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "看起来 'git-am' 正在执行中。无法变基。"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1487
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
-#: builtin/rebase.c:1486
+#: builtin/rebase.c:1492
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "不能将 '--keep-base' 和 '--onto' 组合使用"
-#: builtin/rebase.c:1488
+#: builtin/rebase.c:1494
msgid "cannot combine '--keep-base' with '--root'"
msgstr "不能将 '--keep-base' 和 '--root' 组合使用"
-#: builtin/rebase.c:1492
+#: builtin/rebase.c:1498
msgid "cannot combine '--root' with '--fork-point'"
msgstr "不能将 '--root' 和 '--fork-point' 组合使用"
-#: builtin/rebase.c:1495
+#: builtin/rebase.c:1501
msgid "No rebase in progress?"
msgstr "没有正在进行的变基？"
-#: builtin/rebase.c:1499
+#: builtin/rebase.c:1505
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: builtin/rebase.c:1522
+#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1540
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"您必须编辑所有的合并冲突，然后通过 git add\n"
"命令将它们标记为已解决"
-#: builtin/rebase.c:1553
+#: builtin/rebase.c:1559
msgid "could not discard worktree changes"
msgstr "无法丢弃工作区变更"
-#: builtin/rebase.c:1572
+#: builtin/rebase.c:1578
#, c-format
msgid "could not move back to %s"
msgstr "无法移回 %s"
-#: builtin/rebase.c:1618
+#: builtin/rebase.c:1624
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"\t%s\n"
"然后再重新执行。 为避免丢失重要数据，我已经停止当前操作。\n"
-#: builtin/rebase.c:1646
+#: builtin/rebase.c:1652
msgid "switch `C' expects a numerical value"
msgstr "开关 `C' 期望一个数字值"
-#: builtin/rebase.c:1688
+#: builtin/rebase.c:1694
#, c-format
msgid "Unknown mode: %s"
msgstr "未知模式：%s"
-#: builtin/rebase.c:1727
+#: builtin/rebase.c:1733
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy 需要 --merge 或 --interactive"
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:1763
msgid "cannot combine apply options with merge options"
msgstr "不能组合使用应用选项和合并选项"
-#: builtin/rebase.c:1770
+#: builtin/rebase.c:1776
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "未知的变基后端：%s"
-#: builtin/rebase.c:1795
+#: builtin/rebase.c:1806
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
-#: builtin/rebase.c:1815
+#: builtin/rebase.c:1826
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
-#: builtin/rebase.c:1819
+#: builtin/rebase.c:1830
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
-#: builtin/rebase.c:1843
+#: builtin/rebase.c:1854
#, c-format
msgid "invalid upstream '%s'"
msgstr "无效的上游 '%s'"
-#: builtin/rebase.c:1849
+#: builtin/rebase.c:1860
msgid "Could not create new root commit"
msgstr "不能创建新的根提交"
-#: builtin/rebase.c:1875
+#: builtin/rebase.c:1886
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s'：只需要与分支的一个合并基线"
-#: builtin/rebase.c:1878
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s'：只需要一个合并基线"
-#: builtin/rebase.c:1886
+#: builtin/rebase.c:1897
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "没有指向一个有效的提交 '%s'"
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1923
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "致命错误：无此分支/提交 '%s'"
-#: builtin/rebase.c:1920 builtin/submodule--helper.c:40
+#: builtin/rebase.c:1931 builtin/submodule--helper.c:40
#: builtin/submodule--helper.c:2414
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用：%s"
-#: builtin/rebase.c:1931
+#: builtin/rebase.c:1942
msgid "Could not resolve HEAD to a revision"
msgstr "无法将 HEAD 解析为一个版本"
-#: builtin/rebase.c:1952
+#: builtin/rebase.c:1963
msgid "Please commit or stash them."
msgstr "请提交或贮藏修改。"
-#: builtin/rebase.c:1988
+#: builtin/rebase.c:1999
#, c-format
msgid "could not switch to %s"
msgstr "无法切换到 %s"
-#: builtin/rebase.c:1999
+#: builtin/rebase.c:2010
msgid "HEAD is up to date."
msgstr "HEAD 是最新的。"
-#: builtin/rebase.c:2001
+#: builtin/rebase.c:2012
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "当前分支 %s 是最新的。\n"
-#: builtin/rebase.c:2009
+#: builtin/rebase.c:2020
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD 是最新的，强制变基。"
-#: builtin/rebase.c:2011
+#: builtin/rebase.c:2022
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "当前分支 %s 是最新的，强制变基。\n"
-#: builtin/rebase.c:2019
+#: builtin/rebase.c:2030
msgid "The pre-rebase hook refused to rebase."
msgstr "pre-rebase 钩子拒绝了变基操作。"
-#: builtin/rebase.c:2026
+#: builtin/rebase.c:2037
#, c-format
msgid "Changes to %s:\n"
msgstr "到 %s 的变更：\n"
-#: builtin/rebase.c:2029
+#: builtin/rebase.c:2040
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "从 %s 到 %s 的变更：\n"
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:2065
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "首先，回退头指针以便在其上重放您的工作...\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:2074
msgid "Could not detach HEAD"
msgstr "无法分离头指针"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:2083
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "快进 %s 到 %s。\n"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <仓库目录>"
-#: builtin/receive-pack.c:1224
+#: builtin/receive-pack.c:1276
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
"配置变量为 'refuse'。"
-#: builtin/receive-pack.c:1244
+#: builtin/receive-pack.c:1296
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"若要屏蔽此信息，您可以设置它为 'refuse'。"
-#: builtin/receive-pack.c:2422
+#: builtin/receive-pack.c:2481
msgid "quiet"
msgstr "静默模式"
-#: builtin/receive-pack.c:2436
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
-#: builtin/remote.c:195 builtin/remote.c:697
+#: builtin/remote.c:195 builtin/remote.c:700
#, c-format
msgid "remote %s already exists."
msgstr "远程 %s 已经存在。"
-#: builtin/remote.c:199 builtin/remote.c:701
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "'%s' 不是一个有效的远程名称"
-
-#: builtin/remote.c:239
+#: builtin/remote.c:240
#, c-format
msgid "Could not setup master '%s'"
msgstr "无法设置 master '%s'"
-#: builtin/remote.c:354
+#: builtin/remote.c:355
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "无法得到引用规格 %s 的获取列表"
-#: builtin/remote.c:453 builtin/remote.c:461
+#: builtin/remote.c:454 builtin/remote.c:462
msgid "(matching)"
msgstr "（匹配）"
-#: builtin/remote.c:465
+#: builtin/remote.c:466
msgid "(delete)"
msgstr "（删除）"
-#: builtin/remote.c:654
+#: builtin/remote.c:655
#, c-format
msgid "could not set '%s'"
msgstr "不能设置 '%s'"
-#: builtin/remote.c:659
+#: builtin/remote.c:660
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
"\t%s:%d\n"
"现在在为不存在的远程名 '%s' 命名"
-#: builtin/remote.c:690 builtin/remote.c:833 builtin/remote.c:941
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
#, c-format
msgid "No such remote: '%s'"
msgstr "没有此远程仓库：'%s'"
-#: builtin/remote.c:707
+#: builtin/remote.c:710
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "不能重命名配置小节 '%s' 到 '%s'"
-#: builtin/remote.c:727
+#: builtin/remote.c:730
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\t如果必要请手动更新配置。"
-#: builtin/remote.c:767
+#: builtin/remote.c:770
#, c-format
msgid "deleting '%s' failed"
msgstr "删除 '%s' 失败"
-#: builtin/remote.c:801
+#: builtin/remote.c:804
#, c-format
msgid "creating '%s' failed"
msgstr "创建 '%s' 失败"
-#: builtin/remote.c:877
+#: builtin/remote.c:882
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
-#: builtin/remote.c:891
+#: builtin/remote.c:896
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除配置小节 '%s'"
-#: builtin/remote.c:994
+#: builtin/remote.c:999
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的（下一次获取将存储于 remotes/%s）"
-#: builtin/remote.c:997
+#: builtin/remote.c:1002
msgid " tracked"
msgstr " 已跟踪"
-#: builtin/remote.c:999
+#: builtin/remote.c:1004
msgid " stale (use 'git remote prune' to remove)"
msgstr " 过时（使用 'git remote prune' 来移除）"
-#: builtin/remote.c:1001
+#: builtin/remote.c:1006
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1047
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
-#: builtin/remote.c:1051
+#: builtin/remote.c:1056
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "交互式变基到远程 %s"
-#: builtin/remote.c:1053
+#: builtin/remote.c:1058
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "交互式变基（含合并提交）到远程 %s"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1061
#, c-format
msgid "rebases onto remote %s"
msgstr "变基到远程 %s"
-#: builtin/remote.c:1060
+#: builtin/remote.c:1065
#, c-format
msgid " merges with remote %s"
msgstr " 与远程 %s 合并"
-#: builtin/remote.c:1063
+#: builtin/remote.c:1068
#, c-format
msgid "merges with remote %s"
msgstr "与远程 %s 合并"
-#: builtin/remote.c:1066
+#: builtin/remote.c:1071
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 以及和远程 %s\n"
-#: builtin/remote.c:1109
+#: builtin/remote.c:1114
msgid "create"
msgstr "创建"
-#: builtin/remote.c:1112
+#: builtin/remote.c:1117
msgid "delete"
msgstr "删除"
-#: builtin/remote.c:1116
+#: builtin/remote.c:1121
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1119
+#: builtin/remote.c:1124
msgid "fast-forwardable"
msgstr "可快进"
-#: builtin/remote.c:1122
+#: builtin/remote.c:1127
msgid "local out of date"
msgstr "本地已过时"
-#: builtin/remote.c:1129
+#: builtin/remote.c:1134
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 强制推送至 %-*s (%s)"
-#: builtin/remote.c:1132
+#: builtin/remote.c:1137
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/remote.c:1136
+#: builtin/remote.c:1141
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 强制推送至 %s"
-#: builtin/remote.c:1139
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
-#: builtin/remote.c:1207
+#: builtin/remote.c:1212
msgid "do not query remotes"
msgstr "不查询远程"
-#: builtin/remote.c:1234
+#: builtin/remote.c:1239
#, c-format
msgid "* remote %s"
msgstr "* 远程 %s"
-#: builtin/remote.c:1235
+#: builtin/remote.c:1240
#, c-format
msgid " Fetch URL: %s"
msgstr " 获取地址：%s"
-#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
msgid "(no URL)"
msgstr "(无 URL)"
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1250 builtin/remote.c:1252
+#: builtin/remote.c:1255 builtin/remote.c:1257
#, c-format
msgid " Push URL: %s"
msgstr " 推送地址：%s"
-#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支：%s"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1254
+#: builtin/remote.c:1259
msgid "(not queried)"
msgstr "（未查询）"
-#: builtin/remote.c:1256
+#: builtin/remote.c:1261
msgid "(unknown)"
msgstr "（未知）"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1265
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
-#: builtin/remote.c:1272
+#: builtin/remote.c:1277
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[1] " 远程分支：%s"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1275 builtin/remote.c:1301
+#: builtin/remote.c:1280 builtin/remote.c:1306
msgid " (status not queried)"
msgstr "（状态未查询）"
-#: builtin/remote.c:1284
+#: builtin/remote.c:1289
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 为 'git pull' 配置的本地分支："
msgstr[1] " 为 'git pull' 配置的本地分支："
-#: builtin/remote.c:1292
+#: builtin/remote.c:1297
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜像"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1303
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 为 'git push' 配置的本地引用%s："
msgstr[1] " 为 'git push' 配置的本地引用%s："
-#: builtin/remote.c:1319
+#: builtin/remote.c:1324
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1321
+#: builtin/remote.c:1326
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1336
+#: builtin/remote.c:1341
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
-#: builtin/remote.c:1338
+#: builtin/remote.c:1343
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
-#: builtin/remote.c:1348
+#: builtin/remote.c:1353
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
-#: builtin/remote.c:1356
+#: builtin/remote.c:1361
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一个有效引用：%s"
-#: builtin/remote.c:1358
+#: builtin/remote.c:1363
#, c-format
msgid "Could not setup %s"
msgstr "不能设置 %s"
# 译者：注意保持前导空格
-#: builtin/remote.c:1376
+#: builtin/remote.c:1381
#, c-format
msgid " %s will become dangling!"
msgstr " %s 将成为悬空状态！"
# 译者：注意保持前导空格
-#: builtin/remote.c:1377
+#: builtin/remote.c:1382
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成为悬空状态！"
-#: builtin/remote.c:1387
+#: builtin/remote.c:1392
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1388
+#: builtin/remote.c:1393
#, c-format
msgid "URL: %s"
msgstr "URL：%s"
-#: builtin/remote.c:1404
+#: builtin/remote.c:1409
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
-#: builtin/remote.c:1407
+#: builtin/remote.c:1412
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
-#: builtin/remote.c:1452
+#: builtin/remote.c:1457
msgid "prune remotes after fetching"
msgstr "抓取后清除远程"
-#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
-#: builtin/remote.c:1531
+#: builtin/remote.c:1539
msgid "add branch"
msgstr "添加分支"
-#: builtin/remote.c:1538
+#: builtin/remote.c:1546
msgid "no remote specified"
msgstr "未指定远程"
-#: builtin/remote.c:1555
+#: builtin/remote.c:1563
msgid "query push URLs rather than fetch URLs"
msgstr "查询推送 URL 地址，而非获取 URL 地址"
-#: builtin/remote.c:1557
+#: builtin/remote.c:1565
msgid "return all URLs"
msgstr "返回所有 URL 地址"
-#: builtin/remote.c:1585
+#: builtin/remote.c:1595
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "没有给远程仓库 '%s' 设定 URL"
-#: builtin/remote.c:1611
+#: builtin/remote.c:1621
msgid "manipulate push URLs"
msgstr "操作推送 URLS"
-#: builtin/remote.c:1613
+#: builtin/remote.c:1623
msgid "add URL"
msgstr "添加 URL"
-#: builtin/remote.c:1615
+#: builtin/remote.c:1625
msgid "delete URLs"
msgstr "删除 URLS"
-#: builtin/remote.c:1622
+#: builtin/remote.c:1632
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 无意义"
-#: builtin/remote.c:1661
+#: builtin/remote.c:1673
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹配模版：%s"
-#: builtin/remote.c:1669
+#: builtin/remote.c:1681
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL：%s"
-#: builtin/remote.c:1671
+#: builtin/remote.c:1683
msgid "Will not delete all non-push URLs"
msgstr "将不会删除所有非推送 URL 地址"
msgid "could not start pack-objects to repack promisor objects"
msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
-#: builtin/repack.c:236 builtin/repack.c:421
+#: builtin/repack.c:268 builtin/repack.c:447
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。"
-#: builtin/repack.c:260
+#: builtin/repack.c:295
msgid "could not finish pack-objects to repack promisor objects"
msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
-#: builtin/repack.c:297
+#: builtin/repack.c:323
msgid "pack everything in a single pack"
msgstr "所有内容打包到一个包文件中"
-#: builtin/repack.c:299
+#: builtin/repack.c:325
msgid "same as -a, and turn unreachable objects loose"
msgstr "和 -a 相同，并将不可达的对象设为松散对象"
-#: builtin/repack.c:302
+#: builtin/repack.c:328
msgid "remove redundant packs, and run git-prune-packed"
msgstr "删除多余的包，运行 git-prune-packed"
-#: builtin/repack.c:304
+#: builtin/repack.c:330
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
-#: builtin/repack.c:306
+#: builtin/repack.c:332
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
-#: builtin/repack.c:308
+#: builtin/repack.c:334
msgid "do not run git-update-server-info"
msgstr "不运行 git-update-server-info"
-#: builtin/repack.c:311
+#: builtin/repack.c:337
msgid "pass --local to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --local"
-#: builtin/repack.c:313
+#: builtin/repack.c:339
msgid "write bitmap index"
msgstr "写 bitmap 索引"
-#: builtin/repack.c:315
+#: builtin/repack.c:341
msgid "pass --delta-islands to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --delta-islands"
-#: builtin/repack.c:316
+#: builtin/repack.c:342
msgid "approxidate"
msgstr "近似日期"
-#: builtin/repack.c:317
+#: builtin/repack.c:343
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A，不要将早于给定时间的对象过期"
-#: builtin/repack.c:319
+#: builtin/repack.c:345
msgid "with -a, repack unreachable objects"
msgstr "使用 -a ，重新对不可达对象打包"
-#: builtin/repack.c:321
+#: builtin/repack.c:347
msgid "size of the window used for delta compression"
msgstr "用于增量压缩的窗口值"
-#: builtin/repack.c:322 builtin/repack.c:328
+#: builtin/repack.c:348 builtin/repack.c:354
msgid "bytes"
msgstr "字节"
-#: builtin/repack.c:323
+#: builtin/repack.c:349
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上面的相似，但限制内存大小而非条目数"
-#: builtin/repack.c:325
+#: builtin/repack.c:351
msgid "limits the maximum delta depth"
msgstr "限制最大增量深度"
-#: builtin/repack.c:327
+#: builtin/repack.c:353
msgid "limits the maximum number of threads"
msgstr "限制最大线程数"
-#: builtin/repack.c:329
+#: builtin/repack.c:355
msgid "maximum size of each packfile"
msgstr "每个包文件的最大尺寸"
-#: builtin/repack.c:331
+#: builtin/repack.c:357
msgid "repack objects in packs marked with .keep"
msgstr "对标记为 .keep 的包中的对象重新打包"
-#: builtin/repack.c:333
+#: builtin/repack.c:359
msgid "do not repack this pack"
msgstr "不要对该包文件重新打包"
-#: builtin/repack.c:343
+#: builtin/repack.c:369
msgid "cannot delete packs in a precious-objects repo"
msgstr "不能删除珍品仓库中的打包文件"
-#: builtin/repack.c:347
+#: builtin/repack.c:373
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable 和 -A 不兼容"
-#: builtin/repack.c:430
+#: builtin/repack.c:456
msgid "Nothing new to pack."
msgstr "没有新的要打包。"
#: builtin/repack.c:486
#, c-format
-msgid ""
-"WARNING: Some packs in use have been renamed by\n"
-"WARNING: prefixing old- to their name, in order to\n"
-"WARNING: replace them with the new version of the\n"
-"WARNING: file. But the operation failed, and the\n"
-"WARNING: attempt to rename them back to their\n"
-"WARNING: original names also failed.\n"
-"WARNING: Please rename them in %s manually:\n"
-msgstr ""
-"警告：为了将包文件替换为新版本，一些使用中的包已经\n"
-"警告：通过添加 old- 前缀的方式重命名。但是操作失败，\n"
-"警告：并且尝试重命名改回原有文件名的操作也失败。\n"
-"警告：请手动将 %s 下的这些文件重命名：\n"
+msgid "missing required file: %s"
+msgstr "缺少需要的文件：%s"
-#: builtin/repack.c:534
+#: builtin/repack.c:488
#, c-format
-msgid "failed to remove '%s'"
-msgstr "删除 '%s' 失败"
+msgid "could not unlink: %s"
+msgstr "不能删除：%s"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"
-#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594
+#: builtin/stash.c:618
msgid "be quiet, only report errors"
msgstr "安静模式，只报告错误"
msgid "keep redundant, empty commits"
msgstr "保持多余的、空的提交"
-#: builtin/revert.c:232
+#: builtin/revert.c:239
msgid "revert failed"
msgstr "还原失败"
-#: builtin/revert.c:245
+#: builtin/revert.c:252
msgid "cherry-pick failed"
msgstr "拣选失败"
"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
" --all 和明确的 <引用> 互斥。"
-#: builtin/send-pack.c:182
+#: builtin/send-pack.c:188
msgid "remote name"
msgstr "远程名称"
-#: builtin/send-pack.c:195
+#: builtin/send-pack.c:201
msgid "use stateless RPC protocol"
msgstr "使用无状态的 RPC 协议"
-#: builtin/send-pack.c:196
+#: builtin/send-pack.c:202
msgid "read refs from stdin"
msgstr "从标准输入读取引用"
-#: builtin/send-pack.c:197
+#: builtin/send-pack.c:203
msgid "print status from remote helper"
msgstr "打印来自远程 helper 的状态"
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:16
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
-#: builtin/shortlog.c:16
+#: builtin/shortlog.c:17
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git log --pretty=short | git shortlog [<选项>]"
-#: builtin/shortlog.c:134
+#: builtin/shortlog.c:135
msgid "using multiple --group options with stdin is not supported"
msgstr "不支持和标准输入一起使用多个 --group 选项"
-#: builtin/shortlog.c:144
+#: builtin/shortlog.c:145
msgid "using --group=trailer with stdin is not supported"
msgstr "不支持和标准输入一起使用 --group=trailer"
-#: builtin/shortlog.c:388
+#: builtin/shortlog.c:335
#, c-format
msgid "unknown group type: %s"
msgstr "未知分组类型：%s"
-#: builtin/shortlog.c:416
+#: builtin/shortlog.c:363
msgid "Group by committer rather than author"
msgstr "按照提交者分组而不是作者"
-#: builtin/shortlog.c:419
+#: builtin/shortlog.c:366
msgid "sort output according to the number of commits per author"
msgstr "根据每个作者的提交数量排序"
-#: builtin/shortlog.c:421
+#: builtin/shortlog.c:368
msgid "Suppress commit descriptions, only provides commit count"
msgstr "隐藏提交说明，只提供提交数量"
-#: builtin/shortlog.c:423
+#: builtin/shortlog.c:370
msgid "Show the email address of each author"
msgstr "显示每个作者的电子邮件地址"
-#: builtin/shortlog.c:424
+#: builtin/shortlog.c:371
msgid "<w>[,<i1>[,<i2>]]"
msgstr "<w>[,<i1>[,<i2>]]"
-#: builtin/shortlog.c:425
+#: builtin/shortlog.c:372
msgid "Linewrap output"
msgstr "折行输出"
-#: builtin/shortlog.c:427
+#: builtin/shortlog.c:374
msgid "field"
msgstr "字段"
-#: builtin/shortlog.c:428
+#: builtin/shortlog.c:375
msgid "Group by field"
msgstr "按字段分组"
-#: builtin/shortlog.c:456
+#: builtin/shortlog.c:403
msgid "too many arguments given outside repository"
msgstr "仓库外执行提供了太多的参数"
msgstr "无法生成差异 %s^!."
#: builtin/stash.c:422
-msgid "conflicts in index.Try without --index."
+msgid "conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不用 --index。"
#: builtin/stash.c:428
msgid "Index was not unstashed."
msgstr "索引未从贮藏中恢复。"
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:522 builtin/stash.c:620
msgid "attempt to recreate the index"
msgstr "尝试重建索引"
-#: builtin/stash.c:555
+#: builtin/stash.c:566
#, c-format
msgid "Dropped %s (%s)"
msgstr "丢弃了 %s（%s）"
-#: builtin/stash.c:558
+#: builtin/stash.c:569
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s：无法丢弃贮藏条目"
-#: builtin/stash.c:583
+#: builtin/stash.c:582
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' 不是一个贮藏引用"
-#: builtin/stash.c:633
+#: builtin/stash.c:632
msgid "The stash entry is kept in case you need it again."
msgstr "贮藏条目被保留以备您再次需要。"
-#: builtin/stash.c:656
+#: builtin/stash.c:655
msgid "No branch name specified"
msgstr "未指定分支名"
-#: builtin/stash.c:800 builtin/stash.c:837
+#: builtin/stash.c:799 builtin/stash.c:836
#, c-format
msgid "Cannot update %s with %s"
msgstr "无法用 %2$s 更新 %1$s"
-#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536
msgid "stash message"
msgstr "贮藏说明"
-#: builtin/stash.c:828
+#: builtin/stash.c:827
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" 需要一个 <提交> 参数"
-#: builtin/stash.c:1043
+#: builtin/stash.c:1042
msgid "No changes selected"
msgstr "没有选择变更"
-#: builtin/stash.c:1143
+#: builtin/stash.c:1142
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: builtin/stash.c:1170
+#: builtin/stash.c:1169
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"
-#: builtin/stash.c:1179
+#: builtin/stash.c:1178
msgid "Cannot save the untracked files"
msgstr "无法保存未跟踪文件"
-#: builtin/stash.c:1190 builtin/stash.c:1199
+#: builtin/stash.c:1189 builtin/stash.c:1198
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"
-#: builtin/stash.c:1227
+#: builtin/stash.c:1226
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
-#: builtin/stash.c:1276
+#: builtin/stash.c:1275
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
-#: builtin/stash.c:1292
+#: builtin/stash.c:1291
msgid "Did you forget to 'git add'?"
msgstr "您是否忘了执行 'git add'？"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1306
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
-#: builtin/stash.c:1314
+#: builtin/stash.c:1313
msgid "Cannot initialize stash"
msgstr "无法初始化贮藏"
-#: builtin/stash.c:1329
+#: builtin/stash.c:1328
msgid "Cannot save the current status"
msgstr "无法保存当前状态"
-#: builtin/stash.c:1334
+#: builtin/stash.c:1333
#, c-format
msgid "Saved working directory and index state %s"
msgstr "保存工作目录和索引状态 %s"
-#: builtin/stash.c:1424
+#: builtin/stash.c:1423
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: builtin/stash.c:1463 builtin/stash.c:1528
+#: builtin/stash.c:1462 builtin/stash.c:1527
msgid "keep index"
msgstr "保持索引"
-#: builtin/stash.c:1465 builtin/stash.c:1530
+#: builtin/stash.c:1464 builtin/stash.c:1529
msgid "stash in patch mode"
msgstr "以补丁模式贮藏"
-#: builtin/stash.c:1466 builtin/stash.c:1531
+#: builtin/stash.c:1465 builtin/stash.c:1530
msgid "quiet mode"
msgstr "静默模式"
-#: builtin/stash.c:1468 builtin/stash.c:1533
+#: builtin/stash.c:1467 builtin/stash.c:1532
msgid "include untracked files in stash"
msgstr "贮藏中包含未跟踪文件"
-#: builtin/stash.c:1470 builtin/stash.c:1535
+#: builtin/stash.c:1469 builtin/stash.c:1534
msgid "include ignore files"
msgstr "包含忽略的文件"
-#: builtin/stash.c:1570
+#: builtin/stash.c:1569
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2665 git-submodule.sh:151
+#: builtin/submodule--helper.c:2665 git-submodule.sh:150
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "请确认 .gitmodules 文件在工作区里"
msgid "--branch and --default are mutually exclusive"
msgstr "--branch 和 --default 是互斥的"
-#: builtin/submodule--helper.c:2792 git.c:438 git.c:710
+#: builtin/submodule--helper.c:2792 git.c:438 git.c:711
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支持 --super-prefix"
msgid "shorten ref output"
msgstr "缩短引用输出"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason"
msgstr "原因"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason of the update"
msgstr "更新的原因"
msgid "replace the tag if exists"
msgstr "如果存在，替换现有的标签"
-#: builtin/tag.c:422 builtin/update-ref.c:492
+#: builtin/tag.c:422 builtin/update-ref.c:505
msgid "create a reflog"
msgstr "创建引用日志"
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<选项>] --stdin [-z]"
-#: builtin/update-ref.c:487
+#: builtin/update-ref.c:500
msgid "delete the reference"
msgstr "删除引用"
-#: builtin/update-ref.c:489
+#: builtin/update-ref.c:502
msgid "update <refname> not the one it points to"
msgstr "更新 <引用名> 本身而不是它指向的引用"
-#: builtin/update-ref.c:490
+#: builtin/update-ref.c:503
msgid "stdin has NUL-terminated arguments"
msgstr "标准输入有以 NUL 字符终止的参数"
-#: builtin/update-ref.c:491
+#: builtin/update-ref.c:504
msgid "read updates from stdin"
msgstr "从标准输入读取更新"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路径>"
-#: builtin/worktree.c:60 builtin/worktree.c:970
+#: builtin/worktree.c:60 builtin/worktree.c:973
#, c-format
msgid "failed to delete '%s'"
msgstr "删除 '%s' 失败"
msgid "--[no-]track can only be used if a new branch is created"
msgstr "只能在创建新分支时使用选项 --[no-]track "
-#: builtin/worktree.c:755
+#: builtin/worktree.c:758
msgid "reason for locking"
msgstr "锁定原因"
-#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874
-#: builtin/worktree.c:998
+#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877
+#: builtin/worktree.c:1001
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
-#: builtin/worktree.c:769 builtin/worktree.c:802
+#: builtin/worktree.c:772 builtin/worktree.c:805
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
-#: builtin/worktree.c:774
+#: builtin/worktree.c:777
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定，原因：%s"
-#: builtin/worktree.c:776
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
-#: builtin/worktree.c:804
+#: builtin/worktree.c:807
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
-#: builtin/worktree.c:845
+#: builtin/worktree.c:848
msgid "working trees containing submodules cannot be moved or removed"
msgstr "不能移动或删除包含子模组的工作区"
-#: builtin/worktree.c:853
+#: builtin/worktree.c:856
msgid "force move even if worktree is dirty or locked"
msgstr "强制移动，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:876 builtin/worktree.c:1000
+#: builtin/worktree.c:879 builtin/worktree.c:1003
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' 是一个主工作区"
-#: builtin/worktree.c:881
+#: builtin/worktree.c:884
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "无法从 '%s' 算出目标名称"
-#: builtin/worktree.c:894
+#: builtin/worktree.c:897
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"无法移动一个锁定的工作区，锁定原因：%s\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:896
+#: builtin/worktree.c:899
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"无法移动一个锁定的工作区，\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:899
+#: builtin/worktree.c:902
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "验证失败，无法移动工作区：%s"
-#: builtin/worktree.c:904
+#: builtin/worktree.c:907
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "移动 '%s' 到 '%s' 失败"
-#: builtin/worktree.c:950
+#: builtin/worktree.c:953
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "在 '%s' 中执行 'git status' 失败"
-#: builtin/worktree.c:954
+#: builtin/worktree.c:957
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr "'%s' 包含修改或未跟踪的文件，使用 --force 删除"
-#: builtin/worktree.c:959
+#: builtin/worktree.c:962
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d"
-#: builtin/worktree.c:982
+#: builtin/worktree.c:985
msgid "force removal even if worktree is dirty or locked"
msgstr "强制删除，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:1005
+#: builtin/worktree.c:1008
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"无法删除一个锁定的工作区，锁定原因：%s\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:1007
+#: builtin/worktree.c:1010
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"无法删除一个锁定的工作区，\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:1010
+#: builtin/worktree.c:1013
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "验证失败，无法删除工作区：%s"
-#: builtin/worktree.c:1034
+#: builtin/worktree.c:1037
#, c-format
msgid "repair: %s: %s"
msgstr "修理：%s：%s"
-#: builtin/worktree.c:1037
+#: builtin/worktree.c:1040
#, c-format
msgid "error: %s: %s"
msgstr "错误：%s：%s"
msgid "not a git repository"
msgstr "不是 git 仓库"
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr "未处理的选项"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "准备版本时错误"
+
#: t/helper/test-reach.c:154
#, c-format
msgid "commit %s is not marked reachable"
msgid "close failed on standard output"
msgstr "标准输出关闭失败"
-#: git.c:819
+#: git.c:820
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "检测到别名循环：'%s'的扩展未终止：%s"
-#: git.c:869
+#: git.c:870
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "不能作为内置命令处理 %s"
-#: git.c:882
+#: git.c:883
#, c-format
msgid ""
"usage: %s\n"
"用法：%s\n"
"\n"
-#: git.c:902
+#: git.c:903
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 git 命令\n"
-#: git.c:914
+#: git.c:915
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "运行命令 '%s' 失败：%s\n"
" 请求：%s\n"
" 重定向：%s"
-#: remote-curl.c:174
+#: remote-curl.c:183
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "在 push-option 取值中无效的引号：'%s'"
-#: remote-curl.c:298
+#: remote-curl.c:307
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs 无效：这是 git 仓库么？"
-#: remote-curl.c:399
+#: remote-curl.c:408
msgid "invalid server response; expected service, got flush packet"
msgstr "无效的服务端响应。预期服务，得到 flush 包"
-#: remote-curl.c:430
+#: remote-curl.c:439
#, c-format
msgid "invalid server response; got '%s'"
msgstr "无效的服务端响应，得到 '%s'"
-#: remote-curl.c:490
+#: remote-curl.c:499
#, c-format
msgid "repository '%s' not found"
msgstr "仓库 '%s' 未找到"
-#: remote-curl.c:494
+#: remote-curl.c:503
#, c-format
msgid "Authentication failed for '%s'"
msgstr "'%s' 鉴权失败"
-#: remote-curl.c:498
+#: remote-curl.c:507
#, c-format
msgid "unable to access '%s': %s"
msgstr "无法访问 '%s'：%s"
-#: remote-curl.c:504
+#: remote-curl.c:513
#, c-format
msgid "redirecting to %s"
msgstr "重定向到 %s"
-#: remote-curl.c:633
+#: remote-curl.c:642
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "当没有设置温和处理文件结束符（EOF）时，不应该有文件结束符"
-#: remote-curl.c:645
+#: remote-curl.c:654
msgid "remote server sent stateless separator"
msgstr "远程服务器发送了无状态分隔符"
-#: remote-curl.c:715
+#: remote-curl.c:724
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
-#: remote-curl.c:745
+#: remote-curl.c:754
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl：错误的行宽字符：%.4s"
-#: remote-curl.c:747
+#: remote-curl.c:756
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl：意外响应结束包"
-#: remote-curl.c:823
+#: remote-curl.c:832
#, c-format
msgid "RPC failed; %s"
msgstr "RPC 失败。%s"
-#: remote-curl.c:863
+#: remote-curl.c:872
msgid "cannot handle pushes this big"
msgstr "不能处理这么大的推送"
-#: remote-curl.c:978
+#: remote-curl.c:987
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "不能压缩请求，zlib 压缩错误 %d"
-#: remote-curl.c:982
+#: remote-curl.c:991
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "不能压缩请求，zlib 结束错误 %d"
-#: remote-curl.c:1032
+#: remote-curl.c:1041
#, c-format
msgid "%d bytes of length header were received"
msgstr "收到了 %d 字节长度的头信息"
-#: remote-curl.c:1034
+#: remote-curl.c:1043
#, c-format
msgid "%d bytes of body are still expected"
msgstr "预期仍然需要 %d 个字节的正文"
-#: remote-curl.c:1123
+#: remote-curl.c:1132
msgid "dumb http transport does not support shallow capabilities"
msgstr "哑 http 传输不支持 shalllow 能力"
-#: remote-curl.c:1138
+#: remote-curl.c:1147
msgid "fetch failed."
msgstr "获取失败。"
-#: remote-curl.c:1184
+#: remote-curl.c:1193
msgid "cannot fetch by sha1 over smart http"
msgstr "无法通过智能 HTTP 获取 sha1"
-#: remote-curl.c:1228 remote-curl.c:1234
+#: remote-curl.c:1237 remote-curl.c:1243
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "协议错误：期望 sha/ref，却得到 '%s'"
-#: remote-curl.c:1246 remote-curl.c:1361
+#: remote-curl.c:1255 remote-curl.c:1373
#, c-format
msgid "http transport does not support %s"
msgstr "http 传输协议不支持 %s"
-#: remote-curl.c:1282
+#: remote-curl.c:1291
msgid "git-http-push failed"
msgstr "git-http-push 失败"
-#: remote-curl.c:1467
+#: remote-curl.c:1479
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl：用法：git remote-curl <远程> [<url>]"
-#: remote-curl.c:1499
+#: remote-curl.c:1511
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl：错误读取来自 git 的命令流"
-#: remote-curl.c:1506
+#: remote-curl.c:1518
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl：尝试没有本地仓库下获取"
-#: remote-curl.c:1547
+#: remote-curl.c:1559
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl：未知的来自 git 的命令 '%s'"
msgstr "对每一个引用输出信息 "
#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr "在一个仓库列表上运行 Git 命令"
+
+#: command-list.h:100
msgid "Prepare patches for e-mail submission"
msgstr "准备电子邮件提交的补丁"
-#: command-list.h:100
+#: command-list.h:101
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr "验证仓库中对象的连通性和有效性"
-#: command-list.h:101
+#: command-list.h:102
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr "清除不必要的文件和优化本地仓库"
-#: command-list.h:102
+#: command-list.h:103
msgid "Extract commit ID from an archive created using git-archive"
msgstr "从 git-archive 创建的归档文件中提取提交 ID"
-#: command-list.h:103
+#: command-list.h:104
msgid "Print lines matching a pattern"
msgstr "输出和模式匹配的行"
-#: command-list.h:104
+#: command-list.h:105
msgid "A portable graphical interface to Git"
msgstr "一个便携的 Git 图形客户端"
-#: command-list.h:105
+#: command-list.h:106
msgid "Compute object ID and optionally creates a blob from a file"
msgstr "从一个文件计算对象 ID，并可以创建 blob 数据对象"
-#: command-list.h:106
+#: command-list.h:107
msgid "Display help information about Git"
msgstr "显示 Git 的帮助信息"
-#: command-list.h:107
+#: command-list.h:108
msgid "Server side implementation of Git over HTTP"
msgstr "Git HTTP 协议的服务端实现"
-#: command-list.h:108
+#: command-list.h:109
msgid "Download from a remote Git repository via HTTP"
msgstr "通过 HTTP 从远程 Git 仓库下载"
-#: command-list.h:109
+#: command-list.h:110
msgid "Push objects over HTTP/DAV to another repository"
msgstr "通过 HTTP/DAV 推送对象另一个仓库"
-#: command-list.h:110
+#: command-list.h:111
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr "从标准输入将一组补丁发送到IMAP文件夹"
-#: command-list.h:111
+#: command-list.h:112
msgid "Build pack index file for an existing packed archive"
msgstr "从一个现存的包存档文件创建包索引"
-#: command-list.h:112
+#: command-list.h:113
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
-#: command-list.h:113
+#: command-list.h:114
msgid "Instantly browse your working repository in gitweb"
msgstr "在 gitweb 中即时浏览您的工作仓库"
-#: command-list.h:114
+#: command-list.h:115
msgid "Add or parse structured information in commit messages"
msgstr "添加或解析提交说明中的结构化信息"
-#: command-list.h:115
+#: command-list.h:116
msgid "The Git repository browser"
msgstr "Git 仓库浏览器"
-#: command-list.h:116
+#: command-list.h:117
msgid "Show commit logs"
msgstr "显示提交日志"
-#: command-list.h:117
+#: command-list.h:118
msgid "Show information about files in the index and the working tree"
msgstr "显示索引和工作区中文件的信息"
-#: command-list.h:118
+#: command-list.h:119
msgid "List references in a remote repository"
msgstr "显示一个远程仓库的引用"
-#: command-list.h:119
+#: command-list.h:120
msgid "List the contents of a tree object"
msgstr "显示一个树对象的内容"
-#: command-list.h:120
+#: command-list.h:121
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "从单个电子邮件中提取补丁和作者身份"
-#: command-list.h:121
+#: command-list.h:122
msgid "Simple UNIX mbox splitter program"
msgstr "简单的 UNIX mbox 邮箱切分程序"
-#: command-list.h:122
+#: command-list.h:123
msgid "Run tasks to optimize Git repository data"
msgstr "运行任务以优化仓库数据"
-#: command-list.h:123
+#: command-list.h:124
msgid "Join two or more development histories together"
msgstr "合并两个或更多开发历史"
-#: command-list.h:124
+#: command-list.h:125
msgid "Find as good common ancestors as possible for a merge"
msgstr "为了合并查找尽可能好的公共祖先提交"
-#: command-list.h:125
+#: command-list.h:126
msgid "Run a three-way file merge"
msgstr "运行一个三路文件合并"
-#: command-list.h:126
+#: command-list.h:127
msgid "Run a merge for files needing merging"
msgstr "对于需要合并的文件执行合并"
-#: command-list.h:127
+#: command-list.h:128
msgid "The standard helper program to use with git-merge-index"
msgstr "与 git-merge-index 一起使用的标准向导程序"
-#: command-list.h:128
+#: command-list.h:129
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "运行合并冲突解决工具以解决合并冲突"
-#: command-list.h:129
+#: command-list.h:130
msgid "Show three-way merge without touching index"
msgstr "显示三路合并而不动索引"
-#: command-list.h:130
+#: command-list.h:131
msgid "Write and verify multi-pack-indexes"
msgstr "写入和校验多包索引"
-#: command-list.h:131
+#: command-list.h:132
msgid "Creates a tag object"
msgstr "创建一个标签对象"
-#: command-list.h:132
+#: command-list.h:133
msgid "Build a tree-object from ls-tree formatted text"
msgstr "基于 ls-tree 的格式化文本创建一个树对象"
-#: command-list.h:133
+#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr "移动或重命名一个文件、目录或符号链接"
# 查找给定版本的符号名称
-#: command-list.h:134
+#: command-list.h:135
msgid "Find symbolic names for given revs"
msgstr "查找给定版本的符号名称"
-#: command-list.h:135
+#: command-list.h:136
msgid "Add or inspect object notes"
msgstr "添加或检查对象注释"
-#: command-list.h:136
+#: command-list.h:137
msgid "Import from and submit to Perforce repositories"
msgstr "导入和提交到 Perforce 仓库中"
-#: command-list.h:137
+#: command-list.h:138
msgid "Create a packed archive of objects"
msgstr "创建对象的存档包"
-#: command-list.h:138
+#: command-list.h:139
msgid "Find redundant pack files"
msgstr "查找冗余的包文件"
-#: command-list.h:139
+#: command-list.h:140
msgid "Pack heads and tags for efficient repository access"
msgstr "打包头和标签以实现高效的仓库访问"
-#: command-list.h:140
-msgid "Routines to help parsing remote repository access parameters"
-msgstr "帮助解析远程仓库访问参数的例程"
-
#: command-list.h:141
msgid "Compute unique ID for a patch"
msgstr "计算一个补丁的唯一 ID"
msgid "An overview of recommended workflows with Git"
msgstr "Git 推荐的工作流概览"
-#: git-bisect.sh:79
+#: git-bisect.sh:48
#, sh-format
msgid "Bad rev input: $arg"
msgstr "坏的输入版本：$arg"
-#: git-bisect.sh:99
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "坏的输入版本：$bisected_head"
-
-#: git-bisect.sh:108
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "坏的输入版本：$rev"
-
-#: git-bisect.sh:117
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
-
-#: git-bisect.sh:149
+#: git-bisect.sh:82
msgid "No logfile given"
msgstr "未提供日志文件"
-#: git-bisect.sh:150
+#: git-bisect.sh:83
#, sh-format
msgid "cannot read $file for replaying"
msgstr "不能读取 $file 来重放"
-#: git-bisect.sh:173
+#: git-bisect.sh:105
msgid "?? what are you talking about?"
msgstr "?? 您在说什么?"
-#: git-bisect.sh:183
+#: git-bisect.sh:115
msgid "bisect run failed: no command provided."
msgstr "二分查找运行失败：没有提供命令。"
-#: git-bisect.sh:188
+#: git-bisect.sh:120
#, sh-format
msgid "running $command"
msgstr "运行 $command"
-#: git-bisect.sh:195
+#: git-bisect.sh:127
#, sh-format
msgid ""
"bisect run failed:\n"
"二分查找运行失败：\n"
"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
-#: git-bisect.sh:221
+#: git-bisect.sh:152
msgid "bisect run cannot continue any more"
msgstr "二分查找不能继续运行"
-#: git-bisect.sh:227
+#: git-bisect.sh:158
#, sh-format
msgid ""
"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
msgstr ""
"二分查找运行失败：\n"
-"'bisect_state $state' 退出码为 $res"
+"'bisect-state $state' 退出码为 $res"
-#: git-bisect.sh:234
+#: git-bisect.sh:165
msgid "bisect run success"
msgstr "二分查找运行成功"
-#: git-bisect.sh:242
+#: git-bisect.sh:173
msgid "We are not bisecting."
msgstr "我们没有在二分查找。"
msgid "Simple merge did not work, trying automatic merge."
msgstr "简单合并未生效，尝试自动合并。"
-#: git-submodule.sh:180
+#: git-submodule.sh:179
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "只能在工作区的顶级目录中使用相对路径"
-#: git-submodule.sh:190
+#: git-submodule.sh:189
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
-#: git-submodule.sh:209
+#: git-submodule.sh:208
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' 已经存在于索引中"
-#: git-submodule.sh:212
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
-#: git-submodule.sh:219
+#: git-submodule.sh:218
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "'$sm_path' 没有检出的提交"
-#: git-submodule.sh:250
+#: git-submodule.sh:249
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "添加位于 '$sm_path' 的现存仓库到索引"
-#: git-submodule.sh:252
+#: git-submodule.sh:251
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
-#: git-submodule.sh:260
+#: git-submodule.sh:259
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库："
-#: git-submodule.sh:262
+#: git-submodule.sh:261
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
"或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。"
-#: git-submodule.sh:268
+#: git-submodule.sh:267
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "激活本地 git 目录到子模组 '$sm_name'。"
-#: git-submodule.sh:280
+#: git-submodule.sh:279
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "不能检出子模组 '$sm_path'"
-#: git-submodule.sh:285
+#: git-submodule.sh:284
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "无法添加子模组 '$sm_path'"
-#: git-submodule.sh:294
+#: git-submodule.sh:293
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"
-#: git-submodule.sh:567
+#: git-submodule.sh:568
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
-#: git-submodule.sh:577
+#: git-submodule.sh:578
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-#: git-submodule.sh:582
+#: git-submodule.sh:583
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
-#: git-submodule.sh:600
+#: git-submodule.sh:601
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
"$sha1:"
msgstr "无法在子模组路径 '$displaypath' 中获取，尝试直接获取 $sha1："
-#: git-submodule.sh:606
+#: git-submodule.sh:607
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
msgstr ""
"获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。"
-#: git-submodule.sh:613
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-#: git-submodule.sh:614
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
-#: git-submodule.sh:618
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-#: git-submodule.sh:619
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
-#: git-submodule.sh:624
+#: git-submodule.sh:625
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-#: git-submodule.sh:625
+#: git-submodule.sh:626
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
-#: git-submodule.sh:630
+#: git-submodule.sh:631
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
-#: git-submodule.sh:631
+#: git-submodule.sh:632
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "子模组 '$displaypath'：'$command $sha1'"
-#: git-submodule.sh:662
+#: git-submodule.sh:663
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进子模组路径 '$displaypath'"
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "详见 git-${cmd}(1)。"
-
#: git-rebase--preserve-merges.sh:109
msgid "Applied autostash."
msgstr "已应用 autostash。"
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:634
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "触碰了 %d 个路径\n"
msgstr[1] "触碰了 %d 个路径\n"
-#: git-add--interactive.perl:1058
+#: git-add--interactive.perl:1056
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。"
-#: git-add--interactive.perl:1061
+#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr "如果补丁能干净地应用，编辑块将立即标记为贮藏。"
-#: git-add--interactive.perl:1064
+#: git-add--interactive.perl:1062
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr "如果补丁能干净地应用，编辑块将立即标记为未暂存。"
-#: git-add--interactive.perl:1067 git-add--interactive.perl:1076
-#: git-add--interactive.perl:1082
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr "如果补丁能干净地应用，编辑块将立即标记为应用。"
-#: git-add--interactive.perl:1070 git-add--interactive.perl:1073
-#: git-add--interactive.perl:1079
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。"
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "为写入打开块编辑文件失败：%s"
-#: git-add--interactive.perl:1123
+#: git-add--interactive.perl:1121
#, perl-format
msgid ""
"---\n"
"要删除 '%s' 开始的行，删除它们。\n"
"以 %s 开始的行将被删除。\n"
-#: git-add--interactive.perl:1145
+#: git-add--interactive.perl:1143
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "无法读取块编辑文件：%s"
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1251
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"a - 暂存该块和本文件中后面的全部块\n"
"d - 不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1259
+#: git-add--interactive.perl:1257
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a - 贮藏该块和本文件中后面的全部块\n"
"d - 不贮藏该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1265
+#: git-add--interactive.perl:1263
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"a - 不暂存该块和本文件中后面的全部块\n"
"d - 不要不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1271
+#: git-add--interactive.perl:1269
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1283
+#: git-add--interactive.perl:1281
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1289
+#: git-add--interactive.perl:1287
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1301
+#: git-add--interactive.perl:1299
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1314
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e - 手动编辑当前块\n"
"? - 显示帮助\n"
-#: git-add--interactive.perl:1347
+#: git-add--interactive.perl:1345
msgid "The selected hunks do not apply to the index!\n"
msgstr "选中的块不能应用到索引！\n"
-#: git-add--interactive.perl:1362
+#: git-add--interactive.perl:1360
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "忽略未合入的：%s\n"
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1479
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1480
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1483
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1484
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1601
+#: git-add--interactive.perl:1599
msgid "No other hunks to goto\n"
msgstr "没有其它可供跳转的块\n"
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl:1617
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "无效数字：'%s'\n"
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1622
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "对不起，只有 %d 个可用块。\n"
msgstr[1] "对不起，只有 %d 个可用块。\n"
-#: git-add--interactive.perl:1659
+#: git-add--interactive.perl:1657
msgid "No other hunks to search\n"
msgstr "没有其它可供查找的块\n"
-#: git-add--interactive.perl:1676
+#: git-add--interactive.perl:1674
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "错误的正则表达式 %s：%s\n"
-#: git-add--interactive.perl:1686
+#: git-add--interactive.perl:1684
msgid "No hunk matches the given pattern\n"
msgstr "没有和给定模式相匹配的块\n"
-#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
msgid "No previous hunk\n"
msgstr "没有前一个块\n"
-#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
msgid "No next hunk\n"
msgstr "没有下一个块\n"
-#: git-add--interactive.perl:1732
+#: git-add--interactive.perl:1730
msgid "Sorry, cannot split this hunk\n"
msgstr "对不起，不能拆分这个块\n"
-#: git-add--interactive.perl:1738
+#: git-add--interactive.perl:1736
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "拆分为 %d 块。\n"
msgstr[1] "拆分为 %d 块。\n"
-#: git-add--interactive.perl:1748
+#: git-add--interactive.perl:1746
msgid "Sorry, cannot edit this hunk\n"
msgstr "对不起，不能编辑这个块\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1813
+#: git-add--interactive.perl:1811
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"diff - 显示 HEAD 和索引间差异\n"
"add untracked - 添加未跟踪文件的内容至暂存列表\n"
-#: git-add--interactive.perl:1830 git-add--interactive.perl:1835
-#: git-add--interactive.perl:1838 git-add--interactive.perl:1845
-#: git-add--interactive.perl:1848 git-add--interactive.perl:1855
-#: git-add--interactive.perl:1859 git-add--interactive.perl:1865
+#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
msgid "missing --"
msgstr "缺失 --"
-#: git-add--interactive.perl:1861
+#: git-add--interactive.perl:1866
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "未知的 --patch 模式：%s"
-#: git-add--interactive.perl:1867 git-add--interactive.perl:1873
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "无效的参数 %s，期望是 --"
projects / thirdparty / git.git / commitdiff
