diff --git a/po/zh_CN.po b/po/zh_CN.po index a531819623..068d71bf2e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -28,8 +28,9 @@ # bare repository | 纯仓库 # bisect | 二分查找 # blob object | 数据对象 +# bloom filter | 布隆过滤器 # branch | 分支 -# bundle | 包 +# bundle | 归档包 # bypass | 绕过 # cache | 索引（的别称） # chain | （提交）链 @@ -139,8 +140,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2020-07-10 09:53+0800\n" -"PO-Revision-Date: 2020-07-17 10:27+0800\n" +"POT-Creation-Date: 2020-10-10 09:32+0800\n" +"PO-Revision-Date: 2020-10-10 09:43+0800\n" "Last-Translator: Jiang Xin \n" "Language-Team: GitHub \n" "Language: zh_CN\n" @@ -154,9 +155,9 @@ msgstr "" msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142 -#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518 -#: builtin/rebase.c:1919 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 +#: builtin/rebase.c:1944 msgid "could not read index" msgstr "不能读取索引" @@ -184,7 +185,7 @@ msgstr "更新" msgid "could not stage '%s'" msgstr "不能暂存 '%s'" -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336 +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444 msgid "could not write index" msgstr "不能写入索引" @@ -200,7 +201,7 @@ msgstr[1] "更新了 %d 个路径\n" msgid "note: %s is untracked now.\n" msgstr "说明：%s 现已成为未跟踪的。\n" -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294 +#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" @@ -242,21 +243,21 @@ msgstr[1] "增加了 %d 个路径\n" msgid "ignoring unmerged: %s" msgstr "忽略未合入的：%s" -#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368 +#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371 #, c-format msgid "Only binary files changed.\n" msgstr "只有二进制文件被修改。\n" -#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370 +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 #, c-format msgid "No changes.\n" msgstr "没有修改。\n" -#: add-interactive.c:935 git-add--interactive.perl:1378 +#: add-interactive.c:935 git-add--interactive.perl:1381 msgid "Patch update" msgstr "补丁更新" -#: add-interactive.c:974 git-add--interactive.perl:1771 +#: add-interactive.c:974 git-add--interactive.perl:1794 msgid "Review diff" msgstr "检视 diff" @@ -324,11 +325,11 @@ msgstr "选择一个编号条目" msgid "(empty) select nothing" msgstr "（空）不选择任何内容" -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 msgid "What now" msgstr "请选择" @@ -340,12 +341,12 @@ msgstr "缓存" msgid "unstaged" msgstr "未缓存" -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250 -#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145 -#: builtin/merge.c:276 builtin/pull.c:190 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 bugreport.c:135 +#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 #: git-add--interactive.perl:213 msgid "path" msgstr "路径" @@ -354,27 +355,27 @@ msgstr "路径" msgid "could not refresh index" msgstr "不能刷新索引" -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805 #, c-format msgid "Bye.\n" msgstr "再见。\n" -#: add-patch.c:34 git-add--interactive.perl:1430 +#: add-patch.c:34 git-add--interactive.perl:1433 #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:35 git-add--interactive.perl:1431 +#: add-patch.c:35 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:36 git-add--interactive.perl:1432 +#: add-patch.c:36 git-add--interactive.perl:1435 #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "暂存添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:37 git-add--interactive.perl:1433 +#: add-patch.c:37 git-add--interactive.perl:1436 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "暂存该块 [y,n,q,a,d%s,?]? " @@ -399,22 +400,22 @@ msgstr "" "a - 暂存该块和本文件中后面的全部块\n" "d - 不暂存该块和本文件中后面的全部块\n" -#: add-patch.c:56 git-add--interactive.perl:1436 +#: add-patch.c:56 git-add--interactive.perl:1439 #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:57 git-add--interactive.perl:1437 +#: add-patch.c:57 git-add--interactive.perl:1440 #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:58 git-add--interactive.perl:1438 +#: add-patch.c:58 git-add--interactive.perl:1441 #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:59 git-add--interactive.perl:1439 +#: add-patch.c:59 git-add--interactive.perl:1442 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "贮藏该块 [y,n,q,a,d%s,?]? " @@ -439,22 +440,22 @@ msgstr "" "a - 贮藏该块和本文件中后面的全部块\n" "d - 不贮藏该块和本文件中后面的全部块\n" -#: add-patch.c:80 git-add--interactive.perl:1442 +#: add-patch.c:80 git-add--interactive.perl:1445 #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:81 git-add--interactive.perl:1443 +#: add-patch.c:81 git-add--interactive.perl:1446 #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:82 git-add--interactive.perl:1444 +#: add-patch.c:82 git-add--interactive.perl:1447 #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:83 git-add--interactive.perl:1445 +#: add-patch.c:83 git-add--interactive.perl:1448 #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " @@ -479,22 +480,22 @@ msgstr "" "a - 取消暂存该块和本文件中后面的全部块\n" "d - 不要取消暂存该块和本文件中后面的全部块\n" -#: add-patch.c:103 git-add--interactive.perl:1448 +#: add-patch.c:103 git-add--interactive.perl:1451 #, c-format, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:104 git-add--interactive.perl:1449 +#: add-patch.c:104 git-add--interactive.perl:1452 #, c-format, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:105 git-add--interactive.perl:1450 +#: add-patch.c:105 git-add--interactive.perl:1453 #, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:106 git-add--interactive.perl:1451 +#: add-patch.c:106 git-add--interactive.perl:1454 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " @@ -519,26 +520,26 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c:126 git-add--interactive.perl:1454 -#: git-add--interactive.perl:1472 +#: add-patch.c:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:127 git-add--interactive.perl:1455 -#: git-add--interactive.perl:1473 +#: add-patch.c:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:128 git-add--interactive.perl:1456 -#: git-add--interactive.perl:1474 +#: add-patch.c:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 #, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:129 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " @@ -563,22 +564,22 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463 #, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 #, c-format, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 #, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 #, 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,?]? " @@ -597,22 +598,22 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469 #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 #, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 #, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 #, 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,?]? " @@ -645,40 +646,40 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c:328 +#: add-patch.c:342 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "无法解析数据块头信息 '%.*s'" -#: add-patch.c:347 add-patch.c:351 +#: add-patch.c:361 add-patch.c:365 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "无法解析彩色数据块头信息 '%.*s'" -#: add-patch.c:405 +#: add-patch.c:419 msgid "could not parse diff" msgstr "不能解析差异信息" -#: add-patch.c:424 +#: add-patch.c:438 msgid "could not parse colored diff" msgstr "不能解析彩色差异信息" -#: add-patch.c:438 +#: add-patch.c:452 #, c-format msgid "failed to run '%s'" msgstr "运行 '%s' 失败" -#: add-patch.c:602 +#: add-patch.c:611 msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的输出不匹配" -#: add-patch.c:603 +#: add-patch.c:612 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。" -#: add-patch.c:776 +#: add-patch.c:785 #, c-format msgid "" "expected context line #%d in\n" @@ -687,7 +688,7 @@ msgstr "" "预期上下文行 #%d 于\n" "%.*s" -#: add-patch.c:791 +#: add-patch.c:800 #, c-format msgid "" "hunks do not overlap:\n" @@ -700,11 +701,11 @@ msgstr "" "\t不是结尾于：\n" "%.*s" -#: add-patch.c:1067 git-add--interactive.perl:1114 +#: add-patch.c:1076 git-add--interactive.perl:1117 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" -#: add-patch.c:1071 +#: add-patch.c:1080 #, c-format msgid "" "---\n" @@ -718,7 +719,7 @@ msgstr "" "以 %c 开始的行将被删除。\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1085 git-add--interactive.perl:1128 +#: add-patch.c:1094 git-add--interactive.perl:1131 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" @@ -727,11 +728,11 @@ msgstr "" "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n" "此次编辑被终止，该块不会被修改。\n" -#: add-patch.c:1118 +#: add-patch.c:1127 msgid "could not parse hunk header" msgstr "无法解析数据块头信息" -#: add-patch.c:1163 +#: add-patch.c:1172 msgid "'git apply --cached' failed" msgstr "'git apply --cached' 失败" @@ -747,24 +748,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:1232 git-add--interactive.perl:1241 +#: add-patch.c:1241 git-add--interactive.perl:1244 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " -#: add-patch.c:1275 +#: add-patch.c:1284 msgid "The selected hunks do not apply to the index!" msgstr "选中的块不能应用到索引！" -#: add-patch.c:1276 git-add--interactive.perl:1345 +#: add-patch.c:1285 git-add--interactive.perl:1348 msgid "Apply them to the worktree anyway? " msgstr "无论如何都要应用到工作区么？" -#: add-patch.c:1283 git-add--interactive.perl:1348 +#: add-patch.c:1292 git-add--interactive.perl:1351 msgid "Nothing was applied.\n" msgstr "未应用。\n" -#: add-patch.c:1340 +#: add-patch.c:1349 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -786,69 +787,69 @@ msgstr "" "e - 手动编辑当前块\n" "? - 显示帮助\n" -#: add-patch.c:1463 add-patch.c:1473 +#: add-patch.c:1511 add-patch.c:1521 msgid "No previous hunk" msgstr "没有前一个块" -#: add-patch.c:1468 add-patch.c:1478 +#: add-patch.c:1516 add-patch.c:1526 msgid "No next hunk" msgstr "没有下一个块" -#: add-patch.c:1484 +#: add-patch.c:1532 msgid "No other hunks to goto" msgstr "没有其它可供跳转的块" -#: add-patch.c:1495 git-add--interactive.perl:1594 +#: add-patch.c:1543 git-add--interactive.perl:1608 msgid "go to which hunk ( to see more)? " msgstr "跳转到哪个块（<回车> 查看更多）？ " -#: add-patch.c:1496 git-add--interactive.perl:1596 +#: add-patch.c:1544 git-add--interactive.perl:1610 msgid "go to which hunk? " msgstr "跳转到哪个块？" -#: add-patch.c:1507 +#: add-patch.c:1555 #, c-format msgid "Invalid number: '%s'" msgstr "无效数字：'%s'" -#: add-patch.c:1512 +#: add-patch.c:1560 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "对不起，只有 %d 个可用块。" msgstr[1] "对不起，只有 %d 个可用块。" -#: add-patch.c:1521 +#: add-patch.c:1569 msgid "No other hunks to search" msgstr "没有其它可供查找的块" -#: add-patch.c:1527 git-add--interactive.perl:1640 +#: add-patch.c:1575 git-add--interactive.perl:1663 msgid "search for regex? " msgstr "使用正则表达式搜索？" -#: add-patch.c:1542 +#: add-patch.c:1590 #, c-format msgid "Malformed search regexp %s: %s" msgstr "错误的正则表达式 %s：%s" -#: add-patch.c:1559 +#: add-patch.c:1607 msgid "No hunk matches the given pattern" msgstr "没有和给定模式相匹配的块" -#: add-patch.c:1566 +#: add-patch.c:1614 msgid "Sorry, cannot split this hunk" msgstr "对不起，不能拆分这个块" -#: add-patch.c:1570 +#: add-patch.c:1618 #, c-format msgid "Split into %d hunks." msgstr "拆分为 %d 块。" -#: add-patch.c:1574 +#: add-patch.c:1622 msgid "Sorry, cannot edit this hunk" msgstr "对不起，不能编辑这个块" -#: add-patch.c:1625 +#: add-patch.c:1674 msgid "'git apply' failed" msgstr "'git apply' 失败" @@ -903,7 +904,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" -#: advice.c:278 builtin/merge.c:1353 +#: advice.c:278 builtin/merge.c:1349 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" @@ -1193,7 +1194,7 @@ msgstr "打补丁失败：%s:%ld" msgid "cannot checkout %s" msgstr "不能检出 %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" @@ -1213,7 +1214,7 @@ msgstr "路径 %s 已经被重命名/删除" msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: apply.c:3537 apply.c:3708 +#: apply.c:3537 apply.c:3708 apply.c:3953 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" @@ -1261,360 +1262,355 @@ msgstr "%s：错误类型" msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" -#: apply.c:3936 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: apply.c:3939 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: apply.c:3959 +#: apply.c:3976 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: apply.c:3964 +#: apply.c:3981 #, 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:3984 +#: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" -#: apply.c:3988 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: apply.c:4003 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "正在检查补丁 %s..." -#: apply.c:4095 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" -#: apply.c:4102 +#: apply.c:4119 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式变更，但它不在当前 HEAD 中" -#: apply.c:4105 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效（%s）。" -#: apply.c:4114 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" -#: apply.c:4124 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" -#: apply.c:4262 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: apply.c:4296 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: apply.c:4302 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能对新建文件 '%s' 调用 stat" -#: apply.c:4310 +#: apply.c:4327 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: apply.c:4316 apply.c:4461 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c:4359 +#: apply.c:4376 builtin/bisect--helper.c:537 #, c-format msgid "failed to write to '%s'" msgstr "写入 '%s' 失败" -#: apply.c:4363 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: apply.c:4433 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: apply.c:4531 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: apply.c:4539 +#: apply.c:4556 msgid "internal error" msgstr "内部错误" -#: apply.c:4542 +#: apply.c:4559 #, 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:4553 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" -#: apply.c:4575 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: apply.c:4579 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: apply.c:4698 +#: apply.c:4715 #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" -#: apply.c:4706 +#: apply.c:4723 msgid "unrecognized input" msgstr "未能识别的输入" -#: apply.c:4726 +#: apply.c:4743 msgid "unable to read index file" msgstr "无法读取索引文件" -#: apply.c:4883 +#: apply.c:4900 #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s'：%s" -#: apply.c:4910 +#: apply.c:4927 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: apply.c:4916 apply.c:4931 +#: apply.c:4933 apply.c:4948 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字符误用。" msgstr[1] "%d 行新增了空白字符误用。" -#: apply.c:4924 +#: apply.c:4941 #, 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:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: apply.c:4968 +#: apply.c:4985 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: apply.c:4971 +#: apply.c:4988 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: apply.c:4973 builtin/am.c:2259 +#: apply.c:4990 builtin/am.c:2279 msgid "num" msgstr "数字" -#: apply.c:4974 +#: apply.c:4991 msgid "remove leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: apply.c:4977 +#: apply.c:4994 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: apply.c:4979 +#: apply.c:4996 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: apply.c:4983 +#: apply.c:5000 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: apply.c:4985 +#: apply.c:5002 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: apply.c:4987 +#: apply.c:5004 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: apply.c:4989 +#: apply.c:5006 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: apply.c:4991 +#: apply.c:5008 msgid "mark new files with `git add --intent-to-add`" msgstr "使用命令 `git add --intent-to-add` 标记新增文件" -#: apply.c:4993 +#: apply.c:5010 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: apply.c:4995 +#: apply.c:5012 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" -#: apply.c:4998 +#: apply.c:5015 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: apply.c:5000 +#: apply.c:5017 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三方合并" -#: apply.c:5002 +#: apply.c:5019 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: apply.c:5007 +#: apply.c:5024 msgid "ensure at least lines of context match" msgstr "确保至少匹配 行上下文" -#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3530 builtin/rebase.c:1332 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 msgid "action" msgstr "动作" -#: apply.c:5009 +#: apply.c:5026 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: apply.c:5012 apply.c:5015 +#: apply.c:5029 apply.c:5032 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: apply.c:5018 +#: apply.c:5035 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: apply.c:5020 +#: apply.c:5037 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: apply.c:5022 +#: apply.c:5039 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: apply.c:5024 +#: apply.c:5041 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "冗长输出" -#: apply.c:5027 +#: apply.c:5044 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: apply.c:5030 +#: apply.c:5047 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: apply.c:5032 builtin/am.c:2247 +#: apply.c:5049 builtin/am.c:2267 msgid "root" msgstr "根目录" -#: apply.c:5033 +#: apply.c:5050 msgid "prepend to all filenames" msgstr "为所有文件名前添加 <根目录>" -#: archive-tar.c:125 archive-zip.c:351 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "不能打开数据对象 %s" -#: archive-tar.c:266 archive-zip.c:369 +#: archive-tar.c:265 archive-zip.c:358 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支持的文件模式：0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:359 -#, c-format -msgid "cannot read %s" -msgstr "不能读取 %s" - -#: archive-tar.c:465 +#: archive-tar.c:449 #, c-format msgid "unable to start '%s' filter" msgstr "无法启动 '%s' 过滤器" -#: archive-tar.c:468 +#: archive-tar.c:452 msgid "unable to redirect descriptor" msgstr "无法重定向描述符" -#: archive-tar.c:475 +#: archive-tar.c:459 #, c-format msgid "'%s' filter reported error" msgstr "'%s' 过滤器报告了错误" -#: archive-zip.c:319 +#: archive-zip.c:318 #, c-format msgid "path is not valid UTF-8: %s" msgstr "路径不是有效的 UTF-8：%s" -#: archive-zip.c:323 +#: archive-zip.c:322 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路径太长（%d 字符，SHA1：%s）：%s" -#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246 +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: archive-zip.c:615 +#: archive-zip.c:603 #, c-format msgid "timestamp too large for this system: %" msgstr "对于本系统时间戳太大：%" @@ -1637,119 +1633,149 @@ msgstr "" msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" -#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "不能读取 %s" + +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 +#: builtin/merge.c:1124 +#, c-format +msgid "could not read '%s'" +msgstr "不能读取 '%s'" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" -#: archive.c:401 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "无此引用：%.*s" -#: archive.c:407 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "不是一个有效的对象名：%s" -#: archive.c:420 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "不是一个树对象：%s" -#: archive.c:432 +#: archive.c:485 msgid "current working directory is untracked" msgstr "当前工作目录未被跟踪" -#: archive.c:464 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "文件未找到：%s" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "不是一个常规文件：%s" + +#: archive.c:553 msgid "fmt" msgstr "格式" -#: archive.c:464 +#: archive.c:553 msgid "archive format" msgstr "归档格式" -#: archive.c:465 builtin/log.c:1674 +#: archive.c:554 builtin/log.c:1760 msgid "prefix" msgstr "前缀" -#: archive.c:466 +#: archive.c:555 msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208 -#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907 -#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "文件" -#: archive.c:468 builtin/archive.c:90 +#: archive.c:557 +msgid "add untracked file to archive" +msgstr "将未跟踪文件添加到归档" + +#: archive.c:560 builtin/archive.c:90 msgid "write the archive to this file" msgstr "归档写入此文件" -#: archive.c:470 +#: archive.c:562 msgid "read .gitattributes in working directory" msgstr "读取工作区中的 .gitattributes" -#: archive.c:471 +#: archive.c:563 msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" -#: archive.c:472 +#: archive.c:564 msgid "store only" msgstr "只存储" -#: archive.c:473 +#: archive.c:565 msgid "compress faster" msgstr "压缩速度更快" -#: archive.c:481 +#: archive.c:573 msgid "compress better" msgstr "压缩效果更好" -#: archive.c:484 +#: archive.c:576 msgid "list supported archive formats" msgstr "列出支持的归档格式" -#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "仓库" -#: archive.c:487 builtin/archive.c:92 +#: archive.c:579 builtin/archive.c:92 msgid "retrieve the archive from remote repository " msgstr "从远程仓库（<仓库>）提取归档文件" -#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "命令" -#: archive.c:489 builtin/archive.c:94 +#: archive.c:581 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" -#: archive.c:496 +#: archive.c:588 msgid "Unexpected option --remote" msgstr "未知参数 --remote" -#: archive.c:498 +#: archive.c:590 msgid "Option --exec can only be used together with --remote" msgstr "选项 --exec 只能和 --remote 同时使用" -#: archive.c:500 +#: archive.c:592 msgid "Unexpected option --output" msgstr "未知参数 --output" -#: archive.c:522 +#: archive.c:594 +msgid "Options --add-file and --remote cannot be used together" +msgstr "选项 --add-file 和 --remote 不能同时使用" + +#: archive.c:616 #, c-format msgid "Unknown archive format '%s'" msgstr "未知归档格式 '%s'" -#: archive.c:529 +#: archive.c:623 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "参数不支持此格式 '%s'：-%d" @@ -1772,22 +1798,22 @@ msgstr "" "负值模版在 git attributes 中被忽略\n" "当字符串确实要以感叹号开始时，使用 '\\!'。" -#: bisect.c:468 +#: bisect.c:476 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "文件 '%s' 包含错误的引用格式：%s" -#: bisect.c:678 +#: bisect.c:686 #, c-format msgid "We cannot bisect more!\n" msgstr "我们无法进行更多的二分查找！\n" -#: bisect.c:745 +#: bisect.c:753 #, c-format msgid "Not a valid commit name %s" msgstr "不是一个有效的提交名 %s" -#: bisect.c:770 +#: bisect.c:778 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1796,7 +1822,7 @@ msgstr "" "合并基线 %s 是坏的。\n" "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" -#: bisect.c:775 +#: bisect.c:783 #, c-format msgid "" "The merge base %s is new.\n" @@ -1805,7 +1831,7 @@ msgstr "" "合并基线 %s 是新的。\n" "介于 %s 和 [%s] 之间的属性已经被修改。\n" -#: bisect.c:780 +#: bisect.c:788 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1814,7 +1840,7 @@ msgstr "" "合并基线 %s 是 %s。\n" "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" -#: bisect.c:788 +#: bisect.c:796 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1825,7 +1851,7 @@ msgstr "" "这种情况下 git 二分查找无法正常工作。\n" "您可能弄错了 %s 和 %s 版本？\n" -#: bisect.c:801 +#: bisect.c:809 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1836,36 +1862,36 @@ msgstr "" "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" "我们仍旧继续。" -#: bisect.c:840 +#: bisect.c:848 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分查找中：合并基线必须是经过测试的\n" -#: bisect.c:890 +#: bisect.c:898 #, c-format msgid "a %s revision is needed" msgstr "需要一个 %s 版本" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" -#: bisect.c:966 builtin/merge.c:151 +#: bisect.c:974 builtin/merge.c:150 #, c-format msgid "could not read file '%s'" msgstr "不能读取文件 '%s'" -#: bisect.c:997 +#: bisect.c:1014 msgid "reading bisect refs failed" msgstr "读取二分查找引用失败" -#: bisect.c:1019 +#: bisect.c:1044 #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同时为 %s 和 %s\n" -#: bisect.c:1028 +#: bisect.c:1053 #, c-format msgid "" "No testable commit found.\n" @@ -1874,7 +1900,7 @@ msgstr "" "没有发现可测试的提交。\n" "可能您在运行时使用了错误的路径参数？\n" -#: bisect.c:1057 +#: bisect.c:1082 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1884,44 +1910,44 @@ msgstr[1] "（大概 %d 步）" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: bisect.c:1088 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" -#: blame.c:2777 +#: blame.c:2778 msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" -#: blame.c:2791 +#: blame.c:2792 msgid "cannot use --contents with final commit object name" msgstr "不能将 --contents 和最终的提交对象名共用" -#: blame.c:2812 +#: blame.c:2813 msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 -#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405 -#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235 -#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363 -#: builtin/shortlog.c:192 +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:320 msgid "revision walk setup failed" msgstr "版本遍历设置失败" -#: blame.c:2839 +#: blame.c:2840 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围" -#: blame.c:2850 +#: blame.c:2851 #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中无此路径 %1$s" -#: blame.c:2861 +#: blame.c:2862 #, c-format msgid "cannot read blob %s for path %s" msgstr "不能为路径 %2$s 读取数据对象 %1$s" @@ -2059,88 +2085,104 @@ msgstr "'%s' 已经检出到 '%s'" msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s 的 HEAD 指向没有被更新" -#: bundle.c:47 +#: bundle.c:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "未能识别的归档包哈希算法：%s" + +#: bundle.c:45 #, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "'%s' 不像是一个 v2 版本的包文件" +msgid "unknown capability '%s'" +msgstr "未知能力 '%s'" -#: bundle.c:69 -msgid "unknown hash algorithm length" -msgstr "未知的哈希算法长度" +#: bundle.c:71 +#, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件" -#: bundle.c:84 +#: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" -#: bundle.c:163 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "仓库中缺少这些必备的提交：" -#: bundle.c:166 +#: bundle.c:192 msgid "need a repository to verify a bundle" -msgstr "需要一个仓库来校验一个包" +msgstr "需要一个仓库来校验一个归档包" -#: bundle.c:217 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" -msgstr[0] "这个包中含有这个引用：" -msgstr[1] "这个包中含有 %d 个引用：" +msgstr[0] "这个归档包中含有这个引用：" +msgstr[1] "这个归档包中含有 %d 个引用：" -#: bundle.c:224 +#: bundle.c:250 msgid "The bundle records a complete history." -msgstr "这个包记录一个完整历史。" +msgstr "这个归档包记录一个完整历史。" -#: bundle.c:226 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" -msgstr[0] "这个包需要这个引用：" -msgstr[1] "这个包需要 %d 个引用：" +msgstr[0] "这个归档包需要这个引用：" +msgstr[1] "这个归档包需要 %d 个引用：" -#: bundle.c:293 +#: bundle.c:319 msgid "unable to dup bundle descriptor" -msgstr "无法复制 bundle 描述符" +msgstr "无法复制归档包描述符" -#: bundle.c:300 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 进程" -#: bundle.c:311 +#: bundle.c:337 msgid "pack-objects died" msgstr "pack-objects 终止" -#: bundle.c:353 +#: bundle.c:379 msgid "rev-list died" msgstr "rev-list 终止" -#: bundle.c:402 +#: bundle.c:428 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 +#: bundle.c:498 +#, c-format +msgid "unsupported bundle version %d" +msgstr "不支持的归档包版本 %d" + +#: bundle.c:500 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "不能写入，归档包版本 %d 不支持算法 %s" + +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" -#: bundle.c:489 +#: bundle.c:530 msgid "Refusing to create empty bundle." -msgstr "不能创建空包。" +msgstr "不能创建空的归档包。" -#: bundle.c:499 +#: bundle.c:540 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" -#: bundle.c:524 +#: bundle.c:565 msgid "index-pack died" msgstr "index-pack 终止" @@ -2149,267 +2191,264 @@ msgstr "index-pack 终止" msgid "invalid color value: %.*s" msgstr "无效的颜色值：%.*s" -#: commit-graph.c:238 +#: commit-graph.c:188 midx.c:46 +msgid "invalid hash version" +msgstr "无效的哈希版本" + +#: commit-graph.c:246 msgid "commit-graph file is too small" msgstr "提交图形文件太小" -#: commit-graph.c:303 +#: commit-graph.c:311 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "提交图形签名 %X 和签名 %X 不匹配" -#: commit-graph.c:310 +#: commit-graph.c:318 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "提交图形版本 %X 和版本 %X 不匹配" -#: commit-graph.c:317 +#: commit-graph.c:325 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" -#: commit-graph.c:339 -msgid "commit-graph chunk lookup table entry missing; file may be incomplete" -msgstr "提交图形块查找表条目丢失，文件可能不完整" +#: commit-graph.c:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "提交图形文件太小，容不下 %u 个块" -#: commit-graph.c:349 +#: commit-graph.c:361 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "提交图形不正确的块偏移 %08x%08x" -#: commit-graph.c:417 +#: commit-graph.c:433 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "提交图形块 id %08x 出现了多次" -#: commit-graph.c:491 +#: commit-graph.c:499 msgid "commit-graph has no base graphs chunk" msgstr "提交图形没有基础图形块" -#: commit-graph.c:501 +#: commit-graph.c:509 msgid "commit-graph chain does not match" msgstr "提交图形链不匹配" -#: commit-graph.c:549 +#: commit-graph.c:557 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "无效的提交图形链：行 '%s' 不是一个哈希值" -#: commit-graph.c:573 +#: commit-graph.c:581 msgid "unable to find all commit-graph files" msgstr "无法找到所有提交图形文件" -#: commit-graph.c:706 commit-graph.c:770 +#: commit-graph.c:721 commit-graph.c:785 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "无效的提交位置。提交图形可能已损坏" -#: commit-graph.c:727 +#: commit-graph.c:742 #, c-format msgid "could not find commit %s" msgstr "无法找到提交 %s" -#: commit-graph.c:1009 builtin/am.c:1292 +#: commit-graph.c:1042 builtin/am.c:1306 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: commit-graph.c:1157 -msgid "Writing changed paths Bloom filters index" -msgstr "编写变更路径的 Bloom 过滤器索引" - -#: commit-graph.c:1182 -msgid "Writing changed paths Bloom filters data" -msgstr "编写变更路径的 Bloom 过滤器数据" - -#: commit-graph.c:1221 builtin/pack-objects.c:2832 +#: commit-graph.c:1265 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "无法获得对象 %s 类型" -#: commit-graph.c:1257 +#: commit-graph.c:1301 msgid "Loading known commits in commit graph" msgstr "正在加载提交图中的已知提交" -#: commit-graph.c:1274 +#: commit-graph.c:1318 msgid "Expanding reachable commits in commit graph" msgstr "正在扩展提交图中的可达提交" -#: commit-graph.c:1294 +#: commit-graph.c:1338 msgid "Clearing commit marks in commit graph" msgstr "正在清除提交图中的提交标记" -#: commit-graph.c:1313 +#: commit-graph.c:1357 msgid "Computing commit graph generation numbers" msgstr "正在计算提交图世代数字" -#: commit-graph.c:1367 +#: commit-graph.c:1424 msgid "Computing commit changed paths Bloom filters" -msgstr "计算提交变更路径的 Bloom 过滤器" +msgstr "计算提交变更路径的布隆过滤器" -#: commit-graph.c:1423 +#: commit-graph.c:1501 msgid "Collecting referenced commits" msgstr "正在收集引用的提交" -#: commit-graph.c:1447 +#: commit-graph.c:1526 #, 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:1460 +#: commit-graph.c:1539 #, c-format msgid "error adding pack %s" msgstr "添加包 %s 出错" -#: commit-graph.c:1464 +#: commit-graph.c:1543 #, c-format msgid "error opening index for %s" msgstr "为 %s 打开索引出错" -#: commit-graph.c:1503 +#: commit-graph.c:1582 msgid "Finding commits for commit graph among packed objects" msgstr "正在打包对象中查找提交图的提交" -#: commit-graph.c:1518 +#: commit-graph.c:1597 msgid "Counting distinct commits in commit graph" msgstr "正在计算提交图中不同的提交" -#: commit-graph.c:1550 +#: commit-graph.c:1629 msgid "Finding extra edges in commit graph" msgstr "正在查找提交图中额外的边" -#: commit-graph.c:1599 +#: commit-graph.c:1678 msgid "failed to write correct number of base graph ids" msgstr "无法写入正确数量的基础图形 ID" -#: commit-graph.c:1633 midx.c:812 +#: commit-graph.c:1720 midx.c:826 #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" -#: commit-graph.c:1646 +#: commit-graph.c:1733 msgid "unable to create temporary graph layer" msgstr "无法创建临时图层" -#: commit-graph.c:1651 +#: commit-graph.c:1738 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "无法为 '%s' 调整共享权限" -#: commit-graph.c:1728 +#: commit-graph.c:1808 #, 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:1773 +#: commit-graph.c:1853 msgid "unable to open commit-graph chain file" msgstr "无法打开提交图形链文件" -#: commit-graph.c:1789 +#: commit-graph.c:1869 msgid "failed to rename base commit-graph file" msgstr "无法重命名基础提交图形文件" -#: commit-graph.c:1809 +#: commit-graph.c:1889 msgid "failed to rename temporary commit-graph file" msgstr "无法重命名临时提交图形文件" -#: commit-graph.c:1935 +#: commit-graph.c:2015 msgid "Scanning merged commits" msgstr "正在扫描合并提交" -#: commit-graph.c:1946 +#: commit-graph.c:2026 #, c-format msgid "unexpected duplicate commit id %s" msgstr "意外的重复提交 ID %s" -#: commit-graph.c:1969 +#: commit-graph.c:2049 msgid "Merging commit-graph" msgstr "正在合并提交图形" -#: commit-graph.c:2156 +#: commit-graph.c:2259 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "提交图格式不能写入 %d 个提交" -#: commit-graph.c:2167 +#: commit-graph.c:2270 msgid "too many commits to write graph" msgstr "提交太多不能画图" -#: commit-graph.c:2260 +#: commit-graph.c:2363 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交图文件的校验码错误，可能已经损坏" -#: commit-graph.c:2270 +#: commit-graph.c:2373 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s" -#: commit-graph.c:2280 commit-graph.c:2295 +#: commit-graph.c:2383 commit-graph.c:2398 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u" -#: commit-graph.c:2287 +#: commit-graph.c:2390 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "无法从提交图形中解析提交 %s" -#: commit-graph.c:2305 +#: commit-graph.c:2408 msgid "Verifying commits in commit graph" msgstr "正在校验提交图中的提交" -#: commit-graph.c:2320 +#: commit-graph.c:2423 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "无法从提交图形的对象库中解析提交 %s" -#: commit-graph.c:2327 +#: commit-graph.c:2430 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" -#: commit-graph.c:2337 +#: commit-graph.c:2440 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交图形父提交列表太长了" -#: commit-graph.c:2346 +#: commit-graph.c:2449 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交图形父提交是 %s != %s" -#: commit-graph.c:2360 +#: commit-graph.c:2463 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交图形父提交列表过早终止" -#: commit-graph.c:2365 +#: commit-graph.c:2468 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零" -#: commit-graph.c:2369 +#: commit-graph.c:2472 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零" -#: commit-graph.c:2385 +#: commit-graph.c:2488 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "提交图形中的提交 %s 的世代号是 %u != %u" -#: commit-graph.c:2391 +#: commit-graph.c:2494 #, c-format msgid "commit date for commit %s in commit-graph is % != %" msgstr "提交图形中提交 %s 的提交日期是 % != %" -#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457 +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" @@ -2511,7 +2550,7 @@ msgstr "键名没有包含一个小节名称：%s" msgid "key does not contain variable name: %s" msgstr "键名没有包含变量名：%s" -#: config.c:408 sequencer.c:2456 +#: config.c:408 sequencer.c:2547 #, c-format msgid "invalid key: %s" msgstr "无效键名：%s" @@ -2647,7 +2686,7 @@ msgstr "%s 的取值格式错误：%s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1533 builtin/pack-objects.c:3617 +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" @@ -2676,101 +2715,101 @@ msgstr "解析 %s 失败" msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" -#: config.c:2113 +#: config.c:2122 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" -#: config.c:2283 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "无效 %s：'%s'" -#: config.c:2328 +#: config.c:2341 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" -#: config.c:2374 +#: config.c:2387 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" -#: config.c:2376 +#: config.c:2389 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" -#: config.c:2457 +#: config.c:2470 #, c-format msgid "invalid section name '%s'" msgstr "无效的小节名称 '%s'" -#: config.c:2489 +#: config.c:2502 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" -#: config.c:2518 +#: config.c:2531 #, c-format msgid "failed to write new configuration file %s" msgstr "写入新的配置文件 %s 失败" -#: config.c:2770 config.c:3094 +#: config.c:2783 config.c:3107 #, c-format msgid "could not lock config file %s" msgstr "不能锁定配置文件 %s" -#: config.c:2781 +#: config.c:2794 #, c-format msgid "opening %s" msgstr "打开 %s" -#: config.c:2816 builtin/config.c:344 +#: config.c:2829 builtin/config.c:354 #, c-format msgid "invalid pattern: %s" msgstr "无效模式：%s" -#: config.c:2841 +#: config.c:2854 #, c-format msgid "invalid config file %s" msgstr "无效的配置文件 %s" -#: config.c:2854 config.c:3107 +#: config.c:2867 config.c:3120 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" -#: config.c:2865 +#: config.c:2878 #, c-format msgid "unable to mmap '%s'" msgstr "不能 mmap '%s'" -#: config.c:2874 config.c:3112 +#: config.c:2887 config.c:3125 #, c-format msgid "chmod on %s failed" msgstr "对 %s 调用 chmod 失败" -#: config.c:2959 config.c:3209 +#: config.c:2972 config.c:3222 #, c-format msgid "could not write config file %s" msgstr "不能写入配置文件 %s" -#: config.c:2993 +#: config.c:3006 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" -#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" -#: config.c:3085 +#: config.c:3098 #, c-format msgid "invalid section name: %s" msgstr "无效的小节名称：%s" -#: config.c:3252 +#: config.c:3265 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺失" @@ -2938,23 +2977,23 @@ msgstr "ssh 变体 'simple' 不支持设置端口" msgid "strange pathname '%s' blocked" msgstr "已阻止奇怪的路径名 '%s'" -#: connect.c:1407 +#: connect.c:1408 msgid "unable to fork" msgstr "无法 fork" -#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "正在检查连通性" -#: connected.c:121 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "不能执行 'git rev-list'" -#: connected.c:141 +#: connected.c:144 msgid "failed write to rev-list" msgstr "写入 rev-list 失败" -#: connected.c:148 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "关闭 rev-list 的标准输入失败" @@ -3028,56 +3067,56 @@ msgstr "无法对 '%s' 进行从 %s 到 %s 的编码" msgid "encoding '%s' from %s to %s and back is not the same" msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致" -#: convert.c:668 +#: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "不能 fork 以执行外部过滤器 '%s'" -#: convert.c:688 +#: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "不能将输入传递给外部过滤器 '%s'" -#: convert.c:695 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "外部过滤器 '%s' 失败码 %d" -#: convert.c:730 convert.c:733 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "从外部过滤器 '%s' 读取失败" -#: convert.c:736 convert.c:791 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "外部过滤器 '%s' 失败" -#: convert.c:840 +#: convert.c:837 msgid "unexpected filter type" msgstr "意外的过滤类型" -#: convert.c:851 +#: convert.c:848 msgid "path name too long for external filter" msgstr "外部过滤器的路径名太长" -#: convert.c:943 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤" -#: convert.c:1243 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" msgstr "true/false 不是有效的工作区编码" -#: convert.c:1431 convert.c:1465 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s：clean 过滤器 '%s' 失败" -#: convert.c:1511 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s：smudge 过滤器 %s 失败" @@ -3095,17 +3134,17 @@ msgstr "拒绝使用缺少主机字段的凭据" msgid "refusing to work with credential missing protocol field" msgstr "拒绝使用缺少协议字段的凭据" -#: credential.c:396 +#: credential.c:394 #, c-format msgid "url contains a newline in its %s component: %s" msgstr "URL 的 %s 组件中包含换行符：%s" -#: credential.c:440 +#: credential.c:438 #, c-format msgid "url has no scheme: %s" msgstr "URL 没有 scheme：%s" -#: credential.c:513 +#: credential.c:511 #, c-format msgid "credential url cannot be parsed: %s" msgstr "不能解析凭据 URL：%s" @@ -3210,7 +3249,7 @@ msgstr "git diff --no-index [<选项>] <路径> <路径>" msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" -msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径" +msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径" # 译者：注意保持前导空格 #: diff.c:156 @@ -3261,35 +3300,35 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:4243 +#: diff.c:4269 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" -#: diff.c:4589 +#: diff.c:4618 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:4592 +#: diff.c:4621 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" -#: diff.c:4670 +#: diff.c:4699 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确要求只跟一个路径规格" -#: diff.c:4718 +#: diff.c:4747 #, c-format msgid "invalid --stat value: %s" msgstr "无效的 --stat 值：%s" -#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250 -#: parse-options.c:197 parse-options.c:201 +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一个数字值" -#: diff.c:4755 +#: diff.c:4784 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3298,195 +3337,195 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:4840 +#: diff.c:4869 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" -#: diff.c:4864 +#: diff.c:4893 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之后未知的值" -#: diff.c:4878 +#: diff.c:4907 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" -#: diff.c:4928 diff.c:4934 +#: diff.c:4957 diff.c:4963 #, c-format msgid "%s expects / form" msgstr "%s 期望 / 格式" -#: diff.c:4946 +#: diff.c:4975 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一个字符，得到 '%s'" -#: diff.c:4967 +#: diff.c:4996 #, c-format msgid "bad --color-moved argument: %s" msgstr "坏的 --color-moved 参数：%s" -#: diff.c:4986 +#: diff.c:5015 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的无效模式 '%s' " -#: diff.c:5026 +#: diff.c:5055 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" -#: diff.c:5062 diff.c:5082 +#: diff.c:5091 diff.c:5111 #, c-format msgid "invalid argument to %s" msgstr "%s 的参数无效" -#: diff.c:5219 +#: diff.c:5248 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" -#: diff.c:5275 +#: diff.c:5304 #, c-format msgid "bad --word-diff argument: %s" msgstr "坏的 --word-diff 参数：%s" -#: diff.c:5298 +#: diff.c:5327 msgid "Diff output format options" msgstr "差异输出格式化选项" -#: diff.c:5300 diff.c:5306 +#: diff.c:5329 diff.c:5335 msgid "generate patch" msgstr "生成补丁" -#: diff.c:5303 builtin/log.c:177 +#: diff.c:5332 builtin/log.c:176 msgid "suppress diff output" msgstr "不显示差异输出" -#: diff.c:5308 diff.c:5422 diff.c:5429 +#: diff.c:5337 diff.c:5451 diff.c:5458 msgid "" msgstr "" -#: diff.c:5309 diff.c:5312 +#: diff.c:5338 diff.c:5341 msgid "generate diffs with lines context" msgstr "生成含 行上下文的差异" -#: diff.c:5314 +#: diff.c:5343 msgid "generate the diff in raw format" msgstr "生成原始格式的差异" -#: diff.c:5317 +#: diff.c:5346 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同义" -#: diff.c:5321 +#: diff.c:5350 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同义" -#: diff.c:5325 +#: diff.c:5354 msgid "machine friendly --stat" msgstr "机器友好的 --stat" -#: diff.c:5328 +#: diff.c:5357 msgid "output only the last line of --stat" msgstr "只输出 --stat 的最后一行" -#: diff.c:5330 diff.c:5338 +#: diff.c:5359 diff.c:5367 msgid "..." msgstr "<参数1,参数2>..." -#: diff.c:5331 +#: diff.c:5360 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "输出每个子目录相对变更的分布" -#: diff.c:5335 +#: diff.c:5364 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同义" -#: diff.c:5339 +#: diff.c:5368 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同义词" -#: diff.c:5343 +#: diff.c:5372 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果变更中引入冲突定界符或空白错误，给出警告" -#: diff.c:5346 +#: diff.c:5375 msgid "condensed summary such as creations, renames and mode changes" msgstr "精简摘要，例如创建、重命名和模式变更" -#: diff.c:5349 +#: diff.c:5378 msgid "show only names of changed files" msgstr "只显示变更文件的文件名" -#: diff.c:5352 +#: diff.c:5381 msgid "show only names and status of changed files" msgstr "只显示变更文件的文件名和状态" -#: diff.c:5354 +#: diff.c:5383 msgid "[,[,]]" msgstr "<宽度>[,<文件名宽度>[,<次数>]]" -#: diff.c:5355 +#: diff.c:5384 msgid "generate diffstat" msgstr "生成差异统计（diffstat）" -#: diff.c:5357 diff.c:5360 diff.c:5363 +#: diff.c:5386 diff.c:5389 diff.c:5392 msgid "" msgstr "<宽度>" -#: diff.c:5358 +#: diff.c:5387 msgid "generate diffstat with a given width" msgstr "使用给定的长度生成差异统计" -#: diff.c:5361 +#: diff.c:5390 msgid "generate diffstat with a given name width" msgstr "使用给定的文件名长度生成差异统计" -#: diff.c:5364 +#: diff.c:5393 msgid "generate diffstat with a given graph width" msgstr "使用给定的图形长度生成差异统计" -#: diff.c:5366 +#: diff.c:5395 msgid "" msgstr "<次数>" -#: diff.c:5367 +#: diff.c:5396 msgid "generate diffstat with limited lines" msgstr "生成有限行数的差异统计" -#: diff.c:5370 +#: diff.c:5399 msgid "generate compact summary in diffstat" msgstr "生成差异统计的简洁摘要" -#: diff.c:5373 +#: diff.c:5402 msgid "output a binary diff that can be applied" msgstr "输出一个可以应用的二进制差异" -#: diff.c:5376 +#: diff.c:5405 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行显示完整的前后对象名称" -#: diff.c:5378 +#: diff.c:5407 msgid "show colored diff" msgstr "显示带颜色的差异" -#: diff.c:5379 +#: diff.c:5408 msgid "" msgstr "<类型>" -#: diff.c:5380 +#: diff.c:5409 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符" -#: diff.c:5383 +#: diff.c:5412 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3494,295 +3533,295 @@ msgstr "" "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔" "符" -#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498 +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 msgid "" msgstr "<前缀>" -#: diff.c:5387 +#: diff.c:5416 msgid "show the given source prefix instead of \"a/\"" msgstr "显示给定的源前缀取代 \"a/\"" -#: diff.c:5390 +#: diff.c:5419 msgid "show the given destination prefix instead of \"b/\"" msgstr "显示给定的目标前缀取代 \"b/\"" -#: diff.c:5393 +#: diff.c:5422 msgid "prepend an additional prefix to every line of output" msgstr "输出的每一行附加前缀" -#: diff.c:5396 +#: diff.c:5425 msgid "do not show any source or destination prefix" msgstr "不显示任何源和目标前缀" -#: diff.c:5399 +#: diff.c:5428 msgid "show context between diff hunks up to the specified number of lines" msgstr "显示指定行数的差异块间的上下文" -#: diff.c:5403 diff.c:5408 diff.c:5413 +#: diff.c:5432 diff.c:5437 diff.c:5442 msgid "" msgstr "<字符>" -#: diff.c:5404 +#: diff.c:5433 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一个字符取代 '+' 来表示新的一行" -#: diff.c:5409 +#: diff.c:5438 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一个字符取代 '-' 来表示旧的一行" -#: diff.c:5414 +#: diff.c:5443 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一个字符取代 ' ' 来表示一行上下文" -#: diff.c:5417 +#: diff.c:5446 msgid "Diff rename options" msgstr "差异重命名选项" -#: diff.c:5418 +#: diff.c:5447 msgid "[/]" msgstr "[/]" -#: diff.c:5419 +#: diff.c:5448 msgid "break complete rewrite changes into pairs of delete and create" msgstr "将完全重写的变更打破为成对的删除和创建" -#: diff.c:5423 +#: diff.c:5452 msgid "detect renames" msgstr "检测重命名" -#: diff.c:5427 +#: diff.c:5456 msgid "omit the preimage for deletes" msgstr "省略删除操作的差异输出" -#: diff.c:5430 +#: diff.c:5459 msgid "detect copies" msgstr "检测拷贝" -#: diff.c:5434 +#: diff.c:5463 msgid "use unmodified files as source to find copies" msgstr "使用未修改的文件做为发现拷贝的源" -#: diff.c:5436 +#: diff.c:5465 msgid "disable rename detection" msgstr "禁用重命名探测" -#: diff.c:5439 +#: diff.c:5468 msgid "use empty blobs as rename source" msgstr "使用空的数据对象做为重命名的源" -#: diff.c:5441 +#: diff.c:5470 msgid "continue listing the history of a file beyond renames" msgstr "继续列出文件重命名以外的历史记录" -#: diff.c:5444 +#: diff.c:5473 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测" -#: diff.c:5446 +#: diff.c:5475 msgid "Diff algorithm options" msgstr "差异算法选项" -#: diff.c:5448 +#: diff.c:5477 msgid "produce the smallest possible diff" msgstr "生成尽可能小的差异" -#: diff.c:5451 +#: diff.c:5480 msgid "ignore whitespace when comparing lines" msgstr "行比较时忽略空白字符" -#: diff.c:5454 +#: diff.c:5483 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字符的变更" -#: diff.c:5457 +#: diff.c:5486 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字符变更" -#: diff.c:5460 +#: diff.c:5489 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的回车符（CR）" -#: diff.c:5463 +#: diff.c:5492 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的变更" -#: diff.c:5466 +#: diff.c:5495 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "启发式转换差异边界以便阅读" -#: diff.c:5469 +#: diff.c:5498 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 算法生成差异" -#: diff.c:5473 +#: diff.c:5502 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 算法生成差异" -#: diff.c:5475 +#: diff.c:5504 msgid "" msgstr "<算法>" -#: diff.c:5476 +#: diff.c:5505 msgid "choose a diff algorithm" msgstr "选择一个差异算法" -#: diff.c:5478 +#: diff.c:5507 msgid "" msgstr "<文本>" -#: diff.c:5479 +#: diff.c:5508 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 算法生成差异" -#: diff.c:5481 diff.c:5490 diff.c:5493 +#: diff.c:5510 diff.c:5519 diff.c:5522 msgid "" msgstr "<模式>" -#: diff.c:5482 +#: diff.c:5511 msgid "show word diff, using to delimit changed words" msgstr "显示单词差异，使用 <模式> 分隔变更的单词" -#: diff.c:5484 diff.c:5487 diff.c:5532 +#: diff.c:5513 diff.c:5516 diff.c:5561 msgid "" msgstr "<正则>" -#: diff.c:5485 +#: diff.c:5514 msgid "use to decide what a word is" msgstr "使用 <正则表达式> 确定何为一个词" -#: diff.c:5488 +#: diff.c:5517 msgid "equivalent to --word-diff=color --word-diff-regex=" msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" -#: diff.c:5491 +#: diff.c:5520 msgid "moved lines of code are colored differently" msgstr "移动的代码行用不同方式着色" -#: diff.c:5494 +#: diff.c:5523 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字符" -#: diff.c:5497 +#: diff.c:5526 msgid "Other diff options" msgstr "其它差异选项" -#: diff.c:5499 +#: diff.c:5528 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "当从子目录运行，排除目录之外的变更并显示相对路径" -#: diff.c:5503 +#: diff.c:5532 msgid "treat all files as text" msgstr "把所有文件当做文本处理" -#: diff.c:5505 +#: diff.c:5534 msgid "swap two inputs, reverse the diff" msgstr "交换两个输入，反转差异" -#: diff.c:5507 +#: diff.c:5536 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差异时退出码为 1，否则为 0" -#: diff.c:5509 +#: diff.c:5538 msgid "disable all output of the program" msgstr "禁用本程序的所有输出" -#: diff.c:5511 +#: diff.c:5540 msgid "allow an external diff helper to be executed" msgstr "允许执行一个外置的差异助手" -#: diff.c:5513 +#: diff.c:5542 msgid "run external text conversion filters when comparing binary files" msgstr "当比较二进制文件时，运行外部的文本转换过滤器" -#: diff.c:5515 +#: diff.c:5544 msgid "" msgstr "<何时>" -#: diff.c:5516 +#: diff.c:5545 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差异时，忽略子模组的更改" -#: diff.c:5519 +#: diff.c:5548 msgid "" msgstr "<格式>" -#: diff.c:5520 +#: diff.c:5549 msgid "specify how differences in submodules are shown" msgstr "指定子模组的差异如何显示" -#: diff.c:5524 +#: diff.c:5553 msgid "hide 'git add -N' entries from the index" msgstr "隐藏索引中 'git add -N' 条目" -#: diff.c:5527 +#: diff.c:5556 msgid "treat 'git add -N' entries as real in the index" msgstr "将索引中 'git add -N' 条目当做真实的" -#: diff.c:5529 +#: diff.c:5558 msgid "" msgstr "<字符串>" -#: diff.c:5530 +#: diff.c:5559 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "查找改变了指定字符串出现次数的差异" -#: diff.c:5533 +#: diff.c:5562 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "查找改变指定正则匹配出现次数的差异" -#: diff.c:5536 +#: diff.c:5565 msgid "show all changes in the changeset with -S or -G" msgstr "显示使用 -S 或 -G 的变更集的所有变更" -#: diff.c:5539 +#: diff.c:5568 msgid "treat in -S as extended POSIX regular expression" msgstr "将 -S 的 当做扩展的 POSIX 正则表达式" -#: diff.c:5542 +#: diff.c:5571 msgid "control the order in which files appear in the output" msgstr "控制输出中的文件显示顺序" -#: diff.c:5543 +#: diff.c:5572 msgid "" msgstr "<对象 ID>" -#: diff.c:5544 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "查找改变指定对象出现次数的差异" -#: diff.c:5546 +#: diff.c:5575 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5547 +#: diff.c:5576 msgid "select files by diff type" msgstr "通过差异类型选择文件" -#: diff.c:5549 +#: diff.c:5578 msgid "" msgstr "<文件>" -#: diff.c:5550 +#: diff.c:5579 msgid "Output to a specific file" msgstr "输出到一个指定的文件" -#: diff.c:6205 +#: diff.c:6236 msgid "inexact rename detection was skipped due to too many files." msgstr "因为文件太多，略过不严格的重命名检查。" -#: diff.c:6208 +#: diff.c:6239 msgid "only found copies from modified paths due to too many files." msgstr "因为文件太多，只在修改的路径中查找拷贝。" -#: diff.c:6211 +#: diff.c:6242 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3797,59 +3836,59 @@ msgstr "读取排序文件 '%s' 失败" msgid "Performing inexact rename detection" msgstr "正在进行非精确的重命名探测" -#: dir.c:573 +#: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "路径规格 '%s' 未匹配任何 git 已知文件" -#: dir.c:713 dir.c:742 dir.c:755 +#: dir.c:718 dir.c:747 dir.c:760 #, c-format msgid "unrecognized pattern: '%s'" msgstr "未识别的模式：'%s'" -#: dir.c:772 dir.c:786 +#: dir.c:777 dir.c:791 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "未识别的反向模式：'%s'" -#: dir.c:804 +#: dir.c:809 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'" -#: dir.c:814 +#: dir.c:819 msgid "disabling cone pattern matching" msgstr "禁止 cone 模式匹配" -#: dir.c:1191 +#: dir.c:1198 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能将 %s 用作排除文件" -#: dir.c:2296 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "不能打开目录 '%s'" -#: dir.c:2596 +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "无法获得内核名称和信息" -#: dir.c:2720 +#: dir.c:2729 msgid "untracked cache is disabled on this system or location" msgstr "缓存未跟踪文件在本系统或位置中被禁用" -#: dir.c:3502 +#: dir.c:3520 #, c-format msgid "index file corrupt in repo %s" msgstr "仓库 %s 中的索引文件损坏" -#: dir.c:3547 dir.c:3552 +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "不能为 %s 创建目录" -#: dir.c:3581 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能从 '%s' 迁移 git 目录到 '%s'" @@ -3883,245 +3922,245 @@ msgstr "不能设置 GIT_DIR 为 '%s'" msgid "too many args to run %s" msgstr "执行 %s 的参数太多" -#: fetch-pack.c:152 +#: fetch-pack.c:176 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack：应为 shallow 列表" -#: fetch-pack.c:155 +#: fetch-pack.c:179 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包" -#: fetch-pack.c:166 +#: fetch-pack.c:190 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包" -#: fetch-pack.c:186 +#: fetch-pack.c:210 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'" -#: fetch-pack.c:197 +#: fetch-pack.c:221 msgid "unable to write to remote" msgstr "无法写到远程" -#: fetch-pack.c:259 +#: fetch-pack.c:282 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc 需要 multi_ack_detailed" -#: fetch-pack.c:358 fetch-pack.c:1408 +#: fetch-pack.c:375 fetch-pack.c:1397 #, c-format msgid "invalid shallow line: %s" msgstr "无效的 shallow 信息：%s" -#: fetch-pack.c:364 fetch-pack.c:1414 +#: fetch-pack.c:381 fetch-pack.c:1403 #, c-format msgid "invalid unshallow line: %s" msgstr "无效的 unshallow 信息：%s" -#: fetch-pack.c:366 fetch-pack.c:1416 +#: fetch-pack.c:383 fetch-pack.c:1405 #, c-format msgid "object not found: %s" msgstr "对象未找到：%s" -#: fetch-pack.c:369 fetch-pack.c:1419 +#: fetch-pack.c:386 fetch-pack.c:1408 #, c-format msgid "error in object: %s" msgstr "对象中出错：%s" -#: fetch-pack.c:371 fetch-pack.c:1421 +#: fetch-pack.c:388 fetch-pack.c:1410 #, c-format msgid "no shallow found: %s" msgstr "未发现 shallow：%s" -#: fetch-pack.c:374 fetch-pack.c:1425 +#: fetch-pack.c:391 fetch-pack.c:1414 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "应为 shallow/unshallow，却得到 %s" -#: fetch-pack.c:416 +#: fetch-pack.c:431 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" -#: fetch-pack.c:433 +#: fetch-pack.c:448 #, c-format msgid "invalid commit %s" msgstr "无效提交 %s" -#: fetch-pack.c:464 +#: fetch-pack.c:479 msgid "giving up" msgstr "放弃" -#: fetch-pack.c:477 progress.c:336 +#: fetch-pack.c:492 progress.c:339 msgid "done" msgstr "完成" -#: fetch-pack.c:489 +#: fetch-pack.c:504 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:540 #, c-format msgid "Marking %s as complete" msgstr "标记 %s 为完成" -#: fetch-pack.c:756 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "已经有 %s（%s）" -#: fetch-pack.c:821 +#: fetch-pack.c:824 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack：无法派生 sideband 多路输出" -#: fetch-pack.c:829 +#: fetch-pack.c:832 msgid "protocol error: bad pack header" msgstr "协议错误：坏的包头" -#: fetch-pack.c:910 +#: fetch-pack.c:916 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack：无法派生进程 %s" -#: fetch-pack.c:927 +#: fetch-pack.c:933 #, c-format msgid "%s failed" msgstr "%s 失败" -#: fetch-pack.c:929 +#: fetch-pack.c:935 msgid "error in sideband demultiplexer" msgstr "sideband 多路输出出错" -#: fetch-pack.c:976 +#: fetch-pack.c:978 #, c-format msgid "Server version is %.*s" msgstr "服务器版本 %.*s" -#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996 -#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012 -#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028 -#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 #, c-format msgid "Server supports %s" msgstr "服务器支持 %s" -#: fetch-pack.c:983 +#: fetch-pack.c:985 msgid "Server does not support shallow clients" msgstr "服务器不支持 shalllow 客户端" -#: fetch-pack.c:1043 +#: fetch-pack.c:1045 msgid "Server does not support --shallow-since" msgstr "服务器不支持 --shallow-since" -#: fetch-pack.c:1048 +#: fetch-pack.c:1050 msgid "Server does not support --shallow-exclude" msgstr "服务器不支持 --shallow-exclude" -#: fetch-pack.c:1052 +#: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "服务器不支持 --deepen" -#: fetch-pack.c:1054 +#: fetch-pack.c:1056 msgid "Server does not support this repository's object format" msgstr "服务器不支持这个仓库的对象格式" -#: fetch-pack.c:1071 +#: fetch-pack.c:1069 msgid "no common commits" msgstr "没有共同的提交" -#: fetch-pack.c:1083 fetch-pack.c:1639 +#: fetch-pack.c:1081 fetch-pack.c:1619 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：获取失败。" -#: fetch-pack.c:1211 +#: fetch-pack.c:1205 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "不匹配的算法：客户端 %s，服务端 %s" -#: fetch-pack.c:1215 +#: fetch-pack.c:1209 #, c-format msgid "the server does not support algorithm '%s'" msgstr "服务器不支持算法 '%s'" -#: fetch-pack.c:1235 +#: fetch-pack.c:1229 msgid "Server does not support shallow requests" msgstr "服务器不支持 shalllow 请求" -#: fetch-pack.c:1242 +#: fetch-pack.c:1236 msgid "Server supports filter" msgstr "服务器支持 filter" -#: fetch-pack.c:1286 +#: fetch-pack.c:1275 msgid "unable to write request to remote" msgstr "无法将请求写到远程" -#: fetch-pack.c:1304 +#: fetch-pack.c:1293 #, c-format msgid "error reading section header '%s'" msgstr "读取节标题 '%s' 出错" -#: fetch-pack.c:1310 +#: fetch-pack.c:1299 #, c-format msgid "expected '%s', received '%s'" msgstr "预期 '%s'，得到 '%s'" -#: fetch-pack.c:1371 +#: fetch-pack.c:1360 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "意外的确认行：'%s'" -#: fetch-pack.c:1376 +#: fetch-pack.c:1365 #, c-format msgid "error processing acks: %d" msgstr "处理 ack 出错：%d" -#: fetch-pack.c:1386 +#: fetch-pack.c:1375 msgid "expected packfile to be sent after 'ready'" msgstr "预期在 'ready' 之后发送 packfile" -#: fetch-pack.c:1388 +#: fetch-pack.c:1377 msgid "expected no other sections to be sent after no 'ready'" msgstr "在没有 'ready' 不应该发送其它小节" -#: fetch-pack.c:1430 +#: fetch-pack.c:1419 #, c-format msgid "error processing shallow info: %d" msgstr "处理浅克隆信息出错：%d" -#: fetch-pack.c:1477 +#: fetch-pack.c:1466 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "预期 wanted-ref，得到 '%s'" -#: fetch-pack.c:1482 +#: fetch-pack.c:1471 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "意外的 wanted-ref：'%s'" -#: fetch-pack.c:1487 +#: fetch-pack.c:1476 #, c-format msgid "error processing wanted refs: %d" msgstr "处理要获取的引用出错：%d" -#: fetch-pack.c:1517 +#: fetch-pack.c:1506 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack：预期响应结束包" -#: fetch-pack.c:1921 +#: fetch-pack.c:1887 msgid "no matching remote head" msgstr "没有匹配的远程分支" -#: fetch-pack.c:1944 builtin/clone.c:692 +#: fetch-pack.c:1910 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必需的对象" -#: fetch-pack.c:1971 +#: fetch-pack.c:1937 #, c-format msgid "no such remote ref %s" msgstr "没有这样的远程引用 %s" -#: fetch-pack.c:1974 +#: fetch-pack.c:1940 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "服务器不允许请求未公开的对象 %s" @@ -4220,41 +4259,41 @@ msgstr "低级命令/同步仓库" msgid "Low-level Commands / Internal Helpers" msgstr "低级命令/内部助手" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "这些是各种场合常见的 Git 命令：" -#: help.c:363 git.c:99 +#: help.c:365 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "不支持的命令列表类型 '%s'" -#: help.c:403 -msgid "The common Git guides are:" -msgstr "最常用的 Git 向导有：" +#: help.c:405 +msgid "The Git concept guides are:" +msgstr "Git 概念向导有：" -#: help.c:427 +#: help.c:429 msgid "See 'git help ' to read about a specific subcommand" msgstr "执行　'git help ' 来查看特定子命令" -#: help.c:432 +#: help.c:434 msgid "External commands" msgstr "外部命令" -#: help.c:447 +#: help.c:449 msgid "Command aliases" msgstr "命令别名" -#: help.c:511 +#: help.c:513 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4263,31 +4302,31 @@ msgstr "" "'%s' 像是一个 git 命令，但却无法运行。\n" "可能是 git-%s 受损？" -#: help.c:570 +#: help.c:572 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" -#: help.c:592 +#: help.c:594 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。" -#: help.c:597 +#: help.c:599 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "假定你想要的是 '%s' 并继续。" -#: help.c:602 +#: help.c:604 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。" -#: help.c:610 +#: help.c:612 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:614 +#: help.c:616 msgid "" "\n" "The most similar command is" @@ -4301,16 +4340,16 @@ msgstr[1] "" "\n" "最相似的命令是" -#: help.c:654 +#: help.c:656 msgid "git version []" msgstr "git version [<选项>]" -#: help.c:709 +#: help.c:711 #, c-format msgid "%s: %s - %s" msgstr "%s：%s - %s" -#: help.c:713 +#: help.c:715 msgid "" "\n" "Did you mean this?" @@ -4324,7 +4363,15 @@ msgstr[1] "" "\n" "您指的是这其中的某一个么？" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "作者身份未知\n" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "提交者身份未知\n" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -4349,66 +4396,66 @@ msgstr "" "来设置您账号的缺省身份标识。\n" "如果仅在本仓库设置身份标识，则省略 --global 参数。\n" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "未提供邮件地址且自动探测被禁用" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "无法自动探测邮件地址（得到 '%s'）" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "未提供姓名且自动探测被禁用" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "无法自动探测姓名（得到 '%s'）" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "不允许空的姓名（对于 <%s>）" -#: ident.c:421 +#: ident.c:439 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "姓名中仅包含禁用字符：%s" -#: ident.c:436 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "无效的日期格式：%s" -#: list-objects-filter-options.c:58 +#: list-objects-filter-options.c:81 msgid "expected 'tree:'" msgstr "期望 'tree:<深度>'" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:96 msgid "sparse:path filters support has been dropped" msgstr "sparse:path 过滤器支持已被删除" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:109 #, c-format msgid "invalid filter-spec '%s'" msgstr "无效的过滤器表达式 '%s'" -#: list-objects-filter-options.c:102 +#: list-objects-filter-options.c:125 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'" -#: list-objects-filter-options.c:144 +#: list-objects-filter-options.c:167 msgid "expected something after combine:" msgstr "期望在组合后有一些东西：" -#: list-objects-filter-options.c:226 +#: list-objects-filter-options.c:249 msgid "multiple filter-specs cannot be combined" msgstr "不能混用多种过滤规格" -#: list-objects-filter-options.c:330 +#: list-objects-filter-options.c:361 msgid "unable to upgrade repository format to support partial clone" msgstr "无法升级仓库格式以支持部分克隆" @@ -4765,7 +4812,7 @@ msgstr "添加/添加" msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" -#: merge-recursive.c:3101 git-submodule.sh:959 +#: merge-recursive.c:3101 msgid "submodule" msgstr "子模组" @@ -4851,22 +4898,22 @@ msgstr "已经是最新的！" msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:3549 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:3562 +#: merge-recursive.c:3563 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:3612 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:3671 +#: merge-recursive.c:3672 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4875,12 +4922,12 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" " %s" -#: merge-recursive.c:3768 +#: merge-recursive.c:3769 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 msgid "Unable to write index." msgstr "不能写入索引。" @@ -4888,170 +4935,174 @@ msgstr "不能写入索引。" msgid "failed to read the cache" msgstr "读取缓存失败" -#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912 -#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816 +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "无法写新的索引文件" -#: midx.c:68 +#: midx.c:79 #, c-format msgid "multi-pack-index file %s is too small" msgstr "多包索引文件 %s 太小" -#: midx.c:84 +#: midx.c:95 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配" -#: midx.c:89 +#: midx.c:100 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index 版本 %d 不能被识别" -#: midx.c:94 +#: midx.c:105 #, c-format -msgid "hash version %u does not match" -msgstr "散列版本 %u 不匹配" +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "多包索引哈希版本 %u 和版本 %u 不匹配" -#: midx.c:108 +#: midx.c:122 msgid "invalid chunk offset (too large)" msgstr "无效的块偏移（太大）" -#: midx.c:132 +#: midx.c:146 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "终止多包索引块 id 出现时间早于预期" -#: midx.c:145 +#: midx.c:159 msgid "multi-pack-index missing required pack-name chunk" msgstr "多包索引缺少必需的包名块" -#: midx.c:147 +#: midx.c:161 msgid "multi-pack-index missing required OID fanout chunk" msgstr "多包索引缺少必需的对象 ID 扇出块" -#: midx.c:149 +#: midx.c:163 msgid "multi-pack-index missing required OID lookup chunk" msgstr "多包索引缺少必需的对象 ID 查询块" -#: midx.c:151 +#: midx.c:165 msgid "multi-pack-index missing required object offsets chunk" msgstr "多包索引缺少必需的对象偏移块" -#: midx.c:165 +#: midx.c:179 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "多包索引包名无序：'%s' 在 '%s' 之前" -#: midx.c:208 +#: midx.c:222 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "错的 pack-int-id：%u（共有 %u 个包）" -#: midx.c:258 +#: midx.c:272 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引存储一个64位偏移，但是 off_t 太小" -#: midx.c:286 +#: midx.c:300 msgid "error preparing packfile from multi-pack-index" msgstr "从多包索引准备 packfile 出错" -#: midx.c:470 +#: midx.c:485 #, c-format msgid "failed to add packfile '%s'" msgstr "添加包文件 '%s' 失败" -#: midx.c:476 +#: midx.c:491 #, c-format msgid "failed to open pack-index '%s'" msgstr "打开包索引 '%s' 失败" -#: midx.c:536 +#: midx.c:551 #, c-format msgid "failed to locate object %d in packfile" msgstr "在包文件中定位对象 %d 失败" -#: midx.c:840 +#: midx.c:853 msgid "Adding packfiles to multi-pack-index" msgstr "添加包文件到多包索引" -#: midx.c:873 +#: midx.c:886 #, c-format msgid "did not see pack-file %s to drop" msgstr "没有看到要丢弃的包文件 %s" -#: midx.c:925 +#: midx.c:938 msgid "no pack files to index." msgstr "没有要索引的包文件。" -#: midx.c:977 +#: midx.c:990 msgid "Writing chunks to multi-pack-index" msgstr "写入块到多包索引" -#: midx.c:1056 +#: midx.c:1068 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位于 %s 的多包索引失败" -#: midx.c:1112 +#: midx.c:1124 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "多包索引文件存在，但无法解析" + +#: midx.c:1132 msgid "Looking for referenced packfiles" msgstr "正在查找引用的包文件" -#: midx.c:1127 +#: midx.c:1147 #, c-format msgid "" "oid fanout out of order: fanout[%d] = % > % = fanout[%d]" msgstr "对象 ID 扇出无序：fanout[%d] = % > % = fanout[%d]" -#: midx.c:1132 +#: midx.c:1152 msgid "the midx contains no oid" msgstr "midx 不包含 oid" -#: midx.c:1141 +#: midx.c:1161 msgid "Verifying OID order in multi-pack-index" msgstr "校验多包索引中的 OID 顺序" -#: midx.c:1150 +#: midx.c:1170 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1170 +#: midx.c:1190 msgid "Sorting objects by packfile" msgstr "通过包文件为对象排序" -#: midx.c:1177 +#: midx.c:1197 msgid "Verifying object offsets" msgstr "校验对象偏移" -#: midx.c:1193 +#: midx.c:1213 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "为 oid[%d] = %s 加载包条目失败" -#: midx.c:1199 +#: midx.c:1219 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "为包文件 %s 加载包索引失败" -#: midx.c:1208 +#: midx.c:1228 #, c-format msgid "incorrect object offset for oid[%d] = %s: % != %" msgstr "oid[%d] = %s 错误的对象偏移：% != %" -#: midx.c:1233 +#: midx.c:1253 msgid "Counting referenced objects" msgstr "正在对引用对象计数" -#: midx.c:1243 +#: midx.c:1263 msgid "Finding and deleting unreferenced packfiles" msgstr "正在查找和删除未引用的包文件" -#: midx.c:1433 +#: midx.c:1454 msgid "could not start pack-objects" msgstr "不能开始 pack-objects" -#: midx.c:1452 +#: midx.c:1474 msgid "could not finish pack-objects" msgstr "不能结束 pack-objects" @@ -5134,7 +5185,7 @@ msgstr "不能解析对象：%s" msgid "hash mismatch %s" msgstr "哈希值与 %s 不匹配" -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 #, c-format msgid "unable to get size of %s" msgstr "无法得到 %s 的大小" @@ -5143,12 +5194,12 @@ msgstr "无法得到 %s 的大小" msgid "offset before end of packfile (broken .idx?)" msgstr "偏移量在包文件结束之前（损坏的 .idx？）" -#: packfile.c:1900 +#: packfile.c:1922 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" -#: packfile.c:1904 +#: packfile.c:1926 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" @@ -5168,7 +5219,7 @@ msgstr "格式错误的到期时间：'%s'" msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" -#: parse-options-cb.c:130 parse-options-cb.c:147 +#: parse-options-cb.c:132 parse-options-cb.c:149 #, c-format msgid "malformed object name '%s'" msgstr "格式错误的对象名 '%s'" @@ -5213,31 +5264,31 @@ msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）" msgid "did you mean `--%s` (with two dashes)?" msgstr "你的意思是 `--%s`（有两个短线）？" -#: parse-options.c:663 parse-options.c:963 +#: parse-options.c:666 parse-options.c:971 #, c-format msgid "alias of --%s" msgstr "--%s 的别名" -#: parse-options.c:854 +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "未知选项 `%s'" -#: parse-options.c:856 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "未知开关 `%c'" -#: parse-options.c:858 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "字符串中未知的非 ascii 字符选项：`%s'" -#: parse-options.c:882 +#: parse-options.c:890 msgid "..." msgstr "..." -#: parse-options.c:901 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "用法：%s" @@ -5245,18 +5296,18 @@ msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:907 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:910 +#: parse-options.c:918 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:949 +#: parse-options.c:957 msgid "-NUM" msgstr "-数字" @@ -5391,7 +5442,7 @@ msgstr "协议错误：错误的行长度字符串：%.4s" msgid "protocol error: bad line length %d" msgstr "协议错误：错误的行长度 %d" -#: pkt-line.c:373 +#: pkt-line.c:373 sideband.c:150 #, c-format msgid "remote error: %s" msgstr "远程错误：%s" @@ -5405,15 +5456,23 @@ msgstr "正在刷新索引" msgid "unable to create threaded lstat: %s" msgstr "无法创建线程 lstat：%s" -#: pretty.c:982 +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "远程未设置 URL" +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "promisor-remote：无法派生 fetch 子进程" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "promisor-remote：无法向 fetch 子进程写入" -#: promisor-remote.c:58 +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入" + +#: promisor-remote.c:53 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "promisor 远程名称不能以 '/' 开始：%s" @@ -5430,7 +5489,7 @@ msgstr "不能启动 `log`" msgid "could not read `log` output" msgstr "不能读取 `log` 的输出" -#: range-diff.c:98 sequencer.c:5143 +#: range-diff.c:98 sequencer.c:5283 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" @@ -5456,50 +5515,50 @@ msgstr "生成 diff 失败" msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日志" -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）" -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "不能在对象数据库中创建空的数据对象" -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "%s：只能添加常规文件、符号链接或 git 目录" -#: read-cache.c:723 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' 没有检出一个提交" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "无法索引文件 '%s'" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "无法在索引中添加 '%s'" -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "无法对 %s 执行 stat" -#: read-cache.c:1330 +#: read-cache.c:1318 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起来既是文件又是目录" -#: read-cache.c:1536 +#: read-cache.c:1524 msgid "Refresh index" msgstr "刷新索引" -#: read-cache.c:1651 +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5508,7 +5567,7 @@ msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1661 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5517,140 +5576,140 @@ msgstr "" "设置了 GIT_INDEX_VERSION，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1717 +#: read-cache.c:1705 #, c-format msgid "bad signature 0x%08x" msgstr "坏的签名 0x%08x" -#: read-cache.c:1720 +#: read-cache.c:1708 #, c-format msgid "bad index version %d" msgstr "坏的索引版本 %d" -#: read-cache.c:1729 +#: read-cache.c:1717 msgid "bad index file sha1 signature" msgstr "坏的索引文件 sha1 签名" -#: read-cache.c:1759 +#: read-cache.c:1747 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支持的 %.4s 扩展" # -#: read-cache.c:1761 +#: read-cache.c:1749 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 扩展" -#: read-cache.c:1798 +#: read-cache.c:1786 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引条目格式 0x%08x" -#: read-cache.c:1814 +#: read-cache.c:1802 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路径 '%s' 有错误的名称字段" -#: read-cache.c:1871 +#: read-cache.c:1859 msgid "unordered stage entries in index" msgstr "索引中有未排序的暂存条目" -#: read-cache.c:1874 +#: read-cache.c:1862 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合并文件 '%s' 有多个暂存条目" -#: read-cache.c:1877 +#: read-cache.c:1865 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暂存条目" -#: 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:488 builtin/checkout.c:674 builtin/clean.c:991 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 #: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 -#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "索引文件损坏" -#: read-cache.c:2124 +#: read-cache.c:2115 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "无法创建 load_cache_entries 线程：%s" -#: read-cache.c:2137 +#: read-cache.c:2128 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "无法加入 load_cache_entries 线程：%s" -#: read-cache.c:2170 +#: read-cache.c:2161 #, c-format msgid "%s: index file open failed" msgstr "%s：打开索引文件失败" -#: read-cache.c:2174 +#: read-cache.c:2165 #, c-format msgid "%s: cannot stat the open index" msgstr "%s：不能对打开的索引执行 stat 操作" -#: read-cache.c:2178 +#: read-cache.c:2169 #, c-format msgid "%s: index file smaller than expected" msgstr "%s：索引文件比预期的小" -#: read-cache.c:2182 +#: read-cache.c:2173 #, c-format msgid "%s: unable to map index file" msgstr "%s：无法对索引文件执行 map 操作" -#: read-cache.c:2224 +#: read-cache.c:2215 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "无法创建 load_index_extensions 线程：%s" -#: read-cache.c:2251 +#: read-cache.c:2242 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "无法加入 load_index_extensions 线程：%s" -#: read-cache.c:2283 +#: read-cache.c:2274 #, c-format msgid "could not freshen shared index '%s'" msgstr "无法刷新共享索引 '%s'" -#: read-cache.c:2330 +#: read-cache.c:2321 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s" -#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" -#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066 +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 #, c-format msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: read-cache.c:3142 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "不能打开 git 目录：%s" -#: read-cache.c:3154 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "无法删除：%s" -#: read-cache.c:3179 +#: read-cache.c:3170 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修复 '%s' 的权限位" -#: read-cache.c:3328 +#: read-cache.c:3319 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暂存区 #0" @@ -5717,7 +5776,7 @@ msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "变基 %s 到 %s（%d 个提交）" msgstr[1] "变基 %s 到 %s（%d 个提交）" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5725,7 +5784,7 @@ msgstr "" "\n" "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5733,7 +5792,7 @@ msgstr "" "\n" "如果您在这里删除一行，对应的提交将会丢失。\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5747,7 +5806,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5757,14 +5816,14 @@ msgstr "" "然而，如果您删除全部内容，变基操作将会终止。\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463 -#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 #, c-format msgid "could not write '%s'" msgstr "不能写入 '%s'" -#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216 -#: builtin/rebase.c:240 +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 +#: builtin/rebase.c:246 #, c-format msgid "could not write '%s'." msgstr "不能写入 '%s'。" @@ -5794,14 +5853,14 @@ msgstr "" "可选值有：ignore、warn、error。\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274 -#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227 -#: builtin/rebase.c:252 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 +#: builtin/rebase.c:258 #, c-format msgid "could not read '%s'." msgstr "不能读取 '%s'。" -#: ref-filter.c:42 wt-status.c:1977 +#: ref-filter.c:42 wt-status.c:1973 msgid "gone" msgstr "丢失" @@ -5820,237 +5879,232 @@ msgstr "落后 %d" msgid "ahead %d, behind %d" msgstr "领先 %d，落后 %d" -#: ref-filter.c:165 +#: ref-filter.c:169 #, c-format msgid "expected format: %%(color:)" msgstr "期望的格式：%%(color:<颜色>)" -#: ref-filter.c:167 +#: ref-filter.c:171 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "未能识别的颜色：%%(color:%s)" -#: ref-filter.c:189 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "期望整数值 refname:lstrip=%s" -#: ref-filter.c:193 +#: ref-filter.c:197 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "期望整数值 refname:rstrip=%s" -#: ref-filter.c:195 +#: ref-filter.c:199 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "未能识别的 %%(%s) 参数：%s" -#: ref-filter.c:250 +#: ref-filter.c:254 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) 不带参数" -#: ref-filter.c:272 +#: ref-filter.c:276 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "未能识别的 %%(objectsize) 参数：%s" -#: ref-filter.c:280 +#: ref-filter.c:284 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) 不带参数" -#: ref-filter.c:292 +#: ref-filter.c:296 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) 不带参数" -#: ref-filter.c:301 +#: ref-filter.c:309 #, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) 不带参数" +msgid "unrecognized %%(subject) argument: %s" +msgstr "未能识别的 %%(subject) 参数：%s" -#: ref-filter.c:323 +#: ref-filter.c:330 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "未知的 %%(trailers) 参数：%s" -#: ref-filter.c:352 +#: ref-filter.c:363 #, c-format msgid "positive value expected contents:lines=%s" msgstr "期望一个正数 contents:lines=%s" -#: ref-filter.c:354 +#: ref-filter.c:365 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "未能识别的 %%(contents) 参数：%s" -#: ref-filter.c:369 +#: ref-filter.c:380 +#, c-format +msgid "positive value expected '%s' in %%(%s)" +msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数" + +#: ref-filter.c:384 #, c-format -msgid "positive value expected objectname:short=%s" -msgstr "期望一个正数 objectname:short=%s" +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'" -#: ref-filter.c:373 +#: ref-filter.c:398 #, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "未能识别的 %%(objectname) 参数：%s" +msgid "unrecognized email option: %s" +msgstr "未识别的邮件选项：%s" -#: ref-filter.c:403 +#: ref-filter.c:428 #, c-format msgid "expected format: %%(align:,)" msgstr "期望的格式：%%(align:<宽度>,<位置>)" -#: ref-filter.c:415 +#: ref-filter.c:440 #, c-format msgid "unrecognized position:%s" msgstr "未能识别的位置：%s" -#: ref-filter.c:422 +#: ref-filter.c:447 #, c-format msgid "unrecognized width:%s" msgstr "未能识别的宽度：%s" -#: ref-filter.c:431 +#: ref-filter.c:456 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "未能识别的 %%(align) 参数：%s" -#: ref-filter.c:439 +#: ref-filter.c:464 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "元素 %%(align) 需要一个正数的宽度" -#: ref-filter.c:457 +#: ref-filter.c:482 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "未能识别的 %%(if) 参数：%s" -#: ref-filter.c:559 +#: ref-filter.c:584 #, c-format msgid "malformed field name: %.*s" msgstr "格式错误的字段名：%.*s" -#: ref-filter.c:586 +#: ref-filter.c:611 #, c-format msgid "unknown field name: %.*s" msgstr "未知的字段名：%.*s" -#: ref-filter.c:590 +#: ref-filter.c:615 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" -msgstr "不是一个 git 仓库，但是字段 '%.*s' 需要访问对象数据" +msgstr "不是 git 仓库，但是字段 '%.*s' 需要访问对象数据" -#: ref-filter.c:714 +#: ref-filter.c:739 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素" -#: ref-filter.c:777 +#: ref-filter.c:802 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素" -#: ref-filter.c:779 +#: ref-filter.c:804 #, c-format msgid "format: %%(then) atom used more than once" msgstr "格式：%%(then) 元素用了多次" -#: ref-filter.c:781 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "格式：%%(then) 元素用在了 %%(else) 之后" -#: ref-filter.c:809 +#: ref-filter.c:834 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素" -#: ref-filter.c:811 +#: ref-filter.c:836 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素" -#: ref-filter.c:813 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used more than once" msgstr "格式：%%(else) 元素用了多次" -#: ref-filter.c:828 +#: ref-filter.c:853 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "格式：使用了 %%(end) 元素却没有它的对应元素" -#: ref-filter.c:885 +#: ref-filter.c:910 #, c-format msgid "malformed format string %s" msgstr "错误的格式化字符串 %s" -#: ref-filter.c:1486 +#: ref-filter.c:1541 #, c-format msgid "no branch, rebasing %s" msgstr "非分支，正变基 %s" -#: ref-filter.c:1489 +#: ref-filter.c:1544 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "非分支，正变基分离头指针 %s" -#: ref-filter.c:1492 +#: ref-filter.c:1547 #, c-format msgid "no branch, bisect started on %s" msgstr "非分支，二分查找开始于 %s" -#: ref-filter.c:1502 +#: ref-filter.c:1557 msgid "no branch" msgstr "非分支" -#: ref-filter.c:1538 ref-filter.c:1747 +#: ref-filter.c:1591 ref-filter.c:1800 #, c-format msgid "missing object %s for %s" msgstr "缺失 %2$s 的对象 %1$s" -#: ref-filter.c:1548 +#: ref-filter.c:1601 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" -#: ref-filter.c:2001 +#: ref-filter.c:2054 #, c-format msgid "malformed object at '%s'" msgstr "格式错误的对象 '%s'" -#: ref-filter.c:2090 +#: ref-filter.c:2143 #, c-format msgid "ignoring ref with broken name %s" msgstr "忽略带有错误名称 %s 的引用" -#: ref-filter.c:2095 refs.c:657 +#: ref-filter.c:2148 refs.c:657 #, c-format msgid "ignoring broken ref %s" msgstr "忽略损坏的引用 %s" -#: ref-filter.c:2395 +#: ref-filter.c:2464 #, c-format msgid "format: %%(end) atom missing" msgstr "格式：缺少 %%(end) 元素" -#: ref-filter.c:2495 -#, c-format -msgid "option `%s' is incompatible with --merged" -msgstr "选项 `%s' 和 --merged 不兼容" - -#: ref-filter.c:2498 -#, c-format -msgid "option `%s' is incompatible with --no-merged" -msgstr "选项 `%s' 和 --no-merged 不兼容" - -#: ref-filter.c:2508 +#: ref-filter.c:2563 #, c-format msgid "malformed object name %s" msgstr "格式错误的对象名 %s" -#: ref-filter.c:2513 +#: ref-filter.c:2568 #, c-format msgid "option `%s' must point to a commit" msgstr "选项 `%s' 必须指向一个提交" @@ -6075,157 +6129,119 @@ msgstr "无效的分支名：%s = %s" msgid "ignoring dangling symref %s" msgstr "忽略悬空符号引用 %s" -#: refs.c:792 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "无法为写入打开 '%s'：%s" - -#: refs.c:802 refs.c:853 -#, c-format -msgid "could not read ref '%s'" -msgstr "无法读取引用 '%s'" - -#: refs.c:808 -#, c-format -msgid "ref '%s' already exists" -msgstr "引用 '%s' 已经存在" - -#: refs.c:813 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "写入 '%s' 时意外的对象 ID" - -#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925 -#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168 -#: wrapper.c:628 -#, c-format -msgid "could not write to '%s'" -msgstr "不能写入 '%s'" - -#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719 -#: builtin/rebase.c:852 -#, c-format -msgid "could not open '%s' for writing" -msgstr "无法打开 '%s' 进行写入" - -#: refs.c:855 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "删除 '%s' 时意外的对象 ID" - -#: refs.c:986 +#: refs.c:892 #, c-format msgid "log for ref %s has gap after %s" msgstr "引用 %s 的日志在 %s 之后有缺口" -#: refs.c:992 +#: refs.c:898 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "引用 %s 的日志意外终止于 %s " -#: refs.c:1051 +#: refs.c:957 #, c-format msgid "log for %s is empty" msgstr "%s 的日志为空" -#: refs.c:1143 +#: refs.c:1049 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "拒绝更新有错误名称 '%s' 的引用" -#: refs.c:1219 +#: refs.c:1120 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "对引用 '%s' 执行 update_ref 失败：%s" -#: refs.c:2011 +#: refs.c:1944 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "不允许对引用 '%s' 多次更新" -#: refs.c:2098 +#: refs.c:2024 msgid "ref updates forbidden inside quarantine environment" msgstr "在隔离环境中禁止更新引用" -#: refs.c:2109 +#: refs.c:2035 msgid "ref updates aborted by hook" msgstr "引用更新被钩子中止" -#: refs.c:2209 refs.c:2239 +#: refs.c:2135 refs.c:2165 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' 已存在，无法创建 '%s'" -#: refs.c:2215 refs.c:2250 +#: refs.c:2141 refs.c:2176 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "无法同时处理 '%s' 和 '%s'" -#: refs/files-backend.c:1233 +#: refs/files-backend.c:1228 #, c-format msgid "could not remove reference %s" msgstr "无法删除引用 %s" -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 #, c-format msgid "could not delete reference %s: %s" msgstr "无法删除引用 %s：%s" -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 #, c-format msgid "could not delete references: %s" msgstr "无法删除引用：%s" -#: refspec.c:137 +#: refspec.c:167 #, c-format msgid "invalid refspec '%s'" msgstr "无效的引用表达式：'%s'" -#: remote.c:355 +#: remote.c:351 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "配置的远程短名称不能以 '/' 开始：%s" -#: remote.c:403 +#: remote.c:399 msgid "more than one receivepack given, using the first" msgstr "提供了一个以上的 receivepack，使用第一个" -#: remote.c:411 +#: remote.c:407 msgid "more than one uploadpack given, using the first" msgstr "提供了一个以上的 uploadpack，使用第一个" -#: remote.c:594 +#: remote.c:590 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "不能同时获取 %s 和 %s 至 %s" -#: remote.c:598 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常跟踪 %s，而非 %s" -#: remote.c:602 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "%s 同时跟踪 %s 和 %s" -#: remote.c:670 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "模式的键 '%s' 没有 '*'" -#: remote.c:680 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "模式的值 '%s' 没有 '*'" -#: remote.c:986 +#: remote.c:1073 #, c-format msgid "src refspec %s does not match any" msgstr "源引用表达式 %s 没有匹配" -#: remote.c:991 +#: remote.c:1078 #, c-format msgid "src refspec %s matches more than one" msgstr "源引用表达式 %s 匹配超过一个" @@ -6234,7 +6250,7 @@ msgstr "源引用表达式 %s 匹配超过一个" #. :" push, and "being pushed ('%s')" is #. the . #. -#: remote.c:1006 +#: remote.c:1093 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6256,7 +6272,7 @@ msgstr "" "\n" "都不行，所以我们已放弃。您必须给出完整的引用。" -#: remote.c:1026 +#: remote.c:1113 #, c-format msgid "" "The part of the refspec is a commit object.\n" @@ -6266,7 +6282,7 @@ msgstr "" "引用表达式的 是一个提交对象。您是想创建一个新的分支而向\n" "'%s:refs/heads/%s' 推送么？" -#: remote.c:1031 +#: remote.c:1118 #, c-format msgid "" "The part of the refspec is a tag object.\n" @@ -6276,7 +6292,7 @@ msgstr "" "引用表达式的 是一个标签对象。您是想创建一个新的标签而向\n" "'%s:refs/tags/%s' 推送么？" -#: remote.c:1036 +#: remote.c:1123 #, c-format msgid "" "The part of the refspec is a tree object.\n" @@ -6286,7 +6302,7 @@ msgstr "" "引用表达式的 是一个树对象。您是想为这个树对象创建标签而向\n" "'%s:refs/tags/%s' 推送么？" -#: remote.c:1041 +#: remote.c:1128 #, c-format msgid "" "The part of the refspec is a blob object.\n" @@ -6296,114 +6312,114 @@ msgstr "" "引用表达式的 是一个数据对象。您是想为这个数据对象创建标签而向\n" "'%s:refs/tags/%s' 推送么？" -#: remote.c:1077 +#: remote.c:1164 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s 无法被解析为分支" -#: remote.c:1088 +#: remote.c:1175 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "无法删除 '%s'：远程引用不存在" -#: remote.c:1100 +#: remote.c:1187 #, c-format msgid "dst refspec %s matches more than one" msgstr "目标引用表达式 %s 匹配超过一个" -#: remote.c:1107 +#: remote.c:1194 #, c-format msgid "dst ref %s receives from more than one src" msgstr "目标引用 %s 接收超过一个源" -#: remote.c:1610 remote.c:1711 +#: remote.c:1703 remote.c:1804 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" -#: remote.c:1619 +#: remote.c:1712 #, c-format msgid "no such branch: '%s'" msgstr "没有此分支：'%s'" -#: remote.c:1622 +#: remote.c:1715 #, c-format msgid "no upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" -#: remote.c:1628 +#: remote.c:1721 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" -#: remote.c:1643 +#: remote.c:1736 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" -#: remote.c:1655 +#: remote.c:1748 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "分支 '%s' 没有设置要推送的远程服务器" -#: remote.c:1665 +#: remote.c:1758 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "向 '%s' 推送引用规格未包含 '%s'" -#: remote.c:1678 +#: remote.c:1771 msgid "push has no destination (push.default is 'nothing')" msgstr "推送无目标（push.default 是 'nothing'）" -#: remote.c:1700 +#: remote.c:1793 msgid "cannot resolve 'simple' push to a single destination" msgstr "无法解析 'simple' 推送至一个单独的目标" -#: remote.c:1826 +#: remote.c:1922 #, c-format msgid "couldn't find remote ref %s" msgstr "无法找到远程引用 %s" -#: remote.c:1839 +#: remote.c:1935 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* 在本地忽略可笑的引用 '%s'" -#: remote.c:2002 +#: remote.c:2098 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n" -#: remote.c:2006 +#: remote.c:2102 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n" -#: remote.c:2009 +#: remote.c:2105 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" -#: remote.c:2013 +#: remote.c:2109 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "您的分支和 '%s' 指向不同的提交。\n" -#: remote.c:2016 +#: remote.c:2112 #, c-format msgid " (use \"%s\" for details)\n" msgstr " （使用 \"%s\" 查看详情）\n" -#: remote.c:2020 +#: remote.c:2116 #, 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:2026 +#: remote.c:2122 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 来发布您的本地提交）\n" -#: remote.c:2029 +#: remote.c:2125 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6412,11 +6428,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" # 译者：注意保持前导空格 -#: remote.c:2037 +#: remote.c:2133 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" -#: remote.c:2040 +#: remote.c:2136 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6432,11 +6448,11 @@ msgstr[1] "" "并且分别有 %d 和 %d 处不同的提交。\n" # 译者：注意保持前导空格 -#: remote.c:2050 +#: remote.c:2146 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" -#: remote.c:2241 +#: remote.c:2337 #, c-format msgid "cannot parse expected object name '%s'" msgstr "无法解析期望的对象名 '%s'" @@ -6456,11 +6472,6 @@ msgstr "重复的替换引用：%s" msgid "replace depth too high for object %s" msgstr "对象 %s 的替换层级太深" -#: repository.c:94 builtin/init-db.c:188 -#, c-format -msgid "The hash algorithm %s is not supported in this build." -msgstr "这个版本不支持 %s 哈希算法。" - #: rerere.c:217 rerere.c:226 rerere.c:229 msgid "corrupt MERGE_RR" msgstr "损坏的 MERGE_RR" @@ -6519,8 +6530,8 @@ msgstr "不能删除 stray '%s'" msgid "Recorded preimage for '%s'" msgstr "为 '%s' 记录 preimage" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1891 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "不能创建目录 '%s'" @@ -6558,25 +6569,30 @@ msgstr "不能打开 rr-cache 目录" msgid "could not determine HEAD revision" msgstr "不能确定 HEAD 版本" -#: reset.c:70 reset.c:76 sequencer.c:3318 +#: reset.c:70 reset.c:76 sequencer.c:3426 #, c-format msgid "failed to find tree of %s" msgstr "无法找到 %s 指向的树。" -#: revision.c:2661 +#: revision.c:2344 +msgid "--unpacked= no longer supported" +msgstr "不再支持 --unpacked=" + +#: revision.c:2364 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "未知的 --diff-merges 取值：%s" + +#: revision.c:2702 msgid "your current branch appears to be broken" msgstr "您的当前分支好像被损坏" -#: revision.c:2664 +#: revision.c:2705 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的当前分支 '%s' 尚无任何提交" -#: revision.c:2873 -msgid "--first-parent is incompatible with --bisect" -msgstr "--first-parent 与 --bisect 不兼容" - -#: revision.c:2877 +#: revision.c:2915 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" @@ -6584,12 +6600,12 @@ msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" msgid "open /dev/null failed" msgstr "不能打开 /dev/null" -#: run-command.c:1269 +#: run-command.c:1270 #, c-format msgid "cannot create async thread: %s" msgstr "不能创建 async 线程：%s" -#: run-command.c:1333 +#: run-command.c:1334 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6612,65 +6628,65 @@ msgstr "不能解析远程解包状态：%s" msgid "remote unpack failed: %s" msgstr "远程解包失败：%s" -#: send-pack.c:308 +#: send-pack.c:372 msgid "failed to sign the push certificate" msgstr "为推送证书签名失败" -#: send-pack.c:394 +#: send-pack.c:460 msgid "the receiving end does not support this repository's hash algorithm" msgstr "接收端不支持这个仓库的哈希算法" -#: send-pack.c:403 +#: send-pack.c:469 msgid "the receiving end does not support --signed push" msgstr "接收端不支持签名推送" -#: send-pack.c:405 +#: send-pack.c:471 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "未发送推送证书，因为接收端不支持签名推送" -#: send-pack.c:417 +#: send-pack.c:483 msgid "the receiving end does not support --atomic push" msgstr "接收端不支持原子推送" -#: send-pack.c:422 +#: send-pack.c:488 msgid "the receiving end does not support push options" msgstr "接收端不支持推送选项" -#: sequencer.c:192 +#: sequencer.c:194 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "无效的提交信息清理模式 '%s'" -#: sequencer.c:297 +#: sequencer.c:308 #, c-format msgid "could not delete '%s'" msgstr "无法删除 '%s'" -#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385 +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "无法删除 '%s'" -#: sequencer.c:326 +#: sequencer.c:339 msgid "revert" msgstr "还原" -#: sequencer.c:328 +#: sequencer.c:341 msgid "cherry-pick" msgstr "拣选" -#: sequencer.c:330 +#: sequencer.c:343 msgid "rebase" msgstr "变基" -#: sequencer.c:332 +#: sequencer.c:345 #, c-format msgid "unknown action: %d" msgstr "未知动作：%d" -#: sequencer.c:390 +#: sequencer.c:404 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" @@ -6678,7 +6694,7 @@ msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "命令标记修正后的文件" -#: sequencer.c:393 +#: sequencer.c:407 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" @@ -6687,43 +6703,43 @@ msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:406 sequencer.c:2921 +#: sequencer.c:420 sequencer.c:3028 #, c-format msgid "could not lock '%s'" msgstr "不能锁定 '%s'" -#: sequencer.c:413 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#, c-format +msgid "could not write to '%s'" +msgstr "不能写入 '%s'" + +#: sequencer.c:427 #, c-format msgid "could not write eol to '%s'" msgstr "不能将换行符写入 '%s'" -#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941 -#: sequencer.c:3203 +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 +#: sequencer.c:3311 #, c-format msgid "failed to finalize '%s'" msgstr "无法完成 '%s'" -#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185 -#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128 -#, c-format -msgid "could not read '%s'" -msgstr "不能读取 '%s'" - -#: sequencer.c:457 +#: sequencer.c:471 #, c-format msgid "your local changes would be overwritten by %s." msgstr "您的本地修改将被%s覆盖。" -#: sequencer.c:461 +#: sequencer.c:475 msgid "commit your changes or stash them to proceed." msgstr "提交您的修改或贮藏后再继续。" -#: sequencer.c:493 +#: sequencer.c:507 #, c-format msgid "%s: fast-forward" msgstr "%s：快进" -#: sequencer.c:532 builtin/tag.c:566 +#: sequencer.c:546 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" @@ -6731,65 +6747,65 @@ msgstr "无效的清理模式 %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:626 +#: sequencer.c:640 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：无法写入新索引文件" -#: sequencer.c:643 +#: sequencer.c:657 msgid "unable to update cache tree" msgstr "不能更新缓存树" -#: sequencer.c:657 +#: sequencer.c:671 msgid "could not resolve HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:737 +#: sequencer.c:751 #, c-format msgid "no key present in '%.*s'" msgstr "在 '%.*s' 中没有 key" -#: sequencer.c:748 +#: sequencer.c:762 #, c-format msgid "unable to dequote value of '%s'" msgstr "无法为 '%s' 的值去引号" -#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 #, c-format msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" -#: sequencer.c:795 +#: sequencer.c:809 msgid "'GIT_AUTHOR_NAME' already given" msgstr "已经给出 'GIT_AUTHOR_NAME'" -#: sequencer.c:800 +#: sequencer.c:814 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "已经给出 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:805 +#: sequencer.c:819 msgid "'GIT_AUTHOR_DATE' already given" msgstr "已经给出 'GIT_AUTHOR_DATE'" -#: sequencer.c:809 +#: sequencer.c:823 #, c-format msgid "unknown variable '%s'" msgstr "未知变量 '%s'" -#: sequencer.c:814 +#: sequencer.c:828 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "缺少 'GIT_AUTHOR_NAME'" -#: sequencer.c:816 +#: sequencer.c:830 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "缺少 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:818 +#: sequencer.c:832 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "缺少 'GIT_AUTHOR_DATE'" -#: sequencer.c:867 +#: sequencer.c:897 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6818,11 +6834,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1141 +#: sequencer.c:1178 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' 钩子失败" -#: sequencer.c:1147 +#: sequencer.c:1184 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6846,7 +6862,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1160 +#: sequencer.c:1197 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6869,330 +6885,339 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1202 +#: sequencer.c:1239 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: sequencer.c:1204 +#: sequencer.c:1241 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: sequencer.c:1250 +#: sequencer.c:1287 msgid "unable to resolve HEAD after creating commit" msgstr "创建提交后，不能解析 HEAD" -#: sequencer.c:1252 +#: sequencer.c:1289 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: sequencer.c:1256 +#: sequencer.c:1293 msgid " (root-commit)" msgstr "（根提交）" -#: sequencer.c:1277 +#: sequencer.c:1314 msgid "could not parse HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:1279 +#: sequencer.c:1316 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一个提交！" -#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579 +#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:1335 sequencer.c:1980 +#: sequencer.c:1373 sequencer.c:2067 msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695 +#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入树对象" -#: sequencer.c:1379 sequencer.c:1450 +#: sequencer.c:1417 sequencer.c:1535 #, c-format msgid "unable to read commit message from '%s'" msgstr "不能从 '%s' 读取提交说明" -#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894 -#: builtin/merge.c:919 +#: sequencer.c:1446 sequencer.c:1478 +#, c-format +msgid "invalid author identity '%s'" +msgstr "无效的作者身份 '%s'" + +#: sequencer.c:1452 +msgid "corrupt author: missing date information" +msgstr "损坏的作者：缺失日期信息" + +#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 +#: builtin/merge.c:915 msgid "failed to write commit object" msgstr "写提交对象失败" -#: sequencer.c:1433 sequencer.c:4118 +#: sequencer.c:1518 sequencer.c:4237 #, c-format msgid "could not update %s" msgstr "不能更新 %s" -#: sequencer.c:1481 +#: sequencer.c:1567 #, c-format msgid "could not parse commit %s" msgstr "不能解析提交 %s" -#: sequencer.c:1486 +#: sequencer.c:1572 #, c-format msgid "could not parse parent commit %s" msgstr "不能解析父提交 %s" -#: sequencer.c:1569 sequencer.c:1680 +#: sequencer.c:1655 sequencer.c:1766 #, c-format msgid "unknown command: %d" msgstr "未知命令：%d" -#: sequencer.c:1627 sequencer.c:1652 +#: sequencer.c:1713 sequencer.c:1738 #, c-format msgid "This is a combination of %d commits." msgstr "这是一个 %d 个提交的组合。" -#: sequencer.c:1637 +#: sequencer.c:1723 msgid "need a HEAD to fixup" msgstr "需要一个 HEAD 来修复" -#: sequencer.c:1639 sequencer.c:3230 +#: sequencer.c:1725 sequencer.c:3338 msgid "could not read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:1641 +#: sequencer.c:1727 msgid "could not read HEAD's commit message" msgstr "不能读取 HEAD 的提交说明" -#: sequencer.c:1647 +#: sequencer.c:1733 #, c-format msgid "cannot write '%s'" msgstr "不能写 '%s'" -#: sequencer.c:1654 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "这是第一个提交说明：" -#: sequencer.c:1662 +#: sequencer.c:1748 #, c-format msgid "could not read commit message of %s" msgstr "不能读取 %s 的提交说明" -#: sequencer.c:1669 +#: sequencer.c:1755 #, c-format msgid "This is the commit message #%d:" msgstr "这是提交说明 #%d：" -#: sequencer.c:1675 +#: sequencer.c:1761 #, c-format msgid "The commit message #%d will be skipped:" msgstr "提交说明 #%d 将被跳过：" -#: sequencer.c:1763 +#: sequencer.c:1849 msgid "your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:1770 +#: sequencer.c:1856 msgid "cannot fixup root commit" msgstr "不能修复根提交" -#: sequencer.c:1789 +#: sequencer.c:1875 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:1797 sequencer.c:1805 +#: sequencer.c:1883 sequencer.c:1891 #, c-format msgid "commit %s does not have parent %d" msgstr "提交 %s 没有第 %d 个父提交" -#: sequencer.c:1811 +#: sequencer.c:1897 #, 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:1830 +#: sequencer.c:1916 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:1895 +#: sequencer.c:1981 #, c-format msgid "could not rename '%s' to '%s'" msgstr "不能将 '%s' 重命名为 '%s'" -#: sequencer.c:1952 +#: sequencer.c:2038 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:1953 +#: sequencer.c:2039 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:1972 +#: sequencer.c:2059 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "丢弃 %s %s -- 补丁内容已在上游\n" -#: sequencer.c:2030 +#: sequencer.c:2117 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:2037 +#: sequencer.c:2124 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:2114 +#: sequencer.c:2201 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受参数：'%s'" -#: sequencer.c:2123 +#: sequencer.c:2210 #, c-format msgid "missing arguments for %s" msgstr "缺少 %s 的参数" -#: sequencer.c:2154 +#: sequencer.c:2241 #, c-format msgid "could not parse '%s'" msgstr "无法解析 '%s'" -#: sequencer.c:2215 +#: sequencer.c:2302 #, c-format msgid "invalid line %d: %.*s" msgstr "无效行 %d：%.*s" -#: sequencer.c:2226 +#: sequencer.c:2313 #, c-format msgid "cannot '%s' without a previous commit" msgstr "没有父提交的情况下不能 '%s'" -#: sequencer.c:2310 +#: sequencer.c:2399 msgid "cancelling a cherry picking in progress" msgstr "正在取消一个进行中的拣选" -#: sequencer.c:2317 +#: sequencer.c:2408 msgid "cancelling a revert in progress" msgstr "正在取消一个进行中的还原" -#: sequencer.c:2361 +#: sequencer.c:2452 msgid "please fix this using 'git rebase --edit-todo'." msgstr "请用 'git rebase --edit-todo' 来修改。" -#: sequencer.c:2363 +#: sequencer.c:2454 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "不可用的指令清单：'%s'" -#: sequencer.c:2368 +#: sequencer.c:2459 msgid "no commits parsed." msgstr "没有解析提交。" -#: sequencer.c:2379 +#: sequencer.c:2470 msgid "cannot cherry-pick during a revert." msgstr "不能在回退中执行拣选。" -#: sequencer.c:2381 +#: sequencer.c:2472 msgid "cannot revert during a cherry-pick." msgstr "不能在拣选中执行回退。" -#: sequencer.c:2459 +#: sequencer.c:2550 #, c-format msgid "invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: sequencer.c:2556 +#: sequencer.c:2657 msgid "unusable squash-onto" msgstr "不可用的 squash-onto" -#: sequencer.c:2576 +#: sequencer.c:2677 #, c-format msgid "malformed options sheet: '%s'" msgstr "格式错误的选项清单：'%s'" -#: sequencer.c:2664 sequencer.c:4469 +#: sequencer.c:2769 sequencer.c:4609 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:2680 +#: sequencer.c:2786 msgid "revert is already in progress" msgstr "一个还原操作已在进行" -#: sequencer.c:2682 +#: sequencer.c:2788 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2685 +#: sequencer.c:2791 msgid "cherry-pick is already in progress" msgstr "拣选操作已在进行" -#: sequencer.c:2687 +#: sequencer.c:2793 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2701 +#: sequencer.c:2807 #, c-format msgid "could not create sequencer directory '%s'" msgstr "不能创建序列目录 '%s'" -#: sequencer.c:2716 +#: sequencer.c:2822 msgid "could not lock HEAD" msgstr "不能锁定 HEAD" -#: sequencer.c:2776 sequencer.c:4206 +#: sequencer.c:2882 sequencer.c:4325 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:2778 sequencer.c:2789 +#: sequencer.c:2884 sequencer.c:2895 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:2780 sequencer.c:2824 +#: sequencer.c:2886 sequencer.c:2930 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:2810 builtin/grep.c:744 +#: sequencer.c:2916 builtin/grep.c:745 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: sequencer.c:2812 +#: sequencer.c:2918 #, c-format msgid "cannot read '%s': %s" msgstr "不能读取 '%s'：%s" -#: sequencer.c:2813 +#: sequencer.c:2919 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:2819 +#: sequencer.c:2925 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:2830 +#: sequencer.c:2936 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！" -#: sequencer.c:2871 +#: sequencer.c:2977 msgid "no revert in progress" msgstr "没有正在进行的还原" -#: sequencer.c:2879 +#: sequencer.c:2986 msgid "no cherry-pick in progress" msgstr "没有正在进行的拣选" -#: sequencer.c:2889 +#: sequencer.c:2996 msgid "failed to skip the commit" msgstr "无法跳过这个提交" -#: sequencer.c:2896 +#: sequencer.c:3003 msgid "there is nothing to skip" msgstr "没有要跳过的" -#: sequencer.c:2899 +#: sequencer.c:3006 #, c-format msgid "" "have you committed already?\n" @@ -7201,16 +7226,16 @@ msgstr "" "您已经提交了么？\n" "试试 \"git %s --continue\"" -#: sequencer.c:3060 sequencer.c:4098 +#: sequencer.c:3168 sequencer.c:4217 msgid "cannot read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:3077 +#: sequencer.c:3185 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "无法拷贝 '%s' 至 '%s'" -#: sequencer.c:3085 +#: sequencer.c:3193 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7229,28 +7254,28 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3095 +#: sequencer.c:3203 #, c-format msgid "Could not apply %s... %.*s" msgstr "不能应用 %s... %.*s" -#: sequencer.c:3102 +#: sequencer.c:3210 #, c-format msgid "Could not merge %.*s" msgstr "不能合并 %.*s" -#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641 +#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" -#: sequencer.c:3132 +#: sequencer.c:3240 #, c-format msgid "Executing: %s\n" msgstr "正在执行：%s\n" # 译者：注意保持前导空格 -#: sequencer.c:3147 +#: sequencer.c:3255 #, c-format msgid "" "execution failed: %s\n" @@ -7265,11 +7290,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3153 +#: sequencer.c:3261 msgid "and made changes to the index and/or the working tree\n" msgstr "并且修改索引和/或工作区\n" -#: sequencer.c:3159 +#: sequencer.c:3267 #, c-format msgid "" "execution succeeded: %s\n" @@ -7286,90 +7311,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3220 +#: sequencer.c:3328 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的标签名称：'%.*s'" -#: sequencer.c:3274 +#: sequencer.c:3382 msgid "writing fake root commit" msgstr "写伪根提交" -#: sequencer.c:3279 +#: sequencer.c:3387 msgid "writing squash-onto" msgstr "写入 squash-onto" -#: sequencer.c:3363 +#: sequencer.c:3471 #, c-format msgid "could not resolve '%s'" msgstr "无法解析 '%s'" -#: sequencer.c:3394 +#: sequencer.c:3502 msgid "cannot merge without a current revision" msgstr "没有当前版本不能合并" -#: sequencer.c:3416 +#: sequencer.c:3524 #, c-format msgid "unable to parse '%.*s'" msgstr "无法解析 '%.*s'" -#: sequencer.c:3425 +#: sequencer.c:3533 #, c-format msgid "nothing to merge: '%.*s'" msgstr "无可用合并：'%.*s'" -#: sequencer.c:3437 +#: sequencer.c:3545 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章鱼合并不能在一个新的根提交上执行" -#: sequencer.c:3453 +#: sequencer.c:3561 #, c-format msgid "could not get commit message of '%s'" msgstr "不能获取 '%s' 的提交说明" -#: sequencer.c:3613 +#: sequencer.c:3730 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能尝试合并 '%.*s'" -#: sequencer.c:3629 +#: sequencer.c:3746 msgid "merge: Unable to write new index file" msgstr "合并：无法写入新索引文件" -#: sequencer.c:3703 +#: sequencer.c:3820 msgid "Cannot autostash" msgstr "无法 autostash" -#: sequencer.c:3706 +#: sequencer.c:3823 #, c-format msgid "Unexpected stash response: '%s'" msgstr "意外的 stash 响应：'%s'" -#: sequencer.c:3712 +#: sequencer.c:3829 #, c-format msgid "Could not create directory for '%s'" msgstr "不能为 '%s' 创建目录" -#: sequencer.c:3715 +#: sequencer.c:3832 #, c-format msgid "Created autostash: %s\n" msgstr "创建了 autostash：%s\n" -#: sequencer.c:3719 +#: sequencer.c:3836 msgid "could not reset --hard" msgstr "无法 reset --hard" -#: sequencer.c:3744 +#: sequencer.c:3861 #, c-format msgid "Applied autostash.\n" msgstr "已应用 autostash。\n" -#: sequencer.c:3756 +#: sequencer.c:3873 #, c-format msgid "cannot store %s" msgstr "不能存储 %s" -#: sequencer.c:3759 +#: sequencer.c:3876 #, c-format msgid "" "%s\n" @@ -7380,34 +7405,34 @@ msgstr "" "您的修改在贮藏区中很安全。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:3764 +#: sequencer.c:3881 msgid "Applying autostash resulted in conflicts." msgstr "应用自动贮藏导致冲突。" -#: sequencer.c:3765 +#: sequencer.c:3882 msgid "Autostash exists; creating a new stash entry." msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。" -#: sequencer.c:3857 +#: sequencer.c:3974 #, c-format msgid "%s: not a valid OID" msgstr "%s：不是一个有效的对象 ID" -#: sequencer.c:3862 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "不能分离头指针" -#: sequencer.c:3877 +#: sequencer.c:3994 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:3879 +#: sequencer.c:3996 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:3887 +#: sequencer.c:4004 #, c-format msgid "" "Could not execute the todo command\n" @@ -7427,58 +7452,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3931 +#: sequencer.c:4050 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "正在变基（%d/%d）%s" -#: sequencer.c:3976 +#: sequencer.c:4095 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:4047 +#: sequencer.c:4166 #, c-format msgid "unknown command %d" msgstr "未知命令 %d" -#: sequencer.c:4106 +#: sequencer.c:4225 msgid "could not read orig-head" msgstr "不能读取 orig-head" -#: sequencer.c:4111 +#: sequencer.c:4230 msgid "could not read 'onto'" msgstr "不能读取 'onto'" -#: sequencer.c:4125 +#: sequencer.c:4244 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 为 %s" -#: sequencer.c:4185 +#: sequencer.c:4304 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "成功变基并更新 %s。\n" -#: sequencer.c:4218 +#: sequencer.c:4337 msgid "cannot rebase: You have unstaged changes." msgstr "不能变基：您有未暂存的变更。" -#: sequencer.c:4227 +#: sequencer.c:4346 msgid "cannot amend non-existing commit" msgstr "不能修补不存在的提交" -#: sequencer.c:4229 +#: sequencer.c:4348 #, c-format msgid "invalid file: '%s'" msgstr "无效文件：'%s'" -#: sequencer.c:4231 +#: sequencer.c:4350 #, c-format msgid "invalid contents: '%s'" msgstr "无效内容：'%s'" -#: sequencer.c:4234 +#: sequencer.c:4353 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7487,50 +7512,55 @@ msgstr "" "\n" "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" -#: sequencer.c:4270 sequencer.c:4309 +#: sequencer.c:4389 sequencer.c:4428 #, c-format msgid "could not write file: '%s'" msgstr "不能写入文件：'%s'" -#: sequencer.c:4324 +#: sequencer.c:4444 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能删除 CHERRY_PICK_HEAD" -#: sequencer.c:4331 +#: sequencer.c:4451 msgid "could not commit staged changes." msgstr "不能提交暂存的修改。" -#: sequencer.c:4446 +#: sequencer.c:4477 +#, c-format +msgid "invalid committer '%s'" +msgstr "无效的提交者 '%s'" + +#: sequencer.c:4586 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:4450 +#: sequencer.c:4590 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:4485 +#: sequencer.c:4625 msgid "can't revert as initial commit" msgstr "不能作为初始提交回退" -#: sequencer.c:4962 +#: sequencer.c:5102 msgid "make_script: unhandled options" msgstr "make_script：有未能处理的选项" -#: sequencer.c:4965 +#: sequencer.c:5105 msgid "make_script: error preparing revisions" msgstr "make_script：准备版本时错误" -#: sequencer.c:5206 sequencer.c:5223 +#: sequencer.c:5347 sequencer.c:5364 msgid "nothing to do" msgstr "无事可做" -#: sequencer.c:5242 +#: sequencer.c:5383 msgid "could not skip unnecessary pick commands" msgstr "无法跳过不必要的拣选" -#: sequencer.c:5336 +#: sequencer.c:5480 msgid "the script was already rearranged." msgstr "脚本已经重新编排。" @@ -7583,93 +7613,97 @@ msgstr "无法使用无效配置来创建工作区" msgid "this operation must be run in a work tree" msgstr "该操作必须在一个工作区中运行" -#: setup.c:604 +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 仓库版本 <= %d，却得到 %d" -#: setup.c:612 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "发现未知的仓库扩展：" -#: setup.c:631 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "仓库的版本是 0，但是发现仅用于 v1 的扩展：" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "打开 '%s' 出错" -#: setup.c:633 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" msgstr "文件太大，无法作为 .git 文件：'%s'" -#: setup.c:635 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "读取 %s 出错" -#: setup.c:637 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "无效的 gitfile 格式：%s" -#: setup.c:639 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "在 gitfile 中没有路径：%s" -#: setup.c:641 +#: setup.c:710 #, c-format msgid "not a git repository: %s" -msgstr "不是一个 git 仓库：%s" +msgstr "不是 git 仓库：%s" -#: setup.c:743 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "'$%s' 太大" -#: setup.c:757 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" -msgstr "不是一个 git 仓库：'%s'" +msgstr "不是 git 仓库：'%s'" -#: setup.c:786 setup.c:788 setup.c:819 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "不能切换目录到 '%s'" -#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "无法返回当前工作目录" -#: setup.c:918 +#: setup.c:987 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "获取 '%*s%s%s' 状态（stat）失败" -#: setup.c:1156 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "不能读取当前工作目录" -#: setup.c:1165 setup.c:1171 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "不能切换到 '%s'" -#: setup.c:1176 +#: setup.c:1245 #, c-format msgid "not a git repository (or any of the parent directories): %s" -msgstr "不是一个 git 仓库（或者任何父目录）：%s" +msgstr "不是 git 仓库（或者任何父目录）：%s" -#: setup.c:1182 +#: setup.c:1251 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -"不是一个 git 仓库（或者直至挂载点 %s 的任何父目录）\n" +"不是 git 仓库（或者直至挂载点 %s 的任何父目录）\n" "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" -#: setup.c:1293 +#: setup.c:1362 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7678,15 +7712,15 @@ msgstr "" "参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n" "文件属主必须始终拥有读写权限。" -#: setup.c:1340 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "不能打开或者复制 /dev/null" -#: setup.c:1355 +#: setup.c:1424 msgid "fork failed" msgstr "fork 失败" -#: setup.c:1360 +#: setup.c:1429 msgid "setsid failed" msgstr "setsid 失败" @@ -7766,12 +7800,12 @@ msgstr "mmap 失败" msgid "object file %s is empty" msgstr "对象文件 %s 为空" -#: sha1-file.c:1274 sha1-file.c:2454 +#: sha1-file.c:1274 sha1-file.c:2467 #, c-format msgid "corrupt loose object '%s'" msgstr "损坏的松散对象 '%s'" -#: sha1-file.c:1276 sha1-file.c:2458 +#: sha1-file.c:1276 sha1-file.c:2471 #, c-format msgid "garbage at end of loose object '%s'" msgstr "松散对象 '%s' 后面有垃圾数据" @@ -7800,146 +7834,146 @@ msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" msgid "unable to parse %s header" msgstr "无法解析 %s 头部" -#: sha1-file.c:1640 +#: sha1-file.c:1641 #, c-format msgid "failed to read object %s" msgstr "读取对象 %s 失败" -#: sha1-file.c:1644 +#: sha1-file.c:1645 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" -#: sha1-file.c:1648 +#: sha1-file.c:1649 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "松散对象 %s（保存在 %s）已损坏" -#: sha1-file.c:1652 +#: sha1-file.c:1653 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包对象 %s（保存在 %s）已损坏" -#: sha1-file.c:1757 +#: sha1-file.c:1758 #, c-format msgid "unable to write file %s" msgstr "无法写文件 %s" -#: sha1-file.c:1764 +#: sha1-file.c:1765 #, c-format msgid "unable to set permission to '%s'" msgstr "无法为 '%s' 设置权限" -#: sha1-file.c:1771 +#: sha1-file.c:1772 msgid "file write error" msgstr "文件写错误" -#: sha1-file.c:1791 +#: sha1-file.c:1792 msgid "error when closing loose object file" msgstr "关闭松散对象文件时出错" -#: sha1-file.c:1856 +#: sha1-file.c:1857 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "权限不足，无法在仓库对象库 %s 中添加对象" -#: sha1-file.c:1858 +#: sha1-file.c:1859 msgid "unable to create temporary file" msgstr "无法创建临时文件" -#: sha1-file.c:1882 +#: sha1-file.c:1883 msgid "unable to write loose object file" msgstr "不能写松散对象文件" -#: sha1-file.c:1888 +#: sha1-file.c:1889 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能压缩新对象 %s（%d）" -#: sha1-file.c:1892 +#: sha1-file.c:1893 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在对象 %s 上调用 deflateEnd 失败（%d）" -#: sha1-file.c:1896 +#: sha1-file.c:1897 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不稳定对象源数据搞糊涂了" -#: sha1-file.c:1906 builtin/pack-objects.c:1085 +#: sha1-file.c:1907 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上调用 utime() 失败" -#: sha1-file.c:1983 +#: sha1-file.c:1984 #, c-format msgid "cannot read object for %s" msgstr "不能读取对象 %s" -#: sha1-file.c:2022 +#: sha1-file.c:2035 msgid "corrupt commit" msgstr "损坏的提交" -#: sha1-file.c:2030 +#: sha1-file.c:2043 msgid "corrupt tag" msgstr "损坏的标签" -#: sha1-file.c:2130 +#: sha1-file.c:2143 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 时读取错误" -#: sha1-file.c:2133 +#: sha1-file.c:2146 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 时读入不完整" -#: sha1-file.c:2206 sha1-file.c:2216 +#: sha1-file.c:2219 sha1-file.c:2229 #, c-format msgid "%s: failed to insert into database" msgstr "%s：插入数据库失败" -#: sha1-file.c:2222 +#: sha1-file.c:2235 #, c-format msgid "%s: unsupported file type" msgstr "%s：不支持的文件类型" -#: sha1-file.c:2246 +#: sha1-file.c:2259 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一个有效的对象" -#: sha1-file.c:2248 +#: sha1-file.c:2261 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" -#: sha1-file.c:2275 builtin/index-pack.c:155 +#: sha1-file.c:2288 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "不能打开 %s" -#: sha1-file.c:2465 sha1-file.c:2518 +#: sha1-file.c:2478 sha1-file.c:2531 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s 的哈希值不匹配（预期 %s）" -#: sha1-file.c:2489 +#: sha1-file.c:2502 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" -#: sha1-file.c:2494 +#: sha1-file.c:2507 #, c-format msgid "unable to unpack header of %s" msgstr "无法解压缩 %s 的头部" -#: sha1-file.c:2500 +#: sha1-file.c:2513 #, c-format msgid "unable to parse header of %s" msgstr "无法解析 %s 的头部" -#: sha1-file.c:2511 +#: sha1-file.c:2524 #, c-format msgid "unable to unpack contents of %s" msgstr "无法解压缩 %s 的内容" @@ -7984,12 +8018,12 @@ msgstr "'%.*s' 的日志仅能回到 %s" msgid "log for '%.*s' only has %d entries" msgstr "'%.*s' 的日志仅有 %d 个条目" -#: sha1-name.c:1689 +#: sha1-name.c:1702 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中" -#: sha1-name.c:1695 +#: sha1-name.c:1708 #, c-format msgid "" "path '%s' exists, but not '%s'\n" @@ -7998,12 +8032,12 @@ msgstr "" "路径 '%s' 存在，而 '%s' 不存在\n" "提示：您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'？" -#: sha1-name.c:1704 +#: sha1-name.c:1717 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "路径 '%s' 不在 '%.*s' 中" -#: sha1-name.c:1732 +#: sha1-name.c:1745 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" @@ -8012,7 +8046,7 @@ msgstr "" "路径 '%s' 在索引中，但不在暂存区 %d 中\n" "提示：您的意思是 ':%d:%s'？" -#: sha1-name.c:1748 +#: sha1-name.c:1761 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" @@ -8021,21 +8055,21 @@ msgstr "" "路径 '%s' 在索引中，但 '%s' 不在\n" "提示：您的意思是 ':%d:%s' 亦即 ':%d:./%s'？" -#: sha1-name.c:1756 +#: sha1-name.c:1769 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "路径 '%s' 在磁盘上，但不在索引里" -#: sha1-name.c:1758 +#: sha1-name.c:1771 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）" -#: sha1-name.c:1771 +#: sha1-name.c:1784 msgid "relative path syntax can't be used outside working tree" msgstr "不能在工作区之外使用相对路径语法" -#: sha1-name.c:1909 +#: sha1-name.c:1922 #, c-format msgid "invalid object name '%.*s'." msgstr "无效的对象名 '%.*s'。" @@ -8092,6 +8126,12 @@ msgid_plural "%u bytes/s" msgstr[0] "%u 字节/秒" msgstr[1] "%u 字节/秒" +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 +#: builtin/rebase.c:858 +#, c-format +msgid "could not open '%s' for writing" +msgstr "无法打开 '%s' 进行写入" + #: strbuf.c:1175 #, c-format msgid "could not edit '%s'" @@ -8154,55 +8194,55 @@ msgstr "路径规格 '%s' 在子模组 '%.*s' 中" msgid "bad --ignore-submodules argument: %s" msgstr "坏的 --ignore-submodules 参数：%s" -#: submodule.c:815 +#: submodule.c:816 #, 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 +#: submodule.c:919 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交" -#: submodule.c:995 +#: submodule.c:1004 #, c-format msgid "" "Could not run 'git rev-list --not --remotes -n 1' command in " "submodule %s" msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'" -#: submodule.c:1118 +#: submodule.c:1127 #, c-format msgid "process for submodule '%s' failed" msgstr "处理子模组 '%s' 失败" -#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045 +#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: submodule.c:1158 +#: submodule.c:1167 #, c-format msgid "Pushing submodule '%s'\n" msgstr "正在推送子模组 '%s'\n" -#: submodule.c:1161 +#: submodule.c:1170 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "无法推送子模组 '%s'\n" -#: submodule.c:1453 +#: submodule.c:1462 #, c-format msgid "Fetching submodule %s%s\n" msgstr "正在获取子模组 %s%s\n" -#: submodule.c:1483 +#: submodule.c:1492 #, c-format msgid "Could not access submodule '%s'\n" msgstr "无法访问子模组 '%s'\n" -#: submodule.c:1637 +#: submodule.c:1646 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8211,77 +8251,77 @@ msgstr "" "获取子模组时的错误：\n" "%s" -#: submodule.c:1662 +#: submodule.c:1671 #, c-format msgid "'%s' not recognized as a git repository" -msgstr "无法将 '%s' 识别为一个 git 仓库" +msgstr "无法将 '%s' 识别为 git 仓库" -#: submodule.c:1679 +#: submodule.c:1688 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'" -#: submodule.c:1720 +#: submodule.c:1729 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败" -#: submodule.c:1800 +#: submodule.c:1804 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "无法在子模组 '%s' 中启动 'git status'" -#: submodule.c:1813 +#: submodule.c:1817 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "无法在子模组 '%s' 中执行 'git status'" -#: submodule.c:1828 +#: submodule.c:1832 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置" -#: submodule.c:1855 submodule.c:2165 +#: submodule.c:1859 submodule.c:2169 #, c-format msgid "could not recurse into submodule '%s'" msgstr "无法递归进子模组路径 '%s'" -#: submodule.c:1876 +#: submodule.c:1880 msgid "could not reset submodule index" msgstr "无法重置子模组索引" -#: submodule.c:1918 +#: submodule.c:1922 #, c-format msgid "submodule '%s' has dirty index" msgstr "子模组 '%s' 中有脏索引" -#: submodule.c:1970 +#: submodule.c:1974 #, c-format msgid "Submodule '%s' could not be updated." msgstr "子模组 '%s' 无法被更新。" -#: submodule.c:2038 +#: submodule.c:2042 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中" -#: submodule.c:2059 +#: submodule.c:2063 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" -#: submodule.c:2071 submodule.c:2130 +#: submodule.c:2075 submodule.c:2134 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "不能查询子模组 '%s' 的名称" -#: submodule.c:2075 +#: submodule.c:2079 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "禁止移动 '%s' 到现存 git 目录中" -#: submodule.c:2082 +#: submodule.c:2086 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8292,65 +8332,65 @@ msgstr "" "'%s' 迁移至\n" "'%s'\n" -#: submodule.c:2210 +#: submodule.c:2214 msgid "could not start ls-files in .." msgstr "无法在 .. 中启动 ls-files" -#: submodule.c:2250 +#: submodule.c:2254 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" -#: trailer.c:238 +#: trailer.c:236 #, c-format msgid "running trailer command '%s' failed" msgstr "执行 trailer 命令 '%s' 失败" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "键 '%2$s' 的未知取值 '%1$s'" -#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "多于一个 %s" -#: trailer.c:730 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "签名 '%.*s' 的键为空" -#: trailer.c:750 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "不能读取输入文件 '%s'" -#: trailer.c:753 +#: trailer.c:751 msgid "could not read from stdin" msgstr "不能自标准输入读取" -#: trailer.c:1011 wrapper.c:673 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "不能对 %s 调用 stat" -#: trailer.c:1013 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "文件 %s 不是一个正规文件" -#: trailer.c:1015 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "文件 %s 用户不可写" -#: trailer.c:1027 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "不能打开临时文件" -#: trailer.c:1067 +#: trailer.c:1065 #, c-format msgid "could not rename temporary file to %s" msgstr "不能重命名临时文件为 %s" @@ -8397,7 +8437,7 @@ msgstr "不能执行 fast-import" msgid "error while running fast-import" msgstr "执行 fast-import 出错" -#: transport-helper.c:549 transport-helper.c:1156 +#: transport-helper.c:549 transport-helper.c:1226 #, c-format msgid "could not read ref %s" msgstr "无法读取引用 %s" @@ -8415,7 +8455,7 @@ msgstr "协议不支持设置远程服务路径" msgid "invalid remote service path" msgstr "无效的远程服务路径" -#: transport-helper.c:661 transport.c:1347 +#: transport-helper.c:661 transport.c:1428 msgid "operation not supported by protocol" msgstr "协议不支持该操作" @@ -8424,59 +8464,63 @@ msgstr "协议不支持该操作" msgid "can't connect to subservice %s" msgstr "不能连接到子服务 %s" -#: transport-helper.c:740 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "'option' 缺乏一个匹配的 'ok/error' 指令" + +#: transport-helper.c:788 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "预期 ok/error，助手说 '%s'" -#: transport-helper.c:793 +#: transport-helper.c:841 #, c-format msgid "helper reported unexpected status of %s" msgstr "助手报告 %s 的意外状态" -#: transport-helper.c:854 +#: transport-helper.c:924 #, c-format msgid "helper %s does not support dry-run" msgstr "助手 %s 不支持 dry-run" -#: transport-helper.c:857 +#: transport-helper.c:927 #, c-format msgid "helper %s does not support --signed" msgstr "助手 %s 不支持 --signed" -#: transport-helper.c:860 +#: transport-helper.c:930 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "助手 %s 不支持 --signed=if-asked" -#: transport-helper.c:865 +#: transport-helper.c:935 #, c-format msgid "helper %s does not support --atomic" msgstr "助手 %s 不支持 --atomic" -#: transport-helper.c:871 +#: transport-helper.c:941 #, c-format msgid "helper %s does not support 'push-option'" msgstr "助手 %s 不支持 'push-option'" -#: transport-helper.c:970 +#: transport-helper.c:1040 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-heper 不支持 push，需要引用表达式" -#: transport-helper.c:975 +#: transport-helper.c:1045 #, c-format msgid "helper %s does not support 'force'" msgstr "助手 %s 不支持 'force'" -#: transport-helper.c:1022 +#: transport-helper.c:1092 msgid "couldn't run fast-export" msgstr "无法执行 fast-export" -#: transport-helper.c:1027 +#: transport-helper.c:1097 msgid "error while running fast-export" msgstr "执行 fast-export 时出错" -#: transport-helper.c:1052 +#: transport-helper.c:1122 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8485,52 +8529,52 @@ msgstr "" "没有共同的引用并且也没有指定，什么也不会做。\n" "也许您应该指定一个分支。\n" -#: transport-helper.c:1133 +#: transport-helper.c:1203 #, c-format msgid "unsupported object format '%s'" msgstr "不支持的对象格式 '%s'" -#: transport-helper.c:1142 +#: transport-helper.c:1212 #, c-format msgid "malformed response in ref list: %s" msgstr "引用列表中格式错误的响应：%s" -#: transport-helper.c:1294 +#: transport-helper.c:1364 #, c-format msgid "read(%s) failed" msgstr "读取（%s）失败" -#: transport-helper.c:1321 +#: transport-helper.c:1391 #, c-format msgid "write(%s) failed" msgstr "写（%s）失败" -#: transport-helper.c:1370 +#: transport-helper.c:1440 #, c-format msgid "%s thread failed" msgstr "%s 线程失败" -#: transport-helper.c:1374 +#: transport-helper.c:1444 #, c-format msgid "%s thread failed to join: %s" msgstr "%s 线程等待失败：%s" -#: transport-helper.c:1393 transport-helper.c:1397 +#: transport-helper.c:1463 transport-helper.c:1467 #, c-format msgid "can't start thread for copying data: %s" msgstr "不能启动线程来拷贝数据：%s" -#: transport-helper.c:1434 +#: transport-helper.c:1504 #, c-format msgid "%s process failed to wait" msgstr "%s 进程等待失败" -#: transport-helper.c:1438 +#: transport-helper.c:1508 #, c-format msgid "%s process failed" msgstr "%s 进程失败" -#: transport-helper.c:1456 transport-helper.c:1465 +#: transport-helper.c:1526 transport-helper.c:1535 msgid "can't start thread for copying data" msgstr "不能启动线程来拷贝数据" @@ -8542,51 +8586,51 @@ msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" #: transport.c:145 #, c-format msgid "could not read bundle '%s'" -msgstr "无法读取 bundle '%s'" +msgstr "无法读取归档包 '%s'" #: transport.c:220 #, c-format msgid "transport: invalid depth option '%s'" msgstr "传输：无效的深度选项 '%s'" -#: transport.c:272 +#: transport.c:269 msgid "see protocol.version in 'git help config' for more details" msgstr "查看 'git help config' 中的 protocol.version 获取更多信息" -#: transport.c:273 +#: transport.c:270 msgid "server options require protocol version 2 or later" msgstr "服务端选项需要版本 2 协议或更高" -#: transport.c:631 +#: transport.c:712 msgid "could not parse transport.color.* config" msgstr "不能解析 transport.color.* 配置" -#: transport.c:704 +#: transport.c:785 msgid "support for protocol v2 not implemented yet" msgstr "协议 v2 的支持尚未实现" -#: transport.c:838 +#: transport.c:919 #, c-format msgid "unknown value for config '%s': %s" msgstr "配置 '%s' 的取值未知：%s" -#: transport.c:904 +#: transport.c:985 #, c-format msgid "transport '%s' not allowed" msgstr "传输 '%s' 不允许" -#: transport.c:957 +#: transport.c:1038 msgid "git-over-rsync is no longer supported" msgstr "不再支持 git-over-rsync" -#: transport.c:1059 +#: transport.c:1140 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n" -#: transport.c:1063 +#: transport.c:1144 #, c-format msgid "" "\n" @@ -8613,11 +8657,11 @@ msgstr "" "以推送至远程。\n" "\n" -#: transport.c:1071 +#: transport.c:1152 msgid "Aborting." msgstr "正在终止。" -#: transport.c:1216 +#: transport.c:1297 msgid "failed to push all needed submodules" msgstr "不能推送全部需要的子模组" @@ -8882,7 +8926,7 @@ msgstr "" msgid "Updating index flags" msgstr "正在更新索引标志" -#: upload-pack.c:1415 +#: upload-pack.c:1516 msgid "expected flush after fetch arguments" msgstr "在 fetch 参数之后应该有一个 flush 包" @@ -8919,47 +8963,83 @@ msgstr "无效的 '..' 路径片段" msgid "Fetching objects" msgstr "正在获取对象" -#: worktree.c:248 builtin/am.c:2098 +#: worktree.c:236 builtin/am.c:2116 #, c-format msgid "failed to read '%s'" msgstr "读取 '%s' 失败" -#: worktree.c:295 +#: worktree.c:283 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "在主工作区的 '%s' 不是仓库目录" -#: worktree.c:306 +#: worktree.c:294 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "文件 '%s' 不包含工作区的绝对路径" -#: worktree.c:318 +#: worktree.c:306 #, c-format msgid "'%s' does not exist" msgstr "'%s' 不存在" -#: worktree.c:324 +#: worktree.c:312 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' 不是一个 .git 文件，错误码 %d" -#: worktree.c:333 +#: worktree.c:321 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' 没有指回到 '%s'" -#: wrapper.c:194 wrapper.c:364 +#: worktree.c:587 +msgid "not a directory" +msgstr "不是一个目录" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr ".git 不是一个文件" + +#: worktree.c:598 +msgid ".git file broken" +msgstr ".git 文件损坏" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr ".git 文件不正确" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "不是一个有效的路径" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "无法定位仓库，.git 不是一个文件" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "无法定位仓库，.git 文件损坏" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "gitdir 不可读" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "gitdir 不正确" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" msgstr "无法打开 '%s' 进行读写" -#: wrapper.c:395 wrapper.c:596 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "不能访问 '%s'" -#: wrapper.c:604 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "不能获取当前工作目录" @@ -8998,11 +9078,11 @@ msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）" msgid " (use \"git rm ...\" to mark resolution)" msgstr " （使用 \"git rm <文件>...\" 标记解决方案）" -#: wt-status.c:211 wt-status.c:1072 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:234 wt-status.c:1081 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" @@ -9033,97 +9113,97 @@ msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" msgid " (use \"git %s ...\" to include in what will be committed)" msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）" -#: wt-status.c:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "双方删除：" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "由我们添加：" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "由他们删除：" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "由他们添加：" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "由我们删除：" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "双方添加：" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "双方修改：" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "新文件：" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "拷贝：" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "删除：" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "修改：" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "重命名：" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "类型变更：" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "未知：" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "未合并：" # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "新提交, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "修改的内容, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "未跟踪的内容, " -#: wt-status.c:904 +#: wt-status.c:903 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "您的贮藏区当前有 %d 条记录" msgstr[1] "您的贮藏区当前有 %d 条记录" -#: wt-status.c:936 +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: wt-status.c:938 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: wt-status.c:1020 +#: wt-status.c:1018 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9131,7 +9211,7 @@ msgstr "" "不要改动或删除上面的一行。\n" "其下所有内容都将被忽略。" -#: wt-status.c:1112 +#: wt-status.c:1110 #, c-format msgid "" "\n" @@ -9142,77 +9222,77 @@ msgstr "" "花了 %.2f 秒才计算出分支的领先/落后范围。\n" "为避免，您可以使用 '--no-ahead-behind'。\n" -#: wt-status.c:1142 +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:1145 +#: wt-status.c:1143 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" # 译者：注意保持前导空格 -#: wt-status.c:1147 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " （使用 \"git merge --abort\" 终止合并）" -#: wt-status.c:1151 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:1154 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:1163 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" -#: wt-status.c:1166 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:1170 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1172 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1174 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:1307 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 丢失。" -#: wt-status.c:1309 +#: wt-status.c:1307 msgid "No commands done." msgstr "没有命令被执行。" -#: wt-status.c:1312 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "最后一条命令已完成（%d 条命令被执行）：" msgstr[1] "最后的命令已完成（%d 条命令被执行）：" -#: wt-status.c:1323 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr " （更多参见文件 %s）" -#: wt-status.c:1328 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "未剩下任何命令。" -#: wt-status.c:1331 +#: wt-status.c:1329 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -9220,194 +9300,194 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）：" msgstr[1] "接下来要执行的命令（剩余 %d 条命令）：" # 译者：注意保持前导空格 -#: wt-status.c:1339 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）" -#: wt-status.c:1351 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" -#: wt-status.c:1356 +#: wt-status.c:1354 msgid "You are currently rebasing." msgstr "您在执行变基操作。" # 译者：注意保持前导空格 -#: wt-status.c:1369 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1371 +#: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1373 +#: wt-status.c:1371 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:1380 +#: wt-status.c:1378 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:1384 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" -#: wt-status.c:1389 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行变基操作时拆分提交。" # 译者：注意保持前导空格 -#: wt-status.c:1392 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:1396 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" -#: wt-status.c:1401 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "您在执行变基操作时编辑提交。" # 译者：注意保持前导空格 -#: wt-status.c:1404 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:1406 +#: wt-status.c:1404 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:1417 +#: wt-status.c:1415 msgid "Cherry-pick currently in progress." msgstr "拣选操作正在进行中。" -#: wt-status.c:1420 +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1427 +#: wt-status.c:1425 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1430 +#: wt-status.c:1428 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " （执行 \"git cherry-pick --continue\" 以继续）" # 译者：注意保持前导空格 -#: wt-status.c:1433 +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1435 +#: wt-status.c:1433 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " （使用 \"git cherry-pick --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1437 +#: wt-status.c:1435 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" -#: wt-status.c:1447 +#: wt-status.c:1445 msgid "Revert currently in progress." msgstr "还原操作正在行中。" -#: wt-status.c:1450 +#: wt-status.c:1448 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1456 +#: wt-status.c:1454 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并执行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1459 +#: wt-status.c:1457 msgid " (run \"git revert --continue\" to continue)" msgstr " （执行 \"git revert --continue\" 以继续）" # 译者：注意保持前导空格 -#: wt-status.c:1462 +#: wt-status.c:1460 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：执行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " （使用 \"git revert --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1466 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:1476 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1480 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 -#: wt-status.c:1483 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1494 +#: wt-status.c:1492 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "您处于稀疏签出状态，包含 %d%% 的跟踪文件" -#: wt-status.c:1733 +#: wt-status.c:1731 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1740 +#: wt-status.c:1738 msgid "interactive rebase in progress; onto " msgstr "交互式变基操作正在进行中；至 " -#: wt-status.c:1742 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " -#: wt-status.c:1752 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1769 +#: wt-status.c:1767 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1770 +#: wt-status.c:1768 msgid "No commits yet" msgstr "尚无提交" -#: wt-status.c:1784 +#: wt-status.c:1782 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1786 +#: wt-status.c:1784 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1790 +#: wt-status.c:1788 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9417,26 +9497,26 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1796 +#: wt-status.c:1794 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1798 +#: wt-status.c:1796 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1804 +#: wt-status.c:1802 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1809 +#: wt-status.c:1807 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" -#: wt-status.c:1812 +#: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" @@ -9448,66 +9528,66 @@ msgid "" "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1818 +#: wt-status.c:1819 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1821 +#: wt-status.c:1823 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1824 wt-status.c:1829 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1827 +#: wt-status.c:1830 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1831 +#: wt-status.c:1835 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:1944 +#: wt-status.c:1940 msgid "No commits yet on " msgstr "尚无提交在 " -#: wt-status.c:1948 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" -#: wt-status.c:1979 +#: wt-status.c:1975 msgid "different" msgstr "不同" # 译者：注意保持句尾空格 -#: wt-status.c:1981 wt-status.c:1989 +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " msgstr "落后 " -#: wt-status.c:1984 wt-status.c:1987 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "领先 " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2509 +#: wt-status.c:2505 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "不能%s：您有未暂存的变更。" -#: wt-status.c:2515 +#: wt-status.c:2511 msgid "additionally, your index contains uncommitted changes." msgstr "另外，您的索引中包含未提交的变更。" -#: wt-status.c:2517 +#: wt-status.c:2513 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的变更。" @@ -9539,108 +9619,108 @@ msgstr "删除 '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:266 builtin/rev-parse.c:904 +#: builtin/add.c:272 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "不能读取索引" -#: builtin/add.c:277 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "无法为写入打开 '%s'。" -#: builtin/add.c:281 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "不能生成补丁" -#: builtin/add.c:284 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "编辑补丁失败" -#: builtin/add.c:287 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: builtin/add.c:289 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" -#: builtin/add.c:294 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" -#: builtin/add.c:302 +#: builtin/add.c:308 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 +#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 msgid "dry run" msgstr "演习" -#: builtin/add.c:325 +#: builtin/add.c:331 msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308 +#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 msgid "select hunks interactively" msgstr "交互式挑选数据块" -#: builtin/add.c:327 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "编辑当前差异并应用" -#: builtin/add.c:328 +#: builtin/add.c:334 msgid "allow adding otherwise ignored files" msgstr "允许添加忽略的文件" -#: builtin/add.c:329 +#: builtin/add.c:335 msgid "update tracked files" msgstr "更新已跟踪的文件" -#: builtin/add.c:330 +#: builtin/add.c:336 msgid "renormalize EOL of tracked files (implies -u)" msgstr "对已跟踪文件（暗含 -u）重新归一换行符" -#: builtin/add.c:331 +#: builtin/add.c:337 msgid "record only the fact that the path will be added later" msgstr "只记录，该路径稍后再添加" -#: builtin/add.c:332 +#: builtin/add.c:338 msgid "add changes from all tracked and untracked files" msgstr "添加所有改变的已跟踪文件和未跟踪文件" -#: builtin/add.c:335 +#: builtin/add.c:341 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区中移除的路径（和 --no-all 相同）" -#: builtin/add.c:337 +#: builtin/add.c:343 msgid "don't add, only refresh the index" msgstr "不添加，只刷新索引" -#: builtin/add.c:338 +#: builtin/add.c:344 msgid "just skip files which cannot be added because of errors" msgstr "跳过因出错不能添加的文件" -#: builtin/add.c:339 +#: builtin/add.c:345 msgid "check if - even missing - files are ignored in dry run" msgstr "检查在演习模式下文件（即使不存在）是否被忽略" -#: builtin/add.c:341 builtin/update-index.c:1004 +#: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的可执行位" -#: builtin/add.c:343 +#: builtin/add.c:349 msgid "warn when adding an embedded repository" msgstr "创建一个嵌入式仓库时给予警告" -#: builtin/add.c:345 +#: builtin/add.c:351 msgid "backend for `git stash -p`" msgstr "`git stash -p` 的后端" -#: builtin/add.c:363 +#: builtin/add.c:369 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9668,12 +9748,12 @@ msgstr "" "\n" "参见 \"git help submodule\" 获取更多信息。" -#: builtin/add.c:391 +#: builtin/add.c:397 #, c-format msgid "adding embedded git repository: %s" msgstr "正在添加嵌入式 git 仓库：%s" -#: builtin/add.c:410 +#: builtin/add.c:416 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -9683,47 +9763,47 @@ msgstr "" "运行下面的命令来关闭本消息\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:419 +#: builtin/add.c:425 msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c:447 builtin/commit.c:345 +#: builtin/add.c:453 builtin/commit.c:345 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容" -#: builtin/add.c:464 +#: builtin/add.c:470 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file 与 --edit 不兼容" -#: builtin/add.c:476 +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" -#: builtin/add.c:479 +#: builtin/add.c:485 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" -#: builtin/add.c:483 +#: builtin/add.c:489 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" -#: builtin/add.c:501 builtin/checkout.c:1701 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506 +#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file 与路径表达式参数不兼容" -#: builtin/add.c:508 builtin/checkout.c:1713 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512 +#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul 需要 --pathspec-from-file" -#: builtin/add.c:512 +#: builtin/add.c:518 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" -#: builtin/add.c:514 +#: builtin/add.c:520 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -9733,105 +9813,110 @@ msgstr "" "运行下面的命令来关闭本消息\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:352 +#: builtin/am.c:160 +#, c-format +msgid "invalid committer: %s" +msgstr "无效的提交者：%s" + +#: builtin/am.c:366 msgid "could not parse author script" msgstr "不能解析作者脚本" -#: builtin/am.c:436 +#: builtin/am.c:450 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 钩子删除" -#: builtin/am.c:478 +#: builtin/am.c:492 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/am.c:516 +#: builtin/am.c:530 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "从 '%s' 拷贝注解到 '%s' 时失败" -#: builtin/am.c:542 +#: builtin/am.c:556 msgid "fseek failed" msgstr "fseek 失败" -#: builtin/am.c:730 +#: builtin/am.c:744 #, c-format msgid "could not parse patch '%s'" msgstr "无法解析补丁 '%s'" -#: builtin/am.c:795 +#: builtin/am.c:809 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: builtin/am.c:843 +#: builtin/am.c:857 msgid "invalid timestamp" msgstr "无效的时间戳" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:862 builtin/am.c:874 msgid "invalid Date line" msgstr "无效的日期行" -#: builtin/am.c:855 +#: builtin/am.c:869 msgid "invalid timezone offset" msgstr "无效的时区偏移值" -#: builtin/am.c:948 +#: builtin/am.c:962 msgid "Patch format detection failed." msgstr "补丁格式探测失败。" -#: builtin/am.c:953 builtin/clone.c:409 +#: builtin/am.c:967 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "创建目录 '%s' 失败" -#: builtin/am.c:958 +#: builtin/am.c:972 msgid "Failed to split patches." msgstr "拆分补丁失败。" -#: builtin/am.c:1089 +#: builtin/am.c:1103 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题，执行 \"%s --continue\"。" -#: builtin/am.c:1090 +#: builtin/am.c:1104 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。" -#: builtin/am.c:1091 +#: builtin/am.c:1105 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。" -#: builtin/am.c:1174 +#: builtin/am.c:1188 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。" -#: builtin/am.c:1202 +#: builtin/am.c:1216 msgid "Patch is empty." msgstr "补丁为空。" -#: builtin/am.c:1267 +#: builtin/am.c:1281 #, c-format msgid "missing author line in commit %s" msgstr "在提交 %s 中缺失作者行" -#: builtin/am.c:1270 +#: builtin/am.c:1284 #, c-format msgid "invalid ident line: %.*s" msgstr "无效的身份标识：%.*s" -#: builtin/am.c:1489 +#: builtin/am.c:1503 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: builtin/am.c:1491 +#: builtin/am.c:1505 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个（三方合并的）基础目录树..." -#: builtin/am.c:1510 +#: builtin/am.c:1524 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -9839,24 +9924,24 @@ msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到索引中的数据对象上。" -#: builtin/am.c:1516 +#: builtin/am.c:1530 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基础版本上打补丁及进行三方合并..." -#: builtin/am.c:1542 +#: builtin/am.c:1556 msgid "Failed to merge in the changes." msgstr "无法合并变更。" -#: builtin/am.c:1574 +#: builtin/am.c:1588 msgid "applying to an empty history" msgstr "正应用到一个空历史上" -#: builtin/am.c:1621 builtin/am.c:1625 +#: builtin/am.c:1639 builtin/am.c:1643 #, c-format msgid "cannot resume: %s does not exist." msgstr "无法继续：%s 不存在。" -#: builtin/am.c:1643 +#: builtin/am.c:1661 msgid "Commit Body is:" msgstr "提交内容为：" @@ -9865,39 +9950,39 @@ msgstr "提交内容为：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1653 +#: builtin/am.c:1671 #, 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:1699 builtin/commit.c:395 +#: builtin/am.c:1717 builtin/commit.c:395 msgid "unable to write index file" msgstr "无法写入索引文件" -#: builtin/am.c:1703 +#: builtin/am.c:1721 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "脏索引：不能应用补丁（脏文件：%s）" -#: builtin/am.c:1743 builtin/am.c:1811 +#: builtin/am.c:1761 builtin/am.c:1829 #, c-format msgid "Applying: %.*s" msgstr "应用：%.*s" -#: builtin/am.c:1760 +#: builtin/am.c:1778 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: builtin/am.c:1766 +#: builtin/am.c:1784 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补丁失败于 %s %.*s" -#: builtin/am.c:1770 +#: builtin/am.c:1788 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁" -#: builtin/am.c:1814 +#: builtin/am.c:1832 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9907,7 +9992,7 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: builtin/am.c:1821 +#: builtin/am.c:1839 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9918,171 +10003,171 @@ msgstr "" "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" -#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347 +#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/am.c:1980 +#: builtin/am.c:1998 msgid "failed to clean index" msgstr "清空索引失败" -#: builtin/am.c:2024 +#: builtin/am.c:2042 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:2131 +#: builtin/am.c:2149 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "无效的 --patch-format 值：%s" -#: builtin/am.c:2171 +#: builtin/am.c:2191 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "无效的 --show-current-patch 值：%s" -#: builtin/am.c:2175 +#: builtin/am.c:2195 #, 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:2206 +#: builtin/am.c:2226 msgid "git am [] [( | )...]" msgstr "git am [<选项>] [( | )...]" -#: builtin/am.c:2207 +#: builtin/am.c:2227 msgid "git am [] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" -#: builtin/am.c:2213 +#: builtin/am.c:2233 msgid "run interactively" msgstr "以交互式方式运行" -#: builtin/am.c:2215 +#: builtin/am.c:2235 msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" -#: builtin/am.c:2217 +#: builtin/am.c:2237 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允许使用三方合并。" -#: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16 -#: builtin/repack.c:306 builtin/stash.c:816 +#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:309 builtin/stash.c:816 msgid "be quiet" msgstr "静默模式" -#: builtin/am.c:2220 +#: builtin/am.c:2240 msgid "add a Signed-off-by line to the commit message" msgstr "在提交说明中添加一个 Signed-off-by 签名" -#: builtin/am.c:2223 +#: builtin/am.c:2243 msgid "recode into utf8 (default)" msgstr "使用 utf8 字符集（默认）" -#: builtin/am.c:2225 +#: builtin/am.c:2245 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -k 参数" -#: builtin/am.c:2227 +#: builtin/am.c:2247 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -b 参数" -#: builtin/am.c:2229 +#: builtin/am.c:2249 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -m 参数" -#: builtin/am.c:2231 +#: builtin/am.c:2251 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" -#: builtin/am.c:2234 +#: builtin/am.c:2254 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" -#: builtin/am.c:2237 +#: builtin/am.c:2257 msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" -#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 -#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 -#: builtin/am.c:2266 +#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2286 msgid "pass it through git-apply" msgstr "传递给 git-apply" -#: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252 +#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321 -#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 +#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 #: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 #: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38 -#: bugreport.c:137 +#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format" msgstr "格式" -#: builtin/am.c:2263 +#: builtin/am.c:2283 msgid "format the patch(es) are in" msgstr "补丁的格式" -#: builtin/am.c:2269 +#: builtin/am.c:2289 msgid "override error message when patch failure occurs" msgstr "打补丁失败时显示的错误信息" -#: builtin/am.c:2271 +#: builtin/am.c:2291 msgid "continue applying patches after resolving a conflict" msgstr "冲突解决后继续应用补丁" -#: builtin/am.c:2274 +#: builtin/am.c:2294 msgid "synonyms for --continue" msgstr "和 --continue 同义" -#: builtin/am.c:2277 +#: builtin/am.c:2297 msgid "skip the current patch" msgstr "跳过当前补丁" -#: builtin/am.c:2280 +#: builtin/am.c:2300 msgid "restore the original branch and abort the patching operation." msgstr "恢复原始分支并终止打补丁操作。" -#: builtin/am.c:2283 +#: builtin/am.c:2303 msgid "abort the patching operation but keep HEAD where it is." msgstr "终止补丁操作但保持 HEAD 不变。" -#: builtin/am.c:2287 +#: builtin/am.c:2307 msgid "show the patch being applied" msgstr "显示正在应用的补丁" -#: builtin/am.c:2292 +#: builtin/am.c:2312 msgid "lie about committer date" msgstr "将作者日期作为提交日期" -#: builtin/am.c:2294 +#: builtin/am.c:2314 msgid "use current timestamp for author date" msgstr "用当前时间作为作者日期" -#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517 -#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524 -#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419 +#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 +#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381 +#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 msgid "GPG-sign commits" msgstr "使用 GPG 签名提交" -#: builtin/am.c:2300 +#: builtin/am.c:2320 msgid "(internal use for git-rebase)" msgstr "（内部使用，用于 git-rebase）" -#: builtin/am.c:2318 +#: builtin/am.c:2338 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." @@ -10090,16 +10175,16 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" "请不要再使用它了。" -#: builtin/am.c:2325 +#: builtin/am.c:2345 msgid "failed to read the index" msgstr "读取索引失败" -#: builtin/am.c:2340 +#: builtin/am.c:2360 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" -#: builtin/am.c:2364 +#: builtin/am.c:2384 #, c-format msgid "" "Stray %s directory found.\n" @@ -10108,11 +10193,11 @@ msgstr "" "发现了错误的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" -#: builtin/am.c:2370 +#: builtin/am.c:2390 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" -#: builtin/am.c:2380 +#: builtin/am.c:2400 msgid "interactive mode requires patches on the command line" msgstr "交互式模式需要命令行上提供补丁" @@ -10150,23 +10235,23 @@ msgstr "git archive：协议错误" msgid "git archive: expected a flush" msgstr "git archive：应有一个 flush 包" -#: builtin/bisect--helper.c:22 -msgid "git bisect--helper --next-all [--no-checkout]" -msgstr "git bisect--helper --next-all [--no-checkout]" - #: builtin/bisect--helper.c:23 +msgid "git bisect--helper --next-all" +msgstr "git bisect--helper --next-all" + +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --write-terms " msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" -#: builtin/bisect--helper.c:25 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset []" msgstr "git bisect--helper --bisect-reset [<提交>]" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-write [--no-log] " "" @@ -10174,18 +10259,18 @@ msgstr "" "git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语" ">" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:28 msgid "" "git bisect--helper --bisect-check-and-set-terms " "" msgstr "" "git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-next-check []" msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:30 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -10193,74 +10278,93 @@ msgstr "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:31 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}= --term-{new,bad}" -"=][--no-checkout] [ [...]] [--] [...]" +"git bisect--helper --bisect-start [--term-{new,bad}= --term-{old,good}" +"=] [--no-checkout] [--first-parent] [ [...]] [--] " +"[...]" msgstr "" -"git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}" -"=<术语>][--no-checkout] [<坏> [<好>...]] [--] [<路径>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<术语> --term-{old,good}" +"=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径>...]" + +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --bisect-next" + +#: builtin/bisect--helper.c:34 +msgid "git bisect--helper --bisect-auto-next" +msgstr "git bisect--helper --bisect-auto-next" -#: builtin/bisect--helper.c:86 +#: builtin/bisect--helper.c:35 +msgid "git bisect--helper --bisect-autostart" +msgstr "git bisect--helper --bisect-autostart" + +#: builtin/bisect--helper.c:97 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "不能以 '%2$s' 模式打开文件 '%1$s'" + +#: builtin/bisect--helper.c:104 +#, c-format +msgid "could not write to file '%s'" +msgstr "不能写入文件 '%s'" + +#: builtin/bisect--helper.c:143 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' 不是一个有效的术语" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:147 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "不能使用内置命令 '%s' 作为术语" -#: builtin/bisect--helper.c:100 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "不能修改术语 '%s' 的含义" -#: builtin/bisect--helper.c:111 +#: builtin/bisect--helper.c:167 msgid "please use two different terms" msgstr "请使用两个不同的术语" -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "不能打开文件 BISECT_TERMS" - -#: builtin/bisect--helper.c:155 +#: builtin/bisect--helper.c:207 #, c-format msgid "We are not bisecting.\n" msgstr "我们没有在二分查找。\n" -#: builtin/bisect--helper.c:163 +#: builtin/bisect--helper.c:215 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' 不是一个有效的提交" -#: builtin/bisect--helper.c:172 +#: builtin/bisect--helper.c:224 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset '." msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。" -#: builtin/bisect--helper.c:216 +#: builtin/bisect--helper.c:268 #, c-format msgid "Bad bisect_write argument: %s" msgstr "坏的 bisect_write 参数：%s" -#: builtin/bisect--helper.c:221 +#: builtin/bisect--helper.c:273 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "无法获取版本 '%s' 的对象 ID" -#: builtin/bisect--helper.c:233 +#: builtin/bisect--helper.c:285 #, c-format msgid "couldn't open the file '%s'" msgstr "无法打开文件 '%s'" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:311 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中" -#: builtin/bisect--helper.c:286 +#: builtin/bisect--helper.c:338 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10269,7 +10373,7 @@ msgstr "" "您需要给我至少一个 %s 和一个 %s 版本。\n" "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" -#: builtin/bisect--helper.c:290 +#: builtin/bisect--helper.c:342 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10280,7 +10384,7 @@ msgstr "" "然后需要提供我至少一个 %s 和一个 %s 版本。\n" "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。" -#: builtin/bisect--helper.c:310 +#: builtin/bisect--helper.c:362 #, c-format msgid "bisecting only with a %s commit" msgstr "在只有一个 %s 提交的情况下二分查找" @@ -10290,22 +10394,22 @@ msgstr "在只有一个 %s 提交的情况下二分查找" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:318 +#: builtin/bisect--helper.c:370 msgid "Are you sure [Y/n]? " msgstr "您确认么[Y/n]？ " -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:431 msgid "no terms defined" msgstr "未定义术语" -#: builtin/bisect--helper.c:382 +#: builtin/bisect--helper.c:434 #, 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:392 +#: builtin/bisect--helper.c:444 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10314,266 +10418,308 @@ msgstr "" "命令 'git bisect terms' 的参数 %s 无效。\n" "支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。" -#: builtin/bisect--helper.c:460 builtin/bisect--helper.c:473 +#: builtin/bisect--helper.c:511 +msgid "revision walk setup failed\n" +msgstr "版本遍历设置失败\n" + +#: builtin/bisect--helper.c:533 +#, c-format +msgid "could not open '%s' for appending" +msgstr "无法打开 '%s' 进行追加" + +#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 msgid "'' is not a valid term" msgstr "'' 不是一个有效的术语" -#: builtin/bisect--helper.c:483 +#: builtin/bisect--helper.c:674 #, c-format msgid "unrecognized option: '%s'" msgstr "未识别的选项：'%s'" -#: builtin/bisect--helper.c:487 +#: builtin/bisect--helper.c:678 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' 看起来不是一个有效的版本" -#: builtin/bisect--helper.c:519 +#: builtin/bisect--helper.c:709 msgid "bad HEAD - I need a HEAD" msgstr "坏的 HEAD - 我需要一个 HEAD" -#: builtin/bisect--helper.c:534 +#: builtin/bisect--helper.c:724 #, c-format msgid "checking out '%s' failed. Try 'git bisect start '." msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。" -#: builtin/bisect--helper.c:555 +#: builtin/bisect--helper.c:745 msgid "won't bisect on cg-seek'ed tree" msgstr "不会在做了 cg-seek 的树上做二分查找" -#: builtin/bisect--helper.c:558 +#: builtin/bisect--helper.c:748 msgid "bad HEAD - strange symbolic ref" msgstr "坏的 HEAD - 奇怪的符号引用" -#: builtin/bisect--helper.c:582 +#: builtin/bisect--helper.c:775 #, c-format msgid "invalid ref: '%s'" msgstr "无效的引用：'%s'" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:827 +msgid "You need to start by \"git bisect start\"\n" +msgstr "您需要执行 \"git bisect start\" 来开始\n" + +# 译者：注意保持句尾空格 +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#. +#: builtin/bisect--helper.c:838 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "您想让我为您这样做么[Y/n]？ " + +#: builtin/bisect--helper.c:866 msgid "perform 'git bisect next'" msgstr "执行 'git bisect next'" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:868 msgid "write the terms to .git/BISECT_TERMS" msgstr "将术语写入 .git/BISECT_TERMS" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:870 msgid "cleanup the bisection state" msgstr "清除二分查找状态" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:872 msgid "check for expected revs" msgstr "检查预期的版本" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:874 msgid "reset the bisection state" msgstr "清除二分查找状态" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:876 msgid "write out the bisection state in BISECT_LOG" msgstr "将二分查找的状态写入 BISECT_LOG" -#: builtin/bisect--helper.c:650 +#: builtin/bisect--helper.c:878 msgid "check and set terms in a bisection state" msgstr "在一个二分查找状态中检查和设置术语" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:880 msgid "check whether bad or good terms exist" msgstr "检查坏的或好的术语是否存在" -#: builtin/bisect--helper.c:654 +#: builtin/bisect--helper.c:882 msgid "print out the bisect terms" msgstr "打印二分查找术语" -#: builtin/bisect--helper.c:656 +#: builtin/bisect--helper.c:884 msgid "start the bisect session" msgstr "启动二分查找过程" -#: builtin/bisect--helper.c:658 -msgid "update BISECT_HEAD instead of checking out the current commit" -msgstr "更新 BISECT_HEAD 而非检出当前提交" +#: builtin/bisect--helper.c:886 +msgid "find the next bisection commit" +msgstr "查询下一个二分查找提交" + +#: builtin/bisect--helper.c:888 +msgid "verify the next bisection state then checkout the next bisection commit" +msgstr "校验下一个二分查找状态然后检出下一个二分查找提交" -#: builtin/bisect--helper.c:660 +#: builtin/bisect--helper.c:890 +msgid "start the bisection if it has not yet been started" +msgstr "如果二分查找尚未启动，则启动之" + +#: builtin/bisect--helper.c:892 msgid "no log for BISECT_WRITE" msgstr "BISECT_WRITE 无日志" -#: builtin/bisect--helper.c:678 +#: builtin/bisect--helper.c:910 msgid "--write-terms requires two arguments" msgstr "--write-terms 需要两个参数" -#: builtin/bisect--helper.c:682 +#: builtin/bisect--helper.c:914 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state 不带参数" -#: builtin/bisect--helper.c:689 +#: builtin/bisect--helper.c:921 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset 无需参数或者需要一个提交" -#: builtin/bisect--helper.c:693 +#: builtin/bisect--helper.c:925 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write 需要 4 或 5 个参数" -#: builtin/bisect--helper.c:699 +#: builtin/bisect--helper.c:931 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms 需要 3 个参数" -#: builtin/bisect--helper.c:705 +#: builtin/bisect--helper.c:937 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check 需要 2 或 3 个参数" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:943 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms 需要 0 或 1 个参数" -#: builtin/blame.c:31 +#: builtin/bisect--helper.c:952 +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next 需要 0 个参数" + +#: builtin/bisect--helper.c:958 +msgid "--bisect-auto-next requires 0 arguments" +msgstr "--bisect-auto-next 需要 0 个参数" + +#: builtin/bisect--helper.c:964 +msgid "--bisect-autostart does not accept arguments" +msgstr "--bisect-autostart 不带参数" + +#: builtin/blame.c:32 msgid "git blame [] [] [] [--] " msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid " are documented in git-rev-list(1)" msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "期望一个颜色：%s" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "必须以一个颜色结尾" -#: builtin/blame.c:729 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'" -#: builtin/blame.c:747 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "设置 blame.coloring 中的无效取值" -#: builtin/blame.c:822 +#: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" msgstr "不能找到要忽略的版本 %s" -#: builtin/blame.c:844 +#: builtin/blame.c:867 msgid "Show blame entries as we find them, incrementally" msgstr "增量式地显示发现的 blame 条目" -#: builtin/blame.c:845 -msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "边界提交显示空的 SHA-1（默认：关闭）" +#: builtin/blame.c:868 +msgid "Do not show object names of boundary commits (Default: off)" +msgstr "不显示边界提交的对象名（默认：关闭）" -#: builtin/blame.c:846 +#: builtin/blame.c:869 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "不把根提交作为边界（默认：关闭）" -#: builtin/blame.c:847 +#: builtin/blame.c:870 msgid "Show work cost statistics" msgstr "显示命令消耗统计" -#: builtin/blame.c:848 +#: builtin/blame.c:871 msgid "Force progress reporting" msgstr "强制进度显示" -#: builtin/blame.c:849 +#: builtin/blame.c:872 msgid "Show output score for blame entries" msgstr "显示判断 blame 条目位移的得分诊断信息" -#: builtin/blame.c:850 +#: builtin/blame.c:873 msgid "Show original filename (Default: auto)" msgstr "显示原始文件名（默认：自动）" -#: builtin/blame.c:851 +#: builtin/blame.c:874 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行号（默认：关闭）" -#: builtin/blame.c:852 +#: builtin/blame.c:875 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适合机器读取的格式" -#: builtin/blame.c:853 +#: builtin/blame.c:876 msgid "Show porcelain format with per-line commit information" msgstr "为每一行显示机器适用的提交信息" -#: builtin/blame.c:854 +#: builtin/blame.c:877 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" -#: builtin/blame.c:855 +#: builtin/blame.c:878 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳（默认：关闭）" -#: builtin/blame.c:856 +#: builtin/blame.c:879 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的 SHA1 提交号（默认：关闭）" -#: builtin/blame.c:857 +#: builtin/blame.c:880 msgid "Suppress author name and timestamp (Default: off)" msgstr "隐藏作者名字和时间戳（默认：关闭）" -#: builtin/blame.c:858 +#: builtin/blame.c:881 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而不是名字（默认：关闭）" -#: builtin/blame.c:859 +#: builtin/blame.c:882 msgid "Ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:860 builtin/log.c:1721 +#: builtin/blame.c:883 builtin/log.c:1808 msgid "rev" msgstr "版本" -#: builtin/blame.c:860 +#: builtin/blame.c:883 msgid "Ignore when blaming" msgstr "在执行 blame 操作时忽略 <版本>" -#: builtin/blame.c:861 +#: builtin/blame.c:884 msgid "Ignore revisions from " msgstr "忽略来自 <文件> 中的版本" -#: builtin/blame.c:862 +#: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" msgstr "使用颜色间隔输出与前一行不同的重复元信息" -#: builtin/blame.c:863 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "依据时间着色" -#: builtin/blame.c:864 +#: builtin/blame.c:887 msgid "Spend extra cycles to find better match" msgstr "花费额外的循环来找到更好的匹配" -#: builtin/blame.c:865 +#: builtin/blame.c:888 msgid "Use revisions from instead of calling git-rev-list" msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" -#: builtin/blame.c:866 +#: builtin/blame.c:889 msgid "Use 's contents as the final image" msgstr "使用 <文件> 的内容作为最终的图片" -#: builtin/blame.c:867 builtin/blame.c:868 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "得分" -#: builtin/blame.c:867 +#: builtin/blame.c:890 msgid "Find line copies within and across files" msgstr "找到文件内及跨文件的行拷贝" -#: builtin/blame.c:868 +#: builtin/blame.c:891 msgid "Find line movements within and across files" msgstr "找到文件内及跨文件的行移动" -#: builtin/blame.c:869 +#: builtin/blame.c:892 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:869 +#: builtin/blame.c:892 msgid "Process only line range n,m, counting from 1" msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" -#: builtin/blame.c:921 +#: builtin/blame.c:944 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" @@ -10585,24 +10731,24 @@ msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:995 msgid "4 years, 11 months ago" msgstr "4 年 11 个月前" -#: builtin/blame.c:1087 +#: builtin/blame.c:1110 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "文件 %s 只有 %lu 行" msgstr[1] "文件 %s 只有 %lu 行" -#: builtin/blame.c:1133 +#: builtin/blame.c:1156 msgid "Blaming lines" msgstr "追踪代码行" #: builtin/branch.c:29 -msgid "git branch [] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" +msgid "git branch [] [-r | -a] [--merged] [--no-merged]" +msgstr "git branch [<选项>] [-r | -a] [--merged] [--no-merged]" #: builtin/branch.c:30 msgid "git branch [] [-l] [-f] []" @@ -10807,7 +10953,7 @@ msgstr "设置跟踪模式（参见 git-pull(1)）" msgid "do not use" msgstr "不要使用" -#: builtin/branch.c:626 builtin/rebase.c:520 +#: builtin/branch.c:626 builtin/rebase.c:526 msgid "upstream" msgstr "上游" @@ -11004,6 +11150,101 @@ msgid "" msgstr "" "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "git 版本：\n" + +#: builtin/bugreport.c:21 +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() 失败，错误为 '%s'（%d）\n" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "编译器信息：" + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "libc 信息：" + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory ] [-s|--suffix ]" +msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"感谢您填写 Git 错误报告！\n" +"请填写以下问卷，以帮助我们了解您的问题。\n" +"\n" +"在错误发生之前，您做了什么？（重现问题的步骤）\n" +"\n" +"您期望发生什么？（预期行为）\n" +"\n" +"实际发生了什么？（实际行为）\n" +"\n" +"您所期望的与实际发生的有什么不同？\n" +"\n" +"您想要补充的其它内容：\n" +"\n" +"请检查下面错误报告中余下的内容。\n" +"您可以删除任何您不想共享的内容。\n" + +#: builtin/bugreport.c:134 +msgid "specify a destination for the bugreport file" +msgstr "指定错误报告文件的目标位置" + +#: builtin/bugreport.c:136 +msgid "specify a strftime format suffix for the filename" +msgstr "指定文件的 strftime 格式后缀" + +#: builtin/bugreport.c:158 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "不能为 '%s' 创建先导目录" + +#: builtin/bugreport.c:165 +msgid "System Info" +msgstr "系统信息" + +#: builtin/bugreport.c:168 +msgid "Enabled Hooks" +msgstr "启用的钩子" + +#: builtin/bugreport.c:175 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "不能在 '%s' 创建新文件" + +#: builtin/bugreport.c:178 +#, c-format +msgid "unable to write to %s" +msgstr "无法写入 %s" + +#: builtin/bugreport.c:188 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "在 '%s' 创建了新报告。\n" + #: builtin/bundle.c:15 builtin/bundle.c:23 msgid "git bundle create [] " msgstr "git bundle create [<选项>] <文件> " @@ -11020,44 +11261,48 @@ msgstr "git bundle list-heads <文件> [<引用名>...]" msgid "git bundle unbundle [...]" msgstr "git bundle unbundle <文件> [<引用名>...]" -#: builtin/bundle.c:66 builtin/pack-objects.c:3448 +#: builtin/bundle.c:67 builtin/pack-objects.c:3480 msgid "do not show progress meter" msgstr "不显示进度表" -#: builtin/bundle.c:68 builtin/pack-objects.c:3450 +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 msgid "show progress meter" msgstr "显示进度表" -#: builtin/bundle.c:70 builtin/pack-objects.c:3452 +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/bundle.c:73 builtin/pack-objects.c:3455 +#: builtin/bundle.c:74 builtin/pack-objects.c:3487 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" -#: builtin/bundle.c:93 +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "指定归档包的格式版本" + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." -msgstr "需要一个仓库来创建包。" +msgstr "需要一个仓库来创建归档包。" -#: builtin/bundle.c:104 +#: builtin/bundle.c:107 msgid "do not show bundle details" -msgstr "不显示 bundle 细节" +msgstr "不显示归档包的细节" -#: builtin/bundle.c:119 +#: builtin/bundle.c:122 #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" -#: builtin/bundle.c:160 +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." -msgstr "需要一个仓库来解包。" +msgstr "需要一个仓库来解开归档包。" -#: builtin/bundle.c:168 builtin/remote.c:1686 +#: builtin/bundle.c:171 builtin/remote.c:1687 msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出；必须置于子命令之前" -#: builtin/bundle.c:190 builtin/remote.c:1717 +#: builtin/bundle.c:193 builtin/remote.c:1718 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" @@ -11074,7 +11319,9 @@ msgstr "" msgid "" "git cat-file (--batch[=] | --batch-check[=]) [--follow-" "symlinks] [--textconv | --filters]" -msgstr "git cat-file (--batch[=<格式>] | --batch-check[=<格式>]) [--follow-symlinks] [--textconv | --filters]" +msgstr "" +"git cat-file (--batch[=<格式>] | --batch-check[=<格式>]) [--follow-symlinks] " +"[--textconv | --filters]" #: builtin/cat-file.c:620 msgid "only one batch option may be specified" @@ -11108,7 +11355,7 @@ msgstr "对于数据对象，对其内容做文本转换" msgid "for blob objects, run filters on object's content" msgstr "对于数据对象，对其内容做过滤" -#: builtin/cat-file.c:648 git-submodule.sh:958 +#: builtin/cat-file.c:648 msgid "blob" msgstr "数据对象" @@ -11168,7 +11415,7 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537 +#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 #: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "不显示进度报告" @@ -11259,8 +11506,8 @@ msgid "write the content to temporary files" msgstr "将内容写入临时文件" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 #: builtin/worktree.c:754 msgid "string" msgstr "字符串" @@ -11304,83 +11551,83 @@ msgstr "路径 '%s' 没有他们的版本" msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必需的版本" -#: builtin/checkout.c:256 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必需的版本" -#: builtin/checkout.c:274 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：无法合并" -#: builtin/checkout.c:290 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:395 +#: builtin/checkout.c:396 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新创建了 %d 个合并冲突" msgstr[1] "重新创建了 %d 个合并冲突" -#: builtin/checkout.c:400 +#: builtin/checkout.c:401 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "从 %2$s 更新了 %1$d 个路径" msgstr[1] "从 %2$s 更新了 %1$d 个路径" -#: builtin/checkout.c:407 +#: builtin/checkout.c:408 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "从索引区更新了 %d 个路径" msgstr[1] "从索引区更新了 %d 个路径" -#: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436 -#: builtin/checkout.c:440 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路径时使用" -#: builtin/checkout.c:443 builtin/checkout.c:446 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同时使用" -#: builtin/checkout.c:450 +#: builtin/checkout.c:451 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" -#: builtin/checkout.c:454 +#: builtin/checkout.c:455 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' 或 '%s' 都没有指定" -#: builtin/checkout.c:458 +#: builtin/checkout.c:459 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 '%2$s' 时，必须使用 '%1$s'" -#: builtin/checkout.c:463 builtin/checkout.c:468 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' 或 '%s' 不能和 %s 一起使用" -#: builtin/checkout.c:527 builtin/checkout.c:534 +#: builtin/checkout.c:528 builtin/checkout.c:535 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:702 +#: builtin/checkout.c:703 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:756 +#: builtin/checkout.c:757 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11389,51 +11636,51 @@ msgstr "" "不能继续，下列文件有暂存的修改：\n" "%s" -#: builtin/checkout.c:859 +#: builtin/checkout.c:853 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能对 '%s' 执行 reflog 操作：%s\n" -#: builtin/checkout.c:901 +#: builtin/checkout.c:895 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:905 builtin/clone.c:720 +#: builtin/checkout.c:899 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:909 +#: builtin/checkout.c:903 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:912 +#: builtin/checkout.c:906 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:916 +#: builtin/checkout.c:910 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:918 builtin/checkout.c:1342 +#: builtin/checkout.c:912 builtin/checkout.c:1338 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:920 +#: builtin/checkout.c:914 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:971 +#: builtin/checkout.c:965 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#: builtin/checkout.c:977 +#: builtin/checkout.c:971 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11454,7 +11701,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:996 +#: builtin/checkout.c:990 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11481,19 +11728,19 @@ msgstr[1] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:1031 +#: builtin/checkout.c:1025 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1029 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:1075 builtin/checkout.c:1337 +#: builtin/checkout.c:1069 builtin/checkout.c:1333 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1146 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11502,7 +11749,7 @@ msgstr "" "'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n" "请使用 --（和可选的 --no-guess）来消除歧义" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1153 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" @@ -11521,51 +11768,51 @@ msgstr "" "如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n" "名称，可以在配置中设置 checkout.defaultRemote=origin。" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1163 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' 匹配多个（%d 个）远程跟踪分支" -#: builtin/checkout.c:1233 +#: builtin/checkout.c:1229 msgid "only one reference expected" msgstr "只期望一个引用" -#: builtin/checkout.c:1250 +#: builtin/checkout.c:1246 #, c-format msgid "only one reference expected, %d given." msgstr "应只有一个引用，却给出了 %d 个" -#: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510 +#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" -#: builtin/checkout.c:1309 builtin/checkout.c:1675 +#: builtin/checkout.c:1305 builtin/checkout.c:1671 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1352 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一个分支，得到标签 '%s'" -#: builtin/checkout.c:1358 +#: builtin/checkout.c:1354 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一个分支，得到远程分支 '%s'" -#: builtin/checkout.c:1359 builtin/checkout.c:1367 +#: builtin/checkout.c:1355 builtin/checkout.c:1363 #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一个分支，得到 '%s'" -#: builtin/checkout.c:1362 +#: builtin/checkout.c:1358 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一个分支，得到提交 '%s'" -#: builtin/checkout.c:1378 +#: builtin/checkout.c:1374 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11573,7 +11820,7 @@ msgstr "" "不能在合并时切换分支\n" "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1382 +#: builtin/checkout.c:1378 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11581,7 +11828,7 @@ msgstr "" "不能在一个 am 会话期间切换分支\n" "考虑使用 \"git am --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1386 +#: builtin/checkout.c:1382 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11589,7 +11836,7 @@ msgstr "" "不能在变基时切换分支\n" "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1386 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11597,7 +11844,7 @@ msgstr "" "不能在拣选时切换分支\n" "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1394 +#: builtin/checkout.c:1390 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11605,214 +11852,214 @@ msgstr "" "不能在还原时切换分支\n" "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1398 +#: builtin/checkout.c:1394 msgid "you are switching branch while bisecting" msgstr "您在执行二分查找时切换分支" -#: builtin/checkout.c:1405 +#: builtin/checkout.c:1401 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416 +#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426 -#: builtin/checkout.c:1431 builtin/checkout.c:1436 +#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 +#: builtin/checkout.c:1427 builtin/checkout.c:1432 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1433 +#: builtin/checkout.c:1429 #, c-format msgid "'%s' cannot take " msgstr "'%s' 不带 <起始点>" -#: builtin/checkout.c:1441 +#: builtin/checkout.c:1437 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1448 +#: builtin/checkout.c:1444 msgid "missing branch or commit argument" msgstr "缺少分支或提交参数" -#: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82 -#: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288 -#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561 -#: builtin/send-pack.c:173 +#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 +#: builtin/send-pack.c:192 msgid "force progress reporting" msgstr "强制显示进度报告" -#: builtin/checkout.c:1491 +#: builtin/checkout.c:1487 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方合并" -#: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322 +#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 msgid "style" msgstr "风格" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1489 msgid "conflict style (merge or diff3)" msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1505 builtin/worktree.c:558 +#: builtin/checkout.c:1501 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的提交分离" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1502 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1508 +#: builtin/checkout.c:1504 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1510 +#: builtin/checkout.c:1506 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1510 +#: builtin/checkout.c:1506 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1512 builtin/merge.c:292 +#: builtin/checkout.c:1508 builtin/merge.c:291 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1515 +#: builtin/checkout.c:1511 msgid "do not check if another worktree is holding the given ref" msgstr "不检查指定的引用是否被其他工作区所占用" -#: builtin/checkout.c:1528 +#: builtin/checkout.c:1524 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1531 +#: builtin/checkout.c:1527 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1535 +#: builtin/checkout.c:1531 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1590 +#: builtin/checkout.c:1586 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c、-%c 和 --orphan 是互斥的" -#: builtin/checkout.c:1594 +#: builtin/checkout.c:1590 msgid "-p and --overlay are mutually exclusive" msgstr "-p 和 --overlay 互斥" -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1627 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1636 +#: builtin/checkout.c:1632 #, c-format msgid "missing branch name; try -%c" msgstr "缺少分支名，尝试 -%c" -#: builtin/checkout.c:1668 +#: builtin/checkout.c:1664 #, c-format msgid "could not resolve %s" msgstr "无法解析 %s" -#: builtin/checkout.c:1684 +#: builtin/checkout.c:1680 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1691 +#: builtin/checkout.c:1687 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1691 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1704 +#: builtin/checkout.c:1700 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file 与 --detach 不兼容" -#: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503 +#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file 与 --patch 不兼容" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1716 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:1723 +#: builtin/checkout.c:1721 msgid "you must specify path(s) to restore" msgstr "您必须指定一个要恢复的路径" -#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800 -#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554 +#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 +#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 #: builtin/worktree.c:556 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1748 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1752 +#: builtin/checkout.c:1750 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1753 +#: builtin/checkout.c:1751 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1755 +#: builtin/checkout.c:1753 msgid "second guess 'git checkout ' (default)" msgstr "二次猜测 'git checkout <无此分支>'（默认）" -#: builtin/checkout.c:1756 +#: builtin/checkout.c:1754 msgid "use overlay mode (default)" msgstr "使用叠加模式（默认）" -#: builtin/checkout.c:1801 +#: builtin/checkout.c:1799 msgid "create and switch to a new branch" msgstr "创建并切换一个新分支" -#: builtin/checkout.c:1803 +#: builtin/checkout.c:1801 msgid "create/reset and switch to a branch" msgstr "创建/重置并切换一个分支" -#: builtin/checkout.c:1805 +#: builtin/checkout.c:1803 msgid "second guess 'git switch '" msgstr "二次猜测 'git switch <无此分支>'" -#: builtin/checkout.c:1807 +#: builtin/checkout.c:1805 msgid "throw away local modifications" msgstr "丢弃本地修改" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1839 msgid "which tree-ish to checkout from" msgstr "要检出哪一个树" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1841 msgid "restore the index" msgstr "恢复索引" -#: builtin/checkout.c:1845 +#: builtin/checkout.c:1843 msgid "restore the working tree (default)" msgstr "恢复工作区（默认）" -#: builtin/checkout.c:1847 +#: builtin/checkout.c:1845 msgid "ignore unmerged entries" msgstr "忽略未合并条目" -#: builtin/checkout.c:1848 +#: builtin/checkout.c:1846 msgid "use overlay mode" msgstr "使用叠加模式" @@ -11957,7 +12204,7 @@ msgid "remove whole directories" msgstr "删除整个目录" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184 +#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 #: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" @@ -12001,7 +12248,7 @@ msgstr "git clone [<选项>] [--] <仓库> [<路径>]" msgid "don't create a checkout" msgstr "不创建一个检出" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 msgid "create a bare repository" msgstr "创建一个纯仓库" @@ -12033,26 +12280,26 @@ msgstr "在克隆时初始化子模组" msgid "number of submodules cloned in parallel" msgstr "并发克隆的子模组的数量" -#: builtin/clone.c:111 builtin/init-db.c:551 +#: builtin/clone.c:111 builtin/init-db.c:550 msgid "template-directory" msgstr "模板目录" -#: builtin/clone.c:112 builtin/init-db.c:552 +#: builtin/clone.c:112 builtin/init-db.c:551 msgid "directory from which templates will be used" msgstr "模板目录将被使用" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "参考仓库" -#: builtin/clone.c:118 builtin/submodule--helper.c:1409 -#: builtin/submodule--helper.c:1914 +#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "仅在克隆时参考 --reference 指向的本地仓库" -#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 msgid "name" msgstr "名称" @@ -12068,7 +12315,7 @@ msgstr "检出 <分支> 而不是远程 HEAD" msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848 +#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 #: builtin/pull.c:208 msgid "depth" msgstr "深度" @@ -12077,7 +12324,7 @@ msgstr "深度" msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503 +#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 #: builtin/pull.c:211 msgid "time" msgstr "时间" @@ -12086,17 +12333,17 @@ msgstr "时间" msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" -#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304 +#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 msgid "revision" msgstr "版本" -#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215 +#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "深化浅克隆的历史，除了特定版本" -#: builtin/clone.c:132 builtin/submodule--helper.c:1419 -#: builtin/submodule--helper.c:1928 +#: builtin/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" @@ -12108,11 +12355,11 @@ msgstr "不要克隆任何标签，并且后续获取操作也不下载它们" msgid "any cloned submodules will be shallow" msgstr "子模组将以浅下载模式克隆" -#: builtin/clone.c:137 builtin/init-db.c:560 +#: builtin/clone.c:137 builtin/init-db.c:559 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c:138 builtin/init-db.c:561 +#: builtin/clone.c:138 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" @@ -12124,23 +12371,23 @@ msgstr "key=value" msgid "set config inside the new repository" msgstr "在新仓库中设置配置信息" -#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 -#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 msgid "server-specific" msgstr "server-specific" -#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 -#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 msgid "option to transmit" msgstr "传输选项" -#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234 -#: builtin/push.c:571 +#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:561 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 地址" -#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237 -#: builtin/push.c:573 +#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:563 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 地址" @@ -12239,100 +12486,105 @@ msgstr "无法执行 repack 来清理" msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" -#: builtin/clone.c:971 builtin/receive-pack.c:1982 +#: builtin/clone.c:970 builtin/receive-pack.c:2434 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:975 +#: builtin/clone.c:974 msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" -#: builtin/clone.c:988 +#: builtin/clone.c:987 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:991 +#: builtin/clone.c:990 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 选项不兼容。" -#: builtin/clone.c:1007 +#: builtin/clone.c:1006 #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' 不存在" -#: builtin/clone.c:1011 builtin/fetch.c:1794 +#: builtin/clone.c:1010 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" -#: builtin/clone.c:1021 +#: builtin/clone.c:1020 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:1033 +#: builtin/clone.c:1026 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "仓库路径 '%s' 已经存在，并且不是一个空目录。" + +#: builtin/clone.c:1040 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271 -#: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386 +#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 +#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:1053 +#: builtin/clone.c:1060 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能创建工作区目录 '%s'" -#: builtin/clone.c:1073 +#: builtin/clone.c:1080 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯仓库 '%s'...\n" -#: builtin/clone.c:1075 +#: builtin/clone.c:1082 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:1099 +#: builtin/clone.c:1106 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" -#: builtin/clone.c:1164 +#: builtin/clone.c:1170 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1166 +#: builtin/clone.c:1172 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1168 +#: builtin/clone.c:1174 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1170 +#: builtin/clone.c:1176 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1173 +#: builtin/clone.c:1179 msgid "source repository is shallow, ignoring --local" msgstr "源仓库是浅克隆，忽略 --local" -#: builtin/clone.c:1178 +#: builtin/clone.c:1184 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1262 builtin/clone.c:1270 +#: builtin/clone.c:1268 builtin/clone.c:1276 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:1273 +#: builtin/clone.c:1279 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" @@ -12368,103 +12620,107 @@ msgstr "两列之间的填充空间" msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" -#: builtin/commit-graph.c:13 builtin/commit-graph.c:21 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 msgid "" "git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" msgstr "" "git commit-graph verify [--object-dir <对象目录>] [--shallow] [--" "[no-]progress]" -#: builtin/commit-graph.c:14 builtin/commit-graph.c:26 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:27 msgid "" "git commit-graph write [--object-dir ] [--append] [--" "split[=]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]progress] " +"paths] [--[no-]max-new-filters ] [--[no-]progress] " msgstr "" "git commit-graph write [--object-dir <对象目录>] [--append] [--split[=<策略" ">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--" -"[no-]progress] <切分选项>" +"[no-]max-new-filters ] [--[no-]progress] <切分选项>" -#: builtin/commit-graph.c:62 +#: builtin/commit-graph.c:64 #, c-format msgid "could not find object directory matching %s" msgstr "无法找到和 %s 匹配的对象目录" -#: builtin/commit-graph.c:78 builtin/commit-graph.c:177 -#: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678 +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 msgid "dir" msgstr "目录" -#: builtin/commit-graph.c:79 builtin/commit-graph.c:178 -#: builtin/commit-graph.c:277 +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 msgid "The object directory to store the graph" msgstr "保存图形的对象目录" -#: builtin/commit-graph.c:81 +#: builtin/commit-graph.c:83 msgid "if the commit-graph is split, only verify the tip file" msgstr "如果提交图形被拆分，只验证头一个文件" -#: builtin/commit-graph.c:104 +#: builtin/commit-graph.c:106 #, c-format msgid "Could not open commit-graph '%s'" msgstr "无法打开提交图形 '%s'" -#: builtin/commit-graph.c:138 +#: builtin/commit-graph.c:142 #, c-format msgid "unrecognized --split argument, %s" msgstr "未能识别的 --split 参数，%s" -#: builtin/commit-graph.c:151 +#: builtin/commit-graph.c:155 #, c-format msgid "unexpected non-hex object ID: %s" msgstr "意外的非十六进制对象 ID：%s" -#: builtin/commit-graph.c:156 +#: builtin/commit-graph.c:160 #, c-format msgid "invalid object: %s" msgstr "无效对象：%s" -#: builtin/commit-graph.c:180 +#: builtin/commit-graph.c:213 msgid "start walk at all refs" msgstr "开始遍历所有引用" -#: builtin/commit-graph.c:182 +#: builtin/commit-graph.c:215 msgid "scan pack-indexes listed by stdin for commits" msgstr "从标准输入中的包索引文件列表中扫描提交" -#: builtin/commit-graph.c:184 +#: builtin/commit-graph.c:217 msgid "start walk at commits listed by stdin" msgstr "从标准输入中的提交开始扫描" -#: builtin/commit-graph.c:186 +#: builtin/commit-graph.c:219 msgid "include all commits already in the commit-graph file" msgstr "包含 commit-graph 文件中已有所有提交" -#: builtin/commit-graph.c:188 +#: builtin/commit-graph.c:221 msgid "enable computation for changed paths" msgstr "启用变更路径的计算" -#: builtin/commit-graph.c:191 +#: builtin/commit-graph.c:224 msgid "allow writing an incremental commit-graph file" msgstr "允许写一个增量提交图形文件" -#: builtin/commit-graph.c:195 +#: builtin/commit-graph.c:228 msgid "maximum number of commits in a non-base split commit-graph" msgstr "在非基本拆分提交图形中的最大提交数" -#: builtin/commit-graph.c:197 +#: builtin/commit-graph.c:230 msgid "maximum ratio between two levels of a split commit-graph" msgstr "一个拆分提交图形的两个级别之间的最大比率" -#: builtin/commit-graph.c:199 +#: builtin/commit-graph.c:232 msgid "only expire files older than a given date-time" msgstr "只让早于给定时间的文件过期" -#: builtin/commit-graph.c:215 +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "要计算的变更路径布隆过滤器的最大数" + +#: builtin/commit-graph.c:255 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" -#: builtin/commit-graph.c:245 +#: builtin/commit-graph.c:287 msgid "Collecting commits from input" msgstr "正从标准输入收集提交" @@ -12481,7 +12737,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "忽略重复的父提交 %s" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:547 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 #, c-format msgid "not a valid object name %s" msgstr "不是一个有效的对象名 %s" @@ -12509,13 +12765,13 @@ msgstr "父提交" msgid "id of a parent commit object" msgstr "父提交对象 ID" -#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 #: builtin/tag.c:413 msgid "message" msgstr "说明" -#: builtin/commit-tree.c:115 builtin/commit.c:1506 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "提交说明" @@ -12523,7 +12779,7 @@ msgstr "提交说明" msgid "read commit log message from file" msgstr "从文件中读取提交说明" -#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG 提交签名" @@ -12668,12 +12924,12 @@ msgid "" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:729 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:478 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" @@ -12699,35 +12955,33 @@ msgstr "不能读取 MERGE_MSG" msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:852 -#, c-format +#: builtin/commit.c:853 msgid "" "\n" "It looks like you may be committing a merge.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" "\n" -"似乎您正在做一个合并提交。如果不对，请删除文件\n" -"\t%s\n" +"似乎您正在做一个合并提交。如果不对，请运行\n" +"\tgit update-ref -d MERGE_HEAD\n" "然后重试。\n" -#: builtin/commit.c:857 -#, c-format +#: builtin/commit.c:858 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" "\n" -"似乎您正在做一个拣选提交。如果不对，请删除文件\n" -"\t%s\n" +"似乎您正在做一个拣选提交。如果不对，请运行\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "然后重试。\n" -#: builtin/commit.c:870 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12736,7 +12990,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:878 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12747,324 +13001,324 @@ msgstr "" "也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:895 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:903 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:910 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:928 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:999 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:1013 builtin/tag.c:276 +#: builtin/commit.c:1011 builtin/tag.c:276 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:1057 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配" -#: builtin/commit.c:1071 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "无效的忽略模式 '%s'" -#: builtin/commit.c:1089 builtin/commit.c:1333 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1129 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long 和 -z 选项不兼容" -#: builtin/commit.c:1173 +#: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1182 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1185 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1187 +#: builtin/commit.c:1185 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1189 +#: builtin/commit.c:1187 msgid "You are in the middle of a rebase -- cannot amend." msgstr "您正处于一个变基过程中 -- 无法修补提交。" -#: builtin/commit.c:1192 +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1202 +#: builtin/commit.c:1200 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1204 +#: builtin/commit.c:1202 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" -#: builtin/commit.c:1213 +#: builtin/commit.c:1211 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1231 +#: builtin/commit.c:1229 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1237 +#: builtin/commit.c:1235 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" -#: builtin/commit.c:1368 builtin/commit.c:1529 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1370 builtin/commit.c:1531 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1372 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "显示贮藏区信息" -#: builtin/commit.c:1374 builtin/commit.c:1533 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "计算完整的领先/落后值" -#: builtin/commit.c:1376 +#: builtin/commit.c:1374 msgid "version" msgstr "版本" -#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 #: builtin/worktree.c:722 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1379 builtin/commit.c:1537 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1382 builtin/commit.c:1540 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "条目以 NUL 字符结尾" -#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 #: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336 +#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 msgid "mode" msgstr "模式" -#: builtin/commit.c:1385 builtin/commit.c:1543 +#: builtin/commit.c:1383 builtin/commit.c:1541 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1389 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" "显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）" -#: builtin/commit.c:1391 parse-options.h:192 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "何时" -#: builtin/commit.c:1392 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1394 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1395 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "不检测重命名" -#: builtin/commit.c:1397 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "检测重命名，可以设置索引相似度" -#: builtin/commit.c:1417 +#: builtin/commit.c:1415 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支持已忽略和未跟踪文件参数的组合" -#: builtin/commit.c:1499 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1500 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1502 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415 +#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1504 +#: builtin/commit.c:1502 msgid "author" msgstr "作者" -#: builtin/commit.c:1504 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1505 builtin/gc.c:538 +#: builtin/commit.c:1503 builtin/gc.c:539 msgid "date" msgstr "日期" -#: builtin/commit.c:1505 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509 -#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "提交" -#: builtin/commit.c:1507 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1508 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" -#: builtin/commit.c:1509 +#: builtin/commit.c:1507 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" -#: builtin/commit.c:1510 +#: builtin/commit.c:1508 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" -#: builtin/commit.c:1511 +#: builtin/commit.c:1509 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293 +#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "添加 Signed-off-by: 签名" -#: builtin/commit.c:1513 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1514 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "强制编辑提交" -#: builtin/commit.c:1516 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1521 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1522 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1523 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1524 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1525 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1526 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1527 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "绕过 pre-commit 和 commit-msg 钩子" -#: builtin/commit.c:1528 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1541 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1542 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1549 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1551 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1624 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1631 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1652 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1659 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1664 +#: builtin/commit.c:1662 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1698 +#: builtin/commit.c:1696 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -13077,209 +13331,213 @@ msgstr "" msgid "git config []" msgstr "git config [<选项>]" -#: builtin/config.c:104 builtin/env--helper.c:23 +#: builtin/config.c:107 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "未能识别的 --type 参数，%s" -#: builtin/config.c:116 +#: builtin/config.c:119 msgid "only one type at a time" msgstr "一次只能一个类型" -#: builtin/config.c:125 +#: builtin/config.c:128 msgid "Config file location" msgstr "配置文件位置" -#: builtin/config.c:126 +#: builtin/config.c:129 msgid "use global config file" msgstr "使用全局配置文件" -#: builtin/config.c:127 +#: builtin/config.c:130 msgid "use system config file" msgstr "使用系统级配置文件" -#: builtin/config.c:128 +#: builtin/config.c:131 msgid "use repository config file" msgstr "使用仓库级配置文件" -#: builtin/config.c:129 +#: builtin/config.c:132 msgid "use per-worktree config file" msgstr "使用工作区级别的配置文件" -#: builtin/config.c:130 +#: builtin/config.c:133 msgid "use given config file" msgstr "使用指定的配置文件" -#: builtin/config.c:131 +#: builtin/config.c:134 msgid "blob-id" msgstr "数据对象 ID" -#: builtin/config.c:131 +#: builtin/config.c:134 msgid "read config from given blob object" msgstr "从给定的数据对象读取配置" -#: builtin/config.c:132 +#: builtin/config.c:135 msgid "Action" msgstr "操作" -#: builtin/config.c:133 +#: builtin/config.c:136 msgid "get value: name [value-regex]" msgstr "获取值：name [value-regex]" -#: builtin/config.c:134 +#: builtin/config.c:137 msgid "get all values: key [value-regex]" msgstr "获得所有的值：key [value-regex]" -#: builtin/config.c:135 +#: builtin/config.c:138 msgid "get values for regexp: name-regex [value-regex]" msgstr "根据正则表达式获得值：name-regex [value-regex]" -#: builtin/config.c:136 +#: builtin/config.c:139 msgid "get value specific for the URL: section[.var] URL" msgstr "获得 URL 取值：section[.var] URL" -#: builtin/config.c:137 +#: builtin/config.c:140 msgid "replace all matching variables: name value [value_regex]" msgstr "替换所有匹配的变量：name value [value_regex]" -#: builtin/config.c:138 +#: builtin/config.c:141 msgid "add a new variable: name value" msgstr "添加一个新的变量：name value" -#: builtin/config.c:139 +#: builtin/config.c:142 msgid "remove a variable: name [value-regex]" msgstr "删除一个变量：name [value-regex]" -#: builtin/config.c:140 +#: builtin/config.c:143 msgid "remove all matches: name [value-regex]" msgstr "删除所有匹配项：name [value-regex]" -#: builtin/config.c:141 +#: builtin/config.c:144 msgid "rename section: old-name new-name" msgstr "重命名小节：old-name new-name" -#: builtin/config.c:142 +#: builtin/config.c:145 msgid "remove a section: name" msgstr "删除一个小节：name" -#: builtin/config.c:143 +#: builtin/config.c:146 msgid "list all" msgstr "列出所有" -#: builtin/config.c:144 +#: builtin/config.c:147 msgid "open an editor" msgstr "打开一个编辑器" -#: builtin/config.c:145 +#: builtin/config.c:148 msgid "find the color configured: slot [default]" msgstr "获得配置的颜色：配置 [默认]" -#: builtin/config.c:146 +#: builtin/config.c:149 msgid "find the color setting: slot [stdout-is-tty]" msgstr "获得颜色设置：配置 [stdout-is-tty]" -#: builtin/config.c:147 +#: builtin/config.c:150 msgid "Type" msgstr "类型" -#: builtin/config.c:148 builtin/env--helper.c:38 +#: builtin/config.c:151 builtin/env--helper.c:43 msgid "value is given this type" msgstr "取值为该类型" -#: builtin/config.c:149 +#: builtin/config.c:152 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" -#: builtin/config.c:150 +#: builtin/config.c:153 msgid "value is decimal number" msgstr "值是十进制数" -#: builtin/config.c:151 +#: builtin/config.c:154 msgid "value is --bool or --int" -msgstr "值是 --bool or --int" +msgstr "值是 --bool 或 --int" -#: builtin/config.c:152 +#: builtin/config.c:155 +msgid "value is --bool or string" +msgstr "值是 --bool 或字符串" + +#: builtin/config.c:156 msgid "value is a path (file or directory name)" msgstr "值是一个路径（文件或目录名）" -#: builtin/config.c:153 +#: builtin/config.c:157 msgid "value is an expiry date" msgstr "值是一个到期日期" -#: builtin/config.c:154 +#: builtin/config.c:158 msgid "Other" msgstr "其它" -#: builtin/config.c:155 +#: builtin/config.c:159 msgid "terminate values with NUL byte" msgstr "终止值是 NUL 字节" -#: builtin/config.c:156 +#: builtin/config.c:160 msgid "show variable names only" msgstr "只显示变量名" -#: builtin/config.c:157 +#: builtin/config.c:161 msgid "respect include directives on lookup" msgstr "查询时参照 include 指令递归查找" -#: builtin/config.c:158 +#: builtin/config.c:162 msgid "show origin of config (file, standard input, blob, command line)" msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）" -#: builtin/config.c:159 +#: builtin/config.c:163 msgid "show scope of config (worktree, local, global, system, command)" msgstr "显示配置的作用域（工作区、本地、全局、系统、命令）" -#: builtin/config.c:160 builtin/env--helper.c:40 +#: builtin/config.c:164 builtin/env--helper.c:45 msgid "value" msgstr "取值" -#: builtin/config.c:160 +#: builtin/config.c:164 msgid "with --get, use default value when missing entry" msgstr "使用 --get 参数，当缺少设置时使用默认值" -#: builtin/config.c:174 +#: builtin/config.c:178 #, c-format msgid "wrong number of arguments, should be %d" msgstr "错误的参数个数，应该为 %d 个" -#: builtin/config.c:176 +#: builtin/config.c:180 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "错误的参数个数，应该为从 %d 个到 %d 个" -#: builtin/config.c:324 +#: builtin/config.c:334 #, c-format msgid "invalid key pattern: %s" msgstr "无效键名模式：%s" -#: builtin/config.c:360 +#: builtin/config.c:370 #, c-format msgid "failed to format default config value: %s" msgstr "格式化默认配置值失败：%s" -#: builtin/config.c:417 +#: builtin/config.c:434 #, c-format msgid "cannot parse color '%s'" msgstr "无法解析颜色 '%s'" -#: builtin/config.c:459 +#: builtin/config.c:476 msgid "unable to parse default color value" msgstr "无法解析默认颜色值" -#: builtin/config.c:512 builtin/config.c:768 +#: builtin/config.c:529 builtin/config.c:789 msgid "not in a git directory" msgstr "不在 git 仓库中" -#: builtin/config.c:515 +#: builtin/config.c:532 msgid "writing to stdin is not supported" msgstr "不支持写到标准输入" -#: builtin/config.c:518 +#: builtin/config.c:535 msgid "writing config blobs is not supported" msgstr "不支持写到配置数据对象" -#: builtin/config.c:603 +#: builtin/config.c:620 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13294,23 +13552,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:627 +#: builtin/config.c:644 msgid "only one config file at a time" msgstr "一次只能有一个配置文件" -#: builtin/config.c:632 +#: builtin/config.c:650 msgid "--local can only be used inside a git repository" -msgstr "--local 只能在一个仓库内使用" +msgstr "--local 只能在 git 仓库内使用" -#: builtin/config.c:635 +#: builtin/config.c:652 msgid "--blob can only be used inside a git repository" -msgstr "--blob 只能在一个仓库内使用" +msgstr "--blob 只能在 git 仓库内使用" + +#: builtin/config.c:654 +msgid "--worktree can only be used inside a git repository" +msgstr "--worktree 只能在 git 仓库内使用" -#: builtin/config.c:655 +#: builtin/config.c:676 msgid "$HOME not set" msgstr "$HOME 未设置" -#: builtin/config.c:679 +#: builtin/config.c:700 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -13319,51 +13581,51 @@ msgstr "" "不能和多个工作区一起使用 --worktree，除非启用 worktreeConfig 配置扩展。\n" "详情请阅读“git help worktree”的“CONFIGURATION FILE”小节" -#: builtin/config.c:714 +#: builtin/config.c:735 msgid "--get-color and variable type are incoherent" msgstr "--get-color 和变量类型不兼容" -#: builtin/config.c:719 +#: builtin/config.c:740 msgid "only one action at a time" msgstr "一次只能有一个动作" -#: builtin/config.c:732 +#: builtin/config.c:753 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only 仅适用于 --list 或 --get-regexp" -#: builtin/config.c:738 +#: builtin/config.c:759 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:744 +#: builtin/config.c:765 msgid "--default is only applicable to --get" msgstr "--default 仅适用于 --get" -#: builtin/config.c:757 +#: builtin/config.c:778 #, c-format msgid "unable to read config file '%s'" msgstr "无法读取配置文件 '%s'" -#: builtin/config.c:760 +#: builtin/config.c:781 msgid "error processing config file(s)" msgstr "处理配置文件出错" -#: builtin/config.c:770 +#: builtin/config.c:791 msgid "editing stdin is not supported" msgstr "不支持编辑标准输入" -#: builtin/config.c:772 +#: builtin/config.c:793 msgid "editing blobs is not supported" msgstr "不支持编辑数据对象" -#: builtin/config.c:786 +#: builtin/config.c:807 #, c-format msgid "cannot create configuration file %s" msgstr "不能创建配置文件 %s" -#: builtin/config.c:799 +#: builtin/config.c:820 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -13372,7 +13634,7 @@ msgstr "" "无法用一个值覆盖多个值\n" " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" -#: builtin/config.c:873 builtin/config.c:884 +#: builtin/config.c:894 builtin/config.c:905 #, c-format msgid "no such section: %s" msgstr "无此小节：%s" @@ -13385,6 +13647,31 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "以用户可读的格式显示大小" +#: builtin/credential-cache--daemon.c:226 +#, c-format +msgid "" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" +msgstr "" +"您的 socket 目录权限过于宽松，其他用户可能会读取您缓存的认证信息。考虑执" +"行：\n" +"\n" +"\tchmod 0700 %s" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "输出调试信息到标准错误" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "credential-cache--daemon 不可用，不支持 unix 套接字" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "credential-cache 不可用，不支持 unix 套接字" + #: builtin/describe.c:26 msgid "git describe [] [...]" msgstr "git describe [<选项>] [<提交号>...]" @@ -13554,36 +13841,36 @@ msgstr "--broken 与提交号不兼容" msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一个正规文件或符号链接" -#: builtin/diff.c:242 +#: builtin/diff.c:241 #, c-format msgid "invalid option: %s" msgstr "无效选项：%s" -#: builtin/diff.c:359 +#: builtin/diff.c:358 #, c-format msgid "%s...%s: no merge base" msgstr "%s...%s：无合并基线" -#: builtin/diff.c:469 +#: builtin/diff.c:468 msgid "Not a git repository" -msgstr "不是一个 git 仓库" +msgstr "不是 git 仓库" -#: builtin/diff.c:514 +#: builtin/diff.c:513 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c:525 +#: builtin/diff.c:524 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超过两个数据对象：'%s'" -#: builtin/diff.c:530 +#: builtin/diff.c:529 #, c-format msgid "unhandled object '%s' given." msgstr "无法处理的对象 '%s'。" -#: builtin/diff.c:564 +#: builtin/diff.c:563 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s：多条合并基线，使用 %s" @@ -13704,24 +13991,24 @@ msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" msgid "git env--helper --type=[bool|ulong] " msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>" -#: builtin/env--helper.c:37 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "类型" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "git_env_*(...) 的默认值" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 msgid "be quiet only use git_env_*() value as exit code" msgstr "安静模式，只使用 git_env_*() 的值作为退出码" -#: builtin/env--helper.c:62 +#: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值，不是 `%s`" -#: builtin/env--helper.c:77 +#: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" @@ -13784,7 +14071,7 @@ msgstr "使用 done 功能来终止流" msgid "Skip output of blob data" msgstr "跳过数据对象的输出" -#: builtin/fast-export.c:1223 builtin/log.c:1724 +#: builtin/fast-export.c:1223 builtin/log.c:1811 msgid "refspec" msgstr "引用规格" @@ -13824,7 +14111,36 @@ msgstr "--anonymize-map 而没有 --anonymize 没有意义" msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists" -#: builtin/fetch-pack.c:245 +#: builtin/fast-import.c:3086 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "子模组 '%s' 缺少 from 标记" + +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "子模组 '%s' 缺少 to 标记" + +#: builtin/fast-import.c:3223 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "预期 'mark' 命令，得到 %s" + +#: builtin/fast-import.c:3228 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "预期 'to' 命令，得到 %s" + +#: builtin/fast-import.c:3320 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "子模组重写选项的预期格式为 name:filename" + +#: builtin/fast-import.c:3374 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'" + +#: builtin/fetch-pack.c:241 #, c-format msgid "Lockfile created but not reported: %s" msgstr "Lockfile 已创建但未报告：%s" @@ -13845,182 +14161,190 @@ msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" msgid "git fetch --all []" msgstr "git fetch --all [<选项>]" -#: builtin/fetch.c:117 +#: builtin/fetch.c:119 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel 不能为负数" -#: builtin/fetch.c:140 builtin/pull.c:185 +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "从所有的远程抓取" -#: builtin/fetch.c:142 builtin/pull.c:245 +#: builtin/fetch.c:144 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "为 git pull/fetch 设置上游" -#: builtin/fetch.c:144 builtin/pull.c:188 +#: builtin/fetch.c:146 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" -#: builtin/fetch.c:146 builtin/pull.c:191 +#: builtin/fetch.c:148 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "上传包到远程的路径" -#: builtin/fetch.c:147 +#: builtin/fetch.c:149 msgid "force overwrite of local reference" msgstr "强制覆盖本地引用" -#: builtin/fetch.c:149 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "从多个远程抓取" -#: builtin/fetch.c:151 builtin/pull.c:195 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "抓取所有的标签和关联对象" -#: builtin/fetch.c:153 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何标签(--no-tags)" -#: builtin/fetch.c:155 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "子模组获取的并发数" -#: builtin/fetch.c:157 builtin/pull.c:198 +#: builtin/fetch.c:159 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已经不存在的分支的跟踪分支" -#: builtin/fetch.c:159 +#: builtin/fetch.c:161 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除远程不存在的本地标签，并且替换变更标签" # 译者：可选值，不能翻译 -#: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122 +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:161 +#: builtin/fetch.c:163 msgid "control recursive fetching of submodules" msgstr "控制子模组的递归抓取" -#: builtin/fetch.c:165 builtin/pull.c:206 +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "将获取到的引用写入 FETCH_HEAD 文件" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "保持下载包" -#: builtin/fetch.c:167 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "允许更新 HEAD 引用" -#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历史" -#: builtin/fetch.c:172 builtin/pull.c:212 +#: builtin/fetch.c:176 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "基于时间来深化浅克隆的历史" -#: builtin/fetch.c:178 builtin/pull.c:221 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "转换为一个完整的仓库" -#: builtin/fetch.c:181 +#: builtin/fetch.c:185 msgid "prepend this to submodule path output" msgstr "在子模组路径输出的前面加上此目录" -#: builtin/fetch.c:184 +#: builtin/fetch.c:188 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "递归获取子模组的缺省值（比配置文件优先级低）" -#: builtin/fetch.c:188 builtin/pull.c:224 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:189 builtin/pull.c:226 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:190 builtin/pull.c:227 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "指定获取操作的引用映射" -#: builtin/fetch.c:197 builtin/pull.c:240 +#: builtin/fetch.c:201 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "报告我们只拥有从该对象开始可达的对象" -#: builtin/fetch.c:200 -msgid "run 'gc --auto' after fetching" -msgstr "获取后执行 'gc --auto'" +#: builtin/fetch.c:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" +msgstr "获取后执行 'maintenance --auto'" -#: builtin/fetch.c:202 builtin/pull.c:243 +#: builtin/fetch.c:208 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "在所有更新分支上检查强制更新" -#: builtin/fetch.c:204 +#: builtin/fetch.c:210 msgid "write the commit-graph after fetching" msgstr "抓取后写提交图" -#: builtin/fetch.c:514 +#: builtin/fetch.c:212 +msgid "accept refspecs from stdin" +msgstr "从标准输入获取引用表达式" + +#: builtin/fetch.c:523 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:654 +#: builtin/fetch.c:677 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "配置变量 fetch.output 包含无效值 %s" -#: builtin/fetch.c:752 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c:756 +#: builtin/fetch.c:779 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c:770 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "当前分支下不能执行获取操作" -#: builtin/fetch.c:780 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "[标签更新]" -#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840 -#: builtin/fetch.c:852 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c:785 +#: builtin/fetch.c:808 msgid "would clobber existing tag" msgstr "会破坏现有的标签" -#: builtin/fetch.c:807 +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "[新标签]" -#: builtin/fetch.c:810 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:813 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:852 +#: builtin/fetch.c:875 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:857 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "非快进" -#: builtin/fetch.c:878 +#: builtin/fetch.c:901 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -14030,7 +14354,7 @@ msgstr "" "要重新启用，请使用 '--show-forced-updates' 选项或运行\n" "'git config fetch.showForcedUpdates true'。" -#: builtin/fetch.c:882 +#: builtin/fetch.c:905 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14041,22 +14365,22 @@ msgstr "" "花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n" "或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n" -#: builtin/fetch.c:914 +#: builtin/fetch.c:939 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必需的对象\n" -#: builtin/fetch.c:935 +#: builtin/fetch.c:960 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "拒绝 %s 因为浅克隆不允许被更新" -#: builtin/fetch.c:1020 builtin/fetch.c:1158 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:1031 +#: builtin/fetch.c:1064 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14066,57 +14390,57 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:1128 +#: builtin/fetch.c:1161 #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为悬空状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:1129 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为悬空状态）" -#: builtin/fetch.c:1161 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:1162 builtin/remote.c:1112 +#: builtin/fetch.c:1195 builtin/remote.c:1113 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:1185 +#: builtin/fetch.c:1218 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒绝获取到非纯仓库的当前分支 %s" -#: builtin/fetch.c:1204 +#: builtin/fetch.c:1237 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:1207 +#: builtin/fetch.c:1240 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:1415 +#: builtin/fetch.c:1448 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "检测到多分支，和 --set-upstream 不兼容" -#: builtin/fetch.c:1430 +#: builtin/fetch.c:1463 msgid "not setting upstream for a remote remote-tracking branch" msgstr "没有为一个远程跟踪分支设置上游" -#: builtin/fetch.c:1432 +#: builtin/fetch.c:1465 msgid "not setting upstream for a remote tag" msgstr "没有为一个远程标签设置上游" -#: builtin/fetch.c:1434 +#: builtin/fetch.c:1467 msgid "unknown branch type" msgstr "未知的分支类型" -#: builtin/fetch.c:1436 +#: builtin/fetch.c:1469 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -14124,70 +14448,74 @@ msgstr "" "未发现源分支。\n" "您需要使用 --set-upstream 选项指定一个分支。" -#: builtin/fetch.c:1562 builtin/fetch.c:1625 +#: builtin/fetch.c:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:1584 +#: builtin/fetch.c:1620 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "无法获取 '%s'（退出码：%d）\n" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1724 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:1724 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "您需要指定一个标签名称。" -#: builtin/fetch.c:1778 +#: builtin/fetch.c:1825 msgid "Negative depth in --deepen is not supported" msgstr "--deepen 不支持负数深度" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1827 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen 和 --depth 是互斥的" -#: builtin/fetch.c:1785 +#: builtin/fetch.c:1832 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1834 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库，参数 --unshallow 没有意义" -#: builtin/fetch.c:1800 +#: builtin/fetch.c:1851 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个仓库参数" -#: builtin/fetch.c:1802 +#: builtin/fetch.c:1853 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规格没有任何意义" -#: builtin/fetch.c:1811 +#: builtin/fetch.c:1862 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:1818 +#: builtin/fetch.c:1869 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规格没有意义" -#: builtin/fetch.c:1836 +#: builtin/fetch.c:1887 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库" +#: builtin/fetch.c:1891 +msgid "--stdin can only be used when fetching from one remote" +msgstr "--stdin 仅在从一个远程仓库获取的时候可用" + #: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" @@ -14222,8 +14550,8 @@ msgid "git for-each-ref [--points-at ]" msgstr "git for-each-ref [--points-at <对象>]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) []]" -msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]" +msgid "git for-each-ref [--merged []] [--no-merged []]" +msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains []] [--no-contains []]" @@ -14417,7 +14745,7 @@ msgstr "正在检查对象目录" msgid "Checking %s link" msgstr "正在检查 %s 链接" -#: builtin/fsck.c:696 builtin/index-pack.c:843 +#: builtin/fsck.c:696 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "无效的 %s" @@ -14502,7 +14830,7 @@ msgstr "显示进度" msgid "show verbose names for reachable objects" msgstr "显示可达对象的详细名称" -#: builtin/fsck.c:847 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "正在检查对象" @@ -14516,31 +14844,31 @@ msgstr "%s：对象缺失" msgid "invalid parameter: expected sha1, got '%s'" msgstr "无效的参数：期望 sha1，得到 '%s'" -#: builtin/gc.c:35 +#: builtin/gc.c:36 msgid "git gc []" msgstr "git gc [<选项>]" -#: builtin/gc.c:90 +#: builtin/gc.c:91 #, c-format msgid "Failed to fstat %s: %s" msgstr "对 %s 调用 fstat 失败：%s" -#: builtin/gc.c:126 +#: builtin/gc.c:127 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "无法解析 '%s' 值 '%s'" -#: builtin/gc.c:475 builtin/init-db.c:57 +#: builtin/gc.c:476 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: builtin/gc.c:491 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14554,63 +14882,116 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:539 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "清除未引用的对象" -#: builtin/gc.c:541 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" -#: builtin/gc.c:542 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "启用自动垃圾回收模式" -#: builtin/gc.c:545 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc 即使另外一个 gc 正在执行" -#: builtin/gc.c:548 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "除了最大的包之外，对所有其它包文件重新打包" -#: builtin/gc.c:565 +#: builtin/gc.c:566 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "解析 gc.logexpiry 的值 %s 失败" -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, c-format msgid "failed to parse prune expiry value %s" msgstr "解析清除期限值 %s 失败" -#: builtin/gc.c:596 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自动在后台执行仓库打包以求最佳性能。\n" -#: builtin/gc.c:598 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包仓库以求最佳性能。\n" -#: builtin/gc.c:599 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护参见 \"git help gc\"。\n" -#: builtin/gc.c:639 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid % (use --force if not)" msgstr "" "已经有一个 gc 正运行在机器 '%s' pid %（如果不是，使用 --force）" -#: builtin/gc.c:694 +#: builtin/gc.c:695 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" +#: builtin/gc.c:705 +msgid "git maintenance run [--auto] [--[no-]quiet] [--task=]" +msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<任务>]" + +#: builtin/gc.c:812 +msgid "failed to write commit-graph" +msgstr "无法写入提交图" + +#: builtin/gc.c:905 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "锁文件 '%s' 已存在，跳过维护" + +#: builtin/gc.c:932 +#, c-format +msgid "task '%s' failed" +msgstr "任务 '%s' 失败" + +#: builtin/gc.c:979 +#, c-format +msgid "'%s' is not a valid task" +msgstr "'%s' 不是一个有效的任务" + +#: builtin/gc.c:984 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "任务 '%s' 不能被多次选择" + +#: builtin/gc.c:999 +msgid "run tasks based on the state of the repository" +msgstr "基于仓库状态来运行任务" + +#: builtin/gc.c:1001 +msgid "do not report progress or other information over stderr" +msgstr "不通过标准错误报告进度或其它信息" + +#: builtin/gc.c:1002 +msgid "task" +msgstr "任务" + +#: builtin/gc.c:1003 +msgid "run a specific task" +msgstr "运行一个特定的任务" + +#: builtin/gc.c:1026 +msgid "git maintenance run []" +msgstr "git maintenance run [<选项>]" + +#: builtin/gc.c:1037 +#, c-format +msgid "invalid subcommand: %s" +msgstr "无效子命令：%s" + #: builtin/grep.c:30 msgid "git grep [] [-e] [...] [[--] ...]" msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" @@ -14629,8 +15010,8 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2904 +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" @@ -14645,243 +15026,243 @@ msgstr "无法读取树（%s）" msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c:724 +#: builtin/grep.c:725 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c:823 +#: builtin/grep.c:824 msgid "search in index instead of in the work tree" msgstr "在索引区搜索而不是在工作区" -#: builtin/grep.c:825 +#: builtin/grep.c:826 msgid "find in contents not managed by git" msgstr "在未被 git 管理的内容中查找" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/grep.c:827 +#: builtin/grep.c:828 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" -#: builtin/grep.c:829 +#: builtin/grep.c:830 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的文件" -#: builtin/grep.c:831 +#: builtin/grep.c:832 msgid "recursively search in each submodule" msgstr "在每一个子模组中递归搜索" -#: builtin/grep.c:834 +#: builtin/grep.c:835 msgid "show non-matching lines" msgstr "显示未匹配的行" -#: builtin/grep.c:836 +#: builtin/grep.c:837 msgid "case insensitive matching" msgstr "不区分大小写匹配" -#: builtin/grep.c:838 +#: builtin/grep.c:839 msgid "match patterns only at word boundaries" msgstr "只在单词边界匹配模式" -#: builtin/grep.c:840 +#: builtin/grep.c:841 msgid "process binary files as text" msgstr "把二进制文件当做文本处理" -#: builtin/grep.c:842 +#: builtin/grep.c:843 msgid "don't match patterns in binary files" msgstr "不在二进制文件中匹配模式" -#: builtin/grep.c:845 +#: builtin/grep.c:846 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处理二进制文件" -#: builtin/grep.c:847 +#: builtin/grep.c:848 msgid "search in subdirectories (default)" msgstr "在子目录中寻找（默认）" -#: builtin/grep.c:849 +#: builtin/grep.c:850 msgid "descend at most levels" msgstr "最多以指定的深度向下寻找" -#: builtin/grep.c:853 +#: builtin/grep.c:854 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX 正则表达式" -#: builtin/grep.c:856 +#: builtin/grep.c:857 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正则表达式（默认）" -#: builtin/grep.c:859 +#: builtin/grep.c:860 msgid "interpret patterns as fixed strings" msgstr "把模式解析为固定的字符串" -#: builtin/grep.c:862 +#: builtin/grep.c:863 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的正则表达式" -#: builtin/grep.c:865 +#: builtin/grep.c:866 msgid "show line numbers" msgstr "显示行号" -#: builtin/grep.c:866 +#: builtin/grep.c:867 msgid "show column number of first match" msgstr "显示第一个匹配的列号" -#: builtin/grep.c:867 +#: builtin/grep.c:868 msgid "don't show filenames" msgstr "不显示文件名" -#: builtin/grep.c:868 +#: builtin/grep.c:869 msgid "show filenames" msgstr "显示文件名" -#: builtin/grep.c:870 +#: builtin/grep.c:871 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/grep.c:872 +#: builtin/grep.c:873 msgid "show only filenames instead of matching lines" msgstr "只显示文件名而不显示匹配的行" -#: builtin/grep.c:874 +#: builtin/grep.c:875 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同义" -#: builtin/grep.c:877 +#: builtin/grep.c:878 msgid "show only the names of files without match" msgstr "只显示未匹配的文件名" -#: builtin/grep.c:879 +#: builtin/grep.c:880 msgid "print NUL after filenames" msgstr "在文件名后输出 NUL 字符" -#: builtin/grep.c:882 +#: builtin/grep.c:883 msgid "show only matching parts of a line" msgstr "只显示行中的匹配的部分" -#: builtin/grep.c:884 +#: builtin/grep.c:885 msgid "show the number of matches instead of matching lines" msgstr "显示总匹配行数，而不显示匹配的行" -#: builtin/grep.c:885 +#: builtin/grep.c:886 msgid "highlight matches" msgstr "高亮显示匹配项" -#: builtin/grep.c:887 +#: builtin/grep.c:888 msgid "print empty line between matches from different files" msgstr "在不同文件的匹配项之间打印空行" -#: builtin/grep.c:889 +#: builtin/grep.c:890 msgid "show filename only once above matches from same file" msgstr "只在同一文件的匹配项的上面显示一次文件名" -#: builtin/grep.c:892 +#: builtin/grep.c:893 msgid "show context lines before and after matches" msgstr "显示匹配项前后的 行上下文" -#: builtin/grep.c:895 +#: builtin/grep.c:896 msgid "show context lines before matches" msgstr "显示匹配项前 行上下文" -#: builtin/grep.c:897 +#: builtin/grep.c:898 msgid "show context lines after matches" msgstr "显示匹配项后 行上下文" -#: builtin/grep.c:899 +#: builtin/grep.c:900 msgid "use worker threads" msgstr "使用 个工作线程" -#: builtin/grep.c:900 +#: builtin/grep.c:901 msgid "shortcut for -C NUM" msgstr "快捷键 -C 数字" -#: builtin/grep.c:903 +#: builtin/grep.c:904 msgid "show a line with the function name before matches" msgstr "在匹配的前面显示一行函数名" -#: builtin/grep.c:905 +#: builtin/grep.c:906 msgid "show the surrounding function" msgstr "显示所在函数的前后内容" -#: builtin/grep.c:908 +#: builtin/grep.c:909 msgid "read patterns from file" msgstr "从文件读取模式" -#: builtin/grep.c:910 +#: builtin/grep.c:911 msgid "match " msgstr "匹配 <模式>" -#: builtin/grep.c:912 +#: builtin/grep.c:913 msgid "combine patterns specified with -e" msgstr "组合用 -e 参数设定的模式" -#: builtin/grep.c:924 +#: builtin/grep.c:925 msgid "indicate hit with exit status without output" msgstr "不输出，而用退出码标识命中状态" -#: builtin/grep.c:926 +#: builtin/grep.c:927 msgid "show only matches from files that match all patterns" msgstr "只显示匹配所有模式的文件中的匹配" -#: builtin/grep.c:928 +#: builtin/grep.c:929 msgid "show parse tree for grep expression" msgstr "显示 grep 表达式的解析树" -#: builtin/grep.c:932 +#: builtin/grep.c:933 msgid "pager" msgstr "分页" -#: builtin/grep.c:932 +#: builtin/grep.c:933 msgid "show matching files in the pager" msgstr "分页显示匹配的文件" -#: builtin/grep.c:936 +#: builtin/grep.c:937 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c:1003 +#: builtin/grep.c:1004 msgid "no pattern given" msgstr "未提供匹配模式" -#: builtin/grep.c:1039 +#: builtin/grep.c:1040 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同时使用" -#: builtin/grep.c:1047 +#: builtin/grep.c:1048 #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" -#: builtin/grep.c:1077 +#: builtin/grep.c:1078 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked 不支持和 --recurse-submodules 共用" -#: builtin/grep.c:1081 +#: builtin/grep.c:1082 msgid "invalid option combination, ignoring --threads" msgstr "无效的选项组合，忽略 --threads" -#: builtin/grep.c:1084 builtin/pack-objects.c:3623 +#: builtin/grep.c:1085 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "没有线程支持，忽略 --threads" -#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901 +#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" -#: builtin/grep.c:1121 +#: builtin/grep.c:1122 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:1147 +#: builtin/grep.c:1148 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached 或 --untracked 不能与 --no-index 同时使用" -#: builtin/grep.c:1153 +#: builtin/grep.c:1154 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard 不能用于已跟踪内容" -#: builtin/grep.c:1161 +#: builtin/grep.c:1162 msgid "both --cached and trees are given" msgstr "同时给出了 --cached 和树对象" @@ -15017,7 +15398,7 @@ msgstr "没有 info 查看器处理此请求" msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的别名" -#: builtin/help.c:534 git.c:367 +#: builtin/help.c:534 git.c:369 #, c-format msgid "bad alias.%s string: %s" msgstr "坏的 alias.%s 字符串：%s" @@ -15031,392 +15412,392 @@ msgstr "用法：%s%s" msgid "'git help config' for more information" msgstr "'git help config' 获取更多信息" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型不匹配" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "未能获取预期的对象 %s" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "对象 %s：应为类型 %s，却是 %s" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "无法填充 %d 字节" msgstr[1] "无法填充 %d 字节" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "过早的文件结束符（EOF）" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "输入上的读错误" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" -#: builtin/index-pack.c:288 builtin/pack-objects.c:618 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "包超过了最大允许值" -#: builtin/index-pack.c:306 builtin/repack.c:250 +#: builtin/index-pack.c:342 builtin/repack.c:254 #, c-format msgid "unable to create '%s'" msgstr "不能创建 '%s'" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "无法打开包文件 '%s'" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "包签名不匹配" -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:364 #, c-format msgid "pack version % unsupported" msgstr "不支持包版本 %" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %: %s" msgstr "包中有错误的对象位于偏移量 %：%s" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "无法读取包文件" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, % byte missing" msgid_plural "premature end of pack file, % bytes missing" msgstr[0] "包文件过早结束，缺少 % 字节" msgstr[1] "包文件过早结束，缺少 % 字节" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:612 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" -#: 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 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:738 builtin/pack-objects.c:170 -#: builtin/pack-objects.c:230 builtin/pack-objects.c:325 +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "不能读 %s" -#: builtin/index-pack.c:802 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "不能读取现存对象信息 %s" -#: builtin/index-pack.c:810 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "无效的数据对象 %s" -#: builtin/index-pack.c:827 builtin/index-pack.c:846 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "对打包对象 fsck 检查出错" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:870 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" -#: builtin/index-pack.c:920 builtin/index-pack.c:951 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "应用 delta 失败" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "不能对包文件调用 fstat" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2665 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程：%s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1288 #, 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:1267 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1304 #, 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:1295 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1405 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包文件名 '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "无法写入 %s 文件 '%s'" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "无法关闭已写入的 %s 文件 '%s'" -#: builtin/index-pack.c:1462 +#: builtin/index-pack.c:1501 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1484 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1528 builtin/pack-objects.c:2912 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%" msgstr "坏的 pack.indexversion=%" -#: builtin/index-pack.c:1592 +#: builtin/index-pack.c:1631 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1633 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1642 +#: builtin/index-pack.c:1681 #, 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:1649 +#: builtin/index-pack.c:1688 #, 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:1728 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:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621 +#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 #, c-format msgid "unknown hash algorithm '%s'" msgstr "未知的哈希算法 '%s'" -#: builtin/index-pack.c:1782 +#: builtin/index-pack.c:1821 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1784 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" -msgstr "--stdin 需要一个 git 仓库" +msgstr "--stdin 需要 git 仓库" -#: builtin/index-pack.c:1786 +#: builtin/index-pack.c:1825 msgid "--object-format cannot be used with --stdin" msgstr "--object-format 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1792 +#: builtin/index-pack.c:1831 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包文件名参数" -#: builtin/index-pack.c:1840 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "在打包对象中 fsck 检查出错" -#: builtin/init-db.c:63 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "不能对模版 '%s' 调用 stat" -#: builtin/init-db.c:68 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "不能打开目录 '%s'" -#: builtin/init-db.c:80 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "不能读取链接 '%s'" -#: builtin/init-db.c:82 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "不能自 '%s' 到 '%s' 创建符号链接" -#: builtin/init-db.c:88 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" -#: builtin/init-db.c:92 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "忽略模版 %s" -#: builtin/init-db.c:123 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "没有在 %s 中找到模版" -#: builtin/init-db.c:138 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "没有从 '%s' 复制模版：%s" -#: builtin/init-db.c:276 +#: builtin/init-db.c:274 #, c-format msgid "invalid initial branch name: '%s'" msgstr "无效的初始分支名：'%s'" -#: builtin/init-db.c:368 +#: builtin/init-db.c:366 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" -#: builtin/init-db.c:371 +#: builtin/init-db.c:369 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" -#: builtin/init-db.c:386 +#: builtin/init-db.c:385 msgid "attempt to reinitialize repository with different hash" msgstr "尝试用不同的哈希算法重新初始化仓库" -#: builtin/init-db.c:410 builtin/init-db.c:413 +#: builtin/init-db.c:409 builtin/init-db.c:412 #, c-format msgid "%s already exists" msgstr "%s 已经存在" -#: builtin/init-db.c:444 +#: builtin/init-db.c:443 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init：已忽略 --initial-branch=%s" -#: builtin/init-db.c:475 +#: builtin/init-db.c:474 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:476 +#: builtin/init-db.c:475 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:480 +#: builtin/init-db.c:479 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "已初始化空的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:481 +#: builtin/init-db.c:480 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "已初始化空的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:530 +#: builtin/init-db.c:529 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] []" @@ -15424,48 +15805,56 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " "[<目录>]" -#: builtin/init-db.c:556 +#: builtin/init-db.c:555 msgid "permissions" msgstr "权限" -#: builtin/init-db.c:557 +#: builtin/init-db.c:556 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 仓库是多个用户之间共享的" -#: builtin/init-db.c:563 +#: builtin/init-db.c:562 msgid "override the name of the initial branch" msgstr "覆盖初始分支名称" -#: builtin/init-db.c:564 +#: builtin/init-db.c:563 builtin/verify-pack.c:74 msgid "hash" msgstr "hash" -#: builtin/init-db.c:565 builtin/show-index.c:22 +#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "指定要使用的哈希算法" -#: builtin/init-db.c:598 builtin/init-db.c:603 +#: builtin/init-db.c:571 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "--separate-git-dir 和 --bare 是互斥的" + +#: builtin/init-db.c:600 builtin/init-db.c:605 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:607 +#: builtin/init-db.c:609 builtin/init-db.c:664 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:634 +#: builtin/init-db.c:636 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）" -#: builtin/init-db.c:662 +#: builtin/init-db.c:688 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" +#: builtin/init-db.c:693 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--separate-git-dir 不能用于纯仓库" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -15530,126 +15919,126 @@ msgstr "--trailer 和 --only-input 同时使用没有意义" msgid "no input file given for in-place editing" msgstr "没有给出要原位编辑的文件" -#: builtin/log.c:57 +#: builtin/log.c:56 msgid "git log [] [] [[--] ...]" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" -#: builtin/log.c:58 +#: builtin/log.c:57 msgid "git show [] ..." msgstr "git show [<选项>] <对象>..." -#: builtin/log.c:111 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "无效的 --decorate 选项：%s" -#: builtin/log.c:178 +#: builtin/log.c:177 msgid "show source" msgstr "显示源" -#: builtin/log.c:179 +#: builtin/log.c:178 msgid "Use mail map file" msgstr "使用邮件映射文件" -#: builtin/log.c:182 +#: builtin/log.c:181 msgid "only decorate refs that match " msgstr "只修饰与 <模式> 匹配的引用" -#: builtin/log.c:184 +#: builtin/log.c:183 msgid "do not decorate refs that match " msgstr "不修饰和 <模式> 匹配的引用" -#: builtin/log.c:185 +#: builtin/log.c:184 msgid "decorate options" msgstr "修饰选项" -#: builtin/log.c:188 +#: builtin/log.c:187 msgid "Process line range n,m in file, counting from 1" msgstr "处理文件中第 n 到 m 之间的行，从 1 开始" -#: builtin/log.c:298 +#: builtin/log.c:297 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:556 +#: builtin/log.c:555 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 损坏的文件" -#: builtin/log.c:571 builtin/log.c:666 +#: builtin/log.c:570 builtin/log.c:665 #, c-format msgid "could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:691 +#: builtin/log.c:690 #, c-format msgid "unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:835 +#: builtin/log.c:839 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s：从描述生成附函的模式无效" -#: builtin/log.c:842 +#: builtin/log.c:846 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:957 +#: builtin/log.c:965 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:973 +#: builtin/log.c:981 #, c-format msgid "cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:990 +#: builtin/log.c:998 msgid "need exactly one range" msgstr "只需要一个范围" -#: builtin/log.c:1000 +#: builtin/log.c:1008 msgid "not a range" msgstr "不是一个范围" -#: builtin/log.c:1164 +#: builtin/log.c:1172 msgid "cover letter needs email format" msgstr "附函需要邮件地址格式" -#: builtin/log.c:1170 +#: builtin/log.c:1178 msgid "failed to create cover-letter file" msgstr "无法创建附函文件" -#: builtin/log.c:1249 +#: builtin/log.c:1259 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1276 +#: builtin/log.c:1286 msgid "git format-patch [] [ | ]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" -#: builtin/log.c:1334 +#: builtin/log.c:1344 msgid "two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231 +#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1455 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1506 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "无法将 '%s' 解析为一个有效引用" -#: builtin/log.c:1460 +#: builtin/log.c:1515 msgid "could not find exact merge base" msgstr "不能找到准确的合并基线" -#: builtin/log.c:1464 +#: builtin/log.c:1525 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -15659,275 +16048,280 @@ msgstr "" "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" "参数 --base=<基线提交> 手动指定一个基线提交" -#: builtin/log.c:1484 +#: builtin/log.c:1548 msgid "failed to find exact merge base" msgstr "无法找到准确的合并基线" -#: builtin/log.c:1495 +#: builtin/log.c:1565 msgid "base commit should be the ancestor of revision list" msgstr "基线提交应该是版本列表的祖先" -#: builtin/log.c:1499 +#: builtin/log.c:1575 msgid "base commit shouldn't be in revision list" msgstr "基线提交不应该出现在版本列表中" -#: builtin/log.c:1552 +#: builtin/log.c:1633 msgid "cannot get patch id" msgstr "无法得到补丁 id" -#: builtin/log.c:1604 -msgid "failed to infer range-diff ranges" -msgstr "无法推断 range-diff 范围" +#: builtin/log.c:1690 +msgid "failed to infer range-diff origin of current series" +msgstr "无法推断当前系列的 range-diff 起始" + +#: builtin/log.c:1692 +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "使用 '%s' 作为当前系列的 range-diff 源" -#: builtin/log.c:1650 +#: builtin/log.c:1736 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" -#: builtin/log.c:1653 +#: builtin/log.c:1739 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" -#: builtin/log.c:1657 +#: builtin/log.c:1743 msgid "print patches to standard out" msgstr "打印补丁到标准输出" -#: builtin/log.c:1659 +#: builtin/log.c:1745 msgid "generate a cover letter" msgstr "生成一封附函" -#: builtin/log.c:1661 +#: builtin/log.c:1747 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c:1662 +#: builtin/log.c:1748 msgid "sfx" msgstr "后缀" -#: builtin/log.c:1663 +#: builtin/log.c:1749 msgid "use instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c:1665 +#: builtin/log.c:1751 msgid "start numbering patches at instead of 1" msgstr "补丁以 开始编号，而不是1" -#: builtin/log.c:1667 +#: builtin/log.c:1753 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" -#: builtin/log.c:1669 +#: builtin/log.c:1755 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1672 +#: builtin/log.c:1758 msgid "cover-from-description-mode" msgstr "从分支描述获取附函的模式" -#: builtin/log.c:1673 +#: builtin/log.c:1759 msgid "generate parts of a cover letter based on a branch's description" msgstr "基于一个分支描述生成部分附函" -#: builtin/log.c:1675 +#: builtin/log.c:1761 msgid "Use [] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c:1678 +#: builtin/log.c:1764 msgid "store resulting files in " msgstr "把结果文件存储在 <目录>" -#: builtin/log.c:1681 +#: builtin/log.c:1767 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" -#: builtin/log.c:1684 +#: builtin/log.c:1770 msgid "don't output binary diffs" msgstr "不输出二进制差异" -#: builtin/log.c:1686 +#: builtin/log.c:1772 msgid "output all-zero hash in From header" msgstr "在 From 头信息中输出全为零的哈希值" -#: builtin/log.c:1688 +#: builtin/log.c:1774 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c:1690 +#: builtin/log.c:1776 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" -#: builtin/log.c:1692 +#: builtin/log.c:1778 msgid "Messaging" msgstr "邮件发送" -#: builtin/log.c:1693 +#: builtin/log.c:1779 msgid "header" msgstr "header" -#: builtin/log.c:1694 +#: builtin/log.c:1780 msgid "add email header" msgstr "添加邮件头" -#: builtin/log.c:1695 builtin/log.c:1696 +#: builtin/log.c:1781 builtin/log.c:1782 msgid "email" msgstr "邮件地址" -#: builtin/log.c:1695 +#: builtin/log.c:1781 msgid "add To: header" msgstr "添加收件人" -#: builtin/log.c:1696 +#: builtin/log.c:1782 msgid "add Cc: header" msgstr "添加抄送" -#: builtin/log.c:1697 +#: builtin/log.c:1783 msgid "ident" msgstr "标识" -#: builtin/log.c:1698 +#: builtin/log.c:1784 msgid "set From address to (or committer ident if absent)" msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）" -#: builtin/log.c:1700 +#: builtin/log.c:1786 msgid "message-id" msgstr "邮件标识" -#: builtin/log.c:1701 +#: builtin/log.c:1787 msgid "make first mail a reply to " msgstr "使第一封邮件作为对 <邮件标识> 的回复" -#: builtin/log.c:1702 builtin/log.c:1705 +#: builtin/log.c:1788 builtin/log.c:1791 msgid "boundary" msgstr "边界" -#: builtin/log.c:1703 +#: builtin/log.c:1789 msgid "attach the patch" msgstr "附件方式添加补丁" -#: builtin/log.c:1706 +#: builtin/log.c:1792 msgid "inline the patch" msgstr "内联显示补丁" -#: builtin/log.c:1710 +#: builtin/log.c:1796 msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索，风格：浅，深" -#: builtin/log.c:1712 +#: builtin/log.c:1798 msgid "signature" msgstr "签名" -#: builtin/log.c:1713 +#: builtin/log.c:1799 msgid "add a signature" msgstr "添加一个签名" -#: builtin/log.c:1714 +#: builtin/log.c:1800 msgid "base-commit" msgstr "基线提交" -#: builtin/log.c:1715 +#: builtin/log.c:1801 msgid "add prerequisite tree info to the patch series" msgstr "为补丁列表添加前置树信息" -#: builtin/log.c:1717 +#: builtin/log.c:1804 msgid "add a signature from a file" msgstr "从文件添加一个签名" -#: builtin/log.c:1718 +#: builtin/log.c:1805 msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" -#: builtin/log.c:1720 +#: builtin/log.c:1807 msgid "show progress while generating patches" msgstr "在生成补丁时显示进度" -#: builtin/log.c:1722 +#: builtin/log.c:1809 msgid "show changes against in cover letter or single patch" msgstr "在附函或单个补丁中显示和 的差异" -#: builtin/log.c:1725 +#: builtin/log.c:1812 msgid "show changes against in cover letter or single patch" msgstr "在附函或单个补丁中显示和 的差异" -#: builtin/log.c:1727 +#: builtin/log.c:1814 msgid "percentage by which creation is weighted" msgstr "创建权重的百分比" -#: builtin/log.c:1812 +#: builtin/log.c:1896 #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" -#: builtin/log.c:1827 +#: builtin/log.c:1911 msgid "-n and -k are mutually exclusive" msgstr "-n 和 -k 互斥" -#: builtin/log.c:1829 +#: builtin/log.c:1913 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc 和 -k 互斥" -#: builtin/log.c:1837 +#: builtin/log.c:1921 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1839 +#: builtin/log.c:1923 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1841 +#: builtin/log.c:1925 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1874 +#: builtin/log.c:1958 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1978 +#: builtin/log.c:2062 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:1982 +#: builtin/log.c:2066 msgid "Interdiff:" msgstr "版本间差异：" -#: builtin/log.c:1983 +#: builtin/log.c:2067 #, c-format msgid "Interdiff against v%d:" msgstr "对 v%d 的版本差异：" -#: builtin/log.c:1989 +#: builtin/log.c:2073 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor 需要 --range-diff" -#: builtin/log.c:1993 +#: builtin/log.c:2077 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:2001 +#: builtin/log.c:2085 msgid "Range-diff:" msgstr "范围差异：" -#: builtin/log.c:2002 +#: builtin/log.c:2086 #, c-format msgid "Range-diff against v%d:" msgstr "对 v%d 的范围差异：" -#: builtin/log.c:2013 +#: builtin/log.c:2097 #, c-format msgid "unable to read signature file '%s'" msgstr "无法读取签名文件 '%s'" -#: builtin/log.c:2049 +#: builtin/log.c:2133 msgid "Generating patches" msgstr "生成补丁" -#: builtin/log.c:2093 +#: builtin/log.c:2177 msgid "failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:2152 +#: builtin/log.c:2236 msgid "git cherry [-v] [ [ []]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:2206 +#: builtin/log.c:2290 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" @@ -15999,7 +16393,7 @@ msgstr "显示 resolve-undo 信息" #: builtin/ls-files.c:559 msgid "skip files matching pattern" -msgstr "匹配排除文件的模式" +msgstr "跳过和模式匹配的文件" #: builtin/ls-files.c:562 msgid "exclude patterns are read from " @@ -16051,7 +16445,7 @@ msgstr "" msgid "do not print remote URL" msgstr "不打印远程 URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 msgid "exec" msgstr "exec" @@ -16247,179 +16641,179 @@ msgstr "git merge --abort" msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:121 +#: builtin/merge.c:120 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" -#: builtin/merge.c:144 +#: builtin/merge.c:143 #, c-format msgid "option `%s' requires a value" msgstr "选项 `%s' 需要一个值" -#: builtin/merge.c:190 +#: builtin/merge.c:189 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合并策略 '%s'。\n" -#: builtin/merge.c:191 +#: builtin/merge.c:190 #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" -#: builtin/merge.c:196 +#: builtin/merge.c:195 #, c-format msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" -#: builtin/merge.c:247 builtin/pull.c:133 +#: builtin/merge.c:246 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "在合并的最后不显示差异统计" -#: builtin/merge.c:250 builtin/pull.c:136 +#: builtin/merge.c:249 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "在合并的最后显示差异统计" -#: builtin/merge.c:251 builtin/pull.c:139 +#: builtin/merge.c:250 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "（和 --stat 同义）" -#: builtin/merge.c:253 builtin/pull.c:142 +#: builtin/merge.c:252 builtin/pull.c:142 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加（最多 条）精简提交记录" -#: builtin/merge.c:256 builtin/pull.c:148 +#: builtin/merge.c:255 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" -#: builtin/merge.c:258 builtin/pull.c:151 +#: builtin/merge.c:257 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功，执行一次提交（默认）" -#: builtin/merge.c:260 builtin/pull.c:154 +#: builtin/merge.c:259 builtin/pull.c:154 msgid "edit message before committing" msgstr "在提交前编辑提交说明" -#: builtin/merge.c:262 +#: builtin/merge.c:261 msgid "allow fast-forward (default)" msgstr "允许快进（默认）" -#: builtin/merge.c:264 builtin/pull.c:161 +#: builtin/merge.c:263 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "如果不能快进就放弃合并" -#: builtin/merge.c:268 builtin/pull.c:164 +#: builtin/merge.c:267 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114 +#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 msgid "strategy" msgstr "策略" -#: builtin/merge.c:270 builtin/pull.c:169 +#: builtin/merge.c:269 builtin/pull.c:169 msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c:271 builtin/pull.c:172 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:272 builtin/pull.c:173 +#: builtin/merge.c:271 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" -#: builtin/merge.c:274 +#: builtin/merge.c:273 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明（针对非快进式合并）" -#: builtin/merge.c:281 +#: builtin/merge.c:280 msgid "abort the current in-progress merge" msgstr "放弃当前正在进行的合并" # -#: builtin/merge.c:283 +#: builtin/merge.c:282 msgid "--abort but leave index and working tree alone" msgstr "--abort，但是保留索引和工作区" -#: builtin/merge.c:285 +#: builtin/merge.c:284 msgid "continue the current in-progress merge" msgstr "继续当前正在进行的合并" -#: builtin/merge.c:287 builtin/pull.c:180 +#: builtin/merge.c:286 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "允许合并不相关的历史" -#: builtin/merge.c:294 +#: builtin/merge.c:293 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "绕过 pre-merge-commit 和 commit-msg 钩子" -#: builtin/merge.c:311 +#: builtin/merge.c:310 msgid "could not run stash." msgstr "不能运行贮藏。" -#: builtin/merge.c:316 +#: builtin/merge.c:315 msgid "stash failed" msgstr "贮藏失败" -#: builtin/merge.c:321 +#: builtin/merge.c:320 #, c-format msgid "not a valid object: %s" msgstr "不是一个有效对象：%s" -#: builtin/merge.c:343 builtin/merge.c:360 +#: builtin/merge.c:342 builtin/merge.c:359 msgid "read-tree failed" msgstr "读取树失败" # 译者：注意保持前导空格 -#: builtin/merge.c:390 +#: builtin/merge.c:389 msgid " (nothing to squash)" msgstr " （无可压缩）" -#: builtin/merge.c:401 +#: builtin/merge.c:400 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩提交 -- 未更新 HEAD\n" -#: builtin/merge.c:451 +#: builtin/merge.c:450 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" -#: builtin/merge.c:502 +#: builtin/merge.c:501 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c:589 +#: builtin/merge.c:588 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c:716 +#: builtin/merge.c:713 msgid "Not handling anything other than two heads merge." msgstr "未处理两个头合并之外的任何操作。" -#: builtin/merge.c:730 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:745 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:797 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:806 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:812 +#: builtin/merge.c:808 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" @@ -16429,83 +16823,83 @@ msgstr "" "合并到主题分支。\n" "\n" -#: builtin/merge.c:817 +#: builtin/merge.c:813 msgid "An empty message aborts the commit.\n" msgstr "空的提交说明会终止提交。\n" -#: builtin/merge.c:820 +#: builtin/merge.c:816 #, 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:873 +#: builtin/merge.c:869 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:888 +#: builtin/merge.c:884 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:949 +#: builtin/merge.c:945 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:988 +#: builtin/merge.c:984 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:990 +#: builtin/merge.c:986 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程仓库。" -#: builtin/merge.c:992 +#: builtin/merge.c:988 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:997 +#: builtin/merge.c:993 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1054 +#: builtin/merge.c:1050 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" -#: builtin/merge.c:1157 +#: builtin/merge.c:1153 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合并：%s" -#: builtin/merge.c:1191 +#: builtin/merge.c:1187 msgid "not something we can merge" msgstr "不能合并" -#: builtin/merge.c:1295 +#: builtin/merge.c:1291 msgid "--abort expects no arguments" msgstr "--abort 不带参数" -#: builtin/merge.c:1299 +#: builtin/merge.c:1295 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1317 +#: builtin/merge.c:1313 msgid "--quit expects no arguments" msgstr "--quit 不带参数" -#: builtin/merge.c:1330 +#: builtin/merge.c:1326 msgid "--continue expects no arguments" msgstr "--continue 不带参数" -#: builtin/merge.c:1334 +#: builtin/merge.c:1330 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "没有进行中的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1350 +#: builtin/merge.c:1346 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16513,7 +16907,7 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1357 +#: builtin/merge.c:1353 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16521,96 +16915,96 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1360 +#: builtin/merge.c:1356 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1374 +#: builtin/merge.c:1370 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 和 --no-ff 组合使用。" -#: builtin/merge.c:1376 +#: builtin/merge.c:1372 msgid "You cannot combine --squash with --commit." msgstr "您不能将 --squash 和 --commit 组合使用。" -#: builtin/merge.c:1392 +#: builtin/merge.c:1388 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1409 +#: builtin/merge.c:1405 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1411 +#: builtin/merge.c:1407 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1416 +#: builtin/merge.c:1412 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1418 +#: builtin/merge.c:1414 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1499 +#: builtin/merge.c:1495 msgid "refusing to merge unrelated histories" msgstr "拒绝合并无关的历史" -#: builtin/merge.c:1508 +#: builtin/merge.c:1504 msgid "Already up to date." msgstr "已经是最新的。" -#: builtin/merge.c:1518 +#: builtin/merge.c:1514 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1560 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1571 +#: builtin/merge.c:1567 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1596 +#: builtin/merge.c:1592 msgid "Already up to date. Yeeah!" msgstr "已经是最新的。耶！" -#: builtin/merge.c:1602 +#: builtin/merge.c:1598 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1630 builtin/merge.c:1695 +#: builtin/merge.c:1626 builtin/merge.c:1691 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1634 +#: builtin/merge.c:1630 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1686 +#: builtin/merge.c:1682 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1688 +#: builtin/merge.c:1684 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1697 +#: builtin/merge.c:1693 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1711 +#: builtin/merge.c:1707 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" @@ -16688,68 +17082,72 @@ msgstr "强制移动/重命令，即使目标存在" msgid "skip move/rename errors" msgstr "跳过移动/重命名错误" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "目标 '%s' 不是一个目录" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "检查 '%s' 到 '%s' 的重命名\n" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "坏的源" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "不能将目录移动到自身" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "不能将目录移动到文件" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "源目录为空" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "不在版本控制之下" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "冲突" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "目标已存在" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "不能覆盖" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "同一目标具有多个源" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "目标目录不存在" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，源=%s，目标=%s" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520 +#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" @@ -16767,8 +17165,8 @@ msgid "git name-rev [] --stdin" msgstr "git name-rev [<选项>] --stdin" #: builtin/name-rev.c:524 -msgid "print only names (no SHA-1)" -msgstr "只打印名称（无 SHA-1）" +msgid "print only ref-based names (no object names)" +msgstr "只打印基于引用的名称（非对象名）" #: builtin/name-rev.c:525 msgid "only use tags to name the commits" @@ -17197,129 +17595,131 @@ msgstr "注解引用" msgid "use notes from " msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:1034 builtin/stash.c:1608 +#: builtin/notes.c:1034 builtin/stash.c:1605 #, c-format msgid "unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [...] [< | < ]" msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [...] [< | < ]" msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:442 +#: builtin/pack-objects.c:443 #, c-format msgid "bad packed object CRC for %s" msgstr "%s 错的包对象 CRC" -#: builtin/pack-objects.c:453 +#: builtin/pack-objects.c:454 #, c-format msgid "corrupt packed object for %s" msgstr "%s 损坏的包对象" -#: builtin/pack-objects.c:584 +#: builtin/pack-objects.c:585 #, c-format msgid "recursive delta detected for object %s" msgstr "发现对象 %s 递归 delta" -#: builtin/pack-objects.c:795 +#: builtin/pack-objects.c:796 #, c-format msgid "ordered %u objects, expected %" msgstr "排序了 %u 个对象，预期 % 个" -#: builtin/pack-objects.c:1003 +#: builtin/pack-objects.c:1004 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个" -#: builtin/pack-objects.c:1016 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "写入对象中" -#: builtin/pack-objects.c:1077 builtin/update-index.c:90 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "对 %s 调用 stat 失败" -#: builtin/pack-objects.c:1130 +#: builtin/pack-objects.c:1131 #, c-format msgid "wrote % objects while expecting %" msgstr "写入 % 个对象而预期 % 个" -#: builtin/pack-objects.c:1347 +#: builtin/pack-objects.c:1348 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" -#: builtin/pack-objects.c:1774 +#: builtin/pack-objects.c:1796 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 压缩中 delta 基准偏移越界" -#: builtin/pack-objects.c:1783 +#: builtin/pack-objects.c:1805 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基准偏移越界" -#: builtin/pack-objects.c:2054 +#: builtin/pack-objects.c:2086 msgid "Counting objects" msgstr "对象计数中" -#: builtin/pack-objects.c:2199 +#: builtin/pack-objects.c:2231 #, c-format msgid "unable to parse object header of %s" msgstr "无法解析对象 %s 头信息" -#: builtin/pack-objects.c:2269 builtin/pack-objects.c:2285 -#: builtin/pack-objects.c:2295 +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 #, c-format msgid "object %s cannot be read" msgstr "对象 %s 无法读取" -#: builtin/pack-objects.c:2272 builtin/pack-objects.c:2299 +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 #, c-format msgid "object %s inconsistent object length (% vs %)" msgstr "对象 %s 不一致的对象长度（% vs %）" -#: builtin/pack-objects.c:2309 +#: builtin/pack-objects.c:2341 msgid "suboptimal pack - out of memory" msgstr "次优（suboptimal）打包 - 内存不足" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2656 #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 个线程进行压缩" -#: builtin/pack-objects.c:2763 +#: builtin/pack-objects.c:2795 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "无法为标签 %s 压缩对象" -#: builtin/pack-objects.c:2851 +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "压缩对象中" -#: builtin/pack-objects.c:2857 +#: builtin/pack-objects.c:2889 msgid "inconsistency with delta count" msgstr "不一致的差异计数" -#: builtin/pack-objects.c:2929 +#: builtin/pack-objects.c:2961 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form ' ' (got '%s')" -msgstr "uploadpack.blobpackfileuri 的取值必须是 ' ' 格式（得到 '%s'）" +msgstr "" +"uploadpack.blobpackfileuri 的取值必须是 ' ' 格" +"式（得到 '%s'）" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:2964 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置（得到 '%s'）" -#: builtin/pack-objects.c:2961 +#: builtin/pack-objects.c:2993 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -17328,7 +17728,7 @@ msgstr "" "预期边界对象（edge object）ID，却得到垃圾数据：\n" " %s" -#: builtin/pack-objects.c:2967 +#: builtin/pack-objects.c:2999 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -17337,234 +17737,234 @@ msgstr "" "预期对象 ID，却得到垃圾数据：\n" " %s" -#: builtin/pack-objects.c:3065 +#: builtin/pack-objects.c:3097 msgid "invalid value for --missing" msgstr "选项 --missing 的值无效" -#: builtin/pack-objects.c:3124 builtin/pack-objects.c:3232 +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 msgid "cannot open pack index" msgstr "无法打开包文件索引" -#: builtin/pack-objects.c:3155 +#: builtin/pack-objects.c:3187 #, c-format msgid "loose object at %s could not be examined" msgstr "无法检查 %s 处的松散对象" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3272 msgid "unable to force loose object" msgstr "无法强制松散对象" -#: builtin/pack-objects.c:3333 +#: builtin/pack-objects.c:3365 #, c-format msgid "not a rev '%s'" msgstr "不是一个版本 '%s'" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3368 #, c-format msgid "bad revision '%s'" msgstr "坏的版本 '%s'" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3393 msgid "unable to add recent objects" msgstr "无法添加最近的对象" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3446 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:3418 +#: builtin/pack-objects.c:3450 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:3456 +#: builtin/pack-objects.c:3488 msgid "[,]" msgstr "<版本>[,<偏移>]" -#: builtin/pack-objects.c:3457 +#: builtin/pack-objects.c:3489 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:3460 +#: builtin/pack-objects.c:3492 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:3462 +#: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从备用对象存储里借用对象" -#: builtin/pack-objects.c:3464 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:3466 +#: builtin/pack-objects.c:3498 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:3468 +#: builtin/pack-objects.c:3500 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:3470 +#: builtin/pack-objects.c:3502 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:3472 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:3474 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:3476 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:3478 +#: builtin/pack-objects.c:3510 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:3480 +#: builtin/pack-objects.c:3512 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:3482 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" msgstr "从标准输入读取版本号参数" -#: builtin/pack-objects.c:3484 +#: builtin/pack-objects.c:3516 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:3487 +#: builtin/pack-objects.c:3519 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3522 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:3493 +#: builtin/pack-objects.c:3525 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" -#: builtin/pack-objects.c:3496 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3530 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包对象的标签对象" -#: builtin/pack-objects.c:3500 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:3502 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "打包松散的不可达对象" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3536 msgid "unpack unreachable objects newer than