From db2558009cfcb71d411d63bb604f722e64af6698 Mon Sep 17 00:00:00 2001 From: Fangyi Zhou Date: Wed, 22 Jun 2022 10:28:36 +0100 Subject: [PATCH] l10n: zh_CN: v2.37.0 round 1 Reviewed-by: Jiang Xin Signed-off-by: Fangyi Zhou --- po/zh_CN.po | 36898 +++++++++++++++++++++++++------------------------- 1 file changed, 18580 insertions(+), 18318 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index f0551f2c68..7de9c72d56 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -144,8 +144,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2022-04-13 14:52+0800\n" -"PO-Revision-Date: 2022-04-14 15:39+0100\n" +"POT-Creation-Date: 2022-06-22 10:25+0100\n" +"PO-Revision-Date: 2022-06-14 20:52+0100\n" "Last-Translator: Fangyi Zhou \n" "Language-Team: GitHub \n" "Language: zh_CN\n" @@ -155,243 +155,233 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 40.0\n" -#: add-interactive.c:382 +#: add-interactive.c #, c-format msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505 -#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261 -#: builtin/rebase.c:1671 +#: add-interactive.c builtin/rebase.c reset.c sequencer.c msgid "could not read index" msgstr "不能读取索引" -#: add-interactive.c:590 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 +#: add-interactive.c git-add--interactive.perl msgid "binary" msgstr "二进制" -#: add-interactive.c:648 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 +#: add-interactive.c git-add--interactive.perl msgid "nothing" msgstr "无" -#: add-interactive.c:649 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 +#: add-interactive.c git-add--interactive.perl msgid "unchanged" msgstr "没有修改" -#: add-interactive.c:686 git-add--interactive.perl:641 +#: add-interactive.c git-add--interactive.perl msgid "Update" msgstr "更新" -#: add-interactive.c:703 add-interactive.c:891 +#: add-interactive.c #, c-format msgid "could not stage '%s'" msgstr "不能暂存 '%s'" -#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709 +#: add-interactive.c builtin/stash.c reset.c sequencer.c msgid "could not write index" msgstr "不能写入索引" -#: add-interactive.c:712 git-add--interactive.perl:626 +#: add-interactive.c git-add--interactive.perl #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "更新了 %d 个路径\n" msgstr[1] "更新了 %d 个路径\n" -#: add-interactive.c:730 git-add--interactive.perl:676 +#: add-interactive.c git-add--interactive.perl #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "说明：%s 现已成为未跟踪的。\n" -#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311 -#: builtin/reset.c:167 +#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: add-interactive.c:765 git-add--interactive.perl:653 +#: add-interactive.c git-add--interactive.perl msgid "Revert" msgstr "还原" -#: add-interactive.c:781 +#: add-interactive.c msgid "Could not parse HEAD^{tree}" msgstr "不能解析 HEAD^{tree}" -#: add-interactive.c:819 git-add--interactive.perl:629 +#: add-interactive.c git-add--interactive.perl #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "还原了 %d 个路径\n" msgstr[1] "还原了 %d 个路径\n" -#: add-interactive.c:870 git-add--interactive.perl:693 +#: add-interactive.c git-add--interactive.perl #, c-format msgid "No untracked files.\n" msgstr "没有未跟踪的文件。\n" -#: add-interactive.c:874 git-add--interactive.perl:687 +#: add-interactive.c git-add--interactive.perl msgid "Add untracked" msgstr "添加未跟踪的" -#: add-interactive.c:901 git-add--interactive.perl:623 +#: add-interactive.c git-add--interactive.perl #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "增加了 %d 个路径\n" msgstr[1] "增加了 %d 个路径\n" -#: add-interactive.c:931 +#: add-interactive.c #, c-format msgid "ignoring unmerged: %s" msgstr "忽略未合入的：%s" -#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371 +#: add-interactive.c add-patch.c git-add--interactive.perl #, c-format msgid "Only binary files changed.\n" msgstr "只有二进制文件被修改。\n" -#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373 +#: add-interactive.c add-patch.c git-add--interactive.perl #, c-format msgid "No changes.\n" msgstr "没有修改。\n" -#: add-interactive.c:949 git-add--interactive.perl:1381 +#: add-interactive.c git-add--interactive.perl msgid "Patch update" msgstr "补丁更新" -#: add-interactive.c:988 git-add--interactive.perl:1794 +#: add-interactive.c git-add--interactive.perl msgid "Review diff" msgstr "检视 diff" -#: add-interactive.c:1016 +#: add-interactive.c msgid "show paths with changes" msgstr "显示含变更的路径" -#: add-interactive.c:1018 +#: add-interactive.c msgid "add working tree state to the staged set of changes" msgstr "将工作区状态添加到暂存区修改集中" -#: add-interactive.c:1020 +#: add-interactive.c msgid "revert staged set of changes back to the HEAD version" msgstr "将暂存的修改集恢复为 HEAD 版本" -#: add-interactive.c:1022 +#: add-interactive.c msgid "pick hunks and update selectively" msgstr "挑选数据块并有选择地更新" -#: add-interactive.c:1024 +#: add-interactive.c msgid "view diff between HEAD and index" msgstr "显示 HEAD 和索引的差异" -#: add-interactive.c:1026 +#: add-interactive.c msgid "add contents of untracked files to the staged set of changes" msgstr "将未跟踪文件的内容添加到暂存区修改集中" -#: add-interactive.c:1034 add-interactive.c:1083 +#: add-interactive.c msgid "Prompt help:" msgstr "帮助：" -#: add-interactive.c:1036 +#: add-interactive.c msgid "select a single item" msgstr "选择一个条目" -#: add-interactive.c:1038 +#: add-interactive.c msgid "select a range of items" msgstr "选择一系列条目" -#: add-interactive.c:1040 +#: add-interactive.c msgid "select multiple ranges" msgstr "选择多个范围" -#: add-interactive.c:1042 add-interactive.c:1087 +#: add-interactive.c msgid "select item based on unique prefix" msgstr "基于唯一前缀选择条目" -#: add-interactive.c:1044 +#: add-interactive.c msgid "unselect specified items" msgstr "反选指定的条目" -#: add-interactive.c:1046 +#: add-interactive.c msgid "choose all items" msgstr "选择所有条目" -#: add-interactive.c:1048 +#: add-interactive.c msgid "(empty) finish selecting" msgstr "（空）结束选择" -#: add-interactive.c:1085 +#: add-interactive.c msgid "select a numbered item" msgstr "选择一个编号条目" -#: add-interactive.c:1089 +#: add-interactive.c msgid "(empty) select nothing" msgstr "（空）不选择任何内容" -#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898 +#: add-interactive.c builtin/clean.c git-add--interactive.perl msgid "*** Commands ***" msgstr "*** 命令 ***" -#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895 +#: add-interactive.c builtin/clean.c git-add--interactive.perl msgid "What now" msgstr "请选择" -#: add-interactive.c:1150 git-add--interactive.perl:213 +#: add-interactive.c git-add--interactive.perl msgid "staged" msgstr "缓存" -#: add-interactive.c:1150 git-add--interactive.perl:213 +#: add-interactive.c git-add--interactive.perl msgid "unstaged" msgstr "未缓存" -#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370 -#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132 -#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194 -#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872 -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709 -#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891 -#: git-add--interactive.perl:213 +#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c +#: builtin/fetch.c builtin/merge.c builtin/pull.c builtin/submodule--helper.c +#: git-add--interactive.perl msgid "path" msgstr "路径" -#: add-interactive.c:1157 +#: add-interactive.c msgid "could not refresh index" msgstr "不能刷新索引" -#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805 +#: add-interactive.c builtin/clean.c git-add--interactive.perl #, c-format msgid "Bye.\n" msgstr "再见。\n" -#: add-patch.c:34 git-add--interactive.perl:1433 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:35 git-add--interactive.perl:1434 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:36 git-add--interactive.perl:1435 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "暂存添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:37 git-add--interactive.perl:1436 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "暂存该块 [y,n,q,a,d%s,?]? " -#: add-patch.c:39 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "如果补丁能正确地应用，编辑块将立即标记为暂存。" -#: add-patch.c:42 +#: add-patch.c msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -405,33 +395,33 @@ msgstr "" "a - 暂存该块和本文件中后面的全部块\n" "d - 不暂存该块和本文件中后面的全部块\n" -#: add-patch.c:56 git-add--interactive.perl:1439 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:57 git-add--interactive.perl:1440 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:58 git-add--interactive.perl:1441 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:59 git-add--interactive.perl:1442 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "贮藏该块 [y,n,q,a,d%s,?]? " -#: add-patch.c:61 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." msgstr "如果补丁能正确地应用，编辑块将立即标记为贮藏。" -#: add-patch.c:64 +#: add-patch.c msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -445,33 +435,33 @@ msgstr "" "a - 贮藏该块和本文件中后面的全部块\n" "d - 不贮藏该块和本文件中后面的全部块\n" -#: add-patch.c:80 git-add--interactive.perl:1445 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:81 git-add--interactive.perl:1446 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:82 git-add--interactive.perl:1447 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:83 git-add--interactive.perl:1448 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " -#: add-patch.c:85 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." msgstr "如果补丁能正确地应用，编辑块将立即标记为未暂存。" -#: add-patch.c:88 +#: add-patch.c msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -485,33 +475,33 @@ msgstr "" "a - 取消暂存该块和本文件中后面的全部块\n" "d - 不要取消暂存该块和本文件中后面的全部块\n" -#: add-patch.c:103 git-add--interactive.perl:1451 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:104 git-add--interactive.perl:1452 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:105 git-add--interactive.perl:1453 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:106 git-add--interactive.perl:1454 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:108 add-patch.c:176 add-patch.c:221 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." msgstr "如果补丁能正确地应用，编辑块将立即标记为应用。" -#: add-patch.c:111 +#: add-patch.c msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -525,37 +515,33 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c:126 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:127 git-add--interactive.perl:1458 -#: git-add--interactive.perl:1476 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:128 git-add--interactive.perl:1459 -#: git-add--interactive.perl:1477 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:129 git-add--interactive.perl:1460 -#: git-add--interactive.perl:1478 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " -#: add-patch.c:131 add-patch.c:154 add-patch.c:199 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "如果补丁能正确地应用，编辑块将立即标记为丢弃。" -#: add-patch.c:134 add-patch.c:202 +#: add-patch.c msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -569,27 +555,27 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? " -#: add-patch.c:157 +#: add-patch.c msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -603,27 +589,27 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c:179 +#: add-patch.c msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -637,7 +623,7 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c:224 +#: add-patch.c msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -651,40 +637,40 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c:343 +#: add-patch.c #, c-format msgid "could not parse hunk header '%.*s'" msgstr "无法解析数据块头信息 '%.*s'" -#: add-patch.c:362 add-patch.c:366 +#: add-patch.c #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "无法解析彩色数据块头信息 '%.*s'" -#: add-patch.c:431 +#: add-patch.c msgid "could not parse diff" msgstr "不能解析差异信息" -#: add-patch.c:450 +#: add-patch.c msgid "could not parse colored diff" msgstr "不能解析彩色差异信息" -#: add-patch.c:464 +#: add-patch.c #, c-format msgid "failed to run '%s'" msgstr "无法运行 '%s'" -#: add-patch.c:618 +#: add-patch.c msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的输出不匹配" -#: add-patch.c:619 +#: add-patch.c msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。" -#: add-patch.c:797 +#: add-patch.c #, c-format msgid "" "expected context line #%d in\n" @@ -693,7 +679,7 @@ msgstr "" "预期上下文行 #%d 于\n" "%.*s" -#: add-patch.c:812 +#: add-patch.c #, c-format msgid "" "hunks do not overlap:\n" @@ -706,11 +692,11 @@ msgstr "" "\t不是结尾于：\n" "%.*s" -#: add-patch.c:1088 git-add--interactive.perl:1115 +#: add-patch.c git-add--interactive.perl msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" -#: add-patch.c:1092 +#: add-patch.c #, c-format msgid "" "---\n" @@ -723,8 +709,9 @@ msgstr "" "要删除 '%c' 开始的行，删除它们。\n" "以 %c 开始的行将被删除。\n" +#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1106 git-add--interactive.perl:1129 +#: add-patch.c git-add--interactive.perl msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -733,44 +720,46 @@ msgstr "" "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n" "此次编辑被终止，该块不会被修改。\n" -#: add-patch.c:1139 +#: add-patch.c msgid "could not parse hunk header" msgstr "无法解析数据块头信息" -#: add-patch.c:1184 +#: add-patch.c msgid "'git apply --cached' failed" msgstr "'git apply --cached' 失败" +#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. +#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input #. at this point. #. 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:1253 git-add--interactive.perl:1244 +#: add-patch.c git-add--interactive.perl msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " -#: add-patch.c:1296 +#: add-patch.c msgid "The selected hunks do not apply to the index!" msgstr "选中的块不能应用到索引！" -#: add-patch.c:1297 git-add--interactive.perl:1348 +#: add-patch.c git-add--interactive.perl msgid "Apply them to the worktree anyway? " msgstr "无论如何都要应用到工作区么？" -#: add-patch.c:1304 git-add--interactive.perl:1351 +#: add-patch.c git-add--interactive.perl msgid "Nothing was applied.\n" msgstr "未应用。\n" -#: add-patch.c:1361 +#: add-patch.c msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -792,73 +781,73 @@ msgstr "" "e - 手动编辑当前块\n" "? - 显示帮助\n" -#: add-patch.c:1523 add-patch.c:1533 +#: add-patch.c msgid "No previous hunk" msgstr "没有前一个块" -#: add-patch.c:1528 add-patch.c:1538 +#: add-patch.c msgid "No next hunk" msgstr "没有下一个块" -#: add-patch.c:1544 +#: add-patch.c msgid "No other hunks to goto" msgstr "没有其它可供跳转的块" -#: add-patch.c:1555 git-add--interactive.perl:1608 +#: add-patch.c git-add--interactive.perl msgid "go to which hunk ( to see more)? " msgstr "跳转到哪个块（<回车> 查看更多）？ " -#: add-patch.c:1556 git-add--interactive.perl:1610 +#: add-patch.c git-add--interactive.perl msgid "go to which hunk? " msgstr "跳转到哪个块？" -#: add-patch.c:1567 +#: add-patch.c #, c-format msgid "Invalid number: '%s'" msgstr "无效数字：'%s'" -#: add-patch.c:1572 +#: add-patch.c #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "对不起，只有 %d 个可用块。" msgstr[1] "对不起，只有 %d 个可用块。" -#: add-patch.c:1581 +#: add-patch.c msgid "No other hunks to search" msgstr "没有其它可供查找的块" -#: add-patch.c:1587 git-add--interactive.perl:1663 +#: add-patch.c git-add--interactive.perl msgid "search for regex? " msgstr "使用正则表达式搜索？" -#: add-patch.c:1602 +#: add-patch.c #, c-format msgid "Malformed search regexp %s: %s" msgstr "错误的正则表达式 %s：%s" -#: add-patch.c:1619 +#: add-patch.c msgid "No hunk matches the given pattern" msgstr "没有和给定模式相匹配的块" -#: add-patch.c:1626 +#: add-patch.c msgid "Sorry, cannot split this hunk" msgstr "对不起，不能拆分这个块" -#: add-patch.c:1630 +#: add-patch.c #, c-format msgid "Split into %d hunks." msgstr "拆分为 %d 块。" -#: add-patch.c:1634 +#: add-patch.c msgid "Sorry, cannot edit this hunk" msgstr "对不起，不能编辑这个块" -#: add-patch.c:1686 +#: add-patch.c msgid "'git apply' failed" msgstr "'git apply' 失败" -#: advice.c:81 +#: advice.c #, c-format msgid "" "\n" @@ -867,37 +856,37 @@ msgstr "" "\n" "使用 \"git config advice.%s false\" 来关闭此消息" -#: advice.c:97 +#: advice.c #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示：%.*s%s\n" -#: advice.c:181 +#: advice.c msgid "Cherry-picking is not possible because you have unmerged files." msgstr "无法拣选，因为您有未合并的文件。" -#: advice.c:183 +#: advice.c msgid "Committing is not possible because you have unmerged files." msgstr "无法提交，因为您有未合并的文件。" -#: advice.c:185 +#: advice.c msgid "Merging is not possible because you have unmerged files." msgstr "无法合并，因为您有未合并的文件。" -#: advice.c:187 +#: advice.c msgid "Pulling is not possible because you have unmerged files." msgstr "无法拉取，因为您有未合并的文件。" -#: advice.c:189 +#: advice.c msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退，因为您有未合并的文件。" -#: advice.c:191 +#: advice.c #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "无法 %s，因为您有未合并的文件。" -#: advice.c:199 +#: advice.c msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." @@ -905,27 +894,27 @@ msgstr "" "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n" "解决方案并提交。" -#: advice.c:207 +#: advice.c msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" -#: advice.c:212 builtin/merge.c:1388 +#: advice.c builtin/merge.c msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: advice.c:214 +#: advice.c msgid "Please, commit your changes before merging." msgstr "请在合并前先提交您的修改。" -#: advice.c:215 +#: advice.c msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" -#: advice.c:220 +#: advice.c msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: advice.c:230 +#: advice.c #, c-format msgid "" "The following paths and/or pathspecs matched paths that exist\n" @@ -935,7 +924,7 @@ msgstr "" "下面的路径和/或者路径规格匹配了您定义的稀疏检出以外的路径，\n" "所以不会在索引中更新：\n" -#: advice.c:237 +#: advice.c msgid "" "If you intend to update such entries, try one of the following:\n" "* Use the --sparse option.\n" @@ -945,7 +934,7 @@ msgstr "" "* 使用 --sparse 选项。\n" "* 禁用或者修改稀疏规则。" -#: advice.c:245 +#: advice.c #, c-format msgid "" "Note: switching to '%s'.\n" @@ -984,101 +973,87 @@ msgstr "" "通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n" "\n" -#: alias.c:50 +#: alias.c msgid "cmdline ends with \\" msgstr "命令行以 \\ 结尾" -#: alias.c:51 +#: alias.c msgid "unclosed quote" msgstr "未关闭的引号" -#: apply.c:70 +#: apply.c #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" -#: apply.c:86 +#: apply.c #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" -#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555 -#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332 -#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907 -#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509 -#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755 -#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663 -#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921 -#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200 -#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593 -#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245 -#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167 -#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560 -#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778 -#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409 -#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592 -#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 -#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227 -#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433 -#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711 -#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328 -#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573 -#: builtin/worktree.c:779 +#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout.c +#: builtin/clone.c builtin/commit.c builtin/describe.c builtin/diff-tree.c +#: builtin/difftool.c builtin/fast-export.c builtin/fetch.c builtin/help.c +#: builtin/index-pack.c builtin/init-db.c builtin/log.c builtin/ls-files.c +#: builtin/merge-base.c builtin/merge.c builtin/pack-objects.c builtin/push.c +#: builtin/rebase.c builtin/repack.c builtin/reset.c builtin/rev-list.c +#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c +#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c #, c-format msgid "options '%s' and '%s' cannot be used together" msgstr "选项 '%s' 和 '%s' 不能同时使用" -#: apply.c:141 apply.c:152 apply.c:155 +#: apply.c #, c-format msgid "'%s' outside a repository" msgstr "'%s' 在仓库之外" -#: apply.c:807 +#: apply.c #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" -#: apply.c:816 +#: apply.c #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" -#: apply.c:890 +#: apply.c #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" -#: apply.c:928 +#: apply.c #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s" -#: apply.c:934 +#: apply.c #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致" -#: apply.c:935 +#: apply.c #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" -#: apply.c:940 +#: apply.c #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null" -#: apply.c:969 +#: apply.c #, c-format msgid "invalid mode on line %d: %s" msgstr "第 %d 行包含无效文件模式：%s" -#: apply.c:1288 +#: apply.c #, c-format msgid "inconsistent header lines %d and %d" msgstr "不一致的文件头，%d 行和 %d 行" -#: apply.c:1378 +#: apply.c #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1089,92 +1064,92 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: apply.c:1391 +#: apply.c #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）" -#: apply.c:1487 +#: apply.c #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: apply.c:1556 +#: apply.c #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息：%.*s" -#: apply.c:1759 +#: apply.c msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: apply.c:1761 +#: apply.c msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: apply.c:1795 +#: apply.c #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" -#: apply.c:1832 +#: apply.c #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: apply.c:1834 +#: apply.c #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: apply.c:1837 +#: apply.c #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: apply.c:1985 +#: apply.c #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" -#: apply.c:2022 +#: apply.c #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: apply.c:2184 +#: apply.c #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: apply.c:2270 +#: apply.c #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: apply.c:2274 +#: apply.c #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: apply.c:2943 +#: apply.c #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: apply.c:3064 +#: apply.c #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）" msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）" -#: apply.c:3076 +#: apply.c #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: apply.c:3082 +#: apply.c #, c-format msgid "" "while searching for:\n" @@ -1183,645 +1158,650 @@ msgstr "" "当查询：\n" "%.*s" -#: apply.c:3104 +#: apply.c #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: apply.c:3112 +#: apply.c #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" -#: apply.c:3159 +#: apply.c #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" -#: apply.c:3170 +#: apply.c #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。" -#: apply.c:3178 +#: apply.c #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "补丁应用到空文件 '%s'，但其并非空文件" -#: apply.c:3196 +#: apply.c #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "无法读取 '%2$s' 必需的目标文件 %1$s" -#: apply.c:3209 +#: apply.c #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: apply.c:3216 +#: apply.c #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" -#: apply.c:3237 +#: apply.c #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: apply.c:3360 +#: apply.c #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" -#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214 -#: setup.c:310 +#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c #, c-format msgid "failed to read %s" msgstr "无法读取 %s" -#: apply.c:3420 +#: apply.c #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" -#: apply.c:3449 apply.c:3721 +#: apply.c #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: apply.c:3559 apply.c:3736 +#: apply.c #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: apply.c:3568 apply.c:3744 apply.c:3960 +#: apply.c #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: apply.c:3605 +#: apply.c msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "仓库缺乏执行三方合并所必需的数据对象。" -#: apply.c:3608 +#: apply.c #, c-format msgid "Performing three-way merge...\n" msgstr "执行三方合并...\n" -#: apply.c:3624 apply.c:3628 +#: apply.c #, c-format msgid "cannot read the current contents of '%s'" msgstr "无法读取 '%s' 的当前内容" -#: apply.c:3640 +#: apply.c #, c-format msgid "Failed to perform three-way merge...\n" msgstr "无法执行三方合并...\n" -#: apply.c:3654 +#: apply.c #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补丁到 '%s' 存在冲突。\n" -#: apply.c:3659 +#: apply.c #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功应用补丁到 '%s'。\n" -#: apply.c:3676 +#: apply.c #, c-format msgid "Falling back to direct application...\n" msgstr "回落到直接应用...\n" -#: apply.c:3688 +#: apply.c msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: apply.c:3761 +#: apply.c #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: apply.c:3763 +#: apply.c #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932 -#: read-cache.c:1399 +#: apply.c read-cache.c #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" -#: apply.c:3958 +#: apply.c #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: apply.c:3962 +#: apply.c #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: apply.c:3982 +#: apply.c #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: apply.c:3987 +#: apply.c #, 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:4007 +#: apply.c #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" -#: apply.c:4011 +#: apply.c #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: apply.c:4026 +#: apply.c #, c-format msgid "Checking patch %s..." msgstr "正在检查补丁 %s..." -#: apply.c:4118 +#: apply.c #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" -#: apply.c:4125 +#: apply.c #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式变更，但它不在当前 HEAD 中" -#: apply.c:4128 +#: apply.c #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效（%s）。" -#: apply.c:4137 +#: apply.c #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" -#: apply.c:4147 +#: apply.c #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" -#: apply.c:4285 +#: apply.c #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: apply.c:4319 +#: apply.c #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: apply.c:4325 +#: apply.c #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能对新建文件 '%s' 调用 stat" -#: apply.c:4333 +#: apply.c #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: apply.c:4339 apply.c:4484 +#: apply.c #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258 -#: builtin/gc.c:2293 +#: apply.c builtin/bisect--helper.c builtin/gc.c #, c-format msgid "failed to write to '%s'" msgstr "无法写入 '%s'" -#: apply.c:4386 +#: apply.c #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: apply.c:4456 +#: apply.c #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: apply.c:4554 +#: apply.c #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: apply.c:4562 +#: apply.c msgid "internal error" msgstr "内部错误" -#: apply.c:4565 +#: apply.c #, 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:4576 +#: apply.c #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: apply.c:4584 +#: apply.c #, c-format msgid "cannot open %s" msgstr "不能打开 %s" -#: apply.c:4598 +#: apply.c #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: apply.c:4602 +#: apply.c #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: apply.c:4731 +#: apply.c #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" -#: apply.c:4740 +#: apply.c msgid "No valid patches in input (allow with \"--allow-empty\")" msgstr "输入中没有合法的补丁 （使用 \"--allow-empty\" 来允许）" -#: apply.c:4761 +#: apply.c msgid "unable to read index file" msgstr "无法读取索引文件" -#: apply.c:4918 +#: apply.c #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s'：%s" -#: apply.c:4945 +#: apply.c #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: apply.c:4951 apply.c:4966 +#: apply.c #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字符误用。" msgstr[1] "%d 行新增了空白字符误用。" -#: apply.c:4959 +#: apply.c #, 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:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430 +#: apply.c builtin/add.c builtin/mv.c builtin/rm.c msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: apply.c:5003 +#: apply.c msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: apply.c:5006 +#: apply.c msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: apply.c:5008 builtin/am.c:2379 +#: apply.c builtin/am.c msgid "num" msgstr "数字" -#: apply.c:5009 +#: apply.c msgid "remove leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: apply.c:5012 +#: apply.c msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: apply.c:5014 +#: apply.c msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: apply.c:5018 +#: apply.c msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: apply.c:5020 +#: apply.c msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: apply.c:5022 +#: apply.c msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: apply.c:5024 +#: apply.c msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: apply.c:5026 +#: apply.c msgid "mark new files with `git add --intent-to-add`" msgstr "使用命令 `git add --intent-to-add` 标记新增文件" -#: apply.c:5028 +#: apply.c msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: apply.c:5030 +#: apply.c msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" -#: apply.c:5033 +#: apply.c msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: apply.c:5035 +#: apply.c msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "尝试三路合并，如果失败则回落至正常补丁模式" -#: apply.c:5037 +#: apply.c msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: apply.c:5040 builtin/checkout-index.c:230 +#: apply.c builtin/checkout-index.c msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: apply.c:5042 +#: apply.c msgid "ensure at least lines of context match" msgstr "确保至少匹配 行上下文" -#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358 -#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983 -#: builtin/rebase.c:1079 +#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c +#: builtin/rebase.c msgid "action" msgstr "动作" -#: apply.c:5044 +#: apply.c msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: apply.c:5047 apply.c:5050 +#: apply.c msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: apply.c:5053 +#: apply.c msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: apply.c:5055 +#: apply.c msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: apply.c:5057 +#: apply.c msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: apply.c:5059 +#: apply.c msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: apply.c:5062 +#: apply.c msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: apply.c:5065 +#: apply.c msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: apply.c:5067 builtin/am.c:2367 +#: apply.c builtin/am.c msgid "root" msgstr "根目录" -#: apply.c:5068 +#: apply.c msgid "prepend to all filenames" msgstr "为所有文件名前添加 <根目录>" -#: apply.c:5071 +#: apply.c msgid "don't return error for empty patches" msgstr "对空的补丁不返回错误" -#: archive-tar.c:125 archive-zip.c:346 +#: archive-tar.c archive-zip.c #, c-format msgid "cannot stream blob %s" msgstr "不能打开数据对象 %s" -#: archive-tar.c:265 archive-zip.c:359 +#: archive-tar.c archive-zip.c #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支持的文件模式：0%o (SHA1: %s)" -#: archive-tar.c:447 +#: archive-tar.c #, c-format msgid "unable to start '%s' filter" msgstr "无法启动 '%s' 过滤器" -#: archive-tar.c:450 +#: archive-tar.c msgid "unable to redirect descriptor" msgstr "无法重定向描述符" -#: archive-tar.c:457 +#: archive-tar.c #, c-format msgid "'%s' filter reported error" msgstr "'%s' 过滤器报告了错误" -#: archive-zip.c:319 +#: archive-zip.c #, c-format msgid "path is not valid UTF-8: %s" msgstr "路径不是有效的 UTF-8：%s" -#: archive-zip.c:323 +#: archive-zip.c #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路径太长（%d 字符，SHA1：%s）：%s" -#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366 +#: archive-zip.c builtin/pack-objects.c #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: archive-zip.c:604 +#: archive-zip.c #, c-format msgid "timestamp too large for this system: %" msgstr "对于本系统时间戳太大：%" -#: archive.c:14 +#: archive.c msgid "git archive [] [...]" msgstr "git archive [<选项>] <树对象> [<路径>...]" -#: archive.c:16 +#: archive.c msgid "" "git archive --remote [--exec ] [] [...]" msgstr "" "git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]" -#: archive.c:17 +#: archive.c msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" -#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238 -#: builtin/tag.c:579 +#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334 +#: archive.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" -#: archive.c:450 +#: archive.c #, c-format msgid "no such ref: %.*s" msgstr "无此引用：%.*s" -#: archive.c:456 +#: archive.c #, c-format msgid "not a valid object name: %s" msgstr "不是一个有效的对象名：%s" -#: archive.c:469 +#: archive.c #, c-format msgid "not a tree object: %s" msgstr "不是一个树对象：%s" -#: archive.c:481 +#: archive.c msgid "current working directory is untracked" msgstr "当前工作目录未被跟踪" -#: archive.c:522 +#: archive.c #, c-format msgid "File not found: %s" msgstr "文件未找到：%s" -#: archive.c:524 +#: archive.c #, c-format msgid "Not a regular file: %s" msgstr "不是一个常规文件：%s" -#: archive.c:551 +#: archive.c +#, c-format +msgid "unclosed quote: '%s'" +msgstr "未关闭的引号：'%s'" + +#: archive.c +#, c-format +msgid "missing colon: '%s'" +msgstr "缺失冒号：'%s'" + +#: archive.c +#, c-format +msgid "empty file name: '%s'" +msgstr "空的文件名：'%s'" + +#: archive.c msgid "fmt" msgstr "格式" -#: archive.c:551 +#: archive.c msgid "archive format" msgstr "归档格式" -#: archive.c:552 builtin/log.c:1809 +#: archive.c builtin/log.c msgid "prefix" msgstr "前缀" -#: archive.c:553 +#: archive.c msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885 -#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135 -#: builtin/fast-export.c:1181 builtin/fast-export.c:1183 -#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104 -#: 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:195 +#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c +#: builtin/fast-export.c builtin/grep.c builtin/hash-object.c +#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h msgid "file" msgstr "文件" -#: archive.c:555 +#: archive.c msgid "add untracked file to archive" msgstr "将未跟踪文件添加到归档" -#: archive.c:558 builtin/archive.c:88 +#: archive.c +msgid "path:content" +msgstr "路径:内容" + +#: archive.c builtin/archive.c msgid "write the archive to this file" msgstr "归档写入此文件" -#: archive.c:560 +#: archive.c msgid "read .gitattributes in working directory" msgstr "读取工作区中的 .gitattributes" -#: archive.c:561 +#: archive.c msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" -#: archive.c:563 +#: archive.c msgid "set compression level" msgstr "设置压缩级别" -#: archive.c:566 +#: archive.c msgid "list supported archive formats" msgstr "列出支持的归档格式" -#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125 -#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718 +#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c msgid "repo" msgstr "仓库" -#: archive.c:569 builtin/archive.c:90 +#: archive.c builtin/archive.c msgid "retrieve the archive from remote repository " msgstr "从远程仓库（<仓库>）提取归档文件" -#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708 -#: builtin/notes.c:496 +#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c msgid "command" msgstr "命令" -#: archive.c:571 builtin/archive.c:92 +#: archive.c builtin/archive.c msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" -#: archive.c:578 +#: archive.c msgid "Unexpected option --remote" msgstr "未知参数 --remote" -#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530 -#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099 -#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230 -#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442 -#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708 -#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144 -#: http-fetch.c:153 +#: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c +#: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c +#: builtin/rm.c builtin/stash.c builtin/worktree.c fetch-pack.c http-fetch.c +#: revision.c #, c-format msgid "the option '%s' requires '%s'" msgstr "选项 '%s' 需要 '%s'" -#: archive.c:582 +#: archive.c msgid "Unexpected option --output" msgstr "未知参数 --output" -#: archive.c:606 +#: archive.c #, c-format msgid "Unknown archive format '%s'" msgstr "未知归档格式 '%s'" -#: archive.c:615 +#: archive.c #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "参数不支持此格式 '%s'：-%d" -#: attr.c:202 +#: attr.c #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一个有效的属性名" -#: attr.c:363 +#: attr.c #, c-format msgid "%s not allowed: %s:%d" msgstr "不允许 %s：%s:%d" -#: attr.c:403 +#: attr.c msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1829,22 +1809,22 @@ msgstr "" "负值模版在 git attributes 中被忽略\n" "当字符串确实要以感叹号开始时，使用 '\\!'。" -#: bisect.c:488 +#: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "文件 '%s' 包含错误的引用格式：%s" -#: bisect.c:698 +#: bisect.c #, c-format msgid "We cannot bisect more!\n" msgstr "我们无法进行更多的二分查找！\n" -#: bisect.c:765 +#: bisect.c #, c-format msgid "Not a valid commit name %s" msgstr "不是一个有效的提交名 %s" -#: bisect.c:790 +#: bisect.c #, c-format msgid "" "The merge base %s is bad.\n" @@ -1853,7 +1833,7 @@ msgstr "" "合并基线 %s 是坏的。\n" "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" -#: bisect.c:795 +#: bisect.c #, c-format msgid "" "The merge base %s is new.\n" @@ -1862,7 +1842,7 @@ msgstr "" "合并基线 %s 是新的。\n" "介于 %s 和 [%s] 之间的属性已经被修改。\n" -#: bisect.c:800 +#: bisect.c #, c-format msgid "" "The merge base %s is %s.\n" @@ -1871,7 +1851,7 @@ msgstr "" "合并基线 %s 是 %s。\n" "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" -#: bisect.c:808 +#: bisect.c #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1882,7 +1862,7 @@ msgstr "" "这种情况下 git 二分查找无法正常工作。\n" "您可能弄错了 %s 和 %s 版本？\n" -#: bisect.c:821 +#: bisect.c #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1893,36 +1873,36 @@ msgstr "" "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" "我们仍旧继续。" -#: bisect.c:860 +#: bisect.c #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分查找中：合并基线必须是经过测试的\n" -#: bisect.c:910 +#: bisect.c #, c-format msgid "a %s revision is needed" msgstr "需要一个 %s 版本" -#: bisect.c:940 +#: bisect.c #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" -#: bisect.c:986 builtin/merge.c:155 +#: bisect.c builtin/merge.c #, c-format msgid "could not read file '%s'" msgstr "不能读取文件 '%s'" -#: bisect.c:1026 +#: bisect.c msgid "reading bisect refs failed" msgstr "读取二分查找引用失败" -#: bisect.c:1056 +#: bisect.c #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同时为 %s 和 %s\n" -#: bisect.c:1065 +#: bisect.c #, c-format msgid "" "No testable commit found.\n" @@ -1931,7 +1911,7 @@ msgstr "" "没有发现可测试的提交。\n" "可能您在运行时使用了错误的路径参数？\n" -#: bisect.c:1094 +#: bisect.c #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1941,80 +1921,77 @@ msgstr[1] "（大概 %d 步）" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1100 +#: bisect.c #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" -#: blame.c:2773 +#: blame.c msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" -#: blame.c:2787 +#: blame.c msgid "cannot use --contents with final commit object name" msgstr "不能将 --contents 和最终的提交对象名共用" -#: blame.c:2808 +#: blame.c msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157 -#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118 -#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096 -#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381 -#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796 -#: builtin/shortlog.c:255 +#: blame.c builtin/commit.c builtin/log.c builtin/merge.c +#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c ref-filter.c +#: remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "版本遍历设置失败" -#: blame.c:2835 +#: blame.c msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围" -#: blame.c:2846 +#: blame.c #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中无此路径 %1$s" -#: blame.c:2857 +#: blame.c #, c-format msgid "cannot read blob %s for path %s" msgstr "不能为路径 %2$s 读取数据对象 %1$s" -#: branch.c:93 +#: branch.c msgid "" "cannot inherit upstream tracking configuration of multiple refs when " "rebasing is requested" msgstr "在请求变基时无法继承上游多个引用的跟踪设置" -#: branch.c:104 +#: branch.c #, c-format msgid "not setting branch '%s' as its own upstream" msgstr "没有将分支 '%s' 设置为它自己的上游" -#: branch.c:160 +#: branch.c #, c-format msgid "branch '%s' set up to track '%s' by rebasing." msgstr "分支 '%s' 设置为使用变基来跟踪 '%s'。" -#: branch.c:161 +#: branch.c #, c-format msgid "branch '%s' set up to track '%s'." msgstr "分支 '%s' 设置为跟踪 '%s'。" -#: branch.c:164 +#: branch.c #, c-format msgid "branch '%s' set up to track:" msgstr "分支 '%s' 设置为跟踪：" -#: branch.c:176 +#: branch.c msgid "unable to write upstream branch configuration" msgstr "无法写入上游分支配置" -#: branch.c:178 +#: branch.c msgid "" "\n" "After fixing the error cause you may try to fix up\n" @@ -2023,32 +2000,34 @@ msgstr "" "\n" "在修复错误后，您可以通过执行以下命令来尝试修改远程跟踪分支：" -#: branch.c:219 +#: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no remote is set" msgstr "要求从 '%s' 继承跟踪信息，但是没有设置远程" -#: branch.c:225 +#: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgstr "要求从 '%s' 继承跟踪信息，但是没有设置合并配置" -#: branch.c:277 +#: branch.c #, c-format msgid "not tracking: ambiguous information for ref '%s'" msgstr "不在跟踪中：引用 '%s' 有歧义的信息" # 译者：为保证在输出中对齐，注意调整句中空格！ +#. #-#-#-#-# branch.c.po #-#-#-#-# #. TRANSLATORS: This is a line listing a remote with duplicate #. refspecs in the advice message below. For RTL languages you'll #. probably want to swap the "%s" and leading " " space around. #. +#. #-#-#-#-# object-name.c.po #-#-#-#-# #. TRANSLATORS: This is line item of ambiguous object output #. from describe_ambiguous_object() above. For RTL languages #. you'll probably want to swap the "%s" and leading " " space #. around. #. -#: branch.c:289 object-name.c:464 +#: branch.c object-name.c #, c-format msgid " %s\n" msgstr " %s\n" @@ -2056,7 +2035,7 @@ msgstr " %s\n" #. TRANSLATORS: The second argument is a \n-delimited list of #. duplicate refspecs, composed above. #. -#: branch.c:295 +#: branch.c #, c-format msgid "" "There are multiple remotes whose fetch refspecs map to the remote\n" @@ -2075,32 +2054,32 @@ msgstr "" "如果要支持设置追踪分支，请保证不同远程的获取引用规格映射至不同的追踪命名空" "间。" -#: branch.c:344 +#: branch.c #, c-format msgid "'%s' is not a valid branch name" msgstr "'%s' 不是一个有效的分支名称" -#: branch.c:364 +#: branch.c #, c-format msgid "a branch named '%s' already exists" msgstr "一个名为 '%s' 的分支已经存在" -#: branch.c:370 +#: branch.c #, c-format msgid "cannot force update the branch '%s' checked out at '%s'" msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'" -#: branch.c:393 +#: branch.c #, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支" -#: branch.c:395 +#: branch.c #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "请求的上游分支 '%s' 不存在" -#: branch.c:397 +#: branch.c msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -2118,28 +2097,27 @@ msgstr "" "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n" "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" -#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377 -#: builtin/replace.c:423 builtin/replace.c:453 +#: branch.c builtin/replace.c #, c-format msgid "not a valid object name: '%s'" msgstr "不是一个有效的对象名：'%s'" -#: branch.c:465 +#: branch.c #, c-format msgid "ambiguous object name: '%s'" msgstr "歧义的对象名：'%s'" -#: branch.c:470 +#: branch.c #, c-format msgid "not a valid branch point: '%s'" msgstr "无效的分支点：'%s'" -#: branch.c:658 +#: branch.c #, c-format msgid "submodule '%s': unable to find submodule" msgstr "子模组 '%s'：无法找到子模组" -#: branch.c:661 +#: branch.c #, c-format msgid "" "You may try updating the submodules using 'git checkout %s && git submodule " @@ -2147,22410 +2125,22477 @@ msgid "" msgstr "" "你可以用 'git checkout %s && git submodule update --init' 来尝试更新子模组" -#: branch.c:672 branch.c:698 +#: branch.c #, c-format msgid "submodule '%s': cannot create branch '%s'" msgstr "子模组 '%s'：不能创建分支 '%s'" -#: branch.c:730 +#: branch.c #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' 已经检出到 '%s'" -#: branch.c:755 +#: branch.c #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s 的 HEAD 指向没有被更新" -#: bundle.c:45 -#, c-format -msgid "unrecognized bundle hash algorithm: %s" -msgstr "未能识别的归档包哈希算法：%s" +#: builtin/add.c +msgid "git add [] [--] ..." +msgstr "git add [<选项>] [--] <路径规格>..." -#: bundle.c:53 +#: builtin/add.c #, c-format -msgid "unknown capability '%s'" -msgstr "未知能力 '%s'" +msgid "cannot chmod %cx '%s'" +msgstr "不能 chmod %cx '%s'" -#: bundle.c:79 +#: builtin/add.c #, c-format -msgid "'%s' does not look like a v2 or v3 bundle file" -msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件" +msgid "unexpected diff status %c" +msgstr "意外的差异状态 %c" -#: bundle.c:118 -#, c-format -msgid "unrecognized header: %s%s (%d)" -msgstr "未能识别的包头：%s%s (%d)" +#: builtin/add.c builtin/commit.c +msgid "updating files failed" +msgstr "更新文件失败" -#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402 -#: builtin/commit.c:865 +#: builtin/add.c #, c-format -msgid "could not open '%s'" -msgstr "不能打开 '%s'" +msgid "remove '%s'\n" +msgstr "删除 '%s'\n" -#: bundle.c:203 -msgid "Repository lacks these prerequisite commits:" -msgstr "仓库中缺少这些必备的提交：" +#: builtin/add.c +msgid "Unstaged changes after refreshing the index:" +msgstr "刷新索引之后尚未被暂存的变更：" -#: bundle.c:206 -msgid "need a repository to verify a bundle" -msgstr "需要一个仓库来校验一个归档包" +#: builtin/add.c builtin/rev-parse.c +msgid "Could not read the index" +msgstr "不能读取索引" + +#: builtin/add.c +msgid "Could not write patch" +msgstr "不能生成补丁" -#: bundle.c:264 +#: builtin/add.c +msgid "editing patch failed" +msgstr "编辑补丁失败" + +#: builtin/add.c #, c-format -msgid "The bundle contains this ref:" -msgid_plural "The bundle contains these % refs:" -msgstr[0] "这个归档包中含有这个引用：" -msgstr[1] "这个归档包中含有 % 个引用：" +msgid "Could not stat '%s'" +msgstr "不能对 '%s' 调用 stat" -#: bundle.c:272 -msgid "The bundle records a complete history." -msgstr "这个归档包记录一个完整历史。" +#: builtin/add.c +msgid "Empty patch. Aborted." +msgstr "空补丁。异常终止。" -#: bundle.c:274 +#: builtin/add.c #, c-format -msgid "The bundle requires this ref:" -msgid_plural "The bundle requires these % refs:" -msgstr[0] "这个归档包需要这个引用：" -msgstr[1] "这个归档包需要 % 个引用：" +msgid "Could not apply '%s'" +msgstr "不能应用 '%s'" -#: bundle.c:350 -msgid "unable to dup bundle descriptor" -msgstr "无法复制归档包描述符" +#: builtin/add.c +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: bundle.c:357 -msgid "Could not spawn pack-objects" -msgstr "不能生成 pack-objects 进程" +#: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c +#: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c +#: builtin/rm.c builtin/send-pack.c +msgid "dry run" +msgstr "演习" -#: bundle.c:368 -msgid "pack-objects died" -msgstr "pack-objects 终止" +#: builtin/add.c builtin/check-ignore.c builtin/commit.c +#: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c +#: builtin/read-tree.c +msgid "be verbose" +msgstr "冗长输出" -#: bundle.c:417 -#, c-format -msgid "ref '%s' is excluded by the rev-list options" -msgstr "引用 '%s' 被 rev-list 选项排除" +#: builtin/add.c +msgid "interactive picking" +msgstr "交互式拣选" -#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400 -#, c-format -msgid "unrecognized argument: %s" -msgstr "未能识别的参数：%s" +#: builtin/add.c builtin/checkout.c builtin/reset.c +msgid "select hunks interactively" +msgstr "交互式挑选数据块" -#: bundle.c:548 -#, c-format -msgid "unsupported bundle version %d" -msgstr "不支持的归档包版本 %d" +#: builtin/add.c +msgid "edit current diff and apply" +msgstr "编辑当前差异并应用" -#: bundle.c:550 -#, c-format -msgid "cannot write bundle version %d with algorithm %s" -msgstr "不能写入，归档包版本 %d 不支持算法 %s" +#: builtin/add.c +msgid "allow adding otherwise ignored files" +msgstr "允许添加忽略的文件" -#: bundle.c:600 -msgid "Refusing to create empty bundle." -msgstr "不能创建空的归档包。" +#: builtin/add.c +msgid "update tracked files" +msgstr "更新已跟踪的文件" -#: bundle.c:610 -#, c-format -msgid "cannot create '%s'" -msgstr "不能创建 '%s'" +#: builtin/add.c +msgid "renormalize EOL of tracked files (implies -u)" +msgstr "对已跟踪文件（暗含 -u）重新归一换行符" -#: bundle.c:639 -msgid "index-pack died" -msgstr "index-pack 终止" +#: builtin/add.c +msgid "record only the fact that the path will be added later" +msgstr "只记录，该路径稍后再添加" -#: chunk-format.c:117 -msgid "terminating chunk id appears earlier than expected" -msgstr "终止块 ID 比预期更早出现" +#: builtin/add.c +msgid "add changes from all tracked and untracked files" +msgstr "添加所有改变的已跟踪文件和未跟踪文件" -#: chunk-format.c:126 -#, c-format -msgid "improper chunk offset(s) % and %" -msgstr "不正确的块偏移 % 和 %" +#: builtin/add.c +msgid "ignore paths removed in the working tree (same as --no-all)" +msgstr "忽略工作区中移除的路径（和 --no-all 相同）" -#: chunk-format.c:133 -#, c-format -msgid "duplicate chunk ID % found" -msgstr "发现重复的块ID %" +#: builtin/add.c +msgid "don't add, only refresh the index" +msgstr "不添加，只刷新索引" + +#: builtin/add.c +msgid "just skip files which cannot be added because of errors" +msgstr "跳过因出错不能添加的文件" + +#: builtin/add.c +msgid "check if - even missing - files are ignored in dry run" +msgstr "检查在演习模式下文件（即使不存在）是否被忽略" + +#: builtin/add.c builtin/mv.c builtin/rm.c +msgid "allow updating entries outside of the sparse-checkout cone" +msgstr "允许更新稀疏检出锥以外的条目" + +#: builtin/add.c builtin/update-index.c +msgid "override the executable bit of the listed files" +msgstr "覆盖列表里文件的可执行位" + +#: builtin/add.c +msgid "warn when adding an embedded repository" +msgstr "创建一个嵌入式仓库时给予警告" -#: chunk-format.c:147 +#: builtin/add.c #, c-format -msgid "final chunk has non-zero id %" -msgstr "最终块有非零 ID %" +msgid "" +"You've added another git repository inside your current repository.\n" +"Clones of the outer repository will not contain the contents of\n" +"the embedded repository and will not know how to obtain it.\n" +"If you meant to add a submodule, use:\n" +"\n" +"\tgit submodule add %s\n" +"\n" +"If you added this path by mistake, you can remove it from the\n" +"index with:\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"See \"git help submodule\" for more information." +msgstr "" +"您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n" +"内容，并且不知道该如何获取它。如果您要添加一个子模组，使用：\n" +"\n" +"\tgit submodule add %s\n" +"\n" +"如果您不小心添加了这个路径，可以用下面的命令将其从索引中删除：\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"参见 \"git help submodule\" 获取更多信息。" -#: color.c:354 +#: builtin/add.c #, c-format -msgid "invalid color value: %.*s" -msgstr "无效的颜色值：%.*s" +msgid "adding embedded git repository: %s" +msgstr "正在添加嵌入式 git 仓库：%s" -#: commit-graph.c:204 midx.c:52 -msgid "invalid hash version" -msgstr "无效的哈希版本" +#: builtin/add.c +msgid "" +"Use -f if you really want to add them.\n" +"Turn this message off by running\n" +"\"git config advice.addIgnoredFile false\"" +msgstr "" +"如果您确实要添加它们，使用 -f 参数。\n" +"运行下面的命令来关闭本消息\n" +"\"git config advice.addIgnoredFile false\"" -#: commit-graph.c:262 -msgid "commit-graph file is too small" -msgstr "提交图形文件太小" +#: builtin/add.c +msgid "adding files failed" +msgstr "添加文件失败" -#: commit-graph.c:355 +#: builtin/add.c #, c-format -msgid "commit-graph signature %X does not match signature %X" -msgstr "提交图形签名 %X 和签名 %X 不匹配" +msgid "--chmod param '%s' must be either -x or +x" +msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" -#: commit-graph.c:362 +#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c +#: builtin/rm.c builtin/stash.c #, c-format -msgid "commit-graph version %X does not match version %X" -msgstr "提交图形版本 %X 和版本 %X 不匹配" +msgid "'%s' and pathspec arguments cannot be used together" +msgstr "'%s' 和路径规格参数不能同时使用" -#: commit-graph.c:369 +#: builtin/add.c #, c-format -msgid "commit-graph hash version %X does not match version %X" -msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" +msgid "Nothing specified, nothing added.\n" +msgstr "没有指定文件，也没有文件被添加。\n" -#: commit-graph.c:386 -#, c-format -msgid "commit-graph file is too small to hold %u chunks" -msgstr "提交图形文件太小，容不下 %u 个块" +#: builtin/add.c +msgid "" +"Maybe you wanted to say 'git add .'?\n" +"Turn this message off by running\n" +"\"git config advice.addEmptyPathspec false\"" +msgstr "" +"也许您想要执行 'git add .'？\n" +"运行下面的命令来关闭本消息\n" +"\"git config advice.addEmptyPathspec false\"" -#: commit-graph.c:485 -msgid "commit-graph has no base graphs chunk" -msgstr "提交图形没有基础图形块" +#: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c +#: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c +#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c +#: rerere.c submodule.c +msgid "index file corrupt" +msgstr "索引文件损坏" -#: commit-graph.c:495 -msgid "commit-graph chain does not match" -msgstr "提交图形链不匹配" +#: builtin/am.c builtin/mailinfo.c mailinfo.c +#, c-format +msgid "bad action '%s' for '%s'" +msgstr "'%2$s' 的错误动作 '%1$s'" -#: commit-graph.c:543 +#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c +#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c +#: sequencer.c setup.c #, c-format -msgid "invalid commit-graph chain: line '%s' not a hash" -msgstr "无效的提交图形链：行 '%s' 不是一个哈希值" +msgid "invalid value for '%s': '%s'" +msgstr "'%s' 的值无效：'%s'" -#: commit-graph.c:567 -msgid "unable to find all commit-graph files" -msgstr "无法找到所有提交图形文件" +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c +#, c-format +msgid "could not read '%s'" +msgstr "不能读取 '%s'" -#: commit-graph.c:752 commit-graph.c:789 -msgid "invalid commit position. commit-graph is likely corrupt" -msgstr "无效的提交位置。提交图形可能已损坏" +#: builtin/am.c +msgid "could not parse author script" +msgstr "不能解析作者脚本" -#: commit-graph.c:773 +#: builtin/am.c builtin/replace.c commit.c sequencer.c #, c-format -msgid "could not find commit %s" -msgstr "无法找到提交 %s" +msgid "could not parse %s" +msgstr "不能解析 %s" -#: commit-graph.c:806 -msgid "commit-graph requires overflow generation data but has none" -msgstr "提交图需要溢出世代数据，但是没有" +#: builtin/am.c +#, c-format +msgid "'%s' was deleted by the applypatch-msg hook" +msgstr "'%s' 被 applypatch-msg 钩子删除" -#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775 -#: builtin/clone.c:705 +#: builtin/am.c #, c-format -msgid "unable to parse commit %s" -msgstr "不能解析提交 %s" +msgid "Malformed input line: '%s'." +msgstr "非法的输入行：'%s'。" -#: commit-graph.c:1373 builtin/pack-objects.c:3078 +#: builtin/am.c #, c-format -msgid "unable to get type of object %s" -msgstr "无法获得对象 %s 类型" +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "从 '%s' 拷贝注解到 '%s' 时失败" -#: commit-graph.c:1404 -msgid "Loading known commits in commit graph" -msgstr "正在加载提交图中的已知提交" +#: builtin/am.c +msgid "fseek failed" +msgstr "fseek 失败" -#: commit-graph.c:1421 -msgid "Expanding reachable commits in commit graph" -msgstr "正在扩展提交图中的可达提交" +#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c +#, c-format +msgid "could not open '%s' for reading" +msgstr "无法打开 '%s' 进行读取" -#: commit-graph.c:1441 -msgid "Clearing commit marks in commit graph" -msgstr "正在清除提交图中的提交标记" +#: builtin/am.c builtin/rebase.c strbuf.c wrapper.c +#, c-format +msgid "could not open '%s' for writing" +msgstr "无法打开 '%s' 进行写入" -#: commit-graph.c:1460 -msgid "Computing commit graph topological levels" -msgstr "正在计算提交图拓扑级别" +#: builtin/am.c +#, c-format +msgid "could not parse patch '%s'" +msgstr "无法解析补丁 '%s'" -#: commit-graph.c:1513 -msgid "Computing commit graph generation numbers" -msgstr "正在计算提交图世代数字" +#: builtin/am.c +msgid "Only one StGIT patch series can be applied at once" +msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: commit-graph.c:1598 -msgid "Computing commit changed paths Bloom filters" -msgstr "计算提交变更路径的布隆过滤器" +#: builtin/am.c +msgid "invalid timestamp" +msgstr "无效的时间戳" -#: commit-graph.c:1675 -msgid "Collecting referenced commits" -msgstr "正在收集引用的提交" +#: builtin/am.c +msgid "invalid Date line" +msgstr "无效的日期行" + +#: builtin/am.c +msgid "invalid timezone offset" +msgstr "无效的时区偏移值" + +#: builtin/am.c +msgid "Patch format detection failed." +msgstr "补丁格式探测失败。" -#: commit-graph.c:1701 +#: builtin/am.c builtin/clone.c #, c-format -msgid "Finding commits for commit graph in % pack" -msgid_plural "Finding commits for commit graph in % packs" -msgstr[0] "正在 % 个包中查找提交图的提交" -msgstr[1] "正在 % 个包中查找提交图的提交" +msgid "failed to create directory '%s'" +msgstr "无法创建目录 '%s'" + +#: builtin/am.c +msgid "Failed to split patches." +msgstr "无法拆分补丁。" -#: commit-graph.c:1714 +#: builtin/am.c #, c-format -msgid "error adding pack %s" -msgstr "添加包 %s 出错" +msgid "When you have resolved this problem, run \"%s --continue\"." +msgstr "当您解决这一问题，执行 \"%s --continue\"。" -#: commit-graph.c:1718 +#: builtin/am.c #, c-format -msgid "error opening index for %s" -msgstr "为 %s 打开索引出错" +msgid "If you prefer to skip this patch, run \"%s --skip\" instead." +msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。" -#: commit-graph.c:1756 -msgid "Finding commits for commit graph among packed objects" -msgstr "正在打包对象中查找提交图的提交" +#: builtin/am.c +#, c-format +msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." +msgstr "若要把空补丁记录为空提交，执行 \"%s --allow-empty\"。" -#: commit-graph.c:1774 -msgid "Finding extra edges in commit graph" -msgstr "正在查找提交图中额外的边" +#: builtin/am.c +#, c-format +msgid "To restore the original branch and stop patching, run \"%s --abort\"." +msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。" -#: commit-graph.c:1823 -msgid "failed to write correct number of base graph ids" -msgstr "无法写入正确数量的基础图形 ID" +#: builtin/am.c +msgid "Patch sent with format=flowed; space at the end of lines might be lost." +msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。" -#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475 +#: builtin/am.c #, c-format -msgid "unable to create leading directories of %s" -msgstr "不能为 %s 创建先导目录" - -#: commit-graph.c:1868 -msgid "unable to create temporary graph layer" -msgstr "无法创建临时图层" +msgid "missing author line in commit %s" +msgstr "在提交 %s 中缺失作者行" -#: commit-graph.c:1873 +#: builtin/am.c #, c-format -msgid "unable to adjust shared permissions for '%s'" -msgstr "无法为 '%s' 调整共享权限" +msgid "invalid ident line: %.*s" +msgstr "无效的身份标识：%.*s" -#: commit-graph.c:1930 +#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c #, 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 步写出提交图" +msgid "unable to parse commit %s" +msgstr "不能解析提交 %s" -#: commit-graph.c:1967 -msgid "unable to open commit-graph chain file" -msgstr "无法打开提交图形链文件" +#: builtin/am.c +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: commit-graph.c:1983 -msgid "failed to rename base commit-graph file" -msgstr "无法重命名基础提交图形文件" +#: builtin/am.c +msgid "Using index info to reconstruct a base tree..." +msgstr "使用索引来重建一个（三方合并的）基础目录树..." -#: commit-graph.c:2004 -msgid "failed to rename temporary commit-graph file" -msgstr "无法重命名临时提交图形文件" +#: builtin/am.c +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"您是否曾手动编辑过您的补丁？\n" +"无法应用补丁到索引中的数据对象上。" -#: commit-graph.c:2137 -msgid "Scanning merged commits" -msgstr "正在扫描合并提交" +#: builtin/am.c +msgid "Falling back to patching base and 3-way merge..." +msgstr "回落到基础版本上打补丁及进行三方合并..." -#: commit-graph.c:2181 -msgid "Merging commit-graph" -msgstr "正在合并提交图形" +#: builtin/am.c +msgid "Failed to merge in the changes." +msgstr "无法合并变更。" -#: commit-graph.c:2289 -msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" -msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用" +#: builtin/am.c builtin/merge.c sequencer.c +msgid "git write-tree failed to write a tree" +msgstr "git write-tree 无法写入树对象" -#: commit-graph.c:2396 -msgid "too many commits to write graph" -msgstr "提交太多不能画图" +#: builtin/am.c +msgid "applying to an empty history" +msgstr "正应用到一个空历史上" -#: commit-graph.c:2494 -msgid "the commit-graph file has incorrect checksum and is likely corrupt" -msgstr "提交图文件的校验码错误，可能已经损坏" +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c +#: t/helper/test-fast-rebase.c +msgid "failed to write commit object" +msgstr "无法写提交对象" -#: commit-graph.c:2504 +#: builtin/am.c #, c-format -msgid "commit-graph has incorrect OID order: %s then %s" -msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s" +msgid "cannot resume: %s does not exist." +msgstr "无法继续：%s 不存在。" -#: commit-graph.c:2514 commit-graph.c:2529 -#, c-format -msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" -msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u" +#: builtin/am.c +msgid "Commit Body is:" +msgstr "提交内容为：" -#: commit-graph.c:2521 +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#. +#: builtin/am.c #, c-format -msgid "failed to parse commit %s from commit-graph" -msgstr "无法从提交图形中解析提交 %s" +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " +msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]：" -#: commit-graph.c:2539 -msgid "Verifying commits in commit graph" -msgstr "正在校验提交图中的提交" +#: builtin/am.c builtin/commit.c +msgid "unable to write index file" +msgstr "无法写入索引文件" -#: commit-graph.c:2554 +#: builtin/am.c #, c-format -msgid "failed to parse commit %s from object database for commit-graph" -msgstr "无法从提交图形的对象库中解析提交 %s" +msgid "Dirty index: cannot apply patches (dirty: %s)" +msgstr "脏索引：不能应用补丁（脏文件：%s）" -#: commit-graph.c:2561 +#: builtin/am.c #, c-format -msgid "root tree OID for commit %s in commit-graph is %s != %s" -msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" +msgid "Skipping: %.*s" +msgstr "跳过：%.*s" -#: commit-graph.c:2571 +#: builtin/am.c #, c-format -msgid "commit-graph parent list for commit %s is too long" -msgstr "提交 %s 的提交图形父提交列表太长了" +msgid "Creating an empty commit: %.*s" +msgstr "创建空提交：%.*s" -#: commit-graph.c:2580 -#, c-format -msgid "commit-graph parent for %s is %s != %s" -msgstr "%s 的提交图形父提交是 %s != %s" +#: builtin/am.c +msgid "Patch is empty." +msgstr "补丁为空。" -#: commit-graph.c:2594 +#: builtin/am.c #, c-format -msgid "commit-graph parent list for commit %s terminates early" -msgstr "提交 %s 的提交图形父提交列表过早终止" +msgid "Applying: %.*s" +msgstr "应用：%.*s" -#: commit-graph.c:2599 -#, c-format -msgid "" -"commit-graph has generation number zero for commit %s, but non-zero elsewhere" -msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零" +#: builtin/am.c +msgid "No changes -- Patch already applied." +msgstr "没有变更 —— 补丁已经应用过。" -#: commit-graph.c:2603 +#: builtin/am.c #, c-format +msgid "Patch failed at %s %.*s" +msgstr "打补丁失败于 %s %.*s" + +#: builtin/am.c +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" +msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁" + +#: builtin/am.c +msgid "No changes - recorded it as an empty commit." +msgstr "没有变更 —— 记录为空提交。" + +#: builtin/am.c msgid "" -"commit-graph has non-zero generation number for commit %s, but zero elsewhere" -msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "" +"没有变更 —— 您是不是忘了执行 'git add'？\n" +"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" +"您也许想要跳过这个补丁。" -#: commit-graph.c:2620 -#, c-format -msgid "commit-graph generation for commit %s is % < %" -msgstr "提交图形中的提交 %s 的世代号是 % < %" +#: builtin/am.c +msgid "" +"You still have unmerged paths in your index.\n" +"You should 'git add' each file with resolved conflicts to mark them as " +"such.\n" +"You might run `git rm` on a file to accept \"deleted by them\" for it." +msgstr "" +"在您的索引中仍存在未合并的路径。\n" +"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" +"您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" -#: commit-graph.c:2626 -#, c-format -msgid "commit date for commit %s in commit-graph is % != %" -msgstr "提交图形中提交 %s 的提交日期是 % != %" +#: builtin/am.c builtin/checkout.c builtin/clone.c builtin/stash.c merge.c +#: rerere.c +msgid "unable to write new index file" +msgstr "无法写新的索引文件" -#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445 -#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456 +#: builtin/am.c builtin/reset.c #, c-format -msgid "could not parse %s" -msgstr "不能解析 %s" +msgid "Could not parse object '%s'." +msgstr "不能解析对象 '%s'。" -#: commit.c:56 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s 不是一个提交！" +#: builtin/am.c +msgid "failed to clean index" +msgstr "无法清空索引" -#: commit.c:197 +#: builtin/am.c msgid "" -"Support for /info/grafts is deprecated\n" -"and will be removed in a future Git version.\n" -"\n" -"Please use \"git replace --convert-graft-file\"\n" -"to convert the grafts into replace refs.\n" -"\n" -"Turn this message off by running\n" -"\"git config advice.graftFileDeprecated false\"" -msgstr "" -"对 /info/grafts 的支持已过时，并将在\n" -"未来的Git版本中被移除。\n" -"\n" -"请使用 \"git replace --convert-graft-file\" 将\n" -"grafts 转换为替换引用。\n" -"\n" -"设置 \"git config advice.graftFileDeprecated false\"\n" -"可关闭本消息" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" -#: commit.c:1252 +#: builtin/am.c builtin/bisect--helper.c worktree.c #, c-format -msgid "Commit %s has an untrusted GPG signature, allegedly by %s." -msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" +msgid "failed to read '%s'" +msgstr "无法读取 '%s'" -#: commit.c:1256 +#: builtin/am.c #, c-format -msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" +msgid "options '%s=%s' and '%s=%s' cannot be used together" +msgstr "选项 '%s=%s' 和 '%s=%s' 不能同时使用" -#: commit.c:1259 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "提交 %s 没有 GPG 签名。" +#: builtin/am.c +msgid "git am [] [( | )...]" +msgstr "git am [<选项>] [( | )...]" -#: commit.c:1262 -#, c-format -msgid "Commit %s has a good GPG signature by %s\n" -msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" +#: builtin/am.c +msgid "git am [] (--continue | --skip | --abort)" +msgstr "git am [<选项>] (--continue | --skip | --abort)" -#: commit.c:1516 -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" -"variable i18n.commitencoding to the encoding your project uses.\n" -msgstr "" -"警告：提交说明不符合 UTF-8 字符编码。\n" -"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n" -"设置为您项目所用的字符编码。\n" +#: builtin/am.c +msgid "run interactively" +msgstr "以交互式方式运行" -#: compat/obstack.c:406 compat/obstack.c:408 -msgid "memory exhausted" -msgstr "内存耗尽" +#: builtin/am.c +msgid "historical option -- no-op" +msgstr "老的参数 —— 无作用" -#: compat/terminal.c:167 -msgid "cannot resume in the background, please use 'fg' to resume" -msgstr "无法从后台中恢复，请使用 'fg' 来恢复" +#: builtin/am.c +msgid "allow fall back on 3way merging if needed" +msgstr "如果必要，允许使用三方合并。" -#: compat/terminal.c:168 -msgid "cannot restore terminal settings" -msgstr "无法恢复终端设置" +#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c +#: builtin/stash.c +msgid "be quiet" +msgstr "静默模式" -#: config.c:143 -#, c-format -msgid "" -"exceeded maximum include depth (%d) while including\n" -"\t%s\n" -"from\n" -"\t%s\n" -"This might be due to circular includes." -msgstr "" -"超过了最大包含深度（%1$d），当从\n" -"\t%3$s\n" -"包含\n" -"\t%2$s\n" -"这可能是因为循环包含。" +#: builtin/am.c +msgid "add a Signed-off-by trailer to the commit message" +msgstr "在提交说明中添加 Signed-off-by 尾注" -#: config.c:159 -#, c-format -msgid "could not expand include path '%s'" -msgstr "无法扩展包含路径 '%s'" +#: builtin/am.c +msgid "recode into utf8 (default)" +msgstr "使用 utf8 字符集（默认）" -#: config.c:170 -msgid "relative config includes must come from files" -msgstr "相对路径的配置文件引用必须来自于文件" +#: builtin/am.c +msgid "pass -k flag to git-mailinfo" +msgstr "向 git-mailinfo 传递 -k 参数" -#: config.c:219 -msgid "relative config include conditionals must come from files" -msgstr "相对路径的配置文件条件引用必须来自于文件" +#: builtin/am.c +msgid "pass -b flag to git-mailinfo" +msgstr "向 git-mailinfo 传递 -b 参数" -#: config.c:364 -msgid "" -"remote URLs cannot be configured in file directly or indirectly included by " -"includeIf.hasconfig:remote.*.url" -msgstr "" -"远程 URL 不能在文件中配置，不管直接地还是通过 includeIf.hasconfig:remote.*." -"url 间接地包含。" +#: builtin/am.c +msgid "pass -m flag to git-mailinfo" +msgstr "向 git-mailinfo 传递 -m 参数" -#: config.c:508 -#, c-format -msgid "invalid config format: %s" -msgstr "无效的配置格式：%s" +#: builtin/am.c +msgid "pass --keep-cr flag to git-mailsplit for mbox format" +msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" -#: config.c:512 -#, c-format -msgid "missing environment variable name for configuration '%.*s'" -msgstr "配置 '%.*s' 缺少环境变量名称" +#: builtin/am.c +msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" +msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" -#: config.c:517 -#, c-format -msgid "missing environment variable '%s' for configuration '%.*s'" -msgstr "缺少环境变量 '%s' 于配置 '%.*s' " +#: builtin/am.c +msgid "strip everything before a scissors line" +msgstr "丢弃裁切线前的所有内容" -#: config.c:553 -#, c-format -msgid "key does not contain a section: %s" -msgstr "键名没有包含一个小节名称：%s" +#: builtin/am.c +msgid "pass it through git-mailinfo" +msgstr "传递给 git-mailinfo" -#: config.c:558 -#, c-format -msgid "key does not contain variable name: %s" -msgstr "键名没有包含变量名：%s" +#: builtin/am.c +msgid "pass it through git-apply" +msgstr "传递给 git-apply" -#: config.c:580 sequencer.c:2802 -#, c-format -msgid "invalid key: %s" -msgstr "无效键名：%s" +#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c +#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c +#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h +msgid "n" +msgstr "n" -#: config.c:585 -#, c-format -msgid "invalid key (newline): %s" -msgstr "无效键名（有换行符）：%s" +#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c +#: builtin/for-each-ref.c builtin/ls-tree.c builtin/replace.c builtin/tag.c +#: builtin/verify-tag.c +msgid "format" +msgstr "格式" -#: config.c:605 -msgid "empty config key" -msgstr "空的配置键名" +#: builtin/am.c +msgid "format the patch(es) are in" +msgstr "补丁的格式" -#: config.c:623 config.c:635 -#, c-format -msgid "bogus config parameter: %s" -msgstr "伪配置参数：%s" +#: builtin/am.c +msgid "override error message when patch failure occurs" +msgstr "打补丁失败时显示的错误信息" -#: config.c:649 config.c:666 config.c:673 config.c:682 -#, c-format -msgid "bogus format in %s" -msgstr "%s 中格式错误" +#: builtin/am.c +msgid "continue applying patches after resolving a conflict" +msgstr "冲突解决后继续应用补丁" -#: config.c:716 -#, c-format -msgid "bogus count in %s" -msgstr "%s 中错误计数" +#: builtin/am.c +msgid "synonyms for --continue" +msgstr "和 --continue 同义" -#: config.c:720 -#, c-format -msgid "too many entries in %s" -msgstr "%s 中太多的条目" +#: builtin/am.c +msgid "skip the current patch" +msgstr "跳过当前补丁" -#: config.c:730 -#, c-format -msgid "missing config key %s" -msgstr "缺失配置键名 %s" +#: builtin/am.c +msgid "restore the original branch and abort the patching operation" +msgstr "恢复原始分支并终止打补丁操作" -#: config.c:738 -#, c-format -msgid "missing config value %s" -msgstr "缺失配置取值 %s" +#: builtin/am.c +msgid "abort the patching operation but keep HEAD where it is" +msgstr "终止补丁操作但保持 HEAD 不变" -#: config.c:1089 -#, c-format -msgid "bad config line %d in blob %s" -msgstr "数据对象 %2$s 中错误的配置行 %1$d" +#: builtin/am.c +msgid "show the patch being applied" +msgstr "显示正在应用的补丁" -#: config.c:1093 -#, c-format -msgid "bad config line %d in file %s" -msgstr "文件 %2$s 中错误的配置行 %1$d" +#: builtin/am.c +msgid "record the empty patch as an empty commit" +msgstr "把空补丁记录为空提交" -#: config.c:1097 -#, c-format -msgid "bad config line %d in standard input" -msgstr "标准输入中错误的配置行 %d" +#: builtin/am.c +msgid "lie about committer date" +msgstr "将作者日期作为提交日期" -#: config.c:1101 -#, c-format -msgid "bad config line %d in submodule-blob %s" -msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" +#: builtin/am.c +msgid "use current timestamp for author date" +msgstr "用当前时间作为作者日期" -#: config.c:1105 -#, c-format -msgid "bad config line %d in command line %s" -msgstr "命令行 %2$s 中错误的配置行 %1$d" +#: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c +#: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c +msgid "key-id" +msgstr "key-id" -#: config.c:1109 -#, c-format -msgid "bad config line %d in %s" -msgstr "在 %2$s 中错误的配置行 %1$d" +#: builtin/am.c builtin/rebase.c +msgid "GPG-sign commits" +msgstr "使用 GPG 签名提交" -#: config.c:1246 -msgid "out of range" -msgstr "超出范围" +#: builtin/am.c +msgid "how to handle empty patches" +msgstr "如何处理空补丁" -#: config.c:1246 -msgid "invalid unit" -msgstr "无效的单位" +#: builtin/am.c +msgid "(internal use for git-rebase)" +msgstr "（内部使用，用于 git-rebase）" -#: config.c:1247 -#, c-format -msgid "bad numeric config value '%s' for '%s': %s" -msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s" +#: builtin/am.c +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." +msgstr "" +"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" +"请不要再使用它了。" -#: config.c:1257 -#, c-format -msgid "bad numeric config value '%s' for '%s' in blob %s: %s" -msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" +#: builtin/am.c +msgid "failed to read the index" +msgstr "无法读取索引" -#: config.c:1260 +#: builtin/am.c #, c-format -msgid "bad numeric config value '%s' for '%s' in file %s: %s" -msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" +msgid "previous rebase directory %s still exists but mbox given." +msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" -#: config.c:1263 +#: builtin/am.c #, c-format -msgid "bad numeric config value '%s' for '%s' in standard input: %s" -msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s" +msgid "" +"Stray %s directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" +"发现了错误的 %s 目录。\n" +"使用 \"git am --abort\" 删除它。" -#: config.c:1266 -#, c-format -msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" -msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" +#: builtin/am.c +msgid "Resolve operation not in progress, we are not resuming." +msgstr "解决操作未进行，我们不会继续。" -#: config.c:1269 -#, c-format -msgid "bad numeric config value '%s' for '%s' in command line %s: %s" -msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" +#: builtin/am.c +msgid "interactive mode requires patches on the command line" +msgstr "交互式模式需要命令行上提供补丁" -#: config.c:1272 -#, c-format -msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" +#: builtin/apply.c +msgid "git apply [] [...]" +msgstr "git apply [<选项>] [<补丁>...]" -#: config.c:1368 -#, c-format -msgid "invalid value for variable %s" -msgstr "变量 %s 的值无效" +#: builtin/archive.c contrib/scalar/scalar.c +msgid "could not redirect output" +msgstr "不能重定向输出" -#: config.c:1389 -#, c-format -msgid "ignoring unknown core.fsync component '%s'" -msgstr "忽略未知的 core.fsync 组件 '%s'" +#: builtin/archive.c +msgid "git archive: Remote with no URL" +msgstr "git archive：未提供远程 URL" -#: config.c:1425 -#, c-format -msgid "bad boolean config value '%s' for '%s'" -msgstr "'%2$s' 的错误的布尔取值 '%1$s'" +#: builtin/archive.c +msgid "git archive: expected ACK/NAK, got a flush packet" +msgstr "git archive：期望是 ACK/NAK，却得到 flush 包" -#: config.c:1443 +#: builtin/archive.c #, c-format -msgid "failed to expand user dir in: '%s'" -msgstr "无法扩展用户目录：'%s'" +msgid "git archive: NACK %s" +msgstr "git archive：NACK %s" -#: config.c:1452 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" +#: builtin/archive.c +msgid "git archive: protocol error" +msgstr "git archive：协议错误" -#: config.c:1545 -#, c-format -msgid "abbrev length out of range: %d" -msgstr "缩写长度超出范围：%d" +#: builtin/archive.c +msgid "git archive: expected a flush" +msgstr "git archive：应有一个 flush 包" -#: config.c:1559 config.c:1570 -#, c-format -msgid "bad zlib compression level %d" -msgstr "错误的 zlib 压缩级别 %d" +#: builtin/bisect--helper.c +msgid "git bisect--helper --bisect-reset []" +msgstr "git bisect--helper --bisect-reset [<提交>]" -#: config.c:1660 -msgid "core.commentChar should only be one character" -msgstr "core.commentChar 应该是一个字符" +#: builtin/bisect--helper.c +msgid "" +"git bisect--helper --bisect-start [--term-{new,bad}= --term-{old,good}" +"=] [--no-checkout] [--first-parent] [ [...]] [--] " +"[...]" +msgstr "" +"git bisect--helper --bisect-start [--term-{new,bad}=<术语> --term-{old,good}" +"=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径>...]" -#: config.c:1692 -#, c-format -msgid "ignoring unknown core.fsyncMethod value '%s'" -msgstr "忽略未知的 core.fsyncMethod 值 '%s'" +#: builtin/bisect--helper.c +msgid "git bisect--helper --bisect-state (bad|new) []" +msgstr "git bisect--helper --bisect-state (bad|new) [<版本>]" -#: config.c:1698 -msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead" -msgstr "core.fsyncObjectFiles 已经被弃用；取而代之使用 core.fsync" +#: builtin/bisect--helper.c +msgid "git bisect--helper --bisect-state (good|old) [...]" +msgstr "git bisect--helper --bisect-state (good|old) [<版本>...]" + +#: builtin/bisect--helper.c +msgid "git bisect--helper --bisect-replay " +msgstr "git bisect--helper --bisect-replay <文件>" + +#: builtin/bisect--helper.c +msgid "git bisect--helper --bisect-skip [(|)...]" +msgstr "git bisect--helper --bisect-skip [(<版本>|<范围>)...]" + +#: builtin/bisect--helper.c +msgid "git bisect--helper --bisect-run ..." +msgstr "git bisect--helper --bisect-run <命令>..." -#: config.c:1714 +#: builtin/bisect--helper.c #, c-format -msgid "invalid mode for object creation: %s" -msgstr "无效的对象创建模式：%s" +msgid "cannot open file '%s' in mode '%s'" +msgstr "不能以 '%2$s' 模式打开文件 '%1$s'" -#: config.c:1800 +#: builtin/bisect--helper.c #, c-format -msgid "malformed value for %s" -msgstr "%s 的取值格式错误" +msgid "could not write to file '%s'" +msgstr "不能写入文件 '%s'" -#: config.c:1826 +#: builtin/bisect--helper.c #, c-format -msgid "malformed value for %s: %s" -msgstr "%s 的取值格式错误：%s" +msgid "cannot open file '%s' for reading" +msgstr "不能打开文件 '%s' 来读取" -#: config.c:1827 -msgid "must be one of nothing, matching, simple, upstream or current" -msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current" - -#: config.c:1888 builtin/pack-objects.c:4078 -#, c-format -msgid "bad pack compression level %d" -msgstr "错误的打包压缩级别 %d" - -#: config.c:2014 -#, c-format -msgid "unable to load config blob object '%s'" -msgstr "无法从数据对象 '%s' 加载配置" - -#: config.c:2017 +#: builtin/bisect--helper.c #, c-format -msgid "reference '%s' does not point to a blob" -msgstr "引用 '%s' 没有指向一个数据对象" +msgid "'%s' is not a valid term" +msgstr "'%s' 不是一个有效的术语" -#: config.c:2035 +#: builtin/bisect--helper.c #, c-format -msgid "unable to resolve config blob '%s'" -msgstr "不能解析配置对象 '%s'" +msgid "can't use the builtin command '%s' as a term" +msgstr "不能使用内置命令 '%s' 作为术语" -#: config.c:2080 +#: builtin/bisect--helper.c #, c-format -msgid "failed to parse %s" -msgstr "无法解析 %s" - -#: config.c:2136 -msgid "unable to parse command-line config" -msgstr "无法解析命令行中的配置" +msgid "can't change the meaning of the term '%s'" +msgstr "不能修改术语 '%s' 的含义" -#: config.c:2512 -msgid "unknown error occurred while reading the configuration files" -msgstr "在读取配置文件时遇到未知错误" +#: builtin/bisect--helper.c +msgid "please use two different terms" +msgstr "请使用两个不同的术语" -#: config.c:2686 +#: builtin/bisect--helper.c #, c-format -msgid "Invalid %s: '%s'" -msgstr "无效 %s：'%s'" +msgid "We are not bisecting.\n" +msgstr "我们没有在二分查找。\n" -#: config.c:2731 +#: builtin/bisect--helper.c #, c-format -msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" -msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" +msgid "'%s' is not a valid commit" +msgstr "'%s' 不是一个有效的提交" -#: config.c:2763 +#: builtin/bisect--helper.c #, c-format -msgid "unable to parse '%s' from command-line config" -msgstr "无法解析命令行配置中的 '%s'" +msgid "" +"could not check out original HEAD '%s'. Try 'git bisect reset '." +msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。" -#: config.c:2765 +#: builtin/bisect--helper.c #, c-format -msgid "bad config variable '%s' in file '%s' at line %d" -msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" +msgid "Bad bisect_write argument: %s" +msgstr "坏的 bisect_write 参数：%s" -#: config.c:2850 +#: builtin/bisect--helper.c #, c-format -msgid "invalid section name '%s'" -msgstr "无效的小节名称 '%s'" +msgid "couldn't get the oid of the rev '%s'" +msgstr "无法获取版本 '%s' 的对象 ID" -#: config.c:2882 +#: builtin/bisect--helper.c #, c-format -msgid "%s has multiple values" -msgstr "%s 有多个取值" +msgid "couldn't open the file '%s'" +msgstr "无法打开文件 '%s'" -#: config.c:2911 +#: builtin/bisect--helper.c #, c-format -msgid "failed to write new configuration file %s" -msgstr "无法写入新的配置文件 %s" +msgid "Invalid command: you're currently in a %s/%s bisect" +msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中" -#: config.c:3177 config.c:3518 +#: builtin/bisect--helper.c #, c-format -msgid "could not lock config file %s" -msgstr "不能锁定配置文件 %s" +msgid "" +"You need to give me at least one %s and %s revision.\n" +"You can use \"git bisect %s\" and \"git bisect %s\" for that." +msgstr "" +"您需要给我至少一个 %s 和一个 %s 版本。\n" +"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" -#: config.c:3188 +#: builtin/bisect--helper.c #, c-format -msgid "opening %s" -msgstr "打开 %s" +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one %s and %s revision.\n" +"You can use \"git bisect %s\" and \"git bisect %s\" for that." +msgstr "" +"您需要执行 \"git bisect start\" 来开始。\n" +"然后需要提供我至少一个 %s 和一个 %s 版本。\n" +"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。" -#: config.c:3225 builtin/config.c:361 +#: builtin/bisect--helper.c #, c-format -msgid "invalid pattern: %s" -msgstr "无效模式：%s" +msgid "bisecting only with a %s commit" +msgstr "在只有一个 %s 提交的情况下二分查找" -#: config.c:3250 -#, c-format -msgid "invalid config file %s" -msgstr "无效的配置文件 %s" +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#. +#: builtin/bisect--helper.c +msgid "Are you sure [Y/n]? " +msgstr "您确认么[Y/n]？ " -#: config.c:3263 config.c:3531 -#, c-format -msgid "fstat on %s failed" -msgstr "对 %s 调用 fstat 失败" +#: builtin/bisect--helper.c +msgid "status: waiting for both good and bad commits\n" +msgstr "状态：正在等待好的和坏的提交\n" -#: config.c:3274 +#: builtin/bisect--helper.c #, c-format -msgid "unable to mmap '%s'%s" -msgstr "不能 mmap '%s'%s" +msgid "status: waiting for bad commit, %d good commit known\n" +msgid_plural "status: waiting for bad commit, %d good commits known\n" +msgstr[0] "状态：正在等待坏的提交，已知 %d 个好的提交\n" +msgstr[1] "状态：正在等待坏的提交，已知 %d 个好的提交\n" -#: config.c:3284 config.c:3536 -#, c-format -msgid "chmod on %s failed" -msgstr "对 %s 调用 chmod 失败" +#: builtin/bisect--helper.c +msgid "status: waiting for good commit(s), bad commit known\n" +msgstr "状态：正在等待好的提交，已知坏的提交\n" -#: config.c:3369 config.c:3633 -#, c-format -msgid "could not write config file %s" -msgstr "不能写入配置文件 %s" +#: builtin/bisect--helper.c +msgid "no terms defined" +msgstr "未定义术语" -#: config.c:3403 +#: builtin/bisect--helper.c #, c-format -msgid "could not set '%s' to '%s'" -msgstr "不能设置 '%s' 为 '%s'" +msgid "" +"Your current terms are %s for the old state\n" +"and %s for the new state.\n" +msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n" -#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893 +#: builtin/bisect--helper.c #, c-format -msgid "could not unset '%s'" -msgstr "不能取消设置 '%s'" +msgid "" +"invalid argument %s for 'git bisect terms'.\n" +"Supported options are: --term-good|--term-old and --term-bad|--term-new." +msgstr "" +"命令 'git bisect terms' 的参数 %s 无效。\n" +"支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。" -#: config.c:3509 -#, c-format -msgid "invalid section name: %s" -msgstr "无效的小节名称：%s" +#: builtin/bisect--helper.c +msgid "revision walk setup failed\n" +msgstr "版本遍历设置失败\n" -#: config.c:3676 +#: builtin/bisect--helper.c #, c-format -msgid "missing value for '%s'" -msgstr "%s 的取值缺失" - -#: connect.c:61 -msgid "the remote end hung up upon initial contact" -msgstr "远端在初始连接时即挂断" +msgid "could not open '%s' for appending" +msgstr "无法打开 '%s' 进行追加" -#: connect.c:63 -msgid "" -"Could not read from remote repository.\n" -"\n" -"Please make sure you have the correct access rights\n" -"and the repository exists." -msgstr "" -"无法读取远程仓库。\n" -"\n" -"请确认您有正确的访问权限并且仓库存在。" +#: builtin/bisect--helper.c +msgid "'' is not a valid term" +msgstr "'' 不是一个有效的术语" -#: connect.c:81 +#: builtin/bisect--helper.c #, c-format -msgid "server doesn't support '%s'" -msgstr "服务器不支持 '%s'" +msgid "unrecognized option: '%s'" +msgstr "未识别的选项：'%s'" -#: connect.c:118 +#: builtin/bisect--helper.c #, c-format -msgid "server doesn't support feature '%s'" -msgstr "服务器不支持特性 '%s'" +msgid "'%s' does not appear to be a valid revision" +msgstr "'%s' 看起来不是一个有效的版本" -#: connect.c:129 -msgid "expected flush after capabilities" -msgstr "在能力之后应为一个 flush 包" +#: builtin/bisect--helper.c +msgid "bad HEAD - I need a HEAD" +msgstr "坏的 HEAD - 我需要一个 HEAD" -#: connect.c:265 +#: builtin/bisect--helper.c #, c-format -msgid "ignoring capabilities after first line '%s'" -msgstr "忽略第一行 '%s' 之后的能力字段" +msgid "checking out '%s' failed. Try 'git bisect start '." +msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。" -#: connect.c:286 -msgid "protocol error: unexpected capabilities^{}" -msgstr "协议错误：意外的 capabilities^{}" +#: builtin/bisect--helper.c +msgid "won't bisect on cg-seek'ed tree" +msgstr "不会在做了 cg-seek 的树上做二分查找" -#: connect.c:308 +#: builtin/bisect--helper.c +msgid "bad HEAD - strange symbolic ref" +msgstr "坏的 HEAD - 奇怪的符号引用" + +#: builtin/bisect--helper.c #, c-format -msgid "protocol error: expected shallow sha-1, got '%s'" -msgstr "协议错误：预期浅克隆 sha-1，却得到 '%s'" +msgid "invalid ref: '%s'" +msgstr "无效的引用：'%s'" -#: connect.c:310 -msgid "repository on the other end cannot be shallow" -msgstr "另一端的仓库不能是浅克隆仓库" +#: builtin/bisect--helper.c +msgid "You need to start by \"git bisect start\"\n" +msgstr "您需要执行 \"git bisect start\" 来开始\n" -#: connect.c:349 -msgid "invalid packet" -msgstr "无效数据包" +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#. +#: builtin/bisect--helper.c +msgid "Do you want me to do it for you [Y/n]? " +msgstr "您想让我为您这样做么[Y/n]？ " + +#: builtin/bisect--helper.c +msgid "Please call `--bisect-state` with at least one argument" +msgstr "请使用至少一个参数调用 `--bisect-state`" -#: connect.c:369 +#: builtin/bisect--helper.c #, c-format -msgid "protocol error: unexpected '%s'" -msgstr "协议错误：意外的 '%s'" +msgid "'git bisect %s' can take only one argument." +msgstr "'git bisect %s' 只能带一个参数。" -#: connect.c:499 +#: builtin/bisect--helper.c #, c-format -msgid "unknown object format '%s' specified by server" -msgstr "服务器给出未知的对象格式 '%s'" +msgid "Bad rev input: %s" +msgstr "坏的版本输入：%s" -#: connect.c:528 +#: builtin/bisect--helper.c #, c-format -msgid "invalid ls-refs response: %s" -msgstr "无效的 ls-refs 响应：%s" +msgid "Bad rev input (not a commit): %s" +msgstr "坏的版本输入（不是提交）：%s" -#: connect.c:532 -msgid "expected flush after ref listing" -msgstr "在引用列表之后应该有一个 flush 包" +#: builtin/bisect--helper.c +msgid "We are not bisecting." +msgstr "我们没有在二分查找。" -#: connect.c:535 -msgid "expected response end packet after ref listing" -msgstr "在引用列表之后应该有响应结束包" +#: builtin/bisect--helper.c +#, c-format +msgid "'%s'?? what are you talking about?" +msgstr "'%s'?? 您在说什么?" -#: connect.c:670 +#: builtin/bisect--helper.c #, c-format -msgid "protocol '%s' is not supported" -msgstr "不支持 '%s' 协议" +msgid "cannot read file '%s' for replaying" +msgstr "不能读取文件 '%s' 来重放" -#: connect.c:721 -msgid "unable to set SO_KEEPALIVE on socket" -msgstr "无法为 socket 设置 SO_KEEPALIVE" +#: builtin/bisect--helper.c +#, c-format +msgid "running %s\n" +msgstr "正在执行 %s\n" -#: connect.c:761 connect.c:824 +#: builtin/bisect--helper.c +msgid "bisect run failed: no command provided." +msgstr "二分查找运行失败：没有提供命令。" + +#: builtin/bisect--helper.c #, c-format -msgid "Looking up %s ... " -msgstr "查找 %s ..." +msgid "unable to verify '%s' on good revision" +msgstr "无法在好版本中验证 '%s'" -#: connect.c:765 +#: builtin/bisect--helper.c #, c-format -msgid "unable to look up %s (port %s) (%s)" -msgstr "无法查找 %s（端口 %s）（%s）" +msgid "bogus exit code %d for good revision" +msgstr "好版本返回错误的退出码 %d" -#. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:769 connect.c:840 +#: builtin/bisect--helper.c #, c-format -msgid "" -"done.\n" -"Connecting to %s (port %s) ... " -msgstr "" -"完成。\n" -"连接到 %s（端口 %s）... " +msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" +msgstr "二分查找运行失败：命令 '%2$s' 的退出码 %1$d < 0 或 >= 128" -#: connect.c:791 connect.c:868 +#: builtin/bisect--helper.c #, c-format -msgid "" -"unable to connect to %s:\n" -"%s" -msgstr "" -"无法连接到 %s：\n" -"%s" +msgid "cannot open file '%s' for writing" +msgstr "无法打开文件 '%s' 进行写入" -#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:797 connect.c:874 -msgid "done." -msgstr "完成。" +#: builtin/bisect--helper.c +msgid "bisect run cannot continue any more" +msgstr "二分查找不能继续运行" -#: connect.c:828 +#: builtin/bisect--helper.c #, c-format -msgid "unable to look up %s (%s)" -msgstr "无法查找 %s（%s）" +msgid "bisect run success" +msgstr "二分查找运行成功" -#: connect.c:834 +#: builtin/bisect--helper.c #, c-format -msgid "unknown port %s" -msgstr "未知端口 %s" +msgid "bisect found first bad commit" +msgstr "二分查找找到了第一个坏的提交" -#: connect.c:971 connect.c:1303 +#: builtin/bisect--helper.c #, c-format -msgid "strange hostname '%s' blocked" -msgstr "已阻止奇怪的主机名 '%s'" - -#: connect.c:973 -#, c-format -msgid "strange port '%s' blocked" -msgstr "已阻止奇怪的端口号 '%s'" +msgid "" +"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " +"code %d" +msgstr "二分查找运行失败：'git bisect--helper --bisect-state %s' 退出码为 %d" -#: connect.c:983 -#, c-format -msgid "cannot start proxy %s" -msgstr "不能启动代理 %s" +#: builtin/bisect--helper.c +msgid "reset the bisection state" +msgstr "清除二分查找状态" -#: connect.c:1054 -msgid "no path specified; see 'git help pull' for valid url syntax" -msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法" +#: builtin/bisect--helper.c +msgid "check whether bad or good terms exist" +msgstr "检查坏的或好的术语是否存在" -#: connect.c:1194 -msgid "newline is forbidden in git:// hosts and repo paths" -msgstr "在 git:// 主机和仓库路径中禁止使用换行符" +#: builtin/bisect--helper.c +msgid "print out the bisect terms" +msgstr "打印二分查找术语" -#: connect.c:1251 -msgid "ssh variant 'simple' does not support -4" -msgstr "ssh 变体 'simple' 不支持 -4" +#: builtin/bisect--helper.c +msgid "start the bisect session" +msgstr "启动二分查找过程" -#: connect.c:1263 -msgid "ssh variant 'simple' does not support -6" -msgstr "ssh 变体 'simple' 不支持 -6" +#: builtin/bisect--helper.c +msgid "find the next bisection commit" +msgstr "查询下一个二分查找提交" -#: connect.c:1280 -msgid "ssh variant 'simple' does not support setting port" -msgstr "ssh 变体 'simple' 不支持设置端口" +#: builtin/bisect--helper.c +msgid "mark the state of ref (or refs)" +msgstr "标记引用的状态" -#: connect.c:1392 -#, c-format -msgid "strange pathname '%s' blocked" -msgstr "已阻止奇怪的路径名 '%s'" +#: builtin/bisect--helper.c +msgid "list the bisection steps so far" +msgstr "列出到目前为止的二分查找步骤" -#: connect.c:1440 -msgid "unable to fork" -msgstr "无法 fork" +#: builtin/bisect--helper.c +msgid "replay the bisection process from the given file" +msgstr "从给定文件重放二分查找进程" -#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57 -msgid "Checking connectivity" -msgstr "正在检查连通性" +#: builtin/bisect--helper.c +msgid "skip some commits for checkout" +msgstr "跳过要检出的一些提交" -#: connected.c:122 -msgid "Could not run 'git rev-list'" -msgstr "不能执行 'git rev-list'" +#: builtin/bisect--helper.c +msgid "visualize the bisection" +msgstr "可视化二分查找过程" -#: connected.c:146 -msgid "failed write to rev-list" -msgstr "写入 rev-list 失败" +#: builtin/bisect--helper.c +msgid "use ... to automatically bisect" +msgstr "使用 <命令>... 来自动二分查找" -#: connected.c:151 -msgid "failed to close rev-list's stdin" -msgstr "无法关闭 rev-list 的标准输入" +#: builtin/bisect--helper.c +msgid "no log for BISECT_WRITE" +msgstr "BISECT_WRITE 无日志" -#: convert.c:183 -#, c-format -msgid "illegal crlf_action %d" -msgstr "非法的 crlf_action %d" +#: builtin/bisect--helper.c +msgid "--bisect-reset requires either no argument or a commit" +msgstr "--bisect-reset 无需参数或者需要一个提交" -#: convert.c:196 -#, c-format -msgid "CRLF would be replaced by LF in %s" -msgstr "%s 中的 CRLF 将被 LF 替换" +#: builtin/bisect--helper.c +msgid "--bisect-terms requires 0 or 1 argument" +msgstr "--bisect-terms 需要 0 或 1 个参数" -#: convert.c:198 -#, c-format -msgid "" -"CRLF will be replaced by LF in %s.\n" -"The file will have its original line endings in your working directory" -msgstr "" -"%s 中的 CRLF 将被 LF 替换。<\n" -"在工作区中该文件仍保持原有的换行符。" +#: builtin/bisect--helper.c +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next 需要 0 个参数" -#: convert.c:206 -#, c-format -msgid "LF would be replaced by CRLF in %s" -msgstr "文件 %s 中的 LF 将被 CRLF 替换" +#: builtin/bisect--helper.c +msgid "--bisect-log requires 0 arguments" +msgstr "--bisect-log 需要 0 个参数" -#: convert.c:208 -#, c-format -msgid "" -"LF will be replaced by CRLF in %s.\n" -"The file will have its original line endings in your working directory" -msgstr "" -"%s 中的 LF 将被 CRLF 替换。\n" -"在工作区中该文件仍保持原有的换行符" +#: builtin/bisect--helper.c +msgid "no logfile given" +msgstr "未提供日志文件" -#: convert.c:273 -#, c-format -msgid "BOM is prohibited in '%s' if encoded as %s" -msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM" +#: builtin/blame.c +msgid "git blame [] [] [] [--] " +msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" -#: convert.c:280 -#, c-format -msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." -msgstr "" -"文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%.*s 作为工作区编码。" +#: builtin/blame.c +msgid " are documented in git-rev-list(1)" +msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" -#: convert.c:293 +#: builtin/blame.c #, c-format -msgid "BOM is required in '%s' if encoded as %s" -msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM" +msgid "expecting a color: %s" +msgstr "期望一个颜色：%s" -#: convert.c:295 -#, c-format -msgid "" -"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" -"%sLE (depending on the byte order) as working-tree-encoding." -msgstr "" -"文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字" -"节序）作为工作区编码。" +#: builtin/blame.c +msgid "must end with a color" +msgstr "必须以一个颜色结尾" -#: convert.c:408 convert.c:479 +#: builtin/blame.c #, c-format -msgid "failed to encode '%s' from %s to %s" -msgstr "无法对 '%s' 进行从 %s 到 %s 的编码" +msgid "cannot find revision %s to ignore" +msgstr "不能找到要忽略的版本 %s" -#: convert.c:451 -#, c-format -msgid "encoding '%s' from %s to %s and back is not the same" -msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致" +#: builtin/blame.c +msgid "show blame entries as we find them, incrementally" +msgstr "增量式地显示发现的 blame 条目" -#: convert.c:654 -#, c-format -msgid "cannot fork to run external filter '%s'" -msgstr "不能 fork 以执行外部过滤器 '%s'" +#: builtin/blame.c +msgid "do not show object names of boundary commits (Default: off)" +msgstr "不显示边界提交的对象名（默认：关闭）" -#: convert.c:674 -#, c-format -msgid "cannot feed the input to external filter '%s'" -msgstr "不能将输入传递给外部过滤器 '%s'" +#: builtin/blame.c +msgid "do not treat root commits as boundaries (Default: off)" +msgstr "不把根提交作为边界（默认：关闭）" -#: convert.c:681 -#, c-format -msgid "external filter '%s' failed %d" -msgstr "外部过滤器 '%s' 失败码 %d" +#: builtin/blame.c +msgid "show work cost statistics" +msgstr "显示工作消耗统计" -#: convert.c:716 convert.c:719 -#, c-format -msgid "read from external filter '%s' failed" -msgstr "从外部过滤器 '%s' 读取失败" +#: builtin/blame.c builtin/checkout.c builtin/clone.c builtin/commit-graph.c +#: builtin/fetch.c builtin/merge.c builtin/multi-pack-index.c builtin/pull.c +#: builtin/push.c builtin/remote.c builtin/send-pack.c +msgid "force progress reporting" +msgstr "强制显示进度报告" -#: convert.c:722 convert.c:777 -#, c-format -msgid "external filter '%s' failed" -msgstr "外部过滤器 '%s' 失败" +#: builtin/blame.c +msgid "show output score for blame entries" +msgstr "显示 blame 条目的输出得分" -#: convert.c:826 -msgid "unexpected filter type" -msgstr "意外的过滤类型" +#: builtin/blame.c +msgid "show original filename (Default: auto)" +msgstr "显示原始文件名（默认：自动）" -#: convert.c:837 -msgid "path name too long for external filter" -msgstr "外部过滤器的路径名太长" +#: builtin/blame.c +msgid "show original linenumber (Default: off)" +msgstr "显示原始的行号（默认：关闭）" -#: convert.c:935 -#, c-format -msgid "" -"external filter '%s' is not available anymore although not all paths have " -"been filtered" -msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤" +#: builtin/blame.c +msgid "show in a format designed for machine consumption" +msgstr "显示为一个适合机器读取的格式" -#: convert.c:1236 -msgid "true/false are no valid working-tree-encodings" -msgstr "true/false 不是有效的工作区编码" +#: builtin/blame.c +msgid "show porcelain format with per-line commit information" +msgstr "为每一行显示机器适用的提交信息" -#: convert.c:1416 convert.c:1449 -#, c-format -msgid "%s: clean filter '%s' failed" -msgstr "%s：clean 过滤器 '%s' 失败" +#: builtin/blame.c +msgid "use the same output mode as git-annotate (Default: off)" +msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" -#: convert.c:1492 -#, c-format -msgid "%s: smudge filter %s failed" -msgstr "%s：smudge 过滤器 %s 失败" +#: builtin/blame.c +msgid "show raw timestamp (Default: off)" +msgstr "显示原始时间戳（默认：关闭）" -#: credential.c:96 -#, c-format -msgid "skipping credential lookup for key: credential.%s" -msgstr "跳过凭据查询：credential.%s" +#: builtin/blame.c +msgid "show long commit SHA1 (Default: off)" +msgstr "显示长的 SHA1 提交号（默认：关闭）" -#: credential.c:112 -msgid "refusing to work with credential missing host field" -msgstr "拒绝使用缺少主机字段的凭据" +#: builtin/blame.c +msgid "suppress author name and timestamp (Default: off)" +msgstr "隐藏作者名字和时间戳（默认：关闭）" -#: credential.c:114 -msgid "refusing to work with credential missing protocol field" -msgstr "拒绝使用缺少协议字段的凭据" +#: builtin/blame.c +msgid "show author email instead of name (Default: off)" +msgstr "显示作者的邮箱而不是名字（默认：关闭）" -#: credential.c:396 -#, c-format -msgid "url contains a newline in its %s component: %s" -msgstr "URL 的 %s 组件中包含换行符：%s" +#: builtin/blame.c +msgid "ignore whitespace differences" +msgstr "忽略空白差异" -#: credential.c:440 -#, c-format -msgid "url has no scheme: %s" -msgstr "URL 没有 scheme：%s" +#: builtin/blame.c builtin/log.c +msgid "rev" +msgstr "版本" -#: credential.c:513 -#, c-format -msgid "credential url cannot be parsed: %s" -msgstr "不能解析凭据 URL：%s" +#: builtin/blame.c +msgid "ignore when blaming" +msgstr "在执行 blame 操作时忽略 <版本>" -#: date.c:139 -msgid "in the future" -msgstr "在将来" +#: builtin/blame.c +msgid "ignore revisions from " +msgstr "忽略来自 <文件> 中的版本" -#: date.c:145 -#, c-format -msgid "% second ago" -msgid_plural "% seconds ago" -msgstr[0] "% 秒钟前" -msgstr[1] "% 秒钟前" +#: builtin/blame.c +msgid "color redundant metadata from previous line differently" +msgstr "使用颜色间隔输出与前一行不同的重复元信息" -#: date.c:152 -#, c-format -msgid "% minute ago" -msgid_plural "% minutes ago" -msgstr[0] "% 分钟前" -msgstr[1] "% 分钟前" +#: builtin/blame.c +msgid "color lines by age" +msgstr "依据时间着色" -#: date.c:159 -#, c-format -msgid "% hour ago" -msgid_plural "% hours ago" -msgstr[0] "% 小时前" -msgstr[1] "% 小时前" +#: builtin/blame.c +msgid "spend extra cycles to find better match" +msgstr "花费额外的循环来找到更好的匹配" -#: date.c:166 -#, c-format -msgid "% day ago" -msgid_plural "% days ago" -msgstr[0] "% 天前" -msgstr[1] "% 天前" +#: builtin/blame.c +msgid "use revisions from instead of calling git-rev-list" +msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" -#: date.c:172 -#, c-format -msgid "% week ago" -msgid_plural "% weeks ago" -msgstr[0] "% 周前" -msgstr[1] "% 周前" +#: builtin/blame.c +msgid "use 's contents as the final image" +msgstr "使用 <文件> 的内容作为最终的镜像" -#: date.c:179 -#, c-format -msgid "% month ago" -msgid_plural "% months ago" -msgstr[0] "% 个月前" -msgstr[1] "% 个月前" +#: builtin/blame.c +msgid "score" +msgstr "得分" -#: date.c:190 -#, c-format -msgid "% year" -msgid_plural "% years" -msgstr[0] "% 年" -msgstr[1] "% 年" +#: builtin/blame.c +msgid "find line copies within and across files" +msgstr "找到文件内及跨文件的行拷贝" -#. TRANSLATORS: "%s" is " years" -#: date.c:193 -#, c-format -msgid "%s, % month ago" -msgid_plural "%s, % months ago" -msgstr[0] "%s % 个月前" -msgstr[1] "%s % 个月前" - -#: date.c:198 date.c:203 -#, c-format -msgid "% year ago" -msgid_plural "% years ago" -msgstr[0] "% 年前" -msgstr[1] "% 年前" +#: builtin/blame.c +msgid "find line movements within and across files" +msgstr "找到文件内及跨文件的行移动" -#: delta-islands.c:272 -msgid "Propagating island marks" -msgstr "正在传播数据岛标记" +#: builtin/blame.c +msgid "range" +msgstr "范围" -#: delta-islands.c:290 -#, c-format -msgid "bad tree object %s" -msgstr "坏的树对象 %s" +#: builtin/blame.c +msgid "process only line range , or function :" +msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数名>" -#: delta-islands.c:334 -#, c-format -msgid "failed to load island regex for '%s': %s" -msgstr "未能加载 '%s' 的数据岛正则表达式：%s" +#: builtin/blame.c +msgid "--progress can't be used with --incremental or porcelain formats" +msgstr "--progress 不能和 --incremental 或机器内部格式一起使用" -#: delta-islands.c:390 -#, c-format -msgid "island regex from config has too many capture groups (max=%d)" -msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 %d 个）" +#. TRANSLATORS: This string is used to tell us the +#. maximum display width for a relative timestamp in +#. "git blame" output. For C locale, "4 years, 11 +#. months ago", which takes 22 places, is the longest +#. among various forms of relative timestamps, but +#. your language may need more or fewer display +#. columns. +#. +#: builtin/blame.c +msgid "4 years, 11 months ago" +msgstr "4 年 11 个月前" -#: delta-islands.c:467 +#: builtin/blame.c #, c-format -msgid "Marked %d islands, done.\n" -msgstr "已标记 %d 个数据岛，结束。\n" +msgid "file %s has only %lu line" +msgid_plural "file %s has only %lu lines" +msgstr[0] "文件 %s 只有 %lu 行" +msgstr[1] "文件 %s 只有 %lu 行" -#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37 -#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203 -#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742 -#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45 -#: builtin/pull.c:47 builtin/pull.c:321 -#, c-format -msgid "invalid value for '%s': '%s'" -msgstr "'%s' 的值无效：'%s'" +#: builtin/blame.c +msgid "Blaming lines" +msgstr "追踪代码行" -#: diff-lib.c:561 -msgid "--merge-base does not work with ranges" -msgstr "--merge-base 不适用于范围" +#: builtin/branch.c +msgid "git branch [] [-r | -a] [--merged] [--no-merged]" +msgstr "git branch [<选项>] [-r | -a] [--merged] [--no-merged]" -#: diff-lib.c:563 -msgid "--merge-base only works with commits" -msgstr "--merge-base 仅适用于提交" +#: builtin/branch.c +msgid "" +"git branch [] [-f] [--recurse-submodules] []" +msgstr "git branch [<选项>] [-f] [--recurse-submodules] <分支名> [<起始点>]" -#: diff-lib.c:580 -msgid "unable to get HEAD" -msgstr "不能解析 HEAD" +#: builtin/branch.c +msgid "git branch [] [-l] [...]" +msgstr "git branch [<选项>] [-l] [<模式>...]" -#: diff-lib.c:587 -msgid "no merge base found" -msgstr "未找到合并基线" +#: builtin/branch.c +msgid "git branch [] [-r] (-d | -D) ..." +msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." -#: diff-lib.c:589 -msgid "multiple merge bases found" -msgstr "找到了多条合并基线" +#: builtin/branch.c +msgid "git branch [] (-m | -M) [] " +msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" -#: diff-no-index.c:237 -msgid "git diff --no-index [] " -msgstr "git diff --no-index [<选项>] <路径> <路径>" +#: builtin/branch.c +msgid "git branch [] (-c | -C) [] " +msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>" -#: diff-no-index.c:262 -msgid "" -"Not a git repository. Use --no-index to compare two paths outside a working " -"tree" -msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径" +#: builtin/branch.c +msgid "git branch [] [-r | -a] [--points-at]" +msgstr "git branch [<选项>] [-r | -a] [--points-at]" -# 译者：注意保持前导空格 -#: diff.c:159 -#, c-format -msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n" +#: builtin/branch.c +msgid "git branch [] [-r | -a] [--format]" +msgstr "git branch [<选项>] [-r | -a] [--format]" -# 译者：注意保持前导空格 -#: diff.c:164 +# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 +#: builtin/branch.c #, c-format -msgid " Unknown dirstat parameter '%s'\n" -msgstr " 未知的 dirstat 参数 '%s'\n" - -#: diff.c:300 msgid "" -"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " -"'dimmed-zebra', 'plain'" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." msgstr "" -"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 " -"'plain'" +"将要删除的分支 '%s' 已经被合并到\n" +" '%s'，但未合并到 HEAD。" -#: diff.c:328 +# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 +#: builtin/branch.c #, c-format msgid "" -"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " -"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." msgstr "" -"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-" -"space-at-eol'、'ignore-all-space'、'allow-indentation-change'" - -#: diff.c:336 -msgid "" -"color-moved-ws: allow-indentation-change cannot be combined with other " -"whitespace modes" -msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用" +"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" +" 然而却尚未被合并到分支 '%s' 。" -#: diff.c:413 +#: builtin/branch.c #, c-format -msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" +msgid "Couldn't look up commit object for '%s'" +msgstr "无法查询 '%s' 指向的提交对象" -#: diff.c:473 +#: builtin/branch.c #, c-format msgid "" -"Found errors in 'diff.dirstat' config variable:\n" -"%s" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -"发现配置变量 'diff.dirstat' 中的错误：\n" -"%s" +"分支 '%s' 没有完全合并。\n" +"如果您确认要删除它，执行 'git branch -D %s'。" -#: diff.c:4282 -#, c-format -msgid "external diff died, stopping at %s" -msgstr "外部 diff 退出，停止在 %s" +#: builtin/branch.c +msgid "Update of config-file failed" +msgstr "更新配置文件失败" -#: diff.c:4677 parse-options.c:1114 -#, c-format -msgid "options '%s', '%s', '%s', and '%s' cannot be used together" -msgstr "选项 '%s'、'%s'、'%s' 和 '%s' 不能同时使用" +#: builtin/branch.c +msgid "cannot use -a with -d" +msgstr "不能将 -a 和 -d 同时使用" -#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578 -#, c-format -msgid "options '%s', '%s', and '%s' cannot be used together" -msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用" +#: builtin/branch.c +msgid "Couldn't look up commit object for HEAD" +msgstr "无法查询 HEAD 指向的提交对象" -#: diff.c:4685 +#: builtin/branch.c #, c-format -msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" -msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 一起使用 '%3$s'" +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" -#: diff.c:4689 +#: builtin/branch.c #, c-format -msgid "" -"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:4769 -msgid "--follow requires exactly one pathspec" -msgstr "--follow 明确要求只跟一个路径规格" +msgid "remote-tracking branch '%s' not found." +msgstr "未能找到远程跟踪分支 '%s'。" -#: diff.c:4823 +#: builtin/branch.c #, c-format -msgid "invalid --stat value: %s" -msgstr "无效的 --stat 值：%s" +msgid "branch '%s' not found." +msgstr "分支 '%s' 未发现。" -#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319 -#: parse-options.c:217 parse-options.c:221 +#: builtin/branch.c #, c-format -msgid "%s expects a numerical value" -msgstr "%s 期望一个数字值" +msgid "Deleted remote-tracking branch %s (was %s).\n" +msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n" -#: diff.c:4860 +#: builtin/branch.c #, c-format -msgid "" -"Failed to parse --dirstat/-X option parameter:\n" -"%s" -msgstr "" -"无法解析 --dirstat/-X 选项的参数：\n" -"%s" +msgid "Deleted branch %s (was %s).\n" +msgstr "已删除分支 %s（曾为 %s）。\n" -#: diff.c:4893 -#, c-format -msgid "unknown change class '%c' in --diff-filter=%s" -msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" +#: builtin/branch.c builtin/tag.c +msgid "unable to parse format string" +msgstr "不能解析格式化字符串" -#: diff.c:4917 -#, c-format -msgid "unknown value after ws-error-highlight=%.*s" -msgstr "ws-error-highlight=%.*s 之后未知的值" +#: builtin/branch.c +msgid "could not resolve HEAD" +msgstr "不能解析 HEAD 提交" -#: diff.c:4931 +#: builtin/branch.c #, c-format -msgid "unable to resolve '%s'" -msgstr "不能解析 '%s'" +msgid "HEAD (%s) points outside of refs/heads/" +msgstr "HEAD (%s) 指向 refs/heads/ 之外" -#: diff.c:4981 diff.c:4987 +#: builtin/branch.c #, c-format -msgid "%s expects / form" -msgstr "%s 期望 / 格式" +msgid "Branch %s is being rebased at %s" +msgstr "分支 %s 正被变基到 %s" -#: diff.c:4999 +#: builtin/branch.c #, c-format -msgid "%s expects a character, got '%s'" -msgstr "%s 期望一个字符，得到 '%s'" +msgid "Branch %s is being bisected at %s" +msgstr "分支 %s 正被二分查找于 %s" -#: diff.c:5020 -#, c-format -msgid "bad --color-moved argument: %s" -msgstr "坏的 --color-moved 参数：%s" +#: builtin/branch.c +msgid "cannot copy the current branch while not on any." +msgstr "无法拷贝当前分支因为不处于任何分支上。" + +#: builtin/branch.c +msgid "cannot rename the current branch while not on any." +msgstr "无法重命名当前分支因为不处于任何分支上。" -#: diff.c:5039 +#: builtin/branch.c #, c-format -msgid "invalid mode '%s' in --color-moved-ws" -msgstr "--color-moved-ws 中的无效模式 '%s' " +msgid "Invalid branch name: '%s'" +msgstr "无效的分支名：'%s'" -#: diff.c:5079 -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" +#: builtin/branch.c +msgid "Branch rename failed" +msgstr "分支重命名失败" -#: diff.c:5115 diff.c:5135 -#, c-format -msgid "invalid argument to %s" -msgstr "%s 的参数无效" +#: builtin/branch.c +msgid "Branch copy failed" +msgstr "分支拷贝失败" -#: diff.c:5239 +#: builtin/branch.c #, c-format -msgid "invalid regex given to -I: '%s'" -msgstr "选项 -I 的正则表达式无效：'%s'" +msgid "Created a copy of a misnamed branch '%s'" +msgstr "已为错误命名的分支 '%s' 创建了一个副本" -#: diff.c:5288 +#: builtin/branch.c #, c-format -msgid "failed to parse --submodule option parameter: '%s'" -msgstr "无法解析 --submodule 选项的参数：'%s'" +msgid "Renamed a misnamed branch '%s' away" +msgstr "已将错误命名的分支 '%s' 重命名" -#: diff.c:5344 +#: builtin/branch.c #, c-format -msgid "bad --word-diff argument: %s" -msgstr "坏的 --word-diff 参数：%s" - -#: diff.c:5380 -msgid "Diff output format options" -msgstr "差异输出格式化选项" +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "分支重命名为 %s，但 HEAD 没有更新！" -#: diff.c:5382 diff.c:5388 -msgid "generate patch" -msgstr "生成补丁" +#: builtin/branch.c +msgid "Branch is renamed, but update of config-file failed" +msgstr "分支被重命名，但更新配置文件失败" -#: diff.c:5385 builtin/log.c:180 -msgid "suppress diff output" -msgstr "不显示差异输出" +#: builtin/branch.c +msgid "Branch is copied, but update of config-file failed" +msgstr "分支已拷贝，但更新配置文件失败" -#: diff.c:5390 diff.c:5504 diff.c:5511 -msgid "" -msgstr "" +#: builtin/branch.c +#, c-format +msgid "" +"Please edit the description for the branch\n" +" %s\n" +"Lines starting with '%c' will be stripped.\n" +msgstr "" +"请编辑分支的描述\n" +" %s\n" +"以 '%c' 开头的行将被过滤。\n" -#: diff.c:5391 diff.c:5394 -msgid "generate diffs with lines context" -msgstr "生成含 行上下文的差异" +#: builtin/branch.c +msgid "Generic options" +msgstr "通用选项" -#: diff.c:5396 -msgid "generate the diff in raw format" -msgstr "生成原始格式的差异" +#: builtin/branch.c +msgid "show hash and subject, give twice for upstream branch" +msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" -#: diff.c:5399 -msgid "synonym for '-p --raw'" -msgstr "和 '-p --raw' 同义" +#: builtin/branch.c +msgid "suppress informational messages" +msgstr "不显示信息" -#: diff.c:5403 -msgid "synonym for '-p --stat'" -msgstr "和 '-p --stat' 同义" +#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c +msgid "set branch tracking configuration" +msgstr "设置分支跟踪配置" -#: diff.c:5407 -msgid "machine friendly --stat" -msgstr "机器友好的 --stat" +#: builtin/branch.c +msgid "do not use" +msgstr "不要使用" -#: diff.c:5410 -msgid "output only the last line of --stat" -msgstr "只输出 --stat 的最后一行" +#: builtin/branch.c +msgid "upstream" +msgstr "上游" -#: diff.c:5412 diff.c:5420 -msgid "..." -msgstr "<参数1,参数2>..." +#: builtin/branch.c +msgid "change the upstream info" +msgstr "改变上游信息" -#: diff.c:5413 -msgid "" -"output the distribution of relative amount of changes for each sub-directory" -msgstr "输出每个子目录相对变更的分布" +#: builtin/branch.c +msgid "unset the upstream info" +msgstr "取消上游信息的设置" -#: diff.c:5417 -msgid "synonym for --dirstat=cumulative" -msgstr "和 --dirstat=cumulative 同义" +#: builtin/branch.c +msgid "use colored output" +msgstr "使用彩色输出" -#: diff.c:5421 -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "是 --dirstat=files,param1,param2... 的同义词" +#: builtin/branch.c +msgid "act on remote-tracking branches" +msgstr "作用于远程跟踪分支" -#: diff.c:5425 -msgid "warn if changes introduce conflict markers or whitespace errors" -msgstr "如果变更中引入冲突定界符或空白错误，给出警告" +#: builtin/branch.c +msgid "print only branches that contain the commit" +msgstr "只打印包含该提交的分支" -#: diff.c:5428 -msgid "condensed summary such as creations, renames and mode changes" -msgstr "精简摘要，例如创建、重命名和模式变更" +#: builtin/branch.c +msgid "print only branches that don't contain the commit" +msgstr "只打印不包含该提交的分支" -#: diff.c:5431 -msgid "show only names of changed files" -msgstr "只显示变更文件的文件名" +#: builtin/branch.c +msgid "Specific git-branch actions:" +msgstr "具体的 git-branch 动作：" -#: diff.c:5434 -msgid "show only names and status of changed files" -msgstr "只显示变更文件的文件名和状态" +#: builtin/branch.c +msgid "list both remote-tracking and local branches" +msgstr "列出远程跟踪及本地分支" -#: diff.c:5436 -msgid "[,[,]]" -msgstr "<宽度>[,<文件名宽度>[,<次数>]]" +#: builtin/branch.c +msgid "delete fully merged branch" +msgstr "删除完全合并的分支" -#: diff.c:5437 -msgid "generate diffstat" -msgstr "生成差异统计（diffstat）" +#: builtin/branch.c +msgid "delete branch (even if not merged)" +msgstr "删除分支（即使没有合并）" -#: diff.c:5439 diff.c:5442 diff.c:5445 -msgid "" -msgstr "<宽度>" +#: builtin/branch.c +msgid "move/rename a branch and its reflog" +msgstr "移动/重命名一个分支，以及它的引用日志" -#: diff.c:5440 -msgid "generate diffstat with a given width" -msgstr "使用给定的长度生成差异统计" +#: builtin/branch.c +msgid "move/rename a branch, even if target exists" +msgstr "移动/重命名一个分支，即使目标已存在" -#: diff.c:5443 -msgid "generate diffstat with a given name width" -msgstr "使用给定的文件名长度生成差异统计" +#: builtin/branch.c +msgid "copy a branch and its reflog" +msgstr "拷贝一个分支和它的引用日志" -#: diff.c:5446 -msgid "generate diffstat with a given graph width" -msgstr "使用给定的图形长度生成差异统计" +#: builtin/branch.c +msgid "copy a branch, even if target exists" +msgstr "拷贝一个分支，即使目标已存在" -#: diff.c:5448 -msgid "" -msgstr "<次数>" +#: builtin/branch.c +msgid "list branch names" +msgstr "列出分支名" -#: diff.c:5449 -msgid "generate diffstat with limited lines" -msgstr "生成有限行数的差异统计" +#: builtin/branch.c +msgid "show current branch name" +msgstr "显示当前分支名" -#: diff.c:5452 -msgid "generate compact summary in diffstat" -msgstr "生成差异统计的简洁摘要" +#: builtin/branch.c builtin/submodule--helper.c +msgid "create the branch's reflog" +msgstr "创建分支的引用日志" -#: diff.c:5455 -msgid "output a binary diff that can be applied" -msgstr "输出一个可以应用的二进制差异" +#: builtin/branch.c +msgid "edit the description for the branch" +msgstr "标记分支的描述" -#: diff.c:5458 -msgid "show full pre- and post-image object names on the \"index\" lines" -msgstr "在 \"index\" 行显示完整的前后对象名称" +#: builtin/branch.c +msgid "force creation, move/rename, deletion" +msgstr "强制创建、移动/重命名、删除" -#: diff.c:5460 -msgid "show colored diff" -msgstr "显示带颜色的差异" +#: builtin/branch.c +msgid "print only branches that are merged" +msgstr "只打印已经合并的分支" -#: diff.c:5461 -msgid "" -msgstr "<类型>" +#: builtin/branch.c +msgid "print only branches that are not merged" +msgstr "只打印尚未合并的分支" -#: diff.c:5462 -msgid "" -"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " -"diff" -msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符" +#: builtin/branch.c +msgid "list branches in columns" +msgstr "以列的方式显示分支" -#: diff.c:5465 -msgid "" -"do not munge pathnames and use NULs as output field terminators in --raw or " -"--numstat" -msgstr "" -"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔" -"符" +#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c +msgid "object" +msgstr "对象" -#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583 -msgid "" -msgstr "<前缀>" +#: builtin/branch.c +msgid "print only branches of the object" +msgstr "只打印指向该对象的分支" -#: diff.c:5469 -msgid "show the given source prefix instead of \"a/\"" -msgstr "显示给定的源前缀取代 \"a/\"" +#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c +msgid "sorting and filtering are case insensitive" +msgstr "排序和过滤属于大小写不敏感" -#: diff.c:5472 -msgid "show the given destination prefix instead of \"b/\"" -msgstr "显示给定的目标前缀取代 \"b/\"" +#: builtin/branch.c builtin/ls-files.c +msgid "recurse through submodules" +msgstr "在子模组中递归" -#: diff.c:5475 -msgid "prepend an additional prefix to every line of output" -msgstr "输出的每一行附加前缀" +#: builtin/branch.c builtin/for-each-ref.c builtin/ls-tree.c builtin/tag.c +#: builtin/verify-tag.c +msgid "format to use for the output" +msgstr "输出格式" -#: diff.c:5478 -msgid "do not show any source or destination prefix" -msgstr "不显示任何源和目标前缀" +#: builtin/branch.c builtin/submodule--helper.c submodule.c +msgid "Failed to resolve HEAD as a valid ref." +msgstr "无法将 HEAD 解析为有效引用。" -#: diff.c:5481 -msgid "show context between diff hunks up to the specified number of lines" -msgstr "显示指定行数的差异块间的上下文" +#: builtin/branch.c builtin/clone.c +msgid "HEAD not found below refs/heads!" +msgstr "HEAD 没有位于 /refs/heads 之下！" -#: diff.c:5485 diff.c:5490 diff.c:5495 -msgid "" -msgstr "<字符>" +#: builtin/branch.c +msgid "" +"branch with --recurse-submodules can only be used if submodule." +"propagateBranches is enabled" +msgstr "" +"带有 --recurse-submodules 的分支只能在 submodule.propagateBranches 启用时使用" -#: diff.c:5486 -msgid "specify the character to indicate a new line instead of '+'" -msgstr "指定一个字符取代 '+' 来表示新的一行" +#: builtin/branch.c +msgid "--recurse-submodules can only be used to create branches" +msgstr "--recurse-submodules 只能用于创建分支" -#: diff.c:5491 -msgid "specify the character to indicate an old line instead of '-'" -msgstr "指定一个字符取代 '-' 来表示旧的一行" +#: builtin/branch.c +msgid "branch name required" +msgstr "必须提供分支名" -#: diff.c:5496 -msgid "specify the character to indicate a context instead of ' '" -msgstr "指定一个字符取代 ' ' 来表示一行上下文" +#: builtin/branch.c +msgid "Cannot give description to detached HEAD" +msgstr "不能向分离头指针提供描述" -#: diff.c:5499 -msgid "Diff rename options" -msgstr "差异重命名选项" +#: builtin/branch.c +msgid "cannot edit description of more than one branch" +msgstr "不能为一个以上的分支编辑描述" -#: diff.c:5500 -msgid "[/]" -msgstr "[/]" +#: builtin/branch.c +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "分支 '%s' 尚无提交。" -#: diff.c:5501 -msgid "break complete rewrite changes into pairs of delete and create" -msgstr "将完全重写的变更打破为成对的删除和创建" +#: builtin/branch.c +#, c-format +msgid "No branch named '%s'." +msgstr "没有分支 '%s'。" -#: diff.c:5505 -msgid "detect renames" -msgstr "检测重命名" +#: builtin/branch.c +msgid "too many branches for a copy operation" +msgstr "为拷贝操作提供了太多的分支名" -#: diff.c:5509 -msgid "omit the preimage for deletes" -msgstr "省略删除操作的差异输出" +#: builtin/branch.c +msgid "too many arguments for a rename operation" +msgstr "为重命名操作提供了太多的参数" -#: diff.c:5512 -msgid "detect copies" -msgstr "检测拷贝" +#: builtin/branch.c +msgid "too many arguments to set new upstream" +msgstr "为设置新上游提供了太多的参数" -#: diff.c:5516 -msgid "use unmodified files as source to find copies" -msgstr "使用未修改的文件做为发现拷贝的源" +#: builtin/branch.c +#, c-format +msgid "" +"could not set upstream of HEAD to %s when it does not point to any branch." +msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。" -#: diff.c:5518 -msgid "disable rename detection" -msgstr "禁用重命名探测" +#: builtin/branch.c +#, c-format +msgid "no such branch '%s'" +msgstr "没有此分支 '%s'" -#: diff.c:5521 -msgid "use empty blobs as rename source" -msgstr "使用空的数据对象做为重命名的源" +#: builtin/branch.c +#, c-format +msgid "branch '%s' does not exist" +msgstr "分支 '%s' 不存在" -#: diff.c:5523 -msgid "continue listing the history of a file beyond renames" -msgstr "继续列出文件重命名以外的历史记录" +#: builtin/branch.c +msgid "too many arguments to unset upstream" +msgstr "为取消上游设置操作提供了太多的参数" -#: diff.c:5526 -msgid "" -"prevent rename/copy detection if the number of rename/copy targets exceeds " -"given limit" -msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测" +#: builtin/branch.c +msgid "could not unset upstream of HEAD when it does not point to any branch." +msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" -#: diff.c:5528 -msgid "Diff algorithm options" -msgstr "差异算法选项" +#: builtin/branch.c +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "分支 '%s' 没有上游信息" -#: diff.c:5530 -msgid "produce the smallest possible diff" -msgstr "生成尽可能小的差异" +#: builtin/branch.c +msgid "" +"The -a, and -r, options to 'git branch' do not take a branch name.\n" +"Did you mean to use: -a|-r --list ?" +msgstr "" +"'git branch' 的 -a 和 -r 选项不带一个分支名。\n" +"您是否想要使用：-a|-r --list <模式>？" -#: diff.c:5533 -msgid "ignore whitespace when comparing lines" -msgstr "行比较时忽略空白字符" +#: builtin/branch.c +msgid "" +"the '--set-upstream' option is no longer supported. Please use '--track' or " +"'--set-upstream-to' instead." +msgstr "" +"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" -#: diff.c:5536 -msgid "ignore changes in amount of whitespace" -msgstr "忽略空白字符的变更" +#: builtin/bugreport.c +msgid "git version:\n" +msgstr "git 版本：\n" -#: diff.c:5539 -msgid "ignore changes in whitespace at EOL" -msgstr "忽略行尾的空白字符变更" +#: builtin/bugreport.c +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() 失败，错误为 '%s'（%d）\n" -#: diff.c:5542 -msgid "ignore carrier-return at the end of line" -msgstr "忽略行尾的回车符（CR）" +#: builtin/bugreport.c +msgid "compiler info: " +msgstr "编译器信息：" -#: diff.c:5545 -msgid "ignore changes whose lines are all blank" -msgstr "忽略整行都是空白的变更" +#: builtin/bugreport.c +msgid "libc info: " +msgstr "libc 信息：" -#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617 -msgid "" -msgstr "<正则>" +#: builtin/bugreport.c +msgid "not run from a git repository - no hooks to show\n" +msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n" -#: diff.c:5548 -msgid "ignore changes whose all lines match " -msgstr "忽略所有行都和正则表达式匹配的变更" +#: builtin/bugreport.c +msgid "git bugreport [-o|--output-directory ] [-s|--suffix ]" +msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]" -#: diff.c:5551 -msgid "heuristic to shift diff hunk boundaries for easy reading" -msgstr "启发式转换差异边界以便阅读" - -#: diff.c:5554 -msgid "generate diff using the \"patience diff\" algorithm" -msgstr "使用 \"patience diff\" 算法生成差异" - -#: diff.c:5558 -msgid "generate diff using the \"histogram diff\" algorithm" -msgstr "使用 \"histogram diff\" 算法生成差异" +#: builtin/bugreport.c +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"感谢您填写 Git 错误报告！\n" +"请填写以下问卷，以帮助我们了解您的问题。\n" +"\n" +"在错误发生之前，您做了什么？（重现问题的步骤）\n" +"\n" +"您期望发生什么？（预期行为）\n" +"\n" +"实际发生了什么？（实际行为）\n" +"\n" +"您所期望的与实际发生的有什么不同？\n" +"\n" +"您想要补充的其它内容：\n" +"\n" +"请检查下面错误报告中余下的内容。\n" +"您可以删除任何您不想共享的内容。\n" -#: diff.c:5560 -msgid "" -msgstr "<算法>" +#: builtin/bugreport.c +msgid "specify a destination for the bugreport file" +msgstr "指定错误报告文件的目标位置" -#: diff.c:5561 -msgid "choose a diff algorithm" -msgstr "选择一个差异算法" +#: builtin/bugreport.c +msgid "specify a strftime format suffix for the filename" +msgstr "指定文件的 strftime 格式后缀" -#: diff.c:5563 -msgid "" -msgstr "<文本>" +#: builtin/bugreport.c +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "不能为 '%s' 创建先导目录" -#: diff.c:5564 -msgid "generate diff using the \"anchored diff\" algorithm" -msgstr "使用 \"anchored diff\" 算法生成差异" +#: builtin/bugreport.c +msgid "System Info" +msgstr "系统信息" -#: diff.c:5566 diff.c:5575 diff.c:5578 -msgid "" -msgstr "<模式>" +#: builtin/bugreport.c +msgid "Enabled Hooks" +msgstr "启用的钩子" -#: diff.c:5567 -msgid "show word diff, using to delimit changed words" -msgstr "显示单词差异，使用 <模式> 分隔变更的单词" +#: builtin/bugreport.c +#, c-format +msgid "unable to write to %s" +msgstr "无法写入 %s" -#: diff.c:5570 -msgid "use to decide what a word is" -msgstr "使用 <正则表达式> 确定何为一个词" +#: builtin/bugreport.c +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "在 '%s' 创建了新报告。\n" -#: diff.c:5573 -msgid "equivalent to --word-diff=color --word-diff-regex=" -msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" +#: builtin/bundle.c +msgid "git bundle create [] " +msgstr "git bundle create [<选项>] <文件> " -#: diff.c:5576 -msgid "moved lines of code are colored differently" -msgstr "移动的代码行用不同方式着色" +#: builtin/bundle.c +msgid "git bundle verify [] " +msgstr "git bundle verify [<选项>] <文件>" -#: diff.c:5579 -msgid "how white spaces are ignored in --color-moved" -msgstr "在 --color-moved 下如何忽略空白字符" +#: builtin/bundle.c +msgid "git bundle list-heads [...]" +msgstr "git bundle list-heads <文件> [<引用名>...]" -#: diff.c:5582 -msgid "Other diff options" -msgstr "其它差异选项" +#: builtin/bundle.c +msgid "git bundle unbundle [...]" +msgstr "git bundle unbundle <文件> [<引用名>...]" -#: diff.c:5584 -msgid "when run from subdir, exclude changes outside and show relative paths" -msgstr "当从子目录运行，排除目录之外的变更并显示相对路径" +#: builtin/bundle.c builtin/pack-objects.c +msgid "do not show progress meter" +msgstr "不显示进度表" -#: diff.c:5588 -msgid "treat all files as text" -msgstr "把所有文件当做文本处理" +#: builtin/bundle.c builtin/pack-objects.c +msgid "show progress meter" +msgstr "显示进度表" -#: diff.c:5590 -msgid "swap two inputs, reverse the diff" -msgstr "交换两个输入，反转差异" +#: builtin/bundle.c builtin/pack-objects.c +msgid "show progress meter during object writing phase" +msgstr "在对象写入阶段显示进度表" -#: diff.c:5592 -msgid "exit with 1 if there were differences, 0 otherwise" -msgstr "有差异时退出码为 1，否则为 0" +#: builtin/bundle.c builtin/pack-objects.c +msgid "similar to --all-progress when progress meter is shown" +msgstr "当进度表显示时类似于 --all-progress" -#: diff.c:5594 -msgid "disable all output of the program" -msgstr "禁用本程序的所有输出" +#: builtin/bundle.c +msgid "specify bundle format version" +msgstr "指定归档包的格式版本" -#: diff.c:5596 -msgid "allow an external diff helper to be executed" -msgstr "允许执行一个外置的差异助手" +#: builtin/bundle.c +msgid "Need a repository to create a bundle." +msgstr "需要一个仓库来创建归档包。" -#: diff.c:5598 -msgid "run external text conversion filters when comparing binary files" -msgstr "当比较二进制文件时，运行外部的文本转换过滤器" +#: builtin/bundle.c +msgid "do not show bundle details" +msgstr "不显示归档包的细节" -#: diff.c:5600 -msgid "" -msgstr "<何时>" +#: builtin/bundle.c +#, c-format +msgid "%s is okay\n" +msgstr "%s 可以\n" -#: diff.c:5601 -msgid "ignore changes to submodules in the diff generation" -msgstr "在生成差异时，忽略子模组的更改" +#: builtin/bundle.c +msgid "Need a repository to unbundle." +msgstr "需要一个仓库来解开归档包。" -#: diff.c:5604 -msgid "" -msgstr "<格式>" +#: builtin/bundle.c +msgid "Unbundling objects" +msgstr "解包对象中" -#: diff.c:5605 -msgid "specify how differences in submodules are shown" -msgstr "指定子模组的差异如何显示" +#: builtin/bundle.c builtin/remote.c +#, c-format +msgid "Unknown subcommand: %s" +msgstr "未知子命令：%s" -#: diff.c:5609 -msgid "hide 'git add -N' entries from the index" -msgstr "隐藏索引中 'git add -N' 条目" +#: builtin/cat-file.c merge-recursive.c +#, c-format +msgid "cannot read object %s '%s'" +msgstr "不能读取对象 %s '%s'" -#: diff.c:5612 -msgid "treat 'git add -N' entries as real in the index" -msgstr "将索引中 'git add -N' 条目当做真实的" +#: builtin/cat-file.c +msgid "flush is only for --buffer mode" +msgstr "flush 只在 --buffer 模式中使用" -#: diff.c:5614 -msgid "" -msgstr "<字符串>" +#: builtin/cat-file.c +msgid "empty command in input" +msgstr "输入为空的命令" -#: diff.c:5615 -msgid "" -"look for differences that change the number of occurrences of the specified " -"string" -msgstr "查找改变了指定字符串出现次数的差异" +#: builtin/cat-file.c +#, c-format +msgid "whitespace before command: '%s'" +msgstr "命令前存在空白：'%s'" -#: diff.c:5618 -msgid "" -"look for differences that change the number of occurrences of the specified " -"regex" -msgstr "查找改变指定正则匹配出现次数的差异" +#: builtin/cat-file.c +#, c-format +msgid "%s requires arguments" +msgstr "%s 需要参数" -#: diff.c:5621 -msgid "show all changes in the changeset with -S or -G" -msgstr "显示使用 -S 或 -G 的变更集的所有变更" +#: builtin/cat-file.c +#, c-format +msgid "%s takes no arguments" +msgstr "%s 不需要参数" -#: diff.c:5624 -msgid "treat in -S as extended POSIX regular expression" -msgstr "将 -S 的 当做扩展的 POSIX 正则表达式" +#: builtin/cat-file.c +#, c-format +msgid "unknown command: '%s'" +msgstr "未知命令：'%s'" -#: diff.c:5627 -msgid "control the order in which files appear in the output" -msgstr "控制输出中的文件显示顺序" +#: builtin/cat-file.c +msgid "only one batch option may be specified" +msgstr "只能指定一个批处理选项" -#: diff.c:5628 diff.c:5631 -msgid "" -msgstr "<路径>" +#: builtin/cat-file.c +msgid "git cat-file " +msgstr "git cat-file <类型> <对象>" -#: diff.c:5629 -msgid "show the change in the specified path first" -msgstr "先显示指定路径的变更" +#: builtin/cat-file.c +msgid "git cat-file (-e | -p) " +msgstr "git cat-file (-e | -p) <对象>" -#: diff.c:5632 -msgid "skip the output to the specified path" -msgstr "跳过指定路径的输出" +#: builtin/cat-file.c +msgid "git cat-file (-t | -s) [--allow-unknown-type] " +msgstr "git cat-file (-t | -s) [--allow-unknown-type] <对象>" -#: diff.c:5634 -msgid "" -msgstr "<对象 ID>" +#: builtin/cat-file.c +msgid "" +"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" +"objects]\n" +" [--buffer] [--follow-symlinks] [--unordered]\n" +" [--textconv | --filters]" +msgstr "" +"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" +"objects]\n" +" [--buffer] [--follow-symlinks] [--unordered]\n" +" [--textconv | --filters]" -#: diff.c:5635 +#: builtin/cat-file.c msgid "" -"look for differences that change the number of occurrences of the specified " -"object" -msgstr "查找改变指定对象出现次数的差异" +"git cat-file (--textconv | --filters)\n" +" [: | --path= ]" +msgstr "" +"git cat-file (--textconv | --filters)\n" +" [<版本>:<路径|树对象> | --path=<路径|树对象> <版本>]" -#: diff.c:5637 -msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" -msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" +#: builtin/cat-file.c +msgid "Check object existence or emit object contents" +msgstr "检查对象存在或输出对象内容" -#: diff.c:5638 -msgid "select files by diff type" -msgstr "通过差异类型选择文件" +#: builtin/cat-file.c +msgid "check if exists" +msgstr "检查 <对象> 是否存在" -#: diff.c:5640 -msgid "" -msgstr "<文件>" +#: builtin/cat-file.c +msgid "pretty-print content" +msgstr "美观地打印 <对象> 的内容" -#: diff.c:5641 -msgid "output to a specific file" -msgstr "输出到指定的文件" +#: builtin/cat-file.c +msgid "Emit [broken] object attributes" +msgstr "输出 [坏的] 对象属性" -#: diff.c:6321 -msgid "exhaustive rename detection was skipped due to too many files." -msgstr "由于文件太多，跳过详尽的重命名检查。" +#: builtin/cat-file.c +msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" +msgstr "显示对象的类型（'blob'、'tree'、'commit'、'tag'……其中之一）" -#: diff.c:6324 -msgid "only found copies from modified paths due to too many files." -msgstr "由于文件太多，只在修改的路径中找到了拷贝。" +#: builtin/cat-file.c +msgid "show object size" +msgstr "显示对象大小" -#: diff.c:6327 -#, c-format -msgid "" -"you may want to set your %s variable to at least %d and retry the command." -msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" +#: builtin/cat-file.c +msgid "allow -s and -t to work with broken/corrupt objects" +msgstr "允许 -s 和 -t 对损坏的对象生效" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "无法读取排序文件 '%s'" +#: builtin/cat-file.c +msgid "Batch objects requested on stdin (or --batch-all-objects)" +msgstr "批量处理标准输入中请求的对象（或者 --batch-all-objects）" -#: diffcore-rename.c:1564 -msgid "Performing inexact rename detection" -msgstr "正在进行非精确的重命名探测" +#: builtin/cat-file.c +msgid "show full or contents" +msgstr "显示完整的 <对象> 或 <版本> 内容" -#: diffcore-rotate.c:29 -#, c-format -msgid "No such path '%s' in the diff" -msgstr "在差异中无此路径 '%s'" +#: builtin/cat-file.c +msgid "like --batch, but don't emit " +msgstr "类似于 --batch，但不输出 <内容>" -#: dir.c:593 -#, c-format -msgid "pathspec '%s' did not match any file(s) known to git" -msgstr "路径规格 '%s' 未匹配任何 git 已知文件" +#: builtin/cat-file.c +msgid "read commands from stdin" +msgstr "从标准输入读取命令" -#: dir.c:733 dir.c:762 dir.c:775 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "未识别的模式：'%s'" +#: builtin/cat-file.c +msgid "with --batch[-check]: ignores stdin, batches all known objects" +msgstr "带有 --batch[-check]：忽略标准输入，批量处理所有已知的对象" -#: dir.c:790 dir.c:804 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "未识别的反向模式：'%s'" +#: builtin/cat-file.c +msgid "Change or optimize batch output" +msgstr "更改或优化批处理输出" -#: dir.c:820 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'" +#: builtin/cat-file.c +msgid "buffer --batch output" +msgstr "缓冲 --batch 的输出" -#: dir.c:828 -msgid "disabling cone pattern matching" -msgstr "停用锥形模式匹配" +#: builtin/cat-file.c +msgid "follow in-tree symlinks" +msgstr "跟随树内符号链接" -#: dir.c:1212 -#, c-format -msgid "cannot use %s as an exclude file" -msgstr "不能将 %s 用作排除文件" +#: builtin/cat-file.c +msgid "do not order objects before emitting them" +msgstr "在输出对象前不要排序" -#: dir.c:2419 -#, c-format -msgid "could not open directory '%s'" -msgstr "不能打开目录 '%s'" +#: builtin/cat-file.c +msgid "" +"Emit object (blob or tree) with conversion or filter (stand-alone, or with " +"batch)" +msgstr "转换或过滤后输出对象（数据对象或树）（单独或批处理）" -#: dir.c:2721 -msgid "failed to get kernel name and information" -msgstr "无法获得内核名称和信息" +#: builtin/cat-file.c +msgid "run textconv on object's content" +msgstr "对对象内容做文本转换" -#: dir.c:2846 -msgid "untracked cache is disabled on this system or location" -msgstr "缓存未跟踪文件在本系统或位置中被禁用" +#: builtin/cat-file.c +msgid "run filters on object's content" +msgstr "对对象内容做过滤" -#: dir.c:3119 -msgid "" -"No directory name could be guessed.\n" -"Please specify a directory on the command line" -msgstr "" -"无法猜到目录名。\n" -"请在命令行指定一个目录" +#: builtin/cat-file.c +msgid "blob|tree" +msgstr "数据对象|树" -#: dir.c:3807 -#, c-format -msgid "index file corrupt in repo %s" -msgstr "仓库 %s 中的索引文件损坏" +#: builtin/cat-file.c +msgid "use a for (--textconv | --filters); Not with 'batch'" +msgstr "(--textconv | --filters) 使用 <路径>；而不是 'batch'" -#: dir.c:3854 dir.c:3859 +#: builtin/cat-file.c #, c-format -msgid "could not create directories for %s" -msgstr "不能为 %s 创建目录" +msgid "'%s=<%s>' needs '%s' or '%s'" +msgstr "'%s=<%s>' 需要 '%s' 或 '%s'" + +#: builtin/cat-file.c +msgid "path|tree-ish" +msgstr "路径|树对象" -#: dir.c:3888 +#: builtin/cat-file.c #, c-format -msgid "could not migrate git directory from '%s' to '%s'" -msgstr "不能从 '%s' 迁移 git 目录到 '%s'" +msgid "'%s' requires a batch mode" +msgstr "'%s' 需要批处理模式" -#: editor.c:74 +#: builtin/cat-file.c #, c-format -msgid "hint: Waiting for your editor to close the file...%c" -msgstr "提示：等待您的编辑器关闭文件...%c" +msgid "'-%c' is incompatible with batch mode" +msgstr "'-%c' 与批处理模式不兼容" -#: entry.c:179 -msgid "Filtering content" -msgstr "过滤内容" +#: builtin/cat-file.c +msgid "batch modes take no arguments" +msgstr "批处理模式不带其他参数" -#: entry.c:500 +#: builtin/cat-file.c #, c-format -msgid "could not stat file '%s'" -msgstr "不能对文件 '%s' 调用 stat" +msgid " required with '%s'" +msgstr "'%s' 需要 <版本>" -#: environment.c:147 +#: builtin/cat-file.c #, c-format -msgid "bad git namespace path \"%s\"" -msgstr "错误的 git 名字空间路径 \"%s\"" +msgid " required with '-%c'" +msgstr "'-%c' 需要 <对象>" + +#: builtin/cat-file.c builtin/notes.c builtin/prune-packed.c +#: builtin/receive-pack.c builtin/tag.c +msgid "too many arguments" +msgstr "太多参数" -#: exec-cmd.c:363 +#: builtin/cat-file.c #, c-format -msgid "too many args to run %s" -msgstr "执行 %s 的参数太多" +msgid "only two arguments allowed in mode, not %d" +msgstr "<类型> <对象> 模式只允许两个参数，而不是 %d 个" -#: fetch-pack.c:194 -msgid "git fetch-pack: expected shallow list" -msgstr "git fetch-pack：应为 shallow 列表" +#: builtin/check-attr.c +msgid "git check-attr [-a | --all | ...] [--] ..." +msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." -#: fetch-pack.c:197 -msgid "git fetch-pack: expected a flush packet after shallow list" -msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包" +#: builtin/check-attr.c +msgid "git check-attr --stdin [-z] [-a | --all | ...]" +msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" -#: fetch-pack.c:208 -msgid "git fetch-pack: expected ACK/NAK, got a flush packet" -msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包" +#: builtin/check-attr.c +msgid "report all attributes set on file" +msgstr "报告设置在文件上的所有属性" -#: fetch-pack.c:228 -#, c-format -msgid "git fetch-pack: expected ACK/NAK, got '%s'" -msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'" +#: builtin/check-attr.c +msgid "use .gitattributes only from the index" +msgstr "只使用索引中的 .gitattributes" -#: fetch-pack.c:239 -msgid "unable to write to remote" -msgstr "无法写到远程" +#: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c +msgid "read file names from stdin" +msgstr "从标准输入读出文件名" -#: fetch-pack.c:397 fetch-pack.c:1460 -#, c-format -msgid "invalid shallow line: %s" -msgstr "无效的 shallow 信息：%s" +#: builtin/check-attr.c builtin/check-ignore.c +msgid "terminate input and output records by a NUL character" +msgstr "输入和输出的记录使用 NUL 字符终结" -#: fetch-pack.c:403 fetch-pack.c:1466 -#, c-format -msgid "invalid unshallow line: %s" -msgstr "无效的 unshallow 信息：%s" +#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c +msgid "suppress progress reporting" +msgstr "不显示进度报告" -#: fetch-pack.c:405 fetch-pack.c:1468 -#, c-format -msgid "object not found: %s" -msgstr "对象未找到：%s" +#: builtin/check-ignore.c +msgid "show non-matching input paths" +msgstr "显示未匹配的输入路径" -#: fetch-pack.c:408 fetch-pack.c:1471 -#, c-format -msgid "error in object: %s" -msgstr "对象中出错：%s" +#: builtin/check-ignore.c +msgid "ignore index when checking" +msgstr "检查时忽略索引" -#: fetch-pack.c:410 fetch-pack.c:1473 -#, c-format -msgid "no shallow found: %s" -msgstr "未发现 shallow：%s" +#: builtin/check-ignore.c +msgid "cannot specify pathnames with --stdin" +msgstr "不能同时指定路径及 --stdin 参数" -#: fetch-pack.c:413 fetch-pack.c:1477 -#, c-format -msgid "expected shallow/unshallow, got %s" -msgstr "应为 shallow/unshallow，却得到 %s" +#: builtin/check-ignore.c +msgid "-z only makes sense with --stdin" +msgstr "-z 需要和 --stdin 参数共用才有意义" -#: fetch-pack.c:453 -#, c-format -msgid "got %s %d %s" -msgstr "得到 %s %d %s" +#: builtin/check-ignore.c +msgid "no path specified" +msgstr "未指定路径" -#: fetch-pack.c:470 -#, c-format -msgid "invalid commit %s" -msgstr "无效提交 %s" +#: builtin/check-ignore.c +msgid "--quiet is only valid with a single pathname" +msgstr "参数 --quiet 只在提供一个路径名时有效" -#: fetch-pack.c:501 -msgid "giving up" -msgstr "放弃" +#: builtin/check-ignore.c +msgid "cannot have both --quiet and --verbose" +msgstr "不能同时提供 --quiet 和 --verbose 参数" -#: fetch-pack.c:514 progress.h:25 -msgid "done" -msgstr "完成" +#: builtin/check-ignore.c +msgid "--non-matching is only valid with --verbose" +msgstr "--non-matching 选项只在使用 --verbose 时有效" -#: fetch-pack.c:526 -#, c-format -msgid "got %s (%d) %s" -msgstr "得到 %s (%d) %s" +#: builtin/check-mailmap.c +msgid "git check-mailmap [] ..." +msgstr "git check-mailmap [<选项>] <联系地址>..." -#: fetch-pack.c:562 -#, c-format -msgid "Marking %s as complete" -msgstr "标记 %s 为完成" +#: builtin/check-mailmap.c +msgid "also read contacts from stdin" +msgstr "还从标准输入读取联系地址" -#: fetch-pack.c:784 +#: builtin/check-mailmap.c #, c-format -msgid "already have %s (%s)" -msgstr "已经有 %s（%s）" - -#: fetch-pack.c:870 -msgid "fetch-pack: unable to fork off sideband demultiplexer" -msgstr "fetch-pack：无法派生 sideband 多路输出" - -#: fetch-pack.c:878 -msgid "protocol error: bad pack header" -msgstr "协议错误：坏的包头" +msgid "unable to parse contact: %s" +msgstr "不能解析联系地址：%s" -#: fetch-pack.c:974 -#, c-format -msgid "fetch-pack: unable to fork off %s" -msgstr "fetch-pack：无法派生进程 %s" +#: builtin/check-mailmap.c +msgid "no contacts specified" +msgstr "未指定联系地址" -#: fetch-pack.c:980 -msgid "fetch-pack: invalid index-pack output" -msgstr "fetch-pack：无效的 index-pack 输出" +#: builtin/checkout--worker.c +msgid "git checkout--worker []" +msgstr "git checkout--worker [<选项>]" -#: fetch-pack.c:997 -#, c-format -msgid "%s failed" -msgstr "%s 失败" +#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c +#: builtin/submodule--helper.c builtin/worktree.c +msgid "string" +msgstr "字符串" -#: fetch-pack.c:999 -msgid "error in sideband demultiplexer" -msgstr "sideband 多路输出出错" +#: builtin/checkout--worker.c builtin/checkout-index.c +msgid "when creating files, prepend " +msgstr "在创建文件时，在前面加上 <字符串>" -#: fetch-pack.c:1048 -#, c-format -msgid "Server version is %.*s" -msgstr "服务器版本 %.*s" +#: builtin/checkout-index.c +msgid "git checkout-index [] [--] [...]" +msgstr "git checkout-index [<选项>] [--] [<文件>...]" -#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071 -#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087 -#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103 -#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125 -#, c-format -msgid "Server supports %s" -msgstr "服务器支持 %s" +#: builtin/checkout-index.c +msgid "stage should be between 1 and 3 or all" +msgstr "索引值应该取值 1 到 3 或者 all" -#: fetch-pack.c:1058 -msgid "Server does not support shallow clients" -msgstr "服务器不支持浅客户端" +#: builtin/checkout-index.c +msgid "check out all files in the index" +msgstr "检出索引区的所有文件" -#: fetch-pack.c:1118 -msgid "Server does not support --shallow-since" -msgstr "服务器不支持 --shallow-since" +#: builtin/checkout-index.c +msgid "do not skip files with skip-worktree set" +msgstr "在 skip-worktree 设置时不要跳过文件" -#: fetch-pack.c:1123 -msgid "Server does not support --shallow-exclude" -msgstr "服务器不支持 --shallow-exclude" +#: builtin/checkout-index.c +msgid "force overwrite of existing files" +msgstr "强制覆盖现有的文件" -#: fetch-pack.c:1127 -msgid "Server does not support --deepen" -msgstr "服务器不支持 --deepen" +#: builtin/checkout-index.c +msgid "no warning for existing files and files not in index" +msgstr "存在或不在索引中的文件都没有警告" -#: fetch-pack.c:1129 -msgid "Server does not support this repository's object format" -msgstr "服务器不支持这个仓库的对象格式" +#: builtin/checkout-index.c +msgid "don't checkout new files" +msgstr "不检出新文件" -#: fetch-pack.c:1142 -msgid "no common commits" -msgstr "没有共同的提交" +#: builtin/checkout-index.c +msgid "update stat information in the index file" +msgstr "更新索引中文件的状态信息" -#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166 -msgid "source repository is shallow, reject to clone." -msgstr "源仓库是浅克隆，拒绝克隆。" +#: builtin/checkout-index.c +msgid "read list of paths from the standard input" +msgstr "从标准输入读取路径列表" -#: fetch-pack.c:1157 fetch-pack.c:1705 -msgid "git fetch-pack: fetch failed." -msgstr "git fetch-pack：获取失败。" +#: builtin/checkout-index.c +msgid "write the content to temporary files" +msgstr "将内容写入临时文件" -#: fetch-pack.c:1271 -#, c-format -msgid "mismatched algorithms: client %s; server %s" -msgstr "不匹配的算法：客户端 %s，服务端 %s" +#: builtin/checkout-index.c +msgid "copy out the files from named stage" +msgstr "从指定暂存区中拷出文件" -#: fetch-pack.c:1275 -#, c-format -msgid "the server does not support algorithm '%s'" -msgstr "服务器不支持算法 '%s'" +#: builtin/checkout.c +msgid "git checkout [] " +msgstr "git checkout [<选项>] <分支>" -#: fetch-pack.c:1308 -msgid "Server does not support shallow requests" -msgstr "服务器不支持浅克隆请求" +#: builtin/checkout.c +msgid "git checkout [] [] -- ..." +msgstr "git checkout [<选项>] [<分支>] -- <文件>..." -#: fetch-pack.c:1315 -msgid "Server supports filter" -msgstr "服务器支持 filter" +#: builtin/checkout.c +msgid "git switch [] []" +msgstr "git switch [<选项>] [<分支>]" -#: fetch-pack.c:1358 fetch-pack.c:2087 -msgid "unable to write request to remote" -msgstr "无法将请求写到远程" +#: builtin/checkout.c +msgid "git restore [] [--source=] ..." +msgstr "git restore [<选项>] [--source=<分支>] <文件>..." -#: fetch-pack.c:1376 +#: builtin/checkout.c #, c-format -msgid "error reading section header '%s'" -msgstr "读取节标题 '%s' 出错" - -#: fetch-pack.c:1382 -#, c-format -msgid "expected '%s', received '%s'" -msgstr "预期 '%s'，得到 '%s'" +msgid "path '%s' does not have our version" +msgstr "路径 '%s' 没有我们的版本" -#: fetch-pack.c:1416 +#: builtin/checkout.c #, c-format -msgid "unexpected acknowledgment line: '%s'" -msgstr "意外的确认行：'%s'" +msgid "path '%s' does not have their version" +msgstr "路径 '%s' 没有他们的版本" -#: fetch-pack.c:1421 +#: builtin/checkout.c #, c-format -msgid "error processing acks: %d" -msgstr "处理 ack 出错：%d" +msgid "path '%s' does not have all necessary versions" +msgstr "路径 '%s' 没有全部必需的版本" -#. TRANSLATORS: The parameter will be 'ready', a protocol -#. keyword. -#. -#: fetch-pack.c:1435 +#: builtin/checkout.c #, c-format -msgid "expected packfile to be sent after '%s'" -msgstr "预期在 '%s' 之后发送 packfile" +msgid "path '%s' does not have necessary versions" +msgstr "路径 '%s' 没有必需的版本" -#. TRANSLATORS: The parameter will be 'ready', a protocol -#. keyword. -#. -#: fetch-pack.c:1441 +#: builtin/checkout.c #, c-format -msgid "expected no other sections to be sent after no '%s'" -msgstr "在没有 '%s' 后不应该发送其它小节" +msgid "path '%s': cannot merge" +msgstr "path '%s'：无法合并" -#: fetch-pack.c:1482 +#: builtin/checkout.c #, c-format -msgid "error processing shallow info: %d" -msgstr "处理浅克隆信息出错：%d" +msgid "Unable to add merge result for '%s'" +msgstr "无法为 '%s' 添加合并结果" -#: fetch-pack.c:1531 +#: builtin/checkout.c #, c-format -msgid "expected wanted-ref, got '%s'" -msgstr "预期 wanted-ref，得到 '%s'" +msgid "Recreated %d merge conflict" +msgid_plural "Recreated %d merge conflicts" +msgstr[0] "重新创建了 %d 个合并冲突" +msgstr[1] "重新创建了 %d 个合并冲突" -#: fetch-pack.c:1536 +#: builtin/checkout.c #, c-format -msgid "unexpected wanted-ref: '%s'" -msgstr "意外的 wanted-ref：'%s'" +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 个路径" -#: fetch-pack.c:1541 +#: builtin/checkout.c #, c-format -msgid "error processing wanted refs: %d" -msgstr "处理要获取的引用出错：%d" - -#: fetch-pack.c:1571 -msgid "git fetch-pack: expected response end packet" -msgstr "git fetch-pack：预期响应结束包" - -#: fetch-pack.c:1983 -msgid "no matching remote head" -msgstr "没有匹配的远程分支" - -#: fetch-pack.c:2006 builtin/clone.c:587 -msgid "remote did not send all necessary objects" -msgstr "远程没有发送所有必需的对象" - -#: fetch-pack.c:2109 -msgid "unexpected 'ready' from remote" -msgstr "来自远程的意外的 'ready'" +msgid "Updated %d path from the index" +msgid_plural "Updated %d paths from the index" +msgstr[0] "从索引区更新了 %d 个路径" +msgstr[1] "从索引区更新了 %d 个路径" -#: fetch-pack.c:2132 +#: builtin/checkout.c #, c-format -msgid "no such remote ref %s" -msgstr "没有这样的远程引用 %s" +msgid "'%s' cannot be used with updating paths" +msgstr "'%s' 不能在更新路径时使用" -#: fetch-pack.c:2135 +#: builtin/checkout.c #, c-format -msgid "Server does not allow request for unadvertised object %s" -msgstr "服务器不允许请求未公开的对象 %s" +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "不能同时更新路径并切换到分支'%s'。" -#: fsmonitor-ipc.c:119 +#: builtin/checkout.c #, c-format -msgid "fsmonitor_ipc__send_query: invalid path '%s'" -msgstr "fsmonitor_ipc__send_query: 无效路径 '%s'" +msgid "neither '%s' or '%s' is specified" +msgstr "'%s' 或 '%s' 都没有指定" -#: fsmonitor-ipc.c:125 +#: builtin/checkout.c #, c-format -msgid "fsmonitor_ipc__send_query: unspecified error on '%s'" -msgstr "fsmonitor_ipc__send_query: 未知错误于 '%s'" - -#: fsmonitor-ipc.c:155 -msgid "fsmonitor--daemon is not running" -msgstr "fsmonitor--daemon 没有运行" +msgid "'%s' must be used when '%s' is not specified" +msgstr "未指定 '%2$s' 时，必须使用 '%1$s'" -#: fsmonitor-ipc.c:164 +#: builtin/checkout.c #, c-format -msgid "could not send '%s' command to fsmonitor--daemon" -msgstr "无法发送 '%s' 命令至 fsmonitor--daemon" - -#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995 -#: gpg-interface.c:1011 -msgid "could not create temporary file" -msgstr "不能创建临时文件" +msgid "'%s' or '%s' cannot be used with %s" +msgstr "'%s' 或 '%s' 不能和 %s 一起使用" -#: gpg-interface.c:332 gpg-interface.c:459 +#: builtin/checkout.c #, c-format -msgid "failed writing detached signature to '%s'" -msgstr "无法将分离式签名写入 '%s'" +msgid "path '%s' is unmerged" +msgstr "路径 '%s' 未合并" -#: gpg-interface.c:450 -msgid "" -"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " -"signature verification" -msgstr "ssh 签名验证需要 gpg.ssh.allowedSignersFile 被设置且存在" +#: builtin/checkout.c +msgid "you need to resolve your current index first" +msgstr "您需要先解决当前索引的冲突" -#: gpg-interface.c:479 +#: builtin/checkout.c +#, c-format msgid "" -"ssh-keygen -Y find-principals/verify is needed for ssh signature " -"verification (available in openssh version 8.2p1+)" +"cannot continue with staged changes in the following files:\n" +"%s" msgstr "" -"ssh 签名验证需要 ssh-keygen -Y find-principals/verify \n" -"（openssh 8.2p1+ 版本可用）" - -#: gpg-interface.c:550 -#, c-format -msgid "ssh signing revocation file configured but not found: %s" -msgstr "设置了 ssh 签名吊销文件但无法找到：%s" +"不能继续，下列文件有暂存的修改：\n" +"%s" -#: gpg-interface.c:638 +#: builtin/checkout.c #, c-format -msgid "bad/incompatible signature '%s'" -msgstr "坏的/不兼容的签名 '%s‘" +msgid "Can not do reflog for '%s': %s\n" +msgstr "不能对 '%s' 执行 reflog 操作：%s\n" -#: gpg-interface.c:815 gpg-interface.c:820 -#, c-format -msgid "failed to get the ssh fingerprint for key '%s'" -msgstr "无法得到密钥 '%s' 的 ssh 指纹" +#: builtin/checkout.c +msgid "HEAD is now at" +msgstr "HEAD 目前位于" -#: gpg-interface.c:843 -msgid "" -"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" -msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一" +#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c +msgid "unable to update HEAD" +msgstr "不能更新 HEAD" -#: gpg-interface.c:865 +#: builtin/checkout.c #, c-format -msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" -msgstr "gpg.ssh.defaultKeyCommand 成功，但没有返回密钥：%s %s" +msgid "Reset branch '%s'\n" +msgstr "重置分支 '%s'\n" -#: gpg-interface.c:871 +#: builtin/checkout.c #, c-format -msgid "gpg.ssh.defaultKeyCommand failed: %s %s" -msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s" +msgid "Already on '%s'\n" +msgstr "已经位于 '%s'\n" -#: gpg-interface.c:966 -msgid "gpg failed to sign the data" -msgstr "gpg 无法为数据签名" +#: builtin/checkout.c +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "切换并重置分支 '%s'\n" -#: gpg-interface.c:988 -msgid "user.signingkey needs to be set for ssh signing" -msgstr "ssh 签名需要设置 user.signingkey" +#: builtin/checkout.c +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "切换到一个新分支 '%s'\n" -#: gpg-interface.c:999 +#: builtin/checkout.c #, c-format -msgid "failed writing ssh signing key to '%s'" -msgstr "无法将 ssh 签名密钥写入 '%s'" +msgid "Switched to branch '%s'\n" +msgstr "切换到分支 '%s'\n" -#: gpg-interface.c:1017 +# 译者：注意保持前导空格 +#: builtin/checkout.c #, c-format -msgid "failed writing ssh signing key buffer to '%s'" -msgstr "无法将 ssh 签名密钥缓冲区写入 '%s'" +msgid " ... and %d more.\n" +msgstr " ... 及其它 %d 个。\n" -#: gpg-interface.c:1035 +#: builtin/checkout.c +#, c-format 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+ 版本可用）" +"Warning: you are leaving %d commit behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgid_plural "" +"Warning: you are leaving %d commits behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgstr[0] "" +"警告：您正丢下 %d 个提交，未和任何分支关联：\n" +"\n" +"%s\n" +msgstr[1] "" +"警告：您正丢下 %d 个提交，未和任何分支关联：\n" +"\n" +"%s\n" -#: gpg-interface.c:1047 +#: builtin/checkout.c #, c-format -msgid "failed reading ssh signing data buffer from '%s'" -msgstr "无法从 '%s' 读入 ssh 签名数据" +msgid "" +"If you want to keep it by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch %s\n" +"\n" +msgid_plural "" +"If you want to keep them by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch %s\n" +"\n" +msgstr[0] "" +"如果您想要通过创建新分支保存它，这可能是一个好时候。\n" +"如下操作：\n" +"\n" +" git branch <新分支名> %s\n" +"\n" +msgstr[1] "" +"如果您想要通过创建新分支保存它们，这可能是一个好时候。\n" +"如下操作：\n" +"\n" +" git branch <新分支名> %s\n" +"\n" + +#: builtin/checkout.c +msgid "internal error in revision walk" +msgstr "在版本遍历时遇到内部错误" + +#: builtin/checkout.c +msgid "Previous HEAD position was" +msgstr "之前的 HEAD 位置是" + +#: builtin/checkout.c +msgid "You are on a branch yet to be born" +msgstr "您位于一个尚未初始化的分支" -#: graph.c:98 +#: builtin/checkout.c #, c-format -msgid "ignored invalid color '%.*s' in log.graphColors" -msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" +msgid "" +"'%s' could be both a local file and a tracking branch.\n" +"Please use -- (and optionally --no-guess) to disambiguate" +msgstr "" +"'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n" +"请使用 --（和可选的 --no-guess）来消除歧义" -#: grep.c:446 +#: builtin/checkout.c msgid "" -"given pattern contains NULL byte (via -f ). This is only supported " -"with -P under PCRE v2" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/\n" +"\n" +"If you'd like to always have checkouts of an ambiguous prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." msgstr "" -"给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此" -"功能" +"如果您想要检出一个远程跟踪分支，例如在 'origin' 上的，您可以使用分支\n" +"全名和 --track 选项：\n" +"\n" +" git checkout --track origin/<名称>\n" +"\n" +"如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n" +"名称，可以在配置中设置 checkout.defaultRemote=origin。" -#: grep.c:1859 +#: builtin/checkout.c #, c-format -msgid "'%s': unable to read %s" -msgstr "'%s'：无法读取 %s" +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "'%s' 匹配多个（%d 个）远程跟踪分支" -#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90 -#: builtin/rm.c:136 -#, c-format -msgid "failed to stat '%s'" -msgstr "无法对 '%s' 调用 stat" +#: builtin/checkout.c +msgid "only one reference expected" +msgstr "只期望一个引用" -#: grep.c:1887 +#: builtin/checkout.c #, c-format -msgid "'%s': short read" -msgstr "'%s'：读取不完整" +msgid "only one reference expected, %d given." +msgstr "应只有一个引用，却给出了 %d 个" -#: help.c:25 -msgid "start a working area (see also: git help tutorial)" -msgstr "开始一个工作区（参见：git help tutorial）" +#: builtin/checkout.c builtin/worktree.c +#, c-format +msgid "invalid reference: %s" +msgstr "无效引用：%s" -#: help.c:26 -msgid "work on the current change (see also: git help everyday)" -msgstr "在当前变更上工作（参见：git help everyday）" +#: builtin/checkout.c +#, c-format +msgid "reference is not a tree: %s" +msgstr "引用不是一个树：%s" -#: help.c:27 -msgid "examine the history and state (see also: git help revisions)" -msgstr "检查历史和状态（参见：git help revisions）" +#: builtin/checkout.c +#, c-format +msgid "a branch is expected, got tag '%s'" +msgstr "期望一个分支，得到标签 '%s'" -#: help.c:28 -msgid "grow, mark and tweak your common history" -msgstr "扩展、标记和调校您的历史记录" +#: builtin/checkout.c +#, c-format +msgid "a branch is expected, got remote branch '%s'" +msgstr "期望一个分支，得到远程分支 '%s'" -#: help.c:29 -msgid "collaborate (see also: git help workflows)" -msgstr "协同（参见：git help workflows）" +#: builtin/checkout.c +#, c-format +msgid "a branch is expected, got '%s'" +msgstr "期望一个分支，得到 '%s'" -#: help.c:33 -msgid "Main Porcelain Commands" -msgstr "主要的上层命令" +#: builtin/checkout.c +#, c-format +msgid "a branch is expected, got commit '%s'" +msgstr "期望一个分支，得到提交 '%s'" -#: help.c:34 -msgid "Ancillary Commands / Manipulators" -msgstr "辅助命令/操作者" +#: builtin/checkout.c +msgid "" +"If you want to detach HEAD at the commit, try again with the --detach option." +msgstr "如果你在本提交分离头指针，使用 --detach 选项重试。" -#: help.c:35 -msgid "Ancillary Commands / Interrogators" -msgstr "辅助命令/询问者" +#: builtin/checkout.c +msgid "" +"cannot switch branch while merging\n" +"Consider \"git merge --quit\" or \"git worktree add\"." +msgstr "" +"不能在合并时切换分支\n" +"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: help.c:36 -msgid "Interacting with Others" -msgstr "与其它系统交互" +#: builtin/checkout.c +msgid "" +"cannot switch branch in the middle of an am session\n" +"Consider \"git am --quit\" or \"git worktree add\"." +msgstr "" +"不能在一个 am 会话期间切换分支\n" +"考虑使用 \"git am --quit\" 或 \"git worktree add\"。" -#: help.c:37 -msgid "Low-level Commands / Manipulators" -msgstr "低级命令/操作者" +#: builtin/checkout.c +msgid "" +"cannot switch branch while rebasing\n" +"Consider \"git rebase --quit\" or \"git worktree add\"." +msgstr "" +"不能在变基时切换分支\n" +"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: help.c:38 -msgid "Low-level Commands / Interrogators" -msgstr "低级命令/询问者" +#: builtin/checkout.c +msgid "" +"cannot switch branch while cherry-picking\n" +"Consider \"git cherry-pick --quit\" or \"git worktree add\"." +msgstr "" +"不能在拣选时切换分支\n" +"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: help.c:39 -msgid "Low-level Commands / Syncing Repositories" -msgstr "低级命令/同步仓库" +#: builtin/checkout.c +msgid "" +"cannot switch branch while reverting\n" +"Consider \"git revert --quit\" or \"git worktree add\"." +msgstr "" +"不能在还原时切换分支\n" +"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: help.c:40 -msgid "Low-level Commands / Internal Helpers" -msgstr "低级命令/内部助手" +#: builtin/checkout.c +msgid "you are switching branch while bisecting" +msgstr "您在执行二分查找时切换分支" -#: help.c:316 +#: builtin/checkout.c +msgid "paths cannot be used with switching branches" +msgstr "路径不能和切换分支同时使用" + +#: builtin/checkout.c #, c-format -msgid "available git commands in '%s'" -msgstr "在 '%s' 下可用的 git 命令" +msgid "'%s' cannot be used with switching branches" +msgstr "'%s' 不能和切换分支同时使用" -#: help.c:323 -msgid "git commands available from elsewhere on your $PATH" -msgstr "在 $PATH 路径中的其他地方可用的 git 命令" +#: builtin/checkout.c +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "'%s' 不能和 '%s' 同时使用" -#: help.c:332 -msgid "These are common Git commands used in various situations:" -msgstr "这些是各种场合常见的 Git 命令：" +#: builtin/checkout.c +#, c-format +msgid "'%s' cannot take " +msgstr "'%s' 不带 <起始点>" -#: help.c:382 git.c:100 +#: builtin/checkout.c #, c-format -msgid "unsupported command listing type '%s'" -msgstr "不支持的命令列表类型 '%s'" +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "不能切换分支到一个非提交 '%s'" -#: help.c:422 -msgid "The Git concept guides are:" -msgstr "Git 概念向导有：" +#: builtin/checkout.c +msgid "missing branch or commit argument" +msgstr "缺少分支或提交参数" -#: help.c:446 -msgid "External commands" -msgstr "外部命令" +#: builtin/checkout.c +msgid "perform a 3-way merge with the new branch" +msgstr "和新的分支执行三方合并" -#: help.c:468 -msgid "Command aliases" -msgstr "命令别名" +#: builtin/checkout.c builtin/log.c parse-options.h +msgid "style" +msgstr "风格" -#: help.c:486 -msgid "See 'git help ' to read about a specific subcommand" -msgstr "执行　'git help ' 来了解特定子命令" +#: builtin/checkout.c +msgid "conflict style (merge, diff3, or zdiff3)" +msgstr "冲突输出风格（merge、diff3 或 zdiff3）" -#: help.c:563 -#, c-format -msgid "" -"'%s' appears to be a git command, but we were not\n" -"able to execute it. Maybe git-%s is broken?" -msgstr "" -"'%s' 像是一个 git 命令，但却无法运行。\n" -"可能是 git-%s 受损？" +#: builtin/checkout.c builtin/worktree.c +msgid "detach HEAD at named commit" +msgstr "HEAD 从指定的提交分离" -#: help.c:585 help.c:682 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" +#: builtin/checkout.c +msgid "force checkout (throw away local modifications)" +msgstr "强制检出（丢弃本地修改）" -#: help.c:633 -msgid "Uh oh. Your system reports no Git commands at all." -msgstr "唉呀，您的系统中未发现 Git 命令。" +#: builtin/checkout.c +msgid "new-branch" +msgstr "新分支" -#: help.c:655 -#, c-format -msgid "WARNING: You called a Git command named '%s', which does not exist." -msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。" +#: builtin/checkout.c +msgid "new unparented branch" +msgstr "新的没有父提交的分支" -#: help.c:660 -#, c-format -msgid "Continuing under the assumption that you meant '%s'." -msgstr "假定您想要的是 '%s' 并继续。" +#: builtin/checkout.c builtin/merge.c +msgid "update ignored files (default)" +msgstr "更新忽略的文件（默认）" -#: help.c:666 -#, c-format -msgid "Run '%s' instead [y/N]? " -msgstr "取而代之运行 '%s' [y/N]？" +#: builtin/checkout.c +msgid "do not check if another worktree is holding the given ref" +msgstr "不检查指定的引用是否被其他工作区所占用" -#: help.c:674 -#, c-format -msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." -msgstr "假定您想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。" +#: builtin/checkout.c +msgid "checkout our version for unmerged files" +msgstr "对尚未合并的文件检出我们的版本" -#: help.c:686 -msgid "" -"\n" -"The most similar command is" -msgid_plural "" -"\n" -"The most similar commands are" -msgstr[0] "" -"\n" -"最相似的命令是" -msgstr[1] "" -"\n" -"最相似的命令是" +#: builtin/checkout.c +msgid "checkout their version for unmerged files" +msgstr "对尚未合并的文件检出他们的版本" -#: help.c:729 -msgid "git version []" -msgstr "git version [<选项>]" +#: builtin/checkout.c +msgid "do not limit pathspecs to sparse entries only" +msgstr "对路径不做稀疏检出的限制" -#: help.c:784 +#: builtin/checkout.c #, c-format -msgid "%s: %s - %s" -msgstr "%s：%s - %s" +msgid "options '-%c', '-%c', and '%s' cannot be used together" +msgstr "选项 '-%c'、'-%c' 和 ‘%s' 不能同时使用" -#: help.c:788 -msgid "" -"\n" -"Did you mean this?" -msgid_plural "" -"\n" -"Did you mean one of these?" -msgstr[0] "" -"\n" -"您指的是这个么？" -msgstr[1] "" -"\n" -"您指的是这其中的某一个么？" +#: builtin/checkout.c +msgid "--track needs a branch name" +msgstr "--track 需要一个分支名" -#: hook.c:28 +#: builtin/checkout.c #, c-format -msgid "" -"The '%s' hook was ignored because it's not set as executable.\n" -"You can disable this warning with `git config advice.ignoredHook false`." -msgstr "" -"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n" -"配置 `git config advice.ignoredHook false` 来关闭这条警告。" +msgid "missing branch name; try -%c" +msgstr "缺少分支名，尝试 -%c" -#: hook.c:87 +#: builtin/checkout.c #, c-format -msgid "Couldn't start hook '%s'\n" -msgstr "不能启动钩子 '%s'\n" +msgid "could not resolve %s" +msgstr "无法解析 %s" -#: ident.c:354 -msgid "Author identity unknown\n" -msgstr "作者身份未知\n" +#: builtin/checkout.c +msgid "invalid path specification" +msgstr "无效的路径规格" -#: ident.c:357 -msgid "Committer identity unknown\n" -msgstr "提交者身份未知\n" +#: builtin/checkout.c +#, c-format +msgid "'%s' is not a commit and a branch '%s' cannot be created from it" +msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'" -#: ident.c:363 +#: builtin/checkout.c +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "git checkout：--detach 不能接收路径参数 '%s'" + +#: builtin/checkout.c msgid "" -"\n" -"*** Please tell me who you are.\n" -"\n" -"Run\n" -"\n" -" git config --global user.email \"you@example.com\"\n" -" git config --global user.name \"Your Name\"\n" -"\n" -"to set your account's default identity.\n" -"Omit --global to set the identity only in this repository.\n" -"\n" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." msgstr "" -"\n" -"*** 请告诉我您是谁。\n" -"\n" -"运行\n" -"\n" -" git config --global user.email \"you@example.com\"\n" -" git config --global user.name \"Your Name\"\n" -"\n" -"来设置您账号的缺省身份标识。\n" -"如果仅在本仓库设置身份标识，则省略 --global 参数。\n" +"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。" -#: ident.c:398 -msgid "no email was given and auto-detection is disabled" -msgstr "未提供邮件地址且自动探测被禁用" +#: builtin/checkout.c +msgid "you must specify path(s) to restore" +msgstr "您必须指定一个要恢复的路径" -#: ident.c:403 -#, c-format -msgid "unable to auto-detect email address (got '%s')" -msgstr "无法自动探测邮件地址（得到 '%s'）" +#: builtin/checkout.c builtin/clone.c builtin/remote.c +#: builtin/submodule--helper.c builtin/worktree.c +msgid "branch" +msgstr "分支" -#: ident.c:420 -msgid "no name was given and auto-detection is disabled" -msgstr "未提供姓名且自动探测被禁用" +#: builtin/checkout.c +msgid "create and checkout a new branch" +msgstr "创建并检出一个新的分支" -#: ident.c:426 -#, c-format -msgid "unable to auto-detect name (got '%s')" -msgstr "无法自动探测姓名（得到 '%s'）" +#: builtin/checkout.c +msgid "create/reset and checkout a branch" +msgstr "创建/重置并检出一个分支" -#: ident.c:434 -#, c-format -msgid "empty ident name (for <%s>) not allowed" -msgstr "不允许空的姓名（对于 <%s>）" +#: builtin/checkout.c +msgid "create reflog for new branch" +msgstr "为新的分支创建引用日志" -#: ident.c:440 -#, c-format -msgid "name consists only of disallowed characters: %s" -msgstr "姓名中仅包含禁用字符：%s" +#: builtin/checkout.c +msgid "second guess 'git checkout ' (default)" +msgstr "二次猜测 'git checkout <无此分支>'（默认）" -#: ident.c:455 builtin/commit.c:649 -#, c-format -msgid "invalid date format: %s" -msgstr "无效的日期格式：%s" +#: builtin/checkout.c +msgid "use overlay mode (default)" +msgstr "使用叠加模式（默认）" -#: list-objects-filter-options.c:68 -msgid "expected 'tree:'" -msgstr "期望 'tree:<深度>'" +#: builtin/checkout.c +msgid "create and switch to a new branch" +msgstr "创建并切换一个新分支" -#: list-objects-filter-options.c:83 -msgid "sparse:path filters support has been dropped" -msgstr "sparse:path 过滤器支持已被删除" +#: builtin/checkout.c +msgid "create/reset and switch to a branch" +msgstr "创建/重置并切换一个分支" -#: list-objects-filter-options.c:90 -#, c-format -msgid "'%s' for 'object:type=' is not a valid object type" -msgstr "'object:type=' 的值 '%s' 不是有效的对象类型" +#: builtin/checkout.c +msgid "second guess 'git switch '" +msgstr "二次猜测 'git switch <无此分支>'" -#: list-objects-filter-options.c:109 -#, c-format -msgid "invalid filter-spec '%s'" -msgstr "无效的过滤器表达式 '%s'" +#: builtin/checkout.c +msgid "throw away local modifications" +msgstr "丢弃本地修改" -#: list-objects-filter-options.c:125 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" -msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'" +#: builtin/checkout.c +msgid "which tree-ish to checkout from" +msgstr "要检出哪一个树" -#: list-objects-filter-options.c:167 -msgid "expected something after combine:" -msgstr "期望在组合后有一些东西：" +#: builtin/checkout.c +msgid "restore the index" +msgstr "恢复索引" -#: list-objects-filter-options.c:249 -msgid "multiple filter-specs cannot be combined" -msgstr "不能混用多种过滤规格" +#: builtin/checkout.c +msgid "restore the working tree (default)" +msgstr "恢复工作区（默认）" -#: list-objects-filter-options.c:365 -msgid "unable to upgrade repository format to support partial clone" -msgstr "无法升级仓库格式以支持部分克隆" +#: builtin/checkout.c +msgid "ignore unmerged entries" +msgstr "忽略未合并条目" -#: list-objects-filter.c:532 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "不能访问 '%s' 中的稀疏数据对象" +#: builtin/checkout.c +msgid "use overlay mode" +msgstr "使用叠加模式" -#: list-objects-filter.c:535 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "无法解析 %s 中的稀疏过滤器数据" +#: builtin/clean.c +msgid "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." +msgstr "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." -#: list-objects.c:144 +#: builtin/clean.c #, c-format -msgid "entry '%s' in tree %s has tree mode, but is not a tree" -msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式，但不是一个树对象" +msgid "Removing %s\n" +msgstr "正删除 %s\n" -#: list-objects.c:157 +#: builtin/clean.c #, c-format -msgid "entry '%s' in tree %s has blob mode, but is not a blob" -msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一个数据对象" +msgid "Would remove %s\n" +msgstr "将删除 %s\n" -#: list-objects.c:415 +#: builtin/clean.c #, c-format -msgid "unable to load root tree for commit %s" -msgstr "无法为提交 %s 加载根树" +msgid "Skipping repository %s\n" +msgstr "忽略仓库 %s\n" -#: lockfile.c:152 +#: builtin/clean.c #, c-format -msgid "" -"Unable to create '%s.lock': %s.\n" -"\n" -"Another git process seems to be running in this repository, e.g.\n" -"an editor opened by 'git commit'. Please make sure all processes\n" -"are terminated then try again. If it still fails, a git process\n" -"may have crashed in this repository earlier:\n" -"remove the file manually to continue." -msgstr "" -"无法创建 '%s.lock'：%s。\n" -"\n" -"似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n" -"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n" -"可能之前有一个 git 进程在这个仓库中异常退出：\n" -"手动删除这个文件再继续。" +msgid "Would skip repository %s\n" +msgstr "将忽略仓库 %s\n" -#: lockfile.c:160 +#: builtin/clean.c midx.c #, c-format -msgid "Unable to create '%s.lock': %s" -msgstr "不能创建 '%s.lock'：%s" +msgid "failed to remove %s" +msgstr "无法删除 %s" -#: ls-refs.c:175 +#: builtin/clean.c #, c-format -msgid "unexpected line: '%s'" -msgstr "意外的行：'%s'" +msgid "could not lstat %s\n" +msgstr "不能对 %s 调用 lstat\n" -#: ls-refs.c:179 -msgid "expected flush after ls-refs arguments" -msgstr "在 ls-refs 参数后应该有一个 flush 包" +#: builtin/clean.c +msgid "Refusing to remove current working directory\n" +msgstr "拒绝删除当前工作目录\n" -#: mailinfo.c:1050 -msgid "quoted CRLF detected" -msgstr "检测到被引用的 CRLF" +#: builtin/clean.c +msgid "Would refuse to remove current working directory\n" +msgstr "将拒绝删除当前工作目录\n" -#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46 +#: builtin/clean.c git-add--interactive.perl #, c-format -msgid "bad action '%s' for '%s'" -msgstr "'%2$s' 的错误动作 '%1$s'" +msgid "" +"Prompt help:\n" +"1 - select a numbered item\n" +"foo - select item based on unique prefix\n" +" - (empty) select nothing\n" +msgstr "" +"帮助：\n" +"1 - 通过编号选择一个选项\n" +"foo - 通过唯一前缀选择一个选项\n" +" - （空）什么也不选择\n" -#: merge-ort.c:1630 merge-recursive.c:1214 +#: builtin/clean.c git-add--interactive.perl #, c-format -msgid "Failed to merge submodule %s (not checked out)" -msgstr "无法合并子模组 %s （没有检出）" +msgid "" +"Prompt help:\n" +"1 - select a single item\n" +"3-5 - select a range of items\n" +"2-3,6-9 - select multiple ranges\n" +"foo - select item based on unique prefix\n" +"-... - unselect specified items\n" +"* - choose all items\n" +" - (empty) finish selecting\n" +msgstr "" +"帮助：\n" +"1 - 选择一个选项\n" +"3-5 - 选择一个范围内的所有选项\n" +"2-3,6-9 - 选择多个范围内的所有选项\n" +"foo - 通过唯一前缀选择一个选项\n" +"-... - 反选特定的选项\n" +"* - 选择所有选项\n" +" - （空）结束选择\n" -#: merge-ort.c:1639 merge-recursive.c:1221 -#, c-format -msgid "Failed to merge submodule %s (commits not present)" -msgstr "无法合并子模组 %s（提交不存在）" +#: builtin/clean.c git-add--interactive.perl +#, c-format, perl-format +msgid "Huh (%s)?\n" +msgstr "嗯（%s）？\n" -#: merge-ort.c:1648 merge-recursive.c:1228 +#: builtin/clean.c #, c-format -msgid "Failed to merge submodule %s (commits don't follow merge-base)" -msgstr "无法合并子模组 %s （提交未跟随合并基线）" +msgid "Input ignore patterns>> " +msgstr "输入模版以排除条目>> " -#: merge-ort.c:1658 merge-ort.c:1666 +#: builtin/clean.c #, c-format -msgid "Note: Fast-forwarding submodule %s to %s" -msgstr "注意：快进子模组 %s 到 %s" +msgid "WARNING: Cannot find items matched by: %s" +msgstr "警告：无法找到和 %s 匹配的条目" -#: merge-ort.c:1688 -#, c-format -msgid "Failed to merge submodule %s" -msgstr "无法合并子模组 %s" +#: builtin/clean.c +msgid "Select items to delete" +msgstr "选择要删除的条目" -#: merge-ort.c:1695 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c #, c-format -msgid "" -"Failed to merge submodule %s, but a possible merge resolution exists:\n" -"%s\n" -msgstr "" -"无法合并子模组 %s，但是存在一个可能的合并方案：\n" -"%s\n" +msgid "Remove %s [y/N]? " +msgstr "删除 %s [y/N]？" -#: merge-ort.c:1699 merge-recursive.c:1284 -#, c-format +#: builtin/clean.c msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" +"clean - start cleaning\n" +"filter by pattern - exclude items from deletion\n" +"select by numbers - select items to be deleted by numbers\n" +"ask each - confirm each deletion (like \"rm -i\")\n" +"quit - stop cleaning\n" +"help - this screen\n" +"? - help for prompt selection" msgstr "" -"如果这个正确，将其添加到索引，例如使用命令：\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"以接受此建议。\n" +"clean - 开始清理\n" +"filter by pattern - 通过模版排除要删除的条目\n" +"select by numbers - 通过数字选择要删除的条目\n" +"ask each - 针对删除逐一询问（就像 \"rm -i\"）\n" +"quit - 停止删除并退出\n" +"help - 显示本帮助\n" +"? - 显示如何在提示符下选择的帮助" -#: merge-ort.c:1712 -#, c-format -msgid "" -"Failed to merge submodule %s, but multiple possible merges exist:\n" -"%s" -msgstr "" -"无法合并子模组 %s，但是存在多个可能的合并：\n" -"%s" +#: builtin/clean.c +msgid "Would remove the following item:" +msgid_plural "Would remove the following items:" +msgstr[0] "将删除如下条目：" +msgstr[1] "将删除如下条目：" -#: merge-ort.c:1937 merge-recursive.c:1375 -msgid "Failed to execute internal merge" -msgstr "无法执行内部合并" +#: builtin/clean.c +msgid "No more files to clean, exiting." +msgstr "没有要清理的文件，退出。" -#: merge-ort.c:1942 merge-recursive.c:1380 -#, c-format -msgid "Unable to add %s to database" -msgstr "不能添加 %s 至对象库" +#: builtin/clean.c +msgid "do not print names of files removed" +msgstr "不打印删除文件的名称" -#: merge-ort.c:1949 merge-recursive.c:1413 -#, c-format -msgid "Auto-merging %s" -msgstr "自动合并 %s" +#: builtin/clean.c +msgid "force" +msgstr "强制" -#: merge-ort.c:2088 merge-recursive.c:2135 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " -"implicit directory rename(s) putting the following path(s) there: %s." -msgstr "" -"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放" -"在：%s。" +#: builtin/clean.c +msgid "interactive cleaning" +msgstr "交互式清除" -#: merge-ort.c:2098 merge-recursive.c:2145 -#, c-format +#: builtin/clean.c +msgid "remove whole directories" +msgstr "删除整个目录" + +#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c +#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c +msgid "pattern" +msgstr "模式" + +#: builtin/clean.c +msgid "add to ignore rules" +msgstr "添加 <模式> 到忽略规则" + +#: builtin/clean.c +msgid "remove ignored files, too" +msgstr "也删除忽略的文件" + +#: builtin/clean.c +msgid "remove only ignored files" +msgstr "只删除忽略的文件" + +#: builtin/clean.c msgid "" -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " -"implicit directory renames tried to put these paths there: %s" +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " +"clean" msgstr "" -"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路" -"径放置于此：%s" +"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: merge-ort.c:2156 -#, c-format +#: builtin/clean.c msgid "" -"CONFLICT (directory rename split): Unclear where to rename %s to; it was " -"renamed to multiple other directories, with no destination getting a " -"majority of the files." +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " +"refusing to clean" msgstr "" -"冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目" -"录中，没有一个目标目录中包含多数文件。" +"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: merge-ort.c:2310 merge-recursive.c:2481 -#, c-format -msgid "" -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " -"renamed." -msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。" +#: builtin/clean.c +msgid "-x and -X cannot be used together" +msgstr "-x 和 -X 不能同时使用" -#: merge-ort.c:2450 merge-recursive.c:3264 -#, c-format -msgid "" -"Path updated: %s added in %s inside a directory that was renamed in %s; " -"moving it to %s." -msgstr "" -"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。" +#: builtin/clone.c +msgid "git clone [] [--] []" +msgstr "git clone [<选项>] [--] <仓库> [<路径>]" -#: merge-ort.c:2457 merge-recursive.c:3271 -#, c-format -msgid "" -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " -"%s; moving it to %s." -msgstr "" -"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移" -"动到 %5$s。" +#: builtin/clone.c +msgid "don't clone shallow repository" +msgstr "不克隆浅仓库" -#: merge-ort.c:2470 merge-recursive.c:3267 -#, c-format -msgid "" -"CONFLICT (file location): %s added in %s inside a directory that was renamed " -"in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动" -"到 %s。" +#: builtin/clone.c +msgid "don't create a checkout" +msgstr "不创建一个检出" -#: merge-ort.c:2478 merge-recursive.c:3274 -#, c-format -msgid "" -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " -"was renamed in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，" -"建议将其移动到 %5$s。" +#: builtin/clone.c builtin/init-db.c +msgid "create a bare repository" +msgstr "创建一个纯仓库" -#: merge-ort.c:2634 -#, c-format -msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." -msgstr "" -"冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。" +#: builtin/clone.c +msgid "create a mirror repository (implies bare)" +msgstr "创建一个镜像仓库（也是纯仓库）" -#: merge-ort.c:2729 -#, c-format -msgid "" -"CONFLICT (rename involved in collision): rename of %s -> %s has content " -"conflicts AND collides with another path; this may result in nested conflict " -"markers." -msgstr "" -"冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这" -"可能导致嵌套的冲突标签。" +#: builtin/clone.c +msgid "to clone from a local repository" +msgstr "从本地仓库克隆" -#: merge-ort.c:2748 merge-ort.c:2772 -#, c-format -msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." -msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。" +#: builtin/clone.c +msgid "don't use local hardlinks, always copy" +msgstr "不使用本地硬链接，始终复制" -#: merge-ort.c:3261 merge-recursive.c:3025 -#, c-format -msgid "cannot read object %s" -msgstr "不能读取对象 %s" +#: builtin/clone.c +msgid "setup as shared repository" +msgstr "设置为共享仓库" -#: merge-ort.c:3264 merge-recursive.c:3028 -#, c-format -msgid "object %s is not a blob" -msgstr "对象 %s 不是一个数据对象" +#: builtin/clone.c +msgid "pathspec" +msgstr "路径规格" -#: merge-ort.c:3693 -#, c-format -msgid "" -"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " -"%s instead." -msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。" +#: builtin/clone.c +msgid "initialize submodules in the clone" +msgstr "在克隆时初始化子模组" -#: merge-ort.c:3770 -#, c-format -msgid "" -"CONFLICT (distinct types): %s had different types on each side; renamed both " -"of them so each can be recorded somewhere." -msgstr "" -"冲突（不同类型）：%s 在两侧有不同的类型，将两者都重命名以便它们能记录在不同位" -"置。" +#: builtin/clone.c +msgid "number of submodules cloned in parallel" +msgstr "并发克隆的子模组的数量" -#: merge-ort.c:3777 -#, c-format -msgid "" -"CONFLICT (distinct types): %s had different types on each side; renamed one " -"of them so each can be recorded somewhere." -msgstr "" -"冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同" -"位置。" +#: builtin/clone.c builtin/init-db.c +msgid "template-directory" +msgstr "模板目录" -#: merge-ort.c:3866 merge-recursive.c:3104 -msgid "content" -msgstr "内容" +#: builtin/clone.c builtin/init-db.c +msgid "directory from which templates will be used" +msgstr "模板目录将被使用" -#: merge-ort.c:3868 merge-recursive.c:3108 -msgid "add/add" -msgstr "添加/添加" +#: builtin/clone.c builtin/submodule--helper.c +msgid "reference repository" +msgstr "参考仓库" -#: merge-ort.c:3870 merge-recursive.c:3153 -msgid "submodule" -msgstr "子模组" +#: builtin/clone.c builtin/submodule--helper.c +msgid "use --reference only while cloning" +msgstr "仅在克隆时参考 --reference 指向的本地仓库" -#: merge-ort.c:3872 merge-recursive.c:3154 -#, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "冲突（%s）：合并冲突于 %s" +#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c +#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c +#: builtin/submodule--helper.c t/helper/test-simple-ipc.c +msgid "name" +msgstr "名称" -#: merge-ort.c:3916 -#, c-format -msgid "" -"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " -"of %s left in tree." -msgstr "" -"冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本" -"在树中被保留。" +#: builtin/clone.c +msgid "use instead of 'origin' to track upstream" +msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" -#: merge-ort.c:4212 -#, c-format -msgid "" -"Note: %s not up to date and in way of checking out conflicted version; old " -"copy renamed to %s" -msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副本重命名为 %s" +#: builtin/clone.c +msgid "checkout instead of the remote's HEAD" +msgstr "检出 <分支> 而不是远程 HEAD" -#. 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:4586 -#, c-format -msgid "collecting merge info failed for trees %s, %s, %s" -msgstr "无法收集树 %s、%s、%s 的合并信息" +#: builtin/clone.c +msgid "path to git-upload-pack on the remote" +msgstr "远程 git-upload-pack 路径" -#: merge-ort-wrappers.c:13 merge-recursive.c:3723 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"您对下列文件的本地修改将被合并操作覆盖：\n" -" %s" +#: builtin/clone.c builtin/fetch.c builtin/grep.c builtin/pull.c +msgid "depth" +msgstr "深度" -#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405 -msgid "Already up to date." -msgstr "已经是最新的。" +#: builtin/clone.c +msgid "create a shallow clone of that depth" +msgstr "创建一个指定深度的浅克隆" -#: merge-recursive.c:353 -msgid "(bad commit)\n" -msgstr "（坏提交）\n" +#: builtin/clone.c builtin/fetch.c builtin/pack-objects.c builtin/pull.c +msgid "time" +msgstr "时间" -#: merge-recursive.c:381 -#, c-format -msgid "add_cacheinfo failed for path '%s'; merge aborting." -msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。" +#: builtin/clone.c +msgid "create a shallow clone since a specific time" +msgstr "从一个特定时间创建一个浅克隆" -#: merge-recursive.c:390 -#, c-format -msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." -msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。" +#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c +msgid "revision" +msgstr "版本" -#: merge-recursive.c:881 -#, c-format -msgid "failed to create path '%s'%s" -msgstr "无法创建路径 '%s'%s" +#: builtin/clone.c builtin/fetch.c builtin/pull.c +msgid "deepen history of shallow clone, excluding rev" +msgstr "深化浅克隆的历史，除了特定版本" -#: merge-recursive.c:892 -#, c-format -msgid "Removing %s to make room for subdirectory\n" -msgstr "删除 %s 以便为子目录留出空间\n" +#: builtin/clone.c builtin/submodule--helper.c +msgid "clone only one branch, HEAD or --branch" +msgstr "只克隆一个分支、HEAD 或 --branch" -#: merge-recursive.c:906 merge-recursive.c:925 -msgid ": perhaps a D/F conflict?" -msgstr "：可能是一个目录/文件冲突？" +#: builtin/clone.c +msgid "don't clone any tags, and make later fetches not to follow them" +msgstr "不要克隆任何标签，并且后续获取操作也不下载它们" -#: merge-recursive.c:915 -#, c-format -msgid "refusing to lose untracked file at '%s'" -msgstr "拒绝丢弃 '%s' 中的未跟踪文件" +#: builtin/clone.c +msgid "any cloned submodules will be shallow" +msgstr "子模组将以浅下载模式克隆" -#: merge-recursive.c:956 builtin/cat-file.c:47 -#, c-format -msgid "cannot read object %s '%s'" -msgstr "不能读取对象 %s '%s'" +#: builtin/clone.c builtin/init-db.c +msgid "gitdir" +msgstr "git目录" -#: merge-recursive.c:961 -#, c-format -msgid "blob expected for %s '%s'" -msgstr "%s '%s' 应为数据对象" +#: builtin/clone.c builtin/init-db.c +msgid "separate git dir from working tree" +msgstr "git目录和工作区分离" -#: merge-recursive.c:986 -#, c-format -msgid "failed to open '%s': %s" -msgstr "无法打开 '%s'：%s" +#: builtin/clone.c +msgid "key=value" +msgstr "key=value" -#: merge-recursive.c:997 -#, c-format -msgid "failed to symlink '%s': %s" -msgstr "无法创建符号链接 '%s'：%s" +#: builtin/clone.c +msgid "set config inside the new repository" +msgstr "在新仓库中设置配置信息" + +#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c +#: builtin/push.c builtin/send-pack.c +msgid "server-specific" +msgstr "server-specific" + +#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c +#: builtin/push.c builtin/send-pack.c +msgid "option to transmit" +msgstr "传输选项" + +#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c +msgid "use IPv4 addresses only" +msgstr "只使用 IPv4 地址" + +#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c +msgid "use IPv6 addresses only" +msgstr "只使用 IPv6 地址" + +#: builtin/clone.c +msgid "apply partial clone filters to submodules" +msgstr "对子模组使用部分克隆过滤器" + +#: builtin/clone.c +msgid "any cloned submodules will use their remote-tracking branch" +msgstr "任何克隆的子模组将使用它们的远程跟踪分支" -#: merge-recursive.c:1002 +#: builtin/clone.c +msgid "initialize sparse-checkout file to include only files at root" +msgstr "初始化稀疏检出文件，只包含根目录文件" + +#: builtin/clone.c #, c-format -msgid "do not know what to do with %06o %s '%s'" -msgstr "不知道如何处理 %06o %s '%s'" +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "info: 不能为 '%s' 添加一个备用：%s\n" -#: merge-recursive.c:1236 merge-recursive.c:1249 +#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c #, c-format -msgid "Fast-forwarding submodule %s to the following commit:" -msgstr "子模组 %s 快进到如下提交：" +msgid "failed to stat '%s'" +msgstr "无法对 '%s' 调用 stat" -#: merge-recursive.c:1239 merge-recursive.c:1252 +#: builtin/clone.c #, c-format -msgid "Fast-forwarding submodule %s" -msgstr "快进子模组 %s" +msgid "%s exists and is not a directory" +msgstr "%s 存在且不是一个目录" -#: merge-recursive.c:1276 +#: builtin/clone.c #, c-format -msgid "Failed to merge submodule %s (merge following commits not found)" -msgstr "无法合并子模组 %s （没发现合并跟随的提交）" +msgid "failed to start iterator over '%s'" +msgstr "无法在 '%s' 上启动迭代器" -#: merge-recursive.c:1280 +#: builtin/clone.c compat/precompose_utf8.c #, c-format -msgid "Failed to merge submodule %s (not fast-forward)" -msgstr "无法合并子模组 %s（非快进）" +msgid "failed to unlink '%s'" +msgstr "无法删除 '%s'" -#: merge-recursive.c:1281 -msgid "Found a possible merge resolution for the submodule:\n" -msgstr "找到子模组的一个可能的合并方案：\n" +#: builtin/clone.c +#, c-format +msgid "failed to create link '%s'" +msgstr "无法创建链接 '%s'" -#: merge-recursive.c:1293 +#: builtin/clone.c #, c-format -msgid "Failed to merge submodule %s (multiple merges found)" -msgstr "无法合并子模组 %s （发现多个合并）" +msgid "failed to copy file to '%s'" +msgstr "无法拷贝文件至 '%s'" -#: merge-recursive.c:1437 +#: builtin/clone.c #, c-format -msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." -msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。" +msgid "failed to iterate over '%s'" +msgstr "无法在 '%s' 上迭代" -#: merge-recursive.c:1509 +#: builtin/clone.c #, c-format +msgid "done.\n" +msgstr "完成。\n" + +#: builtin/clone.c msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " -"in tree." +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry with 'git restore --source=HEAD :/'\n" msgstr "" -"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" -"本被保留。" +"克隆成功，但是检出失败。\n" +"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" +"'git restore --source=HEAD :/' 重试\n" -#: merge-recursive.c:1514 +#: builtin/clone.c #, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " -"left in tree." -msgstr "" -"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " -"%7$s 版本被保留。" +msgid "Could not find remote branch %s to clone." +msgstr "不能发现要克隆的远程分支 %s。" -#: merge-recursive.c:1521 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " -"in tree at %s." -msgstr "" -"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" -"本保留在 %8$s 中。" +#: builtin/clone.c fetch-pack.c +msgid "remote did not send all necessary objects" +msgstr "远程没有发送所有必需的对象" -#: merge-recursive.c:1526 +#: builtin/clone.c #, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " -"left in tree at %s." -msgstr "" -"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " -"%7$s 版本保留在 %9$s 中。" - -#: merge-recursive.c:1561 -msgid "rename" -msgstr "重命名" +msgid "unable to update %s" +msgstr "不能更新 %s" -#: merge-recursive.c:1561 -msgid "renamed" -msgstr "重命名" +#: builtin/clone.c +msgid "failed to initialize sparse-checkout" +msgstr "无法初始化稀疏检出" -#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181 -#, c-format -msgid "Refusing to lose dirty file at %s" -msgstr "拒绝丢失脏文件 '%s'" +#: builtin/clone.c +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: merge-recursive.c:1622 -#, c-format -msgid "Refusing to lose untracked file at %s, even though it's in the way." -msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。" +#: builtin/clone.c +msgid "unable to checkout working tree" +msgstr "不能检出工作区" -#: merge-recursive.c:1680 -#, c-format -msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" -msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" +#: builtin/clone.c +msgid "unable to write parameters to config file" +msgstr "无法将参数写入配置文件" -#: merge-recursive.c:1711 -#, c-format -msgid "%s is a directory in %s adding as %s instead" -msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" +#: builtin/clone.c +msgid "cannot repack to clean up" +msgstr "无法执行 repack 来清理" -#: merge-recursive.c:1716 -#, c-format -msgid "Refusing to lose untracked file at %s; adding as %s instead" -msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s" +#: builtin/clone.c +msgid "cannot unlink temporary alternates file" +msgstr "无法删除临时的 alternates 文件" -#: merge-recursive.c:1743 -#, c-format -msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " -"\"%s\"->\"%s\" in \"%s\"%s" -msgstr "" -"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 " -"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" +#: builtin/clone.c +msgid "Too many arguments." +msgstr "太多参数。" -#: merge-recursive.c:1748 -msgid " (left unresolved)" -msgstr "（留下未解决）" +#: builtin/clone.c contrib/scalar/scalar.c +msgid "You must specify a repository to clone." +msgstr "您必须指定一个仓库来克隆。" -#: merge-recursive.c:1840 +#: builtin/clone.c #, c-format -msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" -msgstr "" -"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s-" -">%5$s" +msgid "options '%s' and '%s %s' cannot be used together" +msgstr "选项 '%s' 和 '%s %s' 不能同时使用" -#: merge-recursive.c:2103 +#: builtin/clone.c #, c-format -msgid "" -"CONFLICT (directory rename split): Unclear where to place %s because " -"directory %s was renamed to multiple other directories, with no destination " -"getting a majority of the files." -msgstr "" -"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个" -"其它目录，没有目录包含大部分文件。" +msgid "repository '%s' does not exist" +msgstr "仓库 '%s' 不存在" -#: merge-recursive.c:2237 +#: builtin/clone.c builtin/fetch.c #, c-format -msgid "" -"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" -">%s in %s" -msgstr "" -"冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 " -"%4$s->%5$s" - -#: merge-recursive.c:3092 -msgid "modify" -msgstr "修改" - -#: merge-recursive.c:3092 -msgid "modified" -msgstr "修改" +msgid "depth %s is not a positive number" +msgstr "深度 %s 不是一个正数" -#: merge-recursive.c:3131 +#: builtin/clone.c #, c-format -msgid "Skipped %s (merged same as existing)" -msgstr "略过 %s（已经做过相同合并）" +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: merge-recursive.c:3184 +#: builtin/clone.c #, c-format -msgid "Adding as %s instead" -msgstr "而是以 %s 为名添加" +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "仓库路径 '%s' 已经存在，并且不是一个空目录。" -#: merge-recursive.c:3388 +#: builtin/clone.c #, c-format -msgid "Removing %s" -msgstr "删除 %s" - -#: merge-recursive.c:3411 -msgid "file/directory" -msgstr "文件/目录" - -#: merge-recursive.c:3416 -msgid "directory/file" -msgstr "目录/文件" +msgid "working tree '%s' already exists." +msgstr "工作区 '%s' 已经存在。" -#: merge-recursive.c:3423 +#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c #, c-format -msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" -msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" +msgid "could not create leading directories of '%s'" +msgstr "不能为 '%s' 创建先导目录" -#: merge-recursive.c:3432 +#: builtin/clone.c #, c-format -msgid "Adding %s" -msgstr "添加 %s" +msgid "could not create work tree dir '%s'" +msgstr "不能创建工作区目录 '%s'" -#: merge-recursive.c:3441 +#: builtin/clone.c #, c-format -msgid "CONFLICT (add/add): Merge conflict in %s" -msgstr "冲突（add/add）：合并冲突于 %s" +msgid "Cloning into bare repository '%s'...\n" +msgstr "克隆到纯仓库 '%s'...\n" -#: merge-recursive.c:3494 +#: builtin/clone.c #, c-format -msgid "merging of trees %s and %s failed" -msgstr "无法合并树 %s 和 %s" +msgid "Cloning into '%s'...\n" +msgstr "正克隆到 '%s'...\n" -#: merge-recursive.c:3588 -msgid "Merging:" -msgstr "合并：" +#: builtin/clone.c +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" +msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" -#: merge-recursive.c:3601 +#: builtin/clone.c builtin/remote.c #, c-format -msgid "found %u common ancestor:" -msgid_plural "found %u common ancestors:" -msgstr[0] "发现 %u 个共同祖先：" -msgstr[1] "发现 %u 个共同祖先：" +msgid "'%s' is not a valid remote name" +msgstr "'%s' 不是一个有效的远程名称" -#: merge-recursive.c:3651 -msgid "merge returned no commit" -msgstr "合并未返回提交" +#: builtin/clone.c +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。" -#: merge-recursive.c:3823 -#, c-format -msgid "Could not parse object '%s'" -msgstr "不能解析对象 '%s'" +#: builtin/clone.c +msgid "--shallow-since is ignored in local clones; use file:// instead." +msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。" -#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912 -#: builtin/stash.c:489 -msgid "Unable to write index." -msgstr "不能写入索引。" +#: builtin/clone.c +msgid "--shallow-exclude is ignored in local clones; use file:// instead." +msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。" -#: merge.c:41 -msgid "failed to read the cache" -msgstr "无法读取缓存" +#: builtin/clone.c +msgid "--filter is ignored in local clones; use file:// instead." +msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。" -#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023 -#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714 -#: builtin/stash.c:269 -msgid "unable to write new index file" -msgstr "无法写新的索引文件" +#: builtin/clone.c fetch-pack.c +msgid "source repository is shallow, reject to clone." +msgstr "源仓库是浅克隆，拒绝克隆。" -#: midx.c:79 -msgid "multi-pack-index OID fanout is of the wrong size" -msgstr "多包索引的对象ID扇出表大小错误" +#: builtin/clone.c +msgid "source repository is shallow, ignoring --local" +msgstr "源仓库是浅克隆，忽略 --local" -#: midx.c:112 -#, c-format -msgid "multi-pack-index file %s is too small" -msgstr "多包索引文件 %s 太小" +#: builtin/clone.c +msgid "--local is ignored" +msgstr "--local 被忽略" -#: midx.c:128 -#, c-format -msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" -msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配" +#: builtin/clone.c +msgid "cannot clone from filtered bundle" +msgstr "无法从经过过滤的归档包克隆" -#: midx.c:133 -#, c-format -msgid "multi-pack-index version %d not recognized" -msgstr "multi-pack-index 版本 %d 不能被识别" +#: builtin/clone.c +msgid "remote transport reported error" +msgstr "远程传输报告错误" -#: midx.c:138 +#: builtin/clone.c #, c-format -msgid "multi-pack-index hash version %u does not match version %u" -msgstr "多包索引哈希版本 %u 和版本 %u 不匹配" +msgid "Remote branch %s not found in upstream %s" +msgstr "远程分支 %s 在上游 %s 未发现" -#: midx.c:155 -msgid "multi-pack-index missing required pack-name chunk" -msgstr "多包索引缺少必需的包名块" +#: builtin/clone.c +msgid "You appear to have cloned an empty repository." +msgstr "您似乎克隆了一个空仓库。" -#: midx.c:157 -msgid "multi-pack-index missing required OID fanout chunk" -msgstr "多包索引缺少必需的对象 ID 扇出块" +#: builtin/column.c +msgid "git column []" +msgstr "git column [<选项>]" -#: midx.c:159 -msgid "multi-pack-index missing required OID lookup chunk" -msgstr "多包索引缺少必需的对象 ID 查询块" +#: builtin/column.c +msgid "lookup config vars" +msgstr "查找配置变量" -#: midx.c:161 -msgid "multi-pack-index missing required object offsets chunk" -msgstr "多包索引缺少必需的对象偏移块" +#: builtin/column.c +msgid "layout to use" +msgstr "要使用的布局" -#: midx.c:180 -#, c-format -msgid "multi-pack-index pack names out of order: '%s' before '%s'" -msgstr "多包索引包名无序：'%s' 在 '%s' 之前" +#: builtin/column.c +msgid "maximum width" +msgstr "最大宽度" -#: midx.c:228 -#, c-format -msgid "bad pack-int-id: %u (%u total packs)" -msgstr "错的 pack-int-id：%u（共有 %u 个包）" +#: builtin/column.c +msgid "padding space on left border" +msgstr "左边框的填充空间" -#: midx.c:278 -msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" -msgstr "多包索引存储一个64位偏移，但是 off_t 太小" +#: builtin/column.c +msgid "padding space on right border" +msgstr "右边框的填充空间" -#: midx.c:509 -#, c-format -msgid "failed to add packfile '%s'" -msgstr "无法添加包文件 '%s'" +#: builtin/column.c +msgid "padding space between columns" +msgstr "两列之间的填充空间" -#: midx.c:515 -#, c-format -msgid "failed to open pack-index '%s'" -msgstr "无法打开包索引 '%s'" +#: builtin/column.c +msgid "--command must be the first argument" +msgstr "--command 必须是第一个参数" -#: midx.c:583 -#, c-format -msgid "failed to locate object %d in packfile" -msgstr "无法在包文件中定位对象 %d" +#: builtin/commit-graph.c +msgid "" +"git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" +msgstr "" +"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--" +"[no-]progress]" -#: midx.c:911 -msgid "cannot store reverse index file" -msgstr "无法存储反向索引文件" +#: builtin/commit-graph.c +msgid "" +"git commit-graph write [--object-dir ] [--append] [--" +"split[=]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters ] [--[no-]progress] " +msgstr "" +"git commit-graph write [--object-dir <对象目录>] [--append] [--split[=<策略" +">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--" +"[no-]max-new-filters ] [--[no-]progress] <切分选项>" -#: midx.c:1009 -#, c-format -msgid "could not parse line: %s" -msgstr "不能解析行：%s" - -#: midx.c:1011 -#, c-format -msgid "malformed line: %s" -msgstr "格式错误的行：%s" +#: builtin/commit-graph.c builtin/fetch.c builtin/log.c +msgid "dir" +msgstr "目录" -#: midx.c:1181 -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "忽略已存在的多包索引，校验码不匹配" +#: builtin/commit-graph.c +msgid "the object directory to store the graph" +msgstr "保存图形的对象目录" -#: midx.c:1206 -msgid "could not load pack" -msgstr "不能载入包" +#: builtin/commit-graph.c +msgid "if the commit-graph is split, only verify the tip file" +msgstr "如果提交图形被拆分，只验证头一个文件" -#: midx.c:1212 +#: builtin/commit-graph.c #, c-format -msgid "could not open index for %s" -msgstr "不能打开 %s 的索引" - -#: midx.c:1223 -msgid "Adding packfiles to multi-pack-index" -msgstr "添加包文件到多包索引" +msgid "Could not open commit-graph '%s'" +msgstr "无法打开提交图形 '%s'" -#: midx.c:1266 +#: builtin/commit-graph.c #, c-format -msgid "unknown preferred pack: '%s'" -msgstr "未知的首选包：'%s'" +msgid "unrecognized --split argument, %s" +msgstr "未能识别的 --split 参数，%s" -#: midx.c:1311 +#: builtin/commit-graph.c #, c-format -msgid "cannot select preferred pack %s with no objects" -msgstr "不能选择没有对象的首选包 %s" +msgid "unexpected non-hex object ID: %s" +msgstr "意外的非十六进制对象 ID：%s" -#: midx.c:1343 +#: builtin/commit-graph.c #, c-format -msgid "did not see pack-file %s to drop" -msgstr "没有看到要丢弃的包文件 %s" +msgid "invalid object: %s" +msgstr "无效对象：%s" -#: midx.c:1389 +#: builtin/commit-graph.c parse-options-cb.c #, c-format -msgid "preferred pack '%s' is expired" -msgstr "首选包 '%s' 已过期" +msgid "option `%s' expects a numerical value" +msgstr "选项 `%s' 期望一个数字值" -#: midx.c:1402 -msgid "no pack files to index." -msgstr "没有要索引的包文件。" +#: builtin/commit-graph.c +msgid "start walk at all refs" +msgstr "开始遍历所有引用" -#: midx.c:1409 -msgid "refusing to write multi-pack .bitmap without any objects" -msgstr "拒绝写入没有任何对象的多包位图 .bitmap" +#: builtin/commit-graph.c +msgid "scan pack-indexes listed by stdin for commits" +msgstr "从标准输入中的包索引文件列表中扫描提交" -#: midx.c:1451 -msgid "could not write multi-pack bitmap" -msgstr "无法写入多包位图" +#: builtin/commit-graph.c +msgid "start walk at commits listed by stdin" +msgstr "从标准输入中的提交开始扫描" -#: midx.c:1461 -msgid "could not write multi-pack-index" -msgstr "无法写入多包索引" +#: builtin/commit-graph.c +msgid "include all commits already in the commit-graph file" +msgstr "包含 commit-graph 文件中已有所有提交" -#: midx.c:1520 builtin/clean.c:37 -#, c-format -msgid "failed to remove %s" -msgstr "无法删除 %s" +#: builtin/commit-graph.c +msgid "enable computation for changed paths" +msgstr "启用变更路径的计算" -#: midx.c:1553 -#, c-format -msgid "failed to clear multi-pack-index at %s" -msgstr "无法清理位于 %s 的多包索引" +#: builtin/commit-graph.c +msgid "allow writing an incremental commit-graph file" +msgstr "允许写一个增量提交图形文件" -#: midx.c:1616 -msgid "multi-pack-index file exists, but failed to parse" -msgstr "多包索引文件存在，但无法解析" +#: builtin/commit-graph.c +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "在非基本拆分提交图形中的最大提交数" -#: midx.c:1624 -msgid "incorrect checksum" -msgstr "不正确的校验码" +#: builtin/commit-graph.c +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "一个拆分提交图形的两个级别之间的最大比率" -#: midx.c:1627 -msgid "Looking for referenced packfiles" -msgstr "正在查找引用的包文件" +#: builtin/commit-graph.c +msgid "only expire files older than a given date-time" +msgstr "只让早于给定时间的文件过期" -#: midx.c:1642 -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" -msgstr "对象 ID 扇出无序：fanout[%d] = % > % = fanout[%d]" +#: builtin/commit-graph.c +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "要计算的变更路径布隆过滤器的最大数" -#: midx.c:1647 -msgid "the midx contains no oid" -msgstr "midx 不包含 oid" +#: builtin/commit-graph.c +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" -#: midx.c:1656 -msgid "Verifying OID order in multi-pack-index" -msgstr "校验多包索引中的 OID 顺序" +#: builtin/commit-graph.c +msgid "Collecting commits from input" +msgstr "正从标准输入收集提交" -#: midx.c:1665 +#: builtin/commit-graph.c builtin/multi-pack-index.c #, c-format -msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" -msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]" +msgid "unrecognized subcommand: %s" +msgstr "未识别的子命令：%s" -#: midx.c:1685 -msgid "Sorting objects by packfile" -msgstr "通过包文件为对象排序" +#: builtin/commit-tree.c +msgid "" +"git commit-tree [(-p )...] [-S[]] [(-m )...] [(-F " +")...] " +msgstr "" +"git commit-tree [(-p <父提交>)...] [-S[]] [(-m <消息>)...] [(-F <文件" +">)...] <树>" -#: midx.c:1692 -msgid "Verifying object offsets" -msgstr "校验对象偏移" +#: builtin/commit-tree.c +#, c-format +msgid "duplicate parent %s ignored" +msgstr "忽略重复的父提交 %s" -#: midx.c:1708 +#: builtin/commit-tree.c builtin/log.c #, c-format -msgid "failed to load pack entry for oid[%d] = %s" -msgstr "无法为 oid[%d] = %s 加载包条目" +msgid "not a valid object name %s" +msgstr "不是一个有效的对象名 %s" -#: midx.c:1714 +#: builtin/commit-tree.c #, c-format -msgid "failed to load pack-index for packfile %s" -msgstr "无法为包文件 %s 加载包索引" +msgid "git commit-tree: failed to read '%s'" +msgstr "git commit-tree：无法读取 '%s'" -#: midx.c:1723 +#: builtin/commit-tree.c #, c-format -msgid "incorrect object offset for oid[%d] = %s: % != %" -msgstr "oid[%d] = %s 错误的对象偏移：% != %" +msgid "git commit-tree: failed to close '%s'" +msgstr "git commit-tree：无法关闭 '%s'" -#: midx.c:1750 -msgid "Counting referenced objects" -msgstr "正在对引用对象计数" +#: builtin/commit-tree.c +msgid "parent" +msgstr "父提交" -#: midx.c:1760 -msgid "Finding and deleting unreferenced packfiles" -msgstr "正在查找和删除未引用的包文件" +#: builtin/commit-tree.c +msgid "id of a parent commit object" +msgstr "父提交对象 ID" -#: midx.c:1952 -msgid "could not start pack-objects" -msgstr "不能开始 pack-objects" +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c +#: builtin/stash.c builtin/tag.c +msgid "message" +msgstr "说明" -#: midx.c:1972 -msgid "could not finish pack-objects" -msgstr "不能结束 pack-objects" +#: builtin/commit-tree.c builtin/commit.c +msgid "commit message" +msgstr "提交说明" -#: name-hash.c:542 -#, c-format -msgid "unable to create lazy_dir thread: %s" -msgstr "不能创建 lazy_dir 线程：%s" +#: builtin/commit-tree.c +msgid "read commit log message from file" +msgstr "从文件中读取提交说明" -#: name-hash.c:564 -#, c-format -msgid "unable to create lazy_name thread: %s" -msgstr "不能创建 lazy_name 线程：%s" +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c +#: builtin/revert.c +msgid "GPG sign commit" +msgstr "GPG 提交签名" -#: name-hash.c:570 -#, c-format -msgid "unable to join lazy_name thread: %s" -msgstr "不能加入 lazy_name 线程：%s" +#: builtin/commit-tree.c +msgid "must give exactly one tree" +msgstr "必须精确地提供一个树" -#: notes-merge.c:276 -#, c-format +#: builtin/commit-tree.c +msgid "git commit-tree: failed to read" +msgstr "git commit-tree：无法读取" + +#: builtin/commit.c +msgid "git commit [] [--] ..." +msgstr "git commit [<选项>] [--] <路径规格>..." + +#: builtin/commit.c +msgid "git status [] [--] ..." +msgstr "git status [<选项>] [--] <路径规格>..." + +#: builtin/commit.c msgid "" -"You have not concluded your previous notes merge (%s exists).\n" -"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " -"commit/abort the previous merge before you start a new notes merge." +"You asked to amend the most recent commit, but doing so would make\n" +"it empty. You can repeat your command with --allow-empty, or you can\n" +"remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -"您的前一次注释合并尚未结束（存在 %s）。\n" -"在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git " -"notes merge --abort' 来提交/终止前一次合并。" +"您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" +"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" -#: notes-merge.c:283 -#, c-format -msgid "You have not concluded your notes merge (%s exists)." -msgstr "您尚未结束注释合并（存在 %s）。" +#: builtin/commit.c +msgid "" +"The previous cherry-pick is now empty, possibly due to conflict resolution.\n" +"If you wish to commit it anyway, use:\n" +"\n" +" git commit --allow-empty\n" +"\n" +msgstr "" +"之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n" +"也要提交，使用命令：\n" +"\n" +" git commit --allow-empty\n" +"\n" -#: notes-utils.c:46 -msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "不能提交未初始化/未引用的注解树" +#: builtin/commit.c +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "否则，请使用 'git rebase --skip'\n" -#: notes-utils.c:105 -#, c-format -msgid "Bad notes.rewriteMode value: '%s'" -msgstr "坏的 notes.rewriteMode 值：'%s'" +#: builtin/commit.c +msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgstr "否则，请使用 'git cherry-pick --skip'\n" -#: notes-utils.c:115 -#, c-format -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" +#: builtin/commit.c +msgid "" +"and then use:\n" +"\n" +" git cherry-pick --continue\n" +"\n" +"to resume cherry-picking the remaining commits.\n" +"If you wish to skip this commit, use:\n" +"\n" +" git cherry-pick --skip\n" +"\n" +msgstr "" +"然后使用：\n" +"\n" +" git cherry-pick --continue\n" +"\n" +"来继续拣选剩余提交。如果您想跳过此提交，使用：\n" +"\n" +" git cherry-pick --skip\n" +"\n" -#. TRANSLATORS: The first %s is the name of -#. the environment variable, the second %s is -#. its value. -#. -#: notes-utils.c:145 -#, c-format -msgid "Bad %s value: '%s'" -msgstr "坏的 %s 值：'%s'" +#: builtin/commit.c +msgid "failed to unpack HEAD tree object" +msgstr "无法解包 HEAD 树对象" -#: object-file.c:457 -#, c-format -msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates" +#: builtin/commit.c +msgid "No paths with --include/--only does not make sense." +msgstr "参数 --include/--only 不跟路径没有意义。" -#: object-file.c:515 -#, c-format -msgid "unable to normalize alternate object path: %s" -msgstr "无法规范化备用对象路径：%s" +#: builtin/commit.c +msgid "unable to create temporary index" +msgstr "不能创建临时索引" -#: object-file.c:589 -#, c-format -msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "%s：忽略备用对象库，嵌套太深" +#: builtin/commit.c +msgid "interactive add failed" +msgstr "交互式添加失败" -#: object-file.c:596 -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "无法规范化对象目录: %s" +#: builtin/commit.c +msgid "unable to update temporary index" +msgstr "无法更新临时索引" -#: object-file.c:639 -msgid "unable to fdopen alternates lockfile" -msgstr "无法 fdopen 替换锁文件" +#: builtin/commit.c +msgid "Failed to update main cache tree" +msgstr "不能更新树的主缓存" -#: object-file.c:657 -msgid "unable to read alternates file" -msgstr "无法读取替代文件" +#: builtin/commit.c +msgid "unable to write new_index file" +msgstr "无法写 new_index 文件" -#: object-file.c:664 -msgid "unable to move new alternates file into place" -msgstr "无法将新的替代文件移动到位" +#: builtin/commit.c +msgid "cannot do a partial commit during a merge." +msgstr "在合并过程中不能做部分提交。" -#: object-file.c:742 -#, c-format -msgid "path '%s' does not exist" -msgstr "路径 '%s' 不存在" +#: builtin/commit.c +msgid "cannot do a partial commit during a cherry-pick." +msgstr "在拣选过程中不能做部分提交。" -#: object-file.c:763 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" +#: builtin/commit.c +msgid "cannot do a partial commit during a rebase." +msgstr "在变基过程中不能做部分提交。" -#: object-file.c:769 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "参考仓库 '%s' 不是一个本地仓库。" +#: builtin/commit.c +msgid "cannot read the index" +msgstr "无法读取索引" -#: object-file.c:775 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "参考仓库 '%s' 是一个浅克隆" +#: builtin/commit.c +msgid "unable to write temporary index file" +msgstr "无法写临时索引文件" -#: object-file.c:783 +#: builtin/commit.c #, c-format -msgid "reference repository '%s' is grafted" -msgstr "参考仓库 '%s' 已被移植" +msgid "commit '%s' lacks author header" +msgstr "提交 '%s' 缺少作者信息" -#: object-file.c:814 +#: builtin/commit.c #, c-format -msgid "could not find object directory matching %s" -msgstr "无法找到和 %s 匹配的对象目录" +msgid "commit '%s' has malformed author line" +msgstr "提交 '%s' 有格式错误的作者信息" -#: object-file.c:864 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "解析备用引用时无效的行：%s" +#: builtin/commit.c +msgid "malformed --author parameter" +msgstr "格式错误的 --author 参数" -#: object-file.c:1014 +#: builtin/commit.c ident.c #, c-format -msgid "attempting to mmap % over limit %" -msgstr "尝试 mmap %，超过了最大值 %" +msgid "invalid date format: %s" +msgstr "无效的日期格式：%s" -#: object-file.c:1049 -#, c-format -msgid "mmap failed%s" -msgstr "mmap 失败%s" +#: builtin/commit.c +msgid "" +"unable to select a comment character that is not used\n" +"in the current commit message" +msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: object-file.c:1230 +#: builtin/commit.c #, c-format -msgid "object file %s is empty" -msgstr "对象文件 %s 为空" +msgid "could not lookup commit %s" +msgstr "不能查询提交 %s" -#: object-file.c:1349 object-file.c:2588 +#: builtin/commit.c builtin/shortlog.c #, c-format -msgid "corrupt loose object '%s'" -msgstr "损坏的松散对象 '%s'" +msgid "(reading log message from standard input)\n" +msgstr "（正从标准输入中读取日志信息）\n" -#: object-file.c:1351 object-file.c:2592 +#: builtin/commit.c +msgid "could not read log from standard input" +msgstr "不能从标准输入中读取日志信息" + +#: builtin/commit.c #, c-format -msgid "garbage at end of loose object '%s'" -msgstr "松散对象 '%s' 后面有垃圾数据" +msgid "could not read log file '%s'" +msgstr "不能读取日志文件 '%s'" -#: object-file.c:1473 +#: builtin/commit.c #, c-format -msgid "unable to parse %s header" -msgstr "无法解析 %s 头部" +msgid "options '%s' and '%s:%s' cannot be used together" +msgstr "选项 '%s' 和 '%s:%s' 不能同时使用" -#: object-file.c:1475 -msgid "invalid object type" -msgstr "无效的对象类型" +#: builtin/commit.c +msgid "could not read SQUASH_MSG" +msgstr "不能读取 SQUASH_MSG" -#: object-file.c:1486 -#, c-format -msgid "unable to unpack %s header" -msgstr "无法解开 %s 头部" +#: builtin/commit.c +msgid "could not read MERGE_MSG" +msgstr "不能读取 MERGE_MSG" -#: object-file.c:1490 +#: builtin/commit.c bundle.c rerere.c sequencer.c #, c-format -msgid "header for %s too long, exceeds %d bytes" -msgstr "%s 的头部太长，超出了 %d 字节" +msgid "could not open '%s'" +msgstr "不能打开 '%s'" -#: object-file.c:1720 -#, c-format -msgid "failed to read object %s" -msgstr "无法读取对象 %s" +#: builtin/commit.c +msgid "could not write commit template" +msgstr "不能写提交模版" -#: object-file.c:1724 +#: builtin/commit.c #, c-format -msgid "replacement %s not found for %s" -msgstr "找不到 %2$s 的替代 %1$s" +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored.\n" +msgstr "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略。\n" -#: object-file.c:1728 +#: builtin/commit.c #, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "松散对象 %s（保存在 %s）已损坏" +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" +"说明将会终止提交。\n" -#: object-file.c:1732 +#: builtin/commit.c #, c-format -msgid "packed object %s (stored in %s) is corrupt" -msgstr "打包对象 %s（保存在 %s）已损坏" +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +msgstr "" +"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n" +"也可以删除它们。\n" -#: object-file.c:1855 +#: builtin/commit.c #, c-format -msgid "unable to write file %s" -msgstr "无法写文件 %s" +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n" +"也可以删除它们。一个空的提交说明将会终止提交。\n" -#: object-file.c:1862 -#, c-format -msgid "unable to set permission to '%s'" -msgstr "无法为 '%s' 设置权限" +#: builtin/commit.c +msgid "" +"\n" +"It looks like you may be committing a merge.\n" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" +"and try again.\n" +msgstr "" +"\n" +"似乎您正在做一个合并提交。如果不对，请运行\n" +"\tgit update-ref -d MERGE_HEAD\n" +"然后重试。\n" -#: object-file.c:1869 -msgid "file write error" -msgstr "文件写错误" +#: builtin/commit.c +msgid "" +"\n" +"It looks like you may be committing a cherry-pick.\n" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" +"and try again.\n" +msgstr "" +"\n" +"似乎您正在做一个拣选提交。如果不对，请运行\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" +"然后重试。\n" -#: object-file.c:1904 -msgid "error when closing loose object file" -msgstr "关闭松散对象文件时出错" +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: builtin/commit.c +#, c-format +msgid "%sAuthor: %.*s <%.*s>" +msgstr "%s作者： %.*s <%.*s>" -#: object-file.c:1971 +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: builtin/commit.c #, c-format -msgid "insufficient permission for adding an object to repository database %s" -msgstr "权限不足，无法在仓库对象库 %s 中添加对象" +msgid "%sDate: %s" +msgstr "%s日期： %s" -#: object-file.c:1973 -msgid "unable to create temporary file" -msgstr "无法创建临时文件" +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: builtin/commit.c +#, c-format +msgid "%sCommitter: %.*s <%.*s>" +msgstr "%s提交者：%.*s <%.*s>" -#: object-file.c:1997 -msgid "unable to write loose object file" -msgstr "不能写松散对象文件" +#: builtin/commit.c +msgid "Cannot read index" +msgstr "无法读取索引" -#: object-file.c:2003 -#, c-format -msgid "unable to deflate new object %s (%d)" -msgstr "不能压缩新对象 %s（%d）" +#: builtin/commit.c +msgid "unable to pass trailers to --trailers" +msgstr "无法将尾注传递给 --trailers" + +#: builtin/commit.c +msgid "Error building trees" +msgstr "无法创建树对象" -#: object-file.c:2007 +#: builtin/commit.c builtin/tag.c #, c-format -msgid "deflateEnd on object %s failed (%d)" -msgstr "在对象 %s 上调用 deflateEnd 失败（%d）" +msgid "Please supply the message using either -m or -F option.\n" +msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: object-file.c:2011 +#: builtin/commit.c #, c-format -msgid "confused by unstable object source data for %s" -msgstr "被 %s 的不稳定对象源数据搞糊涂了" +msgid "--author '%s' is not 'Name ' and matches no existing author" +msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配" -#: object-file.c:2022 builtin/pack-objects.c:1251 +#: builtin/commit.c #, c-format -msgid "failed utime() on %s" -msgstr "在 %s 上调用 utime() 失败" +msgid "Invalid ignored mode '%s'" +msgstr "无效的忽略模式 '%s'" -#: object-file.c:2100 +#: builtin/commit.c #, c-format -msgid "cannot read object for %s" -msgstr "不能读取对象 %s" +msgid "Invalid untracked files mode '%s'" +msgstr "无效的未跟踪文件参数 '%s'" -#: object-file.c:2151 -msgid "corrupt commit" -msgstr "损坏的提交" +#: builtin/commit.c +msgid "You are in the middle of a merge -- cannot reword." +msgstr "您正处于一个合并过程中 -- 无法改写说明。" -#: object-file.c:2159 -msgid "corrupt tag" -msgstr "损坏的标签" +#: builtin/commit.c +msgid "You are in the middle of a cherry-pick -- cannot reword." +msgstr "您正处于一个拣选过程中 -- 无法改写说明。" -#: object-file.c:2259 +#: builtin/commit.c #, c-format -msgid "read error while indexing %s" -msgstr "索引 %s 时读取错误" +msgid "reword option of '%s' and path '%s' cannot be used together" +msgstr "改写说明选项 '%s' 和路径 '%s' 不能同时使用" -#: object-file.c:2262 +#: builtin/commit.c #, c-format -msgid "short read while indexing %s" -msgstr "索引 %s 时读入不完整" +msgid "reword option of '%s' and '%s' cannot be used together" +msgstr "改写说明选项 '%s' 和 '%s' 不能同时使用" -#: object-file.c:2335 object-file.c:2345 -#, c-format -msgid "%s: failed to insert into database" -msgstr "%s：无法插入数据库" +#: builtin/commit.c +msgid "You have nothing to amend." +msgstr "您没有可修补的提交。" -#: object-file.c:2351 -#, c-format -msgid "%s: unsupported file type" -msgstr "%s：不支持的文件类型" +#: builtin/commit.c +msgid "You are in the middle of a merge -- cannot amend." +msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: object-file.c:2375 builtin/fetch.c:1494 -#, c-format -msgid "%s is not a valid object" -msgstr "%s 不是一个有效的对象" +#: builtin/commit.c +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: object-file.c:2377 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s 不是一个有效的 '%s' 对象" +#: builtin/commit.c +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "您正处于一个变基过程中 -- 无法修补提交。" -#: object-file.c:2404 -#, c-format -msgid "unable to open %s" -msgstr "不能打开 %s" +#: builtin/commit.c +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: object-file.c:2599 +#: builtin/commit.c #, c-format -msgid "hash mismatch for %s (expected %s)" -msgstr "%s 的哈希值不匹配（预期 %s）" +msgid "unknown option: --fixup=%s:%s" +msgstr "未知选项：--fixup=%s:%s" -#: object-file.c:2622 +#: builtin/commit.c #, c-format -msgid "unable to mmap %s" -msgstr "不能 mmap %s" +msgid "paths '%s ...' with -a does not make sense" +msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" -#: object-file.c:2628 -#, c-format -msgid "unable to unpack header of %s" -msgstr "无法解压缩 %s 的头部" +#: builtin/commit.c +msgid "show status concisely" +msgstr "以简洁的格式显示状态" -#: object-file.c:2633 -#, c-format -msgid "unable to parse header of %s" -msgstr "无法解析 %s 的头部" +#: builtin/commit.c +msgid "show branch information" +msgstr "显示分支信息" -#: object-file.c:2644 -#, c-format -msgid "unable to unpack contents of %s" -msgstr "无法解压缩 %s 的内容" +#: builtin/commit.c +msgid "show stash information" +msgstr "显示贮藏区信息" -#. TRANSLATORS: This is a line of ambiguous object -#. output shown when we cannot look up or parse the -#. object in question. E.g. "deadbeef [bad object]". -#. -#: object-name.c:382 -#, c-format -msgid "%s [bad object]" -msgstr "%s [坏的对象]" +#: builtin/commit.c +msgid "compute full ahead/behind values" +msgstr "计算完整的领先/落后值" -#. TRANSLATORS: This is a line of ambiguous commit -#. object output. E.g.: -#. * -#. "deadbeef commit 2021-01-01 - Some Commit Message" -#. -#: object-name.c:407 -#, c-format -msgid "%s commit %s - %s" -msgstr "%s 提交 %s - %s" +#: builtin/commit.c +msgid "version" +msgstr "版本" -#. TRANSLATORS: This is a line of ambiguous -#. tag object output. E.g.: -#. * -#. "deadbeef tag 2022-01-01 - Some Tag Message" -#. * -#. The second argument is the YYYY-MM-DD found -#. in the tag. -#. * -#. The third argument is the "tag" string -#. from object.c. -#. -#: object-name.c:428 -#, c-format -msgid "%s tag %s - %s" -msgstr "%s 标签 %s - %s" +#: builtin/commit.c builtin/push.c builtin/worktree.c +msgid "machine-readable output" +msgstr "机器可读的输出" -#. TRANSLATORS: This is a line of ambiguous -#. tag object output where we couldn't parse -#. the tag itself. E.g.: -#. * -#. "deadbeef [bad tag, could not parse it]" -#. -#: object-name.c:439 -#, c-format -msgid "%s [bad tag, could not parse it]" -msgstr "%s [坏的标签，无法解析]" +#: builtin/commit.c +msgid "show status in long format (default)" +msgstr "以长格式显示状态（默认）" -#. TRANSLATORS: This is a line of ambiguous -#. object output. E.g. "deadbeef tree". -#. -#: object-name.c:447 -#, c-format -msgid "%s tree" -msgstr "%s 树" +#: builtin/commit.c +msgid "terminate entries with NUL" +msgstr "条目以 NUL 字符结尾" -#. TRANSLATORS: This is a line of ambiguous -#. object output. E.g. "deadbeef blob". -#. -#: object-name.c:453 -#, c-format -msgid "%s blob" -msgstr "%s 数据对象" +#: builtin/commit.c builtin/fast-export.c builtin/rebase.c parse-options.h +msgid "mode" +msgstr "模式" -#: object-name.c:569 -#, c-format -msgid "short object ID %s is ambiguous" -msgstr "短对象ID %s 存在歧义" +#: builtin/commit.c +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#. TRANSLATORS: The argument is the list of ambiguous -#. objects composed in show_ambiguous_object(). See -#. its "TRANSLATORS" comments for details. -#. -#: object-name.c:591 -#, c-format +#: builtin/commit.c msgid "" -"The candidates are:\n" -"%s" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" msgstr "" -"候选者有：\n" -"%s" +"显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）" + +#: builtin/commit.c parse-options.h +msgid "when" +msgstr "何时" -#: object-name.c:888 +#: builtin/commit.c msgid "" -"Git normally never creates a ref that ends with 40 hex characters\n" -"because it will be ignored when you just specify 40-hex. These refs\n" -"may be created by mistake. For example,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" -"examine these refs and maybe delete them. Turn this message off by\n" -"running \"git config advice.objectNameWarning false\"" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" msgstr "" -"Git 通常不会创建一个以40个十六进制字符结尾的引用，因为当您只提供40\n" -"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如：\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"当 \"$br\" 某种原因空白时，一个40位十六进制的引用将被创建。请检查这些\n" -"引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n" -"false\" 命令关闭本消息通知。" +"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: object-name.c:1008 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "'%.*s' 的日志仅能回到 %s" +#: builtin/commit.c +msgid "list untracked files in columns" +msgstr "以列的方式显示未跟踪的文件" -#: object-name.c:1016 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "'%.*s' 的日志仅有 %d 个条目" +#: builtin/commit.c +msgid "do not detect renames" +msgstr "不检测重命名" -#: object-name.c:1794 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中" +#: builtin/commit.c +msgid "detect renames, optionally set similarity index" +msgstr "检测重命名，可以设置索引相似度" -#: object-name.c:1800 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"路径 '%s' 存在，而 '%s' 不存在\n" -"提示：您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'？" +#: builtin/commit.c +msgid "Unsupported combination of ignored and untracked-files arguments" +msgstr "不支持已忽略和未跟踪文件参数的组合" -#: object-name.c:1809 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "路径 '%s' 不在 '%.*s' 中" +#: builtin/commit.c +msgid "suppress summary after successful commit" +msgstr "提交成功后不显示概述信息" -#: object-name.c:1837 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"路径 '%s' 在索引中，但不在暂存区 %d 中\n" -"提示：您的意思是 ':%d:%s'？" +#: builtin/commit.c +msgid "show diff in commit message template" +msgstr "在提交说明模板里显示差异" -#: object-name.c:1853 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"路径 '%s' 在索引中，但 '%s' 不在\n" -"提示：您的意思是 ':%d:%s' 亦即 ':%d:./%s'？" +#: builtin/commit.c +msgid "Commit message options" +msgstr "提交说明选项" -#: object-name.c:1861 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "路径 '%s' 在磁盘上，但不在索引里" +#: builtin/commit.c builtin/merge.c builtin/tag.c +msgid "read message from file" +msgstr "从文件中读取提交说明" -#: object-name.c:1863 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）" +#: builtin/commit.c +msgid "author" +msgstr "作者" -#: object-name.c:1876 -msgid "relative path syntax can't be used outside working tree" -msgstr "不能在工作区之外使用相对路径语法" +#: builtin/commit.c +msgid "override author for commit" +msgstr "提交时覆盖作者" -#: object-name.c:1901 -#, c-format -msgid ": required, only '%s' given" -msgstr "需要 <对象>:<路径>，只给出了 <对象> '%s'" +#: builtin/commit.c builtin/gc.c +msgid "date" +msgstr "日期" -#: object-name.c:2014 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "无效的对象名 '%.*s'。" +#: builtin/commit.c +msgid "override date for commit" +msgstr "提交时覆盖日期" -#: object.c:53 -#, c-format -msgid "invalid object type \"%s\"" -msgstr "无效的对象类型 \"%s\"" +#: builtin/commit.c parse-options.h ref-filter.h +msgid "commit" +msgstr "提交" -#: object.c:173 -#, c-format -msgid "object %s is a %s, not a %s" -msgstr "对象 %s 是一个 %s，不是一个 %s" +#: builtin/commit.c +msgid "reuse and edit message from specified commit" +msgstr "重用并编辑指定提交的提交说明" -#: object.c:250 -#, c-format -msgid "object %s has unknown type id %d" -msgstr "对象 %s 有未知的类型 id %d" +#: builtin/commit.c +msgid "reuse message from specified commit" +msgstr "重用指定提交的提交说明" -#: object.c:263 -#, c-format -msgid "unable to parse object: %s" -msgstr "不能解析对象：%s" +#. TRANSLATORS: Leave "[(amend|reword):]" as-is, +#. and only translate . +#. +#: builtin/commit.c +msgid "[(amend|reword):]commit" +msgstr "[(amend|reword):]提交" -#: object.c:283 object.c:294 -#, c-format -msgid "hash mismatch %s" -msgstr "哈希值与 %s 不匹配" +#: builtin/commit.c +msgid "" +"use autosquash formatted message to fixup or amend/reword specified commit" +msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明" -#: pack-bitmap.c:353 -msgid "multi-pack bitmap is missing required reverse index" -msgstr "多包位图缺少必需的反向索引" +#: builtin/commit.c +msgid "use autosquash formatted message to squash specified commit" +msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交" -#: pack-bitmap.c:433 -msgid "load_reverse_index: could not open pack" -msgstr "load_reverse_index：无法打开包" +#: builtin/commit.c +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432 -#, c-format -msgid "unable to get size of %s" -msgstr "无法得到 %s 的大小" +#: builtin/commit.c builtin/interpret-trailers.c +msgid "trailer" +msgstr "尾注" -#: pack-bitmap.c:1937 -#, c-format -msgid "could not find %s in pack %s at offset %" -msgstr "在包 %2$s 偏移 %3$ 中无法找到 %1$s" +#: builtin/commit.c +msgid "add custom trailer(s)" +msgstr "添加自定义尾注" -#: pack-bitmap.c:1973 builtin/rev-list.c:91 -#, c-format -msgid "unable to get disk usage of %s" -msgstr "无法得到 %s 的磁盘使用量" +#: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c +#: builtin/revert.c +msgid "add a Signed-off-by trailer" +msgstr "添加 Signed-off-by 尾注" -#: pack-revindex.c:221 -#, c-format -msgid "reverse-index file %s is too small" -msgstr "反向索引文件 %s 太小" +#: builtin/commit.c +msgid "use specified template file" +msgstr "使用指定的模板文件" -#: pack-revindex.c:226 -#, c-format -msgid "reverse-index file %s is corrupt" -msgstr "反向索引文件 %s 损坏" +#: builtin/commit.c +msgid "force edit of commit" +msgstr "强制编辑提交" -#: pack-revindex.c:234 -#, c-format -msgid "reverse-index file %s has unknown signature" -msgstr "反向索引文件 %s 有错误的签名" +#: builtin/commit.c +msgid "include status in commit message template" +msgstr "在提交说明模板里包含状态信息" -#: pack-revindex.c:238 -#, c-format -msgid "reverse-index file %s has unsupported version %" -msgstr "反向索引文件 %s 不支持的版本 %" +#: builtin/commit.c +msgid "Commit contents options" +msgstr "提交内容选项" -#: pack-revindex.c:243 -#, c-format -msgid "reverse-index file %s has unsupported hash id %" -msgstr "反向索引文件 %s 有不支持的哈希 ID %" +#: builtin/commit.c +msgid "commit all changed files" +msgstr "提交所有改动的文件" -#: pack-write.c:251 -msgid "cannot both write and verify reverse index" -msgstr "无法同时写入和校验反向索引" +#: builtin/commit.c +msgid "add specified files to index for commit" +msgstr "添加指定的文件到索引区等待提交" -#: pack-write.c:270 -#, c-format -msgid "could not stat: %s" -msgstr "不能调用 stat：%s" +#: builtin/commit.c +msgid "interactively add files" +msgstr "交互式添加文件" -#: pack-write.c:282 -#, c-format -msgid "failed to make %s readable" -msgstr "无法设置 %s 为可读" +#: builtin/commit.c +msgid "interactively add changes" +msgstr "交互式添加变更" -#: pack-write.c:521 -#, c-format -msgid "could not write '%s' promisor file" -msgstr "无法写入 '%s' 承诺者文件" +#: builtin/commit.c +msgid "commit only specified files" +msgstr "只提交指定的文件" -#: packfile.c:627 -msgid "offset before end of packfile (broken .idx?)" -msgstr "偏移量在包文件结束之前（损坏的 .idx？）" +#: builtin/commit.c +msgid "bypass pre-commit and commit-msg hooks" +msgstr "绕过 pre-commit 和 commit-msg 钩子" -#: packfile.c:657 -#, c-format -msgid "packfile %s cannot be mapped%s" -msgstr "包文件 %s 不能被映射%s" +#: builtin/commit.c +msgid "show what would be committed" +msgstr "显示将要提交的内容" -#: packfile.c:1924 -#, c-format -msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" +#: builtin/commit.c +msgid "amend previous commit" +msgstr "修改先前的提交" -#: packfile.c:1928 -#, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" +#: builtin/commit.c +msgid "bypass post-rewrite hook" +msgstr "绕过 post-rewrite 钩子" -#: 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' 期望一个数字值" +#: builtin/commit.c +msgid "ok to record an empty change" +msgstr "允许一个空提交" -#: parse-options-cb.c:42 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "格式错误的到期时间：'%s'" +#: builtin/commit.c +msgid "ok to record a change with an empty message" +msgstr "允许空的提交说明" -#: parse-options-cb.c:55 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" +#: builtin/commit.c sequencer.c +msgid "could not parse HEAD commit" +msgstr "不能解析 HEAD 提交" -#: parse-options-cb.c:133 parse-options-cb.c:150 +#: builtin/commit.c #, c-format -msgid "malformed object name '%s'" -msgstr "格式错误的对象名 '%s'" +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: parse-options-cb.c:307 -#, c-format -msgid "option `%s' expects \"%s\" or \"%s\"" -msgstr "选项 `%s' 期望 \"%s\" 或 \"%s\"" +#: builtin/commit.c +msgid "could not read MERGE_MODE" +msgstr "不能读取 MERGE_MODE" -#: parse-options.c:58 +#: builtin/commit.c #, c-format -msgid "%s requires a value" -msgstr "%s 需要一个值" +msgid "could not read commit message: %s" +msgstr "不能读取提交说明：%s" -#: parse-options.c:93 +#: builtin/commit.c #, c-format -msgid "%s is incompatible with %s" -msgstr "%s 与 %s 不兼容" +msgid "Aborting commit due to empty commit message.\n" +msgstr "终止提交因为提交说明为空。\n" -#: parse-options.c:98 +#: builtin/commit.c #, c-format -msgid "%s : incompatible with something else" -msgstr "%s：和其它的不兼容" +msgid "Aborting commit; you did not edit the message.\n" +msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: parse-options.c:112 parse-options.c:116 +#: builtin/commit.c #, c-format -msgid "%s takes no value" -msgstr "%s 不取值" +msgid "Aborting commit due to empty commit message body.\n" +msgstr "因提交说明的正文为空而终止提交。\n" -#: parse-options.c:114 -#, c-format -msgid "%s isn't available" -msgstr "%s 不可用" +#: builtin/commit.c +msgid "" +"repository has been updated, but unable to write\n" +"new_index file. Check that disk is not full and quota is\n" +"not exceeded, and then \"git restore --staged :/\" to recover." +msgstr "" +"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满或\n" +"磁盘配额已耗尽，然后执行 \"git restore --staged :/\" 恢复。" -#: parse-options.c:237 -#, c-format -msgid "%s expects a non-negative integer value with an optional k/m/g suffix" -msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀" +#: builtin/config.c +msgid "git config []" +msgstr "git config [<选项>]" -#: parse-options.c:393 +#: builtin/config.c builtin/env--helper.c #, c-format -msgid "ambiguous option: %s (could be --%s%s or --%s%s)" -msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）" +msgid "unrecognized --type argument, %s" +msgstr "未能识别的 --type 参数，%s" -#: parse-options.c:428 parse-options.c:436 -#, c-format -msgid "did you mean `--%s` (with two dashes)?" -msgstr "您的意思是 `--%s`（有两个短线）？" +#: builtin/config.c +msgid "only one type at a time" +msgstr "一次只能一个类型" -#: parse-options.c:678 parse-options.c:1054 -#, c-format -msgid "alias of --%s" -msgstr "--%s 的别名" +#: builtin/config.c +msgid "Config file location" +msgstr "配置文件位置" -#: parse-options.c:892 -#, c-format -msgid "unknown option `%s'" -msgstr "未知选项 `%s'" +#: builtin/config.c +msgid "use global config file" +msgstr "使用全局配置文件" -#: parse-options.c:894 -#, c-format -msgid "unknown switch `%c'" -msgstr "未知开关 `%c'" +#: builtin/config.c +msgid "use system config file" +msgstr "使用系统级配置文件" -#: parse-options.c:896 -#, c-format -msgid "unknown non-ascii option in string: `%s'" -msgstr "字符串中未知的非 ascii 字符选项：`%s'" +#: builtin/config.c +msgid "use repository config file" +msgstr "使用仓库级配置文件" -#: parse-options.c:920 -msgid "..." -msgstr "..." +#: builtin/config.c +msgid "use per-worktree config file" +msgstr "使用工作区级别的配置文件" -#: parse-options.c:934 -#, c-format -msgid "usage: %s" -msgstr "用法：%s" +#: builtin/config.c +msgid "use given config file" +msgstr "使用指定的配置文件" -#. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation. -#. -#: parse-options.c:949 -#, c-format -msgid " or: %s" -msgstr " 或：%s" +#: builtin/config.c +msgid "blob-id" +msgstr "数据对象 ID" -#. TRANSLATORS: You should only need to translate this format -#. string if your language is a RTL language (e.g. Arabic, -#. Hebrew etc.), not if it's a LTR language (e.g. German, -#. Russian, Chinese etc.). -#. * -#. When a translated usage string has an embedded "\n" it's -#. because options have wrapped to the next line. The line -#. after the "\n" will then be padded to align with the -#. command name, such as N_("git cmd [opt]\n<8 -#. spaces>[opt2]"), where the 8 spaces are the same length as -#. "git cmd ". -#. * -#. This format string prints out that already-translated -#. line. The "%*s" is whitespace padding to account for the -#. padding at the start of the line that we add in this -#. function. The "%s" is a line in the (hopefully already -#. translated) N_() usage string, which contained embedded -#. newlines before we split it up. -#. -#: parse-options.c:970 -#, c-format -msgid "%*s%s" -msgstr "%*s%s" +#: builtin/config.c +msgid "read config from given blob object" +msgstr "从给定的数据对象读取配置" -# 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:993 -#, c-format -msgid " %s" -msgstr " %s" +#: builtin/config.c +msgid "Action" +msgstr "操作" -#: parse-options.c:1040 -msgid "-NUM" -msgstr "-数字" +#: builtin/config.c +msgid "get value: name [value-pattern]" +msgstr "获取值：名称 [值模式]" -#: path.c:922 -#, c-format -msgid "Could not make %s writable by group" -msgstr "不能设置 %s 为组可写" +#: builtin/config.c +msgid "get all values: key [value-pattern]" +msgstr "获得所有的值：键 [值模式]" -#: pathspec.c:150 -msgid "Escape character '\\' not allowed as last character in attr value" -msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" +#: builtin/config.c +msgid "get values for regexp: name-regex [value-pattern]" +msgstr "根据正则表达式获得值：名称正则 [值模式]" -#: pathspec.c:168 -msgid "Only one 'attr:' specification is allowed." -msgstr "只允许一个 'attr:' 规格。" +#: builtin/config.c +msgid "get value specific for the URL: section[.var] URL" +msgstr "获得 URL 取值：section[.var] URL" -#: pathspec.c:171 -msgid "attr spec must not be empty" -msgstr "属性规格不能为空" +#: builtin/config.c +msgid "replace all matching variables: name value [value-pattern]" +msgstr "替换所有匹配的变量：名称 值 [值模式]" -#: pathspec.c:214 -#, c-format -msgid "invalid attribute name %s" -msgstr "无效的属性名 %s" +#: builtin/config.c +msgid "add a new variable: name value" +msgstr "添加一个新的变量：名称 值" -#: pathspec.c:279 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible" -msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" +#: builtin/config.c +msgid "remove a variable: name [value-pattern]" +msgstr "删除一个变量：名称 [值模式]" -#: pathspec.c:286 -msgid "" -"global 'literal' pathspec setting is incompatible with all other global " -"pathspec settings" -msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" +#: builtin/config.c +msgid "remove all matches: name [value-pattern]" +msgstr "删除所有匹配项：名称 [值模式]" -#: pathspec.c:326 -msgid "invalid parameter for pathspec magic 'prefix'" -msgstr "路径规格包含无效的神奇前缀" +#: builtin/config.c +msgid "rename section: old-name new-name" +msgstr "重命名小节：old-name new-name" -#: pathspec.c:347 -#, c-format -msgid "Invalid pathspec magic '%.*s' in '%s'" -msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" +#: builtin/config.c +msgid "remove a section: name" +msgstr "删除一个小节：name" -#: pathspec.c:352 -#, c-format -msgid "Missing ')' at the end of pathspec magic in '%s'" -msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" +#: builtin/config.c +msgid "list all" +msgstr "列出所有" -#: pathspec.c:390 -#, c-format -msgid "Unimplemented pathspec magic '%c' in '%s'" -msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" +#: builtin/config.c +msgid "use string equality when comparing values to 'value-pattern'" +msgstr "在比较值与 '值模式' 时，使用字符串字面比较" -#: pathspec.c:449 -#, c-format -msgid "%s: 'literal' and 'glob' are incompatible" -msgstr "%s：'literal' 和 'glob' 不兼容" +#: builtin/config.c +msgid "open an editor" +msgstr "打开一个编辑器" -#: pathspec.c:465 -#, c-format -msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s：'%s' 在位于 '%s' 的仓库之外" +#: builtin/config.c +msgid "find the color configured: slot [default]" +msgstr "获得配置的颜色：配置 [默认]" -#: pathspec.c:541 -#, c-format -msgid "'%s' (mnemonic: '%c')" -msgstr "'%s'（助记符：'%c'）" +#: builtin/config.c +msgid "find the color setting: slot [stdout-is-tty]" +msgstr "获得颜色设置：配置 [stdout-is-tty]" -#: pathspec.c:551 -#, c-format -msgid "%s: pathspec magic not supported by this command: %s" -msgstr "%s：路径规格神奇前缀不被此命令支持：%s" +#: builtin/config.c +msgid "Type" +msgstr "类型" -#: pathspec.c:618 -#, c-format -msgid "pathspec '%s' is beyond a symbolic link" -msgstr "路径规格 '%s' 位于符号链接中" +#: builtin/config.c builtin/env--helper.c builtin/hash-object.c +msgid "type" +msgstr "类型" -#: pathspec.c:663 -#, c-format -msgid "line is badly quoted: %s" -msgstr "行被错误地引用：%s" +#: builtin/config.c builtin/env--helper.c +msgid "value is given this type" +msgstr "取值为该类型" -#: pkt-line.c:92 -msgid "unable to write flush packet" -msgstr "无法写 flush 包" +#: builtin/config.c +msgid "value is \"true\" or \"false\"" +msgstr "值是 \"true\" 或 \"false\"" -#: pkt-line.c:99 -msgid "unable to write delim packet" -msgstr "无法写 delim 包" +#: builtin/config.c +msgid "value is decimal number" +msgstr "值是十进制数" -#: pkt-line.c:106 -msgid "unable to write response end packet" -msgstr "无法写入响应结束数据包" +#: builtin/config.c +msgid "value is --bool or --int" +msgstr "值是 --bool 或 --int" -#: pkt-line.c:113 -msgid "flush packet write failed" -msgstr "flush 包写错误" +#: builtin/config.c +msgid "value is --bool or string" +msgstr "值是 --bool 或字符串" -#: pkt-line.c:153 -msgid "protocol error: impossibly long line" -msgstr "协议错误：不可能的长行" +#: builtin/config.c +msgid "value is a path (file or directory name)" +msgstr "值是一个路径（文件或目录名）" -#: pkt-line.c:169 pkt-line.c:171 -msgid "packet write with format failed" -msgstr "格式化包写入错误" +#: builtin/config.c +msgid "value is an expiry date" +msgstr "值是一个到期日期" -#: pkt-line.c:204 pkt-line.c:252 -msgid "packet write failed - data exceeds max packet size" -msgstr "写数据包失败：数据超过了包的最大长度" +#: builtin/config.c +msgid "Other" +msgstr "其它" -#: pkt-line.c:222 -#, c-format -msgid "packet write failed: %s" -msgstr "数据包写入失败：%s" +#: builtin/config.c +msgid "terminate values with NUL byte" +msgstr "终止值是 NUL 字节" -#: pkt-line.c:349 pkt-line.c:350 -msgid "read error" -msgstr "读取错误" +#: builtin/config.c +msgid "show variable names only" +msgstr "只显示变量名" -#: pkt-line.c:360 pkt-line.c:361 -msgid "the remote end hung up unexpectedly" -msgstr "远端意外挂断了" +#: builtin/config.c +msgid "respect include directives on lookup" +msgstr "查询时参照 include 指令递归查找" + +#: builtin/config.c +msgid "show origin of config (file, standard input, blob, command line)" +msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）" + +#: builtin/config.c +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "显示配置的作用域（工作区、本地、全局、系统、命令）" + +#: builtin/config.c builtin/env--helper.c +msgid "value" +msgstr "取值" -#: pkt-line.c:417 pkt-line.c:419 +#: builtin/config.c +msgid "with --get, use default value when missing entry" +msgstr "使用 --get 参数，当缺少设置时使用默认值" + +#: builtin/config.c #, c-format -msgid "protocol error: bad line length character: %.4s" -msgstr "协议错误：错误的行长度字符串：%.4s" +msgid "wrong number of arguments, should be %d" +msgstr "错误的参数个数，应该为 %d 个" -#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444 +#: builtin/config.c #, c-format -msgid "protocol error: bad line length %d" -msgstr "协议错误：错误的行长度 %d" +msgid "wrong number of arguments, should be from %d to %d" +msgstr "错误的参数个数，应该为从 %d 个到 %d 个" -#: pkt-line.c:472 sideband.c:165 +#: builtin/config.c #, c-format -msgid "remote error: %s" -msgstr "远程错误：%s" +msgid "invalid key pattern: %s" +msgstr "无效键名模式：%s" -#: preload-index.c:125 -msgid "Refreshing index" -msgstr "正在刷新索引" +#: builtin/config.c config.c +#, c-format +msgid "invalid pattern: %s" +msgstr "无效模式：%s" -#: preload-index.c:144 +#: builtin/config.c #, c-format -msgid "unable to create threaded lstat: %s" -msgstr "无法创建线程 lstat：%s" +msgid "failed to format default config value: %s" +msgstr "无法格式化默认配置值：%s" -#: pretty.c:1051 -msgid "unable to parse --pretty format" -msgstr "不能解析 --pretty 格式" +#: builtin/config.c +#, c-format +msgid "cannot parse color '%s'" +msgstr "无法解析颜色 '%s'" -#: promisor-remote.c:31 -msgid "promisor-remote: unable to fork off fetch subprocess" -msgstr "promisor-remote：无法派生 fetch 子进程" +#: builtin/config.c +msgid "unable to parse default color value" +msgstr "无法解析默认颜色值" -#: promisor-remote.c:38 promisor-remote.c:40 -msgid "promisor-remote: could not write to fetch subprocess" -msgstr "promisor-remote：无法向 fetch 子进程写入" +#: builtin/config.c +msgid "not in a git directory" +msgstr "不在 git 仓库中" -#: promisor-remote.c:44 -msgid "promisor-remote: could not close stdin to fetch subprocess" -msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入" +#: builtin/config.c +msgid "writing to stdin is not supported" +msgstr "不支持写到标准输入" + +#: builtin/config.c +msgid "writing config blobs is not supported" +msgstr "不支持写到配置数据对象" -#: promisor-remote.c:54 +#: builtin/config.c #, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "promisor 远程名称不能以 '/' 开始：%s" +msgid "" +"# This is Git's per-user configuration file.\n" +"[user]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tname = %s\n" +"#\temail = %s\n" +msgstr "" +"# This is Git's per-user configuration file.\n" +"[user]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tname = %s\n" +"#\temail = %s\n" -#: protocol-caps.c:103 -msgid "object-info: expected flush after arguments" -msgstr "object-info：在参数之后应有一个 flush" +#: builtin/config.c +msgid "only one config file at a time" +msgstr "一次只能有一个配置文件" -#: prune-packed.c:35 -msgid "Removing duplicate objects" -msgstr "正在删除重复对象" +#: builtin/config.c +msgid "--local can only be used inside a git repository" +msgstr "--local 只能在 git 仓库内使用" -#: range-diff.c:68 -msgid "could not start `log`" -msgstr "不能启动 `log`" +#: builtin/config.c +msgid "--blob can only be used inside a git repository" +msgstr "--blob 只能在 git 仓库内使用" -#: range-diff.c:70 -msgid "could not read `log` output" -msgstr "不能读取 `log` 的输出" +#: builtin/config.c +msgid "--worktree can only be used inside a git repository" +msgstr "--worktree 只能在 git 仓库内使用" -#: range-diff.c:98 sequencer.c:5575 -#, c-format -msgid "could not parse commit '%s'" -msgstr "不能解析提交 '%s'" +#: builtin/config.c +msgid "$HOME not set" +msgstr "$HOME 未设置" -#: range-diff.c:109 -#, c-format +#: builtin/config.c msgid "" -"could not parse first line of `log` output: did not start with 'commit ': " -"'%s'" -msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'" +"--worktree cannot be used with multiple working trees unless the config\n" +"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" +"section in \"git help worktree\" for details" +msgstr "" +"不能和多个工作区一起使用 --worktree，除非启用 worktreeConfig 配置扩展。\n" +"详情请阅读“git help worktree”的“CONFIGURATION FILE”小节" -#: range-diff.c:132 -#, c-format -msgid "could not parse git header '%.*s'" -msgstr "无法解析 git 头 '%.*s'" +#: builtin/config.c +msgid "--get-color and variable type are incoherent" +msgstr "--get-color 和变量类型不兼容" -#: range-diff.c:300 -msgid "failed to generate diff" -msgstr "无法生成 diff" +#: builtin/config.c +msgid "only one action at a time" +msgstr "一次只能有一个动作" -#: range-diff.c:558 range-diff.c:560 -#, c-format -msgid "could not parse log for '%s'" -msgstr "不能解析 '%s' 的日志" +#: builtin/config.c +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only 仅适用于 --list 或 --get-regexp" -#: read-cache.c:737 -#, c-format -msgid "will not add file alias '%s' ('%s' already exists in index)" -msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）" +#: builtin/config.c +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list" -#: read-cache.c:753 -msgid "cannot create an empty blob in the object database" -msgstr "不能在对象数据库中创建空的数据对象" +#: builtin/config.c +msgid "--default is only applicable to --get" +msgstr "--default 仅适用于 --get" -#: read-cache.c:775 -#, c-format -msgid "%s: can only add regular files, symbolic links or git-directories" -msgstr "%s：只能添加常规文件、符号链接或 git 目录" +#: builtin/config.c +msgid "--fixed-value only applies with 'value-pattern'" +msgstr "--fixed-value 仅适用于有 '值模式'" -#: read-cache.c:780 builtin/submodule--helper.c:3359 +#: builtin/config.c #, c-format -msgid "'%s' does not have a commit checked out" -msgstr "'%s' 没有检出一个提交" +msgid "unable to read config file '%s'" +msgstr "无法读取配置文件 '%s'" -#: read-cache.c:832 -#, c-format -msgid "unable to index file '%s'" -msgstr "无法索引文件 '%s'" +#: builtin/config.c +msgid "error processing config file(s)" +msgstr "处理配置文件出错" -#: read-cache.c:851 -#, c-format -msgid "unable to add '%s' to index" -msgstr "无法在索引中添加 '%s'" +#: builtin/config.c +msgid "editing stdin is not supported" +msgstr "不支持编辑标准输入" -#: read-cache.c:862 -#, c-format -msgid "unable to stat '%s'" -msgstr "无法对 %s 执行 stat" +#: builtin/config.c +msgid "editing blobs is not supported" +msgstr "不支持编辑数据对象" -#: read-cache.c:1404 +#: builtin/config.c #, c-format -msgid "'%s' appears as both a file and as a directory" -msgstr "'%s' 看起来既是文件又是目录" - -#: read-cache.c:1619 -msgid "Refresh index" -msgstr "刷新索引" +msgid "cannot create configuration file %s" +msgstr "不能创建配置文件 %s" -#: read-cache.c:1751 +#: builtin/config.c #, c-format msgid "" -"index.version set, but the value is invalid.\n" -"Using version %i" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." msgstr "" -"设置了 index.version，但是取值无效。\n" -"使用版本 %i" +"无法用一个值覆盖多个值\n" +" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" + +#: builtin/config.c +#, c-format +msgid "no such section: %s" +msgstr "无此小节：%s" + +#: builtin/count-objects.c +msgid "print sizes in human readable format" +msgstr "以用户可读的格式显示大小" -#: read-cache.c:1761 +#: builtin/credential-cache--daemon.c #, c-format msgid "" -"GIT_INDEX_VERSION set, but the value is invalid.\n" -"Using version %i" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" msgstr "" -"设置了 GIT_INDEX_VERSION，但是取值无效。\n" -"使用版本 %i" +"您的 socket 目录权限过于宽松，其他用户可能会读取您缓存的认证信息。考虑执" +"行：\n" +"\n" +"\tchmod 0700 %s" -#: read-cache.c:1817 -#, c-format -msgid "bad signature 0x%08x" -msgstr "坏的签名 0x%08x" +#: builtin/credential-cache--daemon.c +msgid "print debugging messages to stderr" +msgstr "输出调试信息到标准错误" -#: read-cache.c:1820 -#, c-format -msgid "bad index version %d" -msgstr "坏的索引版本 %d" +#: builtin/credential-cache--daemon.c +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "credential-cache--daemon 不可用，不支持 unix 套接字" -#: read-cache.c:1829 -msgid "bad index file sha1 signature" -msgstr "坏的索引文件 sha1 签名" +#: builtin/credential-cache.c +msgid "credential-cache unavailable; no unix socket support" +msgstr "credential-cache 不可用，不支持 unix 套接字" -#: read-cache.c:1863 +#: builtin/credential-store.c #, c-format -msgid "index uses %.4s extension, which we do not understand" -msgstr "索引使用不被支持的 %.4s 扩展" +msgid "unable to get credential storage lock in %d ms" +msgstr "无法在 %d ms 获得凭证存储锁" -# -#: read-cache.c:1865 -#, c-format -msgid "ignoring %.4s extension" -msgstr "忽略 %.4s 扩展" +#: builtin/describe.c +msgid "git describe [] [...]" +msgstr "git describe [<选项>] [<提交号>...]" -#: read-cache.c:1902 -#, c-format -msgid "unknown index entry format 0x%08x" -msgstr "未知的索引条目格式 0x%08x" +#: builtin/describe.c +msgid "git describe [] --dirty" +msgstr "git describe [<选项>] --dirty" -#: read-cache.c:1918 -#, c-format -msgid "malformed name field in the index, near path '%s'" -msgstr "索引中靠近路径 '%s' 有错误的名称字段" +#: builtin/describe.c +msgid "head" +msgstr "头" -#: read-cache.c:1975 -msgid "unordered stage entries in index" -msgstr "索引中有未排序的暂存条目" +#: builtin/describe.c +msgid "lightweight" +msgstr "轻量级的" + +#: builtin/describe.c +msgid "annotated" +msgstr "附注的" -#: read-cache.c:1978 +#: builtin/describe.c #, c-format -msgid "multiple stage entries for merged file '%s'" -msgstr "合并文件 '%s' 有多个暂存条目" +msgid "annotated tag %s not available" +msgstr "附注标签 %s 无效" -#: read-cache.c:1981 +#: builtin/describe.c #, c-format -msgid "unordered stage entries for '%s'" -msgstr "'%s' 的未排序暂存条目" +msgid "tag '%s' is externally known as '%s'" +msgstr "标签 '%s' 在外部被认为是 '%s'" -#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096 -#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183 -#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016 -#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521 -#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293 -#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319 -msgid "index file corrupt" -msgstr "索引文件损坏" - -#: read-cache.c:2240 +#: builtin/describe.c #, c-format -msgid "unable to create load_cache_entries thread: %s" -msgstr "无法创建 load_cache_entries 线程：%s" +msgid "no tag exactly matches '%s'" +msgstr "没有标签准确匹配 '%s'" -#: read-cache.c:2253 +#: builtin/describe.c #, c-format -msgid "unable to join load_cache_entries thread: %s" -msgstr "无法加入 load_cache_entries 线程：%s" +msgid "No exact match on refs or tags, searching to describe\n" +msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n" -#: read-cache.c:2286 +#: builtin/describe.c #, c-format -msgid "%s: index file open failed" -msgstr "%s：打开索引文件失败" +msgid "finished search at %s\n" +msgstr "完成搜索 %s\n" -#: read-cache.c:2290 +#: builtin/describe.c #, c-format -msgid "%s: cannot stat the open index" -msgstr "%s：不能对打开的索引执行 stat 操作" +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" +"没有附注标签能描述 '%s'。\n" +"然而，存在未附注标签：尝试 --tags。" -#: read-cache.c:2294 +#: builtin/describe.c #, c-format -msgid "%s: index file smaller than expected" -msgstr "%s：索引文件比预期的小" +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" +"没有标签能描述 '%s'。\n" +"尝试 --always，或者创建一些标签。" -#: read-cache.c:2298 +#: builtin/describe.c #, c-format -msgid "%s: unable to map index file%s" -msgstr "%s：无法映射索引文件%s" +msgid "traversed %lu commits\n" +msgstr "已遍历 %lu 个提交\n" -#: read-cache.c:2341 +#: builtin/describe.c #, c-format -msgid "unable to create load_index_extensions thread: %s" -msgstr "无法创建 load_index_extensions 线程：%s" +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" +"发现多于 %i 个标签，列出最近的 %i 个\n" +"在 %s 放弃搜索\n" -#: read-cache.c:2368 +#: builtin/describe.c #, c-format -msgid "unable to join load_index_extensions thread: %s" -msgstr "无法加入 load_index_extensions 线程：%s" +msgid "describe %s\n" +msgstr "描述 %s\n" -#: read-cache.c:2414 +#: builtin/describe.c #, c-format -msgid "could not freshen shared index '%s'" -msgstr "无法刷新共享索引 '%s'" +msgid "Not a valid object name %s" +msgstr "不是一个有效的对象名 %s" -#: read-cache.c:2473 +#: builtin/describe.c #, c-format -msgid "broken index, expect %s in %s, got %s" -msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s" - -#: read-cache.c:3032 -msgid "cannot write split index for a sparse index" -msgstr "无法为稀疏索引写入拆分索引" +msgid "%s is neither a commit nor blob" +msgstr "%s 既不是提交也不是数据对象" -#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156 -#, c-format -msgid "could not close '%s'" -msgstr "不能关闭 '%s'" +#: builtin/describe.c +msgid "find the tag that comes after the commit" +msgstr "寻找该提交之后的标签" -#: read-cache.c:3157 -msgid "failed to convert to a sparse-index" -msgstr "无法转换为稀疏索引" +#: builtin/describe.c +msgid "debug search strategy on stderr" +msgstr "在标准错误上调试搜索策略" -#: read-cache.c:3228 -#, c-format -msgid "could not stat '%s'" -msgstr "不能对 '%s' 调用 stat" +#: builtin/describe.c +msgid "use any ref" +msgstr "使用任意引用" -#: read-cache.c:3241 -#, c-format -msgid "unable to open git dir: %s" -msgstr "不能打开 git 目录：%s" +#: builtin/describe.c +msgid "use any tag, even unannotated" +msgstr "使用任意标签，即使未附带注释" -#: read-cache.c:3253 -#, c-format -msgid "unable to unlink: %s" -msgstr "无法删除：%s" +#: builtin/describe.c +msgid "always use long format" +msgstr "始终使用长提交号格式" -#: read-cache.c:3282 -#, c-format -msgid "cannot fix permission bits on '%s'" -msgstr "不能修复 '%s' 的权限位" +#: builtin/describe.c +msgid "only follow first parent" +msgstr "只跟随第一个父提交" -#: read-cache.c:3439 -#, c-format -msgid "%s: cannot drop to stage #0" -msgstr "%s：不能落到暂存区 #0" +#: builtin/describe.c +msgid "only output exact matches" +msgstr "只输出精确匹配" -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n" -"或者您可以用 'git rebase --abort' 终止变基。\n" +#: builtin/describe.c +msgid "consider most recent tags (default: 10)" +msgstr "考虑最近 个标签（默认：10）" -#: rebase-interactive.c:33 -#, c-format -msgid "" -"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." -msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" +#: builtin/describe.c +msgid "only consider tags matching " +msgstr "只考虑匹配 <模式> 的标签" -#: rebase-interactive.c:42 -msgid "" -"\n" -"Commands:\n" -"p, pick = use commit\n" -"r, reword = use commit, but edit the commit message\n" -"e, edit = use commit, but stop for amending\n" -"s, squash = use commit, but meld into previous commit\n" -"f, fixup [-C | -c] = like \"squash\" but keep only the previous\n" -" commit's log message, unless -C is used, in which case\n" -" keep only this commit's message; -c is same as -C but\n" -" opens the editor\n" -"x, exec = run command (the rest of the line) using shell\n" -"b, break = stop here (continue rebase later with 'git rebase --continue')\n" -"d, drop = remove commit\n" -"l, label