diff options
| author | Fangyi Zhou <me@fangyi.io> | 2022-01-11 19:42:06 +0300 |
|---|---|---|
| committer | Fangyi Zhou <me@fangyi.io> | 2022-01-13 16:15:04 +0300 |
| commit | 65387fd5eb2aff6e789692fc53ef8cc0c8e50733 (patch) | |
| tree | 844a912bcbf329d495690f39ce35848333010a42 | |
| parent | 14a38adf53033553da085549be989f02ca9d4ee4 (diff) | |
l10n: zh_CN: v2.35.0 round 1
- Translate new messages
- Translate the word 'cone' instead of leaving it verbatim
(in the context of sparse checkout)
- Make translations of 'failed to' consistent
Signed-off-by: Fangyi Zhou <me@fangyi.io>
Reviewed-by: Teng Long <dyroneteng@gmail.com>
Reviewed-by: 依云 <lilydjwg@gmail.com>
Reviewed-by: Jiang Xin <worldhello.net@gmail.com>
| -rw-r--r-- | po/zh_CN.po | 6870 |
1 files changed, 3167 insertions, 3703 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 60ffa45f7a..418639d669 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -44,6 +44,7 @@ # commit message | 提交说明 # commit object | 提交对象 # commit-ish (also committish) | 提交号 +# cone | 锥形（稀疏检出模型）；锥（稀疏检出） # conflict | 冲突 # core Git | 核心 Git 工具 # cover letter | 附函 @@ -53,6 +54,7 @@ # directory | 目录 # dirty | 脏（的工作区） # dumb HTTP protocol | 哑 HTTP 协议 +# enlistment | 登记（在 scalar 中使用） # evil merge | 坏合并（合并引入了父提交没有的修改） # fast-forward | 快进 # fetch | 获取 @@ -136,14 +138,14 @@ # upstream | 上游 # upstream branch | 上游分支 # working tree | 工作区 -# Fangyi Zhou <me@fangyi.io>, 2021. +# Fangyi Zhou <me@fangyi.io>, 2021-2022. # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-11-10 08:55+0800\n" -"PO-Revision-Date: 2021-11-10 12:16+0000\n" +"POT-Creation-Date: 2022-01-11 09:38+0800\n" +"PO-Revision-Date: 2022-01-11 18:18+0000\n" "Last-Translator: Fangyi Zhou <me@fangyi.io>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -158,8 +160,8 @@ msgstr "" msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512 -#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509 +#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233 #: builtin/rebase.c:1642 msgid "could not read index" msgstr "不能读取索引" @@ -188,7 +190,7 @@ msgstr "更新" msgid "could not stage '%s'" msgstr "不能暂存 '%s'" -#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713 msgid "could not write index" msgstr "不能写入索引" @@ -204,8 +206,8 @@ msgstr[1] "更新了 %d 个路径\n" msgid "note: %s is untracked now.\n" msgstr "说明：%s 现已成为未跟踪的。\n" -#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298 -#: builtin/reset.c:151 +#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306 +#: builtin/reset.c:167 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" @@ -246,21 +248,21 @@ msgstr[1] "增加了 %d 个路径\n" msgid "ignoring unmerged: %s" msgstr "忽略未合入的：%s" -#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371 #, c-format msgid "Only binary files changed.\n" msgstr "只有二进制文件被修改。\n" -#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373 #, c-format msgid "No changes.\n" msgstr "没有修改。\n" -#: add-interactive.c:947 git-add--interactive.perl:1379 +#: add-interactive.c:947 git-add--interactive.perl:1381 msgid "Patch update" msgstr "补丁更新" -#: add-interactive.c:986 git-add--interactive.perl:1792 +#: add-interactive.c:986 git-add--interactive.perl:1794 msgid "Review diff" msgstr "检视 diff" @@ -328,11 +330,11 @@ msgstr "选择一个编号条目" msgid "(empty) select nothing" msgstr "（空）不选择任何内容" -#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896 +#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893 +#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895 msgid "What now" msgstr "请选择" @@ -344,13 +346,13 @@ msgstr "缓存" msgid "unstaged" msgstr "未缓存" -#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311 -#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128 -#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857 -#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503 -#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573 -#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811 +#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367 +#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128 +#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504 +#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812 #: git-add--interactive.perl:213 msgid "path" msgstr "路径" @@ -359,27 +361,27 @@ msgstr "路径" msgid "could not refresh index" msgstr "不能刷新索引" -#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803 +#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805 #, c-format msgid "Bye.\n" msgstr "再见。\n" -#: add-patch.c:34 git-add--interactive.perl:1431 +#: 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:1432 +#: 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:1433 +#: 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:1434 +#: 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,?]? " @@ -404,22 +406,22 @@ msgstr "" "a - 暂存该块和本文件中后面的全部块\n" "d - 不暂存该块和本文件中后面的全部块\n" -#: add-patch.c:56 git-add--interactive.perl:1437 +#: 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:1438 +#: 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:1439 +#: 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:1440 +#: 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,?]? " @@ -444,22 +446,22 @@ msgstr "" "a - 贮藏该块和本文件中后面的全部块\n" "d - 不贮藏该块和本文件中后面的全部块\n" -#: add-patch.c:80 git-add--interactive.perl:1443 +#: 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:1444 +#: 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:1445 +#: 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:1446 +#: 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,?]? " @@ -484,22 +486,22 @@ msgstr "" "a - 取消暂存该块和本文件中后面的全部块\n" "d - 不要取消暂存该块和本文件中后面的全部块\n" -#: add-patch.c:103 git-add--interactive.perl:1449 +#: 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:1450 +#: 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:1451 +#: 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:1452 +#: 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,?]? " @@ -524,26 +526,26 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c:126 git-add--interactive.perl:1455 -#: git-add--interactive.perl:1473 +#: 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:1456 -#: git-add--interactive.perl:1474 +#: 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:1457 -#: git-add--interactive.perl:1475 +#: 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:1458 -#: git-add--interactive.perl:1476 +#: 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,?]? " @@ -568,22 +570,22 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 +#: 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:1462 +#: 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:1463 +#: 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:1464 +#: 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,?]? " @@ -602,22 +604,22 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 +#: 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:1468 +#: 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:1469 +#: 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:1470 +#: 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,?]? " @@ -671,7 +673,7 @@ msgstr "不能解析彩色差异信息" #: add-patch.c:453 #, c-format msgid "failed to run '%s'" -msgstr "运行 '%s' 失败" +msgstr "无法运行 '%s'" #: add-patch.c:612 msgid "mismatched output from interactive.diffFilter" @@ -752,7 +754,7 @@ 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:1247 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1244 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " @@ -761,11 +763,11 @@ msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！ msgid "The selected hunks do not apply to the index!" msgstr "选中的块不能应用到索引！" -#: add-patch.c:1291 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1348 msgid "Apply them to the worktree anyway? " msgstr "无论如何都要应用到工作区么？" -#: add-patch.c:1298 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1351 msgid "Nothing was applied.\n" msgstr "未应用。\n" @@ -803,11 +805,11 @@ msgstr "没有下一个块" msgid "No other hunks to goto" msgstr "没有其它可供跳转的块" -#: add-patch.c:1549 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk (<ret> to see more)? " msgstr "跳转到哪个块（<回车> 查看更多）？ " -#: add-patch.c:1550 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1610 msgid "go to which hunk? " msgstr "跳转到哪个块？" @@ -827,7 +829,7 @@ msgstr[1] "对不起，只有 %d 个可用块。" msgid "No other hunks to search" msgstr "没有其它可供查找的块" -#: add-patch.c:1581 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1663 msgid "search for regex? " msgstr "使用正则表达式搜索？" @@ -908,7 +910,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" -#: advice.c:209 builtin/merge.c:1379 +#: advice.c:209 builtin/merge.c:1382 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" @@ -1001,21 +1003,33 @@ msgstr "未能识别的空白字符选项 '%s'" msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" -#: apply.c:136 -msgid "--reject and --3way cannot be used together." -msgstr "--reject 和 --3way 不能同时使用。" - -#: apply.c:139 -msgid "--3way outside a repository" -msgstr "--3way 在一个仓库之外" - -#: apply.c:150 -msgid "--index outside a repository" -msgstr "--index 在一个仓库之外" - -#: apply.c:153 -msgid "--cached outside a repository" -msgstr "--cached 在一个仓库之外" +#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307 +#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870 +#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885 +#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541 +#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470 +#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757 +#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361 +#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155 +#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033 +#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560 +#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778 +#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073 +#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 +#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199 +#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426 +#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710 +#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316 +#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572 +#: builtin/worktree.c:702 +#, c-format +msgid "options '%s' and '%s' cannot be used together" +msgstr "选项 '%s' 和 '%s' 不能同时使用" + +#: apply.c:139 apply.c:150 apply.c:153 +#, c-format +msgid "'%s' outside a repository" +msgstr "'%s' 在仓库之外" #: apply.c:800 #, c-format @@ -1218,8 +1232,8 @@ msgstr "打补丁失败：%s:%ld" msgid "cannot checkout %s" msgstr "不能检出 %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214 -#: setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214 +#: setup.c:309 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" @@ -1229,380 +1243,378 @@ msgstr "无法读取 %s" msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" -#: apply.c:3442 apply.c:3709 +#: apply.c:3442 apply.c:3711 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: apply.c:3549 apply.c:3724 +#: apply.c:3549 apply.c:3726 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: apply.c:3558 apply.c:3732 apply.c:3976 +#: apply.c:3558 apply.c:3734 apply.c:3978 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: apply.c:3593 +#: apply.c:3595 msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "仓库缺乏执行三方合并所必需的数据对象。" -#: apply.c:3596 +#: apply.c:3598 #, c-format msgid "Performing three-way merge...\n" msgstr "执行三方合并...\n" -#: apply.c:3612 apply.c:3616 +#: apply.c:3614 apply.c:3618 #, c-format msgid "cannot read the current contents of '%s'" msgstr "无法读取 '%s' 的当前内容" -#: apply.c:3628 +#: apply.c:3630 #, c-format msgid "Failed to perform three-way merge...\n" msgstr "无法执行三方合并...\n" -#: apply.c:3642 +#: apply.c:3644 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补丁到 '%s' 存在冲突。\n" -#: apply.c:3647 +#: apply.c:3649 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功应用补丁到 '%s'。\n" -#: apply.c:3664 +#: apply.c:3666 #, c-format msgid "Falling back to direct application...\n" msgstr "回落到直接应用...\n" -#: apply.c:3676 +#: apply.c:3678 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: apply.c:3749 +#: apply.c:3751 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: apply.c:3751 +#: apply.c:3753 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905 -#: read-cache.c:1368 +#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918 +#: read-cache.c:1381 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" -#: apply.c:3974 +#: apply.c:3976 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: apply.c:3978 +#: apply.c:3980 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: apply.c:3998 +#: apply.c:4000 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: apply.c:4003 +#: apply.c:4005 #, 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:4023 +#: apply.c:4025 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" -#: apply.c:4027 +#: apply.c:4029 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: apply.c:4042 +#: apply.c:4044 #, c-format msgid "Checking patch %s..." msgstr "正在检查补丁 %s..." -#: apply.c:4134 +#: apply.c:4136 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" -#: apply.c:4141 +#: apply.c:4143 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式变更，但它不在当前 HEAD 中" -#: apply.c:4144 +#: apply.c:4146 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效（%s）。" -#: apply.c:4153 +#: apply.c:4155 #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" -#: apply.c:4163 +#: apply.c:4165 #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" -#: apply.c:4301 +#: apply.c:4303 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: apply.c:4335 +#: apply.c:4337 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: apply.c:4341 +#: apply.c:4343 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能对新建文件 '%s' 调用 stat" -#: apply.c:4349 +#: apply.c:4351 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: apply.c:4355 apply.c:4500 +#: apply.c:4357 apply.c:4502 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241 -#: builtin/gc.c:2276 +#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258 +#: builtin/gc.c:2293 #, c-format msgid "failed to write to '%s'" -msgstr "写入 '%s' 失败" +msgstr "无法写入 '%s'" -#: apply.c:4402 +#: apply.c:4404 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: apply.c:4472 +#: apply.c:4474 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: apply.c:4570 +#: apply.c:4572 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: apply.c:4578 +#: apply.c:4580 msgid "internal error" msgstr "内部错误" -#: apply.c:4581 +#: apply.c:4583 #, 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:4592 +#: apply.c:4594 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408 +#: apply.c:4602 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" -#: apply.c:4614 +#: apply.c:4616 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: apply.c:4618 +#: apply.c:4620 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: apply.c:4747 +#: apply.c:4749 #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" -#: apply.c:4755 -msgid "unrecognized input" -msgstr "未能识别的输入" +#: apply.c:4758 +msgid "No valid patches in input (allow with \"--allow-empty\")" +msgstr "输入中没有合法的补丁 （使用 \"--allow-empty\" 来允许）" -#: apply.c:4775 +#: apply.c:4779 msgid "unable to read index file" msgstr "无法读取索引文件" -#: apply.c:4932 +#: apply.c:4936 #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s'：%s" -#: apply.c:4959 +#: apply.c:4963 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: apply.c:4965 apply.c:4980 +#: apply.c:4969 apply.c:4984 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字符误用。" msgstr[1] "%d 行新增了空白字符误用。" -#: apply.c:4973 +#: apply.c:4977 #, 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:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429 +#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: apply.c:5017 +#: apply.c:5021 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: apply.c:5020 +#: apply.c:5024 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: apply.c:5022 builtin/am.c:2320 +#: apply.c:5026 builtin/am.c:2376 msgid "num" msgstr "数字" -#: apply.c:5023 +#: apply.c:5027 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: apply.c:5026 +#: apply.c:5030 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: apply.c:5028 +#: apply.c:5032 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: apply.c:5032 +#: apply.c:5036 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: apply.c:5034 +#: apply.c:5038 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: apply.c:5036 +#: apply.c:5040 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: apply.c:5038 +#: apply.c:5042 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: apply.c:5040 +#: apply.c:5044 msgid "mark new files with `git add --intent-to-add`" msgstr "使用命令 `git add --intent-to-add` 标记新增文件" -#: apply.c:5042 +#: apply.c:5046 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: apply.c:5044 +#: apply.c:5048 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" -#: apply.c:5047 +#: apply.c:5051 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: apply.c:5049 +#: apply.c:5053 msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "尝试三路合并，如果失败则回落至正常补丁模式" -#: apply.c:5051 +#: apply.c:5055 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: apply.c:5054 builtin/checkout-index.c:196 +#: apply.c:5058 builtin/checkout-index.c:196 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: apply.c:5056 +#: apply.c:5060 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299 +#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960 #: builtin/rebase.c:1051 msgid "action" msgstr "动作" -#: apply.c:5058 +#: apply.c:5062 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: apply.c:5061 apply.c:5064 +#: apply.c:5065 apply.c:5068 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: apply.c:5067 +#: apply.c:5071 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: apply.c:5069 +#: apply.c:5073 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: apply.c:5071 +#: apply.c:5075 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: apply.c:5073 +#: apply.c:5077 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22 -#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120 -msgid "be verbose" -msgstr "冗长输出" - -#: apply.c:5076 +#: apply.c:5080 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: apply.c:5079 +#: apply.c:5083 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: apply.c:5081 builtin/am.c:2308 +#: apply.c:5085 builtin/am.c:2364 msgid "root" msgstr "根目录" -#: apply.c:5082 +#: apply.c:5086 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" +#: apply.c:5089 +msgid "don't return error for empty patches" +msgstr "对空的补丁不返回错误" + #: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" @@ -1613,16 +1625,16 @@ msgstr "不能打开数据对象 %s" msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支持的文件模式：0%o (SHA1: %s)" -#: archive-tar.c:450 +#: archive-tar.c:447 #, c-format msgid "unable to start '%s' filter" msgstr "无法启动 '%s' 过滤器" -#: archive-tar.c:453 +#: archive-tar.c:450 msgid "unable to redirect descriptor" msgstr "无法重定向描述符" -#: archive-tar.c:460 +#: archive-tar.c:457 #, c-format msgid "'%s' filter reported error" msgstr "'%s' 过滤器报告了错误" @@ -1665,19 +1677,13 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" -#: archive.c:188 +#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238 +#: builtin/tag.c:578 #, c-format -msgid "cannot read %s" -msgstr "不能读取 %s" - -#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114 -#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834 -#: builtin/merge.c:1145 -#, c-format -msgid "could not read '%s'" +msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334 +#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" @@ -1719,7 +1725,7 @@ msgstr "格式" msgid "archive format" msgstr "归档格式" -#: archive.c:552 builtin/log.c:1775 +#: archive.c:552 builtin/log.c:1790 msgid "prefix" msgstr "前缀" @@ -1729,9 +1735,9 @@ msgstr "为归档中每个路径名加上前缀" #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135 -#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 -#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103 -#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410 +#: builtin/fast-export.c:1181 builtin/fast-export.c:1183 +#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103 +#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190 msgid "file" msgstr "文件" @@ -1761,7 +1767,7 @@ msgid "list supported archive formats" msgstr "列出支持的归档格式" #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512 +#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513 msgid "repo" msgstr "仓库" @@ -1769,7 +1775,7 @@ msgstr "仓库" msgid "retrieve the archive from remote repository <repo>" msgstr "从远程仓库（<仓库>）提取归档文件" -#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708 #: builtin/notes.c:496 msgid "command" msgstr "命令" @@ -1782,18 +1788,20 @@ msgstr "远程 git-upload-archive 命令的路径" msgid "Unexpected option --remote" msgstr "未知参数 --remote" -#: archive.c:580 -msgid "Option --exec can only be used together with --remote" -msgstr "选项 --exec 只能和 --remote 同时使用" +#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544 +#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370 +#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115 +#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281 +#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144 +#: http-fetch.c:153 +#, c-format +msgid "the option '%s' requires '%s'" +msgstr "选项 '%s' 需要 '%s'" #: archive.c:582 msgid "Unexpected option --output" msgstr "未知参数 --output" -#: archive.c:584 -msgid "Options --add-file and --remote cannot be used together" -msgstr "选项 --add-file 和 --remote 不能同时使用" - #: archive.c:606 #, c-format msgid "Unknown archive format '%s'" @@ -1901,7 +1909,7 @@ msgstr "需要一个 %s 版本" msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" -#: bisect.c:985 builtin/merge.c:154 +#: bisect.c:985 builtin/merge.c:155 #, c-format msgid "could not read file '%s'" msgstr "不能读取文件 '%s'" @@ -1953,10 +1961,10 @@ msgstr "不能将 --contents 和最终的提交对象名共用" msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041 -#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114 -#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 -#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373 +#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158 +#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114 +#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071 +#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790 #: builtin/shortlog.c:255 msgid "revision walk setup failed" @@ -1977,97 +1985,86 @@ msgstr "在 %2$s 中无此路径 %1$s" msgid "cannot read blob %s for path %s" msgstr "不能为路径 %2$s 读取数据对象 %1$s" -#: branch.c:53 -#, c-format +#: branch.c:77 msgid "" -"\n" -"After fixing the error cause you may try to fix up\n" -"the remote tracking information by invoking\n" -"\"git branch --set-upstream-to=%s%s%s\"." -msgstr "" -"\n" -"在修复错误后，您可以尝试修改远程跟踪分支，通过执行命令\n" -"\"git branch --set-upstream-to=%s%s%s\" 。" +"cannot inherit upstream tracking configuration of multiple refs when " +"rebasing is requested" +msgstr "在请求变基时无法继承上游多个引用的跟踪设置" -#: branch.c:67 +#: branch.c:88 #, c-format -msgid "Not setting branch %s as its own upstream." -msgstr "未设置分支 %s 作为它自己的上游。" +msgid "not setting branch '%s' as its own upstream" +msgstr "没有将分支 '%s' 设置为它自己的上游" -#: branch.c:93 +#: branch.c:144 #, c-format -msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." -msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。" +msgid "branch '%s' set up to track '%s' by rebasing." +msgstr "分支 '%s' 设置为使用变基来跟踪 '%s'。" -#: branch.c:94 +#: branch.c:145 #, c-format -msgid "Branch '%s' set up to track remote branch '%s' from '%s'." -msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。" +msgid "branch '%s' set up to track '%s'." +msgstr "分支 '%s' 设置为跟踪 '%s'。" -#: branch.c:98 +#: branch.c:148 #, c-format -msgid "Branch '%s' set up to track local branch '%s' by rebasing." -msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。" +msgid "branch '%s' set up to track:" +msgstr "分支 '%s' 设置为跟踪：" -#: branch.c:99 -#, c-format -msgid "Branch '%s' set up to track local branch '%s'." -msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。" - -#: branch.c:104 -#, c-format -msgid "Branch '%s' set up to track remote ref '%s' by rebasing." -msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。" +#: branch.c:160 +msgid "unable to write upstream branch configuration" +msgstr "无法写入上游分支配置" -#: branch.c:105 -#, c-format -msgid "Branch '%s' set up to track remote ref '%s'." -msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。" +#: branch.c:162 +msgid "" +"\n" +"After fixing the error cause you may try to fix up\n" +"the remote tracking information by invoking:" +msgstr "" +"\n" +"在修复错误后，您可以通过执行以下命令来尝试修改远程跟踪分支：" -#: branch.c:109 +#: branch.c:203 #, c-format -msgid "Branch '%s' set up to track local ref '%s' by rebasing." -msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。" +msgid "asked to inherit tracking from '%s', but no remote is set" +msgstr "要求从 '%s' 继承跟踪信息，但是没有设置远程" -#: branch.c:110 +#: branch.c:209 #, c-format -msgid "Branch '%s' set up to track local ref '%s'." -msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。" - -#: branch.c:119 -msgid "Unable to write upstream branch configuration" -msgstr "无法写入上游分支配置" +msgid "asked to inherit tracking from '%s', but no merge configuration is set" +msgstr "要求从 '%s' 继承跟踪信息，但是没有设置合并配置" -#: branch.c:156 +#: branch.c:252 #, c-format -msgid "Not tracking: ambiguous information for ref %s" +msgid "not tracking: ambiguous information for ref %s" msgstr "未跟踪：引用 %s 有歧义" -#: branch.c:189 +#: branch.c:287 #, c-format -msgid "'%s' is not a valid branch name." -msgstr "'%s' 不是一个有效的分支名称。" +msgid "'%s' is not a valid branch name" +msgstr "'%s' 不是一个有效的分支名称" -#: branch.c:208 +#: branch.c:307 #, c-format -msgid "A branch named '%s' already exists." -msgstr "一个分支名 '%s' 已经存在。" +msgid "a branch named '%s' already exists" +msgstr "一个名为 '%s' 的分支已经存在" -#: branch.c:213 -msgid "Cannot force update the current branch." -msgstr "无法强制更新当前分支。" +#: branch.c:313 +#, c-format +msgid "cannot force update the branch '%s'checked out at '%s'" +msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'" -#: branch.c:233 +#: branch.c:336 #, c-format -msgid "Cannot setup tracking information; starting point '%s' is not a branch." -msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。" +msgid "cannot set up tracking information; starting point '%s' is not a branch" +msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支" -#: branch.c:235 +#: branch.c:338 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "请求的上游分支 '%s' 不存在" -#: branch.c:237 +#: branch.c:340 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -2085,27 +2082,28 @@ msgstr "" "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n" "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" -#: branch.c:281 +#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377 +#: builtin/replace.c:423 builtin/replace.c:453 #, c-format -msgid "Not a valid object name: '%s'." -msgstr "不是一个有效的对象名：'%s'。" +msgid "not a valid object name: '%s'" +msgstr "不是一个有效的对象名：'%s'" -#: branch.c:301 +#: branch.c:404 #, c-format -msgid "Ambiguous object name: '%s'." -msgstr "歧义的对象名：'%s'。" +msgid "ambiguous object name: '%s'" +msgstr "歧义的对象名：'%s'" -#: branch.c:306 +#: branch.c:409 #, c-format -msgid "Not a valid branch point: '%s'." -msgstr "无效的分支点：'%s'。" +msgid "not a valid branch point: '%s'" +msgstr "无效的分支点：'%s'" -#: branch.c:366 +#: branch.c:469 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' 已经检出到 '%s'" -#: branch.c:389 +#: branch.c:494 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s 的 HEAD 指向没有被更新" @@ -2130,7 +2128,7 @@ msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406 #: builtin/commit.c:862 #, c-format msgid "could not open '%s'" @@ -2189,7 +2187,7 @@ msgstr "不支持的归档包版本 %d" msgid "cannot write bundle version %d with algorithm %s" msgstr "不能写入，归档包版本 %d 不支持算法 %s" -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" @@ -2226,7 +2224,7 @@ msgstr "发现重复的块ID %<PRIx32>" msgid "final chunk has non-zero id %<PRIx32>" msgstr "最终块有非零 ID %<PRIx32>" -#: color.c:329 +#: color.c:354 #, c-format msgid "invalid color value: %.*s" msgstr "无效的颜色值：%.*s" @@ -2276,207 +2274,207 @@ msgstr "无效的提交图形链：行 '%s' 不是一个哈希值" msgid "unable to find all commit-graph files" msgstr "无法找到所有提交图形文件" -#: commit-graph.c:746 commit-graph.c:783 +#: commit-graph.c:749 commit-graph.c:786 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "无效的提交位置。提交图形可能已损坏" -#: commit-graph.c:767 +#: commit-graph.c:770 #, c-format msgid "could not find commit %s" msgstr "无法找到提交 %s" -#: commit-graph.c:800 +#: commit-graph.c:803 msgid "commit-graph requires overflow generation data but has none" msgstr "提交图需要溢出世代数据，但是没有" -#: commit-graph.c:1105 builtin/am.c:1342 +#: commit-graph.c:1108 builtin/am.c:1369 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: commit-graph.c:1367 builtin/pack-objects.c:3070 +#: commit-graph.c:1370 builtin/pack-objects.c:3070 #, c-format msgid "unable to get type of object %s" msgstr "无法获得对象 %s 类型" -#: commit-graph.c:1398 +#: commit-graph.c:1401 msgid "Loading known commits in commit graph" msgstr "正在加载提交图中的已知提交" -#: commit-graph.c:1415 +#: commit-graph.c:1418 msgid "Expanding reachable commits in commit graph" msgstr "正在扩展提交图中的可达提交" -#: commit-graph.c:1435 +#: commit-graph.c:1438 msgid "Clearing commit marks in commit graph" msgstr "正在清除提交图中的提交标记" -#: commit-graph.c:1454 +#: commit-graph.c:1457 msgid "Computing commit graph topological levels" msgstr "正在计算提交图拓扑级别" -#: commit-graph.c:1507 +#: commit-graph.c:1510 msgid "Computing commit graph generation numbers" msgstr "正在计算提交图世代数字" -#: commit-graph.c:1588 +#: commit-graph.c:1591 msgid "Computing commit changed paths Bloom filters" msgstr "计算提交变更路径的布隆过滤器" -#: commit-graph.c:1665 +#: commit-graph.c:1668 msgid "Collecting referenced commits" msgstr "正在收集引用的提交" -#: commit-graph.c:1690 +#: commit-graph.c:1693 #, 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:1703 +#: commit-graph.c:1706 #, c-format msgid "error adding pack %s" msgstr "添加包 %s 出错" -#: commit-graph.c:1707 +#: commit-graph.c:1710 #, c-format msgid "error opening index for %s" msgstr "为 %s 打开索引出错" -#: commit-graph.c:1744 +#: commit-graph.c:1747 msgid "Finding commits for commit graph among packed objects" msgstr "正在打包对象中查找提交图的提交" -#: commit-graph.c:1762 +#: commit-graph.c:1765 msgid "Finding extra edges in commit graph" msgstr "正在查找提交图中额外的边" -#: commit-graph.c:1811 +#: commit-graph.c:1814 msgid "failed to write correct number of base graph ids" msgstr "无法写入正确数量的基础图形 ID" -#: commit-graph.c:1842 midx.c:1146 +#: commit-graph.c:1845 midx.c:1149 #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" -#: commit-graph.c:1855 +#: commit-graph.c:1858 msgid "unable to create temporary graph layer" msgstr "无法创建临时图层" -#: commit-graph.c:1860 +#: commit-graph.c:1863 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "无法为 '%s' 调整共享权限" -#: commit-graph.c:1917 +#: commit-graph.c:1920 #, 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:1953 +#: commit-graph.c:1956 msgid "unable to open commit-graph chain file" msgstr "无法打开提交图形链文件" -#: commit-graph.c:1969 +#: commit-graph.c:1972 msgid "failed to rename base commit-graph file" msgstr "无法重命名基础提交图形文件" -#: commit-graph.c:1989 +#: commit-graph.c:1992 msgid "failed to rename temporary commit-graph file" msgstr "无法重命名临时提交图形文件" -#: commit-graph.c:2122 +#: commit-graph.c:2125 msgid "Scanning merged commits" msgstr "正在扫描合并提交" -#: commit-graph.c:2166 +#: commit-graph.c:2169 msgid "Merging commit-graph" msgstr "正在合并提交图形" -#: commit-graph.c:2274 +#: commit-graph.c:2277 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用" -#: commit-graph.c:2381 +#: commit-graph.c:2384 msgid "too many commits to write graph" msgstr "提交太多不能画图" -#: commit-graph.c:2479 +#: commit-graph.c:2482 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交图文件的校验码错误，可能已经损坏" -#: commit-graph.c:2489 +#: commit-graph.c:2492 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s" -#: commit-graph.c:2499 commit-graph.c:2514 +#: commit-graph.c:2502 commit-graph.c:2517 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u" -#: commit-graph.c:2506 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "无法从提交图形中解析提交 %s" -#: commit-graph.c:2524 +#: commit-graph.c:2527 msgid "Verifying commits in commit graph" msgstr "正在校验提交图中的提交" -#: commit-graph.c:2539 +#: commit-graph.c:2542 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "无法从提交图形的对象库中解析提交 %s" -#: commit-graph.c:2546 +#: commit-graph.c:2549 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" -#: commit-graph.c:2556 +#: commit-graph.c:2559 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交图形父提交列表太长了" -#: commit-graph.c:2565 +#: commit-graph.c:2568 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交图形父提交是 %s != %s" -#: commit-graph.c:2579 +#: commit-graph.c:2582 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交图形父提交列表过早终止" -#: commit-graph.c:2584 +#: commit-graph.c:2587 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零" -#: commit-graph.c:2588 +#: commit-graph.c:2591 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零" -#: commit-graph.c:2605 +#: commit-graph.c:2608 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>" -#: commit-graph.c:2611 +#: commit-graph.c:2614 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" -#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418 -#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457 +#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444 +#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" @@ -2506,27 +2504,27 @@ msgstr "" "设置 \"git config advice.graftFileDeprecated false\"\n" "可关闭本消息" -#: commit.c:1239 +#: commit.c:1241 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" -#: commit.c:1243 +#: commit.c:1245 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" -#: commit.c:1246 +#: commit.c:1248 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有 GPG 签名。" -#: commit.c:1249 +#: commit.c:1251 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" -#: commit.c:1503 +#: commit.c:1505 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2593,7 +2591,7 @@ msgstr "键名没有包含一个小节名称：%s" msgid "key does not contain variable name: %s" msgstr "键名没有包含变量名：%s" -#: config.c:470 sequencer.c:2804 +#: config.c:470 sequencer.c:2806 #, c-format msgid "invalid key: %s" msgstr "无效键名：%s" @@ -2744,144 +2742,144 @@ msgstr "core.commentChar 应该是一个字符" msgid "invalid mode for object creation: %s" msgstr "无效的对象创建模式：%s" -#: config.c:1581 +#: config.c:1584 #, c-format msgid "malformed value for %s" msgstr "%s 的取值格式错误" -#: config.c:1607 +#: config.c:1610 #, c-format msgid "malformed value for %s: %s" msgstr "%s 的取值格式错误：%s" -#: config.c:1608 +#: config.c:1611 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1669 builtin/pack-objects.c:4053 +#: config.c:1672 builtin/pack-objects.c:4053 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" -#: config.c:1792 +#: config.c:1795 #, c-format msgid "unable to load config blob object '%s'" msgstr "无法从数据对象 '%s' 加载配置" -#: config.c:1795 +#: config.c:1798 #, c-format msgid "reference '%s' does not point to a blob" msgstr "引用 '%s' 没有指向一个数据对象" -#: config.c:1813 +#: config.c:1816 #, c-format msgid "unable to resolve config blob '%s'" msgstr "不能解析配置对象 '%s'" -#: config.c:1858 +#: config.c:1861 #, c-format msgid "failed to parse %s" -msgstr "解析 %s 失败" +msgstr "无法解析 %s" -#: config.c:1914 +#: config.c:1917 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" -#: config.c:2282 +#: config.c:2285 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" -#: config.c:2456 +#: config.c:2459 #, c-format msgid "Invalid %s: '%s'" msgstr "无效 %s：'%s'" -#: config.c:2501 +#: config.c:2504 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" -#: config.c:2547 +#: config.c:2550 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" -#: config.c:2549 +#: config.c:2552 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" -#: config.c:2633 +#: config.c:2637 #, c-format msgid "invalid section name '%s'" msgstr "无效的小节名称 '%s'" -#: config.c:2665 +#: config.c:2669 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" -#: config.c:2694 +#: config.c:2698 #, c-format msgid "failed to write new configuration file %s" -msgstr "写入新的配置文件 %s 失败" +msgstr "无法写入新的配置文件 %s" -#: config.c:2946 config.c:3273 +#: config.c:2950 config.c:3277 #, c-format msgid "could not lock config file %s" msgstr "不能锁定配置文件 %s" -#: config.c:2957 +#: config.c:2961 #, c-format msgid "opening %s" msgstr "打开 %s" -#: config.c:2994 builtin/config.c:361 +#: config.c:2998 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "无效模式：%s" -#: config.c:3019 +#: config.c:3023 #, c-format msgid "invalid config file %s" msgstr "无效的配置文件 %s" -#: config.c:3032 config.c:3286 +#: config.c:3036 config.c:3290 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" -#: config.c:3043 +#: config.c:3047 #, c-format msgid "unable to mmap '%s'%s" msgstr "不能 mmap '%s'%s" -#: config.c:3053 config.c:3291 +#: config.c:3057 config.c:3295 #, c-format msgid "chmod on %s failed" msgstr "对 %s 调用 chmod 失败" -#: config.c:3138 config.c:3388 +#: config.c:3142 config.c:3392 #, c-format msgid "could not write config file %s" msgstr "不能写入配置文件 %s" -#: config.c:3172 +#: config.c:3176 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" -#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868 +#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" -#: config.c:3264 +#: config.c:3268 #, c-format msgid "invalid section name: %s" msgstr "无效的小节名称：%s" -#: config.c:3431 +#: config.c:3435 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺失" @@ -3057,7 +3055,7 @@ msgstr "已阻止奇怪的路径名 '%s'" msgid "unable to fork" msgstr "无法 fork" -#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57 msgid "Checking connectivity" msgstr "正在检查连通性" @@ -3071,7 +3069,7 @@ msgstr "写入 rev-list 失败" #: connected.c:151 msgid "failed to close rev-list's stdin" -msgstr "关闭 rev-list 的标准输入失败" +msgstr "无法关闭 rev-list 的标准输入" #: convert.c:183 #, c-format @@ -3353,18 +3351,18 @@ msgid "" msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径" # 译者：注意保持前导空格 -#: diff.c:157 +#: diff.c:158 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n" # 译者：注意保持前导空格 -#: diff.c:162 +#: diff.c:163 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat 参数 '%s'\n" -#: diff.c:298 +#: diff.c:299 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -3372,7 +3370,7 @@ msgstr "" "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 " "'plain'" -#: diff.c:326 +#: diff.c:327 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -3381,18 +3379,18 @@ msgstr "" "未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-" "space-at-eol'、'ignore-all-space'、'allow-indentation-change'" -#: diff.c:334 +#: diff.c:335 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用" -#: diff.c:411 +#: diff.c:412 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" -#: diff.c:471 +#: diff.c:472 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -3401,46 +3399,48 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:4290 +#: diff.c:4237 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" -#: diff.c:4642 -msgid "--name-only, --name-status, --check and -s are mutually exclusive" -msgstr "--name-only、--name-status、--check 和 -s 是互斥的" +#: diff.c:4589 +#, c-format +msgid "options '%s', '%s', '%s', and '%s' cannot be used together" +msgstr "选项 '%s'、'%s'、'%s' 和 '%s' 不能同时使用" -#: diff.c:4645 -msgid "-G, -S and --find-object are mutually exclusive" -msgstr "-G、-S 和 --find-object 是互斥的" +#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506 +#, c-format +msgid "options '%s', '%s', and '%s' cannot be used together" +msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用" -#: diff.c:4648 -msgid "" -"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" -msgstr "-G 和 --pickaxe-regex 互斥，使用 --pickaxe-regex 和 -S" +#: diff.c:4597 +#, c-format +msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" +msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 一起使用 '%3$s'" -#: diff.c:4651 +#: diff.c:4601 +#, c-format msgid "" -"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " -"with -G and -S" -msgstr "--pickaxe-all 和 --find-object 互斥，使用 --pickaxe-all 与 -G 和 -S" +"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'" +msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 和 '%5$s' 一起使用 '%3$s'" -#: diff.c:4730 +#: diff.c:4681 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确要求只跟一个路径规格" -#: diff.c:4778 +#: diff.c:4729 #, c-format msgid "invalid --stat value: %s" msgstr "无效的 --stat 值：%s" -#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326 +#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277 #: parse-options.c:217 parse-options.c:221 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一个数字值" -#: diff.c:4815 +#: diff.c:4766 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3449,200 +3449,200 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:4900 +#: diff.c:4851 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" -#: diff.c:4924 +#: diff.c:4875 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之后未知的值" -#: diff.c:4938 +#: diff.c:4889 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" -#: diff.c:4988 diff.c:4994 +#: diff.c:4939 diff.c:4945 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s 期望 <n>/<m> 格式" -#: diff.c:5006 +#: diff.c:4957 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一个字符，得到 '%s'" -#: diff.c:5027 +#: diff.c:4978 #, c-format msgid "bad --color-moved argument: %s" msgstr "坏的 --color-moved 参数：%s" -#: diff.c:5046 +#: diff.c:4997 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的无效模式 '%s' " -#: diff.c:5086 +#: diff.c:5037 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" -#: diff.c:5122 diff.c:5142 +#: diff.c:5073 diff.c:5093 #, c-format msgid "invalid argument to %s" msgstr "%s 的参数无效" -#: diff.c:5246 +#: diff.c:5197 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "选项 -I 的正则表达式无效：'%s'" -#: diff.c:5295 +#: diff.c:5246 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" -#: diff.c:5351 +#: diff.c:5302 #, c-format msgid "bad --word-diff argument: %s" msgstr "坏的 --word-diff 参数：%s" -#: diff.c:5387 +#: diff.c:5338 msgid "Diff output format options" msgstr "差异输出格式化选项" -#: diff.c:5389 diff.c:5395 +#: diff.c:5340 diff.c:5346 msgid "generate patch" msgstr "生成补丁" -#: diff.c:5392 builtin/log.c:179 +#: diff.c:5343 builtin/log.c:179 msgid "suppress diff output" msgstr "不显示差异输出" -#: diff.c:5397 diff.c:5511 diff.c:5518 +#: diff.c:5348 diff.c:5462 diff.c:5469 msgid "<n>" msgstr "<n>" -#: diff.c:5398 diff.c:5401 +#: diff.c:5349 diff.c:5352 msgid "generate diffs with <n> lines context" msgstr "生成含 <n> 行上下文的差异" -#: diff.c:5403 +#: diff.c:5354 msgid "generate the diff in raw format" msgstr "生成原始格式的差异" -#: diff.c:5406 +#: diff.c:5357 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同义" -#: diff.c:5410 +#: diff.c:5361 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同义" -#: diff.c:5414 +#: diff.c:5365 msgid "machine friendly --stat" msgstr "机器友好的 --stat" -#: diff.c:5417 +#: diff.c:5368 msgid "output only the last line of --stat" msgstr "只输出 --stat 的最后一行" -#: diff.c:5419 diff.c:5427 +#: diff.c:5370 diff.c:5378 msgid "<param1,param2>..." msgstr "<参数1,参数2>..." -#: diff.c:5420 +#: diff.c:5371 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "输出每个子目录相对变更的分布" -#: diff.c:5424 +#: diff.c:5375 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同义" -#: diff.c:5428 +#: diff.c:5379 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同义词" -#: diff.c:5432 +#: diff.c:5383 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果变更中引入冲突定界符或空白错误，给出警告" -#: diff.c:5435 +#: diff.c:5386 msgid "condensed summary such as creations, renames and mode changes" msgstr "精简摘要，例如创建、重命名和模式变更" -#: diff.c:5438 +#: diff.c:5389 msgid "show only names of changed files" msgstr "只显示变更文件的文件名" -#: diff.c:5441 +#: diff.c:5392 msgid "show only names and status of changed files" msgstr "只显示变更文件的文件名和状态" -#: diff.c:5443 +#: diff.c:5394 msgid "<width>[,<name-width>[,<count>]]" msgstr "<宽度>[,<文件名宽度>[,<次数>]]" -#: diff.c:5444 +#: diff.c:5395 msgid "generate diffstat" msgstr "生成差异统计（diffstat）" -#: diff.c:5446 diff.c:5449 diff.c:5452 +#: diff.c:5397 diff.c:5400 diff.c:5403 msgid "<width>" msgstr "<宽度>" -#: diff.c:5447 +#: diff.c:5398 msgid "generate diffstat with a given width" msgstr "使用给定的长度生成差异统计" -#: diff.c:5450 +#: diff.c:5401 msgid "generate diffstat with a given name width" msgstr "使用给定的文件名长度生成差异统计" -#: diff.c:5453 +#: diff.c:5404 msgid "generate diffstat with a given graph width" msgstr "使用给定的图形长度生成差异统计" -#: diff.c:5455 +#: diff.c:5406 msgid "<count>" msgstr "<次数>" -#: diff.c:5456 +#: diff.c:5407 msgid "generate diffstat with limited lines" msgstr "生成有限行数的差异统计" -#: diff.c:5459 +#: diff.c:5410 msgid "generate compact summary in diffstat" msgstr "生成差异统计的简洁摘要" -#: diff.c:5462 +#: diff.c:5413 msgid "output a binary diff that can be applied" msgstr "输出一个可以应用的二进制差异" -#: diff.c:5465 +#: diff.c:5416 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行显示完整的前后对象名称" -#: diff.c:5467 +#: diff.c:5418 msgid "show colored diff" msgstr "显示带颜色的差异" -#: diff.c:5468 +#: diff.c:5419 msgid "<kind>" msgstr "<类型>" -#: diff.c:5469 +#: diff.c:5420 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符" -#: diff.c:5472 +#: diff.c:5423 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3650,311 +3650,311 @@ msgstr "" "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔" "符" -#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590 +#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541 msgid "<prefix>" msgstr "<前缀>" -#: diff.c:5476 +#: diff.c:5427 msgid "show the given source prefix instead of \"a/\"" msgstr "显示给定的源前缀取代 \"a/\"" -#: diff.c:5479 +#: diff.c:5430 msgid "show the given destination prefix instead of \"b/\"" msgstr "显示给定的目标前缀取代 \"b/\"" -#: diff.c:5482 +#: diff.c:5433 msgid "prepend an additional prefix to every line of output" msgstr "输出的每一行附加前缀" -#: diff.c:5485 +#: diff.c:5436 msgid "do not show any source or destination prefix" msgstr "不显示任何源和目标前缀" -#: diff.c:5488 +#: diff.c:5439 msgid "show context between diff hunks up to the specified number of lines" msgstr "显示指定行数的差异块间的上下文" -#: diff.c:5492 diff.c:5497 diff.c:5502 +#: diff.c:5443 diff.c:5448 diff.c:5453 msgid "<char>" msgstr "<字符>" -#: diff.c:5493 +#: diff.c:5444 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一个字符取代 '+' 来表示新的一行" -#: diff.c:5498 +#: diff.c:5449 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一个字符取代 '-' 来表示旧的一行" -#: diff.c:5503 +#: diff.c:5454 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一个字符取代 ' ' 来表示一行上下文" -#: diff.c:5506 +#: diff.c:5457 msgid "Diff rename options" msgstr "差异重命名选项" -#: diff.c:5507 +#: diff.c:5458 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5508 +#: diff.c:5459 msgid "break complete rewrite changes into pairs of delete and create" msgstr "将完全重写的变更打破为成对的删除和创建" -#: diff.c:5512 +#: diff.c:5463 msgid "detect renames" msgstr "检测重命名" -#: diff.c:5516 +#: diff.c:5467 msgid "omit the preimage for deletes" msgstr "省略删除操作的差异输出" -#: diff.c:5519 +#: diff.c:5470 msgid "detect copies" msgstr "检测拷贝" -#: diff.c:5523 +#: diff.c:5474 msgid "use unmodified files as source to find copies" msgstr "使用未修改的文件做为发现拷贝的源" -#: diff.c:5525 +#: diff.c:5476 msgid "disable rename detection" msgstr "禁用重命名探测" -#: diff.c:5528 +#: diff.c:5479 msgid "use empty blobs as rename source" msgstr "使用空的数据对象做为重命名的源" -#: diff.c:5530 +#: diff.c:5481 msgid "continue listing the history of a file beyond renames" msgstr "继续列出文件重命名以外的历史记录" -#: diff.c:5533 +#: diff.c:5484 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测" -#: diff.c:5535 +#: diff.c:5486 msgid "Diff algorithm options" msgstr "差异算法选项" -#: diff.c:5537 +#: diff.c:5488 msgid "produce the smallest possible diff" msgstr "生成尽可能小的差异" -#: diff.c:5540 +#: diff.c:5491 msgid "ignore whitespace when comparing lines" msgstr "行比较时忽略空白字符" -#: diff.c:5543 +#: diff.c:5494 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字符的变更" -#: diff.c:5546 +#: diff.c:5497 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字符变更" -#: diff.c:5549 +#: diff.c:5500 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的回车符（CR）" -#: diff.c:5552 +#: diff.c:5503 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的变更" -#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624 +#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575 msgid "<regex>" msgstr "<正则>" -#: diff.c:5555 +#: diff.c:5506 msgid "ignore changes whose all lines match <regex>" msgstr "忽略所有行都和正则表达式匹配的变更" -#: diff.c:5558 +#: diff.c:5509 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "启发式转换差异边界以便阅读" -#: diff.c:5561 +#: diff.c:5512 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 算法生成差异" -#: diff.c:5565 +#: diff.c:5516 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 算法生成差异" -#: diff.c:5567 +#: diff.c:5518 msgid "<algorithm>" msgstr "<算法>" -#: diff.c:5568 +#: diff.c:5519 msgid "choose a diff algorithm" msgstr "选择一个差异算法" -#: diff.c:5570 +#: diff.c:5521 msgid "<text>" msgstr "<文本>" -#: diff.c:5571 +#: diff.c:5522 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 算法生成差异" -#: diff.c:5573 diff.c:5582 diff.c:5585 +#: diff.c:5524 diff.c:5533 diff.c:5536 msgid "<mode>" msgstr "<模式>" -#: diff.c:5574 +#: diff.c:5525 msgid "show word diff, using <mode> to delimit changed words" msgstr "显示单词差异，使用 <模式> 分隔变更的单词" -#: diff.c:5577 +#: diff.c:5528 msgid "use <regex> to decide what a word is" msgstr "使用 <正则表达式> 确定何为一个词" -#: diff.c:5580 +#: diff.c:5531 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" -#: diff.c:5583 +#: diff.c:5534 msgid "moved lines of code are colored differently" msgstr "移动的代码行用不同方式着色" -#: diff.c:5586 +#: diff.c:5537 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字符" -#: diff.c:5589 +#: diff.c:5540 msgid "Other diff options" msgstr "其它差异选项" -#: diff.c:5591 +#: diff.c:5542 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "当从子目录运行，排除目录之外的变更并显示相对路径" -#: diff.c:5595 +#: diff.c:5546 msgid "treat all files as text" msgstr "把所有文件当做文本处理" -#: diff.c:5597 +#: diff.c:5548 msgid "swap two inputs, reverse the diff" msgstr "交换两个输入，反转差异" -#: diff.c:5599 +#: diff.c:5550 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差异时退出码为 1，否则为 0" -#: diff.c:5601 +#: diff.c:5552 msgid "disable all output of the program" msgstr "禁用本程序的所有输出" -#: diff.c:5603 +#: diff.c:5554 msgid "allow an external diff helper to be executed" msgstr "允许执行一个外置的差异助手" -#: diff.c:5605 +#: diff.c:5556 msgid "run external text conversion filters when comparing binary files" msgstr "当比较二进制文件时，运行外部的文本转换过滤器" -#: diff.c:5607 +#: diff.c:5558 msgid "<when>" msgstr "<何时>" -#: diff.c:5608 +#: diff.c:5559 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差异时，忽略子模组的更改" -#: diff.c:5611 +#: diff.c:5562 msgid "<format>" msgstr "<格式>" -#: diff.c:5612 +#: diff.c:5563 msgid "specify how differences in submodules are shown" msgstr "指定子模组的差异如何显示" -#: diff.c:5616 +#: diff.c:5567 msgid "hide 'git add -N' entries from the index" msgstr "隐藏索引中 'git add -N' 条目" -#: diff.c:5619 +#: diff.c:5570 msgid "treat 'git add -N' entries as real in the index" msgstr "将索引中 'git add -N' 条目当做真实的" -#: diff.c:5621 +#: diff.c:5572 msgid "<string>" msgstr "<字符串>" -#: diff.c:5622 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "查找改变了指定字符串出现次数的差异" -#: diff.c:5625 +#: diff.c:5576 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "查找改变指定正则匹配出现次数的差异" -#: diff.c:5628 +#: diff.c:5579 msgid "show all changes in the changeset with -S or -G" msgstr "显示使用 -S 或 -G 的变更集的所有变更" -#: diff.c:5631 +#: diff.c:5582 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式" -#: diff.c:5634 +#: diff.c:5585 msgid "control the order in which files appear in the output" msgstr "控制输出中的文件显示顺序" -#: diff.c:5635 diff.c:5638 +#: diff.c:5586 diff.c:5589 msgid "<path>" msgstr "<路径>" -#: diff.c:5636 +#: diff.c:5587 msgid "show the change in the specified path first" msgstr "先显示指定路径的变更" -#: diff.c:5639 +#: diff.c:5590 msgid "skip the output to the specified path" msgstr "跳过指定路径的输出" -#: diff.c:5641 +#: diff.c:5592 msgid "<object-id>" msgstr "<对象 ID>" -#: diff.c:5642 +#: diff.c:5593 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "查找改变指定对象出现次数的差异" -#: diff.c:5644 +#: diff.c:5595 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5645 +#: diff.c:5596 msgid "select files by diff type" msgstr "通过差异类型选择文件" -#: diff.c:5647 +#: diff.c:5598 msgid "<file>" msgstr "<文件>" -#: diff.c:5648 +#: diff.c:5599 msgid "Output to a specific file" msgstr "输出到一个指定的文件" -#: diff.c:6306 +#: diff.c:6257 msgid "exhaustive rename detection was skipped due to too many files." msgstr "由于文件太多，跳过详尽的重命名检查。" -#: diff.c:6309 +#: diff.c:6260 msgid "only found copies from modified paths due to too many files." msgstr "由于文件太多，只在修改的路径中找到了拷贝。" -#: diff.c:6312 +#: diff.c:6263 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3963,7 +3963,7 @@ msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令 #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" -msgstr "读取排序文件 '%s' 失败" +msgstr "无法读取排序文件 '%s'" #: diffcore-rename.c:1564 msgid "Performing inexact rename detection" @@ -3994,29 +3994,29 @@ msgstr "未识别的反向模式：'%s'" msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'" -#: dir.c:830 +#: dir.c:828 msgid "disabling cone pattern matching" -msgstr "禁止 cone 模式匹配" +msgstr "停用锥形模式匹配" -#: dir.c:1214 +#: dir.c:1212 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能将 %s 用作排除文件" -#: dir.c:2464 +#: dir.c:2418 #, c-format msgid "could not open directory '%s'" msgstr "不能打开目录 '%s'" -#: dir.c:2766 +#: dir.c:2720 msgid "failed to get kernel name and information" msgstr "无法获得内核名称和信息" -#: dir.c:2890 +#: dir.c:2844 msgid "untracked cache is disabled on this system or location" msgstr "缓存未跟踪文件在本系统或位置中被禁用" -#: dir.c:3158 +#: dir.c:3112 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4024,36 +4024,36 @@ msgstr "" "无法猜到目录名。\n" "请在命令行指定一个目录" -#: dir.c:3837 +#: dir.c:3800 #, c-format msgid "index file corrupt in repo %s" msgstr "仓库 %s 中的索引文件损坏" -#: dir.c:3884 dir.c:3889 +#: dir.c:3847 dir.c:3852 #, c-format msgid "could not create directories for %s" msgstr "不能为 %s 创建目录" -#: dir.c:3918 +#: dir.c:3881 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能从 '%s' 迁移 git 目录到 '%s'" -#: editor.c:77 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "提示：等待您的编辑器关闭文件...%c" -#: entry.c:177 +#: entry.c:179 msgid "Filtering content" msgstr "过滤内容" -#: entry.c:498 +#: entry.c:500 #, c-format msgid "could not stat file '%s'" msgstr "不能对文件 '%s' 调用 stat" -#: environment.c:143 +#: environment.c:145 #, c-format msgid "bad git namespace path \"%s\"" msgstr "错误的 git 名字空间路径 \"%s\"" @@ -4063,278 +4063,274 @@ msgstr "错误的 git 名字空间路径 \"%s\"" msgid "too many args to run %s" msgstr "执行 %s 的参数太多" -#: fetch-pack.c:193 +#: fetch-pack.c:194 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack：应为 shallow 列表" -#: fetch-pack.c:196 +#: fetch-pack.c:197 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包" -#: fetch-pack.c:207 +#: fetch-pack.c:208 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包" -#: fetch-pack.c:227 +#: fetch-pack.c:228 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'" -#: fetch-pack.c:238 +#: fetch-pack.c:239 msgid "unable to write to remote" msgstr "无法写到远程" -#: fetch-pack.c:299 -msgid "--stateless-rpc requires multi_ack_detailed" -msgstr "--stateless-rpc 需要 multi_ack_detailed" - -#: fetch-pack.c:394 fetch-pack.c:1434 +#: fetch-pack.c:395 fetch-pack.c:1439 #, c-format msgid "invalid shallow line: %s" msgstr "无效的 shallow 信息：%s" -#: fetch-pack.c:400 fetch-pack.c:1440 +#: fetch-pack.c:401 fetch-pack.c:1445 #, c-format msgid "invalid unshallow line: %s" msgstr "无效的 unshallow 信息：%s" -#: fetch-pack.c:402 fetch-pack.c:1442 +#: fetch-pack.c:403 fetch-pack.c:1447 #, c-format msgid "object not found: %s" msgstr "对象未找到：%s" -#: fetch-pack.c:405 fetch-pack.c:1445 +#: fetch-pack.c:406 fetch-pack.c:1450 #, c-format msgid "error in object: %s" msgstr "对象中出错：%s" -#: fetch-pack.c:407 fetch-pack.c:1447 +#: fetch-pack.c:408 fetch-pack.c:1452 #, c-format msgid "no shallow found: %s" msgstr "未发现 shallow：%s" -#: fetch-pack.c:410 fetch-pack.c:1451 +#: fetch-pack.c:411 fetch-pack.c:1456 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "应为 shallow/unshallow，却得到 %s" -#: fetch-pack.c:450 +#: fetch-pack.c:451 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" -#: fetch-pack.c:467 +#: fetch-pack.c:468 #, c-format msgid "invalid commit %s" msgstr "无效提交 %s" -#: fetch-pack.c:498 +#: fetch-pack.c:499 msgid "giving up" msgstr "放弃" -#: fetch-pack.c:511 progress.c:339 +#: fetch-pack.c:512 progress.c:339 msgid "done" msgstr "完成" -#: fetch-pack.c:523 +#: fetch-pack.c:524 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" -#: fetch-pack.c:559 +#: fetch-pack.c:560 #, c-format msgid "Marking %s as complete" msgstr "标记 %s 为完成" -#: fetch-pack.c:774 +#: fetch-pack.c:775 #, c-format msgid "already have %s (%s)" msgstr "已经有 %s（%s）" -#: fetch-pack.c:860 +#: fetch-pack.c:861 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack：无法派生 sideband 多路输出" -#: fetch-pack.c:868 +#: fetch-pack.c:869 msgid "protocol error: bad pack header" msgstr "协议错误：坏的包头" -#: fetch-pack.c:962 +#: fetch-pack.c:965 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack：无法派生进程 %s" -#: fetch-pack.c:968 +#: fetch-pack.c:971 msgid "fetch-pack: invalid index-pack output" msgstr "fetch-pack：无效的 index-pack 输出" -#: fetch-pack.c:985 +#: fetch-pack.c:988 #, c-format msgid "%s failed" msgstr "%s 失败" -#: fetch-pack.c:987 +#: fetch-pack.c:990 msgid "error in sideband demultiplexer" msgstr "sideband 多路输出出错" -#: fetch-pack.c:1030 +#: fetch-pack.c:1035 #, c-format msgid "Server version is %.*s" msgstr "服务器版本 %.*s" -#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053 -#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069 -#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085 -#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 +#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090 +#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112 #, c-format msgid "Server supports %s" msgstr "服务器支持 %s" -#: fetch-pack.c:1040 +#: fetch-pack.c:1045 msgid "Server does not support shallow clients" msgstr "服务器不支持浅客户端" -#: fetch-pack.c:1100 +#: fetch-pack.c:1105 msgid "Server does not support --shallow-since" msgstr "服务器不支持 --shallow-since" -#: fetch-pack.c:1105 +#: fetch-pack.c:1110 msgid "Server does not support --shallow-exclude" msgstr "服务器不支持 --shallow-exclude" -#: fetch-pack.c:1109 +#: fetch-pack.c:1114 msgid "Server does not support --deepen" msgstr "服务器不支持 --deepen" -#: fetch-pack.c:1111 +#: fetch-pack.c:1116 msgid "Server does not support this repository's object format" msgstr "服务器不支持这个仓库的对象格式" -#: fetch-pack.c:1124 +#: fetch-pack.c:1129 msgid "no common commits" msgstr "没有共同的提交" -#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130 +#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130 msgid "source repository is shallow, reject to clone." msgstr "源仓库是浅克隆，拒绝克隆。" -#: fetch-pack.c:1139 fetch-pack.c:1671 +#: fetch-pack.c:1144 fetch-pack.c:1681 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：获取失败。" -#: fetch-pack.c:1253 +#: fetch-pack.c:1258 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "不匹配的算法：客户端 %s，服务端 %s" -#: fetch-pack.c:1257 +#: fetch-pack.c:1262 #, c-format msgid "the server does not support algorithm '%s'" msgstr "服务器不支持算法 '%s'" -#: fetch-pack.c:1290 +#: fetch-pack.c:1295 msgid "Server does not support shallow requests" msgstr "服务器不支持浅克隆请求" -#: fetch-pack.c:1297 +#: fetch-pack.c:1302 msgid "Server supports filter" msgstr "服务器支持 filter" -#: fetch-pack.c:1340 fetch-pack.c:2053 +#: fetch-pack.c:1345 fetch-pack.c:2063 msgid "unable to write request to remote" msgstr "无法将请求写到远程" -#: fetch-pack.c:1358 +#: fetch-pack.c:1363 #, c-format msgid "error reading section header '%s'" msgstr "读取节标题 '%s' 出错" -#: fetch-pack.c:1364 +#: fetch-pack.c:1369 #, c-format msgid "expected '%s', received '%s'" msgstr "预期 '%s'，得到 '%s'" -#: fetch-pack.c:1398 +#: fetch-pack.c:1403 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "意外的确认行：'%s'" -#: fetch-pack.c:1403 +#: fetch-pack.c:1408 #, c-format msgid "error processing acks: %d" msgstr "处理 ack 出错：%d" -#: fetch-pack.c:1413 +#: fetch-pack.c:1418 msgid "expected packfile to be sent after 'ready'" msgstr "预期在 'ready' 之后发送 packfile" -#: fetch-pack.c:1415 +#: fetch-pack.c:1420 msgid "expected no other sections to be sent after no 'ready'" msgstr "在没有 'ready' 不应该发送其它小节" -#: fetch-pack.c:1456 +#: fetch-pack.c:1461 #, c-format msgid "error processing shallow info: %d" msgstr "处理浅克隆信息出错：%d" -#: fetch-pack.c:1505 +#: fetch-pack.c:1510 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "预期 wanted-ref，得到 '%s'" -#: fetch-pack.c:1510 +#: fetch-pack.c:1515 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "意外的 wanted-ref：'%s'" -#: fetch-pack.c:1515 +#: fetch-pack.c:1520 #, c-format msgid "error processing wanted refs: %d" msgstr "处理要获取的引用出错：%d" -#: fetch-pack.c:1545 +#: fetch-pack.c:1550 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack：预期响应结束包" -#: fetch-pack.c:1949 +#: fetch-pack.c:1959 msgid "no matching remote head" msgstr "没有匹配的远程分支" -#: fetch-pack.c:1972 builtin/clone.c:581 +#: fetch-pack.c:1982 builtin/clone.c:581 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必需的对象" -#: fetch-pack.c:2075 +#: fetch-pack.c:2085 msgid "unexpected 'ready' from remote" msgstr "来自远程的意外的 'ready'" -#: fetch-pack.c:2098 +#: fetch-pack.c:2108 #, c-format msgid "no such remote ref %s" msgstr "没有这样的远程引用 %s" -#: fetch-pack.c:2101 +#: fetch-pack.c:2111 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "服务器不允许请求未公开的对象 %s" -#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902 -#: gpg-interface.c:918 +#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974 +#: gpg-interface.c:990 msgid "could not create temporary file" msgstr "不能创建临时文件" -#: gpg-interface.c:332 gpg-interface.c:454 +#: gpg-interface.c:332 gpg-interface.c:460 #, c-format msgid "failed writing detached signature to '%s'" msgstr "无法将分离式签名写入 '%s'" -#: gpg-interface.c:445 +#: gpg-interface.c:451 msgid "" "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " "signature verification" msgstr "ssh 签名验证需要 gpg.ssh.allowedSignersFile 被设置且存在" -#: gpg-interface.c:469 +#: gpg-interface.c:480 msgid "" "ssh-keygen -Y find-principals/verify is needed for ssh signature " "verification (available in openssh version 8.2p1+)" @@ -4342,61 +4338,61 @@ msgstr "" "ssh 签名验证需要 ssh-keygen -Y find-principals/verify \n" "（openssh 8.2p1+ 版本可用）" -#: gpg-interface.c:523 +#: gpg-interface.c:536 #, c-format msgid "ssh signing revocation file configured but not found: %s" msgstr "设置了 ssh 签名吊销文件但无法找到：%s" -#: gpg-interface.c:576 +#: gpg-interface.c:624 #, c-format msgid "bad/incompatible signature '%s'" msgstr "坏的/不兼容的签名 '%s‘" -#: gpg-interface.c:735 gpg-interface.c:740 +#: gpg-interface.c:801 gpg-interface.c:806 #, c-format msgid "failed to get the ssh fingerprint for key '%s'" msgstr "无法得到密钥 '%s' 的 ssh 指纹" -#: gpg-interface.c:762 +#: gpg-interface.c:829 msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一" -#: gpg-interface.c:780 +#: gpg-interface.c:851 #, c-format msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "gpg.ssh.defaultKeyCommand 成功，但没有返回密钥：%s %s" -#: gpg-interface.c:786 +#: gpg-interface.c:857 #, c-format msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s" -#: gpg-interface.c:874 +#: gpg-interface.c:945 msgid "gpg failed to sign the data" -msgstr "gpg 数据签名失败" +msgstr "gpg 无法为数据签名" -#: gpg-interface.c:895 +#: gpg-interface.c:967 msgid "user.signingkey needs to be set for ssh signing" msgstr "ssh 签名需要设置 user.signingkey" -#: gpg-interface.c:906 +#: gpg-interface.c:978 #, c-format msgid "failed writing ssh signing key to '%s'" msgstr "无法将 ssh 签名密钥写入 '%s'" -#: gpg-interface.c:924 +#: gpg-interface.c:996 #, c-format msgid "failed writing ssh signing key buffer to '%s'" msgstr "无法将 ssh 签名密钥缓冲区写入 '%s'" -#: gpg-interface.c:942 +#: gpg-interface.c:1014 msgid "" "ssh-keygen -Y sign is needed for ssh signing (available in openssh version " "8.2p1+)" msgstr "ssh 签名需要 ssh-keygen -Y sign （openssh 8.2p1+ 版本可用）" -#: gpg-interface.c:954 +#: gpg-interface.c:1026 #, c-format msgid "failed reading ssh signing data buffer from '%s'" msgstr "无法从 '%s' 读入 ssh 签名数据" @@ -4406,7 +4402,7 @@ msgstr "无法从 '%s' 读入 ssh 签名数据" msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" -#: grep.c:533 +#: grep.c:531 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4414,18 +4410,18 @@ msgstr "" "给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此" "功能" -#: grep.c:1928 +#: grep.c:1942 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90 +#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" -msgstr "对 '%s' 调用 stat 失败" +msgstr "无法对 '%s' 调用 stat" -#: grep.c:1956 +#: grep.c:1970 #, c-format msgid "'%s': short read" msgstr "'%s'：读取不完整" @@ -4546,8 +4542,8 @@ msgstr "假定您想要的是 '%s' 并继续。" #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" -msgstr "取而代之运行 '%s' ？ (y/N)" +msgid "Run '%s' instead [y/N]? " +msgstr "取而代之运行 '%s' [y/N]？" #: help.c:654 #, c-format @@ -4767,7 +4763,7 @@ msgstr "在 ls-refs 参数后应该有一个 flush 包" msgid "quoted CRLF detected" msgstr "检测到被引用的 CRLF" -#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46 +#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46 #, c-format msgid "bad action '%s' for '%s'" msgstr "'%2$s' 的错误动作 '%1$s'" @@ -4988,7 +4984,7 @@ msgstr "子模组" msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" -#: merge-ort.c:3856 +#: merge-ort.c:3869 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4997,7 +4993,7 @@ msgstr "" "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本" "在树中被保留。" -#: merge-ort.c:4152 +#: merge-ort.c:4165 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -5007,7 +5003,7 @@ msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:4521 +#: merge-ort.c:4534 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "无法收集树 %s、%s、%s 的合并信息" @@ -5021,7 +5017,7 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405 msgid "Already up to date." msgstr "已经是最新的。" @@ -5042,7 +5038,7 @@ msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。" #: merge-recursive.c:881 #, c-format msgid "failed to create path '%s'%s" -msgstr "创建路径 '%s'%s 失败" +msgstr "无法创建路径 '%s'%s" #: merge-recursive.c:892 #, c-format @@ -5071,12 +5067,12 @@ msgstr "%s '%s' 应为数据对象" #: merge-recursive.c:986 #, c-format msgid "failed to open '%s': %s" -msgstr "打开 '%s' 失败：%s" +msgstr "无法打开 '%s'：%s" #: merge-recursive.c:997 #, c-format msgid "failed to symlink '%s': %s" -msgstr "创建符号链接 '%s' 失败：%s" +msgstr "无法创建符号链接 '%s'：%s" #: merge-recursive.c:1002 #, c-format @@ -5296,17 +5292,17 @@ msgstr "合并未返回提交" msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904 +#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906 #: builtin/stash.c:489 msgid "Unable to write index." msgstr "不能写入索引。" #: merge.c:41 msgid "failed to read the cache" -msgstr "读取缓存失败" +msgstr "无法读取缓存" -#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967 -#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706 +#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022 +#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706 #: builtin/stash.c:269 msgid "unable to write new index file" msgstr "无法写新的索引文件" @@ -5315,211 +5311,211 @@ msgstr "无法写新的索引文件" msgid "multi-pack-index OID fanout is of the wrong size" msgstr "多包索引的对象ID扇出表大小错误" -#: midx.c:109 +#: midx.c:111 #, c-format msgid "multi-pack-index file %s is too small" msgstr "多包索引文件 %s 太小" -#: midx.c:125 +#: midx.c:127 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配" -#: midx.c:130 +#: midx.c:132 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index 版本 %d 不能被识别" -#: midx.c:135 +#: midx.c:137 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "多包索引哈希版本 %u 和版本 %u 不匹配" -#: midx.c:152 +#: midx.c:154 msgid "multi-pack-index missing required pack-name chunk" msgstr "多包索引缺少必需的包名块" -#: midx.c:154 +#: midx.c:156 msgid "multi-pack-index missing required OID fanout chunk" msgstr "多包索引缺少必需的对象 ID 扇出块" -#: midx.c:156 +#: midx.c:158 msgid "multi-pack-index missing required OID lookup chunk" msgstr "多包索引缺少必需的对象 ID 查询块" -#: midx.c:158 +#: midx.c:160 msgid "multi-pack-index missing required object offsets chunk" msgstr "多包索引缺少必需的对象偏移块" -#: midx.c:174 +#: midx.c:176 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "多包索引包名无序：'%s' 在 '%s' 之前" -#: midx.c:221 +#: midx.c:224 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "错的 pack-int-id：%u（共有 %u 个包）" -#: midx.c:271 +#: midx.c:274 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引存储一个64位偏移，但是 off_t 太小" -#: midx.c:502 +#: midx.c:505 #, c-format msgid "failed to add packfile '%s'" -msgstr "添加包文件 '%s' 失败" +msgstr "无法添加包文件 '%s'" -#: midx.c:508 +#: midx.c:511 #, c-format msgid "failed to open pack-index '%s'" -msgstr "打开包索引 '%s' 失败" +msgstr "无法打开包索引 '%s'" -#: midx.c:576 +#: midx.c:579 #, c-format msgid "failed to locate object %d in packfile" -msgstr "在包文件中定位对象 %d 失败" +msgstr "无法在包文件中定位对象 %d" -#: midx.c:892 +#: midx.c:895 msgid "cannot store reverse index file" msgstr "无法存储反向索引文件" -#: midx.c:990 +#: midx.c:993 #, c-format msgid "could not parse line: %s" -msgstr "不能解析行： %s" +msgstr "不能解析行：%s" -#: midx.c:992 +#: midx.c:995 #, c-format msgid "malformed line: %s" msgstr "格式错误的行：%s" -#: midx.c:1159 +#: midx.c:1162 msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "忽略已存在的多包索引，校验码不匹配" -#: midx.c:1184 +#: midx.c:1187 msgid "could not load pack" msgstr "不能载入包" -#: midx.c:1190 +#: midx.c:1193 #, c-format msgid "could not open index for %s" msgstr "不能打开 %s 的索引" -#: midx.c:1201 +#: midx.c:1204 msgid "Adding packfiles to multi-pack-index" msgstr "添加包文件到多包索引" -#: midx.c:1244 +#: midx.c:1247 #, c-format msgid "unknown preferred pack: '%s'" msgstr "未知的首选包：'%s'" -#: midx.c:1289 +#: midx.c:1292 #, c-format msgid "cannot select preferred pack %s with no objects" msgstr "不能选择没有对象的首选包 %s" -#: midx.c:1321 +#: midx.c:1324 #, c-format msgid "did not see pack-file %s to drop" msgstr "没有看到要丢弃的包文件 %s" -#: midx.c:1367 +#: midx.c:1370 #, c-format msgid "preferred pack '%s' is expired" msgstr "首选包 '%s' 已过期" -#: midx.c:1380 +#: midx.c:1383 msgid "no pack files to index." msgstr "没有要索引的包文件。" -#: midx.c:1417 +#: midx.c:1420 msgid "could not write multi-pack bitmap" msgstr "无法写入多包位图" -#: midx.c:1427 +#: midx.c:1430 msgid "could not write multi-pack-index" msgstr "无法写入多包索引" -#: midx.c:1486 builtin/clean.c:37 +#: midx.c:1489 builtin/clean.c:37 #, c-format msgid "failed to remove %s" -msgstr "删除 %s 失败" +msgstr "无法删除 %s" -#: midx.c:1517 +#: midx.c:1522 #, c-format msgid "failed to clear multi-pack-index at %s" -msgstr "清理位于 %s 的多包索引失败" +msgstr "无法清理位于 %s 的多包索引" -#: midx.c:1577 +#: midx.c:1585 msgid "multi-pack-index file exists, but failed to parse" msgstr "多包索引文件存在，但无法解析" -#: midx.c:1585 +#: midx.c:1593 msgid "incorrect checksum" msgstr "不正确的校验码" -#: midx.c:1588 +#: midx.c:1596 msgid "Looking for referenced packfiles" msgstr "正在查找引用的包文件" -#: midx.c:1603 +#: midx.c:1611 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1608 +#: midx.c:1616 msgid "the midx contains no oid" msgstr "midx 不包含 oid" -#: midx.c:1617 +#: midx.c:1625 msgid "Verifying OID order in multi-pack-index" msgstr "校验多包索引中的 OID 顺序" -#: midx.c:1626 +#: midx.c:1634 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1646 +#: midx.c:1654 msgid "Sorting objects by packfile" msgstr "通过包文件为对象排序" -#: midx.c:1653 +#: midx.c:1661 msgid "Verifying object offsets" msgstr "校验对象偏移" -#: midx.c:1669 +#: midx.c:1677 #, c-format msgid "failed to load pack entry for oid[%d] = %s" -msgstr "为 oid[%d] = %s 加载包条目失败" +msgstr "无法为 oid[%d] = %s 加载包条目" -#: midx.c:1675 +#: midx.c:1683 #, c-format msgid "failed to load pack-index for packfile %s" -msgstr "为包文件 %s 加载包索引失败" +msgstr "无法为包文件 %s 加载包索引" -#: midx.c:1684 +#: midx.c:1692 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>" -#: midx.c:1709 +#: midx.c:1719 msgid "Counting referenced objects" msgstr "正在对引用对象计数" -#: midx.c:1719 +#: midx.c:1729 msgid "Finding and deleting unreferenced packfiles" msgstr "正在查找和删除未引用的包文件" -#: midx.c:1911 +#: midx.c:1921 msgid "could not start pack-objects" msgstr "不能开始 pack-objects" -#: midx.c:1931 +#: midx.c:1941 msgid "could not finish pack-objects" msgstr "不能结束 pack-objects" @@ -5577,257 +5573,257 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" -#: object-file.c:459 +#: object-file.c:456 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates" -#: object-file.c:517 +#: object-file.c:514 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "无法规范化备用对象路径：%s" -#: object-file.c:591 +#: object-file.c:588 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略备用对象库，嵌套太深" -#: object-file.c:598 +#: object-file.c:595 #, c-format msgid "unable to normalize object directory: %s" msgstr "无法规范化对象目录: %s" -#: object-file.c:641 +#: object-file.c:638 msgid "unable to fdopen alternates lockfile" msgstr "无法 fdopen 替换锁文件" -#: object-file.c:659 +#: object-file.c:656 msgid "unable to read alternates file" msgstr "无法读取替代文件" -#: object-file.c:666 +#: object-file.c:663 msgid "unable to move new alternates file into place" msgstr "无法将新的替代文件移动到位" -#: object-file.c:701 +#: object-file.c:741 #, c-format msgid "path '%s' does not exist" msgstr "路径 '%s' 不存在" -#: object-file.c:722 +#: object-file.c:762 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" -#: object-file.c:728 +#: object-file.c:768 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "参考仓库 '%s' 不是一个本地仓库。" -#: object-file.c:734 +#: object-file.c:774 #, c-format msgid "reference repository '%s' is shallow" msgstr "参考仓库 '%s' 是一个浅克隆" -#: object-file.c:742 +#: object-file.c:782 #, c-format msgid "reference repository '%s' is grafted" msgstr "参考仓库 '%s' 已被移植" -#: object-file.c:773 +#: object-file.c:813 #, c-format msgid "could not find object directory matching %s" msgstr "无法找到和 %s 匹配的对象目录" -#: object-file.c:823 +#: object-file.c:863 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "解析备用引用时无效的行：%s" -#: object-file.c:973 +#: object-file.c:1013 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>" -#: object-file.c:1008 +#: object-file.c:1048 #, c-format msgid "mmap failed%s" msgstr "mmap 失败%s" -#: object-file.c:1174 +#: object-file.c:1214 #, c-format msgid "object file %s is empty" msgstr "对象文件 %s 为空" -#: object-file.c:1293 object-file.c:2499 +#: object-file.c:1333 object-file.c:2542 #, c-format msgid "corrupt loose object '%s'" msgstr "损坏的松散对象 '%s'" -#: object-file.c:1295 object-file.c:2503 +#: object-file.c:1335 object-file.c:2546 #, c-format msgid "garbage at end of loose object '%s'" msgstr "松散对象 '%s' 后面有垃圾数据" -#: object-file.c:1417 +#: object-file.c:1457 #, c-format msgid "unable to parse %s header" msgstr "无法解析 %s 头部" -#: object-file.c:1419 +#: object-file.c:1459 msgid "invalid object type" msgstr "无效的对象类型" -#: object-file.c:1430 +#: object-file.c:1470 #, c-format msgid "unable to unpack %s header" msgstr "无法解开 %s 头部" -#: object-file.c:1434 +#: object-file.c:1474 #, c-format msgid "header for %s too long, exceeds %d bytes" msgstr "%s 的头部太长，超出了 %d 字节" -#: object-file.c:1664 +#: object-file.c:1704 #, c-format msgid "failed to read object %s" -msgstr "读取对象 %s 失败" +msgstr "无法读取对象 %s" -#: object-file.c:1668 +#: object-file.c:1708 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" -#: object-file.c:1672 +#: object-file.c:1712 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "松散对象 %s（保存在 %s）已损坏" -#: object-file.c:1676 +#: object-file.c:1716 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包对象 %s（保存在 %s）已损坏" -#: object-file.c:1781 +#: object-file.c:1821 #, c-format msgid "unable to write file %s" msgstr "无法写文件 %s" -#: object-file.c:1788 +#: object-file.c:1828 #, c-format msgid "unable to set permission to '%s'" msgstr "无法为 '%s' 设置权限" -#: object-file.c:1795 +#: object-file.c:1835 msgid "file write error" msgstr "文件写错误" -#: object-file.c:1815 +#: object-file.c:1858 msgid "error when closing loose object file" msgstr "关闭松散对象文件时出错" -#: object-file.c:1882 +#: object-file.c:1925 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "权限不足，无法在仓库对象库 %s 中添加对象" -#: object-file.c:1884 +#: object-file.c:1927 msgid "unable to create temporary file" msgstr "无法创建临时文件" -#: object-file.c:1908 +#: object-file.c:1951 msgid "unable to write loose object file" msgstr "不能写松散对象文件" -#: object-file.c:1914 +#: object-file.c:1957 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能压缩新对象 %s（%d）" -#: object-file.c:1918 +#: object-file.c:1961 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在对象 %s 上调用 deflateEnd 失败（%d）" -#: object-file.c:1922 +#: object-file.c:1965 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不稳定对象源数据搞糊涂了" -#: object-file.c:1933 builtin/pack-objects.c:1243 +#: object-file.c:1976 builtin/pack-objects.c:1243 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上调用 utime() 失败" -#: object-file.c:2011 +#: object-file.c:2054 #, c-format msgid "cannot read object for %s" msgstr "不能读取对象 %s" -#: object-file.c:2062 +#: object-file.c:2105 msgid "corrupt commit" msgstr "损坏的提交" -#: object-file.c:2070 +#: object-file.c:2113 msgid "corrupt tag" msgstr "损坏的标签" -#: object-file.c:2170 +#: object-file.c:2213 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 时读取错误" -#: object-file.c:2173 +#: object-file.c:2216 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 时读入不完整" -#: object-file.c:2246 object-file.c:2256 +#: object-file.c:2289 object-file.c:2299 #, c-format msgid "%s: failed to insert into database" -msgstr "%s：插入数据库失败" +msgstr "%s：无法插入数据库" -#: object-file.c:2262 +#: object-file.c:2305 #, c-format msgid "%s: unsupported file type" msgstr "%s：不支持的文件类型" -#: object-file.c:2286 builtin/fetch.c:1445 +#: object-file.c:2329 builtin/fetch.c:1448 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一个有效的对象" -#: object-file.c:2288 +#: object-file.c:2331 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" -#: object-file.c:2315 +#: object-file.c:2358 #, c-format msgid "unable to open %s" msgstr "不能打开 %s" -#: object-file.c:2510 +#: object-file.c:2553 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s 的哈希值不匹配（预期 %s）" -#: object-file.c:2533 +#: object-file.c:2576 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" -#: object-file.c:2539 +#: object-file.c:2582 #, c-format msgid "unable to unpack header of %s" msgstr "无法解压缩 %s 的头部" -#: object-file.c:2544 +#: object-file.c:2587 #, c-format msgid "unable to parse header of %s" msgstr "无法解析 %s 的头部" -#: object-file.c:2555 +#: object-file.c:2598 #, c-format msgid "unable to unpack contents of %s" msgstr "无法解压缩 %s 的内容" @@ -5953,25 +5949,25 @@ msgstr "不能解析对象：%s" msgid "hash mismatch %s" msgstr "哈希值与 %s 不匹配" -#: pack-bitmap.c:348 +#: pack-bitmap.c:353 msgid "multi-pack bitmap is missing required reverse index" msgstr "多包位图缺少必需的反向索引" -#: pack-bitmap.c:424 +#: pack-bitmap.c:429 msgid "load_reverse_index: could not open pack" msgstr "load_reverse_index：无法打开包" -#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424 +#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424 #, c-format msgid "unable to get size of %s" msgstr "无法得到 %s 的大小" -#: pack-bitmap.c:1916 +#: pack-bitmap.c:1935 #, c-format msgid "could not find %s in pack %s at offset %<PRIuMAX>" msgstr "在包 %2$s 偏移 %3$<PRIuMAX> 中无法找到 %1$s" -#: pack-bitmap.c:1952 builtin/rev-list.c:92 +#: pack-bitmap.c:1971 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "无法得到 %s 的磁盘使用量" @@ -6020,45 +6016,50 @@ msgstr "无法设置 %s 为可读" msgid "could not write '%s' promisor file" msgstr "无法写入 '%s' 承诺者文件" -#: packfile.c:626 +#: packfile.c:627 msgid "offset before end of packfile (broken .idx?)" msgstr "偏移量在包文件结束之前（损坏的 .idx？）" -#: packfile.c:656 +#: packfile.c:657 #, c-format msgid "packfile %s cannot be mapped%s" msgstr "包文件 %s 不能被映射%s" -#: packfile.c:1923 +#: packfile.c:1924 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" -#: packfile.c:1927 +#: packfile.c:1928 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" -#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175 +#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175 #, c-format msgid "option `%s' expects a numerical value" msgstr "选项 `%s' 期望一个数字值" -#: parse-options-cb.c:41 +#: parse-options-cb.c:42 #, c-format msgid "malformed expiration date '%s'" msgstr "格式错误的到期时间：'%s'" -#: parse-options-cb.c:54 +#: parse-options-cb.c:55 #, c-format msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" -#: parse-options-cb.c:132 parse-options-cb.c:149 +#: parse-options-cb.c:133 parse-options-cb.c:150 #, c-format msgid "malformed object name '%s'" msgstr "格式错误的对象名 '%s'" +#: parse-options-cb.c:307 +#, c-format +msgid "option `%s' expects \"%s\" or \"%s\"" +msgstr "选项 `%s' 期望 \"%s\" 或 \"%s\"" + #: parse-options.c:58 #, c-format msgid "%s requires a value" @@ -6094,36 +6095,36 @@ msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀" msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）" -#: parse-options.c:427 parse-options.c:435 +#: parse-options.c:428 parse-options.c:436 #, c-format msgid "did you mean `--%s` (with two dashes)?" msgstr "您的意思是 `--%s`（有两个短线）？" -#: parse-options.c:677 parse-options.c:1053 +#: parse-options.c:678 parse-options.c:1054 #, c-format msgid "alias of --%s" msgstr "--%s 的别名" -#: parse-options.c:891 +#: parse-options.c:892 #, c-format msgid "unknown option `%s'" msgstr "未知选项 `%s'" -#: parse-options.c:893 +#: parse-options.c:894 #, c-format msgid "unknown switch `%c'" msgstr "未知开关 `%c'" -#: parse-options.c:895 +#: parse-options.c:896 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "字符串中未知的非 ascii 字符选项：`%s'" -#: parse-options.c:919 +#: parse-options.c:920 msgid "..." msgstr "..." -#: parse-options.c:933 +#: parse-options.c:934 #, c-format msgid "usage: %s" msgstr "用法：%s" @@ -6131,7 +6132,7 @@ msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:948 +#: parse-options.c:949 #, c-format msgid " or: %s" msgstr " 或：%s" @@ -6155,18 +6156,18 @@ msgstr " 或：%s" #. translated) N_() usage string, which contained embedded #. newlines before we split it up. #. -#: parse-options.c:969 +#: parse-options.c:970 #, c-format msgid "%*s%s" msgstr "%*s%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:992 +#: parse-options.c:993 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:1039 +#: parse-options.c:1040 msgid "-NUM" msgstr "-数字" @@ -6292,17 +6293,17 @@ msgstr "读取错误" msgid "the remote end hung up unexpectedly" msgstr "远端意外挂断了" -#: pkt-line.c:390 pkt-line.c:392 +#: pkt-line.c:417 pkt-line.c:419 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "协议错误：错误的行长度字符串：%.4s" -#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417 +#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444 #, c-format msgid "protocol error: bad line length %d" msgstr "协议错误：错误的行长度 %d" -#: pkt-line.c:434 sideband.c:165 +#: pkt-line.c:472 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "远程错误：%s" @@ -6353,7 +6354,7 @@ msgstr "不能启动 `log`" msgid "could not read `log` output" msgstr "不能读取 `log` 的输出" -#: range-diff.c:97 sequencer.c:5605 +#: range-diff.c:97 sequencer.c:5602 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" @@ -6372,61 +6373,57 @@ msgstr "无法解析 git 头 '%.*s'" #: range-diff.c:304 msgid "failed to generate diff" -msgstr "生成 diff 失败" - -#: range-diff.c:559 -msgid "--left-only and --right-only are mutually exclusive" -msgstr "--left-only 和 --right-only 互斥" +msgstr "无法生成 diff" #: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日志" -#: read-cache.c:710 +#: read-cache.c:723 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）" -#: read-cache.c:726 +#: read-cache.c:739 msgid "cannot create an empty blob in the object database" msgstr "不能在对象数据库中创建空的数据对象" -#: read-cache.c:748 +#: read-cache.c:761 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "%s：只能添加常规文件、符号链接或 git 目录" -#: read-cache.c:753 builtin/submodule--helper.c:3241 +#: read-cache.c:766 builtin/submodule--helper.c:3242 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' 没有检出一个提交" -#: read-cache.c:805 +#: read-cache.c:818 #, c-format msgid "unable to index file '%s'" msgstr "无法索引文件 '%s'" -#: read-cache.c:824 +#: read-cache.c:837 #, c-format msgid "unable to add '%s' to index" msgstr "无法在索引中添加 '%s'" -#: read-cache.c:835 +#: read-cache.c:848 #, c-format msgid "unable to stat '%s'" msgstr "无法对 %s 执行 stat" -#: read-cache.c:1373 +#: read-cache.c:1386 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起来既是文件又是目录" -#: read-cache.c:1588 +#: read-cache.c:1601 msgid "Refresh index" msgstr "刷新索引" -#: read-cache.c:1720 +#: read-cache.c:1733 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6435,7 +6432,7 @@ msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1730 +#: read-cache.c:1743 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6444,144 +6441,144 @@ msgstr "" "设置了 GIT_INDEX_VERSION，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1786 +#: read-cache.c:1799 #, c-format msgid "bad signature 0x%08x" msgstr "坏的签名 0x%08x" -#: read-cache.c:1789 +#: read-cache.c:1802 #, c-format msgid "bad index version %d" msgstr "坏的索引版本 %d" -#: read-cache.c:1798 +#: read-cache.c:1811 msgid "bad index file sha1 signature" msgstr "坏的索引文件 sha1 签名" -#: read-cache.c:1832 +#: read-cache.c:1845 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支持的 %.4s 扩展" # -#: read-cache.c:1834 +#: read-cache.c:1847 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 扩展" -#: read-cache.c:1871 +#: read-cache.c:1884 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引条目格式 0x%08x" -#: read-cache.c:1887 +#: read-cache.c:1900 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路径 '%s' 有错误的名称字段" -#: read-cache.c:1944 +#: read-cache.c:1957 msgid "unordered stage entries in index" msgstr "索引中有未排序的暂存条目" -#: read-cache.c:1947 +#: read-cache.c:1960 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合并文件 '%s' 有多个暂存条目" -#: read-cache.c:1950 +#: read-cache.c:1963 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暂存条目" -#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183 -#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987 +#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183 +#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519 -#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293 -#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201 +#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293 +#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202 msgid "index file corrupt" msgstr "索引文件损坏" -#: read-cache.c:2209 +#: read-cache.c:2222 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "无法创建 load_cache_entries 线程：%s" -#: read-cache.c:2222 +#: read-cache.c:2235 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "无法加入 load_cache_entries 线程：%s" -#: read-cache.c:2255 +#: read-cache.c:2268 #, c-format msgid "%s: index file open failed" msgstr "%s：打开索引文件失败" -#: read-cache.c:2259 +#: read-cache.c:2272 #, c-format msgid "%s: cannot stat the open index" msgstr "%s：不能对打开的索引执行 stat 操作" -#: read-cache.c:2263 +#: read-cache.c:2276 #, c-format msgid "%s: index file smaller than expected" msgstr "%s：索引文件比预期的小" -#: read-cache.c:2267 +#: read-cache.c:2280 #, c-format msgid "%s: unable to map index file%s" msgstr "%s：无法映射索引文件%s" -#: read-cache.c:2310 +#: read-cache.c:2323 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "无法创建 load_index_extensions 线程：%s" -#: read-cache.c:2337 +#: read-cache.c:2350 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "无法加入 load_index_extensions 线程：%s" -#: read-cache.c:2375 +#: read-cache.c:2396 #, c-format msgid "could not freshen shared index '%s'" msgstr "无法刷新共享索引 '%s'" -#: read-cache.c:2434 +#: read-cache.c:2455 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s" -#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147 +#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150 #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" -#: read-cache.c:3108 +#: read-cache.c:3129 msgid "failed to convert to a sparse-index" msgstr "无法转换为稀疏索引" -#: read-cache.c:3179 +#: read-cache.c:3200 #, c-format msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: read-cache.c:3192 +#: read-cache.c:3213 #, c-format msgid "unable to open git dir: %s" msgstr "不能打开 git 目录：%s" -#: read-cache.c:3204 +#: read-cache.c:3225 #, c-format msgid "unable to unlink: %s" msgstr "无法删除：%s" -#: read-cache.c:3233 +#: read-cache.c:3254 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修复 '%s' 的权限位" -#: read-cache.c:3390 +#: read-cache.c:3411 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暂存区 #0" @@ -6694,8 +6691,8 @@ msgstr "" "然而，如果您删除全部内容，变基操作将会终止。\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888 -#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883 +#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791 #: builtin/rebase.c:190 #, c-format msgid "could not write '%s'" @@ -6734,9 +6731,9 @@ msgstr "" #: rebase.c:29 #, c-format msgid "%s: 'preserve' superseded by 'merges'" -msgstr "%s： 'preserve' 被 'merges' 取代" +msgstr "%s：'preserve' 被 'merges' 取代" -#: ref-filter.c:42 wt-status.c:2036 +#: ref-filter.c:42 wt-status.c:2048 msgid "gone" msgstr "丢失" @@ -6775,7 +6772,8 @@ msgstr "期望整数值 refname:lstrip=%s" msgid "Integer value expected refname:rstrip=%s" msgstr "期望整数值 refname:rstrip=%s" -#: ref-filter.c:265 +#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431 +#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "未能识别的 %%(%s) 参数：%s" @@ -6785,11 +6783,6 @@ msgstr "未能识别的 %%(%s) 参数：%s" msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) 不带参数" -#: ref-filter.c:344 -#, c-format -msgid "unrecognized %%(objectsize) argument: %s" -msgstr "未能识别的 %%(objectsize) 参数：%s" - #: ref-filter.c:352 #, c-format msgid "%%(deltabase) does not take arguments" @@ -6800,11 +6793,6 @@ msgstr "%%(deltabase) 不带参数" msgid "%%(body) does not take arguments" msgstr "%%(body) 不带参数" -#: ref-filter.c:377 -#, c-format -msgid "unrecognized %%(subject) argument: %s" -msgstr "未能识别的 %%(subject) 参数：%s" - #: ref-filter.c:396 #, c-format msgid "expected %%(trailers:key=<value>)" @@ -6820,26 +6808,11 @@ msgstr "未知的 %%(trailers) 参数：%s" msgid "positive value expected contents:lines=%s" msgstr "期望一个正数 contents:lines=%s" -#: ref-filter.c:431 -#, c-format -msgid "unrecognized %%(contents) argument: %s" -msgstr "未能识别的 %%(contents) 参数：%s" - -#: ref-filter.c:443 -#, c-format -msgid "unrecognized %%(raw) argument: %s" -msgstr "未能识别的 %%(raw) 参数：%s" - #: ref-filter.c:458 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数" -#: ref-filter.c:462 -#, c-format -msgid "unrecognized argument '%s' in %%(%s)" -msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'" - #: ref-filter.c:476 #, c-format msgid "unrecognized email option: %s" @@ -6860,21 +6833,11 @@ msgstr "未能识别的位置：%s" msgid "unrecognized width:%s" msgstr "未能识别的宽度：%s" -#: ref-filter.c:534 -#, c-format -msgid "unrecognized %%(align) argument: %s" -msgstr "未能识别的 %%(align) 参数：%s" - #: ref-filter.c:542 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "元素 %%(align) 需要一个正数的宽度" -#: ref-filter.c:560 -#, c-format -msgid "unrecognized %%(if) argument: %s" -msgstr "未能识别的 %%(if) 参数：%s" - #: ref-filter.c:568 #, c-format msgid "%%(rest) does not take arguments" @@ -6896,15 +6859,10 @@ msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "不是 git 仓库，但是字段 '%.*s' 需要访问对象数据" -#: ref-filter.c:844 +#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948 #, c-format -msgid "format: %%(if) atom used without a %%(then) atom" -msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素" - -#: ref-filter.c:910 -#, c-format -msgid "format: %%(then) atom used without an %%(if) atom" -msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素" +msgid "format: %%(%s) atom used without a %%(%s) atom" +msgstr "格式：在没有 %%(%2$s) 元素的情况下使用了 %%(%1$s) 元素" #: ref-filter.c:912 #, c-format @@ -6916,16 +6874,6 @@ msgstr "格式：%%(then) 元素用了多次" msgid "format: %%(then) atom used after %%(else)" msgstr "格式：%%(then) 元素用在了 %%(else) 之后" -#: ref-filter.c:946 -#, c-format -msgid "format: %%(else) atom used without an %%(if) atom" -msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素" - -#: ref-filter.c:948 -#, c-format -msgid "format: %%(else) atom used without a %%(then) atom" -msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素" - #: ref-filter.c:950 #, c-format msgid "format: %%(else) atom used more than once" @@ -7000,22 +6948,22 @@ msgstr "格式错误的对象 '%s'" msgid "ignoring ref with broken name %s" msgstr "忽略带有错误名称 %s 的引用" -#: ref-filter.c:2250 refs.c:673 +#: ref-filter.c:2250 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "忽略损坏的引用 %s" -#: ref-filter.c:2623 +#: ref-filter.c:2629 #, c-format msgid "format: %%(end) atom missing" msgstr "格式：缺少 %%(end) 元素" -#: ref-filter.c:2726 +#: ref-filter.c:2740 #, c-format msgid "malformed object name %s" msgstr "格式错误的对象名 %s" -#: ref-filter.c:2731 +#: ref-filter.c:2745 #, c-format msgid "option `%s' must point to a commit" msgstr "选项 `%s' 必须指向一个提交" @@ -7059,71 +7007,71 @@ msgstr "无法获取 `%s`" msgid "invalid branch name: %s = %s" msgstr "无效的分支名：%s = %s" -#: refs.c:671 +#: refs.c:674 #, c-format msgid "ignoring dangling symref %s" msgstr "忽略悬空符号引用 %s" -#: refs.c:920 +#: refs.c:925 #, c-format msgid "log for ref %s has gap after %s" msgstr "引用 %s 的日志在 %s 之后有缺口" -#: refs.c:927 +#: refs.c:932 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "引用 %s 的日志意外终止于 %s " -#: refs.c:992 +#: refs.c:997 #, c-format msgid "log for %s is empty" msgstr "%s 的日志为空" -#: refs.c:1084 +#: refs.c:1090 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "拒绝更新有错误名称 '%s' 的引用" -#: refs.c:1155 +#: refs.c:1168 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "对引用 '%s' 执行 update_ref 失败：%s" -#: refs.c:2062 +#: refs.c:2069 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "不允许对引用 '%s' 多次更新" -#: refs.c:2142 +#: refs.c:2152 msgid "ref updates forbidden inside quarantine environment" msgstr "在隔离环境中禁止更新引用" -#: refs.c:2153 +#: refs.c:2163 msgid "ref updates aborted by hook" msgstr "引用更新被钩子中止" -#: refs.c:2253 refs.c:2283 +#: refs.c:2271 refs.c:2301 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' 已存在，无法创建 '%s'" -#: refs.c:2259 refs.c:2294 +#: refs.c:2277 refs.c:2312 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "无法同时处理 '%s' 和 '%s'" -#: refs/files-backend.c:1271 +#: refs/files-backend.c:1268 #, c-format msgid "could not remove reference %s" msgstr "无法删除引用 %s" -#: refs/files-backend.c:1285 refs/packed-backend.c:1549 +#: refs/files-backend.c:1282 refs/packed-backend.c:1549 #: refs/packed-backend.c:1559 #, c-format msgid "could not delete reference %s: %s" msgstr "无法删除引用 %s：%s" -#: refs/files-backend.c:1288 refs/packed-backend.c:1562 +#: refs/files-backend.c:1285 refs/packed-backend.c:1562 #, c-format msgid "could not delete references: %s" msgstr "无法删除引用：%s" @@ -7133,50 +7081,50 @@ msgstr "无法删除引用：%s" msgid "invalid refspec '%s'" msgstr "无效的引用规格：'%s'" -#: remote.c:351 +#: remote.c:402 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "配置的远程短名称不能以 '/' 开始：%s" -#: remote.c:399 +#: remote.c:450 msgid "more than one receivepack given, using the first" msgstr "提供了一个以上的 receivepack，使用第一个" -#: remote.c:407 +#: remote.c:458 msgid "more than one uploadpack given, using the first" msgstr "提供了一个以上的 uploadpack，使用第一个" -#: remote.c:590 +#: remote.c:699 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "不能同时获取 %s 和 %s 至 %s" -#: remote.c:594 +#: remote.c:703 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常跟踪 %s，而非 %s" -#: remote.c:598 +#: remote.c:707 #, c-format msgid "%s tracks both %s and %s" msgstr "%s 同时跟踪 %s 和 %s" -#: remote.c:666 +#: remote.c:775 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "模式的键 '%s' 没有 '*'" -#: remote.c:676 +#: remote.c:785 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "模式的值 '%s' 没有 '*'" -#: remote.c:1083 +#: remote.c:1192 #, c-format msgid "src refspec %s does not match any" msgstr "源引用规格 %s 没有匹配" -#: remote.c:1088 +#: remote.c:1197 #, c-format msgid "src refspec %s matches more than one" msgstr "源引用规格 %s 匹配超过一个" @@ -7185,7 +7133,7 @@ msgstr "源引用规格 %s 匹配超过一个" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1103 +#: remote.c:1212 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -7207,7 +7155,7 @@ msgstr "" "\n" "都不行，所以我们已放弃。您必须给出完整的引用。" -#: remote.c:1123 +#: remote.c:1232 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -7217,7 +7165,7 @@ msgstr "" "引用规格的 <src> 是一个提交对象。您是想创建一个新的分支而向\n" "'%s:refs/heads/%s' 推送么？" -#: remote.c:1128 +#: remote.c:1237 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -7227,7 +7175,7 @@ msgstr "" "引用规格的 <src> 是一个标签对象。您是想创建一个新的标签而向\n" "'%s:refs/tags/%s' 推送么？" -#: remote.c:1133 +#: remote.c:1242 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -7237,7 +7185,7 @@ msgstr "" "引用规格的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n" "'%s:refs/tags/%s' 推送么？" -#: remote.c:1138 +#: remote.c:1247 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -7247,114 +7195,114 @@ msgstr "" "引用规格的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n" "'%s:refs/tags/%s' 推送么？" -#: remote.c:1174 +#: remote.c:1283 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s 无法被解析为分支" -#: remote.c:1185 +#: remote.c:1294 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "无法删除 '%s'：远程引用不存在" -#: remote.c:1197 +#: remote.c:1306 #, c-format msgid "dst refspec %s matches more than one" msgstr "目标引用规格 %s 匹配超过一个" -#: remote.c:1204 +#: remote.c:1313 #, c-format msgid "dst ref %s receives from more than one src" msgstr "目标引用 %s 接收超过一个源" -#: remote.c:1724 remote.c:1825 +#: remote.c:1834 remote.c:1941 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" -#: remote.c:1733 +#: remote.c:1843 #, c-format msgid "no such branch: '%s'" msgstr "没有此分支：'%s'" -#: remote.c:1736 +#: remote.c:1846 #, c-format msgid "no upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" -#: remote.c:1742 +#: remote.c:1852 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" -#: remote.c:1757 +#: remote.c:1867 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" -#: remote.c:1769 +#: remote.c:1882 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "分支 '%s' 没有设置要推送的远程服务器" -#: remote.c:1779 +#: remote.c:1892 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "向 '%s' 推送引用规格未包含 '%s'" -#: remote.c:1792 +#: remote.c:1905 msgid "push has no destination (push.default is 'nothing')" msgstr "推送无目标（push.default 是 'nothing'）" -#: remote.c:1814 +#: remote.c:1927 msgid "cannot resolve 'simple' push to a single destination" msgstr "无法解析 'simple' 推送至一个单独的目标" -#: remote.c:1943 +#: remote.c:2060 #, c-format msgid "couldn't find remote ref %s" msgstr "无法找到远程引用 %s" -#: remote.c:1956 +#: remote.c:2073 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* 在本地忽略可笑的引用 '%s'" -#: remote.c:2119 +#: remote.c:2236 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n" -#: remote.c:2123 +#: remote.c:2240 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n" -#: remote.c:2126 +#: remote.c:2243 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" -#: remote.c:2130 +#: remote.c:2247 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "您的分支和 '%s' 指向不同的提交。\n" -#: remote.c:2133 +#: remote.c:2250 #, c-format msgid " (use \"%s\" for details)\n" msgstr " （使用 \"%s\" 查看详情）\n" -#: remote.c:2137 +#: remote.c:2254 #, 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:2143 +#: remote.c:2260 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 来发布您的本地提交）\n" -#: remote.c:2146 +#: remote.c:2263 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -7363,11 +7311,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" # 译者：注意保持前导空格 -#: remote.c:2154 +#: remote.c:2271 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" -#: remote.c:2157 +#: remote.c:2274 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -7383,11 +7331,11 @@ msgstr[1] "" "并且分别有 %d 和 %d 处不同的提交。\n" # 译者：注意保持前导空格 -#: remote.c:2167 +#: remote.c:2284 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" -#: remote.c:2359 +#: remote.c:2476 #, c-format msgid "cannot parse expected object name '%s'" msgstr "无法解析期望的对象名 '%s'" @@ -7420,10 +7368,10 @@ msgstr "无法写入 rerere 记录" msgid "there were errors while writing '%s' (%s)" msgstr "写入 '%s' (%s) 时出错" -#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281 +#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298 #, c-format msgid "failed to flush '%s'" -msgstr "刷新 '%s' 失败" +msgstr "无法刷新 '%s'" #: rerere.c:487 rerere.c:1023 #, c-format @@ -7465,8 +7413,8 @@ msgstr "不能删除 stray '%s'" msgid "Recorded preimage for '%s'" msgstr "为 '%s' 记录 preimage" -#: rerere.c:865 submodule.c:2121 builtin/log.c:2002 -#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819 +#: rerere.c:865 submodule.c:2121 builtin/log.c:2017 +#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820 #, c-format msgid "could not create directory '%s'" msgstr "不能创建目录 '%s'" @@ -7474,7 +7422,7 @@ msgstr "不能创建目录 '%s'" #: rerere.c:1041 #, c-format msgid "failed to update conflicted state in '%s'" -msgstr "更新 '%s' 中的冲突状态失败" +msgstr "无法更新 '%s' 中的冲突状态" #: rerere.c:1052 rerere.c:1059 #, c-format @@ -7504,37 +7452,29 @@ msgstr "不能打开 rr-cache 目录" msgid "could not determine HEAD revision" msgstr "不能确定 HEAD 版本" -#: reset.c:70 reset.c:76 sequencer.c:3705 +#: reset.c:70 reset.c:76 sequencer.c:3700 #, c-format msgid "failed to find tree of %s" msgstr "无法找到 %s 指向的树" -#: revision.c:2259 -msgid "--unsorted-input is incompatible with --no-walk" -msgstr "--unsorted-input 和 --no-walk 不兼容" - -#: revision.c:2346 +#: revision.c:2347 msgid "--unpacked=<packfile> no longer supported" msgstr "不再支持 --unpacked=<packfile>" -#: revision.c:2655 revision.c:2659 -msgid "--no-walk is incompatible with --unsorted-input" -msgstr "--no-walk 和 --unsorted-input 不兼容" - -#: revision.c:2690 +#: revision.c:2686 msgid "your current branch appears to be broken" msgstr "您的当前分支好像被损坏" -#: revision.c:2693 +#: revision.c:2689 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的当前分支 '%s' 尚无任何提交" -#: revision.c:2895 +#: revision.c:2891 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" -#: run-command.c:1278 +#: run-command.c:1262 #, c-format msgid "cannot create async thread: %s" msgstr "不能创建 async 线程：%s" @@ -7555,7 +7495,7 @@ msgstr "远程解包失败：%s" #: send-pack.c:378 msgid "failed to sign the push certificate" -msgstr "为推送证书签名失败" +msgstr "无法为推送证书签名" #: send-pack.c:435 msgid "send-pack: unable to fork off fetch subprocess" @@ -7597,8 +7537,8 @@ msgstr "无效的提交信息清理模式 '%s'" msgid "could not delete '%s'" msgstr "无法删除 '%s'" -#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297 -#: builtin/rm.c:408 +#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297 +#: builtin/rm.c:409 #, c-format msgid "could not remove '%s'" msgstr "无法删除 '%s'" @@ -7656,13 +7596,13 @@ msgstr "" "\"git revert --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" "执行 \"git revert\" 之前的状态，执行 \"git revert --abort\"。" -#: sequencer.c:448 sequencer.c:3290 +#: sequencer.c:448 sequencer.c:3292 #, c-format msgid "could not lock '%s'" msgstr "不能锁定 '%s'" -#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308 -#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639 +#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310 +#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639 #, c-format msgid "could not write to '%s'" msgstr "不能写入 '%s'" @@ -7672,12 +7612,18 @@ msgstr "不能写入 '%s'" msgid "could not write eol to '%s'" msgstr "不能将换行符写入 '%s'" -#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310 -#: sequencer.c:3574 +#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312 +#: sequencer.c:3569 #, c-format msgid "failed to finalize '%s'" msgstr "无法完成 '%s'" +#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551 +#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148 +#, c-format +msgid "could not read '%s'" +msgstr "不能读取 '%s'" + #: sequencer.c:499 #, c-format msgid "your local changes would be overwritten by %s." @@ -7692,7 +7638,7 @@ msgstr "提交您的修改或贮藏后再继续。" msgid "%s: fast-forward" msgstr "%s：快进" -#: sequencer.c:574 builtin/tag.c:610 +#: sequencer.c:574 builtin/tag.c:614 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" @@ -7723,8 +7669,8 @@ msgstr "在 '%.*s' 中没有 key" msgid "unable to dequote value of '%s'" msgstr "无法为 '%s' 的值去引号" -#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730 -#: builtin/am.c:822 builtin/rebase.c:694 +#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756 +#: builtin/am.c:848 builtin/rebase.c:694 #, c-format msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" @@ -7787,11 +7733,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1229 +#: sequencer.c:1225 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' 钩子失败" -#: sequencer.c:1235 +#: sequencer.c:1231 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7815,7 +7761,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1248 +#: sequencer.c:1244 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7838,349 +7784,349 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1290 +#: sequencer.c:1288 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: sequencer.c:1292 +#: sequencer.c:1290 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: sequencer.c:1338 +#: sequencer.c:1339 msgid "unable to resolve HEAD after creating commit" msgstr "创建提交后，不能解析 HEAD" -#: sequencer.c:1340 +#: sequencer.c:1342 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: sequencer.c:1344 +#: sequencer.c:1346 msgid " (root-commit)" msgstr "（根提交）" -#: sequencer.c:1365 +#: sequencer.c:1367 msgid "could not parse HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:1367 +#: sequencer.c:1369 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一个提交！" -#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707 +#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:1427 sequencer.c:2312 +#: sequencer.c:1429 sequencer.c:2314 msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708 +#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入树对象" -#: sequencer.c:1471 sequencer.c:1591 +#: sequencer.c:1473 sequencer.c:1593 #, c-format msgid "unable to read commit message from '%s'" msgstr "不能从 '%s' 读取提交说明" -#: sequencer.c:1502 sequencer.c:1534 +#: sequencer.c:1504 sequencer.c:1536 #, c-format msgid "invalid author identity '%s'" msgstr "无效的作者身份 '%s'" -#: sequencer.c:1508 +#: sequencer.c:1510 msgid "corrupt author: missing date information" msgstr "损坏的作者：缺失日期信息" -#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913 -#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915 +#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" -msgstr "写提交对象失败" +msgstr "无法写提交对象" -#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199 +#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199 #: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "不能更新 %s" -#: sequencer.c:1623 +#: sequencer.c:1625 #, c-format msgid "could not parse commit %s" msgstr "不能解析提交 %s" -#: sequencer.c:1628 +#: sequencer.c:1630 #, c-format msgid "could not parse parent commit %s" msgstr "不能解析父提交 %s" -#: sequencer.c:1711 sequencer.c:1992 +#: sequencer.c:1713 sequencer.c:1994 #, c-format msgid "unknown command: %d" msgstr "未知命令：%d" -#: sequencer.c:1753 +#: sequencer.c:1755 msgid "This is the 1st commit message:" msgstr "这是第一个提交说明：" -#: sequencer.c:1754 +#: sequencer.c:1756 #, c-format msgid "This is the commit message #%d:" msgstr "这是提交说明 #%d：" -#: sequencer.c:1755 +#: sequencer.c:1757 msgid "The 1st commit message will be skipped:" msgstr "第一个提交说明将被跳过：" -#: sequencer.c:1756 +#: sequencer.c:1758 #, c-format msgid "The commit message #%d will be skipped:" msgstr "提交说明 #%d 将被跳过：" -#: sequencer.c:1757 +#: sequencer.c:1759 #, c-format msgid "This is a combination of %d commits." msgstr "这是一个 %d 个提交的组合。" -#: sequencer.c:1904 sequencer.c:1961 +#: sequencer.c:1906 sequencer.c:1963 #, c-format msgid "cannot write '%s'" msgstr "不能写 '%s'" -#: sequencer.c:1951 +#: sequencer.c:1953 msgid "need a HEAD to fixup" msgstr "需要一个 HEAD 来修复" -#: sequencer.c:1953 sequencer.c:3601 +#: sequencer.c:1955 sequencer.c:3596 msgid "could not read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:1955 +#: sequencer.c:1957 msgid "could not read HEAD's commit message" msgstr "不能读取 HEAD 的提交说明" -#: sequencer.c:1979 +#: sequencer.c:1981 #, c-format msgid "could not read commit message of %s" msgstr "不能读取 %s 的提交说明" -#: sequencer.c:2089 +#: sequencer.c:2091 msgid "your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:2096 +#: sequencer.c:2098 msgid "cannot fixup root commit" msgstr "不能修复根提交" -#: sequencer.c:2115 +#: sequencer.c:2117 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:2123 sequencer.c:2131 +#: sequencer.c:2125 sequencer.c:2133 #, c-format msgid "commit %s does not have parent %d" msgstr "提交 %s 没有第 %d 个父提交" -#: sequencer.c:2137 +#: sequencer.c:2139 #, 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:2156 +#: sequencer.c:2158 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:2222 +#: sequencer.c:2224 #, c-format msgid "could not rename '%s' to '%s'" msgstr "不能将 '%s' 重命名为 '%s'" -#: sequencer.c:2282 +#: sequencer.c:2284 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:2283 +#: sequencer.c:2285 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:2304 +#: sequencer.c:2306 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "丢弃 %s %s -- 补丁内容已在上游\n" -#: sequencer.c:2362 +#: sequencer.c:2364 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:2370 +#: sequencer.c:2372 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:2450 +#: sequencer.c:2452 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受参数：'%s'" -#: sequencer.c:2459 +#: sequencer.c:2461 #, c-format msgid "missing arguments for %s" msgstr "缺少 %s 的参数" -#: sequencer.c:2502 +#: sequencer.c:2504 #, c-format msgid "could not parse '%s'" msgstr "无法解析 '%s'" -#: sequencer.c:2563 +#: sequencer.c:2565 #, c-format msgid "invalid line %d: %.*s" msgstr "无效行 %d：%.*s" -#: sequencer.c:2574 +#: sequencer.c:2576 #, c-format msgid "cannot '%s' without a previous commit" msgstr "没有父提交的情况下不能 '%s'" -#: sequencer.c:2622 builtin/rebase.c:184 +#: sequencer.c:2624 builtin/rebase.c:184 #, c-format msgid "could not read '%s'." msgstr "不能读取 '%s'。" -#: sequencer.c:2660 +#: sequencer.c:2662 msgid "cancelling a cherry picking in progress" msgstr "正在取消一个进行中的拣选" -#: sequencer.c:2669 +#: sequencer.c:2671 msgid "cancelling a revert in progress" msgstr "正在取消一个进行中的还原" -#: sequencer.c:2709 +#: sequencer.c:2711 msgid "please fix this using 'git rebase --edit-todo'." msgstr "请用 'git rebase --edit-todo' 来修改。" -#: sequencer.c:2711 +#: sequencer.c:2713 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "不可用的指令清单：'%s'" -#: sequencer.c:2716 +#: sequencer.c:2718 msgid "no commits parsed." msgstr "没有解析提交。" -#: sequencer.c:2727 +#: sequencer.c:2729 msgid "cannot cherry-pick during a revert." msgstr "不能在回退中执行拣选。" -#: sequencer.c:2729 +#: sequencer.c:2731 msgid "cannot revert during a cherry-pick." msgstr "不能在拣选中执行回退。" -#: sequencer.c:2807 +#: sequencer.c:2809 #, c-format msgid "invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: sequencer.c:2916 +#: sequencer.c:2918 msgid "unusable squash-onto" msgstr "不可用的 squash-onto" -#: sequencer.c:2936 +#: sequencer.c:2938 #, c-format msgid "malformed options sheet: '%s'" msgstr "格式错误的选项清单：'%s'" -#: sequencer.c:3031 sequencer.c:4905 +#: sequencer.c:3033 sequencer.c:4902 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:3048 +#: sequencer.c:3050 msgid "revert is already in progress" msgstr "一个还原操作已在进行" -#: sequencer.c:3050 +#: sequencer.c:3052 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:3053 +#: sequencer.c:3055 msgid "cherry-pick is already in progress" msgstr "拣选操作已在进行" -#: sequencer.c:3055 +#: sequencer.c:3057 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:3069 +#: sequencer.c:3071 #, c-format msgid "could not create sequencer directory '%s'" msgstr "不能创建序列目录 '%s'" -#: sequencer.c:3084 +#: sequencer.c:3086 msgid "could not lock HEAD" msgstr "不能锁定 HEAD" -#: sequencer.c:3144 sequencer.c:4615 +#: sequencer.c:3146 sequencer.c:4612 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:3146 sequencer.c:3157 +#: sequencer.c:3148 sequencer.c:3159 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:3148 sequencer.c:3192 +#: sequencer.c:3150 sequencer.c:3194 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:3178 builtin/grep.c:772 +#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: sequencer.c:3180 +#: sequencer.c:3182 #, c-format msgid "cannot read '%s': %s" msgstr "不能读取 '%s'：%s" -#: sequencer.c:3181 +#: sequencer.c:3183 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:3187 +#: sequencer.c:3189 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:3198 +#: sequencer.c:3200 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！" -#: sequencer.c:3239 +#: sequencer.c:3241 msgid "no revert in progress" msgstr "没有正在进行的还原" -#: sequencer.c:3248 +#: sequencer.c:3250 msgid "no cherry-pick in progress" msgstr "没有正在进行的拣选" -#: sequencer.c:3258 +#: sequencer.c:3260 msgid "failed to skip the commit" msgstr "无法跳过这个提交" -#: sequencer.c:3265 +#: sequencer.c:3267 msgid "there is nothing to skip" msgstr "没有要跳过的" -#: sequencer.c:3268 +#: sequencer.c:3270 #, c-format msgid "" "have you committed already?\n" @@ -8189,16 +8135,16 @@ msgstr "" "您已经提交了么？\n" "试试 \"git %s --continue\"" -#: sequencer.c:3430 sequencer.c:4506 +#: sequencer.c:3432 sequencer.c:4503 msgid "cannot read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:3447 +#: sequencer.c:3449 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "无法拷贝 '%s' 至 '%s'" -#: sequencer.c:3455 +#: sequencer.c:3457 #, c-format msgid "" "You can amend the commit now, with\n" @@ -8217,27 +8163,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3465 +#: sequencer.c:3467 #, c-format msgid "Could not apply %s... %.*s" msgstr "不能应用 %s... %.*s" -#: sequencer.c:3472 +#: sequencer.c:3474 #, c-format msgid "Could not merge %.*s" msgstr "不能合并 %.*s" -#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639 +#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" -#: sequencer.c:3502 +#: sequencer.c:3503 #, c-format msgid "Executing: %s\n" msgstr "正在执行：%s\n" -#: sequencer.c:3517 +#: sequencer.c:3514 #, c-format msgid "" "execution failed: %s\n" @@ -8252,11 +8198,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3523 +#: sequencer.c:3520 msgid "and made changes to the index and/or the working tree\n" msgstr "并且修改索引和/或工作区\n" -#: sequencer.c:3529 +#: sequencer.c:3526 #, c-format msgid "" "execution succeeded: %s\n" @@ -8273,90 +8219,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3591 +#: sequencer.c:3586 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的标签名称：'%.*s'" -#: sequencer.c:3664 +#: sequencer.c:3659 msgid "writing fake root commit" msgstr "写伪根提交" -#: sequencer.c:3669 +#: sequencer.c:3664 msgid "writing squash-onto" msgstr "写入 squash-onto" -#: sequencer.c:3748 +#: sequencer.c:3743 #, c-format msgid "could not resolve '%s'" msgstr "无法解析 '%s'" -#: sequencer.c:3780 +#: sequencer.c:3775 msgid "cannot merge without a current revision" msgstr "没有当前版本不能合并" -#: sequencer.c:3802 +#: sequencer.c:3797 #, c-format msgid "unable to parse '%.*s'" msgstr "无法解析 '%.*s'" -#: sequencer.c:3811 +#: sequencer.c:3806 #, c-format msgid "nothing to merge: '%.*s'" msgstr "无可用合并：'%.*s'" -#: sequencer.c:3823 +#: sequencer.c:3818 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章鱼合并不能在一个新的根提交上执行" -#: sequencer.c:3878 +#: sequencer.c:3873 #, c-format msgid "could not get commit message of '%s'" msgstr "不能获取 '%s' 的提交说明" -#: sequencer.c:4024 +#: sequencer.c:4019 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能尝试合并 '%.*s'" -#: sequencer.c:4040 +#: sequencer.c:4035 msgid "merge: Unable to write new index file" msgstr "合并：无法写入新索引文件" -#: sequencer.c:4121 +#: sequencer.c:4116 msgid "Cannot autostash" msgstr "无法自动贮藏" -#: sequencer.c:4124 +#: sequencer.c:4119 #, c-format msgid "Unexpected stash response: '%s'" msgstr "意外的贮藏响应：'%s'" -#: sequencer.c:4130 +#: sequencer.c:4125 #, c-format msgid "Could not create directory for '%s'" msgstr "不能为 '%s' 创建目录" -#: sequencer.c:4133 +#: sequencer.c:4128 #, c-format msgid "Created autostash: %s\n" msgstr "创建了自动贮藏：%s\n" -#: sequencer.c:4137 +#: sequencer.c:4132 msgid "could not reset --hard" msgstr "无法硬性重置（reset --hard）" -#: sequencer.c:4162 +#: sequencer.c:4157 #, c-format msgid "Applied autostash.\n" msgstr "已应用自动贮藏。\n" -#: sequencer.c:4174 +#: sequencer.c:4169 #, c-format msgid "cannot store %s" msgstr "不能存储 %s" -#: sequencer.c:4177 +#: sequencer.c:4172 #, c-format msgid "" "%s\n" @@ -8367,29 +8313,29 @@ msgstr "" "您的修改在贮藏区中很安全。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:4182 +#: sequencer.c:4177 msgid "Applying autostash resulted in conflicts." msgstr "应用自动贮藏导致冲突。" -#: sequencer.c:4183 +#: sequencer.c:4178 msgid "Autostash exists; creating a new stash entry." msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。" -#: sequencer.c:4255 +#: sequencer.c:4252 msgid "could not detach HEAD" msgstr "不能分离头指针" -#: sequencer.c:4270 +#: sequencer.c:4267 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:4272 +#: sequencer.c:4269 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:4304 +#: sequencer.c:4301 #, c-format msgid "" "Could not execute the todo command\n" @@ -8409,58 +8355,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4350 +#: sequencer.c:4347 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "正在变基（%d/%d）%s" -#: sequencer.c:4396 +#: sequencer.c:4393 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:4466 +#: sequencer.c:4463 #, c-format msgid "unknown command %d" msgstr "未知命令 %d" -#: sequencer.c:4514 +#: sequencer.c:4511 msgid "could not read orig-head" msgstr "不能读取 orig-head" -#: sequencer.c:4519 +#: sequencer.c:4516 msgid "could not read 'onto'" msgstr "不能读取 'onto'" -#: sequencer.c:4533 +#: sequencer.c:4530 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 为 %s" -#: sequencer.c:4593 +#: sequencer.c:4590 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "成功变基并更新 %s。\n" -#: sequencer.c:4645 +#: sequencer.c:4642 msgid "cannot rebase: You have unstaged changes." msgstr "不能变基：您有未暂存的变更。" -#: sequencer.c:4654 +#: sequencer.c:4651 msgid "cannot amend non-existing commit" msgstr "不能修补不存在的提交" -#: sequencer.c:4656 +#: sequencer.c:4653 #, c-format msgid "invalid file: '%s'" msgstr "无效文件：'%s'" -#: sequencer.c:4658 +#: sequencer.c:4655 #, c-format msgid "invalid contents: '%s'" msgstr "无效内容：'%s'" -#: sequencer.c:4661 +#: sequencer.c:4658 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8469,68 +8415,68 @@ msgstr "" "\n" "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" -#: sequencer.c:4697 sequencer.c:4736 +#: sequencer.c:4694 sequencer.c:4733 #, c-format msgid "could not write file: '%s'" msgstr "不能写入文件：'%s'" -#: sequencer.c:4752 +#: sequencer.c:4749 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能删除 CHERRY_PICK_HEAD" -#: sequencer.c:4762 +#: sequencer.c:4759 msgid "could not commit staged changes." msgstr "不能提交暂存的修改。" -#: sequencer.c:4882 +#: sequencer.c:4879 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:4886 +#: sequencer.c:4883 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:4921 +#: sequencer.c:4918 msgid "can't revert as initial commit" msgstr "不能作为初始提交回退" -#: sequencer.c:5192 sequencer.c:5421 +#: sequencer.c:5189 sequencer.c:5418 #, c-format msgid "skipped previously applied commit %s" msgstr "跳过了先前已应用的提交 %s" -#: sequencer.c:5262 sequencer.c:5437 +#: sequencer.c:5259 sequencer.c:5434 msgid "use --reapply-cherry-picks to include skipped commits" msgstr "使用 --reapply-cherry-picks 来包括跳过的提交" -#: sequencer.c:5408 +#: sequencer.c:5405 msgid "make_script: unhandled options" msgstr "make_script：有未能处理的选项" -#: sequencer.c:5411 +#: sequencer.c:5408 msgid "make_script: error preparing revisions" msgstr "make_script：准备版本时错误" -#: sequencer.c:5669 sequencer.c:5686 +#: sequencer.c:5666 sequencer.c:5683 msgid "nothing to do" msgstr "无事可做" -#: sequencer.c:5705 +#: sequencer.c:5702 msgid "could not skip unnecessary pick commands" msgstr "无法跳过不必要的拣选" -#: sequencer.c:5805 +#: sequencer.c:5802 msgid "the script was already rearranged." msgstr "脚本已经重新编排。" -#: setup.c:133 +#: setup.c:134 #, c-format msgid "'%s' is outside repository at '%s'" msgstr "'%s' 在位于 '%s' 的仓库之外" -#: setup.c:185 +#: setup.c:186 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -8539,7 +8485,7 @@ msgstr "" "%s：工作区中无此路径。\n" "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。" -#: setup.c:198 +#: setup.c:199 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -8550,12 +8496,12 @@ msgstr "" "使用 '--' 来分隔版本和路径，例如：\n" "'git <命令> [<版本>...] -- [<文件>...]'" -#: setup.c:264 +#: setup.c:265 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "选项 '%s' 必须在其他非选项参数之前" -#: setup.c:283 +#: setup.c:284 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -8566,100 +8512,100 @@ msgstr "" "使用 '--' 来分隔版本和路径，例如：\n" "'git <命令> [<版本>...] -- [<文件>...]'" -#: setup.c:419 +#: setup.c:420 msgid "unable to set up work tree using invalid config" msgstr "无法使用无效配置来创建工作区" -#: setup.c:423 builtin/rev-parse.c:895 +#: setup.c:424 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "该操作必须在一个工作区中运行" -#: setup.c:658 +#: setup.c:722 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 仓库版本 <= %d，却得到 %d" -#: setup.c:666 +#: setup.c:730 msgid "unknown repository extension found:" msgid_plural "unknown repository extensions found:" msgstr[0] "发现未知的仓库扩展：" msgstr[1] "发现未知的仓库扩展：" -#: setup.c:680 +#: setup.c:744 msgid "repo version is 0, but v1-only extension found:" msgid_plural "repo version is 0, but v1-only extensions found:" msgstr[0] "仓库的版本是 0，但是发现仅用于 v1 的扩展：" msgstr[1] "仓库的版本是 0，但是发现仅用于 v1 的扩展：" -#: setup.c:701 +#: setup.c:765 #, c-format msgid "error opening '%s'" msgstr "打开 '%s' 出错" -#: setup.c:703 +#: setup.c:767 #, c-format msgid "too large to be a .git file: '%s'" msgstr "文件太大，无法作为 .git 文件：'%s'" -#: setup.c:705 +#: setup.c:769 #, c-format msgid "error reading %s" msgstr "读取 %s 出错" -#: setup.c:707 +#: setup.c:771 #, c-format msgid "invalid gitfile format: %s" msgstr "无效的 gitfile 格式：%s" -#: setup.c:709 +#: setup.c:773 #, c-format msgid "no path in gitfile: %s" msgstr "在 gitfile 中没有路径：%s" -#: setup.c:711 +#: setup.c:775 #, c-format msgid "not a git repository: %s" msgstr "不是 git 仓库：%s" -#: setup.c:813 +#: setup.c:877 #, c-format msgid "'$%s' too big" msgstr "'$%s' 太大" -#: setup.c:827 +#: setup.c:891 #, c-format msgid "not a git repository: '%s'" msgstr "不是 git 仓库：'%s'" -#: setup.c:856 setup.c:858 setup.c:889 +#: setup.c:920 setup.c:922 setup.c:953 #, c-format msgid "cannot chdir to '%s'" msgstr "不能切换目录到 '%s'" -#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 +#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038 msgid "cannot come back to cwd" msgstr "无法返回当前工作目录" -#: setup.c:988 +#: setup.c:1052 #, c-format msgid "failed to stat '%*s%s%s'" -msgstr "获取 '%*s%s%s' 状态（stat）失败" +msgstr "无法获取 '%*s%s%s' 状态（stat）" -#: setup.c:1231 +#: setup.c:1295 msgid "Unable to read current working directory" msgstr "不能读取当前工作目录" -#: setup.c:1240 setup.c:1246 +#: setup.c:1304 setup.c:1310 #, c-format msgid "cannot change to '%s'" msgstr "不能切换到 '%s'" -#: setup.c:1251 +#: setup.c:1315 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "不是 git 仓库（或者任何父目录）：%s" -#: setup.c:1257 +#: setup.c:1321 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -8668,7 +8614,7 @@ msgstr "" "不是 git 仓库（或者直至挂载点 %s 的任何父目录）\n" "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" -#: setup.c:1381 +#: setup.c:1446 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8677,15 +8623,15 @@ msgstr "" "参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n" "文件属主必须始终拥有读写权限。" -#: setup.c:1443 +#: setup.c:1508 msgid "fork failed" msgstr "fork 失败" -#: setup.c:1448 +#: setup.c:1513 msgid "setsid failed" msgstr "setsid 失败" -#: sparse-index.c:273 +#: sparse-index.c:289 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "索引条目是一个目录，但不是稀疏的 (%08x)" @@ -8742,13 +8688,13 @@ msgid_plural "%u bytes/s" msgstr[0] "%u 字节/秒" msgstr[1] "%u 字节/秒" -#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739 +#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765 #: builtin/rebase.c:650 #, c-format msgid "could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" -#: strbuf.c:1183 +#: strbuf.c:1195 #, c-format msgid "could not edit '%s'" msgstr "不能编辑 '%s'" @@ -8834,7 +8780,7 @@ msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes - msgid "process for submodule '%s' failed" msgstr "处理子模组 '%s' 失败" -#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713 +#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" @@ -9077,7 +9023,7 @@ msgstr "协议不支持设置远程服务路径" msgid "invalid remote service path" msgstr "无效的远程服务路径" -#: transport-helper.c:661 transport.c:1475 +#: transport-helper.c:661 transport.c:1474 msgid "operation not supported by protocol" msgstr "协议不支持该操作" @@ -9296,7 +9242,7 @@ msgstr "" msgid "Aborting." msgstr "正在终止。" -#: transport.c:1344 +#: transport.c:1343 msgid "failed to push all needed submodules" msgstr "不能推送全部需要的子模组" @@ -9316,7 +9262,7 @@ msgstr "树对象条目中空的文件名" msgid "too-short tree file" msgstr "太短的树文件" -#: unpack-trees.c:115 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9325,7 +9271,7 @@ msgstr "" "您对下列文件的本地修改将被检出操作覆盖：\n" "%%s请在切换分支前提交或贮藏您的修改。" -#: unpack-trees.c:117 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9334,7 +9280,7 @@ msgstr "" "您对下列文件的本地修改将被检出操作覆盖：\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9343,7 +9289,7 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" "%%s请在合并前提交或贮藏您的修改。" -#: unpack-trees.c:122 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9352,7 +9298,7 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" "%%s" -#: unpack-trees.c:125 +#: unpack-trees.c:128 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9361,7 +9307,7 @@ msgstr "" "您对下列文件的本地修改将被 %s 覆盖：\n" "%%s请在 %s 之前提交或贮藏您的修改。" -#: unpack-trees.c:127 +#: unpack-trees.c:130 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9370,7 +9316,7 @@ msgstr "" "您对下列文件的本地修改将被 %s 覆盖：\n" "%%s" -#: unpack-trees.c:132 +#: unpack-trees.c:135 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -9379,7 +9325,16 @@ msgstr "" "更新如下目录将会丢失其中未跟踪的文件：\n" "%s" -#: unpack-trees.c:136 +#: unpack-trees.c:138 +#, c-format +msgid "" +"Refusing to remove the current working directory:\n" +"%s" +msgstr "" +"拒绝删除当前工作目录：\n" +"%s" + +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9388,7 +9343,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" "%%s请在切换分支之前移动或删除。" -#: unpack-trees.c:138 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9397,7 +9352,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9406,7 +9361,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" "%%s请在合并前移动或删除。" -#: unpack-trees.c:143 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9415,7 +9370,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" "%%s" -#: unpack-trees.c:146 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9424,7 +9379,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" "%%s请在 %s 前移动或删除。" -#: unpack-trees.c:148 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9433,7 +9388,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9443,7 +9398,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" "%%s请在切换分支前移动或删除。" -#: unpack-trees.c:156 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9453,7 +9408,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:165 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9462,7 +9417,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" "%%s请在合并前移动或删除。" -#: unpack-trees.c:161 +#: unpack-trees.c:167 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9471,7 +9426,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" "%%s" -#: unpack-trees.c:164 +#: unpack-trees.c:170 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9480,7 +9435,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" "%%s请在 %s 前移动或删除。" -#: unpack-trees.c:166 +#: unpack-trees.c:172 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9489,12 +9444,12 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" "%%s" -#: unpack-trees.c:174 +#: unpack-trees.c:180 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" -#: unpack-trees.c:177 +#: unpack-trees.c:183 #, c-format msgid "" "Cannot update submodule:\n" @@ -9503,7 +9458,7 @@ msgstr "" "无法更新子模组：\n" "%s" -#: unpack-trees.c:180 +#: unpack-trees.c:186 #, c-format msgid "" "The following paths are not up to date and were left despite sparse " @@ -9513,7 +9468,7 @@ msgstr "" "尽管存在稀疏检出模板，以下路径不是最新，因而保留：\n" "%s" -#: unpack-trees.c:182 +#: unpack-trees.c:188 #, c-format msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" @@ -9522,7 +9477,7 @@ msgstr "" "尽管存在稀疏检出模板，以下路径处于未合并状态，因而保留：\n" "%s" -#: unpack-trees.c:184 +#: unpack-trees.c:190 #, c-format msgid "" "The following paths were already present and thus not updated despite sparse " @@ -9532,23 +9487,23 @@ msgstr "" "尽管存在稀疏检出模板，以下路径已经存在，因而未更新：\n" "%s" -#: unpack-trees.c:264 +#: unpack-trees.c:270 #, c-format msgid "Aborting\n" msgstr "正在终止\n" -#: unpack-trees.c:291 +#: unpack-trees.c:297 #, c-format msgid "" "After fixing the above paths, you may want to run `git sparse-checkout " "reapply`.\n" msgstr "在修复上述路径之后，您可能要执行 `git sparse-checkout reapply`。\n" -#: unpack-trees.c:352 +#: unpack-trees.c:358 msgid "Updating files" msgstr "正在更新文件" -#: unpack-trees.c:384 +#: unpack-trees.c:390 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -9557,16 +9512,16 @@ msgstr "" "以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n" "并且碰撞组中只有一个文件存在工作区中：\n" -#: unpack-trees.c:1620 +#: unpack-trees.c:1636 msgid "Updating index flags" msgstr "正在更新索引标志" -#: unpack-trees.c:2772 +#: unpack-trees.c:2803 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "工作树和未跟踪提交具有重复条目：%s" -#: upload-pack.c:1561 +#: upload-pack.c:1565 msgid "expected flush after fetch arguments" msgstr "在 fetch 参数之后应该有一个 flush 包" @@ -9603,99 +9558,99 @@ msgstr "无效的 '..' 路径片段" msgid "Fetching objects" msgstr "正在获取对象" -#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156 +#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156 #, c-format msgid "failed to read '%s'" -msgstr "读取 '%s' 失败" +msgstr "无法读取 '%s'" -#: worktree.c:303 +#: worktree.c:305 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "在主工作区的 '%s' 不是仓库目录" -#: worktree.c:314 +#: worktree.c:316 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "文件 '%s' 不包含工作区的绝对路径" -#: worktree.c:326 +#: worktree.c:328 #, c-format msgid "'%s' does not exist" msgstr "'%s' 不存在" -#: worktree.c:332 +#: worktree.c:334 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' 不是一个 .git 文件，错误码 %d" -#: worktree.c:341 +#: worktree.c:343 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' 没有指回到 '%s'" -#: worktree.c:603 +#: worktree.c:604 msgid "not a directory" msgstr "不是一个目录" -#: worktree.c:612 +#: worktree.c:613 msgid ".git is not a file" msgstr ".git 不是一个文件" -#: worktree.c:614 +#: worktree.c:615 msgid ".git file broken" msgstr ".git 文件损坏" -#: worktree.c:616 +#: worktree.c:617 msgid ".git file incorrect" msgstr ".git 文件不正确" -#: worktree.c:722 +#: worktree.c:723 msgid "not a valid path" msgstr "不是一个有效的路径" -#: worktree.c:728 +#: worktree.c:729 msgid "unable to locate repository; .git is not a file" msgstr "无法定位仓库，.git 不是一个文件" -#: worktree.c:732 +#: worktree.c:733 msgid "unable to locate repository; .git file does not reference a repository" msgstr "无法定位仓库，.git 文件没有指向一个仓库" -#: worktree.c:736 +#: worktree.c:737 msgid "unable to locate repository; .git file broken" msgstr "无法定位仓库，.git 文件损坏" -#: worktree.c:742 +#: worktree.c:743 msgid "gitdir unreadable" msgstr "gitdir 不可读" -#: worktree.c:746 +#: worktree.c:747 msgid "gitdir incorrect" msgstr "gitdir 不正确" -#: worktree.c:771 +#: worktree.c:772 msgid "not a valid directory" msgstr "不是一个有效的目录" -#: worktree.c:777 +#: worktree.c:778 msgid "gitdir file does not exist" msgstr "gitdir 文件不存在" -#: worktree.c:782 worktree.c:791 +#: worktree.c:783 worktree.c:792 #, c-format msgid "unable to read gitdir file (%s)" msgstr "无法读取 gitdir 文件（%s）" -#: worktree.c:801 +#: worktree.c:802 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）" -#: worktree.c:809 +#: worktree.c:810 msgid "invalid gitdir file" msgstr "无效的 gitdir 文件" -#: worktree.c:817 +#: worktree.c:818 msgid "gitdir file points to non-existent location" msgstr "gitdir 文件指向一个不存在的位置" @@ -9758,11 +9713,11 @@ msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <文件>...\" 标记解决方案）" -#: wt-status.c:211 wt-status.c:1125 +#: wt-status.c:211 wt-status.c:1131 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:234 wt-status.c:1134 +#: wt-status.c:234 wt-status.c:1140 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" @@ -9868,22 +9823,22 @@ msgstr "修改的内容, " msgid "untracked content, " msgstr "未跟踪的内容, " -#: wt-status.c:958 +#: wt-status.c:964 #, 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:989 +#: wt-status.c:995 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: wt-status.c:991 +#: wt-status.c:997 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: wt-status.c:1073 +#: wt-status.c:1079 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9891,7 +9846,7 @@ msgstr "" "不要改动或删除上面的一行。\n" "其下所有内容都将被忽略。" -#: wt-status.c:1165 +#: wt-status.c:1171 #, c-format msgid "" "\n" @@ -9902,77 +9857,83 @@ msgstr "" "花了 %.2f 秒才计算出分支的领先/落后范围。\n" "为避免，您可以使用 '--no-ahead-behind'。\n" -#: wt-status.c:1195 +#: wt-status.c:1201 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:1198 +#: wt-status.c:1204 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" # 译者：注意保持前导空格 -#: wt-status.c:1200 +#: wt-status.c:1206 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " （使用 \"git merge --abort\" 终止合并）" -#: wt-status.c:1204 +#: wt-status.c:1210 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:1207 +#: wt-status.c:1213 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:1216 +#: wt-status.c:1224 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" -#: wt-status.c:1219 +#: wt-status.c:1227 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:1223 +#: wt-status.c:1232 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1225 +#: wt-status.c:1234 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1227 +#: wt-status.c:1237 +msgid "" +" (use \"git am --allow-empty\" to record this patch as an empty commit)" +msgstr " （使用 \"git am --allow-empty\" 将这个补丁记录为空提交）" + +# 译者：注意保持前导空格 +#: wt-status.c:1239 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:1360 +#: wt-status.c:1372 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 丢失。" -#: wt-status.c:1362 +#: wt-status.c:1374 msgid "No commands done." msgstr "没有命令被执行。" -#: wt-status.c:1365 +#: wt-status.c:1377 #, 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:1376 +#: wt-status.c:1388 #, c-format msgid " (see more in file %s)" msgstr " （更多参见文件 %s）" -#: wt-status.c:1381 +#: wt-status.c:1393 msgid "No commands remaining." msgstr "未剩下任何命令。" -#: wt-status.c:1384 +#: wt-status.c:1396 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -9980,206 +9941,206 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）：" msgstr[1] "接下来要执行的命令（剩余 %d 条命令）：" # 译者：注意保持前导空格 -#: wt-status.c:1392 +#: wt-status.c:1404 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）" -#: wt-status.c:1404 +#: wt-status.c:1416 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" -#: wt-status.c:1409 +#: wt-status.c:1421 msgid "You are currently rebasing." msgstr "您在执行变基操作。" # 译者：注意保持前导空格 -#: wt-status.c:1422 +#: wt-status.c:1434 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1424 +#: wt-status.c:1436 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1426 +#: wt-status.c:1438 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:1433 +#: wt-status.c:1445 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:1437 +#: wt-status.c:1449 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" -#: wt-status.c:1442 +#: wt-status.c:1454 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行变基操作时拆分提交。" # 译者：注意保持前导空格 -#: wt-status.c:1445 +#: wt-status.c:1457 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:1449 +#: wt-status.c:1461 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" -#: wt-status.c:1454 +#: wt-status.c:1466 msgid "You are currently editing a commit during a rebase." msgstr "您在执行变基操作时编辑提交。" # 译者：注意保持前导空格 -#: wt-status.c:1457 +#: wt-status.c:1469 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:1459 +#: wt-status.c:1471 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:1470 +#: wt-status.c:1482 msgid "Cherry-pick currently in progress." msgstr "拣选操作正在进行中。" -#: wt-status.c:1473 +#: wt-status.c:1485 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1480 +#: wt-status.c:1492 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1483 +#: wt-status.c:1495 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " （执行 \"git cherry-pick --continue\" 以继续）" # 译者：注意保持前导空格 -#: wt-status.c:1486 +#: wt-status.c:1498 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1488 +#: wt-status.c:1500 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " （使用 \"git cherry-pick --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1490 +#: wt-status.c:1502 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" -#: wt-status.c:1500 +#: wt-status.c:1512 msgid "Revert currently in progress." msgstr "还原操作正在行中。" -#: wt-status.c:1503 +#: wt-status.c:1515 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1509 +#: wt-status.c:1521 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并执行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1512 +#: wt-status.c:1524 msgid " (run \"git revert --continue\" to continue)" msgstr " （执行 \"git revert --continue\" 以继续）" # 译者：注意保持前导空格 -#: wt-status.c:1515 +#: wt-status.c:1527 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：执行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1517 +#: wt-status.c:1529 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " （使用 \"git revert --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1519 +#: wt-status.c:1531 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:1529 +#: wt-status.c:1541 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1533 +#: wt-status.c:1545 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 -#: wt-status.c:1536 +#: wt-status.c:1548 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1547 +#: wt-status.c:1559 msgid "You are in a sparse checkout." msgstr "您处于一个稀疏检出中。" -#: wt-status.c:1550 +#: wt-status.c:1562 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "您处于稀疏检出状态，包含 %d%% 的跟踪文件" -#: wt-status.c:1794 +#: wt-status.c:1806 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1801 +#: wt-status.c:1813 msgid "interactive rebase in progress; onto " msgstr "交互式变基操作正在进行中；至 " -#: wt-status.c:1803 +#: wt-status.c:1815 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " -#: wt-status.c:1808 +#: wt-status.c:1820 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.c:1810 +#: wt-status.c:1822 msgid "HEAD detached from " msgstr "头指针分离自 " -#: wt-status.c:1813 +#: wt-status.c:1825 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1830 +#: wt-status.c:1842 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1831 +#: wt-status.c:1843 msgid "No commits yet" msgstr "尚无提交" -#: wt-status.c:1845 +#: wt-status.c:1857 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1847 +#: wt-status.c:1859 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1851 +#: wt-status.c:1863 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -10189,112 +10150,112 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1857 +#: wt-status.c:1869 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1859 +#: wt-status.c:1871 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1865 +#: wt-status.c:1877 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1870 +#: wt-status.c:1882 #, 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:1874 +#: wt-status.c:1886 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1878 +#: wt-status.c:1890 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1882 +#: wt-status.c:1894 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" -#: wt-status.c:1886 +#: wt-status.c:1898 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1890 wt-status.c:1896 +#: wt-status.c:1902 wt-status.c:1908 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" -#: wt-status.c:1893 +#: wt-status.c:1905 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" -#: wt-status.c:1898 +#: wt-status.c:1910 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:2003 +#: wt-status.c:2015 msgid "No commits yet on " msgstr "尚无提交在 " -#: wt-status.c:2007 +#: wt-status.c:2019 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" -#: wt-status.c:2038 +#: wt-status.c:2050 msgid "different" msgstr "不同" # 译者：注意保持句尾空格 -#: wt-status.c:2040 wt-status.c:2048 +#: wt-status.c:2052 wt-status.c:2060 msgid "behind " msgstr "落后 " -#: wt-status.c:2043 wt-status.c:2046 +#: wt-status.c:2055 wt-status.c:2058 msgid "ahead " msgstr "领先 " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2569 +#: wt-status.c:2596 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "不能%s：您有未暂存的变更。" -#: wt-status.c:2575 +#: wt-status.c:2602 msgid "additionally, your index contains uncommitted changes." msgstr "另外，您的索引中包含未提交的变更。" -#: wt-status.c:2577 +#: wt-status.c:2604 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的变更。" -#: compat/simple-ipc/ipc-unix-socket.c:183 +#: compat/simple-ipc/ipc-unix-socket.c:205 msgid "could not send IPC command" msgstr "无法发送 IPC 命令" -#: compat/simple-ipc/ipc-unix-socket.c:190 +#: compat/simple-ipc/ipc-unix-socket.c:212 msgid "could not read IPC response" msgstr "无法读取 IPC 响应" -#: compat/simple-ipc/ipc-unix-socket.c:870 +#: compat/simple-ipc/ipc-unix-socket.c:892 #, c-format msgid "could not start accept_thread '%s'" msgstr "无法启动 accept_thread '%s'" -#: compat/simple-ipc/ipc-unix-socket.c:882 +#: compat/simple-ipc/ipc-unix-socket.c:904 #, c-format msgid "could not start worker[0] for '%s'" msgstr "无法启动 '%s' 的 worker[0]" @@ -10302,7 +10263,7 @@ msgstr "无法启动 '%s' 的 worker[0]" #: compat/precompose_utf8.c:58 builtin/clone.c:347 #, c-format msgid "failed to unlink '%s'" -msgstr "删除 '%s' 失败" +msgstr "无法删除 '%s'" #: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." @@ -10331,107 +10292,113 @@ msgstr "删除 '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:317 builtin/rev-parse.c:993 +#: builtin/add.c:313 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "不能读取索引" -#: builtin/add.c:330 +#: builtin/add.c:326 msgid "Could not write patch" msgstr "不能生成补丁" -#: builtin/add.c:333 +#: builtin/add.c:329 msgid "editing patch failed" msgstr "编辑补丁失败" -#: builtin/add.c:336 +#: builtin/add.c:332 #, c-format msgid "Could not stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: builtin/add.c:338 +#: builtin/add.c:334 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" -#: builtin/add.c:343 +#: builtin/add.c:340 #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" -#: builtin/add.c:351 +#: builtin/add.c:348 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194 msgid "dry run" msgstr "演习" -#: builtin/add.c:374 +#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484 +#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313 +#: builtin/mv.c:123 builtin/read-tree.c:120 +msgid "be verbose" +msgstr "冗长输出" + +#: builtin/add.c:371 msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314 +#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409 msgid "select hunks interactively" msgstr "交互式挑选数据块" -#: builtin/add.c:376 +#: builtin/add.c:373 msgid "edit current diff and apply" msgstr "编辑当前差异并应用" -#: builtin/add.c:377 +#: builtin/add.c:374 msgid "allow adding otherwise ignored files" msgstr "允许添加忽略的文件" -#: builtin/add.c:378 +#: builtin/add.c:375 msgid "update tracked files" msgstr "更新已跟踪的文件" -#: builtin/add.c:379 +#: builtin/add.c:376 msgid "renormalize EOL of tracked files (implies -u)" msgstr "对已跟踪文件（暗含 -u）重新归一换行符" -#: builtin/add.c:380 +#: builtin/add.c:377 msgid "record only the fact that the path will be added later" msgstr "只记录，该路径稍后再添加" -#: builtin/add.c:381 +#: builtin/add.c:378 msgid "add changes from all tracked and untracked files" msgstr "添加所有改变的已跟踪文件和未跟踪文件" -#: builtin/add.c:384 +#: builtin/add.c:381 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区中移除的路径（和 --no-all 相同）" -#: builtin/add.c:386 +#: builtin/add.c:383 msgid "don't add, only refresh the index" msgstr "不添加，只刷新索引" -#: builtin/add.c:387 +#: builtin/add.c:384 msgid "just skip files which cannot be added because of errors" msgstr "跳过因出错不能添加的文件" -#: builtin/add.c:388 +#: builtin/add.c:385 msgid "check if - even missing - files are ignored in dry run" msgstr "检查在演习模式下文件（即使不存在）是否被忽略" -#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251 +#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251 msgid "allow updating entries outside of the sparse-checkout cone" -msgstr "允许更新稀疏检出 cone 以外的条目" +msgstr "允许更新稀疏检出锥以外的条目" -#: builtin/add.c:391 builtin/update-index.c:1004 +#: builtin/add.c:388 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的可执行位" -#: builtin/add.c:393 +#: builtin/add.c:390 msgid "warn when adding an embedded repository" msgstr "创建一个嵌入式仓库时给予警告" -#: builtin/add.c:395 +#: builtin/add.c:392 msgid "backend for `git stash -p`" msgstr "`git stash -p` 的后端" -#: builtin/add.c:413 +#: builtin/add.c:410 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -10459,12 +10426,12 @@ msgstr "" "\n" "参见 \"git help submodule\" 获取更多信息。" -#: builtin/add.c:442 +#: builtin/add.c:439 #, c-format msgid "adding embedded git repository: %s" msgstr "正在添加嵌入式 git 仓库：%s" -#: builtin/add.c:462 +#: builtin/add.c:459 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -10474,51 +10441,27 @@ msgstr "" "运行下面的命令来关闭本消息\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:477 +#: builtin/add.c:474 msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c:513 -msgid "--dry-run is incompatible with --interactive/--patch" -msgstr "--dry-run 与 --interactive/--patch 不兼容" - -#: builtin/add.c:515 builtin/commit.c:358 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容" - -#: builtin/add.c:532 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "--pathspec-from-file 与 --edit 不兼容" - -#: builtin/add.c:544 -msgid "-A and -u are mutually incompatible" -msgstr "-A 和 -u 选项互斥" - -#: builtin/add.c:547 -msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" - -#: builtin/add.c:551 +#: builtin/add.c:548 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" -#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364 -#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "--pathspec-from-file 与路径表达式参数不兼容" - -#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370 -#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "--pathspec-file-nul 需要 --pathspec-from-file" +#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364 +#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713 +#, c-format +msgid "'%s' and pathspec arguments cannot be used together" +msgstr "'%s' 和路径规格参数不能同时使用" -#: builtin/add.c:583 +#: builtin/add.c:580 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" -#: builtin/add.c:585 +#: builtin/add.c:582 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10528,105 +10471,111 @@ msgstr "" "运行下面的命令来关闭本消息\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:366 +#: builtin/am.c:202 +#, c-format +msgid "Invalid value for --empty: %s" +msgstr "--empty 的值无效：%s" + +#: builtin/am.c:392 msgid "could not parse author script" msgstr "不能解析作者脚本" -#: builtin/am.c:456 +#: builtin/am.c:482 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 钩子删除" -#: builtin/am.c:498 +#: builtin/am.c:524 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/am.c:536 +#: builtin/am.c:562 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "从 '%s' 拷贝注解到 '%s' 时失败" -#: builtin/am.c:562 +#: builtin/am.c:588 msgid "fseek failed" msgstr "fseek 失败" -#: builtin/am.c:750 +#: builtin/am.c:776 #, c-format msgid "could not parse patch '%s'" msgstr "无法解析补丁 '%s'" -#: builtin/am.c:815 +#: builtin/am.c:841 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: builtin/am.c:863 +#: builtin/am.c:889 msgid "invalid timestamp" msgstr "无效的时间戳" -#: builtin/am.c:868 builtin/am.c:880 +#: builtin/am.c:894 builtin/am.c:906 msgid "invalid Date line" msgstr "无效的日期行" -#: builtin/am.c:875 +#: builtin/am.c:901 msgid "invalid timezone offset" msgstr "无效的时区偏移值" -#: builtin/am.c:968 +#: builtin/am.c:994 msgid "Patch format detection failed." msgstr "补丁格式探测失败。" -#: builtin/am.c:973 builtin/clone.c:300 +#: builtin/am.c:999 builtin/clone.c:300 #, c-format msgid "failed to create directory '%s'" -msgstr "创建目录 '%s' 失败" +msgstr "无法创建目录 '%s'" -#: builtin/am.c:978 +#: builtin/am.c:1004 msgid "Failed to split patches." -msgstr "拆分补丁失败。" +msgstr "无法拆分补丁。" -#: builtin/am.c:1127 +#: builtin/am.c:1153 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题，执行 \"%s --continue\"。" -#: builtin/am.c:1128 +#: builtin/am.c:1154 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。" -#: builtin/am.c:1129 +#: builtin/am.c:1159 +#, c-format +msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." +msgstr "若要把空补丁记录为空提交，执行 \"%s --allow-empty\"。" + +#: builtin/am.c:1161 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。" -#: builtin/am.c:1224 +#: builtin/am.c:1256 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。" -#: builtin/am.c:1252 -msgid "Patch is empty." -msgstr "补丁为空。" - -#: builtin/am.c:1317 +#: builtin/am.c:1344 #, c-format msgid "missing author line in commit %s" msgstr "在提交 %s 中缺失作者行" -#: builtin/am.c:1320 +#: builtin/am.c:1347 #, c-format msgid "invalid ident line: %.*s" msgstr "无效的身份标识：%.*s" -#: builtin/am.c:1539 +#: builtin/am.c:1566 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: builtin/am.c:1541 +#: builtin/am.c:1568 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个（三方合并的）基础目录树..." -#: builtin/am.c:1560 +#: builtin/am.c:1587 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10634,24 +10583,24 @@ msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到索引中的数据对象上。" -#: builtin/am.c:1566 +#: builtin/am.c:1593 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基础版本上打补丁及进行三方合并..." -#: builtin/am.c:1592 +#: builtin/am.c:1619 msgid "Failed to merge in the changes." msgstr "无法合并变更。" -#: builtin/am.c:1624 +#: builtin/am.c:1651 msgid "applying to an empty history" msgstr "正应用到一个空历史上" -#: builtin/am.c:1676 builtin/am.c:1680 +#: builtin/am.c:1703 builtin/am.c:1707 #, c-format msgid "cannot resume: %s does not exist." msgstr "无法继续：%s 不存在。" -#: builtin/am.c:1698 +#: builtin/am.c:1725 msgid "Commit Body is:" msgstr "提交内容为：" @@ -10659,39 +10608,57 @@ msgstr "提交内容为：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1708 +#: builtin/am.c:1735 #, 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:1754 builtin/commit.c:409 +#: builtin/am.c:1781 builtin/commit.c:409 msgid "unable to write index file" msgstr "无法写入索引文件" -#: builtin/am.c:1758 +#: builtin/am.c:1785 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "脏索引：不能应用补丁（脏文件：%s）" -#: builtin/am.c:1798 builtin/am.c:1865 +#: builtin/am.c:1827 +#, c-format +msgid "Skipping: %.*s" +msgstr "跳过：%.*s" + +#: builtin/am.c:1832 +#, c-format +msgid "Creating an empty commit: %.*s" +msgstr "创建空提交：%.*s" + +#: builtin/am.c:1836 +msgid "Patch is empty." +msgstr "补丁为空。" + +#: builtin/am.c:1847 builtin/am.c:1916 #, c-format msgid "Applying: %.*s" msgstr "应用：%.*s" -#: builtin/am.c:1815 +#: builtin/am.c:1864 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: builtin/am.c:1821 +#: builtin/am.c:1870 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补丁失败于 %s %.*s" -#: builtin/am.c:1825 +#: builtin/am.c:1874 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁" -#: builtin/am.c:1868 +#: builtin/am.c:1920 +msgid "No changes - recorded it as an empty commit." +msgstr "没有变更 —— 记录为空提交。" + +#: builtin/am.c:1922 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10701,7 +10668,7 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: builtin/am.c:1875 +#: builtin/am.c:1930 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10712,175 +10679,183 @@ msgstr "" "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" "您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" -#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353 -#: builtin/reset.c:361 +#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448 +#: builtin/reset.c:456 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/am.c:2035 builtin/am.c:2111 +#: builtin/am.c:2090 builtin/am.c:2166 msgid "failed to clean index" -msgstr "清空索引失败" +msgstr "无法清空索引" -#: builtin/am.c:2079 +#: builtin/am.c:2134 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:2187 +#: builtin/am.c:2242 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "无效的 --patch-format 值：%s" -#: builtin/am.c:2229 +#: builtin/am.c:2285 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "无效的 --show-current-patch 值：%s" -#: builtin/am.c:2233 +#: builtin/am.c:2289 #, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容" +msgid "options '%s=%s' and '%s=%s' cannot be used together" +msgstr "选项 '%s=%s' 和 '%s=%s' 不能同时使用" -#: builtin/am.c:2264 +#: builtin/am.c:2320 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2265 +#: builtin/am.c:2321 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" -#: builtin/am.c:2271 +#: builtin/am.c:2327 msgid "run interactively" msgstr "以交互式方式运行" -#: builtin/am.c:2273 +#: builtin/am.c:2329 msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" -#: builtin/am.c:2275 +#: builtin/am.c:2331 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允许使用三方合并。" -#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16 -#: builtin/repack.c:640 builtin/stash.c:961 +#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:642 builtin/stash.c:962 msgid "be quiet" msgstr "静默模式" -#: builtin/am.c:2278 +#: builtin/am.c:2334 msgid "add a Signed-off-by trailer to the commit message" msgstr "在提交说明中添加 Signed-off-by 尾注" -#: builtin/am.c:2281 +#: builtin/am.c:2337 msgid "recode into utf8 (default)" msgstr "使用 utf8 字符集（默认）" -#: builtin/am.c:2283 +#: builtin/am.c:2339 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -k 参数" -#: builtin/am.c:2285 +#: builtin/am.c:2341 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -b 参数" -#: builtin/am.c:2287 +#: builtin/am.c:2343 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -m 参数" -#: builtin/am.c:2289 +#: builtin/am.c:2345 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" -#: builtin/am.c:2292 +#: builtin/am.c:2348 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" -#: builtin/am.c:2295 +#: builtin/am.c:2351 msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" -#: builtin/am.c:2297 +#: builtin/am.c:2353 msgid "pass it through git-mailinfo" msgstr "传递给 git-mailinfo" -#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309 -#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321 -#: builtin/am.c:2327 +#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 +#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 +#: builtin/am.c:2383 msgid "pass it through git-apply" msgstr "传递给 git-apply" -#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262 +#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221 -#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655 -#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172 +#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657 +#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175 -#: parse-options.h:315 +#: parse-options.h:317 msgid "n" msgstr "n" -#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109 -#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479 +#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109 +#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479 #: builtin/verify-tag.c:38 msgid "format" msgstr "格式" -#: builtin/am.c:2324 +#: builtin/am.c:2380 msgid "format the patch(es) are in" msgstr "补丁的格式" -#: builtin/am.c:2330 +#: builtin/am.c:2386 msgid "override error message when patch failure occurs" msgstr "打补丁失败时显示的错误信息" -#: builtin/am.c:2332 +#: builtin/am.c:2388 msgid "continue applying patches after resolving a conflict" msgstr "冲突解决后继续应用补丁" -#: builtin/am.c:2335 +#: builtin/am.c:2391 msgid "synonyms for --continue" msgstr "和 --continue 同义" -#: builtin/am.c:2338 +#: builtin/am.c:2394 msgid "skip the current patch" msgstr "跳过当前补丁" -#: builtin/am.c:2341 +#: builtin/am.c:2397 msgid "restore the original branch and abort the patching operation" msgstr "恢复原始分支并终止打补丁操作" -#: builtin/am.c:2344 +#: builtin/am.c:2400 msgid "abort the patching operation but keep HEAD where it is" msgstr "终止补丁操作但保持 HEAD 不变" -#: builtin/am.c:2348 +#: builtin/am.c:2404 msgid "show the patch being applied" msgstr "显示正在应用的补丁" -#: builtin/am.c:2353 +#: builtin/am.c:2408 +msgid "record the empty patch as an empty commit" +msgstr "把空补丁记录为空提交" + +#: builtin/am.c:2412 msgid "lie about committer date" msgstr "将作者日期作为提交日期" -#: builtin/am.c:2355 +#: builtin/am.c:2414 msgid "use current timestamp for author date" msgstr "用当前时间作为作者日期" -#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642 -#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099 +#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643 +#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099 #: builtin/revert.c:117 builtin/tag.c:460 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2358 builtin/rebase.c:1100 +#: builtin/am.c:2417 builtin/rebase.c:1100 msgid "GPG-sign commits" msgstr "使用 GPG 签名提交" -#: builtin/am.c:2361 +#: builtin/am.c:2420 +msgid "how to handle empty patches" +msgstr "如何处理空补丁" + +#: builtin/am.c:2423 msgid "(internal use for git-rebase)" msgstr "（内部使用，用于 git-rebase）" -#: builtin/am.c:2379 +#: builtin/am.c:2441 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." @@ -10888,16 +10863,16 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" "请不要再使用它了。" -#: builtin/am.c:2386 +#: builtin/am.c:2448 msgid "failed to read the index" -msgstr "读取索引失败" +msgstr "无法读取索引" -#: builtin/am.c:2401 +#: builtin/am.c:2463 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" -#: builtin/am.c:2425 +#: builtin/am.c:2487 #, c-format msgid "" "Stray %s directory found.\n" @@ -10906,11 +10881,11 @@ msgstr "" "发现了错误的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" -#: builtin/am.c:2431 +#: builtin/am.c:2493 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" -#: builtin/am.c:2441 +#: builtin/am.c:2503 msgid "interactive mode requires patches on the command line" msgstr "交互式模式需要命令行上提供补丁" @@ -11360,11 +11335,11 @@ msgstr "不把根提交作为边界（默认：关闭）" msgid "show work cost statistics" msgstr "显示工作消耗统计" -#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94 -#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179 -#: builtin/merge.c:298 builtin/multi-pack-index.c:103 -#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178 -#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566 +#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94 +#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180 +#: builtin/merge.c:301 builtin/multi-pack-index.c:103 +#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180 +#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566 #: builtin/send-pack.c:202 msgid "force progress reporting" msgstr "强制显示进度报告" @@ -11413,7 +11388,7 @@ msgstr "显示作者的邮箱而不是名字（默认：关闭）" msgid "ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:879 builtin/log.c:1823 +#: builtin/blame.c:879 builtin/log.c:1838 msgid "rev" msgstr "版本" @@ -11465,7 +11440,7 @@ msgstr "范围" msgid "process only line range <start>,<end> or function :<funcname>" msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数名>" -#: builtin/blame.c:944 +#: builtin/blame.c:947 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress 不能和 --incremental 或机器内部格式一起使用" @@ -11477,18 +11452,18 @@ msgstr "--progress 不能和 --incremental 或机器内部格式一起使用" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:995 +#: builtin/blame.c:998 msgid "4 years, 11 months ago" msgstr "4 年 11 个月前" -#: builtin/blame.c:1111 +#: builtin/blame.c:1114 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "文件 %s 只有 %lu 行" msgstr[1] "文件 %s 只有 %lu 行" -#: builtin/blame.c:1156 +#: builtin/blame.c:1159 msgid "Blaming lines" msgstr "追踪代码行" @@ -11521,7 +11496,7 @@ msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<选项>] [-r | -a] [--format]" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:154 +#: builtin/branch.c:153 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -11531,7 +11506,7 @@ msgstr "" " '%s'，但未合并到 HEAD。" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:158 +#: builtin/branch.c:157 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -11540,12 +11515,12 @@ msgstr "" "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" " 然而却尚未被合并到分支 '%s' 。" -#: builtin/branch.c:172 +#: builtin/branch.c:171 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "无法查询 '%s' 指向的提交对象" -#: builtin/branch.c:176 +#: builtin/branch.c:175 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -11554,7 +11529,7 @@ msgstr "" "分支 '%s' 没有完全合并。\n" "如果您确认要删除它，执行 'git branch -D %s'。" -#: builtin/branch.c:189 +#: builtin/branch.c:188 msgid "Update of config-file failed" msgstr "更新配置文件失败" @@ -11566,99 +11541,99 @@ msgstr "不能将 -a 和 -d 同时使用" msgid "Couldn't look up commit object for HEAD" msgstr "无法查询 HEAD 指向的提交对象" -#: builtin/branch.c:244 +#: builtin/branch.c:247 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" -#: builtin/branch.c:259 +#: builtin/branch.c:262 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "未能找到远程跟踪分支 '%s'。" -#: builtin/branch.c:260 +#: builtin/branch.c:263 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未发现。" -#: builtin/branch.c:291 +#: builtin/branch.c:294 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n" -#: builtin/branch.c:292 +#: builtin/branch.c:295 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s（曾为 %s）。\n" -#: builtin/branch.c:441 builtin/tag.c:63 +#: builtin/branch.c:445 builtin/tag.c:63 msgid "unable to parse format string" msgstr "不能解析格式化字符串" -#: builtin/branch.c:472 +#: builtin/branch.c:476 msgid "could not resolve HEAD" msgstr "不能解析 HEAD 提交" -#: builtin/branch.c:478 +#: builtin/branch.c:482 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) 指向 refs/heads/ 之外" -#: builtin/branch.c:493 +#: builtin/branch.c:497 #, c-format msgid "Branch %s is being rebased at %s" msgstr "分支 %s 正被变基到 %s" -#: builtin/branch.c:497 +#: builtin/branch.c:501 #, c-format msgid "Branch %s is being bisected at %s" msgstr "分支 %s 正被二分查找于 %s" -#: builtin/branch.c:514 +#: builtin/branch.c:518 msgid "cannot copy the current branch while not on any." msgstr "无法拷贝当前分支因为不处于任何分支上。" -#: builtin/branch.c:516 +#: builtin/branch.c:520 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" -#: builtin/branch.c:527 +#: builtin/branch.c:531 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" -#: builtin/branch.c:556 +#: builtin/branch.c:560 msgid "Branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c:558 +#: builtin/branch.c:562 msgid "Branch copy failed" msgstr "分支拷贝失败" -#: builtin/branch.c:562 +#: builtin/branch.c:566 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "已为错误命名的分支 '%s' 创建了一个副本" -#: builtin/branch.c:565 +#: builtin/branch.c:569 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "已将错误命名的分支 '%s' 重命名" -#: builtin/branch.c:571 +#: builtin/branch.c:575 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" -#: builtin/branch.c:580 +#: builtin/branch.c:584 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新配置文件失败" -#: builtin/branch.c:582 +#: builtin/branch.c:586 msgid "Branch is copied, but update of config-file failed" msgstr "分支已拷贝，但更新配置文件失败" -#: builtin/branch.c:598 +#: builtin/branch.c:602 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11669,209 +11644,205 @@ msgstr "" " %s\n" "以 '%c' 开头的行将被过滤。\n" -#: builtin/branch.c:632 +#: builtin/branch.c:637 msgid "Generic options" msgstr "通用选项" -#: builtin/branch.c:634 +#: builtin/branch.c:639 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" -#: builtin/branch.c:635 +#: builtin/branch.c:640 msgid "suppress informational messages" msgstr "不显示信息" -#: builtin/branch.c:636 -msgid "set up tracking mode (see git-pull(1))" -msgstr "设置跟踪模式（参见 git-pull(1)）" +#: builtin/branch.c:642 +msgid "set branch tracking configuration" +msgstr "设置分支跟踪配置" -#: builtin/branch.c:638 +#: builtin/branch.c:645 msgid "do not use" msgstr "不要使用" -#: builtin/branch.c:640 +#: builtin/branch.c:647 msgid "upstream" msgstr "上游" -#: builtin/branch.c:640 +#: builtin/branch.c:647 msgid "change the upstream info" msgstr "改变上游信息" -#: builtin/branch.c:641 +#: builtin/branch.c:648 msgid "unset the upstream info" msgstr "取消上游信息的设置" -#: builtin/branch.c:642 +#: builtin/branch.c:649 msgid "use colored output" msgstr "使用彩色输出" -#: builtin/branch.c:643 +#: builtin/branch.c:650 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" -#: builtin/branch.c:645 builtin/branch.c:647 +#: builtin/branch.c:652 builtin/branch.c:654 msgid "print only branches that contain the commit" msgstr "只打印包含该提交的分支" -#: builtin/branch.c:646 builtin/branch.c:648 +#: builtin/branch.c:653 builtin/branch.c:655 msgid "print only branches that don't contain the commit" msgstr "只打印不包含该提交的分支" -#: builtin/branch.c:651 +#: builtin/branch.c:658 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作：" -#: builtin/branch.c:652 +#: builtin/branch.c:659 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪及本地分支" -#: builtin/branch.c:654 +#: builtin/branch.c:661 msgid "delete fully merged branch" msgstr "删除完全合并的分支" -#: builtin/branch.c:655 +#: builtin/branch.c:662 msgid "delete branch (even if not merged)" msgstr "删除分支（即使没有合并）" -#: builtin/branch.c:656 +#: builtin/branch.c:663 msgid "move/rename a branch and its reflog" msgstr "移动/重命名一个分支，以及它的引用日志" -#: builtin/branch.c:657 +#: builtin/branch.c:664 msgid "move/rename a branch, even if target exists" msgstr "移动/重命名一个分支，即使目标已存在" -#: builtin/branch.c:658 +#: builtin/branch.c:665 msgid "copy a branch and its reflog" msgstr "拷贝一个分支和它的引用日志" -#: builtin/branch.c:659 +#: builtin/branch.c:666 msgid "copy a branch, even if target exists" msgstr "拷贝一个分支，即使目标已存在" -#: builtin/branch.c:660 +#: builtin/branch.c:667 msgid "list branch names" msgstr "列出分支名" -#: builtin/branch.c:661 +#: builtin/branch.c:668 msgid "show current branch name" msgstr "显示当前分支名" -#: builtin/branch.c:662 +#: builtin/branch.c:669 msgid "create the branch's reflog" msgstr "创建分支的引用日志" -#: builtin/branch.c:664 +#: builtin/branch.c:671 msgid "edit the description for the branch" msgstr "标记分支的描述" -#: builtin/branch.c:665 +#: builtin/branch.c:672 msgid "force creation, move/rename, deletion" msgstr "强制创建、移动/重命名、删除" -#: builtin/branch.c:666 +#: builtin/branch.c:673 msgid "print only branches that are merged" msgstr "只打印已经合并的分支" -#: builtin/branch.c:667 +#: builtin/branch.c:674 msgid "print only branches that are not merged" msgstr "只打印尚未合并的分支" -#: builtin/branch.c:668 +#: builtin/branch.c:675 msgid "list branches in columns" msgstr "以列的方式显示分支" -#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413 +#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582 #: builtin/tag.c:475 msgid "object" msgstr "对象" -#: builtin/branch.c:671 +#: builtin/branch.c:678 msgid "print only branches of the object" msgstr "只打印指向该对象的分支" -#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482 +#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482 msgid "sorting and filtering are case insensitive" msgstr "排序和过滤属于大小写不敏感" -#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480 +#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "输出格式" -#: builtin/branch.c:696 builtin/clone.c:678 +#: builtin/branch.c:703 builtin/clone.c:678 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" -#: builtin/branch.c:720 -msgid "--column and --verbose are incompatible" -msgstr "--column 和 --verbose 不兼容" - -#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801 +#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807 msgid "branch name required" msgstr "必须提供分支名" -#: builtin/branch.c:768 +#: builtin/branch.c:774 msgid "Cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" -#: builtin/branch.c:773 +#: builtin/branch.c:779 msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" -#: builtin/branch.c:780 +#: builtin/branch.c:786 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚无提交。" -#: builtin/branch.c:783 +#: builtin/branch.c:789 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" -#: builtin/branch.c:798 +#: builtin/branch.c:804 msgid "too many branches for a copy operation" msgstr "为拷贝操作提供了太多的分支名" -#: builtin/branch.c:807 +#: builtin/branch.c:813 msgid "too many arguments for a rename operation" msgstr "为重命名操作提供了太多的参数" -#: builtin/branch.c:812 +#: builtin/branch.c:818 msgid "too many arguments to set new upstream" msgstr "为设置新上游提供了太多的参数" -#: builtin/branch.c:816 +#: builtin/branch.c:822 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。" -#: builtin/branch.c:819 builtin/branch.c:842 +#: builtin/branch.c:825 builtin/branch.c:848 #, c-format msgid "no such branch '%s'" msgstr "没有此分支 '%s'" -#: builtin/branch.c:823 +#: builtin/branch.c:829 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c:836 +#: builtin/branch.c:842 msgid "too many arguments to unset upstream" msgstr "为取消上游设置操作提供了太多的参数" -#: builtin/branch.c:840 +#: builtin/branch.c:846 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" -#: builtin/branch.c:846 +#: builtin/branch.c:852 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" -#: builtin/branch.c:856 +#: builtin/branch.c:862 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11879,7 +11850,7 @@ msgstr "" "'git branch' 的 -a 和 -r 选项不带一个分支名。\n" "您是否想要使用：-a|-r --list <模式>？" -#: builtin/branch.c:860 +#: builtin/branch.c:866 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -12146,8 +12117,8 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549 -#: builtin/worktree.c:494 +#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "不显示进度报告" @@ -12205,10 +12176,10 @@ msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<选项>]" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863 -#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874 -#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576 -#: builtin/worktree.c:492 builtin/worktree.c:729 +#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875 +#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577 +#: builtin/worktree.c:491 builtin/worktree.c:728 msgid "string" msgstr "字符串" @@ -12272,98 +12243,93 @@ msgstr "git switch [<选项>] [<分支>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<选项>] [--source=<分支>] <文件>..." -#: builtin/checkout.c:190 builtin/checkout.c:229 +#: builtin/checkout.c:198 builtin/checkout.c:237 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" -#: builtin/checkout.c:192 builtin/checkout.c:231 +#: builtin/checkout.c:200 builtin/checkout.c:239 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" -#: builtin/checkout.c:208 +#: builtin/checkout.c:216 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必需的版本" -#: builtin/checkout.c:261 +#: builtin/checkout.c:269 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必需的版本" -#: builtin/checkout.c:278 +#: builtin/checkout.c:286 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：无法合并" -#: builtin/checkout.c:294 +#: builtin/checkout.c:302 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:411 +#: builtin/checkout.c:419 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新创建了 %d 个合并冲突" msgstr[1] "重新创建了 %d 个合并冲突" -#: builtin/checkout.c:416 +#: builtin/checkout.c:424 #, 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:423 +#: builtin/checkout.c:431 #, 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:446 builtin/checkout.c:449 builtin/checkout.c:452 -#: builtin/checkout.c:456 +#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460 +#: builtin/checkout.c:464 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路径时使用" -#: builtin/checkout.c:459 builtin/checkout.c:462 -#, c-format -msgid "'%s' cannot be used with %s" -msgstr "'%s' 不能和 %s 同时使用" - -#: builtin/checkout.c:466 +#: builtin/checkout.c:474 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" -#: builtin/checkout.c:470 +#: builtin/checkout.c:478 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' 或 '%s' 都没有指定" -#: builtin/checkout.c:474 +#: builtin/checkout.c:482 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 '%2$s' 时，必须使用 '%1$s'" -#: builtin/checkout.c:479 builtin/checkout.c:484 +#: builtin/checkout.c:487 builtin/checkout.c:492 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' 或 '%s' 不能和 %s 一起使用" -#: builtin/checkout.c:558 builtin/checkout.c:565 +#: builtin/checkout.c:566 builtin/checkout.c:573 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:736 +#: builtin/checkout.c:747 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:786 +#: builtin/checkout.c:797 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12372,51 +12338,51 @@ msgstr "" "不能继续，下列文件有暂存的修改：\n" "%s" -#: builtin/checkout.c:879 +#: builtin/checkout.c:890 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能对 '%s' 执行 reflog 操作：%s\n" -#: builtin/checkout.c:921 +#: builtin/checkout.c:934 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203 +#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:929 +#: builtin/checkout.c:942 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:932 +#: builtin/checkout.c:945 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:936 +#: builtin/checkout.c:949 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:938 builtin/checkout.c:1369 +#: builtin/checkout.c:951 builtin/checkout.c:1388 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:940 +#: builtin/checkout.c:953 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:991 +#: builtin/checkout.c:1004 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#: builtin/checkout.c:997 +#: builtin/checkout.c:1010 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12437,7 +12403,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1016 +#: builtin/checkout.c:1029 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12464,19 +12430,19 @@ msgstr[1] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:1051 +#: builtin/checkout.c:1064 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:1055 +#: builtin/checkout.c:1068 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:1095 builtin/checkout.c:1364 +#: builtin/checkout.c:1114 builtin/checkout.c:1383 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c:1177 +#: builtin/checkout.c:1196 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12485,7 +12451,7 @@ msgstr "" "'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n" "请使用 --（和可选的 --no-guess）来消除歧义" -#: builtin/checkout.c:1184 +#: builtin/checkout.c:1203 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" @@ -12504,51 +12470,51 @@ msgstr "" "如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n" "名称，可以在配置中设置 checkout.defaultRemote=origin。" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1213 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' 匹配多个（%d 个）远程跟踪分支" -#: builtin/checkout.c:1260 +#: builtin/checkout.c:1279 msgid "only one reference expected" msgstr "只期望一个引用" -#: builtin/checkout.c:1277 +#: builtin/checkout.c:1296 #, c-format msgid "only one reference expected, %d given." msgstr "应只有一个引用，却给出了 %d 个" -#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437 +#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" -#: builtin/checkout.c:1336 builtin/checkout.c:1705 +#: builtin/checkout.c:1355 builtin/checkout.c:1725 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1402 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一个分支，得到标签 '%s'" -#: builtin/checkout.c:1385 +#: builtin/checkout.c:1404 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一个分支，得到远程分支 '%s'" -#: builtin/checkout.c:1386 builtin/checkout.c:1394 +#: builtin/checkout.c:1405 builtin/checkout.c:1413 #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一个分支，得到 '%s'" -#: builtin/checkout.c:1389 +#: builtin/checkout.c:1408 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一个分支，得到提交 '%s'" -#: builtin/checkout.c:1405 +#: builtin/checkout.c:1424 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12556,7 +12522,7 @@ msgstr "" "不能在合并时切换分支\n" "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1409 +#: builtin/checkout.c:1428 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12564,7 +12530,7 @@ msgstr "" "不能在一个 am 会话期间切换分支\n" "考虑使用 \"git am --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1413 +#: builtin/checkout.c:1432 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12572,7 +12538,7 @@ msgstr "" "不能在变基时切换分支\n" "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1417 +#: builtin/checkout.c:1436 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12580,7 +12546,7 @@ msgstr "" "不能在拣选时切换分支\n" "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1421 +#: builtin/checkout.c:1440 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12588,208 +12554,196 @@ msgstr "" "不能在还原时切换分支\n" "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1425 +#: builtin/checkout.c:1444 msgid "you are switching branch while bisecting" msgstr "您在执行二分查找时切换分支" -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1451 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443 +#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453 -#: builtin/checkout.c:1458 builtin/checkout.c:1463 +#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472 +#: builtin/checkout.c:1477 builtin/checkout.c:1482 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1460 +#: builtin/checkout.c:1479 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' 不带 <起始点>" -#: builtin/checkout.c:1468 +#: builtin/checkout.c:1487 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1494 msgid "missing branch or commit argument" msgstr "缺少分支或提交参数" -#: builtin/checkout.c:1518 +#: builtin/checkout.c:1537 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方合并" -#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321 +#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323 msgid "style" msgstr "风格" -#: builtin/checkout.c:1520 -msgid "conflict style (merge or diff3)" -msgstr "冲突输出风格（merge 或 diff3）" +#: builtin/checkout.c:1539 +msgid "conflict style (merge, diff3, or zdiff3)" +msgstr "冲突输出风格（merge、diff3 或 zdiff3）" -#: builtin/checkout.c:1532 builtin/worktree.c:489 +#: builtin/checkout.c:1551 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的提交分离" -#: builtin/checkout.c:1533 -msgid "set upstream info for new branch" -msgstr "为新的分支设置上游信息" +#: builtin/checkout.c:1553 +msgid "set up tracking mode (see git-pull(1))" +msgstr "设置跟踪模式（参见 git-pull(1)）" -#: builtin/checkout.c:1535 +#: builtin/checkout.c:1556 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1558 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1558 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1539 builtin/merge.c:302 +#: builtin/checkout.c:1560 builtin/merge.c:305 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1563 msgid "do not check if another worktree is holding the given ref" msgstr "不检查指定的引用是否被其他工作区所占用" -#: builtin/checkout.c:1555 +#: builtin/checkout.c:1576 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1558 +#: builtin/checkout.c:1579 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1583 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1620 +#: builtin/checkout.c:1640 #, c-format -msgid "-%c, -%c and --orphan are mutually exclusive" -msgstr "-%c、-%c 和 --orphan 是互斥的" +msgid "options '-%c', '-%c', and '%s' cannot be used together" +msgstr "选项 '-%c'、'-%c' 和 ‘%s' 不能同时使用" -#: builtin/checkout.c:1624 -msgid "-p and --overlay are mutually exclusive" -msgstr "-p 和 --overlay 互斥" - -#: builtin/checkout.c:1661 +#: builtin/checkout.c:1681 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1666 +#: builtin/checkout.c:1686 #, c-format msgid "missing branch name; try -%c" msgstr "缺少分支名，尝试 -%c" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1718 #, c-format msgid "could not resolve %s" msgstr "无法解析 %s" -#: builtin/checkout.c:1714 +#: builtin/checkout.c:1734 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1721 +#: builtin/checkout.c:1741 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'" -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1745 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1734 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--pathspec-from-file 与 --detach 不兼容" - -#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--pathspec-from-file 与 --patch 不兼容" - -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1770 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:1755 +#: builtin/checkout.c:1775 msgid "you must specify path(s) to restore" msgstr "您必须指定一个要恢复的路径" -#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832 -#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2958 -#: builtin/submodule--helper.c:3252 builtin/worktree.c:485 -#: builtin/worktree.c:487 +#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854 +#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2959 +#: builtin/submodule--helper.c:3253 builtin/worktree.c:484 +#: builtin/worktree.c:486 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1782 +#: builtin/checkout.c:1801 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1784 +#: builtin/checkout.c:1803 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1785 +#: builtin/checkout.c:1804 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1787 +#: builtin/checkout.c:1806 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "二次猜测 'git checkout <无此分支>'（默认）" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1807 msgid "use overlay mode (default)" msgstr "使用叠加模式（默认）" -#: builtin/checkout.c:1833 +#: builtin/checkout.c:1855 msgid "create and switch to a new branch" msgstr "创建并切换一个新分支" -#: builtin/checkout.c:1835 +#: builtin/checkout.c:1857 msgid "create/reset and switch to a branch" msgstr "创建/重置并切换一个分支" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1859 msgid "second guess 'git switch <no-such-branch>'" msgstr "二次猜测 'git switch <无此分支>'" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1861 msgid "throw away local modifications" msgstr "丢弃本地修改" -#: builtin/checkout.c:1873 +#: builtin/checkout.c:1897 msgid "which tree-ish to checkout from" msgstr "要检出哪一个树" -#: builtin/checkout.c:1875 +#: builtin/checkout.c:1899 msgid "restore the index" msgstr "恢复索引" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1901 msgid "restore the working tree (default)" msgstr "恢复工作区（默认）" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1903 msgid "ignore unmerged entries" msgstr "忽略未合并条目" -#: builtin/checkout.c:1880 +#: builtin/checkout.c:1904 msgid "use overlay mode" msgstr "使用叠加模式" @@ -12824,7 +12778,15 @@ msgstr "将忽略仓库 %s\n" msgid "could not lstat %s\n" msgstr "不能对 %s 调用 lstat\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:39 +msgid "Refusing to remove current working directory\n" +msgstr "拒绝删除当前工作目录\n" + +#: builtin/clean.c:40 +msgid "Would refuse to remove current working directory\n" +msgstr "将拒绝删除当前工作目录\n" + +#: builtin/clean.c:326 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12837,7 +12799,7 @@ msgstr "" "foo - 通过唯一前缀选择一个选项\n" " - （空）什么也不选择\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:330 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12858,33 +12820,33 @@ msgstr "" "* - 选择所有选项\n" " - （空）结束选择\n" -#: builtin/clean.c:519 git-add--interactive.perl:568 +#: builtin/clean.c:545 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" -#: builtin/clean.c:659 +#: builtin/clean.c:685 #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除条目>> " -#: builtin/clean.c:693 +#: builtin/clean.c:719 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：无法找到和 %s 匹配的条目" -#: builtin/clean.c:714 +#: builtin/clean.c:740 msgid "Select items to delete" msgstr "选择要删除的条目" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:755 +#: builtin/clean.c:781 #, c-format msgid "Remove %s [y/N]? " msgstr "删除 %s [y/N]？" -#: builtin/clean.c:786 +#: builtin/clean.c:812 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12902,66 +12864,66 @@ msgstr "" "help - 显示本帮助\n" "? - 显示如何在提示符下选择的帮助" -#: builtin/clean.c:822 +#: builtin/clean.c:848 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "将删除如下条目：" msgstr[1] "将删除如下条目：" -#: builtin/clean.c:838 +#: builtin/clean.c:864 msgid "No more files to clean, exiting." msgstr "没有要清理的文件，退出。" -#: builtin/clean.c:900 +#: builtin/clean.c:926 msgid "do not print names of files removed" msgstr "不打印删除文件的名称" -#: builtin/clean.c:902 +#: builtin/clean.c:928 msgid "force" msgstr "强制" -#: builtin/clean.c:903 +#: builtin/clean.c:929 msgid "interactive cleaning" msgstr "交互式清除" -#: builtin/clean.c:905 +#: builtin/clean.c:931 msgid "remove whole directories" msgstr "删除整个目录" -#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567 #: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537 #: builtin/show-ref.c:179 msgid "pattern" msgstr "模式" -#: builtin/clean.c:907 +#: builtin/clean.c:933 msgid "add <pattern> to ignore rules" msgstr "添加 <模式> 到忽略规则" -#: builtin/clean.c:908 +#: builtin/clean.c:934 msgid "remove ignored files, too" msgstr "也删除忽略的文件" -#: builtin/clean.c:910 +#: builtin/clean.c:936 msgid "remove only ignored files" msgstr "只删除忽略的文件" -#: builtin/clean.c:925 +#: builtin/clean.c:951 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:928 +#: builtin/clean.c:954 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:940 +#: builtin/clean.c:966 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" @@ -13017,19 +12979,20 @@ msgstr "模板目录" msgid "directory from which templates will be used" msgstr "模板目录将被使用" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870 -#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871 +#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260 msgid "reference repository" msgstr "参考仓库" -#: builtin/clone.c:123 builtin/submodule--helper.c:1872 -#: builtin/submodule--helper.c:2515 +#: builtin/clone.c:123 builtin/submodule--helper.c:1873 +#: builtin/submodule--helper.c:2516 msgid "use --reference only while cloning" msgstr "仅在克隆时参考 --reference 指向的本地仓库" -#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663 -#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595 +#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27 +#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290 +#: builtin/pack-objects.c:3944 builtin/repack.c:665 +#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595 #: t/helper/test-simple-ipc.c:597 msgid "name" msgstr "名称" @@ -13046,7 +13009,7 @@ msgstr "检出 <分支> 而不是远程 HEAD" msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876 +#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876 #: builtin/pull.c:212 msgid "depth" msgstr "深度" @@ -13055,7 +13018,7 @@ msgstr "深度" msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933 +#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933 #: builtin/pull.c:215 msgid "time" msgstr "时间" @@ -13064,17 +13027,17 @@ msgstr "时间" msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" -#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 +#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208 #: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022 msgid "revision" msgstr "版本" -#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219 +#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219 msgid "deepen history of shallow clone, excluding rev" msgstr "深化浅克隆的历史，除了特定版本" -#: builtin/clone.c:137 builtin/submodule--helper.c:1882 -#: builtin/submodule--helper.c:2529 +#: builtin/clone.c:137 builtin/submodule--helper.c:1883 +#: builtin/submodule--helper.c:2530 msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" @@ -13102,22 +13065,22 @@ msgstr "key=value" msgid "set config inside the new repository" msgstr "在新仓库中设置配置信息" -#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200 msgid "server-specific" msgstr "server-specific" -#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201 msgid "option to transmit" msgstr "传输选项" -#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238 +#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238 #: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 地址" -#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241 +#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241 #: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 地址" @@ -13148,12 +13111,12 @@ msgstr "无法在 '%s' 上启动迭代器" #: builtin/clone.c:353 #, c-format msgid "failed to create link '%s'" -msgstr "创建链接 '%s' 失败" +msgstr "无法创建链接 '%s'" #: builtin/clone.c:357 #, c-format msgid "failed to copy file to '%s'" -msgstr "拷贝文件至 '%s' 失败" +msgstr "无法拷贝文件至 '%s'" #: builtin/clone.c:362 #, c-format @@ -13209,29 +13172,25 @@ msgstr "无法执行 repack 来清理" msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" -#: builtin/clone.c:886 builtin/receive-pack.c:2493 +#: builtin/clone.c:886 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:890 +#: builtin/clone.c:890 contrib/scalar/scalar.c:414 msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" #: builtin/clone.c:903 #, c-format -msgid "--bare and --origin %s options are incompatible." -msgstr "--bare 和 --origin %s 选项不兼容。" - -#: builtin/clone.c:906 -msgid "--bare and --separate-git-dir are incompatible." -msgstr "--bare 和 --separate-git-dir 选项不兼容。" +msgid "options '%s' and '%s %s' cannot be used together" +msgstr "选项 '%s' 和 '%s %s' 不能同时使用" #: builtin/clone.c:920 #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' 不存在" -#: builtin/clone.c:924 builtin/fetch.c:2029 +#: builtin/clone.c:924 builtin/fetch.c:2047 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" @@ -13251,8 +13210,8 @@ msgstr "仓库路径 '%s' 已经存在，并且不是一个空目录。" msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262 -#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313 +#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256 +#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" @@ -13369,7 +13328,7 @@ msgstr "" ">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--" "[no-]max-new-filters <n>] [--[no-]progress] <切分选项>" -#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779 +#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794 msgid "dir" msgstr "目录" @@ -13449,7 +13408,7 @@ msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" msgid "Collecting commits from input" msgstr "正从标准输入收集提交" -#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255 +#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259 #, c-format msgid "unrecognized subcommand: %s" msgstr "未识别的子命令：%s" @@ -13467,7 +13426,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "忽略重复的父提交 %s" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577 #, c-format msgid "not a valid object name %s" msgstr "不是一个有效的对象名 %s" @@ -13490,13 +13449,13 @@ msgstr "父提交" msgid "id of a parent commit object" msgstr "父提交对象 ID" -#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283 -#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618 +#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284 +#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677 #: builtin/tag.c:454 msgid "message" msgstr "说明" -#: builtin/commit-tree.c:113 builtin/commit.c:1626 +#: builtin/commit-tree.c:113 builtin/commit.c:1627 msgid "commit message" msgstr "提交说明" @@ -13504,7 +13463,7 @@ msgstr "提交说明" msgid "read commit log message from file" msgstr "从文件中读取提交说明" -#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300 +#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303 #: builtin/pull.c:180 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG 提交签名" @@ -13515,7 +13474,7 @@ msgstr "必须精确地提供一个树" #: builtin/commit-tree.c:138 msgid "git commit-tree: failed to read" -msgstr "git commit-tree：读取失败" +msgstr "git commit-tree：无法读取" #: builtin/commit.c:42 msgid "git commit [<options>] [--] <pathspec>..." @@ -13579,11 +13538,7 @@ msgstr "" #: builtin/commit.c:325 msgid "failed to unpack HEAD tree object" -msgstr "解包 HEAD 树对象失败" - -#: builtin/commit.c:361 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "--pathspec-from-file 和 -a 在一起没有意义" +msgstr "无法解包 HEAD 树对象" #: builtin/commit.c:375 msgid "No paths with --include/--only does not make sense." @@ -13670,8 +13625,8 @@ msgstr "不能读取日志文件 '%s'" #: builtin/commit.c:802 #, c-format -msgid "cannot combine -m with --fixup:%s" -msgstr "不能将 -m 和 --fixup 组合使用：%s" +msgid "options '%s' and '%s:%s' cannot be used together" +msgstr "选项 '%s' 和 '%s:%s' 不能同时使用" #: builtin/commit.c:814 builtin/commit.c:830 msgid "could not read SQUASH_MSG" @@ -13776,7 +13731,7 @@ msgstr "无法将尾注传递给 --trailers" msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:1080 builtin/tag.c:317 +#: builtin/commit.c:1080 builtin/tag.c:316 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" @@ -13791,14 +13746,10 @@ msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者 msgid "Invalid ignored mode '%s'" msgstr "无效的忽略模式 '%s'" -#: builtin/commit.c:1156 builtin/commit.c:1450 +#: builtin/commit.c:1156 builtin/commit.c:1451 #, c-format msgid "Invalid untracked files mode '%s'" -msgstr "无效的未追踪文件参数 '%s'" - -#: builtin/commit.c:1196 -msgid "--long and -z are incompatible" -msgstr "--long 和 -z 选项不兼容" +msgstr "无效的未跟踪文件参数 '%s'" #: builtin/commit.c:1227 msgid "You are in the middle of a merge -- cannot reword." @@ -13810,311 +13761,309 @@ msgstr "您正处于一个拣选过程中 -- 无法改写说明。" #: builtin/commit.c:1232 #, c-format -msgid "cannot combine reword option of --fixup with path '%s'" -msgstr "不能将 --fixup 的改写说明选项和路径 '%s' 组合使用" +msgid "reword option of '%s' and path '%s' cannot be used together" +msgstr "改写说明选项 '%s' 和路径 '%s' 不能同时使用" #: builtin/commit.c:1234 -msgid "" -"reword option of --fixup is mutually exclusive with --patch/--interactive/--" -"all/--include/--only" -msgstr "" -"--fixup 的 reword 选项和 --patch/--interactive/--all/--include/--only 互斥" +#, c-format +msgid "reword option of '%s' and '%s' cannot be used together" +msgstr "改写说明选项 '%s' 和 '%s' 不能同时使用" -#: builtin/commit.c:1253 +#: builtin/commit.c:1254 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1260 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1263 +#: builtin/commit.c:1264 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1265 +#: builtin/commit.c:1266 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1267 +#: builtin/commit.c:1268 msgid "You are in the middle of a rebase -- cannot amend." msgstr "您正处于一个变基过程中 -- 无法修补提交。" -#: builtin/commit.c:1270 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1280 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1282 +#: builtin/commit.c:1283 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" -#: builtin/commit.c:1291 +#: builtin/commit.c:1292 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1309 +#: builtin/commit.c:1310 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1337 +#: builtin/commit.c:1338 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "未知选项：--fixup=%s:%s" -#: builtin/commit.c:1354 +#: builtin/commit.c:1355 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" -#: builtin/commit.c:1485 builtin/commit.c:1654 +#: builtin/commit.c:1486 builtin/commit.c:1655 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1487 builtin/commit.c:1656 +#: builtin/commit.c:1488 builtin/commit.c:1657 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1489 +#: builtin/commit.c:1490 msgid "show stash information" msgstr "显示贮藏区信息" -#: builtin/commit.c:1491 builtin/commit.c:1658 +#: builtin/commit.c:1492 builtin/commit.c:1659 msgid "compute full ahead/behind values" msgstr "计算完整的领先/落后值" -#: builtin/commit.c:1493 +#: builtin/commit.c:1494 msgid "version" msgstr "版本" -#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551 -#: builtin/worktree.c:691 +#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1496 builtin/commit.c:1662 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1499 builtin/commit.c:1665 +#: builtin/commit.c:1500 builtin/commit.c:1666 msgid "terminate entries with NUL" msgstr "条目以 NUL 字符结尾" -#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668 -#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335 +#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669 +#: builtin/fast-export.c:1172 builtin/fast-export.c:1175 +#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337 msgid "mode" msgstr "模式" -#: builtin/commit.c:1502 builtin/commit.c:1668 +#: builtin/commit.c:1503 builtin/commit.c:1669 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1506 +#: builtin/commit.c:1507 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" "显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）" -#: builtin/commit.c:1508 parse-options.h:192 +#: builtin/commit.c:1509 parse-options.h:192 msgid "when" msgstr "何时" -#: builtin/commit.c:1509 +#: builtin/commit.c:1510 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1511 +#: builtin/commit.c:1512 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1512 +#: builtin/commit.c:1513 msgid "do not detect renames" msgstr "不检测重命名" -#: builtin/commit.c:1514 +#: builtin/commit.c:1515 msgid "detect renames, optionally set similarity index" msgstr "检测重命名，可以设置索引相似度" -#: builtin/commit.c:1537 +#: builtin/commit.c:1538 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支持已忽略和未跟踪文件参数的组合" -#: builtin/commit.c:1619 +#: builtin/commit.c:1620 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1620 +#: builtin/commit.c:1621 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1622 +#: builtin/commit.c:1623 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456 +#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1624 +#: builtin/commit.c:1625 msgid "author" msgstr "作者" -#: builtin/commit.c:1624 +#: builtin/commit.c:1625 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1625 builtin/gc.c:550 +#: builtin/commit.c:1626 builtin/gc.c:551 msgid "date" msgstr "日期" -#: builtin/commit.c:1625 +#: builtin/commit.c:1626 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634 -#: parse-options.h:327 ref-filter.h:92 +#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635 +#: parse-options.h:329 ref-filter.h:89 msgid "commit" msgstr "提交" -#: builtin/commit.c:1627 +#: builtin/commit.c:1628 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1628 +#: builtin/commit.c:1629 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1633 +#: builtin/commit.c:1634 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]提交" -#: builtin/commit.c:1633 +#: builtin/commit.c:1634 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明" -#: builtin/commit.c:1634 +#: builtin/commit.c:1635 msgid "use autosquash formatted message to squash specified commit" msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交" -#: builtin/commit.c:1635 +#: builtin/commit.c:1636 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1636 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1637 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "尾注" -#: builtin/commit.c:1636 +#: builtin/commit.c:1637 msgid "add custom trailer(s)" msgstr "添加自定义尾注" -#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303 +#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306 #: builtin/pull.c:146 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "添加 Signed-off-by 尾注" -#: builtin/commit.c:1638 +#: builtin/commit.c:1639 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1639 +#: builtin/commit.c:1640 msgid "force edit of commit" msgstr "强制编辑提交" -#: builtin/commit.c:1641 +#: builtin/commit.c:1642 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1646 +#: builtin/commit.c:1647 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1647 +#: builtin/commit.c:1648 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1648 +#: builtin/commit.c:1649 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1649 +#: builtin/commit.c:1650 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1650 +#: builtin/commit.c:1651 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1651 +#: builtin/commit.c:1652 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1652 +#: builtin/commit.c:1653 msgid "bypass pre-commit and commit-msg hooks" msgstr "绕过 pre-commit 和 commit-msg 钩子" -#: builtin/commit.c:1653 +#: builtin/commit.c:1654 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1666 +#: builtin/commit.c:1667 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1667 +#: builtin/commit.c:1668 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1674 +#: builtin/commit.c:1675 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1676 +#: builtin/commit.c:1677 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1752 +#: builtin/commit.c:1753 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1759 +#: builtin/commit.c:1760 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1780 +#: builtin/commit.c:1781 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1787 +#: builtin/commit.c:1788 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1792 +#: builtin/commit.c:1793 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1803 +#: builtin/commit.c:1804 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "因提交说明的正文为空而终止提交。\n" -#: builtin/commit.c:1839 +#: builtin/commit.c:1840 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14314,7 +14263,7 @@ msgstr "无效键名模式：%s" #: builtin/config.c:377 #, c-format msgid "failed to format default config value: %s" -msgstr "格式化默认配置值失败：%s" +msgstr "无法格式化默认配置值：%s" #: builtin/config.c:441 #, c-format @@ -14613,7 +14562,7 @@ msgstr "只考虑匹配 <模式> 的标签" msgid "do not consider tags matching <pattern>" msgstr "不考虑匹配 <模式> 的标签" -#: builtin/describe.c:570 builtin/name-rev.c:535 +#: builtin/describe.c:570 builtin/name-rev.c:544 msgid "show abbreviated commit object as fallback" msgstr "显示简写的提交号作为后备" @@ -14629,25 +14578,14 @@ msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）" msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）" -#: builtin/describe.c:593 -msgid "--long is incompatible with --abbrev=0" -msgstr "--long 与 --abbrev=0 不兼容" - #: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "没有发现名称，无法描述任何东西。" -#: builtin/describe.c:673 -msgid "--dirty is incompatible with commit-ishes" -msgstr "--dirty 与提交号不兼容" - -#: builtin/describe.c:675 -msgid "--broken is incompatible with commit-ishes" -msgstr "--broken 与提交号不兼容" - -#: builtin/diff-tree.c:155 -msgid "--stdin and --merge-base are mutually exclusive" -msgstr "--stdin 和 --merge-base 是互斥的" +#: builtin/describe.c:673 builtin/describe.c:675 +#, c-format +msgid "option '%s' and commit-ishes cannot be used together" +msgstr "选项 '%s' 和提交号不能同时使用" #: builtin/diff-tree.c:157 msgid "--merge-base only works with two commits" @@ -14668,26 +14606,26 @@ msgstr "无效选项：%s" msgid "%s...%s: no merge base" msgstr "%s...%s：无合并基线" -#: builtin/diff.c:486 +#: builtin/diff.c:491 msgid "Not a git repository" msgstr "不是 git 仓库" -#: builtin/diff.c:532 builtin/grep.c:698 +#: builtin/diff.c:537 builtin/grep.c:698 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c:543 +#: builtin/diff.c:548 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超过两个数据对象：'%s'" -#: builtin/diff.c:548 +#: builtin/diff.c:553 #, c-format msgid "unhandled object '%s' given." msgstr "无法处理的对象 '%s'。" -#: builtin/diff.c:582 +#: builtin/diff.c:587 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s：多条合并基线，使用 %s" @@ -14696,22 +14634,22 @@ msgstr "%s...%s：多条合并基线，使用 %s" msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" -#: builtin/difftool.c:293 +#: builtin/difftool.c:287 #, c-format msgid "could not read symlink %s" msgstr "无法读取符号链接 %s" -#: builtin/difftool.c:295 +#: builtin/difftool.c:289 #, c-format msgid "could not read symlink file %s" msgstr "无法读取符号链接文件 %s" -#: builtin/difftool.c:303 +#: builtin/difftool.c:297 #, c-format msgid "could not read object %s for symlink %s" msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" -#: builtin/difftool.c:427 +#: builtin/difftool.c:421 msgid "" "combined diff formats ('-c' and '--cc') are not supported in\n" "directory diff mode ('-d' and '--dir-diff')." @@ -14719,88 +14657,80 @@ msgstr "" "不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--" "cc'）。" -#: builtin/difftool.c:632 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "两个文件都被修改：'%s' 和 '%s'。" -#: builtin/difftool.c:634 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "工作区文件被留了下来。" -#: builtin/difftool.c:645 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "临时文件存在于 '%s'。" -#: builtin/difftool.c:646 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者恢复它们。" -#: builtin/difftool.c:651 +#: builtin/difftool.c:645 #, c-format msgid "failed: %d" msgstr "失败：%d" -#: builtin/difftool.c:696 +#: builtin/difftool.c:690 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c:698 +#: builtin/difftool.c:692 msgid "perform a full-directory diff" msgstr "执行一个全目录差异比较" -#: builtin/difftool.c:700 +#: builtin/difftool.c:694 msgid "do not prompt before launching a diff tool" msgstr "启动差异比较工具之前不提示" -#: builtin/difftool.c:705 +#: builtin/difftool.c:699 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符号链接" -#: builtin/difftool.c:706 +#: builtin/difftool.c:700 msgid "tool" msgstr "工具" -#: builtin/difftool.c:707 +#: builtin/difftool.c:701 msgid "use the specified diff tool" msgstr "使用指定的差异比较工具" -#: builtin/difftool.c:709 +#: builtin/difftool.c:703 msgid "print a list of diff tools that may be used with `--tool`" msgstr "显示可以用在 `--tool` 参数后的差异工具列表" -#: builtin/difftool.c:712 +#: builtin/difftool.c:706 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit " "code" msgstr "当执行的 diff 工具返回非零退出码时，使 'git-difftool' 退出" -#: builtin/difftool.c:715 +#: builtin/difftool.c:709 msgid "specify a custom command for viewing diffs" msgstr "指定一个用于查看差异的自定义命令" -#: builtin/difftool.c:716 +#: builtin/difftool.c:710 msgid "passed to `diff`" msgstr "传递给 `diff`" -#: builtin/difftool.c:732 +#: builtin/difftool.c:726 msgid "difftool requires worktree or --no-index" msgstr "difftool 要求工作区或者 --no-index" -#: builtin/difftool.c:739 -msgid "--dir-diff is incompatible with --no-index" -msgstr "--dir-diff 和 --no-index 不兼容" - -#: builtin/difftool.c:742 -msgid "--gui, --tool and --extcmd are mutually exclusive" -msgstr "--gui、--tool 和 --extcmd 互斥" - -#: builtin/difftool.c:750 +#: builtin/difftool.c:744 msgid "no <tool> given for --tool=<tool>" msgstr "没有为 --tool=<工具> 参数提供 <工具>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:751 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" @@ -14836,123 +14766,115 @@ msgstr "选项 `--default' 和 `--type=ulong` 期望一个无符号长整型， msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:869 +#: builtin/fast-export.c:843 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "错误：除非指定 --mark-tags，否则无法导出嵌套标签。" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1152 msgid "--anonymize-map token cannot be empty" msgstr "--anonymize-map 取值不能为空" -#: builtin/fast-export.c:1198 +#: builtin/fast-export.c:1171 msgid "show progress after <n> objects" msgstr "在 <n> 个对象之后显示进度" -#: builtin/fast-export.c:1200 +#: builtin/fast-export.c:1173 msgid "select handling of signed tags" msgstr "选择如何处理签名标签" -#: builtin/fast-export.c:1203 +#: builtin/fast-export.c:1176 msgid "select handling of tags that tag filtered objects" msgstr "选择当标签指向被过滤对象时该标签的处理方式" -#: builtin/fast-export.c:1206 +#: builtin/fast-export.c:1179 msgid "select handling of commit messages in an alternate encoding" msgstr "选择使用备用编码处理提交说明" -#: builtin/fast-export.c:1209 +#: builtin/fast-export.c:1182 msgid "dump marks to this file" msgstr "把标记存储到这个文件" -#: builtin/fast-export.c:1211 +#: builtin/fast-export.c:1184 msgid "import marks from this file" msgstr "从这个文件导入标记" -#: builtin/fast-export.c:1215 +#: builtin/fast-export.c:1188 msgid "import marks from this file if it exists" msgstr "如果文件存在，从该文件导入标记" -#: builtin/fast-export.c:1217 +#: builtin/fast-export.c:1190 msgid "fake a tagger when tags lack one" msgstr "当标签缺少标记人字段时，假装提供一个" -#: builtin/fast-export.c:1219 +#: builtin/fast-export.c:1192 msgid "output full tree for each commit" msgstr "每次提交都输出整个树" -#: builtin/fast-export.c:1221 +#: builtin/fast-export.c:1194 msgid "use the done feature to terminate the stream" msgstr "使用 done 功能来终止流" -#: builtin/fast-export.c:1222 +#: builtin/fast-export.c:1195 msgid "skip output of blob data" msgstr "跳过数据对象的输出" -#: builtin/fast-export.c:1223 builtin/log.c:1826 +#: builtin/fast-export.c:1196 builtin/log.c:1841 msgid "refspec" msgstr "引用规格" -#: builtin/fast-export.c:1224 +#: builtin/fast-export.c:1197 msgid "apply refspec to exported refs" msgstr "对导出的引用应用引用规格" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c:1198 msgid "anonymize output" msgstr "匿名输出" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1199 msgid "from:to" msgstr "from:to" -#: builtin/fast-export.c:1227 +#: builtin/fast-export.c:1200 msgid "convert <from> to <to> in anonymized output" msgstr "在匿名输出中将 <from> 转换为 <to>" -#: builtin/fast-export.c:1230 +#: builtin/fast-export.c:1203 msgid "reference parents which are not in fast-export stream by object id" msgstr "引用父对象 ID 不在 fast-export 流中" -#: builtin/fast-export.c:1232 +#: builtin/fast-export.c:1205 msgid "show original object ids of blobs/commits" msgstr "显示数据对象/提交的原始对象 ID" -#: builtin/fast-export.c:1234 +#: builtin/fast-export.c:1207 msgid "label tags with mark ids" msgstr "对带有标记 ID 的标签做标记" -#: builtin/fast-export.c:1257 -msgid "--anonymize-map without --anonymize does not make sense" -msgstr "--anonymize-map 而没有 --anonymize 没有意义" - -#: builtin/fast-export.c:1272 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists" - -#: builtin/fast-import.c:3088 +#: builtin/fast-import.c:3090 #, c-format msgid "Missing from marks for submodule '%s'" msgstr "子模组 '%s' 缺少 from 标记" -#: builtin/fast-import.c:3090 +#: builtin/fast-import.c:3092 #, c-format msgid "Missing to marks for submodule '%s'" msgstr "子模组 '%s' 缺少 to 标记" -#: builtin/fast-import.c:3225 +#: builtin/fast-import.c:3227 #, c-format msgid "Expected 'mark' command, got %s" msgstr "预期 'mark' 命令，得到 %s" -#: builtin/fast-import.c:3230 +#: builtin/fast-import.c:3232 #, c-format msgid "Expected 'to' command, got %s" msgstr "预期 'to' 命令，得到 %s" -#: builtin/fast-import.c:3322 +#: builtin/fast-import.c:3324 msgid "Expected format name:filename for submodule rewrite option" msgstr "子模组重写选项的预期格式为 name:filename" -#: builtin/fast-import.c:3377 +#: builtin/fast-import.c:3379 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'" @@ -14962,163 +14884,163 @@ msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'" msgid "Lockfile created but not reported: %s" msgstr "Lockfile 已创建但未报告：%s" -#: builtin/fetch.c:35 +#: builtin/fetch.c:36 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/fetch.c:36 +#: builtin/fetch.c:37 msgid "git fetch [<options>] <group>" msgstr "git fetch [<选项>] <组>" -#: builtin/fetch.c:37 +#: builtin/fetch.c:38 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" -#: builtin/fetch.c:38 +#: builtin/fetch.c:39 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" -#: builtin/fetch.c:122 +#: builtin/fetch.c:123 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel 不能为负数" -#: builtin/fetch.c:145 builtin/pull.c:189 +#: builtin/fetch.c:146 builtin/pull.c:189 msgid "fetch from all remotes" msgstr "从所有的远程抓取" -#: builtin/fetch.c:147 builtin/pull.c:249 +#: builtin/fetch.c:148 builtin/pull.c:249 msgid "set upstream for git pull/fetch" msgstr "为 git pull/fetch 设置上游" -#: builtin/fetch.c:149 builtin/pull.c:192 +#: builtin/fetch.c:150 builtin/pull.c:192 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" -#: builtin/fetch.c:151 +#: builtin/fetch.c:152 msgid "use atomic transaction to update references" msgstr "使用原子事务更新引用" -#: builtin/fetch.c:153 builtin/pull.c:195 +#: builtin/fetch.c:154 builtin/pull.c:195 msgid "path to upload pack on remote end" msgstr "上传包到远程的路径" -#: builtin/fetch.c:154 +#: builtin/fetch.c:155 msgid "force overwrite of local reference" msgstr "强制覆盖本地引用" -#: builtin/fetch.c:156 +#: builtin/fetch.c:157 msgid "fetch from multiple remotes" msgstr "从多个远程抓取" -#: builtin/fetch.c:158 builtin/pull.c:199 +#: builtin/fetch.c:159 builtin/pull.c:199 msgid "fetch all tags and associated objects" msgstr "抓取所有的标签和关联对象" -#: builtin/fetch.c:160 +#: builtin/fetch.c:161 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何标签(--no-tags)" -#: builtin/fetch.c:162 +#: builtin/fetch.c:163 msgid "number of submodules fetched in parallel" msgstr "子模组获取的并发数" -#: builtin/fetch.c:164 +#: builtin/fetch.c:165 msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "修改引用规格以将所有引用放入 refs/prefetch/" -#: builtin/fetch.c:166 builtin/pull.c:202 +#: builtin/fetch.c:167 builtin/pull.c:202 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已经不存在的分支的跟踪分支" -#: builtin/fetch.c:168 +#: builtin/fetch.c:169 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除远程不存在的本地标签，并且替换变更标签" # 译者：可选值，不能翻译 -#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123 +#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:170 +#: builtin/fetch.c:171 msgid "control recursive fetching of submodules" msgstr "控制子模组的递归抓取" -#: builtin/fetch.c:175 +#: builtin/fetch.c:176 msgid "write fetched references to the FETCH_HEAD file" msgstr "将获取到的引用写入 FETCH_HEAD 文件" -#: builtin/fetch.c:176 builtin/pull.c:210 +#: builtin/fetch.c:177 builtin/pull.c:210 msgid "keep downloaded pack" msgstr "保持下载包" -#: builtin/fetch.c:178 +#: builtin/fetch.c:179 msgid "allow updating of HEAD ref" msgstr "允许更新 HEAD 引用" -#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213 +#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213 #: builtin/pull.c:222 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历史" -#: builtin/fetch.c:183 builtin/pull.c:216 +#: builtin/fetch.c:184 builtin/pull.c:216 msgid "deepen history of shallow repository based on time" msgstr "基于时间来深化浅克隆的历史" -#: builtin/fetch.c:189 builtin/pull.c:225 +#: builtin/fetch.c:190 builtin/pull.c:225 msgid "convert to a complete repository" msgstr "转换为一个完整的仓库" -#: builtin/fetch.c:192 +#: builtin/fetch.c:193 msgid "prepend this to submodule path output" msgstr "在子模组路径输出的前面加上此目录" -#: builtin/fetch.c:195 +#: builtin/fetch.c:196 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "递归获取子模组的缺省值（比配置文件优先级低）" -#: builtin/fetch.c:199 builtin/pull.c:228 +#: builtin/fetch.c:200 builtin/pull.c:228 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:200 builtin/pull.c:230 +#: builtin/fetch.c:201 builtin/pull.c:230 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:201 builtin/pull.c:231 +#: builtin/fetch.c:202 builtin/pull.c:231 msgid "specify fetch refmap" msgstr "指定获取操作的引用映射" -#: builtin/fetch.c:208 builtin/pull.c:244 +#: builtin/fetch.c:209 builtin/pull.c:244 msgid "report that we have only objects reachable from this object" msgstr "报告我们只拥有从该对象开始可达的对象" -#: builtin/fetch.c:210 +#: builtin/fetch.c:211 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "不获取包文件；而是打印协商的祖先提交" -#: builtin/fetch.c:213 builtin/fetch.c:215 +#: builtin/fetch.c:214 builtin/fetch.c:216 msgid "run 'maintenance --auto' after fetching" msgstr "获取后执行 'maintenance --auto'" -#: builtin/fetch.c:217 builtin/pull.c:247 +#: builtin/fetch.c:218 builtin/pull.c:247 msgid "check for forced-updates on all updated branches" msgstr "在所有更新分支上检查强制更新" -#: builtin/fetch.c:219 +#: builtin/fetch.c:220 msgid "write the commit-graph after fetching" msgstr "抓取后写提交图" -#: builtin/fetch.c:221 +#: builtin/fetch.c:222 msgid "accept refspecs from stdin" msgstr "从标准输入获取引用规格" -#: builtin/fetch.c:586 -msgid "Couldn't find remote ref HEAD" +#: builtin/fetch.c:587 +msgid "couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:760 +#: builtin/fetch.c:761 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "配置变量 fetch.output 包含无效值 %s" @@ -15132,7 +15054,7 @@ msgstr "对象 %s 未发现" msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967 +#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968 msgid "[rejected]" msgstr "[已拒绝]" @@ -15140,76 +15062,80 @@ msgstr "[已拒绝]" msgid "can't fetch in current branch" msgstr "当前分支下不能执行获取操作" -#: builtin/fetch.c:890 +#: builtin/fetch.c:881 +msgid "checked out in another worktree" +msgstr "已在另一个工作树中检出" + +#: builtin/fetch.c:891 msgid "[tag update]" msgstr "[标签更新]" -#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950 -#: builtin/fetch.c:962 +#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951 +#: builtin/fetch.c:963 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c:895 +#: builtin/fetch.c:896 msgid "would clobber existing tag" msgstr "会破坏现有的标签" -#: builtin/fetch.c:917 +#: builtin/fetch.c:918 msgid "[new tag]" msgstr "[新标签]" -#: builtin/fetch.c:920 +#: builtin/fetch.c:921 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:923 +#: builtin/fetch.c:924 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:962 +#: builtin/fetch.c:963 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:967 +#: builtin/fetch.c:968 msgid "non-fast-forward" msgstr "非快进" -#: builtin/fetch.c:1070 +#: builtin/fetch.c:1071 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" -"flag or run 'git config fetch.showForcedUpdates true'." +"fetch normally indicates which branches had a forced update,\n" +"but that check has been disabled; to re-enable, use '--show-forced-updates'\n" +"flag or run 'git config fetch.showForcedUpdates true'" msgstr "" -"获取操作通常显示哪些分支发生了强制更新，但该检查已被禁用。\n" +"获取操作通常显示哪些分支发生了强制更新，但该检查已被禁用；\n" "要重新启用，请使用 '--show-forced-updates' 选项或运行\n" -"'git config fetch.showForcedUpdates true'。" +"'git config fetch.showForcedUpdates true'" -#: builtin/fetch.c:1074 +#: builtin/fetch.c:1075 #, c-format msgid "" -"It took %.2f seconds to check forced updates. You can use\n" +"it took %.2f seconds to check forced updates; you can use\n" "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " "false'\n" -" to avoid this check.\n" +"to avoid this check\n" msgstr "" -"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n" -"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n" +"花了 %.2f 秒来检查强制更新；您可以使用 '--no-show-forced-updates'\n" +"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查\n" -#: builtin/fetch.c:1105 +#: builtin/fetch.c:1107 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必需的对象\n" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1136 #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "拒绝 %s 因为浅克隆的根不允许被更新" -#: builtin/fetch.c:1223 builtin/fetch.c:1371 +#: builtin/fetch.c:1226 builtin/fetch.c:1374 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:1244 +#: builtin/fetch.c:1247 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -15219,150 +15145,149 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:1341 +#: builtin/fetch.c:1344 #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为悬空状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:1342 +#: builtin/fetch.c:1345 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为悬空状态）" -#: builtin/fetch.c:1374 +#: builtin/fetch.c:1377 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:1375 builtin/remote.c:1128 +#: builtin/fetch.c:1378 builtin/remote.c:1128 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:1398 +#: builtin/fetch.c:1400 #, c-format -msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "拒绝获取到非纯仓库的当前分支 %s" +msgid "refusing to fetch into branch '%s' checked out at '%s'" +msgstr "拒绝获取于 '%2$s' 检出的分支 '%1$s'" -#: builtin/fetch.c:1417 +#: builtin/fetch.c:1420 #, c-format -msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgid "option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:1420 +#: builtin/fetch.c:1423 #, c-format -msgid "Option \"%s\" is ignored for %s\n" +msgid "option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:1447 +#: builtin/fetch.c:1450 #, c-format msgid "the object %s does not exist" msgstr "对象 '%s' 不存在" -#: builtin/fetch.c:1633 +#: builtin/fetch.c:1638 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "检测到多分支，和 --set-upstream 不兼容" -#: builtin/fetch.c:1648 +#: builtin/fetch.c:1650 +#, c-format +msgid "" +"could not set upstream of HEAD to '%s' from '%s' when it does not point to " +"any branch." +msgstr "无法在不指向任何分支时将 HEAD 的上游从 '%s' 设置为 '%s'。" + +#: builtin/fetch.c:1663 msgid "not setting upstream for a remote remote-tracking branch" msgstr "没有为一个远程跟踪分支设置上游" -#: builtin/fetch.c:1650 +#: builtin/fetch.c:1665 msgid "not setting upstream for a remote tag" msgstr "没有为一个远程标签设置上游" -#: builtin/fetch.c:1652 +#: builtin/fetch.c:1667 msgid "unknown branch type" msgstr "未知的分支类型" -#: builtin/fetch.c:1654 +#: builtin/fetch.c:1669 msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." +"no source branch found;\n" +"you need to specify exactly one branch with the --set-upstream option" msgstr "" -"未发现源分支。\n" -"您需要使用 --set-upstream 选项指定一个分支。" +"未发现源分支；\n" +"您需要使用 --set-upstream 选项指定一个分支" -#: builtin/fetch.c:1783 builtin/fetch.c:1846 +#: builtin/fetch.c:1799 builtin/fetch.c:1862 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101 +#: builtin/fetch.c:1809 builtin/fetch.c:1864 #, c-format -msgid "Could not fetch %s" +msgid "could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1821 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "无法获取 '%s'（退出码：%d）\n" -#: builtin/fetch.c:1909 +#: builtin/fetch.c:1925 msgid "" -"No remote repository specified. Please, specify either a URL or a\n" -"remote name from which new revisions should be fetched." -msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。" +"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:1945 -msgid "You need to specify a tag name." -msgstr "您需要指定一个标签名称。" +#: builtin/fetch.c:1961 +msgid "you need to specify a tag name" +msgstr "您需要指定一个标签名称" -#: builtin/fetch.c:2009 +#: builtin/fetch.c:2027 msgid "--negotiate-only needs one or more --negotiate-tip=*" msgstr "--negotiate-only 需要一个或多个 --negotiate-tip=*" -#: builtin/fetch.c:2013 -msgid "Negative depth in --deepen is not supported" +#: builtin/fetch.c:2031 +msgid "negative depth in --deepen is not supported" msgstr "--deepen 不支持负数深度" -#: builtin/fetch.c:2015 -msgid "--deepen and --depth are mutually exclusive" -msgstr "--deepen 和 --depth 是互斥的" - -#: builtin/fetch.c:2020 -msgid "--depth and --unshallow cannot be used together" -msgstr "--depth 和 --unshallow 不能同时使用" - -#: builtin/fetch.c:2022 +#: builtin/fetch.c:2040 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库，参数 --unshallow 没有意义" -#: builtin/fetch.c:2039 +#: builtin/fetch.c:2057 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个仓库参数" -#: builtin/fetch.c:2041 +#: builtin/fetch.c:2059 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规格没有任何意义" -#: builtin/fetch.c:2050 +#: builtin/fetch.c:2068 #, c-format -msgid "No such remote or remote group: %s" +msgid "no such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:2057 -msgid "Fetching a group and specifying refspecs does not make sense" +#: builtin/fetch.c:2076 +msgid "fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规格没有意义" -#: builtin/fetch.c:2073 +#: builtin/fetch.c:2092 msgid "must supply remote when using --negotiate-only" msgstr "在使用 --negotiate-only 时必须提供远程仓库" -#: builtin/fetch.c:2078 -msgid "Protocol does not support --negotiate-only, exiting." -msgstr "协议不支持 --negotiate-only，退出。" - #: builtin/fetch.c:2097 +msgid "protocol does not support --negotiate-only, exiting" +msgstr "协议不支持 --negotiate-only，退出" + +#: builtin/fetch.c:2116 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库" -#: builtin/fetch.c:2101 +#: builtin/fetch.c:2120 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic 仅在从一个远程仓库获取的时候可用" -#: builtin/fetch.c:2105 +#: builtin/fetch.c:2124 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin 仅在从一个远程仓库获取的时候可用" @@ -15371,23 +15296,27 @@ msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:19 msgid "populate log with at most <n> entries from shortlog" msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明" -#: builtin/fmt-merge-msg.c:21 +#: builtin/fmt-merge-msg.c:22 msgid "alias for --log (deprecated)" msgstr "参数 --log 的别名（已弃用）" -#: builtin/fmt-merge-msg.c:24 +#: builtin/fmt-merge-msg.c:25 msgid "text" msgstr "文本" -#: builtin/fmt-merge-msg.c:25 +#: builtin/fmt-merge-msg.c:26 msgid "use <text> as start of message" msgstr "使用 <文本> 作为提交说明的开始" -#: builtin/fmt-merge-msg.c:26 +#: builtin/fmt-merge-msg.c:28 +msgid "use <name> instead of the real target branch" +msgstr "使用 <名称> 而不是真正的目标分支" + +#: builtin/fmt-merge-msg.c:29 msgid "file to read from" msgstr "从文件中读取" @@ -15407,47 +15336,47 @@ msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]" msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:31 msgid "quote placeholders suitably for shells" msgstr "引用占位符适用于 shells" -#: builtin/for-each-ref.c:32 +#: builtin/for-each-ref.c:33 msgid "quote placeholders suitably for perl" msgstr "引用占位符适用于 perl" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:35 msgid "quote placeholders suitably for python" msgstr "引用占位符适用于 python" -#: builtin/for-each-ref.c:36 +#: builtin/for-each-ref.c:37 msgid "quote placeholders suitably for Tcl" msgstr "引用占位符适用于 Tcl" -#: builtin/for-each-ref.c:39 +#: builtin/for-each-ref.c:40 msgid "show only <n> matched refs" msgstr "只显示 <n> 个匹配的引用" -#: builtin/for-each-ref.c:41 builtin/tag.c:481 +#: builtin/for-each-ref.c:42 builtin/tag.c:481 msgid "respect format colors" msgstr "遵照格式中的颜色输出" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs which points at the given object" msgstr "只打印指向给定对象的引用" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs that are merged" msgstr "只打印已经合并的引用" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:48 msgid "print only refs that are not merged" msgstr "只打印没有合并的引用" -#: builtin/for-each-ref.c:48 +#: builtin/for-each-ref.c:49 msgid "print only refs which contain the commit" msgstr "只打印包含该提交的引用" -#: builtin/for-each-ref.c:49 +#: builtin/for-each-ref.c:50 msgid "print only refs which don't contain the commit" msgstr "只打印不包含该提交的引用" @@ -15586,7 +15515,7 @@ msgstr "注意：无默认引用" #: builtin/fsck.c:621 #, c-format msgid "%s: hash-path mismatch, found at: %s" -msgstr "%s： 哈希路径不匹配，在 %s 被找到" +msgstr "%s：哈希路径不匹配，发现于 %s" #: builtin/fsck.c:624 #, c-format @@ -15596,126 +15525,126 @@ msgstr "%s：对象损坏或丢失：%s" #: builtin/fsck.c:628 #, c-format msgid "%s: object is of unknown type '%s': %s" -msgstr "%s： 对象有未知的类型 '%s': %s" +msgstr "%s：对象有未知的类型 '%s': %s" -#: builtin/fsck.c:644 +#: builtin/fsck.c:645 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s：不能解析对象：%s" -#: builtin/fsck.c:664 +#: builtin/fsck.c:665 #, c-format msgid "bad sha1 file: %s" msgstr "坏的 sha1 文件：%s" -#: builtin/fsck.c:685 +#: builtin/fsck.c:686 msgid "Checking object directory" msgstr "正在检查对象目录" -#: builtin/fsck.c:688 +#: builtin/fsck.c:689 msgid "Checking object directories" msgstr "正在检查对象目录" -#: builtin/fsck.c:704 +#: builtin/fsck.c:705 #, c-format msgid "Checking %s link" msgstr "正在检查 %s 链接" -#: builtin/fsck.c:709 builtin/index-pack.c:859 +#: builtin/fsck.c:710 builtin/index-pack.c:859 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/fsck.c:716 +#: builtin/fsck.c:717 #, c-format msgid "%s points to something strange (%s)" msgstr "%s 指向奇怪的东西（%s）" -#: builtin/fsck.c:722 +#: builtin/fsck.c:723 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s：分离头指针的指向不存在" -#: builtin/fsck.c:726 +#: builtin/fsck.c:727 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一个尚未诞生的分支（%s）" -#: builtin/fsck.c:738 +#: builtin/fsck.c:739 msgid "Checking cache tree" msgstr "正在检查缓存树" -#: builtin/fsck.c:743 +#: builtin/fsck.c:744 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s：cache-tree 中无效的 sha1 指针" -#: builtin/fsck.c:752 +#: builtin/fsck.c:753 msgid "non-tree in cache-tree" msgstr "cache-tree 中非树对象" -#: builtin/fsck.c:783 +#: builtin/fsck.c:784 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<选项>] [<对象>...]" -#: builtin/fsck.c:789 +#: builtin/fsck.c:790 msgid "show unreachable objects" msgstr "显示不可达的对象" -#: builtin/fsck.c:790 +#: builtin/fsck.c:791 msgid "show dangling objects" msgstr "显示悬空的对象" -#: builtin/fsck.c:791 +#: builtin/fsck.c:792 msgid "report tags" msgstr "报告标签" -#: builtin/fsck.c:792 +#: builtin/fsck.c:793 msgid "report root nodes" msgstr "报告根节点" -#: builtin/fsck.c:793 +#: builtin/fsck.c:794 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" -#: builtin/fsck.c:794 +#: builtin/fsck.c:795 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点（默认）" -#: builtin/fsck.c:795 +#: builtin/fsck.c:796 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" -#: builtin/fsck.c:796 +#: builtin/fsck.c:797 msgid "check only connectivity" msgstr "仅检查连通性" -#: builtin/fsck.c:797 builtin/mktag.c:76 +#: builtin/fsck.c:798 builtin/mktag.c:76 msgid "enable more strict checking" msgstr "启用更严格的检查" -#: builtin/fsck.c:799 +#: builtin/fsck.c:800 msgid "write dangling objects in .git/lost-found" msgstr "将悬空对象写入 .git/lost-found 中" -#: builtin/fsck.c:800 builtin/prune.c:134 +#: builtin/fsck.c:801 builtin/prune.c:146 msgid "show progress" msgstr "显示进度" -#: builtin/fsck.c:801 +#: builtin/fsck.c:802 msgid "show verbose names for reachable objects" msgstr "显示可达对象的详细名称" -#: builtin/fsck.c:861 builtin/index-pack.c:261 +#: builtin/fsck.c:862 builtin/index-pack.c:261 msgid "Checking objects" msgstr "正在检查对象" -#: builtin/fsck.c:889 +#: builtin/fsck.c:890 #, c-format msgid "%s: object missing" msgstr "%s：对象缺失" -#: builtin/fsck.c:900 +#: builtin/fsck.c:901 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "无效的参数：期望 sha1，得到 '%s'" @@ -15734,17 +15663,12 @@ msgstr "对 %s 调用 fstat 失败：%s" msgid "failed to parse '%s' value '%s'" msgstr "无法解析 '%s' 值 '%s'" -#: builtin/gc.c:487 builtin/init-db.c:57 +#: builtin/gc.c:488 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574 -#, c-format -msgid "cannot read '%s'" -msgstr "不能读取 '%s'" - -#: builtin/gc.c:503 +#: builtin/gc.c:504 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -15758,259 +15682,259 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:551 +#: builtin/gc.c:552 msgid "prune unreferenced objects" msgstr "清除未引用的对象" -#: builtin/gc.c:553 +#: builtin/gc.c:554 msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" -#: builtin/gc.c:554 +#: builtin/gc.c:555 msgid "enable auto-gc mode" msgstr "启用自动垃圾回收模式" -#: builtin/gc.c:557 +#: builtin/gc.c:558 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc 即使另外一个 gc 正在执行" -#: builtin/gc.c:560 +#: builtin/gc.c:561 msgid "repack all other packs except the largest pack" msgstr "除了最大的包之外，对所有其它包文件重新打包" -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, c-format msgid "failed to parse gc.logexpiry value %s" -msgstr "解析 gc.logexpiry 的值 %s 失败" +msgstr "无法解析 gc.logexpiry 的值 %s" -#: builtin/gc.c:587 +#: builtin/gc.c:588 #, c-format msgid "failed to parse prune expiry value %s" -msgstr "解析清除期限值 %s 失败" +msgstr "无法解析清除期限值 %s" -#: builtin/gc.c:607 +#: builtin/gc.c:608 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自动在后台执行仓库打包以求最佳性能。\n" -#: builtin/gc.c:609 +#: builtin/gc.c:610 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包仓库以求最佳性能。\n" -#: builtin/gc.c:610 +#: builtin/gc.c:611 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护参见 \"git help gc\"。\n" -#: builtin/gc.c:650 +#: builtin/gc.c:652 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）" -#: builtin/gc.c:705 +#: builtin/gc.c:707 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" -#: builtin/gc.c:715 +#: builtin/gc.c:717 msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" msgstr "" "git maintenance run [--auto] [--[no-]quiet] [--task=<任务>] [--schedule]" -#: builtin/gc.c:745 +#: builtin/gc.c:747 msgid "--no-schedule is not allowed" msgstr "--no-schedule 不被允许" -#: builtin/gc.c:750 +#: builtin/gc.c:752 #, c-format msgid "unrecognized --schedule argument '%s'" msgstr "无法识别的 --schedule 参数 '%s'" -#: builtin/gc.c:868 +#: builtin/gc.c:870 msgid "failed to write commit-graph" msgstr "无法写入提交图" -#: builtin/gc.c:904 +#: builtin/gc.c:906 msgid "failed to prefetch remotes" msgstr "无法预先获取远程仓库" -#: builtin/gc.c:1020 +#: builtin/gc.c:1022 msgid "failed to start 'git pack-objects' process" msgstr "无法启动 'git pack-objects' 进程" -#: builtin/gc.c:1037 +#: builtin/gc.c:1039 msgid "failed to finish 'git pack-objects' process" msgstr "无法完成 'git pack-objects' 进程" -#: builtin/gc.c:1088 +#: builtin/gc.c:1090 msgid "failed to write multi-pack-index" msgstr "无法写入多包索引" -#: builtin/gc.c:1104 +#: builtin/gc.c:1106 msgid "'git multi-pack-index expire' failed" msgstr "'git multi-pack-index expire' 失败" -#: builtin/gc.c:1163 +#: builtin/gc.c:1165 msgid "'git multi-pack-index repack' failed" msgstr "'git multi-pack-index repack' 失败" -#: builtin/gc.c:1172 +#: builtin/gc.c:1174 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "跳过增量重新打包任务，因为 core.multiPackIndex 被禁用" -#: builtin/gc.c:1276 +#: builtin/gc.c:1278 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "锁文件 '%s' 已存在，跳过维护" -#: builtin/gc.c:1306 +#: builtin/gc.c:1308 #, c-format msgid "task '%s' failed" msgstr "任务 '%s' 失败" -#: builtin/gc.c:1388 +#: builtin/gc.c:1390 #, c-format msgid "'%s' is not a valid task" msgstr "'%s' 不是一个有效的任务" -#: builtin/gc.c:1393 +#: builtin/gc.c:1395 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "任务 '%s' 不能被多次选择" -#: builtin/gc.c:1408 +#: builtin/gc.c:1410 msgid "run tasks based on the state of the repository" msgstr "基于仓库状态来运行任务" -#: builtin/gc.c:1409 +#: builtin/gc.c:1411 msgid "frequency" msgstr "频率" -#: builtin/gc.c:1410 +#: builtin/gc.c:1412 msgid "run tasks based on frequency" msgstr "基于频率运行任务" -#: builtin/gc.c:1413 +#: builtin/gc.c:1415 msgid "do not report progress or other information over stderr" msgstr "不通过标准错误报告进度或其它信息" -#: builtin/gc.c:1414 +#: builtin/gc.c:1416 msgid "task" msgstr "任务" -#: builtin/gc.c:1415 +#: builtin/gc.c:1417 msgid "run a specific task" msgstr "运行一个特定的任务" -#: builtin/gc.c:1432 +#: builtin/gc.c:1434 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一" -#: builtin/gc.c:1475 +#: builtin/gc.c:1477 msgid "failed to run 'git config'" msgstr "无法运行 'git config'" -#: builtin/gc.c:1627 +#: builtin/gc.c:1629 #, c-format msgid "failed to expand path '%s'" msgstr "无法扩展路径 '%s'" -#: builtin/gc.c:1654 builtin/gc.c:1692 +#: builtin/gc.c:1656 builtin/gc.c:1694 msgid "failed to start launchctl" msgstr "无法启动 launchctl" -#: builtin/gc.c:1767 builtin/gc.c:2220 +#: builtin/gc.c:1769 builtin/gc.c:2237 #, c-format msgid "failed to create directories for '%s'" msgstr "无法为 '%s' 创建目录" -#: builtin/gc.c:1794 +#: builtin/gc.c:1796 #, c-format msgid "failed to bootstrap service %s" msgstr "无法引导服务 %s" -#: builtin/gc.c:1887 +#: builtin/gc.c:1889 msgid "failed to create temp xml file" msgstr "无法创建临时 XML 文件" -#: builtin/gc.c:1977 +#: builtin/gc.c:1979 msgid "failed to start schtasks" msgstr "无法启动计划任务" -#: builtin/gc.c:2046 +#: builtin/gc.c:2063 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "无法执行 'crontab -l'，您的系统可能不支持 'cron'" -#: builtin/gc.c:2063 +#: builtin/gc.c:2080 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'" -#: builtin/gc.c:2067 +#: builtin/gc.c:2084 msgid "failed to open stdin of 'crontab'" msgstr "无法打开 'crontab' 的标准输入" -#: builtin/gc.c:2109 +#: builtin/gc.c:2126 msgid "'crontab' died" msgstr "'crontab' 终止" -#: builtin/gc.c:2174 +#: builtin/gc.c:2191 msgid "failed to start systemctl" msgstr "无法启动 systemctl" -#: builtin/gc.c:2184 +#: builtin/gc.c:2201 msgid "failed to run systemctl" msgstr "无法运行 systemctl" -#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62 -#: builtin/worktree.c:945 +#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62 +#: builtin/worktree.c:944 #, c-format msgid "failed to delete '%s'" -msgstr "删除 '%s' 失败" +msgstr "无法删除 '%s'" -#: builtin/gc.c:2378 +#: builtin/gc.c:2395 #, c-format msgid "unrecognized --scheduler argument '%s'" msgstr "无法识别的 --scheduler 参数 '%s'" -#: builtin/gc.c:2403 +#: builtin/gc.c:2420 msgid "neither systemd timers nor crontab are available" msgstr "systemd 和 crontab 的定时器都不可用" -#: builtin/gc.c:2418 +#: builtin/gc.c:2435 #, c-format msgid "%s scheduler is not available" msgstr "%s 调度器不可用" -#: builtin/gc.c:2432 +#: builtin/gc.c:2449 msgid "another process is scheduling background maintenance" msgstr "另外一个进程正运行于后台维护" -#: builtin/gc.c:2454 +#: builtin/gc.c:2471 msgid "git maintenance start [--scheduler=<scheduler>]" msgstr "git maintenance start [--scheduler=<调度器>]" -#: builtin/gc.c:2463 +#: builtin/gc.c:2480 msgid "scheduler" msgstr "调度器" -#: builtin/gc.c:2464 +#: builtin/gc.c:2481 msgid "scheduler to trigger git maintenance run" msgstr "触发 git maintenance 执行的调度器" -#: builtin/gc.c:2478 +#: builtin/gc.c:2495 msgid "failed to add repo to global config" msgstr "无法将仓库添加到全局配置" -#: builtin/gc.c:2487 +#: builtin/gc.c:2504 msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <子命令> [<选项>]" -#: builtin/gc.c:2506 +#: builtin/gc.c:2523 #, c-format msgid "invalid subcommand: %s" msgstr "无效子命令：%s" @@ -16378,25 +16302,25 @@ msgstr "git help [-c|--config]" msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" -#: builtin/help.c:223 +#: builtin/help.c:222 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" -#: builtin/help.c:236 +#: builtin/help.c:235 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" -#: builtin/help.c:244 +#: builtin/help.c:243 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302 +#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301 #, c-format msgid "failed to exec '%s'" -msgstr "执行 '%s' 失败" +msgstr "无法执行 '%s'" -#: builtin/help.c:340 +#: builtin/help.c:339 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -16405,7 +16329,7 @@ msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" "请使用 'man.<工具>.cmd'。" -#: builtin/help.c:352 +#: builtin/help.c:351 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -16414,39 +16338,39 @@ msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<工具>.path'。" -#: builtin/help.c:467 +#: builtin/help.c:466 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:483 +#: builtin/help.c:482 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:490 +#: builtin/help.c:489 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:551 builtin/help.c:562 git.c:348 +#: builtin/help.c:550 builtin/help.c:561 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的别名" -#: builtin/help.c:565 git.c:380 +#: builtin/help.c:564 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "坏的 alias.%s 字符串：%s" -#: builtin/help.c:581 +#: builtin/help.c:580 msgid "this option doesn't take any other arguments" msgstr "这个选项不带其他参数" -#: builtin/help.c:602 builtin/help.c:629 +#: builtin/help.c:601 builtin/help.c:628 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:624 +#: builtin/help.c:623 msgid "'git help config' for more information" msgstr "'git help config' 获取更多信息" @@ -16577,7 +16501,7 @@ msgstr "%s 的所有子对象并非都可达" #: builtin/index-pack.c:925 builtin/index-pack.c:972 msgid "failed to apply delta" -msgstr "应用 delta 失败" +msgstr "无法应用 delta" #: builtin/index-pack.c:1156 msgid "Receiving objects" @@ -16713,18 +16637,10 @@ msgstr "错误选项 %s" msgid "unknown hash algorithm '%s'" msgstr "未知的哈希算法 '%s'" -#: builtin/index-pack.c:1848 -msgid "--fix-thin cannot be used without --stdin" -msgstr "--fix-thin 不能和 --stdin 同时使用" - #: builtin/index-pack.c:1850 msgid "--stdin requires a git repository" msgstr "--stdin 需要 git 仓库" -#: builtin/index-pack.c:1852 -msgid "--object-format cannot be used with --stdin" -msgstr "--object-format 不能和 --stdin 同时使用" - #: builtin/index-pack.c:1867 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包文件名参数" @@ -16850,10 +16766,6 @@ msgstr "hash" msgid "specify the hash algorithm to use" msgstr "指定要使用的哈希算法" -#: builtin/init-db.c:560 -msgid "--separate-git-dir and --bare are mutually exclusive" -msgstr "--separate-git-dir 和 --bare 是互斥的" - #: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" @@ -16983,85 +16895,85 @@ msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数 msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<范围>:<文件> 不能和路径表达式共用" -#: builtin/log.c:306 +#: builtin/log.c:321 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:571 +#: builtin/log.c:586 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 损坏的文件" -#: builtin/log.c:586 builtin/log.c:676 +#: builtin/log.c:601 builtin/log.c:691 #, c-format msgid "could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:701 +#: builtin/log.c:716 #, c-format msgid "unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:846 +#: builtin/log.c:861 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s：从描述生成附函的模式无效" -#: builtin/log.c:853 +#: builtin/log.c:868 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:982 +#: builtin/log.c:997 #, c-format msgid "cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:999 +#: builtin/log.c:1014 msgid "need exactly one range" msgstr "只需要一个范围" -#: builtin/log.c:1009 +#: builtin/log.c:1024 msgid "not a range" msgstr "不是一个范围" -#: builtin/log.c:1173 +#: builtin/log.c:1188 msgid "cover letter needs email format" msgstr "附函需要邮件地址格式" -#: builtin/log.c:1179 +#: builtin/log.c:1194 msgid "failed to create cover-letter file" msgstr "无法创建附函文件" -#: builtin/log.c:1266 +#: builtin/log.c:1281 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1293 +#: builtin/log.c:1308 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" -#: builtin/log.c:1351 +#: builtin/log.c:1366 msgid "two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 +#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358 #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1528 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:1522 +#: builtin/log.c:1537 msgid "could not find exact merge base" msgstr "不能找到准确的合并基线" -#: builtin/log.c:1532 +#: builtin/log.c:1547 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" @@ -17071,405 +16983,393 @@ msgstr "" "git branch --set-upstream-to 来跟踪一个远程分支。或者您可以通过\n" "参数 --base=<基线提交> 手动指定一个基线提交" -#: builtin/log.c:1555 +#: builtin/log.c:1570 msgid "failed to find exact merge base" msgstr "无法找到准确的合并基线" -#: builtin/log.c:1572 +#: builtin/log.c:1587 msgid "base commit should be the ancestor of revision list" msgstr "基线提交应该是版本列表的祖先" -#: builtin/log.c:1582 +#: builtin/log.c:1597 msgid "base commit shouldn't be in revision list" msgstr "基线提交不应该出现在版本列表中" -#: builtin/log.c:1640 +#: builtin/log.c:1655 msgid "cannot get patch id" msgstr "无法得到补丁 id" -#: builtin/log.c:1703 +#: builtin/log.c:1718 msgid "failed to infer range-diff origin of current series" msgstr "无法推断当前系列的 range-diff 起始" -#: builtin/log.c:1705 +#: builtin/log.c:1720 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "使用 '%s' 作为当前系列的 range-diff 源" -#: builtin/log.c:1749 +#: builtin/log.c:1764 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" -#: builtin/log.c:1752 +#: builtin/log.c:1767 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" -#: builtin/log.c:1756 +#: builtin/log.c:1771 msgid "print patches to standard out" msgstr "打印补丁到标准输出" -#: builtin/log.c:1758 +#: builtin/log.c:1773 msgid "generate a cover letter" msgstr "生成一封附函" -#: builtin/log.c:1760 +#: builtin/log.c:1775 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c:1761 +#: builtin/log.c:1776 msgid "sfx" msgstr "后缀" -#: builtin/log.c:1762 +#: builtin/log.c:1777 msgid "use <sfx> instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c:1764 +#: builtin/log.c:1779 msgid "start numbering patches at <n> instead of 1" msgstr "补丁以 <n> 开始编号，而不是1" -#: builtin/log.c:1765 +#: builtin/log.c:1780 msgid "reroll-count" msgstr "重制-计数" -#: builtin/log.c:1766 +#: builtin/log.c:1781 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" -#: builtin/log.c:1768 +#: builtin/log.c:1783 msgid "max length of output filename" msgstr "输出文件名的最大长度" -#: builtin/log.c:1770 +#: builtin/log.c:1785 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1773 +#: builtin/log.c:1788 msgid "cover-from-description-mode" msgstr "从分支描述获取附函的模式" -#: builtin/log.c:1774 +#: builtin/log.c:1789 msgid "generate parts of a cover letter based on a branch's description" msgstr "基于一个分支描述生成部分附函" -#: builtin/log.c:1776 +#: builtin/log.c:1791 msgid "use [<prefix>] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c:1779 +#: builtin/log.c:1794 msgid "store resulting files in <dir>" msgstr "把结果文件存储在 <目录>" -#: builtin/log.c:1782 +#: builtin/log.c:1797 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" -#: builtin/log.c:1785 +#: builtin/log.c:1800 msgid "don't output binary diffs" msgstr "不输出二进制差异" -#: builtin/log.c:1787 +#: builtin/log.c:1802 msgid "output all-zero hash in From header" msgstr "在 From 头信息中输出全为零的哈希值" -#: builtin/log.c:1789 +#: builtin/log.c:1804 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c:1791 +#: builtin/log.c:1806 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" -#: builtin/log.c:1793 +#: builtin/log.c:1808 msgid "Messaging" msgstr "邮件发送" -#: builtin/log.c:1794 +#: builtin/log.c:1809 msgid "header" msgstr "header" -#: builtin/log.c:1795 +#: builtin/log.c:1810 msgid "add email header" msgstr "添加邮件头" -#: builtin/log.c:1796 builtin/log.c:1797 +#: builtin/log.c:1811 builtin/log.c:1812 msgid "email" msgstr "邮件地址" -#: builtin/log.c:1796 +#: builtin/log.c:1811 msgid "add To: header" msgstr "添加收件人" -#: builtin/log.c:1797 +#: builtin/log.c:1812 msgid "add Cc: header" msgstr "添加抄送" -#: builtin/log.c:1798 +#: builtin/log.c:1813 msgid "ident" msgstr "标识" -#: builtin/log.c:1799 +#: builtin/log.c:1814 msgid "set From address to <ident> (or committer ident if absent)" msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）" -#: builtin/log.c:1801 +#: builtin/log.c:1816 msgid "message-id" msgstr "邮件标识" -#: builtin/log.c:1802 +#: builtin/log.c:1817 msgid "make first mail a reply to <message-id>" msgstr "使第一封邮件作为对 <邮件标识> 的回复" -#: builtin/log.c:1803 builtin/log.c:1806 +#: builtin/log.c:1818 builtin/log.c:1821 msgid "boundary" msgstr "边界" -#: builtin/log.c:1804 +#: builtin/log.c:1819 msgid "attach the patch" msgstr "附件方式添加补丁" -#: builtin/log.c:1807 +#: builtin/log.c:1822 msgid "inline the patch" msgstr "内联显示补丁" -#: builtin/log.c:1811 +#: builtin/log.c:1826 msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索，风格：浅，深" -#: builtin/log.c:1813 +#: builtin/log.c:1828 msgid "signature" msgstr "签名" -#: builtin/log.c:1814 +#: builtin/log.c:1829 msgid "add a signature" msgstr "添加一个签名" -#: builtin/log.c:1815 +#: builtin/log.c:1830 msgid "base-commit" msgstr "基线提交" -#: builtin/log.c:1816 +#: builtin/log.c:1831 msgid "add prerequisite tree info to the patch series" msgstr "为补丁列表添加前置树信息" -#: builtin/log.c:1819 +#: builtin/log.c:1834 msgid "add a signature from a file" msgstr "从文件添加一个签名" -#: builtin/log.c:1820 +#: builtin/log.c:1835 msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" -#: builtin/log.c:1822 +#: builtin/log.c:1837 msgid "show progress while generating patches" msgstr "在生成补丁时显示进度" -#: builtin/log.c:1824 +#: builtin/log.c:1839 msgid "show changes against <rev> in cover letter or single patch" msgstr "在附函或单个补丁中显示和 <版本> 的差异" -#: builtin/log.c:1827 +#: builtin/log.c:1842 msgid "show changes against <refspec> in cover letter or single patch" msgstr "在附函或单个补丁中显示和 <引用规格> 的差异" -#: builtin/log.c:1829 builtin/range-diff.c:28 +#: builtin/log.c:1844 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "创建权重的百分比" -#: builtin/log.c:1916 +#: builtin/log.c:1931 #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" -#: builtin/log.c:1931 -msgid "-n and -k are mutually exclusive" -msgstr "-n 和 -k 互斥" - -#: builtin/log.c:1933 -msgid "--subject-prefix/--rfc and -k are mutually exclusive" -msgstr "--subject-prefix/--rfc 和 -k 互斥" - -#: builtin/log.c:1941 +#: builtin/log.c:1956 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1943 +#: builtin/log.c:1958 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1945 +#: builtin/log.c:1960 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1967 -msgid "--stdout, --output, and --output-directory are mutually exclusive" -msgstr "--stdout、--output 和 --output-directory 是互斥的" - -#: builtin/log.c:2089 +#: builtin/log.c:2104 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:2093 +#: builtin/log.c:2108 msgid "Interdiff:" msgstr "版本间差异：" -#: builtin/log.c:2094 +#: builtin/log.c:2109 #, c-format msgid "Interdiff against v%d:" msgstr "对 v%d 的版本差异：" -#: builtin/log.c:2100 -msgid "--creation-factor requires --range-diff" -msgstr "--creation-factor 需要 --range-diff" - -#: builtin/log.c:2104 +#: builtin/log.c:2119 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:2112 +#: builtin/log.c:2127 msgid "Range-diff:" msgstr "范围差异：" -#: builtin/log.c:2113 +#: builtin/log.c:2128 #, c-format msgid "Range-diff against v%d:" msgstr "对 v%d 的范围差异：" -#: builtin/log.c:2124 +#: builtin/log.c:2139 #, c-format msgid "unable to read signature file '%s'" msgstr "无法读取签名文件 '%s'" -#: builtin/log.c:2160 +#: builtin/log.c:2175 msgid "Generating patches" msgstr "生成补丁" -#: builtin/log.c:2204 +#: builtin/log.c:2219 msgid "failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:2263 +#: builtin/log.c:2279 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:2317 +#: builtin/log.c:2333 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:564 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<选项>] [<文件>...]" -#: builtin/ls-files.c:615 +#: builtin/ls-files.c:618 msgid "separate paths with the NUL character" msgstr "用 NUL 字符分隔路径" -#: builtin/ls-files.c:617 +#: builtin/ls-files.c:620 msgid "identify the file status with tags" msgstr "用标签标识文件的状态" -#: builtin/ls-files.c:619 +#: builtin/ls-files.c:622 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小写字母表示 '假设未改变的' 文件" -#: builtin/ls-files.c:621 +#: builtin/ls-files.c:624 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "使用小写字母表示 'fsmonitor clean' 文件" -#: builtin/ls-files.c:623 +#: builtin/ls-files.c:626 msgid "show cached files in the output (default)" msgstr "显示缓存的文件（默认）" -#: builtin/ls-files.c:625 +#: builtin/ls-files.c:628 msgid "show deleted files in the output" msgstr "显示已删除的文件" -#: builtin/ls-files.c:627 +#: builtin/ls-files.c:630 msgid "show modified files in the output" msgstr "显示已修改的文件" -#: builtin/ls-files.c:629 +#: builtin/ls-files.c:632 msgid "show other files in the output" msgstr "显示其它文件" -#: builtin/ls-files.c:631 +#: builtin/ls-files.c:634 msgid "show ignored files in the output" msgstr "显示忽略的文件" -#: builtin/ls-files.c:634 +#: builtin/ls-files.c:637 msgid "show staged contents' object name in the output" msgstr "显示暂存区内容的对象名称" -#: builtin/ls-files.c:636 +#: builtin/ls-files.c:639 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需要删除的文件" -#: builtin/ls-files.c:638 +#: builtin/ls-files.c:641 msgid "show 'other' directories' names only" msgstr "只显示“其他”目录的名称" -#: builtin/ls-files.c:640 +#: builtin/ls-files.c:643 msgid "show line endings of files" msgstr "显示文件换行符格式" -#: builtin/ls-files.c:642 +#: builtin/ls-files.c:645 msgid "don't show empty directories" msgstr "不显示空目录" -#: builtin/ls-files.c:645 +#: builtin/ls-files.c:648 msgid "show unmerged files in the output" msgstr "显示未合并的文件" -#: builtin/ls-files.c:647 +#: builtin/ls-files.c:650 msgid "show resolve-undo information" msgstr "显示 resolve-undo 信息" -#: builtin/ls-files.c:649 +#: builtin/ls-files.c:652 msgid "skip files matching pattern" msgstr "跳过和模式匹配的文件" -#: builtin/ls-files.c:652 +#: builtin/ls-files.c:655 msgid "read exclude patterns from <file>" msgstr "从 <文件> 读取排除模式" -#: builtin/ls-files.c:655 +#: builtin/ls-files.c:658 msgid "read additional per-directory exclude patterns in <file>" msgstr "从 <文件> 读取额外的每个目录的排除模式" -#: builtin/ls-files.c:657 +#: builtin/ls-files.c:660 msgid "add the standard git exclusions" msgstr "添加标准的 git 排除" -#: builtin/ls-files.c:661 +#: builtin/ls-files.c:664 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/ls-files.c:664 +#: builtin/ls-files.c:667 msgid "recurse through submodules" msgstr "在子模组中递归" -#: builtin/ls-files.c:666 +#: builtin/ls-files.c:669 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都不在索引区，视为错误" -#: builtin/ls-files.c:667 +#: builtin/ls-files.c:670 msgid "tree-ish" msgstr "树对象" -#: builtin/ls-files.c:668 +#: builtin/ls-files.c:671 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "假装自从 <树对象> 之后删除的路径仍然存在" -#: builtin/ls-files.c:670 +#: builtin/ls-files.c:673 msgid "show debugging data" msgstr "显示调试数据" -#: builtin/ls-files.c:672 +#: builtin/ls-files.c:675 msgid "suppress duplicate entries" msgstr "抑制重复条目" +#: builtin/ls-files.c:677 +msgid "show sparse directories in the presence of a sparse index" +msgstr "在稀疏索引存在时显示稀疏目录" + #: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" @@ -17663,26 +17563,30 @@ msgid "use a diff3 based merge" msgstr "使用基于 diff3 的合并" #: builtin/merge-file.c:37 +msgid "use a zealous diff3 based merge" +msgstr "使用基于狂热 diff3（zealous diff3）的合并" + +#: builtin/merge-file.c:39 msgid "for conflicts, use our version" msgstr "如果冲突，使用我们的版本" -#: builtin/merge-file.c:39 +#: builtin/merge-file.c:41 msgid "for conflicts, use their version" msgstr "如果冲突，使用他们的版本" -#: builtin/merge-file.c:41 +#: builtin/merge-file.c:43 msgid "for conflicts, use a union version" msgstr "如果冲突，使用联合版本" -#: builtin/merge-file.c:44 +#: builtin/merge-file.c:46 msgid "for conflicts, use this marker size" msgstr "如果冲突，使用指定长度的标记" -#: builtin/merge-file.c:45 +#: builtin/merge-file.c:47 msgid "do not warn about conflicts" msgstr "不要警告冲突" -#: builtin/merge-file.c:47 +#: builtin/merge-file.c:49 msgid "set labels for file1/orig-file/file2" msgstr "为 文件1/初始文件/文件2 设置标签" @@ -17721,178 +17625,182 @@ msgstr "合并 %s 和 %s\n" msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<选项>] [<提交>...]" -#: builtin/merge.c:124 +#: builtin/merge.c:125 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" -#: builtin/merge.c:147 +#: builtin/merge.c:148 #, c-format msgid "option `%s' requires a value" msgstr "选项 `%s' 需要一个值" -#: builtin/merge.c:200 +#: builtin/merge.c:201 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合并策略 '%s'。\n" -#: builtin/merge.c:201 +#: builtin/merge.c:202 #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" -#: builtin/merge.c:206 +#: builtin/merge.c:207 #, c-format msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" -#: builtin/merge.c:257 builtin/pull.c:134 +#: builtin/merge.c:258 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "在合并的最后不显示差异统计" -#: builtin/merge.c:260 builtin/pull.c:137 +#: builtin/merge.c:261 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "在合并的最后显示差异统计" -#: builtin/merge.c:261 builtin/pull.c:140 +#: builtin/merge.c:262 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "（和 --stat 同义）" -#: builtin/merge.c:263 builtin/pull.c:143 +#: builtin/merge.c:264 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录" -#: builtin/merge.c:266 builtin/pull.c:149 +#: builtin/merge.c:267 builtin/pull.c:149 msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" -#: builtin/merge.c:268 builtin/pull.c:152 +#: builtin/merge.c:269 builtin/pull.c:152 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功，执行一次提交（默认）" -#: builtin/merge.c:270 builtin/pull.c:155 +#: builtin/merge.c:271 builtin/pull.c:155 msgid "edit message before committing" msgstr "在提交前编辑提交说明" -#: builtin/merge.c:272 +#: builtin/merge.c:273 msgid "allow fast-forward (default)" msgstr "允许快进（默认）" -#: builtin/merge.c:274 builtin/pull.c:162 +#: builtin/merge.c:275 builtin/pull.c:162 msgid "abort if fast-forward is not possible" msgstr "如果不能快进就放弃合并" -#: builtin/merge.c:278 builtin/pull.c:168 +#: builtin/merge.c:279 builtin/pull.c:168 msgid "verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172 +#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172 #: builtin/rebase.c:1117 builtin/revert.c:114 msgid "strategy" msgstr "策略" -#: builtin/merge.c:280 builtin/pull.c:173 +#: builtin/merge.c:281 builtin/pull.c:173 msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c:281 builtin/pull.c:176 +#: builtin/merge.c:282 builtin/pull.c:176 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:282 builtin/pull.c:177 +#: builtin/merge.c:283 builtin/pull.c:177 msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" -#: builtin/merge.c:284 +#: builtin/merge.c:285 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明（针对非快进式合并）" #: builtin/merge.c:291 +msgid "use <name> instead of the real target" +msgstr "使用 <名称> 而不是真正的目标" + +#: builtin/merge.c:294 msgid "abort the current in-progress merge" msgstr "放弃当前正在进行的合并" # -#: builtin/merge.c:293 +#: builtin/merge.c:296 msgid "--abort but leave index and working tree alone" msgstr "--abort，但是保留索引和工作区" -#: builtin/merge.c:295 +#: builtin/merge.c:298 msgid "continue the current in-progress merge" msgstr "继续当前正在进行的合并" -#: builtin/merge.c:297 builtin/pull.c:184 +#: builtin/merge.c:300 builtin/pull.c:184 msgid "allow merging unrelated histories" msgstr "允许合并不相关的历史" -#: builtin/merge.c:304 +#: builtin/merge.c:307 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "绕过 pre-merge-commit 和 commit-msg 钩子" -#: builtin/merge.c:321 +#: builtin/merge.c:323 msgid "could not run stash." msgstr "不能运行贮藏。" -#: builtin/merge.c:326 +#: builtin/merge.c:328 msgid "stash failed" msgstr "贮藏失败" -#: builtin/merge.c:331 +#: builtin/merge.c:333 #, c-format msgid "not a valid object: %s" msgstr "不是一个有效对象：%s" -#: builtin/merge.c:353 builtin/merge.c:370 +#: builtin/merge.c:355 builtin/merge.c:372 msgid "read-tree failed" msgstr "读取树失败" -#: builtin/merge.c:401 +#: builtin/merge.c:403 msgid "Already up to date. (nothing to squash)" msgstr "已经是最新的。（无可挤压）" -#: builtin/merge.c:415 +#: builtin/merge.c:417 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "挤压提交 -- 未更新 HEAD\n" -#: builtin/merge.c:465 +#: builtin/merge.c:467 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" -#: builtin/merge.c:515 +#: builtin/merge.c:517 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c:603 +#: builtin/merge.c:605 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c:730 +#: builtin/merge.c:732 msgid "Not handling anything other than two heads merge." msgstr "未处理两个头合并之外的任何操作。" -#: builtin/merge.c:743 +#: builtin/merge.c:745 #, c-format msgid "unknown strategy option: -X%s" msgstr "未知的策略选项：-X%s" -#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223 +#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:814 +#: builtin/merge.c:816 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:823 +#: builtin/merge.c:825 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:829 +#: builtin/merge.c:831 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" @@ -17902,83 +17810,83 @@ msgstr "" "合并到主题分支。\n" "\n" -#: builtin/merge.c:834 +#: builtin/merge.c:836 msgid "An empty message aborts the commit.\n" msgstr "空的提交说明会终止提交。\n" -#: builtin/merge.c:837 +#: builtin/merge.c:839 #, 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:892 +#: builtin/merge.c:894 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:907 +#: builtin/merge.c:909 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:968 +#: builtin/merge.c:970 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:1007 +#: builtin/merge.c:1009 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:1009 +#: builtin/merge.c:1011 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程仓库。" -#: builtin/merge.c:1011 +#: builtin/merge.c:1013 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:1016 +#: builtin/merge.c:1018 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1073 +#: builtin/merge.c:1075 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" -#: builtin/merge.c:1174 +#: builtin/merge.c:1177 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合并：%s" -#: builtin/merge.c:1208 +#: builtin/merge.c:1211 msgid "not something we can merge" msgstr "不能合并" -#: builtin/merge.c:1321 +#: builtin/merge.c:1324 msgid "--abort expects no arguments" msgstr "--abort 不带参数" -#: builtin/merge.c:1325 +#: builtin/merge.c:1328 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1343 +#: builtin/merge.c:1346 msgid "--quit expects no arguments" msgstr "--quit 不带参数" -#: builtin/merge.c:1356 +#: builtin/merge.c:1359 msgid "--continue expects no arguments" msgstr "--continue 不带参数" -#: builtin/merge.c:1360 +#: builtin/merge.c:1363 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "没有进行中的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1376 +#: builtin/merge.c:1379 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17986,7 +17894,7 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1383 +#: builtin/merge.c:1386 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17994,84 +17902,76 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1386 +#: builtin/merge.c:1389 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1400 -msgid "You cannot combine --squash with --no-ff." -msgstr "您不能将 --squash 和 --no-ff 组合使用。" - -#: builtin/merge.c:1402 -msgid "You cannot combine --squash with --commit." -msgstr "您不能将 --squash 和 --commit 组合使用。" - -#: builtin/merge.c:1418 +#: builtin/merge.c:1421 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1435 +#: builtin/merge.c:1438 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1437 +#: builtin/merge.c:1440 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1442 +#: builtin/merge.c:1445 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1444 +#: builtin/merge.c:1447 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1531 +#: builtin/merge.c:1534 msgid "refusing to merge unrelated histories" msgstr "拒绝合并无关的历史" -#: builtin/merge.c:1550 +#: builtin/merge.c:1553 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1598 +#: builtin/merge.c:1601 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1605 +#: builtin/merge.c:1608 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1664 builtin/merge.c:1730 +#: builtin/merge.c:1667 builtin/merge.c:1733 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1668 +#: builtin/merge.c:1671 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1720 +#: builtin/merge.c:1723 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1722 +#: builtin/merge.c:1725 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1732 +#: builtin/merge.c:1735 #, c-format msgid "Using the %s strategy to prepare resolving by hand.\n" msgstr "使用 %s 策略以准备手工解决。\n" -#: builtin/merge.c:1746 +#: builtin/merge.c:1749 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" @@ -18113,7 +18013,7 @@ msgstr "标准输入上的标签未通过我们严格的 fsck 检查" msgid "tag on stdin did not refer to a valid object" msgstr "标准输入上的标签未指向一个有效的对象" -#: builtin/mktag.c:104 builtin/tag.c:243 +#: builtin/mktag.c:104 builtin/tag.c:242 msgid "unable to write tag file" msgstr "无法写标签文件" @@ -18177,7 +18077,7 @@ msgstr "写入只包括给定索引的多包索引" msgid "refs snapshot for selecting bitmap commits" msgstr "用于选择位图提交的引用快照" -#: builtin/multi-pack-index.c:202 +#: builtin/multi-pack-index.c:206 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -18274,52 +18174,52 @@ msgstr "%s，源=%s，目标=%s" msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853 +#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:474 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<选项>] <提交>..." -#: builtin/name-rev.c:466 +#: builtin/name-rev.c:475 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<选项>] --all" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:476 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<选项>] --stdin" -#: builtin/name-rev.c:524 +#: builtin/name-rev.c:533 msgid "print only ref-based names (no object names)" msgstr "只打印基于引用的名称（非对象名）" -#: builtin/name-rev.c:525 +#: builtin/name-rev.c:534 msgid "only use tags to name the commits" msgstr "只使用标签来命名提交" -#: builtin/name-rev.c:527 +#: builtin/name-rev.c:536 msgid "only use refs matching <pattern>" msgstr "只使用和 <模式> 相匹配的引用" -#: builtin/name-rev.c:529 +#: builtin/name-rev.c:538 msgid "ignore refs matching <pattern>" msgstr "忽略和 <模式> 相匹配的引用" -#: builtin/name-rev.c:531 +#: builtin/name-rev.c:540 msgid "list all commits reachable from all refs" msgstr "列出可以从所有引用访问的提交" -#: builtin/name-rev.c:532 +#: builtin/name-rev.c:541 msgid "read from stdin" msgstr "从标准输入读取" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:542 msgid "allow to print `undefined` names (default)" msgstr "允许打印 `未定义` 的名称（默认）" -#: builtin/name-rev.c:539 +#: builtin/name-rev.c:548 msgid "dereference tags in the input (internal use)" msgstr "反向解析输入中的标签（内部使用）" @@ -18436,25 +18336,25 @@ msgstr "git notes get-ref" msgid "Write/edit the notes for the following object:" msgstr "为下面的对象写/编辑说明：" -#: builtin/notes.c:150 +#: builtin/notes.c:149 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "不能为对象 '%s' 开始 'show'" -#: builtin/notes.c:154 +#: builtin/notes.c:153 msgid "could not read 'show' output" msgstr "不能读取 'show' 的输出" -#: builtin/notes.c:162 +#: builtin/notes.c:161 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "无法为对象 '%s' 完成 'show'" -#: builtin/notes.c:195 +#: builtin/notes.c:194 msgid "please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解提供内容" -#: builtin/notes.c:204 +#: builtin/notes.c:203 msgid "unable to write note object" msgstr "不能写注解对象" @@ -18463,7 +18363,7 @@ msgstr "不能写注解对象" msgid "the note contents have been left in %s" msgstr "注解内容被留在 %s 中" -#: builtin/notes.c:240 builtin/tag.c:577 +#: builtin/notes.c:240 builtin/tag.c:581 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" @@ -18478,7 +18378,7 @@ msgstr "无法解析 '%s' 为一个有效引用。" #: builtin/notes.c:263 #, c-format msgid "failed to read object '%s'." -msgstr "读取对象 '%s' 失败。" +msgstr "无法读取对象 '%s'。" #: builtin/notes.c:266 #, c-format @@ -18493,7 +18393,7 @@ msgstr "格式错误的输入行：'%s'。" #: builtin/notes.c:322 #, c-format msgid "failed to copy notes from '%s' to '%s'" -msgstr "从 '%s' 拷贝注解到 '%s' 时失败" +msgstr "无法把注解从 '%s' 拷贝到 '%s'" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. @@ -18505,8 +18405,8 @@ msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解" #: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507 #: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663 -#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983 -#: builtin/prune-packed.c:25 builtin/tag.c:587 +#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987 +#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591 msgid "too many arguments" msgstr "太多参数" @@ -18551,7 +18451,7 @@ msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆 msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" -#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900 +#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904 #, c-format msgid "Removing note for object %s\n" msgstr "删除对象 %s 的注解\n" @@ -18591,19 +18491,19 @@ msgstr "" #: builtin/notes.c:696 msgid "failed to delete ref NOTES_MERGE_PARTIAL" -msgstr "删除引用 NOTES_MERGE_PARTIAL 失败" +msgstr "无法删除引用 NOTES_MERGE_PARTIAL" #: builtin/notes.c:698 msgid "failed to delete ref NOTES_MERGE_REF" -msgstr "删除引用 NOTES_MERGE_REF 失败" +msgstr "无法删除引用 NOTES_MERGE_REF" #: builtin/notes.c:700 msgid "failed to remove 'git notes merge' worktree" -msgstr "删除 'git notes merge' 工作区失败" +msgstr "无法删除 'git notes merge' 工作区" #: builtin/notes.c:720 msgid "failed to read ref NOTES_MERGE_PARTIAL" -msgstr "读取引用 NOTES_MERGE_PARTIAL 失败" +msgstr "无法读取引用 NOTES_MERGE_PARTIAL" #: builtin/notes.c:722 msgid "could not find commit from NOTES_MERGE_PARTIAL." @@ -18615,7 +18515,7 @@ msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" #: builtin/notes.c:737 msgid "failed to resolve NOTES_MERGE_REF" -msgstr "解析 NOTES_MERGE_REF 失败" +msgstr "无法解析 NOTES_MERGE_REF" #: builtin/notes.c:740 msgid "failed to finalize notes merge" @@ -18669,17 +18569,17 @@ msgstr "必须指定一个注解引用来合并" msgid "unknown -s/--strategy: %s" msgstr "未知的 -s/--strategy：%s" -#: builtin/notes.c:871 +#: builtin/notes.c:874 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" -#: builtin/notes.c:874 +#: builtin/notes.c:878 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "无法存储链接到当前的注解引用（%s）" -#: builtin/notes.c:876 +#: builtin/notes.c:880 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -18689,41 +18589,41 @@ msgstr "" "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" "交结果，或者使用命令 'git notes merge --abort' 终止合并。\n" -#: builtin/notes.c:895 builtin/tag.c:590 +#: builtin/notes.c:899 builtin/tag.c:594 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" -#: builtin/notes.c:898 +#: builtin/notes.c:902 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" -#: builtin/notes.c:910 +#: builtin/notes.c:914 msgid "attempt to remove non-existent note is not an error" msgstr "尝试删除不存在的注解不是一个错误" -#: builtin/notes.c:913 +#: builtin/notes.c:917 msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" -#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147 +#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147 msgid "do not remove, show only" msgstr "不删除，只显示" -#: builtin/notes.c:953 +#: builtin/notes.c:957 msgid "report pruned notes" msgstr "报告清除的注解" -#: builtin/notes.c:996 +#: builtin/notes.c:1000 msgid "notes-ref" msgstr "注解引用" -#: builtin/notes.c:997 +#: builtin/notes.c:1001 msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:1032 builtin/stash.c:1752 +#: builtin/notes.c:1036 builtin/stash.c:1818 #, c-format msgid "unknown subcommand: %s" msgstr "未知子命令：%s" @@ -18782,11 +18682,11 @@ msgstr "写入对象中" #: builtin/pack-objects.c:1235 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" -msgstr "对 %s 调用 stat 失败" +msgstr "无法对 %s 调用 stat" #: builtin/pack-objects.c:1268 msgid "failed to write bitmap index" -msgstr "写入位图索引失败" +msgstr "无法写入位图索引" #: builtin/pack-objects.c:1294 #, c-format @@ -19112,10 +19012,6 @@ msgstr "最小的包文件大小是 1 MiB" msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用于创建一个可索引包" -#: builtin/pack-objects.c:4073 -msgid "--keep-unreachable and --unpack-unreachable are incompatible" -msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容" - #: builtin/pack-objects.c:4079 msgid "cannot use --filter without --stdout" msgstr "不能在没有 --stdout 的情况下使用 --filter" @@ -19132,7 +19028,7 @@ msgstr "不能同时使用内部版本列表和 --stdin-packs" msgid "Enumerating objects" msgstr "枚举对象中" -#: builtin/pack-objects.c:4181 +#: builtin/pack-objects.c:4180 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -19174,19 +19070,19 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]" -#: builtin/prune.c:133 +#: builtin/prune.c:145 msgid "report pruned objects" msgstr "报告清除的对象" -#: builtin/prune.c:136 +#: builtin/prune.c:148 msgid "expire objects older than <time>" msgstr "使早于给定时间的对象过期" -#: builtin/prune.c:138 +#: builtin/prune.c:150 msgid "limit traversal to objects outside promisor packfiles" msgstr "限制遍历 promisor 包以外的对象" -#: builtin/prune.c:151 +#: builtin/prune.c:163 msgid "cannot prune in a precious-objects repo" msgstr "不能在珍品仓库中执行清理操作" @@ -19219,7 +19115,7 @@ msgstr "允许快进式" msgid "control use of pre-merge-commit and commit-msg hooks" msgstr "控制 pre-merge-commit 和 commit-msg 钩子的使用" -#: builtin/pull.c:171 parse-options.h:338 +#: builtin/pull.c:171 parse-options.h:340 msgid "automatically stash/stash pop before and after" msgstr "在操作前后执行自动贮藏和弹出贮藏" @@ -19289,6 +19185,7 @@ msgid "<remote>" msgstr "<远程>" #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487 +#: contrib/scalar/scalar.c:375 msgid "<branch>" msgstr "<分支>" @@ -19319,13 +19216,13 @@ msgstr "无法访问提交 %s" msgid "ignoring --verify-signatures for rebase" msgstr "为变基操作忽略 --verify-signatures" -#: builtin/pull.c:942 +#: builtin/pull.c:969 msgid "" "You have divergent branches and need to specify how to reconcile them.\n" "You can do so by running one of the following commands sometime before\n" "your next pull:\n" "\n" -" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase false # merge\n" " git config pull.rebase true # rebase\n" " git config pull.ff only # fast-forward only\n" "\n" @@ -19338,7 +19235,7 @@ msgstr "" "您有偏离的分支，需要指定如何调和它们。您可以在执行下一次\n" "pull 操作之前执行下面一条命令来抑制本消息：\n" "\n" -" git config pull.rebase false # 合并（缺省策略）\n" +" git config pull.rebase false # 合并\n" " git config pull.rebase true # 变基\n" " git config pull.ff only # 仅快进\n" "\n" @@ -19346,19 +19243,19 @@ msgstr "" "缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase，\n" "或者 --ff-only 参数覆盖缺省设置。\n" -#: builtin/pull.c:1016 +#: builtin/pull.c:1046 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未诞生的分支，变更添加至索引。" -#: builtin/pull.c:1020 +#: builtin/pull.c:1050 msgid "pull with rebase" msgstr "变基式拉取" -#: builtin/pull.c:1021 +#: builtin/pull.c:1051 msgid "please commit or stash them." msgstr "请提交或贮藏它们。" -#: builtin/pull.c:1046 +#: builtin/pull.c:1076 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -19368,7 +19265,7 @@ msgstr "" "fetch 更新了当前的分支。快进您的工作区\n" "至提交 %s。" -#: builtin/pull.c:1052 +#: builtin/pull.c:1082 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -19385,23 +19282,23 @@ msgstr "" "$ git reset --hard\n" "恢复之前的状态。" -#: builtin/pull.c:1067 +#: builtin/pull.c:1097 msgid "Cannot merge multiple branches into empty head." msgstr "无法将多个分支合并到空分支。" -#: builtin/pull.c:1072 +#: builtin/pull.c:1102 msgid "Cannot rebase onto multiple branches." msgstr "无法变基到多个分支。" -#: builtin/pull.c:1074 +#: builtin/pull.c:1104 msgid "Cannot fast-forward to multiple branches." msgstr "无法快进到多个分支。" -#: builtin/pull.c:1088 +#: builtin/pull.c:1119 msgid "Need to specify how to reconcile divergent branches." msgstr "需要指定如何调和偏离的分支。" -#: builtin/pull.c:1102 +#: builtin/pull.c:1133 msgid "cannot rebase with locally recorded submodule modifications" msgstr "本地子模组中有修改，无法变基" @@ -19562,9 +19459,9 @@ msgstr "推送到 %s\n" #: builtin/push.c:362 #, c-format msgid "failed to push some refs to '%s'" -msgstr "推送一些引用到 '%s' 失败" +msgstr "无法推送一些引用到 '%s'" -#: builtin/push.c:544 builtin/submodule--helper.c:3258 +#: builtin/push.c:544 builtin/submodule--helper.c:3259 msgid "repository" msgstr "仓库" @@ -19637,10 +19534,6 @@ msgstr "用 GPG 为推送签名" msgid "request atomic transaction on remote side" msgstr "需要远端支持原子事务" -#: builtin/push.c:592 -msgid "--delete is incompatible with --all, --mirror and --tags" -msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" - #: builtin/push.c:594 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" @@ -19671,26 +19564,14 @@ msgstr "" "\n" " git push <名称>\n" -#: builtin/push.c:630 -msgid "--all and --tags are incompatible" -msgstr "--all 和 --tags 不兼容" - #: builtin/push.c:632 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用规格同时使用" -#: builtin/push.c:636 -msgid "--mirror and --tags are incompatible" -msgstr "--mirror 和 --tags 不兼容" - #: builtin/push.c:638 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用规格同时使用" -#: builtin/push.c:641 -msgid "--all and --mirror are incompatible" -msgstr "--all 和 --mirror 不兼容" - #: builtin/push.c:648 msgid "push options must not have new line characters" msgstr "推送选项不能有换行符" @@ -20105,18 +19986,6 @@ msgstr "看起来 'git am' 正在执行中。无法变基。" msgid "--preserve-merges was replaced by --rebase-merges" msgstr "--preserve-merges 被 --rebase-merges 代替。" -#: builtin/rebase.c:1193 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "不能将 '--keep-base' 和 '--onto' 组合使用" - -#: builtin/rebase.c:1195 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "不能将 '--keep-base' 和 '--root' 组合使用" - -#: builtin/rebase.c:1199 -msgid "cannot combine '--root' with '--fork-point'" -msgstr "不能将 '--root' 和 '--fork-point' 组合使用" - #: builtin/rebase.c:1202 msgid "No rebase in progress?" msgstr "没有正在进行的变基？" @@ -20179,8 +20048,8 @@ msgid "--strategy requires --merge or --interactive" msgstr "--strategy 需要 --merge 或 --interactive" #: builtin/rebase.c:1463 -msgid "cannot combine apply options with merge options" -msgstr "不能组合使用应用选项和合并选项" +msgid "apply options and merge options cannot be used together" +msgstr "应用选项和合并选项不能同时使用" #: builtin/rebase.c:1476 #, c-format @@ -20221,7 +20090,7 @@ msgid "no such branch/commit '%s'" msgstr "无此分支/提交 '%s'" #: builtin/rebase.c:1618 builtin/submodule--helper.c:39 -#: builtin/submodule--helper.c:2658 +#: builtin/submodule--helper.c:2659 #, c-format msgid "No such ref: %s" msgstr "没有这样的引用：%s" @@ -20289,7 +20158,7 @@ msgstr "快进 %s 到 %s。\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <仓库目录>" -#: builtin/receive-pack.c:1280 +#: builtin/receive-pack.c:1275 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -20315,7 +20184,7 @@ msgstr "" "若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n" "配置变量为 'refuse'。" -#: builtin/receive-pack.c:1300 +#: builtin/receive-pack.c:1295 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -20334,13 +20203,13 @@ msgstr "" "\n" "若要屏蔽此信息，您可以设置它为 'refuse'。" -#: builtin/receive-pack.c:2480 +#: builtin/receive-pack.c:2474 msgid "quiet" msgstr "静默模式" -#: builtin/receive-pack.c:2495 -msgid "You must specify a directory." -msgstr "您必须指定一个目录。" +#: builtin/receive-pack.c:2489 +msgid "you must specify a directory" +msgstr "您必须指定一个目录" #: builtin/reflog.c:17 msgid "" @@ -20364,41 +20233,41 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <引用>" -#: builtin/reflog.c:568 builtin/reflog.c:573 +#: builtin/reflog.c:585 builtin/reflog.c:590 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' 不是一个有效的时间戳" -#: builtin/reflog.c:609 +#: builtin/reflog.c:631 #, c-format msgid "Marking reachable objects..." msgstr "正在标记可达对象..." -#: builtin/reflog.c:647 +#: builtin/reflog.c:675 #, c-format msgid "%s points nowhere!" msgstr "%s 指向不存在！" -#: builtin/reflog.c:700 +#: builtin/reflog.c:731 msgid "no reflog specified to delete" msgstr "未指定要删除的引用日志" -#: builtin/reflog.c:708 +#: builtin/reflog.c:742 #, c-format msgid "not a reflog: %s" msgstr "不是一个引用日志：%s" -#: builtin/reflog.c:713 +#: builtin/reflog.c:747 #, c-format msgid "no reflog for '%s'" msgstr "没有 '%s' 的引用日志" -#: builtin/reflog.c:759 +#: builtin/reflog.c:794 #, c-format msgid "invalid ref format: %s" msgstr "无效的引用格式：%s" -#: builtin/reflog.c:768 +#: builtin/reflog.c:803 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" @@ -20488,6 +20357,11 @@ msgstr "git remote update [<选项>] [<组> | <远程>]..." msgid "Updating %s" msgstr "更新 %s 中" +#: builtin/remote.c:101 +#, c-format +msgid "Could not fetch %s" +msgstr "不能获取 %s" + #: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" @@ -20933,148 +20807,140 @@ msgstr "" msgid "could not start pack-objects to repack promisor objects" msgstr "无法开始 pack-objects 来重新打包 promisor 对象" -#: builtin/repack.c:273 builtin/repack.c:816 +#: builtin/repack.c:275 builtin/repack.c:820 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。" -#: builtin/repack.c:297 +#: builtin/repack.c:299 msgid "could not finish pack-objects to repack promisor objects" msgstr "无法完成 pack-objects 来重新打包 promisor 对象" -#: builtin/repack.c:312 +#: builtin/repack.c:314 #, c-format msgid "cannot open index for %s" msgstr "不能打开 %s 的索引" -#: builtin/repack.c:371 +#: builtin/repack.c:373 #, c-format msgid "pack %s too large to consider in geometric progression" msgstr "包 %s 太大，不在几何级数中考虑" -#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416 +#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418 #, c-format msgid "pack %s too large to roll up" msgstr "包 %s 太大导致数字溢出" -#: builtin/repack.c:496 +#: builtin/repack.c:498 #, c-format msgid "could not open tempfile %s for writing" msgstr "无法打开临时文件 %s 进行写入" -#: builtin/repack.c:514 +#: builtin/repack.c:516 msgid "could not close refs snapshot tempfile" msgstr "不能关闭引用快照临时文件" -#: builtin/repack.c:628 +#: builtin/repack.c:630 msgid "pack everything in a single pack" msgstr "所有内容打包到一个包文件中" -#: builtin/repack.c:630 +#: builtin/repack.c:632 msgid "same as -a, and turn unreachable objects loose" msgstr "和 -a 相同，并将不可达的对象设为松散对象" -#: builtin/repack.c:633 +#: builtin/repack.c:635 msgid "remove redundant packs, and run git-prune-packed" msgstr "删除多余的包，运行 git-prune-packed" -#: builtin/repack.c:635 +#: builtin/repack.c:637 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" -#: builtin/repack.c:637 +#: builtin/repack.c:639 msgid "pass --no-reuse-object to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --no-reuse-object" -#: builtin/repack.c:639 +#: builtin/repack.c:641 msgid "do not run git-update-server-info" msgstr "不运行 git-update-server-info" -#: builtin/repack.c:642 +#: builtin/repack.c:644 msgid "pass --local to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --local" -#: builtin/repack.c:644 +#: builtin/repack.c:646 msgid "write bitmap index" msgstr "写 bitmap 索引" -#: builtin/repack.c:646 +#: builtin/repack.c:648 msgid "pass --delta-islands to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --delta-islands" -#: builtin/repack.c:647 +#: builtin/repack.c:649 msgid "approxidate" msgstr "近似日期" -#: builtin/repack.c:648 +#: builtin/repack.c:650 msgid "with -A, do not loosen objects older than this" msgstr "使用 -A，不要将早于给定时间的对象过期" -#: builtin/repack.c:650 +#: builtin/repack.c:652 msgid "with -a, repack unreachable objects" msgstr "使用 -a ，重新对不可达对象打包" -#: builtin/repack.c:652 +#: builtin/repack.c:654 msgid "size of the window used for delta compression" msgstr "用于增量压缩的窗口值" -#: builtin/repack.c:653 builtin/repack.c:659 +#: builtin/repack.c:655 builtin/repack.c:661 msgid "bytes" msgstr "字节" -#: builtin/repack.c:654 +#: builtin/repack.c:656 msgid "same as the above, but limit memory size instead of entries count" msgstr "和上面的相似，但限制内存大小而非条目数" -#: builtin/repack.c:656 +#: builtin/repack.c:658 msgid "limits the maximum delta depth" msgstr "限制最大增量深度" -#: builtin/repack.c:658 +#: builtin/repack.c:660 msgid "limits the maximum number of threads" msgstr "限制最大线程数" -#: builtin/repack.c:660 +#: builtin/repack.c:662 msgid "maximum size of each packfile" msgstr "每个包文件的最大尺寸" -#: builtin/repack.c:662 +#: builtin/repack.c:664 msgid "repack objects in packs marked with .keep" msgstr "对标记为 .keep 的包中的对象重新打包" -#: builtin/repack.c:664 +#: builtin/repack.c:666 msgid "do not repack this pack" msgstr "不要对该包文件重新打包" -#: builtin/repack.c:666 +#: builtin/repack.c:668 msgid "find a geometric progression with factor <N>" msgstr "使用因子 <n> 查找几何级数" -#: builtin/repack.c:668 +#: builtin/repack.c:670 msgid "write a multi-pack index of the resulting packs" msgstr "写入结果包的多包索引" -#: builtin/repack.c:678 +#: builtin/repack.c:680 msgid "cannot delete packs in a precious-objects repo" msgstr "不能删除珍品仓库中的打包文件" -#: builtin/repack.c:682 -msgid "--keep-unreachable and -A are incompatible" -msgstr "--keep-unreachable 和 -A 不兼容" - -#: builtin/repack.c:713 -msgid "--geometric is incompatible with -A, -a" -msgstr "--geometric 和 -A、-a 不兼容" - -#: builtin/repack.c:825 +#: builtin/repack.c:829 msgid "Nothing new to pack." msgstr "没有新的要打包。" -#: builtin/repack.c:855 +#: builtin/repack.c:859 #, c-format msgid "missing required file: %s" msgstr "缺少需要的文件：%s" -#: builtin/repack.c:857 +#: builtin/repack.c:861 #, c-format msgid "could not unlink: %s" msgstr "不能删除：%s" @@ -21157,98 +21023,92 @@ msgstr "cat-file 报告失败" msgid "unable to open %s for reading" msgstr "无法为读取打开 %s" -#: builtin/replace.c:272 +#: builtin/replace.c:271 msgid "unable to spawn mktree" msgstr "无法启动 mktree" -#: builtin/replace.c:276 +#: builtin/replace.c:275 msgid "unable to read from mktree" msgstr "无法从 mktree 读取" -#: builtin/replace.c:285 +#: builtin/replace.c:284 msgid "mktree reported failure" msgstr "mktree 报告失败" -#: builtin/replace.c:289 +#: builtin/replace.c:288 msgid "mktree did not return an object name" msgstr "mktree 没有返回一个对象名" -#: builtin/replace.c:298 +#: builtin/replace.c:297 #, c-format msgid "unable to fstat %s" msgstr "无法对 %s 执行 fstat" -#: builtin/replace.c:303 +#: builtin/replace.c:302 msgid "unable to write object to database" msgstr "无法向数据库写入对象" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 -#, c-format -msgid "not a valid object name: '%s'" -msgstr "不是一个有效的对象名：'%s'" - -#: builtin/replace.c:326 +#: builtin/replace.c:325 #, c-format msgid "unable to get object type for %s" msgstr "无法得到 %s 的对象类型" -#: builtin/replace.c:342 +#: builtin/replace.c:341 msgid "editing object file failed" msgstr "编辑对象文件失败" -#: builtin/replace.c:351 +#: builtin/replace.c:350 #, c-format msgid "new object is the same as the old one: '%s'" msgstr "新对象和旧对象相同：'%s'" -#: builtin/replace.c:384 +#: builtin/replace.c:383 #, c-format msgid "could not parse %s as a commit" msgstr "无法将 %s 解析为一个提交" -#: builtin/replace.c:416 +#: builtin/replace.c:415 #, c-format msgid "bad mergetag in commit '%s'" msgstr "提交 '%s' 中含有损坏的合并标签" -#: builtin/replace.c:418 +#: builtin/replace.c:417 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "提交 '%s' 中含有格式错误的合并标签" -#: builtin/replace.c:430 +#: builtin/replace.c:429 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft" -#: builtin/replace.c:469 +#: builtin/replace.c:468 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "原始提交 '%s' 中有一个 gpg 签名" -#: builtin/replace.c:470 +#: builtin/replace.c:469 msgid "the signature will be removed in the replacement commit!" msgstr "在替换的提交中签名将被移除！" -#: builtin/replace.c:480 +#: builtin/replace.c:479 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "不能为 '%s' 写替换提交" -#: builtin/replace.c:488 +#: builtin/replace.c:487 #, c-format msgid "graft for '%s' unnecessary" msgstr "对 '%s' 移植没有必要" -#: builtin/replace.c:492 +#: builtin/replace.c:491 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "新提交和旧的一样：'%s'" -#: builtin/replace.c:527 +#: builtin/replace.c:526 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -21257,71 +21117,71 @@ msgstr "" "不能转换下列移植：\n" "%s" -#: builtin/replace.c:548 +#: builtin/replace.c:547 msgid "list replace refs" msgstr "列出替换的引用" -#: builtin/replace.c:549 +#: builtin/replace.c:548 msgid "delete replace refs" msgstr "删除替换的引用" -#: builtin/replace.c:550 +#: builtin/replace.c:549 msgid "edit existing object" msgstr "编辑现存的对象" -#: builtin/replace.c:551 +#: builtin/replace.c:550 msgid "change a commit's parents" msgstr "修改一个提交的父提交" -#: builtin/replace.c:552 +#: builtin/replace.c:551 msgid "convert existing graft file" msgstr "转换现存的移植文件" -#: builtin/replace.c:553 +#: builtin/replace.c:552 msgid "replace the ref if it exists" msgstr "如果存在则替换引用" -#: builtin/replace.c:555 +#: builtin/replace.c:554 msgid "do not pretty-print contents for --edit" msgstr "不要为 --edit 操作美观显示内容" -#: builtin/replace.c:556 +#: builtin/replace.c:555 msgid "use this format" msgstr "使用此格式" -#: builtin/replace.c:569 +#: builtin/replace.c:568 msgid "--format cannot be used when not listing" msgstr "不列出时不能使用 --format" -#: builtin/replace.c:577 +#: builtin/replace.c:576 msgid "-f only makes sense when writing a replacement" msgstr "只有写一个替换时 -f 才有意义" -#: builtin/replace.c:581 +#: builtin/replace.c:580 msgid "--raw only makes sense with --edit" msgstr "--raw 只有和 --edit 共用才有意义" -#: builtin/replace.c:587 +#: builtin/replace.c:586 msgid "-d needs at least one argument" msgstr "-d 需要至少一个参数" -#: builtin/replace.c:593 +#: builtin/replace.c:592 msgid "bad number of arguments" msgstr "错误的参数个数" -#: builtin/replace.c:599 +#: builtin/replace.c:598 msgid "-e needs exactly one argument" msgstr "-e 需要且仅需要一个参数" -#: builtin/replace.c:605 +#: builtin/replace.c:604 msgid "-g needs at least one argument" msgstr "-g 需要至少一个参数" -#: builtin/replace.c:611 +#: builtin/replace.c:610 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file 不带参数" -#: builtin/replace.c:617 +#: builtin/replace.c:616 msgid "only one pattern can be given with -l" msgstr "只能为 -l 提供一个模式" @@ -21342,132 +21202,124 @@ msgstr "没有路径的 'git rerere forget' 已经过时" msgid "unable to generate diff for '%s'" msgstr "无法为 '%s' 生成差异" -#: builtin/reset.c:32 +#: builtin/reset.c:33 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..." -#: builtin/reset.c:34 +#: builtin/reset.c:35 msgid "" "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]" -#: builtin/reset.c:35 +#: builtin/reset.c:36 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "mixed" msgstr "混杂" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "soft" msgstr "软性" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "hard" msgstr "硬性" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "merge" msgstr "合并" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "keep" msgstr "保持" -#: builtin/reset.c:89 +#: builtin/reset.c:90 msgid "You do not have a valid HEAD." msgstr "您没有一个有效的 HEAD。" -#: builtin/reset.c:91 +#: builtin/reset.c:92 msgid "Failed to find tree of HEAD." msgstr "无法找到 HEAD 指向的树。" -#: builtin/reset.c:97 +#: builtin/reset.c:98 #, c-format msgid "Failed to find tree of %s." msgstr "无法找到 %s 指向的树。" -#: builtin/reset.c:122 +#: builtin/reset.c:123 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 现在位于 %s" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:201 +#: builtin/reset.c:299 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" -#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679 -#: builtin/stash.c:703 +#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680 +#: builtin/stash.c:704 msgid "be quiet, only report errors" msgstr "安静模式，只报告错误" -#: builtin/reset.c:303 +#: builtin/reset.c:398 msgid "reset HEAD and index" msgstr "重置 HEAD 和索引" -#: builtin/reset.c:304 +#: builtin/reset.c:399 msgid "reset only HEAD" msgstr "只重置 HEAD" -#: builtin/reset.c:306 builtin/reset.c:308 +#: builtin/reset.c:401 builtin/reset.c:403 msgid "reset HEAD, index and working tree" msgstr "重置 HEAD、索引和工作区" -#: builtin/reset.c:310 +#: builtin/reset.c:405 msgid "reset HEAD but keep local changes" msgstr "重置 HEAD 但保存本地变更" -#: builtin/reset.c:316 +#: builtin/reset.c:411 msgid "record only the fact that removed paths will be added later" msgstr "将删除的路径标记为稍后添加" -#: builtin/reset.c:350 +#: builtin/reset.c:445 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "无法将 '%s' 解析为一个有效的版本。" -#: builtin/reset.c:358 +#: builtin/reset.c:453 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "无法将 '%s' 解析为一个有效的树对象。" -#: builtin/reset.c:367 -msgid "--patch is incompatible with --{hard,mixed,soft}" -msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" - -#: builtin/reset.c:377 +#: builtin/reset.c:472 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:379 +#: builtin/reset.c:474 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:394 +#: builtin/reset.c:489 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能对纯仓库进行%s重置" -#: builtin/reset.c:398 -msgid "-N can only be used with --mixed" -msgstr "-N 只能和 --mixed 同时使用" - -#: builtin/reset.c:419 +#: builtin/reset.c:520 msgid "Unstaged changes after reset:" msgstr "重置后取消暂存的变更：" -#: builtin/reset.c:422 +#: builtin/reset.c:523 #, c-format msgid "" "\n" @@ -21479,19 +21331,15 @@ msgstr "" "重置后，枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n" "将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n" -#: builtin/reset.c:440 +#: builtin/reset.c:541 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" -#: builtin/reset.c:445 +#: builtin/reset.c:546 msgid "Could not write new index file." msgstr "不能写入新的索引文件。" -#: builtin/rev-list.c:541 -msgid "cannot combine --exclude-promisor-objects and --missing" -msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项" - #: builtin/rev-list.c:602 msgid "object filtering requires --objects" msgstr "对象过滤需要 --objects" @@ -21501,8 +21349,9 @@ msgid "rev-list does not support display of notes" msgstr "rev-list 不支持显示注解" #: builtin/rev-list.c:679 -msgid "marked counting is incompatible with --objects" -msgstr "标记计数和 --objects 不兼容" +#, c-format +msgid "marked counting and '%s' cannot be used together" +msgstr "标记计数和 '%s' 不能同时使用" #: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -21937,11 +21786,6 @@ msgstr "<n>[,<base>]" msgid "show <n> most recent ref-log entries starting at base" msgstr "显示从起始点开始的 <n> 条最近的引用日志记录" -#: builtin/show-branch.c:710 -msgid "" -"--reflog is incompatible with --all, --remotes, --independent or --merge-base" -msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" - #: builtin/show-branch.c:734 msgid "no branches given, and HEAD is not valid" msgstr "未提供分支，且 HEAD 无效" @@ -21962,19 +21806,19 @@ msgstr[1] "一次只能显示 %d 个条目。" msgid "no such ref %s" msgstr "无此引用 %s" -#: builtin/show-branch.c:828 +#: builtin/show-branch.c:830 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "不能处理 %d 个以上的版本。" msgstr[1] "不能处理 %d 个以上的版本。" -#: builtin/show-branch.c:832 +#: builtin/show-branch.c:834 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' 不是一个有效的引用。" -#: builtin/show-branch.c:835 +#: builtin/show-branch.c:837 #, c-format msgid "cannot find commit %s (%s)" msgstr "不能找到提交 %s（%s）" @@ -22039,86 +21883,112 @@ msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <选项>" msgid "git sparse-checkout list" msgstr "git sparse-checkout list" -#: builtin/sparse-checkout.c:72 +#: builtin/sparse-checkout.c:60 +msgid "this worktree is not sparse" +msgstr "这个工作区不是稀疏的" + +#: builtin/sparse-checkout.c:75 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "本工作区不是稀疏模式（稀疏检出文件可能不存在）" -#: builtin/sparse-checkout.c:173 +#: builtin/sparse-checkout.c:176 #, c-format msgid "" "directory '%s' contains untracked files, but is not in the sparse-checkout " "cone" -msgstr "目录 '%s' 包括了未跟踪文件，但不在稀疏检出 cone 中" +msgstr "目录 '%s' 包括了未跟踪文件，但不在稀疏检出锥中" -#: builtin/sparse-checkout.c:181 +#: builtin/sparse-checkout.c:184 #, c-format msgid "failed to remove directory '%s'" msgstr "无法删除目录 '%s'" -#: builtin/sparse-checkout.c:321 +#: builtin/sparse-checkout.c:324 msgid "failed to create directory for sparse-checkout file" msgstr "无法为稀疏检出文件创建目录" -#: builtin/sparse-checkout.c:362 +#: builtin/sparse-checkout.c:365 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "无法升级仓库格式以启用 worktreeConfig" -#: builtin/sparse-checkout.c:364 +#: builtin/sparse-checkout.c:367 msgid "failed to set extensions.worktreeConfig setting" msgstr "无法设置 extensions.worktreeConfig" -#: builtin/sparse-checkout.c:384 +#: builtin/sparse-checkout.c:411 +msgid "failed to modify sparse-index config" +msgstr "无法修改 sparse-index 配置" + +#: builtin/sparse-checkout.c:422 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" -#: builtin/sparse-checkout.c:404 +#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729 +#: builtin/sparse-checkout.c:778 msgid "initialize the sparse-checkout in cone mode" -msgstr "初始化稀疏检出为 cone 模式" +msgstr "初始化稀疏检出为锥形模式" -#: builtin/sparse-checkout.c:406 +#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731 +#: builtin/sparse-checkout.c:780 msgid "toggle the use of a sparse index" msgstr "切换稀疏索引的使用" -#: builtin/sparse-checkout.c:434 -msgid "failed to modify sparse-index config" -msgstr "无法修改 sparse-index 配置" - -#: builtin/sparse-checkout.c:455 +#: builtin/sparse-checkout.c:476 #, c-format msgid "failed to open '%s'" msgstr "无法打开 '%s'" -#: builtin/sparse-checkout.c:507 +#: builtin/sparse-checkout.c:528 #, c-format msgid "could not normalize path %s" msgstr "无法规范化路径 %s" -#: builtin/sparse-checkout.c:519 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "git sparse-checkout (set|add) (--stdin | <模式>)" - -#: builtin/sparse-checkout.c:544 +#: builtin/sparse-checkout.c:557 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "无法为 C 语言风格的字符串 '%s' 去引号" -#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622 +#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640 msgid "unable to load existing sparse-checkout patterns" msgstr "无法加载现存的稀疏检出模式" -#: builtin/sparse-checkout.c:667 +#: builtin/sparse-checkout.c:616 +msgid "existing sparse-checkout patterns do not use cone mode" +msgstr "已有的稀疏检出模式不使用锥形模式" + +#: builtin/sparse-checkout.c:682 +msgid "git sparse-checkout add (--stdin | <patterns>)" +msgstr "git sparse-checkout add (--stdin | <模式>)" + +#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733 msgid "read patterns from standard in" msgstr "从标准输入读取模式" -#: builtin/sparse-checkout.c:682 -msgid "git sparse-checkout reapply" -msgstr "git sparse-checkout reapply" +#: builtin/sparse-checkout.c:699 +msgid "no sparse-checkout to add to" +msgstr "没有可以添加到的稀疏检出" + +#: builtin/sparse-checkout.c:712 +msgid "" +"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | " +"<patterns>)" +msgstr "" +"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | <模式" +">)" + +#: builtin/sparse-checkout.c:765 +msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" +msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" -#: builtin/sparse-checkout.c:701 +#: builtin/sparse-checkout.c:785 +msgid "must be in a sparse-checkout to reapply sparsity patterns" +msgstr "必须在稀疏检出中重应用稀疏模式" + +#: builtin/sparse-checkout.c:803 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:732 +#: builtin/sparse-checkout.c:845 msgid "error while refreshing working directory" msgstr "刷新工作目录时出错" @@ -22144,22 +22014,26 @@ msgstr "git stash branch <分支名> [<stash>]" #: builtin/stash.c:30 msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash [push [-p|--patch] [[-S|--staged] -k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n" " [--] [<路径规格>...]]" #: builtin/stash.c:34 msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [<消息>]" #: builtin/stash.c:55 @@ -22252,140 +22126,156 @@ msgstr "正在合并 %s 和 %s" msgid "Index was not unstashed." msgstr "索引未从贮藏中恢复。" -#: builtin/stash.c:575 +#: builtin/stash.c:576 msgid "could not restore untracked files from stash" msgstr "无法从贮藏条目中恢复未跟踪文件" -#: builtin/stash.c:607 builtin/stash.c:705 +#: builtin/stash.c:608 builtin/stash.c:706 msgid "attempt to recreate the index" msgstr "尝试重建索引" -#: builtin/stash.c:651 +#: builtin/stash.c:652 #, c-format msgid "Dropped %s (%s)" msgstr "丢弃了 %s（%s）" -#: builtin/stash.c:654 +#: builtin/stash.c:655 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s：无法丢弃贮藏条目" -#: builtin/stash.c:667 +#: builtin/stash.c:668 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' 不是一个贮藏引用" -#: builtin/stash.c:717 +#: builtin/stash.c:718 msgid "The stash entry is kept in case you need it again." msgstr "贮藏条目被保留以备您再次需要。" -#: builtin/stash.c:740 +#: builtin/stash.c:741 msgid "No branch name specified" msgstr "未指定分支名" -#: builtin/stash.c:824 +#: builtin/stash.c:825 msgid "failed to parse tree" msgstr "无法解析树" -#: builtin/stash.c:835 +#: builtin/stash.c:836 msgid "failed to unpack trees" msgstr "无法解包目录树" -#: builtin/stash.c:855 +#: builtin/stash.c:856 msgid "include untracked files in the stash" msgstr "在贮藏中包含未跟踪文件" -#: builtin/stash.c:858 +#: builtin/stash.c:859 msgid "only show untracked files in the stash" msgstr "仅显示贮藏中的未跟踪文件" -#: builtin/stash.c:945 builtin/stash.c:982 +#: builtin/stash.c:946 builtin/stash.c:983 #, c-format msgid "Cannot update %s with %s" msgstr "无法用 %2$s 更新 %1$s" -#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684 +#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750 msgid "stash message" msgstr "贮藏说明" -#: builtin/stash.c:973 +#: builtin/stash.c:974 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" 需要一个 <提交> 参数" -#: builtin/stash.c:1187 +#: builtin/stash.c:1159 +msgid "No staged changes" +msgstr "没有暂存的修改" + +#: builtin/stash.c:1220 msgid "No changes selected" msgstr "没有选择变更" -#: builtin/stash.c:1287 +#: builtin/stash.c:1320 msgid "You do not have the initial commit yet" msgstr "您尚未建立初始提交" -#: builtin/stash.c:1314 +#: builtin/stash.c:1347 msgid "Cannot save the current index state" msgstr "无法保存当前索引状态" -#: builtin/stash.c:1323 +#: builtin/stash.c:1356 msgid "Cannot save the untracked files" msgstr "无法保存未跟踪文件" -#: builtin/stash.c:1334 builtin/stash.c:1343 +#: builtin/stash.c:1367 builtin/stash.c:1386 msgid "Cannot save the current worktree state" msgstr "无法保存当前工作区状态" -#: builtin/stash.c:1371 +#: builtin/stash.c:1377 +msgid "Cannot save the current staged state" +msgstr "无法保存当前暂存状态" + +#: builtin/stash.c:1414 msgid "Cannot record working tree state" msgstr "不能记录工作区状态" -#: builtin/stash.c:1420 +#: builtin/stash.c:1463 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" -#: builtin/stash.c:1438 +#: builtin/stash.c:1474 +msgid "Can't use --staged and --include-untracked or --all at the same time" +msgstr "不能同时使用参数 --staged 和 --include-untracked 或 --all" + +#: builtin/stash.c:1492 msgid "Did you forget to 'git add'?" msgstr "您是否忘了执行 'git add'？" -#: builtin/stash.c:1453 +#: builtin/stash.c:1507 msgid "No local changes to save" msgstr "没有要保存的本地修改" -#: builtin/stash.c:1460 +#: builtin/stash.c:1514 msgid "Cannot initialize stash" msgstr "无法初始化贮藏" -#: builtin/stash.c:1475 +#: builtin/stash.c:1529 msgid "Cannot save the current status" msgstr "无法保存当前状态" -#: builtin/stash.c:1480 +#: builtin/stash.c:1534 #, c-format msgid "Saved working directory and index state %s" msgstr "保存工作目录和索引状态 %s" -#: builtin/stash.c:1571 +#: builtin/stash.c:1627 msgid "Cannot remove worktree changes" msgstr "无法删除工作区变更" -#: builtin/stash.c:1610 builtin/stash.c:1675 +#: builtin/stash.c:1667 builtin/stash.c:1739 msgid "keep index" msgstr "保持索引" -#: builtin/stash.c:1612 builtin/stash.c:1677 +#: builtin/stash.c:1669 builtin/stash.c:1741 +msgid "stash staged changes only" +msgstr "只贮藏暂存的变更" + +#: builtin/stash.c:1671 builtin/stash.c:1743 msgid "stash in patch mode" msgstr "以补丁模式贮藏" -#: builtin/stash.c:1613 builtin/stash.c:1678 +#: builtin/stash.c:1672 builtin/stash.c:1744 msgid "quiet mode" msgstr "静默模式" -#: builtin/stash.c:1615 builtin/stash.c:1680 +#: builtin/stash.c:1674 builtin/stash.c:1746 msgid "include untracked files in stash" msgstr "贮藏中包含未跟踪文件" -#: builtin/stash.c:1617 builtin/stash.c:1682 +#: builtin/stash.c:1676 builtin/stash.c:1748 msgid "include ignore files" msgstr "包含忽略的文件" -#: builtin/stash.c:1717 +#: builtin/stash.c:1783 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22409,7 +22299,7 @@ msgstr "跳过和移除所有的注释行" msgid "prepend comment character and space to each line" msgstr "为每一行的行首添加注释符和空格" -#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一个完整的引用名称，却得到 %s" @@ -22430,7 +22320,7 @@ msgid "" "authoritative upstream." msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" -#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859 msgid "alternative anchor for relative paths" msgstr "相对路径的替代锚记（anchor）" @@ -22522,9 +22412,9 @@ msgstr "无法解析子模组 '%s' 的 HEAD 引用" #: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423 #, c-format msgid "failed to recurse into submodule '%s'" -msgstr "递归子模组 '%s' 失败" +msgstr "无法递归进入子模组 '%s'" -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590 msgid "suppress submodule status output" msgstr "抑制子模组状态输出" @@ -22591,10 +22481,6 @@ msgstr "git submodule--helper summary [<选项>] [<提交>] [--] [<路径>]" msgid "could not fetch a revision for HEAD" msgstr "不能为 HEAD 获取一个版本" -#: builtin/submodule--helper.c:1316 -msgid "--cached and --files are mutually exclusive" -msgstr "--cached 和 --files 是互斥的" - #: builtin/submodule--helper.c:1373 #, c-format msgid "Synchronizing submodule url for '%s'\n" @@ -22623,61 +22509,61 @@ msgstr "抑制子模组 URL 同步的输出" msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1508 #, c-format msgid "" -"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " -"really want to remove it including all of its history)" +"Submodule work tree '%s' contains a .git directory. This will be replaced " +"with a .git file by using absorbgitdirs." msgstr "" -"子模组工作区 '%s' 包含一个 .git 目录（如果您确需删除它及其全部历史，使用 'rm " -"-rf' 命令）" +"子模组工作区 '%s' 包含一个 .git 目录。这将会用 absorbgitdirs 子命令替换成一" +"个 .git 文件。" -#: builtin/submodule--helper.c:1524 +#: builtin/submodule--helper.c:1525 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "子模组工作区 '%s' 包含本地修改；使用 '-f' 丢弃它们" -#: builtin/submodule--helper.c:1532 +#: builtin/submodule--helper.c:1533 #, c-format msgid "Cleared directory '%s'\n" msgstr "已清除目录 '%s'\n" -#: builtin/submodule--helper.c:1534 +#: builtin/submodule--helper.c:1535 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "无法移除子模组工作区 '%s'\n" -#: builtin/submodule--helper.c:1545 +#: builtin/submodule--helper.c:1546 #, c-format msgid "could not create empty submodule directory %s" msgstr "不能创建空的子模组目录 %s" -#: builtin/submodule--helper.c:1561 +#: builtin/submodule--helper.c:1562 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n" -#: builtin/submodule--helper.c:1590 +#: builtin/submodule--helper.c:1591 msgid "remove submodule working trees even if they contain local changes" msgstr "删除子模组工作区，即使包含本地修改" -#: builtin/submodule--helper.c:1591 +#: builtin/submodule--helper.c:1592 msgid "unregister all submodules" msgstr "将所有子模组取消注册" -#: builtin/submodule--helper.c:1596 +#: builtin/submodule--helper.c:1597 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]" -#: builtin/submodule--helper.c:1610 +#: builtin/submodule--helper.c:1611 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'" -#: builtin/submodule--helper.c:1655 +#: builtin/submodule--helper.c:1656 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22689,67 +22575,67 @@ msgstr "" "Git 不使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而非\n" "'--reference' 来克隆。" -#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703 +#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模组 '%s' 不能添加仓库备选：%s" -#: builtin/submodule--helper.c:1739 +#: builtin/submodule--helper.c:1740 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" -#: builtin/submodule--helper.c:1746 +#: builtin/submodule--helper.c:1747 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "不能识别 submodule.alternateLocation 的取值 '%s'" -#: builtin/submodule--helper.c:1771 +#: builtin/submodule--helper.c:1772 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "拒绝在另一个子模组的 git 目录中创建/使用 '%s'" -#: builtin/submodule--helper.c:1812 +#: builtin/submodule--helper.c:1813 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "无法克隆 '%s' 到子模组路径 '%s'" -#: builtin/submodule--helper.c:1817 +#: builtin/submodule--helper.c:1818 #, c-format msgid "directory not empty: '%s'" msgstr "目录非空：'%s'" -#: builtin/submodule--helper.c:1829 +#: builtin/submodule--helper.c:1830 #, c-format msgid "could not get submodule directory for '%s'" msgstr "无法得到 '%s' 的子模组目录" -#: builtin/submodule--helper.c:1861 +#: builtin/submodule--helper.c:1862 msgid "where the new submodule will be cloned to" msgstr "新的子模组将要克隆的路径" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1865 msgid "name of the new submodule" msgstr "新子模组的名称" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:1868 msgid "url where to clone the submodule from" msgstr "克隆子模组的 url 地址" -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264 +#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265 msgid "depth for shallow clones" msgstr "浅克隆的深度" -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525 -#: builtin/submodule--helper.c:3257 +#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526 +#: builtin/submodule--helper.c:3258 msgid "force cloning progress" msgstr "强制显示克隆进度" -#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527 +#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528 msgid "disallow cloning into non-empty directory" msgstr "不允许克隆到一个非空目录" -#: builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:1888 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22758,269 +22644,265 @@ msgstr "" "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " "[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>" -#: builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1925 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "子模组路径 '%2$s' 的更新模式 '%1$s' 无效" -#: builtin/submodule--helper.c:1928 +#: builtin/submodule--helper.c:1929 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "为子模组路径 '%2$s' 配置的更新模式 '%1$s' 无效" -#: builtin/submodule--helper.c:2043 +#: builtin/submodule--helper.c:2044 #, c-format msgid "Submodule path '%s' not initialized" msgstr "子模组路径 '%s' 尚未初始化" -#: builtin/submodule--helper.c:2047 +#: builtin/submodule--helper.c:2048 msgid "Maybe you want to use 'update --init'?" msgstr "也许您想要执行 'update --init'？" -#: builtin/submodule--helper.c:2077 +#: builtin/submodule--helper.c:2078 #, c-format msgid "Skipping unmerged submodule %s" msgstr "略过未合并的子模组 %s" -#: builtin/submodule--helper.c:2106 +#: builtin/submodule--helper.c:2107 #, c-format msgid "Skipping submodule '%s'" msgstr "略过子模组 '%s'" -#: builtin/submodule--helper.c:2256 +#: builtin/submodule--helper.c:2257 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "克隆 '%s' 失败。按计划重试" -#: builtin/submodule--helper.c:2267 +#: builtin/submodule--helper.c:2268 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "第二次尝试克隆 '%s' 失败，退出" -#: builtin/submodule--helper.c:2372 +#: builtin/submodule--helper.c:2373 #, c-format msgid "Unable to checkout '%s' in submodule path '%s'" msgstr "无法在子模组路径 '%2$s' 中检出 '%1$s'" -#: builtin/submodule--helper.c:2376 +#: builtin/submodule--helper.c:2377 #, c-format msgid "Unable to rebase '%s' in submodule path '%s'" msgstr "无法在子模组路径 '%2$s' 中变基 '%1$s'" -#: builtin/submodule--helper.c:2380 +#: builtin/submodule--helper.c:2381 #, c-format msgid "Unable to merge '%s' in submodule path '%s'" msgstr "无法在子模组路径 '%2$s' 中合并 '%1$s'" -#: builtin/submodule--helper.c:2384 +#: builtin/submodule--helper.c:2385 #, c-format msgid "Execution of '%s %s' failed in submodule path '%s'" msgstr "在子模组路径 '%3$s' 中执行 '%1$s %2$s' 失败" -#: builtin/submodule--helper.c:2408 +#: builtin/submodule--helper.c:2409 #, c-format msgid "Submodule path '%s': checked out '%s'\n" msgstr "子模组路径 '%s'：检出 '%s'\n" -#: builtin/submodule--helper.c:2412 +#: builtin/submodule--helper.c:2413 #, c-format msgid "Submodule path '%s': rebased into '%s'\n" msgstr "子模组路径 '%s'：变基至 '%s'\n" -#: builtin/submodule--helper.c:2416 +#: builtin/submodule--helper.c:2417 #, c-format msgid "Submodule path '%s': merged in '%s'\n" msgstr "子模组路径 '%s'：合并入 '%s'\n" -#: builtin/submodule--helper.c:2420 +#: builtin/submodule--helper.c:2421 #, c-format msgid "Submodule path '%s': '%s %s'\n" msgstr "子模组路径 '%s'：'%s %s'\n" -#: builtin/submodule--helper.c:2444 +#: builtin/submodule--helper.c:2445 #, c-format msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:" msgstr "无法在子模组路径 '%s' 中获取；尝试直接获取 %s：" -#: builtin/submodule--helper.c:2453 +#: builtin/submodule--helper.c:2454 #, c-format msgid "" "Fetched in submodule path '%s', but it did not contain %s. Direct fetching " "of that commit failed." msgstr "获取了子模组路径 '%s'，但是它没有包含 %s。直接获取该提交失败。" -#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574 -#: builtin/submodule--helper.c:2812 +#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575 +#: builtin/submodule--helper.c:2813 msgid "path into the working tree" msgstr "到工作区的路径" -#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579 +#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作区中的路径，递归嵌套子模组" -#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577 +#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578 msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:2517 +#: builtin/submodule--helper.c:2518 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "创建一个指定深度的浅克隆" -#: builtin/submodule--helper.c:2520 +#: builtin/submodule--helper.c:2521 msgid "parallel jobs" msgstr "并发任务" -#: builtin/submodule--helper.c:2522 +#: builtin/submodule--helper.c:2523 msgid "whether the initial clone should follow the shallow recommendation" msgstr "初始克隆是否应该遵守推荐的浅克隆选项" -#: builtin/submodule--helper.c:2523 +#: builtin/submodule--helper.c:2524 msgid "don't print cloning progress" msgstr "不要输出克隆进度" -#: builtin/submodule--helper.c:2534 +#: builtin/submodule--helper.c:2535 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]" -#: builtin/submodule--helper.c:2547 +#: builtin/submodule--helper.c:2548 msgid "bad value for update parameter" msgstr "update 参数取值错误" -#: builtin/submodule--helper.c:2565 +#: builtin/submodule--helper.c:2566 msgid "suppress output for update by rebase or merge" msgstr "抑制变基或合并更新的输出" -#: builtin/submodule--helper.c:2566 +#: builtin/submodule--helper.c:2567 msgid "force checkout updates" msgstr "强制检出更新" -#: builtin/submodule--helper.c:2568 +#: builtin/submodule--helper.c:2569 msgid "don't fetch new objects from the remote site" msgstr "不要从远程地址获取新对象" -#: builtin/submodule--helper.c:2570 +#: builtin/submodule--helper.c:2571 msgid "overrides update mode in case the repository is a fresh clone" msgstr "当仓库是新的克隆时，覆盖更新模式" -#: builtin/submodule--helper.c:2571 +#: builtin/submodule--helper.c:2572 msgid "depth for shallow fetch" msgstr "浅获取的深度" -#: builtin/submodule--helper.c:2581 +#: builtin/submodule--helper.c:2582 msgid "sha1" msgstr "sha1" -#: builtin/submodule--helper.c:2582 +#: builtin/submodule--helper.c:2583 msgid "SHA1 expected by superproject" msgstr "上层项目期待的 SHA1" -#: builtin/submodule--helper.c:2584 +#: builtin/submodule--helper.c:2585 msgid "subsha1" msgstr "subsha1" -#: builtin/submodule--helper.c:2585 +#: builtin/submodule--helper.c:2586 msgid "SHA1 of submodule's HEAD" msgstr "子模块头指针的 SHA1" -#: builtin/submodule--helper.c:2591 +#: builtin/submodule--helper.c:2592 msgid "git submodule--helper run-update-procedure [<options>] <path>" msgstr "git submodule--helper run-update-procedure [<选项>] <路径>" -#: builtin/submodule--helper.c:2662 +#: builtin/submodule--helper.c:2663 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上" -#: builtin/submodule--helper.c:2780 +#: builtin/submodule--helper.c:2781 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "无法获得子模组 '%s' 的仓库句柄" -#: builtin/submodule--helper.c:2813 +#: builtin/submodule--helper.c:2814 msgid "recurse into submodules" msgstr "在子模组中递归" -#: builtin/submodule--helper.c:2819 +#: builtin/submodule--helper.c:2820 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]" -#: builtin/submodule--helper.c:2875 +#: builtin/submodule--helper.c:2876 msgid "check if it is safe to write to the .gitmodules file" msgstr "检查写入 .gitmodules 文件是否安全" -#: builtin/submodule--helper.c:2878 +#: builtin/submodule--helper.c:2879 msgid "unset the config in the .gitmodules file" msgstr "取消 .gitmodules 文件中的设置" -#: builtin/submodule--helper.c:2883 +#: builtin/submodule--helper.c:2884 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <名称> [<值>]" -#: builtin/submodule--helper.c:2884 +#: builtin/submodule--helper.c:2885 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <名称>" -#: builtin/submodule--helper.c:2885 +#: builtin/submodule--helper.c:2886 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120 -#: builtin/submodule--helper.c:3276 +#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121 +#: builtin/submodule--helper.c:3277 msgid "please make sure that the .gitmodules file is in the working tree" msgstr "请确认 .gitmodules 文件在工作区里" -#: builtin/submodule--helper.c:2920 +#: builtin/submodule--helper.c:2921 msgid "suppress output for setting url of a submodule" msgstr "抑制设置子模组 URL 的输出" -#: builtin/submodule--helper.c:2924 +#: builtin/submodule--helper.c:2925 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>" -#: builtin/submodule--helper.c:2957 +#: builtin/submodule--helper.c:2958 msgid "set the default tracking branch to master" msgstr "设置默认跟踪分支为 master" -#: builtin/submodule--helper.c:2959 +#: builtin/submodule--helper.c:2960 msgid "set the default tracking branch" msgstr "设置默认跟踪分支" -#: builtin/submodule--helper.c:2963 +#: builtin/submodule--helper.c:2964 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>" -#: builtin/submodule--helper.c:2964 +#: builtin/submodule--helper.c:2965 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>" -#: builtin/submodule--helper.c:2971 +#: builtin/submodule--helper.c:2972 msgid "--branch or --default required" msgstr "需要 --branch 或 --default" -#: builtin/submodule--helper.c:2974 -msgid "--branch and --default are mutually exclusive" -msgstr "--branch 和 --default 是互斥的" - -#: builtin/submodule--helper.c:3037 +#: builtin/submodule--helper.c:3038 #, c-format msgid "Adding existing repo at '%s' to the index\n" msgstr "向索引中添加位于 '%s' 的已存在的仓库\n" -#: builtin/submodule--helper.c:3040 +#: builtin/submodule--helper.c:3041 #, c-format msgid "'%s' already exists and is not a valid git repo" msgstr "'%s' 已存在并且不是一个有效的 git 仓库" -#: builtin/submodule--helper.c:3053 +#: builtin/submodule--helper.c:3054 #, c-format msgid "A git directory for '%s' is found locally with remote(s):\n" msgstr "发现一个本地 git 目录 '%s' 及其远程仓库：\n" -#: builtin/submodule--helper.c:3060 +#: builtin/submodule--helper.c:3061 #, c-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23035,83 +22917,83 @@ msgstr "" "使用 '--force' 选项。如果本地 git 目录不是正确的仓库，或者如果您不确定这里\n" "的含义，使用 '--name' 选项指定另外的名称。" -#: builtin/submodule--helper.c:3072 +#: builtin/submodule--helper.c:3073 #, c-format msgid "Reactivating local git directory for submodule '%s'\n" msgstr "为子模组 '%s' 重新激活本地 git 目录\n" -#: builtin/submodule--helper.c:3109 +#: builtin/submodule--helper.c:3110 #, c-format msgid "unable to checkout submodule '%s'" msgstr "无法检出子模组 '%s'" -#: builtin/submodule--helper.c:3148 +#: builtin/submodule--helper.c:3149 #, c-format msgid "Failed to add submodule '%s'" msgstr "无法添加子模组 '%s'" -#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157 -#: builtin/submodule--helper.c:3165 +#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158 +#: builtin/submodule--helper.c:3166 #, c-format msgid "Failed to register submodule '%s'" msgstr "无法注册子模组 '%s'" -#: builtin/submodule--helper.c:3221 +#: builtin/submodule--helper.c:3222 #, c-format msgid "'%s' already exists in the index" msgstr "'%s' 已经存在于索引中" -#: builtin/submodule--helper.c:3224 +#: builtin/submodule--helper.c:3225 #, c-format msgid "'%s' already exists in the index and is not a submodule" msgstr "'%s' 已经存在于索引中且不是一个子模组" -#: builtin/submodule--helper.c:3253 +#: builtin/submodule--helper.c:3254 msgid "branch of repository to add as submodule" msgstr "要添加为子模组的仓库的分支" -#: builtin/submodule--helper.c:3254 +#: builtin/submodule--helper.c:3255 msgid "allow adding an otherwise ignored submodule path" msgstr "允许添加一个被忽略的子模组路径" -#: builtin/submodule--helper.c:3256 +#: builtin/submodule--helper.c:3257 msgid "print only error messages" msgstr "只打印错误消息" -#: builtin/submodule--helper.c:3260 +#: builtin/submodule--helper.c:3261 msgid "borrow the objects from reference repositories" msgstr "从引用仓库中借用对象" -#: builtin/submodule--helper.c:3262 +#: builtin/submodule--helper.c:3263 msgid "" "sets the submodule’s name to the given string instead of defaulting to its " "path" msgstr "将子模组的名称设置为给定的字符串，而非默认为其路径" -#: builtin/submodule--helper.c:3269 +#: builtin/submodule--helper.c:3270 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" msgstr "git submodule--helper add [<选项>] [--] <仓库> [<路径>]" -#: builtin/submodule--helper.c:3297 +#: builtin/submodule--helper.c:3298 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "只能在工作区的顶级目录中使用相对路径" -#: builtin/submodule--helper.c:3305 +#: builtin/submodule--helper.c:3306 #, c-format msgid "repo URL: '%s' must be absolute or begin with ./|../" msgstr "仓库 URL：'%s' 必须是绝对路径或以 ./|../ 起始" -#: builtin/submodule--helper.c:3340 +#: builtin/submodule--helper.c:3341 #, c-format msgid "'%s' is not a valid submodule name" msgstr "'%s' 不是一个有效的子模组名称" -#: builtin/submodule--helper.c:3404 git.c:449 git.c:723 +#: builtin/submodule--helper.c:3405 git.c:452 git.c:726 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支持 --super-prefix" -#: builtin/submodule--helper.c:3410 +#: builtin/submodule--helper.c:3411 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一个有效的 submodule--helper 子命令" @@ -23208,11 +23090,11 @@ msgstr "" " %s\n" "以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n" -#: builtin/tag.c:241 +#: builtin/tag.c:240 msgid "unable to sign the tag" msgstr "无法签署标签" -#: builtin/tag.c:259 +#: builtin/tag.c:258 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -23225,15 +23107,15 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:275 +#: builtin/tag.c:274 msgid "bad object type." msgstr "坏的对象类型。" -#: builtin/tag.c:326 +#: builtin/tag.c:325 msgid "no tag message?" msgstr "无标签说明？" -#: builtin/tag.c:333 +#: builtin/tag.c:332 #, c-format msgid "The tag message has been left in %s\n" msgstr "标签说明被保留在 %s\n" @@ -23314,45 +23196,22 @@ msgstr "只打印尚未合并的标签" msgid "print only tags of the object" msgstr "只打印指向该对象的标签" -#: builtin/tag.c:525 -msgid "--column and -n are incompatible" -msgstr "--column 和 -n 不兼容" - -#: builtin/tag.c:546 -msgid "-n option is only allowed in list mode" -msgstr "-n 选项只允许用在列表显示模式" - -#: builtin/tag.c:548 -msgid "--contains option is only allowed in list mode" -msgstr "--contains 选项只允许用在列表显示模式" - -#: builtin/tag.c:550 -msgid "--no-contains option is only allowed in list mode" -msgstr "--no-contains 选项只允许用在列表显示模式" - -#: builtin/tag.c:552 -msgid "--points-at option is only allowed in list mode" -msgstr "--points-at 选项只允许用在列表显示模式" - -#: builtin/tag.c:554 -msgid "--merged and --no-merged options are only allowed in list mode" -msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式" - -#: builtin/tag.c:568 -msgid "only one -F or -m option is allowed." -msgstr "只允许一个 -F 或 -m 选项。" +#: builtin/tag.c:558 +#, c-format +msgid "the '%s' option is only allowed in list mode" +msgstr "'%s' 选项只允许用在列表显示模式" -#: builtin/tag.c:593 +#: builtin/tag.c:597 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一个有效的标签名称。" -#: builtin/tag.c:598 +#: builtin/tag.c:602 #, c-format msgid "tag '%s' already exists" msgstr "标签 '%s' 已存在" -#: builtin/tag.c:629 +#: builtin/tag.c:633 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新标签 '%s'（曾为 %s）\n" @@ -23364,17 +23223,17 @@ msgstr "展开对象中" #: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" -msgstr "创建目录 %s 失败" +msgstr "无法创建目录 %s" #: builtin/update-index.c:106 #, c-format msgid "failed to delete file %s" -msgstr "删除文件 %s 失败" +msgstr "无法删除文件 %s" #: builtin/update-index.c:113 builtin/update-index.c:219 #, c-format msgid "failed to delete directory %s" -msgstr "删除目录 %s 失败" +msgstr "无法删除目录 %s" #: builtin/update-index.c:138 #, c-format @@ -23771,130 +23630,118 @@ msgstr "不能创建目录 '%s'" msgid "initializing" msgstr "初始化" -#: builtin/worktree.c:421 builtin/worktree.c:427 +#: builtin/worktree.c:420 builtin/worktree.c:426 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "准备工作区（新分支 '%s'）" -#: builtin/worktree.c:423 +#: builtin/worktree.c:422 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "准备工作区（重置分支 '%s'，之前为 %s）" -#: builtin/worktree.c:432 +#: builtin/worktree.c:431 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "准备工作区（检出 '%s'）" -#: builtin/worktree.c:438 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "准备工作区（分离头指针 %s）" -#: builtin/worktree.c:483 +#: builtin/worktree.c:482 msgid "checkout <branch> even if already checked out in other worktree" msgstr "检出 <分支>，即使已经被检出到其它工作区" -#: builtin/worktree.c:486 +#: builtin/worktree.c:485 msgid "create a new branch" msgstr "创建一个新分支" -#: builtin/worktree.c:488 +#: builtin/worktree.c:487 msgid "create or reset a branch" msgstr "创建或重置一个分支" -#: builtin/worktree.c:490 +#: builtin/worktree.c:489 msgid "populate the new working tree" msgstr "生成新的工作区" -#: builtin/worktree.c:491 +#: builtin/worktree.c:490 msgid "keep the new working tree locked" msgstr "锁定新工作区" -#: builtin/worktree.c:493 builtin/worktree.c:730 +#: builtin/worktree.c:492 builtin/worktree.c:729 msgid "reason for locking" msgstr "锁定原因" -#: builtin/worktree.c:496 +#: builtin/worktree.c:495 msgid "set up tracking mode (see git-branch(1))" msgstr "设置跟踪模式（参见 git-branch(1)）" -#: builtin/worktree.c:499 +#: builtin/worktree.c:498 msgid "try to match the new branch name with a remote-tracking branch" msgstr "尝试为新分支名匹配一个远程跟踪分支" -#: builtin/worktree.c:507 -msgid "-b, -B, and --detach are mutually exclusive" -msgstr "-b、-B 和 --detach 是互斥的" - -#: builtin/worktree.c:509 -msgid "--reason requires --lock" -msgstr "--reason 需要 --lock" - -#: builtin/worktree.c:513 +#: builtin/worktree.c:512 msgid "added with --lock" msgstr "由 --lock 添加" -#: builtin/worktree.c:575 +#: builtin/worktree.c:574 msgid "--[no-]track can only be used if a new branch is created" msgstr "只能在创建新分支时使用选项 --[no-]track " -#: builtin/worktree.c:692 +#: builtin/worktree.c:691 msgid "show extended annotations and reasons, if available" msgstr "显示扩展的注释和原因（如果有）" -#: builtin/worktree.c:694 +#: builtin/worktree.c:693 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "向早于 <时间> 的工作区添添加“可修剪”注释" -#: builtin/worktree.c:703 -msgid "--verbose and --porcelain are mutually exclusive" -msgstr "--verbose 和 --porcelain 互斥" - -#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849 -#: builtin/worktree.c:973 +#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 +#: builtin/worktree.c:972 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一个工作区" -#: builtin/worktree.c:744 builtin/worktree.c:777 +#: builtin/worktree.c:743 builtin/worktree.c:776 msgid "The main working tree cannot be locked or unlocked" msgstr "主工作区无法被加锁或解锁" -#: builtin/worktree.c:749 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被锁定，原因：%s" -#: builtin/worktree.c:751 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被锁定" -#: builtin/worktree.c:779 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被锁定" -#: builtin/worktree.c:820 +#: builtin/worktree.c:819 msgid "working trees containing submodules cannot be moved or removed" msgstr "不能移动或删除包含子模组的工作区" -#: builtin/worktree.c:828 +#: builtin/worktree.c:827 msgid "force move even if worktree is dirty or locked" msgstr "强制移动，即使工作区是脏的或已锁定" -#: builtin/worktree.c:851 builtin/worktree.c:975 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一个主工作区" -#: builtin/worktree.c:856 +#: builtin/worktree.c:855 #, c-format msgid "could not figure out destination name from '%s'" msgstr "无法从 '%s' 算出目标名称" -#: builtin/worktree.c:869 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23903,7 +23750,7 @@ msgstr "" "无法移动一个锁定的工作区，锁定原因：%s\n" "使用 'move -f -f' 覆盖或先解锁" -#: builtin/worktree.c:871 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23911,36 +23758,36 @@ msgstr "" "无法移动一个锁定的工作区，\n" "使用 'move -f -f' 覆盖或先解锁" -#: builtin/worktree.c:874 +#: builtin/worktree.c:873 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "验证失败，无法移动工作区：%s" -#: builtin/worktree.c:879 +#: builtin/worktree.c:878 #, c-format msgid "failed to move '%s' to '%s'" -msgstr "移动 '%s' 到 '%s' 失败" +msgstr "无法移动 '%s' 到 '%s'" -#: builtin/worktree.c:925 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s'" -msgstr "在 '%s' 中执行 'git status' 失败" +msgstr "无法在 '%s' 中执行 'git status'" -#: builtin/worktree.c:929 +#: builtin/worktree.c:928 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "'%s' 包含修改或未跟踪的文件，使用 --force 删除" -#: builtin/worktree.c:934 +#: builtin/worktree.c:933 #, c-format msgid "failed to run 'git status' on '%s', code %d" -msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d" +msgstr "无法在 '%s' 中执行 'git status'，退出码 %d" -#: builtin/worktree.c:957 +#: builtin/worktree.c:956 msgid "force removal even if worktree is dirty or locked" msgstr "强制删除，即使工作区是脏的或已锁定" -#: builtin/worktree.c:980 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23949,7 +23796,7 @@ msgstr "" "无法删除一个锁定的工作区，锁定原因：%s\n" "使用 'remove -f -f' 覆盖或先解锁" -#: builtin/worktree.c:982 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23957,17 +23804,17 @@ msgstr "" "无法删除一个锁定的工作区，\n" "使用 'remove -f -f' 覆盖或先解锁" -#: builtin/worktree.c:985 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "验证失败，无法删除工作区：%s" -#: builtin/worktree.c:1009 +#: builtin/worktree.c:1008 #, c-format msgid "repair: %s: %s" msgstr "修理：%s：%s" -#: builtin/worktree.c:1012 +#: builtin/worktree.c:1011 #, c-format msgid "error: %s: %s" msgstr "错误：%s：%s" @@ -24018,21 +23865,16 @@ msgstr "" "帮助。\n" "有关系统的概述，查看 'git help git'。" -#: git.c:188 +#: git.c:188 git.c:216 git.c:300 #, c-format -msgid "no directory given for --git-dir\n" -msgstr "没有为 --git-dir 提供目录\n" +msgid "no directory given for '%s' option\n" +msgstr "没有为 '%s' 选项提供目录\n" #: git.c:202 #, c-format msgid "no namespace given for --namespace\n" msgstr "没有为 --namespace 提供命名空间\n" -#: git.c:216 -#, c-format -msgid "no directory given for --work-tree\n" -msgstr "没有为 --work-tree 提供目录\n" - #: git.c:230 #, c-format msgid "no prefix given for --super-prefix\n" @@ -24048,11 +23890,6 @@ msgstr "应为 -c 提供一个配置字符串\n" msgid "no config key given for --config-env\n" msgstr "没有为 --config-env 提供配置名称\n" -#: git.c:300 -#, c-format -msgid "no directory given for -C\n" -msgstr "没有为 -C 提供目录\n" - #: git.c:326 #, c-format msgid "unknown option: %s\n" @@ -24082,29 +23919,29 @@ msgstr "%s 的空别名" msgid "recursive alias: %s" msgstr "递归的别名：%s" -#: git.c:476 +#: git.c:479 msgid "write failure on standard output" msgstr "在标准输出写入失败" -#: git.c:478 +#: git.c:481 msgid "unknown write failure on standard output" msgstr "到标准输出的未知写入错误" -#: git.c:480 +#: git.c:483 msgid "close failed on standard output" msgstr "标准输出关闭失败" -#: git.c:832 +#: git.c:835 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "检测到别名循环：'%s'的扩展未终止：%s" -#: git.c:882 +#: git.c:885 #, c-format msgid "cannot handle %s as a builtin" msgstr "不能作为内置命令处理 %s" -#: git.c:895 +#: git.c:898 #, c-format msgid "" "usage: %s\n" @@ -24113,33 +23950,25 @@ msgstr "" "用法：%s\n" "\n" -#: git.c:915 +#: git.c:918 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 git 命令\n" -#: git.c:927 +#: git.c:930 #, c-format msgid "failed to run command '%s': %s\n" -msgstr "运行命令 '%s' 失败：%s\n" +msgstr "无法运行命令 '%s'：%s\n" -#: http-fetch.c:118 +#: http-fetch.c:128 #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "--packfile 的参数必须是有效的哈希值（得到 '%s'）" -#: http-fetch.c:128 +#: http-fetch.c:138 msgid "not a git repository" msgstr "不是 git 仓库" -#: http-fetch.c:134 -msgid "--packfile requires --index-pack-args" -msgstr "--packfile 需要 --index-pack-args" - -#: http-fetch.c:143 -msgid "--index-pack-args can only be used with --packfile" -msgstr "--index-pack-args 只能和 --packfile 一起使用" - #: t/helper/test-fast-rebase.c:141 msgid "unhandled options" msgstr "未处理的选项" @@ -24417,6 +24246,175 @@ msgstr "remote-curl：尝试没有本地仓库下获取" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl：未知的来自 git 的命令 '%s'" +#: contrib/scalar/scalar.c:49 +msgid "need a working directory" +msgstr "需要一个工作目录" + +#: contrib/scalar/scalar.c:86 +msgid "could not find enlistment root" +msgstr "无法找到登记根" + +#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351 +#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579 +#, c-format +msgid "could not switch to '%s'" +msgstr "无法切换到 '%s'" + +#: contrib/scalar/scalar.c:180 +#, c-format +msgid "could not configure %s=%s" +msgstr "无法配置 %s=%s" + +#: contrib/scalar/scalar.c:198 +msgid "could not configure log.excludeDecoration" +msgstr "无法配置 log.excludeDecoration" + +#: contrib/scalar/scalar.c:219 +msgid "Scalar enlistments require a worktree" +msgstr "Scalar 登记需要一个工作树" + +#: contrib/scalar/scalar.c:311 +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "远程 HEAD 不是一个分支：'%.*s'" + +#: contrib/scalar/scalar.c:317 +msgid "failed to get default branch name from remote; using local default" +msgstr "无法从远程获取默认分支名称；使用本地默认值" + +#: contrib/scalar/scalar.c:330 +msgid "failed to get default branch name" +msgstr "无法获取默认分支名称" + +#: contrib/scalar/scalar.c:341 +msgid "failed to unregister repository" +msgstr "无法取消注册仓库" + +#: contrib/scalar/scalar.c:356 +msgid "failed to delete enlistment directory" +msgstr "无法删除登记目录" + +#: contrib/scalar/scalar.c:376 +msgid "branch to checkout after clone" +msgstr "克隆后要检出的分支" + +#: contrib/scalar/scalar.c:378 +msgid "when cloning, create full working directory" +msgstr "在克隆时，创建完整的工作目录" + +#: contrib/scalar/scalar.c:380 +msgid "only download metadata for the branch that will be checked out" +msgstr "只下载要检出的分支的元信息" + +#: contrib/scalar/scalar.c:385 +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]" + +#: contrib/scalar/scalar.c:410 +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "无法从 '%s' 猜测工作区名称" + +#: contrib/scalar/scalar.c:419 +#, c-format +msgid "directory '%s' exists already" +msgstr "目录 '%s' 已存在" + +#: contrib/scalar/scalar.c:446 +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "无法获取 '%s' 的默认分支" + +#: contrib/scalar/scalar.c:457 +#, c-format +msgid "could not configure remote in '%s'" +msgstr "无法在 '%s' 中配置远程" + +#: contrib/scalar/scalar.c:466 +#, c-format +msgid "could not configure '%s'" +msgstr "无法配置 '%s'" + +#: contrib/scalar/scalar.c:469 +msgid "partial clone failed; attempting full clone" +msgstr "部分克隆失败；尝试完整克隆" + +#: contrib/scalar/scalar.c:473 +msgid "could not configure for full clone" +msgstr "无法配置完整克隆" + +#: contrib/scalar/scalar.c:505 +msgid "`scalar list` does not take arguments" +msgstr "`scalar list` 不带参数" + +#: contrib/scalar/scalar.c:518 +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<登记>]" + +#: contrib/scalar/scalar.c:545 +msgid "reconfigure all registered enlistments" +msgstr "重新配置所有注册的登记" + +#: contrib/scalar/scalar.c:549 +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scalar reconfigure [--all | <登记>]" + +#: contrib/scalar/scalar.c:567 +msgid "--all or <enlistment>, but not both" +msgstr "--all 或者 <登记>，而不是两个一起" + +#: contrib/scalar/scalar.c:582 +#, c-format +msgid "git repository gone in '%s'" +msgstr "在 '%s' 的 git 仓库已消失" + +#: contrib/scalar/scalar.c:622 +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <任务> [<登记>]\n" +"任务：\n" + +#: contrib/scalar/scalar.c:640 +#, c-format +msgid "no such task: '%s'" +msgstr "没有此任务：'%s'" + +#: contrib/scalar/scalar.c:690 +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<登记>]" + +#: contrib/scalar/scalar.c:737 +msgid "scalar delete <enlistment>" +msgstr "scalar delete <登记>" + +#: contrib/scalar/scalar.c:752 +msgid "refusing to delete current working directory" +msgstr "拒绝删除当前工作目录" + +#: contrib/scalar/scalar.c:767 +msgid "include Git version" +msgstr "包括 Git 的版本" + +#: contrib/scalar/scalar.c:769 +msgid "include Git's build options" +msgstr "包括 Git 的构建选项" + +#: contrib/scalar/scalar.c:773 +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +#: contrib/scalar/scalar.c:821 +msgid "" +"scalar <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar <命令> [<选项>]\n" +"\n" +"命令：\n" + #: compat/compiler.h:26 msgid "no compiler information available\n" msgstr "编译器信息不可用\n" @@ -24441,36 +24439,36 @@ msgstr "到期时间" msgid "no-op (backward compatibility)" msgstr "空操作（向后兼容）" -#: parse-options.h:308 +#: parse-options.h:310 msgid "be more verbose" msgstr "更加详细" -#: parse-options.h:310 +#: parse-options.h:312 msgid "be more quiet" msgstr "更加安静" -#: parse-options.h:316 +#: parse-options.h:318 msgid "use <n> digits to display object names" msgstr "用 <n> 位数字显示对象名" -#: parse-options.h:335 +#: parse-options.h:337 msgid "how to strip spaces and #comments from message" msgstr "设置如何删除提交说明里的空格和#注释" -#: parse-options.h:336 +#: parse-options.h:338 msgid "read pathspec from file" msgstr "从文件读取路径表达式" -#: parse-options.h:337 +#: parse-options.h:339 msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "使用 --pathspec-from-file，路径表达式用空字符分隔" -#: ref-filter.h:101 +#: ref-filter.h:98 msgid "key" msgstr "key" -#: ref-filter.h:101 +#: ref-filter.h:98 msgid "field name to sort on" msgstr "排序的字段名" @@ -24539,17 +24537,17 @@ msgid "Show canonical names and email addresses of contacts" msgstr "显示联系人的规范名称和电子邮件" #: command-list.h:65 +msgid "Ensures that a reference name is well formed" +msgstr "确保引用名称格式正确" + +#: command-list.h:66 msgid "Switch branches or restore working tree files" msgstr "切换分支或恢复工作区文件" -#: command-list.h:66 +#: command-list.h:67 msgid "Copy files from the index to the working tree" msgstr "从索引拷贝文件到工作区" -#: command-list.h:67 -msgid "Ensures that a reference name is well formed" -msgstr "确保引用名称格式正确" - #: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "查找尚未应用到上游的提交" @@ -24743,413 +24741,413 @@ msgid "Add or parse structured information in commit messages" msgstr "添加或解析提交说明中的结构化信息" #: command-list.h:116 -msgid "The Git repository browser" -msgstr "Git 仓库浏览器" - -#: command-list.h:117 msgid "Show commit logs" msgstr "显示提交日志" -#: command-list.h:118 +#: command-list.h:117 msgid "Show information about files in the index and the working tree" msgstr "显示索引和工作区中文件的信息" -#: command-list.h:119 +#: command-list.h:118 msgid "List references in a remote repository" msgstr "显示一个远程仓库的引用" -#: command-list.h:120 +#: command-list.h:119 msgid "List the contents of a tree object" msgstr "显示一个树对象的内容" -#: command-list.h:121 +#: command-list.h:120 msgid "Extracts patch and authorship from a single e-mail message" msgstr "从单个电子邮件中提取补丁和作者身份" -#: command-list.h:122 +#: command-list.h:121 msgid "Simple UNIX mbox splitter program" msgstr "简单的 UNIX mbox 邮箱切分程序" -#: command-list.h:123 +#: command-list.h:122 msgid "Run tasks to optimize Git repository data" msgstr "运行任务以优化仓库数据" -#: command-list.h:124 +#: command-list.h:123 msgid "Join two or more development histories together" msgstr "合并两个或更多开发历史" -#: command-list.h:125 +#: command-list.h:124 msgid "Find as good common ancestors as possible for a merge" msgstr "为了合并查找尽可能好的公共祖先提交" -#: command-list.h:126 +#: command-list.h:125 msgid "Run a three-way file merge" msgstr "运行一个三路文件合并" -#: command-list.h:127 +#: command-list.h:126 msgid "Run a merge for files needing merging" msgstr "对于需要合并的文件执行合并" -#: command-list.h:128 +#: command-list.h:127 msgid "The standard helper program to use with git-merge-index" msgstr "与 git-merge-index 一起使用的标准向导程序" +#: command-list.h:128 +msgid "Show three-way merge without touching index" +msgstr "在不动索引的情况下显示三路合并" + #: command-list.h:129 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "运行合并冲突解决工具以解决合并冲突" #: command-list.h:130 -msgid "Show three-way merge without touching index" -msgstr "显示三路合并而不动索引" - -#: command-list.h:131 -msgid "Write and verify multi-pack-indexes" -msgstr "写入和校验多包索引" - -#: command-list.h:132 msgid "Creates a tag object with extra validation" msgstr "创建一个有额外验证的标签对象" -#: command-list.h:133 +#: command-list.h:131 msgid "Build a tree-object from ls-tree formatted text" msgstr "基于 ls-tree 的格式化文本创建一个树对象" -#: command-list.h:134 +#: command-list.h:132 +msgid "Write and verify multi-pack-indexes" +msgstr "写入和校验多包索引" + +#: command-list.h:133 msgid "Move or rename a file, a directory, or a symlink" msgstr "移动或重命名一个文件、目录或符号链接" # 查找给定版本的符号名称 -#: command-list.h:135 +#: command-list.h:134 msgid "Find symbolic names for given revs" msgstr "查找给定版本的符号名称" -#: command-list.h:136 +#: command-list.h:135 msgid "Add or inspect object notes" msgstr "添加或检查对象注释" -#: command-list.h:137 +#: command-list.h:136 msgid "Import from and submit to Perforce repositories" msgstr "导入和提交到 Perforce 仓库中" -#: command-list.h:138 +#: command-list.h:137 msgid "Create a packed archive of objects" msgstr "创建对象的存档包" -#: command-list.h:139 +#: command-list.h:138 msgid "Find redundant pack files" msgstr "查找冗余的包文件" -#: command-list.h:140 +#: command-list.h:139 msgid "Pack heads and tags for efficient repository access" msgstr "打包头和标签以实现高效的仓库访问" -#: command-list.h:141 +#: command-list.h:140 msgid "Compute unique ID for a patch" msgstr "计算一个补丁的唯一 ID" -#: command-list.h:142 +#: command-list.h:141 msgid "Prune all unreachable objects from the object database" msgstr "删除对象库中所有不可达对象" -#: command-list.h:143 +#: command-list.h:142 msgid "Remove extra objects that are already in pack files" msgstr "删除已经在包文件中的多余对象" -#: command-list.h:144 +#: command-list.h:143 msgid "Fetch from and integrate with another repository or a local branch" msgstr "获取并整合另外的仓库或一个本地分支" -#: command-list.h:145 +#: command-list.h:144 msgid "Update remote refs along with associated objects" msgstr "更新远程引用和相关的对象" -#: command-list.h:146 +#: command-list.h:145 msgid "Applies a quilt patchset onto the current branch" msgstr "将一个 quilt 补丁集应用到当前分支。" -#: command-list.h:147 +#: command-list.h:146 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "比较两个提交范围（如一个分支的两个版本）" -#: command-list.h:148 +#: command-list.h:147 msgid "Reads tree information into the index" msgstr "将树信息读取到索引" -#: command-list.h:149 +#: command-list.h:148 msgid "Reapply commits on top of another base tip" msgstr "在另一个分支上重新应用提交" -#: command-list.h:150 +#: command-list.h:149 msgid "Receive what is pushed into the repository" msgstr "接收推送到仓库中的对象" -#: command-list.h:151 +#: command-list.h:150 msgid "Manage reflog information" msgstr "管理 reflog 信息" -#: command-list.h:152 +#: command-list.h:151 msgid "Manage set of tracked repositories" msgstr "管理已跟踪仓库" -#: command-list.h:153 +#: command-list.h:152 msgid "Pack unpacked objects in a repository" msgstr "打包仓库中未打包对象" -#: command-list.h:154 +#: command-list.h:153 msgid "Create, list, delete refs to replace objects" msgstr "创建、列出、删除对象替换引用" -#: command-list.h:155 +#: command-list.h:154 msgid "Generates a summary of pending changes" msgstr "生成待定更改的摘要" -#: command-list.h:156 +#: command-list.h:155 msgid "Reuse recorded resolution of conflicted merges" msgstr "重用冲突合并的解决方案记录" -#: command-list.h:157 +#: command-list.h:156 msgid "Reset current HEAD to the specified state" msgstr "重置当前 HEAD 到指定状态" -#: command-list.h:158 +#: command-list.h:157 msgid "Restore working tree files" msgstr "恢复工作区文件" -#: command-list.h:159 -msgid "Revert some existing commits" -msgstr "回退一些现存提交" - -#: command-list.h:160 +#: command-list.h:158 msgid "Lists commit objects in reverse chronological order" msgstr "按时间顺序列出提交对象" -#: command-list.h:161 +#: command-list.h:159 msgid "Pick out and massage parameters" msgstr "选出并处理参数" -#: command-list.h:162 +#: command-list.h:160 +msgid "Revert some existing commits" +msgstr "回退一些现存提交" + +#: command-list.h:161 msgid "Remove files from the working tree and from the index" msgstr "从工作区和索引中删除文件" -#: command-list.h:163 +#: command-list.h:162 msgid "Send a collection of patches as emails" msgstr "通过电子邮件发送一组补丁" -#: command-list.h:164 +#: command-list.h:163 msgid "Push objects over Git protocol to another repository" msgstr "使用 Git 协议推送对象到另一个仓库" +#: command-list.h:164 +msgid "Git's i18n setup code for shell scripts" +msgstr "为 shell 脚本准备的 Git 国际化设置代码" + #: command-list.h:165 +msgid "Common Git shell script setup code" +msgstr "常用的 Git shell 脚本设置代码" + +#: command-list.h:166 msgid "Restricted login shell for Git-only SSH access" msgstr "只允许 Git SSH 访问的受限登录shell" -#: command-list.h:166 +#: command-list.h:167 msgid "Summarize 'git log' output" msgstr "'git log' 输出摘要" -#: command-list.h:167 +#: command-list.h:168 msgid "Show various types of objects" msgstr "显示各种类型的对象" -#: command-list.h:168 +#: command-list.h:169 msgid "Show branches and their commits" msgstr "显示分支和提交" -#: command-list.h:169 +#: command-list.h:170 msgid "Show packed archive index" msgstr "显示打包归档索引" -#: command-list.h:170 +#: command-list.h:171 msgid "List references in a local repository" msgstr "显示本地仓库中的引用" -#: command-list.h:171 -msgid "Git's i18n setup code for shell scripts" -msgstr "为 shell 脚本准备的 Git 国际化设置代码" - #: command-list.h:172 -msgid "Common Git shell script setup code" -msgstr "常用的 Git shell 脚本设置代码" - -#: command-list.h:173 msgid "Initialize and modify the sparse-checkout" msgstr "初始化及修改稀疏检出" +#: command-list.h:173 +msgid "Add file contents to the staging area" +msgstr "将文件内容添加到暂存区" + #: command-list.h:174 msgid "Stash the changes in a dirty working directory away" msgstr "贮藏脏工作区中的修改" #: command-list.h:175 -msgid "Add file contents to the staging area" -msgstr "将文件内容添加到索引" - -#: command-list.h:176 msgid "Show the working tree status" msgstr "显示工作区状态" -#: command-list.h:177 +#: command-list.h:176 msgid "Remove unnecessary whitespace" msgstr "删除不必要的空白字符" -#: command-list.h:178 +#: command-list.h:177 msgid "Initialize, update or inspect submodules" msgstr "初始化、更新或检查子模组" -#: command-list.h:179 +#: command-list.h:178 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Subersion 仓库和 Git 之间的双向操作" -#: command-list.h:180 +#: command-list.h:179 msgid "Switch branches" msgstr "切换分支" -#: command-list.h:181 +#: command-list.h:180 msgid "Read, modify and delete symbolic refs" msgstr "读取、修改和删除符号引用" -#: command-list.h:182 +#: command-list.h:181 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" -#: command-list.h:183 +#: command-list.h:182 msgid "Creates a temporary file with a blob's contents" msgstr "用 blob 数据对象的内容创建一个临时文件" -#: command-list.h:184 +#: command-list.h:183 msgid "Unpack objects from a packed archive" msgstr "从打包文件中解压缩对象" -#: command-list.h:185 +#: command-list.h:184 msgid "Register file contents in the working tree to the index" msgstr "将工作区的文件内容注册到索引" -#: command-list.h:186 +#: command-list.h:185 msgid "Update the object name stored in a ref safely" msgstr "安全地更新存储于引用中的对象名称" -#: command-list.h:187 +#: command-list.h:186 msgid "Update auxiliary info file to help dumb servers" msgstr "更新辅助信息文件以帮助哑协议服务" -#: command-list.h:188 +#: command-list.h:187 msgid "Send archive back to git-archive" msgstr "将存档发送回 git-archive" -#: command-list.h:189 +#: command-list.h:188 msgid "Send objects packed back to git-fetch-pack" msgstr "将对象压缩包发送回 git-fetch-pack" -#: command-list.h:190 +#: command-list.h:189 msgid "Show a Git logical variable" msgstr "显示一个Git逻辑变量" -#: command-list.h:191 +#: command-list.h:190 msgid "Check the GPG signature of commits" msgstr "检查 GPG 提交签名" -#: command-list.h:192 +#: command-list.h:191 msgid "Validate packed Git archive files" msgstr "校验打包的Git存仓文件" -#: command-list.h:193 +#: command-list.h:192 msgid "Check the GPG signature of tags" msgstr "检查标签的 GPG 签名" -#: command-list.h:194 -msgid "Git web interface (web frontend to Git repositories)" -msgstr "Git web 界面（Git 仓库的 web 前端）" - -#: command-list.h:195 +#: command-list.h:193 msgid "Show logs with difference each commit introduces" msgstr "显示每一个提交引入的差异日志" -#: command-list.h:196 +#: command-list.h:194 msgid "Manage multiple working trees" msgstr "管理多个工作区" -#: command-list.h:197 +#: command-list.h:195 msgid "Create a tree object from the current index" msgstr "从当前索引创建一个树对象" -#: command-list.h:198 +#: command-list.h:196 msgid "Defining attributes per path" msgstr "定义路径的属性" -#: command-list.h:199 +#: command-list.h:197 msgid "Git command-line interface and conventions" msgstr "Git 命令行界面和约定" -#: command-list.h:200 +#: command-list.h:198 msgid "A Git core tutorial for developers" msgstr "面向开发人员的 Git 核心教程" -#: command-list.h:201 +#: command-list.h:199 msgid "Providing usernames and passwords to Git" msgstr "为 Git 提供用户名和口令" -#: command-list.h:202 +#: command-list.h:200 msgid "Git for CVS users" msgstr "适合 CVS 用户的 Git 帮助" -#: command-list.h:203 +#: command-list.h:201 msgid "Tweaking diff output" msgstr "调整差异输出" -#: command-list.h:204 +#: command-list.h:202 msgid "A useful minimum set of commands for Everyday Git" msgstr "每一天 Git 的一组有用的最小命令集合" -#: command-list.h:205 +#: command-list.h:203 msgid "Frequently asked questions about using Git" msgstr "关于使用 Git 的常见问题" -#: command-list.h:206 +#: command-list.h:204 msgid "A Git Glossary" msgstr "Git 词汇表" -#: command-list.h:207 +#: command-list.h:205 msgid "Hooks used by Git" msgstr "Git 使用的钩子" -#: command-list.h:208 +#: command-list.h:206 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未跟踪文件" -#: command-list.h:209 +#: command-list.h:207 +msgid "The Git repository browser" +msgstr "Git 仓库浏览器" + +#: command-list.h:208 msgid "Map author/committer names and/or E-Mail addresses" msgstr "映射作者/提交者的名称和/或邮件地址" -#: command-list.h:210 +#: command-list.h:209 msgid "Defining submodule properties" msgstr "定义子模组属性" -#: command-list.h:211 +#: command-list.h:210 msgid "Git namespaces" msgstr "Git 名字空间" -#: command-list.h:212 +#: command-list.h:211 msgid "Helper programs to interact with remote repositories" msgstr "与远程仓库交互的助手程序" -#: command-list.h:213 +#: command-list.h:212 msgid "Git Repository Layout" msgstr "Git 仓库布局" -#: command-list.h:214 +#: command-list.h:213 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本范围" -#: command-list.h:215 +#: command-list.h:214 msgid "Mounting one repository inside another" msgstr "将一个仓库安装到另外一个仓库中" +#: command-list.h:215 +msgid "A tutorial introduction to Git" +msgstr "Git 入门教程" + #: command-list.h:216 msgid "A tutorial introduction to Git: part two" -msgstr "一个 Git 教程：第二部分" +msgstr "Git 入门教程：第二部分" #: command-list.h:217 -msgid "A tutorial introduction to Git" -msgstr "一个 Git 教程" +msgid "Git web interface (web frontend to Git repositories)" +msgstr "Git web 界面（Git 仓库的 web 前端）" #: command-list.h:218 msgid "An overview of recommended workflows with Git" @@ -25220,39 +25218,39 @@ msgstr "无法递归进子模组路径 '$displaypath'" msgid "usage: $dashless $USAGE" msgstr "用法：$dashless $USAGE" -#: git-sh-setup.sh:191 +#: git-sh-setup.sh:183 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "不能切换目录到 $cdup，工作区的顶级目录" -#: git-sh-setup.sh:200 git-sh-setup.sh:207 +#: git-sh-setup.sh:192 git-sh-setup.sh:199 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "致命错误：$program_name 不能在没有工作区的情况下使用" -#: git-sh-setup.sh:221 +#: git-sh-setup.sh:213 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "不能重写分支：您有未暂存的变更。" -#: git-sh-setup.sh:224 +#: git-sh-setup.sh:216 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "不能 $action：您有未暂存的变更。" -#: git-sh-setup.sh:235 +#: git-sh-setup.sh:227 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "不能 $action：您的索引中包含未提交的变更。" -#: git-sh-setup.sh:237 +#: git-sh-setup.sh:229 msgid "Additionally, your index contains uncommitted changes." msgstr "而且您的索引中包含未提交的变更。" -#: git-sh-setup.sh:357 +#: git-sh-setup.sh:349 msgid "You need to run this command from the toplevel of the working tree." msgstr "您需要在工作区的顶级目录中运行这个命令。" -#: git-sh-setup.sh:362 +#: git-sh-setup.sh:354 msgid "Unable to determine absolute path of git directory" msgstr "不能确定 git 目录的绝对路径" @@ -25304,7 +25302,7 @@ msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。" #: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for writing: %s" -msgstr "为写入打开块编辑文件失败：%s" +msgstr "无法为写入打开块编辑文件：%s" #: git-add--interactive.perl:1121 #, perl-format @@ -25324,7 +25322,7 @@ msgstr "" msgid "failed to open hunk edit file for reading: %s" msgstr "无法读取块编辑文件：%s" -#: git-add--interactive.perl:1251 +#: git-add--interactive.perl:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -25338,7 +25336,7 @@ msgstr "" "a - 暂存该块和本文件中后面的全部块\n" "d - 不暂存该块和本文件中后面的全部块" -#: git-add--interactive.perl:1257 +#: git-add--interactive.perl:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -25352,7 +25350,7 @@ msgstr "" "a - 贮藏该块和本文件中后面的全部块\n" "d - 不贮藏该块和本文件中后面的全部块" -#: git-add--interactive.perl:1263 +#: git-add--interactive.perl:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -25366,7 +25364,7 @@ msgstr "" "a - 不暂存该块和本文件中后面的全部块\n" "d - 不要不暂存该块和本文件中后面的全部块" -#: git-add--interactive.perl:1269 +#: git-add--interactive.perl:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -25380,7 +25378,7 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块" -#: git-add--interactive.perl:1275 git-add--interactive.perl:1293 +#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -25394,7 +25392,7 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块" -#: git-add--interactive.perl:1281 +#: git-add--interactive.perl:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -25408,7 +25406,7 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块" -#: git-add--interactive.perl:1287 +#: git-add--interactive.perl:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -25422,7 +25420,7 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块" -#: git-add--interactive.perl:1299 +#: git-add--interactive.perl:1301 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -25436,7 +25434,7 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块" -#: git-add--interactive.perl:1314 +#: git-add--interactive.perl:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -25458,90 +25456,90 @@ msgstr "" "e - 手动编辑当前块\n" "? - 显示帮助\n" -#: git-add--interactive.perl:1345 +#: git-add--interactive.perl:1347 msgid "The selected hunks do not apply to the index!\n" msgstr "选中的块不能应用到索引！\n" -#: git-add--interactive.perl:1360 +#: git-add--interactive.perl:1362 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "忽略未合入的：%s\n" -#: git-add--interactive.perl:1479 +#: git-add--interactive.perl:1481 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1480 +#: git-add--interactive.perl:1482 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1481 +#: git-add--interactive.perl:1483 #, perl-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1482 +#: git-add--interactive.perl:1484 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1599 +#: git-add--interactive.perl:1601 msgid "No other hunks to goto\n" msgstr "没有其它可供跳转的块\n" -#: git-add--interactive.perl:1617 +#: git-add--interactive.perl:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "无效数字：'%s'\n" -#: git-add--interactive.perl:1622 +#: git-add--interactive.perl:1624 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "对不起，只有 %d 个可用块。\n" msgstr[1] "对不起，只有 %d 个可用块。\n" -#: git-add--interactive.perl:1657 +#: git-add--interactive.perl:1659 msgid "No other hunks to search\n" msgstr "没有其它可供查找的块\n" -#: git-add--interactive.perl:1674 +#: git-add--interactive.perl:1676 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "错误的正则表达式 %s：%s\n" -#: git-add--interactive.perl:1684 +#: git-add--interactive.perl:1686 msgid "No hunk matches the given pattern\n" msgstr "没有和给定模式相匹配的块\n" -#: git-add--interactive.perl:1696 git-add--interactive.perl:1718 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "没有前一个块\n" -#: git-add--interactive.perl:1705 git-add--interactive.perl:1724 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "没有下一个块\n" -#: git-add--interactive.perl:1730 +#: git-add--interactive.perl:1732 msgid "Sorry, cannot split this hunk\n" msgstr "对不起，不能拆分这个块\n" -#: git-add--interactive.perl:1736 +#: git-add--interactive.perl:1738 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "拆分为 %d 块。\n" msgstr[1] "拆分为 %d 块。\n" -#: git-add--interactive.perl:1746 +#: git-add--interactive.perl:1748 msgid "Sorry, cannot edit this hunk\n" msgstr "对不起，不能编辑这个块\n" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1811 +#: git-add--interactive.perl:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -25558,56 +25556,56 @@ msgstr "" "diff - 显示 HEAD 和索引间差异\n" "add untracked - 添加未跟踪文件的内容至暂存列表\n" -#: git-add--interactive.perl:1828 git-add--interactive.perl:1840 -#: git-add--interactive.perl:1843 git-add--interactive.perl:1850 -#: git-add--interactive.perl:1853 git-add--interactive.perl:1860 -#: git-add--interactive.perl:1864 git-add--interactive.perl:1870 +#: git-add--interactive.perl:1830 git-add--interactive.perl:1842 +#: git-add--interactive.perl:1845 git-add--interactive.perl:1852 +#: git-add--interactive.perl:1855 git-add--interactive.perl:1862 +#: git-add--interactive.perl:1866 git-add--interactive.perl:1872 msgid "missing --" msgstr "缺失 --" -#: git-add--interactive.perl:1866 +#: git-add--interactive.perl:1868 #, perl-format msgid "unknown --patch mode: %s" msgstr "未知的 --patch 模式：%s" -#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 +#: git-add--interactive.perl:1874 git-add--interactive.perl:1880 #, perl-format msgid "invalid argument %s, expecting --" msgstr "无效的参数 %s，期望是 --" -#: git-send-email.perl:129 +#: git-send-email.perl:159 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "本地时间和 GMT 有不到一分钟间隔\n" -#: git-send-email.perl:136 git-send-email.perl:142 +#: git-send-email.perl:166 git-send-email.perl:172 msgid "local time offset greater than or equal to 24 hours\n" msgstr "本地时间偏移量大于等于 24 小时\n" -#: git-send-email.perl:214 +#: git-send-email.perl:244 #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "致命错误：命令 '%s' 已终止，退出代码为 %d" -#: git-send-email.perl:227 +#: git-send-email.perl:257 msgid "the editor exited uncleanly, aborting everything" msgstr "编辑器非正常退出，终止所有操作" -#: git-send-email.perl:316 +#: git-send-email.perl:346 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" -#: git-send-email.perl:321 +#: git-send-email.perl:351 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' 包含编辑的邮件。\n" -#: git-send-email.perl:450 +#: git-send-email.perl:484 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases 和其它选项不兼容\n" -#: git-send-email.perl:525 +#: git-send-email.perl:561 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -25617,47 +25615,47 @@ msgstr "" "git-send-email 通过 sendemail.* 选项进行设置，注意字母 'e'。\n" "设置 sendemail.forbidSendmailVariables 为 false 来禁用这项检查。\n" -#: git-send-email.perl:530 git-send-email.perl:746 +#: git-send-email.perl:566 git-send-email.perl:782 msgid "Cannot run git format-patch from outside a repository\n" msgstr "不能在仓库之外运行 git format-patch\n" -#: git-send-email.perl:533 +#: git-send-email.perl:569 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "`batch-size` 和 `relogin` 必须同时定义（通过命令行或者配置选项）\n" -#: git-send-email.perl:546 +#: git-send-email.perl:582 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "未知的 --suppress-cc 字段：'%s'\n" -#: git-send-email.perl:577 +#: git-send-email.perl:613 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "未知的 --confirm 设置：'%s'\n" -#: git-send-email.perl:617 +#: git-send-email.perl:653 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "警告：不支持带引号的 sendmail 别名：%s\n" -#: git-send-email.perl:619 +#: git-send-email.perl:655 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "警告：不支持 `:include:`：%s\n" -#: git-send-email.perl:621 +#: git-send-email.perl:657 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n" -#: git-send-email.perl:626 +#: git-send-email.perl:662 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "警告：不能识别的 sendmail 行：%s\n" -#: git-send-email.perl:711 +#: git-send-email.perl:747 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25672,12 +25670,12 @@ msgstr "" " * 如果含义为一个文件，使用 \"./%s\"，或者\n" " * 如果含义为一个范围，使用 --format-patch 选项。\n" -#: git-send-email.perl:732 +#: git-send-email.perl:768 #, perl-format msgid "Failed to opendir %s: %s" msgstr "无法打开目录 %s: %s" -#: git-send-email.perl:767 +#: git-send-email.perl:803 msgid "" "\n" "No patch files specified!\n" @@ -25687,17 +25685,17 @@ msgstr "" "未指定补丁文件！\n" "\n" -#: git-send-email.perl:780 +#: git-send-email.perl:816 #, perl-format msgid "No subject line in %s?" msgstr "在 %s 中没有标题行？" -#: git-send-email.perl:791 +#: git-send-email.perl:827 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "为写入打开 %s 失败: %s" -#: git-send-email.perl:802 +#: git-send-email.perl:838 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -25710,37 +25708,37 @@ msgstr "" "\n" "如果您不想发送摘要，清除内容。\n" -#: git-send-email.perl:826 +#: git-send-email.perl:862 #, perl-format msgid "Failed to open %s: %s" msgstr "无法打开 %s: %s" -#: git-send-email.perl:843 +#: git-send-email.perl:879 #, perl-format msgid "Failed to open %s.final: %s" msgstr "无法打开 %s.final: %s" -#: git-send-email.perl:886 +#: git-send-email.perl:922 msgid "Summary email is empty, skipping it\n" msgstr "摘要邮件为空，跳过\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:935 +#: git-send-email.perl:971 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "您确认要使用 <%s> [y/N]？" -#: git-send-email.perl:990 +#: git-send-email.perl:1026 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "如下文件含 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n" -#: git-send-email.perl:995 +#: git-send-email.perl:1031 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？" -#: git-send-email.perl:1003 +#: git-send-email.perl:1039 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -25752,20 +25750,20 @@ msgstr "" "\t%s\n" "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n" -#: git-send-email.perl:1022 +#: git-send-email.perl:1058 msgid "To whom should the emails be sent (if anyone)?" msgstr "邮件将要发送给谁？" -#: git-send-email.perl:1040 +#: git-send-email.perl:1076 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "致命错误：别名 '%s' 扩展为它自己\n" -#: git-send-email.perl:1052 +#: git-send-email.perl:1088 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ？" -#: git-send-email.perl:1114 git-send-email.perl:1122 +#: git-send-email.perl:1150 git-send-email.perl:1158 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n" @@ -25773,16 +25771,16 @@ msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1126 +#: git-send-email.perl:1162 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)：" -#: git-send-email.perl:1446 +#: git-send-email.perl:1482 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA 路径 \"%s\" 不存在" -#: git-send-email.perl:1529 +#: git-send-email.perl:1565 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25807,112 +25805,112 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1544 +#: git-send-email.perl:1580 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "发送这封邮件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): " -#: git-send-email.perl:1547 +#: git-send-email.perl:1583 msgid "Send this email reply required" msgstr "发送要求的邮件回复" -#: git-send-email.perl:1581 +#: git-send-email.perl:1617 msgid "The required SMTP server is not properly defined." msgstr "要求的 SMTP 服务器未被正确定义。" -#: git-send-email.perl:1628 +#: git-send-email.perl:1664 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "服务器不支持 STARTTLS！%s" -#: git-send-email.perl:1633 git-send-email.perl:1637 +#: git-send-email.perl:1669 git-send-email.perl:1673 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS 失败！%s" -#: git-send-email.perl:1646 +#: git-send-email.perl:1682 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" -#: git-send-email.perl:1664 +#: git-send-email.perl:1700 #, perl-format msgid "Failed to send %s\n" msgstr "无法发送 %s\n" -#: git-send-email.perl:1667 +#: git-send-email.perl:1703 #, perl-format msgid "Dry-Sent %s\n" msgstr "演习发送 %s\n" -#: git-send-email.perl:1667 +#: git-send-email.perl:1703 #, perl-format msgid "Sent %s\n" msgstr "正发送 %s\n" -#: git-send-email.perl:1669 +#: git-send-email.perl:1705 msgid "Dry-OK. Log says:\n" msgstr "演习成功。日志说：\n" -#: git-send-email.perl:1669 +#: git-send-email.perl:1705 msgid "OK. Log says:\n" msgstr "OK。日志说：\n" -#: git-send-email.perl:1688 +#: git-send-email.perl:1724 msgid "Result: " msgstr "结果：" -#: git-send-email.perl:1691 +#: git-send-email.perl:1727 msgid "Result: OK\n" msgstr "结果：OK\n" -#: git-send-email.perl:1708 +#: git-send-email.perl:1744 #, perl-format msgid "can't open file %s" msgstr "无法打开文件 %s" -#: git-send-email.perl:1756 git-send-email.perl:1776 +#: git-send-email.perl:1792 git-send-email.perl:1812 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) 添加 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1762 +#: git-send-email.perl:1798 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) 添加 to：%s 自行 '%s'\n" -#: git-send-email.perl:1819 +#: git-send-email.perl:1855 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1854 +#: git-send-email.perl:1890 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) 添加 cc: %s 自行 '%s'\n" -#: git-send-email.perl:1973 +#: git-send-email.perl:2009 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) 不能执行 '%s'" -#: git-send-email.perl:1980 +#: git-send-email.perl:2016 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) 添加 %s: %s 自：'%s'\n" -#: git-send-email.perl:1984 +#: git-send-email.perl:2020 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) 无法关闭管道至 '%s'" -#: git-send-email.perl:2014 +#: git-send-email.perl:2050 msgid "cannot send message as 7bit" msgstr "不能以 7bit 形式发送信息" -#: git-send-email.perl:2022 +#: git-send-email.perl:2058 msgid "invalid transfer encoding" msgstr "无效的传送编码" -#: git-send-email.perl:2059 +#: git-send-email.perl:2095 #, perl-format msgid "" "fatal: %s: rejected by sendemail-validate hook\n" @@ -25923,12 +25921,12 @@ msgstr "" "%s\n" "警告：补丁未能发送\n" -#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132 +#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168 #, perl-format msgid "unable to open %s: %s\n" msgstr "不能打开 %s：%s\n" -#: git-send-email.perl:2072 +#: git-send-email.perl:2108 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -25937,547 +25935,13 @@ msgstr "" "致命错误：%s:%d 超过 998 字符\n" "警告：补丁未能发送\n" -#: git-send-email.perl:2090 +#: git-send-email.perl:2126 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "略过 %s 含备份后缀 '%s'。\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:2094 +#: git-send-email.perl:2130 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要发送 %s？[y|N]：" - -#, c-format -#~ msgid "" -#~ "The following pathspecs didn't match any eligible path, but they do match " -#~ "index\n" -#~ "entries outside the current sparse checkout:\n" -#~ msgstr "" -#~ "以下路径规格不匹配任何适合的路径，但它们和当前稀疏检出之外的索引条目匹" -#~ "配：\n" - -#~ msgid "" -#~ "Disable or modify the sparsity rules if you intend to update such entries." -#~ msgstr "如果您打算更新此类条目，请禁用或修改稀疏规则。" - -#, c-format -#~ msgid "could not set GIT_DIR to '%s'" -#~ msgstr "不能设置 GIT_DIR 为 '%s'" - -#, c-format -#~ msgid "unable to unpack %s header with --allow-unknown-type" -#~ msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息" - -#, c-format -#~ msgid "unable to parse %s header with --allow-unknown-type" -#~ msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" - -#~ msgid "open /dev/null failed" -#~ msgstr "不能打开 /dev/null" - -#~ msgid "" -#~ "after resolving the conflicts, mark the corrected paths\n" -#~ "with 'git add <paths>' or 'git rm <paths>'\n" -#~ "and commit the result with 'git commit'" -#~ msgstr "" -#~ "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" -#~ "对修正后的文件做标记，然后用 'git commit' 提交" - -#~ msgid "open /dev/null or dup failed" -#~ msgstr "不能打开或者复制 /dev/null" - -#~ msgid "attempting to use sparse-index without cone mode" -#~ msgstr "尝试在没有 cone 模式下使用稀疏索引" - -#~ msgid "unable to update cache-tree, staying full" -#~ msgstr "不能更新缓存树，保持完整" - -#, c-format -#~ msgid "Could not open '%s' for writing." -#~ msgstr "无法为写入打开 '%s'。" - -#, c-format -#~ msgid "could not create archive file '%s'" -#~ msgstr "不能创建归档文件 '%s'" - -#~ msgid "" -#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" -#~ msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]" - -#~ msgid "--bisect-next-check requires 2 or 3 arguments" -#~ msgstr "--bisect-next-check 需要 2 或 3 个参数" - -#, c-format -#~ msgid "couldn't create a new file at '%s'" -#~ msgstr "不能在 '%s' 创建新文件" - -#, c-format -#~ msgid "git commit-tree: failed to open '%s'" -#~ msgstr "git commit-tree：无法打开 '%s'" - -#, c-format -#~ msgid "cannot open packfile '%s'" -#~ msgstr "无法打开包文件 '%s'" - -#~ msgid "cannot store pack file" -#~ msgstr "无法存储包文件" - -#~ msgid "cannot store index file" -#~ msgstr "无法存储索引文件" - -#~ msgid "exclude patterns are read from <file>" -#~ msgstr "从 <文件> 中读取排除模式" - -#, c-format -#~ msgid "Unknown option for merge-recursive: -X%s" -#~ msgstr "merge-recursive 的未知选项：-X%s" - -#, c-format -#~ msgid "unusable todo list: '%s'" -#~ msgstr "不可用的待办列表：'%s'" - -#~ msgid "git rebase--interactive [<options>]" -#~ msgstr "git rebase--interactive [<选项>]" - -#~ msgid "rebase merge commits" -#~ msgstr "对合并提交变基" - -#~ msgid "keep original branch points of cousins" -#~ msgstr "保持兄弟提交的原始分支点" - -#~ msgid "move commits that begin with squash!/fixup!" -#~ msgstr "移动以 squash!/fixup! 开头的提交" - -#~ msgid "sign commits" -#~ msgstr "签名提交" - -#~ msgid "continue rebase" -#~ msgstr "继续变基" - -#~ msgid "skip commit" -#~ msgstr "跳过提交" - -#~ msgid "edit the todo list" -#~ msgstr "变基待办列表" - -#~ msgid "show the current patch" -#~ msgstr "显示当前补丁" - -#~ msgid "shorten commit ids in the todo list" -#~ msgstr "缩短待办列表中的提交号" - -#~ msgid "expand commit ids in the todo list" -#~ msgstr "扩展待办列表中的提交号" - -#~ msgid "check the todo list" -#~ msgstr "检查待办列表" - -#~ msgid "rearrange fixup/squash lines" -#~ msgstr "重新排列 fixup/squash 行" - -#~ msgid "insert exec commands in todo list" -#~ msgstr "在待办列表中插入 exec 执行命令" - -#~ msgid "onto" -#~ msgstr "onto" - -#~ msgid "restrict-revision" -#~ msgstr "restrict-revision" - -#~ msgid "restrict revision" -#~ msgstr "限制版本" - -#~ msgid "squash-onto" -#~ msgstr "squash-onto" - -#~ msgid "squash onto" -#~ msgstr "squash onto" - -#~ msgid "the upstream commit" -#~ msgstr "上游提交" - -#~ msgid "head-name" -#~ msgstr "head-name" - -#~ msgid "head name" -#~ msgstr "head 名称" - -#~ msgid "rebase strategy" -#~ msgstr "变基策略" - -#~ msgid "strategy-opts" -#~ msgstr "strategy-opts" - -#~ msgid "strategy options" -#~ msgstr "策略选项" - -#~ msgid "switch-to" -#~ msgstr "切换到" - -#~ msgid "the branch or commit to checkout" -#~ msgstr "要检出的分支或提交" - -#~ msgid "onto-name" -#~ msgstr "onto-name" - -#~ msgid "onto name" -#~ msgstr "onto name" - -#~ msgid "cmd" -#~ msgstr "cmd" - -#~ msgid "the command to run" -#~ msgstr "要执行的命令" - -#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges" -#~ msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果" - -#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'" -#~ msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用" - -#~ msgid "" -#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" -#~ msgstr "" -#~ "错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用" - -#~ msgid "" -#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> " -#~ "--name <name>" -#~ msgstr "" -#~ "git submodule--helper add-clone [<选项>...] --url <URL> --path <路径> --" -#~ "name <名称>" - -#, c-format -#~ msgid "failed to create file %s" -#~ msgstr "创建文件 %s 失败" - -#~ msgid "exit immediately after initial ref advertisement" -#~ msgstr "在初始的引用广告后立即退出" - -#, c-format -#~ msgid "socket/pipe already in use: '%s'" -#~ msgstr "套接字/管道已在使用：'%s'" - -#, c-format -#~ msgid "could not start server on: '%s'" -#~ msgstr "不能启动服务于：'%s'" - -#~ msgid "could not spawn daemon in the background" -#~ msgstr "无法在后台生成守护进程" - -#~ msgid "waitpid failed" -#~ msgstr "waitpid 失败" - -#~ msgid "daemon not online yet" -#~ msgstr "守护进程尚未上线" - -#~ msgid "daemon failed to start" -#~ msgstr "守护进程无法启动" - -#~ msgid "waitpid is confused" -#~ msgstr "waitpid 迷惑了" - -#~ msgid "daemon has not shutdown yet" -#~ msgstr "守护进程尚未关闭" - -#~ msgid "Protocol restrictions not supported with cURL < 7.19.4" -#~ msgstr "不支持协议限制，因为 cURL < 7.19.4" - -#, sh-format -#~ msgid "running $command" -#~ msgstr "运行 $command" - -#, sh-format -#~ msgid "'$sm_path' does not have a commit checked out" -#~ msgstr "'$sm_path' 没有检出的提交" - -#, sh-format -#~ msgid "Submodule path '$displaypath': '$command $sha1'" -#~ msgstr "子模组 '$displaypath'：'$command $sha1'" - -#~ msgid "Applied autostash." -#~ msgstr "已应用 autostash。" - -#, sh-format -#~ msgid "Cannot store $stash_sha1" -#~ msgstr "不能存储 $stash_sha1" - -#~ msgid "" -#~ "Applying autostash resulted in conflicts.\n" -#~ "Your changes are safe in the stash.\n" -#~ "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" -#~ msgstr "" -#~ "应用 autostash 导致了冲突。\n" -#~ "您的修改安全地保存在贮藏区中。\n" -#~ "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" - -#, sh-format -#~ msgid "Rebasing ($new_count/$total)" -#~ msgstr "变基中（$new_count/$total）" - -#~ msgid "" -#~ "\n" -#~ "Commands:\n" -#~ "p, pick <commit> = use commit\n" -#~ "r, reword <commit> = use commit, but edit the commit message\n" -#~ "e, edit <commit> = use commit, but stop for amending\n" -#~ "s, squash <commit> = use commit, but meld into previous commit\n" -#~ "f, fixup <commit> = like \"squash\", but discard this commit's log " -#~ "message\n" -#~ "x, exec <commit> = run command (the rest of the line) using shell\n" -#~ "d, drop <commit> = remove commit\n" -#~ "l, label <label> = label current HEAD with a name\n" -#~ "t, reset <label> = reset HEAD to a label\n" -#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -#~ ". create a merge commit using the original merge commit's\n" -#~ ". message (or the oneline, if no original merge commit was\n" -#~ ". specified). Use -c <commit> to reword the commit message.\n" -#~ "\n" -#~ "These lines can be re-ordered; they are executed from top to bottom.\n" -#~ msgstr "" -#~ "\n" -#~ "命令:\n" -#~ "p, pick <提交> = 使用提交\n" -#~ "r, reword <提交> = 使用提交，但修改提交说明\n" -#~ "e, edit <提交> = 使用提交，但停下来修补\n" -#~ "s, squash <提交> = 使用提交，但挤压到前一个提交\n" -#~ "f, fixup <提交> = 类似于 \"squash\"，但丢弃提交说明日志\n" -#~ "x, exec <命令> = 使用 shell 运行命令（此行剩余部分）\n" -#~ "d, drop <提交> = 删除提交\n" -#~ "l, label <标签> = 为当前 HEAD 打上标签\n" -#~ "t, reset <标签> = 重置 HEAD 到该标签\n" -#~ "m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n" -#~ ". 创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n" -#~ ". 原始提交，使用注释部分的 oneline 作为提交说明）。使用\n" -#~ ". -c <提交> 可以编辑提交说明。\n" -#~ "\n" -#~ "可以对这些行重新排序，将从上至下执行。\n" - -#, sh-format -#~ msgid "" -#~ "You can amend the commit now, with\n" -#~ "\n" -#~ "\tgit commit --amend $gpg_sign_opt_quoted\n" -#~ "\n" -#~ "Once you are satisfied with your changes, run\n" -#~ "\n" -#~ "\tgit rebase --continue" -#~ msgstr "" -#~ "您现在可以修补这个提交，使用\n" -#~ "\n" -#~ "\tgit commit --amend $gpg_sign_opt_quoted\n" -#~ "\n" -#~ "当您对变更感到满意，执行\n" -#~ "\n" -#~ "\tgit rebase --continue" - -#, sh-format -#~ msgid "$sha1: not a commit that can be picked" -#~ msgstr "$sha1：不是一个可以被拣选的提交" - -#, sh-format -#~ msgid "Invalid commit name: $sha1" -#~ msgstr "无效的提交名：$sha1" - -#~ msgid "Cannot write current commit's replacement sha1" -#~ msgstr "不能写入当前提交的替代 sha1" - -#, sh-format -#~ msgid "Fast-forward to $sha1" -#~ msgstr "快进到 $sha1" - -#, sh-format -#~ msgid "Cannot fast-forward to $sha1" -#~ msgstr "不能快进到 $sha1" - -#, sh-format -#~ msgid "Cannot move HEAD to $first_parent" -#~ msgstr "不能移动 HEAD 到 $first_parent" - -#, sh-format -#~ msgid "Refusing to squash a merge: $sha1" -#~ msgstr "拒绝挤压一个合并：$sha1" - -#, sh-format -#~ msgid "Error redoing merge $sha1" -#~ msgstr "无法重做合并 $sha1" - -#, sh-format -#~ msgid "Could not pick $sha1" -#~ msgstr "不能拣选 $sha1" - -#, sh-format -#~ msgid "This is the commit message #${n}:" -#~ msgstr "这是提交说明 #${n}：" - -#, sh-format -#~ msgid "The commit message #${n} will be skipped:" -#~ msgstr "提交说明 #${n} 将被跳过：" - -#, sh-format -#~ msgid "This is a combination of $count commit." -#~ msgid_plural "This is a combination of $count commits." -#~ msgstr[0] "这是一个 $count 个提交的组合。" -#~ msgstr[1] "这是一个 $count 个提交的组合。" - -#, sh-format -#~ msgid "Cannot write $fixup_msg" -#~ msgstr "不能写入 $fixup_msg" - -#~ msgid "This is a combination of 2 commits." -#~ msgstr "这是一个 2 个提交的组合。" - -#, sh-format -#~ msgid "Could not apply $sha1... $rest" -#~ msgstr "不能应用 $sha1... $rest" - -#, sh-format -#~ msgid "" -#~ "Could not amend commit after successfully picking $sha1... $rest\n" -#~ "This is most likely due to an empty commit message, or the pre-commit " -#~ "hook\n" -#~ "failed. If the pre-commit hook failed, you may need to resolve the issue " -#~ "before\n" -#~ "you are able to reword the commit." -#~ msgstr "" -#~ "不能在成功拣选 $sha1... $rest 之后修补提交\n" -#~ "这通常是因为空的提交说明，或者 pre-commit 钩子执行失败。如果是 pre-" -#~ "commit\n" -#~ "钩子执行失败，你可能需要在重写提交说明前解决这个问题。" - -#, sh-format -#~ msgid "Stopped at $sha1_abbrev... $rest" -#~ msgstr "停止在 $sha1_abbrev... $rest" - -#, sh-format -#~ msgid "Cannot '$squash_style' without a previous commit" -#~ msgstr "没有父提交的情况下不能 '$squash_style'" - -#, sh-format -#~ msgid "Executing: $rest" -#~ msgstr "执行：$rest" - -#, sh-format -#~ msgid "Execution failed: $rest" -#~ msgstr "执行失败：$rest" - -#~ msgid "and made changes to the index and/or the working tree" -#~ msgstr "并且修改索引和/或工作区" - -#~ msgid "" -#~ "You can fix the problem, and then run\n" -#~ "\n" -#~ "\tgit rebase --continue" -#~ msgstr "" -#~ "您可以解决这个问题，然后运行\n" -#~ "\n" -#~ "\tgit rebase --continue" - -#, sh-format -#~ msgid "" -#~ "Execution succeeded: $rest\n" -#~ "but left changes to the index and/or the working tree\n" -#~ "Commit or stash your changes, and then run\n" -#~ "\n" -#~ "\tgit rebase --continue" -#~ msgstr "" -#~ "执行成功：$rest\n" -#~ "但是在索引和/或工作区中存在变更。提交或贮藏修改，然后运行\n" -#~ "\n" -#~ "\tgit rebase --continue" - -#, sh-format -#~ msgid "Unknown command: $command $sha1 $rest" -#~ msgstr "未知命令：$command $sha1 $rest" - -#~ msgid "Please fix this using 'git rebase --edit-todo'." -#~ msgstr "要修改请使用命令 'git rebase --edit-todo'。" - -#, sh-format -#~ msgid "Successfully rebased and updated $head_name." -#~ msgstr "成功变基并更新 $head_name。" - -#~ msgid "Could not remove CHERRY_PICK_HEAD" -#~ msgstr "不能删除 CHERRY_PICK_HEAD" - -#, sh-format -#~ msgid "" -#~ "You have staged changes in your working tree.\n" -#~ "If these changes are meant to be\n" -#~ "squashed into the previous commit, run:\n" -#~ "\n" -#~ " git commit --amend $gpg_sign_opt_quoted\n" -#~ "\n" -#~ "If they are meant to go into a new commit, run:\n" -#~ "\n" -#~ " git commit $gpg_sign_opt_quoted\n" -#~ "\n" -#~ "In both cases, once you're done, continue with:\n" -#~ "\n" -#~ " git rebase --continue\n" -#~ msgstr "" -#~ "您已暂存了工作区的修改。如果这些修改要挤压到前一个提交，执行：\n" -#~ "\n" -#~ " git commit --amend $gpg_sign_opt_quoted\n" -#~ "\n" -#~ "如果这些变更要形成一个新提交，执行：\n" -#~ "\n" -#~ " git commit $gpg_sign_opt_quoted\n" -#~ "\n" -#~ "无论哪种情况，当您完成提交，继续执行：\n" -#~ "\n" -#~ " git rebase --continue\n" - -#~ msgid "Error trying to find the author identity to amend commit" -#~ msgstr "在修补提交中查找作者信息时遇到错误" - -#~ msgid "" -#~ "You have uncommitted changes in your working tree. Please commit them\n" -#~ "first and then run 'git rebase --continue' again." -#~ msgstr "" -#~ "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" - -#~ msgid "Could not commit staged changes." -#~ msgstr "不能提交暂存的修改。" - -#~ msgid "Could not execute editor" -#~ msgstr "无法运行编辑器" - -#, sh-format -#~ msgid "Could not checkout $switch_to" -#~ msgstr "不能检出 $switch_to" - -#~ msgid "No HEAD?" -#~ msgstr "没有 HEAD？" - -#, sh-format -#~ msgid "Could not create temporary $state_dir" -#~ msgstr "不能创建临时 $state_dir" - -#~ msgid "Could not mark as interactive" -#~ msgstr "不能标记为交互式" - -#, sh-format -#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" -#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" -#~ msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）" -#~ msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）" - -#~ msgid "Note that empty commits are commented out" -#~ msgstr "注意空提交已被注释掉" - -#~ msgid "Could not init rewritten commits" -#~ msgstr "不能对重写提交进行初始化" - -#~ msgid "Cannot rebase: You have unstaged changes." -#~ msgstr "不能变基：您有未暂存的变更。" - -#~ msgid "Cannot pull with rebase: You have unstaged changes." -#~ msgstr "无法通过变基方式拉取：您有未暂存的变更。" - -#~ msgid "Cannot rebase: Your index contains uncommitted changes." -#~ msgstr "不能变基：您的索引中包含未提交的变更。" - -#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes." -#~ msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。" |