summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2019-12-30 00:56:49 (GMT)
committerJiang Xin <worldhello.net@gmail.com>2020-03-17 06:05:22 (GMT)
commit2b472aae5cda0c687643cfffebe1aad5e5f73411 (patch)
tree589a15f0fec551ee1a187ddc0c9750585e0327a1 /po/zh_CN.po
parentee94b979b228e7c7ca16dc069ca8e935915696fe (diff)
downloadgit-2b472aae5cda0c687643cfffebe1aad5e5f73411.zip
git-2b472aae5cda0c687643cfffebe1aad5e5f73411.tar.gz
git-2b472aae5cda0c687643cfffebe1aad5e5f73411.tar.bz2
l10n: zh_CN: for git v2.26.0 l10n round 1 and 2
Translate 79 new messages (4839t0f0u) for git 2.26.0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po5385
1 files changed, 2844 insertions, 2541 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 73da662..a1ea5d3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -139,8 +139,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-12-30 08:48+0800\n"
-"PO-Revision-Date: 2020-01-12 17:16+0800\n"
+"POT-Creation-Date: 2020-03-11 15:26+0800\n"
+"PO-Revision-Date: 2020-03-11 15:38+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
@@ -149,250 +149,500 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: add-interactive.c:347
+#: add-interactive.c:368
#, c-format
msgid "Huh (%s)?"
msgstr "嗯(%s)?"
-#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216
-#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643
-#: builtin/rebase.c:2019 builtin/rebase.c:2063
+#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
+#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
+#: builtin/rebase.c:2086 builtin/rebase.c:2130
msgid "could not read index"
msgstr "不能读取索引"
-#: add-interactive.c:555 git-add--interactive.perl:269
+#: add-interactive.c:576 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "二进制"
-#: add-interactive.c:613 git-add--interactive.perl:278
+#: add-interactive.c:634 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "无"
-#: add-interactive.c:614 git-add--interactive.perl:314
+#: add-interactive.c:635 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "没有修改"
-#: add-interactive.c:651 git-add--interactive.perl:643
+#: add-interactive.c:672 git-add--interactive.perl:643
msgid "Update"
msgstr "更新"
-#: add-interactive.c:668 add-interactive.c:856
+#: add-interactive.c:689 add-interactive.c:877
#, c-format
msgid "could not stage '%s'"
msgstr "不能暂存 '%s'"
-#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409
-#: builtin/rebase.c:895
+#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
+#: builtin/rebase.c:899
msgid "could not write index"
msgstr "不能写入索引"
-#: add-interactive.c:677 git-add--interactive.perl:628
+#: add-interactive.c:698 git-add--interactive.perl:628
#, 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:695 git-add--interactive.perl:678
+#: add-interactive.c:716 git-add--interactive.perl:678
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "说明:%s 现已成为未跟踪的。\n"
-#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281
+#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
#: builtin/reset.c:144
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
-#: add-interactive.c:730 git-add--interactive.perl:655
+#: add-interactive.c:751 git-add--interactive.perl:655
msgid "Revert"
msgstr "还原"
-#: add-interactive.c:746
+#: add-interactive.c:767
msgid "Could not parse HEAD^{tree}"
msgstr "不能解析 HEAD^{tree}"
-#: add-interactive.c:784 git-add--interactive.perl:631
+#: add-interactive.c:805 git-add--interactive.perl:631
#, 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:835 git-add--interactive.perl:695
+#: add-interactive.c:856 git-add--interactive.perl:695
#, c-format
msgid "No untracked files.\n"
msgstr "没有未跟踪的文件。\n"
-#: add-interactive.c:839 git-add--interactive.perl:689
+#: add-interactive.c:860 git-add--interactive.perl:689
msgid "Add untracked"
msgstr "添加未跟踪的"
-#: add-interactive.c:866 git-add--interactive.perl:625
+#: add-interactive.c:887 git-add--interactive.perl:625
#, 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:896
+#: add-interactive.c:917
#, c-format
msgid "ignoring unmerged: %s"
msgstr "忽略未合入的:%s"
-#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366
+#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
#, c-format
msgid "Only binary files changed.\n"
msgstr "只有二进制文件被修改。\n"
-#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368
+#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
#, c-format
msgid "No changes.\n"
msgstr "没有修改。\n"
-#: add-interactive.c:914 git-add--interactive.perl:1376
+#: add-interactive.c:935 git-add--interactive.perl:1376
msgid "Patch update"
msgstr "补丁更新"
-#: add-interactive.c:953 git-add--interactive.perl:1754
+#: add-interactive.c:974 git-add--interactive.perl:1754
msgid "Review diff"
msgstr "检视 diff"
-#: add-interactive.c:981
+#: add-interactive.c:1002
msgid "show paths with changes"
msgstr "显示含变更的路径"
-#: add-interactive.c:983
+#: add-interactive.c:1004
msgid "add working tree state to the staged set of changes"
msgstr "将工作区状态添加到暂存区修改集中"
-#: add-interactive.c:985
+#: add-interactive.c:1006
msgid "revert staged set of changes back to the HEAD version"
msgstr "将暂存的修改集恢复为 HEAD 版本"
-#: add-interactive.c:987
+#: add-interactive.c:1008
msgid "pick hunks and update selectively"
msgstr "挑选数据块并有选择地更新"
-#: add-interactive.c:989
+#: add-interactive.c:1010
msgid "view diff between HEAD and index"
msgstr "显示 HEAD 和索引的差异"
-#: add-interactive.c:991
+#: add-interactive.c:1012
msgid "add contents of untracked files to the staged set of changes"
msgstr "将未跟踪文件的内容添加到暂存区修改集中"
-#: add-interactive.c:999 add-interactive.c:1048
+#: add-interactive.c:1020 add-interactive.c:1069
msgid "Prompt help:"
msgstr "帮助:"
-#: add-interactive.c:1001
+#: add-interactive.c:1022
msgid "select a single item"
msgstr "选择一个条目"
-#: add-interactive.c:1003
+#: add-interactive.c:1024
msgid "select a range of items"
msgstr "选择一系列条目"
-#: add-interactive.c:1005
+#: add-interactive.c:1026
msgid "select multiple ranges"
msgstr "选择多个范围"
-#: add-interactive.c:1007 add-interactive.c:1052
+#: add-interactive.c:1028 add-interactive.c:1073
msgid "select item based on unique prefix"
msgstr "基于唯一前缀选择条目"
-#: add-interactive.c:1009
+#: add-interactive.c:1030
msgid "unselect specified items"
msgstr "反选指定的条目"
-#: add-interactive.c:1011
+#: add-interactive.c:1032
msgid "choose all items"
msgstr "选择所有条目"
-#: add-interactive.c:1013
+#: add-interactive.c:1034
msgid "(empty) finish selecting"
msgstr "(空)结束选择"
-#: add-interactive.c:1050
+#: add-interactive.c:1071
msgid "select a numbered item"
msgstr "选择一个编号条目"
-#: add-interactive.c:1054
+#: add-interactive.c:1075
msgid "(empty) select nothing"
msgstr "(空)不选择任何内容"
-#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851
+#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848
+#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
msgid "What now"
msgstr "请选择"
-#: add-interactive.c:1115 git-add--interactive.perl:213
+#: add-interactive.c:1136 git-add--interactive.perl:213
msgid "staged"
msgstr "缓存"
-#: add-interactive.c:1115 git-add--interactive.perl:213
+#: add-interactive.c:1136 git-add--interactive.perl:213
msgid "unstaged"
msgstr "未缓存"
-#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197
-#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144
-#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878
-#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
+#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
+#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
+#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
+#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
msgid "path"
msgstr "路径"
-#: add-interactive.c:1122
+#: add-interactive.c:1143
msgid "could not refresh index"
msgstr "不能刷新索引"
-#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765
+#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
#, c-format
msgid "Bye.\n"
msgstr "再见。\n"
-#: add-patch.c:15
-#, c-format
-msgid "Stage mode change [y,n,a,q,d%s,?]? "
-msgstr "暂存模式变更 [y,n,a,q,d%s,?]? "
+#: add-patch.c:33 git-add--interactive.perl:1428
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:16
-#, c-format
-msgid "Stage deletion [y,n,a,q,d%s,?]? "
-msgstr "暂存删除动作 [y,n,a,q,d%s,?]? "
+#: add-patch.c:34 git-add--interactive.perl:1429
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:17
-#, c-format
-msgid "Stage this hunk [y,n,a,q,d%s,?]? "
-msgstr "暂存该块 [y,n,a,q,d%s,?]? "
+#: add-patch.c:35 git-add--interactive.perl:1430
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "暂存该块 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr "如果补丁能正确地应用,编辑块将立即标记为暂存。"
+
+#: add-patch.c:40
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 暂存该块\n"
+"n - 不要暂存该块\n"
+"q - 退出。不暂存该块及后面的全部块\n"
+"a - 暂存该块和本文件中后面的全部块\n"
+"d - 不暂存该块和本文件中后面的全部块\n"
+
+#: add-patch.c:54 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:55 git-add--interactive.perl:1434
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:56 git-add--interactive.perl:1435
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr "如果补丁能正确地应用,编辑块将立即标记为贮藏。"
+
+#: add-patch.c:61
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 贮藏该块\n"
+"n - 不要贮藏该块\n"
+"q - 退出。不贮藏该块及后面的全部块\n"
+"a - 贮藏该块和本文件中后面的全部块\n"
+"d - 不贮藏该块和本文件中后面的全部块\n"
+
+#: add-patch.c:77 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:78 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:79 git-add--interactive.perl:1440
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:81
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr "如果补丁能正确地应用,编辑块将立即标记为未暂存。"
+
+#: add-patch.c:84
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 不暂存该块\n"
+"n - 不要不暂存该块\n"
+"q - 退出。不要不暂存该块及后面的全部块\n"
+"a - 不暂存该块和本文件中后面的全部块\n"
+"d - 不要不暂存该块和本文件中后面的全部块\n"
+
+#: add-patch.c:99 git-add--interactive.perl:1443
+#, 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:100 git-add--interactive.perl:1444
+#, 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:101 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr "如果补丁能正确地应用,编辑块将立即标记为应用。"
+
+#: add-patch.c:106
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 在索引中应用该块\n"
+"n - 不要在索引中应用该块\n"
+"q - 退出。不要应用该块及后面的全部块\n"
+"a - 应用该块和本文件中后面的全部块\n"
+"d - 不要应用该块和本文件中后面的全部块\n"
+
+#: add-patch.c:121 git-add--interactive.perl:1448
+#: git-add--interactive.perl:1463
+#, 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:122 git-add--interactive.perl:1449
+#: git-add--interactive.perl:1464
+#, 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:123 git-add--interactive.perl:1450
+#: git-add--interactive.perl:1465
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr "如果补丁能正确地应用,编辑块将立即标记为丢弃。"
+
+#: add-patch.c:128 add-patch.c:193
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 在工作区中丢弃该块\n"
+"n - 不要在工作区中丢弃该块\n"
+"q - 退出。不要丢弃该块及后面的全部块\n"
+"a - 丢弃该块和本文件中后面的全部块\n"
+"d - 不要丢弃该块和本文件中后面的全部块\n"
+
+#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#, 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:144 add-patch.c:187 git-add--interactive.perl:1454
+#, 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:145 add-patch.c:188 git-add--interactive.perl:1455
+#, 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,?]? "
+
+#: add-patch.c:150
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 在索引和工作区中丢弃该块\n"
+"n - 不要在索引和工作区中丢弃该块\n"
+"q - 退出。不要丢弃该块及后面的全部块\n"
+"a - 丢弃该块和本文件中后面的全部块\n"
+"d - 不要丢弃该块和本文件中后面的全部块\n"
+
+#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#, 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:165 add-patch.c:208 git-add--interactive.perl:1459
+#, 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:166 add-patch.c:209 git-add--interactive.perl:1460
+#, 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,?]? "
+
+#: add-patch.c:171
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 在索引和工作区中应用该块\n"
+"n - 不要在索引和工作区中应用该块\n"
+"q - 退出。不要应用该块及后面的全部块\n"
+"a - 应用该块和本文件中后面的全部块\n"
+"d - 不要应用该块和本文件中后面的全部块\n"
+
+#: add-patch.c:214
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 在工作区中应用该块\n"
+"n - 不要在工作区中应用该块\n"
+"q - 退出。不要应用该块及后面的全部块\n"
+"a - 应用该块和本文件中后面的全部块\n"
+"d - 不要应用该块和本文件中后面的全部块\n"
-#: add-patch.c:111
+#: add-patch.c:318
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "无法解析数据块头信息 '%.*s'"
-#: add-patch.c:130 add-patch.c:134
+#: add-patch.c:337 add-patch.c:341
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "无法解析彩色数据块头信息 '%.*s'"
-#: add-patch.c:176
+#: add-patch.c:395
msgid "could not parse diff"
msgstr "不能解析差异信息"
-#: add-patch.c:194
+#: add-patch.c:414
msgid "could not parse colored diff"
msgstr "不能解析彩色差异信息"
-#: add-patch.c:508
+#: add-patch.c:428
+#, c-format
+msgid "failed to run '%s'"
+msgstr "运行 '%s' 失败"
+
+#: add-patch.c:587
+msgid "mismatched output from interactive.diffFilter"
+msgstr "interactive.diffFilter 的输出不匹配"
+
+#: add-patch.c:588
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
+
+#: add-patch.c:761
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -401,7 +651,7 @@ msgstr ""
"预期上下文行 #%d 于\n"
"%.*s"
-#: add-patch.c:523
+#: add-patch.c:776
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -414,11 +664,11 @@ msgstr ""
"\t不是结尾于:\n"
"%.*s"
-#: add-patch.c:799 git-add--interactive.perl:1112
+#: add-patch.c:1052 git-add--interactive.perl:1112
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
-#: add-patch.c:803
+#: add-patch.c:1056
#, c-format
msgid ""
"---\n"
@@ -431,14 +681,8 @@ msgstr ""
"要删除 '%c' 开始的行,删除它们。\n"
"以 %c 开始的行将被删除。\n"
-#: add-patch.c:810
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for staging.\n"
-msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。\n"
-
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:818 git-add--interactive.perl:1126
+#: add-patch.c:1070 git-add--interactive.perl:1126
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"
@@ -447,11 +691,11 @@ msgstr ""
"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
"此次编辑被终止,该块不会被修改。\n"
-#: add-patch.c:851
+#: add-patch.c:1103
msgid "could not parse hunk header"
msgstr "无法解析数据块头信息"
-#: add-patch.c:895 add-patch.c:1294
+#: add-patch.c:1148
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' 失败"
@@ -467,26 +711,24 @@ 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:952 git-add--interactive.perl:1239
+#: add-patch.c:1218 git-add--interactive.perl:1239
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
-#: add-patch.c:1009
-msgid ""
-"y - stage this hunk\n"
-"n - do not stage this hunk\n"
-"q - quit; do not stage this hunk or any of the remaining ones\n"
-"a - stage this and all the remaining hunks\n"
-"d - do not stage this hunk nor any of the remaining hunks\n"
-msgstr ""
-"y - 暂存该块\n"
-"n - 不要暂存该块\n"
-"q - 退出。不暂存该块及后面的全部块\n"
-"a - 暂存该块和所有剩余的块\n"
-"d - 不暂存该块和任何剩余的块\n"
+#: add-patch.c:1261
+msgid "The selected hunks do not apply to the index!"
+msgstr "选中的块不能应用到索引!"
-#: add-patch.c:1016
+#: add-patch.c:1262 git-add--interactive.perl:1343
+msgid "Apply them to the worktree anyway? "
+msgstr "无论如何都要应用到工作区么?"
+
+#: add-patch.c:1269 git-add--interactive.perl:1346
+msgid "Nothing was applied.\n"
+msgstr "未应用。\n"
+
+#: add-patch.c:1326
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -508,99 +750,103 @@ msgstr ""
"e - 手动编辑当前块\n"
"? - 显示帮助\n"
-#: add-patch.c:1137 add-patch.c:1147
+#: add-patch.c:1447 add-patch.c:1457
msgid "No previous hunk"
msgstr "没有前一个块"
-#: add-patch.c:1142 add-patch.c:1152
+#: add-patch.c:1452 add-patch.c:1462
msgid "No next hunk"
msgstr "没有下一个块"
-#: add-patch.c:1158
+#: add-patch.c:1468
msgid "No other hunks to goto"
msgstr "没有其它可供跳转的块"
-#: add-patch.c:1169 git-add--interactive.perl:1577
+#: add-patch.c:1479 git-add--interactive.perl:1577
msgid "go to which hunk (<ret> to see more)? "
msgstr "跳转到哪个块(<回车> 查看更多)? "
-#: add-patch.c:1170 git-add--interactive.perl:1579
+#: add-patch.c:1480 git-add--interactive.perl:1579
msgid "go to which hunk? "
msgstr "跳转到哪个块?"
-#: add-patch.c:1181
+#: add-patch.c:1491
#, c-format
msgid "Invalid number: '%s'"
msgstr "无效数字:'%s'"
-#: add-patch.c:1186
+#: add-patch.c:1496
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "对不起,只有 %d 个可用块。"
msgstr[1] "对不起,只有 %d 个可用块。"
-#: add-patch.c:1195
+#: add-patch.c:1505
msgid "No other hunks to search"
msgstr "没有其它可供查找的块"
-#: add-patch.c:1201 git-add--interactive.perl:1623
+#: add-patch.c:1511 git-add--interactive.perl:1623
msgid "search for regex? "
msgstr "使用正则表达式搜索?"
-#: add-patch.c:1216
+#: add-patch.c:1526
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "错误的正则表达式 %s:%s"
-#: add-patch.c:1233
+#: add-patch.c:1543
msgid "No hunk matches the given pattern"
msgstr "没有和给定模式相匹配的块"
-#: add-patch.c:1240
+#: add-patch.c:1550
msgid "Sorry, cannot split this hunk"
msgstr "对不起,不能拆分这个块"
-#: add-patch.c:1244
+#: add-patch.c:1554
#, c-format
msgid "Split into %d hunks."
msgstr "拆分为 %d 块。"
-#: add-patch.c:1248
+#: add-patch.c:1558
msgid "Sorry, cannot edit this hunk"
msgstr "对不起,不能编辑这个块"
-#: advice.c:111
+#: add-patch.c:1609
+msgid "'git apply' failed"
+msgstr "'git apply' 失败"
+
+#: advice.c:115
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示:%.*s%s\n"
-#: advice.c:164
+#: advice.c:168
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "无法拣选,因为您有未合并的文件。"
-#: advice.c:166
+#: advice.c:170
msgid "Committing is not possible because you have unmerged files."
msgstr "无法提交,因为您有未合并的文件。"
-#: advice.c:168
+#: advice.c:172
msgid "Merging is not possible because you have unmerged files."
msgstr "无法合并,因为您有未合并的文件。"
-#: advice.c:170
+#: advice.c:174
msgid "Pulling is not possible because you have unmerged files."
msgstr "无法拉取,因为您有未合并的文件。"
-#: advice.c:172
+#: advice.c:176
msgid "Reverting is not possible because you have unmerged files."
msgstr "无法回退,因为您有未合并的文件。"
-#: advice.c:174
+#: advice.c:178
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "无法 %s,因为您有未合并的文件。"
-#: advice.c:182
+#: advice.c:186
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."
@@ -608,23 +854,23 @@ msgstr ""
"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
"解决方案并提交。"
-#: advice.c:190
+#: advice.c:194
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
-#: advice.c:195 builtin/merge.c:1332
+#: advice.c:199 builtin/merge.c:1335
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
-#: advice.c:197
+#: advice.c:201
msgid "Please, commit your changes before merging."
msgstr "请在合并前先提交您的修改。"
-#: advice.c:198
+#: advice.c:202
msgid "Exiting because of unfinished merge."
msgstr "因为存在未完成的合并而退出。"
-#: advice.c:204
+#: advice.c:208
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -866,416 +1112,416 @@ msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
-#: apply.c:3170
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "补丁应用到空文件 '%s',但其并非空文件"
-#: apply.c:3188
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
-#: apply.c:3201
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
-#: apply.c:3207
+#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
-#: apply.c:3228
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败:%s:%ld"
-#: apply.c:3351
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
-#: apply.c:3411
+#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读取位于符号链接中的 '%s'"
-#: apply.c:3440 apply.c:3683
+#: apply.c:3442 apply.c:3685
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
-#: apply.c:3526 apply.c:3698
+#: apply.c:3528 apply.c:3700
#, c-format
msgid "%s: does not exist in index"
msgstr "%s:不存在于索引中"
-#: apply.c:3535 apply.c:3706
+#: apply.c:3537 apply.c:3708
#, c-format
msgid "%s: does not match index"
msgstr "%s:和索引不匹配"
-#: apply.c:3570
+#: apply.c:3572
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: apply.c:3573
+#: apply.c:3575
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "回落到三方合并...\n"
-#: apply.c:3589 apply.c:3593
+#: apply.c:3591 apply.c:3595
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "无法读取 '%s' 的当前内容"
-#: apply.c:3605
+#: apply.c:3607
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "无法回落到三方合并...\n"
-#: apply.c:3619
+#: apply.c:3621
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "应用补丁到 '%s' 存在冲突。\n"
-#: apply.c:3624
+#: apply.c:3626
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功应用补丁到 '%s'。\n"
-#: apply.c:3650
+#: apply.c:3652
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
-#: apply.c:3723
+#: apply.c:3725
#, c-format
msgid "%s: wrong type"
msgstr "%s:错误类型"
-#: apply.c:3725
+#: apply.c:3727
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o,应为 %o"
-#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1320
+#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1325
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
-#: apply.c:3934
+#: apply.c:3936
#, c-format
msgid "%s: already exists in index"
msgstr "%s:已经存在于索引中"
-#: apply.c:3937
+#: apply.c:3939
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s:已经存在于工作区中"
-#: apply.c:3957
+#: apply.c:3959
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
-#: apply.c:3962
+#: apply.c:3964
#, 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:3982
+#: apply.c:3984
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"
-#: apply.c:3986
+#: apply.c:3988
#, c-format
msgid "%s: patch does not apply"
msgstr "%s:补丁未应用"
-#: apply.c:4001
+#: apply.c:4003
#, c-format
msgid "Checking patch %s..."
msgstr "正在检查补丁 %s..."
-#: apply.c:4093
+#: apply.c:4095
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模组 %s 的 sha1 信息缺失或无效"
-#: apply.c:4100
+#: apply.c:4102
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式变更,但它不在当前 HEAD 中"
-#: apply.c:4103
+#: apply.c:4105
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效(%s)。"
-#: apply.c:4112
+#: apply.c:4114
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在临时索引中添加 %s"
-#: apply.c:4122
+#: apply.c:4124
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把临时索引写入到 %s"
-#: apply.c:4260
+#: apply.c:4262
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-#: apply.c:4294
+#: apply.c:4296
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
-#: apply.c:4300
+#: apply.c:4302
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能对新建文件 '%s' 调用 stat"
-#: apply.c:4308
+#: apply.c:4310
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
-#: apply.c:4314 apply.c:4459
+#: apply.c:4316 apply.c:4461
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
-#: apply.c:4357
+#: apply.c:4359
#, c-format
msgid "failed to write to '%s'"
msgstr "写入 '%s' 失败"
-#: apply.c:4361
+#: apply.c:4363
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: apply.c:4431
+#: apply.c:4433
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
-#: apply.c:4529
+#: apply.c:4531
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
-#: apply.c:4537
+#: apply.c:4539
msgid "internal error"
msgstr "内部错误"
-#: apply.c:4540
+#: apply.c:4542
#, 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:4551
+#: apply.c:4553
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192
+#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
-#: apply.c:4573
+#: apply.c:4575
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
-#: apply.c:4577
+#: apply.c:4579
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
-#: apply.c:4696
+#: apply.c:4698
#, c-format
msgid "Skipped patch '%s'."
msgstr "略过补丁 '%s'。"
-#: apply.c:4704
+#: apply.c:4706
msgid "unrecognized input"
msgstr "未能识别的输入"
-#: apply.c:4724
+#: apply.c:4726
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: apply.c:4881
+#: apply.c:4883
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s':%s"
-#: apply.c:4908
+#: apply.c:4910
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: apply.c:4914 apply.c:4929
+#: apply.c:4916 apply.c:4931
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字符误用。"
msgstr[1] "%d 行新增了空白字符误用。"
-#: apply.c:4922
+#: apply.c:4924
#, 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:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: apply.c:4966
+#: apply.c:4968
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
-#: apply.c:4969
+#: apply.c:4971
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: apply.c:4971 builtin/am.c:2206
+#: apply.c:4973 builtin/am.c:2260
msgid "num"
msgstr "数字"
-#: apply.c:4972
+#: apply.c:4974
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: apply.c:4975
+#: apply.c:4977
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
-#: apply.c:4977
+#: apply.c:4979
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
-#: apply.c:4981
+#: apply.c:4983
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
-#: apply.c:4983
+#: apply.c:4985
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁,而是显示输入的概要"
-#: apply.c:4985
+#: apply.c:4987
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁,而是查看补丁是否可应用"
-#: apply.c:4987
+#: apply.c:4989
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
-#: apply.c:4989
+#: apply.c:4991
msgid "mark new files with `git add --intent-to-add`"
msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
-#: apply.c:4991
+#: apply.c:4993
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
-#: apply.c:4993
+#: apply.c:4995
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
-#: apply.c:4996
+#: apply.c:4998
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
-#: apply.c:4998
+#: apply.c:5000
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三方合并"
-#: apply.c:5000
+#: apply.c:5002
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: apply.c:5005
+#: apply.c:5007
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98
+#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3310 builtin/rebase.c:1474
+#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
msgid "action"
msgstr "动作"
-#: apply.c:5007
+#: apply.c:5009
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: apply.c:5010 apply.c:5013
+#: apply.c:5012 apply.c:5015
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
-#: apply.c:5016
+#: apply.c:5018
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
-#: apply.c:5018
+#: apply.c:5020
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: apply.c:5020
+#: apply.c:5022
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: apply.c:5022
+#: apply.c:5024
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22
-#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774
+#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
+#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "冗长输出"
-#: apply.c:5025
+#: apply.c:5027
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
-#: apply.c:5028
+#: apply.c:5030
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: apply.c:5030 builtin/am.c:2194
+#: apply.c:5032 builtin/am.c:2248
msgid "root"
msgstr "根目录"
-#: apply.c:5031
+#: apply.c:5033
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
@@ -1297,7 +1543,7 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
-#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299
+#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹配任何文件"
@@ -1338,8 +1584,8 @@ msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
#: parse-options.h:190
@@ -1375,7 +1621,7 @@ msgid "list supported archive formats"
msgstr "列出支持的归档格式"
#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
msgid "repo"
msgstr "仓库"
@@ -1414,17 +1660,17 @@ msgstr "未知归档格式 '%s'"
msgid "Argument not supported for format '%s': -%d"
msgstr "参数不支持此格式 '%s':-%d"
-#: archive-tar.c:125 archive-zip.c:350
+#: archive-tar.c:125 archive-zip.c:351
#, c-format
msgid "cannot stream blob %s"
msgstr "不能打开数据对象 %s"
-#: archive-tar.c:266 archive-zip.c:368
+#: archive-tar.c:266 archive-zip.c:369
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "不支持的文件模式:0%o (SHA1: %s)"
-#: archive-tar.c:293 archive-zip.c:358
+#: archive-tar.c:293 archive-zip.c:359
#, c-format
msgid "cannot read %s"
msgstr "不能读取 %s"
@@ -1453,12 +1699,12 @@ msgstr "路径不是有效的 UTF-8:%s"
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "路径太长(%d 字符,SHA1:%s):%s"
-#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233
+#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
#, c-format
msgid "deflate error (%d)"
msgstr "压缩错误 (%d)"
-#: archive-zip.c:614
+#: archive-zip.c:615
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "对于本系统时间戳太大:%<PRIuMAX>"
@@ -1491,12 +1737,12 @@ msgstr "文件 '%s' 包含错误的引用格式:%s"
msgid "We cannot bisect more!\n"
msgstr "我们无法进行更多的二分查找!\n"
-#: bisect.c:733
+#: bisect.c:745
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一个有效的提交名 %s"
-#: bisect.c:758
+#: bisect.c:770
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1505,7 +1751,7 @@ msgstr ""
"合并基线 %s 是坏的。\n"
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
-#: bisect.c:763
+#: bisect.c:775
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1514,7 +1760,7 @@ msgstr ""
"合并基线 %s 是新的。\n"
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
-#: bisect.c:768
+#: bisect.c:780
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1523,7 +1769,7 @@ msgstr ""
"合并基线 %s 是 %s。\n"
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
-#: bisect.c:776
+#: bisect.c:788
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1534,7 +1780,7 @@ msgstr ""
"这种情况下 git 二分查找无法正常工作。\n"
"您可能弄错了 %s 和 %s 版本?\n"
-#: bisect.c:789
+#: bisect.c:801
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1545,36 +1791,36 @@ msgstr ""
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
"我们仍旧继续。"
-#: bisect.c:822
+#: bisect.c:840
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中:合并基线必须是经过测试的\n"
-#: bisect.c:865
+#: bisect.c:890
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:966 builtin/merge.c:149
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
-#: bisect.c:958
+#: bisect.c:997
msgid "reading bisect refs failed"
msgstr "读取二分查找引用失败"
-#: bisect.c:977
+#: bisect.c:1019
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同时为 %s 和 %s\n"
-#: bisect.c:985
+#: bisect.c:1028
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1583,7 +1829,7 @@ msgstr ""
"没有发现可测试的提交。\n"
"可能您在运行时使用了错误的路径参数?\n"
-#: bisect.c:1004
+#: bisect.c:1057
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1593,7 +1839,7 @@ msgstr[1] "(大概 %d 步)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1010
+#: bisect.c:1063
#, 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"
@@ -1612,10 +1858,10 @@ msgstr "不能将 --contents 和最终的提交对象名共用"
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093
-#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991
-#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411
-#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
+#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
+#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
+#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
@@ -1778,8 +2024,8 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头:%s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108
-#: builtin/commit.c:811
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
+#: builtin/commit.c:815
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
@@ -1849,13 +2095,13 @@ msgstr "不能创建 '%s'"
msgid "index-pack died"
msgstr "index-pack 终止"
-#: color.c:296
+#: color.c:329
#, c-format
msgid "invalid color value: %.*s"
msgstr "无效的颜色值:%.*s"
-#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398
-#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
+#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
@@ -1885,27 +2131,27 @@ msgstr ""
"设置 \"git config advice.graftFileDeprecated false\"\n"
"可关闭本消息"
-#: commit.c:1152
+#: commit.c:1153
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
-#: commit.c:1155
+#: commit.c:1157
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
-#: commit.c:1158
+#: commit.c:1160
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 没有 GPG 签名。"
-#: commit.c:1161
+#: commit.c:1163
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-#: commit.c:1415
+#: commit.c:1417
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -1915,253 +2161,253 @@ msgstr ""
"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
"设置为您项目所用的字符编码。\n"
-#: commit-graph.c:130
+#: commit-graph.c:122
msgid "commit-graph file is too small"
msgstr "提交图形文件太小"
-#: commit-graph.c:195
+#: commit-graph.c:189
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr "提交图形签名 %X 和签名 %X 不匹配"
-#: commit-graph.c:202
+#: commit-graph.c:196
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "提交图形版本 %X 和版本 %X 不匹配"
-#: commit-graph.c:209
+#: commit-graph.c:203
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
-#: commit-graph.c:232
+#: commit-graph.c:226
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr "提交图形块查找表条目丢失,文件可能不完整"
-#: commit-graph.c:243
+#: commit-graph.c:237
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr "提交图形不正确的块偏移 %08x%08x"
-#: commit-graph.c:286
+#: commit-graph.c:280
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr "提交图形块 id %08x 出现了多次"
-#: commit-graph.c:350
+#: commit-graph.c:343
msgid "commit-graph has no base graphs chunk"
msgstr "提交图形没有基础图形块"
-#: commit-graph.c:360
+#: commit-graph.c:353
msgid "commit-graph chain does not match"
msgstr "提交图形链不匹配"
-#: commit-graph.c:407
+#: commit-graph.c:401
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr "无效的提交图形链:行 '%s' 不是一个哈希值"
-#: commit-graph.c:433
+#: commit-graph.c:425
msgid "unable to find all commit-graph files"
msgstr "无法找到所有提交图形文件"
-#: commit-graph.c:564 commit-graph.c:624
+#: commit-graph.c:558 commit-graph.c:618
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "无效的提交位置。提交图形可能已损坏"
-#: commit-graph.c:585
+#: commit-graph.c:579
#, c-format
msgid "could not find commit %s"
msgstr "无法找到提交 %s"
-#: commit-graph.c:858 builtin/am.c:1287
+#: commit-graph.c:852 builtin/am.c:1292
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: commit-graph.c:1017 builtin/pack-objects.c:2641
+#: commit-graph.c:1011 builtin/pack-objects.c:2782
#, c-format
msgid "unable to get type of object %s"
msgstr "无法获得对象 %s 类型"
-#: commit-graph.c:1049
+#: commit-graph.c:1043
msgid "Loading known commits in commit graph"
msgstr "正在加载提交图中的已知提交"
-#: commit-graph.c:1066
+#: commit-graph.c:1060
msgid "Expanding reachable commits in commit graph"
msgstr "正在扩展提交图中的可达提交"
-#: commit-graph.c:1085
+#: commit-graph.c:1079
msgid "Clearing commit marks in commit graph"
msgstr "正在清除提交图中的提交标记"
-#: commit-graph.c:1104
+#: commit-graph.c:1098
msgid "Computing commit graph generation numbers"
msgstr "正在计算提交图世代数字"
-#: commit-graph.c:1179
+#: commit-graph.c:1173
#, 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:1192
+#: commit-graph.c:1186
#, c-format
msgid "error adding pack %s"
msgstr "添加包 %s 出错"
-#: commit-graph.c:1196
+#: commit-graph.c:1190
#, c-format
msgid "error opening index for %s"
msgstr "为 %s 打开索引出错"
-#: commit-graph.c:1220
+#: commit-graph.c:1214
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] "正在从 %d 个引用中查找提交图的提交"
msgstr[1] "正在从 %d 个引用中查找提交图的提交"
-#: commit-graph.c:1240
+#: commit-graph.c:1234
#, c-format
msgid "invalid commit object id: %s"
msgstr "无效的提交对象 ID:%s"
-#: commit-graph.c:1255
+#: commit-graph.c:1249
msgid "Finding commits for commit graph among packed objects"
msgstr "正在打包对象中查找提交图的提交"
-#: commit-graph.c:1270
+#: commit-graph.c:1264
msgid "Counting distinct commits in commit graph"
msgstr "正在计算提交图中不同的提交"
-#: commit-graph.c:1300
+#: commit-graph.c:1294
msgid "Finding extra edges in commit graph"
msgstr "正在查找提交图中额外的边"
-#: commit-graph.c:1346
+#: commit-graph.c:1340
msgid "failed to write correct number of base graph ids"
msgstr "无法写入正确数量的基础图形 ID"
-#: commit-graph.c:1379 midx.c:814
+#: commit-graph.c:1373 midx.c:814
#, c-format
msgid "unable to create leading directories of %s"
msgstr "不能为 %s 创建先导目录"
-#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248
+#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
#, c-format
msgid "unable to create '%s'"
msgstr "不能创建 '%s'"
-#: commit-graph.c:1451
+#: commit-graph.c:1445
#, 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:1492
+#: commit-graph.c:1486
msgid "unable to open commit-graph chain file"
msgstr "无法打开提交图形链文件"
-#: commit-graph.c:1504
+#: commit-graph.c:1498
msgid "failed to rename base commit-graph file"
msgstr "无法重命名基础提交图形文件"
-#: commit-graph.c:1524
+#: commit-graph.c:1518
msgid "failed to rename temporary commit-graph file"
msgstr "无法重命名临时提交图形文件"
-#: commit-graph.c:1635
+#: commit-graph.c:1631
msgid "Scanning merged commits"
msgstr "正在扫描合并提交"
-#: commit-graph.c:1646
+#: commit-graph.c:1642
#, c-format
msgid "unexpected duplicate commit id %s"
msgstr "意外的重复提交 ID %s"
-#: commit-graph.c:1670
+#: commit-graph.c:1665
msgid "Merging commit-graph"
msgstr "正在合并提交图形"
-#: commit-graph.c:1860
+#: commit-graph.c:1844
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr "提交图格式不能写入 %d 个提交"
-#: commit-graph.c:1871
+#: commit-graph.c:1855
msgid "too many commits to write graph"
msgstr "提交太多不能画图"
-#: commit-graph.c:1961
+#: commit-graph.c:1944
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "提交图文件的校验码错误,可能已经损坏"
-#: commit-graph.c:1971
+#: commit-graph.c:1954
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s"
-#: commit-graph.c:1981 commit-graph.c:1996
+#: commit-graph.c:1964 commit-graph.c:1979
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u"
-#: commit-graph.c:1988
+#: commit-graph.c:1971
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "无法从提交图形中解析提交 %s"
-#: commit-graph.c:2006
+#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr "正在校验提交图中的提交"
-#: commit-graph.c:2020
+#: commit-graph.c:2003
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr "无法从提交图形的对象库中解析提交 %s"
-#: commit-graph.c:2027
+#: commit-graph.c:2010
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
-#: commit-graph.c:2037
+#: commit-graph.c:2020
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "提交 %s 的提交图形父提交列表太长了"
-#: commit-graph.c:2046
+#: commit-graph.c:2029
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "%s 的提交图形父提交是 %s != %s"
-#: commit-graph.c:2059
+#: commit-graph.c:2042
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "提交 %s 的提交图形父提交列表过早终止"
-#: commit-graph.c:2064
+#: commit-graph.c:2047
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零"
-#: commit-graph.c:2068
+#: commit-graph.c:2051
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零"
-#: commit-graph.c:2083
+#: commit-graph.c:2066
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
-#: commit-graph.c:2089
+#: commit-graph.c:2072
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
@@ -2208,7 +2454,7 @@ msgstr "键名没有包含一个小节名称:%s"
msgid "key does not contain variable name: %s"
msgstr "键名没有包含变量名:%s"
-#: config.c:406 sequencer.c:2530
+#: config.c:406 sequencer.c:2444
#, c-format
msgid "invalid key: %s"
msgstr "无效键名:%s"
@@ -2344,7 +2590,7 @@ msgstr "%s 的取值格式错误:%s"
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current"
-#: config.c:1518 builtin/pack-objects.c:3394
+#: config.c:1518 builtin/pack-objects.c:3541
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
@@ -2369,105 +2615,105 @@ msgstr "不能解析配置对象 '%s'"
msgid "failed to parse %s"
msgstr "解析 %s 失败"
-#: config.c:1745
+#: config.c:1743
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
-#: config.c:2096
+#: config.c:2097
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
-#: config.c:2266
+#: config.c:2267
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s:'%s'"
-#: config.c:2311
+#: config.c:2312
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
-#: config.c:2357
+#: config.c:2358
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
-#: config.c:2359
+#: config.c:2360
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: config.c:2440
+#: config.c:2441
#, c-format
msgid "invalid section name '%s'"
msgstr "无效的小节名称 '%s'"
-#: config.c:2472
+#: config.c:2473
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
-#: config.c:2501
+#: config.c:2502
#, c-format
msgid "failed to write new configuration file %s"
msgstr "写入新的配置文件 %s 失败"
-#: config.c:2753 config.c:3077
+#: config.c:2754 config.c:3078
#, c-format
msgid "could not lock config file %s"
msgstr "不能锁定配置文件 %s"
-#: config.c:2764
+#: config.c:2765
#, c-format
msgid "opening %s"
msgstr "打开 %s"
-#: config.c:2799 builtin/config.c:328
+#: config.c:2800 builtin/config.c:344
#, c-format
msgid "invalid pattern: %s"
msgstr "无效模式:%s"
-#: config.c:2824
+#: config.c:2825
#, c-format
msgid "invalid config file %s"
msgstr "无效的配置文件 %s"
-#: config.c:2837 config.c:3090
+#: config.c:2838 config.c:3091
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
-#: config.c:2848
+#: config.c:2849
#, c-format
msgid "unable to mmap '%s'"
msgstr "不能 mmap '%s'"
-#: config.c:2857 config.c:3095
+#: config.c:2858 config.c:3096
#, c-format
msgid "chmod on %s failed"
msgstr "对 %s 调用 chmod 失败"
-#: config.c:2942 config.c:3192
+#: config.c:2943 config.c:3193
#, c-format
msgid "could not write config file %s"
msgstr "不能写入配置文件 %s"
-#: config.c:2976
+#: config.c:2977
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
-#: config.c:2978 builtin/remote.c:781
+#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
-#: config.c:3068
+#: config.c:3069
#, c-format
msgid "invalid section name: %s"
msgstr "无效的小节名称:%s"
-#: config.c:3235
+#: config.c:3236
#, c-format
msgid "missing value for '%s'"
msgstr "%s 的取值缺失"
@@ -2630,19 +2876,19 @@ msgstr "已阻止奇怪的路径名 '%s'"
msgid "unable to fork"
msgstr "无法 fork"
-#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "正在检查连通性"
-#: connected.c:101
+#: connected.c:110
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"
-#: connected.c:121
+#: connected.c:130
msgid "failed write to rev-list"
msgstr "写入 rev-list 失败"
-#: connected.c:128
+#: connected.c:137
msgid "failed to close rev-list's stdin"
msgstr "关闭 rev-list 的标准输入失败"
@@ -2689,7 +2935,8 @@ msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
"working-tree-encoding."
-msgstr "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%.*s 作为工作区编码。"
+msgstr ""
+"文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%.*s 作为工作区编码。"
#: convert.c:304
#, c-format
@@ -2952,7 +3199,7 @@ msgid "invalid --stat value: %s"
msgstr "无效的 --stat 值:%s"
#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
-#: parse-options.c:199 parse-options.c:203
+#: parse-options.c:197 parse-options.c:201
#, c-format
msgid "%s expects a numerical value"
msgstr "%s 期望一个数字值"
@@ -3456,59 +3703,59 @@ msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
-#: dir.c:554
+#: dir.c:555
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
-#: dir.c:664
+#: dir.c:695 dir.c:724 dir.c:737
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "未识别的模式:'%s'"
-#: dir.c:682 dir.c:696
+#: dir.c:754 dir.c:768
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "未识别的反向模式:'%s'"
-#: dir.c:714
+#: dir.c:786
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr "您的 sparse-checkout 文件可能有问题:重复的模式 '%s'"
-#: dir.c:724
+#: dir.c:796
msgid "disabling cone pattern matching"
msgstr "禁止 cone 模式匹配"
-#: dir.c:1101
+#: dir.c:1173
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "不能将 %s 用作排除文件"
-#: dir.c:2078
+#: dir.c:2144
#, c-format
msgid "could not open directory '%s'"
msgstr "不能打开目录 '%s'"
-#: dir.c:2415
+#: dir.c:2479
msgid "failed to get kernel name and information"
msgstr "无法获得内核名称和信息"
-#: dir.c:2539
+#: dir.c:2603
msgid "untracked cache is disabled on this system or location"
msgstr "缓存未跟踪文件在本系统或位置中被禁用"
-#: dir.c:3343
+#: dir.c:3407
#, c-format
msgid "index file corrupt in repo %s"
msgstr "仓库 %s 中的索引文件损坏"
-#: dir.c:3388 dir.c:3393
+#: dir.c:3452 dir.c:3457
#, c-format
msgid "could not create directories for %s"
msgstr "不能为 %s 创建目录"
-#: dir.c:3422
+#: dir.c:3486
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
@@ -3753,7 +4000,7 @@ msgstr "处理要获取的引用出错:%d"
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
-#: fetch-pack.c:1785 builtin/clone.c:688
+#: fetch-pack.c:1785 builtin/clone.c:689
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必需的对象"
@@ -3767,19 +4014,19 @@ msgstr "没有这样的远程引用 %s"
msgid "Server does not allow request for unadvertised object %s"
msgstr "服务器不允许请求未公开的对象 %s"
-#: gpg-interface.c:223
+#: gpg-interface.c:408
+msgid "gpg failed to sign the data"
+msgstr "gpg 无法为数据签名"
+
+#: gpg-interface.c:434
msgid "could not create temporary file"
msgstr "不能创建临时文件"
-#: gpg-interface.c:226
+#: gpg-interface.c:437
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "无法将分离式签名写入 '%s'"
-#: gpg-interface.c:390
-msgid "gpg failed to sign the data"
-msgstr "gpg 无法为数据签名"
-
#: graph.c:98
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
@@ -3793,18 +4040,18 @@ msgstr ""
"给定的模式包含 NULL 字符(通过 -f <文件> 参数)。只有 PCRE v2 下的 -P 支持此"
"功能"
-#: grep.c:2124
+#: grep.c:2128
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s':无法读取 %s"
-#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "对 '%s' 调用 stat 失败"
-#: grep.c:2152
+#: grep.c:2156
#, c-format
msgid "'%s': short read"
msgstr "'%s':读取不完整"
@@ -4018,7 +4265,7 @@ msgstr "不允许空的姓名(对于 <%s>)"
msgid "name consists only of disallowed characters: %s"
msgstr "姓名中仅包含禁用字符:%s"
-#: ident.c:436 builtin/commit.c:631
+#: ident.c:436 builtin/commit.c:635
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格式:%s"
@@ -4101,110 +4348,110 @@ msgstr "不能创建 '%s.lock':%s"
msgid "failed to read the cache"
msgstr "读取缓存失败"
-#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
-#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809
-#: builtin/stash.c:264
+#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
+#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
+#: builtin/stash.c:265
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
-#: merge-recursive.c:367
+#: merge-recursive.c:356
msgid "(bad commit)\n"
msgstr "(坏提交)\n"
-#: merge-recursive.c:390
+#: merge-recursive.c:379
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。"
-#: merge-recursive.c:399
+#: merge-recursive.c:388
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。"
-#: merge-recursive.c:885
+#: merge-recursive.c:874
#, c-format
msgid "failed to create path '%s'%s"
msgstr "创建路径 '%s'%s 失败"
-#: merge-recursive.c:896
+#: merge-recursive.c:885
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为子目录留出空间\n"
-#: merge-recursive.c:910 merge-recursive.c:929
+#: merge-recursive.c:899 merge-recursive.c:918
msgid ": perhaps a D/F conflict?"
msgstr ":可能是一个目录/文件冲突?"
-#: merge-recursive.c:919
+#: merge-recursive.c:908
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
-#: merge-recursive.c:960 builtin/cat-file.c:41
+#: merge-recursive.c:949 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能读取对象 %s '%s'"
-#: merge-recursive.c:965
+#: merge-recursive.c:954
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据对象"
-#: merge-recursive.c:990
+#: merge-recursive.c:979
#, c-format
msgid "failed to open '%s': %s"
msgstr "打开 '%s' 失败:%s"
-#: merge-recursive.c:1001
+#: merge-recursive.c:990
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "创建符号链接 '%s' 失败:%s"
-#: merge-recursive.c:1006
+#: merge-recursive.c:995
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"
-#: merge-recursive.c:1199
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "无法合并子模组 %s (没有检出)"
-#: merge-recursive.c:1206
+#: merge-recursive.c:1198
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "无法合并子模组 %s(提交不存在)"
-#: merge-recursive.c:1213
+#: merge-recursive.c:1205
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "无法合并子模组 %s (提交未跟随合并基线)"
-#: merge-recursive.c:1221 merge-recursive.c:1233
+#: merge-recursive.c:1213 merge-recursive.c:1225
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "子模组 %s 快进到如下提交:"
-#: merge-recursive.c:1224 merge-recursive.c:1236
+#: merge-recursive.c:1216 merge-recursive.c:1228
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "快进子模组 %s"
-#: merge-recursive.c:1259
+#: merge-recursive.c:1251
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr "无法合并子模组 %s (没发现合并跟随的提交)"
-#: merge-recursive.c:1263
+#: merge-recursive.c:1255
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "无法合并子模组 %s(非快进)"
-#: merge-recursive.c:1264
+#: merge-recursive.c:1256
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "找到子模组的一个可能的合并方案:\n"
-#: merge-recursive.c:1267
+#: merge-recursive.c:1259
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4220,31 +4467,31 @@ msgstr ""
"\n"
"以接受此建议。\n"
-#: merge-recursive.c:1276
+#: merge-recursive.c:1268
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "无法合并子模组 %s (发现多个合并)"
-#: merge-recursive.c:1349
+#: merge-recursive.c:1341
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"
-#: merge-recursive.c:1354
+#: merge-recursive.c:1346
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
-#: merge-recursive.c:1386
+#: merge-recursive.c:1378
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
-#: merge-recursive.c:1410
+#: merge-recursive.c:1402
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。"
-#: merge-recursive.c:1482
+#: merge-recursive.c:1474
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4253,7 +4500,7 @@ msgstr ""
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本被保留。"
-#: merge-recursive.c:1487
+#: merge-recursive.c:1479
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4262,7 +4509,7 @@ msgstr ""
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本被保留。"
-#: merge-recursive.c:1494
+#: merge-recursive.c:1486
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4271,7 +4518,7 @@ msgstr ""
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本保留在 %8$s 中。"
-#: merge-recursive.c:1499
+#: merge-recursive.c:1491
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4280,40 +4527,40 @@ msgstr ""
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本保留在 %9$s 中。"
-#: merge-recursive.c:1534
+#: merge-recursive.c:1526
msgid "rename"
msgstr "重命名"
-#: merge-recursive.c:1534
+#: merge-recursive.c:1526
msgid "renamed"
msgstr "重命名"
-#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175
+#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "拒绝丢失脏文件 '%s'"
-#: merge-recursive.c:1624
+#: merge-recursive.c:1587
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。"
-#: merge-recursive.c:1682
+#: merge-recursive.c:1645
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
-#: merge-recursive.c:1713
+#: merge-recursive.c:1676
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: merge-recursive.c:1718
+#: merge-recursive.c:1681
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1708
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -4322,18 +4569,18 @@ msgstr ""
"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1742
+#: merge-recursive.c:1713
msgid " (left unresolved)"
msgstr "(留下未解决)"
-#: merge-recursive.c:1851
+#: merge-recursive.c:1793
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
"%5$s"
-#: merge-recursive.c:2114
+#: merge-recursive.c:2056
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4343,7 +4590,7 @@ msgstr ""
"冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个"
"其它目录,没有目录包含大部分文件。"
-#: merge-recursive.c:2146
+#: merge-recursive.c:2088
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4352,7 +4599,7 @@ msgstr ""
"冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放"
"在:%s。"
-#: merge-recursive.c:2156
+#: merge-recursive.c:2098
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4361,7 +4608,7 @@ msgstr ""
"冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路"
"径放置于此:%s"
-#: merge-recursive.c:2248
+#: merge-recursive.c:2190
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4370,59 +4617,59 @@ msgstr ""
"冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 "
"%4$s->%5$s"
-#: merge-recursive.c:2493
+#: merge-recursive.c:2435
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。"
-#: merge-recursive.c:3019
+#: merge-recursive.c:2961
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
-#: merge-recursive.c:3022
+#: merge-recursive.c:2964
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据对象"
-#: merge-recursive.c:3086
+#: merge-recursive.c:3028
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:3086
+#: merge-recursive.c:3028
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:3098
+#: merge-recursive.c:3040
msgid "content"
msgstr "内容"
-#: merge-recursive.c:3102
+#: merge-recursive.c:3044
msgid "add/add"
msgstr "添加/添加"
-#: merge-recursive.c:3125
+#: merge-recursive.c:3067
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s(已经做过相同合并)"
-#: merge-recursive.c:3147 git-submodule.sh:993
+#: merge-recursive.c:3089 git-submodule.sh:1003
msgid "submodule"
msgstr "子模组"
-#: merge-recursive.c:3148
+#: merge-recursive.c:3090
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突(%s):合并冲突于 %s"
-#: merge-recursive.c:3178
+#: merge-recursive.c:3120
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
-#: merge-recursive.c:3261
+#: merge-recursive.c:3203
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4430,7 +4677,7 @@ msgid ""
msgstr ""
"路径已更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。"
-#: merge-recursive.c:3264
+#: merge-recursive.c:3206
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4439,7 +4686,7 @@ msgstr ""
"冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动"
"到 %s。"
-#: merge-recursive.c:3268
+#: merge-recursive.c:3210
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4448,7 +4695,7 @@ msgstr ""
"路径已更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移"
"动到 %5$s。"
-#: merge-recursive.c:3271
+#: merge-recursive.c:3213
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4457,59 +4704,59 @@ msgstr ""
"冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,"
"建议将其移动到 %5$s。"
-#: merge-recursive.c:3385
+#: merge-recursive.c:3327
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: merge-recursive.c:3408
+#: merge-recursive.c:3350
msgid "file/directory"
msgstr "文件/目录"
-#: merge-recursive.c:3413
+#: merge-recursive.c:3355
msgid "directory/file"
msgstr "目录/文件"
-#: merge-recursive.c:3420
+#: merge-recursive.c:3362
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
-#: merge-recursive.c:3429
+#: merge-recursive.c:3371
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:3438
+#: merge-recursive.c:3380
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "冲突(add/add):合并冲突于 %s"
-#: merge-recursive.c:3482
+#: merge-recursive.c:3424
msgid "Already up to date!"
msgstr "已经是最新的!"
-#: merge-recursive.c:3491
+#: merge-recursive.c:3433
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
-#: merge-recursive.c:3595
+#: merge-recursive.c:3537
msgid "Merging:"
msgstr "合并:"
-#: merge-recursive.c:3608
+#: merge-recursive.c:3550
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先:"
msgstr[1] "发现 %u 个共同祖先:"
-#: merge-recursive.c:3658
+#: merge-recursive.c:3600
msgid "merge returned no commit"
msgstr "合并未返回提交"
-#: merge-recursive.c:3717
+#: merge-recursive.c:3659
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4518,12 +4765,12 @@ msgstr ""
"您对下列文件的本地修改将被合并操作覆盖:\n"
" %s"
-#: merge-recursive.c:3814
+#: merge-recursive.c:3756
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874
+#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
msgid "Unable to write index."
msgstr "不能写入索引。"
@@ -4754,25 +5001,30 @@ msgstr "对象 %s 有未知的类型 id %d"
msgid "unable to parse object: %s"
msgstr "不能解析对象:%s"
-#: object.c:266 object.c:277
+#: object.c:266 object.c:278
#, c-format
msgid "hash mismatch %s"
msgstr "哈希值与 %s 不匹配"
-#: packfile.c:641
+#: packfile.c:629
msgid "offset before end of packfile (broken .idx?)"
msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
-#: packfile.c:1888
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
-#: packfile.c:1892
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
+#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#, c-format
+msgid "unable to get size of %s"
+msgstr "不能得到 %s 的大小"
+
#: parse-options.c:38
#, c-format
msgid "%s requires a value"
@@ -4788,7 +5040,7 @@ msgstr "%s 与 %s 不兼容"
msgid "%s : incompatible with something else"
msgstr "%s:和其它的不兼容"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
#, c-format
msgid "%s takes no value"
msgstr "%s 不取值"
@@ -4798,41 +5050,41 @@ msgstr "%s 不取值"
msgid "%s isn't available"
msgstr "%s 不可用"
-#: parse-options.c:219
+#: parse-options.c:217
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
-#: parse-options.c:389
+#: parse-options.c:386
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)"
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
#, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
-msgstr "你的意思是 `--%s`(有两个短线?)"
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "你的意思是 `--%s`(有两个短线)?"
-#: parse-options.c:860
+#: parse-options.c:857
#, c-format
msgid "unknown option `%s'"
msgstr "未知选项 `%s'"
-#: parse-options.c:862
+#: parse-options.c:859
#, c-format
msgid "unknown switch `%c'"
msgstr "未知开关 `%c'"
-#: parse-options.c:864
+#: parse-options.c:861
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "字符串中未知的非 ascii 字符选项:`%s'"
-#: parse-options.c:888
+#: parse-options.c:885
msgid "..."
msgstr "..."
-#: parse-options.c:907
+#: parse-options.c:904
#, c-format
msgid "usage: %s"
msgstr "用法:%s"
@@ -4840,22 +5092,22 @@ msgstr "用法:%s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:913
+#: parse-options.c:910
#, c-format
msgid " or: %s"
msgstr " 或:%s"
# 译者:为保证在输出中对齐,注意调整句中空格!
-#: parse-options.c:916
+#: parse-options.c:913
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:955
+#: parse-options.c:952
msgid "-NUM"
msgstr "-数字"
-#: parse-options.c:969
+#: parse-options.c:966
#, c-format
msgid "alias of --%s"
msgstr "--%s 的别名"
@@ -4938,25 +5190,25 @@ msgstr "%s:'literal' 和 'glob' 不兼容"
#: pathspec.c:442
#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s:'%s' 在仓库之外"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s:'%s' 在仓库('%s' 中)之外"
-#: pathspec.c:516
+#: pathspec.c:517
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s'(助记符:'%c')"
-#: pathspec.c:526
+#: pathspec.c:527
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
-#: pathspec.c:593
+#: pathspec.c:594
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路径规格 '%s' 位于符号链接中"
-#: pathspec.c:638
+#: pathspec.c:639
#, c-format
msgid "line is badly quoted: %s"
msgstr "行被错误地引用:%s"
@@ -5042,7 +5294,7 @@ msgstr "不能启动 `log`"
msgid "could not read `log` output"
msgstr "不能读取 `log` 的输出"
-#: range-diff.c:96 sequencer.c:5163
+#: range-diff.c:96 sequencer.c:5020
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
@@ -5095,16 +5347,16 @@ msgstr "无法在索引中添加 '%s'"
msgid "unable to stat '%s'"
msgstr "无法对 %s 执行 stat"
-#: read-cache.c:1325
+#: read-cache.c:1330
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' 看起来既是文件又是目录"
-#: read-cache.c:1531
+#: read-cache.c:1536
msgid "Refresh index"
msgstr "刷新索引"
-#: read-cache.c:1646
+#: read-cache.c:1651
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -5113,7 +5365,7 @@ msgstr ""
"设置了 index.version,但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1656
+#: read-cache.c:1661
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -5122,150 +5374,160 @@ msgstr ""
"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1712
+#: read-cache.c:1717
#, c-format
msgid "bad signature 0x%08x"
msgstr "坏的签名 0x%08x"
-#: read-cache.c:1715
+#: read-cache.c:1720
#, c-format
msgid "bad index version %d"
msgstr "坏的索引版本 %d"
-#: read-cache.c:1724
+#: read-cache.c:1729
msgid "bad index file sha1 signature"
msgstr "坏的索引文件 sha1 签名"
-#: read-cache.c:1754
+#: read-cache.c:1759
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "索引使用不被支持的 %.4s 扩展"
#
-#: read-cache.c:1756
+#: read-cache.c:1761
#, c-format
msgid "ignoring %.4s extension"
msgstr "忽略 %.4s 扩展"
-#: read-cache.c:1793
+#: read-cache.c:1798
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "未知的索引条目格式 0x%08x"
-#: read-cache.c:1809
+#: read-cache.c:1814
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "索引中靠近路径 '%s' 有错误的名称字段"
-#: read-cache.c:1866
+#: read-cache.c:1871
msgid "unordered stage entries in index"
msgstr "索引中有未排序的暂存条目"
-#: read-cache.c:1869
+#: read-cache.c:1874
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "合并文件 '%s' 有多个暂存条目"
-#: read-cache.c:1872
+#: read-cache.c:1877
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "'%s' 的未排序暂存条目"
-#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470
-#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332
+#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
+#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
+#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
+#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
+#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/submodule--helper.c:332
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: read-cache.c:2119
+#: read-cache.c:2124
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "无法创建 load_cache_entries 线程:%s"
-#: read-cache.c:2132
+#: read-cache.c:2137
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "无法加入 load_cache_entries 线程:%s"
-#: read-cache.c:2165
+#: read-cache.c:2170
#, c-format
msgid "%s: index file open failed"
msgstr "%s:打开索引文件失败"
-#: read-cache.c:2169
+#: read-cache.c:2174
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s:不能对打开的索引执行 stat 操作"
-#: read-cache.c:2173
+#: read-cache.c:2178
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s:索引文件比预期的小"
-#: read-cache.c:2177
+#: read-cache.c:2182
#, c-format
msgid "%s: unable to map index file"
msgstr "%s:无法对索引文件执行 map 操作"
-#: read-cache.c:2219
+#: read-cache.c:2224
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "无法创建 load_index_extensions 线程:%s"
-#: read-cache.c:2246
+#: read-cache.c:2251
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "无法加入 load_index_extensions 线程:%s"
-#: read-cache.c:2278
+#: read-cache.c:2283
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "无法刷新共享索引 '%s'"
-#: read-cache.c:2325
+#: read-cache.c:2330
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s"
-#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119
+#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
-#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069
+#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
#, c-format
msgid "could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: read-cache.c:3137
+#: read-cache.c:3142
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能打开 git 目录:%s"
-#: read-cache.c:3149
+#: read-cache.c:3154
#, c-format
msgid "unable to unlink: %s"
msgstr "无法删除:%s"
-#: read-cache.c:3174
+#: read-cache.c:3179
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "不能修复 '%s' 的权限位"
-#: read-cache.c:3323
+#: read-cache.c:3328
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s:不能落到暂存区 #0"
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
+"或者您可以用 'git rebase --abort' 终止变基。\n"
+
+#: rebase-interactive.c:33
#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
msgid ""
"\n"
"Commands:\n"
@@ -5305,14 +5567,14 @@ msgstr ""
"\n"
"可以对这些行重新排序,将从上至下执行。\n"
-#: rebase-interactive.c:56
+#: rebase-interactive.c:63
#, c-format
msgid "Rebase %s onto %s (%d command)"
msgid_plural "Rebase %s onto %s (%d commands)"
msgstr[0] "变基 %s 到 %s(%d 个提交)"
msgstr[1] "变基 %s 到 %s(%d 个提交)"
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -5320,7 +5582,7 @@ msgstr ""
"\n"
"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -5328,7 +5590,7 @@ msgstr ""
"\n"
"如果您在这里删除一行,对应的提交将会丢失。\n"
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -5342,7 +5604,7 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -5352,22 +5614,19 @@ msgstr ""
"然而,如果您删除全部内容,变基操作将会终止。\n"
"\n"
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "注意空提交已被注释掉"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536
-#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
+#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
#, c-format
msgid "could not write '%s'"
msgstr "不能写入 '%s'"
-#: rebase-interactive.c:108
+#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
+#: builtin/rebase.c:234
#, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "不能拷贝 '%s' 至 '%s'。"
+msgid "could not write '%s'."
+msgstr "不能写入 '%s'。"
-#: rebase-interactive.c:173
+#: rebase-interactive.c:193
#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
@@ -5376,7 +5635,7 @@ msgstr ""
"警告:一些提交可能被意外丢弃。\n"
"丢弃的提交(从新到旧):\n"
-#: rebase-interactive.c:180
+#: rebase-interactive.c:200
#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -5392,6 +5651,13 @@ msgstr ""
"可选值有:ignore、warn、error。\n"
"\n"
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
+#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
+#: builtin/rebase.c:246
+#, c-format
+msgid "could not read '%s'."
+msgstr "不能读取 '%s'。"
+
#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
@@ -5427,15 +5693,15 @@ msgstr "引用 '%s' 已经存在"
msgid "unexpected object ID when writing '%s'"
msgstr "写入 '%s' 时意外的对象 ID"
-#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997
-#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142
+#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
+#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
#: wrapper.c:620
#, c-format
msgid "could not write to '%s'"
msgstr "不能写入 '%s'"
-#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714
-#: builtin/rebase.c:1031
+#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:1029
#, c-format
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
@@ -5489,18 +5755,18 @@ msgstr "'%s' 已存在,无法创建 '%s'"
msgid "cannot process '%s' and '%s' at the same time"
msgstr "无法同时处理 '%s' 和 '%s'"
-#: refs/files-backend.c:1234
+#: refs/files-backend.c:1233
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
-#: refs/files-backend.c:1248 refs/packed-backend.c:1541
+#: refs/files-backend.c:1247 refs/packed-backend.c:1541
#: refs/packed-backend.c:1551
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s:%s"
-#: refs/files-backend.c:1251 refs/packed-backend.c:1554
+#: refs/files-backend.c:1250 refs/packed-backend.c:1554
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用:%s"
@@ -5764,45 +6030,45 @@ msgstr "选项 `%s' 必须指向一个提交"
msgid "config remote shorthand cannot begin with '/': %s"
msgstr "配置的远程短名称不能以 '/' 开始:%s"
-#: remote.c:413
+#: remote.c:414
msgid "more than one receivepack given, using the first"
msgstr "提供了一个以上的 receivepack,使用第一个"
-#: remote.c:421
+#: remote.c:422
msgid "more than one uploadpack given, using the first"
msgstr "提供了一个以上的 uploadpack,使用第一个"
-#: remote.c:611
+#: remote.c:612
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同时获取 %s 和 %s 至 %s"
-#: remote.c:615
+#: remote.c:616
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常跟踪 %s,而非 %s"
-#: remote.c:619
+#: remote.c:620
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同时跟踪 %s 和 %s"
-#: remote.c:687
+#: remote.c:688
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "模式的键 '%s' 没有 '*'"
-#: remote.c:697
+#: remote.c:698
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "模式的值 '%s' 没有 '*'"
-#: remote.c:1003
+#: remote.c:1004
#, c-format
msgid "src refspec %s does not match any"
msgstr "源引用表达式 %s 没有匹配"
-#: remote.c:1008
+#: remote.c:1009
#, c-format
msgid "src refspec %s matches more than one"
msgstr "源引用表达式 %s 匹配超过一个"
@@ -5811,7 +6077,7 @@ msgstr "源引用表达式 %s 匹配超过一个"
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1023
+#: remote.c:1024
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -5833,7 +6099,7 @@ msgstr ""
"\n"
"都不行,所以我们已放弃。您必须给出完整的引用。"
-#: remote.c:1043
+#: remote.c:1044
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -5843,7 +6109,7 @@ msgstr ""
"引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
"'%s:refs/heads/%s' 推送么?"
-#: remote.c:1048
+#: remote.c:1049
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -5853,7 +6119,7 @@ msgstr ""
"引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
"'%s:refs/tags/%s' 推送么?"
-#: remote.c:1053
+#: remote.c:1054
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -5863,7 +6129,7 @@ msgstr ""
"引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
"'%s:refs/tags/%s' 推送么?"
-#: remote.c:1058
+#: remote.c:1059
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -5873,114 +6139,114 @@ msgstr ""
"引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
"'%s:refs/tags/%s' 推送么?"
-#: remote.c:1094
+#: remote.c:1095
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s 无法被解析为分支"
-#: remote.c:1105
+#: remote.c:1106
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "无法删除 '%s':远程引用不存在"
-#: remote.c:1117
+#: remote.c:1118
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "目标引用表达式 %s 匹配超过一个"
-#: remote.c:1124
+#: remote.c:1125
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "目标引用 %s 接收超过一个源"
-#: remote.c:1627 remote.c:1728
+#: remote.c:1628 remote.c:1729
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
-#: remote.c:1636
+#: remote.c:1637
#, c-format
msgid "no such branch: '%s'"
msgstr "没有此分支:'%s'"
-#: remote.c:1639
+#: remote.c:1640
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
-#: remote.c:1645
+#: remote.c:1646
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: remote.c:1660
+#: remote.c:1661
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
-#: remote.c:1672
+#: remote.c:1673
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 没有设置要推送的远程服务器"
-#: remote.c:1682
+#: remote.c:1683
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用规格未包含 '%s'"
-#: remote.c:1695
+#: remote.c:1696
msgid "push has no destination (push.default is 'nothing')"
msgstr "推送无目标(push.default 是 'nothing')"
-#: remote.c:1717
+#: remote.c:1718
msgid "cannot resolve 'simple' push to a single destination"
msgstr "无法解析 'simple' 推送至一个单独的目标"
-#: remote.c:1843
+#: remote.c:1844
#, c-format
msgid "couldn't find remote ref %s"
msgstr "无法找到远程引用 %s"
-#: remote.c:1856
+#: remote.c:1857
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* 在本地忽略可笑的引用 '%s'"
-#: remote.c:2019
+#: remote.c:2020
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
-#: remote.c:2023
+#: remote.c:2024
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
-#: remote.c:2026
+#: remote.c:2027
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: remote.c:2030
+#: remote.c:2031
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "您的分支和 '%s' 指向不同的提交。\n"
-#: remote.c:2033
+#: remote.c:2034
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (使用 \"%s\" 查看详情)\n"
-#: remote.c:2037
+#: remote.c:2038
#, 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:2043
+#: remote.c:2044
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
-#: remote.c:2046
+#: remote.c:2047
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -5989,11 +6255,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
# 译者:注意保持前导空格
-#: remote.c:2054
+#: remote.c:2055
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
-#: remote.c:2057
+#: remote.c:2058
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6009,11 +6275,11 @@ msgstr[1] ""
"并且分别有 %d 和 %d 处不同的提交。\n"
# 译者:注意保持前导空格
-#: remote.c:2067
+#: remote.c:2068
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (使用 \"git pull\" 来合并远程分支)\n"
-#: remote.c:2250
+#: remote.c:2251
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "无法解析期望的对象名 '%s'"
@@ -6028,7 +6294,7 @@ msgstr "错误的替换引用名称:%s"
msgid "duplicate replace ref: %s"
msgstr "重复的替换引用:%s"
-#: replace-object.c:73
+#: replace-object.c:82
#, c-format
msgid "replace depth too high for object %s"
msgstr "对象 %s 的替换层级太深"
@@ -6091,8 +6357,8 @@ msgstr "不能删除 stray '%s'"
msgid "Recorded preimage for '%s'"
msgstr "为 '%s' 记录 preimage"
-#: rerere.c:881 submodule.c:2067 builtin/log.c:1871
-#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
#, c-format
msgid "could not create directory '%s'"
msgstr "不能创建目录 '%s'"
@@ -6143,16 +6409,16 @@ msgstr "--first-parent 与 --bisect 不兼容"
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
-#: run-command.c:762
+#: run-command.c:763
msgid "open /dev/null failed"
msgstr "不能打开 /dev/null"
-#: run-command.c:1268
+#: run-command.c:1269
#, c-format
msgid "cannot create async thread: %s"
msgstr "不能创建 async 线程:%s"
-#: run-command.c:1332
+#: run-command.c:1333
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -6197,39 +6463,39 @@ msgstr "接收端不支持原子推送"
msgid "the receiving end does not support push options"
msgstr "接收端不支持推送选项"
-#: sequencer.c:189
+#: sequencer.c:191
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "无效的提交信息清理模式 '%s'"
-#: sequencer.c:294
+#: sequencer.c:296
#, c-format
msgid "could not delete '%s'"
msgstr "无法删除 '%s'"
-#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369
+#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "无法删除 '%s'"
-#: sequencer.c:323
+#: sequencer.c:325
msgid "revert"
msgstr "还原"
-#: sequencer.c:325
+#: sequencer.c:327
msgid "cherry-pick"
msgstr "拣选"
-#: sequencer.c:327
-msgid "rebase -i"
-msgstr "rebase -i"
-
#: sequencer.c:329
+msgid "rebase"
+msgstr "变基"
+
+#: sequencer.c:331
#, c-format
msgid "unknown action: %d"
msgstr "未知动作:%d"
-#: sequencer.c:387
+#: sequencer.c:389
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6237,7 +6503,7 @@ msgstr ""
"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
"命令标记修正后的文件"
-#: sequencer.c:390
+#: sequencer.c:392
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6246,114 +6512,110 @@ msgstr ""
"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
"对修正后的文件做标记,然后用 'git commit' 提交"
-#: sequencer.c:403 sequencer.c:2993
+#: sequencer.c:405 sequencer.c:2901
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
-#: sequencer.c:410
+#: sequencer.c:412
#, c-format
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
-#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013
-#: sequencer.c:3277
+#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
+#: sequencer.c:3185
#, c-format
msgid "failed to finalize '%s'"
msgstr "无法完成 '%s'"
-#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259
-#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117
-#: builtin/rebase.c:589
+#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
+#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
+#: builtin/rebase.c:593
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
-#: sequencer.c:464
+#: sequencer.c:466
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "您的本地修改将被%s覆盖。"
-#: sequencer.c:468
+#: sequencer.c:470
msgid "commit your changes or stash them to proceed."
msgstr "提交您的修改或贮藏后再继续。"
-#: sequencer.c:500
+#: sequencer.c:502
#, c-format
msgid "%s: fast-forward"
msgstr "%s:快进"
-#: sequencer.c:539 builtin/tag.c:565
+#: sequencer.c:541 builtin/tag.c:565
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
#.
-#: sequencer.c:633
+#: sequencer.c:635
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s:无法写入新索引文件"
-#: sequencer.c:650
+#: sequencer.c:652
msgid "unable to update cache tree"
msgstr "不能更新缓存树"
-#: sequencer.c:664
+#: sequencer.c:666
msgid "could not resolve HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:744
+#: sequencer.c:746
#, c-format
msgid "no key present in '%.*s'"
msgstr "在 '%.*s' 中没有 key"
-#: sequencer.c:755
+#: sequencer.c:757
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "无法为 '%s' 的值去引号"
-#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705
-#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074
+#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读取"
-#: sequencer.c:802
+#: sequencer.c:804
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "已经给出 'GIT_AUTHOR_NAME'"
-#: sequencer.c:807
+#: sequencer.c:809
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:812
+#: sequencer.c:814
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "已经给出 'GIT_AUTHOR_DATE'"
-#: sequencer.c:816
+#: sequencer.c:818
#, c-format
msgid "unknown variable '%s'"
msgstr "未知变量 '%s'"
-#: sequencer.c:821
+#: sequencer.c:823
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "缺少 'GIT_AUTHOR_NAME'"
-#: sequencer.c:823
+#: sequencer.c:825
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "缺少 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:825
+#: sequencer.c:827
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "缺少 'GIT_AUTHOR_DATE'"
-#: sequencer.c:902 sequencer.c:1427
-msgid "malformed ident line"
-msgstr "错误的身份信息"
-
-#: sequencer.c:925
+#: sequencer.c:876
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6382,11 +6644,11 @@ msgstr ""
"\n"
" git rebase --continue\n"
-#: sequencer.c:1218
+#: sequencer.c:1148
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' 钩子失败"
-#: sequencer.c:1224
+#: sequencer.c:1154
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6410,7 +6672,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1237
+#: sequencer.c:1167
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6433,330 +6695,325 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1279
+#: sequencer.c:1209
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
-#: sequencer.c:1281
+#: sequencer.c:1211
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
-#: sequencer.c:1327
+#: sequencer.c:1257
msgid "unable to resolve HEAD after creating commit"
msgstr "创建提交后,不能解析 HEAD"
-#: sequencer.c:1329
+#: sequencer.c:1259
msgid "detached HEAD"
msgstr "分离头指针"
# 译者:中文字符串拼接,可删除前导空格
-#: sequencer.c:1333
+#: sequencer.c:1263
msgid " (root-commit)"
msgstr "(根提交)"
-#: sequencer.c:1354
+#: sequencer.c:1284
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1356
+#: sequencer.c:1286
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一个提交!"
-#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569
+#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:1411 sequencer.c:2055
+#: sequencer.c:1342 sequencer.c:1968
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
-#: sequencer.c:1431
-msgid "corrupted author without date information"
-msgstr "损坏的没有日期的作者信息"
-
-#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684
+#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入树对象"
-#: sequencer.c:1480 sequencer.c:1550
+#: sequencer.c:1386 sequencer.c:1447
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能从 '%s' 读取提交说明"
-#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883
-#: builtin/merge.c:908
+#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
+#: builtin/merge.c:911
msgid "failed to write commit object"
msgstr "写提交对象失败"
-#: sequencer.c:1577
+#: sequencer.c:1474
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
-#: sequencer.c:1582
+#: sequencer.c:1479
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
-#: sequencer.c:1656 sequencer.c:1767
+#: sequencer.c:1562 sequencer.c:1673
#, c-format
msgid "unknown command: %d"
msgstr "未知命令:%d"
-#: sequencer.c:1714 sequencer.c:1739
+#: sequencer.c:1620 sequencer.c:1645
#, c-format
msgid "This is a combination of %d commits."
msgstr "这是一个 %d 个提交的组合。"
-#: sequencer.c:1724
+#: sequencer.c:1630
msgid "need a HEAD to fixup"
msgstr "需要一个 HEAD 来修复"
-#: sequencer.c:1726 sequencer.c:3304
+#: sequencer.c:1632 sequencer.c:3212
msgid "could not read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:1728
+#: sequencer.c:1634
msgid "could not read HEAD's commit message"
msgstr "不能读取 HEAD 的提交说明"
-#: sequencer.c:1734
+#: sequencer.c:1640
#, c-format
msgid "cannot write '%s'"
msgstr "不能写 '%s'"
-#: sequencer.c:1741 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "这是第一个提交说明:"
-#: sequencer.c:1749
+#: sequencer.c:1655
#, c-format
msgid "could not read commit message of %s"
msgstr "不能读取 %s 的提交说明"
-#: sequencer.c:1756
+#: sequencer.c:1662
#, c-format
msgid "This is the commit message #%d:"
msgstr "这是提交说明 #%d:"
-#: sequencer.c:1762
+#: sequencer.c:1668
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交说明 #%d 将被跳过:"
-#: sequencer.c:1850
+#: sequencer.c:1756
msgid "your index file is unmerged."
msgstr "您的索引文件未完成合并。"
-#: sequencer.c:1857
+#: sequencer.c:1763
msgid "cannot fixup root commit"
msgstr "不能修复根提交"
-#: sequencer.c:1876
+#: sequencer.c:1782
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: sequencer.c:1884 sequencer.c:1892
+#: sequencer.c:1790 sequencer.c:1798
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 没有第 %d 个父提交"
-#: sequencer.c:1898
+#: sequencer.c:1804
#, 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:1917
+#: sequencer.c:1823
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s:不能解析父提交 %s"
-#: sequencer.c:1982
+#: sequencer.c:1888
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
-#: sequencer.c:2037
+#: sequencer.c:1943
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
-#: sequencer.c:2038
+#: sequencer.c:1944
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
-#: sequencer.c:2105
+#: sequencer.c:1961
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
+
+#: sequencer.c:2018
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s:无法读取索引"
-#: sequencer.c:2112
+#: sequencer.c:2025
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s:无法刷新索引"
-#: sequencer.c:2189
+#: sequencer.c:2102
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受参数:'%s'"
-#: sequencer.c:2198
+#: sequencer.c:2111
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的参数"
-#: sequencer.c:2235
+#: sequencer.c:2142
#, c-format
-msgid "could not parse '%.*s'"
-msgstr "无法解析 '%.*s'"
+msgid "could not parse '%s'"
+msgstr "无法解析 '%s'"
-#: sequencer.c:2289
+#: sequencer.c:2203
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d:%.*s"
-#: sequencer.c:2300
+#: sequencer.c:2214
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
-#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197
-#: builtin/rebase.c:223 builtin/rebase.c:248
-#, c-format
-msgid "could not read '%s'."
-msgstr "不能读取 '%s'。"
-
-#: sequencer.c:2384
+#: sequencer.c:2298
msgid "cancelling a cherry picking in progress"
msgstr "正在取消一个进行中的拣选"
-#: sequencer.c:2391
+#: sequencer.c:2305
msgid "cancelling a revert in progress"
msgstr "正在取消一个进行中的还原"
-#: sequencer.c:2435
+#: sequencer.c:2349
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: sequencer.c:2437
+#: sequencer.c:2351
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单:'%s'"
-#: sequencer.c:2442
+#: sequencer.c:2356
msgid "no commits parsed."
msgstr "没有解析提交。"
-#: sequencer.c:2453
+#: sequencer.c:2367
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
-#: sequencer.c:2455
+#: sequencer.c:2369
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
-#: sequencer.c:2533
+#: sequencer.c:2447
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效:%s"
-#: sequencer.c:2630
+#: sequencer.c:2540
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
-#: sequencer.c:2646
+#: sequencer.c:2556
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式错误的选项清单:'%s'"
-#: sequencer.c:2736 sequencer.c:4463
+#: sequencer.c:2644 sequencer.c:4361
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:2752
+#: sequencer.c:2660
msgid "revert is already in progress"
msgstr "一个还原操作已在进行"
-#: sequencer.c:2754
+#: sequencer.c:2662
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2757
+#: sequencer.c:2665
msgid "cherry-pick is already in progress"
msgstr "拣选操作已在进行"
-#: sequencer.c:2759
+#: sequencer.c:2667
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2773
+#: sequencer.c:2681
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
-#: sequencer.c:2788
+#: sequencer.c:2696
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
-#: sequencer.c:2848 sequencer.c:4209
+#: sequencer.c:2756 sequencer.c:4099
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
-#: sequencer.c:2850 sequencer.c:2861
+#: sequencer.c:2758 sequencer.c:2769
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:2852 sequencer.c:2896
+#: sequencer.c:2760 sequencer.c:2804
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:2882 builtin/grep.c:736
+#: sequencer.c:2790 builtin/grep.c:724
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: sequencer.c:2884
+#: sequencer.c:2792
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s':%s"
-#: sequencer.c:2885
+#: sequencer.c:2793
msgid "unexpected end of file"
msgstr "意外的文件结束"
-#: sequencer.c:2891
+#: sequencer.c:2799
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: sequencer.c:2902
+#: sequencer.c:2810
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
-#: sequencer.c:2943
+#: sequencer.c:2851
msgid "no revert in progress"
msgstr "没有正在进行的还原"
-#: sequencer.c:2951
+#: sequencer.c:2859
msgid "no cherry-pick in progress"
msgstr "没有正在进行的拣选"
-#: sequencer.c:2961
+#: sequencer.c:2869
msgid "failed to skip the commit"
msgstr "无法跳过这个提交"
-#: sequencer.c:2968
+#: sequencer.c:2876
msgid "there is nothing to skip"
msgstr "没有要跳过的"
-#: sequencer.c:2971
+#: sequencer.c:2879
#, c-format
msgid ""
"have you committed already?\n"
@@ -6765,21 +7022,21 @@ msgstr ""
"您已经提交了么?\n"
"试试 \"git %s --continue\""
-#: sequencer.c:3095 sequencer.c:4121
+#: sequencer.c:3003 sequencer.c:4011
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:3134 sequencer.c:4101
+#: sequencer.c:3042 sequencer.c:3991
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:3151
+#: sequencer.c:3059
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "无法拷贝 '%s' 至 '%s'"
-#: sequencer.c:3159
+#: sequencer.c:3067
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -6798,23 +7055,23 @@ msgstr ""
"\n"
" git rebase --continue\n"
-#: sequencer.c:3169
+#: sequencer.c:3077
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "不能应用 %s... %.*s"
-#: sequencer.c:3176
+#: sequencer.c:3084
#, c-format
msgid "Could not merge %.*s"
msgstr "不能合并 %.*s"
-#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641
+#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
# 译者:注意保持前导空格
-#: sequencer.c:3221
+#: sequencer.c:3129
#, c-format
msgid ""
"execution failed: %s\n"
@@ -6829,11 +7086,11 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: sequencer.c:3227
+#: sequencer.c:3135
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
-#: sequencer.c:3233
+#: sequencer.c:3141
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -6850,72 +7107,72 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: sequencer.c:3294
+#: sequencer.c:3202
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "非法的标签名称:'%.*s'"
-#: sequencer.c:3348
+#: sequencer.c:3256
msgid "writing fake root commit"
msgstr "写伪根提交"
-#: sequencer.c:3353
+#: sequencer.c:3261
msgid "writing squash-onto"
msgstr "写入 squash-onto"
-#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882
+#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
#, c-format
msgid "failed to find tree of %s"
msgstr "无法找到 %s 指向的树。"
-#: sequencer.c:3436
+#: sequencer.c:3344
#, c-format
msgid "could not resolve '%s'"
msgstr "无法解析 '%s'"
-#: sequencer.c:3467
+#: sequencer.c:3375
msgid "cannot merge without a current revision"
msgstr "没有当前版本不能合并"
-#: sequencer.c:3489
+#: sequencer.c:3397
#, c-format
msgid "unable to parse '%.*s'"
msgstr "无法解析 '%.*s'"
-#: sequencer.c:3498
+#: sequencer.c:3406
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "无可用合并:'%.*s'"
-#: sequencer.c:3510
+#: sequencer.c:3418
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "章鱼合并不能在一个新的根提交上执行"
-#: sequencer.c:3526
+#: sequencer.c:3434
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能获取 '%s' 的提交说明"
-#: sequencer.c:3688
+#: sequencer.c:3594
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能尝试合并 '%.*s'"
-#: sequencer.c:3704
+#: sequencer.c:3610
msgid "merge: Unable to write new index file"
msgstr "合并:无法写入新索引文件"
-#: sequencer.c:3773 builtin/rebase.c:733
+#: sequencer.c:3679 builtin/rebase.c:737
#, c-format
msgid "Applied autostash.\n"
msgstr "已应用 autostash。\n"
-#: sequencer.c:3785
+#: sequencer.c:3691
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
-#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -6926,31 +7183,26 @@ msgstr ""
"您的修改安全地保存在贮藏区中。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:3849
-#, c-format
-msgid "could not checkout %s"
-msgstr "不能检出 %s"
-
-#: sequencer.c:3863
+#: sequencer.c:3755
#, c-format
msgid "%s: not a valid OID"
msgstr "%s:不是一个有效的对象 ID"
-#: sequencer.c:3868 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "不能分离头指针"
-#: sequencer.c:3883
+#: sequencer.c:3775
#, c-format
msgid "Stopped at HEAD\n"
msgstr "停止在 HEAD\n"
-#: sequencer.c:3885
+#: sequencer.c:3777
#, c-format
msgid "Stopped at %s\n"
msgstr "停止在 %s\n"
-#: sequencer.c:3893
+#: sequencer.c:3785
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -6970,48 +7222,48 @@ msgstr ""
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3979
+#: sequencer.c:3869
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:4050
+#: sequencer.c:3940
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
-#: sequencer.c:4109
+#: sequencer.c:3999
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
-#: sequencer.c:4114
+#: sequencer.c:4004
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
-#: sequencer.c:4128
+#: sequencer.c:4018
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
-#: sequencer.c:4221
+#: sequencer.c:4111
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基:您有未暂存的变更。"
-#: sequencer.c:4230
+#: sequencer.c:4120
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
-#: sequencer.c:4232
+#: sequencer.c:4122
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件:'%s'"
-#: sequencer.c:4234
+#: sequencer.c:4124
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容:'%s'"
-#: sequencer.c:4237
+#: sequencer.c:4127
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7020,68 +7272,59 @@ msgstr ""
"\n"
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: sequencer.c:4273 sequencer.c:4312
+#: sequencer.c:4163 sequencer.c:4202
#, c-format
msgid "could not write file: '%s'"
msgstr "不能写入文件:'%s'"
-#: sequencer.c:4327
+#: sequencer.c:4217
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: sequencer.c:4334
+#: sequencer.c:4224
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: sequencer.c:4440
+#: sequencer.c:4338
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s:不能拣选一个%s"
-#: sequencer.c:4444
+#: sequencer.c:4342
#, c-format
msgid "%s: bad revision"
msgstr "%s:错误的版本"
-#: sequencer.c:4479
+#: sequencer.c:4377
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
-#: sequencer.c:4952
+#: sequencer.c:4846
msgid "make_script: unhandled options"
msgstr "make_script:有未能处理的选项"
-#: sequencer.c:4955
+#: sequencer.c:4849
msgid "make_script: error preparing revisions"
msgstr "make_script:准备版本时错误"
-#: sequencer.c:5113
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
-"或者您可以用 'git rebase --abort' 终止变基。\n"
-
-#: sequencer.c:5226 sequencer.c:5243
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "无事可做"
-#: sequencer.c:5257
+#: sequencer.c:5119
msgid "could not skip unnecessary pick commands"
msgstr "无法跳过不必要的拣选"
-#: sequencer.c:5351
+#: sequencer.c:5213
msgid "the script was already rearranged."
msgstr "脚本已经重新编排。"
#: setup.c:124
#, c-format
-msgid "'%s' is outside repository"
-msgstr "'%s' 在仓库之外"
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' 在仓库('%s' 中)之外"
-#: setup.c:174
+#: setup.c:175
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -7090,7 +7333,7 @@ msgstr ""
"%s:工作区中无此路径。\n"
"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
-#: setup.c:187
+#: setup.c:188
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -7101,12 +7344,12 @@ msgstr ""
"使用 '--' 来分隔版本和路径,例如:\n"
"'git <命令> [<版本>...] -- [<文件>...]'"
-#: setup.c:236
+#: setup.c:254
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "选项 '%s' 必须在其他非选项参数之前"
-#: setup.c:255
+#: setup.c:273
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -7117,92 +7360,92 @@ msgstr ""
"使用 '--' 来分隔版本和路径,例如:\n"
"'git <命令> [<版本>...] -- [<文件>...]'"
-#: setup.c:391
+#: setup.c:409
msgid "unable to set up work tree using invalid config"
msgstr "无法使用无效配置来创建工作区"
-#: setup.c:395
+#: setup.c:413
msgid "this operation must be run in a work tree"
msgstr "该操作必须在一个工作区中运行"
-#: setup.c:541
+#: setup.c:559
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "期望 git 仓库版本 <= %d,却得到 %d"
-#: setup.c:549
+#: setup.c:567
msgid "unknown repository extensions found:"
msgstr "发现未知的仓库扩展:"
-#: setup.c:568
+#: setup.c:586
#, c-format
msgid "error opening '%s'"
msgstr "打开 '%s' 出错"
-#: setup.c:570
+#: setup.c:588
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "文件太大,无法作为 .git 文件:'%s'"
-#: setup.c:572
+#: setup.c:590
#, c-format
msgid "error reading %s"
msgstr "读取 %s 出错"
-#: setup.c:574
+#: setup.c:592
#, c-format
msgid "invalid gitfile format: %s"
msgstr "无效的 gitfile 格式:%s"
-#: setup.c:576
+#: setup.c:594
#, c-format
msgid "no path in gitfile: %s"
msgstr "在 gitfile 中没有路径:%s"
-#: setup.c:578
+#: setup.c:596
#, c-format
msgid "not a git repository: %s"
msgstr "不是一个 git 仓库:%s"
-#: setup.c:677
+#: setup.c:695
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' 太大"
-#: setup.c:691
+#: setup.c:709
#, c-format
msgid "not a git repository: '%s'"
msgstr "不是一个 git 仓库:'%s'"
-#: setup.c:720 setup.c:722 setup.c:753
+#: setup.c:738 setup.c:740 setup.c:771
#, c-format
msgid "cannot chdir to '%s'"
msgstr "不能切换目录到 '%s'"
-#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
+#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
msgid "cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: setup.c:852
+#: setup.c:870
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "获取 '%*s%s%s' 状态(stat)失败"
-#: setup.c:1090
+#: setup.c:1108
msgid "Unable to read current working directory"
msgstr "不能读取当前工作目录"
-#: setup.c:1099 setup.c:1105
+#: setup.c:1117 setup.c:1123
#, c-format
msgid "cannot change to '%s'"
msgstr "不能切换到 '%s'"
-#: setup.c:1110
+#: setup.c:1128
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "不是一个 git 仓库(或者任何父目录):%s"
-#: setup.c:1116
+#: setup.c:1134
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7211,7 +7454,7 @@ msgstr ""
"不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n"
"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
-#: setup.c:1227
+#: setup.c:1245
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7220,15 +7463,15 @@ msgstr ""
"参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n"
"文件属主必须始终拥有读写权限。"
-#: setup.c:1271
+#: setup.c:1289
msgid "open /dev/null or dup failed"
msgstr "不能打开或者复制 /dev/null"
-#: setup.c:1286
+#: setup.c:1304
msgid "fork failed"
msgstr "fork 失败"
-#: setup.c:1291
+#: setup.c:1309
msgid "setsid failed"
msgstr "setsid 失败"
@@ -7308,194 +7551,194 @@ msgstr "mmap 失败"
msgid "object file %s is empty"
msgstr "对象文件 %s 为空"
-#: sha1-file.c:1252 sha1-file.c:2392
+#: sha1-file.c:1263 sha1-file.c:2443
#, c-format
msgid "corrupt loose object '%s'"
msgstr "损坏的松散对象 '%s'"
-#: sha1-file.c:1254 sha1-file.c:2396
+#: sha1-file.c:1265 sha1-file.c:2447
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "松散对象 '%s' 后面有垃圾数据"
-#: sha1-file.c:1296
+#: sha1-file.c:1307
msgid "invalid object type"
msgstr "无效的对象类型"
-#: sha1-file.c:1380
+#: sha1-file.c:1391
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
-#: sha1-file.c:1383
+#: sha1-file.c:1394
#, c-format
msgid "unable to unpack %s header"
msgstr "无法解开 %s 头部"
-#: sha1-file.c:1389
+#: sha1-file.c:1400
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
-#: sha1-file.c:1392
+#: sha1-file.c:1403
#, c-format
msgid "unable to parse %s header"
msgstr "无法解析 %s 头部"
-#: sha1-file.c:1584
+#: sha1-file.c:1629
#, c-format
msgid "failed to read object %s"
msgstr "读取对象 %s 失败"
-#: sha1-file.c:1588
+#: sha1-file.c:1633
#, c-format
msgid "replacement %s not found for %s"
msgstr "找不到 %2$s 的替代 %1$s"
-#: sha1-file.c:1592
+#: sha1-file.c:1637
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "松散对象 %s(保存在 %s)已损坏"
-#: sha1-file.c:1596
+#: sha1-file.c:1641
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "打包对象 %s(保存在 %s)已损坏"
-#: sha1-file.c:1699
+#: sha1-file.c:1746
#, c-format
msgid "unable to write file %s"
msgstr "无法写文件 %s"
-#: sha1-file.c:1706
+#: sha1-file.c:1753
#, c-format
msgid "unable to set permission to '%s'"
msgstr "无法为 '%s' 设置权限"
-#: sha1-file.c:1713
+#: sha1-file.c:1760
msgid "file write error"
msgstr "文件写错误"
-#: sha1-file.c:1732
+#: sha1-file.c:1780
msgid "error when closing loose object file"
msgstr "关闭松散对象文件时出错"
-#: sha1-file.c:1797
+#: sha1-file.c:1845
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "权限不足,无法在仓库对象库 %s 中添加对象"
-#: sha1-file.c:1799
+#: sha1-file.c:1847
msgid "unable to create temporary file"
msgstr "无法创建临时文件"
-#: sha1-file.c:1823
+#: sha1-file.c:1871
msgid "unable to write loose object file"
msgstr "不能写松散对象文件"
-#: sha1-file.c:1829
+#: sha1-file.c:1877
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "不能压缩新对象 %s(%d)"
-#: sha1-file.c:1833
+#: sha1-file.c:1881
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "在对象 %s 上调用 deflateEnd 失败(%d)"
-#: sha1-file.c:1837
+#: sha1-file.c:1885
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "被 %s 的不稳定对象源数据搞糊涂了"
-#: sha1-file.c:1847 builtin/pack-objects.c:925
+#: sha1-file.c:1895 builtin/pack-objects.c:1054
#, c-format
msgid "failed utime() on %s"
msgstr "在 %s 上调用 utime() 失败"
-#: sha1-file.c:1922
+#: sha1-file.c:1972
#, c-format
msgid "cannot read object for %s"
msgstr "不能读取对象 %s"
-#: sha1-file.c:1962
+#: sha1-file.c:2011
msgid "corrupt commit"
msgstr "损坏的提交"
-#: sha1-file.c:1970
+#: sha1-file.c:2019
msgid "corrupt tag"
msgstr "损坏的标签"
-#: sha1-file.c:2069
+#: sha1-file.c:2119
#, c-format
msgid "read error while indexing %s"
msgstr "索引 %s 时读取错误"
-#: sha1-file.c:2072
+#: sha1-file.c:2122
#, c-format
msgid "short read while indexing %s"
msgstr "索引 %s 时读入不完整"
-#: sha1-file.c:2145 sha1-file.c:2154
+#: sha1-file.c:2195 sha1-file.c:2205
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s:插入数据库失败"
-#: sha1-file.c:2160
+#: sha1-file.c:2211
#, c-format
msgid "%s: unsupported file type"
msgstr "%s:不支持的文件类型"
-#: sha1-file.c:2184
+#: sha1-file.c:2235
#, c-format
msgid "%s is not a valid object"
msgstr "%s 不是一个有效的对象"
-#: sha1-file.c:2186
+#: sha1-file.c:2237
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一个有效的 '%s' 对象"
-#: sha1-file.c:2213 builtin/index-pack.c:155
+#: sha1-file.c:2264 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "不能打开 %s"
-#: sha1-file.c:2403 sha1-file.c:2455
+#: sha1-file.c:2454 sha1-file.c:2507
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s 的哈希值不匹配(预期 %s)"
-#: sha1-file.c:2427
+#: sha1-file.c:2478
#, c-format
msgid "unable to mmap %s"
msgstr "不能 mmap %s"
-#: sha1-file.c:2432
+#: sha1-file.c:2483
#, c-format
msgid "unable to unpack header of %s"
msgstr "无法解压缩 %s 的头部"
-#: sha1-file.c:2438
+#: sha1-file.c:2489
#, c-format
msgid "unable to parse header of %s"
msgstr "无法解析 %s 的头部"
-#: sha1-file.c:2449
+#: sha1-file.c:2500
#, c-format
msgid "unable to unpack contents of %s"
msgstr "无法解压缩 %s 的内容"
-#: sha1-name.c:487
+#: sha1-name.c:486
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "短 SHA1 %s 存在歧义"
-#: sha1-name.c:498
+#: sha1-name.c:497
msgid "The candidates are:"
msgstr "候选者有:"
-#: sha1-name.c:797
+#: sha1-name.c:796
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -7516,44 +7759,110 @@ msgstr ""
"引用,可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
"false\" 命令关闭本消息通知。"
+#: sha1-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "'%.*s' 的日志仅能回到 %s"
+
+#: sha1-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "'%.*s' 的日志仅有 %d 个条目"
+
+#: sha1-name.c:1689
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "路径 '%s' 在磁盘上,但是不在 '%.*s' 中"
+
+#: sha1-name.c:1695
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"路径 '%s' 存在,但是不在 '%s' 中\n"
+"提示:您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'?"
+
+#: sha1-name.c:1704
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "路径 '%s' 不在 '%.*s' 中"
+
+#: sha1-name.c:1732
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"路径 '%s' 在索引中,但不在暂存区 %d 中\n"
+"提示:您的意思是 ':%d:%s'?"
+
+#: sha1-name.c:1748
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+"路径 '%s' 在索引中,但是不在 '%s' 中\n"
+"提示:您的意思是 ':%d:%s' 亦即 ':%d:./%s'?"
+
+#: sha1-name.c:1756
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "路径 '%s' 在磁盘中,但不在索引里"
+
+#: sha1-name.c:1758
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "路径 '%s' 不存在(既不在磁盘中,也不在索引中)"
+
+#: sha1-name.c:1771
+msgid "relative path syntax can't be used outside working tree"
+msgstr "不能在工作区之外使用相对路径语法"
+
+#: sha1-name.c:1909
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "无效的对象名 '%.*s'。"
+
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:822
+#: strbuf.c:837
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:824
+#: strbuf.c:839
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr "%u.%2.2u GiB/s"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:832
+#: strbuf.c:847
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:834
+#: strbuf.c:849
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr "%u.%2.2u MiB/s"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:841
+#: strbuf.c:856
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:843
+#: strbuf.c:858
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr "%u.%2.2u KiB/s"
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:849
+#: strbuf.c:864
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -7561,14 +7870,14 @@ msgstr[0] "%u 字节"
msgstr[1] "%u 字节"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:851
+#: strbuf.c:866
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u 字节/秒"
msgstr[1] "%u 字节/秒"
-#: strbuf.c:1149
+#: strbuf.c:1164
#, c-format
msgid "could not edit '%s'"
msgstr "不能编辑 '%s'"
@@ -7601,72 +7910,139 @@ msgstr "位于未检出的子模组 '%s'"
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
+#: submodule.c:434
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "坏的 --ignore-submodules 参数:%s"
+
+#: submodule.c:815
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr "提交 %s 中的子模组在路径:'%s' 和同名的子模组冲突。 跳过它。"
+
#: submodule.c:910
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016
+#: submodule.c:995
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr "无法在子模组 %s 中执行 'git rev-list <commits> --not --remotes -n 1'"
+
+#: submodule.c:1118
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "无法处理子模组 '%s'"
+
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
-#: submodule.c:1481
+#: submodule.c:1158
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "正在推送子模组 '%s'\n"
+
+#: submodule.c:1161
#, c-format
-msgid "Could not access submodule '%s'"
-msgstr "无法访问子模组 '%s'"
+msgid "Unable to push submodule '%s'\n"
+msgstr "无法推送子模组 '%s'\n"
+
+#: submodule.c:1453
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "正在获取子模组 %s%s\n"
+
+#: submodule.c:1483
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "无法访问子模组 '%s'\n"
+
+#: submodule.c:1637
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"获取子模组时的错误:\n"
+"%s"
-#: submodule.c:1651
+#: submodule.c:1662
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "无法将 '%s' 识别为一个 git 仓库"
-#: submodule.c:1789
+#: submodule.c:1679
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'"
+
+#: submodule.c:1720
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败"
+
+#: submodule.c:1800
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中启动 'git status'"
-#: submodule.c:1802
+#: submodule.c:1813
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中执行 'git status'"
-#: submodule.c:1817
+#: submodule.c:1828
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
-#: submodule.c:1907
+#: submodule.c:1855 submodule.c:2165
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "无法递归进子模组路径 '%s'"
+
+#: submodule.c:1876
+msgid "could not reset submodule index"
+msgstr "无法重置子模组索引"
+
+#: submodule.c:1918
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "子模组 '%s' 中有脏索引"
-#: submodule.c:1959
+#: submodule.c:1970
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "子模组 '%s' 无法被更新。"
-#: submodule.c:2027
+#: submodule.c:2038
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
-#: submodule.c:2048
+#: submodule.c:2059
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
-#: submodule.c:2060 submodule.c:2119
+#: submodule.c:2071 submodule.c:2130
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查询子模组 '%s' 的名称"
-#: submodule.c:2064
+#: submodule.c:2075
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "禁止移动 '%s' 到现存 git 目录中"
-#: submodule.c:2071
+#: submodule.c:2082
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -7677,16 +8053,11 @@ msgstr ""
"'%s' 迁移至\n"
"'%s'\n"
-#: submodule.c:2154
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "无法递归进子模组路径 '%s'"
-
-#: submodule.c:2198
+#: submodule.c:2209
msgid "could not start ls-files in .."
msgstr "无法在 .. 中启动 ls-files"
-#: submodule.c:2237
+#: submodule.c:2248
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
@@ -7710,7 +8081,7 @@ msgstr "忽略可能被解析为命令行选项的 '%s':%s"
msgid "invalid value for %s"
msgstr "%s 的值无效"
-#: submodule-config.c:769
+#: submodule-config.c:765
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "不能更新 .gitmodules 条目 %s"
@@ -7726,7 +8097,7 @@ msgstr "执行 trailer 命令 '%s' 失败"
msgid "unknown value '%s' for key '%s'"
msgstr "键 '%2$s' 的未知取值 '%1$s'"
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
#, c-format
msgid "more than one %s"
msgstr "多于一个 %s"
@@ -7856,7 +8227,7 @@ msgstr "正在终止。"
msgid "failed to push all needed submodules"
msgstr "不能推送全部需要的子模组"
-#: transport.c:1345 transport-helper.c:656
+#: transport.c:1345 transport-helper.c:657
msgid "operation not supported by protocol"
msgstr "协议不支持该操作"
@@ -7869,7 +8240,7 @@ msgstr "完整写入远程助手失败"
msgid "unable to find remote helper for '%s'"
msgstr "无法为 '%s' 找到远程助手"
-#: transport-helper.c:160 transport-helper.c:570
+#: transport-helper.c:160 transport-helper.c:571
msgid "can't dup helper output fd"
msgstr "无法复制助手输出文件句柄"
@@ -7884,100 +8255,100 @@ msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git"
msgid "this remote helper should implement refspec capability"
msgstr "远程助手需要实现 refspec 能力"
-#: transport-helper.c:284 transport-helper.c:424
+#: transport-helper.c:284 transport-helper.c:425
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr "%s 意外地说:'%s'"
-#: transport-helper.c:413
+#: transport-helper.c:414
#, c-format
msgid "%s also locked %s"
msgstr "%s 也锁定了 %s"
-#: transport-helper.c:492
+#: transport-helper.c:493
msgid "couldn't run fast-import"
msgstr "不能执行 fast-import"
-#: transport-helper.c:515
+#: transport-helper.c:516
msgid "error while running fast-import"
msgstr "执行 fast-import 出错"
-#: transport-helper.c:544 transport-helper.c:1133
+#: transport-helper.c:545 transport-helper.c:1134
#, c-format
msgid "could not read ref %s"
msgstr "无法读取引用 %s"
-#: transport-helper.c:589
+#: transport-helper.c:590
#, c-format
msgid "unknown response to connect: %s"
msgstr "连接时未知的响应:%s"
-#: transport-helper.c:611
+#: transport-helper.c:612
msgid "setting remote service path not supported by protocol"
msgstr "协议不支持设置远程服务路径"
-#: transport-helper.c:613
+#: transport-helper.c:614
msgid "invalid remote service path"
msgstr "无效的远程服务路径"
-#: transport-helper.c:659
+#: transport-helper.c:660
#, c-format
msgid "can't connect to subservice %s"
msgstr "不能连接到子服务 %s"
-#: transport-helper.c:735
+#: transport-helper.c:736
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "预期 ok/error,助手说 '%s'"
-#: transport-helper.c:788
+#: transport-helper.c:789
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "助手报告 %s 的意外状态"
-#: transport-helper.c:849
+#: transport-helper.c:850
#, c-format
msgid "helper %s does not support dry-run"
msgstr "助手 %s 不支持 dry-run"
-#: transport-helper.c:852
+#: transport-helper.c:853
#, c-format
msgid "helper %s does not support --signed"
msgstr "助手 %s 不支持 --signed"
-#: transport-helper.c:855
+#: transport-helper.c:856
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "助手 %s 不支持 --signed=if-asked"
-#: transport-helper.c:860
+#: transport-helper.c:861
#, c-format
msgid "helper %s does not support --atomic"
msgstr "助手 %s 不支持 --atomic"
-#: transport-helper.c:866
+#: transport-helper.c:867
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "助手 %s 不支持 'push-option'"
-#: transport-helper.c:964
+#: transport-helper.c:965
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-heper 不支持 push,需要引用表达式"
-#: transport-helper.c:969
+#: transport-helper.c:970
#, c-format
msgid "helper %s does not support 'force'"
msgstr "助手 %s 不支持 'force'"
-#: transport-helper.c:1016
+#: transport-helper.c:1017
msgid "couldn't run fast-export"
msgstr "无法执行 fast-export"
-#: transport-helper.c:1021
+#: transport-helper.c:1022
msgid "error while running fast-export"
msgstr "执行 fast-export 时出错"
-#: transport-helper.c:1046
+#: transport-helper.c:1047
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -7986,68 +8357,63 @@ msgstr ""
"没有共同的引用并且也没有指定,什么也不会做。\n"
"可能您应该指定一个分支如 'master'。\n"
-#: transport-helper.c:1119
+#: transport-helper.c:1120
#, c-format
msgid "malformed response in ref list: %s"
msgstr "引用列表中格式错误的响应:%s"
-#: transport-helper.c:1271
+#: transport-helper.c:1272
#, c-format
msgid "read(%s) failed"
msgstr "读取(%s)失败"
-#: transport-helper.c:1298
+#: transport-helper.c:1299
#, c-format
msgid "write(%s) failed"
msgstr "写(%s)失败"
-#: transport-helper.c:1347
+#: transport-helper.c:1348
#, c-format
msgid "%s thread failed"
msgstr "%s 线程失败"
-#: transport-helper.c:1351
+#: transport-helper.c:1352
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s 线程等待失败:%s"
-#: transport-helper.c:1370 transport-helper.c:1374
+#: transport-helper.c:1371 transport-helper.c:1375
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "不能启动线程来拷贝数据:%s"
-#: transport-helper.c:1411
+#: transport-helper.c:1412
#, c-format
msgid "%s process failed to wait"
msgstr "%s 进程等待失败"
-#: transport-helper.c:1415
+#: transport-helper.c:1416
#, c-format
msgid "%s process failed"
msgstr "%s 进程失败"
-#: transport-helper.c:1433 transport-helper.c:1442
+#: transport-helper.c:1434 transport-helper.c:1443
msgid "can't start thread for copying data"
msgstr "不能启动线程来拷贝数据"
-#: tree-walk.c:33
+#: tree-walk.c:32
msgid "too-short tree object"
msgstr "太短的树对象"
-#: tree-walk.c:39
+#: tree-walk.c:38
msgid "malformed mode in tree entry"
msgstr "树对象中的条目模式错误"
-#: tree-walk.c:43
+#: tree-walk.c:42
msgid "empty filename in tree entry"
msgstr "树对象条目中空的文件名"
-#: tree-walk.c:48
-#, c-format
-msgid "filename in tree entry contains backslash: '%s'"
-msgstr "树条目中的文件名包含反斜杠:'%s'"
-
-#: tree-walk.c:124
+#: tree-walk.c:117
msgid "too-short tree file"
msgstr "太短的树文件"
@@ -8285,7 +8651,7 @@ msgstr ""
"以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n"
"并且碰撞组中只有一个文件存在工作区中:\n"
-#: unpack-trees.c:1441
+#: unpack-trees.c:1445
msgid "Updating index flags"
msgstr "正在更新索引标志"
@@ -8318,32 +8684,36 @@ msgstr "无效的端口号"
msgid "invalid '..' path segment"
msgstr "无效的 '..' 路径片段"
-#: worktree.c:258 builtin/am.c:2084
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "正在获取对象"
+
+#: worktree.c:259 builtin/am.c:2099
#, c-format
msgid "failed to read '%s'"
msgstr "读取 '%s' 失败"
-#: worktree.c:304
+#: worktree.c:305
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "在主工作区的 '%s' 不是仓库目录"
-#: worktree.c:315
+#: worktree.c:316
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "文件 '%s' 不包含工作区的绝对路径"
-#: worktree.c:327
+#: worktree.c:328
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' 不存在"
-#: worktree.c:333
+#: worktree.c:334
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' 不是一个 .git 文件,错误码 %d"
-#: worktree.c:341
+#: worktree.c:342
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' 没有指回到 '%s'"
@@ -8915,122 +9285,126 @@ msgstr "删除 '%s' 失败"
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<选项>] [--] <路径规格>..."
-#: builtin/add.c:87
+#: builtin/add.c:88
#, c-format
msgid "unexpected diff status %c"
msgstr "意外的差异状态 %c"
-#: builtin/add.c:92 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:288
msgid "updating files failed"
msgstr "更新文件失败"
-#: builtin/add.c:102
+#: builtin/add.c:103
#, c-format
msgid "remove '%s'\n"
msgstr "删除 '%s'\n"
-#: builtin/add.c:177
+#: builtin/add.c:178
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更:"
-#: builtin/add.c:252 builtin/rev-parse.c:899
+#: builtin/add.c:266 builtin/rev-parse.c:899
msgid "Could not read the index"
msgstr "不能读取索引"
-#: builtin/add.c:263
+#: builtin/add.c:277
#, c-format
msgid "Could not open '%s' for writing."
msgstr "无法为写入打开 '%s'。"
-#: builtin/add.c:267
+#: builtin/add.c:281
msgid "Could not write patch"
msgstr "不能生成补丁"
-#: builtin/add.c:270
+#: builtin/add.c:284
msgid "editing patch failed"
msgstr "编辑补丁失败"
-#: builtin/add.c:273
+#: builtin/add.c:287
#, c-format
msgid "Could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/add.c:275
+#: builtin/add.c:289
msgid "Empty patch. Aborted."
msgstr "空补丁。异常终止。"
-#: builtin/add.c:280
+#: builtin/add.c:294
#, c-format
msgid "Could not apply '%s'"
msgstr "不能应用 '%s'"
-#: builtin/add.c:288
+#: builtin/add.c:302
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
-#: builtin/add.c:308 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:548
-#: builtin/remote.c:1344 builtin/rm.c:241 builtin/send-pack.c:165
+#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
+#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
msgid "dry run"
msgstr "演习"
-#: builtin/add.c:311
+#: builtin/add.c:325
msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307
+#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
-#: builtin/add.c:313
+#: builtin/add.c:327
msgid "edit current diff and apply"
msgstr "编辑当前差异并应用"
-#: builtin/add.c:314
+#: builtin/add.c:328
msgid "allow adding otherwise ignored files"
msgstr "允许添加忽略的文件"
-#: builtin/add.c:315
+#: builtin/add.c:329
msgid "update tracked files"
msgstr "更新已跟踪的文件"
-#: builtin/add.c:316
+#: builtin/add.c:330
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "对已跟踪文件(暗含 -u)重新归一换行符"
-#: builtin/add.c:317
+#: builtin/add.c:331
msgid "record only the fact that the path will be added later"
msgstr "只记录,该路径稍后再添加"
-#: builtin/add.c:318
+#: builtin/add.c:332
msgid "add changes from all tracked and untracked files"
msgstr "添加所有改变的已跟踪文件和未跟踪文件"
-#: builtin/add.c:321
+#: builtin/add.c:335
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
-#: builtin/add.c:323
+#: builtin/add.c:337
msgid "don't add, only refresh the index"
msgstr "不添加,只刷新索引"
-#: builtin/add.c:324
+#: builtin/add.c:338
msgid "just skip files which cannot be added because of errors"
msgstr "跳过因出错不能添加的文件"
-#: builtin/add.c:325
+#: builtin/add.c:339
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
-#: builtin/add.c:327 builtin/update-index.c:1004
+#: builtin/add.c:341 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "覆盖列表里文件的可执行位"
-#: builtin/add.c:329
+#: builtin/add.c:343
msgid "warn when adding an embedded repository"
msgstr "创建一个嵌入式仓库时给予警告"
-#: builtin/add.c:347
+#: builtin/add.c:345
+msgid "backend for `git stash -p`"
+msgstr "`git stash -p` 的后端"
+
+#: builtin/add.c:363
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9058,160 +9432,170 @@ msgstr ""
"\n"
"参见 \"git help submodule\" 获取更多信息。"
-#: builtin/add.c:375
+#: builtin/add.c:391
#, c-format
msgid "adding embedded git repository: %s"
msgstr "正在添加嵌入式 git 仓库:%s"
-#: builtin/add.c:393
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "使用 -f 参数如果您确实要添加它们。\n"
+#: builtin/add.c:410
+msgid ""
+"Use -f if you really want to add them.\n"
+"Turn this message off by running\n"
+"\"git config advice.addIgnoredFile false\""
+msgstr ""
+"使用 -f 如果您确实要添加它们。\n"
+"运行下面的命令来关闭本消息\n"
+"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:400
+#: builtin/add.c:419
msgid "adding files failed"
msgstr "添加文件失败"
-#: builtin/add.c:428 builtin/commit.c:348
+#: builtin/add.c:447 builtin/commit.c:348
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容"
-#: builtin/add.c:434
+#: builtin/add.c:464
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file 与 --edit 不兼容"
-#: builtin/add.c:446
+#: builtin/add.c:476
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 选项互斥"
-#: builtin/add.c:449
+#: builtin/add.c:479
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
-#: builtin/add.c:453
+#: builtin/add.c:483
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
-#: builtin/add.c:471 builtin/checkout.c:1648 builtin/commit.c:354
-#: builtin/reset.c:327
+#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
+#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file 与路径表达式参数不兼容"
-#: builtin/add.c:478 builtin/checkout.c:1660 builtin/commit.c:360
-#: builtin/reset.c:333
+#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
+#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
-#: builtin/add.c:482
+#: builtin/add.c:512
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件,也没有文件被添加。\n"
-#: builtin/add.c:483
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "也许您想要执行 'git add .'?\n"
+#: builtin/add.c:514
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
+msgstr ""
+"也许您想要执行 'git add .'?\n"
+"运行下面的命令来关闭本消息\n"
+"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:347
+#: builtin/am.c:352
msgid "could not parse author script"
msgstr "不能解析作者脚本"
-#: builtin/am.c:431
+#: builtin/am.c:436
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 钩子删除"
-#: builtin/am.c:473
+#: builtin/am.c:478
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行:'%s'。"
-#: builtin/am.c:511
+#: builtin/am.c:516
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/am.c:537
+#: builtin/am.c:542
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:725
+#: builtin/am.c:730
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解析补丁 '%s'"
-#: builtin/am.c:790
+#: builtin/am.c:795
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
-#: builtin/am.c:838
+#: builtin/am.c:843
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:843 builtin/am.c:855
+#: builtin/am.c:848 builtin/am.c:860
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:850
+#: builtin/am.c:855
msgid "invalid timezone offset"
msgstr "无效的时区偏移值"
-#: builtin/am.c:943
+#: builtin/am.c:948
msgid "Patch format detection failed."
msgstr "补丁格式探测失败。"
-#: builtin/am.c:948 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:409
#, c-format
msgid "failed to create directory '%s'"
msgstr "创建目录 '%s' 失败"
-#: builtin/am.c:953
+#: builtin/am.c:958
msgid "Failed to split patches."
msgstr "拆分补丁失败。"
-#: builtin/am.c:1084
+#: builtin/am.c:1089
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题,执行 \"%s --continue\"。"
-#: builtin/am.c:1085
+#: builtin/am.c:1090
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
-#: builtin/am.c:1086
+#: builtin/am.c:1091
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
-#: builtin/am.c:1169
+#: 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:1197
+#: builtin/am.c:1202
msgid "Patch is empty."
msgstr "补丁为空。"
-#: builtin/am.c:1262
+#: builtin/am.c:1267
#, c-format
msgid "missing author line in commit %s"
msgstr "在提交 %s 中缺失作者行"
-#: builtin/am.c:1265
+#: builtin/am.c:1270
#, c-format
msgid "invalid ident line: %.*s"
msgstr "无效的身份标识:%.*s"
-#: builtin/am.c:1484
+#: builtin/am.c:1489
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: builtin/am.c:1486
+#: builtin/am.c:1491
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个(三方合并的)基础目录树..."
-#: builtin/am.c:1505
+#: builtin/am.c:1510
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -9219,24 +9603,24 @@ msgstr ""
"您是否曾手动编辑过您的补丁?\n"
"无法应用补丁到索引中的数据对象上。"
-#: builtin/am.c:1511
+#: builtin/am.c:1516
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/am.c:1537
+#: builtin/am.c:1542
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
-#: builtin/am.c:1569
+#: builtin/am.c:1574
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
-#: builtin/am.c:1616 builtin/am.c:1620
+#: builtin/am.c:1621 builtin/am.c:1625
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续:%s 不存在。"
-#: builtin/am.c:1638
+#: builtin/am.c:1643
msgid "Commit Body is:"
msgstr "提交内容为:"
@@ -9245,39 +9629,39 @@ msgstr "提交内容为:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1648
+#: builtin/am.c:1653
#, 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:1695 builtin/commit.c:394
+#: builtin/am.c:1700 builtin/commit.c:398
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:1699
+#: builtin/am.c:1704
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引:不能应用补丁(脏文件:%s)"
-#: builtin/am.c:1739 builtin/am.c:1807
+#: builtin/am.c:1744 builtin/am.c:1812
#, c-format
msgid "Applying: %.*s"
msgstr "应用:%.*s"
-#: builtin/am.c:1756
+#: builtin/am.c:1761
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/am.c:1762
+#: builtin/am.c:1767
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
-#: builtin/am.c:1766
-msgid "Use 'git am --show-current-patch' to see the failed patch"
-msgstr "用 'git am --show-current-patch' 命令查看失败的补丁"
+#: builtin/am.c:1771
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
-#: builtin/am.c:1810
+#: builtin/am.c:1815
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9287,7 +9671,7 @@ msgstr ""
"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
"您也许想要跳过这个补丁。"
-#: builtin/am.c:1817
+#: builtin/am.c:1822
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9298,159 +9682,169 @@ msgstr ""
"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
-#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346
+#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
#: builtin/reset.c:354
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/am.c:1976
+#: builtin/am.c:1981
msgid "failed to clean index"
msgstr "清空索引失败"
-#: builtin/am.c:2020
+#: builtin/am.c:2025
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:2117
+#: builtin/am.c:2132
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值:%s"
-#: builtin/am.c:2153
+#: builtin/am.c:2172
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "无效的 --show-current-patch 值:%s"
+
+#: builtin/am.c:2176
+#, 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:2207
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2154
+#: builtin/am.c:2208
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2160
+#: builtin/am.c:2214
msgid "run interactively"
msgstr "以交互式方式运行"
-#: builtin/am.c:2162
+#: builtin/am.c:2216
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
-#: builtin/am.c:2164
+#: builtin/am.c:2218
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要,允许使用三方合并。"
-#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:811
+#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:304 builtin/stash.c:812
msgid "be quiet"
msgstr "静默模式"
-#: builtin/am.c:2167
+#: builtin/am.c:2221
msgid "add a Signed-off-by line to the commit message"
msgstr "在提交说明中添加一个 Signed-off-by 签名"
-#: builtin/am.c:2170
+#: builtin/am.c:2224
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集(默认)"
-#: builtin/am.c:2172
+#: builtin/am.c:2226
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/am.c:2174
+#: builtin/am.c:2228
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/am.c:2176
+#: builtin/am.c:2230
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
-#: builtin/am.c:2178
+#: builtin/am.c:2232
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/am.c:2181
+#: builtin/am.c:2235
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
-#: builtin/am.c:2184
+#: builtin/am.c:2238
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
-#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2213
+#: builtin/am.c:2240 builtin/am.c:2243 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:2267
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2203 builtin/commit.c:1386 builtin/fmt-merge-msg.c:673
-#: builtin/fmt-merge-msg.c:676 builtin/grep.c:883 builtin/merge.c:249
-#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1469
+#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
+#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
#: parse-options.h:154 parse-options.h:175 parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
-#: builtin/am.c:2210
+#: builtin/am.c:2264
msgid "format the patch(es) are in"
msgstr "补丁的格式"
-#: builtin/am.c:2216
+#: builtin/am.c:2270
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
-#: builtin/am.c:2218
+#: builtin/am.c:2272
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
-#: builtin/am.c:2221
+#: builtin/am.c:2275
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
-#: builtin/am.c:2224
+#: builtin/am.c:2278
msgid "skip the current patch"
msgstr "跳过当前补丁"
-#: builtin/am.c:2227
+#: builtin/am.c:2281
msgid "restore the original branch and abort the patching operation."
msgstr "恢复原始分支并终止打补丁操作。"
-#: builtin/am.c:2230
+#: builtin/am.c:2284
msgid "abort the patching operation but keep HEAD where it is."
msgstr "终止补丁操作但保持 HEAD 不变。"
-#: builtin/am.c:2233
-msgid "show the patch being applied."
-msgstr "显示正在应用的补丁。"
+#: builtin/am.c:2288
+msgid "show the patch being applied"
+msgstr "显示正在应用的补丁"
-#: builtin/am.c:2237
+#: builtin/am.c:2293
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
-#: builtin/am.c:2239
+#: builtin/am.c:2295
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
-#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1507
-#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:509
-#: builtin/rebase.c:1513 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
+#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
+#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2242 builtin/rebase.c:510 builtin/rebase.c:1514
+#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
-#: builtin/am.c:2245
+#: builtin/am.c:2301
msgid "(internal use for git-rebase)"
msgstr "(内部使用,用于 git-rebase)"
-#: builtin/am.c:2263
+#: builtin/am.c:2319
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."
@@ -9458,16 +9852,16 @@ msgstr ""
"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
"请不要再使用它了。"
-#: builtin/am.c:2270
+#: builtin/am.c:2326
msgid "failed to read the index"
msgstr "读取索引失败"
-#: builtin/am.c:2285
+#: builtin/am.c:2341
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
-#: builtin/am.c:2309
+#: builtin/am.c:2365
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -9476,11 +9870,11 @@ msgstr ""
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2315
+#: builtin/am.c:2371
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行,我们不会继续。"
-#: builtin/am.c:2325
+#: builtin/am.c:2381
msgid "interactive mode requires patches on the command line"
msgstr "交互式模式需要命令行上提供补丁"
@@ -9648,7 +10042,7 @@ msgstr ""
"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
-#: builtin/bisect--helper.c:322
+#: builtin/bisect--helper.c:310
#, c-format
msgid "bisecting only with a %s commit"
msgstr "在只有一个 %s 提交的情况下二分查找"
@@ -9658,22 +10052,22 @@ msgstr "在只有一个 %s 提交的情况下二分查找"
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:318
msgid "Are you sure [Y/n]? "
msgstr "您确认么[Y/n]? "
-#: builtin/bisect--helper.c:377
+#: builtin/bisect--helper.c:379
msgid "no terms defined"
msgstr "未定义术语"
-#: builtin/bisect--helper.c:380
+#: builtin/bisect--helper.c:382
#, 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:390
+#: builtin/bisect--helper.c:392
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -9682,111 +10076,111 @@ msgstr ""
"命令 'git bisect terms' 的参数 %s 无效。\n"
"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
-#: builtin/bisect--helper.c:476
+#: builtin/bisect--helper.c:478
#, c-format
msgid "unrecognized option: '%s'"
msgstr "未识别的选项:'%s'"
-#: builtin/bisect--helper.c:480
+#: builtin/bisect--helper.c:482
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' 看起来不是一个有效的版本"
-#: builtin/bisect--helper.c:512
+#: builtin/bisect--helper.c:514
msgid "bad HEAD - I need a HEAD"
msgstr "坏的 HEAD - 我需要一个 HEAD"
-#: builtin/bisect--helper.c:527
+#: builtin/bisect--helper.c:529
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
-#: builtin/bisect--helper.c:548
+#: builtin/bisect--helper.c:550
msgid "won't bisect on cg-seek'ed tree"
msgstr "不会在做了 cg-seek 的树上做二分查找"
-#: builtin/bisect--helper.c:551
+#: builtin/bisect--helper.c:553
msgid "bad HEAD - strange symbolic ref"
msgstr "坏的 HEAD - 奇怪的符号引用"
-#: builtin/bisect--helper.c:575
+#: builtin/bisect--helper.c:577
#, c-format
msgid "invalid ref: '%s'"
msgstr "无效的引用:'%s'"
-#: builtin/bisect--helper.c:631
+#: builtin/bisect--helper.c:633
msgid "perform 'git bisect next'"
msgstr "执行 'git bisect next'"
-#: builtin/bisect--helper.c:633
+#: builtin/bisect--helper.c:635
msgid "write the terms to .git/BISECT_TERMS"
msgstr "将术语写入 .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:637
msgid "cleanup the bisection state"
msgstr "清除二分查找状态"
-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:639
msgid "check for expected revs"
msgstr "检查预期的版本"
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:641
msgid "reset the bisection state"
msgstr "清除二分查找状态"
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:643
msgid "write out the bisection state in BISECT_LOG"
msgstr "将二分查找的状态写入 BISECT_LOG"
-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:645
msgid "check and set terms in a bisection state"
msgstr "在一个二分查找状态中检查和设置术语"
-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:647
msgid "check whether bad or good terms exist"
msgstr "检查坏的或好的术语是否存在"
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:649
msgid "print out the bisect terms"
msgstr "打印二分查找术语"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:651
msgid "start the bisect session"
msgstr "启动二分查找过程"
-#: builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:653
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "更新 BISECT_HEAD 而非检出当前提交"
-#: builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655
msgid "no log for BISECT_WRITE"
msgstr "BISECT_WRITE 无日志"
-#: builtin/bisect--helper.c:670
+#: builtin/bisect--helper.c:673
msgid "--write-terms requires two arguments"
msgstr "--write-terms 需要两个参数"
-#: builtin/bisect--helper.c:674
+#: builtin/bisect--helper.c:677
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state 不带参数"
-#: builtin/bisect--helper.c:681
+#: builtin/bisect--helper.c:684
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset 无需参数或者需要一个提交"
-#: builtin/bisect--helper.c:685
+#: builtin/bisect--helper.c:688
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr "--bisect-write 需要 4 或 5 个参数"
-#: builtin/bisect--helper.c:691
+#: builtin/bisect--helper.c:694
msgid "--check-and-set-terms requires 3 arguments"
msgstr "--check-and-set-terms 需要 3 个参数"
-#: builtin/bisect--helper.c:697
+#: builtin/bisect--helper.c:700
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check 需要 2 或 3 个参数"
-#: builtin/bisect--helper.c:703
+#: builtin/bisect--helper.c:706
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms 需要 0 或 1 个参数"
@@ -10171,7 +10565,7 @@ msgstr "设置跟踪模式(参见 git-pull(1))"
msgid "do not use"
msgstr "不要使用"
-#: builtin/branch.c:626 builtin/rebase.c:505
+#: builtin/branch.c:626 builtin/rebase.c:513
msgid "upstream"
msgstr "上游"
@@ -10282,7 +10676,7 @@ msgstr "排序和过滤属于大小写不敏感"
msgid "format to use for the output"
msgstr "输出格式"
-#: builtin/branch.c:684 builtin/clone.c:784
+#: builtin/branch.c:684 builtin/clone.c:785
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下!"
@@ -10384,19 +10778,19 @@ msgstr "git bundle list-heads <文件> [<引用名>...]"
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <文件> [<引用名>...]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3228
+#: builtin/bundle.c:66 builtin/pack-objects.c:3375
msgid "do not show progress meter"
msgstr "不显示进度表"
-#: builtin/bundle.c:68 builtin/pack-objects.c:3230
+#: builtin/bundle.c:68 builtin/pack-objects.c:3377
msgid "show progress meter"
msgstr "显示进度表"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3232
+#: builtin/bundle.c:70 builtin/pack-objects.c:3379
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
-#: builtin/bundle.c:73 builtin/pack-objects.c:3235
+#: builtin/bundle.c:73 builtin/pack-objects.c:3382
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
@@ -10417,11 +10811,11 @@ msgstr "%s 可以\n"
msgid "Need a repository to unbundle."
msgstr "需要一个仓库来解包。"
-#: builtin/bundle.c:168 builtin/remote.c:1609
+#: builtin/bundle.c:168 builtin/remote.c:1686
msgid "be verbose; must be placed before a subcommand"
msgstr "冗长输出;必须置于子命令之前"
-#: builtin/bundle.c:190 builtin/remote.c:1640
+#: builtin/bundle.c:190 builtin/remote.c:1717
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子命令:%s"
@@ -10474,7 +10868,7 @@ msgstr "对于数据对象,对其内容做文本转换"
msgid "for blob objects, run filters on object's content"
msgstr "对于数据对象,对其内容做过滤"
-#: builtin/cat-file.c:645 git-submodule.sh:992
+#: builtin/cat-file.c:645 git-submodule.sh:1002
msgid "blob"
msgstr "数据对象"
@@ -10534,8 +10928,8 @@ msgstr "从标准输入读出文件名"
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1435 builtin/gc.c:537
-#: builtin/worktree.c:506
+#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
+#: builtin/worktree.c:499
msgid "suppress progress reporting"
msgstr "不显示进度报告"
@@ -10547,27 +10941,27 @@ msgstr "显示未匹配的输入路径"
msgid "ignore index when checking"
msgstr "检查时忽略索引"
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:163
msgid "cannot specify pathnames with --stdin"
msgstr "不能同时指定路径及 --stdin 参数"
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:166
msgid "-z only makes sense with --stdin"
msgstr "-z 需要和 --stdin 参数共用才有意义"
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:168
msgid "no path specified"
msgstr "未指定路径"
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:172
msgid "--quiet is only valid with a single pathname"
msgstr "参数 --quiet 只在提供一个路径名时有效"
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:174
msgid "cannot have both --quiet and --verbose"
msgstr "不能同时提供 --quiet 和 --verbose 参数"
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:177
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching 选项只在使用 --verbose 时有效"
@@ -10625,9 +11019,9 @@ msgid "write the content to temporary files"
msgstr "将内容写入临时文件"
#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1385 builtin/submodule--helper.c:1388
-#: builtin/submodule--helper.c:1396 builtin/submodule--helper.c:1882
-#: builtin/worktree.c:679
+#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
+#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
+#: builtin/worktree.c:672
msgid "string"
msgstr "字符串"
@@ -10742,11 +11136,11 @@ msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:682 builtin/sparse-checkout.c:82
+#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:732
+#: builtin/checkout.c:734
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -10755,51 +11149,51 @@ msgstr ""
"不能继续,下列文件有暂存的修改:\n"
"%s"
-#: builtin/checkout.c:835
+#: builtin/checkout.c:837
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
-#: builtin/checkout.c:877
+#: builtin/checkout.c:879
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:881 builtin/clone.c:716
+#: builtin/checkout.c:883 builtin/clone.c:717
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:885
+#: builtin/checkout.c:887
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:888
+#: builtin/checkout.c:890
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:892
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:894 builtin/checkout.c:1291
+#: builtin/checkout.c:896 builtin/checkout.c:1320
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:896
+#: builtin/checkout.c:898
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者:注意保持前导空格
-#: builtin/checkout.c:947
+#: builtin/checkout.c:949
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
-#: builtin/checkout.c:953
+#: builtin/checkout.c:955
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -10820,7 +11214,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:972
+#: builtin/checkout.c:974
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10847,28 +11241,19 @@ msgstr[1] ""
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:1007
+#: builtin/checkout.c:1009
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:1011
+#: builtin/checkout.c:1013
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:1051 builtin/checkout.c:1286
+#: builtin/checkout.c:1053 builtin/checkout.c:1315
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#: builtin/checkout.c:1178
-msgid "only one reference expected"
-msgstr "预期只有一个引用"
-
-#: builtin/checkout.c:1195
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "应只有一个引用,却给出了 %d 个"
-
-#: builtin/checkout.c:1232
+#: builtin/checkout.c:1128
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -10877,37 +11262,70 @@ msgstr ""
"'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n"
"请使用 --(和可选的 --no-guess)来消除歧义"
-#: builtin/checkout.c:1245 builtin/worktree.c:290 builtin/worktree.c:455
+#: builtin/checkout.c:1135
+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"
+"\n"
+" git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"如果您想要检出一个远程跟踪分支,例如在 'origin' 上的,您可以使用分支\n"
+"全名和 --track 选项:\n"
+"\n"
+" git checkout --track origin/<name>\n"
+"\n"
+"如果您总是喜欢使用模糊的简短分支名 <name>,而不喜欢如 'origin' 的远程\n"
+"名称,可以在配置中设置 checkout.defaultRemote=origin。"
+
+#: builtin/checkout.c:1145
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' 匹配多个(%d)远程跟踪分支"
+
+#: builtin/checkout.c:1211
+msgid "only one reference expected"
+msgstr "预期只有一个引用"
+
+#: builtin/checkout.c:1228
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "应只有一个引用,却给出了 %d 个"
+
+#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用:%s"
-#: builtin/checkout.c:1258 builtin/checkout.c:1622
+#: builtin/checkout.c:1287 builtin/checkout.c:1649
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树:%s"
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1334
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "期望一个分支,得到标签 '%s'"
-#: builtin/checkout.c:1307
+#: builtin/checkout.c:1336
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "期望一个分支,得到远程分支 '%s'"
-#: builtin/checkout.c:1308 builtin/checkout.c:1316
+#: builtin/checkout.c:1337 builtin/checkout.c:1345
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "期望一个分支,得到 '%s'"
-#: builtin/checkout.c:1311
+#: builtin/checkout.c:1340
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "期望一个分支,得到提交 '%s'"
-#: builtin/checkout.c:1327
+#: builtin/checkout.c:1356
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10915,7 +11333,7 @@ msgstr ""
"不能在合并时切换分支\n"
"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1331
+#: builtin/checkout.c:1360
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -10923,7 +11341,7 @@ msgstr ""
"不能在一个 am 会话期间切换分支\n"
"考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1335
+#: builtin/checkout.c:1364
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10931,7 +11349,7 @@ msgstr ""
"不能在变基时切换分支\n"
"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1339
+#: builtin/checkout.c:1368
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10939,7 +11357,7 @@ msgstr ""
"不能在拣选时切换分支\n"
"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1343
+#: builtin/checkout.c:1372
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10947,239 +11365,211 @@ msgstr ""
"不能在还原时切换分支\n"
"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1347
+#: builtin/checkout.c:1376
msgid "you are switching branch while bisecting"
msgstr "您在执行二分查找时切换分支"
-#: builtin/checkout.c:1354
+#: builtin/checkout.c:1383
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1357 builtin/checkout.c:1361 builtin/checkout.c:1365
+#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1369 builtin/checkout.c:1372 builtin/checkout.c:1375
-#: builtin/checkout.c:1380 builtin/checkout.c:1385
+#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
+#: builtin/checkout.c:1409 builtin/checkout.c:1414
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1382
+#: builtin/checkout.c:1411
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' 不带 <起始点>"
-#: builtin/checkout.c:1390
+#: builtin/checkout.c:1419
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1397
+#: builtin/checkout.c:1426
msgid "missing branch or commit argument"
msgstr "缺少分支或提交参数"
-#: builtin/checkout.c:1439 builtin/clone.c:91 builtin/commit-graph.c:52
-#: builtin/commit-graph.c:113 builtin/fetch.c:167 builtin/merge.c:285
-#: builtin/multi-pack-index.c:27 builtin/pull.c:138 builtin/push.c:563
+#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
+#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
+#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr "强制显示进度报告"
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1469
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方合并"
-#: builtin/checkout.c:1441 builtin/log.c:1690 parse-options.h:322
+#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1442
+#: builtin/checkout.c:1471
msgid "conflict style (merge or diff3)"
msgstr "冲突输出风格(merge 或 diff3)"
-#: builtin/checkout.c:1454 builtin/worktree.c:503
+#: builtin/checkout.c:1483 builtin/worktree.c:496
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1484
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信息"
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1486
msgid "force checkout (throw away local modifications)"
msgstr "强制检出(丢弃本地修改)"
-#: builtin/checkout.c:1459
+#: builtin/checkout.c:1488
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1459
+#: builtin/checkout.c:1488
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1461 builtin/merge.c:288
+#: builtin/checkout.c:1490 builtin/merge.c:289
msgid "update ignored files (default)"
msgstr "更新忽略的文件(默认)"
-#: builtin/checkout.c:1464
+#: builtin/checkout.c:1493
msgid "do not check if another worktree is holding the given ref"
msgstr "不检查指定的引用是否被其他工作区所占用"
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1506
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1480
+#: builtin/checkout.c:1509
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1513
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1565
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b、-B 和 --orphan 是互斥的"
-#: builtin/checkout.c:1540
+#: builtin/checkout.c:1568
msgid "-p and --overlay are mutually exclusive"
msgstr "-p 和 --overlay 互斥"
-#: builtin/checkout.c:1577
+#: builtin/checkout.c:1605
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1582
+#: builtin/checkout.c:1610
msgid "missing branch name; try -b"
msgstr "缺少分支名,尝试 -b"
-#: builtin/checkout.c:1615
+#: builtin/checkout.c:1642
#, c-format
msgid "could not resolve %s"
msgstr "无法解析 %s"
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1658
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1665
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1669
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout:--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1651
+#: builtin/checkout.c:1678
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file 与 --detach 不兼容"
-#: builtin/checkout.c:1654 builtin/reset.c:324
+#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file 与 --patch 不兼容"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1692
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:1670
+#: builtin/checkout.c:1697
msgid "you must specify path(s) to restore"
msgstr "您必须指定一个要恢复的路径"
-#: builtin/checkout.c:1689
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"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"
-"\n"
-" git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"'%s' 匹配了一个以上的远程跟踪分支。\n"
-"我们发现 %d 个远程仓库具有同名分支。所以我们转而尝试将这个参数解析为\n"
-"路径,但是也失败了!\n"
-"\n"
-"如果您想要检出一个远程跟踪分支,例如在远程仓库 'origin' 上的,您可以\n"
-"使用分支全名和 --track 选项:\n"
-"\n"
-" git checkout --track origin/<name>\n"
-"\n"
-"如果您总是喜欢使用模糊的简短分支名 <name>,而不喜欢如 'origin' 的远程\n"
-"仓库名,可以在配置中设置 checkout.defaultRemote=origin。"
-
-#: builtin/checkout.c:1714 builtin/checkout.c:1716 builtin/checkout.c:1765
-#: builtin/checkout.c:1767 builtin/clone.c:121 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
+#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
+#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1715
+#: builtin/checkout.c:1724
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1717
+#: builtin/checkout.c:1726
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1727
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1720
+#: builtin/checkout.c:1729
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "二次猜测 'git checkout <无此分支>'(默认)"
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1730
msgid "use overlay mode (default)"
msgstr "使用叠加模式(默认)"
-#: builtin/checkout.c:1766
+#: builtin/checkout.c:1775
msgid "create and switch to a new branch"
msgstr "创建并切换一个新分支"
-#: builtin/checkout.c:1768
+#: builtin/checkout.c:1777
msgid "create/reset and switch to a branch"
msgstr "创建/重置并切换一个分支"
-#: builtin/checkout.c:1770
+#: builtin/checkout.c:1779
msgid "second guess 'git switch <no-such-branch>'"
msgstr "二次猜测 'git switch <无此分支>'"
-#: builtin/checkout.c:1772
+#: builtin/checkout.c:1781
msgid "throw away local modifications"
msgstr "丢弃本地修改"
-#: builtin/checkout.c:1804
+#: builtin/checkout.c:1813
msgid "which tree-ish to checkout from"
msgstr "要检出哪一个树"
-#: builtin/checkout.c:1806
+#: builtin/checkout.c:1815
msgid "restore the index"
msgstr "恢复索引"
-#: builtin/checkout.c:1808
+#: builtin/checkout.c:1817
msgid "restore the working tree (default)"
msgstr "恢复工作区(默认)"
-#: builtin/checkout.c:1810
+#: builtin/checkout.c:1819
msgid "ignore unmerged entries"
msgstr "忽略未合并条目"
-#: builtin/checkout.c:1811
+#: builtin/checkout.c:1820
msgid "use overlay mode"
msgstr "使用叠加模式"
@@ -11323,9 +11713,9 @@ msgstr "交互式清除"
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
-#: builtin/grep.c:901 builtin/log.c:177 builtin/log.c:179
-#: builtin/ls-files.c:557 builtin/name-rev.c:464 builtin/name-rev.c:466
+#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
+#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
+#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "模式"
@@ -11408,18 +11798,18 @@ msgstr "模板目录"
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1392
-#: builtin/submodule--helper.c:1885
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1912
msgid "reference repository"
msgstr "参考仓库"
-#: builtin/clone.c:118 builtin/submodule--helper.c:1394
-#: builtin/submodule--helper.c:1887
+#: builtin/clone.c:118 builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1914
msgid "use --reference only while cloning"
msgstr "仅在克隆时参考 --reference 指向的本地仓库"
#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3294 builtin/repack.c:327
+#: builtin/pack-objects.c:3441 builtin/repack.c:327
msgid "name"
msgstr "名称"
@@ -11435,8 +11825,8 @@ msgstr "检出 <分支> 而不是远程 HEAD"
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:840
-#: builtin/pull.c:227
+#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
+#: builtin/pull.c:207
msgid "depth"
msgstr "深度"
@@ -11444,7 +11834,7 @@ msgstr "深度"
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3283
+#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
msgid "time"
msgstr "时间"
@@ -11453,7 +11843,7 @@ msgid "create a shallow clone since a specific time"
msgstr "从一个特定时间创建一个浅克隆"
#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1445
+#: builtin/rebase.c:1480
msgid "revision"
msgstr "版本"
@@ -11461,7 +11851,8 @@ msgstr "版本"
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化浅克隆的历史,除了特定版本"
-#: builtin/clone.c:132
+#: builtin/clone.c:132 builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1928
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
@@ -11499,12 +11890,12 @@ msgstr "server-specific"
msgid "option to transmit"
msgstr "传输选项"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:240
+#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
#: builtin/push.c:574
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 地址"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:243
+#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
#: builtin/push.c:576
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 地址"
@@ -11575,129 +11966,129 @@ msgstr ""
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:704
+#: builtin/clone.c:705
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:752
+#: builtin/clone.c:753
msgid "failed to initialize sparse-checkout"
msgstr "无法初始化稀疏检出"
-#: builtin/clone.c:775
+#: builtin/clone.c:776
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
-#: builtin/clone.c:806
+#: builtin/clone.c:807
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:856
+#: builtin/clone.c:862
msgid "unable to write parameters to config file"
msgstr "无法将参数写入配置文件"
-#: builtin/clone.c:919
+#: builtin/clone.c:925
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
-#: builtin/clone.c:921
+#: builtin/clone.c:927
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:959 builtin/receive-pack.c:1948
+#: builtin/clone.c:965 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:963
+#: builtin/clone.c:969
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
-#: builtin/clone.c:976
+#: builtin/clone.c:982
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:979
+#: builtin/clone.c:985
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:992
+#: builtin/clone.c:998
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:998 builtin/fetch.c:1787
+#: builtin/clone.c:1004 builtin/fetch.c:1796
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
-#: builtin/clone.c:1008
+#: builtin/clone.c:1014
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
-#: builtin/clone.c:1018
+#: builtin/clone.c:1024
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:1033 builtin/clone.c:1054 builtin/difftool.c:271
-#: builtin/log.c:1866 builtin/worktree.c:302 builtin/worktree.c:334
+#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
+#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:1038
+#: builtin/clone.c:1044
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
-#: builtin/clone.c:1058
+#: builtin/clone.c:1064
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:1060
+#: builtin/clone.c:1066
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:1084
+#: builtin/clone.c:1090
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
-#: builtin/clone.c:1148
+#: builtin/clone.c:1154
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
-#: builtin/clone.c:1150
+#: builtin/clone.c:1156
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
-#: builtin/clone.c:1152
+#: builtin/clone.c:1158
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
-#: builtin/clone.c:1154
+#: builtin/clone.c:1160
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。"
-#: builtin/clone.c:1157
+#: builtin/clone.c:1163
msgid "source repository is shallow, ignoring --local"
msgstr "源仓库是浅克隆,忽略 --local"
-#: builtin/clone.c:1162
+#: builtin/clone.c:1168
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1237 builtin/clone.c:1245
+#: builtin/clone.c:1243 builtin/clone.c:1251
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:1248
+#: builtin/clone.c:1254
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
@@ -11774,13 +12165,13 @@ msgstr "父提交"
msgid "id of a parent commit object"
msgstr "父提交对象 ID"
-#: builtin/commit-tree.c:114 builtin/commit.c:1496 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
+#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
#: builtin/tag.c:412
msgid "message"
msgstr "说明"
-#: builtin/commit-tree.c:115 builtin/commit.c:1496
+#: builtin/commit-tree.c:115 builtin/commit.c:1501
msgid "commit message"
msgstr "提交说明"
@@ -11788,8 +12179,8 @@ msgstr "提交说明"
msgid "read commit log message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit-tree.c:121 builtin/commit.c:1508 builtin/merge.c:287
-#: builtin/pull.c:195 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
+#: builtin/pull.c:175 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG 提交签名"
@@ -11873,90 +12264,90 @@ msgstr "参数 --include/--only 不跟路径没有意义。"
msgid "unable to create temporary index"
msgstr "不能创建临时索引"
-#: builtin/commit.c:382
+#: builtin/commit.c:385
msgid "interactive add failed"
msgstr "交互式添加失败"
-#: builtin/commit.c:396
+#: builtin/commit.c:400
msgid "unable to update temporary index"
msgstr "无法更新临时索引"
-#: builtin/commit.c:398
+#: builtin/commit.c:402
msgid "Failed to update main cache tree"
msgstr "不能更新树的主缓存"
-#: builtin/commit.c:423 builtin/commit.c:446 builtin/commit.c:492
+#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"
-#: builtin/commit.c:475
+#: builtin/commit.c:479
msgid "cannot do a partial commit during a merge."
msgstr "在合并过程中不能做部分提交。"
-#: builtin/commit.c:477
+#: builtin/commit.c:481
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中不能做部分提交。"
-#: builtin/commit.c:485
+#: builtin/commit.c:489
msgid "cannot read the index"
msgstr "无法读取索引"
-#: builtin/commit.c:504
+#: builtin/commit.c:508
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
-#: builtin/commit.c:602
+#: builtin/commit.c:606
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者信息"
-#: builtin/commit.c:604
+#: builtin/commit.c:608
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有格式错误的作者信息"
-#: builtin/commit.c:623
+#: builtin/commit.c:627
msgid "malformed --author parameter"
msgstr "格式错误的 --author 参数"
-#: builtin/commit.c:676
+#: builtin/commit.c:680
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "无法选择一个未被当前提交说明使用的注释字符"
-#: builtin/commit.c:714 builtin/commit.c:747 builtin/commit.c:1092
+#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
-#: builtin/commit.c:726 builtin/shortlog.c:319
+#: builtin/commit.c:730 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(正从标准输入中读取日志信息)\n"
-#: builtin/commit.c:728
+#: builtin/commit.c:732
msgid "could not read log from standard input"
msgstr "不能从标准输入中读取日志信息"
-#: builtin/commit.c:732
+#: builtin/commit.c:736
#, c-format
msgid "could not read log file '%s'"
msgstr "不能读取日志文件 '%s'"
-#: builtin/commit.c:763 builtin/commit.c:779
+#: builtin/commit.c:767 builtin/commit.c:783
msgid "could not read SQUASH_MSG"
msgstr "不能读取 SQUASH_MSG"
-#: builtin/commit.c:770
+#: builtin/commit.c:774
msgid "could not read MERGE_MSG"
msgstr "不能读取 MERGE_MSG"
-#: builtin/commit.c:830
+#: builtin/commit.c:834
msgid "could not write commit template"
msgstr "不能写提交模版"
-#: builtin/commit.c:849
+#: builtin/commit.c:853
#, c-format
msgid ""
"\n"
@@ -11970,7 +12361,7 @@ msgstr ""
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:854
+#: builtin/commit.c:858
#, c-format
msgid ""
"\n"
@@ -11984,7 +12375,7 @@ msgstr ""
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:867
+#: builtin/commit.c:871
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -11993,7 +12384,7 @@ msgstr ""
"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
"说明将会终止提交。\n"
-#: builtin/commit.c:875
+#: builtin/commit.c:879
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12004,320 +12395,320 @@ msgstr ""
"也可以删除它们。一个空的提交说明将会终止提交。\n"
# 译者:为保证在输出中对齐,注意调整句中空格!
-#: builtin/commit.c:892
+#: builtin/commit.c:896
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者: %.*s <%.*s>"
# 译者:为保证在输出中对齐,注意调整句中空格!
-#: builtin/commit.c:900
+#: builtin/commit.c:904
#, c-format
msgid "%sDate: %s"
msgstr "%s日期: %s"
# 译者:为保证在输出中对齐,注意调整句中空格!
-#: builtin/commit.c:907
+#: builtin/commit.c:911
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者:%.*s <%.*s>"
-#: builtin/commit.c:925
+#: builtin/commit.c:929
msgid "Cannot read index"
msgstr "无法读取索引"
-#: builtin/commit.c:992
+#: builtin/commit.c:997
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:1006 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
-#: builtin/commit.c:1050
+#: builtin/commit.c:1055
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
-#: builtin/commit.c:1064
+#: builtin/commit.c:1069
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "无效的忽略模式 '%s'"
-#: builtin/commit.c:1082 builtin/commit.c:1322
+#: builtin/commit.c:1087 builtin/commit.c:1327
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'"
-#: builtin/commit.c:1122
+#: builtin/commit.c:1127
msgid "--long and -z are incompatible"
msgstr "--long 和 -z 选项不兼容"
-#: builtin/commit.c:1166
+#: builtin/commit.c:1171
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"
-#: builtin/commit.c:1175
+#: builtin/commit.c:1180
msgid "You have nothing to amend."
msgstr "您没有可修补的提交。"
-#: builtin/commit.c:1178
+#: builtin/commit.c:1183
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
-#: builtin/commit.c:1180
+#: builtin/commit.c:1185
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
-#: builtin/commit.c:1183
+#: builtin/commit.c:1188
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash 和 --fixup 不能同时使用"
-#: builtin/commit.c:1193
+#: builtin/commit.c:1198
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
-#: builtin/commit.c:1195
+#: builtin/commit.c:1200
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
-#: builtin/commit.c:1203
+#: builtin/commit.c:1208
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
-#: builtin/commit.c:1220
+#: builtin/commit.c:1225
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1231
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
-#: builtin/commit.c:1357 builtin/commit.c:1519
+#: builtin/commit.c:1362 builtin/commit.c:1524
msgid "show status concisely"
msgstr "以简洁的格式显示状态"
-#: builtin/commit.c:1359 builtin/commit.c:1521
+#: builtin/commit.c:1364 builtin/commit.c:1526
msgid "show branch information"
msgstr "显示分支信息"
-#: builtin/commit.c:1361
+#: builtin/commit.c:1366
msgid "show stash information"
msgstr "显示贮藏区信息"
-#: builtin/commit.c:1363 builtin/commit.c:1523
+#: builtin/commit.c:1368 builtin/commit.c:1528
msgid "compute full ahead/behind values"
msgstr "计算完整的领先/落后值"
-#: builtin/commit.c:1365
+#: builtin/commit.c:1370
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1365 builtin/commit.c:1525 builtin/push.c:549
-#: builtin/worktree.c:650
+#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
+#: builtin/worktree.c:643
msgid "machine-readable output"
msgstr "机器可读的输出"
-#: builtin/commit.c:1368 builtin/commit.c:1527
+#: builtin/commit.c:1373 builtin/commit.c:1532
msgid "show status in long format (default)"
msgstr "以长格式显示状态(默认)"
-#: builtin/commit.c:1371 builtin/commit.c:1530
+#: builtin/commit.c:1376 builtin/commit.c:1535
msgid "terminate entries with NUL"
msgstr "条目以 NUL 字符结尾"
-#: builtin/commit.c:1373 builtin/commit.c:1377 builtin/commit.c:1533
+#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1525 parse-options.h:336
+#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1374 builtin/commit.c:1533
+#: builtin/commit.c:1379 builtin/commit.c:1538
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
-#: builtin/commit.c:1378
+#: builtin/commit.c:1383
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
"显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)"
-#: builtin/commit.c:1380 parse-options.h:192
+#: builtin/commit.c:1385 parse-options.h:192
msgid "when"
msgstr "何时"
-#: builtin/commit.c:1381
+#: builtin/commit.c:1386
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
-#: builtin/commit.c:1383
+#: builtin/commit.c:1388
msgid "list untracked files in columns"
msgstr "以列的方式显示未跟踪的文件"
-#: builtin/commit.c:1384
+#: builtin/commit.c:1389
msgid "do not detect renames"
msgstr "不检测重命名"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1391
msgid "detect renames, optionally set similarity index"
msgstr "检测重命名,可以设置索引相似度"
-#: builtin/commit.c:1406
+#: builtin/commit.c:1411
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "不支持已忽略和未跟踪文件参数的组合"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1494
msgid "suppress summary after successful commit"
msgstr "提交成功后不显示概述信息"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1495
msgid "show diff in commit message template"
msgstr "在提交说明模板里显示差异"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1497
msgid "Commit message options"
msgstr "提交说明选项"
-#: builtin/commit.c:1493 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
msgid "read message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1499
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1499
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1495 builtin/gc.c:538
+#: builtin/commit.c:1500 builtin/gc.c:538
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1500
msgid "override date for commit"
msgstr "提交时覆盖日期"
-#: builtin/commit.c:1497 builtin/commit.c:1498 builtin/commit.c:1499
-#: builtin/commit.c:1500 parse-options.h:328 ref-filter.h:92
+#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
+#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
msgid "commit"
msgstr "提交"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1502
msgid "reuse and edit message from specified commit"
msgstr "重用并编辑指定提交的提交说明"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1503
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交说明"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to fixup specified commit"
msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1505
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
-#: builtin/commit.c:1501
+#: builtin/commit.c:1506
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
-#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289
-#: builtin/pull.c:164 builtin/revert.c:110
+#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
+#: builtin/pull.c:144 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: 签名"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1508
msgid "use specified template file"
msgstr "使用指定的模板文件"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1509
msgid "force edit of commit"
msgstr "强制编辑提交"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1511
msgid "include status in commit message template"
msgstr "在提交说明模板里包含状态信息"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1516
msgid "Commit contents options"
msgstr "提交内容选项"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1517
msgid "commit all changed files"
msgstr "提交所有改动的文件"
-#: builtin/commit.c:1513
+#: builtin/commit.c:1518
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待提交"
-#: builtin/commit.c:1514
+#: builtin/commit.c:1519
msgid "interactively add files"
msgstr "交互式添加文件"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1520
msgid "interactively add changes"
msgstr "交互式添加变更"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1521
msgid "commit only specified files"
msgstr "只提交指定的文件"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1522
msgid "bypass pre-commit and commit-msg hooks"
msgstr "绕过 pre-commit 和 commit-msg 钩子"
-#: builtin/commit.c:1518
+#: builtin/commit.c:1523
msgid "show what would be committed"
msgstr "显示将要提交的内容"
-#: builtin/commit.c:1531
+#: builtin/commit.c:1536
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1532
+#: builtin/commit.c:1537
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite 钩子"
-#: builtin/commit.c:1539
+#: builtin/commit.c:1544
msgid "ok to record an empty change"
msgstr "允许一个空提交"
-#: builtin/commit.c:1541
+#: builtin/commit.c:1546
msgid "ok to record a change with an empty message"
msgstr "允许空的提交说明"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1619
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "损坏的 MERGE_HEAD 文件(%s)"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1626
msgid "could not read MERGE_MODE"
msgstr "不能读取 MERGE_MODE"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1645
#, c-format
msgid "could not read commit message: %s"
msgstr "不能读取提交说明:%s"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1652
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1657
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止提交;您未更改来自模版的提交说明。\n"
-#: builtin/commit.c:1686
+#: builtin/commit.c:1691
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -12341,54 +12732,59 @@ msgstr ""
"git commit-graph write [--object-dir <对象目录>] [--append|--split] [--"
"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-#: builtin/commit-graph.c:48 builtin/commit-graph.c:103
-#: builtin/commit-graph.c:187 builtin/fetch.c:179 builtin/log.c:1657
+#: builtin/commit-graph.c:52
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "无法找到和 %s 匹配的对象目录"
+
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
+#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
msgid "dir"
msgstr "目录"
-#: builtin/commit-graph.c:49 builtin/commit-graph.c:104
-#: builtin/commit-graph.c:188
+#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
+#: builtin/commit-graph.c:211
msgid "The object directory to store the graph"
msgstr "保存图形的对象目录"
-#: builtin/commit-graph.c:51
+#: builtin/commit-graph.c:71
msgid "if the commit-graph is split, only verify the tip file"
msgstr "如果提交图形被拆分,只验证头一个文件"
-#: builtin/commit-graph.c:73 t/helper/test-read-graph.c:23
+#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "无法打开提交图形 '%s'"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:128
msgid "start walk at all refs"
msgstr "开始遍历所有引用"
-#: builtin/commit-graph.c:108
+#: builtin/commit-graph.c:130
msgid "scan pack-indexes listed by stdin for commits"
msgstr "从标准输入中的包索引文件列表中扫描提交"
-#: builtin/commit-graph.c:110
+#: builtin/commit-graph.c:132
msgid "start walk at commits listed by stdin"
msgstr "从标准输入中的提交开始扫描"
-#: builtin/commit-graph.c:112
+#: builtin/commit-graph.c:134
msgid "include all commits already in the commit-graph file"
msgstr "包含 commit-graph 文件中已有所有提交"
-#: builtin/commit-graph.c:115
+#: builtin/commit-graph.c:137
msgid "allow writing an incremental commit-graph file"
msgstr "允许写一个增量提交图形文件"
-#: builtin/commit-graph.c:117 builtin/commit-graph.c:121
+#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
msgid "maximum number of commits in a non-base split commit-graph"
msgstr "在非基本拆分提交图形中的最大提交数"
-#: builtin/commit-graph.c:119
+#: builtin/commit-graph.c:141
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "一个拆分提交图形的两个级别之间的最大比率"
-#: builtin/commit-graph.c:137
+#: builtin/commit-graph.c:159
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
@@ -12396,205 +12792,209 @@ msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
msgid "git config [<options>]"
msgstr "git config [<选项>]"
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:104 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "未能识别的 --type 参数,%s"
-#: builtin/config.c:115
+#: builtin/config.c:116
msgid "only one type at a time"
msgstr "一次只能一个类型"
-#: builtin/config.c:124
+#: builtin/config.c:125
msgid "Config file location"
msgstr "配置文件位置"
-#: builtin/config.c:125
+#: builtin/config.c:126
msgid "use global config file"
msgstr "使用全局配置文件"
-#: builtin/config.c:126
+#: builtin/config.c:127
msgid "use system config file"
msgstr "使用系统级配置文件"
-#: builtin/config.c:127
+#: builtin/config.c:128
msgid "use repository config file"
msgstr "使用仓库级配置文件"
-#: builtin/config.c:128
+#: builtin/config.c:129
msgid "use per-worktree config file"
msgstr "使用工作区级别的配置文件"
-#: builtin/config.c:129
+#: builtin/config.c:130
msgid "use given config file"
msgstr "使用指定的配置文件"
-#: builtin/config.c:130
+#: builtin/config.c:131
msgid "blob-id"
msgstr "数据对象 ID"
-#: builtin/config.c:130
+#: builtin/config.c:131
msgid "read config from given blob object"
msgstr "从给定的数据对象读取配置"
-#: builtin/config.c:131
+#: builtin/config.c:132
msgid "Action"
msgstr "操作"
-#: builtin/config.c:132
+#: builtin/config.c:133
msgid "get value: name [value-regex]"
msgstr "获取值:name [value-regex]"
-#: builtin/config.c:133
+#: builtin/config.c:134
msgid "get all values: key [value-regex]"
msgstr "获得所有的值:key [value-regex]"
-#: builtin/config.c:134
+#: builtin/config.c:135
msgid "get values for regexp: name-regex [value-regex]"
msgstr "根据正则表达式获得值:name-regex [value-regex]"
-#: builtin/config.c:135
+#: builtin/config.c:136
msgid "get value specific for the URL: section[.var] URL"
msgstr "获得 URL 取值:section[.var] URL"
-#: builtin/config.c:136
+#: builtin/config.c:137
msgid "replace all matching variables: name value [value_regex]"
msgstr "替换所有匹配的变量:name value [value_regex]"
-#: builtin/config.c:137
+#: builtin/config.c:138
msgid "add a new variable: name value"
msgstr "添加一个新的变量:name value"
-#: builtin/config.c:138
+#: builtin/config.c:139
msgid "remove a variable: name [value-regex]"
msgstr "删除一个变量:name [value-regex]"
-#: builtin/config.c:139
+#: builtin/config.c:140
msgid "remove all matches: name [value-regex]"
msgstr "删除所有匹配项:name [value-regex]"
-#: builtin/config.c:140
+#: builtin/config.c:141
msgid "rename section: old-name new-name"
msgstr "重命名小节:old-name new-name"
-#: builtin/config.c:141
+#: builtin/config.c:142
msgid "remove a section: name"
msgstr "删除一个小节:name"
-#: builtin/config.c:142
+#: builtin/config.c:143
msgid "list all"
msgstr "列出所有"
-#: builtin/config.c:143
+#: builtin/config.c:144
msgid "open an editor"
msgstr "打开一个编辑器"
-#: builtin/config.c:144
+#: builtin/config.c:145
msgid "find the color configured: slot [default]"
msgstr "获得配置的颜色:配置 [默认]"
-#: builtin/config.c:145
+#: builtin/config.c:146
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "获得颜色设置:配置 [stdout-is-tty]"
-#: builtin/config.c:146
+#: builtin/config.c:147
msgid "Type"
msgstr "类型"
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:148 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "取值为该类型"
-#: builtin/config.c:148
+#: builtin/config.c:149
msgid "value is \"true\" or \"false\""
msgstr "值是 \"true\" 或 \"false\""
-#: builtin/config.c:149
+#: builtin/config.c:150
msgid "value is decimal number"
msgstr "值是十进制数"
-#: builtin/config.c:150
+#: builtin/config.c:151
msgid "value is --bool or --int"
msgstr "值是 --bool or --int"
-#: builtin/config.c:151
+#: builtin/config.c:152
msgid "value is a path (file or directory name)"
msgstr "值是一个路径(文件或目录名)"
-#: builtin/config.c:152
+#: builtin/config.c:153
msgid "value is an expiry date"
msgstr "值是一个到期日期"
-#: builtin/config.c:153
+#: builtin/config.c:154
msgid "Other"
msgstr "其它"
-#: builtin/config.c:154
+#: builtin/config.c:155
msgid "terminate values with NUL byte"
msgstr "终止值是 NUL 字节"
-#: builtin/config.c:155
+#: builtin/config.c:156
msgid "show variable names only"
msgstr "只显示变量名"
-#: builtin/config.c:156
+#: builtin/config.c:157
msgid "respect include directives on lookup"
msgstr "查询时参照 include 指令递归查找"
-#: builtin/config.c:157
+#: builtin/config.c:158
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:159
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr "显示配置的范围(工作区、本地、全局、系统、命令)"
+
+#: builtin/config.c:160 builtin/env--helper.c:40
msgid "value"
msgstr "取值"
-#: builtin/config.c:158
+#: builtin/config.c:160
msgid "with --get, use default value when missing entry"
msgstr "使用 --get 参数,当缺少设置时使用默认值"
-#: builtin/config.c:172
+#: builtin/config.c:174
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "错误的参数个数,应该为 %d 个"
-#: builtin/config.c:174
+#: builtin/config.c:176
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "错误的参数个数,应该为从 %d 个到 %d 个"
-#: builtin/config.c:308
+#: builtin/config.c:324
#, c-format
msgid "invalid key pattern: %s"
msgstr "无效键名模式:%s"
-#: builtin/config.c:344
+#: builtin/config.c:360
#, c-format
msgid "failed to format default config value: %s"
msgstr "格式化默认配置值失败:%s"
-#: builtin/config.c:401
+#: builtin/config.c:417
#, c-format
msgid "cannot parse color '%s'"
msgstr "无法解析颜色 '%s'"
-#: builtin/config.c:443
+#: builtin/config.c:459
msgid "unable to parse default color value"
msgstr "无法解析默认颜色值"
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:512 builtin/config.c:768
msgid "not in a git directory"
msgstr "不在 git 仓库中"
-#: builtin/config.c:499
+#: builtin/config.c:515
msgid "writing to stdin is not supported"
msgstr "不支持写到标准输入"
-#: builtin/config.c:502
+#: builtin/config.c:518
msgid "writing config blobs is not supported"
msgstr "不支持写到配置数据对象"
-#: builtin/config.c:587
+#: builtin/config.c:603
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -12609,23 +13009,23 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:611
+#: builtin/config.c:627
msgid "only one config file at a time"
msgstr "一次只能有一个配置文件"
-#: builtin/config.c:616
+#: builtin/config.c:632
msgid "--local can only be used inside a git repository"
msgstr "--local 只能在一个仓库内使用"
-#: builtin/config.c:619
+#: builtin/config.c:635
msgid "--blob can only be used inside a git repository"
msgstr "--blob 只能在一个仓库内使用"
-#: builtin/config.c:638
+#: builtin/config.c:655
msgid "$HOME not set"
msgstr "$HOME 未设置"
-#: builtin/config.c:658
+#: builtin/config.c:679
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12634,51 +13034,51 @@ msgstr ""
"不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n"
"详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
-#: builtin/config.c:688
+#: builtin/config.c:714
msgid "--get-color and variable type are incoherent"
msgstr "--get-color 和变量类型不兼容"
-#: builtin/config.c:693
+#: builtin/config.c:719
msgid "only one action at a time"
msgstr "一次只能有一个动作"
-#: builtin/config.c:706
+#: builtin/config.c:732
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only 仅适用于 --list 或 --get-regexp"
-#: builtin/config.c:712
+#: builtin/config.c:738
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:718
+#: builtin/config.c:744
msgid "--default is only applicable to --get"
msgstr "--default 仅适用于 --get"
-#: builtin/config.c:731
+#: builtin/config.c:757
#, c-format
msgid "unable to read config file '%s'"
msgstr "无法读取配置文件 '%s'"
-#: builtin/config.c:734
+#: builtin/config.c:760
msgid "error processing config file(s)"
msgstr "处理配置文件出错"
-#: builtin/config.c:744
+#: builtin/config.c:770
msgid "editing stdin is not supported"
msgstr "不支持编辑标准输入"
-#: builtin/config.c:746
+#: builtin/config.c:772
msgid "editing blobs is not supported"
msgstr "不支持编辑数据对象"
-#: builtin/config.c:760
+#: builtin/config.c:786
#, c-format
msgid "cannot create configuration file %s"
msgstr "不能创建配置文件 %s"
-#: builtin/config.c:773
+#: builtin/config.c:799
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -12687,7 +13087,7 @@ msgstr ""
"无法用一个值覆盖多个值\n"
" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:873 builtin/config.c:884
#, c-format
msgid "no such section: %s"
msgstr "无此小节:%s"
@@ -12745,12 +13145,12 @@ msgstr "没有标签准确匹配 '%s'"
msgid "No exact match on refs or tags, searching to describe\n"
msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n"
-#: builtin/describe.c:381
+#: builtin/describe.c:394
#, c-format
msgid "finished search at %s\n"
msgstr "完成搜索 %s\n"
-#: builtin/describe.c:407
+#: builtin/describe.c:421
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -12759,7 +13159,7 @@ msgstr ""
"没有附注标签能描述 '%s'。\n"
"然而,存在未附注标签:尝试 --tags。"
-#: builtin/describe.c:411
+#: builtin/describe.c:425
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -12768,12 +13168,12 @@ msgstr ""
"没有标签能描述 '%s'。\n"
"尝试 --always,或者创建一些标签。"
-#: builtin/describe.c:441
+#: builtin/describe.c:455
#, c-format
msgid "traversed %lu commits\n"
msgstr "已遍历 %lu 个提交\n"
-#: builtin/describe.c:444
+#: builtin/describe.c:458
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -12782,90 +13182,90 @@ msgstr ""
"发现多于 %i 个标签,列出最近的 %i 个\n"
"在 %s 放弃搜索\n"
-#: builtin/describe.c:512
+#: builtin/describe.c:526
#, c-format
msgid "describe %s\n"
msgstr "描述 %s\n"
-#: builtin/describe.c:515
+#: builtin/describe.c:529
#, c-format
msgid "Not a valid object name %s"
msgstr "不是一个有效的对象名 %s"
-#: builtin/describe.c:523
+#: builtin/describe.c:537
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s 既不是提交也不是数据对象"
-#: builtin/describe.c:537
+#: builtin/describe.c:551
msgid "find the tag that comes after the commit"
msgstr "寻找该提交之后的标签"
-#: builtin/describe.c:538
+#: builtin/describe.c:552
msgid "debug search strategy on stderr"
msgstr "在标准错误上调试搜索策略"
-#: builtin/describe.c:539
+#: builtin/describe.c:553
msgid "use any ref"
msgstr "使用任意引用"
-#: builtin/describe.c:540
+#: builtin/describe.c:554
msgid "use any tag, even unannotated"
msgstr "使用任意标签,即使未附带注释"
-#: builtin/describe.c:541
+#: builtin/describe.c:555
msgid "always use long format"
msgstr "始终使用长提交号格式"
-#: builtin/describe.c:542
+#: builtin/describe.c:556
msgid "only follow first parent"
msgstr "只跟随第一个父提交"
-#: builtin/describe.c:545
+#: builtin/describe.c:559
msgid "only output exact matches"
msgstr "只输出精确匹配"
-#: builtin/describe.c:547
+#: builtin/describe.c:561
msgid "consider <n> most recent tags (default: 10)"
msgstr "考虑最近 <n> 个标签(默认:10)"
-#: builtin/describe.c:549
+#: builtin/describe.c:563
msgid "only consider tags matching <pattern>"
msgstr "只考虑匹配 <模式> 的标签"
-#: builtin/describe.c:551
+#: builtin/describe.c:565
msgid "do not consider tags matching <pattern>"
msgstr "不考虑匹配 <模式> 的标签"
-#: builtin/describe.c:553 builtin/name-rev.c:473
+#: builtin/describe.c:567 builtin/name-rev.c:535
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的提交号作为后备"
-#: builtin/describe.c:554 builtin/describe.c:557
+#: builtin/describe.c:568 builtin/describe.c:571
msgid "mark"
msgstr "标记"
-#: builtin/describe.c:555
+#: builtin/describe.c:569
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
-#: builtin/describe.c:558
+#: builtin/describe.c:572
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
-#: builtin/describe.c:576
+#: builtin/describe.c:590
msgid "--long is incompatible with --abbrev=0"
msgstr "--long 与 --abbrev=0 不兼容"
-#: builtin/describe.c:605
+#: builtin/describe.c:619
msgid "No names found, cannot describe anything."
msgstr "没有发现名称,无法描述任何东西。"
-#: builtin/describe.c:656
+#: builtin/describe.c:670
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty 与提交号不兼容"
-#: builtin/describe.c:658
+#: builtin/describe.c:672
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken 与提交号不兼容"
@@ -13042,7 +13442,7 @@ msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型,不
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:852
+#: builtin/fast-export.c:853
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr "错误:除非指定 --mark-tags,否则无法导出嵌套标签。"
@@ -13138,19 +13538,19 @@ msgstr "git fetch --all [<选项>]"
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel 不能为负数"
-#: builtin/fetch.c:139 builtin/pull.c:204
+#: builtin/fetch.c:139 builtin/pull.c:184
msgid "fetch from all remotes"
msgstr "从所有的远程抓取"
-#: builtin/fetch.c:141 builtin/pull.c:248
+#: builtin/fetch.c:141 builtin/pull.c:228
msgid "set upstream for git pull/fetch"
msgstr "为 git pull/fetch 设置上游"
-#: builtin/fetch.c:143 builtin/pull.c:207
+#: builtin/fetch.c:143 builtin/pull.c:187
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
-#: builtin/fetch.c:145 builtin/pull.c:210
+#: builtin/fetch.c:145 builtin/pull.c:190
msgid "path to upload pack on remote end"
msgstr "上传包到远程的路径"
@@ -13162,7 +13562,7 @@ msgstr "强制覆盖本地引用"
msgid "fetch from multiple remotes"
msgstr "从多个远程抓取"
-#: builtin/fetch.c:150 builtin/pull.c:214
+#: builtin/fetch.c:150 builtin/pull.c:194
msgid "fetch all tags and associated objects"
msgstr "抓取所有的标签和关联对象"
@@ -13174,7 +13574,7 @@ msgstr "不抓取任何标签(--no-tags)"
msgid "number of submodules fetched in parallel"
msgstr "子模组获取的并发数"
-#: builtin/fetch.c:156 builtin/pull.c:217
+#: builtin/fetch.c:156 builtin/pull.c:197
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除远程已经不存在的分支的跟踪分支"
@@ -13183,7 +13583,7 @@ msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "清除远程不存在的本地标签,并且替换变更标签"
# 译者:可选值,不能翻译
-#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:141
+#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
msgid "on-demand"
msgstr "on-demand"
@@ -13191,7 +13591,7 @@ msgstr "on-demand"
msgid "control recursive fetching of submodules"
msgstr "控制子模组的递归抓取"
-#: builtin/fetch.c:164 builtin/pull.c:225
+#: builtin/fetch.c:164 builtin/pull.c:205
msgid "keep downloaded pack"
msgstr "保持下载包"
@@ -13199,7 +13599,7 @@ msgstr "保持下载包"
msgid "allow updating of HEAD ref"
msgstr "允许更新 HEAD 引用"
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:228
+#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
msgid "deepen history of shallow clone"
msgstr "深化浅克隆的历史"
@@ -13207,7 +13607,7 @@ msgstr "深化浅克隆的历史"
msgid "deepen history of shallow repository based on time"
msgstr "基于时间来深化浅克隆的历史"
-#: builtin/fetch.c:177 builtin/pull.c:231
+#: builtin/fetch.c:177 builtin/pull.c:211
msgid "convert to a complete repository"
msgstr "转换为一个完整的仓库"
@@ -13221,15 +13621,15 @@ msgid ""
"files)"
msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
-#: builtin/fetch.c:187 builtin/pull.c:234
+#: builtin/fetch.c:187 builtin/pull.c:214
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:188 builtin/pull.c:236
+#: builtin/fetch.c:188 builtin/pull.c:216
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:189 builtin/pull.c:237
+#: builtin/fetch.c:189 builtin/pull.c:217
msgid "specify fetch refmap"
msgstr "指定获取操作的引用映射"
@@ -13241,7 +13641,7 @@ msgstr "报告我们只拥有从该对象开始可达的对象"
msgid "run 'gc --auto' after fetching"
msgstr "获取后执行 'gc --auto'"
-#: builtin/fetch.c:201 builtin/pull.c:246
+#: builtin/fetch.c:201 builtin/pull.c:226
msgid "check for forced-updates on all updated branches"
msgstr "在所有更新分支上检查强制更新"
@@ -13329,22 +13729,22 @@ msgstr ""
"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:920
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必需的对象\n"
-#: builtin/fetch.c:932
+#: builtin/fetch.c:941
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆不允许被更新"
-#: builtin/fetch.c:1017 builtin/fetch.c:1155
+#: builtin/fetch.c:1026 builtin/fetch.c:1164
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
-#: builtin/fetch.c:1028
+#: builtin/fetch.c:1037
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -13354,57 +13754,57 @@ msgstr ""
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者:注意保持前导空格
-#: builtin/fetch.c:1125
+#: builtin/fetch.c:1134
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s 将成为悬空状态)"
# 译者:注意保持前导空格
-#: builtin/fetch.c:1126
+#: builtin/fetch.c:1135
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s 已成为悬空状态)"
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1167
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:1159 builtin/remote.c:1035
+#: builtin/fetch.c:1168 builtin/remote.c:1112
msgid "(none)"
msgstr "(无)"
-#: builtin/fetch.c:1182
+#: builtin/fetch.c:1191
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非纯仓库的当前分支 %s"
-#: builtin/fetch.c:1201
+#: builtin/fetch.c:1210
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:1204
+#: builtin/fetch.c:1213
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:1412
+#: builtin/fetch.c:1421
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "检测到多分支,和 --set-upstream 不兼容"
-#: builtin/fetch.c:1427
+#: builtin/fetch.c:1436
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "没有为一个远程跟踪分支设置上游"
-#: builtin/fetch.c:1429
+#: builtin/fetch.c:1438
msgid "not setting upstream for a remote tag"
msgstr "没有为一个远程标签设置上游"
-#: builtin/fetch.c:1431
+#: builtin/fetch.c:1440
msgid "unknown branch type"
msgstr "未知的分支类型"
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1442
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -13412,65 +13812,65 @@ msgstr ""
"未发现源分支。\n"
"您需要使用 --set-upstream 选项指定一个分支。"
-#: builtin/fetch.c:1559 builtin/fetch.c:1622
+#: builtin/fetch.c:1568 builtin/fetch.c:1631
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
-#: builtin/fetch.c:1569 builtin/fetch.c:1624 builtin/remote.c:100
+#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"
-#: builtin/fetch.c:1581
+#: builtin/fetch.c:1590
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "无法获取 '%s'(退出码:%d)\n"
-#: builtin/fetch.c:1684
+#: builtin/fetch.c:1693
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
-#: builtin/fetch.c:1721
+#: builtin/fetch.c:1730
msgid "You need to specify a tag name."
msgstr "您需要指定一个标签名称。"
-#: builtin/fetch.c:1771
+#: builtin/fetch.c:1780
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 不支持负数深度"
-#: builtin/fetch.c:1773
+#: builtin/fetch.c:1782
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen 和 --depth 是互斥的"
-#: builtin/fetch.c:1778
+#: builtin/fetch.c:1787
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同时使用"
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1789
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
-#: builtin/fetch.c:1796
+#: builtin/fetch.c:1805
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/fetch.c:1798
+#: builtin/fetch.c:1807
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1816
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组:%s"
-#: builtin/fetch.c:1814
+#: builtin/fetch.c:1823
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义"
-#: builtin/fetch.c:1832
+#: builtin/fetch.c:1841
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -13481,23 +13881,23 @@ msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:671
msgid "populate log with at most <n> entries from shortlog"
msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:674
msgid "alias for --log (deprecated)"
msgstr "参数 --log 的别名(已弃用)"
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:677
msgid "text"
msgstr "文本"
-#: builtin/fmt-merge-msg.c:681
+#: builtin/fmt-merge-msg.c:678
msgid "use <text> as start of message"
msgstr "使用 <文本> 作为提交说明的开始"
-#: builtin/fmt-merge-msg.c:682
+#: builtin/fmt-merge-msg.c:679
msgid "file to read from"
msgstr "从文件中读取"
@@ -13705,7 +14105,7 @@ msgstr "正在检查对象目录"
msgid "Checking %s link"
msgstr "正在检查 %s 链接"
-#: builtin/fsck.c:695 builtin/index-pack.c:842
+#: builtin/fsck.c:695 builtin/index-pack.c:843
#, c-format
msgid "invalid %s"
msgstr "无效的 %s"
@@ -13899,7 +14299,7 @@ msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
-#: builtin/grep.c:29
+#: builtin/grep.c:30
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
@@ -13917,259 +14317,259 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2708
+#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
+#: builtin/pack-objects.c:2854
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支持,忽略 %s"
-#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635
+#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树(%s)"
-#: builtin/grep.c:650
+#: builtin/grep.c:633
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/grep.c:716
+#: builtin/grep.c:704
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:815
+#: builtin/grep.c:803
msgid "search in index instead of in the work tree"
msgstr "在索引区搜索而不是在工作区"
-#: builtin/grep.c:817
+#: builtin/grep.c:805
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的内容中查找"
# 译者:中文字符串拼接,可删除前导空格
-#: builtin/grep.c:819
+#: builtin/grep.c:807
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/grep.c:821
+#: builtin/grep.c:809
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/grep.c:823
+#: builtin/grep.c:811
msgid "recursively search in each submodule"
msgstr "在每一个子模组中递归搜索"
-#: builtin/grep.c:826
+#: builtin/grep.c:814
msgid "show non-matching lines"
msgstr "显示未匹配的行"
-#: builtin/grep.c:828
+#: builtin/grep.c:816
msgid "case insensitive matching"
msgstr "不区分大小写匹配"
-#: builtin/grep.c:830
+#: builtin/grep.c:818
msgid "match patterns only at word boundaries"
msgstr "只在单词边界匹配模式"
-#: builtin/grep.c:832
+#: builtin/grep.c:820
msgid "process binary files as text"
msgstr "把二进制文件当做文本处理"
-#: builtin/grep.c:834
+#: builtin/grep.c:822
msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
-#: builtin/grep.c:837
+#: builtin/grep.c:825
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/grep.c:839
+#: builtin/grep.c:827
msgid "search in subdirectories (default)"
msgstr "在子目录中寻找(默认)"
-#: builtin/grep.c:841
+#: builtin/grep.c:829
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
-#: builtin/grep.c:845
+#: builtin/grep.c:833
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/grep.c:848
+#: builtin/grep.c:836
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式(默认)"
-#: builtin/grep.c:851
+#: builtin/grep.c:839
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
-#: builtin/grep.c:854
+#: builtin/grep.c:842
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/grep.c:857
+#: builtin/grep.c:845
msgid "show line numbers"
msgstr "显示行号"
-#: builtin/grep.c:858
+#: builtin/grep.c:846
msgid "show column number of first match"
msgstr "显示第一个匹配的列号"
-#: builtin/grep.c:859
+#: builtin/grep.c:847
msgid "don't show filenames"
msgstr "不显示文件名"
-#: builtin/grep.c:860
+#: builtin/grep.c:848
msgid "show filenames"
msgstr "显示文件名"
-#: builtin/grep.c:862
+#: builtin/grep.c:850
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/grep.c:864
+#: builtin/grep.c:852
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
-#: builtin/grep.c:866
+#: builtin/grep.c:854
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
-#: builtin/grep.c:869
+#: builtin/grep.c:857
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
-#: builtin/grep.c:871
+#: builtin/grep.c:859
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
-#: builtin/grep.c:874
+#: builtin/grep.c:862
msgid "show only matching parts of a line"
msgstr "只显示行中的匹配的部分"
-#: builtin/grep.c:876
+#: builtin/grep.c:864
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数,而不显示匹配的行"
-#: builtin/grep.c:877
+#: builtin/grep.c:865
msgid "highlight matches"
msgstr "高亮显示匹配项"
-#: builtin/grep.c:879
+#: builtin/grep.c:867
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/grep.c:881
+#: builtin/grep.c:869
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/grep.c:884
+#: builtin/grep.c:872
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/grep.c:887
+#: builtin/grep.c:875
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/grep.c:889
+#: builtin/grep.c:877
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/grep.c:891
+#: builtin/grep.c:879
msgid "use <n> worker threads"
msgstr "使用 <n> 个工作线程"
-#: builtin/grep.c:892
+#: builtin/grep.c:880
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
-#: builtin/grep.c:895
+#: builtin/grep.c:883
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
-#: builtin/grep.c:897
+#: builtin/grep.c:885
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
-#: builtin/grep.c:900
+#: builtin/grep.c:888
msgid "read patterns from file"
msgstr "从文件读取模式"
-#: builtin/grep.c:902
+#: builtin/grep.c:890
msgid "match <pattern>"
msgstr "匹配 <模式>"
-#: builtin/grep.c:904
+#: builtin/grep.c:892
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
-#: builtin/grep.c:916
+#: builtin/grep.c:904
msgid "indicate hit with exit status without output"
msgstr "不输出,而用退出码标识命中状态"
-#: builtin/grep.c:918
+#: builtin/grep.c:906
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
-#: builtin/grep.c:920
+#: builtin/grep.c:908
msgid "show parse tree for grep expression"
msgstr "显示 grep 表达式的解析树"
-#: builtin/grep.c:924
+#: builtin/grep.c:912
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:924
+#: builtin/grep.c:912
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
-#: builtin/grep.c:928
+#: builtin/grep.c:916
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)(本次构建忽略)"
-#: builtin/grep.c:992
+#: builtin/grep.c:983
msgid "no pattern given"
msgstr "未提供匹配模式"
-#: builtin/grep.c:1028
+#: builtin/grep.c:1019
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同时使用"
-#: builtin/grep.c:1036
+#: builtin/grep.c:1027
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本:%s"
-#: builtin/grep.c:1067
+#: builtin/grep.c:1057
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked 不支持和 --recurse-submodules 共用"
+
+#: builtin/grep.c:1061
msgid "invalid option combination, ignoring --threads"
msgstr "无效的选项组合,忽略 --threads"
-#: builtin/grep.c:1070 builtin/pack-objects.c:3400
+#: builtin/grep.c:1064 builtin/pack-objects.c:3547
msgid "no threads support, ignoring --threads"
msgstr "没有线程支持,忽略 --threads"
-#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
+#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效(%d)"
-#: builtin/grep.c:1096
+#: builtin/grep.c:1101
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:1119
-msgid "option not supported with --recurse-submodules"
-msgstr "选项不支持和 --recurse-submodules 共用"
-
-#: builtin/grep.c:1125
+#: builtin/grep.c:1127
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1133
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
-#: builtin/grep.c:1139
+#: builtin/grep.c:1141
msgid "both --cached and trees are given"
msgstr "同时给出了 --cached 和树对象"
@@ -14353,7 +14753,7 @@ msgstr "输入上的读错误"
msgid "used more bytes than were available"
msgstr "用掉了超过可用的字节"
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:288 builtin/pack-objects.c:606
msgid "pack too large for current definition of off_t"
msgstr "包太大超过了当前 off_t 的定义"
@@ -14413,191 +14813,191 @@ msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
msgid "serious inflate inconsistency"
msgstr "解压缩严重的不一致"
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
+#: builtin/index-pack.c:804 builtin/index-pack.c:813
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "发现 %s 出现 SHA1 冲突!"
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: builtin/index-pack.c:738 builtin/pack-objects.c:158
+#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
#, c-format
msgid "unable to read %s"
msgstr "不能读 %s"
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:802
#, c-format
msgid "cannot read existing object info %s"
msgstr "不能读取现存对象信息 %s"
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:810
#, c-format
msgid "cannot read existing object %s"
msgstr "不能读取现存对象 %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
#, c-format
msgid "invalid blob object %s"
msgstr "无效的数据对象 %s"
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:827 builtin/index-pack.c:846
msgid "fsck error in packed object"
msgstr "对打包对象 fsck 检查出错"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:848
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子对象并非都可达"
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:920 builtin/index-pack.c:951
msgid "failed to apply delta"
msgstr "应用 delta 失败"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
msgid "Receiving objects"
msgstr "接收对象中"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
msgid "Indexing objects"
msgstr "索引对象中"
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包冲突(SHA1 不匹配)"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr "不能对包文件调用 fstat"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr "包的结尾有垃圾数据"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1175
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的问题"
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1198
msgid "Resolving deltas"
msgstr "处理 delta 中"
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
#, c-format
msgid "unable to create thread: %s"
msgstr "不能创建线程:%s"
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1249
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "完成 %d 个本地对象"
msgstr[1] "完成 %d 个本地对象"
-#: builtin/index-pack.c:1264
+#: builtin/index-pack.c:1267
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1271
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "包有 %d 个未解决的 delta"
msgstr[1] "包有 %d 个未解决的 delta"
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1295
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能压缩附加对象(%d)"
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1392
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s 已损坏"
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1406
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1431
#, c-format
msgid "cannot write %s file '%s'"
msgstr "无法写入 %s 文件 '%s'"
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1439
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "无法关闭已写入的 %s 文件 '%s'"
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1463
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1477
msgid "cannot store pack file"
msgstr "无法存储包文件"
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1485
msgid "cannot store index file"
msgstr "无法存储索引文件"
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
+#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "坏的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1597
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1599
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1647
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "非 delta:%d 个对象"
msgstr[1] "非 delta:%d 个对象"
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1654
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "链长 = %d: %lu 对象"
msgstr[1] "链长 = %d: %lu 对象"
-#: builtin/index-pack.c:1689
+#: builtin/index-pack.c:1693
msgid "Cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
+#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1781
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同时使用"
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1783
msgid "--stdin requires a git repository"
msgstr "--stdin 需要一个 git 仓库"
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1789
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包文件名参数"
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:581
+#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
msgid "fsck error in pack objects"
msgstr "在打包对象中 fsck 检查出错"
@@ -15299,7 +15699,7 @@ msgstr ""
msgid "do not print remote URL"
msgstr "不打印远程 URL"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1518
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
msgid "exec"
msgstr "exec"
@@ -15384,179 +15784,179 @@ msgstr "git merge --abort"
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:118
+#: builtin/merge.c:119
msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值"
-#: builtin/merge.c:141
+#: builtin/merge.c:142
#, c-format
msgid "option `%s' requires a value"
msgstr "选项 `%s' 需要一个值"
-#: builtin/merge.c:187
+#: builtin/merge.c:188
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合并策略 '%s'。\n"
-#: builtin/merge.c:188
+#: builtin/merge.c:189
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有:"
-#: builtin/merge.c:193
+#: builtin/merge.c:194
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有:"
-#: builtin/merge.c:244 builtin/pull.c:152
+#: builtin/merge.c:245 builtin/pull.c:132
msgid "do not show a diffstat at the end of the merge"
msgstr "在合并的最后不显示差异统计"
-#: builtin/merge.c:247 builtin/pull.c:155
+#: builtin/merge.c:248 builtin/pull.c:135
msgid "show a diffstat at the end of the merge"
msgstr "在合并的最后显示差异统计"
-#: builtin/merge.c:248 builtin/pull.c:158
+#: builtin/merge.c:249 builtin/pull.c:138
msgid "(synonym to --stat)"
msgstr "(和 --stat 同义)"
-#: builtin/merge.c:250 builtin/pull.c:161
+#: builtin/merge.c:251 builtin/pull.c:141
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
-#: builtin/merge.c:253 builtin/pull.c:167
+#: builtin/merge.c:254 builtin/pull.c:147
msgid "create a single commit instead of doing a merge"
msgstr "创建一个单独的提交而不是做一次合并"
-#: builtin/merge.c:255 builtin/pull.c:170
+#: builtin/merge.c:256 builtin/pull.c:150
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合并成功,执行一次提交(默认)"
-#: builtin/merge.c:257 builtin/pull.c:173
+#: builtin/merge.c:258 builtin/pull.c:153
msgid "edit message before committing"
msgstr "在提交前编辑提交说明"
-#: builtin/merge.c:259
+#: builtin/merge.c:260
msgid "allow fast-forward (default)"
msgstr "允许快进(默认)"
-#: builtin/merge.c:261 builtin/pull.c:180
+#: builtin/merge.c:262 builtin/pull.c:160
msgid "abort if fast-forward is not possible"
msgstr "如果不能快进就放弃合并"
-#: builtin/merge.c:265 builtin/pull.c:183
+#: builtin/merge.c:266 builtin/pull.c:163
msgid "verify that the named commit has a valid GPG signature"
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187
-#: builtin/rebase.c:512 builtin/rebase.c:1531 builtin/revert.c:114
+#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
+#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:267 builtin/pull.c:188
+#: builtin/merge.c:268 builtin/pull.c:168
msgid "merge strategy to use"
msgstr "要使用的合并策略"
-#: builtin/merge.c:268 builtin/pull.c:191
+#: builtin/merge.c:269 builtin/pull.c:171
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:269 builtin/pull.c:192
+#: builtin/merge.c:270 builtin/pull.c:172
msgid "option for selected merge strategy"
msgstr "所选的合并策略的选项"
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "合并的提交说明(针对非快进式合并)"
-#: builtin/merge.c:278
+#: builtin/merge.c:279
msgid "abort the current in-progress merge"
msgstr "放弃当前正在进行的合并"
#
-#: builtin/merge.c:280
+#: builtin/merge.c:281
msgid "--abort but leave index and working tree alone"
msgstr "--abort,但是保留索引和工作区"
-#: builtin/merge.c:282
+#: builtin/merge.c:283
msgid "continue the current in-progress merge"
msgstr "继续当前正在进行的合并"
-#: builtin/merge.c:284 builtin/pull.c:199
+#: builtin/merge.c:285 builtin/pull.c:179
msgid "allow merging unrelated histories"
msgstr "允许合并不相关的历史"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
-#: builtin/merge.c:307
+#: builtin/merge.c:308
msgid "could not run stash."
msgstr "不能运行贮藏。"
-#: builtin/merge.c:312
+#: builtin/merge.c:313
msgid "stash failed"
msgstr "贮藏失败"
-#: builtin/merge.c:317
+#: builtin/merge.c:318
#, c-format
msgid "not a valid object: %s"
msgstr "不是一个有效对象:%s"
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:340 builtin/merge.c:357
msgid "read-tree failed"
msgstr "读取树失败"
# 译者:注意保持前导空格
-#: builtin/merge.c:386
+#: builtin/merge.c:387
msgid " (nothing to squash)"
msgstr " (无可压缩)"
-#: builtin/merge.c:397
+#: builtin/merge.c:398
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "压缩提交 -- 未更新 HEAD\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:448
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "无合并信息 -- 未更新 HEAD\n"
-#: builtin/merge.c:498
+#: builtin/merge.c:499
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 没有指向一个提交"
-#: builtin/merge.c:585
+#: builtin/merge.c:586
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
-#: builtin/merge.c:705
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "未处理两个头合并之外的任何操作。"
-#: builtin/merge.c:719
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive 的未知选项:-X%s"
-#: builtin/merge.c:734
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "不能写 %s"
-#: builtin/merge.c:786
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "不能从 '%s' 读取"
-#: builtin/merge.c:795
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
-#: builtin/merge.c:801
+#: builtin/merge.c:804
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"
@@ -15566,83 +15966,83 @@ msgstr ""
"合并到主题分支。\n"
"\n"
-#: builtin/merge.c:806
+#: builtin/merge.c:809
msgid "An empty message aborts the commit.\n"
msgstr "空的提交说明会终止提交。\n"
-#: builtin/merge.c:809
+#: builtin/merge.c:812
#, 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:862
+#: builtin/merge.c:865
msgid "Empty commit message."
msgstr "空提交信息。"
-#: builtin/merge.c:877
+#: builtin/merge.c:880
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:938
+#: builtin/merge.c:941
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
-#: builtin/merge.c:977
+#: builtin/merge.c:980
msgid "No current branch."
msgstr "没有当前分支。"
-#: builtin/merge.c:979
+#: builtin/merge.c:982
msgid "No remote for the current branch."
msgstr "当前分支没有对应的远程仓库。"
-#: builtin/merge.c:981
+#: builtin/merge.c:984
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
-#: builtin/merge.c:986
+#: builtin/merge.c:989
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-#: builtin/merge.c:1043
+#: builtin/merge.c:1046
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
-#: builtin/merge.c:1146
+#: builtin/merge.c:1149
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合并:%s"
-#: builtin/merge.c:1180
+#: builtin/merge.c:1183
msgid "not something we can merge"
msgstr "不能合并"
-#: builtin/merge.c:1283
+#: builtin/merge.c:1286
msgid "--abort expects no arguments"
msgstr "--abort 不带参数"
-#: builtin/merge.c:1287
+#: builtin/merge.c:1290
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
-#: builtin/merge.c:1296
+#: builtin/merge.c:1299
msgid "--quit expects no arguments"
msgstr "--quit 不带参数"
-#: builtin/merge.c:1309
+#: builtin/merge.c:1312
msgid "--continue expects no arguments"
msgstr "--continue 不带参数"
-#: builtin/merge.c:1313
+#: builtin/merge.c:1316
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
-#: builtin/merge.c:1329
+#: builtin/merge.c:1332
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -15650,7 +16050,7 @@ msgstr ""
"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1336
+#: builtin/merge.c:1339
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -15658,96 +16058,96 @@ msgstr ""
"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1342
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
-#: builtin/merge.c:1353
+#: builtin/merge.c:1356
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能将 --squash 和 --no-ff 组合使用。"
-#: builtin/merge.c:1355
+#: builtin/merge.c:1358
msgid "You cannot combine --squash with --commit."
msgstr "您不能将 --squash 和 --commit 组合使用。"
-#: builtin/merge.c:1371
+#: builtin/merge.c:1374
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1388
+#: builtin/merge.c:1391
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"
-#: builtin/merge.c:1390
+#: builtin/merge.c:1393
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
-#: builtin/merge.c:1395
+#: builtin/merge.c:1398
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
-#: builtin/merge.c:1397
+#: builtin/merge.c:1400
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"
-#: builtin/merge.c:1476
+#: builtin/merge.c:1481
msgid "refusing to merge unrelated histories"
msgstr "拒绝合并无关的历史"
-#: builtin/merge.c:1485
+#: builtin/merge.c:1490
msgid "Already up to date."
msgstr "已经是最新的。"
-#: builtin/merge.c:1495
+#: builtin/merge.c:1500
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1537
+#: builtin/merge.c:1542
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
-#: builtin/merge.c:1544
+#: builtin/merge.c:1549
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1569
+#: builtin/merge.c:1574
msgid "Already up to date. Yeeah!"
msgstr "已经是最新的。耶!"
-#: builtin/merge.c:1575
+#: builtin/merge.c:1580
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进,终止。"
-#: builtin/merge.c:1598 builtin/merge.c:1663
+#: builtin/merge.c:1603 builtin/merge.c:1668
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
-#: builtin/merge.c:1602
+#: builtin/merge.c:1607
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
-#: builtin/merge.c:1654
+#: builtin/merge.c:1659
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
-#: builtin/merge.c:1656
+#: builtin/merge.c:1661
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
-#: builtin/merge.c:1665
+#: builtin/merge.c:1670
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/merge.c:1677
+#: builtin/merge.c:1682
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利,按要求在提交前停止\n"
@@ -15883,7 +16283,9 @@ msgstr "允许创建一个以上的树"
msgid ""
"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
"size=<size>)"
-msgstr "git multi-pack-index [<选项>] (write|verify|expire|repack --batch-size=<大小>)"
+msgstr ""
+"git multi-pack-index [<选项>] (write|verify|expire|repack --batch-size=<大小"
+">)"
#: builtin/multi-pack-index.c:26
msgid "object directory containing set of packfile and pack-index pairs"
@@ -15995,52 +16397,52 @@ msgstr "%s,源=%s,目标=%s"
msgid "Renaming %s to %s\n"
msgstr "重命名 %s 至 %s\n"
-#: builtin/mv.c:277 builtin/remote.c:716 builtin/repack.c:518
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
-#: builtin/name-rev.c:403
+#: builtin/name-rev.c:465
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<选项>] <提交>..."
-#: builtin/name-rev.c:404
+#: builtin/name-rev.c:466
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<选项>] --all"
-#: builtin/name-rev.c:405
+#: builtin/name-rev.c:467
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<选项>] --stdin"
-#: builtin/name-rev.c:462
+#: builtin/name-rev.c:524
msgid "print only names (no SHA-1)"
msgstr "只打印名称(无 SHA-1)"
-#: builtin/name-rev.c:463
+#: builtin/name-rev.c:525
msgid "only use tags to name the commits"
msgstr "只使用标签来命名提交"
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:527
msgid "only use refs matching <pattern>"
msgstr "只使用和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:529
msgid "ignore refs matching <pattern>"
msgstr "忽略和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:469
+#: builtin/name-rev.c:531
msgid "list all commits reachable from all refs"
msgstr "列出可以从所有引用访问的提交"
-#: builtin/name-rev.c:470
+#: builtin/name-rev.c:532
msgid "read from stdin"
msgstr "从标准输入读取"
-#: builtin/name-rev.c:471
+#: builtin/name-rev.c:533
msgid "allow to print `undefined` names (default)"
msgstr "允许打印 `未定义` 的名称(默认)"
-#: builtin/name-rev.c:477
+#: builtin/name-rev.c:539
msgid "dereference tags in the input (internal use)"
msgstr "反向解析输入中的标签(内部使用)"
@@ -16443,7 +16845,7 @@ msgstr "注解引用"
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1034 builtin/stash.c:1607
+#: builtin/notes.c:1034 builtin/stash.c:1643
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子命令:%s"
@@ -16458,124 +16860,101 @@ msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
-#: builtin/pack-objects.c:428
+#: builtin/pack-objects.c:430
#, c-format
msgid "bad packed object CRC for %s"
msgstr "%s 错的包对象 CRC"
-#: builtin/pack-objects.c:439
+#: builtin/pack-objects.c:441
#, c-format
msgid "corrupt packed object for %s"
msgstr "%s 损坏的包对象"
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c:572
#, c-format
msgid "recursive delta detected for object %s"
msgstr "发现对象 %s 递归 delta"
-#: builtin/pack-objects.c:781
+#: builtin/pack-objects.c:783
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "排序了 %u 个对象,预期 %<PRIu32> 个"
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "无效的包文件:%s"
-
-#: builtin/pack-objects.c:798
-#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "无法为重用打开包文件:%s"
-
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr "无法在重用的包文件中查找"
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "无法读取索引文件"
-
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:972
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:985
msgid "Writing objects"
msgstr "写入对象中"
-#: builtin/pack-objects.c:917 builtin/update-index.c:90
+#: builtin/pack-objects.c:1046 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "对 %s 调用 stat 失败"
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1099
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
-#: builtin/pack-objects.c:1164
+#: builtin/pack-objects.c:1297
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
-#: builtin/pack-objects.c:1592
+#: builtin/pack-objects.c:1724
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "%s 压缩中 delta 基准偏移越界"
-#: builtin/pack-objects.c:1601
+#: builtin/pack-objects.c:1733
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "%s 的 delta 基准偏移越界"
-#: builtin/pack-objects.c:1870
+#: builtin/pack-objects.c:2004
msgid "Counting objects"
msgstr "对象计数中"
-#: builtin/pack-objects.c:2000
-#, c-format
-msgid "unable to get size of %s"
-msgstr "不能得到 %s 的大小"
-
-#: builtin/pack-objects.c:2015
+#: builtin/pack-objects.c:2149
#, c-format
msgid "unable to parse object header of %s"
msgstr "无法解析对象 %s 头信息"
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101
-#: builtin/pack-objects.c:2111
+#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
+#: builtin/pack-objects.c:2245
#, c-format
msgid "object %s cannot be read"
msgstr "对象 %s 无法读取"
-#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115
+#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)"
-#: builtin/pack-objects.c:2125
+#: builtin/pack-objects.c:2259
msgid "suboptimal pack - out of memory"
msgstr "次优(suboptimal)打包 - 内存不足"
-#: builtin/pack-objects.c:2440
+#: builtin/pack-objects.c:2574
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "使用 %d 个线程进行压缩"
-#: builtin/pack-objects.c:2572
+#: builtin/pack-objects.c:2713
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "无法为标签 %s 压缩对象"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2801
msgid "Compressing objects"
msgstr "压缩对象中"
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2807
msgid "inconsistency with delta count"
msgstr "不一致的差异计数"
-#: builtin/pack-objects.c:2742
+#: builtin/pack-objects.c:2888
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -16584,7 +16963,7 @@ msgstr ""
"预期边界对象(edge object)ID,却得到垃圾数据:\n"
" %s"
-#: builtin/pack-objects.c:2748
+#: builtin/pack-objects.c:2894
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -16593,229 +16972,233 @@ msgstr ""
"预期对象 ID,却得到垃圾数据:\n"
" %s"
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:2992
msgid "invalid value for --missing"
msgstr "选项 --missing 的值无效"
-#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013
+#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
msgid "cannot open pack index"
msgstr "无法打开包文件索引"
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:3082
#, c-format
msgid "loose object at %s could not be examined"
msgstr "无法检查 %s 处的松散对象"
-#: builtin/pack-objects.c:3021
+#: builtin/pack-objects.c:3167
msgid "unable to force loose object"
msgstr "无法强制松散对象"
-#: builtin/pack-objects.c:3113
+#: builtin/pack-objects.c:3260
#, c-format
msgid "not a rev '%s'"
msgstr "不是一个版本 '%s'"
-#: builtin/pack-objects.c:3116
+#: builtin/pack-objects.c:3263
#, c-format
msgid "bad revision '%s'"
msgstr "坏的版本 '%s'"
-#: builtin/pack-objects.c:3141
+#: builtin/pack-objects.c:3288
msgid "unable to add recent objects"
msgstr "无法添加最近的对象"
-#: builtin/pack-objects.c:3194
+#: builtin/pack-objects.c:3341
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"
-#: builtin/pack-objects.c:3198
+#: builtin/pack-objects.c:3345
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"
-#: builtin/pack-objects.c:3236
+#: builtin/pack-objects.c:3383
msgid "<version>[,<offset>]"
msgstr "<版本>[,<偏移>]"
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3384
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本来写包索引文件"
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3387
msgid "maximum size of each output pack file"
msgstr "每个输出包的最大尺寸"
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3389
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从备用对象存储里借用对象"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3391
msgid "ignore packed objects"
msgstr "忽略包对象"
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3393
msgid "limit pack window by objects"
msgstr "限制打包窗口的对象数"
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3395
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数量限制外设置打包窗口的内存限制"
-#: builtin/pack-objects.c:3250
+#: builtin/pack-objects.c:3397
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允许的 delta 链的最大长度"
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3399
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3401
msgid "reuse existing objects"
msgstr "重用已存在的对象"
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3403
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3405
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹配"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3407
msgid "do not create an empty pack output"
msgstr "不创建空的包输出"
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3409
msgid "read revision arguments from standard input"
msgstr "从标准输入读取版本号参数"
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3411
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的对象"
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3414
msgid "include objects reachable from any reference"
msgstr "包括可以从任何引用访问到的对象"
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3417
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3420
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的对象"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3423
msgid "output pack to stdout"
msgstr "输出包到标准输出"
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3425
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包对象的标签对象"
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3427
msgid "keep unreachable objects"
msgstr "维持不可达的对象"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3429
msgid "pack loose unreachable objects"
msgstr "打包松散的不可达对象"
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3431
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3434
msgid "use the sparse reachability algorithm"
msgstr "使用稀疏可达性算法"
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3436
msgid "create thin packs"
msgstr "创建精简包"
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3438
msgid "create packs suitable for shallow fetches"
msgstr "创建适合浅克隆仓库获取的包"
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3440
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 文件的包"
-#: builtin/pack-objects.c:3295
+#: builtin/pack-objects.c:3442
msgid "ignore this pack"
msgstr "忽略该 pack"
-#: builtin/pack-objects.c:3297
+#: builtin/pack-objects.c:3444
msgid "pack compression level"
msgstr "打包压缩级别"
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3446
msgid "do not hide commits by grafts"
msgstr "显示被移植隐藏的提交"
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3448
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3450
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同时创建 bitmap 索引"
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3454
msgid "write a bitmap index if possible"
msgstr "如果可能,写 bitmap 索引"
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3458
msgid "handling for missing objects"
msgstr "处理丢失的对象"
-#: builtin/pack-objects.c:3314
+#: builtin/pack-objects.c:3461
msgid "do not pack objects in promisor packfiles"
msgstr "不要打包 promisor 包文件中的对象"
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3463
msgid "respect islands during delta compression"
msgstr "在增量压缩时参考数据岛"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3492
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "增量链深度 %d 太深了,强制为 %d"
-#: builtin/pack-objects.c:3350
+#: builtin/pack-objects.c:3497
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d"
-#: builtin/pack-objects.c:3404
+#: builtin/pack-objects.c:3551
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
-#: builtin/pack-objects.c:3406
+#: builtin/pack-objects.c:3553
msgid "minimum pack size limit is 1 MiB"
msgstr "最小的包文件大小是 1 MiB"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3558
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin 不能用于创建一个可索引包"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3561
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3567
msgid "cannot use --filter without --stdout"
msgstr "不能在没有 --stdout 的情况下使用 --filter"
-#: builtin/pack-objects.c:3481
+#: builtin/pack-objects.c:3627
msgid "Enumerating objects"
msgstr "枚举对象"
-#: builtin/pack-objects.c:3511
+#: builtin/pack-objects.c:3657
#, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
-msgstr "总共 %<PRIu32> (差异 %<PRIu32>),复用 %<PRIu32> (差异 %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"总共 %<PRIu32>(差异 %<PRIu32>),复用 %<PRIu32>(差异 %<PRIu32>),包复用 "
+"%<PRIu32>"
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
@@ -16857,70 +17240,70 @@ msgstr "限制遍历 promisor 包以外的对象"
msgid "cannot prune in a precious-objects repo"
msgstr "不能在珍品仓库中执行清理操作"
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
#, c-format
msgid "Invalid value for %s: %s"
msgstr "%s 的值无效:%s"
-#: builtin/pull.c:88
+#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/pull.c:142
+#: builtin/pull.c:122
msgid "control for recursive fetching of submodules"
msgstr "控制子模组的递归获取"
-#: builtin/pull.c:146
+#: builtin/pull.c:126
msgid "Options related to merging"
msgstr "和合并相关的选项"
-#: builtin/pull.c:149
+#: builtin/pull.c:129
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用变基操作取代合并操作以合入修改"
-#: builtin/pull.c:177 builtin/rebase.c:467 builtin/revert.c:126
+#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "允许快进式"
-#: builtin/pull.c:186
+#: builtin/pull.c:166
msgid "automatically stash/stash pop before and after rebase"
msgstr "变基操作前后执行自动贮藏和弹出贮藏"
-#: builtin/pull.c:202
+#: builtin/pull.c:182
msgid "Options related to fetching"
msgstr "和获取相关的参数"
-#: builtin/pull.c:212
+#: builtin/pull.c:192
msgid "force overwrite of local branch"
msgstr "强制覆盖本地分支"
-#: builtin/pull.c:220
+#: builtin/pull.c:200
msgid "number of submodules pulled in parallel"
msgstr "并发拉取的子模组的数量"
-#: builtin/pull.c:320
+#: builtin/pull.c:300
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff 的取值无效:%s"
-#: builtin/pull.c:437
+#: builtin/pull.c:426
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
-#: builtin/pull.c:439
+#: builtin/pull.c:428
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
-#: builtin/pull.c:440
+#: builtin/pull.c:429
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
-#: builtin/pull.c:443
+#: builtin/pull.c:432
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -16930,42 +17313,42 @@ msgstr ""
"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
-#: builtin/pull.c:448 builtin/rebase.c:1375 git-parse-remote.sh:73
+#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "您当前不在一个分支上。"
-#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79
+#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "请指定您要变基到哪一个分支。"
-#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82
+#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "请指定您要合并哪一个分支。"
-#: builtin/pull.c:453 builtin/pull.c:468
+#: builtin/pull.c:442 builtin/pull.c:457
msgid "See git-pull(1) for details."
msgstr "详见 git-pull(1)。"
-#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470
-#: builtin/rebase.c:1381 git-parse-remote.sh:64
+#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
+#: builtin/rebase.c:1415 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<远程>"
-#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
+#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:463 builtin/rebase.c:1373 git-parse-remote.sh:75
+#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "当前分支没有跟踪信息。"
-#: builtin/pull.c:472 git-parse-remote.sh:95
+#: builtin/pull.c:461 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
-#: builtin/pull.c:477
+#: builtin/pull.c:466
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -16974,32 +17357,32 @@ msgstr ""
"您的配置中指定要合并远程的引用 '%s',\n"
"但是没有获取到这个引用。"
-#: builtin/pull.c:587
+#: builtin/pull.c:576
#, c-format
msgid "unable to access commit %s"
msgstr "无法访问提交 %s"
-#: builtin/pull.c:867
+#: builtin/pull.c:857
msgid "ignoring --verify-signatures for rebase"
msgstr "为变基操作忽略 --verify-signatures"
-#: builtin/pull.c:922
+#: builtin/pull.c:912
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
-#: builtin/pull.c:930
+#: builtin/pull.c:920
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未诞生的分支,变更添加至索引。"
-#: builtin/pull.c:934
+#: builtin/pull.c:924
msgid "pull with rebase"
msgstr "变基式拉取"
-#: builtin/pull.c:935
+#: builtin/pull.c:925
msgid "please commit or stash them."
msgstr "请提交或贮藏它们。"
-#: builtin/pull.c:960
+#: builtin/pull.c:950
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17009,7 +17392,7 @@ msgstr ""
"fetch 更新了当前的分支。快进您的工作区\n"
"至提交 %s。"
-#: builtin/pull.c:966
+#: builtin/pull.c:956
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17026,15 +17409,15 @@ msgstr ""
"$ git reset --hard\n"
"恢复之前的状态。"
-#: builtin/pull.c:981
+#: builtin/pull.c:971
msgid "Cannot merge multiple branches into empty head."
msgstr "无法将多个分支合并到空分支。"
-#: builtin/pull.c:985
+#: builtin/pull.c:975
msgid "Cannot rebase onto multiple branches."
msgstr "无法变基到多个分支。"
-#: builtin/pull.c:992
+#: builtin/pull.c:982
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本地子模组中有修改,无法变基"
@@ -17455,216 +17838,207 @@ msgstr ""
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:177 builtin/rebase.c:201 builtin/rebase.c:228
+#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
#, c-format
msgid "unusable todo list: '%s'"
msgstr "不可用的待办列表:'%s'"
-#: builtin/rebase.c:186 builtin/rebase.c:212 builtin/rebase.c:236
-#, c-format
-msgid "could not write '%s'."
-msgstr "不能写入 '%s'。"
-
-#: builtin/rebase.c:271
-msgid "no HEAD?"
-msgstr "没有 HEAD?"
-
-#: builtin/rebase.c:298
+#: builtin/rebase.c:292
#, c-format
msgid "could not create temporary %s"
msgstr "无法创建临时的 %s"
-#: builtin/rebase.c:304
+#: builtin/rebase.c:298
msgid "could not mark as interactive"
msgstr "无法标记为交互式"
-#: builtin/rebase.c:362
+#: builtin/rebase.c:352
msgid "could not generate todo list"
msgstr "无法生成待办列表"
-#: builtin/rebase.c:402
+#: builtin/rebase.c:391
msgid "a base commit must be provided with --upstream or --onto"
msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
-#: builtin/rebase.c:457
+#: builtin/rebase.c:461
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<选项>]"
-#: builtin/rebase.c:469
-msgid "keep empty commits"
-msgstr "保持空提交"
+#: builtin/rebase.c:474 builtin/rebase.c:1550
+msgid "(DEPRECATED) keep empty commits"
+msgstr "(已弃用)保留空提交"
-#: builtin/rebase.c:471 builtin/revert.c:128
+#: builtin/rebase.c:478 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "允许提交说明为空"
-#: builtin/rebase.c:472
+#: builtin/rebase.c:480
msgid "rebase merge commits"
msgstr "对合并提交变基"
-#: builtin/rebase.c:474
+#: builtin/rebase.c:482
msgid "keep original branch points of cousins"
msgstr "保持兄弟提交的原始分支点"
-#: builtin/rebase.c:476
+#: builtin/rebase.c:484
msgid "move commits that begin with squash!/fixup!"
msgstr "移动以 squash!/fixup! 开头的提交"
-#: builtin/rebase.c:477
+#: builtin/rebase.c:485
msgid "sign commits"
msgstr "签名提交"
-#: builtin/rebase.c:479 builtin/rebase.c:1455
+#: builtin/rebase.c:487 builtin/rebase.c:1490
msgid "display a diffstat of what changed upstream"
msgstr "显示上游变化的差异统计"
-#: builtin/rebase.c:481
+#: builtin/rebase.c:489
msgid "continue rebase"
msgstr "继续变基"
-#: builtin/rebase.c:483
+#: builtin/rebase.c:491
msgid "skip commit"
msgstr "跳过提交"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:492
msgid "edit the todo list"
msgstr "变基待办列表"
-#: builtin/rebase.c:486
+#: builtin/rebase.c:494
msgid "show the current patch"
msgstr "显示当前补丁"
-#: builtin/rebase.c:489
+#: builtin/rebase.c:497
msgid "shorten commit ids in the todo list"
msgstr "缩短待办列表中的提交号"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:499
msgid "expand commit ids in the todo list"
msgstr "扩展待办列表中的提交号"
-#: builtin/rebase.c:493
+#: builtin/rebase.c:501
msgid "check the todo list"
msgstr "检查待办列表"
-#: builtin/rebase.c:495
+#: builtin/rebase.c:503
msgid "rearrange fixup/squash lines"
msgstr "重新排列 fixup/squash 行"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:505
msgid "insert exec commands in todo list"
msgstr "在待办列表中插入 exec 执行命令"
-#: builtin/rebase.c:498
+#: builtin/rebase.c:506
msgid "onto"
msgstr "onto"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:509
msgid "restrict-revision"
msgstr "restrict-revision"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:509
msgid "restrict revision"
msgstr "限制版本"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:511
msgid "squash-onto"
msgstr "squash-onto"
-#: builtin/rebase.c:504
+#: builtin/rebase.c:512
msgid "squash onto"
msgstr "squash onto"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:514
msgid "the upstream commit"
msgstr "上游提交"
-#: builtin/rebase.c:508
+#: builtin/rebase.c:516
msgid "head-name"
msgstr "head-name"
-#: builtin/rebase.c:508
+#: builtin/rebase.c:516
msgid "head name"
msgstr "head 名称"
-#: builtin/rebase.c:513
+#: builtin/rebase.c:521
msgid "rebase strategy"
msgstr "变基策略"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:522
msgid "strategy-opts"
msgstr "strategy-opts"
-#: builtin/rebase.c:515
+#: builtin/rebase.c:523
msgid "strategy options"
msgstr "策略选项"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:524
msgid "switch-to"
msgstr "切换到"
-#: builtin/rebase.c:517
+#: builtin/rebase.c:525
msgid "the branch or commit to checkout"
msgstr "要检出的分支或提交"
-#: builtin/rebase.c:518
+#: builtin/rebase.c:526
msgid "onto-name"
msgstr "onto-name"
-#: builtin/rebase.c:518
+#: builtin/rebase.c:526
msgid "onto name"
msgstr "onto name"
-#: builtin/rebase.c:519
+#: builtin/rebase.c:527
msgid "cmd"
msgstr "cmd"
-#: builtin/rebase.c:519
+#: builtin/rebase.c:527
msgid "the command to run"
msgstr "要执行的命令"
-#: builtin/rebase.c:522 builtin/rebase.c:1540
+#: builtin/rebase.c:530 builtin/rebase.c:1584
msgid "automatically re-schedule any `exec` that fails"
msgstr "自动重新安排任何失败的 `exec`"
-#: builtin/rebase.c:540
+#: builtin/rebase.c:546
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果"
-#: builtin/rebase.c:556
+#: builtin/rebase.c:562
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s 需要交互式变基"
-#: builtin/rebase.c:608
+#: builtin/rebase.c:612
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "无法获取 'onto':'%s'"
-#: builtin/rebase.c:623
+#: builtin/rebase.c:627
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "无效的原始 head:'%s'"
-#: builtin/rebase.c:648
+#: builtin/rebase.c:652
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "忽略无效的 allow_rerere_autoupdate:'%s'"
-#: builtin/rebase.c:724
+#: builtin/rebase.c:728
#, c-format
msgid "Could not read '%s'"
msgstr "不能读取 '%s'"
-#: builtin/rebase.c:742
+#: builtin/rebase.c:746
#, c-format
msgid "Cannot store %s"
msgstr "不能存储 %s"
-#: builtin/rebase.c:849
+#: builtin/rebase.c:853
msgid "could not determine HEAD revision"
msgstr "不能确定 HEAD 版本"
-#: builtin/rebase.c:972 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:976 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"
@@ -17677,7 +18051,7 @@ msgstr ""
"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
"\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
-#: builtin/rebase.c:1060
+#: builtin/rebase.c:1058
#, c-format
msgid ""
"\n"
@@ -17695,7 +18069,14 @@ msgstr ""
"\n"
"因此 git 无法对其变基。"
-#: builtin/rebase.c:1367
+#: builtin/rebase.c:1383
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr "无法识别的空类型 '%s';有效类型有 \"drop\"、\"keep\" 和 \"ask\"。"
+
+#: builtin/rebase.c:1401
#, c-format
msgid ""
"%s\n"
@@ -17712,7 +18093,7 @@ msgstr ""
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1417
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -17725,144 +18106,136 @@ msgstr ""
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1447
msgid "exec commands cannot contain newlines"
msgstr "exec 命令不能包含换行符"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1451
msgid "empty exec command"
msgstr "空的 exec 命令"
-#: builtin/rebase.c:1446
+#: builtin/rebase.c:1481
msgid "rebase onto given branch instead of upstream"
msgstr "变基到给定的分支而非上游"
-#: builtin/rebase.c:1448
+#: builtin/rebase.c:1483
msgid "use the merge-base of upstream and branch as the current base"
msgstr "使用上游和分支的合并基线做为当前基线"
-#: builtin/rebase.c:1450
+#: builtin/rebase.c:1485
msgid "allow pre-rebase hook to run"
msgstr "允许执行 pre-rebase 钩子"
-#: builtin/rebase.c:1452
+#: builtin/rebase.c:1487
msgid "be quiet. implies --no-stat"
msgstr "安静。暗示 --no-stat"
-#: builtin/rebase.c:1458
+#: builtin/rebase.c:1493
msgid "do not show diffstat of what changed upstream"
msgstr "不显示上游变化的差异统计"
-#: builtin/rebase.c:1461
+#: builtin/rebase.c:1496
msgid "add a Signed-off-by: line to each commit"
msgstr "为每一个提交添加一个 Signed-off-by: 签名"
-#: builtin/rebase.c:1464
-msgid "make committer date match author date"
-msgstr "让提交者日期匹配作者日期"
-
-#: builtin/rebase.c:1466
-msgid "ignore author date and use current date"
-msgstr "忽略作者日期并使用当前日期"
+#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
+msgid "passed to 'git am'"
+msgstr "传递给 'git am"
-#: builtin/rebase.c:1468
-msgid "synonym of --reset-author-date"
-msgstr "--reset-author-date 的同义词"
-
-#: builtin/rebase.c:1470 builtin/rebase.c:1474
+#: builtin/rebase.c:1506 builtin/rebase.c:1508
msgid "passed to 'git apply'"
msgstr "传递给 'git apply'"
-#: builtin/rebase.c:1472
-msgid "ignore changes in whitespace"
-msgstr "忽略空白字符的变更"
-
-#: builtin/rebase.c:1476 builtin/rebase.c:1479
+#: builtin/rebase.c:1510 builtin/rebase.c:1513
msgid "cherry-pick all commits, even if unchanged"
msgstr "拣选所有提交,即使未修改"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1515
msgid "continue"
msgstr "继续"
-#: builtin/rebase.c:1484
+#: builtin/rebase.c:1518
msgid "skip current patch and continue"
msgstr "跳过当前补丁并继续"
# 译者:注意保持前导空格
-#: builtin/rebase.c:1486
+#: builtin/rebase.c:1520
msgid "abort and check out the original branch"
msgstr "终止并检出原有分支"
-#: builtin/rebase.c:1489
+#: builtin/rebase.c:1523
msgid "abort but keep HEAD where it is"
msgstr "终止但保持 HEAD 不变"
-#: builtin/rebase.c:1490
+#: builtin/rebase.c:1524
msgid "edit the todo list during an interactive rebase"
msgstr "在交互式变基中编辑待办列表"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1527
msgid "show the patch file being applied or merged"
msgstr "显示正在应用或合并的补丁文件"
-#: builtin/rebase.c:1496
+#: builtin/rebase.c:1530
+msgid "use apply strategies to rebase"
+msgstr "使用应用策略进行变基"
+
+#: builtin/rebase.c:1534
msgid "use merging strategies to rebase"
msgstr "使用合并策略进行变基"
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1538
msgid "let the user edit the list of commits to rebase"
msgstr "让用户编辑要变基的提交列表"
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1542
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(已弃用)尝试重建合并提交而非忽略它们"
-#: builtin/rebase.c:1509
-msgid "preserve empty commits during rebase"
-msgstr "变基时保留空提交"
+#: builtin/rebase.c:1547
+msgid "how to handle commits that become empty"
+msgstr "如何处理空提交"
-#: builtin/rebase.c:1511
+#: builtin/rebase.c:1554
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交"
-#: builtin/rebase.c:1517
+#: builtin/rebase.c:1560
msgid "automatically stash/stash pop before and after"
msgstr "在操作前后执行自动贮藏和弹出贮藏"
-#: builtin/rebase.c:1519
+#: builtin/rebase.c:1562
msgid "add exec lines after each commit of the editable list"
msgstr "可编辑列表的每一个提交下面增加一行 exec"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1566
msgid "allow rebasing commits with empty messages"
msgstr "允许针对空提交说明的提交变基"
-#: builtin/rebase.c:1526
+#: builtin/rebase.c:1570
msgid "try to rebase merges instead of skipping them"
msgstr "尝试对合并提交变基而不是忽略它们"
-#: builtin/rebase.c:1529
+#: builtin/rebase.c:1573
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "使用 'merge-base --fork-point' 来优化上游"
-#: builtin/rebase.c:1531
+#: builtin/rebase.c:1575
msgid "use the given merge strategy"
msgstr "使用给定的合并策略"
-#: builtin/rebase.c:1533 builtin/revert.c:115
+#: builtin/rebase.c:1577 builtin/revert.c:115
msgid "option"
msgstr "选项"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1578
msgid "pass the argument through to the merge strategy"
msgstr "将参数传递给合并策略"
-#: builtin/rebase.c:1537
+#: builtin/rebase.c:1581
msgid "rebase all reachable commits up to the root(s)"
msgstr "将所有可达的提交变基到根提交"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1598
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -17870,36 +18243,36 @@ msgstr ""
"对 rebase.useBuiltin 的支持已被删除!\n"
"详见 'git help config' 中的条目。"
-#: builtin/rebase.c:1560
+#: builtin/rebase.c:1604
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "看起来 'git-am' 正在执行中。无法变基。"
-#: builtin/rebase.c:1601
+#: builtin/rebase.c:1645
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
-#: builtin/rebase.c:1606
+#: builtin/rebase.c:1650
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "不能将 '--keep-base' 和 '--onto' 组合使用"
-#: builtin/rebase.c:1608
+#: builtin/rebase.c:1652
msgid "cannot combine '--keep-base' with '--root'"
msgstr "不能将 '--keep-base' 和 '--root' 组合使用"
-#: builtin/rebase.c:1612
+#: builtin/rebase.c:1656
msgid "No rebase in progress?"
msgstr "没有正在进行的变基?"
-#: builtin/rebase.c:1616
+#: builtin/rebase.c:1660
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: builtin/rebase.c:1639
+#: builtin/rebase.c:1683
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
-#: builtin/rebase.c:1651
+#: builtin/rebase.c:1695
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -17907,16 +18280,16 @@ msgstr ""
"您必须编辑所有的合并冲突,然后通过 git add\n"
"命令将它们标记为已解决"
-#: builtin/rebase.c:1670
+#: builtin/rebase.c:1714
msgid "could not discard worktree changes"
msgstr "无法丢弃工作区变更"
-#: builtin/rebase.c:1689
+#: builtin/rebase.c:1733
#, c-format
msgid "could not move back to %s"
msgstr "无法移回 %s"
-#: builtin/rebase.c:1734
+#: builtin/rebase.c:1778
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -17935,164 +18308,164 @@ msgstr ""
"\t%s\n"
"然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n"
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:1806
msgid "switch `C' expects a numerical value"
msgstr "开关 `C' 期望一个数字值"
-#: builtin/rebase.c:1798
+#: builtin/rebase.c:1847
#, c-format
msgid "Unknown mode: %s"
msgstr "未知模式:%s"
-#: builtin/rebase.c:1820
+#: builtin/rebase.c:1869
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy 需要 --merge 或 --interactive"
-#: builtin/rebase.c:1860
+#: builtin/rebase.c:1899
+msgid "cannot combine apply options with merge options"
+msgstr "不能组合使用应用选项和合并选项"
+
+#: builtin/rebase.c:1912
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "未知的变基后端:%s"
+
+#: builtin/rebase.c:1937
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
-#: builtin/rebase.c:1872
-msgid "cannot combine am options with either interactive or merge options"
-msgstr "不能将 am 选项与交互或合并选项同时使用"
-
-#: builtin/rebase.c:1891
+#: builtin/rebase.c:1957
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
-#: builtin/rebase.c:1895
+#: builtin/rebase.c:1961
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
-#: builtin/rebase.c:1919
+#: builtin/rebase.c:1985
#, c-format
msgid "invalid upstream '%s'"
msgstr "无效的上游 '%s'"
-#: builtin/rebase.c:1925
+#: builtin/rebase.c:1991
msgid "Could not create new root commit"
msgstr "不能创建新的根提交"
-#: builtin/rebase.c:1951
+#: builtin/rebase.c:2017
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s':只需要与分支的一个合并基线"
-#: builtin/rebase.c:1954
+#: builtin/rebase.c:2020
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s':只需要一个合并基线"
-#: builtin/rebase.c:1962
+#: builtin/rebase.c:2028
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "没有指向一个有效的提交 '%s'"
-#: builtin/rebase.c:1987
+#: builtin/rebase.c:2054
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "致命错误:无此分支/提交 '%s'"
-#: builtin/rebase.c:1995 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:1961
+#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:1990
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用:%s"
-#: builtin/rebase.c:2006
+#: builtin/rebase.c:2073
msgid "Could not resolve HEAD to a revision"
msgstr "无法将 HEAD 解析为一个版本"
-#: builtin/rebase.c:2044
+#: builtin/rebase.c:2111
msgid "Cannot autostash"
msgstr "无法 autostash"
-#: builtin/rebase.c:2047
+#: builtin/rebase.c:2114
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "意外的 stash 响应:'%s'"
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2120
#, c-format
msgid "Could not create directory for '%s'"
msgstr "不能为 '%s' 创建目录"
-#: builtin/rebase.c:2056
+#: builtin/rebase.c:2123
#, c-format
msgid "Created autostash: %s\n"
msgstr "创建了 autostash:%s\n"
-#: builtin/rebase.c:2059
+#: builtin/rebase.c:2126
msgid "could not reset --hard"
msgstr "无法 reset --hard"
-#: builtin/rebase.c:2068
+#: builtin/rebase.c:2135
msgid "Please commit or stash them."
msgstr "请提交或贮藏修改。"
-#: builtin/rebase.c:2095
-#, c-format
-msgid "could not parse '%s'"
-msgstr "无法解析 '%s'"
-
-#: builtin/rebase.c:2108
+#: builtin/rebase.c:2169
#, c-format
msgid "could not switch to %s"
msgstr "无法切换到 %s"
-#: builtin/rebase.c:2119
+#: builtin/rebase.c:2180
msgid "HEAD is up to date."
msgstr "HEAD 是最新的。"
-#: builtin/rebase.c:2121
+#: builtin/rebase.c:2182
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "当前分支 %s 是最新的。\n"
-#: builtin/rebase.c:2129
+#: builtin/rebase.c:2190
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD 是最新的,强制变基。"
-#: builtin/rebase.c:2131
+#: builtin/rebase.c:2192
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "当前分支 %s 是最新的,强制变基。\n"
-#: builtin/rebase.c:2139
+#: builtin/rebase.c:2200
msgid "The pre-rebase hook refused to rebase."
msgstr "pre-rebase 钩子拒绝了变基操作。"
-#: builtin/rebase.c:2146
+#: builtin/rebase.c:2207
#, c-format
msgid "Changes to %s:\n"
msgstr "到 %s 的变更:\n"
-#: builtin/rebase.c:2149
+#: builtin/rebase.c:2210
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "从 %s 到 %s 的变更:\n"
-#: builtin/rebase.c:2174
+#: builtin/rebase.c:2235
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "首先,回退头指针以便在其上重放您的工作...\n"
-#: builtin/rebase.c:2183
+#: builtin/rebase.c:2244
msgid "Could not detach HEAD"
msgstr "无法分离头指针"
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:2253
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "快进 %s 到 %s。\n"
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:33
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <仓库目录>"
-#: builtin/receive-pack.c:830
+#: builtin/receive-pack.c:821
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"
@@ -18118,7 +18491,7 @@ msgstr ""
"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
"配置变量为 'refuse'。"
-#: builtin/receive-pack.c:850
+#: builtin/receive-pack.c:841
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"
@@ -18137,11 +18510,11 @@ msgstr ""
"\n"
"若要屏蔽此信息,您可以设置它为 'refuse'。"
-#: builtin/receive-pack.c:1936
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "静默模式"
-#: builtin/receive-pack.c:1950
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
@@ -18167,49 +18540,49 @@ msgstr ""
msgid "git reflog exists <ref>"
msgstr "git reflog exists <引用>"
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' 不是一个有效的时间戳"
-#: builtin/reflog.c:605
+#: builtin/reflog.c:606
#, c-format
msgid "Marking reachable objects..."
msgstr "正在标记可达对象..."
-#: builtin/reflog.c:643
+#: builtin/reflog.c:644
#, c-format
msgid "%s points nowhere!"
msgstr "%s 指向不存在!"
-#: builtin/reflog.c:695
+#: builtin/reflog.c:696
msgid "no reflog specified to delete"
msgstr "未指定要删除的引用日志"
-#: builtin/reflog.c:704
+#: builtin/reflog.c:705
#, c-format
msgid "not a reflog: %s"
msgstr "不是一个引用日志:%s"
-#: builtin/reflog.c:709
+#: builtin/reflog.c:710
#, c-format
msgid "no reflog for '%s'"
msgstr "没有 '%s' 的引用日志"
-#: builtin/reflog.c:755
+#: builtin/reflog.c:756
#, c-format
msgid "invalid ref format: %s"
msgstr "无效的引用格式:%s"
-#: builtin/reflog.c:764
+#: builtin/reflog.c:765
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
-#: builtin/remote.c:16
+#: builtin/remote.c:17
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
-#: builtin/remote.c:17
+#: builtin/remote.c:18
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
@@ -18217,81 +18590,81 @@ msgstr ""
"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <名称> <地址>"
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
msgid "git remote rename <old> <new>"
msgstr "git remote rename <旧名称> <新名称>"
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
msgid "git remote remove <name>"
msgstr "git remote remove <名称>"
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
-#: builtin/remote.c:21
+#: builtin/remote.c:22
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <名称>"
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <名称>"
-#: builtin/remote.c:23
+#: builtin/remote.c:24
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
-#: builtin/remote.c:24
+#: builtin/remote.c:25
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <名称> <分支>..."
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <名称>"
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <名称> <新的地址>"
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <名称> <地址>"
-#: builtin/remote.c:33
+#: builtin/remote.c:34
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<选项>] <名称> <地址>"
-#: builtin/remote.c:53
+#: builtin/remote.c:54
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <名称> <分支>..."
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <名称> <分支>..."
-#: builtin/remote.c:59
+#: builtin/remote.c:60
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<选项>] <名称>"
-#: builtin/remote.c:64
+#: builtin/remote.c:65
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<选项>] <名称>"
-#: builtin/remote.c:69
+#: builtin/remote.c:70
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<选项>] [<组> | <远程>]..."
-#: builtin/remote.c:98
+#: builtin/remote.c:99
#, c-format
msgid "Updating %s"
msgstr "更新 %s 中"
-#: builtin/remote.c:130
+#: builtin/remote.c:131
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -18299,82 +18672,98 @@ msgstr ""
"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
"\t 或 --mirror=push"
-#: builtin/remote.c:147
+#: builtin/remote.c:148
#, c-format
msgid "unknown mirror argument: %s"
msgstr "未知的镜像参数:%s"
-#: builtin/remote.c:163
+#: builtin/remote.c:164
msgid "fetch the remote branches"
msgstr "抓取远程的分支"
-#: builtin/remote.c:165
+#: builtin/remote.c:166
msgid "import all tags and associated objects when fetching"
msgstr "抓取时导入所有的标签和关联对象"
-#: builtin/remote.c:168
+#: builtin/remote.c:169
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "或不抓取任何标签(--no-tags)"
-#: builtin/remote.c:170
+#: builtin/remote.c:171
msgid "branch(es) to track"
msgstr "跟踪的分支"
-#: builtin/remote.c:171
+#: builtin/remote.c:172
msgid "master branch"
msgstr "主线分支"
-#: builtin/remote.c:173
+#: builtin/remote.c:174
msgid "set up remote as a mirror to push to or fetch from"
msgstr "把远程设置为用以推送或抓取的镜像"
-#: builtin/remote.c:185
+#: builtin/remote.c:186
msgid "specifying a master branch makes no sense with --mirror"
msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
-#: builtin/remote.c:187
+#: builtin/remote.c:188
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:696
#, c-format
msgid "remote %s already exists."
msgstr "远程 %s 已经存在。"
-#: builtin/remote.c:198 builtin/remote.c:640
+#: builtin/remote.c:199 builtin/remote.c:700
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' 不是一个有效的远程名称"
-#: builtin/remote.c:238
+#: builtin/remote.c:239
#, c-format
msgid "Could not setup master '%s'"
msgstr "无法设置 master '%s'"
-#: builtin/remote.c:344
+#: builtin/remote.c:354
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "无法得到引用规格 %s 的获取列表"
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:453 builtin/remote.c:461
msgid "(matching)"
msgstr "(匹配)"
-#: builtin/remote.c:455
+#: builtin/remote.c:465
msgid "(delete)"
msgstr "(删除)"
-#: builtin/remote.c:629 builtin/remote.c:764 builtin/remote.c:863
+#: builtin/remote.c:653
+#, c-format
+msgid "could not set '%s'"
+msgstr "不能设置 '%s'"
+
+#: builtin/remote.c:658
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"配置(%s)remote.pushDefault 位于:\n"
+"\t%s:%d\n"
+"现在在为不存在的远程名 '%s' 命名"
+
+#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
#, c-format
msgid "No such remote: '%s'"
msgstr "没有此远程仓库:'%s'"
-#: builtin/remote.c:646
+#: builtin/remote.c:706
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "不能重命名配置小节 '%s' 到 '%s'"
-#: builtin/remote.c:666
+#: builtin/remote.c:726
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -18385,17 +18774,17 @@ msgstr ""
"\t%s\n"
"\t如果必要请手动更新配置。"
-#: builtin/remote.c:701
+#: builtin/remote.c:766
#, c-format
msgid "deleting '%s' failed"
msgstr "删除 '%s' 失败"
-#: builtin/remote.c:735
+#: builtin/remote.c:800
#, c-format
msgid "creating '%s' failed"
msgstr "创建 '%s' 失败"
-#: builtin/remote.c:801
+#: builtin/remote.c:876
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -18405,118 +18794,118 @@ msgid_plural ""
msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
-#: builtin/remote.c:815
+#: builtin/remote.c:890
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除配置小节 '%s'"
-#: builtin/remote.c:916
+#: builtin/remote.c:993
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的(下一次获取将存储于 remotes/%s)"
-#: builtin/remote.c:919
+#: builtin/remote.c:996
msgid " tracked"
msgstr " 已跟踪"
-#: builtin/remote.c:921
+#: builtin/remote.c:998
msgid " stale (use 'git remote prune' to remove)"
msgstr " 过时(使用 'git remote prune' 来移除)"
-#: builtin/remote.c:923
+#: builtin/remote.c:1000
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:964
+#: builtin/remote.c:1041
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
-#: builtin/remote.c:973
+#: builtin/remote.c:1050
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "交互式变基到远程 %s"
-#: builtin/remote.c:975
+#: builtin/remote.c:1052
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "交互式变基(含合并提交)到远程 %s"
-#: builtin/remote.c:978
+#: builtin/remote.c:1055
#, c-format
msgid "rebases onto remote %s"
msgstr "变基到远程 %s"
-#: builtin/remote.c:982
+#: builtin/remote.c:1059
#, c-format
msgid " merges with remote %s"
msgstr " 与远程 %s 合并"
-#: builtin/remote.c:985
+#: builtin/remote.c:1062
#, c-format
msgid "merges with remote %s"
msgstr "与远程 %s 合并"
-#: builtin/remote.c:988
+#: builtin/remote.c:1065
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 以及和远程 %s\n"
-#: builtin/remote.c:1031
+#: builtin/remote.c:1108
msgid "create"
msgstr "创建"
-#: builtin/remote.c:1034
+#: builtin/remote.c:1111
msgid "delete"
msgstr "删除"
-#: builtin/remote.c:1038
+#: builtin/remote.c:1115
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1118
msgid "fast-forwardable"
msgstr "可快进"
-#: builtin/remote.c:1044
+#: builtin/remote.c:1121
msgid "local out of date"
msgstr "本地已过时"
-#: builtin/remote.c:1051
+#: builtin/remote.c:1128
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 强制推送至 %-*s (%s)"
-#: builtin/remote.c:1054
+#: builtin/remote.c:1131
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1135
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 强制推送至 %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1138
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
-#: builtin/remote.c:1129
+#: builtin/remote.c:1206
msgid "do not query remotes"
msgstr "不查询远程"
-#: builtin/remote.c:1156
+#: builtin/remote.c:1233
#, c-format
msgid "* remote %s"
msgstr "* 远程 %s"
-#: builtin/remote.c:1157
+#: builtin/remote.c:1234
#, c-format
msgid " Fetch URL: %s"
msgstr " 获取地址:%s"
-#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313
+#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
msgid "(no URL)"
msgstr "(无 URL)"
@@ -18524,32 +18913,32 @@ msgstr "(无 URL)"
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1249 builtin/remote.c:1251
#, c-format
msgid " Push URL: %s"
msgstr " 推送地址:%s"
-#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
+#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支:%s"
# 译者:中文字符串拼接,可删除前导空格
-#: builtin/remote.c:1176
+#: builtin/remote.c:1253
msgid "(not queried)"
msgstr "(未查询)"
-#: builtin/remote.c:1178
+#: builtin/remote.c:1255
msgid "(unknown)"
msgstr "(未知)"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1259
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1271
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -18557,147 +18946,147 @@ msgstr[0] " 远程分支:%s"
msgstr[1] " 远程分支:%s"
# 译者:中文字符串拼接,可删除前导空格
-#: builtin/remote.c:1197 builtin/remote.c:1223
+#: builtin/remote.c:1274 builtin/remote.c:1300
msgid " (status not queried)"
msgstr "(状态未查询)"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1283
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:1214
+#: builtin/remote.c:1291
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜像"
-#: builtin/remote.c:1220
+#: builtin/remote.c:1297
#, 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:1241
+#: builtin/remote.c:1318
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1243
+#: builtin/remote.c:1320
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1335
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1337
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
-#: builtin/remote.c:1270
+#: builtin/remote.c:1347
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
-#: builtin/remote.c:1278
+#: builtin/remote.c:1355
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一个有效引用:%s"
-#: builtin/remote.c:1280
+#: builtin/remote.c:1357
#, c-format
msgid "Could not setup %s"
msgstr "不能设置 %s"
# 译者:注意保持前导空格
-#: builtin/remote.c:1298
+#: builtin/remote.c:1375
#, c-format
msgid " %s will become dangling!"
msgstr " %s 将成为悬空状态!"
# 译者:注意保持前导空格
-#: builtin/remote.c:1299
+#: builtin/remote.c:1376
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成为悬空状态!"
-#: builtin/remote.c:1309
+#: builtin/remote.c:1386
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1310
+#: builtin/remote.c:1387
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1403
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
-#: builtin/remote.c:1329
+#: builtin/remote.c:1406
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
-#: builtin/remote.c:1374
+#: builtin/remote.c:1451
msgid "prune remotes after fetching"
msgstr "抓取后清除远程"
-#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559
+#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
-#: builtin/remote.c:1453
+#: builtin/remote.c:1530
msgid "add branch"
msgstr "添加分支"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1537
msgid "no remote specified"
msgstr "未指定远程"
-#: builtin/remote.c:1477
+#: builtin/remote.c:1554
msgid "query push URLs rather than fetch URLs"
msgstr "查询推送 URL 地址,而非获取 URL 地址"
-#: builtin/remote.c:1479
+#: builtin/remote.c:1556
msgid "return all URLs"
msgstr "返回所有 URL 地址"
-#: builtin/remote.c:1507
+#: builtin/remote.c:1584
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "没有给远程仓库 '%s' 设定 URL"
-#: builtin/remote.c:1533
+#: builtin/remote.c:1610
msgid "manipulate push URLs"
msgstr "操作推送 URLS"
-#: builtin/remote.c:1535
+#: builtin/remote.c:1612
msgid "add URL"
msgstr "添加 URL"
-#: builtin/remote.c:1537
+#: builtin/remote.c:1614
msgid "delete URLs"
msgstr "删除 URLS"
-#: builtin/remote.c:1544
+#: builtin/remote.c:1621
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 无意义"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1660
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹配模版:%s"
-#: builtin/remote.c:1591
+#: builtin/remote.c:1668
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL:%s"
-#: builtin/remote.c:1593
+#: builtin/remote.c:1670
msgid "Will not delete all non-push URLs"
msgstr "将不会删除所有非推送 URL 地址"
@@ -18941,8 +19330,8 @@ msgstr "无法对 %s 执行 fstat"
msgid "unable to write object to database"
msgstr "无法向数据库写入对象"
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423
-#: builtin/replace.c:453
+#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
+#: builtin/replace.c:454
#, c-format
msgid "not a valid object name: '%s'"
msgstr "不是一个有效的对象名:'%s'"
@@ -18966,48 +19355,48 @@ msgstr "新对象和旧对象相同:'%s'"
msgid "could not parse %s as a commit"
msgstr "无法将 %s 解析为一个提交"
-#: builtin/replace.c:415
+#: builtin/replace.c:416
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "提交 '%s' 中含有损坏的合并标签"
-#: builtin/replace.c:417
+#: builtin/replace.c:418
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "提交 '%s' 中含有格式错误的合并标签"
-#: builtin/replace.c:429
+#: builtin/replace.c:430
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
-#: builtin/replace.c:468
+#: builtin/replace.c:469
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "原始提交 '%s' 中有一个 gpg 签名"
-#: builtin/replace.c:469
+#: builtin/replace.c:470
msgid "the signature will be removed in the replacement commit!"
msgstr "在替换的提交中签名将被移除!"
-#: builtin/replace.c:479
+#: builtin/replace.c:480
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "不能为 '%s' 写替换提交"
-#: builtin/replace.c:487
+#: builtin/replace.c:488
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "对 '%s' 移植没有必要"
-#: builtin/replace.c:491
+#: builtin/replace.c:492
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "新提交和旧的一样:'%s'"
-#: builtin/replace.c:526
+#: builtin/replace.c:527
#, c-format
msgid ""
"could not convert the following graft(s):\n"
@@ -19016,71 +19405,71 @@ msgstr ""
"不能转换下列移植:\n"
"%s"
-#: builtin/replace.c:547
+#: builtin/replace.c:548
msgid "list replace refs"
msgstr "列出替换的引用"
-#: builtin/replace.c:548
+#: builtin/replace.c:549
msgid "delete replace refs"
msgstr "删除替换的引用"
-#: builtin/replace.c:549
+#: builtin/replace.c:550
msgid "edit existing object"
msgstr "编辑现存的对象"
-#: builtin/replace.c:550
+#: builtin/replace.c:551
msgid "change a commit's parents"
msgstr "修改一个提交的父提交"
-#: builtin/replace.c:551
+#: builtin/replace.c:552
msgid "convert existing graft file"
msgstr "转换现存的移植文件"
-#: builtin/replace.c:552
+#: builtin/replace.c:553
msgid "replace the ref if it exists"
msgstr "如果存在则替换引用"
-#: builtin/replace.c:554
+#: builtin/replace.c:555
msgid "do not pretty-print contents for --edit"
msgstr "不要为 --edit 操作美观显示内容"
-#: builtin/replace.c:555
+#: builtin/replace.c:556
msgid "use this format"
msgstr "使用此格式"
-#: builtin/replace.c:568
+#: builtin/replace.c:569
msgid "--format cannot be used when not listing"
msgstr "不列出时不能使用 --format"
-#: builtin/replace.c:576
+#: builtin/replace.c:577
msgid "-f only makes sense when writing a replacement"
msgstr "只有写一个替换时 -f 才有意义"
-#: builtin/replace.c:580
+#: builtin/replace.c:581
msgid "--raw only makes sense with --edit"
msgstr "--raw 只有和 --edit 共用才有意义"
-#: builtin/replace.c:586
+#: builtin/replace.c:587
msgid "-d needs at least one argument"
msgstr "-d 需要至少一个参数"
-#: builtin/replace.c:592
+#: builtin/replace.c:593
msgid "bad number of arguments"
msgstr "错误的参数个数"
-#: builtin/replace.c:598
+#: builtin/replace.c:599
msgid "-e needs exactly one argument"
msgstr "-e 需要且仅需要一个参数"
-#: builtin/replace.c:604
+#: builtin/replace.c:605
msgid "-g needs at least one argument"
msgstr "-g 需要至少一个参数"
-#: builtin/replace.c:610
+#: builtin/replace.c:611
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file 不带参数"
-#: builtin/replace.c:616
+#: builtin/replace.c:617
msgid "only one pattern can be given with -l"
msgstr "只能为 -l 提供一个模式"
@@ -19113,8 +19502,7 @@ msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..."
#: builtin/reset.c:34
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
-msgstr ""
-"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]"
+msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]"
#: builtin/reset.c:35
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
@@ -19164,8 +19552,8 @@ msgstr "HEAD 现在位于 %s"
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"
-#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594
-#: builtin/stash.c:618
+#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/stash.c:619
msgid "be quiet, only report errors"
msgstr "安静模式,只报告错误"
@@ -19248,21 +19636,21 @@ msgstr "不能重置索引文件至版本 '%s'。"
msgid "Could not write new index file."
msgstr "不能写入新的索引文件。"
-#: builtin/rev-list.c:411
+#: builtin/rev-list.c:499
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
-#: builtin/rev-list.c:472
+#: builtin/rev-list.c:560
msgid "object filtering requires --objects"
msgstr "对象过滤需要 --objects"
-#: builtin/rev-list.c:522
+#: builtin/rev-list.c:610
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支持显示注解"
-#: builtin/rev-list.c:525
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "不能将 --use-bitmap-index 和对象过滤组合使用"
+#: builtin/rev-list.c:615
+msgid "marked counting is incompatible with --objects"
+msgstr "标记计数和 --objects 不兼容"
#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -19422,36 +19810,40 @@ msgid_plural "the following files have local modifications:"
msgstr[0] "如下文件有本地修改:"
msgstr[1] "如下文件有本地修改:"
-#: builtin/rm.c:242
+#: builtin/rm.c:243
msgid "do not list removed files"
msgstr "不列出删除的文件"
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "only remove from the index"
msgstr "只从索引区删除"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "override the up-to-date check"
msgstr "忽略文件更新状态检查"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "allow recursive removal"
msgstr "允许递归删除"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "exit with a zero status even if nothing matched"
msgstr "即使没有匹配,也以零状态退出"
-#: builtin/rm.c:289
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "没有提供路径规格。我应该删除哪个文件?"
+
+#: builtin/rm.c:305
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
-#: builtin/rm.c:307
+#: builtin/rm.c:323
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "未提供 -r 选项不会递归删除 '%s'"
-#: builtin/rm.c:346
+#: builtin/rm.c:362
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm:不能删除 %s"
@@ -19697,64 +20089,82 @@ msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
msgid "show refs from stdin that aren't in local repository"
msgstr "显示从标准输入中读入的不在本地仓库中的引用"
-#: builtin/sparse-checkout.c:20
-msgid "git sparse-checkout (init|list|set|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|disable) <选项>"
+#: builtin/sparse-checkout.c:21
+msgid "git sparse-checkout (init|list|set|add|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|add|disable) <选项>"
-#: builtin/sparse-checkout.c:61
+#: builtin/sparse-checkout.c:64
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr "本工作区不是稀疏模式(稀疏检出文件可能不存在)"
-#: builtin/sparse-checkout.c:220
+#: builtin/sparse-checkout.c:225
+msgid "failed to create directory for sparse-checkout file"
+msgstr "无法为稀疏检出文件创建目录"
+
+#: builtin/sparse-checkout.c:266
msgid "failed to set extensions.worktreeConfig setting"
msgstr "无法设置 extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:237
+#: builtin/sparse-checkout.c:283
msgid "git sparse-checkout init [--cone]"
msgstr "git sparse-checkout init [--cone]"
-#: builtin/sparse-checkout.c:256
+#: builtin/sparse-checkout.c:302
msgid "initialize the sparse-checkout in cone mode"
msgstr "初始化稀疏检出为 cone 模式"
-#: builtin/sparse-checkout.c:262
+#: builtin/sparse-checkout.c:308
msgid "initialize sparse-checkout"
msgstr "初始化稀疏检出"
-#: builtin/sparse-checkout.c:295
+#: builtin/sparse-checkout.c:341
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
-#: builtin/sparse-checkout.c:361
-msgid "git sparse-checkout set (--stdin | <patterns>)"
-msgstr "git sparse-checkout set (--stdin | <模式>)"
+#: builtin/sparse-checkout.c:398
+#, c-format
+msgid "could not normalize path %s"
+msgstr "无法规范化路径 %s"
+
+#: builtin/sparse-checkout.c:410
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <模式>)"
+
+#: builtin/sparse-checkout.c:435
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "无法为 C 语言风格的字符串 '%s' 去括号"
+
+#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "无法加载现存的稀疏检出模式"
-#: builtin/sparse-checkout.c:378
+#: builtin/sparse-checkout.c:558
msgid "read patterns from standard in"
msgstr "从标准输入读取模式"
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:564
msgid "set sparse-checkout patterns"
msgstr "设置稀疏检出模式"
-#: builtin/sparse-checkout.c:447
+#: builtin/sparse-checkout.c:581
msgid "disable sparse-checkout"
msgstr "禁用稀疏检出"
-#: builtin/sparse-checkout.c:459
+#: builtin/sparse-checkout.c:593
msgid "error while refreshing working directory"
msgstr "刷新工作目录时出错"
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/stash.c:22 builtin/stash.c:38
msgid "git stash list [<options>]"
msgstr "git stash list [<选项>]"
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:23 builtin/stash.c:43
msgid "git stash show [<options>] [<stash>]"
msgstr "git stash show [<选项>] [<stash>]"
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:24 builtin/stash.c:48
msgid "git stash drop [-q|--quiet] [<stash>]"
msgstr "git stash drop [-q|--quiet] [<stash>]"
@@ -19762,25 +20172,27 @@ msgstr "git stash drop [-q|--quiet] [<stash>]"
msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:26 builtin/stash.c:63
msgid "git stash branch <branchname> [<stash>]"
msgstr "git stash branch <分支名> [<stash>]"
-#: builtin/stash.c:27 builtin/stash.c:67
+#: builtin/stash.c:27 builtin/stash.c:68
msgid "git stash clear"
msgstr "git stash clear"
-#: builtin/stash.c:28 builtin/stash.c:77
+#: builtin/stash.c:28
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
+" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<路径规格>...]]"
-#: builtin/stash.c:31 builtin/stash.c:84
+#: builtin/stash.c:32 builtin/stash.c:85
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -19788,186 +20200,196 @@ msgstr ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<消息>]"
-#: builtin/stash.c:52
+#: builtin/stash.c:53
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
-#: builtin/stash.c:57
+#: builtin/stash.c:58
msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
-#: builtin/stash.c:72
+#: builtin/stash.c:73
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
-#: builtin/stash.c:127
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
+" [--] [<路径规格>...]]"
+
+#: builtin/stash.c:128
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "'%s' 不像是一个贮藏提交"
-#: builtin/stash.c:147
+#: builtin/stash.c:148
#, c-format
msgid "Too many revisions specified:%s"
msgstr "指定了太多的版本:%s"
-#: builtin/stash.c:161 git-legacy-stash.sh:549
+#: builtin/stash.c:162 git-legacy-stash.sh:549
msgid "No stash entries found."
msgstr "未发现贮藏条目。"
-#: builtin/stash.c:175
+#: builtin/stash.c:176
#, c-format
msgid "%s is not a valid reference"
msgstr "%s 不是一个有效的引用名"
-#: builtin/stash.c:224 git-legacy-stash.sh:75
+#: builtin/stash.c:225 git-legacy-stash.sh:75
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear 不支持参数"
-#: builtin/stash.c:403
+#: builtin/stash.c:404
msgid "cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程应用贮藏"
-#: builtin/stash.c:414
+#: builtin/stash.c:415
#, c-format
msgid "could not generate diff %s^!."
msgstr "无法生成差异 %s^!."
-#: builtin/stash.c:421
+#: builtin/stash.c:422
msgid "conflicts in index.Try without --index."
msgstr "索引中有冲突。尝试不用 --index。"
-#: builtin/stash.c:427
+#: builtin/stash.c:428
msgid "could not save index tree"
msgstr "不能保存索引树"
-#: builtin/stash.c:436
+#: builtin/stash.c:437
msgid "could not restore untracked files from stash"
msgstr "无法从贮藏条目中恢复未跟踪文件"
-#: builtin/stash.c:450
+#: builtin/stash.c:451
#, c-format
msgid "Merging %s with %s"
msgstr "正在合并 %s 和 %s"
-#: builtin/stash.c:460 git-legacy-stash.sh:681
+#: builtin/stash.c:461 git-legacy-stash.sh:681
msgid "Index was not unstashed."
msgstr "索引未从贮藏中恢复。"
-#: builtin/stash.c:521 builtin/stash.c:620
+#: builtin/stash.c:522 builtin/stash.c:621
msgid "attempt to recreate the index"
msgstr "尝试重建索引"
-#: builtin/stash.c:554
+#: builtin/stash.c:555
#, c-format
msgid "Dropped %s (%s)"
msgstr "丢弃了 %s(%s)"
-#: builtin/stash.c:557
+#: builtin/stash.c:558
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s:无法丢弃贮藏条目"
-#: builtin/stash.c:582
+#: builtin/stash.c:583
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' 不是一个贮藏引用"
-#: builtin/stash.c:632 git-legacy-stash.sh:695
+#: builtin/stash.c:633 git-legacy-stash.sh:695
msgid "The stash entry is kept in case you need it again."
msgstr "贮藏条目被保留以备您再次需要。"
-#: builtin/stash.c:655 git-legacy-stash.sh:713
+#: builtin/stash.c:656 git-legacy-stash.sh:713
msgid "No branch name specified"
msgstr "未指定分支名"
-#: builtin/stash.c:795 builtin/stash.c:832
+#: builtin/stash.c:796 builtin/stash.c:833
#, c-format
msgid "Cannot update %s with %s"
msgstr "无法用 %2$s 更新 %1$s"
-#: builtin/stash.c:813 builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
msgid "stash message"
msgstr "贮藏说明"
-#: builtin/stash.c:823
+#: builtin/stash.c:824
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" 需要一个 <提交> 参数"
-#: builtin/stash.c:1045 git-legacy-stash.sh:218
+#: builtin/stash.c:1049 git-legacy-stash.sh:218
msgid "No changes selected"
msgstr "没有选择变更"
-#: builtin/stash.c:1145 git-legacy-stash.sh:150
+#: builtin/stash.c:1149 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: builtin/stash.c:1172 git-legacy-stash.sh:165
+#: builtin/stash.c:1176 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"
-#: builtin/stash.c:1181 git-legacy-stash.sh:180
+#: builtin/stash.c:1185 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr "无法保存未跟踪文件"
-#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:201
+#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
#: git-legacy-stash.sh:214
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"
-#: builtin/stash.c:1229 git-legacy-stash.sh:234
+#: builtin/stash.c:1233 git-legacy-stash.sh:234
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
-#: builtin/stash.c:1278 git-legacy-stash.sh:338
+#: builtin/stash.c:1282 git-legacy-stash.sh:338
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
-#: builtin/stash.c:1294
+#: builtin/stash.c:1298
msgid "Did you forget to 'git add'?"
msgstr "您是否忘了执行 'git add'?"
-#: builtin/stash.c:1309 git-legacy-stash.sh:346
+#: builtin/stash.c:1313 git-legacy-stash.sh:346
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
-#: builtin/stash.c:1316 git-legacy-stash.sh:351
+#: builtin/stash.c:1320 git-legacy-stash.sh:351
msgid "Cannot initialize stash"
msgstr "无法初始化贮藏"
-#: builtin/stash.c:1331 git-legacy-stash.sh:355
+#: builtin/stash.c:1335 git-legacy-stash.sh:355
msgid "Cannot save the current status"
msgstr "无法保存当前状态"
-#: builtin/stash.c:1336
+#: builtin/stash.c:1340
#, c-format
msgid "Saved working directory and index state %s"
msgstr "保存工作目录和索引状态 %s"
-#: builtin/stash.c:1426 git-legacy-stash.sh:385
+#: builtin/stash.c:1430 git-legacy-stash.sh:385
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:1469 builtin/stash.c:1534
msgid "keep index"
msgstr "保持索引"
-#: builtin/stash.c:1463 builtin/stash.c:1499
+#: builtin/stash.c:1471 builtin/stash.c:1536
msgid "stash in patch mode"
msgstr "以补丁模式贮藏"
-#: builtin/stash.c:1464 builtin/stash.c:1500
+#: builtin/stash.c:1472 builtin/stash.c:1537
msgid "quiet mode"
msgstr "静默模式"
-#: builtin/stash.c:1466 builtin/stash.c:1502
+#: builtin/stash.c:1474 builtin/stash.c:1539
msgid "include untracked files in stash"
msgstr "贮藏中包含未跟踪文件"
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1476 builtin/stash.c:1541
msgid "include ignore files"
msgstr "包含忽略的文件"
-#: builtin/stash.c:1564
+#: builtin/stash.c:1600
#, c-format
msgid "could not exec %s"
msgstr "不能执行 %s"
@@ -19988,7 +20410,7 @@ msgstr "跳过和移除所有的注释行"
msgid "prepend comment character and space to each line"
msgstr "为每一行的行首添加注释符和空格"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1970
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一个完整的引用名称,却得到 %s"
@@ -20002,7 +20424,7 @@ msgstr "submodule--helper print-default-remote 不带参数"
msgid "cannot strip one component off url '%s'"
msgstr "无法从 url '%s' 剥离一个组件"
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记(anchor)"
@@ -20044,7 +20466,7 @@ msgstr ""
msgid "Suppress output of entering each submodule command"
msgstr "阻止进入每一个子模组命令的输出"
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1053
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
msgid "Recurse into nested submodules"
msgstr "递归进入嵌套子模组中"
@@ -20087,72 +20509,72 @@ msgstr "阻止子模组初始化的输出"
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<选项>] [<路径>]"
-#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:914
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
-#: builtin/submodule--helper.c:827
+#: builtin/submodule--helper.c:837
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "无法解析子模组 '%s' 的 HEAD 引用"
-#: builtin/submodule--helper.c:854 builtin/submodule--helper.c:1023
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "递归子模组 '%s' 失败"
-#: builtin/submodule--helper.c:878 builtin/submodule--helper.c:1189
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
msgid "Suppress submodule status output"
msgstr "阻止子模组状态输出"
-#: builtin/submodule--helper.c:879
+#: builtin/submodule--helper.c:889
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
-#: builtin/submodule--helper.c:880
+#: builtin/submodule--helper.c:890
msgid "recurse into nested submodules"
msgstr "递归进入嵌套子模组中"
-#: builtin/submodule--helper.c:885
+#: builtin/submodule--helper.c:895
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
-#: builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:919
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路径>"
-#: builtin/submodule--helper.c:973
+#: builtin/submodule--helper.c:983
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "为 '%s' 同步子模组 url\n"
-#: builtin/submodule--helper.c:979
+#: builtin/submodule--helper.c:989
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "无法为子模组路径 '%s' 注册 url"
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:1003
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "无法得到子模组 '%s' 的默认远程关联"
-#: builtin/submodule--helper.c:1004
+#: builtin/submodule--helper.c:1014
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "无法为子模组 '%s' 更新远程关联"
-#: builtin/submodule--helper.c:1051
+#: builtin/submodule--helper.c:1061
msgid "Suppress output of synchronizing submodule url"
msgstr "阻止子模组 url 同步的输出"
-#: builtin/submodule--helper.c:1058
+#: builtin/submodule--helper.c:1068
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
-#: builtin/submodule--helper.c:1112
+#: builtin/submodule--helper.c:1122
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -20161,52 +20583,52 @@ msgstr ""
"子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm "
"-rf' 命令)"
-#: builtin/submodule--helper.c:1124
+#: builtin/submodule--helper.c:1134
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们"
-#: builtin/submodule--helper.c:1132
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "已清除目录 '%s'\n"
-#: builtin/submodule--helper.c:1134
+#: builtin/submodule--helper.c:1144
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "无法移除子模组工作区 '%s'\n"
-#: builtin/submodule--helper.c:1145
+#: builtin/submodule--helper.c:1155
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "不能创建空的子模组目录 %s"
-#: builtin/submodule--helper.c:1161
+#: builtin/submodule--helper.c:1171
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
-#: builtin/submodule--helper.c:1190
+#: builtin/submodule--helper.c:1200
msgid "Remove submodule working trees even if they contain local changes"
msgstr "删除子模组工作区,即使包含本地修改"
-#: builtin/submodule--helper.c:1191
+#: builtin/submodule--helper.c:1201
msgid "Unregister all submodules"
msgstr "将所有子模组取消注册"
-#: builtin/submodule--helper.c:1196
+#: builtin/submodule--helper.c:1206
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
-#: builtin/submodule--helper.c:1210
+#: builtin/submodule--helper.c:1220
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
-#: builtin/submodule--helper.c:1275
+#: builtin/submodule--helper.c:1289
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -20218,199 +20640,200 @@ msgstr ""
"Git 不使用备用仓库克隆,或者等效地使用 '--reference-if-able' 而非\n"
"'--reference' 来克隆。"
-#: builtin/submodule--helper.c:1314 builtin/submodule--helper.c:1317
+#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "子模组 '%s' 不能添加仓库备选:%s"
-#: builtin/submodule--helper.c:1353
+#: builtin/submodule--helper.c:1367
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:1360
+#: builtin/submodule--helper.c:1374
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
-#: builtin/submodule--helper.c:1383
+#: builtin/submodule--helper.c:1398
msgid "where the new submodule will be cloned to"
msgstr "新的子模组将要克隆的路径"
-#: builtin/submodule--helper.c:1386
+#: builtin/submodule--helper.c:1401
msgid "name of the new submodule"
msgstr "新子模组的名称"
-#: builtin/submodule--helper.c:1389
+#: builtin/submodule--helper.c:1404
msgid "url where to clone the submodule from"
msgstr "克隆子模组的 url 地址"
-#: builtin/submodule--helper.c:1397
+#: builtin/submodule--helper.c:1412
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
-#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1897
+#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
msgid "force cloning progress"
msgstr "强制显示克隆进度"
-#: builtin/submodule--helper.c:1402 builtin/submodule--helper.c:1899
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
msgid "disallow cloning into non-empty directory"
msgstr "不允许克隆到一个非空目录"
-#: builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1424
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
msgstr ""
"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
-"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
+"[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>"
-#: builtin/submodule--helper.c:1431
+#: builtin/submodule--helper.c:1449
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr "拒绝在另一个子模组的 git dir 中创建/使用 '%s'"
-#: builtin/submodule--helper.c:1442
+#: builtin/submodule--helper.c:1460
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到子模组路径 '%s'"
-#: builtin/submodule--helper.c:1446
+#: builtin/submodule--helper.c:1464
#, c-format
msgid "directory not empty: '%s'"
msgstr "目录非空:'%s'"
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:1476
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' 的子模组目录"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1512
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效"
-#: builtin/submodule--helper.c:1498
+#: builtin/submodule--helper.c:1516
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效"
-#: builtin/submodule--helper.c:1594
+#: builtin/submodule--helper.c:1617
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模组 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:1598
+#: builtin/submodule--helper.c:1621
msgid "Maybe you want to use 'update --init'?"
msgstr "也许您想要执行 'update --init'?"
-#: builtin/submodule--helper.c:1628
+#: builtin/submodule--helper.c:1651
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略过未合并的子模组 %s"
-#: builtin/submodule--helper.c:1657
+#: builtin/submodule--helper.c:1680
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略过子模组 '%s'"
-#: builtin/submodule--helper.c:1803
+#: builtin/submodule--helper.c:1830
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "克隆 '%s' 失败。按计划重试"
-#: builtin/submodule--helper.c:1814
+#: builtin/submodule--helper.c:1841
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次尝试克隆 '%s' 失败,退出"
-#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:2120
+#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
msgid "path into the working tree"
msgstr "到工作区的路径"
-#: builtin/submodule--helper.c:1879
+#: builtin/submodule--helper.c:1906
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作区中的路径,递归嵌套子模组"
-#: builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:1910
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
-#: builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:1916
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/submodule--helper.c:1892
+#: builtin/submodule--helper.c:1919
msgid "parallel jobs"
msgstr "并发任务"
-#: builtin/submodule--helper.c:1894
+#: builtin/submodule--helper.c:1921
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
-#: builtin/submodule--helper.c:1895
+#: builtin/submodule--helper.c:1922
msgid "don't print cloning progress"
msgstr "不要输出克隆进度"
-#: builtin/submodule--helper.c:1904
+#: builtin/submodule--helper.c:1933
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:1917
+#: builtin/submodule--helper.c:1946
msgid "bad value for update parameter"
msgstr "update 参数取值错误"
-#: builtin/submodule--helper.c:1965
+#: builtin/submodule--helper.c:1994
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
-#: builtin/submodule--helper.c:2088
+#: builtin/submodule--helper.c:2117
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "无法获得子模组 '%s' 的仓库句柄"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2150
msgid "recurse into submodules"
msgstr "在子模组中递归"
-#: builtin/submodule--helper.c:2127
+#: builtin/submodule--helper.c:2156
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
-#: builtin/submodule--helper.c:2183
+#: builtin/submodule--helper.c:2212
msgid "check if it is safe to write to the .gitmodules file"
msgstr "检查写入 .gitmodules 文件是否安全"
-#: builtin/submodule--helper.c:2186
+#: builtin/submodule--helper.c:2215
msgid "unset the config in the .gitmodules file"
msgstr "取消 .gitmodules 文件中的设置"
-#: builtin/submodule--helper.c:2191
+#: builtin/submodule--helper.c:2220
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <名称> [<值>]"
-#: builtin/submodule--helper.c:2192
+#: builtin/submodule--helper.c:2221
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <名称>"
-#: builtin/submodule--helper.c:2193
+#: builtin/submodule--helper.c:2222
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2212 git-submodule.sh:173
+#: builtin/submodule--helper.c:2241 git-submodule.sh:174
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "请确认 .gitmodules 文件在工作区里"
-#: builtin/submodule--helper.c:2262 git.c:433 git.c:684
+#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支持 --super-prefix"
-#: builtin/submodule--helper.c:2268
+#: builtin/submodule--helper.c:2297
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
@@ -20663,7 +21086,7 @@ msgstr "标签 '%s' 已存在"
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'(曾为 %s)\n"
-#: builtin/unpack-objects.c:501
+#: builtin/unpack-objects.c:502
msgid "Unpacking objects"
msgstr "展开对象中"
@@ -21032,7 +21455,7 @@ msgstr "git worktree remove [<选项>] <工作区>"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路径>"
-#: builtin/worktree.c:60 builtin/worktree.c:898
+#: builtin/worktree.c:60 builtin/worktree.c:891
#, c-format
msgid "failed to delete '%s'"
msgstr "删除 '%s' 失败"
@@ -21082,12 +21505,12 @@ msgstr "将早于 <时间> 的工作区过期"
msgid "'%s' already exists"
msgstr "'%s' 已经存在"
-#: builtin/worktree.c:251
+#: builtin/worktree.c:244
#, c-format
msgid "unable to re-add worktree '%s'"
msgstr "无法再次添加工作区 '%s'"
-#: builtin/worktree.c:256
+#: builtin/worktree.c:249
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -21096,7 +21519,7 @@ msgstr ""
"'%s' 是一个丢失但锁定的工作区,使用\n"
"'add -f -f' 覆盖,或 'unlock' 和 'prune' 或 'remove' 清除"
-#: builtin/worktree.c:258
+#: builtin/worktree.c:251
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -21105,120 +21528,120 @@ msgstr ""
"'%s' 是一个丢失但已经注册的工作区,使用\n"
"'add -f' 覆盖,或 'prune' 或 'remove' 清除"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:301
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/worktree.c:439 builtin/worktree.c:445
+#: builtin/worktree.c:432 builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "准备工作区(新分支 '%s')"
-#: builtin/worktree.c:441
+#: builtin/worktree.c:434
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "准备工作区(重置分支 '%s',之前为 %s)"
-#: builtin/worktree.c:450
+#: builtin/worktree.c:443
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "准备工作区(检出 '%s')"
-#: builtin/worktree.c:456
+#: builtin/worktree.c:449
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "准备工作区(分离头指针 %s)"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:490
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出 <分支>,即使已经被检出到其它工作区"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:493
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:502
+#: builtin/worktree.c:495
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:497
msgid "populate the new working tree"
msgstr "生成新的工作区"
-#: builtin/worktree.c:505
+#: builtin/worktree.c:498
msgid "keep the new working tree locked"
msgstr "锁定新工作区"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:501
msgid "set up tracking mode (see git-branch(1))"
msgstr "设置跟踪模式(参见 git-branch(1))"
-#: builtin/worktree.c:511
+#: builtin/worktree.c:504
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "尝试为新分支名匹配一个远程跟踪分支"
-#: builtin/worktree.c:519
+#: builtin/worktree.c:512
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
-#: builtin/worktree.c:580
+#: builtin/worktree.c:573
msgid "--[no-]track can only be used if a new branch is created"
msgstr "只能在创建新分支时使用选项 --[no-]track "
-#: builtin/worktree.c:680
+#: builtin/worktree.c:673
msgid "reason for locking"
msgstr "锁定原因"
-#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799
-#: builtin/worktree.c:926
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
-#: builtin/worktree.c:694 builtin/worktree.c:727
+#: builtin/worktree.c:687 builtin/worktree.c:720
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
-#: builtin/worktree.c:699
+#: builtin/worktree.c:692
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定,原因:%s"
-#: builtin/worktree.c:701
+#: builtin/worktree.c:694
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
-#: builtin/worktree.c:729
+#: builtin/worktree.c:722
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
-#: builtin/worktree.c:770
+#: builtin/worktree.c:763
msgid "working trees containing submodules cannot be moved or removed"
msgstr "不能移动或删除包含子模组的工作区"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:771
msgid "force move even if worktree is dirty or locked"
msgstr "强制移动,即使工作区是脏的或已锁定"
-#: builtin/worktree.c:801 builtin/worktree.c:928
+#: builtin/worktree.c:794 builtin/worktree.c:921
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' 是一个主工作区"
-#: builtin/worktree.c:806
+#: builtin/worktree.c:799
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "无法从 '%s' 算出目标名称"
-#: builtin/worktree.c:812
+#: builtin/worktree.c:805
#, c-format
msgid "target '%s' already exists"
msgstr "目标 '%s' 已存在"
-#: builtin/worktree.c:820
+#: builtin/worktree.c:813
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -21227,7 +21650,7 @@ msgstr ""
"无法移动一个锁定的工作区,锁定原因:%s\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:822
+#: builtin/worktree.c:815
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -21235,36 +21658,36 @@ msgstr ""
"无法移动一个锁定的工作区,\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:825
+#: builtin/worktree.c:818
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "验证失败,无法移动工作区:%s"
-#: builtin/worktree.c:830
+#: builtin/worktree.c:823
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "移动 '%s' 到 '%s' 失败"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:871
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "在 '%s' 中执行 'git status' 失败"
-#: builtin/worktree.c:882
+#: builtin/worktree.c:875
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr "'%s' 包含修改或未跟踪的文件,使用 --force 删除"
-#: builtin/worktree.c:887
+#: builtin/worktree.c:880
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d"
-#: builtin/worktree.c:910
+#: builtin/worktree.c:903
msgid "force removal even if worktree is dirty or locked"
msgstr "强制删除,即使工作区是脏的或已锁定"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:926
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -21273,7 +21696,7 @@ msgstr ""
"无法删除一个锁定的工作区,锁定原因:%s\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:935
+#: builtin/worktree.c:928
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -21281,7 +21704,7 @@ msgstr ""
"无法删除一个锁定的工作区,\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:938
+#: builtin/worktree.c:931
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "验证失败,无法删除工作区:%s"
@@ -21596,41 +22019,41 @@ msgstr "不能压缩请求,zlib 结束错误 %d"
msgid "dumb http transport does not support shallow capabilities"
msgstr "哑 http 传输不支持 shalllow 能力"
-#: remote-curl.c:1037
+#: remote-curl.c:1038
msgid "fetch failed."
msgstr "获取失败。"
-#: remote-curl.c:1085
+#: remote-curl.c:1086
msgid "cannot fetch by sha1 over smart http"
msgstr "无法通过智能 HTTP 获取 sha1"
-#: remote-curl.c:1129 remote-curl.c:1135
+#: remote-curl.c:1130 remote-curl.c:1136
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "协议错误:期望 sha/ref,却得到 '%s'"
-#: remote-curl.c:1147 remote-curl.c:1261
+#: remote-curl.c:1148 remote-curl.c:1263
#, c-format
msgid "http transport does not support %s"
msgstr "http 传输协议不支持 %s"
-#: remote-curl.c:1183
+#: remote-curl.c:1184
msgid "git-http-push failed"
msgstr "git-http-push 失败"
-#: remote-curl.c:1367
+#: remote-curl.c:1369
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl:用法:git remote-curl <远程> [<url>]"
-#: remote-curl.c:1399
+#: remote-curl.c:1401
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl:错误读取来自 git 的命令流"
-#: remote-curl.c:1406
+#: remote-curl.c:1408
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl:尝试没有本地仓库下获取"
-#: remote-curl.c:1446
+#: remote-curl.c:1448
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl:未知的来自 git 的命令 '%s'"
@@ -22553,57 +22976,46 @@ msgstr "${REV}:无法丢弃贮藏条目"
msgid "(To restore them type \"git stash apply\")"
msgstr "(为恢复数据输入 \"git stash apply\")"
-#: git-submodule.sh:202
+#: git-submodule.sh:203
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "只能在工作区的顶级目录中使用相对路径"
-#: git-submodule.sh:212
+#: git-submodule.sh:213
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
-#: git-submodule.sh:231
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' 已经存在于索引中"
-#: git-submodule.sh:234
+#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
-#: git-submodule.sh:241
+#: git-submodule.sh:242
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "'$sm_path' 没有检出的提交"
-#: git-submodule.sh:247
-#, sh-format
-msgid ""
-"The following path is ignored by one of your .gitignore files:\n"
-"$sm_path\n"
-"Use -f if you really want to add it."
-msgstr ""
-"以下路径被您的一个 .gitignore 文件所忽略:\n"
-"$sm_path\n"
-"如果您确实想添加它,使用 -f 参数。"
-
-#: git-submodule.sh:270
+#: git-submodule.sh:273
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "添加位于 '$sm_path' 的现存仓库到索引"
-#: git-submodule.sh:272
+#: git-submodule.sh:275
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
-#: git-submodule.sh:280
+#: git-submodule.sh:283
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
-#: git-submodule.sh:282
+#: git-submodule.sh:285
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -22618,51 +23030,51 @@ msgstr ""
"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
-#: git-submodule.sh:288
+#: git-submodule.sh:291
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "激活本地 git 目录到子模组 '$sm_name'。"
-#: git-submodule.sh:300
+#: git-submodule.sh:303
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "不能检出子模组 '$sm_path'"
-#: git-submodule.sh:305
+#: git-submodule.sh:308
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "无法添加子模组 '$sm_path'"
-#: git-submodule.sh:314
+#: git-submodule.sh:317
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"
-#: git-submodule.sh:580
+#: git-submodule.sh:590
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
-#: git-submodule.sh:590
+#: git-submodule.sh:600
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-#: git-submodule.sh:595
+#: git-submodule.sh:605
#, 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:613
+#: git-submodule.sh:623
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
"$sha1:"
msgstr "无法在子模组路径 '$displaypath' 中获取,尝试直接获取 $sha1:"
-#: git-submodule.sh:619
+#: git-submodule.sh:629
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22670,74 +23082,74 @@ msgid ""
msgstr ""
"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
-#: git-submodule.sh:626
+#: git-submodule.sh:636
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-#: git-submodule.sh:627
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "子模组路径 '$displaypath':检出 '$sha1'"
-#: git-submodule.sh:631
+#: git-submodule.sh:641
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-#: git-submodule.sh:632
+#: git-submodule.sh:642
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
-#: git-submodule.sh:637
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-#: git-submodule.sh:638
+#: git-submodule.sh:648
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
-#: git-submodule.sh:643
+#: git-submodule.sh:653
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
-#: git-submodule.sh:644
+#: git-submodule.sh:654
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "子模组 '$displaypath':'$command $sha1'"
-#: git-submodule.sh:675
+#: git-submodule.sh:685
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进子模组路径 '$displaypath'"
-#: git-submodule.sh:886
+#: git-submodule.sh:896
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached 不能和选项 --files 同时使用"
-#: git-submodule.sh:938
+#: git-submodule.sh:948
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
# 译者:注意保持前导空格
-#: git-submodule.sh:958
+#: git-submodule.sh:968
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 警告:$display_name 未包含提交 $sha1_src"
# 译者:注意保持前导空格
-#: git-submodule.sh:961
+#: git-submodule.sh:971
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 警告:$display_name 未包含提交 $sha1_dst"
# 译者:注意保持前导空格
-#: git-submodule.sh:964
+#: git-submodule.sh:974
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
@@ -23048,6 +23460,10 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
+#: git-rebase--preserve-merges.sh:955
+msgid "Note that empty commits are commented out"
+msgstr "注意空提交已被注释掉"
+
#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "不能对重写提交进行初始化"
@@ -23315,124 +23731,11 @@ msgstr ""
msgid "The selected hunks do not apply to the index!\n"
msgstr "选中的块不能应用到索引!\n"
-#: git-add--interactive.perl:1343
-msgid "Apply them to the worktree anyway? "
-msgstr "无论如何都要应用到工作区么?"
-
-#: git-add--interactive.perl:1346
-msgid "Nothing was applied.\n"
-msgstr "未应用。\n"
-
#: git-add--interactive.perl:1357
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "忽略未合入的:%s\n"
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1429
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1430
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "暂存该块 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1434
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1435
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1439
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1440
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1443
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1444
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1445
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1449 git-add--interactive.perl:1464
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1450 git-add--interactive.perl:1465
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1454
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1455
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1459
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1460
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
-
#: git-add--interactive.perl:1468
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "