From 414998b292fcecd0abaabbc30ddd368c1b8f4b71 Mon Sep 17 00:00:00 2001 From: Teng Long Date: Thu, 18 Jul 2024 19:36:09 +0800 Subject: [PATCH] l10n: zh_CN: for git 2.46 rounds Signed-off-by: Teng Long --- po/zh_CN.po | 12343 ++++++++++++++++++++++++++------------------------ 1 file changed, 6448 insertions(+), 5895 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 4838c19b0be283..9b9ea4a8e1acb3 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -154,8 +154,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2024-04-28 19:59+0800\n" -"PO-Revision-Date: 2024-04-28 20:31+0800\n" +"POT-Creation-Date: 2024-07-18 11:31+0800\n" +"PO-Revision-Date: 2024-07-27 22:08+0800\n" "Last-Translator: Teng Long \n" "Language-Team: GitHub \n" "Language: zh_CN\n" @@ -165,233 +165,240 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 42.0\n" -#: add-interactive.c +#: add-interactive.c:391 #, c-format msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c +#: add-interactive.c:545 add-interactive.c:855 builtin/merge.c:381 +#: builtin/rebase.c:1307 builtin/rebase.c:1719 reset.c:146 sequencer.c:3810 +#: sequencer.c:4287 sequencer.c:4680 msgid "could not read index" msgstr "不能读取索引" -#: add-interactive.c +#: add-interactive.c:599 msgid "binary" msgstr "二进制" -#: add-interactive.c +#: add-interactive.c:657 msgid "nothing" msgstr "无" -#: add-interactive.c +#: add-interactive.c:658 msgid "unchanged" msgstr "没有修改" -#: add-interactive.c +#: add-interactive.c:695 msgid "Update" msgstr "更新" -#: add-interactive.c +#: add-interactive.c:716 add-interactive.c:720 add-interactive.c:911 #, c-format msgid "could not stage '%s'" msgstr "不能暂存 '%s'" -#: add-interactive.c builtin/stash.c reset.c sequencer.c +#: add-interactive.c:726 add-interactive.c:918 builtin/stash.c:523 +#: builtin/stash.c:540 builtin/stash.c:610 builtin/stash.c:1377 +#: builtin/stash.c:1568 reset.c:175 sequencer.c:4051 msgid "could not write index" msgstr "不能写入索引" -#: add-interactive.c +#: add-interactive.c:729 #, c-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "更新了 %d 个路径\n" msgstr[1] "更新了 %d 个路径\n" -#: add-interactive.c +#: add-interactive.c:747 #, c-format msgid "note: %s is untracked now.\n" msgstr "说明：%s 现已成为未跟踪的。\n" -#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c +#: add-interactive.c:752 apply.c:4206 builtin/checkout.c:323 +#: builtin/reset.c:183 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: add-interactive.c +#: add-interactive.c:784 msgid "Revert" msgstr "还原" -#: add-interactive.c +#: add-interactive.c:800 msgid "Could not parse HEAD^{tree}" msgstr "不能解析 HEAD^{tree}" -#: add-interactive.c +#: add-interactive.c:838 #, c-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "还原了 %d 个路径\n" msgstr[1] "还原了 %d 个路径\n" -#: add-interactive.c +#: add-interactive.c:890 #, c-format msgid "No untracked files.\n" msgstr "没有未跟踪的文件。\n" -#: add-interactive.c +#: add-interactive.c:894 msgid "Add untracked" msgstr "添加未跟踪的" -#: add-interactive.c +#: add-interactive.c:921 #, c-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "增加了 %d 个路径\n" msgstr[1] "增加了 %d 个路径\n" -#: add-interactive.c +#: add-interactive.c:951 #, c-format msgid "ignoring unmerged: %s" msgstr "忽略未合入的：%s" -#: add-interactive.c add-patch.c +#: add-interactive.c:963 #, c-format msgid "Only binary files changed.\n" msgstr "只有二进制文件被修改。\n" -#: add-interactive.c add-patch.c +#: add-interactive.c:965 #, c-format msgid "No changes.\n" msgstr "没有修改。\n" -#: add-interactive.c +#: add-interactive.c:969 msgid "Patch update" msgstr "补丁更新" -#: add-interactive.c +#: add-interactive.c:1010 msgid "Review diff" msgstr "检视 diff" -#: add-interactive.c +#: add-interactive.c:1037 msgid "show paths with changes" msgstr "显示含变更的路径" -#: add-interactive.c +#: add-interactive.c:1039 msgid "add working tree state to the staged set of changes" msgstr "将工作区状态添加到暂存区修改集中" -#: add-interactive.c +#: add-interactive.c:1041 msgid "revert staged set of changes back to the HEAD version" msgstr "将暂存的修改集恢复为 HEAD 版本" -#: add-interactive.c +#: add-interactive.c:1043 msgid "pick hunks and update selectively" msgstr "挑选数据块并有选择地更新" -#: add-interactive.c +#: add-interactive.c:1045 msgid "view diff between HEAD and index" msgstr "显示 HEAD 和索引的差异" -#: add-interactive.c +#: add-interactive.c:1047 msgid "add contents of untracked files to the staged set of changes" msgstr "将未跟踪文件的内容添加到暂存区修改集中" -#: add-interactive.c +#: add-interactive.c:1055 add-interactive.c:1104 msgid "Prompt help:" msgstr "帮助：" -#: add-interactive.c +#: add-interactive.c:1057 msgid "select a single item" msgstr "选择一个条目" -#: add-interactive.c +#: add-interactive.c:1059 msgid "select a range of items" msgstr "选择一系列条目" -#: add-interactive.c +#: add-interactive.c:1061 msgid "select multiple ranges" msgstr "选择多个范围" -#: add-interactive.c +#: add-interactive.c:1063 add-interactive.c:1108 msgid "select item based on unique prefix" msgstr "基于唯一前缀选择条目" -#: add-interactive.c +#: add-interactive.c:1065 msgid "unselect specified items" msgstr "反选指定的条目" -#: add-interactive.c +#: add-interactive.c:1067 msgid "choose all items" msgstr "选择所有条目" -#: add-interactive.c +#: add-interactive.c:1069 msgid "(empty) finish selecting" msgstr "（空）结束选择" -#: add-interactive.c +#: add-interactive.c:1106 msgid "select a numbered item" msgstr "选择一个编号条目" -#: add-interactive.c +#: add-interactive.c:1110 msgid "(empty) select nothing" msgstr "（空）不选择任何内容" -#: add-interactive.c builtin/clean.c +#: add-interactive.c:1118 builtin/clean.c:846 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: add-interactive.c builtin/clean.c +#: add-interactive.c:1119 builtin/clean.c:847 msgid "What now" msgstr "请选择" -#: add-interactive.c +#: add-interactive.c:1171 msgid "staged" msgstr "缓存" -#: add-interactive.c +#: add-interactive.c:1171 msgid "unstaged" msgstr "未缓存" -#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c -#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c -#: builtin/pull.c builtin/submodule--helper.c +#: add-interactive.c:1171 apply.c:5119 apply.c:5122 builtin/am.c:2357 +#: builtin/am.c:2360 builtin/bugreport.c:120 builtin/clone.c:143 +#: builtin/diagnose.c:25 builtin/fetch.c:2179 builtin/hook.c:30 +#: builtin/merge.c:272 builtin/pull.c:196 builtin/submodule--helper.c:1838 +#: builtin/submodule--helper.c:1841 msgid "path" msgstr "路径" -#: add-interactive.c +#: add-interactive.c:1178 msgid "could not refresh index" msgstr "不能刷新索引" -#: add-interactive.c builtin/clean.c +#: add-interactive.c:1192 builtin/clean.c:811 #, c-format msgid "Bye.\n" msgstr "再见。\n" -#: add-patch.c +#: add-patch.c:42 #, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:43 #, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:44 #, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "暂存添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:45 #, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "暂存该块 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:47 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "如果补丁能正确地应用，编辑块将立即标记为暂存。" -#: add-patch.c +#: add-patch.c:50 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -405,33 +412,33 @@ msgstr "" "a - 暂存该块和本文件中后面的全部块\n" "d - 不暂存该块和本文件中后面的全部块\n" -#: add-patch.c +#: add-patch.c:64 #, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:65 #, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:66 #, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:67 #, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "贮藏该块 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:69 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." msgstr "如果补丁能正确地应用，编辑块将立即标记为贮藏。" -#: add-patch.c +#: add-patch.c:72 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -445,33 +452,33 @@ msgstr "" "a - 贮藏该块和本文件中后面的全部块\n" "d - 不贮藏该块和本文件中后面的全部块\n" -#: add-patch.c +#: add-patch.c:88 #, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:89 #, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:90 #, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:91 #, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:93 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." msgstr "如果补丁能正确地应用，编辑块将立即标记为未暂存。" -#: add-patch.c +#: add-patch.c:96 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -485,33 +492,33 @@ msgstr "" "a - 取消暂存该块和本文件中后面的全部块\n" "d - 不要取消暂存该块和本文件中后面的全部块\n" -#: add-patch.c +#: add-patch.c:111 #, c-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:112 #, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:113 #, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:114 #, c-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:116 add-patch.c:184 add-patch.c:229 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." msgstr "如果补丁能正确地应用，编辑块将立即标记为应用。" -#: add-patch.c +#: add-patch.c:119 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -525,33 +532,33 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c +#: add-patch.c:134 add-patch.c:202 #, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:135 add-patch.c:203 #, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:136 add-patch.c:204 #, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:137 add-patch.c:205 #, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:139 add-patch.c:162 add-patch.c:207 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "如果补丁能正确地应用，编辑块将立即标记为丢弃。" -#: add-patch.c +#: add-patch.c:142 add-patch.c:210 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -565,27 +572,27 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c +#: add-patch.c:157 #, c-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 +#: add-patch.c:158 #, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:159 #, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:160 #, c-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 +#: add-patch.c:165 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -599,27 +606,27 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c +#: add-patch.c:179 #, c-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 +#: add-patch.c:180 #, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:181 #, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:182 #, c-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 +#: add-patch.c:187 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -633,27 +640,27 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c +#: add-patch.c:224 #, c-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:225 #, c-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:226 #, c-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:227 #, c-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:232 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -667,35 +674,35 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c +#: add-patch.c:352 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "无法解析数据块头信息 '%.*s'" -#: add-patch.c +#: add-patch.c:440 msgid "could not parse diff" msgstr "不能解析差异信息" -#: add-patch.c +#: add-patch.c:459 msgid "could not parse colored diff" msgstr "不能解析彩色差异信息" -#: add-patch.c +#: add-patch.c:473 #, c-format msgid "failed to run '%s'" msgstr "无法运行 '%s'" -#: add-patch.c +#: add-patch.c:631 msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的输出不匹配" -#: add-patch.c +#: add-patch.c:632 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。" -#: add-patch.c +#: add-patch.c:819 #, c-format msgid "" "expected context line #%d in\n" @@ -704,7 +711,7 @@ msgstr "" "预期上下文行 #%d 于\n" "%.*s" -#: add-patch.c +#: add-patch.c:834 #, c-format msgid "" "hunks do not overlap:\n" @@ -717,11 +724,11 @@ msgstr "" "\t不是结尾于：\n" "%.*s" -#: add-patch.c +#: add-patch.c:1111 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" -#: add-patch.c +#: add-patch.c:1115 #, c-format msgid "" "---\n" @@ -734,7 +741,7 @@ msgstr "" "要删除 '%c' 开始的行，删除它们。\n" "以 %s 开始的行将被删除。\n" -#: add-patch.c +#: add-patch.c:1130 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" @@ -743,11 +750,11 @@ msgstr "" "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n" "此次编辑被终止，该块不会被修改。\n" -#: add-patch.c +#: add-patch.c:1163 msgid "could not parse hunk header" msgstr "无法解析数据块头信息" -#: add-patch.c +#: add-patch.c:1208 msgid "'git apply --cached' failed" msgstr "'git apply --cached' 失败" @@ -757,24 +764,24 @@ msgstr "'git apply --cached' 失败" #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#: add-patch.c +#: add-patch.c:1278 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " -#: add-patch.c +#: add-patch.c:1321 msgid "The selected hunks do not apply to the index!" msgstr "选中的块不能应用到索引！" -#: add-patch.c +#: add-patch.c:1322 msgid "Apply them to the worktree anyway? " msgstr "无论如何都要应用到工作区么？" -#: add-patch.c +#: add-patch.c:1329 msgid "Nothing was applied.\n" msgstr "未应用。\n" -#: add-patch.c +#: add-patch.c:1386 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -798,73 +805,91 @@ msgstr "" "p - 显示当前块\n" "? - 显示帮助\n" -#: add-patch.c +#: add-patch.c:1520 +#, c-format +msgid "Only one letter is expected, got '%s'" +msgstr "预计只有一个字母，得到 '%s'" + +#: add-patch.c:1559 add-patch.c:1569 msgid "No previous hunk" msgstr "没有前一个块" -#: add-patch.c +#: add-patch.c:1564 add-patch.c:1574 msgid "No next hunk" msgstr "没有下一个块" -#: add-patch.c +#: add-patch.c:1580 msgid "No other hunks to goto" msgstr "没有其它可供跳转的块" -#: add-patch.c +#: add-patch.c:1591 msgid "go to which hunk ( to see more)? " msgstr "跳转到哪个块（<回车> 查看更多）？ " -#: add-patch.c +#: add-patch.c:1592 msgid "go to which hunk? " msgstr "跳转到哪个块？" -#: add-patch.c +#: add-patch.c:1603 #, c-format msgid "Invalid number: '%s'" msgstr "无效数字：'%s'" -#: add-patch.c +#: add-patch.c:1608 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "对不起，只有 %d 个可用块。" msgstr[1] "对不起，只有 %d 个可用块。" -#: add-patch.c +#: add-patch.c:1617 msgid "No other hunks to search" msgstr "没有其它可供查找的块" -#: add-patch.c +#: add-patch.c:1623 msgid "search for regex? " msgstr "使用正则表达式搜索？" -#: add-patch.c +#: add-patch.c:1638 #, c-format msgid "Malformed search regexp %s: %s" msgstr "错误的正则表达式 %s：%s" -#: add-patch.c +#: add-patch.c:1655 msgid "No hunk matches the given pattern" msgstr "没有和给定模式相匹配的块" -#: add-patch.c +#: add-patch.c:1663 msgid "Sorry, cannot split this hunk" msgstr "对不起，不能拆分这个块" -#: add-patch.c +#: add-patch.c:1667 #, c-format msgid "Split into %d hunks." msgstr "拆分为 %d 块。" -#: add-patch.c +#: add-patch.c:1673 msgid "Sorry, cannot edit this hunk" msgstr "对不起，不能编辑这个块" -#: add-patch.c +#: add-patch.c:1705 +#, c-format +msgid "Unknown command '%s' (use '?' for help)" +msgstr "未知命令 '%s'（使用 '?' 寻求帮助）" + +#: add-patch.c:1730 msgid "'git apply' failed" msgstr "'git apply' 失败" -#: advice.c +#: add-patch.c:1793 +msgid "No changes." +msgstr "没有修改。" + +#: add-patch.c:1795 +msgid "Only binary files changed." +msgstr "只有二进制文件被修改。" + +#: advice.c:95 #, c-format msgid "" "\n" @@ -873,36 +898,36 @@ msgstr "" "\n" "使用 \"git config advice.%s false\" 来关闭此消息" -#: advice.c +#: advice.c:111 #, c-format msgid "%shint:%s%.*s%s\n" msgstr "%s提示：%s%.*s%s\n" -#: advice.c +#: advice.c:205 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "无法拣选，因为您有未合并的文件。" -#: advice.c +#: advice.c:207 msgid "Committing is not possible because you have unmerged files." msgstr "无法提交，因为您有未合并的文件。" -#: advice.c +#: advice.c:209 msgid "Merging is not possible because you have unmerged files." msgstr "无法合并，因为您有未合并的文件。" -#: advice.c +#: advice.c:211 msgid "Pulling is not possible because you have unmerged files." msgstr "无法拉取，因为您有未合并的文件。" -#: advice.c +#: advice.c:213 msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退，因为您有未合并的文件。" -#: advice.c +#: advice.c:215 msgid "Rebasing is not possible because you have unmerged files." msgstr "无法变基，因为您有未合并的文件。" -#: advice.c +#: advice.c:224 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." @@ -910,23 +935,23 @@ msgstr "" "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n" "解决方案并提交。" -#: advice.c +#: advice.c:232 msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" -#: advice.c builtin/merge.c +#: advice.c:237 builtin/merge.c:1398 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: advice.c +#: advice.c:239 msgid "Please, commit your changes before merging." msgstr "请在合并前先提交您的修改。" -#: advice.c +#: advice.c:240 msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" -#: advice.c +#: advice.c:246 msgid "" "Diverging branches can't be fast-forwarded, you need to either:\n" "\n" @@ -944,11 +969,11 @@ msgstr "" "\n" "\tgit rebase\n" -#: advice.c +#: advice.c:253 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: advice.c +#: advice.c:263 #, c-format msgid "" "The following paths and/or pathspecs matched paths that exist\n" @@ -958,7 +983,7 @@ msgstr "" "下面的路径和/或者路径规格匹配了您定义的稀疏检出以外的路径，\n" "所以不会在索引中更新：\n" -#: advice.c +#: advice.c:270 msgid "" "If you intend to update such entries, try one of the following:\n" "* Use the --sparse option.\n" @@ -968,7 +993,7 @@ msgstr "" "* 使用 --sparse 选项。\n" "* 禁用或者修改稀疏规则。" -#: advice.c +#: advice.c:278 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -1007,7 +1032,7 @@ msgstr "" "通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n" "\n" -#: advice.c +#: advice.c:305 #, c-format msgid "" "The following paths have been moved outside the\n" @@ -1017,7 +1042,7 @@ msgstr "" "下列的路径已经被移动至稀疏检出的定义之外，\n" "但是由于本地的修改而并非稀疏。\n" -#: advice.c +#: advice.c:312 msgid "" "To correct the sparsity of these paths, do the following:\n" "* Use \"git add --sparse \" to update the index\n" @@ -1027,102 +1052,122 @@ msgstr "" "* 使用 \"git add --sparse <路径>\" 来更新索引\n" "* 使用 \"git sparse-checkout reapply\" 来应用稀疏规则" -#: alias.c +#: alias.c:73 msgid "cmdline ends with \\" msgstr "命令行以 \\ 结尾" -#: alias.c +#: alias.c:74 msgid "unclosed quote" msgstr "未关闭的引号" -#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c +#: alias.c:75 builtin/cat-file.c:1077 builtin/notes.c:450 builtin/notes.c:512 +#: builtin/notes.c:594 builtin/notes.c:606 builtin/notes.c:689 +#: builtin/notes.c:765 builtin/notes.c:918 builtin/notes.c:1072 +#: builtin/notes.c:1094 builtin/prune-packed.c:26 builtin/receive-pack.c:2506 +#: builtin/refs.c:33 builtin/tag.c:644 t/helper/test-pkt-line.c:89 msgid "too many arguments" msgstr "太多参数" -#: apply.c +#: apply.c:86 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" -#: apply.c +#: apply.c:102 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" -#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c -#: builtin/checkout.c builtin/clean.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-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c -#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-list.c -#: builtin/rev-parse.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 +#: apply.c:155 archive.c:685 builtin/add.c:381 builtin/add.c:383 +#: builtin/add.c:389 builtin/add.c:401 builtin/branch.c:837 +#: builtin/checkout-index.c:275 builtin/checkout.c:485 builtin/checkout.c:488 +#: builtin/checkout.c:1791 builtin/checkout.c:1901 builtin/checkout.c:1904 +#: builtin/clean.c:963 builtin/clone.c:1015 builtin/clone.c:1020 +#: builtin/commit.c:360 builtin/commit.c:363 builtin/commit.c:1230 +#: builtin/commit.c:1286 builtin/commit.c:1303 builtin/describe.c:617 +#: builtin/diff-tree.c:163 builtin/difftool.c:743 builtin/fast-export.c:1262 +#: builtin/fetch.c:2290 builtin/fetch.c:2317 builtin/fetch.c:2331 +#: builtin/fetch.c:2336 builtin/help.c:618 builtin/index-pack.c:1867 +#: builtin/init-db.c:110 builtin/log.c:2234 builtin/log.c:2236 +#: builtin/ls-files.c:744 builtin/merge-base.c:174 builtin/merge-base.c:180 +#: builtin/merge-tree.c:594 builtin/merge.c:1419 builtin/merge.c:1421 +#: builtin/pack-objects.c:4508 builtin/rebase.c:1262 builtin/rebase.c:1264 +#: builtin/rebase.c:1273 builtin/repack.c:1263 builtin/replay.c:315 +#: builtin/reset.c:382 builtin/reset.c:419 builtin/rev-list.c:575 +#: builtin/rev-parse.c:934 builtin/rev-parse.c:941 builtin/rev-parse.c:952 +#: builtin/show-branch.c:725 builtin/show-branch.c:730 builtin/stash.c:1783 +#: builtin/stash.c:1786 builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:3038 builtin/tag.c:578 builtin/tag.c:625 +#: builtin/worktree.c:730 builtin/worktree.c:733 builtin/worktree.c:806 +#: builtin/worktree.c:809 builtin/worktree.c:812 builtin/worktree.c:1058 +#: parse-options.c:280 parse-options.c:1326 range-diff.c:574 revision.c:2476 +#: revision.c:2481 revision.c:2485 revision.c:2494 revision.c:2499 +#: revision.c:2731 revision.c:2802 revision.c:2814 revision.c:2820 +#: revision.c:2840 revision.c:2850 revision.c:2860 revision.c:3147 +#: revision.c:3159 #, c-format msgid "options '%s' and '%s' cannot be used together" msgstr "选项 '%s' 和 '%s' 不能同时使用" -#: apply.c +#: apply.c:158 apply.c:169 apply.c:172 #, c-format msgid "'%s' outside a repository" msgstr "'%s' 在仓库之外" -#: apply.c +#: apply.c:419 msgid "failed to read patch" msgstr "无法读取补丁" -#: apply.c +#: apply.c:421 msgid "patch too large" msgstr "补丁过大" -#: apply.c +#: apply.c:835 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" -#: apply.c +#: apply.c:844 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" -#: apply.c +#: apply.c:918 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" -#: apply.c +#: apply.c:956 #, 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 +#: apply.c:962 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致" -#: apply.c +#: apply.c:963 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" -#: apply.c +#: apply.c:968 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null" -#: apply.c +#: apply.c:997 #, c-format msgid "invalid mode on line %d: %s" msgstr "第 %d 行包含无效文件模式：%s" -#: apply.c +#: apply.c:1323 #, c-format msgid "inconsistent header lines %d and %d" msgstr "不一致的文件头，%d 行和 %d 行" -#: apply.c +#: apply.c:1413 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1133,92 +1178,92 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: apply.c +#: apply.c:1426 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）" -#: apply.c +#: apply.c:1522 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: apply.c +#: apply.c:1591 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息：%.*s" -#: apply.c +#: apply.c:1794 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: apply.c +#: apply.c:1796 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: apply.c +#: apply.c:1830 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" -#: apply.c +#: apply.c:1867 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: apply.c +#: apply.c:1869 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: apply.c +#: apply.c:1872 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: apply.c +#: apply.c:2020 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" -#: apply.c +#: apply.c:2057 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: apply.c +#: apply.c:2219 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: apply.c +#: apply.c:2306 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: apply.c +#: apply.c:2310 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: apply.c +#: apply.c:3002 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: apply.c +#: apply.c:3123 #, 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 +#: apply.c:3135 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: apply.c +#: apply.c:3141 #, c-format msgid "" "while searching for:\n" @@ -1227,674 +1272,687 @@ msgstr "" "当查询：\n" "%.*s" -#: apply.c +#: apply.c:3163 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: apply.c +#: apply.c:3171 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" -#: apply.c +#: apply.c:3218 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" -#: apply.c +#: apply.c:3229 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。" -#: apply.c +#: apply.c:3237 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "补丁应用到空文件 '%s'，但其并非空文件" -#: apply.c +#: apply.c:3256 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "无法读取 '%2$s' 必需的目标文件 %1$s" -#: apply.c +#: apply.c:3269 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: apply.c +#: apply.c:3276 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" -#: apply.c +#: apply.c:3297 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: apply.c builtin/mv.c +#: apply.c:3421 builtin/mv.c:529 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" -#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c +#: apply.c:3473 apply.c:3484 apply.c:3530 midx.c:114 pack-mtimes.c:42 +#: pack-revindex.c:225 setup.c:328 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" -#: apply.c +#: apply.c:3481 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" -#: apply.c +#: apply.c:3510 apply.c:3785 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: apply.c +#: apply.c:3621 apply.c:3800 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: apply.c +#: apply.c:3630 apply.c:3808 apply.c:4033 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: apply.c +#: apply.c:3667 msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "仓库缺乏执行三方合并所必需的数据对象。" -#: apply.c +#: apply.c:3670 #, c-format msgid "Performing three-way merge...\n" msgstr "执行三方合并...\n" -#: apply.c +#: apply.c:3686 apply.c:3690 #, c-format msgid "cannot read the current contents of '%s'" msgstr "无法读取 '%s' 的当前内容" -#: apply.c +#: apply.c:3702 #, c-format msgid "Failed to perform three-way merge...\n" msgstr "无法执行三方合并...\n" -#: apply.c +#: apply.c:3716 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补丁到 '%s' 存在冲突。\n" -#: apply.c +#: apply.c:3721 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功应用补丁到 '%s'。\n" -#: apply.c +#: apply.c:3738 #, c-format msgid "Falling back to direct application...\n" msgstr "回落到直接应用...\n" -#: apply.c +#: apply.c:3752 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: apply.c +#: apply.c:3834 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: apply.c +#: apply.c:3836 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: apply.c read-cache.c +#: apply.c:3973 apply.c:3975 read-cache.c:842 read-cache.c:871 +#: read-cache.c:1304 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" -#: apply.c +#: apply.c:4031 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: apply.c +#: apply.c:4035 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: apply.c +#: apply.c:4055 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: apply.c +#: apply.c:4060 #, 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 +#: apply.c:4080 apply.c:4510 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" -#: apply.c +#: apply.c:4084 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: apply.c +#: apply.c:4099 #, c-format msgid "Checking patch %s..." msgstr "正在检查补丁 %s..." -#: apply.c +#: apply.c:4191 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" -#: apply.c +#: apply.c:4198 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式变更，但它不在当前 HEAD 中" -#: apply.c +#: apply.c:4201 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效（%s）。" -#: apply.c +#: apply.c:4210 #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" -#: apply.c +#: apply.c:4220 #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" -#: apply.c +#: apply.c:4358 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: apply.c +#: apply.c:4392 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: apply.c +#: apply.c:4398 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能对新建文件 '%s' 调用 stat" -#: apply.c +#: apply.c:4406 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: apply.c +#: apply.c:4412 apply.c:4587 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c builtin/bisect.c builtin/gc.c +#: apply.c:4455 builtin/bisect.c:611 builtin/gc.c:2412 builtin/gc.c:2474 #, c-format msgid "failed to write to '%s'" msgstr "无法写入 '%s'" -#: apply.c +#: apply.c:4459 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: apply.c +#: apply.c:4557 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: apply.c +#: apply.c:4657 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: apply.c +#: apply.c:4665 msgid "internal error" msgstr "内部错误" -#: apply.c +#: apply.c:4668 #, 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 +#: apply.c:4681 apply.c:4690 apply.c:4696 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" -#: apply.c rerere.c +#: apply.c:4685 rerere.c:1081 #, c-format msgid "cannot unlink '%s'" msgstr "不能删除 '%s'" -#: apply.c +#: apply.c:4713 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: apply.c +#: apply.c:4717 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: apply.c +#: apply.c:4848 #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" -#: apply.c +#: apply.c:4857 msgid "No valid patches in input (allow with \"--allow-empty\")" msgstr "输入中没有合法的补丁 （使用 \"--allow-empty\" 来允许）" -#: apply.c t/helper/test-cache-tree.c +#: apply.c:4878 t/helper/test-cache-tree.c:40 msgid "unable to read index file" msgstr "无法读取索引文件" -#: apply.c +#: apply.c:5035 #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s'：%s" -#: apply.c +#: apply.c:5062 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: apply.c +#: apply.c:5068 apply.c:5083 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字符误用。" msgstr[1] "%d 行新增了空白字符误用。" -#: apply.c +#: apply.c:5076 #, 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 builtin/mv.c builtin/rm.c +#: apply.c:5092 builtin/mv.c:570 builtin/rm.c:440 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: apply.c +#: apply.c:5120 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: apply.c +#: apply.c:5123 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: apply.c builtin/am.c +#: apply.c:5125 builtin/am.c:2366 msgid "num" msgstr "数字" -#: apply.c +#: apply.c:5126 msgid "remove leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: apply.c +#: apply.c:5129 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: apply.c +#: apply.c:5131 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: apply.c +#: apply.c:5135 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: apply.c +#: apply.c:5137 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: apply.c +#: apply.c:5139 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: apply.c +#: apply.c:5141 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: apply.c +#: apply.c:5143 msgid "mark new files with `git add --intent-to-add`" msgstr "使用命令 `git add --intent-to-add` 标记新增文件" -#: apply.c +#: apply.c:5145 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: apply.c +#: apply.c:5147 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" -#: apply.c +#: apply.c:5150 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: apply.c +#: apply.c:5152 msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "尝试三路合并，如果失败则回落至正常补丁模式" -#: apply.c +#: apply.c:5154 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: apply.c builtin/checkout-index.c +#: apply.c:5157 builtin/checkout-index.c:235 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: apply.c +#: apply.c:5159 msgid "ensure at least lines of context match" msgstr "确保至少匹配 行上下文" -#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c -#: builtin/rebase.c +#: apply.c:5160 builtin/am.c:2342 builtin/am.c:2345 +#: builtin/interpret-trailers.c:202 builtin/interpret-trailers.c:204 +#: builtin/pack-objects.c:4390 builtin/rebase.c:1117 msgid "action" msgstr "动作" -#: apply.c +#: apply.c:5161 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: apply.c +#: apply.c:5164 apply.c:5167 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: apply.c +#: apply.c:5170 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: apply.c +#: apply.c:5172 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: apply.c +#: apply.c:5174 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: apply.c +#: apply.c:5176 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: apply.c +#: apply.c:5179 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: apply.c +#: apply.c:5182 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: apply.c builtin/am.c +#: apply.c:5184 builtin/am.c:2354 msgid "root" msgstr "根目录" -#: apply.c +#: apply.c:5185 msgid "prepend to all filenames" msgstr "为所有文件名前添加 <根目录>" -#: apply.c +#: apply.c:5188 msgid "don't return error for empty patches" msgstr "对空的补丁不返回错误" -#: archive-tar.c archive-zip.c +#: archive-tar.c:140 archive-zip.c:354 #, c-format msgid "cannot stream blob %s" msgstr "不能打开数据对象 %s" -#: archive-tar.c archive-zip.c +#: archive-tar.c:280 archive-zip.c:367 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支持的文件模式：0%o (SHA1: %s)" -#: archive-tar.c archive-zip.c builtin/pack-objects.c +#: archive-tar.c:460 archive-zip.c:478 builtin/pack-objects.c:376 +#: builtin/pack-objects.c:379 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: archive-tar.c +#: archive-tar.c:513 #, c-format msgid "unable to start '%s' filter" msgstr "无法启动 '%s' 过滤器" -#: archive-tar.c +#: archive-tar.c:516 msgid "unable to redirect descriptor" msgstr "无法重定向描述符" -#: archive-tar.c +#: archive-tar.c:523 #, c-format msgid "'%s' filter reported error" msgstr "'%s' 过滤器报告了错误" -#: archive-zip.c +#: archive-zip.c:327 #, c-format msgid "path is not valid UTF-8: %s" msgstr "路径不是有效的 UTF-8：%s" -#: archive-zip.c +#: archive-zip.c:331 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路径太长（%d 字符，SHA1：%s）：%s" -#: archive-zip.c +#: archive-zip.c:612 #, c-format msgid "timestamp too large for this system: %" msgstr "对于本系统时间戳太大：%" -#: archive.c +#: archive.c:26 msgid "git archive [] [...]" msgstr "git archive [<选项>] <树对象> [<路径>...]" -#: archive.c +#: archive.c:28 msgid "" "git archive --remote [--exec ] [] [...]" msgstr "" "git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]" -#: archive.c +#: archive.c:29 msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" -#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c +#: archive.c:222 archive.c:378 builtin/gc.c:566 builtin/notes.c:298 +#: builtin/tag.c:631 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: archive.c +#: archive.c:473 #, c-format msgid "pathspec '%s' matches files outside the current directory" msgstr "路径规格 '%s' 匹配了当前目录外的文件'" -#: archive.c builtin/add.c builtin/rm.c +#: archive.c:496 builtin/add.c:133 builtin/add.c:530 builtin/rm.c:344 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" -#: archive.c +#: archive.c:519 #, c-format msgid "no such ref: %.*s" msgstr "无此引用：%.*s" -#: archive.c +#: archive.c:526 #, c-format msgid "not a valid object name: %s" msgstr "不是一个有效的对象名：%s" -#: archive.c t/helper/test-cache-tree.c +#: archive.c:541 t/helper/test-cache-tree.c:45 #, c-format msgid "not a tree object: %s" msgstr "不是一个树对象：%s" -#: archive.c +#: archive.c:582 #, c-format msgid "File not found: %s" msgstr "文件未找到：%s" -#: archive.c +#: archive.c:584 #, c-format msgid "Not a regular file: %s" msgstr "不是一个常规文件：%s" -#: archive.c +#: archive.c:593 #, c-format msgid "unclosed quote: '%s'" msgstr "未关闭的引号：'%s'" -#: archive.c +#: archive.c:596 #, c-format msgid "missing colon: '%s'" msgstr "缺失冒号：'%s'" -#: archive.c +#: archive.c:599 #, c-format msgid "empty file name: '%s'" msgstr "空的文件名：'%s'" -#: archive.c +#: archive.c:646 msgid "fmt" msgstr "格式" -#: archive.c +#: archive.c:646 msgid "archive format" msgstr "归档格式" -#: archive.c builtin/log.c parse-options.h +#: archive.c:647 builtin/log.c:2061 parse-options.h:532 msgid "prefix" msgstr "前缀" -#: archive.c +#: archive.c:648 msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c -#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c -#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h +#: archive.c:649 archive.c:655 builtin/blame.c:901 builtin/blame.c:905 +#: builtin/blame.c:906 builtin/commit-tree.c:107 builtin/config.c:71 +#: builtin/fast-export.c:1198 builtin/fast-export.c:1200 +#: builtin/fast-export.c:1204 builtin/gc.c:1526 builtin/gc.c:1591 +#: builtin/grep.c:992 builtin/hash-object.c:112 builtin/ls-files.c:610 +#: builtin/ls-files.c:613 builtin/notes.c:487 builtin/notes.c:663 +#: builtin/read-tree.c:121 parse-options.h:330 msgid "file" msgstr "文件" -#: archive.c +#: archive.c:650 archive.c:653 msgid "add untracked file to archive" msgstr "将未跟踪文件添加到归档" -#: archive.c +#: archive.c:653 msgid "path:content" msgstr "路径:内容" -#: archive.c builtin/archive.c +#: archive.c:656 builtin/archive.c:86 msgid "write the archive to this file" msgstr "归档写入此文件" -#: archive.c +#: archive.c:658 msgid "read .gitattributes in working directory" msgstr "读取工作区中的 .gitattributes" -#: archive.c +#: archive.c:659 msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" -#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pull.c +#: archive.c:660 builtin/clone.c:147 builtin/fetch.c:2210 +#: builtin/pack-objects.c:4359 builtin/pack-objects.c:4363 builtin/pull.c:217 msgid "time" msgstr "时间" -#: archive.c +#: archive.c:661 msgid "set modification time of archive entries" msgstr "设置归档条目的修改时间" -#: archive.c +#: archive.c:664 msgid "set compression level" msgstr "设置压缩级别" -#: archive.c +#: archive.c:667 msgid "list supported archive formats" msgstr "列出支持的归档格式" -#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c +#: archive.c:669 builtin/archive.c:87 builtin/clone.c:133 builtin/clone.c:136 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2761 msgid "repo" msgstr "仓库" -#: archive.c builtin/archive.c +#: archive.c:670 builtin/archive.c:88 msgid "retrieve the archive from remote repository " msgstr "从远程仓库（<仓库>）提取归档文件" -#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c +#: archive.c:671 builtin/archive.c:89 builtin/difftool.c:718 +#: builtin/notes.c:583 msgid "command" msgstr "命令" -#: archive.c builtin/archive.c +#: archive.c:672 builtin/archive.c:90 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" -#: archive.c +#: archive.c:679 msgid "Unexpected option --remote" msgstr "未知参数 --remote" -#: 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 +#: archive.c:681 builtin/add.c:404 builtin/add.c:436 builtin/checkout.c:1910 +#: builtin/clone.c:1249 builtin/clone.c:1252 builtin/commit.c:372 +#: builtin/fast-export.c:1247 builtin/index-pack.c:1863 builtin/log.c:2408 +#: builtin/reset.c:391 builtin/reset.c:452 builtin/rm.c:288 +#: builtin/stash.c:1795 builtin/worktree.c:818 builtin/worktree.c:1060 +#: fetch-pack.c:345 http-fetch.c:156 http-fetch.c:165 revision.c:3161 #, c-format msgid "the option '%s' requires '%s'" msgstr "选项 '%s' 需要 '%s'" -#: archive.c +#: archive.c:683 msgid "Unexpected option --output" msgstr "未知参数 --output" -#: archive.c +#: archive.c:692 #, c-format msgid "extra command line parameter '%s'" msgstr "额外的命令行参数：'%s'" -#: archive.c +#: archive.c:709 #, c-format msgid "Unknown archive format '%s'" msgstr "未知归档格式 '%s'" -#: archive.c +#: archive.c:718 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "参数不支持此格式 '%s'：-%d" -#: attr.c +#: attr.c:221 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一个有效的属性名" -#: attr.c +#: attr.c:249 msgid "unable to add additional attribute" msgstr "不能添加额外属性" -#: attr.c +#: attr.c:371 #, c-format msgid "ignoring overly long attributes line %d" msgstr "忽略过长的属性行 %d" -#: attr.c +#: attr.c:386 #, c-format msgid "%s not allowed: %s:%d" msgstr "不允许 %s：%s:%d" -#: attr.c +#: attr.c:425 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1902,52 +1960,58 @@ msgstr "" "负值模版在 git attributes 中被忽略\n" "当字符串确实要以感叹号开始时，使用 '\\!'。" -#: attr.c +#: attr.c:748 #, c-format msgid "cannot fstat gitattributes file '%s'" msgstr "无法 fstat gitattributes 文件 '%s'" -#: attr.c +#: attr.c:753 #, c-format msgid "ignoring overly large gitattributes file '%s'" msgstr "忽略过大的 gitattributes 文件 '%s'" -#: attr.c +#: attr.c:780 #, c-format msgid "ignoring overly large gitattributes blob '%s'" msgstr "忽略过大的 gitattributes 数据对象 '%s'" -#: attr.c +#: attr.c:1234 +msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo" +msgstr "无法在没有存储库的情况下使用 --attr-source 或 GIT_ATTR_SOURCE" + +#: attr.c:1242 msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "错误的 --attr-source 或 GIT_ATTR_SOURCE" -#: attr.c read-cache.c +#: attr.c:1294 read-cache.c:801 #, c-format msgid "unable to stat '%s'" msgstr "无法对 %s 执行 stat" -#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c -#: builtin/pack-objects.c combine-diff.c rerere.c +#: bisect.c:164 builtin/cat-file.c:230 builtin/cat-file.c:494 +#: builtin/index-pack.c:766 builtin/notes.c:720 builtin/pack-objects.c:302 +#: builtin/pack-objects.c:363 builtin/pack-objects.c:471 combine-diff.c:343 +#: rerere.c:987 #, c-format msgid "unable to read %s" msgstr "不能读 %s" -#: bisect.c +#: bisect.c:495 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "文件 '%s' 包含错误的引用格式：%s" -#: bisect.c +#: bisect.c:707 #, c-format msgid "We cannot bisect more!\n" msgstr "我们无法进行更多的二分查找！\n" -#: bisect.c +#: bisect.c:764 #, c-format msgid "Not a valid commit name %s" msgstr "不是一个有效的提交名 %s" -#: bisect.c +#: bisect.c:789 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1956,7 +2020,7 @@ msgstr "" "合并基线 %s 是坏的。\n" "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" -#: bisect.c +#: bisect.c:794 #, c-format msgid "" "The merge base %s is new.\n" @@ -1965,7 +2029,7 @@ msgstr "" "合并基线 %s 是新的。\n" "介于 %s 和 [%s] 之间的属性已经被修改。\n" -#: bisect.c +#: bisect.c:799 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1974,7 +2038,7 @@ msgstr "" "合并基线 %s 是 %s。\n" "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" -#: bisect.c +#: bisect.c:807 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1985,7 +2049,7 @@ msgstr "" "这种情况下 git 二分查找无法正常工作。\n" "您可能弄错了 %s 和 %s 版本？\n" -#: bisect.c +#: bisect.c:820 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1996,41 +2060,41 @@ msgstr "" "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" "我们仍旧继续。" -#: bisect.c +#: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分查找中：合并基线必须是经过测试的\n" -#: bisect.c +#: bisect.c:914 #, c-format msgid "a %s revision is needed" msgstr "需要一个 %s 版本" -#: bisect.c +#: bisect.c:944 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" -#: bisect.c builtin/notes.c +#: bisect.c:979 builtin/notes.c:177 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "不能为对象 '%s' 开始 'show'" -#: bisect.c builtin/merge.c +#: bisect.c:1000 builtin/merge.c:157 #, c-format msgid "could not read file '%s'" msgstr "不能读取文件 '%s'" -#: bisect.c +#: bisect.c:1042 msgid "reading bisect refs failed" msgstr "读取二分查找引用失败" -#: bisect.c +#: bisect.c:1072 #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同时为 %s 和 %s\n" -#: bisect.c +#: bisect.c:1082 #, c-format msgid "" "No testable commit found.\n" @@ -2039,7 +2103,7 @@ msgstr "" "没有发现可测试的提交。\n" "可能您在运行时使用了错误的路径参数？\n" -#: bisect.c +#: bisect.c:1113 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -2049,73 +2113,77 @@ msgstr[1] "（大概 %d 步）" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c +#: bisect.c:1119 #, 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 +#: blame.c:2774 msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" -#: blame.c +#: blame.c:2826 msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c midx-write.c pack-bitmap.c -#: remote.c sequencer.c submodule.c +#: blame.c:2835 builtin/commit.c:1124 builtin/log.c:519 builtin/log.c:1273 +#: builtin/log.c:1903 builtin/log.c:2362 builtin/log.c:2675 builtin/merge.c:417 +#: builtin/pack-objects.c:3520 builtin/pack-objects.c:3678 +#: builtin/pack-objects.c:4168 builtin/pack-objects.c:4183 +#: builtin/shortlog.c:272 midx-write.c:782 pack-bitmap.c:1152 +#: pack-bitmap.c:2548 remote.c:2221 sequencer.c:2540 sequencer.c:5528 +#: submodule.c:924 msgid "revision walk setup failed" msgstr "版本遍历初始化失败" -#: blame.c +#: blame.c:2853 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围" -#: blame.c +#: blame.c:2864 #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中无此路径 %1$s" -#: blame.c +#: blame.c:2877 #, c-format msgid "cannot read blob %s for path %s" msgstr "不能为路径 %2$s 读取数据对象 %1$s" -#: branch.c +#: branch.c:102 msgid "" "cannot inherit upstream tracking configuration of multiple refs when " "rebasing is requested" msgstr "在请求变基时无法继承上游多个引用的跟踪设置" -#: branch.c +#: branch.c:113 #, c-format msgid "not setting branch '%s' as its own upstream" msgstr "没有将分支 '%s' 设置为它自己的上游" -#: branch.c +#: branch.c:169 #, c-format msgid "branch '%s' set up to track '%s' by rebasing." msgstr "分支 '%s' 设置为使用变基来跟踪 '%s'。" -#: branch.c +#: branch.c:170 #, c-format msgid "branch '%s' set up to track '%s'." msgstr "分支 '%s' 设置为跟踪 '%s'。" -#: branch.c +#: branch.c:173 #, c-format msgid "branch '%s' set up to track:" msgstr "分支 '%s' 设置为跟踪：" -#: branch.c +#: branch.c:185 msgid "unable to write upstream branch configuration" msgstr "无法写入上游分支配置" -#: branch.c +#: branch.c:187 msgid "" "\n" "After fixing the error cause you may try to fix up\n" @@ -2124,17 +2192,17 @@ msgstr "" "\n" "在修复错误后，您可以通过执行以下命令来尝试修改远程跟踪分支：" -#: branch.c +#: branch.c:228 #, c-format msgid "asked to inherit tracking from '%s', but no remote is set" msgstr "要求从 '%s' 继承跟踪信息，但是没有设置远程" -#: branch.c +#: branch.c:234 #, c-format msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgstr "要求从 '%s' 继承跟踪信息，但是没有设置合并配置" -#: branch.c +#: branch.c:294 #, c-format msgid "not tracking: ambiguous information for ref '%s'" msgstr "不在跟踪中：引用 '%s' 有歧义的信息" @@ -2151,7 +2219,7 @@ msgstr "不在跟踪中：引用 '%s' 有歧义的信息" #. you'll probably want to swap the "%s" and leading " " space #. around. #. -#: branch.c object-name.c +#: branch.c:306 object-name.c:487 #, c-format msgid " %s\n" msgstr " %s\n" @@ -2159,7 +2227,7 @@ msgstr " %s\n" #. TRANSLATORS: The second argument is a \n-delimited list of #. duplicate refspecs, composed above. #. -#: branch.c +#: branch.c:312 #, c-format msgid "" "There are multiple remotes whose fetch refspecs map to the remote\n" @@ -2178,36 +2246,36 @@ msgstr "" "如果要支持设置追踪分支，请保证不同远程的获取引用规格映射至不同的追踪命名空" "间。" -#: branch.c +#: branch.c:376 #, c-format msgid "'%s' is not a valid branch name" msgstr "'%s' 不是一个有效的分支名称" -#: branch.c builtin/branch.c +#: branch.c:378 builtin/branch.c:592 msgid "See `man git check-ref-format`" msgstr "查阅 `man git check-ref-format`" -#: branch.c +#: branch.c:475 #, c-format msgid "a branch named '%s' already exists" msgstr "一个名为 '%s' 的分支已经存在" -#: branch.c +#: branch.c:479 #, c-format msgid "cannot force update the branch '%s' used by worktree at '%s'" msgstr "无法强制更新被工作区 '%2$s' 所使用的分支 '%1$s'" -#: branch.c +#: branch.c:504 #, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支" -#: branch.c +#: branch.c:506 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "请求的上游分支 '%s' 不存在" -#: branch.c +#: branch.c:508 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -2225,27 +2293,28 @@ msgstr "" "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n" "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" -#: branch.c builtin/replace.c +#: branch.c:556 builtin/replace.c:336 builtin/replace.c:392 +#: builtin/replace.c:438 builtin/replace.c:468 #, c-format msgid "not a valid object name: '%s'" msgstr "不是一个有效的对象名：'%s'" -#: branch.c +#: branch.c:577 #, c-format msgid "ambiguous object name: '%s'" msgstr "歧义的对象名：'%s'" -#: branch.c +#: branch.c:582 #, c-format msgid "not a valid branch point: '%s'" msgstr "无效的分支点：'%s'" -#: branch.c +#: branch.c:774 #, c-format msgid "submodule '%s': unable to find submodule" msgstr "子模组 '%s'：无法找到子模组" -#: branch.c +#: branch.c:777 #, c-format msgid "" "You may try updating the submodules using 'git checkout --no-recurse-" @@ -2254,136 +2323,128 @@ msgstr "" "你可以用 'git checkout --no-recurse-submodules %s && git submodule update --" "init' 来尝试更新子模组" -#: branch.c +#: branch.c:788 branch.c:814 #, c-format msgid "submodule '%s': cannot create branch '%s'" msgstr "子模组 '%s'：不能创建分支 '%s'" -#: branch.c +#: branch.c:849 #, c-format msgid "'%s' is already used by worktree at '%s'" msgstr "'%s' 已经被工作区 '%s' 使用" -#: builtin/add.c +#: builtin/add.c:29 msgid "git add [] [--] ..." msgstr "git add [<选项>] [--] <路径规格>..." -#: builtin/add.c +#: builtin/add.c:61 #, c-format msgid "cannot chmod %cx '%s'" msgstr "不能 chmod %cx '%s'" -#: builtin/add.c +#: builtin/add.c:123 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c -msgid "" -"the add.interactive.useBuiltin setting has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"设置 add.interactive.useBuiltin 已经被移除！\n" -"查看 'git help config' 中的相关条目以获取更多信息。" - -#: builtin/add.c +#: builtin/add.c:181 msgid "could not read the index" msgstr "不能读取索引" -#: builtin/add.c +#: builtin/add.c:196 msgid "editing patch failed" msgstr "编辑补丁失败" -#: builtin/add.c read-cache.c +#: builtin/add.c:199 read-cache.c:3206 #, c-format msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: builtin/add.c +#: builtin/add.c:201 msgid "empty patch. aborted" msgstr "空补丁。异常终止" -#: builtin/add.c +#: builtin/add.c:207 #, c-format msgid "could not apply '%s'" msgstr "不能应用 '%s'" -#: builtin/add.c +#: builtin/add.c:216 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: 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 +#: builtin/add.c:238 builtin/clean.c:934 builtin/fetch.c:2200 builtin/mv.c:187 +#: builtin/prune-packed.c:15 builtin/pull.c:210 builtin/push.c:570 +#: builtin/remote.c:1474 builtin/rm.c:251 builtin/send-pack.c:189 msgid "dry run" msgstr "演习" -#: 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 +#: builtin/add.c:239 builtin/check-ignore.c:23 builtin/commit.c:1511 +#: builtin/count-objects.c:102 builtin/fsck.c:908 builtin/log.c:2626 +#: builtin/mv.c:186 builtin/read-tree.c:126 msgid "be verbose" msgstr "冗长输出" -#: builtin/add.c +#: builtin/add.c:241 msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c builtin/checkout.c builtin/reset.c +#: builtin/add.c:242 builtin/checkout.c:1726 builtin/reset.c:366 msgid "select hunks interactively" msgstr "交互式挑选数据块" -#: builtin/add.c +#: builtin/add.c:243 msgid "edit current diff and apply" msgstr "编辑当前差异并应用" -#: builtin/add.c +#: builtin/add.c:244 msgid "allow adding otherwise ignored files" msgstr "允许添加忽略的文件" -#: builtin/add.c +#: builtin/add.c:245 msgid "update tracked files" msgstr "更新已跟踪的文件" -#: builtin/add.c +#: builtin/add.c:246 msgid "renormalize EOL of tracked files (implies -u)" msgstr "对已跟踪文件（暗含 -u）重新归一换行符" -#: builtin/add.c +#: builtin/add.c:247 msgid "record only the fact that the path will be added later" msgstr "只记录，该路径稍后再添加" -#: builtin/add.c +#: builtin/add.c:248 msgid "add changes from all tracked and untracked files" msgstr "添加所有改变的已跟踪文件和未跟踪文件" -#: builtin/add.c +#: builtin/add.c:251 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区中移除的路径（和 --no-all 相同）" -#: builtin/add.c +#: builtin/add.c:253 msgid "don't add, only refresh the index" msgstr "不添加，只刷新索引" -#: builtin/add.c +#: builtin/add.c:254 msgid "just skip files which cannot be added because of errors" msgstr "跳过因出错不能添加的文件" -#: builtin/add.c +#: builtin/add.c:255 msgid "check if - even missing - files are ignored in dry run" msgstr "检查在演习模式下文件（即使不存在）是否被忽略" -#: builtin/add.c builtin/mv.c builtin/rm.c +#: builtin/add.c:256 builtin/mv.c:191 builtin/rm.c:258 msgid "allow updating entries outside of the sparse-checkout cone" msgstr "允许更新稀疏检出锥以外的条目" -#: builtin/add.c builtin/update-index.c +#: builtin/add.c:258 builtin/update-index.c:970 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的可执行位" -#: builtin/add.c +#: builtin/add.c:260 msgid "warn when adding an embedded repository" msgstr "创建一个嵌入式仓库时给予警告" -#: builtin/add.c +#: builtin/add.c:282 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -2411,189 +2472,201 @@ msgstr "" "\n" "参见 \"git help submodule\" 获取更多信息。" -#: builtin/add.c +#: builtin/add.c:311 #, c-format msgid "adding embedded git repository: %s" msgstr "正在添加嵌入式 git 仓库：%s" -#: builtin/add.c +#: builtin/add.c:331 msgid "Use -f if you really want to add them." msgstr "如果您确实想添加它们，请使用 -f 选项。" -#: builtin/add.c +#: builtin/add.c:344 msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c +#: builtin/add.c:408 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" -#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c -#: builtin/rm.c builtin/stash.c +#: builtin/add.c:429 builtin/checkout.c:1898 builtin/commit.c:366 +#: builtin/reset.c:385 builtin/rm.c:282 builtin/stash.c:1789 #, c-format msgid "'%s' and pathspec arguments cannot be used together" msgstr "'%s' 和路径规格参数不能同时使用" -#: builtin/add.c +#: builtin/add.c:440 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" -#: builtin/add.c +#: builtin/add.c:442 msgid "Maybe you wanted to say 'git add .'?" msgstr "也许您想要执行 'git add .'？" -#: 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 +#: builtin/add.c:458 builtin/check-ignore.c:184 builtin/checkout.c:568 +#: builtin/checkout.c:784 builtin/clean.c:1013 builtin/commit.c:380 +#: builtin/diff-tree.c:130 builtin/grep.c:556 builtin/mv.c:219 +#: builtin/reset.c:458 builtin/rm.c:302 builtin/submodule--helper.c:207 +#: builtin/submodule--helper.c:3317 read-cache.c:2031 read-cache.c:2350 +#: rerere.c:561 rerere.c:595 rerere.c:1115 submodule.c:1866 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/add.c builtin/am.c builtin/checkout.c builtin/clone.c -#: builtin/commit.c builtin/stash.c merge.c rerere.c +#: builtin/add.c:570 builtin/am.c:2018 builtin/am.c:2052 builtin/checkout.c:637 +#: builtin/checkout.c:926 builtin/clone.c:789 builtin/commit.c:448 +#: builtin/commit.c:473 builtin/commit.c:521 builtin/stash.c:303 merge.c:111 +#: rerere.c:717 msgid "unable to write new index file" msgstr "无法写新的索引文件" -#: builtin/am.c builtin/mailinfo.c mailinfo.c +#: builtin/am.c:198 builtin/mailinfo.c:47 mailinfo.c:1263 #, c-format msgid "bad action '%s' for '%s'" msgstr "'%2$s' 的错误动作 '%1$s'" -#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c -#: ls-refs.c parallel-checkout.c sequencer.c setup.c +#: builtin/am.c:216 builtin/am.c:2273 builtin/am.c:2295 builtin/blame.c:741 +#: builtin/blame.c:761 builtin/fetch.c:169 builtin/pack-objects.c:3865 +#: builtin/pull.c:46 builtin/pull.c:48 builtin/pull.c:323 builtin/revert.c:66 +#: config.c:1410 diff-merges.c:94 gpg-interface.c:746 gpg-interface.c:761 +#: ls-refs.c:38 parallel-checkout.c:47 sequencer.c:3101 setup.c:646 setup.c:658 +#: setup.c:676 #, c-format msgid "invalid value for '%s': '%s'" msgstr "'%s' 的值无效：'%s'" -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c +#: builtin/am.c:303 builtin/commit.c:850 builtin/merge.c:1159 sequencer.c:599 +#: sequencer.c:2082 sequencer.c:3402 sequencer.c:3852 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: builtin/am.c +#: builtin/am.c:406 msgid "could not parse author script" msgstr "不能解析作者脚本" -#: builtin/am.c builtin/replace.c commit.c sequencer.c +#: builtin/am.c:413 builtin/am.c:458 builtin/am.c:463 builtin/am.c:1464 +#: builtin/am.c:2153 builtin/replace.c:471 commit.c:62 sequencer.c:3395 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" -#: builtin/am.c +#: builtin/am.c:498 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 钩子删除" -#: builtin/am.c +#: builtin/am.c:528 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/am.c +#: builtin/am.c:566 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "从 '%s' 拷贝注解到 '%s' 时失败" -#: builtin/am.c +#: builtin/am.c:592 msgid "fseek failed" msgstr "fseek 失败" -#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c +#: builtin/am.c:760 builtin/am.c:852 builtin/rebase.c:678 sequencer.c:985 +#: wrapper.c:198 wrapper.c:368 #, c-format msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" -#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c +#: builtin/am.c:769 builtin/rebase.c:629 editor.c:147 sequencer.c:4415 +#: wrapper.c:196 wrapper.c:366 #, c-format msgid "could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" -#: builtin/am.c +#: builtin/am.c:780 #, c-format msgid "could not parse patch '%s'" msgstr "无法解析补丁 '%s'" -#: builtin/am.c +#: builtin/am.c:845 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: builtin/am.c +#: builtin/am.c:893 msgid "invalid timestamp" msgstr "无效的时间戳" -#: builtin/am.c +#: builtin/am.c:898 builtin/am.c:910 msgid "invalid Date line" msgstr "无效的日期行" -#: builtin/am.c +#: builtin/am.c:905 msgid "invalid timezone offset" msgstr "无效的时区偏移值" -#: builtin/am.c +#: builtin/am.c:998 msgid "Patch format detection failed." msgstr "补丁格式探测失败。" -#: builtin/am.c builtin/clone.c +#: builtin/am.c:1003 builtin/clone.c:318 #, c-format msgid "failed to create directory '%s'" msgstr "无法创建目录 '%s'" -#: builtin/am.c +#: builtin/am.c:1009 msgid "Failed to split patches." msgstr "无法拆分补丁。" -#: builtin/am.c +#: builtin/am.c:1163 #, c-format msgid "When you have resolved this problem, run \"%s --continue\".\n" msgstr "当您解决这一问题之后，执行 \"%s --continue\"。\n" -#: builtin/am.c +#: builtin/am.c:1164 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead.\n" msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。\n" -#: builtin/am.c +#: builtin/am.c:1169 #, c-format msgid "" "To record the empty patch as an empty commit, run \"%s --allow-empty\".\n" msgstr "若要把空补丁记录为空提交，执行 \"%s --allow-empty\"。\n" -#: builtin/am.c +#: builtin/am.c:1171 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。" -#: builtin/am.c +#: builtin/am.c:1269 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。" -#: builtin/am.c +#: builtin/am.c:1358 #, c-format msgid "missing author line in commit %s" msgstr "在提交 %s 中缺失作者行" -#: builtin/am.c +#: builtin/am.c:1361 #, c-format msgid "invalid ident line: %.*s" msgstr "无效的身份标识：%.*s" -#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c +#: builtin/am.c:1383 builtin/checkout.c:830 builtin/clone.c:779 +#: commit-graph.c:1243 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: builtin/am.c +#: builtin/am.c:1592 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: builtin/am.c +#: builtin/am.c:1594 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个（三方合并的）基础目录树..." -#: builtin/am.c +#: builtin/am.c:1614 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2601,32 +2674,33 @@ msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到索引中的数据对象上。" -#: builtin/am.c +#: builtin/am.c:1620 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基础版本上打补丁及进行三方合并..." -#: builtin/am.c +#: builtin/am.c:1646 msgid "Failed to merge in the changes." msgstr "无法合并变更。" -#: builtin/am.c builtin/merge.c sequencer.c +#: builtin/am.c:1670 builtin/merge.c:699 sequencer.c:1590 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入树对象" -#: builtin/am.c +#: builtin/am.c:1678 msgid "applying to an empty history" msgstr "正应用到一个空历史上" -#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c +#: builtin/am.c:1697 builtin/commit.c:1849 builtin/merge.c:921 +#: builtin/merge.c:948 builtin/replay.c:75 sequencer.c:1700 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/am.c +#: builtin/am.c:1732 builtin/am.c:1736 #, c-format msgid "cannot resume: %s does not exist." msgstr "无法继续：%s 不存在。" -#: builtin/am.c +#: builtin/am.c:1754 msgid "Commit Body is:" msgstr "提交内容为：" @@ -2634,57 +2708,57 @@ msgstr "提交内容为：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c +#: builtin/am.c:1764 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]：" -#: builtin/am.c builtin/commit.c +#: builtin/am.c:1811 builtin/commit.c:413 msgid "unable to write index file" msgstr "无法写入索引文件" -#: builtin/am.c +#: builtin/am.c:1815 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "脏索引：不能应用补丁（脏文件：%s）" -#: builtin/am.c +#: builtin/am.c:1857 #, c-format msgid "Skipping: %.*s" msgstr "跳过：%.*s" -#: builtin/am.c +#: builtin/am.c:1862 #, c-format msgid "Creating an empty commit: %.*s" msgstr "创建空提交：%.*s" -#: builtin/am.c +#: builtin/am.c:1866 msgid "Patch is empty." msgstr "补丁为空。" -#: builtin/am.c +#: builtin/am.c:1877 builtin/am.c:1946 #, c-format msgid "Applying: %.*s" msgstr "应用：%.*s" -#: builtin/am.c +#: builtin/am.c:1894 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: builtin/am.c +#: builtin/am.c:1900 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补丁失败于 %s %.*s" -#: builtin/am.c +#: builtin/am.c:1904 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁" -#: builtin/am.c +#: builtin/am.c:1950 msgid "No changes - recorded it as an empty commit." msgstr "没有变更 —— 记录为空提交。" -#: builtin/am.c +#: builtin/am.c:1952 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2694,7 +2768,7 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: builtin/am.c +#: builtin/am.c:1960 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -2705,166 +2779,180 @@ msgstr "" "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" "您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" -#: builtin/am.c builtin/reset.c +#: builtin/am.c:2068 builtin/am.c:2072 builtin/am.c:2084 builtin/reset.c:405 +#: builtin/reset.c:413 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/am.c +#: builtin/am.c:2120 builtin/am.c:2197 msgid "failed to clean index" msgstr "无法清空索引" -#: builtin/am.c +#: builtin/am.c:2164 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" -#: builtin/am.c builtin/bisect.c worktree.c +#: builtin/am.c:2240 builtin/bisect.c:181 builtin/tag.c:359 worktree.c:259 #, c-format msgid "failed to read '%s'" msgstr "无法读取 '%s'" -#: builtin/am.c +#: builtin/am.c:2311 msgid "git am [] [( | )...]" msgstr "git am [<选项>] [( | )...]" -#: builtin/am.c +#: builtin/am.c:2312 msgid "git am [] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" -#: builtin/am.c +#: builtin/am.c:2318 msgid "run interactively" msgstr "以交互式方式运行" -#: builtin/am.c +#: builtin/am.c:2320 msgid "bypass pre-applypatch and applypatch-msg hooks" msgstr "绕过 pre-applypatch 和 applypatch-msg 钩子" -#: builtin/am.c +#: builtin/am.c:2322 msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" -#: builtin/am.c +#: builtin/am.c:2324 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允许使用三方合并。" -#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c -#: builtin/stash.c +#: builtin/am.c:2325 builtin/init-db.c:95 builtin/prune-packed.c:17 +#: builtin/repack.c:1162 builtin/stash.c:1025 msgid "be quiet" msgstr "静默模式" -#: builtin/am.c +#: builtin/am.c:2327 msgid "add a Signed-off-by trailer to the commit message" msgstr "在提交说明中添加 Signed-off-by 尾注" -#: builtin/am.c +#: builtin/am.c:2330 msgid "recode into utf8 (default)" msgstr "使用 utf8 字符集（默认）" -#: builtin/am.c +#: builtin/am.c:2332 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -k 参数" -#: builtin/am.c +#: builtin/am.c:2334 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -b 参数" -#: builtin/am.c +#: builtin/am.c:2336 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -m 参数" -#: builtin/am.c +#: builtin/am.c:2338 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" -#: builtin/am.c +#: builtin/am.c:2341 msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" -#: builtin/am.c +#: builtin/am.c:2343 msgid "pass it through git-mailinfo" msgstr "传递给 git-mailinfo" -#: builtin/am.c +#: builtin/am.c:2346 builtin/am.c:2349 builtin/am.c:2352 builtin/am.c:2355 +#: builtin/am.c:2358 builtin/am.c:2361 builtin/am.c:2364 builtin/am.c:2367 +#: builtin/am.c:2373 msgid "pass it through git-apply" msgstr "传递给 git-apply" -#: 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 +#: builtin/am.c:2363 builtin/commit.c:1542 builtin/fmt-merge-msg.c:19 +#: builtin/fmt-merge-msg.c:22 builtin/grep.c:976 builtin/merge.c:248 +#: builtin/pull.c:144 builtin/pull.c:206 builtin/pull.c:223 +#: builtin/rebase.c:1112 builtin/repack.c:1173 builtin/repack.c:1177 +#: builtin/repack.c:1179 builtin/show-branch.c:664 builtin/show-ref.c:309 +#: builtin/tag.c:486 parse-options.h:215 parse-options.h:276 +#: parse-options.h:526 msgid "n" msgstr "n" -#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c -#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c -#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c -#: builtin/verify-tag.c +#: builtin/am.c:2369 builtin/branch.c:771 builtin/bugreport.c:122 +#: builtin/cat-file.c:964 builtin/cat-file.c:968 builtin/cat-file.c:975 +#: builtin/clone.c:159 builtin/diagnose.c:27 builtin/for-each-ref.c:43 +#: builtin/init-db.c:102 builtin/ls-files.c:634 builtin/ls-tree.c:363 +#: builtin/refs.c:20 builtin/replace.c:570 builtin/tag.c:524 +#: builtin/verify-tag.c:30 msgid "format" msgstr "格式" -#: builtin/am.c +#: builtin/am.c:2370 msgid "format the patch(es) are in" msgstr "补丁的格式" -#: builtin/am.c +#: builtin/am.c:2376 msgid "override error message when patch failure occurs" msgstr "打补丁失败时显示的错误信息" -#: builtin/am.c +#: builtin/am.c:2378 msgid "continue applying patches after resolving a conflict" msgstr "冲突解决后继续应用补丁" -#: builtin/am.c +#: builtin/am.c:2381 msgid "synonyms for --continue" msgstr "和 --continue 同义" -#: builtin/am.c +#: builtin/am.c:2384 msgid "skip the current patch" msgstr "跳过当前补丁" -#: builtin/am.c +#: builtin/am.c:2387 msgid "restore the original branch and abort the patching operation" msgstr "恢复原始分支并终止打补丁操作" -#: builtin/am.c +#: builtin/am.c:2390 msgid "abort the patching operation but keep HEAD where it is" msgstr "终止补丁操作但保持 HEAD 不变" -#: builtin/am.c +#: builtin/am.c:2394 msgid "show the patch being applied" msgstr "显示正在应用的补丁" -#: builtin/am.c +#: builtin/am.c:2398 +msgid "try to apply current patch again" +msgstr "尝试再次应用当前补丁" + +#: builtin/am.c:2401 msgid "record the empty patch as an empty commit" msgstr "把空补丁记录为空提交" -#: builtin/am.c +#: builtin/am.c:2405 msgid "lie about committer date" msgstr "将作者日期作为提交日期" -#: builtin/am.c +#: builtin/am.c:2407 msgid "use current timestamp for author date" msgstr "用当前时间作为作者日期" -#: 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 +#: builtin/am.c:2409 builtin/commit-tree.c:110 builtin/commit.c:1668 +#: builtin/merge.c:287 builtin/pull.c:181 builtin/rebase.c:1168 +#: builtin/revert.c:131 builtin/tag.c:503 msgid "key-id" msgstr "key-id" -#: builtin/am.c builtin/rebase.c +#: builtin/am.c:2410 builtin/rebase.c:1169 msgid "GPG-sign commits" msgstr "使用 GPG 签名提交" -#: builtin/am.c +#: builtin/am.c:2413 msgid "how to handle empty patches" msgstr "如何处理空补丁" -#: builtin/am.c +#: builtin/am.c:2416 msgid "(internal use for git-rebase)" msgstr "（内部使用，用于 git-rebase）" -#: builtin/am.c +#: builtin/am.c:2434 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." @@ -2872,16 +2960,16 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" "请不要再使用它了。" -#: builtin/am.c +#: builtin/am.c:2441 msgid "failed to read the index" msgstr "无法读取索引" -#: builtin/am.c +#: builtin/am.c:2456 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" -#: builtin/am.c +#: builtin/am.c:2480 #, c-format msgid "" "Stray %s directory found.\n" @@ -2890,44 +2978,40 @@ msgstr "" "发现了错误的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" -#: builtin/am.c +#: builtin/am.c:2486 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" -#: builtin/am.c +#: builtin/am.c:2496 msgid "interactive mode requires patches on the command line" msgstr "交互式模式需要命令行上提供补丁" -#: builtin/apply.c +#: builtin/apply.c:8 msgid "git apply [] [...]" msgstr "git apply [<选项>] [<补丁>...]" -#: builtin/archive.c diagnose.c +#: builtin/archive.c:18 diagnose.c:211 msgid "could not redirect output" msgstr "不能重定向输出" -#: builtin/archive.c -msgid "git archive: Remote with no URL" -msgstr "git archive：未提供远程 URL" - -#: builtin/archive.c +#: builtin/archive.c:57 msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive：期望是 ACK/NAK，却得到 flush 包" -#: builtin/archive.c +#: builtin/archive.c:60 #, c-format msgid "git archive: NACK %s" msgstr "git archive：NACK %s" -#: builtin/archive.c +#: builtin/archive.c:61 msgid "git archive: protocol error" msgstr "git archive：协议错误" -#: builtin/archive.c +#: builtin/archive.c:65 msgid "git archive: expected a flush" msgstr "git archive：应有一个 flush 包" -#: builtin/bisect.c +#: builtin/bisect.c:27 msgid "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" "checkout] [--first-parent] [ [...]] [--] [...]" @@ -2935,97 +3019,97 @@ msgstr "" "git bisect start [--term-{new|bad}=<术语> --term-{old|good}=<术语>] [--no-" "checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径规格>...]" -#: builtin/bisect.c +#: builtin/bisect.c:31 msgid "git bisect (good|bad) [...]" msgstr "git bisect (good|bad) [<版本>...]" -#: builtin/bisect.c +#: builtin/bisect.c:35 msgid "git bisect skip [(|)...]" msgstr "git bisect skip [(<版本>|<范围>)...]" -#: builtin/bisect.c +#: builtin/bisect.c:39 msgid "git bisect reset []" msgstr "git bisect reset [<提交>]" -#: builtin/bisect.c +#: builtin/bisect.c:43 msgid "git bisect replay " msgstr "git bisect replay <日志文件>" -#: builtin/bisect.c +#: builtin/bisect.c:47 msgid "git bisect run [...]" msgstr "git bisect run <命令> [<参数>...]" -#: builtin/bisect.c +#: builtin/bisect.c:134 #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "不能以 '%2$s' 模式打开文件 '%1$s'" -#: builtin/bisect.c +#: builtin/bisect.c:141 #, c-format msgid "could not write to file '%s'" msgstr "不能写入文件 '%s'" -#: builtin/bisect.c +#: builtin/bisect.c:179 #, c-format msgid "cannot open file '%s' for reading" msgstr "不能打开文件 '%s' 来读取" -#: builtin/bisect.c +#: builtin/bisect.c:195 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' 不是一个有效的术语" -#: builtin/bisect.c +#: builtin/bisect.c:199 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "不能使用内置命令 '%s' 作为术语" -#: builtin/bisect.c +#: builtin/bisect.c:209 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "不能修改术语 '%s' 的含义" -#: builtin/bisect.c +#: builtin/bisect.c:219 msgid "please use two different terms" msgstr "请使用两个不同的术语" -#: builtin/bisect.c +#: builtin/bisect.c:235 #, c-format msgid "We are not bisecting.\n" msgstr "我们没有在二分查找。\n" -#: builtin/bisect.c +#: builtin/bisect.c:242 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' 不是一个有效的提交" -#: builtin/bisect.c +#: builtin/bisect.c:253 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset '." msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。" -#: builtin/bisect.c +#: builtin/bisect.c:297 #, c-format msgid "Bad bisect_write argument: %s" msgstr "坏的 bisect_write 参数：%s" -#: builtin/bisect.c +#: builtin/bisect.c:302 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "无法获取版本 '%s' 的对象 ID" -#: builtin/bisect.c +#: builtin/bisect.c:314 #, c-format msgid "couldn't open the file '%s'" msgstr "无法打开文件 '%s'" -#: builtin/bisect.c +#: builtin/bisect.c:340 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中" -#: builtin/bisect.c +#: builtin/bisect.c:368 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -3034,7 +3118,7 @@ msgstr "" "您需要给我至少一个 %s 和一个 %s 版本。\n" "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" -#: builtin/bisect.c +#: builtin/bisect.c:372 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -3045,7 +3129,7 @@ msgstr "" "然后需要提供我至少一个 %s 和一个 %s 版本。\n" "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。" -#: builtin/bisect.c +#: builtin/bisect.c:392 #, c-format msgid "bisecting only with a %s commit" msgstr "在只有一个 %s 提交的情况下二分查找" @@ -3054,37 +3138,37 @@ msgstr "在只有一个 %s 提交的情况下二分查找" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect.c +#: builtin/bisect.c:400 msgid "Are you sure [Y/n]? " msgstr "您确认么[Y/n]？ " -#: builtin/bisect.c +#: builtin/bisect.c:458 msgid "status: waiting for both good and bad commits\n" msgstr "状态：正在等待好的和坏的提交\n" -#: builtin/bisect.c +#: builtin/bisect.c:460 #, c-format 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" -#: builtin/bisect.c +#: builtin/bisect.c:464 msgid "status: waiting for good commit(s), bad commit known\n" msgstr "状态：正在等待好的提交，已知坏的提交\n" -#: builtin/bisect.c +#: builtin/bisect.c:503 msgid "no terms defined" msgstr "未定义术语" -#: builtin/bisect.c +#: builtin/bisect.c:506 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n" -#: builtin/bisect.c +#: builtin/bisect.c:516 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -3093,48 +3177,48 @@ msgstr "" "命令 'git bisect terms' 的参数 %s 无效。\n" "支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。" -#: builtin/bisect.c +#: builtin/bisect.c:585 builtin/bisect.c:1110 msgid "revision walk setup failed\n" msgstr "版本遍历设置失败\n" -#: builtin/bisect.c +#: builtin/bisect.c:607 #, c-format msgid "could not open '%s' for appending" msgstr "无法打开 '%s' 进行追加" -#: builtin/bisect.c +#: builtin/bisect.c:731 builtin/bisect.c:744 msgid "'' is not a valid term" msgstr "'' 不是一个有效的术语" -#: builtin/bisect.c +#: builtin/bisect.c:754 #, c-format msgid "unrecognized option: '%s'" msgstr "未识别的选项：'%s'" -#: builtin/bisect.c +#: builtin/bisect.c:758 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' 看起来不是一个有效的版本" -#: builtin/bisect.c +#: builtin/bisect.c:790 msgid "bad HEAD - I need a HEAD" msgstr "坏的 HEAD - 我需要一个 HEAD" -#: builtin/bisect.c +#: builtin/bisect.c:806 #, c-format msgid "checking out '%s' failed. Try 'git bisect start '." msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。" -#: builtin/bisect.c +#: builtin/bisect.c:823 msgid "bad HEAD - strange symbolic ref" msgstr "坏的 HEAD - 奇怪的符号引用" -#: builtin/bisect.c +#: builtin/bisect.c:843 #, c-format msgid "invalid ref: '%s'" msgstr "无效的引用：'%s'" -#: builtin/bisect.c +#: builtin/bisect.c:901 msgid "You need to start by \"git bisect start\"\n" msgstr "您需要执行 \"git bisect start\" 来开始\n" @@ -3142,267 +3226,270 @@ msgstr "您需要执行 \"git bisect start\" 来开始\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect.c +#: builtin/bisect.c:912 msgid "Do you want me to do it for you [Y/n]? " msgstr "您想让我为您这样做么[Y/n]？ " -#: builtin/bisect.c +#: builtin/bisect.c:929 msgid "Please call `--bisect-state` with at least one argument" msgstr "请使用至少一个参数调用 `--bisect-state`" -#: builtin/bisect.c +#: builtin/bisect.c:942 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' 只能带一个参数。" -#: builtin/bisect.c +#: builtin/bisect.c:955 builtin/bisect.c:968 #, c-format msgid "Bad rev input: %s" msgstr "坏的版本输入：%s" -#: builtin/bisect.c +#: builtin/bisect.c:975 #, c-format msgid "Bad rev input (not a commit): %s" msgstr "坏的版本输入（不是提交）：%s" -#: builtin/bisect.c +#: builtin/bisect.c:1007 msgid "We are not bisecting." msgstr "我们没有在二分查找。" -#: builtin/bisect.c +#: builtin/bisect.c:1057 #, c-format msgid "'%s'?? what are you talking about?" msgstr "'%s'?? 您在说什么?" -#: builtin/bisect.c +#: builtin/bisect.c:1069 #, c-format msgid "cannot read file '%s' for replaying" msgstr "不能读取文件 '%s' 来重放" -#: builtin/bisect.c +#: builtin/bisect.c:1176 #, c-format msgid "running %s\n" msgstr "正在执行 %s\n" -#: builtin/bisect.c +#: builtin/bisect.c:1225 msgid "bisect run failed: no command provided." msgstr "二分查找运行失败：没有提供命令。" -#: builtin/bisect.c +#: builtin/bisect.c:1245 #, c-format msgid "unable to verify %s on good revision" msgstr "无法在好版本中验证 %s" -#: builtin/bisect.c +#: builtin/bisect.c:1251 #, c-format msgid "bogus exit code %d for good revision" msgstr "好版本返回错误的退出码 %d" -#: builtin/bisect.c +#: builtin/bisect.c:1259 #, c-format msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" msgstr "二分查找运行失败：命令 %2$s 的退出码 %1$d < 0 或 >= 128" -#: builtin/bisect.c +#: builtin/bisect.c:1274 #, c-format msgid "cannot open file '%s' for writing" msgstr "无法打开文件 '%s' 进行写入" -#: builtin/bisect.c +#: builtin/bisect.c:1292 msgid "bisect run cannot continue any more" msgstr "二分查找不能继续运行" -#: builtin/bisect.c +#: builtin/bisect.c:1294 msgid "bisect run success" msgstr "二分查找运行成功" -#: builtin/bisect.c +#: builtin/bisect.c:1297 msgid "bisect found first bad commit" msgstr "二分查找找到了第一个坏的提交" -#: builtin/bisect.c +#: builtin/bisect.c:1300 #, c-format msgid "bisect run failed: 'git bisect %s' exited with error code %d" msgstr "二分查找运行失败：'git bisect %s' 退出码为 %d" -#: builtin/bisect.c +#: builtin/bisect.c:1315 #, c-format msgid "'%s' requires either no argument or a commit" msgstr "'%s' 无需参数或者需要一个提交" -#: builtin/bisect.c +#: builtin/bisect.c:1326 #, c-format msgid "'%s' requires 0 or 1 argument" msgstr "'%s' 无需参数或者需要一个参数" -#: builtin/bisect.c +#: builtin/bisect.c:1350 #, c-format msgid "'%s' requires 0 arguments" msgstr "'%s' 无需参数" -#: builtin/bisect.c +#: builtin/bisect.c:1369 msgid "no logfile given" msgstr "未提供日志文件" -#: builtin/bisect.c +#: builtin/bisect.c:1405 #, c-format msgid "'%s' failed: no command provided." msgstr "'%s' 运行失败：没有提供命令。" -#: builtin/bisect.c +#: builtin/bisect.c:1436 msgid "need a command" msgstr "需要一个命令" -#: builtin/bisect.c builtin/cat-file.c +#: builtin/bisect.c:1441 builtin/cat-file.c:747 #, c-format msgid "unknown command: '%s'" msgstr "未知命令：'%s'" -#: builtin/blame.c +#: builtin/blame.c:38 msgid "git blame [] [] [] [--] " msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" -#: builtin/blame.c +#: builtin/blame.c:39 msgid "git annotate [] [] [] [--] " msgstr "git annotate [<选项>] [<版本选项>] [<版本>] [--] <文件>" -#: builtin/blame.c +#: builtin/blame.c:44 builtin/blame.c:51 msgid " are documented in git-rev-list(1)" msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" -#: builtin/blame.c +#: builtin/blame.c:420 #, c-format msgid "expecting a color: %s" msgstr "期望一个颜色：%s" -#: builtin/blame.c +#: builtin/blame.c:427 msgid "must end with a color" msgstr "必须以一个颜色结尾" -#: builtin/blame.c +#: builtin/blame.c:862 #, c-format msgid "cannot find revision %s to ignore" msgstr "不能找到要忽略的版本 %s" -#: builtin/blame.c +#: builtin/blame.c:884 msgid "show blame entries as we find them, incrementally" msgstr "增量式地显示发现的 blame 条目" -#: builtin/blame.c +#: builtin/blame.c:885 msgid "do not show object names of boundary commits (Default: off)" msgstr "不显示边界提交的对象名（默认：关闭）" -#: builtin/blame.c +#: builtin/blame.c:886 msgid "do not treat root commits as boundaries (Default: off)" msgstr "不把根提交作为边界（默认：关闭）" -#: builtin/blame.c +#: builtin/blame.c:887 msgid "show work cost statistics" msgstr "显示工作消耗统计" -#: 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 +#: builtin/blame.c:888 builtin/checkout.c:1680 builtin/clone.c:109 +#: builtin/commit-graph.c:83 builtin/commit-graph.c:253 builtin/fetch.c:2207 +#: builtin/merge.c:286 builtin/multi-pack-index.c:131 +#: builtin/multi-pack-index.c:188 builtin/multi-pack-index.c:215 +#: builtin/multi-pack-index.c:244 builtin/pull.c:122 builtin/push.c:586 +#: builtin/remote.c:697 builtin/send-pack.c:197 msgid "force progress reporting" msgstr "强制显示进度报告" -#: builtin/blame.c +#: builtin/blame.c:889 msgid "show output score for blame entries" msgstr "显示 blame 条目的输出得分" -#: builtin/blame.c +#: builtin/blame.c:890 msgid "show original filename (Default: auto)" msgstr "显示原始文件名（默认：自动）" -#: builtin/blame.c +#: builtin/blame.c:891 msgid "show original linenumber (Default: off)" msgstr "显示原始的行号（默认：关闭）" -#: builtin/blame.c +#: builtin/blame.c:892 msgid "show in a format designed for machine consumption" msgstr "显示为一个适合机器读取的格式" -#: builtin/blame.c +#: builtin/blame.c:893 msgid "show porcelain format with per-line commit information" msgstr "为每一行显示机器适用的提交信息" -#: builtin/blame.c +#: builtin/blame.c:894 msgid "use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" -#: builtin/blame.c +#: builtin/blame.c:895 msgid "show raw timestamp (Default: off)" msgstr "显示原始时间戳（默认：关闭）" -#: builtin/blame.c +#: builtin/blame.c:896 msgid "show long commit SHA1 (Default: off)" msgstr "显示长的 SHA1 提交号（默认：关闭）" -#: builtin/blame.c +#: builtin/blame.c:897 msgid "suppress author name and timestamp (Default: off)" msgstr "隐藏作者名字和时间戳（默认：关闭）" -#: builtin/blame.c +#: builtin/blame.c:898 msgid "show author email instead of name (Default: off)" msgstr "显示作者的邮箱而不是名字（默认：关闭）" -#: builtin/blame.c +#: builtin/blame.c:899 msgid "ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c builtin/log.c +#: builtin/blame.c:900 builtin/log.c:2109 msgid "rev" msgstr "版本" -#: builtin/blame.c +#: builtin/blame.c:900 msgid "ignore when blaming" msgstr "在执行 blame 操作时忽略 <版本>" -#: builtin/blame.c +#: builtin/blame.c:901 msgid "ignore revisions from " msgstr "忽略来自 <文件> 中的版本" -#: builtin/blame.c +#: builtin/blame.c:902 msgid "color redundant metadata from previous line differently" msgstr "使用颜色间隔输出与前一行不同的重复元信息" -#: builtin/blame.c +#: builtin/blame.c:903 msgid "color lines by age" msgstr "依据时间着色" -#: builtin/blame.c +#: builtin/blame.c:904 msgid "spend extra cycles to find better match" msgstr "花费额外的循环来找到更好的匹配" -#: builtin/blame.c +#: builtin/blame.c:905 msgid "use revisions from instead of calling git-rev-list" msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" -#: builtin/blame.c +#: builtin/blame.c:906 msgid "use 's contents as the final image" msgstr "使用 <文件> 的内容作为最终的镜像" -#: builtin/blame.c +#: builtin/blame.c:907 builtin/blame.c:908 msgid "score" msgstr "得分" -#: builtin/blame.c +#: builtin/blame.c:907 msgid "find line copies within and across files" msgstr "找到文件内及跨文件的行拷贝" -#: builtin/blame.c +#: builtin/blame.c:908 msgid "find line movements within and across files" msgstr "找到文件内及跨文件的行移动" -#: builtin/blame.c +#: builtin/blame.c:909 msgid "range" msgstr "范围" -#: builtin/blame.c +#: builtin/blame.c:910 msgid "process only line range , or function :" msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数名>" -#: builtin/blame.c +#: builtin/blame.c:972 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress 不能和 --incremental 或机器内部格式一起使用" @@ -3414,57 +3501,57 @@ msgstr "--progress 不能和 --incremental 或机器内部格式一起使用" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c +#: builtin/blame.c:1023 msgid "4 years, 11 months ago" msgstr "4 年 11 个月前" -#: builtin/blame.c +#: builtin/blame.c:1139 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "文件 %s 只有 %lu 行" msgstr[1] "文件 %s 只有 %lu 行" -#: builtin/blame.c +#: builtin/blame.c:1187 msgid "Blaming lines" msgstr "追踪代码行" -#: builtin/branch.c +#: builtin/branch.c:31 msgid "git branch [] [-r | -a] [--merged] [--no-merged]" msgstr "git branch [<选项>] [-r | -a] [--merged] [--no-merged]" -#: builtin/branch.c +#: builtin/branch.c:32 msgid "" "git branch [] [-f] [--recurse-submodules] []" msgstr "git branch [<选项>] [-f] [--recurse-submodules] <分支名> [<起始点>]" -#: builtin/branch.c +#: builtin/branch.c:33 msgid "git branch [] [-l] [...]" msgstr "git branch [<选项>] [-l] [<模式>...]" -#: builtin/branch.c +#: builtin/branch.c:34 msgid "git branch [] [-r] (-d | -D) ..." msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." -#: builtin/branch.c +#: builtin/branch.c:35 msgid "git branch [] (-m | -M) [] " msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" -#: builtin/branch.c +#: builtin/branch.c:36 msgid "git branch [] (-c | -C) [] " msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>" -#: builtin/branch.c +#: builtin/branch.c:37 msgid "git branch [] [-r | -a] [--points-at]" msgstr "git branch [<选项>] [-r | -a] [--points-at]" -#: builtin/branch.c +#: builtin/branch.c:38 msgid "git branch [] [-r | -a] [--format]" msgstr "git branch [<选项>] [-r | -a] [--format]" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c +#: builtin/branch.c:178 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3474,7 +3561,7 @@ msgstr "" " '%s'，但未合并到 HEAD" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c +#: builtin/branch.c:182 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3483,40 +3570,40 @@ msgstr "" "并未删除分支 '%s'，虽然它已经合并到 HEAD，\n" " 然而却尚未被合并到分支 '%s'" -#: builtin/branch.c +#: builtin/branch.c:196 #, c-format msgid "couldn't look up commit object for '%s'" msgstr "无法查询 '%s' 指向的提交对象" -#: builtin/branch.c +#: builtin/branch.c:200 #, c-format msgid "the branch '%s' is not fully merged" msgstr "分支 '%s' 没有完全合并" -#: builtin/branch.c +#: builtin/branch.c:202 #, c-format msgid "If you are sure you want to delete it, run 'git branch -D %s'" msgstr "如果您确认要删除它，执行 'git branch -D %s'" -#: builtin/branch.c +#: builtin/branch.c:214 msgid "update of config-file failed" msgstr "更新配置文件失败" -#: builtin/branch.c +#: builtin/branch.c:249 msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 同时使用" -#: builtin/branch.c +#: builtin/branch.c:267 #, c-format msgid "cannot delete branch '%s' used by worktree at '%s'" msgstr "无法强制更新被工作区 '%2$s' 所使用的分支 '%1$s'" -#: builtin/branch.c +#: builtin/branch.c:283 #, c-format msgid "remote-tracking branch '%s' not found" msgstr "未能找到远程跟踪分支 '%s'" -#: builtin/branch.c +#: builtin/branch.c:296 #, c-format msgid "" "branch '%s' not found.\n" @@ -3525,96 +3612,96 @@ msgstr "" "分支 '%s' 未找到。\n" "是否忘记指定 --remote 选项？" -#: builtin/branch.c +#: builtin/branch.c:300 #, c-format msgid "branch '%s' not found" msgstr "分支 '%s' 未发现" -#: builtin/branch.c +#: builtin/branch.c:333 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n" -#: builtin/branch.c +#: builtin/branch.c:334 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s（曾为 %s）。\n" -#: builtin/branch.c builtin/tag.c +#: builtin/branch.c:472 builtin/tag.c:69 msgid "unable to parse format string" msgstr "不能解析格式化字符串" -#: builtin/branch.c +#: builtin/branch.c:509 msgid "could not resolve HEAD" msgstr "不能解析 HEAD 提交" -#: builtin/branch.c +#: builtin/branch.c:515 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) 指向 refs/heads/ 之外" -#: builtin/branch.c +#: builtin/branch.c:530 #, c-format msgid "branch %s is being rebased at %s" msgstr "分支 %s 正被变基到 %s" -#: builtin/branch.c +#: builtin/branch.c:534 #, c-format msgid "branch %s is being bisected at %s" msgstr "分支 %s 正被二分查找于 %s" -#: builtin/branch.c +#: builtin/branch.c:563 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s 的 HEAD 指向没有被更新" -#: builtin/branch.c +#: builtin/branch.c:590 #, c-format msgid "invalid branch name: '%s'" msgstr "无效的分支名：'%s'" -#: builtin/branch.c +#: builtin/branch.c:610 builtin/branch.c:901 builtin/branch.c:946 #, c-format msgid "no commit on branch '%s' yet" msgstr "分支 '%s' 尚无提交" -#: builtin/branch.c +#: builtin/branch.c:612 builtin/branch.c:902 #, c-format msgid "no branch named '%s'" msgstr "没有分支 '%s'" -#: builtin/branch.c +#: builtin/branch.c:640 msgid "branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c +#: builtin/branch.c:642 msgid "branch copy failed" msgstr "分支拷贝失败" -#: builtin/branch.c +#: builtin/branch.c:646 #, c-format msgid "created a copy of a misnamed branch '%s'" msgstr "已为错误命名的分支 '%s' 创建了一个副本" -#: builtin/branch.c +#: builtin/branch.c:649 #, c-format msgid "renamed a misnamed branch '%s' away" msgstr "已将错误命名的分支 '%s' 重命名" -#: builtin/branch.c +#: builtin/branch.c:656 #, c-format msgid "branch renamed to %s, but HEAD is not updated" msgstr "分支重命名为 %s，但 HEAD 没有更新" -#: builtin/branch.c +#: builtin/branch.c:663 msgid "branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新配置文件失败" -#: builtin/branch.c +#: builtin/branch.c:665 msgid "branch is copied, but update of config-file failed" msgstr "分支已拷贝，但更新配置文件失败" -#: builtin/branch.c +#: builtin/branch.c:685 #, c-format msgid "" "Please edit the description for the branch\n" @@ -3625,224 +3712,227 @@ msgstr "" " %s\n" "以 '%s' 开头的行将被过滤。\n" -#: builtin/branch.c +#: builtin/branch.c:723 msgid "Generic options" msgstr "通用选项" -#: builtin/branch.c +#: builtin/branch.c:725 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" -#: builtin/branch.c +#: builtin/branch.c:726 msgid "suppress informational messages" msgstr "不显示信息" -#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c +#: builtin/branch.c:728 builtin/checkout.c:1698 +#: builtin/submodule--helper.c:3066 msgid "set branch tracking configuration" msgstr "设置分支跟踪配置" -#: builtin/branch.c +#: builtin/branch.c:731 msgid "do not use" msgstr "不要使用" -#: builtin/branch.c +#: builtin/branch.c:733 msgid "upstream" msgstr "上游" -#: builtin/branch.c +#: builtin/branch.c:733 msgid "change the upstream info" msgstr "改变上游信息" -#: builtin/branch.c +#: builtin/branch.c:734 msgid "unset the upstream info" msgstr "取消上游信息的设置" -#: builtin/branch.c +#: builtin/branch.c:735 msgid "use colored output" msgstr "使用彩色输出" -#: builtin/branch.c +#: builtin/branch.c:736 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" -#: builtin/branch.c +#: builtin/branch.c:739 builtin/branch.c:741 msgid "print only branches that contain the commit" msgstr "只打印包含该提交的分支" -#: builtin/branch.c +#: builtin/branch.c:740 builtin/branch.c:742 msgid "print only branches that don't contain the commit" msgstr "只打印不包含该提交的分支" -#: builtin/branch.c +#: builtin/branch.c:745 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作：" -#: builtin/branch.c +#: builtin/branch.c:746 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪及本地分支" -#: builtin/branch.c +#: builtin/branch.c:749 msgid "delete fully merged branch" msgstr "删除完全合并的分支" -#: builtin/branch.c +#: builtin/branch.c:750 msgid "delete branch (even if not merged)" msgstr "删除分支（即使没有合并）" -#: builtin/branch.c +#: builtin/branch.c:751 msgid "move/rename a branch and its reflog" msgstr "移动/重命名一个分支，以及它的引用日志" -#: builtin/branch.c +#: builtin/branch.c:752 msgid "move/rename a branch, even if target exists" msgstr "移动/重命名一个分支，即使目标已存在" -#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c +#: builtin/branch.c:754 builtin/for-each-ref.c:39 builtin/tag.c:517 msgid "do not output a newline after empty formatted refs" msgstr "在格式化引用结果为空之后，不输出换行符" -#: builtin/branch.c +#: builtin/branch.c:755 msgid "copy a branch and its reflog" msgstr "拷贝一个分支和它的引用日志" -#: builtin/branch.c +#: builtin/branch.c:756 msgid "copy a branch, even if target exists" msgstr "拷贝一个分支，即使目标已存在" -#: builtin/branch.c +#: builtin/branch.c:757 msgid "list branch names" msgstr "列出分支名" -#: builtin/branch.c +#: builtin/branch.c:758 msgid "show current branch name" msgstr "显示当前分支名" -#: builtin/branch.c builtin/submodule--helper.c +#: builtin/branch.c:759 builtin/submodule--helper.c:3064 msgid "create the branch's reflog" msgstr "创建分支的引用日志" -#: builtin/branch.c +#: builtin/branch.c:761 msgid "edit the description for the branch" msgstr "标记分支的描述" -#: builtin/branch.c +#: builtin/branch.c:762 msgid "force creation, move/rename, deletion" msgstr "强制创建、移动/重命名、删除" -#: builtin/branch.c +#: builtin/branch.c:763 msgid "print only branches that are merged" msgstr "只打印已经合并的分支" -#: builtin/branch.c +#: builtin/branch.c:764 msgid "print only branches that are not merged" msgstr "只打印尚未合并的分支" -#: builtin/branch.c +#: builtin/branch.c:765 msgid "list branches in columns" msgstr "以列的方式显示分支" -#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c +#: builtin/branch.c:767 builtin/for-each-ref.c:48 builtin/notes.c:490 +#: builtin/notes.c:493 builtin/notes.c:666 builtin/notes.c:669 +#: builtin/tag.c:520 msgid "object" msgstr "对象" -#: builtin/branch.c +#: builtin/branch.c:768 msgid "print only branches of the object" msgstr "只打印指向该对象的分支" -#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c +#: builtin/branch.c:769 builtin/for-each-ref.c:54 builtin/tag.c:527 msgid "sorting and filtering are case insensitive" msgstr "排序和过滤属于大小写不敏感" -#: builtin/branch.c builtin/ls-files.c +#: builtin/branch.c:770 builtin/ls-files.c:623 msgid "recurse through submodules" msgstr "在子模组中递归" -#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c -#: builtin/tag.c builtin/verify-tag.c +#: builtin/branch.c:771 builtin/for-each-ref.c:43 builtin/ls-files.c:635 +#: builtin/ls-tree.c:364 builtin/tag.c:525 builtin/verify-tag.c:30 msgid "format to use for the output" msgstr "输出格式" -#: builtin/branch.c +#: builtin/branch.c:796 msgid "failed to resolve HEAD as a valid ref" msgstr "无法将 HEAD 解析为有效引用" -#: builtin/branch.c builtin/clone.c +#: builtin/branch.c:800 builtin/clone.c:758 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" -#: builtin/branch.c +#: builtin/branch.c:821 msgid "" "branch with --recurse-submodules can only be used if submodule." "propagateBranches is enabled" msgstr "" "带有 --recurse-submodules 的分支只能在 submodule.propagateBranches 启用时使用" -#: builtin/branch.c +#: builtin/branch.c:823 msgid "--recurse-submodules can only be used to create branches" msgstr "--recurse-submodules 只能用于创建分支" -#: builtin/branch.c +#: builtin/branch.c:854 builtin/branch.c:913 msgid "branch name required" msgstr "必须提供分支名" -#: builtin/branch.c +#: builtin/branch.c:889 msgid "cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" -#: builtin/branch.c +#: builtin/branch.c:895 msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" -#: builtin/branch.c +#: builtin/branch.c:915 msgid "cannot copy the current branch while not on any" msgstr "不处于任何分支上，无法拷贝当前分支" -#: builtin/branch.c +#: builtin/branch.c:916 msgid "cannot rename the current branch while not on any" msgstr "不处于任何分支上，无法重命名当前分支" -#: builtin/branch.c +#: builtin/branch.c:922 msgid "too many branches for a copy operation" msgstr "为拷贝操作提供了太多的分支名" -#: builtin/branch.c +#: builtin/branch.c:923 msgid "too many arguments for a rename operation" msgstr "为重命名操作提供了太多的参数" -#: builtin/branch.c +#: builtin/branch.c:934 msgid "too many arguments to set new upstream" msgstr "为设置新上游提供了太多的参数" -#: builtin/branch.c +#: builtin/branch.c:938 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch" msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支" -#: builtin/branch.c +#: builtin/branch.c:941 builtin/branch.c:970 #, c-format msgid "no such branch '%s'" msgstr "没有此分支 '%s'" -#: builtin/branch.c +#: builtin/branch.c:947 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c +#: builtin/branch.c:964 msgid "too many arguments to unset upstream" msgstr "为取消上游设置操作提供了太多的参数" -#: builtin/branch.c +#: builtin/branch.c:968 msgid "could not unset upstream of HEAD when it does not point to any branch" msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" -#: builtin/branch.c +#: builtin/branch.c:974 #, c-format msgid "branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" -#: builtin/branch.c +#: builtin/branch.c:988 msgid "" "the -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list ?" @@ -3850,34 +3940,34 @@ msgstr "" "'git branch' 的 -a 和 -r 选项不带一个分支名。\n" "您是否想要使用：-a|-r --list <模式>？" -#: builtin/branch.c +#: builtin/branch.c:992 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead" msgstr "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'" -#: builtin/bugreport.c +#: builtin/bugreport.c:21 msgid "git version:\n" msgstr "git 版本：\n" -#: builtin/bugreport.c +#: builtin/bugreport.c:27 #, c-format msgid "uname() failed with error '%s' (%d)\n" msgstr "uname() 失败，错误为 '%s'（%d）\n" -#: builtin/bugreport.c +#: builtin/bugreport.c:37 msgid "compiler info: " msgstr "编译器信息：" -#: builtin/bugreport.c +#: builtin/bugreport.c:40 msgid "libc info: " msgstr "libc 信息：" -#: builtin/bugreport.c +#: builtin/bugreport.c:54 msgid "not run from a git repository - no hooks to show\n" msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n" -#: builtin/bugreport.c +#: builtin/bugreport.c:67 msgid "" "git bugreport [(-o | --output-directory) ]\n" " [(-s | --suffix) | --no-suffix]\n" @@ -3887,7 +3977,7 @@ msgstr "" " [(-s | --suffix) <格式> | --no-suffix]\n" " [--diagnose[=<模式>]" -#: builtin/bugreport.c +#: builtin/bugreport.c:76 msgid "" "Thank you for filling out a Git bug report!\n" "Please answer the following questions to help us understand your issue.\n" @@ -3921,58 +4011,59 @@ msgstr "" "请检查下面错误报告中余下的内容。\n" "您可以删除任何您不想共享的内容。\n" -#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c -#: parse-options.h +#: builtin/bugreport.c:117 builtin/commit.c:1529 builtin/commit.c:1533 +#: builtin/commit.c:1694 builtin/fast-export.c:1189 builtin/fast-export.c:1192 +#: builtin/fast-export.c:1195 builtin/rebase.c:1179 parse-options.h:581 msgid "mode" msgstr "模式" -#: builtin/bugreport.c +#: builtin/bugreport.c:118 msgid "" "create an additional zip archive of detailed diagnostics (default 'stats')" msgstr "额外创建详细诊断信息的压缩包（默认 'stats'）" -#: builtin/bugreport.c +#: builtin/bugreport.c:121 msgid "specify a destination for the bugreport file(s)" msgstr "指定错误报告文件的目标位置" -#: builtin/bugreport.c +#: builtin/bugreport.c:123 msgid "specify a strftime format suffix for the filename(s)" msgstr "指定文件的 strftime 格式后缀" -#: builtin/bugreport.c +#: builtin/bugreport.c:131 #, c-format msgid "unknown argument `%s'" msgstr "未知参数 `%s'" -#: builtin/bugreport.c builtin/diagnose.c +#: builtin/bugreport.c:154 builtin/diagnose.c:53 #, c-format msgid "could not create leading directories for '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/bugreport.c builtin/diagnose.c +#: builtin/bugreport.c:167 builtin/diagnose.c:59 #, c-format msgid "unable to create diagnostics archive %s" msgstr "不能创建诊断归档包 %s" -#: builtin/bugreport.c +#: builtin/bugreport.c:175 msgid "System Info" msgstr "系统信息" -#: builtin/bugreport.c +#: builtin/bugreport.c:178 msgid "Enabled Hooks" msgstr "启用的钩子" -#: builtin/bugreport.c +#: builtin/bugreport.c:185 #, c-format msgid "unable to write to %s" msgstr "无法写入 %s" -#: builtin/bugreport.c +#: builtin/bugreport.c:195 #, c-format msgid "Created new report at '%s'.\n" msgstr "在 '%s' 创建了新报告。\n" -#: builtin/bundle.c +#: builtin/bundle.c:19 msgid "" "git bundle create [-q | --quiet | --progress]\n" " [--version=] " @@ -3980,108 +4071,112 @@ msgstr "" "git bundle create [-q | --quiet | --progress]\n" " [--version=<版本>] <文件> " -#: builtin/bundle.c +#: builtin/bundle.c:22 msgid "git bundle verify [-q | --quiet] " msgstr "git bundle verify [-q | --quiet] <文件>" -#: builtin/bundle.c +#: builtin/bundle.c:24 msgid "git bundle list-heads [...]" msgstr "git bundle list-heads <文件> [<引用名>...]" -#: builtin/bundle.c +#: builtin/bundle.c:26 msgid "git bundle unbundle [--progress] [...]" msgstr "git bundle unbundle [--progress] <文件> [<引用名>...]" -#: builtin/bundle.c +#: builtin/bundle.c:65 msgid "need a argument" msgstr "需要一个 <文件> 参数" -#: builtin/bundle.c builtin/pack-objects.c +#: builtin/bundle.c:76 builtin/pack-objects.c:4301 msgid "do not show progress meter" msgstr "不显示进度表" -#: builtin/bundle.c builtin/pack-objects.c +#: builtin/bundle.c:79 builtin/bundle.c:200 builtin/pack-objects.c:4304 msgid "show progress meter" msgstr "显示进度表" -#: builtin/bundle.c +#: builtin/bundle.c:82 msgid "historical; same as --progress" msgstr "老的参数；等同于 --progress" -#: builtin/bundle.c +#: builtin/bundle.c:85 msgid "historical; does nothing" msgstr "老的参数；无作用" -#: builtin/bundle.c +#: builtin/bundle.c:88 msgid "specify bundle format version" msgstr "指定归档包的格式版本" -#: builtin/bundle.c +#: builtin/bundle.c:102 msgid "Need a repository to create a bundle." msgstr "需要一个仓库来创建归档包。" -#: builtin/bundle.c +#: builtin/bundle.c:133 msgid "do not show bundle details" msgstr "不显示归档包的细节" -#: builtin/bundle.c +#: builtin/bundle.c:144 bundle.c:231 +msgid "need a repository to verify a bundle" +msgstr "需要一个仓库来校验一个归档包" + +#: builtin/bundle.c:159 #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" -#: builtin/bundle.c +#: builtin/bundle.c:215 msgid "Need a repository to unbundle." msgstr "需要一个仓库来解开归档包。" -#: builtin/bundle.c +#: builtin/bundle.c:218 msgid "Unbundling objects" msgstr "解包对象中" -#: builtin/cat-file.c merge-recursive.c +#: builtin/cat-file.c:73 merge-recursive.c:967 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" -#: builtin/cat-file.c +#: builtin/cat-file.c:679 msgid "flush is only for --buffer mode" msgstr "flush 只在 --buffer 模式中使用" -#: builtin/cat-file.c +#: builtin/cat-file.c:723 msgid "empty command in input" msgstr "输入为空的命令" -#: builtin/cat-file.c +#: builtin/cat-file.c:725 #, c-format msgid "whitespace before command: '%s'" msgstr "命令前存在空白：'%s'" -#: builtin/cat-file.c +#: builtin/cat-file.c:734 #, c-format msgid "%s requires arguments" msgstr "%s 需要参数" -#: builtin/cat-file.c +#: builtin/cat-file.c:739 #, c-format msgid "%s takes no arguments" msgstr "%s 不需要参数" -#: builtin/cat-file.c +#: builtin/cat-file.c:907 msgid "only one batch option may be specified" msgstr "只能指定一个批处理选项" -#: builtin/cat-file.c +#: builtin/cat-file.c:938 msgid "git cat-file " msgstr "git cat-file <类型> <对象>" -#: builtin/cat-file.c +#: builtin/cat-file.c:939 msgid "git cat-file (-e | -p) " msgstr "git cat-file (-e | -p) <对象>" -#: builtin/cat-file.c +#: builtin/cat-file.c:940 msgid "git cat-file (-t | -s) [--allow-unknown-type] " msgstr "git cat-file (-t | -s) [--allow-unknown-type] <对象>" -#: builtin/cat-file.c +#: builtin/cat-file.c:941 msgid "" "git cat-file (--textconv | --filters)\n" " [: | --path= ]" @@ -4089,7 +4184,7 @@ msgstr "" "git cat-file (--textconv | --filters)\n" " [<版本>:<路径|树对象> | --path=<路径|树对象> <版本>]" -#: builtin/cat-file.c +#: builtin/cat-file.c:943 msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" @@ -4101,402 +4196,410 @@ msgstr "" " [--buffer] [--follow-symlinks] [--unordered]\n" " [--textconv | --filters] [-Z]" -#: builtin/cat-file.c +#: builtin/cat-file.c:950 msgid "Check object existence or emit object contents" msgstr "检查对象存在或输出对象内容" -#: builtin/cat-file.c +#: builtin/cat-file.c:952 msgid "check if exists" msgstr "检查 <对象> 是否存在" -#: builtin/cat-file.c +#: builtin/cat-file.c:953 msgid "pretty-print content" msgstr "美观地打印 <对象> 的内容" -#: builtin/cat-file.c +#: builtin/cat-file.c:955 msgid "Emit [broken] object attributes" msgstr "输出 [坏的] 对象属性" -#: builtin/cat-file.c +#: builtin/cat-file.c:956 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" msgstr "显示对象的类型（'blob'、'tree'、'commit'、'tag'……其中之一）" -#: builtin/cat-file.c +#: builtin/cat-file.c:957 msgid "show object size" msgstr "显示对象大小" -#: builtin/cat-file.c +#: builtin/cat-file.c:959 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允许 -s 和 -t 对损坏的对象生效" -#: builtin/cat-file.c builtin/log.c +#: builtin/cat-file.c:960 builtin/log.c:267 msgid "use mail map file" msgstr "使用邮件映射文件" -#: builtin/cat-file.c +#: builtin/cat-file.c:963 msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "批量处理标准输入中请求的对象（或者 --batch-all-objects）" -#: builtin/cat-file.c +#: builtin/cat-file.c:965 msgid "show full or contents" msgstr "显示完整的 <对象> 或 <版本> 内容" -#: builtin/cat-file.c +#: builtin/cat-file.c:969 msgid "like --batch, but don't emit " msgstr "类似于 --batch，但不输出 <内容>" -#: builtin/cat-file.c +#: builtin/cat-file.c:972 msgid "stdin is NUL-terminated" msgstr "标准输入以 NUL 字符分隔" -#: builtin/cat-file.c +#: builtin/cat-file.c:974 msgid "stdin and stdout is NUL-terminated" msgstr "标准输入和标准输出以 NUL 字符分隔" -#: builtin/cat-file.c +#: builtin/cat-file.c:976 msgid "read commands from stdin" msgstr "从标准输入读取命令" -#: builtin/cat-file.c +#: builtin/cat-file.c:980 msgid "with --batch[-check]: ignores stdin, batches all known objects" msgstr "带有 --batch[-check]：忽略标准输入，批量处理所有已知的对象" -#: builtin/cat-file.c +#: builtin/cat-file.c:982 msgid "Change or optimize batch output" msgstr "更改或优化批处理输出" -#: builtin/cat-file.c +#: builtin/cat-file.c:983 msgid "buffer --batch output" msgstr "缓冲 --batch 的输出" -#: builtin/cat-file.c +#: builtin/cat-file.c:985 msgid "follow in-tree symlinks" msgstr "跟随树内符号链接" -#: builtin/cat-file.c +#: builtin/cat-file.c:987 msgid "do not order objects before emitting them" msgstr "在输出对象前不要排序" -#: builtin/cat-file.c +#: builtin/cat-file.c:989 msgid "" "Emit object (blob or tree) with conversion or filter (stand-alone, or with " "batch)" msgstr "转换或过滤后输出对象（数据对象或树）（单独或批处理）" -#: builtin/cat-file.c +#: builtin/cat-file.c:991 msgid "run textconv on object's content" msgstr "对对象内容做文本转换" -#: builtin/cat-file.c +#: builtin/cat-file.c:993 msgid "run filters on object's content" msgstr "对对象内容做过滤" -#: builtin/cat-file.c +#: builtin/cat-file.c:994 msgid "blob|tree" msgstr "数据对象|树" -#: builtin/cat-file.c +#: builtin/cat-file.c:995 msgid "use a for (--textconv | --filters); Not with 'batch'" msgstr "(--textconv | --filters) 使用 <路径>；而不是 'batch'" -#: builtin/cat-file.c +#: builtin/cat-file.c:1016 #, c-format msgid "'%s=<%s>' needs '%s' or '%s'" msgstr "'%s=<%s>' 需要 '%s' 或 '%s'" -#: builtin/cat-file.c +#: builtin/cat-file.c:1018 msgid "path|tree-ish" msgstr "路径|树对象" -#: builtin/cat-file.c +#: builtin/cat-file.c:1025 builtin/cat-file.c:1028 builtin/cat-file.c:1031 +#: builtin/cat-file.c:1034 builtin/cat-file.c:1037 #, c-format msgid "'%s' requires a batch mode" msgstr "'%s' 需要批处理模式" -#: builtin/cat-file.c +#: builtin/cat-file.c:1055 #, c-format msgid "'-%c' is incompatible with batch mode" msgstr "'-%c' 与批处理模式不兼容" -#: builtin/cat-file.c +#: builtin/cat-file.c:1058 msgid "batch modes take no arguments" msgstr "批处理模式不带其他参数" -#: builtin/cat-file.c +#: builtin/cat-file.c:1066 builtin/cat-file.c:1069 #, c-format msgid " required with '%s'" msgstr "'%s' 需要 <版本>" -#: builtin/cat-file.c +#: builtin/cat-file.c:1072 #, c-format msgid " required with '-%c'" msgstr "'-%c' 需要 <对象>" -#: builtin/cat-file.c +#: builtin/cat-file.c:1081 #, c-format msgid "only two arguments allowed in mode, not %d" msgstr "<类型> <对象> 模式只允许两个参数，而不是 %d 个" -#: builtin/check-attr.c +#: builtin/check-attr.c:18 msgid "" "git check-attr [--source ] [-a | --all | ...] [--] " "..." msgstr "" "git check-attr [--source <树对象>] [-a | --all | <属性>...] [--] <路径名>..." -#: builtin/check-attr.c +#: builtin/check-attr.c:19 msgid "" "git check-attr --stdin [-z] [--source ] [-a | --all | ...]" msgstr "" "git check-attr --stdin [-z] [--source <树对象>] [-a | --all | <属性>...]" -#: builtin/check-attr.c +#: builtin/check-attr.c:26 msgid "report all attributes set on file" msgstr "报告设置在文件上的所有属性" -#: builtin/check-attr.c +#: builtin/check-attr.c:27 msgid "use .gitattributes only from the index" msgstr "只使用索引中的 .gitattributes" -#: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c +#: builtin/check-attr.c:28 builtin/check-ignore.c:26 builtin/hash-object.c:109 msgid "read file names from stdin" msgstr "从标准输入读出文件名" -#: builtin/check-attr.c builtin/check-ignore.c +#: builtin/check-attr.c:30 builtin/check-ignore.c:28 msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-attr.c +#: builtin/check-attr.c:31 msgid "" msgstr "<树对象>" -#: builtin/check-attr.c +#: builtin/check-attr.c:31 msgid "which tree-ish to check attributes at" msgstr "要用哪一个树对象来检查属性" -#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c +#: builtin/check-ignore.c:22 builtin/checkout.c:1676 builtin/gc.c:626 +#: builtin/worktree.c:790 msgid "suppress progress reporting" msgstr "不显示进度报告" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:30 msgid "show non-matching input paths" msgstr "显示未匹配的输入路径" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:32 msgid "ignore index when checking" msgstr "检查时忽略索引" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:166 msgid "cannot specify pathnames with --stdin" msgstr "不能同时指定路径及 --stdin 参数" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:169 msgid "-z only makes sense with --stdin" msgstr "-z 需要和 --stdin 参数共用才有意义" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:171 msgid "no path specified" msgstr "未指定路径" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:175 msgid "--quiet is only valid with a single pathname" msgstr "参数 --quiet 只在提供一个路径名时有效" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:177 msgid "cannot have both --quiet and --verbose" msgstr "不能同时提供 --quiet 和 --verbose 参数" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:180 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 选项只在使用 --verbose 时有效" -#: builtin/check-mailmap.c +#: builtin/check-mailmap.c:13 msgid "git check-mailmap [] ..." msgstr "git check-mailmap [<选项>] <联系地址>..." -#: builtin/check-mailmap.c +#: builtin/check-mailmap.c:18 msgid "also read contacts from stdin" msgstr "还从标准输入读取联系地址" -#: builtin/check-mailmap.c +#: builtin/check-mailmap.c:29 #, c-format msgid "unable to parse contact: %s" msgstr "不能解析联系地址：%s" -#: builtin/check-mailmap.c +#: builtin/check-mailmap.c:52 msgid "no contacts specified" msgstr "未指定联系地址" -#: builtin/checkout--worker.c +#: builtin/checkout--worker.c:112 msgid "git checkout--worker []" msgstr "git checkout--worker [<选项>]" -#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c -#: builtin/submodule--helper.c builtin/worktree.c +#: builtin/checkout--worker.c:120 builtin/checkout-index.c:240 +#: builtin/column.c:32 builtin/column.c:33 builtin/submodule--helper.c:1844 +#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:1855 +#: builtin/worktree.c:788 builtin/worktree.c:1087 msgid "string" msgstr "字符串" -#: builtin/checkout--worker.c builtin/checkout-index.c +#: builtin/checkout--worker.c:121 builtin/checkout-index.c:241 msgid "when creating files, prepend " msgstr "在创建文件时，在前面加上 <字符串>" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:188 msgid "git checkout-index [] [--] [...]" msgstr "git checkout-index [<选项>] [--] [<文件>...]" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:206 msgid "stage should be between 1 and 3 or all" msgstr "索引值应该取值 1 到 3 或者 all" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:224 msgid "check out all files in the index" msgstr "检出索引区的所有文件" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:226 msgid "do not skip files with skip-worktree set" msgstr "在 skip-worktree 设置时不要跳过文件" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:227 msgid "force overwrite of existing files" msgstr "强制覆盖现有的文件" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:229 msgid "no warning for existing files and files not in index" msgstr "存在或不在索引中的文件都没有警告" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:231 msgid "don't checkout new files" msgstr "不检出新文件" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:233 msgid "update stat information in the index file" msgstr "更新索引中文件的状态信息" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:237 msgid "read list of paths from the standard input" msgstr "从标准输入读取路径列表" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:239 msgid "write the content to temporary files" msgstr "将内容写入临时文件" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:243 msgid "copy out the files from named stage" msgstr "从指定暂存区中拷出文件" -#: builtin/checkout.c +#: builtin/checkout.c:42 msgid "git checkout [] " msgstr "git checkout [<选项>] <分支>" -#: builtin/checkout.c +#: builtin/checkout.c:43 msgid "git checkout [] [] -- ..." msgstr "git checkout [<选项>] [<分支>] -- <文件>..." -#: builtin/checkout.c +#: builtin/checkout.c:48 msgid "git switch [] []" msgstr "git switch [<选项>] [<分支>]" -#: builtin/checkout.c +#: builtin/checkout.c:53 msgid "git restore [] [--source=] ..." msgstr "git restore [<选项>] [--source=<分支>] <文件>..." -#: builtin/checkout.c +#: builtin/checkout.c:210 builtin/checkout.c:249 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" -#: builtin/checkout.c +#: builtin/checkout.c:212 builtin/checkout.c:251 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" -#: builtin/checkout.c +#: builtin/checkout.c:228 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必需的版本" -#: builtin/checkout.c +#: builtin/checkout.c:283 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必需的版本" -#: builtin/checkout.c +#: builtin/checkout.c:303 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：无法合并" -#: builtin/checkout.c +#: builtin/checkout.c:319 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c +#: builtin/checkout.c:437 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新创建了 %d 个合并冲突" msgstr[1] "重新创建了 %d 个合并冲突" -#: builtin/checkout.c +#: builtin/checkout.c:442 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "从 %2$s 更新了 %1$d 个路径" msgstr[1] "从 %2$s 更新了 %1$d 个路径" -#: builtin/checkout.c +#: builtin/checkout.c:449 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "从索引区更新了 %d 个路径" msgstr[1] "从索引区更新了 %d 个路径" -#: builtin/checkout.c +#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:478 +#: builtin/checkout.c:482 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路径时使用" -#: builtin/checkout.c +#: builtin/checkout.c:492 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" -#: builtin/checkout.c +#: builtin/checkout.c:496 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' 或 '%s' 都没有指定" -#: builtin/checkout.c +#: builtin/checkout.c:500 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 '%2$s' 时，必须使用 '%1$s'" -#: builtin/checkout.c +#: builtin/checkout.c:518 builtin/checkout.c:522 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' 或 '%s' 不能和 %s 一起使用" -#: builtin/checkout.c +#: builtin/checkout.c:532 #, c-format msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree" msgstr "'%s'、'%s' 或 '%s' 不能在检出一个树时使用" -#: builtin/checkout.c +#: builtin/checkout.c:605 builtin/checkout.c:612 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c builtin/grep.c builtin/merge-tree.c builtin/reset.c -#: merge-ort.c reset.c sequencer.c tree-walk.c +#: builtin/checkout.c:797 builtin/checkout.c:1267 builtin/checkout.c:1273 +#: builtin/grep.c:525 builtin/grep.c:668 builtin/grep.c:708 +#: builtin/merge-tree.c:449 builtin/merge-tree.c:454 builtin/merge-tree.c:459 +#: builtin/reset.c:120 merge-ort.c:5142 reset.c:168 sequencer.c:775 +#: sequencer.c:4047 tree-walk.c:95 #, c-format msgid "unable to read tree (%s)" msgstr "无法读取树（%s）" -#: builtin/checkout.c +#: builtin/checkout.c:813 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c +#: builtin/checkout.c:868 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -4505,51 +4608,51 @@ msgstr "" "不能继续，下列文件有暂存的修改：\n" "%s" -#: builtin/checkout.c +#: builtin/checkout.c:964 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能对 '%s' 执行 reflog 操作：%s\n" -#: builtin/checkout.c +#: builtin/checkout.c:1011 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c builtin/clone.c +#: builtin/checkout.c:1015 builtin/clone.c:676 builtin/clone.c:705 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c +#: builtin/checkout.c:1019 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c +#: builtin/checkout.c:1022 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c +#: builtin/checkout.c:1026 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c +#: builtin/checkout.c:1028 builtin/checkout.c:1481 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c +#: builtin/checkout.c:1030 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c +#: builtin/checkout.c:1083 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#: builtin/checkout.c +#: builtin/checkout.c:1089 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4570,7 +4673,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c +#: builtin/checkout.c:1108 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4597,19 +4700,19 @@ msgstr[1] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c +#: builtin/checkout.c:1144 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c +#: builtin/checkout.c:1148 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c +#: builtin/checkout.c:1193 builtin/checkout.c:1475 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c +#: builtin/checkout.c:1286 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -4618,7 +4721,7 @@ msgstr "" "'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n" "请使用 --（和可选的 --no-guess）来消除歧义" -#: builtin/checkout.c +#: builtin/checkout.c:1293 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -4637,56 +4740,56 @@ msgstr "" "如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n" "名称，可以在配置中设置 checkout.defaultRemote=origin。" -#: builtin/checkout.c +#: builtin/checkout.c:1303 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' 匹配多个（%d 个）远程跟踪分支" -#: builtin/checkout.c +#: builtin/checkout.c:1370 msgid "only one reference expected" msgstr "只期望一个引用" -#: builtin/checkout.c +#: builtin/checkout.c:1387 #, c-format msgid "only one reference expected, %d given." msgstr "应只有一个引用，却给出了 %d 个" -#: builtin/checkout.c builtin/worktree.c +#: builtin/checkout.c:1433 builtin/worktree.c:443 builtin/worktree.c:897 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" -#: builtin/checkout.c +#: builtin/checkout.c:1446 builtin/checkout.c:1872 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c +#: builtin/checkout.c:1497 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一个分支，得到标签 '%s'" -#: builtin/checkout.c +#: builtin/checkout.c:1499 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一个分支，得到远程分支 '%s'" -#: builtin/checkout.c +#: builtin/checkout.c:1501 builtin/checkout.c:1510 #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一个分支，得到 '%s'" -#: builtin/checkout.c +#: builtin/checkout.c:1504 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一个分支，得到提交 '%s'" -#: builtin/checkout.c +#: builtin/checkout.c:1513 msgid "" "If you want to detach HEAD at the commit, try again with the --detach option." msgstr "如果你在本提交分离头指针，使用 --detach 选项重试。" -#: builtin/checkout.c +#: builtin/checkout.c:1526 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -4694,7 +4797,7 @@ msgstr "" "不能在合并时切换分支\n" "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c +#: builtin/checkout.c:1530 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -4702,7 +4805,7 @@ msgstr "" "不能在一个 am 会话期间切换分支\n" "考虑使用 \"git am --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c +#: builtin/checkout.c:1534 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -4710,7 +4813,7 @@ msgstr "" "不能在变基时切换分支\n" "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c +#: builtin/checkout.c:1538 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -4718,7 +4821,7 @@ msgstr "" "不能在拣选时切换分支\n" "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c +#: builtin/checkout.c:1542 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -4726,242 +4829,246 @@ msgstr "" "不能在还原时切换分支\n" "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c +#: builtin/checkout.c:1546 msgid "you are switching branch while bisecting" msgstr "您在执行二分查找时切换分支" -#: builtin/checkout.c +#: builtin/checkout.c:1576 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c +#: builtin/checkout.c:1579 builtin/checkout.c:1583 builtin/checkout.c:1587 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c +#: builtin/checkout.c:1591 builtin/checkout.c:1594 builtin/checkout.c:1597 +#: builtin/checkout.c:1602 builtin/checkout.c:1607 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c +#: builtin/checkout.c:1604 #, c-format msgid "'%s' cannot take " msgstr "'%s' 不带 <起始点>" -#: builtin/checkout.c +#: builtin/checkout.c:1612 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c +#: builtin/checkout.c:1619 msgid "missing branch or commit argument" msgstr "缺少分支或提交参数" -#: builtin/checkout.c +#: builtin/checkout.c:1664 #, c-format msgid "unknown conflict style '%s'" msgstr "未知的冲突风格 '%s'" -#: builtin/checkout.c +#: builtin/checkout.c:1681 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方合并" -#: builtin/checkout.c builtin/log.c parse-options.h +#: builtin/checkout.c:1682 builtin/log.c:2096 parse-options.h:542 msgid "style" msgstr "风格" -#: builtin/checkout.c +#: builtin/checkout.c:1683 msgid "conflict style (merge, diff3, or zdiff3)" msgstr "冲突输出风格（merge、diff3 或 zdiff3）" -#: builtin/checkout.c builtin/worktree.c +#: builtin/checkout.c:1696 builtin/worktree.c:785 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的提交分离" -#: builtin/checkout.c +#: builtin/checkout.c:1701 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c +#: builtin/checkout.c:1703 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c +#: builtin/checkout.c:1703 msgid "new unborn branch" msgstr "新的未诞生的分支" -#: builtin/checkout.c builtin/merge.c +#: builtin/checkout.c:1705 builtin/merge.c:290 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c +#: builtin/checkout.c:1708 msgid "do not check if another worktree is holding the given ref" msgstr "不检查指定的引用是否被其他工作区所占用" -#: builtin/checkout.c +#: builtin/checkout.c:1721 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c +#: builtin/checkout.c:1724 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c +#: builtin/checkout.c:1728 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c +#: builtin/checkout.c:1787 #, c-format msgid "options '-%c', '-%c', and '%s' cannot be used together" msgstr "选项 '-%c'、'-%c' 和 ‘%s' 不能同时使用" -#: builtin/checkout.c +#: builtin/checkout.c:1828 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c +#: builtin/checkout.c:1833 #, c-format msgid "missing branch name; try -%c" msgstr "缺少分支名，尝试 -%c" -#: builtin/checkout.c +#: builtin/checkout.c:1865 #, c-format msgid "could not resolve %s" msgstr "无法解析 %s" -#: builtin/checkout.c +#: builtin/checkout.c:1881 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c +#: builtin/checkout.c:1888 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'" -#: builtin/checkout.c +#: builtin/checkout.c:1892 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c +#: builtin/checkout.c:1917 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。" -#: builtin/checkout.c +#: builtin/checkout.c:1922 msgid "you must specify path(s) to restore" msgstr "您必须指定要恢复的路径" -#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c -#: builtin/submodule--helper.c builtin/worktree.c +#: builtin/checkout.c:1954 builtin/checkout.c:1956 builtin/checkout.c:2001 +#: builtin/checkout.c:2003 builtin/clone.c:141 builtin/remote.c:174 +#: builtin/remote.c:176 builtin/replay.c:296 builtin/submodule--helper.c:3021 +#: builtin/submodule--helper.c:3367 builtin/worktree.c:780 +#: builtin/worktree.c:782 msgid "branch" msgstr "分支" -#: builtin/checkout.c +#: builtin/checkout.c:1955 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c +#: builtin/checkout.c:1957 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c +#: builtin/checkout.c:1958 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c +#: builtin/checkout.c:1960 msgid "second guess 'git checkout ' (default)" msgstr "二次猜测 'git checkout <无此分支>'（默认）" -#: builtin/checkout.c +#: builtin/checkout.c:1961 msgid "use overlay mode (default)" msgstr "使用叠加模式（默认）" -#: builtin/checkout.c +#: builtin/checkout.c:2002 msgid "create and switch to a new branch" msgstr "创建并切换一个新分支" -#: builtin/checkout.c +#: builtin/checkout.c:2004 msgid "create/reset and switch to a branch" msgstr "创建/重置并切换一个分支" -#: builtin/checkout.c +#: builtin/checkout.c:2006 msgid "second guess 'git switch '" msgstr "二次猜测 'git switch <无此分支>'" -#: builtin/checkout.c +#: builtin/checkout.c:2008 msgid "throw away local modifications" msgstr "丢弃本地修改" -#: builtin/checkout.c +#: builtin/checkout.c:2038 msgid "which tree-ish to checkout from" msgstr "要检出哪一个树" -#: builtin/checkout.c +#: builtin/checkout.c:2040 msgid "restore the index" msgstr "恢复索引" -#: builtin/checkout.c +#: builtin/checkout.c:2042 msgid "restore the working tree (default)" msgstr "恢复工作区（默认）" -#: builtin/checkout.c +#: builtin/checkout.c:2044 msgid "ignore unmerged entries" msgstr "忽略未合并条目" -#: builtin/checkout.c +#: builtin/checkout.c:2045 msgid "use overlay mode" msgstr "使用叠加模式" -#: builtin/clean.c +#: builtin/clean.c:33 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] " "[...]" msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径规格>..." -#: builtin/clean.c +#: builtin/clean.c:37 #, c-format msgid "Removing %s\n" msgstr "正删除 %s\n" -#: builtin/clean.c +#: builtin/clean.c:38 #, c-format msgid "Would remove %s\n" msgstr "将删除 %s\n" -#: builtin/clean.c +#: builtin/clean.c:39 #, c-format msgid "Skipping repository %s\n" msgstr "忽略仓库 %s\n" -#: builtin/clean.c +#: builtin/clean.c:40 #, c-format msgid "Would skip repository %s\n" msgstr "将忽略仓库 %s\n" -#: builtin/clean.c midx.c +#: builtin/clean.c:41 midx.c:513 #, c-format msgid "failed to remove %s" msgstr "无法删除 %s" -#: builtin/clean.c +#: builtin/clean.c:42 #, c-format msgid "could not lstat %s\n" msgstr "不能对 %s 调用 lstat\n" -#: builtin/clean.c +#: builtin/clean.c:43 msgid "Refusing to remove current working directory\n" msgstr "拒绝删除当前工作目录\n" -#: builtin/clean.c +#: builtin/clean.c:44 msgid "Would refuse to remove current working directory\n" msgstr "将拒绝删除当前工作目录\n" -#: builtin/clean.c +#: builtin/clean.c:333 #, c-format msgid "" "Prompt help:\n" @@ -4974,7 +5081,7 @@ msgstr "" "foo - 通过唯一前缀选择一个选项\n" " - （空）什么也不选择\n" -#: builtin/clean.c +#: builtin/clean.c:337 #, c-format msgid "" "Prompt help:\n" @@ -4995,32 +5102,32 @@ msgstr "" "* - 选择所有选项\n" " - （空）结束选择\n" -#: builtin/clean.c +#: builtin/clean.c:552 #, c-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" -#: builtin/clean.c +#: builtin/clean.c:692 #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除条目>> " -#: builtin/clean.c +#: builtin/clean.c:726 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：无法找到和 %s 匹配的条目" -#: builtin/clean.c +#: builtin/clean.c:747 msgid "Select items to delete" msgstr "选择要删除的条目" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c +#: builtin/clean.c:788 #, c-format msgid "Remove %s [y/N]? " msgstr "删除 %s [y/N]？" -#: builtin/clean.c +#: builtin/clean.c:819 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -5038,271 +5145,291 @@ msgstr "" "help - 显示本帮助\n" "? - 显示如何在提示符下选择的帮助" -#: builtin/clean.c +#: builtin/clean.c:855 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "将删除如下条目：" msgstr[1] "将删除如下条目：" -#: builtin/clean.c +#: builtin/clean.c:871 msgid "No more files to clean, exiting." msgstr "没有要清理的文件，退出。" -#: builtin/clean.c +#: builtin/clean.c:933 msgid "do not print names of files removed" msgstr "不打印删除文件的名称" -#: builtin/clean.c +#: builtin/clean.c:935 msgid "force" msgstr "强制" -#: builtin/clean.c +#: builtin/clean.c:936 msgid "interactive cleaning" msgstr "交互式清除" -#: builtin/clean.c +#: builtin/clean.c:938 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/pack-refs.c builtin/show-ref.c -#: ref-filter.h +#: builtin/clean.c:939 builtin/config.c:876 builtin/config.c:929 +#: builtin/config.c:985 builtin/describe.c:589 builtin/describe.c:591 +#: builtin/grep.c:994 builtin/log.c:274 builtin/log.c:276 +#: builtin/ls-files.c:607 builtin/name-rev.c:570 builtin/name-rev.c:572 +#: builtin/pack-refs.c:32 builtin/pack-refs.c:34 builtin/show-ref.c:316 +#: ref-filter.h:133 msgid "pattern" msgstr "模式" -#: builtin/clean.c +#: builtin/clean.c:940 msgid "add to ignore rules" msgstr "添加 <模式> 到忽略规则" -#: builtin/clean.c +#: builtin/clean.c:941 msgid "remove ignored files, too" msgstr "也删除忽略的文件" -#: builtin/clean.c +#: builtin/clean.c:943 msgid "remove only ignored files" msgstr "只删除忽略的文件" -#: builtin/clean.c +#: builtin/clean.c:953 msgid "clean.requireForce is true and -f not given: refusing to clean" msgstr "clean.requireForce 设置为 true 且未提供 -f 选项：拒绝执行清理动作" -#: builtin/clone.c +#: builtin/clone.c:56 msgid "git clone [] [--] []" msgstr "git clone [<选项>] [--] <仓库> [<路径>]" -#: builtin/clone.c +#: builtin/clone.c:111 msgid "don't clone shallow repository" msgstr "不克隆浅仓库" -#: builtin/clone.c +#: builtin/clone.c:113 msgid "don't create a checkout" msgstr "不创建一个检出" -#: builtin/clone.c builtin/init-db.c +#: builtin/clone.c:114 builtin/clone.c:116 builtin/init-db.c:90 msgid "create a bare repository" msgstr "创建一个纯仓库" -#: builtin/clone.c +#: builtin/clone.c:118 msgid "create a mirror repository (implies --bare)" msgstr "创建一个镜像仓库（隐含 --bare）" -#: builtin/clone.c +#: builtin/clone.c:120 msgid "to clone from a local repository" msgstr "从本地仓库克隆" -#: builtin/clone.c +#: builtin/clone.c:122 msgid "don't use local hardlinks, always copy" msgstr "不使用本地硬链接，始终复制" -#: builtin/clone.c +#: builtin/clone.c:124 msgid "setup as shared repository" msgstr "设置为共享仓库" -#: builtin/clone.c +#: builtin/clone.c:126 msgid "pathspec" msgstr "路径规格" -#: builtin/clone.c +#: builtin/clone.c:126 msgid "initialize submodules in the clone" msgstr "在克隆时初始化子模组" -#: builtin/clone.c +#: builtin/clone.c:130 msgid "number of submodules cloned in parallel" msgstr "并发克隆的子模组的数量" -#: builtin/clone.c builtin/init-db.c +#: builtin/clone.c:131 builtin/init-db.c:87 msgid "template-directory" msgstr "模板目录" -#: builtin/clone.c builtin/init-db.c +#: builtin/clone.c:132 builtin/init-db.c:88 msgid "directory from which templates will be used" msgstr "模板目录将被使用" -#: builtin/clone.c builtin/submodule--helper.c +#: builtin/clone.c:134 builtin/clone.c:136 builtin/submodule--helper.c:1851 +#: builtin/submodule--helper.c:2762 builtin/submodule--helper.c:3374 msgid "reference repository" msgstr "参考仓库" -#: builtin/clone.c builtin/submodule--helper.c +#: builtin/clone.c:138 builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:2764 msgid "use --reference only while cloning" msgstr "仅在克隆时参考 --reference 指向的本地仓库" -#: 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 +#: builtin/clone.c:139 builtin/column.c:28 builtin/fmt-merge-msg.c:28 +#: builtin/init-db.c:98 builtin/merge-file.c:82 builtin/merge.c:275 +#: builtin/pack-objects.c:4374 builtin/repack.c:1186 +#: builtin/submodule--helper.c:3376 t/helper/test-simple-ipc.c:596 +#: t/helper/test-simple-ipc.c:598 msgid "name" msgstr "名称" -#: builtin/clone.c +#: builtin/clone.c:140 msgid "use instead of 'origin' to track upstream" msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" -#: builtin/clone.c +#: builtin/clone.c:142 msgid "checkout instead of the remote's HEAD" msgstr "检出 <分支> 而不是远程 HEAD" -#: builtin/clone.c +#: builtin/clone.c:144 msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c builtin/fetch.c builtin/pull.c +#: builtin/clone.c:145 builtin/fetch.c:2208 builtin/pull.c:214 msgid "depth" msgstr "深度" -#: builtin/clone.c +#: builtin/clone.c:146 msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c +#: builtin/clone.c:148 msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" -#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c -#: builtin/replay.c +#: builtin/clone.c:149 builtin/fetch.c:2212 builtin/fetch.c:2235 +#: builtin/pull.c:220 builtin/pull.c:245 builtin/rebase.c:1088 +#: builtin/replay.c:299 msgid "revision" msgstr "版本" -#: builtin/clone.c builtin/fetch.c builtin/pull.c +#: builtin/clone.c:150 builtin/fetch.c:2213 builtin/pull.c:221 msgid "deepen history of shallow clone, excluding rev" msgstr "深化浅克隆的历史，除了特定版本" -#: builtin/clone.c builtin/submodule--helper.c +#: builtin/clone.c:152 builtin/submodule--helper.c:1863 +#: builtin/submodule--helper.c:2778 msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" -#: builtin/clone.c +#: builtin/clone.c:154 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "不要克隆任何标签，并且后续获取操作也不下载它们" -#: builtin/clone.c +#: builtin/clone.c:156 msgid "any cloned submodules will be shallow" msgstr "子模组将以浅下载模式克隆" -#: builtin/clone.c builtin/init-db.c +#: builtin/clone.c:157 builtin/init-db.c:96 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c builtin/init-db.c +#: builtin/clone.c:158 builtin/init-db.c:97 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" -#: builtin/clone.c builtin/init-db.c +#: builtin/clone.c:160 builtin/init-db.c:103 msgid "specify the reference format to use" msgstr "指定要使用的引用格式" -#: builtin/clone.c +#: builtin/clone.c:161 msgid "key=value" msgstr "key=value" -#: builtin/clone.c +#: builtin/clone.c:162 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 +#: builtin/clone.c:164 builtin/fetch.c:2233 builtin/ls-remote.c:84 +#: builtin/pull.c:236 builtin/push.c:595 builtin/send-pack.c:195 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 +#: builtin/clone.c:164 builtin/fetch.c:2233 builtin/ls-remote.c:84 +#: builtin/pull.c:237 builtin/push.c:595 builtin/send-pack.c:196 msgid "option to transmit" msgstr "传输选项" -#: builtin/clone.c +#: builtin/clone.c:168 msgid "apply partial clone filters to submodules" msgstr "对子模组使用部分克隆过滤器" -#: builtin/clone.c +#: builtin/clone.c:170 msgid "any cloned submodules will use their remote-tracking branch" msgstr "任何克隆的子模组将使用它们的远程跟踪分支" -#: builtin/clone.c +#: builtin/clone.c:172 msgid "initialize sparse-checkout file to include only files at root" msgstr "初始化稀疏检出文件，只包含根目录文件" -#: builtin/clone.c +#: builtin/clone.c:174 msgid "uri" msgstr "uri" -#: builtin/clone.c +#: builtin/clone.c:174 msgid "a URI for downloading bundles before fetching from origin remote" msgstr "用于在从 origin 远程获取之前下载归档包的 URI" -#: builtin/clone.c +#: builtin/clone.c:249 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: 不能为 '%s' 添加一个备用：%s\n" -#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c +#: builtin/clone.c:320 builtin/diff.c:93 builtin/rm.c:143 grep.c:1940 +#: setup.c:196 #, c-format msgid "failed to stat '%s'" msgstr "无法对 '%s' 调用 stat" -#: builtin/clone.c +#: builtin/clone.c:322 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" -#: builtin/clone.c +#: builtin/clone.c:356 #, c-format msgid "'%s' is a symlink, refusing to clone with --local" msgstr "'%s' 为符号链接，拒绝用 --local 克隆" -#: builtin/clone.c +#: builtin/clone.c:360 #, c-format msgid "failed to start iterator over '%s'" msgstr "无法在 '%s' 上启动迭代器" -#: builtin/clone.c +#: builtin/clone.c:375 #, c-format msgid "symlink '%s' exists, refusing to clone with --local" msgstr "符号链接 '%s' 存在，拒绝用 --local 克隆" -#: builtin/clone.c compat/precompose_utf8.c +#: builtin/clone.c:390 compat/precompose_utf8.c:62 #, c-format msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" -#: builtin/clone.c +#: builtin/clone.c:402 +#, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "无法检查 '%s' 处的硬链接" + +#: builtin/clone.c:409 +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "硬链接与 '%s' 处的源不同" + +#: builtin/clone.c:414 #, c-format msgid "failed to create link '%s'" msgstr "无法创建链接 '%s'" -#: builtin/clone.c +#: builtin/clone.c:418 #, c-format msgid "failed to copy file to '%s'" msgstr "无法拷贝文件至 '%s'" -#: builtin/clone.c +#: builtin/clone.c:423 #, c-format msgid "failed to iterate over '%s'" msgstr "无法在 '%s' 上迭代" -#: builtin/clone.c +#: builtin/clone.c:448 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c +#: builtin/clone.c:462 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -5312,215 +5439,216 @@ msgstr "" "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" "'git restore --source=HEAD :/' 重试\n" -#: builtin/clone.c +#: builtin/clone.c:543 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c fetch-pack.c +#: builtin/clone.c:648 fetch-pack.c:2099 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必需的对象" -#: builtin/clone.c +#: builtin/clone.c:664 #, c-format msgid "unable to update %s" msgstr "不能更新 %s" -#: builtin/clone.c +#: builtin/clone.c:725 msgid "failed to initialize sparse-checkout" msgstr "无法初始化稀疏检出" -#: builtin/clone.c +#: builtin/clone.c:748 msgid "remote HEAD refers to nonexistent ref, unable to checkout" msgstr "远程 HEAD 指向一个不存在的引用，无法检出" -#: builtin/clone.c +#: builtin/clone.c:784 msgid "unable to checkout working tree" msgstr "不能检出工作区" -#: builtin/clone.c +#: builtin/clone.c:874 msgid "unable to write parameters to config file" msgstr "无法将参数写入配置文件" -#: builtin/clone.c +#: builtin/clone.c:941 msgid "cannot repack to clean up" msgstr "无法执行 repack 来清理" -#: builtin/clone.c +#: builtin/clone.c:943 msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" -#: builtin/clone.c +#: builtin/clone.c:992 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c scalar.c +#: builtin/clone.c:996 scalar.c:456 msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" -#: builtin/clone.c builtin/init-db.c setup.c +#: builtin/clone.c:1007 builtin/init-db.c:170 builtin/refs.c:39 setup.c:2321 #, c-format msgid "unknown ref storage format '%s'" msgstr "未知的引用存储格式 '%s'" -#: builtin/clone.c +#: builtin/clone.c:1034 #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' 不存在" -#: builtin/clone.c builtin/fetch.c +#: builtin/clone.c:1038 builtin/fetch.c:2345 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" -#: builtin/clone.c +#: builtin/clone.c:1048 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c +#: builtin/clone.c:1054 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "仓库路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c +#: builtin/clone.c:1068 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c +#: builtin/clone.c:1083 builtin/clone.c:1104 builtin/difftool.c:267 +#: builtin/log.c:2301 builtin/worktree.c:455 builtin/worktree.c:487 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c +#: builtin/clone.c:1088 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能创建工作区目录 '%s'" -#: builtin/clone.c +#: builtin/clone.c:1108 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯仓库 '%s'...\n" -#: builtin/clone.c +#: builtin/clone.c:1110 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c +#: builtin/clone.c:1139 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" -#: builtin/clone.c builtin/remote.c +#: builtin/clone.c:1268 builtin/remote.c:204 builtin/remote.c:735 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一个有效的远程名称" -#: builtin/clone.c +#: builtin/clone.c:1302 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c +#: builtin/clone.c:1304 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c +#: builtin/clone.c:1306 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c +#: builtin/clone.c:1308 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c fetch-pack.c +#: builtin/clone.c:1311 fetch-pack.c:1217 fetch-pack.c:1570 msgid "source repository is shallow, reject to clone." msgstr "源仓库是浅克隆，拒绝克隆。" -#: builtin/clone.c +#: builtin/clone.c:1313 msgid "source repository is shallow, ignoring --local" msgstr "源仓库是浅克隆，忽略 --local" -#: builtin/clone.c +#: builtin/clone.c:1318 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c +#: builtin/clone.c:1334 msgid "cannot clone from filtered bundle" msgstr "无法从经过过滤的归档包克隆" -#: builtin/clone.c +#: builtin/clone.c:1401 builtin/clone.c:1418 msgid "failed to initialize the repo, skipping bundle URI" msgstr "无法初始化仓库，跳过归档包 URI" -#: builtin/clone.c +#: builtin/clone.c:1403 #, c-format msgid "failed to fetch objects from bundle URI '%s'" msgstr "无法从归档包 URI '%s' 获取对象" -#: builtin/clone.c +#: builtin/clone.c:1421 msgid "failed to fetch advertised bundles" msgstr "无法获取公布的归档包" -#: builtin/clone.c +#: builtin/clone.c:1450 builtin/clone.c:1510 msgid "remote transport reported error" msgstr "远程传输报告错误" -#: builtin/clone.c +#: builtin/clone.c:1460 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c +#: builtin/clone.c:1471 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" -#: builtin/column.c +#: builtin/column.c:10 msgid "git column []" msgstr "git column [<选项>]" -#: builtin/column.c +#: builtin/column.c:28 msgid "lookup config vars" msgstr "查找配置变量" -#: builtin/column.c +#: builtin/column.c:29 builtin/column.c:30 msgid "layout to use" msgstr "要使用的布局" -#: builtin/column.c +#: builtin/column.c:31 msgid "maximum width" msgstr "最大宽度" -#: builtin/column.c +#: builtin/column.c:32 msgid "padding space on left border" msgstr "左边框的填充空间" -#: builtin/column.c +#: builtin/column.c:33 msgid "padding space on right border" msgstr "右边框的填充空间" -#: builtin/column.c +#: builtin/column.c:34 msgid "padding space between columns" msgstr "两列之间的填充空间" -#: builtin/column.c +#: builtin/column.c:49 #, c-format msgid "%s must be non-negative" msgstr "%s 必须为非负整数" -#: builtin/column.c +#: builtin/column.c:54 msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:18 msgid "" "git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" msgstr "" "git commit-graph verify [--object-dir <目录>] [--shallow] [--[no-]progress]" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:21 msgid "" "git commit-graph write [--object-dir ] [--append]\n" " [--split[=]] [--reachable | --stdin-packs | " @@ -5536,101 +5664,102 @@ msgstr "" "[no-]progress]\n" " <切分选项>" -#: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c +#: builtin/commit-graph.c:56 builtin/fetch.c:2222 builtin/log.c:2065 +#: builtin/repack.c:1192 builtin/repack.c:1194 msgid "dir" msgstr "目录" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:57 msgid "the object directory to store the graph" msgstr "保存图形的对象目录" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:81 msgid "if the commit-graph is split, only verify the tip file" msgstr "如果提交图被拆分，只验证头一个文件" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:110 #, c-format msgid "Could not open commit-graph '%s'" msgstr "无法打开提交图 '%s'" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:114 #, c-format msgid "could not open commit-graph chain '%s'" msgstr "无法打开提交图链 '%s'" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:161 #, c-format msgid "unrecognized --split argument, %s" msgstr "未能识别的 --split 参数，%s" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:174 #, c-format msgid "unexpected non-hex object ID: %s" msgstr "意外的非十六进制对象 ID：%s" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:179 #, c-format msgid "invalid object: %s" msgstr "无效对象：%s" -#: builtin/commit-graph.c parse-options-cb.c +#: builtin/commit-graph.c:199 parse-options-cb.c:27 parse-options-cb.c:31 #, c-format msgid "option `%s' expects a numerical value" msgstr "选项 `%s' 期望一个数字值" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:230 msgid "start walk at all refs" msgstr "开始遍历所有引用" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:232 msgid "scan pack-indexes listed by stdin for commits" msgstr "从标准输入中的包索引文件列表中扫描提交" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:234 msgid "start walk at commits listed by stdin" msgstr "从标准输入中的提交开始扫描" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:236 msgid "include all commits already in the commit-graph file" msgstr "包含 commit-graph 文件中已有所有提交" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:238 msgid "enable computation for changed paths" msgstr "启用变更路径的计算" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:240 msgid "allow writing an incremental commit-graph file" msgstr "允许写一个增量提交图文件" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:244 msgid "maximum number of commits in a non-base split commit-graph" msgstr "在非基本拆分提交图中的最大提交数" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:246 msgid "maximum ratio between two levels of a split commit-graph" msgstr "一个拆分提交图的两个级别之间的最大比率" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:248 msgid "only expire files older than a given date-time" msgstr "只让早于给定时间的文件过期" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:250 msgid "maximum number of changed-path Bloom filters to compute" msgstr "要计算的变更路径布隆过滤器的最大数" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:276 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:307 msgid "Collecting commits from input" msgstr "正从标准输入收集提交" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:17 msgid "git commit-tree [(-p )...]" msgstr "git commit-tree <树> [(-p <父提交>)...]" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p )...] [-S[]] [(-m )...]\n" " [(-F )...] " @@ -5638,61 +5767,62 @@ msgstr "" "git commit-tree [(-p <父提交>)...] [-S[<私钥 ID>]] [(-m <消息>)...]\n" " [(-F <文件>)...] <树>" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:31 #, c-format msgid "duplicate parent %s ignored" msgstr "忽略重复的父提交 %s" -#: builtin/commit-tree.c builtin/log.c +#: builtin/commit-tree.c:48 builtin/commit-tree.c:127 builtin/log.c:697 #, c-format msgid "not a valid object name %s" msgstr "不是一个有效的对象名 %s" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:86 #, c-format msgid "git commit-tree: failed to read '%s'" msgstr "git commit-tree：无法读取 '%s'" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:88 #, c-format msgid "git commit-tree: failed to close '%s'" msgstr "git commit-tree：无法关闭 '%s'" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:101 msgid "parent" msgstr "父提交" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:102 msgid "id of a parent commit object" msgstr "父提交对象 ID" -#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c -#: builtin/stash.c builtin/tag.c +#: builtin/commit-tree.c:104 builtin/commit.c:1652 builtin/merge.c:269 +#: builtin/notes.c:484 builtin/notes.c:660 builtin/stash.c:1752 +#: builtin/tag.c:495 msgid "message" msgstr "说明" -#: builtin/commit-tree.c builtin/commit.c +#: builtin/commit-tree.c:105 builtin/commit.c:1652 msgid "commit message" msgstr "提交说明" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:108 msgid "read commit log message from file" msgstr "从文件中读取提交说明" -#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c -#: builtin/revert.c +#: builtin/commit-tree.c:111 builtin/commit.c:1669 builtin/merge.c:288 +#: builtin/pull.c:182 builtin/revert.c:132 msgid "GPG sign commit" msgstr "GPG 提交签名" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:124 msgid "must give exactly one tree" msgstr "必须精确地提供一个树" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:131 msgid "git commit-tree: failed to read" msgstr "git commit-tree：无法读取" -#: builtin/commit.c +#: builtin/commit.c:43 msgid "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" @@ -5714,11 +5844,11 @@ msgstr "" " [(--trailer <键>[(=|:)<值>])...] [-S[<私钥 ID>]]\n" " [--] [<路径规格>...]" -#: builtin/commit.c +#: builtin/commit.c:55 msgid "git status [] [--] [...]" msgstr "git status [<选项>] [--] [<路径规格>...]" -#: builtin/commit.c +#: builtin/commit.c:60 msgid "" "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" @@ -5727,7 +5857,7 @@ msgstr "" "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" -#: builtin/commit.c +#: builtin/commit.c:65 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -5741,15 +5871,15 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c +#: builtin/commit.c:72 msgid "Otherwise, please use 'git rebase --skip'\n" msgstr "否则，请使用 'git rebase --skip'\n" -#: builtin/commit.c +#: builtin/commit.c:75 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "否则，请使用 'git cherry-pick --skip'\n" -#: builtin/commit.c +#: builtin/commit.c:78 msgid "" "and then use:\n" "\n" @@ -5770,128 +5900,129 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c read-cache.c +#: builtin/commit.c:299 read-cache.c:3916 msgid "updating files failed" msgstr "更新文件失败" -#: builtin/commit.c +#: builtin/commit.c:326 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" -#: builtin/commit.c +#: builtin/commit.c:377 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c +#: builtin/commit.c:390 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c +#: builtin/commit.c:399 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c +#: builtin/commit.c:415 msgid "unable to update temporary index" msgstr "无法更新临时索引" -#: builtin/commit.c +#: builtin/commit.c:417 msgid "Failed to update main cache tree" msgstr "不能更新树的主缓存" -#: builtin/commit.c +#: builtin/commit.c:502 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c +#: builtin/commit.c:504 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c +#: builtin/commit.c:506 msgid "cannot do a partial commit during a rebase." msgstr "在变基过程中不能做部分提交。" -#: builtin/commit.c +#: builtin/commit.c:514 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c +#: builtin/commit.c:533 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c +#: builtin/commit.c:631 #, c-format msgid "commit '%s' lacks author header" msgstr "提交 '%s' 缺少作者信息" -#: builtin/commit.c +#: builtin/commit.c:633 #, c-format msgid "commit '%s' has malformed author line" msgstr "提交 '%s' 有格式错误的作者信息" -#: builtin/commit.c +#: builtin/commit.c:652 msgid "malformed --author parameter" msgstr "格式错误的 --author 参数" -#: builtin/commit.c ident.c +#: builtin/commit.c:660 ident.c:531 #, c-format msgid "invalid date format: %s" msgstr "无效的日期格式：%s" -#: builtin/commit.c +#: builtin/commit.c:706 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: builtin/commit.c +#: builtin/commit.c:761 builtin/commit.c:796 builtin/commit.c:1200 #, c-format msgid "could not lookup commit '%s'" msgstr "不能查询提交 '%s'" -#: builtin/commit.c builtin/shortlog.c +#: builtin/commit.c:774 builtin/shortlog.c:457 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c +#: builtin/commit.c:776 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c +#: builtin/commit.c:780 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c +#: builtin/commit.c:818 #, c-format msgid "options '%s' and '%s:%s' cannot be used together" msgstr "选项 '%s' 和 '%s:%s' 不能同时使用" -#: builtin/commit.c +#: builtin/commit.c:830 builtin/commit.c:846 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c +#: builtin/commit.c:837 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c bundle.c rerere.c sequencer.c +#: builtin/commit.c:878 bundle.c:152 rerere.c:476 rerere.c:687 sequencer.c:2905 +#: sequencer.c:3691 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" -#: builtin/commit.c +#: builtin/commit.c:897 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c +#: builtin/commit.c:910 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%s' will be ignored.\n" msgstr "请为您的变更输入提交说明。以 '%s' 开始的行将被忽略。\n" -#: builtin/commit.c +#: builtin/commit.c:912 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5900,7 +6031,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%s' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c +#: builtin/commit.c:916 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5909,7 +6040,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%s' 开始的行将被保留，如果您愿意\n" "也可以删除它们。\n" -#: builtin/commit.c +#: builtin/commit.c:920 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5919,7 +6050,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%s' 开始的行将被保留，如果您愿意\n" "也可以删除它们。一个空的提交说明将会终止提交。\n" -#: builtin/commit.c +#: builtin/commit.c:931 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -5932,7 +6063,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "然后重试。\n" -#: builtin/commit.c +#: builtin/commit.c:936 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -5946,344 +6077,346 @@ msgstr "" "然后重试。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c +#: builtin/commit.c:963 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c +#: builtin/commit.c:971 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c +#: builtin/commit.c:978 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c +#: builtin/commit.c:996 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c +#: builtin/commit.c:1035 builtin/tag.c:348 msgid "unable to pass trailers to --trailers" msgstr "无法将尾注传递给 --trailers" -#: builtin/commit.c +#: builtin/commit.c:1075 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c builtin/tag.c +#: builtin/commit.c:1089 builtin/tag.c:353 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c +#: builtin/commit.c:1135 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配" -#: builtin/commit.c +#: builtin/commit.c:1149 #, c-format msgid "Invalid ignored mode '%s'" msgstr "无效的忽略模式 '%s'" -#: builtin/commit.c +#: builtin/commit.c:1188 builtin/commit.c:1477 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未跟踪文件参数 '%s'" -#: builtin/commit.c +#: builtin/commit.c:1261 msgid "You are in the middle of a merge -- cannot reword." msgstr "您正处于一个合并过程中 -- 无法改写说明。" -#: builtin/commit.c +#: builtin/commit.c:1263 msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "您正处于一个拣选过程中 -- 无法改写说明。" -#: builtin/commit.c +#: builtin/commit.c:1266 #, c-format msgid "reword option of '%s' and path '%s' cannot be used together" msgstr "改写说明选项 '%s' 和路径 '%s' 不能同时使用" -#: builtin/commit.c +#: builtin/commit.c:1268 #, c-format msgid "reword option of '%s' and '%s' cannot be used together" msgstr "改写说明选项 '%s' 和 '%s' 不能同时使用" -#: builtin/commit.c +#: builtin/commit.c:1293 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c +#: builtin/commit.c:1296 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c +#: builtin/commit.c:1298 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c +#: builtin/commit.c:1300 msgid "You are in the middle of a rebase -- cannot amend." msgstr "您正处于一个变基过程中 -- 无法修补提交。" -#: builtin/commit.c +#: builtin/commit.c:1320 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c +#: builtin/commit.c:1367 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "未知选项：--fixup=%s:%s" -#: builtin/commit.c +#: builtin/commit.c:1384 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" -#: builtin/commit.c +#: builtin/commit.c:1513 builtin/commit.c:1680 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c +#: builtin/commit.c:1515 builtin/commit.c:1682 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c +#: builtin/commit.c:1517 msgid "show stash information" msgstr "显示贮藏区信息" -#: builtin/commit.c +#: builtin/commit.c:1519 builtin/commit.c:1684 msgid "compute full ahead/behind values" msgstr "计算完整的领先/落后值" -#: builtin/commit.c +#: builtin/commit.c:1521 msgid "version" msgstr "版本" -#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c +#: builtin/commit.c:1521 builtin/commit.c:1686 builtin/fetch.c:2201 +#: builtin/push.c:571 builtin/worktree.c:1044 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c +#: builtin/commit.c:1524 builtin/commit.c:1688 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c +#: builtin/commit.c:1527 builtin/commit.c:1691 msgid "terminate entries with NUL" msgstr "条目以 NUL 字符结尾" -#: builtin/commit.c +#: builtin/commit.c:1530 builtin/commit.c:1694 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c +#: builtin/commit.c:1534 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" "显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）" -#: builtin/commit.c parse-options.h +#: builtin/commit.c:1536 parse-options.h:338 msgid "when" msgstr "何时" -#: builtin/commit.c +#: builtin/commit.c:1537 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c +#: builtin/commit.c:1539 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c +#: builtin/commit.c:1540 msgid "do not detect renames" msgstr "不检测重命名" -#: builtin/commit.c +#: builtin/commit.c:1542 msgid "detect renames, optionally set similarity index" msgstr "检测重命名，可以设置索引相似度" -#: builtin/commit.c +#: builtin/commit.c:1565 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支持已忽略和未跟踪文件参数的组合" -#: builtin/commit.c +#: builtin/commit.c:1645 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c +#: builtin/commit.c:1646 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c +#: builtin/commit.c:1648 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c builtin/merge.c builtin/tag.c +#: builtin/commit.c:1649 builtin/merge.c:273 builtin/tag.c:497 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c +#: builtin/commit.c:1650 msgid "author" msgstr "作者" -#: builtin/commit.c +#: builtin/commit.c:1650 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c builtin/gc.c +#: builtin/commit.c:1651 builtin/gc.c:627 msgid "date" msgstr "日期" -#: builtin/commit.c +#: builtin/commit.c:1651 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c parse-options.h ref-filter.h +#: builtin/commit.c:1653 builtin/commit.c:1654 builtin/commit.c:1660 +#: parse-options.h:571 ref-filter.h:121 msgid "commit" msgstr "提交" -#: builtin/commit.c +#: builtin/commit.c:1653 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c +#: builtin/commit.c:1654 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate . #. -#: builtin/commit.c +#: builtin/commit.c:1659 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]提交" -#: builtin/commit.c +#: builtin/commit.c:1659 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明" -#: builtin/commit.c +#: builtin/commit.c:1660 msgid "use autosquash formatted message to squash specified commit" msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交" -#: builtin/commit.c +#: builtin/commit.c:1661 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c builtin/interpret-trailers.c +#: builtin/commit.c:1662 builtin/interpret-trailers.c:213 builtin/tag.c:498 msgid "trailer" msgstr "尾注" -#: builtin/commit.c +#: builtin/commit.c:1662 builtin/tag.c:499 msgid "add custom trailer(s)" msgstr "添加自定义尾注" -#: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c -#: builtin/revert.c +#: builtin/commit.c:1663 builtin/log.c:2038 builtin/merge.c:291 +#: builtin/pull.c:148 builtin/revert.c:124 msgid "add a Signed-off-by trailer" msgstr "添加 Signed-off-by 尾注" -#: builtin/commit.c +#: builtin/commit.c:1664 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c +#: builtin/commit.c:1665 msgid "force edit of commit" msgstr "强制编辑提交" -#: builtin/commit.c +#: builtin/commit.c:1667 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c +#: builtin/commit.c:1672 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c +#: builtin/commit.c:1673 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c +#: builtin/commit.c:1674 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c +#: builtin/commit.c:1675 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c +#: builtin/commit.c:1676 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c +#: builtin/commit.c:1677 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c +#: builtin/commit.c:1678 msgid "bypass pre-commit and commit-msg hooks" msgstr "绕过 pre-commit 和 commit-msg 钩子" -#: builtin/commit.c +#: builtin/commit.c:1679 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c +#: builtin/commit.c:1692 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c +#: builtin/commit.c:1693 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c +#: builtin/commit.c:1700 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c +#: builtin/commit.c:1702 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c sequencer.c +#: builtin/commit.c:1734 sequencer.c:1521 sequencer.c:1601 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c +#: builtin/commit.c:1780 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c +#: builtin/commit.c:1787 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c +#: builtin/commit.c:1808 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c +#: builtin/commit.c:1815 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c +#: builtin/commit.c:1820 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c +#: builtin/commit.c:1831 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "因提交说明的正文为空而终止提交。\n" -#: builtin/commit.c +#: builtin/commit.c:1865 msgid "" "repository has been updated, but unable to write\n" "new index file. Check that disk is not full and quota is\n" @@ -6292,234 +6425,199 @@ msgstr "" "仓库已更新，但无法写入索引文件。检查是否磁盘已满或\n" "磁盘配额已耗尽，然后执行 \"git restore --staged :/\" 恢复。" -#: builtin/config.c -msgid "git config []" -msgstr "git config [<选项>]" +#: builtin/config.c:19 builtin/config.c:31 +msgid "git config list [] [] [--includes]" +msgstr "git config list [<文件选项>] [<显示选项>] [--includes]" -#: builtin/config.c -#, c-format -msgid "unrecognized --type argument, %s" -msgstr "未能识别的 --type 参数，%s" +#: builtin/config.c:20 builtin/config.c:36 +msgid "" +"git config get [] [] [--includes] [--all] [--" +"regexp=] [--value=] [--fixed-value] [--default=] " +"" +msgstr "git config get [<文件选项>] [<显示选项>] [--includes] [--all] [--regexp=<正则表达式>] [--value=<值>] [--fixed-value] [--default=<默认值>] <名称>" -#: builtin/config.c -msgid "only one type at a time" -msgstr "一次只能一个类型" +#: builtin/config.c:21 +msgid "" +"git config set [] [--type=] [--all] [--value=] [--" +"fixed-value] " +msgstr "git config set [<文件选项>] [--type=<类型>] [--all] [--value=<值>] [--fixed-value] <名称> <值>" + +#: builtin/config.c:22 builtin/config.c:46 +msgid "" +"git config unset [] [--all] [--value=] [--fixed-value] " +" " +msgstr "git config unset [<文件选项>] [--all] [--value=<值>] [--fixed-value] <名称> <值>" + +#: builtin/config.c:23 builtin/config.c:51 +msgid "git config rename-section [] " +msgstr "git config rename-section [<文件选项>] <旧名称> <新名称>" -#: builtin/config.c +#: builtin/config.c:24 builtin/config.c:56 +msgid "git config remove-section [] " +msgstr "git config remove-section [<文件选项>] <名称>" + +#: builtin/config.c:25 builtin/config.c:61 +msgid "git config edit []" +msgstr "git config edit [<文件选项>]" + +#: builtin/config.c:26 +msgid "git config [] --get-colorbool []" +msgstr "git config [<文件选项>] --get-colorbool <名称> [<标准输出为 tty>]" + +#: builtin/config.c:41 +msgid "" +"git config set [] [--type=] [--comment=] [--all] " +"[--value=] [--fixed-value] " +msgstr "git config set [<文件选项>] [--type=<类型>] [--comment=<消息>] [--all] [--value=<值>] [--fixed-value] <名称> <值>" + +#: builtin/config.c:66 msgid "Config file location" msgstr "配置文件位置" -#: builtin/config.c +#: builtin/config.c:67 msgid "use global config file" msgstr "使用全局配置文件" -#: builtin/config.c +#: builtin/config.c:68 msgid "use system config file" msgstr "使用系统级配置文件" -#: builtin/config.c +#: builtin/config.c:69 msgid "use repository config file" msgstr "使用仓库级配置文件" -#: builtin/config.c +#: builtin/config.c:70 msgid "use per-worktree config file" msgstr "使用工作区级别的配置文件" -#: builtin/config.c builtin/gc.c +#: builtin/config.c:71 builtin/gc.c:1526 builtin/gc.c:1591 msgid "use given config file" msgstr "使用指定的配置文件" -#: builtin/config.c +#: builtin/config.c:72 msgid "blob-id" msgstr "数据对象 ID" -#: builtin/config.c +#: builtin/config.c:72 msgid "read config from given blob object" msgstr "从给定的数据对象读取配置" -#: builtin/config.c -msgid "Action" -msgstr "操作" - -#: builtin/config.c -msgid "get value: name [value-pattern]" -msgstr "获取值：名称 [值模式]" - -#: builtin/config.c -msgid "get all values: key [value-pattern]" -msgstr "获得所有的值：键 [值模式]" - -#: builtin/config.c -msgid "get values for regexp: name-regex [value-pattern]" -msgstr "根据正则表达式获得值：名称正则 [值模式]" - -#: builtin/config.c -msgid "get value specific for the URL: section[.var] URL" -msgstr "获得 URL 取值：section[.var] URL" - -#: builtin/config.c -msgid "replace all matching variables: name value [value-pattern]" -msgstr "替换所有匹配的变量：名称 值 [值模式]" - -#: builtin/config.c -msgid "add a new variable: name value" -msgstr "添加一个新的变量：名称 值" - -#: builtin/config.c -msgid "remove a variable: name [value-pattern]" -msgstr "删除一个变量：名称 [值模式]" - -#: builtin/config.c -msgid "remove all matches: name [value-pattern]" -msgstr "删除所有匹配项：名称 [值模式]" - -#: builtin/config.c -msgid "rename section: old-name new-name" -msgstr "重命名小节：old-name new-name" - -#: builtin/config.c -msgid "remove a section: name" -msgstr "删除一个小节：name" - -#: builtin/config.c -msgid "list all" -msgstr "列出所有" - -#: builtin/config.c -msgid "use string equality when comparing values to 'value-pattern'" -msgstr "在比较值与 '值模式' 时，使用字符串字面比较" - -#: builtin/config.c -msgid "open an editor" -msgstr "打开一个编辑器" - -#: builtin/config.c -msgid "find the color configured: slot [default]" -msgstr "获得配置的颜色：配置 [默认]" - -#: builtin/config.c -msgid "find the color setting: slot [stdout-is-tty]" -msgstr "获得颜色设置：配置 [stdout-is-tty]" - -#: builtin/config.c +#: builtin/config.c:89 msgid "Type" msgstr "类型" -#: builtin/config.c builtin/hash-object.c +#: builtin/config.c:90 builtin/hash-object.c:105 msgid "type" msgstr "类型" -#: builtin/config.c +#: builtin/config.c:90 msgid "value is given this type" msgstr "取值为该类型" -#: builtin/config.c +#: builtin/config.c:91 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" -#: builtin/config.c +#: builtin/config.c:92 msgid "value is decimal number" msgstr "值是十进制数" -#: builtin/config.c +#: builtin/config.c:93 msgid "value is --bool or --int" msgstr "值是 --bool 或 --int" -#: builtin/config.c +#: builtin/config.c:94 msgid "value is --bool or string" msgstr "值是 --bool 或字符串" -#: builtin/config.c +#: builtin/config.c:95 msgid "value is a path (file or directory name)" msgstr "值是一个路径（文件或目录名）" -#: builtin/config.c +#: builtin/config.c:96 msgid "value is an expiry date" msgstr "值是一个到期日期" -#: builtin/config.c -msgid "Other" -msgstr "其它" +#: builtin/config.c:99 +msgid "Display options" +msgstr "显示选项" -#: builtin/config.c +#: builtin/config.c:100 msgid "terminate values with NUL byte" msgstr "终止值是 NUL 字节" -#: builtin/config.c +#: builtin/config.c:101 msgid "show variable names only" msgstr "只显示变量名" -#: builtin/config.c -msgid "respect include directives on lookup" -msgstr "查询时参照 include 指令递归查找" - -#: builtin/config.c +#: builtin/config.c:102 msgid "show origin of config (file, standard input, blob, command line)" msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）" -#: builtin/config.c +#: builtin/config.c:103 msgid "show scope of config (worktree, local, global, system, command)" msgstr "显示配置的作用域（工作区、本地、全局、系统、命令）" -#: builtin/config.c -msgid "value" -msgstr "取值" +#: builtin/config.c:104 +msgid "show config keys in addition to their values" +msgstr "显示配置键及其值" -#: builtin/config.c -msgid "with --get, use default value when missing entry" -msgstr "使用 --get 参数，当缺少设置时使用默认值" +#: builtin/config.c:169 +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "未能识别的 --type 参数，%s" -#: builtin/config.c -msgid "human-readable comment string (# will be prepended as needed)" -msgstr "人类可读的注释字符串（# 将根据需要添加到前面）" +#: builtin/config.c:181 +msgid "only one type at a time" +msgstr "一次只能一个类型" -#: builtin/config.c +#: builtin/config.c:194 #, c-format msgid "wrong number of arguments, should be %d" msgstr "错误的参数个数，应该为 %d 个" -#: builtin/config.c +#: builtin/config.c:196 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "错误的参数个数，应该为从 %d 个到 %d 个" -#: builtin/config.c +#: builtin/config.c:396 #, c-format msgid "invalid key pattern: %s" msgstr "无效键名模式：%s" -#: builtin/config.c config.c +#: builtin/config.c:420 config.c:3376 #, c-format msgid "invalid pattern: %s" msgstr "无效模式：%s" -#: builtin/config.c +#: builtin/config.c:441 #, c-format msgid "failed to format default config value: %s" msgstr "无法格式化默认配置值：%s" -#: builtin/config.c +#: builtin/config.c:506 #, c-format msgid "cannot parse color '%s'" msgstr "无法解析颜色 '%s'" -#: builtin/config.c +#: builtin/config.c:557 msgid "unable to parse default color value" msgstr "无法解析默认颜色值" -#: builtin/config.c +#: builtin/config.c:622 builtin/config.c:1076 msgid "not in a git directory" msgstr "不在 git 仓库中" -#: builtin/config.c +#: builtin/config.c:625 msgid "writing to stdin is not supported" msgstr "不支持写到标准输入" -#: builtin/config.c +#: builtin/config.c:628 msgid "writing config blobs is not supported" msgstr "不支持写到配置数据对象" -#: builtin/config.c +#: builtin/config.c:723 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -6534,27 +6632,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c +#: builtin/config.c:743 msgid "only one config file at a time" msgstr "一次只能有一个配置文件" -#: builtin/config.c +#: builtin/config.c:749 msgid "--local can only be used inside a git repository" msgstr "--local 只能在 git 仓库内使用" -#: builtin/config.c +#: builtin/config.c:751 msgid "--blob can only be used inside a git repository" msgstr "--blob 只能在 git 仓库内使用" -#: builtin/config.c +#: builtin/config.c:753 msgid "--worktree can only be used inside a git repository" msgstr "--worktree 只能在 git 仓库内使用" -#: builtin/config.c builtin/gc.c +#: builtin/config.c:772 builtin/gc.c:1566 builtin/gc.c:1634 msgid "$HOME not set" msgstr "$HOME 未设置" -#: builtin/config.c +#: builtin/config.c:786 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -6563,59 +6661,99 @@ msgstr "" "不能和多个工作区一起使用 --worktree，除非启用 worktreeConfig 配置扩展。\n" "详情请阅读“git help worktree”的“CONFIGURATION FILE”小节" -#: builtin/config.c -msgid "--get-color and variable type are incoherent" -msgstr "--get-color 和变量类型不兼容" +#: builtin/config.c:836 builtin/config.c:880 builtin/config.c:931 +#: builtin/config.c:1165 +msgid "Other" +msgstr "其它" -#: builtin/config.c -msgid "only one action at a time" -msgstr "一次只能有一个动作" +#: builtin/config.c:838 builtin/config.c:882 builtin/config.c:1171 +msgid "respect include directives on lookup" +msgstr "查询时参照 include 指令递归查找" -#: builtin/config.c -msgid "--name-only is only applicable to --list or --get-regexp" -msgstr "--name-only 仅适用于 --list 或 --get-regexp" +#: builtin/config.c:854 builtin/config.c:1272 +#, c-format +msgid "unable to read config file '%s'" +msgstr "无法读取配置文件 '%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" +#: builtin/config.c:857 builtin/config.c:1275 +msgid "error processing config file(s)" +msgstr "处理配置文件出错" -#: builtin/config.c -msgid "--default is only applicable to --get" -msgstr "--default 仅适用于 --get" +#: builtin/config.c:873 +msgid "Filter options" +msgstr "过滤选项" -#: builtin/config.c -msgid "--comment is only applicable to add/set/replace operations" -msgstr "--comment 仅适用于 add/set/replace 操作" +#: builtin/config.c:874 +msgid "return all values for multi-valued config options" +msgstr "返回多值配置选项的所有值" + +#: builtin/config.c:875 +msgid "interpret the name as a regular expression" +msgstr "将名称解释为正则表达式" + +#: builtin/config.c:876 builtin/config.c:929 builtin/config.c:985 +msgid "show config with values matching the pattern" +msgstr "显示具有与模式匹配的值的配置" -#: builtin/config.c +#: builtin/config.c:877 builtin/config.c:930 builtin/config.c:986 +#: builtin/config.c:1169 +msgid "use string equality when comparing values to value pattern" +msgstr "在将值与值模式进行比较时使用字符串相等性" + +#: builtin/config.c:878 +msgid "URL" +msgstr "URL" + +#: builtin/config.c:878 +msgid "show config matching the given URL" +msgstr "显示与给定 URL 匹配的配置" + +#: builtin/config.c:884 builtin/config.c:932 builtin/config.c:1167 +#: builtin/config.c:1168 +msgid "value" +msgstr "取值" + +#: builtin/config.c:884 +msgid "use default value when missing entry" +msgstr "缺少条目时使用默认值" + +#: builtin/config.c:894 builtin/config.c:996 builtin/config.c:1252 msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value 仅适用于有 '值模式'" -#: builtin/config.c -#, c-format -msgid "unable to read config file '%s'" -msgstr "无法读取配置文件 '%s'" +#: builtin/config.c:897 +msgid "--default= cannot be used with --all or --url=" +msgstr "--default= 不能与 --all 或 --url= 一起使用" -#: builtin/config.c -msgid "error processing config file(s)" -msgstr "处理配置文件出错" +#: builtin/config.c:901 +msgid "--url= cannot be used with --all, --regexp or --value" +msgstr "--url= 不能与 --all、--regexp 或 --value 一起使用" -#: builtin/config.c -msgid "editing stdin is not supported" -msgstr "不支持编辑标准输入" +#: builtin/config.c:927 builtin/config.c:983 +msgid "Filter" +msgstr "过滤器" -#: builtin/config.c -msgid "editing blobs is not supported" -msgstr "不支持编辑数据对象" +#: builtin/config.c:928 builtin/config.c:984 +msgid "replace multi-valued config option with new value" +msgstr "将多值配置选项替换为新值" -#: builtin/config.c -#, c-format -msgid "cannot create configuration file %s" -msgstr "不能创建配置文件 %s" +#: builtin/config.c:932 builtin/config.c:1168 +msgid "human-readable comment string (# will be prepended as needed)" +msgstr "人类可读的注释字符串（# 将根据需要添加到前面）" + +#: builtin/config.c:933 +msgid "add a new line without altering any existing values" +msgstr "添加新行而不更改任何现有值" + +#: builtin/config.c:945 +msgid "--fixed-value only applies with --value=" +msgstr "--fixed-value only applies with --value=" -#: builtin/config.c +#: builtin/config.c:947 +msgid "--append cannot be used with --value=" +msgstr "--append 不能与 --value= 一起使用" + +#: builtin/config.c:966 builtin/config.c:1287 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -6624,16 +6762,120 @@ msgstr "" "无法用一个值覆盖多个值\n" " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" -#: builtin/config.c +#: builtin/config.c:1034 builtin/config.c:1063 builtin/config.c:1361 +#: builtin/config.c:1373 #, c-format msgid "no such section: %s" msgstr "无此小节：%s" -#: builtin/count-objects.c +#: builtin/config.c:1078 +msgid "editing stdin is not supported" +msgstr "不支持编辑标准输入" + +#: builtin/config.c:1080 +msgid "editing blobs is not supported" +msgstr "不支持编辑数据对象" + +#: builtin/config.c:1094 +#, c-format +msgid "cannot create configuration file %s" +msgstr "不能创建配置文件 %s" + +#: builtin/config.c:1149 +msgid "Action" +msgstr "操作" + +#: builtin/config.c:1150 +msgid "get value: name []" +msgstr "获取值：name [<值模式>]" + +#: builtin/config.c:1151 +msgid "get all values: key []" +msgstr "获取所有值：key [<值模式>]" + +#: builtin/config.c:1152 +msgid "get values for regexp: name-regex []" +msgstr "获取正则表达式的值：name-regex [<值模式>]" + +#: builtin/config.c:1153 +msgid "get value specific for the URL: section[.var] URL" +msgstr "获得 URL 取值：section[.var] URL" + +#: builtin/config.c:1154 +msgid "replace all matching variables: name value []" +msgstr "替换所有匹配的变量：name value [<值模式>]" + +#: builtin/config.c:1155 +msgid "add a new variable: name value" +msgstr "添加一个新的变量：名称 值" + +#: builtin/config.c:1156 +msgid "remove a variable: name []" +msgstr "删除一个变量：名称 [<值模式>]" + +#: builtin/config.c:1157 +msgid "remove all matches: name []" +msgstr "删除所有匹配项：名称 [<值模式>]" + +#: builtin/config.c:1158 +msgid "rename section: old-name new-name" +msgstr "重命名小节：old-name new-name" + +#: builtin/config.c:1159 +msgid "remove a section: name" +msgstr "删除一个小节：name" + +#: builtin/config.c:1160 +msgid "list all" +msgstr "列出所有" + +#: builtin/config.c:1161 +msgid "open an editor" +msgstr "打开一个编辑器" + +#: builtin/config.c:1162 +msgid "find the color configured: slot []" +msgstr "找到配置的颜色：slot [<默认>]" + +#: builtin/config.c:1163 +msgid "find the color setting: slot []" +msgstr "找到颜色设置：slot []" + +#: builtin/config.c:1167 +msgid "with --get, use default value when missing entry" +msgstr "使用 --get 参数，当缺少设置时使用默认值" + +#: builtin/config.c:1186 +msgid "--get-color and variable type are incoherent" +msgstr "--get-color 和变量类型不兼容" + +#: builtin/config.c:1196 +msgid "no action specified" +msgstr "未指定任何操作" + +#: builtin/config.c:1201 +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only 仅适用于 --list 或 --get-regexp" + +#: builtin/config.c:1207 +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list" + +#: builtin/config.c:1213 +msgid "--default is only applicable to --get" +msgstr "--default 仅适用于 --get" + +#: builtin/config.c:1219 +msgid "--comment is only applicable to add/set/replace operations" +msgstr "--comment 仅适用于 add/set/replace 操作" + +#: builtin/count-objects.c:104 msgid "print sizes in human readable format" msgstr "以用户可读的格式显示大小" -#: builtin/credential-cache--daemon.c +#: builtin/credential-cache--daemon.c:253 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -6646,77 +6888,78 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: builtin/credential-cache--daemon.c +#: builtin/credential-cache--daemon.c:302 msgid "print debugging messages to stderr" msgstr "输出调试信息到标准错误" -#: builtin/credential-cache--daemon.c +#: builtin/credential-cache--daemon.c:312 +#: builtin/credential-cache--daemon.c:344 msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "credential-cache--daemon 不可用，不支持 unix 套接字" -#: builtin/credential-cache.c +#: builtin/credential-cache.c:161 builtin/credential-cache.c:195 msgid "credential-cache unavailable; no unix socket support" msgstr "credential-cache 不可用，不支持 unix 套接字" -#: builtin/credential-store.c +#: builtin/credential-store.c:70 #, c-format msgid "unable to get credential storage lock in %d ms" msgstr "无法在 %d ms 获得凭证存储锁" -#: builtin/describe.c +#: builtin/describe.c:30 msgid "" "git describe [--all] [--tags] [--contains] [--abbrev=] [...]" msgstr "" "git describe [--all] [--tags] [--contains] [--abbrev=] [<提交号>...]" -#: builtin/describe.c +#: builtin/describe.c:31 msgid "" "git describe [--all] [--tags] [--contains] [--abbrev=] --dirty[=]" msgstr "" "git describe [--all] [--tags] [--contains] [--abbrev=] --dirty[=<标记>]" -#: builtin/describe.c +#: builtin/describe.c:32 msgid "git describe " msgstr "git describe <数据对象>" -#: builtin/describe.c +#: builtin/describe.c:72 msgid "head" msgstr "头" -#: builtin/describe.c +#: builtin/describe.c:72 msgid "lightweight" msgstr "轻量级的" -#: builtin/describe.c +#: builtin/describe.c:72 msgid "annotated" msgstr "附注的" -#: builtin/describe.c +#: builtin/describe.c:287 #, c-format msgid "annotated tag %s not available" msgstr "附注标签 %s 无效" -#: builtin/describe.c +#: builtin/describe.c:291 #, c-format msgid "tag '%s' is externally known as '%s'" msgstr "标签 '%s' 在外部被认为是 '%s'" -#: builtin/describe.c +#: builtin/describe.c:339 #, c-format msgid "no tag exactly matches '%s'" msgstr "没有标签准确匹配 '%s'" -#: builtin/describe.c +#: builtin/describe.c:341 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n" -#: builtin/describe.c +#: builtin/describe.c:408 #, c-format msgid "finished search at %s\n" msgstr "完成搜索 %s\n" -#: builtin/describe.c +#: builtin/describe.c:435 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -6725,7 +6968,7 @@ msgstr "" "没有附注标签能描述 '%s'。\n" "然而，存在未附注标签：尝试 --tags。" -#: builtin/describe.c +#: builtin/describe.c:439 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -6734,12 +6977,12 @@ msgstr "" "没有标签能描述 '%s'。\n" "尝试 --always，或者创建一些标签。" -#: builtin/describe.c +#: builtin/describe.c:469 #, c-format msgid "traversed %lu commits\n" msgstr "已遍历 %lu 个提交\n" -#: builtin/describe.c +#: builtin/describe.c:472 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -6748,87 +6991,87 @@ msgstr "" "发现多于 %i 个标签，列出最近的 %i 个\n" "在 %s 放弃搜索\n" -#: builtin/describe.c +#: builtin/describe.c:541 #, c-format msgid "describe %s\n" msgstr "描述 %s\n" -#: builtin/describe.c +#: builtin/describe.c:544 #, c-format msgid "Not a valid object name %s" msgstr "不是一个有效的对象名 %s" -#: builtin/describe.c +#: builtin/describe.c:552 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s 既不是提交也不是数据对象" -#: builtin/describe.c +#: builtin/describe.c:577 msgid "find the tag that comes after the commit" msgstr "寻找该提交之后的标签" -#: builtin/describe.c +#: builtin/describe.c:578 msgid "debug search strategy on stderr" msgstr "在标准错误上调试搜索策略" -#: builtin/describe.c +#: builtin/describe.c:579 msgid "use any ref" msgstr "使用任意引用" -#: builtin/describe.c +#: builtin/describe.c:580 msgid "use any tag, even unannotated" msgstr "使用任意标签，即使未附带注释" -#: builtin/describe.c +#: builtin/describe.c:581 msgid "always use long format" msgstr "始终使用长提交号格式" -#: builtin/describe.c +#: builtin/describe.c:582 msgid "only follow first parent" msgstr "只跟随第一个父提交" -#: builtin/describe.c +#: builtin/describe.c:585 msgid "only output exact matches" msgstr "只输出精确匹配" -#: builtin/describe.c +#: builtin/describe.c:588 msgid "consider most recent tags (default: 10)" msgstr "考虑最近 个标签（默认：10）" -#: builtin/describe.c +#: builtin/describe.c:590 msgid "only consider tags matching " msgstr "只考虑匹配 <模式> 的标签" -#: builtin/describe.c +#: builtin/describe.c:592 msgid "do not consider tags matching " msgstr "不考虑匹配 <模式> 的标签" -#: builtin/describe.c builtin/name-rev.c +#: builtin/describe.c:594 builtin/name-rev.c:584 msgid "show abbreviated commit object as fallback" msgstr "显示简写的提交号作为后备" -#: builtin/describe.c +#: builtin/describe.c:595 builtin/describe.c:598 msgid "mark" msgstr "标记" -#: builtin/describe.c +#: builtin/describe.c:596 msgid "append on dirty working tree (default: \"-dirty\")" msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）" -#: builtin/describe.c +#: builtin/describe.c:599 msgid "append on broken working tree (default: \"-broken\")" msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）" -#: builtin/describe.c +#: builtin/describe.c:647 msgid "No names found, cannot describe anything." msgstr "没有发现名称，无法描述任何东西。" -#: builtin/describe.c +#: builtin/describe.c:710 builtin/describe.c:712 #, c-format msgid "option '%s' and commit-ishes cannot be used together" msgstr "选项 '%s' 和提交号不能同时使用" -#: builtin/diagnose.c +#: builtin/diagnose.c:9 msgid "" "git diagnose [(-o | --output-directory) ] [(-s | --suffix) ]\n" " [--mode=]" @@ -6836,85 +7079,85 @@ msgstr "" "git diagnose [(-o | --output-directory) <路径>] [(-s | --suffix) <格式>]\n" " [--mode=<模式>]" -#: builtin/diagnose.c +#: builtin/diagnose.c:26 msgid "specify a destination for the diagnostics archive" msgstr "指定诊断归档包的目标位置" -#: builtin/diagnose.c +#: builtin/diagnose.c:28 msgid "specify a strftime format suffix for the filename" msgstr "指定文件的 strftime 格式后缀" -#: builtin/diagnose.c +#: builtin/diagnose.c:30 msgid "specify the content of the diagnostic archive" msgstr "指定诊断信息归档包的内容" -#: builtin/diff-tree.c +#: builtin/diff-tree.c:165 msgid "--merge-base only works with two commits" msgstr "--merge-base 仅适用于两个提交" -#: builtin/diff.c +#: builtin/diff.c:95 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一个普通文件或符号链接" -#: builtin/diff.c +#: builtin/diff.c:220 msgid "no merge given, only parents." msgstr "没有给出合并，只有父提交。" -#: builtin/diff.c +#: builtin/diff.c:265 #, c-format msgid "invalid option: %s" msgstr "无效选项：%s" -#: builtin/diff.c +#: builtin/diff.c:384 #, c-format msgid "%s...%s: no merge base" msgstr "%s...%s：无合并基线" -#: builtin/diff.c +#: builtin/diff.c:508 msgid "Not a git repository" msgstr "不是 git 仓库" -#: builtin/diff.c builtin/grep.c +#: builtin/diff.c:554 builtin/grep.c:749 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c +#: builtin/diff.c:570 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超过两个数据对象：'%s'" -#: builtin/diff.c +#: builtin/diff.c:575 #, c-format msgid "unhandled object '%s' given." msgstr "无法处理的对象 '%s'。" -#: builtin/diff.c +#: builtin/diff.c:609 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s：多条合并基线，使用 %s" -#: builtin/difftool.c +#: builtin/difftool.c:38 msgid "git difftool [] [ []] [--] [...]" msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" -#: builtin/difftool.c +#: builtin/difftool.c:298 #, c-format msgid "could not read symlink %s" msgstr "无法读取符号链接 %s" -#: builtin/difftool.c +#: builtin/difftool.c:300 #, c-format msgid "could not read symlink file %s" msgstr "无法读取符号链接文件 %s" -#: builtin/difftool.c +#: builtin/difftool.c:309 #, c-format msgid "could not read object %s for symlink %s" msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" -#: builtin/difftool.c +#: builtin/difftool.c:431 msgid "" "combined diff formats ('-c' and '--cc') are not supported in\n" "directory diff mode ('-d' and '--dir-diff')." @@ -6922,294 +7165,296 @@ msgstr "" "不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--" "cc'）。" -#: builtin/difftool.c +#: builtin/difftool.c:637 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "两个文件都被修改：'%s' 和 '%s'。" -#: builtin/difftool.c +#: builtin/difftool.c:639 msgid "working tree file has been left." msgstr "工作区文件被留了下来。" -#: builtin/difftool.c sequencer.c +#: builtin/difftool.c:644 sequencer.c:2410 sequencer.c:3786 sequencer.c:3790 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" -#: builtin/difftool.c +#: builtin/difftool.c:650 #, c-format msgid "temporary files exist in '%s'." msgstr "临时文件存在于 '%s'。" -#: builtin/difftool.c +#: builtin/difftool.c:651 msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者恢复它们。" -#: builtin/difftool.c +#: builtin/difftool.c:656 #, c-format msgid "failed: %d" msgstr "失败：%d" -#: builtin/difftool.c +#: builtin/difftool.c:700 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c +#: builtin/difftool.c:702 msgid "perform a full-directory diff" msgstr "执行一个全目录差异比较" -#: builtin/difftool.c +#: builtin/difftool.c:704 msgid "do not prompt before launching a diff tool" msgstr "启动差异比较工具之前不提示" -#: builtin/difftool.c +#: builtin/difftool.c:709 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符号链接" -#: builtin/difftool.c +#: builtin/difftool.c:710 msgid "tool" msgstr "工具" -#: builtin/difftool.c +#: builtin/difftool.c:711 msgid "use the specified diff tool" msgstr "使用指定的差异比较工具" -#: builtin/difftool.c +#: builtin/difftool.c:713 msgid "print a list of diff tools that may be used with `--tool`" msgstr "显示可以用在 `--tool` 参数后的差异工具列表" -#: builtin/difftool.c +#: builtin/difftool.c:716 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit " "code" msgstr "当执行的 diff 工具返回非零退出码时，使 'git-difftool' 退出" -#: builtin/difftool.c +#: builtin/difftool.c:719 msgid "specify a custom command for viewing diffs" msgstr "指定一个用于查看差异的自定义命令" -#: builtin/difftool.c +#: builtin/difftool.c:720 msgid "passed to `diff`" msgstr "传递给 `diff`" -#: builtin/difftool.c +#: builtin/difftool.c:736 msgid "difftool requires worktree or --no-index" msgstr "difftool 要求工作区或者 --no-index" -#: builtin/difftool.c +#: builtin/difftool.c:763 msgid "no given for --tool=" msgstr "没有为 --tool=<工具> 参数提供 <工具>" -#: builtin/difftool.c +#: builtin/difftool.c:770 msgid "no given for --extcmd=" msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" -#: builtin/fast-export.c +#: builtin/fast-export.c:30 msgid "git fast-export []" msgstr "git fast-export []" -#: builtin/fast-export.c +#: builtin/fast-export.c:863 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "错误：除非指定 --mark-tags，否则无法导出嵌套标签。" -#: builtin/fast-export.c +#: builtin/fast-export.c:1168 msgid "--anonymize-map token cannot be empty" msgstr "--anonymize-map 取值不能为空" -#: builtin/fast-export.c +#: builtin/fast-export.c:1188 msgid "show progress after objects" msgstr "在 个对象之后显示进度" -#: builtin/fast-export.c +#: builtin/fast-export.c:1190 msgid "select handling of signed tags" msgstr "选择如何处理签名标签" -#: builtin/fast-export.c +#: builtin/fast-export.c:1193 msgid "select handling of tags that tag filtered objects" msgstr "选择当标签指向被过滤对象时该标签的处理方式" -#: builtin/fast-export.c +#: builtin/fast-export.c:1196 msgid "select handling of commit messages in an alternate encoding" msgstr "选择使用备用编码处理提交说明" -#: builtin/fast-export.c +#: builtin/fast-export.c:1199 msgid "dump marks to this file" msgstr "把标记存储到这个文件" -#: builtin/fast-export.c +#: builtin/fast-export.c:1201 msgid "import marks from this file" msgstr "从这个文件导入标记" -#: builtin/fast-export.c +#: builtin/fast-export.c:1205 msgid "import marks from this file if it exists" msgstr "如果文件存在，从该文件导入标记" -#: builtin/fast-export.c +#: builtin/fast-export.c:1207 msgid "fake a tagger when tags lack one" msgstr "当标签缺少标记人字段时，假装提供一个" -#: builtin/fast-export.c +#: builtin/fast-export.c:1209 msgid "output full tree for each commit" msgstr "每次提交都输出整个树" -#: builtin/fast-export.c +#: builtin/fast-export.c:1211 msgid "use the done feature to terminate the stream" msgstr "使用 done 功能来终止流" -#: builtin/fast-export.c +#: builtin/fast-export.c:1212 msgid "skip output of blob data" msgstr "跳过数据对象的输出" -#: builtin/fast-export.c builtin/log.c +#: builtin/fast-export.c:1213 builtin/log.c:2112 msgid "refspec" msgstr "引用规格" -#: builtin/fast-export.c +#: builtin/fast-export.c:1214 msgid "apply refspec to exported refs" msgstr "对导出的引用应用引用规格" -#: builtin/fast-export.c +#: builtin/fast-export.c:1215 msgid "anonymize output" msgstr "匿名输出" -#: builtin/fast-export.c +#: builtin/fast-export.c:1216 msgid "from:to" msgstr "from:to" -#: builtin/fast-export.c +#: builtin/fast-export.c:1217 msgid "convert to in anonymized output" msgstr "在匿名输出中将 转换为 " -#: builtin/fast-export.c +#: builtin/fast-export.c:1220 msgid "reference parents which are not in fast-export stream by object id" msgstr "引用父对象 ID 不在 fast-export 流中" -#: builtin/fast-export.c +#: builtin/fast-export.c:1222 msgid "show original object ids of blobs/commits" msgstr "显示数据对象/提交的原始对象 ID" -#: builtin/fast-export.c +#: builtin/fast-export.c:1224 msgid "label tags with mark ids" msgstr "对带有标记 ID 的标签做标记" -#: builtin/fast-import.c +#: builtin/fast-import.c:3117 #, c-format msgid "Missing from marks for submodule '%s'" msgstr "子模组 '%s' 缺少 from 标记" -#: builtin/fast-import.c +#: builtin/fast-import.c:3119 #, c-format msgid "Missing to marks for submodule '%s'" msgstr "子模组 '%s' 缺少 to 标记" -#: builtin/fast-import.c +#: builtin/fast-import.c:3247 #, c-format msgid "Expected 'mark' command, got %s" msgstr "预期 'mark' 命令，得到 %s" -#: builtin/fast-import.c +#: builtin/fast-import.c:3252 #, c-format msgid "Expected 'to' command, got %s" msgstr "预期 'to' 命令，得到 %s" -#: builtin/fast-import.c +#: builtin/fast-import.c:3346 msgid "Expected format name:filename for submodule rewrite option" msgstr "子模组重写选项的预期格式为 name:filename" -#: builtin/fast-import.c +#: builtin/fast-import.c:3403 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'" -#: builtin/fetch-pack.c +#: builtin/fetch-pack.c:250 #, c-format msgid "Lockfile created but not reported: %s" msgstr "Lockfile 已创建但未报告：%s" -#: builtin/fetch.c +#: builtin/fetch.c:45 msgid "git fetch [] [ [...]]" msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/fetch.c +#: builtin/fetch.c:46 msgid "git fetch [] " msgstr "git fetch [<选项>] <组>" -#: builtin/fetch.c +#: builtin/fetch.c:47 msgid "git fetch --multiple [] [( | )...]" msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" -#: builtin/fetch.c +#: builtin/fetch.c:48 msgid "git fetch --all []" msgstr "git fetch --all [<选项>]" -#: builtin/fetch.c +#: builtin/fetch.c:155 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel 不能为负数" -#: builtin/fetch.c +#: builtin/fetch.c:579 msgid "couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c +#: builtin/fetch.c:870 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c +#: builtin/fetch.c:915 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c +#: builtin/fetch.c:919 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c +#: builtin/fetch.c:932 builtin/fetch.c:950 builtin/fetch.c:1029 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c +#: builtin/fetch.c:933 msgid "can't fetch into checked-out branch" msgstr "无法获取到已检出的分支" -#: builtin/fetch.c +#: builtin/fetch.c:944 msgid "[tag update]" msgstr "[标签更新]" -#: builtin/fetch.c +#: builtin/fetch.c:945 builtin/fetch.c:984 builtin/fetch.c:1010 +#: builtin/fetch.c:1023 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c +#: builtin/fetch.c:951 msgid "would clobber existing tag" msgstr "会破坏现有的标签" -#: builtin/fetch.c +#: builtin/fetch.c:973 msgid "[new tag]" msgstr "[新标签]" -#: builtin/fetch.c +#: builtin/fetch.c:976 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c +#: builtin/fetch.c:979 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c +#: builtin/fetch.c:1023 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c +#: builtin/fetch.c:1029 msgid "non-fast-forward" msgstr "非快进" -#: builtin/fetch.c builtin/grep.c sequencer.c +#: builtin/fetch.c:1061 builtin/fetch.c:1449 builtin/grep.c:829 +#: sequencer.c:3463 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: builtin/fetch.c +#: builtin/fetch.c:1133 msgid "" "fetch normally indicates which branches had a forced update,\n" "but that check has been disabled; to re-enable, use '--show-forced-updates'\n" @@ -7219,7 +7464,7 @@ msgstr "" "要重新启用，请使用 '--show-forced-updates' 选项或运行\n" "'git config fetch.showForcedUpdates true'" -#: builtin/fetch.c +#: builtin/fetch.c:1137 #, c-format msgid "" "it took %.2f seconds to check forced updates; you can use\n" @@ -7230,17 +7475,17 @@ msgstr "" "花了 %.2f 秒来检查强制更新；您可以使用 '--no-show-forced-updates'\n" "或运行 'git config fetch.showForcedUpdates false' 以避免此项检查\n" -#: builtin/fetch.c +#: builtin/fetch.c:1164 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必需的对象\n" -#: builtin/fetch.c +#: builtin/fetch.c:1183 #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "拒绝 %s 因为浅克隆的根不允许被更新" -#: builtin/fetch.c +#: builtin/fetch.c:1281 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -7250,74 +7495,74 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c +#: builtin/fetch.c:1388 #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为悬空状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c +#: builtin/fetch.c:1389 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为悬空状态）" -#: builtin/fetch.c +#: builtin/fetch.c:1416 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c builtin/remote.c +#: builtin/fetch.c:1417 builtin/remote.c:1179 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c +#: builtin/fetch.c:1438 #, c-format msgid "refusing to fetch into branch '%s' checked out at '%s'" msgstr "拒绝获取于 '%2$s' 检出的分支 '%1$s'" -#: builtin/fetch.c +#: builtin/fetch.c:1458 #, c-format msgid "option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c +#: builtin/fetch.c:1461 #, c-format msgid "option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c object-file.c +#: builtin/fetch.c:1487 object-file.c:2697 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一个有效的对象" -#: builtin/fetch.c +#: builtin/fetch.c:1489 #, c-format msgid "the object %s does not exist" msgstr "对象 '%s' 不存在" -#: builtin/fetch.c +#: builtin/fetch.c:1760 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "检测到多分支，和 --set-upstream 不兼容" -#: builtin/fetch.c +#: builtin/fetch.c:1772 #, c-format msgid "" "could not set upstream of HEAD to '%s' from '%s' when it does not point to " "any branch." msgstr "无法在不指向任何分支时将 HEAD 的上游从 '%s' 设置为 '%s'。" -#: builtin/fetch.c +#: builtin/fetch.c:1785 msgid "not setting upstream for a remote remote-tracking branch" msgstr "没有为一个远程跟踪分支设置上游" -#: builtin/fetch.c +#: builtin/fetch.c:1787 msgid "not setting upstream for a remote tag" msgstr "没有为一个远程标签设置上游" -#: builtin/fetch.c +#: builtin/fetch.c:1789 msgid "unknown branch type" msgstr "未知的分支类型" -#: builtin/fetch.c +#: builtin/fetch.c:1791 msgid "" "no source branch found;\n" "you need to specify exactly one branch with the --set-upstream option" @@ -7325,370 +7570,375 @@ msgstr "" "未发现源分支；\n" "您需要使用 --set-upstream 选项指定一个分支" -#: builtin/fetch.c +#: builtin/fetch.c:1932 builtin/fetch.c:2010 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c +#: builtin/fetch.c:1943 builtin/fetch.c:2013 #, c-format msgid "could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c +#: builtin/fetch.c:1955 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "无法获取 '%s'（退出码：%d）\n" -#: builtin/fetch.c +#: builtin/fetch.c:2074 msgid "" "no remote repository specified; please specify either a URL or a\n" "remote name from which new revisions should be fetched" msgstr "未指定远程仓库；请指定一个用于获取新版本的 URL 或远程仓库名" -#: builtin/fetch.c +#: builtin/fetch.c:2110 msgid "you need to specify a tag name" msgstr "您需要指定一个标签名称" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2172 builtin/pull.c:191 msgid "fetch from all remotes" msgstr "从所有远程抓取" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2174 builtin/pull.c:251 msgid "set upstream for git pull/fetch" msgstr "为 git pull/fetch 设置上游" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2176 builtin/pull.c:194 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" -#: builtin/fetch.c +#: builtin/fetch.c:2178 msgid "use atomic transaction to update references" msgstr "使用原子事务更新引用" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2180 builtin/pull.c:197 msgid "path to upload pack on remote end" msgstr "上传包到远程的路径" -#: builtin/fetch.c +#: builtin/fetch.c:2181 msgid "force overwrite of local reference" msgstr "强制覆盖本地引用" -#: builtin/fetch.c +#: builtin/fetch.c:2183 msgid "fetch from multiple remotes" msgstr "从多个远程抓取" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2185 builtin/pull.c:201 msgid "fetch all tags and associated objects" msgstr "抓取所有的标签和关联对象" -#: builtin/fetch.c +#: builtin/fetch.c:2187 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何标签（--no-tags）" -#: builtin/fetch.c +#: builtin/fetch.c:2189 msgid "number of submodules fetched in parallel" msgstr "获取子模组的并发数" -#: builtin/fetch.c +#: builtin/fetch.c:2191 msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "修改引用规格以将所有引用放入 refs/prefetch/" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2193 builtin/pull.c:204 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已经不存在的分支的跟踪分支" -#: builtin/fetch.c +#: builtin/fetch.c:2195 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除远程不存在的本地标签，并且替换变更标签" # 译者：可选值，不能翻译 -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2196 builtin/fetch.c:2225 builtin/pull.c:125 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c +#: builtin/fetch.c:2197 msgid "control recursive fetching of submodules" msgstr "控制子模组的递归抓取" -#: builtin/fetch.c +#: builtin/fetch.c:2203 msgid "write fetched references to the FETCH_HEAD file" msgstr "将获取到的引用写入 FETCH_HEAD 文件" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2204 builtin/pull.c:212 msgid "keep downloaded pack" msgstr "保持已下载的包" -#: builtin/fetch.c +#: builtin/fetch.c:2206 msgid "allow updating of HEAD ref" msgstr "允许更新 HEAD 引用" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2209 builtin/fetch.c:2215 builtin/pull.c:215 +#: builtin/pull.c:224 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历史" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2211 builtin/pull.c:218 msgid "deepen history of shallow repository based on time" msgstr "基于时间来深化浅克隆的历史" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2217 builtin/pull.c:227 msgid "convert to a complete repository" msgstr "转换为一个完整的仓库" -#: builtin/fetch.c +#: builtin/fetch.c:2220 msgid "re-fetch without negotiating common commits" msgstr "重新获取而不协商共同提交" -#: builtin/fetch.c +#: builtin/fetch.c:2223 msgid "prepend this to submodule path output" msgstr "在子模组路径输出的前面加上此目录" -#: builtin/fetch.c +#: builtin/fetch.c:2226 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "递归获取子模组的缺省值（比配置文件优先级低）" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2230 builtin/pull.c:230 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2231 builtin/pull.c:232 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2232 builtin/pull.c:233 msgid "specify fetch refmap" msgstr "指定获取操作的引用映射" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2236 builtin/pull.c:246 msgid "report that we have only objects reachable from this object" msgstr "报告我们只拥有从该对象开始可达的对象" -#: builtin/fetch.c +#: builtin/fetch.c:2238 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "不获取包文件；而是打印协商的祖先提交" -#: builtin/fetch.c +#: builtin/fetch.c:2241 builtin/fetch.c:2243 msgid "run 'maintenance --auto' after fetching" msgstr "获取后执行 'maintenance --auto'" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2245 builtin/pull.c:249 msgid "check for forced-updates on all updated branches" msgstr "在所有更新分支上检查强制更新" -#: builtin/fetch.c +#: builtin/fetch.c:2247 msgid "write the commit-graph after fetching" msgstr "抓取后写提交图" -#: builtin/fetch.c +#: builtin/fetch.c:2249 msgid "accept refspecs from stdin" msgstr "从标准输入获取引用规格" -#: builtin/fetch.c +#: builtin/fetch.c:2325 msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only 需要一个或多个 --negotiation-tip=*" -#: builtin/fetch.c +#: builtin/fetch.c:2329 msgid "negative depth in --deepen is not supported" msgstr "--deepen 不支持负数深度" -#: builtin/fetch.c +#: builtin/fetch.c:2338 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库，参数 --unshallow 没有意义" -#: builtin/fetch.c +#: builtin/fetch.c:2358 #, c-format msgid "failed to fetch bundles from '%s'" msgstr "无法从 '%s' 获取归档包" -#: builtin/fetch.c +#: builtin/fetch.c:2370 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个仓库参数" -#: builtin/fetch.c +#: builtin/fetch.c:2372 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规格没有任何意义" -#: builtin/fetch.c +#: builtin/fetch.c:2386 #, c-format msgid "no such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c +#: builtin/fetch.c:2394 msgid "fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规格没有意义" -#: builtin/fetch.c +#: builtin/fetch.c:2411 msgid "must supply remote when using --negotiate-only" msgstr "在使用 --negotiate-only 时必须提供远程仓库" -#: builtin/fetch.c +#: builtin/fetch.c:2416 msgid "protocol does not support --negotiate-only, exiting" msgstr "协议不支持 --negotiate-only，退出" -#: builtin/fetch.c +#: builtin/fetch.c:2437 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库" -#: builtin/fetch.c +#: builtin/fetch.c:2441 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic 仅在从一个远程仓库获取的时候可用" -#: builtin/fetch.c +#: builtin/fetch.c:2445 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin 仅在从一个远程仓库获取的时候可用" -#: builtin/fmt-merge-msg.c +#: builtin/fmt-merge-msg.c:8 msgid "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" msgstr "git fmt-merge-msg [-m <说明>] [--log[=] | --no-log] [--file <文件>]" -#: builtin/fmt-merge-msg.c +#: builtin/fmt-merge-msg.c:20 msgid "populate log with at most entries from shortlog" msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明" -#: builtin/fmt-merge-msg.c +#: builtin/fmt-merge-msg.c:23 msgid "alias for --log (deprecated)" msgstr "参数 --log 的别名（已弃用）" -#: builtin/fmt-merge-msg.c +#: builtin/fmt-merge-msg.c:26 msgid "text" msgstr "文本" -#: builtin/fmt-merge-msg.c +#: builtin/fmt-merge-msg.c:27 msgid "use as start of message" msgstr "使用 <文本> 作为提交说明的开始" -#: builtin/fmt-merge-msg.c +#: builtin/fmt-merge-msg.c:29 msgid "use instead of the real target branch" msgstr "使用 <名称> 而不是真正的目标分支" -#: builtin/fmt-merge-msg.c +#: builtin/fmt-merge-msg.c:30 msgid "file to read from" msgstr "从文件中读取" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:12 msgid "git for-each-ref [] []" msgstr "git for-each-ref [<选项>] [<模式>]" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:13 msgid "git for-each-ref [--points-at ]" msgstr "git for-each-ref [--points-at <对象>]" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:14 msgid "git for-each-ref [--merged []] [--no-merged []]" msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:15 msgid "git for-each-ref [--contains []] [--no-contains []]" msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:31 msgid "quote placeholders suitably for shells" msgstr "引用占位符适用于 shells" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:33 msgid "quote placeholders suitably for perl" msgstr "引用占位符适用于 perl" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:35 msgid "quote placeholders suitably for python" msgstr "引用占位符适用于 python" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:37 msgid "quote placeholders suitably for Tcl" msgstr "引用占位符适用于 Tcl" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:42 msgid "show only matched refs" msgstr "只显示 个匹配的引用" -#: builtin/for-each-ref.c builtin/tag.c +#: builtin/for-each-ref.c:44 builtin/tag.c:526 msgid "respect format colors" msgstr "遵照格式中的颜色输出" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:48 msgid "print only refs which points at the given object" msgstr "只打印指向给定对象的引用" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:50 msgid "print only refs that are merged" msgstr "只打印已经合并的引用" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:51 msgid "print only refs that are not merged" msgstr "只打印没有合并的引用" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:52 msgid "print only refs which contain the commit" msgstr "只打印包含该提交的引用" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:53 msgid "print only refs which don't contain the commit" msgstr "只打印不包含该提交的引用" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:55 msgid "read reference patterns from stdin" msgstr "从标准输入读取引用的模式" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:56 msgid "also include HEAD ref and pseudorefs" msgstr "还包括 HEAD 引用和伪引用" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:87 msgid "unknown arguments supplied with --stdin" msgstr "为 --stdin 提供了未知的命令参数" -#: builtin/for-each-repo.c +#: builtin/for-each-repo.c:11 msgid "git for-each-repo --config= [--] " msgstr "git for-each-repo --config=<配置> [--] <命令参数>" -#: builtin/for-each-repo.c +#: builtin/for-each-repo.c:41 msgid "config" msgstr "配置" -#: builtin/for-each-repo.c +#: builtin/for-each-repo.c:42 msgid "config key storing a list of repository paths" msgstr "存储着仓库路径列表的配置项键名" -#: builtin/for-each-repo.c +#: builtin/for-each-repo.c:44 +msgid "keep going even if command fails in a repository" +msgstr "即使存储库中的命令失败，仍继续执行" + +#: builtin/for-each-repo.c:52 msgid "missing --config=" msgstr "缺少 --config=<配置>" -#: builtin/for-each-repo.c +#: builtin/for-each-repo.c:56 #, c-format msgid "got bad config --config=%s" msgstr "发现错误的配置行 --config=%s" -#: builtin/fsck.c +#: builtin/fsck.c:77 builtin/fsck.c:136 builtin/fsck.c:137 msgid "unknown" msgstr "未知" #. TRANSLATORS: e.g. error in tree 01bfda: -#: builtin/fsck.c +#: builtin/fsck.c:86 builtin/fsck.c:108 #, c-format msgid "error in %s %s: %s" msgstr "%s %s 错误：%s" #. TRANSLATORS: e.g. warning in tree 01bfda: -#: builtin/fsck.c +#: builtin/fsck.c:102 #, c-format msgid "warning in %s %s: %s" msgstr "%s %s 警告：%s" -#: builtin/fsck.c +#: builtin/fsck.c:132 builtin/fsck.c:135 #, c-format msgid "broken link from %7s %s" msgstr "来自 %7s %s 的损坏的链接" -#: builtin/fsck.c +#: builtin/fsck.c:144 msgid "wrong object type in link" msgstr "链接中错误的对象类型" -#: builtin/fsck.c +#: builtin/fsck.c:160 #, c-format msgid "" "broken link from %7s %s\n" @@ -7697,186 +7947,187 @@ msgstr "" "损坏的链接来自于 %7s %s\n" " 到 %7s %s" -#: builtin/fsck.c builtin/prune.c connected.c +#: builtin/fsck.c:197 builtin/prune.c:64 connected.c:117 msgid "Checking connectivity" msgstr "正在检查连通性" -#: builtin/fsck.c +#: builtin/fsck.c:274 #, c-format msgid "missing %s %s" msgstr "缺失 %s %s" -#: builtin/fsck.c +#: builtin/fsck.c:301 #, c-format msgid "unreachable %s %s" msgstr "不可达 %s %s" -#: builtin/fsck.c +#: builtin/fsck.c:321 #, c-format msgid "dangling %s %s" msgstr "悬空 %s %s" -#: builtin/fsck.c +#: builtin/fsck.c:331 msgid "could not create lost-found" msgstr "不能创建 lost-found" -#: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c -#: sequencer.c +#: builtin/fsck.c:338 builtin/gc.c:1943 builtin/rebase.c:224 +#: rebase-interactive.c:127 rerere.c:481 rerere.c:689 sequencer.c:4222 +#: sequencer.c:6509 #, c-format msgid "could not write '%s'" msgstr "不能写入 '%s'" -#: builtin/fsck.c +#: builtin/fsck.c:342 #, c-format msgid "could not finish '%s'" msgstr "不能完成 '%s'" -#: builtin/fsck.c +#: builtin/fsck.c:359 #, c-format msgid "Checking %s" msgstr "正在检查 %s" -#: builtin/fsck.c +#: builtin/fsck.c:397 #, c-format msgid "Checking connectivity (%d objects)" msgstr "正在检查连通性（%d 个对象）" -#: builtin/fsck.c +#: builtin/fsck.c:416 #, c-format msgid "Checking %s %s" msgstr "正在检查 %s %s" -#: builtin/fsck.c +#: builtin/fsck.c:421 msgid "broken links" msgstr "损坏的链接" -#: builtin/fsck.c +#: builtin/fsck.c:430 #, c-format msgid "root %s" msgstr "根 %s" -#: builtin/fsck.c +#: builtin/fsck.c:438 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "标记 %s %s (%s) 于 %s" -#: builtin/fsck.c +#: builtin/fsck.c:464 #, c-format msgid "%s: object corrupt or missing" msgstr "%s：对象损坏或丢失" -#: builtin/fsck.c +#: builtin/fsck.c:489 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s：无效的引用日志条目 %s" -#: builtin/fsck.c +#: builtin/fsck.c:504 #, c-format msgid "Checking reflog %s->%s" msgstr "正在检查引用日志 %s->%s" -#: builtin/fsck.c +#: builtin/fsck.c:539 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s：无效的 sha1 指针 %s" -#: builtin/fsck.c +#: builtin/fsck.c:546 #, c-format msgid "%s: not a commit" msgstr "%s：不是一个提交" -#: builtin/fsck.c +#: builtin/fsck.c:601 msgid "notice: No default references" msgstr "注意：无默认引用" -#: builtin/fsck.c +#: builtin/fsck.c:631 #, c-format msgid "%s: hash-path mismatch, found at: %s" msgstr "%s：哈希路径不匹配，发现于 %s" -#: builtin/fsck.c +#: builtin/fsck.c:634 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s：对象损坏或丢失：%s" -#: builtin/fsck.c +#: builtin/fsck.c:638 #, c-format msgid "%s: object is of unknown type '%s': %s" msgstr "%s：对象有未知的类型 '%s': %s" -#: builtin/fsck.c +#: builtin/fsck.c:655 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s：不能解析对象：%s" -#: builtin/fsck.c +#: builtin/fsck.c:676 #, c-format msgid "bad sha1 file: %s" msgstr "坏的 sha1 文件：%s" -#: builtin/fsck.c +#: builtin/fsck.c:697 msgid "Checking object directory" msgstr "正在检查对象目录" -#: builtin/fsck.c +#: builtin/fsck.c:700 msgid "Checking object directories" msgstr "正在检查对象目录" -#: builtin/fsck.c +#: builtin/fsck.c:716 #, c-format msgid "Checking %s link" msgstr "正在检查 %s 链接" -#: builtin/fsck.c builtin/index-pack.c +#: builtin/fsck.c:723 builtin/index-pack.c:873 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/fsck.c +#: builtin/fsck.c:730 #, c-format msgid "%s points to something strange (%s)" msgstr "%s 指向奇怪的东西（%s）" -#: builtin/fsck.c +#: builtin/fsck.c:736 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s：分离头指针的指向不存在" -#: builtin/fsck.c +#: builtin/fsck.c:740 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一个尚未诞生的分支（%s）" -#: builtin/fsck.c +#: builtin/fsck.c:752 #, c-format msgid "Checking cache tree of %s" msgstr "正在检查缓存树 %s" -#: builtin/fsck.c +#: builtin/fsck.c:757 #, c-format msgid "%s: invalid sha1 pointer in cache-tree of %s" msgstr "%s：cache-tree %s 中存在无效的 sha1 指针" -#: builtin/fsck.c +#: builtin/fsck.c:766 msgid "non-tree in cache-tree" msgstr "cache-tree 中非树对象" -#: builtin/fsck.c +#: builtin/fsck.c:797 #, c-format msgid "%s: invalid sha1 pointer in resolve-undo of %s" msgstr "%s：resolve-undo %s 中存在无效的 sha1 指针" -#: builtin/fsck.c +#: builtin/fsck.c:884 #, c-format msgid "unable to load rev-index for pack '%s'" msgstr "无法为包文件 %s 加载反向索引" -#: builtin/fsck.c +#: builtin/fsck.c:889 #, c-format msgid "invalid rev-index for pack '%s'" msgstr "包文件 '%s' 的反向索引文件无效" -#: builtin/fsck.c +#: builtin/fsck.c:900 msgid "" "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" " [--[no-]full] [--strict] [--verbose] [--lost-found]\n" @@ -7888,205 +8139,205 @@ msgstr "" " [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" " [--[no-]name-objects] [<对象>...]" -#: builtin/fsck.c +#: builtin/fsck.c:909 msgid "show unreachable objects" msgstr "显示不可达的对象" -#: builtin/fsck.c +#: builtin/fsck.c:910 msgid "show dangling objects" msgstr "显示悬空的对象" -#: builtin/fsck.c +#: builtin/fsck.c:911 msgid "report tags" msgstr "报告标签" -#: builtin/fsck.c +#: builtin/fsck.c:912 msgid "report root nodes" msgstr "报告根节点" -#: builtin/fsck.c +#: builtin/fsck.c:913 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" -#: builtin/fsck.c +#: builtin/fsck.c:914 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点（默认）" -#: builtin/fsck.c +#: builtin/fsck.c:915 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" -#: builtin/fsck.c +#: builtin/fsck.c:916 msgid "check only connectivity" msgstr "仅检查连通性" -#: builtin/fsck.c builtin/mktag.c +#: builtin/fsck.c:917 builtin/mktag.c:79 msgid "enable more strict checking" msgstr "启用更严格的检查" -#: builtin/fsck.c +#: builtin/fsck.c:919 msgid "write dangling objects in .git/lost-found" msgstr "将悬空对象写入 .git/lost-found 中" -#: builtin/fsck.c builtin/prune.c +#: builtin/fsck.c:920 builtin/prune.c:157 msgid "show progress" msgstr "显示进度" -#: builtin/fsck.c +#: builtin/fsck.c:921 msgid "show verbose names for reachable objects" msgstr "显示可达对象的详细名称" -#: builtin/fsck.c builtin/index-pack.c +#: builtin/fsck.c:982 builtin/index-pack.c:269 msgid "Checking objects" msgstr "正在检查对象" -#: builtin/fsck.c +#: builtin/fsck.c:1010 #, c-format msgid "%s: object missing" msgstr "%s：对象缺失" -#: builtin/fsck.c +#: builtin/fsck.c:1021 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "无效的参数：期望 sha1，得到 '%s'" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:22 msgid "git fsmonitor--daemon start []" msgstr "git fsmonitor--daemon start [<选项>]" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:23 msgid "git fsmonitor--daemon run []" msgstr "git fsmonitor--daemon run [<选项>]" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:48 builtin/fsmonitor--daemon.c:57 #, c-format msgid "value of '%s' out of range: %d" msgstr "'%s' 的值超出范围：%d" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:67 #, c-format msgid "value of '%s' not bool or int: %d" msgstr "'%s' 的值不是 bool 或 int：%d" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:109 #, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "fsmonitor-daemon 正在监视 '%s'\n" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:114 #, c-format msgid "fsmonitor-daemon is not watching '%s'\n" msgstr "fsmonitor-daemon 不在监视 '%s'\n" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:181 #, c-format msgid "could not create fsmonitor cookie '%s'" msgstr "无法创建 fsmonitor cookie '%s'" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:766 #, c-format msgid "fsmonitor: cookie_result '%d' != SEEN" msgstr "fsmonitor: cookie_result '%d' != SEEN" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1215 #, c-format msgid "could not start IPC thread pool on '%s'" msgstr "无法在 '%s' 启动 IPC 线程池" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1225 msgid "could not start fsmonitor listener thread" msgstr "无法启动 fsmonitor 监听线程" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1236 msgid "could not start fsmonitor health thread" msgstr "无法启动 fsmonitor 健康检查线程" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1371 msgid "could not initialize listener thread" msgstr "无法初始化监听线程" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1376 msgid "could not initialize health thread" msgstr "无法初始化健康检查线程" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1395 #, c-format msgid "could not cd home '%s'" msgstr "不能切换至家目录 '%s'" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1428 builtin/fsmonitor--daemon.c:1484 #, c-format msgid "fsmonitor--daemon is already running '%s'" msgstr "fsmonitor--daemon 已经在运行 '%s'" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1432 #, c-format msgid "running fsmonitor-daemon in '%s'\n" msgstr "在 '%s' 中运行 fsmonitor-daemon\n" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1488 #, c-format msgid "starting fsmonitor-daemon in '%s'\n" msgstr "在 '%s' 中启动 fsmonitor-daemon\n" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1514 msgid "daemon failed to start" msgstr "守护进程无法启动" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1517 msgid "daemon not online yet" msgstr "守护进程尚未在线" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1520 msgid "daemon terminated" msgstr "守护进程被终结" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1531 msgid "detach from console" msgstr "从控制台分离" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1534 msgid "use ipc worker threads" msgstr "使用 个 IPC 工作线程" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1537 msgid "max seconds to wait for background daemon startup" msgstr "等待守护进程启动的最大秒数" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1551 #, c-format msgid "invalid 'ipc-threads' value (%d)" msgstr "无效的 'ipc-threads' 值（%d）" -#: builtin/fsmonitor--daemon.c t/helper/test-cache-tree.c +#: builtin/fsmonitor--daemon.c:1583 t/helper/test-cache-tree.c:67 #, c-format msgid "Unhandled subcommand '%s'" msgstr "未处理的子命令 '%s'" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1596 msgid "fsmonitor--daemon not supported on this platform" msgstr "fsmonitor--daemon 不支持本平台" -#: builtin/gc.c +#: builtin/gc.c:48 msgid "git gc []" msgstr "git gc [<选项>]" -#: builtin/gc.c +#: builtin/gc.c:106 #, c-format msgid "Failed to fstat %s: %s" msgstr "对 %s 调用 fstat 失败：%s" -#: builtin/gc.c +#: builtin/gc.c:142 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "无法解析 '%s' 值 '%s'" -#: builtin/gc.c setup.c +#: builtin/gc.c:557 setup.c:1955 #, c-format msgid "cannot stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: builtin/gc.c +#: builtin/gc.c:573 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8100,303 +8351,304 @@ msgstr "" "\n" "%s" -#: builtin/gc.c +#: builtin/gc.c:628 msgid "prune unreferenced objects" msgstr "清除未引用的对象" -#: builtin/gc.c +#: builtin/gc.c:630 msgid "pack unreferenced objects separately" msgstr "分开打包未引用的对象" -#: builtin/gc.c builtin/repack.c +#: builtin/gc.c:632 builtin/repack.c:1153 msgid "with --cruft, limit the size of new cruft packs" msgstr "使用 --cruft，限制新 cruft 包的总大小" -#: builtin/gc.c +#: builtin/gc.c:633 msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" -#: builtin/gc.c +#: builtin/gc.c:634 msgid "enable auto-gc mode" msgstr "启用自动垃圾回收模式" -#: builtin/gc.c +#: builtin/gc.c:637 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc 即使另外一个 gc 正在执行" -#: builtin/gc.c +#: builtin/gc.c:640 msgid "repack all other packs except the largest pack" msgstr "除了最大的包之外，对所有其它包文件重新打包" -#: builtin/gc.c +#: builtin/gc.c:656 #, c-format msgid "failed to parse gc.logExpiry value %s" msgstr "无法解析 gc.logExpiry 的值 %s" -#: builtin/gc.c +#: builtin/gc.c:667 #, c-format msgid "failed to parse prune expiry value %s" msgstr "无法解析清除期限值 %s" -#: builtin/gc.c +#: builtin/gc.c:687 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自动在后台执行仓库打包以求最佳性能。\n" -#: builtin/gc.c +#: builtin/gc.c:689 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包仓库以求最佳性能。\n" -#: builtin/gc.c +#: builtin/gc.c:690 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护参见 \"git help gc\"。\n" -#: builtin/gc.c +#: builtin/gc.c:731 #, c-format msgid "" "gc is already running on machine '%s' pid % (use --force if not)" msgstr "" "已经有一个 gc 正运行在机器 '%s' pid %（如果不是，使用 --force）" -#: builtin/gc.c +#: builtin/gc.c:800 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" -#: builtin/gc.c +#: builtin/gc.c:810 msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=] [--schedule]" msgstr "" "git maintenance run [--auto] [--[no-]quiet] [--task=<任务>] [--schedule]" -#: builtin/gc.c +#: builtin/gc.c:820 msgid "--no-schedule is not allowed" msgstr "--no-schedule 不被允许" -#: builtin/gc.c +#: builtin/gc.c:825 #, c-format msgid "unrecognized --schedule argument '%s'" msgstr "无法识别的 --schedule 参数 '%s'" -#: builtin/gc.c +#: builtin/gc.c:939 msgid "failed to write commit-graph" msgstr "无法写入提交图" -#: builtin/gc.c +#: builtin/gc.c:969 msgid "failed to prefetch remotes" msgstr "无法预先获取远程仓库" -#: builtin/gc.c +#: builtin/gc.c:1085 msgid "failed to start 'git pack-objects' process" msgstr "无法启动 'git pack-objects' 进程" -#: builtin/gc.c +#: builtin/gc.c:1102 msgid "failed to finish 'git pack-objects' process" msgstr "无法完成 'git pack-objects' 进程" -#: builtin/gc.c +#: builtin/gc.c:1153 msgid "failed to write multi-pack-index" msgstr "无法写入多包索引" -#: builtin/gc.c +#: builtin/gc.c:1169 msgid "'git multi-pack-index expire' failed" msgstr "'git multi-pack-index expire' 失败" -#: builtin/gc.c +#: builtin/gc.c:1228 msgid "'git multi-pack-index repack' failed" msgstr "'git multi-pack-index repack' 失败" -#: builtin/gc.c +#: builtin/gc.c:1237 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "跳过增量重新打包任务，因为 core.multiPackIndex 被禁用" -#: builtin/gc.c +#: builtin/gc.c:1341 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "锁文件 '%s' 已存在，跳过维护" -#: builtin/gc.c +#: builtin/gc.c:1371 #, c-format msgid "task '%s' failed" msgstr "任务 '%s' 失败" -#: builtin/gc.c +#: builtin/gc.c:1453 #, c-format msgid "'%s' is not a valid task" msgstr "'%s' 不是一个有效的任务" -#: builtin/gc.c +#: builtin/gc.c:1458 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "任务 '%s' 不能被多次选择" -#: builtin/gc.c +#: builtin/gc.c:1473 msgid "run tasks based on the state of the repository" msgstr "基于仓库状态来运行任务" -#: builtin/gc.c +#: builtin/gc.c:1474 msgid "frequency" msgstr "频率" -#: builtin/gc.c +#: builtin/gc.c:1475 msgid "run tasks based on frequency" msgstr "基于频率运行任务" -#: builtin/gc.c +#: builtin/gc.c:1478 msgid "do not report progress or other information over stderr" msgstr "不通过标准错误报告进度或其它信息" -#: builtin/gc.c +#: builtin/gc.c:1479 msgid "task" msgstr "任务" -#: builtin/gc.c +#: builtin/gc.c:1480 msgid "run a specific task" msgstr "运行一个特定的任务" -#: builtin/gc.c +#: builtin/gc.c:1497 msgid "use at most one of --auto and --schedule=" msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一" -#: builtin/gc.c +#: builtin/gc.c:1573 #, c-format msgid "unable to add '%s' value of '%s'" msgstr "无法添加 '%2$s' 的 '%1$s' 值" -#: builtin/gc.c +#: builtin/gc.c:1593 msgid "return success even if repository was not registered" msgstr "即便仓库非注册仍然返回成功" -#: builtin/gc.c +#: builtin/gc.c:1642 #, c-format msgid "unable to unset '%s' value of '%s'" msgstr "无法取消设置 '%2$s' 的 '%1$s' 值" -#: builtin/gc.c +#: builtin/gc.c:1645 #, c-format msgid "repository '%s' is not registered" msgstr "仓库 '%s' 未注册" -#: builtin/gc.c +#: builtin/gc.c:1778 #, c-format msgid "failed to expand path '%s'" msgstr "无法扩展路径 '%s'" -#: builtin/gc.c +#: builtin/gc.c:1805 builtin/gc.c:1843 msgid "failed to start launchctl" msgstr "无法启动 launchctl" -#: builtin/gc.c +#: builtin/gc.c:1921 builtin/gc.c:2374 builtin/gc.c:2447 #, c-format msgid "failed to create directories for '%s'" msgstr "无法为 '%s' 创建目录" -#: builtin/gc.c +#: builtin/gc.c:1948 #, c-format msgid "failed to bootstrap service %s" msgstr "无法引导服务 %s" -#: builtin/gc.c +#: builtin/gc.c:2038 msgid "failed to create temp xml file" msgstr "无法创建临时 XML 文件" -#: builtin/gc.c +#: builtin/gc.c:2131 msgid "failed to start schtasks" msgstr "无法启动计划任务" -#: builtin/gc.c +#: builtin/gc.c:2217 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "无法执行 'crontab -l'，您的系统可能不支持 'cron'" -#: builtin/gc.c +#: builtin/gc.c:2224 msgid "failed to create crontab temporary file" msgstr "无法创建 crontab 临时文件" -#: builtin/gc.c +#: builtin/gc.c:2229 msgid "failed to open temporary file" msgstr "无法打开临时文件" -#: builtin/gc.c +#: builtin/gc.c:2279 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'" -#: builtin/gc.c +#: builtin/gc.c:2284 msgid "'crontab' died" msgstr "'crontab' 终止" -#: builtin/gc.c builtin/worktree.c +#: builtin/gc.c:2335 builtin/gc.c:2348 builtin/gc.c:2544 builtin/worktree.c:152 +#: builtin/worktree.c:1304 #, c-format msgid "failed to delete '%s'" msgstr "无法删除 '%s'" -#: builtin/gc.c rerere.c +#: builtin/gc.c:2417 builtin/gc.c:2479 rerere.c:494 #, c-format msgid "failed to flush '%s'" msgstr "无法刷新 '%s'" -#: builtin/gc.c +#: builtin/gc.c:2520 msgid "failed to start systemctl" msgstr "无法启动 systemctl" -#: builtin/gc.c +#: builtin/gc.c:2530 msgid "failed to run systemctl" msgstr "无法运行 systemctl" -#: builtin/gc.c +#: builtin/gc.c:2661 #, c-format msgid "unrecognized --scheduler argument '%s'" msgstr "无法识别的 --scheduler 参数 '%s'" -#: builtin/gc.c +#: builtin/gc.c:2686 msgid "neither systemd timers nor crontab are available" msgstr "systemd 和 crontab 的定时器都不可用" -#: builtin/gc.c +#: builtin/gc.c:2701 #, c-format msgid "%s scheduler is not available" msgstr "%s 调度器不可用" -#: builtin/gc.c +#: builtin/gc.c:2715 msgid "another process is scheduling background maintenance" msgstr "另外一个进程正运行于后台维护" -#: builtin/gc.c +#: builtin/gc.c:2737 msgid "git maintenance start [--scheduler=]" msgstr "git maintenance start [--scheduler=<调度器>]" -#: builtin/gc.c +#: builtin/gc.c:2746 msgid "scheduler" msgstr "调度器" -#: builtin/gc.c +#: builtin/gc.c:2747 msgid "scheduler to trigger git maintenance run" msgstr "触发 git maintenance 执行的调度器" -#: builtin/gc.c +#: builtin/gc.c:2762 msgid "failed to set up maintenance schedule" msgstr "无法设置维护计划" -#: builtin/gc.c +#: builtin/gc.c:2765 msgid "failed to add repo to global config" msgstr "无法将仓库添加到全局配置" -#: builtin/gc.c +#: builtin/gc.c:2787 msgid "git maintenance []" msgstr "git maintenance <子命令> [<选项>]" -#: builtin/grep.c +#: builtin/grep.c:36 msgid "git grep [] [-e] [...] [[--] ...]" msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" -#: builtin/grep.c +#: builtin/grep.c:245 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep：无法创建线程：%s" -#: builtin/grep.c +#: builtin/grep.c:303 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "为 %2$s 设定的线程数 (%1$d) 无效" @@ -8406,257 +8658,258 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c +#: builtin/grep.c:311 builtin/index-pack.c:1594 builtin/index-pack.c:1800 +#: builtin/pack-objects.c:3281 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" -#: builtin/grep.c +#: builtin/grep.c:575 #, c-format msgid "unable to read tree %s" msgstr "无法读取树 %s" -#: builtin/grep.c +#: builtin/grep.c:723 #, c-format msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c +#: builtin/grep.c:803 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c +#: builtin/grep.c:909 msgid "search in index instead of in the work tree" msgstr "在索引区搜索而不是在工作区" -#: builtin/grep.c +#: builtin/grep.c:911 msgid "find in contents not managed by git" msgstr "在未被 git 管理的内容中查找" -#: builtin/grep.c +#: builtin/grep.c:913 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" -#: builtin/grep.c +#: builtin/grep.c:915 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的文件" -#: builtin/grep.c +#: builtin/grep.c:917 msgid "recursively search in each submodule" msgstr "在每一个子模组中递归搜索" -#: builtin/grep.c +#: builtin/grep.c:920 msgid "show non-matching lines" msgstr "显示未匹配的行" -#: builtin/grep.c +#: builtin/grep.c:922 msgid "case insensitive matching" msgstr "不区分大小写匹配" -#: builtin/grep.c +#: builtin/grep.c:924 msgid "match patterns only at word boundaries" msgstr "只在单词边界匹配模式" -#: builtin/grep.c +#: builtin/grep.c:926 msgid "process binary files as text" msgstr "把二进制文件当做文本处理" -#: builtin/grep.c +#: builtin/grep.c:928 msgid "don't match patterns in binary files" msgstr "不在二进制文件中匹配模式" -#: builtin/grep.c +#: builtin/grep.c:931 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处理二进制文件" -#: builtin/grep.c +#: builtin/grep.c:933 msgid "search in subdirectories (default)" msgstr "在子目录中寻找（默认）" -#: builtin/grep.c +#: builtin/grep.c:935 msgid "descend at most levels" msgstr "最多向下寻找 层" -#: builtin/grep.c +#: builtin/grep.c:938 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX 正则表达式" -#: builtin/grep.c +#: builtin/grep.c:941 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正则表达式（默认）" -#: builtin/grep.c +#: builtin/grep.c:944 msgid "interpret patterns as fixed strings" msgstr "把模式解析为固定的字符串" -#: builtin/grep.c +#: builtin/grep.c:947 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的正则表达式" -#: builtin/grep.c +#: builtin/grep.c:950 msgid "show line numbers" msgstr "显示行号" -#: builtin/grep.c +#: builtin/grep.c:951 msgid "show column number of first match" msgstr "显示第一个匹配的列号" -#: builtin/grep.c +#: builtin/grep.c:952 msgid "don't show filenames" msgstr "不显示文件名" -#: builtin/grep.c +#: builtin/grep.c:953 msgid "show filenames" msgstr "显示文件名" -#: builtin/grep.c +#: builtin/grep.c:955 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/grep.c +#: builtin/grep.c:957 msgid "show only filenames instead of matching lines" msgstr "只显示文件名而不显示匹配的行" -#: builtin/grep.c +#: builtin/grep.c:959 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同义" -#: builtin/grep.c +#: builtin/grep.c:962 msgid "show only the names of files without match" msgstr "只显示未匹配的文件名" -#: builtin/grep.c +#: builtin/grep.c:964 msgid "print NUL after filenames" msgstr "在文件名后输出 NUL 字符" -#: builtin/grep.c +#: builtin/grep.c:967 msgid "show only matching parts of a line" msgstr "只显示行中的匹配的部分" -#: builtin/grep.c +#: builtin/grep.c:969 msgid "show the number of matches instead of matching lines" msgstr "显示总匹配行数，而不显示匹配的行" -#: builtin/grep.c +#: builtin/grep.c:970 msgid "highlight matches" msgstr "高亮显示匹配项" -#: builtin/grep.c +#: builtin/grep.c:972 msgid "print empty line between matches from different files" msgstr "在不同文件的匹配项之间打印空行" -#: builtin/grep.c +#: builtin/grep.c:974 msgid "show filename only once above matches from same file" msgstr "只在同一文件的匹配项的上面显示一次文件名" -#: builtin/grep.c +#: builtin/grep.c:977 msgid "show context lines before and after matches" msgstr "显示匹配项前后的 行上下文" -#: builtin/grep.c +#: builtin/grep.c:980 msgid "show context lines before matches" msgstr "显示匹配项前 行上下文" -#: builtin/grep.c +#: builtin/grep.c:982 msgid "show context lines after matches" msgstr "显示匹配项后 行上下文" -#: builtin/grep.c +#: builtin/grep.c:984 msgid "use worker threads" msgstr "使用 个工作线程" -#: builtin/grep.c +#: builtin/grep.c:985 msgid "shortcut for -C NUM" msgstr "快捷键 -C 数字" -#: builtin/grep.c +#: builtin/grep.c:988 msgid "show a line with the function name before matches" msgstr "在匹配的前面显示一行函数名" -#: builtin/grep.c +#: builtin/grep.c:990 msgid "show the surrounding function" msgstr "显示所在函数的前后内容" -#: builtin/grep.c +#: builtin/grep.c:993 msgid "read patterns from file" msgstr "从文件读取模式" -#: builtin/grep.c +#: builtin/grep.c:995 msgid "match " msgstr "匹配 <模式>" -#: builtin/grep.c +#: builtin/grep.c:997 msgid "combine patterns specified with -e" msgstr "组合用 -e 参数设定的模式" -#: builtin/grep.c +#: builtin/grep.c:1009 msgid "indicate hit with exit status without output" msgstr "不输出，而用退出码标识命中状态" -#: builtin/grep.c +#: builtin/grep.c:1011 msgid "show only matches from files that match all patterns" msgstr "只显示匹配所有模式的文件中的匹配" -#: builtin/grep.c +#: builtin/grep.c:1014 msgid "pager" msgstr "分页" -#: builtin/grep.c +#: builtin/grep.c:1014 msgid "show matching files in the pager" msgstr "分页显示匹配的文件" -#: builtin/grep.c +#: builtin/grep.c:1018 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c +#: builtin/grep.c:1021 msgid "maximum number of results per file" msgstr "每个文件的最大结果数量" -#: builtin/grep.c +#: builtin/grep.c:1091 msgid "no pattern given" msgstr "未提供匹配模式" -#: builtin/grep.c +#: builtin/grep.c:1127 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同时使用" -#: builtin/grep.c +#: builtin/grep.c:1135 #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" -#: builtin/grep.c +#: builtin/grep.c:1165 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked 不支持和 --recurse-submodules 共用" -#: builtin/grep.c +#: builtin/grep.c:1176 msgid "invalid option combination, ignoring --threads" msgstr "无效的选项组合，忽略 --threads" -#: builtin/grep.c builtin/pack-objects.c +#: builtin/grep.c:1179 builtin/pack-objects.c:4494 msgid "no threads support, ignoring --threads" msgstr "没有线程支持，忽略 --threads" -#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c +#: builtin/grep.c:1182 builtin/index-pack.c:1591 builtin/pack-objects.c:3278 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" -#: builtin/grep.c +#: builtin/grep.c:1216 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c +#: builtin/grep.c:1249 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard 不能用于已跟踪内容" -#: builtin/grep.c +#: builtin/grep.c:1257 msgid "both --cached and trees are given" msgstr "同时给出了 --cached 和树对象" -#: builtin/hash-object.c +#: builtin/hash-object.c:90 msgid "" "git hash-object [-t ] [-w] [--path= | --no-filters]\n" " [--stdin [--literally]] [--] ..." @@ -8664,111 +8917,111 @@ msgstr "" "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters]\n" " [--stdin [--literally]] [--] <文件>..." -#: builtin/hash-object.c +#: builtin/hash-object.c:92 msgid "git hash-object [-t ] [-w] --stdin-paths [--no-filters]" msgstr "git hash-object [-t <类型>] [-w] --stdin-paths [--no-filters]" -#: builtin/hash-object.c +#: builtin/hash-object.c:105 msgid "object type" msgstr "对象类型" -#: builtin/hash-object.c +#: builtin/hash-object.c:106 msgid "write the object into the object database" msgstr "将对象写入对象数据库" -#: builtin/hash-object.c +#: builtin/hash-object.c:108 msgid "read the object from stdin" msgstr "从标准输入读取对象" -#: builtin/hash-object.c +#: builtin/hash-object.c:110 msgid "store file as is without filters" msgstr "原样存储文件不使用过滤器" -#: builtin/hash-object.c +#: builtin/hash-object.c:111 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" -#: builtin/hash-object.c +#: builtin/hash-object.c:112 msgid "process file as it were from this path" msgstr "处理文件并假设其来自于此路径" -#: builtin/help.c +#: builtin/help.c:62 msgid "print all available commands" msgstr "打印所有可用的命令" -#: builtin/help.c +#: builtin/help.c:65 msgid "show external commands in --all" msgstr "在 --all 中显示外部命令" -#: builtin/help.c +#: builtin/help.c:66 msgid "show aliases in --all" msgstr "在 --all 中显示别名" -#: builtin/help.c +#: builtin/help.c:67 msgid "exclude guides" msgstr "排除向导" -#: builtin/help.c +#: builtin/help.c:68 msgid "show man page" msgstr "显示 man 手册" -#: builtin/help.c +#: builtin/help.c:69 msgid "show manual in web browser" msgstr "在 web 浏览器中显示手册" -#: builtin/help.c +#: builtin/help.c:71 msgid "show info page" msgstr "显示 info 手册" -#: builtin/help.c +#: builtin/help.c:73 msgid "print command description" msgstr "打印命令描述" -#: builtin/help.c +#: builtin/help.c:75 msgid "print list of useful guides" msgstr "显示有用的指南列表" -#: builtin/help.c +#: builtin/help.c:78 msgid "print list of user-facing repository, command and file interfaces" msgstr "打印面向用户的仓库、命令和文件接口列表" -#: builtin/help.c +#: builtin/help.c:81 msgid "print list of file formats, protocols and other developer interfaces" msgstr "打印文件格式、协议和其他开发者接口列表" -#: builtin/help.c +#: builtin/help.c:83 msgid "print all configuration variable names" msgstr "打印所有配置变量名称" -#: builtin/help.c +#: builtin/help.c:95 msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [|]" msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<命令>|<文档>]" -#: builtin/help.c +#: builtin/help.c:214 #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" -#: builtin/help.c +#: builtin/help.c:240 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" -#: builtin/help.c +#: builtin/help.c:253 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" -#: builtin/help.c +#: builtin/help.c:261 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c +#: builtin/help.c:279 builtin/help.c:301 builtin/help.c:311 builtin/help.c:319 #, c-format msgid "failed to exec '%s'" msgstr "无法执行 '%s'" -#: builtin/help.c +#: builtin/help.c:357 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -8777,7 +9030,7 @@ msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" "请使用 'man.<工具>.cmd'。" -#: builtin/help.c +#: builtin/help.c:369 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -8786,49 +9039,49 @@ msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<工具>.path'。" -#: builtin/help.c +#: builtin/help.c:487 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c +#: builtin/help.c:503 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c +#: builtin/help.c:510 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c git.c +#: builtin/help.c:571 builtin/help.c:582 git.c:370 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的别名" -#: builtin/help.c git.c +#: builtin/help.c:585 git.c:400 #, c-format msgid "bad alias.%s string: %s" msgstr "坏的 alias.%s 字符串：%s" -#: builtin/help.c +#: builtin/help.c:627 #, c-format msgid "the '%s' option doesn't take any non-option arguments" msgstr "'%s' 选项不带任何非选项参数" -#: builtin/help.c +#: builtin/help.c:647 msgid "" "the '--no-[external-commands|aliases]' options can only be used with '--all'" msgstr "'--no-[external-commands|aliases]' 选项只能和 '--all' 一起使用" -#: builtin/help.c +#: builtin/help.c:659 builtin/help.c:695 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c +#: builtin/help.c:690 msgid "'git help config' for more information" msgstr "'git help config' 获取更多信息" -#: builtin/hook.c +#: builtin/hook.c:9 msgid "" "git hook run [--ignore-missing] [--to-stdin=] [-- ]" @@ -8836,283 +9089,285 @@ msgstr "" "git hook run [--ignore-missing] [--to-stdin=<路径>] <钩子名称> [-- <钩子参数" ">]" -#: builtin/hook.c +#: builtin/hook.c:29 msgid "silently ignore missing requested " msgstr "静默地忽略缺失的 <钩子名称>" -#: builtin/hook.c +#: builtin/hook.c:31 msgid "file to read into hooks' stdin" msgstr "读取至钩子标准输入的文件" -#: builtin/index-pack.c +#: builtin/index-pack.c:229 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型不匹配" -#: builtin/index-pack.c +#: builtin/index-pack.c:249 #, c-format msgid "did not receive expected object %s" msgstr "未能获取预期的对象 %s" -#: builtin/index-pack.c +#: builtin/index-pack.c:252 #, c-format msgid "object %s: expected type %s, found %s" msgstr "对象 %s：应为类型 %s，却是 %s" -#: builtin/index-pack.c +#: builtin/index-pack.c:302 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "无法填充 %d 字节" msgstr[1] "无法填充 %d 字节" -#: builtin/index-pack.c +#: builtin/index-pack.c:312 msgid "early EOF" msgstr "过早的文件结束符（EOF）" -#: builtin/index-pack.c +#: builtin/index-pack.c:313 msgid "read error on input" msgstr "输入上的读错误" -#: builtin/index-pack.c +#: builtin/index-pack.c:325 msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" -#: builtin/index-pack.c builtin/pack-objects.c +#: builtin/index-pack.c:332 builtin/pack-objects.c:769 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" -#: builtin/index-pack.c +#: builtin/index-pack.c:337 #, c-format msgid "pack exceeds maximum allowed size (%s)" msgstr "包超过了最大允许大小（%s）" -#: builtin/index-pack.c +#: builtin/index-pack.c:370 msgid "pack signature mismatch" msgstr "包签名不匹配" -#: builtin/index-pack.c +#: builtin/index-pack.c:372 #, c-format msgid "pack version % unsupported" msgstr "不支持包版本 %" -#: builtin/index-pack.c +#: builtin/index-pack.c:388 #, c-format msgid "pack has bad object at offset %: %s" msgstr "包中有错误的对象位于偏移量 %：%s" -#: builtin/index-pack.c +#: builtin/index-pack.c:493 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" -#: builtin/index-pack.c +#: builtin/index-pack.c:543 msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" -#: builtin/index-pack.c +#: builtin/index-pack.c:551 msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" -#: builtin/index-pack.c +#: builtin/index-pack.c:559 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" -#: builtin/index-pack.c +#: builtin/index-pack.c:590 msgid "cannot pread pack file" msgstr "无法读取包文件" -#: builtin/index-pack.c +#: builtin/index-pack.c:592 #, c-format msgid "premature end of pack file, % byte missing" msgid_plural "premature end of pack file, % bytes missing" msgstr[0] "包文件过早结束，缺少 % 字节" msgstr[1] "包文件过早结束，缺少 % 字节" -#: builtin/index-pack.c +#: builtin/index-pack.c:618 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" -#: builtin/index-pack.c +#: builtin/index-pack.c:763 builtin/index-pack.c:769 builtin/index-pack.c:793 +#: builtin/index-pack.c:833 builtin/index-pack.c:843 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c +#: builtin/index-pack.c:831 #, c-format msgid "cannot read existing object info %s" msgstr "不能读取现存对象信息 %s" -#: builtin/index-pack.c +#: builtin/index-pack.c:840 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" -#: builtin/index-pack.c +#: builtin/index-pack.c:854 #, c-format msgid "invalid blob object %s" msgstr "无效的数据对象 %s" -#: builtin/index-pack.c +#: builtin/index-pack.c:857 builtin/index-pack.c:876 msgid "fsck error in packed object" msgstr "对打包对象 fsck 检查出错" -#: builtin/index-pack.c +#: builtin/index-pack.c:878 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" -#: builtin/index-pack.c +#: builtin/index-pack.c:939 builtin/index-pack.c:986 msgid "failed to apply delta" msgstr "无法应用 delta" -#: builtin/index-pack.c +#: builtin/index-pack.c:1173 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c +#: builtin/index-pack.c:1173 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c +#: builtin/index-pack.c:1209 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" -#: builtin/index-pack.c +#: builtin/index-pack.c:1214 msgid "cannot fstat packfile" msgstr "不能对包文件调用 fstat" -#: builtin/index-pack.c +#: builtin/index-pack.c:1217 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c +#: builtin/index-pack.c:1229 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" -#: builtin/index-pack.c +#: builtin/index-pack.c:1252 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c builtin/pack-objects.c +#: builtin/index-pack.c:1264 builtin/pack-objects.c:3022 #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程：%s" -#: builtin/index-pack.c +#: builtin/index-pack.c:1298 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c +#: builtin/index-pack.c:1304 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "完成 %d 个本地对象" msgstr[1] "完成 %d 个本地对象" -#: builtin/index-pack.c +#: builtin/index-pack.c:1316 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" -#: builtin/index-pack.c +#: builtin/index-pack.c:1320 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" -#: builtin/index-pack.c +#: builtin/index-pack.c:1344 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c +#: builtin/index-pack.c:1440 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c +#: builtin/index-pack.c:1462 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "包文件名 '%s' 没有以 '.%s' 结尾" -#: builtin/index-pack.c +#: builtin/index-pack.c:1486 #, c-format msgid "cannot write %s file '%s'" msgstr "无法写入 %s 文件 '%s'" -#: builtin/index-pack.c +#: builtin/index-pack.c:1494 #, c-format msgid "cannot close written %s file '%s'" msgstr "无法关闭已写入的 %s 文件 '%s'" -#: builtin/index-pack.c +#: builtin/index-pack.c:1511 #, c-format msgid "unable to rename temporary '*.%s' file to '%s'" msgstr "不能重命名临时文件 '*.%s' 为 '%s'" -#: builtin/index-pack.c +#: builtin/index-pack.c:1534 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c builtin/pack-objects.c +#: builtin/index-pack.c:1585 builtin/pack-objects.c:3289 #, c-format msgid "bad pack.indexVersion=%" msgstr "坏的 pack.indexVersion=%" -#: builtin/index-pack.c +#: builtin/index-pack.c:1655 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c +#: builtin/index-pack.c:1657 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c +#: builtin/index-pack.c:1705 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 个对象" msgstr[1] "非 delta：%d 个对象" -#: builtin/index-pack.c +#: builtin/index-pack.c:1712 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "链长 = %d: %lu 对象" msgstr[1] "链长 = %d: %lu 对象" -#: builtin/index-pack.c +#: builtin/index-pack.c:1756 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: builtin/index-pack.c +#: builtin/index-pack.c:1811 builtin/index-pack.c:1814 +#: builtin/index-pack.c:1834 builtin/index-pack.c:1838 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c builtin/init-db.c setup.c +#: builtin/index-pack.c:1844 builtin/init-db.c:164 setup.c:2302 #, c-format msgid "unknown hash algorithm '%s'" msgstr "未知的哈希算法 '%s'" -#: builtin/index-pack.c +#: builtin/index-pack.c:1865 msgid "--stdin requires a git repository" msgstr "--stdin 需要 git 仓库" -#: builtin/index-pack.c +#: builtin/index-pack.c:1882 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包文件名参数" -#: builtin/index-pack.c builtin/unpack-objects.c +#: builtin/index-pack.c:1948 builtin/unpack-objects.c:675 msgid "fsck error in pack objects" msgstr "在打包对象中 fsck 检查出错" -#: builtin/init-db.c +#: builtin/init-db.c:59 msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" @@ -9126,53 +9381,53 @@ msgstr "" " [-b <分支名> | --initial-branch=<分支名>]\n" " [--shared[=<权限>]] [<目录>]" -#: builtin/init-db.c +#: builtin/init-db.c:92 msgid "permissions" msgstr "权限" -#: builtin/init-db.c +#: builtin/init-db.c:93 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 仓库是多个用户之间共享的" -#: builtin/init-db.c +#: builtin/init-db.c:99 msgid "override the name of the initial branch" msgstr "覆盖初始分支名称" -#: builtin/init-db.c builtin/verify-pack.c +#: builtin/init-db.c:100 builtin/verify-pack.c:75 msgid "hash" msgstr "hash" -#: builtin/init-db.c builtin/show-index.c builtin/verify-pack.c +#: builtin/init-db.c:101 builtin/show-index.c:25 builtin/verify-pack.c:76 msgid "specify the hash algorithm to use" msgstr "指定要使用的哈希算法" -#: builtin/init-db.c +#: builtin/init-db.c:141 builtin/init-db.c:146 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c +#: builtin/init-db.c:150 builtin/init-db.c:211 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c +#: builtin/init-db.c:183 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）" -#: builtin/init-db.c +#: builtin/init-db.c:235 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" -#: builtin/init-db.c +#: builtin/init-db.c:240 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir 不能用于纯仓库" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:17 msgid "" "git interpret-trailers [--in-place] [--trim-empty]\n" " [(--trailer (|)[(=|:)])...]\n" @@ -9182,234 +9437,236 @@ msgstr "" " [(--trailer (<键|键别名>)[(=|:)<值>])...]\n" " [--parse] [<文件>...]" -#: builtin/interpret-trailers.c wrapper.c +#: builtin/interpret-trailers.c:105 wrapper.c:728 #, c-format msgid "could not stat %s" msgstr "不能对 %s 调用 stat" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:107 #, c-format msgid "file %s is not a regular file" msgstr "文件 %s 不是一个普通文件" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:109 #, c-format msgid "file %s is not writable by user" msgstr "文件 %s 用户不可写" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:121 msgid "could not open temporary file" msgstr "不能打开临时文件" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:130 #, c-format msgid "could not read input file '%s'" msgstr "不能读取输入文件 '%s'" -#: builtin/interpret-trailers.c builtin/mktag.c imap-send.c +#: builtin/interpret-trailers.c:133 builtin/mktag.c:92 imap-send.c:1552 msgid "could not read from stdin" msgstr "不能自标准输入读取" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:186 #, c-format msgid "could not rename temporary file to %s" msgstr "不能重命名临时文件为 %s" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:197 msgid "edit files in place" msgstr "在原位编辑文件" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:198 msgid "trim empty trailers" msgstr "删除空的尾注" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:200 msgid "placement" msgstr "安置" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:201 msgid "where to place the new trailer" msgstr "在哪里放置新的尾注" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:203 msgid "action if trailer already exists" msgstr "当尾注已经存在时所采取的动作" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:205 msgid "action if trailer is missing" msgstr "当尾注缺失时所采取的动作" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:207 msgid "output only the trailers" msgstr "只输出尾注" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:208 msgid "do not apply trailer.* configuration variables" msgstr "不应用 trailer.* 配置变量" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:209 msgid "reformat multiline trailer values as single-line values" msgstr "将多行尾注值重新格式化为单行值" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:210 msgid "alias for --only-trailers --only-input --unfold" msgstr "--only-trailers --only-input --unfold 的别名" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:212 msgid "do not treat \"---\" as the end of input" msgstr "不要将 \"---\" 视为输入的结束" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:214 msgid "trailer(s) to add" msgstr "要添加的尾注" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:225 msgid "--trailer with --only-input does not make sense" msgstr "--trailer 和 --only-input 同时使用没有意义" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:235 msgid "no input file given for in-place editing" msgstr "没有给出要原位编辑的文件" -#: builtin/log.c +#: builtin/log.c:56 msgid "git log [] [] [[--] ...]" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" -#: builtin/log.c +#: builtin/log.c:57 msgid "git show [] ..." msgstr "git show [<选项>] <对象>..." -#: builtin/log.c +#: builtin/log.c:162 #, c-format msgid "invalid --decorate option: %s" msgstr "无效的 --decorate 选项：%s" -#: builtin/log.c diff.c +#: builtin/log.c:265 diff.c:5620 msgid "suppress diff output" msgstr "不显示差异输出" -#: builtin/log.c +#: builtin/log.c:266 msgid "show source" msgstr "显示源" -#: builtin/log.c +#: builtin/log.c:270 msgid "clear all previously-defined decoration filters" msgstr "清除所有之前定义的修饰过滤器" -#: builtin/log.c +#: builtin/log.c:274 msgid "only decorate refs that match " msgstr "只修饰与 <模式> 匹配的引用" -#: builtin/log.c +#: builtin/log.c:276 msgid "do not decorate refs that match " msgstr "不修饰和 <模式> 匹配的引用" -#: builtin/log.c +#: builtin/log.c:277 msgid "decorate options" msgstr "修饰选项" -#: builtin/log.c +#: builtin/log.c:280 msgid "" "trace the evolution of line range , or function : in " "" msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变" -#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c +#: builtin/log.c:300 builtin/log.c:2241 builtin/replay.c:336 +#: builtin/shortlog.c:439 bundle.c:531 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" -#: builtin/log.c +#: builtin/log.c:303 msgid "-L: cannot be used with pathspec" msgstr "-L<范围>:<文件> 不能和路径表达式共用" -#: builtin/log.c +#: builtin/log.c:404 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c +#: builtin/log.c:511 msgid "unable to create temporary object directory" msgstr "无法创建临时对象目录" -#: builtin/log.c +#: builtin/log.c:706 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 损坏的文件" -#: builtin/log.c +#: builtin/log.c:721 builtin/log.c:823 #, c-format msgid "could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c +#: builtin/log.c:861 #, c-format msgid "unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c +#: builtin/log.c:1043 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s：从描述生成附函的模式无效" -#: builtin/log.c +#: builtin/log.c:1073 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c +#: builtin/log.c:1234 #, c-format msgid "cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c +#: builtin/log.c:1251 msgid "need exactly one range" msgstr "只需要一个范围" -#: builtin/log.c +#: builtin/log.c:1261 msgid "not a range" msgstr "不是一个范围" -#: builtin/log.c +#: builtin/log.c:1356 #, c-format msgid "unable to read branch description file '%s'" msgstr "无法读取分支描述文件 '%s'" -#: builtin/log.c +#: builtin/log.c:1439 msgid "cover letter needs email format" msgstr "附函需要邮件地址格式" -#: builtin/log.c +#: builtin/log.c:1445 msgid "failed to create cover-letter file" msgstr "无法创建附函文件" -#: builtin/log.c +#: builtin/log.c:1536 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c +#: builtin/log.c:1563 msgid "git format-patch [] [ | ]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" -#: builtin/log.c +#: builtin/log.c:1631 msgid "two output directories?" msgstr "两个输出目录？" -#: builtin/log.c +#: builtin/log.c:1768 builtin/log.c:2657 builtin/log.c:2659 builtin/log.c:2671 #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c builtin/replace.c +#: builtin/log.c:1779 builtin/replace.c:67 builtin/replace.c:222 +#: builtin/replace.c:225 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "无法将 '%s' 解析为一个有效引用" -#: builtin/log.c +#: builtin/log.c:1791 msgid "could not find exact merge base" msgstr "不能找到准确的合并基线" -#: builtin/log.c +#: builtin/log.c:1801 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -9419,412 +9676,417 @@ msgstr "" "git branch --set-upstream-to 来跟踪一个远程分支。或者您可以通过\n" "参数 --base=<基线提交> 手动指定一个基线提交" -#: builtin/log.c +#: builtin/log.c:1826 msgid "failed to find exact merge base" msgstr "无法找到准确的合并基线" -#: builtin/log.c +#: builtin/log.c:1846 msgid "base commit should be the ancestor of revision list" msgstr "基线提交应该是版本列表的祖先" -#: builtin/log.c +#: builtin/log.c:1856 msgid "base commit shouldn't be in revision list" msgstr "基线提交不应该出现在版本列表中" -#: builtin/log.c +#: builtin/log.c:1914 msgid "cannot get patch id" msgstr "无法得到补丁 id" -#: builtin/log.c +#: builtin/log.c:1977 msgid "failed to infer range-diff origin of current series" msgstr "无法推断当前系列的 range-diff 起始" -#: builtin/log.c +#: builtin/log.c:1979 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "使用 '%s' 作为当前系列的 range-diff 源" -#: builtin/log.c +#: builtin/log.c:2033 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" -#: builtin/log.c +#: builtin/log.c:2036 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" -#: builtin/log.c +#: builtin/log.c:2040 msgid "print patches to standard out" msgstr "打印补丁到标准输出" -#: builtin/log.c +#: builtin/log.c:2042 msgid "generate a cover letter" msgstr "生成一封附函" -#: builtin/log.c +#: builtin/log.c:2044 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c +#: builtin/log.c:2045 msgid "sfx" msgstr "后缀" -#: builtin/log.c +#: builtin/log.c:2046 msgid "use instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c +#: builtin/log.c:2048 msgid "start numbering patches at instead of 1" msgstr "补丁以 开始编号，而不是1" -#: builtin/log.c +#: builtin/log.c:2049 msgid "reroll-count" msgstr "重制-计数" -#: builtin/log.c +#: builtin/log.c:2050 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" -#: builtin/log.c +#: builtin/log.c:2052 msgid "max length of output filename" msgstr "输出文件名的最大长度" -#: builtin/log.c -msgid "use [RFC PATCH] instead of [PATCH]" -msgstr "使用 [RFC PATCH] 代替 [PATCH]" +#: builtin/log.c:2053 +msgid "rfc" +msgstr "rfc 补丁" -#: builtin/log.c +#: builtin/log.c:2054 +msgid "add (default 'RFC') before 'PATCH'" +msgstr "在 'PATCH' 之前添加 （默认为 'RFC'）" + +#: builtin/log.c:2057 msgid "cover-from-description-mode" msgstr "从分支描述获取附函的模式" -#: builtin/log.c +#: builtin/log.c:2058 msgid "generate parts of a cover letter based on a branch's description" msgstr "基于一个分支描述生成部分附函" -#: builtin/log.c +#: builtin/log.c:2060 msgid "use branch description from file" msgstr "使用来自文件的分支描述" -#: builtin/log.c +#: builtin/log.c:2062 msgid "use [] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c +#: builtin/log.c:2065 msgid "store resulting files in " msgstr "把结果文件存储在 <目录>" -#: builtin/log.c +#: builtin/log.c:2068 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" -#: builtin/log.c +#: builtin/log.c:2071 msgid "don't output binary diffs" msgstr "不输出二进制差异" -#: builtin/log.c +#: builtin/log.c:2073 msgid "output all-zero hash in From header" msgstr "在 From 头信息中输出全为零的哈希值" -#: builtin/log.c +#: builtin/log.c:2075 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c +#: builtin/log.c:2077 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" -#: builtin/log.c +#: builtin/log.c:2079 msgid "Messaging" msgstr "邮件发送" -#: builtin/log.c +#: builtin/log.c:2080 msgid "header" msgstr "header" -#: builtin/log.c +#: builtin/log.c:2081 msgid "add email header" msgstr "添加邮件头" -#: builtin/log.c +#: builtin/log.c:2082 builtin/log.c:2083 msgid "email" msgstr "邮件地址" -#: builtin/log.c +#: builtin/log.c:2082 msgid "add To: header" msgstr "添加收件人" -#: builtin/log.c +#: builtin/log.c:2083 msgid "add Cc: header" msgstr "添加抄送" -#: builtin/log.c +#: builtin/log.c:2084 msgid "ident" msgstr "标识" -#: builtin/log.c +#: builtin/log.c:2085 msgid "set From address to (or committer ident if absent)" msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）" -#: builtin/log.c +#: builtin/log.c:2087 msgid "message-id" msgstr "邮件标识" -#: builtin/log.c +#: builtin/log.c:2088 msgid "make first mail a reply to " msgstr "使第一封邮件作为对 <邮件标识> 的回复" -#: builtin/log.c +#: builtin/log.c:2089 builtin/log.c:2092 msgid "boundary" msgstr "边界" -#: builtin/log.c +#: builtin/log.c:2090 msgid "attach the patch" msgstr "附件方式添加补丁" -#: builtin/log.c +#: builtin/log.c:2093 msgid "inline the patch" msgstr "内联显示补丁" -#: builtin/log.c +#: builtin/log.c:2097 msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索，风格：浅，深" -#: builtin/log.c +#: builtin/log.c:2099 msgid "signature" msgstr "签名" -#: builtin/log.c +#: builtin/log.c:2100 msgid "add a signature" msgstr "添加一个签名" -#: builtin/log.c +#: builtin/log.c:2101 msgid "base-commit" msgstr "基线提交" -#: builtin/log.c +#: builtin/log.c:2102 msgid "add prerequisite tree info to the patch series" msgstr "为补丁列表添加前置树信息" -#: builtin/log.c +#: builtin/log.c:2105 msgid "add a signature from a file" msgstr "从文件添加一个签名" -#: builtin/log.c +#: builtin/log.c:2106 msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" -#: builtin/log.c +#: builtin/log.c:2108 msgid "show progress while generating patches" msgstr "在生成补丁时显示进度" -#: builtin/log.c +#: builtin/log.c:2110 msgid "show changes against in cover letter or single patch" msgstr "在附函或单个补丁中显示和 <版本> 的差异" -#: builtin/log.c +#: builtin/log.c:2113 msgid "show changes against in cover letter or single patch" msgstr "在附函或单个补丁中显示和 <引用规格> 的差异" -#: builtin/log.c builtin/range-diff.c +#: builtin/log.c:2115 builtin/range-diff.c:29 msgid "percentage by which creation is weighted" msgstr "创建权重的百分比" -#: builtin/log.c +#: builtin/log.c:2117 msgid "show in-body From: even if identical to the e-mail header" msgstr "显示正文内的 From:，即使其与电子邮件头中一致" -#: builtin/log.c +#: builtin/log.c:2219 #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" -#: builtin/log.c +#: builtin/log.c:2244 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c +#: builtin/log.c:2246 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c +#: builtin/log.c:2248 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c +#: builtin/log.c:2250 msgid "--remerge-diff does not make sense" msgstr "--remerge-diff 无意义" -#: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c +#: builtin/log.c:2306 builtin/submodule--helper.c:1722 +#: builtin/submodule--helper.c:1780 rerere.c:880 submodule.c:2379 #, c-format msgid "could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: builtin/log.c +#: builtin/log.c:2397 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或单一补丁" -#: builtin/log.c +#: builtin/log.c:2401 msgid "Interdiff:" msgstr "版本间差异：" -#: builtin/log.c +#: builtin/log.c:2402 #, c-format msgid "Interdiff against v%d:" msgstr "对 v%d 的版本差异：" -#: builtin/log.c +#: builtin/log.c:2412 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或单一补丁" -#: builtin/log.c +#: builtin/log.c:2420 msgid "Range-diff:" msgstr "范围差异：" -#: builtin/log.c +#: builtin/log.c:2421 #, c-format msgid "Range-diff against v%d:" msgstr "对 v%d 的范围差异：" -#: builtin/log.c +#: builtin/log.c:2443 #, c-format msgid "unable to read signature file '%s'" msgstr "无法读取签名文件 '%s'" -#: builtin/log.c +#: builtin/log.c:2483 msgid "Generating patches" msgstr "生成补丁" -#: builtin/log.c +#: builtin/log.c:2527 msgid "failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c +#: builtin/log.c:2592 msgid "git cherry [-v] [ [ []]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c +#: builtin/log.c:2646 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" -#: builtin/ls-files.c builtin/ls-tree.c +#: builtin/ls-files.c:251 builtin/ls-tree.c:29 #, c-format msgid "could not get object info about '%s'" msgstr "无法获得关于 '%s' 的对象信息" -#: builtin/ls-files.c +#: builtin/ls-files.c:520 msgid "git ls-files [] [...]" msgstr "git ls-files [<选项>] [<文件>...]" -#: builtin/ls-files.c builtin/merge-tree.c +#: builtin/ls-files.c:574 builtin/merge-tree.c:551 msgid "separate paths with the NUL character" msgstr "用 NUL 字符分隔路径" -#: builtin/ls-files.c +#: builtin/ls-files.c:576 msgid "identify the file status with tags" msgstr "用标签标识文件的状态" -#: builtin/ls-files.c +#: builtin/ls-files.c:578 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小写字母表示 '假设未改变的' 文件" -#: builtin/ls-files.c +#: builtin/ls-files.c:580 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "使用小写字母表示 'fsmonitor clean' 文件" -#: builtin/ls-files.c +#: builtin/ls-files.c:582 msgid "show cached files in the output (default)" msgstr "显示缓存的文件（默认）" -#: builtin/ls-files.c +#: builtin/ls-files.c:584 msgid "show deleted files in the output" msgstr "显示已删除的文件" -#: builtin/ls-files.c +#: builtin/ls-files.c:586 msgid "show modified files in the output" msgstr "显示已修改的文件" -#: builtin/ls-files.c +#: builtin/ls-files.c:588 msgid "show other files in the output" msgstr "显示其它文件" -#: builtin/ls-files.c +#: builtin/ls-files.c:590 msgid "show ignored files in the output" msgstr "显示忽略的文件" -#: builtin/ls-files.c +#: builtin/ls-files.c:593 msgid "show staged contents' object name in the output" msgstr "显示暂存区内容的对象名称" -#: builtin/ls-files.c +#: builtin/ls-files.c:595 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需要删除的文件" -#: builtin/ls-files.c +#: builtin/ls-files.c:597 msgid "show 'other' directories' names only" msgstr "只显示“其他”目录的名称" -#: builtin/ls-files.c +#: builtin/ls-files.c:599 msgid "show line endings of files" msgstr "显示文件换行符格式" -#: builtin/ls-files.c +#: builtin/ls-files.c:601 msgid "don't show empty directories" msgstr "不显示空目录" -#: builtin/ls-files.c +#: builtin/ls-files.c:604 msgid "show unmerged files in the output" msgstr "显示未合并的文件" -#: builtin/ls-files.c +#: builtin/ls-files.c:606 msgid "show resolve-undo information" msgstr "显示 resolve-undo 信息" -#: builtin/ls-files.c +#: builtin/ls-files.c:608 msgid "skip files matching pattern" msgstr "跳过和模式匹配的文件" -#: builtin/ls-files.c +#: builtin/ls-files.c:611 msgid "read exclude patterns from " msgstr "从 <文件> 读取排除模式" -#: builtin/ls-files.c +#: builtin/ls-files.c:614 msgid "read additional per-directory exclude patterns in " msgstr "从 <文件> 读取额外的每个目录的排除模式" -#: builtin/ls-files.c +#: builtin/ls-files.c:616 msgid "add the standard git exclusions" msgstr "添加标准的 git 排除" -#: builtin/ls-files.c +#: builtin/ls-files.c:620 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/ls-files.c +#: builtin/ls-files.c:625 msgid "if any is not in the index, treat this as an error" msgstr "如果任何 <文件> 都不在索引区，视为错误" -#: builtin/ls-files.c builtin/merge-tree.c +#: builtin/ls-files.c:626 builtin/merge-tree.c:566 msgid "tree-ish" msgstr "树对象" -#: builtin/ls-files.c +#: builtin/ls-files.c:627 msgid "pretend that paths removed since are still present" msgstr "假装自从 <树对象> 之后删除的路径仍然存在" -#: builtin/ls-files.c +#: builtin/ls-files.c:629 msgid "show debugging data" msgstr "显示调试数据" -#: builtin/ls-files.c +#: builtin/ls-files.c:631 msgid "suppress duplicate entries" msgstr "抑制重复条目" -#: builtin/ls-files.c +#: builtin/ls-files.c:633 msgid "show sparse directories in the presence of a sparse index" msgstr "在稀疏索引存在时显示稀疏目录" -#: builtin/ls-files.c +#: builtin/ls-files.c:664 msgid "" "--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " "--eol" @@ -9832,195 +10094,199 @@ msgstr "" "--format 不能和 -s、-o、-k、-t、--resolve-undo、--deduplicate 和 --eol 同时使" "用" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:12 msgid "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=]\n" " [--symref] [ [...]]" msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<可执行文件>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<可执行文件>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<键>]\n" " [--symref] [<仓库> [<模式>...]]" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:64 msgid "do not print remote URL" msgstr "不打印远程 URL" -#: builtin/ls-remote.c builtin/rebase.c +#: builtin/ls-remote.c:65 builtin/ls-remote.c:67 builtin/rebase.c:1172 msgid "exec" msgstr "exec" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:66 builtin/ls-remote.c:68 msgid "path of git-upload-pack on the remote host" msgstr "远程主机上的 git-upload-pack 路径" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:70 msgid "limit to tags" msgstr "仅限于标签" -#: builtin/ls-remote.c -msgid "limit to heads" +#: builtin/ls-remote.c:71 +msgid "limit to branches" msgstr "仅限于分支" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:73 builtin/show-ref.c:299 +msgid "deprecated synonym for --branches" +msgstr "已弃用的 --branches 同义词" + +#: builtin/ls-remote.c:75 msgid "do not show peeled tags" msgstr "不显示已解析的标签" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:77 msgid "take url..insteadOf into account" msgstr "参考 url..insteadOf 设置" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:80 msgid "exit with exit code 2 if no matching refs are found" msgstr "若未找到匹配的引用则以退出码2退出" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:83 msgid "show underlying ref in addition to the object pointed by it" msgstr "除了显示指向的对象外，显示指向的引用名" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:19 msgid "git ls-tree [] [...]" msgstr "git ls-tree [<选项>] <树对象> [<路径>...]" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:343 msgid "only show trees" msgstr "只显示树" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:345 msgid "recurse into subtrees" msgstr "递归到子树" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:347 msgid "show trees when recursing" msgstr "当递归时显示树" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:350 msgid "terminate entries with NUL byte" msgstr "条目以 NUL 字符终止" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:351 msgid "include object size" msgstr "包括对象大小" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:353 builtin/ls-tree.c:355 msgid "list only filenames" msgstr "只列出文件名" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:357 msgid "list only objects" msgstr "只列出对象" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:359 msgid "use full path names" msgstr "使用文件的全路径" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:361 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:398 msgid "--format can't be combined with other format-altering options" msgstr "--format 不能和改变格式的选项同时使用" #. TRANSLATORS: keep <> in "<" mail ">" info. -#: builtin/mailinfo.c +#: builtin/mailinfo.c:15 msgid "git mailinfo [] < mail >info" msgstr "git mailinfo [<选项>] <消息> <补丁> < mail >info" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:59 msgid "keep subject" msgstr "保持主题" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:61 msgid "keep non patch brackets in subject" msgstr "在主题中保持无补丁括号标注" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:63 msgid "copy Message-ID to the end of commit message" msgstr "拷贝 Message-ID 至提交说明结尾" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:65 msgid "re-code metadata to i18n.commitEncoding" msgstr "将元数据重新编码为 i18n.commitEncoding" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:68 msgid "disable charset re-coding of metadata" msgstr "禁用元数据的字符集重新编码" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:70 msgid "encoding" msgstr "编码" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:71 msgid "re-code metadata to this encoding" msgstr "将元数据用此编码重新编码" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:73 msgid "use scissors" msgstr "使用剪刀标记" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:74 msgid "" msgstr "<动作>" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:75 msgid "action when quoted CR is found" msgstr "找到引号中的 CR 时的操作" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:78 msgid "use headers in message's body" msgstr "在消息正文中使用标头" -#: builtin/mailsplit.c +#: builtin/mailsplit.c:227 msgid "reading patches from stdin/tty..." msgstr "从标准输入或tty读取补丁……" -#: builtin/mailsplit.c +#: builtin/mailsplit.c:242 #, c-format msgid "empty mbox: '%s'" msgstr "空的 mbox：'%s'" -#: builtin/merge-base.c +#: builtin/merge-base.c:35 msgid "git merge-base [-a | --all] ..." msgstr "git merge-base [-a | --all] <提交> <提交>..." -#: builtin/merge-base.c +#: builtin/merge-base.c:36 msgid "git merge-base [-a | --all] --octopus ..." msgstr "git merge-base [-a | --all] --octopus <提交>..." -#: builtin/merge-base.c +#: builtin/merge-base.c:37 msgid "git merge-base --is-ancestor " msgstr "git merge-base --is-ancestor <提交> <提交>" -#: builtin/merge-base.c +#: builtin/merge-base.c:38 msgid "git merge-base --independent ..." msgstr "git merge-base --independent <提交>..." -#: builtin/merge-base.c +#: builtin/merge-base.c:39 msgid "git merge-base --fork-point []" msgstr "git merge-base --fork-point <引用> [<提交>]" -#: builtin/merge-base.c +#: builtin/merge-base.c:155 msgid "output all common ancestors" msgstr "输出所有共同的祖先" -#: builtin/merge-base.c +#: builtin/merge-base.c:157 msgid "find ancestors for a single n-way merge" msgstr "查找一个多路合并的祖先提交" -#: builtin/merge-base.c +#: builtin/merge-base.c:159 msgid "list revs not reachable from others" msgstr "显示不能被其他访问到的版本" -#: builtin/merge-base.c +#: builtin/merge-base.c:161 msgid "is the first one ancestor of the other?" msgstr "第一个是其他的祖先提交么？" -#: builtin/merge-base.c +#: builtin/merge-base.c:163 msgid "find where forked from reflog of " msgstr "根据 <引用> 的引用日志查找 <提交> 的分叉点" -#: builtin/merge-file.c +#: builtin/merge-file.c:15 msgid "" "git merge-file [] [-L [-L [-L ]]] " " " @@ -10028,7 +10294,7 @@ msgstr "" "git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初" "始文件> <文件2>" -#: builtin/merge-file.c diff.c +#: builtin/merge-file.c:50 diff.c:5281 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -10036,345 +10302,345 @@ msgstr "" "选项 diff-algorithm 接受参数 \"myers\"、\"minimal\"、\"patience\" 和 " "\"histogram\"" -#: builtin/merge-file.c +#: builtin/merge-file.c:65 msgid "send results to standard output" msgstr "将结果发送到标准输出" -#: builtin/merge-file.c +#: builtin/merge-file.c:66 msgid "use object IDs instead of filenames" msgstr "使用对象 ID 替换文件名" -#: builtin/merge-file.c +#: builtin/merge-file.c:67 msgid "use a diff3 based merge" msgstr "使用基于 diff3 的合并" -#: builtin/merge-file.c +#: builtin/merge-file.c:68 msgid "use a zealous diff3 based merge" msgstr "使用基于狂热 diff3（zealous diff3）的合并" -#: builtin/merge-file.c +#: builtin/merge-file.c:70 msgid "for conflicts, use our version" msgstr "如果冲突，使用我们的版本" -#: builtin/merge-file.c +#: builtin/merge-file.c:72 msgid "for conflicts, use their version" msgstr "如果冲突，使用他们的版本" -#: builtin/merge-file.c +#: builtin/merge-file.c:74 msgid "for conflicts, use a union version" msgstr "如果冲突，使用联合版本" -#: builtin/merge-file.c diff.c +#: builtin/merge-file.c:76 diff.c:5799 msgid "" msgstr "<算法>" -#: builtin/merge-file.c diff.c +#: builtin/merge-file.c:77 diff.c:5800 msgid "choose a diff algorithm" msgstr "选择一个差异算法" -#: builtin/merge-file.c +#: builtin/merge-file.c:80 msgid "for conflicts, use this marker size" msgstr "如果冲突，使用指定长度的标记" -#: builtin/merge-file.c +#: builtin/merge-file.c:81 msgid "do not warn about conflicts" msgstr "不要警告冲突" -#: builtin/merge-file.c +#: builtin/merge-file.c:83 msgid "set labels for file1/orig-file/file2" msgstr "为 文件1/初始文件/文件2 设置标签" -#: builtin/merge-file.c +#: builtin/merge-file.c:121 #, c-format msgid "object '%s' does not exist" msgstr "对象 '%s' 不存在" -#: builtin/merge-file.c +#: builtin/merge-file.c:152 msgid "Could not write object file" msgstr "不能写入对象文件" -#: builtin/merge-recursive.c +#: builtin/merge-recursive.c:48 #, c-format msgid "unknown option %s" msgstr "未知选项 %s" -#: builtin/merge-recursive.c +#: builtin/merge-recursive.c:53 #, c-format msgid "could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: builtin/merge-recursive.c +#: builtin/merge-recursive.c:56 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" -#: builtin/merge-recursive.c +#: builtin/merge-recursive.c:64 msgid "not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" -#: builtin/merge-recursive.c +#: builtin/merge-recursive.c:73 builtin/merge-recursive.c:75 #, c-format msgid "could not resolve ref '%s'" msgstr "无法解析引用 '%s'" -#: builtin/merge-recursive.c +#: builtin/merge-recursive.c:81 #, c-format msgid "Merging %s with %s\n" msgstr "合并 %s 和 %s\n" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:446 builtin/merge-tree.c:451 builtin/merge-tree.c:456 #, c-format msgid "could not parse as tree '%s'" msgstr "无法解析为树对象 '%s'" -#: builtin/merge-tree.c builtin/merge.c +#: builtin/merge-tree.c:467 builtin/merge-tree.c:472 builtin/merge.c:1222 msgid "not something we can merge" msgstr "不是可以合并的东西" -#: builtin/merge-tree.c builtin/merge.c +#: builtin/merge-tree.c:482 builtin/merge.c:1562 msgid "refusing to merge unrelated histories" msgstr "拒绝合并无关的历史" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:489 msgid "failure to merge" msgstr "合并失败" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:538 msgid "git merge-tree [--write-tree] [] " msgstr "git merge-tree [--write-tree] [<选项>] <分支1> <分支2>" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:539 msgid "git merge-tree [--trivial-merge] " msgstr "git merge-tree [--trivial-merge] <基准树> <分支1> <分支2>" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:544 msgid "do a real merge instead of a trivial merge" msgstr "进行真正的合并而不是简单的合并" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:547 msgid "do a trivial merge only" msgstr "只进行简单的合并" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:549 msgid "also show informational/conflict messages" msgstr "同时显示额外信息/冲突消息" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:554 msgid "list filenames without modes/oids/stages" msgstr "列出没有模式/对象 ID/暂存的文件名" -#: builtin/merge-tree.c builtin/merge.c builtin/pull.c +#: builtin/merge-tree.c:558 builtin/merge.c:285 builtin/pull.c:186 msgid "allow merging unrelated histories" msgstr "允许合并不相关的历史" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:562 msgid "perform multiple merges, one per line of input" msgstr "实施多个合并，每输入行一个" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:567 msgid "specify a merge-base for the merge" msgstr "指定用于合并的合并基线" -#: builtin/merge-tree.c builtin/merge.c builtin/pull.c +#: builtin/merge-tree.c:568 builtin/merge.c:267 builtin/pull.c:178 msgid "option=value" msgstr "option=value" -#: builtin/merge-tree.c builtin/merge.c builtin/pull.c +#: builtin/merge-tree.c:569 builtin/merge.c:268 builtin/pull.c:179 msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:582 builtin/merge-tree.c:592 builtin/merge-tree.c:658 msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge 与其他所有选项不兼容" -#: builtin/merge-tree.c builtin/merge.c +#: builtin/merge-tree.c:585 builtin/merge.c:736 #, c-format msgid "unknown strategy option: -X%s" msgstr "未知的策略选项：-X%s" -#: builtin/merge-tree.c builtin/notes.c +#: builtin/merge-tree.c:604 builtin/merge-tree.c:620 builtin/notes.c:383 #, c-format msgid "malformed input line: '%s'." msgstr "格式错误的输入行：'%s'。" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:624 #, c-format msgid "merging cannot continue; got unclean result of %d" msgstr "合并无法继续；得到不干净的结果 %d" -#: builtin/merge.c +#: builtin/merge.c:62 msgid "git merge [] [...]" msgstr "git merge [<选项>] [<提交>...]" -#: builtin/merge.c +#: builtin/merge.c:127 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" -#: builtin/merge.c +#: builtin/merge.c:150 #, c-format msgid "option `%s' requires a value" msgstr "选项 `%s' 需要一个值" -#: builtin/merge.c +#: builtin/merge.c:203 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合并策略 '%s'。\n" -#: builtin/merge.c +#: builtin/merge.c:204 #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" -#: builtin/merge.c +#: builtin/merge.c:209 #, c-format msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:244 builtin/pull.c:136 msgid "do not show a diffstat at the end of the merge" msgstr "在合并的最后不显示差异统计" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:246 builtin/pull.c:139 msgid "show a diffstat at the end of the merge" msgstr "在合并的最后显示差异统计" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:247 builtin/pull.c:142 msgid "(synonym to --stat)" msgstr "（和 --stat 同义）" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:249 builtin/pull.c:145 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加（最多 条）精简提交记录" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:252 builtin/pull.c:151 msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:254 builtin/pull.c:154 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功，执行一次提交（默认）" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:256 builtin/pull.c:157 msgid "edit message before committing" msgstr "在提交前编辑提交说明" -#: builtin/merge.c +#: builtin/merge.c:258 msgid "allow fast-forward (default)" msgstr "允许快进（默认）" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:260 builtin/pull.c:164 msgid "abort if fast-forward is not possible" msgstr "如果不能快进就放弃合并" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:264 builtin/pull.c:170 msgid "verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/merge.c builtin/notes.c builtin/pull.c builtin/rebase.c -#: builtin/revert.c +#: builtin/merge.c:265 builtin/notes.c:890 builtin/pull.c:174 +#: builtin/rebase.c:1185 builtin/revert.c:128 msgid "strategy" msgstr "策略" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:266 builtin/pull.c:175 msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c +#: builtin/merge.c:270 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明（针对非快进式合并）" -#: builtin/merge.c +#: builtin/merge.c:276 msgid "use instead of the real target" msgstr "使用 <名称> 而不是真正的目标" -#: builtin/merge.c +#: builtin/merge.c:279 msgid "abort the current in-progress merge" msgstr "放弃当前正在进行的合并" # -#: builtin/merge.c +#: builtin/merge.c:281 msgid "--abort but leave index and working tree alone" msgstr "--abort，但是保留索引和工作区" -#: builtin/merge.c +#: builtin/merge.c:283 msgid "continue the current in-progress merge" msgstr "继续当前正在进行的合并" -#: builtin/merge.c +#: builtin/merge.c:292 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "绕过 pre-merge-commit 和 commit-msg 钩子" -#: builtin/merge.c +#: builtin/merge.c:316 msgid "could not run stash." msgstr "不能运行贮藏。" -#: builtin/merge.c +#: builtin/merge.c:321 msgid "stash failed" msgstr "贮藏失败" -#: builtin/merge.c +#: builtin/merge.c:326 #, c-format msgid "not a valid object: %s" msgstr "不是一个有效对象：%s" -#: builtin/merge.c +#: builtin/merge.c:343 builtin/merge.c:355 msgid "read-tree failed" msgstr "读取树失败" -#: builtin/merge.c +#: builtin/merge.c:389 msgid "Already up to date. (nothing to squash)" msgstr "已经是最新的。（无可挤压）" -#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c +#: builtin/merge.c:391 merge-ort-wrappers.c:37 merge-recursive.c:3547 msgid "Already up to date." msgstr "已经是最新的。" -#: builtin/merge.c +#: builtin/merge.c:403 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "挤压提交 -- 未更新 HEAD\n" -#: builtin/merge.c +#: builtin/merge.c:454 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" -#: builtin/merge.c +#: builtin/merge.c:505 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c +#: builtin/merge.c:593 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c merge-recursive.c +#: builtin/merge.c:711 builtin/merge.c:912 merge-recursive.c:3919 msgid "Unable to write index." msgstr "不能写入索引。" -#: builtin/merge.c +#: builtin/merge.c:723 msgid "Not handling anything other than two heads merge." msgstr "未处理两个头合并之外的任何操作。" -#: builtin/merge.c +#: builtin/merge.c:760 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c +#: builtin/merge.c:812 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c +#: builtin/merge.c:821 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c +#: builtin/merge.c:827 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -10384,84 +10650,84 @@ msgstr "" "合并到主题分支。\n" "\n" -#: builtin/merge.c +#: builtin/merge.c:832 msgid "An empty message aborts the commit.\n" msgstr "空的提交说明会终止提交。\n" -#: builtin/merge.c +#: builtin/merge.c:835 #, c-format msgid "" "Lines starting with '%s' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "以 '%s' 开始的行将被忽略，而空的提交说明将终止提交。\n" -#: builtin/merge.c +#: builtin/merge.c:898 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c +#: builtin/merge.c:915 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c +#: builtin/merge.c:980 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c +#: builtin/merge.c:1020 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c +#: builtin/merge.c:1022 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程仓库。" -#: builtin/merge.c +#: builtin/merge.c:1024 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c +#: builtin/merge.c:1029 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c +#: builtin/merge.c:1086 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" -#: builtin/merge.c editor.c read-cache.c wrapper.c +#: builtin/merge.c:1161 editor.c:152 read-cache.c:3090 wrapper.c:685 #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" -#: builtin/merge.c +#: builtin/merge.c:1188 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合并：%s" -#: builtin/merge.c +#: builtin/merge.c:1338 msgid "--abort expects no arguments" msgstr "--abort 不带参数" -#: builtin/merge.c +#: builtin/merge.c:1342 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c +#: builtin/merge.c:1362 msgid "--quit expects no arguments" msgstr "--quit 不带参数" -#: builtin/merge.c +#: builtin/merge.c:1375 msgid "--continue expects no arguments" msgstr "--continue 不带参数" -#: builtin/merge.c +#: builtin/merge.c:1379 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "没有进行中的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c +#: builtin/merge.c:1395 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10469,7 +10735,7 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c +#: builtin/merge.c:1402 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10477,37 +10743,37 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c +#: builtin/merge.c:1405 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c +#: builtin/merge.c:1437 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c +#: builtin/merge.c:1454 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c +#: builtin/merge.c:1456 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c +#: builtin/merge.c:1461 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c +#: builtin/merge.c:1463 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c +#: builtin/merge.c:1583 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c +#: builtin/merge.c:1632 merge-ort-wrappers.c:17 merge-recursive.c:3797 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -10516,101 +10782,101 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" " %s" -#: builtin/merge.c +#: builtin/merge.c:1641 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c +#: builtin/merge.c:1648 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c +#: builtin/merge.c:1711 builtin/merge.c:1779 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c +#: builtin/merge.c:1715 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c +#: builtin/merge.c:1769 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c +#: builtin/merge.c:1771 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c +#: builtin/merge.c:1781 #, c-format msgid "Using the %s strategy to prepare resolving by hand.\n" msgstr "使用 %s 策略以准备手工解决。\n" -#: builtin/merge.c +#: builtin/merge.c:1795 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" -#: builtin/merge.c +#: builtin/merge.c:1800 #, c-format msgid "When finished, apply stashed changes with `git stash pop`\n" msgstr "在完成后，使用 `git stash pop` 应用贮藏的变更\n" -#: builtin/mktag.c +#: builtin/mktag.c:30 #, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "警告：标签输入未通过 fsck：%s" -#: builtin/mktag.c +#: builtin/mktag.c:41 #, c-format msgid "error: tag input does not pass fsck: %s" msgstr "错误：标签输入未通过 fsck：%s" -#: builtin/mktag.c +#: builtin/mktag.c:44 #, c-format msgid "%d (FSCK_IGNORE?) should never trigger this callback" msgstr "%d (FSCK_IGNORE?) 永远不应该触发这个回调" -#: builtin/mktag.c +#: builtin/mktag.c:60 #, c-format msgid "could not read tagged object '%s'" msgstr "不能读取被标记的对象 '%s'" -#: builtin/mktag.c +#: builtin/mktag.c:63 #, c-format msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "对象 '%s' 被标记为 '%s'，然而是一个 '%s' 类型" -#: builtin/mktag.c +#: builtin/mktag.c:101 msgid "tag on stdin did not pass our strict fsck check" msgstr "标准输入上的标签未通过我们严格的 fsck 检查" -#: builtin/mktag.c +#: builtin/mktag.c:104 msgid "tag on stdin did not refer to a valid object" msgstr "标准输入上的标签未指向一个有效的对象" -#: builtin/mktag.c builtin/tag.c +#: builtin/mktag.c:107 builtin/tag.c:271 msgid "unable to write tag file" msgstr "无法写标签文件" -#: builtin/mktree.c +#: builtin/mktree.c:164 msgid "input is NUL terminated" msgstr "输入以 NUL 字符终止" -#: builtin/mktree.c builtin/write-tree.c +#: builtin/mktree.c:165 builtin/write-tree.c:29 msgid "allow missing objects" msgstr "允许丢失的对象" -#: builtin/mktree.c +#: builtin/mktree.c:166 msgid "allow creation of more than one tree" msgstr "允许创建一个以上的树" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:14 msgid "" "git multi-pack-index [] write [--preferred-pack=][--refs-" "snapshot=]" @@ -10618,205 +10884,205 @@ msgstr "" "git multi-pack-index [<选项>] write [--preferred-pack=<包>][--refs-snapshot=<" "路径>]" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:18 msgid "git multi-pack-index [] verify" msgstr "git multi-pack-index [<选项>] verify" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:21 msgid "git multi-pack-index [] expire" msgstr "git multi-pack-index [<选项>] expire" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:24 msgid "git multi-pack-index [] repack [--batch-size=]" msgstr "git multi-pack-index [<选项>] repack [--batch-size=<尺寸>]" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:74 msgid "directory" msgstr "目录" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:75 msgid "object directory containing set of packfile and pack-index pairs" msgstr "包含成对包文件和包索引的对象目录" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:126 msgid "preferred-pack" msgstr "首选包" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:127 msgid "pack for reuse when computing a multi-pack bitmap" msgstr "在计算多包位图时打包以供重用" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:128 msgid "write multi-pack bitmap" msgstr "写入多包位图" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:133 msgid "write multi-pack index containing only given indexes" msgstr "写入只包括给定索引的多包索引" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:135 msgid "refs snapshot for selecting bitmap commits" msgstr "用于选择位图提交的引用快照" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:242 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中" -#: builtin/mv.c +#: builtin/mv.c:28 msgid "git mv [] ... " msgstr "git mv [<选项>] <源>... <目标>" -#: builtin/mv.c +#: builtin/mv.c:91 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "目录 %s 在索引中并且不是子模组？" -#: builtin/mv.c +#: builtin/mv.c:93 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" -#: builtin/mv.c +#: builtin/mv.c:112 #, c-format msgid "%.*s is in index" msgstr "%.*s 在索引中" -#: builtin/mv.c +#: builtin/mv.c:188 msgid "force move/rename even if target exists" msgstr "强制移动/重命令，即使目标存在" -#: builtin/mv.c +#: builtin/mv.c:190 msgid "skip move/rename errors" msgstr "跳过移动/重命名错误" -#: builtin/mv.c +#: builtin/mv.c:246 #, c-format msgid "destination '%s' is not a directory" msgstr "目标 '%s' 不是一个目录" -#: builtin/mv.c +#: builtin/mv.c:270 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "检查 '%s' 到 '%s' 的重命名\n" -#: builtin/mv.c +#: builtin/mv.c:289 builtin/mv.c:294 msgid "bad source" msgstr "坏的源" -#: builtin/mv.c +#: builtin/mv.c:307 builtin/mv.c:384 msgid "destination exists" msgstr "目标已存在" -#: builtin/mv.c +#: builtin/mv.c:315 msgid "can not move directory into itself" msgstr "不能将目录移动到自身" -#: builtin/mv.c +#: builtin/mv.c:320 msgid "destination already exists" msgstr "目标已存在" -#: builtin/mv.c +#: builtin/mv.c:339 msgid "source directory is empty" msgstr "源目录为空" -#: builtin/mv.c +#: builtin/mv.c:375 msgid "not under version control" msgstr "不在版本控制之下" -#: builtin/mv.c +#: builtin/mv.c:379 msgid "conflicted" msgstr "冲突" -#: builtin/mv.c +#: builtin/mv.c:392 builtin/mv.c:414 #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" -#: builtin/mv.c +#: builtin/mv.c:395 msgid "Cannot overwrite" msgstr "不能覆盖" -#: builtin/mv.c +#: builtin/mv.c:400 msgid "multiple sources for the same target" msgstr "同一目标具有多个源" -#: builtin/mv.c +#: builtin/mv.c:404 msgid "destination directory does not exist" msgstr "目标目录不存在" -#: builtin/mv.c +#: builtin/mv.c:411 msgid "destination exists in the index" msgstr "目标在索引中已存在" -#: builtin/mv.c +#: builtin/mv.c:446 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，源=%s，目标=%s" -#: builtin/mv.c +#: builtin/mv.c:479 #, c-format msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c builtin/remote.c +#: builtin/mv.c:487 builtin/remote.c:829 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" -#: builtin/name-rev.c +#: builtin/name-rev.c:508 msgid "git name-rev [] ..." msgstr "git name-rev [<选项>] <提交>..." -#: builtin/name-rev.c +#: builtin/name-rev.c:509 msgid "git name-rev [] --all" msgstr "git name-rev [<选项>] --all" -#: builtin/name-rev.c +#: builtin/name-rev.c:510 msgid "git name-rev [] --annotate-stdin" msgstr "git name-rev [<选项>] --annotate-stdin" -#: builtin/name-rev.c +#: builtin/name-rev.c:568 msgid "print only ref-based names (no object names)" msgstr "只打印基于引用的名称（非对象名）" -#: builtin/name-rev.c +#: builtin/name-rev.c:569 msgid "only use tags to name the commits" msgstr "只使用标签来命名提交" -#: builtin/name-rev.c +#: builtin/name-rev.c:571 msgid "only use refs matching " msgstr "只使用和 <模式> 相匹配的引用" -#: builtin/name-rev.c +#: builtin/name-rev.c:573 msgid "ignore refs matching " msgstr "忽略和 <模式> 相匹配的引用" -#: builtin/name-rev.c +#: builtin/name-rev.c:575 msgid "list all commits reachable from all refs" msgstr "列出可以从所有引用访问的提交" -#: builtin/name-rev.c +#: builtin/name-rev.c:579 msgid "deprecated: use --annotate-stdin instead" msgstr "已弃用：取而代之使用 --annotate-stdin" -#: builtin/name-rev.c +#: builtin/name-rev.c:581 msgid "annotate text from stdin" msgstr "标注标准输入的文字" -#: builtin/name-rev.c +#: builtin/name-rev.c:582 msgid "allow to print `undefined` names (default)" msgstr "允许打印 `未定义` 的名称（默认）" -#: builtin/name-rev.c +#: builtin/name-rev.c:586 msgid "dereference tags in the input (internal use)" msgstr "反向解析输入中的标签（内部使用）" -#: builtin/notes.c +#: builtin/notes.c:34 msgid "git notes [--ref ] [list []]" msgstr "git notes [--ref <注解引用>] [list [<对象>]]" -#: builtin/notes.c +#: builtin/notes.c:35 msgid "" "git notes [--ref ] add [-f] [--allow-empty] [--[no-]separator|--" "separator=] [--[no-]stripspace] [-m | -F | (-c " @@ -10826,11 +11092,11 @@ msgstr "" "separator=<分段符>] [--[no-]stripspace] [-m <说明> | -F <文件> | (-c | -C) <" "对象>] [<对象>]" -#: builtin/notes.c +#: builtin/notes.c:36 msgid "git notes [--ref ] copy [-f] " msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" -#: builtin/notes.c +#: builtin/notes.c:37 msgid "" "git notes [--ref ] append [--allow-empty] [--[no-]separator|--" "separator=] [--[no-]stripspace] [-m | -F | (-c " @@ -10840,126 +11106,128 @@ msgstr "" "separator=<分段符>] [--[no-]stripspace] [-m <说明> | -F <文件> | (-c | -C) <" "对象>] [<对象>]" -#: builtin/notes.c +#: builtin/notes.c:38 msgid "git notes [--ref ] edit [--allow-empty] []" msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" -#: builtin/notes.c +#: builtin/notes.c:39 msgid "git notes [--ref ] show []" msgstr "git notes [--ref <注解引用>] show [<对象>]" -#: builtin/notes.c +#: builtin/notes.c:40 msgid "" "git notes [--ref ] merge [-v | -q] [-s ] " msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" -#: builtin/notes.c +#: builtin/notes.c:43 msgid "git notes [--ref ] remove [...]" msgstr "git notes [--ref <注解引用>] remove [<对象>...]" -#: builtin/notes.c +#: builtin/notes.c:44 msgid "git notes [--ref ] prune [-n] [-v]" msgstr "git notes [--ref <注解引用>] prune [-n] [-v]" -#: builtin/notes.c +#: builtin/notes.c:45 msgid "git notes [--ref ] get-ref" msgstr "git notes [--ref <注解引用>] get-ref" -#: builtin/notes.c +#: builtin/notes.c:50 msgid "git notes [list []]" msgstr "git notes [list [<对象>]]" -#: builtin/notes.c +#: builtin/notes.c:55 msgid "git notes add [] []" msgstr "git notes add [<选项>] [<对象>]" -#: builtin/notes.c +#: builtin/notes.c:60 msgid "git notes copy [] " msgstr "git notes copy [<选项>] <源对象> <目标对象>" -#: builtin/notes.c +#: builtin/notes.c:61 msgid "git notes copy --stdin [ ]..." msgstr "git notes copy --stdin [<源对象> <目标对象>]..." -#: builtin/notes.c +#: builtin/notes.c:66 msgid "git notes append [] []" msgstr "git notes append [<选项>] [<对象>]" -#: builtin/notes.c +#: builtin/notes.c:71 msgid "git notes edit []" msgstr "git notes edit [<对象>]" -#: builtin/notes.c +#: builtin/notes.c:76 msgid "git notes show []" msgstr "git notes show [<对象>]" -#: builtin/notes.c +#: builtin/notes.c:81 msgid "git notes merge [] " msgstr "git notes merge [<选项>] <注解引用>" -#: builtin/notes.c +#: builtin/notes.c:82 msgid "git notes merge --commit []" msgstr "git notes merge --commit [<选项>]" -#: builtin/notes.c +#: builtin/notes.c:83 msgid "git notes merge --abort []" msgstr "git notes merge --abort [<选项>]" -#: builtin/notes.c +#: builtin/notes.c:88 msgid "git notes remove []" msgstr "git notes remove [<对象>]" -#: builtin/notes.c +#: builtin/notes.c:93 msgid "git notes prune []" msgstr "git notes prune [<选项>]" -#: builtin/notes.c +#: builtin/notes.c:103 msgid "Write/edit the notes for the following object:" msgstr "为下面的对象写/编辑说明：" -#: builtin/notes.c +#: builtin/notes.c:181 msgid "could not read 'show' output" msgstr "不能读取 'show' 的输出" -#: builtin/notes.c +#: builtin/notes.c:189 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "无法为对象 '%s' 完成 'show'" -#: builtin/notes.c +#: builtin/notes.c:223 msgid "please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解提供内容" -#: builtin/notes.c +#: builtin/notes.c:233 msgid "unable to write note object" msgstr "不能写注解对象" -#: builtin/notes.c +#: builtin/notes.c:236 #, c-format msgid "the note contents have been left in %s" msgstr "注解内容被留在 %s 中" -#: builtin/notes.c builtin/tag.c +#: builtin/notes.c:300 builtin/tag.c:634 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" -#: builtin/notes.c +#: builtin/notes.c:321 builtin/notes.c:387 builtin/notes.c:389 +#: builtin/notes.c:457 builtin/notes.c:523 builtin/notes.c:611 +#: builtin/notes.c:616 builtin/notes.c:705 builtin/notes.c:772 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" -#: builtin/notes.c +#: builtin/notes.c:323 #, c-format msgid "failed to read object '%s'." msgstr "无法读取对象 '%s'。" -#: builtin/notes.c +#: builtin/notes.c:328 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "不能从非数据对象 '%s' 中读取注解数据。" -#: builtin/notes.c +#: builtin/notes.c:398 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "无法把注解从 '%s' 拷贝到 '%s'" @@ -10967,94 +11235,94 @@ msgstr "无法把注解从 '%s' 拷贝到 '%s'" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c +#: builtin/notes.c:430 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解" -#: builtin/notes.c +#: builtin/notes.c:463 builtin/notes.c:778 #, c-format msgid "no note found for object %s." msgstr "未发现对象 %s 的注解。" -#: builtin/notes.c +#: builtin/notes.c:485 builtin/notes.c:661 msgid "note contents as a string" msgstr "注解内容作为一个字符串" -#: builtin/notes.c +#: builtin/notes.c:488 builtin/notes.c:664 msgid "note contents in a file" msgstr "注解内容到一个文件中" -#: builtin/notes.c +#: builtin/notes.c:491 builtin/notes.c:667 msgid "reuse and edit specified note object" msgstr "重用和编辑指定的注解对象" -#: builtin/notes.c +#: builtin/notes.c:494 builtin/notes.c:670 msgid "reuse specified note object" msgstr "重用指定的注解对象" -#: builtin/notes.c +#: builtin/notes.c:497 builtin/notes.c:673 msgid "allow storing empty note" msgstr "允许保存空白注释" -#: builtin/notes.c +#: builtin/notes.c:498 builtin/notes.c:581 msgid "replace existing notes" msgstr "替换已存在的注解" -#: builtin/notes.c +#: builtin/notes.c:500 builtin/notes.c:675 msgid "" msgstr "<分段符>" -#: builtin/notes.c +#: builtin/notes.c:501 builtin/notes.c:676 msgid "insert between paragraphs" msgstr "在段落之间插入<分段符>" -#: builtin/notes.c +#: builtin/notes.c:504 builtin/notes.c:679 msgid "remove unnecessary whitespace" msgstr "删除不必要的空白字符" -#: builtin/notes.c +#: builtin/notes.c:533 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c +#: builtin/notes.c:548 builtin/notes.c:629 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" -#: builtin/notes.c +#: builtin/notes.c:560 builtin/notes.c:737 builtin/notes.c:1011 #, c-format msgid "Removing note for object %s\n" msgstr "删除对象 %s 的注解\n" -#: builtin/notes.c +#: builtin/notes.c:582 msgid "read objects from stdin" msgstr "从标准输入读取对象" -#: builtin/notes.c +#: builtin/notes.c:584 msgid "load rewriting config for (implies --stdin)" msgstr "重新加载 <命令> 的配置（隐含 --stdin）" -#: builtin/notes.c +#: builtin/notes.c:602 msgid "too few arguments" msgstr "参数太少" -#: builtin/notes.c +#: builtin/notes.c:623 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c +#: builtin/notes.c:635 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "源对象 %s 缺少注解。不能拷贝。" -#: builtin/notes.c +#: builtin/notes.c:698 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -11063,97 +11331,97 @@ msgstr "" "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请换用 'git notes add -f -m/-F/-c/-C'。\n" -#: builtin/notes.c +#: builtin/notes.c:798 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "无法删除引用 NOTES_MERGE_PARTIAL" -#: builtin/notes.c +#: builtin/notes.c:800 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "无法删除引用 NOTES_MERGE_REF" -#: builtin/notes.c +#: builtin/notes.c:802 msgid "failed to remove 'git notes merge' worktree" msgstr "无法删除 'git notes merge' 工作区" -#: builtin/notes.c +#: builtin/notes.c:822 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "无法读取引用 NOTES_MERGE_PARTIAL" -#: builtin/notes.c +#: builtin/notes.c:824 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" -#: builtin/notes.c +#: builtin/notes.c:826 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" -#: builtin/notes.c +#: builtin/notes.c:840 msgid "failed to resolve NOTES_MERGE_REF" msgstr "无法解析 NOTES_MERGE_REF" -#: builtin/notes.c +#: builtin/notes.c:843 msgid "failed to finalize notes merge" msgstr "无法完成注解合并" -#: builtin/notes.c +#: builtin/notes.c:871 #, c-format msgid "unknown notes merge strategy %s" msgstr "未知的注解合并策略 %s" -#: builtin/notes.c +#: builtin/notes.c:887 msgid "General options" msgstr "通用选项" -#: builtin/notes.c +#: builtin/notes.c:889 msgid "Merge options" msgstr "合并选项" -#: builtin/notes.c +#: builtin/notes.c:891 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c +#: builtin/notes.c:893 msgid "Committing unmerged notes" msgstr "提交未合并的注解" -#: builtin/notes.c +#: builtin/notes.c:895 msgid "finalize notes merge by committing unmerged notes" msgstr "通过提交未合并的注解来完成注解合并" -#: builtin/notes.c +#: builtin/notes.c:897 msgid "Aborting notes merge resolution" msgstr "中止注解合并的方案" -#: builtin/notes.c +#: builtin/notes.c:899 msgid "abort notes merge" msgstr "中止注解合并" -#: builtin/notes.c +#: builtin/notes.c:910 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "不能混用 --commit、--abort 或 -s/--strategy" -#: builtin/notes.c +#: builtin/notes.c:915 msgid "must specify a notes ref to merge" msgstr "必须指定一个注解引用来合并" -#: builtin/notes.c +#: builtin/notes.c:939 #, c-format msgid "unknown -s/--strategy: %s" msgstr "未知的 -s/--strategy：%s" -#: builtin/notes.c +#: builtin/notes.c:981 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" -#: builtin/notes.c +#: builtin/notes.c:985 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "无法存储链接到当前的注解引用（%s）" -#: builtin/notes.c +#: builtin/notes.c:987 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -11163,55 +11431,55 @@ msgstr "" "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" "交结果，或者使用命令 'git notes merge --abort' 终止合并。\n" -#: builtin/notes.c builtin/tag.c +#: builtin/notes.c:1006 builtin/tag.c:647 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" -#: builtin/notes.c +#: builtin/notes.c:1009 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" -#: builtin/notes.c +#: builtin/notes.c:1021 msgid "attempt to remove non-existent note is not an error" msgstr "尝试删除不存在的注解不是一个错误" -#: builtin/notes.c +#: builtin/notes.c:1024 msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" -#: builtin/notes.c builtin/prune.c builtin/worktree.c +#: builtin/notes.c:1063 builtin/prune.c:155 builtin/worktree.c:237 msgid "do not remove, show only" msgstr "不删除，只显示" -#: builtin/notes.c +#: builtin/notes.c:1064 msgid "report pruned notes" msgstr "报告清除的注解" -#: builtin/notes.c +#: builtin/notes.c:1107 msgid "notes-ref" msgstr "注解引用" -#: builtin/notes.c +#: builtin/notes.c:1108 msgid "use notes from " msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c builtin/remote.c parse-options.c +#: builtin/notes.c:1127 builtin/remote.c:1755 parse-options.c:867 #, c-format msgid "unknown subcommand: `%s'" msgstr "未知子命令：`%s'" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:185 msgid "git pack-objects --stdout [] [< | < ]" msgstr "git pack-objects --stdout [<选项>] [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:186 msgid "" "git pack-objects [] [< | < ]" msgstr "git pack-objects [<选项>] <前缀名称> [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:585 #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset % in " @@ -11219,129 +11487,130 @@ msgid "" msgstr "" "write_reuse_object：无法定位 %1$s，预期在包 %3$s 中的偏移量 %2$ 上" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:593 #, c-format msgid "bad packed object CRC for %s" msgstr "%s 错的包对象 CRC" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:604 #, c-format msgid "corrupt packed object for %s" msgstr "%s 损坏的包对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:735 #, c-format msgid "recursive delta detected for object %s" msgstr "发现对象 %s 递归 delta" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:957 #, c-format msgid "ordered %u objects, expected %" msgstr "排序了 %u 个对象，预期 % 个" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:1055 #, c-format msgid "expected object at offset % in pack %s" msgstr "预期对象在包文件 %2$s 的偏移量 %1$ 上" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:1238 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:1251 msgid "Writing objects" msgstr "写入对象中" -#: builtin/pack-objects.c builtin/update-index.c +#: builtin/pack-objects.c:1329 builtin/update-index.c:109 #, c-format msgid "failed to stat %s" msgstr "无法对 %s 调用 stat" -#: builtin/pack-objects.c object-file.c +#: builtin/pack-objects.c:1337 object-file.c:2186 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上调用 utime() 失败" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:1371 msgid "failed to write bitmap index" msgstr "无法写入位图索引" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:1399 #, c-format msgid "wrote % objects while expecting %" msgstr "写入 % 个对象而预期 % 个" -#: builtin/pack-objects.c builtin/repack.c +#: builtin/pack-objects.c:1649 builtin/repack.c:1239 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2097 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 压缩中 delta 基准偏移越界" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2106 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基准偏移越界" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2387 msgid "Counting objects" msgstr "对象计数中" -#: builtin/pack-objects.c pack-bitmap.c +#: builtin/pack-objects.c:2537 pack-bitmap.c:1725 pack-bitmap.c:1731 #, c-format msgid "unable to get size of %s" msgstr "无法得到 %s 的大小" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2552 #, c-format msgid "unable to parse object header of %s" msgstr "无法解析对象 %s 头信息" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2624 builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2652 #, c-format msgid "object %s cannot be read" msgstr "对象 %s 无法读取" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2627 builtin/pack-objects.c:2656 #, c-format msgid "object %s inconsistent object length (% vs %)" msgstr "对象 %s 不一致的对象长度（% vs %）" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2666 msgid "suboptimal pack - out of memory" msgstr "次优（suboptimal）打包 - 内存不足" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2981 #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 个线程进行压缩" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3120 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "无法为标签 %s 压缩对象" -#: builtin/pack-objects.c commit-graph.c +#: builtin/pack-objects.c:3188 commit-graph.c:1505 #, c-format msgid "unable to get type of object %s" msgstr "无法获得对象 %s 类型" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3207 msgid "Compressing objects" msgstr "压缩对象中" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3213 msgid "inconsistency with delta count" msgstr "不一致的差异计数" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3267 #, c-format msgid "invalid pack.allowPackReuse value: '%s'" msgstr "无效的 pack.allowPackReuse 值：'%s'" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3317 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form ' ' 格" "式（得到 '%s'）" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3320 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置（得到 '%s'）" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3357 #, c-format msgid "could not get type of object %s in pack %s" msgstr "无法获得包 %2$s 中对象 %1$s 的类型" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3487 builtin/pack-objects.c:3500 +#: builtin/pack-objects.c:3624 #, c-format msgid "could not find pack '%s'" msgstr "不能找到包 '%s'" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3489 #, c-format msgid "packfile %s cannot be accessed" msgstr "无法访问包文件 %s" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3635 builtin/pack-objects.c:3661 msgid "Enumerating cruft objects" msgstr "枚举废弃对象中" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3667 msgid "unable to add cruft objects" msgstr "无法添加废弃对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3680 msgid "Traversing cruft objects" msgstr "遍历废弃对象中" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3765 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -11392,7 +11662,7 @@ msgstr "" "预期边界对象（edge object）ID，却得到垃圾数据：\n" " %s" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3771 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -11401,267 +11671,267 @@ msgstr "" "预期对象 ID，却得到垃圾数据：\n" " %s" -#: builtin/pack-objects.c reachable.c +#: builtin/pack-objects.c:3885 reachable.c:294 msgid "could not load cruft pack .mtimes" msgstr "不能载入废弃包 .mtimes" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3907 builtin/pack-objects.c:4006 msgid "cannot open pack index" msgstr "无法打开包文件索引" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3916 #, c-format msgid "loose object at %s could not be examined" msgstr "无法检查 %s 处的松散对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4014 msgid "unable to force loose object" msgstr "无法强制松散对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4150 #, c-format msgid "not a rev '%s'" msgstr "不是一个版本 '%s'" -#: builtin/pack-objects.c builtin/rev-parse.c +#: builtin/pack-objects.c:4153 builtin/rev-parse.c:1145 #, c-format msgid "bad revision '%s'" msgstr "坏的版本 '%s'" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4181 msgid "unable to add recent objects" msgstr "无法添加最近的对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4249 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4253 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4306 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4309 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4310 msgid "[,]" msgstr "<版本>[,<偏移>]" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4311 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4314 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4316 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从备用对象存储里借用对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4318 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4320 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4322 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4324 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4326 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4328 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4330 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4332 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4334 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4336 msgid "read revision arguments from standard input" msgstr "从标准输入读取版本号参数" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4338 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4341 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4344 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4347 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4350 msgid "read packs from stdin" msgstr "从标准输入读取包" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4352 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4354 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包对象的标签对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4356 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4358 msgid "pack loose unreachable objects" msgstr "打包松散的不可达对象" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4360 msgid "unpack unreachable objects newer than