diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 12702 |
1 files changed, 7877 insertions, 4825 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 912083e9ed..73da662fef 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,7 +3,7 @@ # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> # This file is distributed under the same license as the Git package. # Contributors: -# - Fangyi Zhou <fangyi.zhou AT yuriko.moe> +# - Fangyi Zhou <me AT fangyi.io> # - Jiang Xin <worldhello.net AT gmail.com> # - Lian Cheng <rhythm.mail AT gmail.com> # - Ray Chen <oldsharp AT gmail.com> @@ -45,6 +45,7 @@ # commit-ish (also committish) | 提交号 # conflict | 冲突 # core Git | 核心 Git 工具 +# cover letter | 附函 # DAG | 有向无环图 # dangling object | 悬空对象 # detached HEAD | 分离头指针 @@ -138,8 +139,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2018-12-02 10:55+0800\n" -"PO-Revision-Date: 2018-12-03 18:08+0800\n" +"POT-Creation-Date: 2019-12-30 08:48+0800\n" +"PO-Revision-Date: 2020-01-12 17:16+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -148,37 +149,458 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:99 +#: add-interactive.c:347 +#, c-format +msgid "Huh (%s)?" +msgstr "嗯（%s）？" + +#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216 +#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643 +#: builtin/rebase.c:2019 builtin/rebase.c:2063 +msgid "could not read index" +msgstr "不能读取索引" + +#: add-interactive.c:555 git-add--interactive.perl:269 +#: git-add--interactive.perl:294 +msgid "binary" +msgstr "二进制" + +#: add-interactive.c:613 git-add--interactive.perl:278 +#: git-add--interactive.perl:332 +msgid "nothing" +msgstr "无" + +#: add-interactive.c:614 git-add--interactive.perl:314 +#: git-add--interactive.perl:329 +msgid "unchanged" +msgstr "没有修改" + +#: add-interactive.c:651 git-add--interactive.perl:643 +msgid "Update" +msgstr "更新" + +#: add-interactive.c:668 add-interactive.c:856 +#, c-format +msgid "could not stage '%s'" +msgstr "不能暂存 '%s'" + +#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409 +#: builtin/rebase.c:895 +msgid "could not write index" +msgstr "不能写入索引" + +#: add-interactive.c:677 git-add--interactive.perl:628 +#, c-format, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "更新了 %d 个路径\n" +msgstr[1] "更新了 %d 个路径\n" + +#: add-interactive.c:695 git-add--interactive.perl:678 +#, c-format, perl-format +msgid "note: %s is untracked now.\n" +msgstr "说明：%s 现已成为未跟踪的。\n" + +#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281 +#: builtin/reset.c:144 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "对路径 '%s' 的 make_cache_entry 操作失败" + +#: add-interactive.c:730 git-add--interactive.perl:655 +msgid "Revert" +msgstr "还原" + +#: add-interactive.c:746 +msgid "Could not parse HEAD^{tree}" +msgstr "不能解析 HEAD^{tree}" + +#: add-interactive.c:784 git-add--interactive.perl:631 +#, c-format, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "还原了 %d 个路径\n" +msgstr[1] "还原了 %d 个路径\n" + +#: add-interactive.c:835 git-add--interactive.perl:695 +#, c-format +msgid "No untracked files.\n" +msgstr "没有未跟踪的文件。\n" + +#: add-interactive.c:839 git-add--interactive.perl:689 +msgid "Add untracked" +msgstr "添加未跟踪的" + +#: add-interactive.c:866 git-add--interactive.perl:625 +#, c-format, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "增加了 %d 个路径\n" +msgstr[1] "增加了 %d 个路径\n" + +#: add-interactive.c:896 +#, c-format +msgid "ignoring unmerged: %s" +msgstr "忽略未合入的：%s" + +#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366 +#, c-format +msgid "Only binary files changed.\n" +msgstr "只有二进制文件被修改。\n" + +#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368 +#, c-format +msgid "No changes.\n" +msgstr "没有修改。\n" + +#: add-interactive.c:914 git-add--interactive.perl:1376 +msgid "Patch update" +msgstr "补丁更新" + +#: add-interactive.c:953 git-add--interactive.perl:1754 +msgid "Review diff" +msgstr "检视 diff" + +#: add-interactive.c:981 +msgid "show paths with changes" +msgstr "显示含变更的路径" + +#: add-interactive.c:983 +msgid "add working tree state to the staged set of changes" +msgstr "将工作区状态添加到暂存区修改集中" + +#: add-interactive.c:985 +msgid "revert staged set of changes back to the HEAD version" +msgstr "将暂存的修改集恢复为 HEAD 版本" + +#: add-interactive.c:987 +msgid "pick hunks and update selectively" +msgstr "挑选数据块并有选择地更新" + +#: add-interactive.c:989 +msgid "view diff between HEAD and index" +msgstr "显示 HEAD 和索引的差异" + +#: add-interactive.c:991 +msgid "add contents of untracked files to the staged set of changes" +msgstr "将未跟踪文件的内容添加到暂存区修改集中" + +#: add-interactive.c:999 add-interactive.c:1048 +msgid "Prompt help:" +msgstr "帮助：" + +#: add-interactive.c:1001 +msgid "select a single item" +msgstr "选择一个条目" + +#: add-interactive.c:1003 +msgid "select a range of items" +msgstr "选择一系列条目" + +#: add-interactive.c:1005 +msgid "select multiple ranges" +msgstr "选择多个范围" + +#: add-interactive.c:1007 add-interactive.c:1052 +msgid "select item based on unique prefix" +msgstr "基于唯一前缀选择条目" + +#: add-interactive.c:1009 +msgid "unselect specified items" +msgstr "反选指定的条目" + +#: add-interactive.c:1011 +msgid "choose all items" +msgstr "选择所有条目" + +#: add-interactive.c:1013 +msgid "(empty) finish selecting" +msgstr "（空）结束选择" + +#: add-interactive.c:1050 +msgid "select a numbered item" +msgstr "选择一个编号条目" + +#: add-interactive.c:1054 +msgid "(empty) select nothing" +msgstr "（空）不选择任何内容" + +#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851 +msgid "*** Commands ***" +msgstr "*** 命令 ***" + +#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848 +msgid "What now" +msgstr "请选择" + +#: add-interactive.c:1115 git-add--interactive.perl:213 +msgid "staged" +msgstr "缓存" + +#: add-interactive.c:1115 git-add--interactive.perl:213 +msgid "unstaged" +msgstr "未缓存" + +#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197 +#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144 +#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878 +#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213 +msgid "path" +msgstr "路径" + +#: add-interactive.c:1122 +msgid "could not refresh index" +msgstr "不能刷新索引" + +#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765 +#, c-format +msgid "Bye.\n" +msgstr "再见。\n" + +#: add-patch.c:15 +#, c-format +msgid "Stage mode change [y,n,a,q,d%s,?]? " +msgstr "暂存模式变更 [y,n,a,q,d%s,?]? " + +#: add-patch.c:16 +#, c-format +msgid "Stage deletion [y,n,a,q,d%s,?]? " +msgstr "暂存删除动作 [y,n,a,q,d%s,?]? " + +#: add-patch.c:17 +#, c-format +msgid "Stage this hunk [y,n,a,q,d%s,?]? " +msgstr "暂存该块 [y,n,a,q,d%s,?]? " + +#: add-patch.c:111 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "无法解析数据块头信息 '%.*s'" + +#: add-patch.c:130 add-patch.c:134 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "无法解析彩色数据块头信息 '%.*s'" + +#: add-patch.c:176 +msgid "could not parse diff" +msgstr "不能解析差异信息" + +#: add-patch.c:194 +msgid "could not parse colored diff" +msgstr "不能解析彩色差异信息" + +#: add-patch.c:508 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"预期上下文行 #%d 于\n" +"%.*s" + +#: add-patch.c:523 +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "" +"块不重叠：\n" +"%.*s\n" +"\t不是结尾于：\n" +"%.*s" + +#: add-patch.c:799 git-add--interactive.perl:1112 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" + +#: add-patch.c:803 +#, c-format +msgid "" +"---\n" +"To remove '%c' lines, make them ' ' lines (context).\n" +"To remove '%c' lines, delete them.\n" +"Lines starting with %c will be removed.\n" +msgstr "" +"---\n" +"要删除 '%c' 开始的行，使其成为 ' ' 开始的行（上下文）。\n" +"要删除 '%c' 开始的行，删除它们。\n" +"以 %c 开始的行将被删除。\n" + +#: add-patch.c:810 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging.\n" +msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: add-patch.c:818 git-add--interactive.perl:1126 +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" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n" +"此次编辑被终止，该块不会被修改。\n" + +#: add-patch.c:851 +msgid "could not parse hunk header" +msgstr "无法解析数据块头信息" + +#: add-patch.c:895 add-patch.c:1294 +msgid "'git apply --cached' failed" +msgstr "'git apply --cached' 失败" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#. +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: add-patch.c:952 git-add--interactive.perl:1239 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " + +#: add-patch.c:1009 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this and all the remaining hunks\n" +"d - do not stage this hunk nor any of the remaining hunks\n" +msgstr "" +"y - 暂存该块\n" +"n - 不要暂存该块\n" +"q - 退出。不暂存该块及后面的全部块\n" +"a - 暂存该块和所有剩余的块\n" +"d - 不暂存该块和任何剩余的块\n" + +#: add-patch.c:1016 +msgid "" +"j - leave this hunk undecided, see next undecided hunk\n" +"J - leave this hunk undecided, see next hunk\n" +"k - leave this hunk undecided, see previous undecided hunk\n" +"K - leave this hunk undecided, see previous hunk\n" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" +"j - 维持该块未决状态，查看下一个未决块\n" +"J - 维持该块未决状态，查看下一个块\n" +"k - 维持该块未决状态，查看上一个未决块\n" +"K - 维持该块未决状态，查看上一个块\n" +"g - 选择跳转到一个块\n" +"/ - 查找和给定正则表达式匹配的块\n" +"s - 拆分当前块为更小的块\n" +"e - 手动编辑当前块\n" +"? - 显示帮助\n" + +#: add-patch.c:1137 add-patch.c:1147 +msgid "No previous hunk" +msgstr "没有前一个块" + +#: add-patch.c:1142 add-patch.c:1152 +msgid "No next hunk" +msgstr "没有下一个块" + +#: add-patch.c:1158 +msgid "No other hunks to goto" +msgstr "没有其它可供跳转的块" + +#: add-patch.c:1169 git-add--interactive.perl:1577 +msgid "go to which hunk (<ret> to see more)? " +msgstr "跳转到哪个块（<回车> 查看更多）？ " + +#: add-patch.c:1170 git-add--interactive.perl:1579 +msgid "go to which hunk? " +msgstr "跳转到哪个块？" + +#: add-patch.c:1181 +#, c-format +msgid "Invalid number: '%s'" +msgstr "无效数字：'%s'" + +#: add-patch.c:1186 +#, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "对不起，只有 %d 个可用块。" +msgstr[1] "对不起，只有 %d 个可用块。" + +#: add-patch.c:1195 +msgid "No other hunks to search" +msgstr "没有其它可供查找的块" + +#: add-patch.c:1201 git-add--interactive.perl:1623 +msgid "search for regex? " +msgstr "使用正则表达式搜索？" + +#: add-patch.c:1216 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "错误的正则表达式 %s：%s" + +#: add-patch.c:1233 +msgid "No hunk matches the given pattern" +msgstr "没有和给定模式相匹配的块" + +#: add-patch.c:1240 +msgid "Sorry, cannot split this hunk" +msgstr "对不起，不能拆分这个块" + +#: add-patch.c:1244 +#, c-format +msgid "Split into %d hunks." +msgstr "拆分为 %d 块。" + +#: add-patch.c:1248 +msgid "Sorry, cannot edit this hunk" +msgstr "对不起，不能编辑这个块" + +#: advice.c:111 #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示：%.*s%s\n" -#: advice.c:152 +#: advice.c:164 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "无法拣选，因为您有未合并的文件。" -#: advice.c:154 +#: advice.c:166 msgid "Committing is not possible because you have unmerged files." msgstr "无法提交，因为您有未合并的文件。" -#: advice.c:156 +#: advice.c:168 msgid "Merging is not possible because you have unmerged files." msgstr "无法合并，因为您有未合并的文件。" -#: advice.c:158 +#: advice.c:170 msgid "Pulling is not possible because you have unmerged files." msgstr "无法拉取，因为您有未合并的文件。" -#: advice.c:160 +#: advice.c:172 msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退，因为您有未合并的文件。" -#: advice.c:162 +#: advice.c:174 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "无法 %s，因为您有未合并的文件。" -#: advice.c:170 +#: advice.c:182 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -186,135 +608,145 @@ msgstr "" "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n" "解决方案并提交。" -#: advice.c:178 +#: advice.c:190 msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" -#: advice.c:183 builtin/merge.c:1289 +#: advice.c:195 builtin/merge.c:1332 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: advice.c:185 +#: advice.c:197 msgid "Please, commit your changes before merging." msgstr "请在合并前先提交您的修改。" -#: advice.c:186 +#: advice.c:198 msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" -#: advice.c:192 +#: advice.c:204 #, c-format msgid "" -"Note: checking out '%s'.\n" +"Note: switching to '%s'.\n" "\n" "You are in 'detached HEAD' state. You can look around, make experimental\n" "changes and commit them, and you can discard any commits you make in this\n" -"state without impacting any branches by performing another checkout.\n" +"state without impacting any branches by switching back to a branch.\n" "\n" "If you want to create a new branch to retain commits you create, you may\n" -"do so (now or later) by using -b with the checkout command again. Example:\n" +"do so (now or later) by using -c with the switch command. Example:\n" +"\n" +" git switch -c <new-branch-name>\n" "\n" -" git checkout -b <new-branch-name>\n" +"Or undo this operation with:\n" +"\n" +" git switch -\n" +"\n" +"Turn off this advice by setting config variable advice.detachedHead to " +"false\n" "\n" msgstr "" -"注意：正在检出 '%s'。\n" +"注意：正在切换到 '%s'。\n" +"\n" +"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以在切换\n" +"回一个分支时，丢弃在此状态下所做的提交而不对分支造成影响。\n" "\n" -"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以通过另" -"外\n" -"的检出分支操作丢弃在这个状态下所做的任何提交。\n" +"如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在 switch 命令\n" +"中添加参数 -c 来实现（现在或稍后）。例如：\n" "\n" -"如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在检出命令添加\n" -"参数 -b 来实现（现在或稍后）。例如：\n" +" git switch -c <新分支名>\n" "\n" -" git checkout -b <新分支名>\n" +"或者撤销此操作：\n" "\n" +" git switch -\n" +"\n" +"通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n" +"\n" + +#: alias.c:50 +msgid "cmdline ends with \\" +msgstr "命令行以 \\ 结尾" -#: apply.c:59 +#: alias.c:51 +msgid "unclosed quote" +msgstr "未关闭的引号" + +#: apply.c:69 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" -#: apply.c:75 +#: apply.c:85 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" -#: apply.c:125 +#: apply.c:135 msgid "--reject and --3way cannot be used together." msgstr "--reject 和 --3way 不能同时使用。" -#: apply.c:127 +#: apply.c:137 msgid "--cached and --3way cannot be used together." msgstr "--cached 和 --3way 不能同时使用。" -#: apply.c:130 +#: apply.c:140 msgid "--3way outside a repository" msgstr "--3way 在一个仓库之外" -#: apply.c:141 +#: apply.c:151 msgid "--index outside a repository" msgstr "--index 在一个仓库之外" -#: apply.c:144 +#: apply.c:154 msgid "--cached outside a repository" msgstr "--cached 在一个仓库之外" -#: apply.c:826 +#: apply.c:801 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" -#: apply.c:835 +#: apply.c:810 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" -#: apply.c:909 +#: apply.c:884 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" -#: apply.c:947 +#: apply.c:922 #, 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:953 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致" -#: apply.c:954 +#: apply.c:929 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" -#: apply.c:959 +#: apply.c:934 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null" -#: apply.c:988 +#: apply.c:963 #, c-format msgid "invalid mode on line %d: %s" msgstr "第 %d 行包含无效文件模式：%s" -#: apply.c:1307 +#: apply.c:1282 #, c-format msgid "inconsistent header lines %d and %d" msgstr "不一致的文件头，%d 行和 %d 行" -#: apply.c:1479 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount：意外的行：%.*s" - -#: apply.c:1548 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "第 %d 行的补丁片段没有头信息：%.*s" - -#: apply.c:1568 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -325,82 +757,92 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: apply.c:1581 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）" -#: apply.c:1769 +#: apply.c:1481 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount：意外的行：%.*s" + +#: apply.c:1550 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "第 %d 行的补丁片段没有头信息：%.*s" + +#: apply.c:1753 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: apply.c:1771 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: apply.c:1805 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" -#: apply.c:1842 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: apply.c:1844 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: apply.c:1847 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: apply.c:1994 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" -#: apply.c:2031 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: apply.c:2193 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: apply.c:2279 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: apply.c:2283 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: apply.c:2942 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: apply.c:3063 +#: apply.c:3057 #, 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:3075 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: apply.c:3081 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -409,451 +851,437 @@ msgstr "" "当查询：\n" "%.*s" -#: apply.c:3103 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: apply.c:3111 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" -#: apply.c:3158 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" -#: apply.c:3168 +#: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。" -#: apply.c:3176 +#: apply.c:3170 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "补丁应用到空文件 '%s'，但其并非空文件" -#: apply.c:3194 +#: apply.c:3188 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "无法读取 '%2$s' 必需的目标文件 %1$s" -#: apply.c:3207 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: apply.c:3213 +#: apply.c:3207 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" -#: apply.c:3234 +#: apply.c:3228 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: apply.c:3356 +#: apply.c:3351 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" -#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278 +#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" -#: apply.c:3416 +#: apply.c:3411 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" -#: apply.c:3445 apply.c:3688 +#: apply.c:3440 apply.c:3683 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: apply.c:3531 apply.c:3703 +#: apply.c:3526 apply.c:3698 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: apply.c:3540 apply.c:3711 +#: apply.c:3535 apply.c:3706 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: apply.c:3575 +#: apply.c:3570 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: apply.c:3578 +#: apply.c:3573 #, c-format msgid "Falling back to three-way merge...\n" msgstr "回落到三方合并...\n" -#: apply.c:3594 apply.c:3598 +#: apply.c:3589 apply.c:3593 #, c-format msgid "cannot read the current contents of '%s'" msgstr "无法读取 '%s' 的当前内容" -#: apply.c:3610 +#: apply.c:3605 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "无法回落到三方合并...\n" -#: apply.c:3624 +#: apply.c:3619 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补丁到 '%s' 存在冲突。\n" -#: apply.c:3629 +#: apply.c:3624 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功应用补丁到 '%s'。\n" -#: apply.c:3655 +#: apply.c:3650 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: apply.c:3728 +#: apply.c:3723 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: apply.c:3730 +#: apply.c:3725 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: apply.c:3881 apply.c:3883 +#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1320 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" -#: apply.c:3939 +#: apply.c:3934 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: apply.c:3942 +#: apply.c:3937 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: apply.c:3962 +#: apply.c:3957 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: apply.c:3967 +#: apply.c:3962 #, 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:3987 +#: apply.c:3982 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" -#: apply.c:3991 +#: apply.c:3986 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: apply.c:4006 +#: apply.c:4001 #, c-format msgid "Checking patch %s..." -msgstr "检查补丁 %s..." +msgstr "正在检查补丁 %s..." -#: apply.c:4098 +#: apply.c:4093 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" -#: apply.c:4105 +#: apply.c:4100 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式变更，但它不在当前 HEAD 中" -#: apply.c:4108 +#: apply.c:4103 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效（%s）。" -#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "对路径 '%s' 的 make_cache_entry 操作失败" - -#: apply.c:4117 +#: apply.c:4112 #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" -#: apply.c:4127 +#: apply.c:4122 #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" -#: apply.c:4265 +#: apply.c:4260 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: apply.c:4299 +#: apply.c:4294 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: apply.c:4305 +#: apply.c:4300 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能对新建文件 '%s' 调用 stat" -#: apply.c:4313 +#: apply.c:4308 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: apply.c:4319 apply.c:4464 +#: apply.c:4314 apply.c:4459 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c:4362 +#: apply.c:4357 #, c-format msgid "failed to write to '%s'" msgstr "写入 '%s' 失败" -#: apply.c:4366 +#: apply.c:4361 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: apply.c:4436 +#: apply.c:4431 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: apply.c:4534 +#: apply.c:4529 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: apply.c:4542 +#: apply.c:4537 msgid "internal error" msgstr "内部错误" -#: apply.c:4545 +#: apply.c:4540 #, 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:4556 +#: apply.c:4551 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122 +#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" -#: apply.c:4578 +#: apply.c:4573 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: apply.c:4582 +#: apply.c:4577 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: apply.c:4692 +#: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" -#: apply.c:4700 +#: apply.c:4704 msgid "unrecognized input" msgstr "未能识别的输入" -#: apply.c:4719 +#: apply.c:4724 msgid "unable to read index file" msgstr "无法读取索引文件" -#: apply.c:4874 +#: apply.c:4881 #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s'：%s" -#: apply.c:4901 +#: apply.c:4908 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: apply.c:4907 apply.c:4922 +#: apply.c:4914 apply.c:4929 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字符误用。" msgstr[1] "%d 行新增了空白字符误用。" -#: apply.c:4915 +#: apply.c:4922 #, 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:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389 +#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212 -#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262 -#: builtin/pull.c:199 builtin/submodule--helper.c:406 -#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365 -#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849 -#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197 -msgid "path" -msgstr "路径" - -#: apply.c:4959 +#: apply.c:4966 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: apply.c:4962 +#: apply.c:4969 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: apply.c:4964 builtin/am.c:2218 +#: apply.c:4971 builtin/am.c:2206 msgid "num" msgstr "数字" -#: apply.c:4965 +#: apply.c:4972 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: apply.c:4968 +#: apply.c:4975 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: apply.c:4970 +#: apply.c:4977 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: apply.c:4974 +#: apply.c:4981 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: apply.c:4976 +#: apply.c:4983 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: apply.c:4978 +#: apply.c:4985 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: apply.c:4980 +#: apply.c:4987 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: apply.c:4982 +#: apply.c:4989 msgid "mark new files with `git add --intent-to-add`" msgstr "使用命令 `git add --intent-to-add` 标记新增文件" -#: apply.c:4984 +#: apply.c:4991 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: apply.c:4986 +#: apply.c:4993 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" -#: apply.c:4989 +#: apply.c:4996 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: apply.c:4991 +#: apply.c:4998 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三方合并" -#: apply.c:4993 +#: apply.c:5000 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523 +#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: apply.c:4998 +#: apply.c:5005 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97 -#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 -#: builtin/pack-objects.c:3312 builtin/rebase.c:857 +#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1474 msgid "action" msgstr "动作" -#: apply.c:5000 +#: apply.c:5007 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: apply.c:5003 apply.c:5006 +#: apply.c:5010 apply.c:5013 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: apply.c:5009 +#: apply.c:5016 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: apply.c:5011 +#: apply.c:5018 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: apply.c:5013 +#: apply.c:5020 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: apply.c:5015 +#: apply.c:5022 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21 -#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698 -#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127 -#: builtin/rebase--interactive.c:157 +#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22 +#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774 +#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "冗长输出" -#: apply.c:5018 +#: apply.c:5025 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: apply.c:5021 +#: apply.c:5028 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: apply.c:5023 builtin/am.c:2206 +#: apply.c:5030 builtin/am.c:2194 msgid "root" msgstr "根目录" -#: apply.c:5024 +#: apply.c:5031 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" -msgstr "git archive [<选项>] <树或提交> [<路径>...]" +msgstr "git archive [<选项>] <树对象> [<路径>...]" #: archive.c:15 msgid "git archive --list" @@ -863,154 +1291,174 @@ msgstr "git archive --list" msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" +"git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]" #: archive.c:17 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" -#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298 +#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" -#: archive.c:453 +#: archive.c:396 +#, c-format +msgid "no such ref: %.*s" +msgstr "无此引用：%.*s" + +#: archive.c:401 +#, c-format +msgid "not a valid object name: %s" +msgstr "不是一个有效的对象名：%s" + +#: archive.c:414 +#, c-format +msgid "not a tree object: %s" +msgstr "不是一个树对象：%s" + +#: archive.c:426 +msgid "current working directory is untracked" +msgstr "当前工作目录未被跟踪" + +#: archive.c:457 msgid "fmt" msgstr "格式" -#: archive.c:453 +#: archive.c:457 msgid "archive format" msgstr "归档格式" -#: archive.c:454 builtin/log.c:1536 +#: archive.c:458 builtin/log.c:1653 msgid "prefix" msgstr "前缀" -#: archive.c:455 +#: archive.c:459 msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129 -#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884 -#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562 -#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122 -#: parse-options.h:162 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 +#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 +#: parse-options.h:190 msgid "file" msgstr "文件" -#: archive.c:457 builtin/archive.c:89 +#: archive.c:461 builtin/archive.c:90 msgid "write the archive to this file" msgstr "归档写入此文件" -#: archive.c:459 +#: archive.c:463 msgid "read .gitattributes in working directory" msgstr "读取工作区中的 .gitattributes" -#: archive.c:460 +#: archive.c:464 msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" -#: archive.c:461 +#: archive.c:465 msgid "store only" msgstr "只存储" -#: archive.c:462 +#: archive.c:466 msgid "compress faster" msgstr "压缩速度更快" -#: archive.c:470 +#: archive.c:474 msgid "compress better" msgstr "压缩效果更好" -#: archive.c:473 +#: archive.c:477 msgid "list supported archive formats" msgstr "列出支持的归档格式" -#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 -#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884 msgid "repo" msgstr "仓库" -#: archive.c:476 builtin/archive.c:91 +#: archive.c:480 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "从远程仓库（<仓库>）提取归档文件" -#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714 -#: builtin/notes.c:496 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: builtin/notes.c:498 msgid "command" msgstr "命令" -#: archive.c:478 builtin/archive.c:93 +#: archive.c:482 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" -#: archive.c:485 +#: archive.c:489 msgid "Unexpected option --remote" msgstr "未知参数 --remote" -#: archive.c:487 +#: archive.c:491 msgid "Option --exec can only be used together with --remote" msgstr "选项 --exec 只能和 --remote 同时使用" -#: archive.c:489 +#: archive.c:493 msgid "Unexpected option --output" msgstr "未知参数 --output" -#: archive.c:511 +#: archive.c:515 #, c-format msgid "Unknown archive format '%s'" msgstr "未知归档格式 '%s'" -#: archive.c:518 +#: archive.c:522 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "参数不支持此格式 '%s'：-%d" -#: archive-tar.c:125 archive-zip.c:345 +#: archive-tar.c:125 archive-zip.c:350 #, c-format msgid "cannot stream blob %s" msgstr "不能打开数据对象 %s" -#: archive-tar.c:260 archive-zip.c:363 +#: archive-tar.c:266 archive-zip.c:368 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支持的文件模式：0%o (SHA1: %s)" -#: archive-tar.c:287 archive-zip.c:353 +#: archive-tar.c:293 archive-zip.c:358 #, c-format msgid "cannot read %s" msgstr "不能读取 %s" -#: archive-tar.c:458 +#: archive-tar.c:465 #, c-format msgid "unable to start '%s' filter" msgstr "无法启动 '%s' 过滤器" -#: archive-tar.c:461 +#: archive-tar.c:468 msgid "unable to redirect descriptor" msgstr "无法重定向描述符" -#: archive-tar.c:468 +#: archive-tar.c:475 #, c-format msgid "'%s' filter reported error" msgstr "'%s' 过滤器报告了错误" -#: archive-zip.c:314 +#: archive-zip.c:319 #, c-format msgid "path is not valid UTF-8: %s" msgstr "路径不是有效的 UTF-8：%s" -#: archive-zip.c:318 +#: archive-zip.c:323 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路径太长（%d 字符，SHA1：%s）：%s" -#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227 +#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: archive-zip.c:609 +#: archive-zip.c:614 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "对于本系统时间戳太大：%<PRIuMAX>" @@ -1020,6 +1468,11 @@ msgstr "对于本系统时间戳太大：%<PRIuMAX>" msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一个有效的属性名" +#: attr.c:369 +#, c-format +msgid "%s not allowed: %s:%d" +msgstr "不允许 %s：%s:%d" + #: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" @@ -1033,17 +1486,17 @@ msgstr "" msgid "Badly quoted content in file '%s': %s" msgstr "文件 '%s' 包含错误的引用格式：%s" -#: bisect.c:676 +#: bisect.c:678 #, c-format msgid "We cannot bisect more!\n" msgstr "我们无法进行更多的二分查找！\n" -#: bisect.c:730 +#: bisect.c:733 #, c-format msgid "Not a valid commit name %s" msgstr "不是一个有效的提交名 %s" -#: bisect.c:754 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1052,7 +1505,7 @@ msgstr "" "合并基线 %s 是坏的。\n" "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" -#: bisect.c:759 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is new.\n" @@ -1061,7 +1514,7 @@ msgstr "" "合并基线 %s 是新的。\n" "介于 %s 和 [%s] 之间的属性已经被修改。\n" -#: bisect.c:764 +#: bisect.c:768 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1070,7 +1523,7 @@ msgstr "" "合并基线 %s 是 %s。\n" "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" -#: bisect.c:772 +#: bisect.c:776 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1081,7 +1534,7 @@ msgstr "" "这种情况下 git 二分查找无法正常工作。\n" "您可能弄错了 %s 和 %s 版本？\n" -#: bisect.c:785 +#: bisect.c:789 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1092,22 +1545,22 @@ msgstr "" "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" "我们仍旧继续。" -#: bisect.c:818 +#: bisect.c:822 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分查找中：合并基线必须是经过测试的\n" -#: bisect.c:858 +#: bisect.c:865 #, c-format msgid "a %s revision is needed" msgstr "需要一个 %s 版本" -#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" -#: bisect.c:928 builtin/merge.c:138 +#: bisect.c:928 builtin/merge.c:148 #, c-format msgid "could not read file '%s'" msgstr "不能读取文件 '%s'" @@ -1147,42 +1600,42 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" -#: blame.c:1787 +#: blame.c:2700 msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" -#: blame.c:1801 +#: blame.c:2714 msgid "cannot use --contents with final commit object name" msgstr "不能将 --contents 和最终的提交对象名共用" -#: blame.c:1822 +#: blame.c:2735 msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963 -#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932 -#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406 -#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093 +#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991 +#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411 +#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "版本遍历设置失败" -#: blame.c:1849 +#: blame.c:2762 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围" -#: blame.c:1860 +#: blame.c:2773 #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中无此路径 %1$s" -#: blame.c:1871 +#: blame.c:2784 #, c-format msgid "cannot read blob %s for path %s" msgstr "不能为路径 %2$s 读取数据对象 %1$s" -#: branch.c:52 +#: branch.c:53 #, c-format msgid "" "\n" @@ -1194,85 +1647,85 @@ msgstr "" "在修复错误后，您可以尝试修改远程跟踪分支，通过执行命令\n" "\"git branch --set-upstream-to=%s%s%s\" 。" -#: branch.c:66 +#: branch.c:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "未设置分支 %s 作为它自己的上游。" -#: branch.c:92 +#: branch.c:93 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。" -#: branch.c:93 +#: branch.c:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。" -#: branch.c:97 +#: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。" -#: branch.c:98 +#: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。" -#: branch.c:103 +#: branch.c:104 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。" -#: branch.c:104 +#: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。" -#: branch.c:108 +#: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。" -#: branch.c:109 +#: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。" -#: branch.c:118 +#: branch.c:119 msgid "Unable to write upstream branch configuration" msgstr "无法写入上游分支配置" -#: branch.c:155 +#: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "未跟踪：引用 %s 有歧义" -#: branch.c:188 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' 不是一个有效的分支名称。" -#: branch.c:207 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "一个分支名 '%s' 已经存在。" -#: branch.c:212 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "无法强制更新当前分支。" -#: branch.c:232 +#: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。" -#: branch.c:234 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "请求的上游分支 '%s' 不存在" -#: branch.c:236 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1290,27 +1743,27 @@ msgstr "" "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n" "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" -#: branch.c:279 +#: branch.c:281 #, c-format msgid "Not a valid object name: '%s'." msgstr "不是一个有效的对象名：'%s'。" -#: branch.c:299 +#: branch.c:301 #, c-format msgid "Ambiguous object name: '%s'." msgstr "歧义的对象名：'%s'。" -#: branch.c:304 +#: branch.c:306 #, c-format msgid "Not a valid branch point: '%s'." msgstr "无效的分支点：'%s'。" -#: branch.c:358 +#: branch.c:364 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' 已经检出到 '%s'" -#: branch.c:381 +#: branch.c:387 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s 的 HEAD 指向没有被更新" @@ -1325,70 +1778,74 @@ msgstr "'%s' 不像是一个 v2 版本的包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722 -#: builtin/commit.c:774 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108 +#: builtin/commit.c:811 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" -#: bundle.c:141 +#: bundle.c:143 msgid "Repository lacks these prerequisite commits:" msgstr "仓库中缺少这些必备的提交：" -#: bundle.c:192 +#: bundle.c:146 +msgid "need a repository to verify a bundle" +msgstr "需要一个仓库来校验一个包" + +#: bundle.c:197 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个包中含有这个引用：" msgstr[1] "这个包中含有 %d 个引用：" -#: bundle.c:199 +#: bundle.c:204 msgid "The bundle records a complete history." msgstr "这个包记录一个完整历史。" -#: bundle.c:201 +#: bundle.c:206 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个包需要这个引用：" msgstr[1] "这个包需要 %d 个引用：" -#: bundle.c:267 +#: bundle.c:273 msgid "unable to dup bundle descriptor" msgstr "无法复制 bundle 描述符" -#: bundle.c:274 +#: bundle.c:280 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 进程" -#: bundle.c:285 +#: bundle.c:291 msgid "pack-objects died" msgstr "pack-objects 终止" -#: bundle.c:327 +#: bundle.c:333 msgid "rev-list died" msgstr "rev-list 终止" -#: bundle.c:376 +#: bundle.c:382 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304 +#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" -#: bundle.c:464 +#: bundle.c:469 msgid "Refusing to create empty bundle." msgstr "不能创建空包。" -#: bundle.c:474 +#: bundle.c:479 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" -#: bundle.c:498 +#: bundle.c:504 msgid "index-pack died" msgstr "index-pack 终止" @@ -1397,14 +1854,13 @@ msgstr "index-pack 终止" msgid "invalid color value: %.*s" msgstr "无效的颜色值：%.*s" -#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414 -#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376 -#: builtin/replace.c:448 +#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" -#: commit.c:52 +#: commit.c:53 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s 不是一个提交！" @@ -1429,27 +1885,27 @@ msgstr "" "设置 \"git config advice.graftFileDeprecated false\"\n" "可关闭本消息" -#: commit.c:1115 +#: commit.c:1152 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" -#: commit.c:1118 +#: commit.c:1155 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" -#: commit.c:1121 +#: commit.c:1158 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有 GPG 签名。" -#: commit.c:1124 +#: commit.c:1161 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" -#: commit.c:1378 +#: commit.c:1415 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1459,95 +1915,262 @@ msgstr "" "您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n" "设置为您项目所用的字符编码。\n" -#: commit-graph.c:108 +#: commit-graph.c:130 +msgid "commit-graph file is too small" +msgstr "提交图形文件太小" + +#: commit-graph.c:195 #, c-format -msgid "graph file %s is too small" -msgstr "图形文件 %s 太小" +msgid "commit-graph signature %X does not match signature %X" +msgstr "提交图形签名 %X 和签名 %X 不匹配" -#: commit-graph.c:115 +#: commit-graph.c:202 #, c-format -msgid "graph signature %X does not match signature %X" -msgstr "图形签名 %X 和签名 %X 不匹配" +msgid "commit-graph version %X does not match version %X" +msgstr "提交图形版本 %X 和版本 %X 不匹配" -#: commit-graph.c:122 +#: commit-graph.c:209 #, c-format -msgid "graph version %X does not match version %X" -msgstr "图形版本 %X 和版本 %X 不匹配" +msgid "commit-graph hash version %X does not match version %X" +msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" + +#: commit-graph.c:232 +msgid "commit-graph chunk lookup table entry missing; file may be incomplete" +msgstr "提交图形块查找表条目丢失，文件可能不完整" -#: commit-graph.c:129 +#: commit-graph.c:243 #, c-format -msgid "hash version %X does not match version %X" -msgstr "散列版本 %X 和版本 %X 不匹配" +msgid "commit-graph improper chunk offset %08x%08x" +msgstr "提交图形不正确的块偏移 %08x%08x" -#: commit-graph.c:153 +#: commit-graph.c:286 #, c-format -msgid "improper chunk offset %08x%08x" -msgstr "不正确的块偏移 %08x%08x" +msgid "commit-graph chunk id %08x appears multiple times" +msgstr "提交图形块 id %08x 出现了多次" -#: commit-graph.c:189 +#: commit-graph.c:350 +msgid "commit-graph has no base graphs chunk" +msgstr "提交图形没有基础图形块" + +#: commit-graph.c:360 +msgid "commit-graph chain does not match" +msgstr "提交图形链不匹配" + +#: commit-graph.c:407 #, c-format -msgid "chunk id %08x appears multiple times" -msgstr "块 id %08x 出现了多次" +msgid "invalid commit-graph chain: line '%s' not a hash" +msgstr "无效的提交图形链：行 '%s' 不是一个哈希值" + +#: commit-graph.c:433 +msgid "unable to find all commit-graph files" +msgstr "无法找到所有提交图形文件" -#: commit-graph.c:308 +#: commit-graph.c:564 commit-graph.c:624 +msgid "invalid commit position. commit-graph is likely corrupt" +msgstr "无效的提交位置。提交图形可能已损坏" + +#: commit-graph.c:585 #, c-format msgid "could not find commit %s" msgstr "无法找到提交 %s" -#: commit-graph.c:617 builtin/pack-objects.c:2652 +#: commit-graph.c:858 builtin/am.c:1287 +#, c-format +msgid "unable to parse commit %s" +msgstr "不能解析提交 %s" + +#: commit-graph.c:1017 builtin/pack-objects.c:2641 #, c-format msgid "unable to get type of object %s" msgstr "无法获得对象 %s 类型" -#: commit-graph.c:651 -msgid "Annotating commits in commit graph" -msgstr "正在注解提交图中的提交" +#: commit-graph.c:1049 +msgid "Loading known commits in commit graph" +msgstr "正在加载提交图中的已知提交" + +#: commit-graph.c:1066 +msgid "Expanding reachable commits in commit graph" +msgstr "正在扩展提交图中的可达提交" -#: commit-graph.c:691 +#: commit-graph.c:1085 +msgid "Clearing commit marks in commit graph" +msgstr "正在清除提交图中的提交标记" + +#: commit-graph.c:1104 msgid "Computing commit graph generation numbers" msgstr "正在计算提交图世代数字" -#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852 -msgid "Finding commits for commit graph" -msgstr "正在查找提交图的提交" +#: commit-graph.c:1179 +#, c-format +msgid "Finding commits for commit graph in %d pack" +msgid_plural "Finding commits for commit graph in %d packs" +msgstr[0] "正在 %d 个包中查找提交图的提交" +msgstr[1] "正在 %d 个包中查找提交图的提交" -#: commit-graph.c:812 +#: commit-graph.c:1192 #, c-format msgid "error adding pack %s" msgstr "添加包 %s 出错" -#: commit-graph.c:814 +#: commit-graph.c:1196 #, c-format msgid "error opening index for %s" msgstr "为 %s 打开索引出错" -#: commit-graph.c:868 +#: commit-graph.c:1220 #, c-format -msgid "the commit graph format cannot write %d commits" -msgstr "提交图格式不能写入 %d 个提交" +msgid "Finding commits for commit graph from %d ref" +msgid_plural "Finding commits for commit graph from %d refs" +msgstr[0] "正在从 %d 个引用中查找提交图的提交" +msgstr[1] "正在从 %d 个引用中查找提交图的提交" -#: commit-graph.c:895 -msgid "too many commits to write graph" -msgstr "提交太多不能画图" +#: commit-graph.c:1240 +#, c-format +msgid "invalid commit object id: %s" +msgstr "无效的提交对象 ID：%s" + +#: commit-graph.c:1255 +msgid "Finding commits for commit graph among packed objects" +msgstr "正在打包对象中查找提交图的提交" + +#: commit-graph.c:1270 +msgid "Counting distinct commits in commit graph" +msgstr "正在计算提交图中不同的提交" -#: commit-graph.c:902 midx.c:769 +#: commit-graph.c:1300 +msgid "Finding extra edges in commit graph" +msgstr "正在查找提交图中额外的边" + +#: commit-graph.c:1346 +msgid "failed to write correct number of base graph ids" +msgstr "无法写入正确数量的基础图形 ID" + +#: commit-graph.c:1379 midx.c:814 #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" -#: commit-graph.c:1002 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248 +#, c-format +msgid "unable to create '%s'" +msgstr "不能创建 '%s'" + +#: commit-graph.c:1451 +#, c-format +msgid "Writing out commit graph in %d pass" +msgid_plural "Writing out commit graph in %d passes" +msgstr[0] "正在用 %d 步写出提交图" +msgstr[1] "正在用 %d 步写出提交图" + +#: commit-graph.c:1492 +msgid "unable to open commit-graph chain file" +msgstr "无法打开提交图形链文件" + +#: commit-graph.c:1504 +msgid "failed to rename base commit-graph file" +msgstr "无法重命名基础提交图形文件" + +#: commit-graph.c:1524 +msgid "failed to rename temporary commit-graph file" +msgstr "无法重命名临时提交图形文件" + +#: commit-graph.c:1635 +msgid "Scanning merged commits" +msgstr "正在扫描合并提交" + +#: commit-graph.c:1646 +#, c-format +msgid "unexpected duplicate commit id %s" +msgstr "意外的重复提交 ID %s" + +#: commit-graph.c:1670 +msgid "Merging commit-graph" +msgstr "正在合并提交图形" + +#: commit-graph.c:1860 +#, c-format +msgid "the commit graph format cannot write %d commits" +msgstr "提交图格式不能写入 %d 个提交" + +#: commit-graph.c:1871 +msgid "too many commits to write graph" +msgstr "提交太多不能画图" + +#: commit-graph.c:1961 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交图文件的校验码错误，可能已经损坏" -#: commit-graph.c:1046 +#: commit-graph.c:1971 +#, c-format +msgid "commit-graph has incorrect OID order: %s then %s" +msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s" + +#: commit-graph.c:1981 commit-graph.c:1996 +#, c-format +msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" +msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u" + +#: commit-graph.c:1988 +#, c-format +msgid "failed to parse commit %s from commit-graph" +msgstr "无法从提交图形中解析提交 %s" + +#: commit-graph.c:2006 msgid "Verifying commits in commit graph" -msgstr "校验提交图中的提交" +msgstr "正在校验提交图中的提交" + +#: commit-graph.c:2020 +#, c-format +msgid "failed to parse commit %s from object database for commit-graph" +msgstr "无法从提交图形的对象库中解析提交 %s" + +#: commit-graph.c:2027 +#, c-format +msgid "root tree OID for commit %s in commit-graph is %s != %s" +msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" + +#: commit-graph.c:2037 +#, c-format +msgid "commit-graph parent list for commit %s is too long" +msgstr "提交 %s 的提交图形父提交列表太长了" + +#: commit-graph.c:2046 +#, c-format +msgid "commit-graph parent for %s is %s != %s" +msgstr "%s 的提交图形父提交是 %s != %s" + +#: commit-graph.c:2059 +#, c-format +msgid "commit-graph parent list for commit %s terminates early" +msgstr "提交 %s 的提交图形父提交列表过早终止" + +#: commit-graph.c:2064 +#, c-format +msgid "" +"commit-graph has generation number zero for commit %s, but non-zero elsewhere" +msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零" + +#: commit-graph.c:2068 +#, c-format +msgid "" +"commit-graph has non-zero generation number for commit %s, but zero elsewhere" +msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零" + +#: commit-graph.c:2083 +#, c-format +msgid "commit-graph generation for commit %s is %u != %u" +msgstr "提交图形中的提交 %s 的世代号是 %u != %u" -#: compat/obstack.c:405 compat/obstack.c:407 +#: commit-graph.c:2089 +#, c-format +msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" +msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" + +#: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "内存耗尽" -#: config.c:123 +#: config.c:124 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1562,294 +2185,289 @@ msgstr "" "\t%2$s\n" "这可能是因为循环包含。" -#: config.c:139 +#: config.c:140 #, c-format msgid "could not expand include path '%s'" msgstr "无法扩展包含路径 '%s'" -#: config.c:150 +#: config.c:151 msgid "relative config includes must come from files" msgstr "相对路径的配置文件引用必须来自于文件" -#: config.c:190 +#: config.c:197 msgid "relative config include conditionals must come from files" msgstr "相对路径的配置文件条件引用必须来自于文件" -#: config.c:348 +#: config.c:376 #, c-format msgid "key does not contain a section: %s" msgstr "键名没有包含一个小节名称：%s" -#: config.c:354 +#: config.c:382 #, c-format msgid "key does not contain variable name: %s" msgstr "键名没有包含变量名：%s" -#: config.c:378 sequencer.c:2296 +#: config.c:406 sequencer.c:2530 #, c-format msgid "invalid key: %s" msgstr "无效键名：%s" -#: config.c:384 +#: config.c:412 #, c-format msgid "invalid key (newline): %s" msgstr "无效键名（有换行符）：%s" -#: config.c:420 config.c:432 +#: config.c:448 config.c:460 #, c-format msgid "bogus config parameter: %s" msgstr "伪配置参数：%s" -#: config.c:467 +#: config.c:495 #, c-format msgid "bogus format in %s" msgstr "%s 中格式错误" -#: config.c:793 +#: config.c:821 #, c-format msgid "bad config line %d in blob %s" msgstr "数据对象 %2$s 中错误的配置行 %1$d" -#: config.c:797 +#: config.c:825 #, c-format msgid "bad config line %d in file %s" msgstr "文件 %2$s 中错误的配置行 %1$d" -#: config.c:801 +#: config.c:829 #, c-format msgid "bad config line %d in standard input" msgstr "标准输入中错误的配置行 %d" -#: config.c:805 +#: config.c:833 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" -#: config.c:809 +#: config.c:837 #, c-format msgid "bad config line %d in command line %s" msgstr "命令行 %2$s 中错误的配置行 %1$d" -#: config.c:813 +#: config.c:841 #, c-format msgid "bad config line %d in %s" msgstr "在 %2$s 中错误的配置行 %1$d" -#: config.c:952 +#: config.c:978 msgid "out of range" msgstr "超出范围" -#: config.c:952 +#: config.c:978 msgid "invalid unit" msgstr "无效的单位" -#: config.c:958 +#: config.c:979 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s" -#: config.c:963 +#: config.c:998 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:966 +#: config.c:1001 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:969 +#: config.c:1004 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s" -#: config.c:972 +#: config.c:1007 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:975 +#: config.c:1010 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:978 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:1073 +#: config.c:1108 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "无法扩展用户目录：'%s'" -#: config.c:1082 +#: config.c:1117 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" -#: config.c:1173 +#: config.c:1208 #, c-format msgid "abbrev length out of range: %d" msgstr "缩写长度超出范围：%d" -#: config.c:1187 config.c:1198 +#: config.c:1222 config.c:1233 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" -#: config.c:1290 +#: config.c:1325 msgid "core.commentChar should only be one character" msgstr "core.commentChar 应该是一个字符" -#: config.c:1323 +#: config.c:1358 #, c-format msgid "invalid mode for object creation: %s" msgstr "无效的对象创建模式：%s" -#: config.c:1395 +#: config.c:1430 #, c-format msgid "malformed value for %s" msgstr "%s 的取值格式错误" -#: config.c:1421 +#: config.c:1456 #, c-format msgid "malformed value for %s: %s" msgstr "%s 的取值格式错误：%s" -#: config.c:1422 +#: config.c:1457 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1481 builtin/pack-objects.c:3391 +#: config.c:1518 builtin/pack-objects.c:3394 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" -#: config.c:1602 +#: config.c:1639 #, c-format msgid "unable to load config blob object '%s'" msgstr "无法从数据对象 '%s' 加载配置" -#: config.c:1605 +#: config.c:1642 #, c-format msgid "reference '%s' does not point to a blob" msgstr "引用 '%s' 没有指向一个数据对象" -#: config.c:1622 +#: config.c:1659 #, c-format msgid "unable to resolve config blob '%s'" msgstr "不能解析配置对象 '%s'" -#: config.c:1652 +#: config.c:1689 #, c-format msgid "failed to parse %s" msgstr "解析 %s 失败" -#: config.c:1705 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" -#: config.c:2037 +#: config.c:2096 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" -#: config.c:2207 +#: config.c:2266 #, c-format msgid "Invalid %s: '%s'" msgstr "无效 %s：'%s'" -#: config.c:2250 -#, c-format -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'" - -#: config.c:2276 +#: config.c:2311 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" -#: config.c:2322 +#: config.c:2357 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" -#: config.c:2324 +#: config.c:2359 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" -#: config.c:2405 +#: config.c:2440 #, c-format msgid "invalid section name '%s'" msgstr "无效的小节名称 '%s'" -#: config.c:2437 +#: config.c:2472 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" -#: config.c:2466 +#: config.c:2501 #, c-format msgid "failed to write new configuration file %s" msgstr "写入新的配置文件 %s 失败" -#: config.c:2717 config.c:3041 +#: config.c:2753 config.c:3077 #, c-format msgid "could not lock config file %s" msgstr "不能锁定配置文件 %s" -#: config.c:2728 +#: config.c:2764 #, c-format msgid "opening %s" msgstr "打开 %s" -#: config.c:2763 builtin/config.c:327 +#: config.c:2799 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "无效模式：%s" -#: config.c:2788 +#: config.c:2824 #, c-format msgid "invalid config file %s" msgstr "无效的配置文件 %s" -#: config.c:2801 config.c:3054 +#: config.c:2837 config.c:3090 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" -#: config.c:2812 +#: config.c:2848 #, c-format msgid "unable to mmap '%s'" msgstr "不能 mmap '%s'" -#: config.c:2821 config.c:3059 +#: config.c:2857 config.c:3095 #, c-format msgid "chmod on %s failed" msgstr "对 %s 调用 chmod 失败" -#: config.c:2906 config.c:3156 +#: config.c:2942 config.c:3192 #, c-format msgid "could not write config file %s" msgstr "不能写入配置文件 %s" -#: config.c:2940 +#: config.c:2976 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" -#: config.c:2942 builtin/remote.c:782 +#: config.c:2978 builtin/remote.c:781 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" -#: config.c:3032 +#: config.c:3068 #, c-format msgid "invalid section name: %s" msgstr "无效的小节名称：%s" -#: config.c:3199 +#: config.c:3235 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺失" @@ -1901,50 +2519,45 @@ msgstr "协议错误：预期浅克隆 sha-1，却得到 '%s'" msgid "repository on the other end cannot be shallow" msgstr "另一端的仓库不能是浅克隆仓库" -#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "远程错误：%s" - -#: connect.c:316 +#: connect.c:313 msgid "invalid packet" msgstr "无效数据包" -#: connect.c:336 +#: connect.c:333 #, c-format msgid "protocol error: unexpected '%s'" msgstr "协议错误：意外的 '%s'" -#: connect.c:444 +#: connect.c:441 #, c-format msgid "invalid ls-refs response: %s" msgstr "无效的 ls-refs 响应：%s" -#: connect.c:448 +#: connect.c:445 msgid "expected flush after ref listing" msgstr "在引用列表之后应该有一个 flush 包" -#: connect.c:547 +#: connect.c:544 #, c-format msgid "protocol '%s' is not supported" msgstr "不支持 '%s' 协议" -#: connect.c:598 +#: connect.c:595 msgid "unable to set SO_KEEPALIVE on socket" msgstr "无法为 socket 设置 SO_KEEPALIVE" -#: connect.c:638 connect.c:701 +#: connect.c:635 connect.c:698 #, c-format msgid "Looking up %s ... " msgstr "查找 %s ..." -#: connect.c:642 +#: connect.c:639 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "无法查找 %s（端口 %s）（%s）" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:646 connect.c:717 +#: connect.c:643 connect.c:714 #, c-format msgid "" "done.\n" @@ -1953,7 +2566,7 @@ msgstr "" "完成。\n" "连接到 %s（端口 %s）... " -#: connect.c:668 connect.c:745 +#: connect.c:665 connect.c:742 #, c-format msgid "" "unable to connect to %s:\n" @@ -1963,73 +2576,73 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:674 connect.c:751 +#: connect.c:671 connect.c:748 msgid "done." msgstr "完成。" -#: connect.c:705 +#: connect.c:702 #, c-format msgid "unable to look up %s (%s)" msgstr "无法查找 %s（%s）" -#: connect.c:711 +#: connect.c:708 #, c-format msgid "unknown port %s" msgstr "未知端口 %s" -#: connect.c:848 connect.c:1174 +#: connect.c:845 connect.c:1175 #, c-format msgid "strange hostname '%s' blocked" msgstr "已阻止奇怪的主机名 '%s'" -#: connect.c:850 +#: connect.c:847 #, c-format msgid "strange port '%s' blocked" msgstr "已阻止奇怪的端口号 '%s'" -#: connect.c:860 +#: connect.c:857 #, c-format msgid "cannot start proxy %s" msgstr "不能启动代理 %s" -#: connect.c:927 +#: connect.c:928 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法" -#: connect.c:1122 +#: connect.c:1123 msgid "ssh variant 'simple' does not support -4" msgstr "ssh 变体 'simple' 不支持 -4" -#: connect.c:1134 +#: connect.c:1135 msgid "ssh variant 'simple' does not support -6" msgstr "ssh 变体 'simple' 不支持 -6" -#: connect.c:1151 +#: connect.c:1152 msgid "ssh variant 'simple' does not support setting port" msgstr "ssh 变体 'simple' 不支持设置端口" -#: connect.c:1262 +#: connect.c:1264 #, c-format msgid "strange pathname '%s' blocked" msgstr "已阻止奇怪的路径名 '%s'" -#: connect.c:1307 +#: connect.c:1311 msgid "unable to fork" msgstr "无法 fork" -#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147 +#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43 msgid "Checking connectivity" -msgstr "检查连接中" +msgstr "正在检查连通性" -#: connected.c:80 +#: connected.c:101 msgid "Could not run 'git rev-list'" msgstr "不能执行 'git rev-list'" -#: connected.c:100 +#: connected.c:121 msgid "failed write to rev-list" msgstr "写入 rev-list 失败" -#: connected.c:107 +#: connected.c:128 msgid "failed to close rev-list's stdin" msgstr "关闭 rev-list 的标准输入失败" @@ -2066,24 +2679,24 @@ msgstr "" "%s 中的 LF 将被 CRLF 替换。\n" "在工作区中该文件仍保持原有的换行符" -#: convert.c:280 +#: convert.c:284 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM" -#: convert.c:287 +#: convert.c:291 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" -"tree-encoding." -msgstr "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%s 作为工作区编码。" +"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " +"working-tree-encoding." +msgstr "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%.*s 作为工作区编码。" -#: convert.c:305 +#: convert.c:304 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM" -#: convert.c:307 +#: convert.c:306 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -2092,117 +2705,117 @@ msgstr "" "文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字" "节序）作为工作区编码。" -#: convert.c:425 convert.c:496 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "无法对 '%s' 进行从 %s 到 %s 的编码" -#: convert.c:468 +#: convert.c:462 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致" -#: convert.c:674 +#: convert.c:668 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "不能 fork 以执行外部过滤器 '%s'" -#: convert.c:694 +#: convert.c:688 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "不能将输入传递给外部过滤器 '%s'" -#: convert.c:701 +#: convert.c:695 #, c-format msgid "external filter '%s' failed %d" msgstr "外部过滤器 '%s' 失败码 %d" -#: convert.c:736 convert.c:739 +#: convert.c:730 convert.c:733 #, c-format msgid "read from external filter '%s' failed" msgstr "从外部过滤器 '%s' 读取失败" -#: convert.c:742 convert.c:796 +#: convert.c:736 convert.c:791 #, c-format msgid "external filter '%s' failed" msgstr "外部过滤器 '%s' 失败" -#: convert.c:844 +#: convert.c:839 msgid "unexpected filter type" msgstr "意外的过滤类型" -#: convert.c:855 +#: convert.c:850 msgid "path name too long for external filter" msgstr "外部过滤器的路径名太长" -#: convert.c:929 +#: convert.c:924 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤" -#: convert.c:1228 +#: convert.c:1223 msgid "true/false are no valid working-tree-encodings" msgstr "true/false 不是有效的工作区编码" -#: convert.c:1398 convert.c:1432 +#: convert.c:1411 convert.c:1445 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s：clean 过滤器 '%s' 失败" -#: convert.c:1476 +#: convert.c:1489 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s：smudge 过滤器 %s 失败" -#: date.c:116 +#: date.c:138 msgid "in the future" msgstr "在将来" -#: date.c:122 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> 秒钟前" msgstr[1] "%<PRIuMAX> 秒钟前" -#: date.c:129 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> 分钟前" msgstr[1] "%<PRIuMAX> 分钟前" -#: date.c:136 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> 小时前" msgstr[1] "%<PRIuMAX> 小时前" -#: date.c:143 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> 天前" msgstr[1] "%<PRIuMAX> 天前" -#: date.c:149 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> 周前" msgstr[1] "%<PRIuMAX> 周前" -#: date.c:156 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "%<PRIuMAX> 个月前" msgstr[1] "%<PRIuMAX> 个月前" -#: date.c:167 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2210,40 +2823,40 @@ msgstr[0] "%<PRIuMAX> 年" msgstr[1] "%<PRIuMAX> 年" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:170 +#: date.c:192 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s %<PRIuMAX> 个月前" msgstr[1] "%s %<PRIuMAX> 个月前" -#: date.c:175 date.c:180 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" msgstr[0] "%<PRIuMAX> 年前" msgstr[1] "%<PRIuMAX> 年前" -#: delta-islands.c:268 +#: delta-islands.c:272 msgid "Propagating island marks" msgstr "正在传播数据岛标记" -#: delta-islands.c:286 +#: delta-islands.c:290 #, c-format msgid "bad tree object %s" msgstr "坏的树对象 %s" -#: delta-islands.c:330 +#: delta-islands.c:334 #, c-format msgid "failed to load island regex for '%s': %s" msgstr "未能加载 '%s' 的数据岛正则表达式：%s" -#: delta-islands.c:386 +#: delta-islands.c:390 #, c-format msgid "island regex from config has too many capture groups (max=%d)" msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 %d 个）" -#: delta-islands.c:462 +#: delta-islands.c:467 #, c-format msgid "Marked %d islands, done.\n" msgstr "已标记 %d 个数据岛，结束。\n" @@ -2253,28 +2866,33 @@ msgstr "已标记 %d 个数据岛，结束。\n" msgid "failed to read orderfile '%s'" msgstr "读取排序文件 '%s' 失败" -#: diffcore-rename.c:544 +#: diffcore-rename.c:543 msgid "Performing inexact rename detection" msgstr "正在进行非精确的重命名探测" -#: diff.c:108 -#, c-format -msgid "option '%s' requires a value" -msgstr "选项 '%s' 需要一个值" +#: diff-no-index.c:238 +msgid "git diff --no-index [<options>] <path> <path>" +msgstr "git diff --no-index [<选项>] <路径> <路径>" + +#: diff-no-index.c:263 +msgid "" +"Not a git repository. Use --no-index to compare two paths outside a working " +"tree" +msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径" # 译者：注意保持前导空格 -#: diff.c:158 +#: diff.c:155 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n" # 译者：注意保持前导空格 -#: diff.c:163 +#: diff.c:160 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat 参数 '%s'\n" -#: diff.c:291 +#: diff.c:296 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -2282,23 +2900,27 @@ msgstr "" "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 " "'plain'" -#: diff.c:316 +#: diff.c:324 #, c-format -msgid "ignoring unknown color-moved-ws mode '%s'" -msgstr "忽略未知的 color-moved-ws 模式 '%s'" +msgid "" +"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " +"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" +msgstr "" +"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-" +"space-at-eol'、'ignore-all-space'、'allow-indentation-change'" -#: diff.c:323 +#: diff.c:332 msgid "" -"color-moved-ws: allow-indentation-change cannot be combined with other white " -"space modes" +"color-moved-ws: allow-indentation-change cannot be combined with other " +"whitespace modes" msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用" -#: diff.c:394 +#: diff.c:405 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" -#: diff.c:454 +#: diff.c:465 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -2307,24 +2929,35 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:4140 +#: diff.c:4202 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" -#: diff.c:4482 +#: diff.c:4547 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:4485 +#: diff.c:4550 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" -#: diff.c:4563 +#: diff.c:4628 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确要求只跟一个路径规格" -#: diff.c:4729 +#: diff.c:4676 +#, c-format +msgid "invalid --stat value: %s" +msgstr "无效的 --stat 值：%s" + +#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 +#: parse-options.c:199 parse-options.c:203 +#, c-format +msgid "%s expects a numerical value" +msgstr "%s 期望一个数字值" + +#: diff.c:4713 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2333,59 +2966,549 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:4743 +#: diff.c:4798 +#, c-format +msgid "unknown change class '%c' in --diff-filter=%s" +msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" + +#: diff.c:4822 +#, c-format +msgid "unknown value after ws-error-highlight=%.*s" +msgstr "ws-error-highlight=%.*s 之后未知的值" + +#: diff.c:4836 #, c-format -msgid "Failed to parse --submodule option parameter: '%s'" +msgid "unable to resolve '%s'" +msgstr "不能解析 '%s'" + +#: diff.c:4886 diff.c:4892 +#, c-format +msgid "%s expects <n>/<m> form" +msgstr "%s 期望 <n>/<m> 格式" + +#: diff.c:4904 +#, c-format +msgid "%s expects a character, got '%s'" +msgstr "%s 期望一个字符，得到 '%s'" + +#: diff.c:4925 +#, c-format +msgid "bad --color-moved argument: %s" +msgstr "坏的 --color-moved 参数：%s" + +#: diff.c:4944 +#, c-format +msgid "invalid mode '%s' in --color-moved-ws" +msgstr "--color-moved-ws 中的无效模式 '%s' " + +#: diff.c:4984 +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" + +#: diff.c:5020 diff.c:5040 +#, c-format +msgid "invalid argument to %s" +msgstr "%s 的参数无效" + +#: diff.c:5178 +#, c-format +msgid "failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" -#: diff.c:5823 +#: diff.c:5234 +#, c-format +msgid "bad --word-diff argument: %s" +msgstr "坏的 --word-diff 参数：%s" + +#: diff.c:5257 +msgid "Diff output format options" +msgstr "差异输出格式化选项" + +#: diff.c:5259 diff.c:5265 +msgid "generate patch" +msgstr "生成补丁" + +#: diff.c:5262 builtin/log.c:173 +msgid "suppress diff output" +msgstr "不显示差异输出" + +#: diff.c:5267 diff.c:5381 diff.c:5388 +msgid "<n>" +msgstr "<n>" + +#: diff.c:5268 diff.c:5271 +msgid "generate diffs with <n> lines context" +msgstr "生成含 <n> 行上下文的差异" + +#: diff.c:5273 +msgid "generate the diff in raw format" +msgstr "生成原始格式的差异" + +#: diff.c:5276 +msgid "synonym for '-p --raw'" +msgstr "和 '-p --raw' 同义" + +#: diff.c:5280 +msgid "synonym for '-p --stat'" +msgstr "和 '-p --stat' 同义" + +#: diff.c:5284 +msgid "machine friendly --stat" +msgstr "机器友好的 --stat" + +#: diff.c:5287 +msgid "output only the last line of --stat" +msgstr "只输出 --stat 的最后一行" + +#: diff.c:5289 diff.c:5297 +msgid "<param1,param2>..." +msgstr "<参数1,参数2>..." + +#: diff.c:5290 +msgid "" +"output the distribution of relative amount of changes for each sub-directory" +msgstr "输出每个子目录相对变更的分布" + +#: diff.c:5294 +msgid "synonym for --dirstat=cumulative" +msgstr "和 --dirstat=cumulative 同义" + +#: diff.c:5298 +msgid "synonym for --dirstat=files,param1,param2..." +msgstr "是 --dirstat=files,param1,param2... 的同义词" + +#: diff.c:5302 +msgid "warn if changes introduce conflict markers or whitespace errors" +msgstr "如果变更中引入冲突定界符或空白错误，给出警告" + +#: diff.c:5305 +msgid "condensed summary such as creations, renames and mode changes" +msgstr "精简摘要，例如创建、重命名和模式变更" + +#: diff.c:5308 +msgid "show only names of changed files" +msgstr "只显示变更文件的文件名" + +#: diff.c:5311 +msgid "show only names and status of changed files" +msgstr "只显示变更文件的文件名和状态" + +#: diff.c:5313 +msgid "<width>[,<name-width>[,<count>]]" +msgstr "<宽度>[,<文件名宽度>[,<次数>]]" + +#: diff.c:5314 +msgid "generate diffstat" +msgstr "生成差异统计（diffstat）" + +#: diff.c:5316 diff.c:5319 diff.c:5322 +msgid "<width>" +msgstr "<宽度>" + +#: diff.c:5317 +msgid "generate diffstat with a given width" +msgstr "使用给定的长度生成差异统计" + +#: diff.c:5320 +msgid "generate diffstat with a given name width" +msgstr "使用给定的文件名长度生成差异统计" + +#: diff.c:5323 +msgid "generate diffstat with a given graph width" +msgstr "使用给定的图形长度生成差异统计" + +#: diff.c:5325 +msgid "<count>" +msgstr "<次数>" + +#: diff.c:5326 +msgid "generate diffstat with limited lines" +msgstr "生成有限行数的差异统计" + +#: diff.c:5329 +msgid "generate compact summary in diffstat" +msgstr "生成差异统计的简洁摘要" + +#: diff.c:5332 +msgid "output a binary diff that can be applied" +msgstr "输出一个可以应用的二进制差异" + +#: diff.c:5335 +msgid "show full pre- and post-image object names on the \"index\" lines" +msgstr "在 \"index\" 行显示完整的前后对象名称" + +#: diff.c:5337 +msgid "show colored diff" +msgstr "显示带颜色的差异" + +#: diff.c:5338 +msgid "<kind>" +msgstr "<类型>" + +#: diff.c:5339 +msgid "" +"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " +"diff" +msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符" + +#: diff.c:5342 +msgid "" +"do not munge pathnames and use NULs as output field terminators in --raw or " +"--numstat" +msgstr "" +"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔" +"符" + +#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 +msgid "<prefix>" +msgstr "<前缀>" + +#: diff.c:5346 +msgid "show the given source prefix instead of \"a/\"" +msgstr "显示给定的源前缀取代 \"a/\"" + +#: diff.c:5349 +msgid "show the given destination prefix instead of \"b/\"" +msgstr "显示给定的目标前缀取代 \"b/\"" + +#: diff.c:5352 +msgid "prepend an additional prefix to every line of output" +msgstr "输出的每一行附加前缀" + +#: diff.c:5355 +msgid "do not show any source or destination prefix" +msgstr "不显示任何源和目标前缀" + +#: diff.c:5358 +msgid "show context between diff hunks up to the specified number of lines" +msgstr "显示指定行数的差异块间的上下文" + +#: diff.c:5362 diff.c:5367 diff.c:5372 +msgid "<char>" +msgstr "<字符>" + +#: diff.c:5363 +msgid "specify the character to indicate a new line instead of '+'" +msgstr "指定一个字符取代 '+' 来表示新的一行" + +#: diff.c:5368 +msgid "specify the character to indicate an old line instead of '-'" +msgstr "指定一个字符取代 '-' 来表示旧的一行" + +#: diff.c:5373 +msgid "specify the character to indicate a context instead of ' '" +msgstr "指定一个字符取代 ' ' 来表示一行上下文" + +#: diff.c:5376 +msgid "Diff rename options" +msgstr "差异重命名选项" + +#: diff.c:5377 +msgid "<n>[/<m>]" +msgstr "<n>[/<m>]" + +#: diff.c:5378 +msgid "break complete rewrite changes into pairs of delete and create" +msgstr "将完全重写的变更打破为成对的删除和创建" + +#: diff.c:5382 +msgid "detect renames" +msgstr "检测重命名" + +#: diff.c:5386 +msgid "omit the preimage for deletes" +msgstr "省略删除操作的差异输出" + +#: diff.c:5389 +msgid "detect copies" +msgstr "检测拷贝" + +#: diff.c:5393 +msgid "use unmodified files as source to find copies" +msgstr "使用未修改的文件做为发现拷贝的源" + +#: diff.c:5395 +msgid "disable rename detection" +msgstr "禁用重命名探测" + +#: diff.c:5398 +msgid "use empty blobs as rename source" +msgstr "使用空的数据对象做为重命名的源" + +#: diff.c:5400 +msgid "continue listing the history of a file beyond renames" +msgstr "继续列出文件重命名以外的历史记录" + +#: diff.c:5403 +msgid "" +"prevent rename/copy detection if the number of rename/copy targets exceeds " +"given limit" +msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测" + +#: diff.c:5405 +msgid "Diff algorithm options" +msgstr "差异算法选项" + +#: diff.c:5407 +msgid "produce the smallest possible diff" +msgstr "生成尽可能小的差异" + +#: diff.c:5410 +msgid "ignore whitespace when comparing lines" +msgstr "行比较时忽略空白字符" + +#: diff.c:5413 +msgid "ignore changes in amount of whitespace" +msgstr "忽略空白字符的变更" + +#: diff.c:5416 +msgid "ignore changes in whitespace at EOL" +msgstr "忽略行尾的空白字符变更" + +#: diff.c:5419 +msgid "ignore carrier-return at the end of line" +msgstr "忽略行尾的回车符（CR）" + +#: diff.c:5422 +msgid "ignore changes whose lines are all blank" +msgstr "忽略整行都是空白的变更" + +#: diff.c:5425 +msgid "heuristic to shift diff hunk boundaries for easy reading" +msgstr "启发式转换差异边界以便阅读" + +#: diff.c:5428 +msgid "generate diff using the \"patience diff\" algorithm" +msgstr "使用 \"patience diff\" 算法生成差异" + +#: diff.c:5432 +msgid "generate diff using the \"histogram diff\" algorithm" +msgstr "使用 \"histogram diff\" 算法生成差异" + +#: diff.c:5434 +msgid "<algorithm>" +msgstr "<算法>" + +#: diff.c:5435 +msgid "choose a diff algorithm" +msgstr "选择一个差异算法" + +#: diff.c:5437 +msgid "<text>" +msgstr "<文本>" + +#: diff.c:5438 +msgid "generate diff using the \"anchored diff\" algorithm" +msgstr "使用 \"anchored diff\" 算法生成差异" + +#: diff.c:5440 diff.c:5449 diff.c:5452 +msgid "<mode>" +msgstr "<模式>" + +#: diff.c:5441 +msgid "show word diff, using <mode> to delimit changed words" +msgstr "显示单词差异，使用 <模式> 分隔变更的单词" + +#: diff.c:5443 diff.c:5446 diff.c:5491 +msgid "<regex>" +msgstr "<正则>" + +#: diff.c:5444 +msgid "use <regex> to decide what a word is" +msgstr "使用 <正则表达式> 确定何为一个词" + +#: diff.c:5447 +msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" +msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" + +#: diff.c:5450 +msgid "moved lines of code are colored differently" +msgstr "移动的代码行用不同方式着色" + +#: diff.c:5453 +msgid "how white spaces are ignored in --color-moved" +msgstr "在 --color-moved 下如何忽略空白字符" + +#: diff.c:5456 +msgid "Other diff options" +msgstr "其它差异选项" + +#: diff.c:5458 +msgid "when run from subdir, exclude changes outside and show relative paths" +msgstr "当从子目录运行，排除目录之外的变更并显示相对路径" + +#: diff.c:5462 +msgid "treat all files as text" +msgstr "把所有文件当做文本处理" + +#: diff.c:5464 +msgid "swap two inputs, reverse the diff" +msgstr "交换两个输入，反转差异" + +#: diff.c:5466 +msgid "exit with 1 if there were differences, 0 otherwise" +msgstr "有差异时退出码为 1，否则为 0" + +#: diff.c:5468 +msgid "disable all output of the program" +msgstr "禁用本程序的所有输出" + +#: diff.c:5470 +msgid "allow an external diff helper to be executed" +msgstr "允许执行一个外置的差异助手" + +#: diff.c:5472 +msgid "run external text conversion filters when comparing binary files" +msgstr "当比较二进制文件时，运行外部的文本转换过滤器" + +#: diff.c:5474 +msgid "<when>" +msgstr "<何时>" + +#: diff.c:5475 +msgid "ignore changes to submodules in the diff generation" +msgstr "在生成差异时，忽略子模组的更改" + +#: diff.c:5478 +msgid "<format>" +msgstr "<格式>" + +#: diff.c:5479 +msgid "specify how differences in submodules are shown" +msgstr "指定子模组的差异如何显示" + +#: diff.c:5483 +msgid "hide 'git add -N' entries from the index" +msgstr "隐藏索引中 'git add -N' 条目" + +#: diff.c:5486 +msgid "treat 'git add -N' entries as real in the index" +msgstr "将索引中 'git add -N' 条目当做真实的" + +#: diff.c:5488 +msgid "<string>" +msgstr "<字符串>" + +#: diff.c:5489 +msgid "" +"look for differences that change the number of occurrences of the specified " +"string" +msgstr "查找改变了指定字符串出现次数的差异" + +#: diff.c:5492 +msgid "" +"look for differences that change the number of occurrences of the specified " +"regex" +msgstr "查找改变指定正则匹配出现次数的差异" + +#: diff.c:5495 +msgid "show all changes in the changeset with -S or -G" +msgstr "显示使用 -S 或 -G 的变更集的所有变更" + +#: diff.c:5498 +msgid "treat <string> in -S as extended POSIX regular expression" +msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式" + +#: diff.c:5501 +msgid "control the order in which files appear in the output" +msgstr "控制输出中的文件显示顺序" + +#: diff.c:5502 +msgid "<object-id>" +msgstr "<对象 ID>" + +#: diff.c:5503 +msgid "" +"look for differences that change the number of occurrences of the specified " +"object" +msgstr "查找改变指定对象出现次数的差异" + +#: diff.c:5505 +msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" +msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" + +#: diff.c:5506 +msgid "select files by diff type" +msgstr "通过差异类型选择文件" + +#: diff.c:5508 +msgid "<file>" +msgstr "<文件>" + +#: diff.c:5509 +msgid "Output to a specific file" +msgstr "输出到一个指定的文件" + +#: diff.c:6164 msgid "inexact rename detection was skipped due to too many files." msgstr "因为文件太多，略过不严格的重命名检查。" -#: diff.c:5826 +#: diff.c:6167 msgid "only found copies from modified paths due to too many files." msgstr "因为文件太多，只在修改的路径中查找拷贝。" -#: diff.c:5829 +#: diff.c:6170 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" -#: dir.c:576 +#: dir.c:554 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "路径规格 '%s' 未匹配任何 git 已知文件" -#: dir.c:965 +#: dir.c:664 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "未识别的模式：'%s'" + +#: dir.c:682 dir.c:696 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "未识别的反向模式：'%s'" + +#: dir.c:714 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'" + +#: dir.c:724 +msgid "disabling cone pattern matching" +msgstr "禁止 cone 模式匹配" + +#: dir.c:1101 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能将 %s 用作排除文件" -#: dir.c:1880 +#: dir.c:2078 #, c-format msgid "could not open directory '%s'" msgstr "不能打开目录 '%s'" -#: dir.c:2122 +#: dir.c:2415 msgid "failed to get kernel name and information" msgstr "无法获得内核名称和信息" -#: dir.c:2246 +#: dir.c:2539 msgid "untracked cache is disabled on this system or location" msgstr "缓存未跟踪文件在本系统或位置中被禁用" -#: dir.c:3047 +#: dir.c:3343 #, c-format msgid "index file corrupt in repo %s" msgstr "仓库 %s 中的索引文件损坏" -#: dir.c:3092 dir.c:3097 +#: dir.c:3388 dir.c:3393 #, c-format msgid "could not create directories for %s" msgstr "不能为 %s 创建目录" -#: dir.c:3126 +#: dir.c:3422 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能从 '%s' 迁移 git 目录到 '%s'" @@ -2399,297 +3522,289 @@ msgstr "提示：等待您的编辑器关闭文件...%c" msgid "Filtering content" msgstr "过滤内容" -#: entry.c:465 +#: entry.c:476 #, c-format msgid "could not stat file '%s'" msgstr "不能对文件 '%s' 调用 stat" -#: environment.c:150 +#: environment.c:149 #, c-format msgid "bad git namespace path \"%s\"" msgstr "错误的 git 名字空间路径 \"%s\"" -#: environment.c:332 +#: environment.c:331 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "不能设置 GIT_DIR 为 '%s'" -#: exec-cmd.c:361 +#: exec-cmd.c:363 #, c-format msgid "too many args to run %s" msgstr "执行 %s 的参数太多" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "远程未设置 URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:150 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack：应为 shallow 列表" -#: fetch-pack.c:163 +#: fetch-pack.c:153 +msgid "git fetch-pack: expected a flush packet after shallow list" +msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包" + +#: fetch-pack.c:164 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包" -#: fetch-pack.c:183 +#: fetch-pack.c:184 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'" -#: fetch-pack.c:253 +#: fetch-pack.c:195 +msgid "unable to write to remote" +msgstr "无法写到远程" + +#: fetch-pack.c:257 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc 需要 multi_ack_detailed" -#: fetch-pack.c:347 fetch-pack.c:1277 +#: fetch-pack.c:356 fetch-pack.c:1340 #, c-format msgid "invalid shallow line: %s" msgstr "无效的 shallow 信息：%s" -#: fetch-pack.c:353 fetch-pack.c:1283 +#: fetch-pack.c:362 fetch-pack.c:1346 #, c-format msgid "invalid unshallow line: %s" msgstr "无效的 unshallow 信息：%s" -#: fetch-pack.c:355 fetch-pack.c:1285 +#: fetch-pack.c:364 fetch-pack.c:1348 #, c-format msgid "object not found: %s" msgstr "对象未找到：%s" -#: fetch-pack.c:358 fetch-pack.c:1288 +#: fetch-pack.c:367 fetch-pack.c:1351 #, c-format msgid "error in object: %s" msgstr "对象中出错：%s" -#: fetch-pack.c:360 fetch-pack.c:1290 +#: fetch-pack.c:369 fetch-pack.c:1353 #, c-format msgid "no shallow found: %s" msgstr "未发现 shallow：%s" -#: fetch-pack.c:363 fetch-pack.c:1293 +#: fetch-pack.c:372 fetch-pack.c:1357 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "应为 shallow/unshallow，却得到 %s" -#: fetch-pack.c:404 +#: fetch-pack.c:414 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" -#: fetch-pack.c:421 +#: fetch-pack.c:431 #, c-format msgid "invalid commit %s" msgstr "无效提交 %s" -#: fetch-pack.c:452 +#: fetch-pack.c:462 msgid "giving up" msgstr "放弃" -#: fetch-pack.c:464 progress.c:229 +#: fetch-pack.c:475 progress.c:323 msgid "done" msgstr "完成" -#: fetch-pack.c:476 +#: fetch-pack.c:487 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" -#: fetch-pack.c:522 +#: fetch-pack.c:533 #, c-format msgid "Marking %s as complete" msgstr "标记 %s 为完成" -#: fetch-pack.c:764 +#: fetch-pack.c:754 #, c-format msgid "already have %s (%s)" msgstr "已经有 %s（%s）" -#: fetch-pack.c:803 +#: fetch-pack.c:818 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack：无法派生 sideband 多路输出" -#: fetch-pack.c:811 +#: fetch-pack.c:826 msgid "protocol error: bad pack header" msgstr "协议错误：坏的包头" -#: fetch-pack.c:879 +#: fetch-pack.c:900 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack：无法派生进程 %s" -#: fetch-pack.c:895 +#: fetch-pack.c:916 #, c-format msgid "%s failed" msgstr "%s 失败" -#: fetch-pack.c:897 +#: fetch-pack.c:918 msgid "error in sideband demultiplexer" msgstr "sideband 多路输出出错" -#: fetch-pack.c:926 -msgid "Server does not support shallow clients" -msgstr "服务器不支持 shalllow 客户端" - -#: fetch-pack.c:930 -msgid "Server supports multi_ack_detailed" -msgstr "服务器支持 multi_ack_detailed" - -#: fetch-pack.c:933 -msgid "Server supports no-done" -msgstr "服务器支持 no-done" - -#: fetch-pack.c:939 -msgid "Server supports multi_ack" -msgstr "服务器支持 multi_ack" - -#: fetch-pack.c:943 -msgid "Server supports side-band-64k" -msgstr "服务器支持 side-band-64k" - -#: fetch-pack.c:947 -msgid "Server supports side-band" -msgstr "服务器支持 side-band" - -#: fetch-pack.c:951 -msgid "Server supports allow-tip-sha1-in-want" -msgstr "服务器支持 allow-tip-sha1-in-want" - -#: fetch-pack.c:955 -msgid "Server supports allow-reachable-sha1-in-want" -msgstr "服务器支持 allow-reachable-sha1-in-want" - #: fetch-pack.c:965 -msgid "Server supports ofs-delta" -msgstr "服务器支持 ofs-delta" - -#: fetch-pack.c:971 fetch-pack.c:1158 -msgid "Server supports filter" -msgstr "服务器支持 filter" - -#: fetch-pack.c:979 #, c-format msgid "Server version is %.*s" msgstr "服务器版本 %.*s" -#: fetch-pack.c:985 +#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 +#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 +#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 +#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 +#, c-format +msgid "Server supports %s" +msgstr "服务器支持 %s" + +#: fetch-pack.c:972 +msgid "Server does not support shallow clients" +msgstr "服务器不支持 shalllow 客户端" + +#: fetch-pack.c:1032 msgid "Server does not support --shallow-since" msgstr "服务器不支持 --shallow-since" -#: fetch-pack.c:989 +#: fetch-pack.c:1037 msgid "Server does not support --shallow-exclude" msgstr "服务器不支持 --shallow-exclude" -#: fetch-pack.c:991 +#: fetch-pack.c:1041 msgid "Server does not support --deepen" msgstr "服务器不支持 --deepen" -#: fetch-pack.c:1008 +#: fetch-pack.c:1058 msgid "no common commits" msgstr "没有共同的提交" -#: fetch-pack.c:1020 fetch-pack.c:1418 +#: fetch-pack.c:1070 fetch-pack.c:1536 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：获取失败。" -#: fetch-pack.c:1153 +#: fetch-pack.c:1209 msgid "Server does not support shallow requests" msgstr "服务器不支持 shalllow 请求" -#: fetch-pack.c:1199 +#: fetch-pack.c:1216 +msgid "Server supports filter" +msgstr "服务器支持 filter" + +#: fetch-pack.c:1239 +msgid "unable to write request to remote" +msgstr "无法将请求写到远程" + +#: fetch-pack.c:1257 #, c-format msgid "error reading section header '%s'" msgstr "读取节标题 '%s' 出错" -#: fetch-pack.c:1205 +#: fetch-pack.c:1263 #, c-format msgid "expected '%s', received '%s'" msgstr "预期 '%s'，得到 '%s'" -#: fetch-pack.c:1244 +#: fetch-pack.c:1303 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "意外的确认行：'%s'" -#: fetch-pack.c:1249 +#: fetch-pack.c:1308 #, c-format msgid "error processing acks: %d" msgstr "处理 ack 出错：%d" -#: fetch-pack.c:1259 +#: fetch-pack.c:1318 msgid "expected packfile to be sent after 'ready'" msgstr "预期在 'ready' 之后发送 packfile" -#: fetch-pack.c:1261 +#: fetch-pack.c:1320 msgid "expected no other sections to be sent after no 'ready'" msgstr "在没有 'ready' 不应该发送其它小节" -#: fetch-pack.c:1298 +#: fetch-pack.c:1362 #, c-format msgid "error processing shallow info: %d" msgstr "处理浅克隆信息出错：%d" -#: fetch-pack.c:1314 +#: fetch-pack.c:1409 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "预期 wanted-ref，得到 '%s'" -#: fetch-pack.c:1324 +#: fetch-pack.c:1414 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "意外的 wanted-ref：'%s'" -#: fetch-pack.c:1328 +#: fetch-pack.c:1419 #, c-format msgid "error processing wanted refs: %d" msgstr "处理要获取的引用出错：%d" -#: fetch-pack.c:1642 +#: fetch-pack.c:1762 msgid "no matching remote head" msgstr "没有匹配的远程分支" -#: fetch-pack.c:1660 builtin/clone.c:664 +#: fetch-pack.c:1785 builtin/clone.c:688 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必需的对象" -#: fetch-pack.c:1686 +#: fetch-pack.c:1812 #, c-format msgid "no such remote ref %s" msgstr "没有这样的远程引用 %s" -#: fetch-pack.c:1689 +#: fetch-pack.c:1815 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "服务器不允许请求未公开的对象 %s" -#: gpg-interface.c:318 -msgid "gpg failed to sign the data" -msgstr "gpg 无法为数据签名" - -#: gpg-interface.c:344 +#: gpg-interface.c:223 msgid "could not create temporary file" msgstr "不能创建临时文件" -#: gpg-interface.c:347 +#: gpg-interface.c:226 #, c-format msgid "failed writing detached signature to '%s'" msgstr "无法将分离式签名写入 '%s'" -#: graph.c:97 +#: gpg-interface.c:390 +msgid "gpg failed to sign the data" +msgstr "gpg 无法为数据签名" + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" -#: grep.c:2113 +#: grep.c:668 +msgid "" +"given pattern contains NULL byte (via -f <file>). This is only supported " +"with -P under PCRE v2" +msgstr "" +"给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此" +"功能" + +#: grep.c:2124 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81 -#: builtin/rm.c:134 +#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82 +#: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "对 '%s' 调用 stat 失败" -#: grep.c:2141 +#: grep.c:2152 #, c-format msgid "'%s': short read" msgstr "'%s'：读取不完整" @@ -2739,48 +3854,48 @@ msgid "Low-level Commands / Interrogators" msgstr "低级命令/询问者" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "低级命令/同步仓库" #: help.c:38 msgid "Low-level Commands / Internal Helpers" msgstr "低级命令/内部助手" -#: help.c:296 +#: help.c:298 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" -#: help.c:303 +#: help.c:305 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" -#: help.c:312 +#: help.c:314 msgid "These are common Git commands used in various situations:" msgstr "这些是各种场合常见的 Git 命令：" -#: help.c:361 git.c:90 +#: help.c:363 git.c:98 #, c-format msgid "unsupported command listing type '%s'" msgstr "不支持的命令列表类型 '%s'" -#: help.c:408 +#: help.c:403 msgid "The common Git guides are:" msgstr "最常用的 Git 向导有：" -#: help.c:517 +#: help.c:512 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "执行 'git help <command>' 来查看特定子命令" -#: help.c:522 +#: help.c:517 msgid "External commands" msgstr "外部命令" -#: help.c:530 +#: help.c:532 msgid "Command aliases" msgstr "命令别名" -#: help.c:594 +#: help.c:596 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -2789,31 +3904,31 @@ msgstr "" "'%s' 像是一个 git 命令，但却无法运行。\n" "可能是 git-%s 受损？" -#: help.c:653 +#: help.c:655 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" -#: help.c:675 +#: help.c:677 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。" -#: help.c:680 +#: help.c:682 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "假定你想要的是 '%s' 并继续。" -#: help.c:685 +#: help.c:687 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。" -#: help.c:693 +#: help.c:695 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:697 +#: help.c:699 msgid "" "\n" "The most similar command is" @@ -2827,16 +3942,16 @@ msgstr[1] "" "\n" "最相似的命令是" -#: help.c:712 +#: help.c:714 msgid "git version [<options>]" msgstr "git version [<选项>]" -#: help.c:780 +#: help.c:783 #, c-format msgid "%s: %s - %s" msgstr "%s：%s - %s" -#: help.c:784 +#: help.c:787 msgid "" "\n" "Did you mean this?" @@ -2850,7 +3965,7 @@ msgstr[1] "" "\n" "您指的是这其中的某一个么？" -#: ident.c:345 +#: ident.c:349 msgid "" "\n" "*** Please tell me who you are.\n" @@ -2875,50 +3990,89 @@ msgstr "" "来设置您账号的缺省身份标识。\n" "如果仅在本仓库设置身份标识，则省略 --global 参数。\n" -#: ident.c:369 +#: ident.c:379 msgid "no email was given and auto-detection is disabled" msgstr "未提供邮件地址且自动探测被禁用" -#: ident.c:374 +#: ident.c:384 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "无法自动探测邮件地址（得到 '%s'）" -#: ident.c:384 +#: ident.c:401 msgid "no name was given and auto-detection is disabled" msgstr "未提供姓名且自动探测被禁用" -#: ident.c:390 +#: ident.c:407 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "无法自动探测姓名（得到 '%s'）" -#: ident.c:398 +#: ident.c:415 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "不允许空的姓名（对于 <%s>）" -#: ident.c:404 +#: ident.c:421 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "姓名中仅包含禁用字符：%s" -#: ident.c:419 builtin/commit.c:606 +#: ident.c:436 builtin/commit.c:631 #, c-format msgid "invalid date format: %s" msgstr "无效的日期格式：%s" -#: list-objects-filter-options.c:35 -msgid "multiple filter-specs cannot be combined" -msgstr "不能混用多种过滤规格" +#: list-objects.c:127 +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" +msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性，但不是一个树对象" + +#: list-objects.c:140 +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性，但不是一个数据对象" + +#: list-objects.c:375 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "无法为提交 %s 加载根树" + +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "不能访问 '%s' 中的稀疏数据对象" + +#: list-objects-filter.c:495 +#, c-format +msgid "unable to parse sparse filter data in %s" +msgstr "无法解析 %s 中的稀疏过滤器数据" #: list-objects-filter-options.c:58 -msgid "only 'tree:0' is supported" -msgstr "只支持 'tree:0'" +msgid "expected 'tree:<depth>'" +msgstr "期望 'tree:<深度>'" + +#: list-objects-filter-options.c:73 +msgid "sparse:path filters support has been dropped" +msgstr "sparse:path 过滤器支持已被删除" + +#: list-objects-filter-options.c:86 +#, c-format +msgid "invalid filter-spec '%s'" +msgstr "无效的过滤器表达式 '%s'" -#: list-objects-filter-options.c:137 -msgid "cannot change partial clone promisor remote" -msgstr "无法修改部分克隆的 promisor 远程仓库" +#: list-objects-filter-options.c:102 +#, c-format +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'" + +#: list-objects-filter-options.c:144 +msgid "expected something after combine:" +msgstr "期望在组合后有一些东西：" + +#: list-objects-filter-options.c:226 +msgid "multiple filter-specs cannot be combined" +msgstr "不能混用多种过滤规格" #: lockfile.c:151 #, c-format @@ -2947,113 +4101,110 @@ msgstr "不能创建 '%s.lock'：%s" msgid "failed to read the cache" msgstr "读取缓存失败" -#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933 -#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764 +#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 +#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809 +#: builtin/stash.c:264 msgid "unable to write new index file" msgstr "无法写新的索引文件" -#: merge-recursive.c:323 +#: merge-recursive.c:367 msgid "(bad commit)\n" msgstr "（坏提交）\n" -#: merge-recursive.c:345 +#: merge-recursive.c:390 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。" -#: merge-recursive.c:353 +#: merge-recursive.c:399 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。" -#: merge-recursive.c:435 -msgid "error building trees" -msgstr "创建树出错" - -#: merge-recursive.c:906 +#: merge-recursive.c:885 #, c-format msgid "failed to create path '%s'%s" msgstr "创建路径 '%s'%s 失败" -#: merge-recursive.c:917 +#: merge-recursive.c:896 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" -#: merge-recursive.c:931 merge-recursive.c:950 +#: merge-recursive.c:910 merge-recursive.c:929 msgid ": perhaps a D/F conflict?" msgstr "：可能是一个目录/文件冲突？" -#: merge-recursive.c:940 +#: merge-recursive.c:919 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" -#: merge-recursive.c:982 builtin/cat-file.c:39 +#: merge-recursive.c:960 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" -#: merge-recursive.c:984 +#: merge-recursive.c:965 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据对象" -#: merge-recursive.c:1008 +#: merge-recursive.c:990 #, c-format msgid "failed to open '%s': %s" msgstr "打开 '%s' 失败：%s" -#: merge-recursive.c:1019 +#: merge-recursive.c:1001 #, c-format msgid "failed to symlink '%s': %s" msgstr "创建符号链接 '%s' 失败：%s" -#: merge-recursive.c:1024 +#: merge-recursive.c:1006 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" -#: merge-recursive.c:1212 +#: merge-recursive.c:1199 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "无法合并子模组 %s （没有检出）" -#: merge-recursive.c:1219 +#: merge-recursive.c:1206 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "无法合并子模组 %s（提交不存在）" -#: merge-recursive.c:1226 +#: merge-recursive.c:1213 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "无法合并子模组 %s （提交未跟随合并基线）" -#: merge-recursive.c:1234 merge-recursive.c:1246 +#: merge-recursive.c:1221 merge-recursive.c:1233 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "子模组 %s 快进到如下提交：" -#: merge-recursive.c:1237 merge-recursive.c:1249 +#: merge-recursive.c:1224 merge-recursive.c:1236 #, c-format msgid "Fast-forwarding submodule %s" msgstr "快进子模组 %s" -#: merge-recursive.c:1271 +#: merge-recursive.c:1259 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "无法合并子模组 %s （没发现合并跟随的提交）" -#: merge-recursive.c:1275 +#: merge-recursive.c:1263 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "无法合并子模组 %s（非快进）" -#: merge-recursive.c:1276 +#: merge-recursive.c:1264 msgid "Found a possible merge resolution for the submodule:\n" msgstr "找到子模组的一个可能的合并方案：\n" -#: merge-recursive.c:1279 +#: merge-recursive.c:1267 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3069,31 +4220,31 @@ msgstr "" "\n" "以接受此建议。\n" -#: merge-recursive.c:1288 +#: merge-recursive.c:1276 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "无法合并子模组 %s （发现多个合并）" -#: merge-recursive.c:1358 +#: merge-recursive.c:1349 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" -#: merge-recursive.c:1363 +#: merge-recursive.c:1354 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" -#: merge-recursive.c:1395 +#: merge-recursive.c:1386 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-recursive.c:1416 +#: merge-recursive.c:1410 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。" -#: merge-recursive.c:1483 +#: merge-recursive.c:1482 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3102,7 +4253,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本被保留。" -#: merge-recursive.c:1488 +#: merge-recursive.c:1487 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3111,7 +4262,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本被保留。" -#: merge-recursive.c:1495 +#: merge-recursive.c:1494 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3120,7 +4271,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本保留在 %8$s 中。" -#: merge-recursive.c:1500 +#: merge-recursive.c:1499 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3137,23 +4288,32 @@ msgstr "重命名" msgid "renamed" msgstr "重命名" -#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369 -#: merge-recursive.c:3124 +#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "拒绝丢失脏文件 '%s'" -#: merge-recursive.c:1602 +#: merge-recursive.c:1624 +#, c-format +msgid "Refusing to lose untracked file at %s, even though it's in the way." +msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。" + +#: merge-recursive.c:1682 +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" +msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" + +#: merge-recursive.c:1713 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" -#: merge-recursive.c:1607 +#: merge-recursive.c:1718 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s" -#: merge-recursive.c:1633 +#: merge-recursive.c:1737 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3162,28 +4322,18 @@ msgstr "" "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 " "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1638 +#: merge-recursive.c:1742 msgid " (left unresolved)" msgstr "（留下未解决）" -#: merge-recursive.c:1699 +#: merge-recursive.c:1851 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->" "%5$s" -#: merge-recursive.c:1734 -#, c-format -msgid "Renaming %s to %s and %s to %s instead" -msgstr "代之以重命名 %s 至 %s，以及 %s 至 %s" - -#: merge-recursive.c:1746 -#, c-format -msgid "Refusing to lose untracked file at %s, even though it's in the way." -msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。" - -#: merge-recursive.c:1952 +#: merge-recursive.c:2114 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3193,7 +4343,7 @@ msgstr "" "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个" "其它目录，没有目录包含大部分文件。" -#: merge-recursive.c:1984 +#: merge-recursive.c:2146 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3202,7 +4352,7 @@ msgstr "" "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放" "在：%s。" -#: merge-recursive.c:1994 +#: merge-recursive.c:2156 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3211,7 +4361,7 @@ msgstr "" "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路" "径放置于此：%s" -#: merge-recursive.c:2086 +#: merge-recursive.c:2248 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3220,261 +4370,332 @@ msgstr "" "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 " "%4$s->%5$s" -#: merge-recursive.c:2331 +#: merge-recursive.c:2493 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。" -#: merge-recursive.c:2737 -#, c-format -msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" -msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" - -#: merge-recursive.c:2763 -#, c-format -msgid "Adding merged %s" -msgstr "添加合并后的 %s" - -#: merge-recursive.c:2770 merge-recursive.c:3127 -#, c-format -msgid "Adding as %s instead" -msgstr "而是以 %s 为名添加" - -#: merge-recursive.c:2934 +#: merge-recursive.c:3019 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" -#: merge-recursive.c:2937 +#: merge-recursive.c:3022 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个数据对象" -#: merge-recursive.c:3006 +#: merge-recursive.c:3086 msgid "modify" msgstr "修改" -#: merge-recursive.c:3006 +#: merge-recursive.c:3086 msgid "modified" msgstr "修改" -#: merge-recursive.c:3017 +#: merge-recursive.c:3098 msgid "content" msgstr "内容" -#: merge-recursive.c:3024 +#: merge-recursive.c:3102 msgid "add/add" msgstr "添加/添加" -#: merge-recursive.c:3071 +#: merge-recursive.c:3125 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" -#: merge-recursive.c:3093 git-submodule.sh:858 +#: merge-recursive.c:3147 git-submodule.sh:993 msgid "submodule" msgstr "子模组" -#: merge-recursive.c:3094 +#: merge-recursive.c:3148 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" -#: merge-recursive.c:3216 +#: merge-recursive.c:3178 +#, c-format +msgid "Adding as %s instead" +msgstr "而是以 %s 为名添加" + +#: merge-recursive.c:3261 +#, c-format +msgid "" +"Path updated: %s added in %s inside a directory that was renamed in %s; " +"moving it to %s." +msgstr "" +"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。" + +#: merge-recursive.c:3264 +#, c-format +msgid "" +"CONFLICT (file location): %s added in %s inside a directory that was renamed " +"in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动" +"到 %s。" + +#: merge-recursive.c:3268 +#, c-format +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" +"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移" +"动到 %5$s。" + +#: merge-recursive.c:3271 +#, c-format +msgid "" +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " +"was renamed in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，" +"建议将其移动到 %5$s。" + +#: merge-recursive.c:3385 #, c-format msgid "Removing %s" msgstr "删除 %s" -#: merge-recursive.c:3242 +#: merge-recursive.c:3408 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:3248 +#: merge-recursive.c:3413 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:3255 +#: merge-recursive.c:3420 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" -#: merge-recursive.c:3264 +#: merge-recursive.c:3429 #, c-format msgid "Adding %s" msgstr "添加 %s" -#: merge-recursive.c:3300 +#: merge-recursive.c:3438 #, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"您对下列文件的本地修改将被合并操作覆盖：\n" -" %s" +msgid "CONFLICT (add/add): Merge conflict in %s" +msgstr "冲突（add/add）：合并冲突于 %s" -#: merge-recursive.c:3311 +#: merge-recursive.c:3482 msgid "Already up to date!" msgstr "已经是最新的！" -#: merge-recursive.c:3320 +#: merge-recursive.c:3491 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:3419 +#: merge-recursive.c:3595 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:3432 +#: merge-recursive.c:3608 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:3471 +#: merge-recursive.c:3658 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:3537 +#: merge-recursive.c:3717 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"您对下列文件的本地修改将被合并操作覆盖：\n" +" %s" + +#: merge-recursive.c:3814 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849 +#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874 msgid "Unable to write index." msgstr "不能写入索引。" -#: midx.c:65 +#: midx.c:68 #, c-format msgid "multi-pack-index file %s is too small" msgstr "多包索引文件 %s 太小" -#: midx.c:81 +#: midx.c:84 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配" -#: midx.c:86 +#: midx.c:89 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index 版本 %d 不能被识别" -#: midx.c:91 +#: midx.c:94 #, c-format msgid "hash version %u does not match" msgstr "散列版本 %u 不匹配" -#: midx.c:105 +#: midx.c:108 msgid "invalid chunk offset (too large)" msgstr "无效的块偏移（太大）" -#: midx.c:129 +#: midx.c:132 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "终止多包索引块 id 出现时间早于预期" -#: midx.c:142 +#: midx.c:145 msgid "multi-pack-index missing required pack-name chunk" msgstr "多包索引缺少必需的包名块" -#: midx.c:144 +#: midx.c:147 msgid "multi-pack-index missing required OID fanout chunk" -msgstr "多包索引缺少必需的 OID 扇出块" +msgstr "多包索引缺少必需的对象 ID 扇出块" -#: midx.c:146 +#: midx.c:149 msgid "multi-pack-index missing required OID lookup chunk" -msgstr "多包索引缺少必需的 OID 查询块" +msgstr "多包索引缺少必需的对象 ID 查询块" -#: midx.c:148 +#: midx.c:151 msgid "multi-pack-index missing required object offsets chunk" msgstr "多包索引缺少必需的对象偏移块" -#: midx.c:162 +#: midx.c:165 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "多包索引包名无序：'%s' 在 '%s' 之前" -#: midx.c:205 +#: midx.c:210 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "错的 pack-int-id：%u（共有 %u 个包）" -#: midx.c:246 +#: midx.c:260 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引存储一个64位偏移，但是 off_t 太小" -#: midx.c:271 +#: midx.c:288 msgid "error preparing packfile from multi-pack-index" msgstr "从多包索引准备 packfile 出错" -#: midx.c:407 +#: midx.c:472 #, c-format msgid "failed to add packfile '%s'" msgstr "添加包文件 '%s' 失败" -#: midx.c:413 +#: midx.c:478 #, c-format msgid "failed to open pack-index '%s'" msgstr "打开包索引 '%s' 失败" -#: midx.c:507 +#: midx.c:538 #, c-format msgid "failed to locate object %d in packfile" msgstr "在包文件中定位对象 %d 失败" -#: midx.c:943 +#: midx.c:842 +msgid "Adding packfiles to multi-pack-index" +msgstr "添加包文件到多包索引" + +#: midx.c:875 +#, c-format +msgid "did not see pack-file %s to drop" +msgstr "没有看到要丢弃的包文件 %s" + +#: midx.c:973 +msgid "Writing chunks to multi-pack-index" +msgstr "写入块到多包索引" + +#: midx.c:1052 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位于 %s 的多包索引失败" -#: midx.c:981 +#: midx.c:1108 +msgid "Looking for referenced packfiles" +msgstr "正在查找引用的包文件" + +#: midx.c:1123 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -msgstr "oid 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" +msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" + +#: midx.c:1128 +msgid "Verifying OID order in multi-pack-index" +msgstr "校验多包索引中的 OID 顺序" -#: midx.c:992 +#: midx.c:1137 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" -msgstr "oid 查询无序：oid[%d] = %s >= %s = oid[%d]" +msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]" -#: midx.c:996 +#: midx.c:1157 +msgid "Sorting objects by packfile" +msgstr "通过包文件为对象排序" + +#: midx.c:1164 msgid "Verifying object offsets" msgstr "校验对象偏移" -#: midx.c:1004 +#: midx.c:1180 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "为 oid[%d] = %s 加载包条目失败" -#: midx.c:1010 +#: midx.c:1186 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "为包文件 %s 加载包索引失败" -#: midx.c:1019 +#: midx.c:1195 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>" -#: name-hash.c:532 +#: midx.c:1220 +msgid "Counting referenced objects" +msgstr "正在对引用对象计数" + +#: midx.c:1230 +msgid "Finding and deleting unreferenced packfiles" +msgstr "正在查找和删除未引用的包文件" + +#: midx.c:1388 +msgid "could not start pack-objects" +msgstr "不能开始 pack-objects" + +#: midx.c:1407 +msgid "could not finish pack-objects" +msgstr "不能结束 pack-objects" + +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "不能创建 lazy_dir 线程：%s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "不能创建 lazy_name 线程：%s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "不能加入 lasy_name 线程：%s" -#: notes-merge.c:275 +#: notes-merge.c:277 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -3485,21 +4706,21 @@ msgstr "" "在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git " "notes merge --abort' 来提交/终止前一次合并。" -#: notes-merge.c:282 +#: notes-merge.c:284 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "您尚未结束注释合并（存在 %s）。" -#: notes-utils.c:45 +#: notes-utils.c:46 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "不能提交未初始化/未引用的注解树" -#: notes-utils.c:104 +#: notes-utils.c:105 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "坏的 notes.rewriteMode 值：'%s'" -#: notes-utils.c:114 +#: notes-utils.c:115 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" @@ -3508,12 +4729,12 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" #. the environment variable, the second %s is #. its value. #. -#: notes-utils.c:144 +#: notes-utils.c:145 #, c-format msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "无效的对象类型 \"%s\"" @@ -3535,28 +4756,83 @@ msgstr "不能解析对象：%s" #: object.c:266 object.c:277 #, c-format -msgid "sha1 mismatch %s" -msgstr "sha1 与 %s 不匹配" +msgid "hash mismatch %s" +msgstr "哈希值与 %s 不匹配" -#: packfile.c:607 +#: packfile.c:641 msgid "offset before end of packfile (broken .idx?)" msgstr "偏移量在包文件结束之前（损坏的 .idx？）" -#: packfile.c:1864 +#: packfile.c:1888 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" -#: packfile.c:1868 +#: packfile.c:1892 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" -#: parse-options.c:672 +#: parse-options.c:38 +#, c-format +msgid "%s requires a value" +msgstr "%s 需要一个值" + +#: parse-options.c:73 +#, c-format +msgid "%s is incompatible with %s" +msgstr "%s 与 %s 不兼容" + +#: parse-options.c:78 +#, c-format +msgid "%s : incompatible with something else" +msgstr "%s：和其它的不兼容" + +#: parse-options.c:92 parse-options.c:96 parse-options.c:319 +#, c-format +msgid "%s takes no value" +msgstr "%s 不取值" + +#: parse-options.c:94 +#, c-format +msgid "%s isn't available" +msgstr "%s 不可用" + +#: parse-options.c:219 +#, c-format +msgid "%s expects a non-negative integer value with an optional k/m/g suffix" +msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀" + +#: parse-options.c:389 +#, c-format +msgid "ambiguous option: %s (could be --%s%s or --%s%s)" +msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）" + +#: parse-options.c:423 parse-options.c:431 +#, c-format +msgid "did you mean `--%s` (with two dashes ?)" +msgstr "你的意思是 `--%s`（有两个短线？）" + +#: parse-options.c:860 +#, c-format +msgid "unknown option `%s'" +msgstr "未知选项 `%s'" + +#: parse-options.c:862 +#, c-format +msgid "unknown switch `%c'" +msgstr "未知开关 `%c'" + +#: parse-options.c:864 +#, c-format +msgid "unknown non-ascii option in string: `%s'" +msgstr "字符串中未知的非 ascii 字符选项：`%s'" + +#: parse-options.c:888 msgid "..." msgstr "..." -#: parse-options.c:691 +#: parse-options.c:907 #, c-format msgid "usage: %s" msgstr "用法：%s" @@ -3564,185 +4840,271 @@ msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:697 +#: parse-options.c:913 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:700 +#: parse-options.c:916 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:739 +#: parse-options.c:955 msgid "-NUM" msgstr "-数字" -#: parse-options-cb.c:37 +#: parse-options.c:969 +#, c-format +msgid "alias of --%s" +msgstr "--%s 的别名" + +#: parse-options-cb.c:20 parse-options-cb.c:24 +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "选项 `%s' 期望一个数字值" + +#: parse-options-cb.c:41 #, c-format msgid "malformed expiration date '%s'" msgstr "格式错误的到期时间：'%s'" -#: parse-options-cb.c:109 +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" + +#: parse-options-cb.c:130 parse-options-cb.c:147 #, c-format msgid "malformed object name '%s'" msgstr "格式错误的对象名 '%s'" -#: path.c:894 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "不能设置 %s 为组可写" -#: pathspec.c:129 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" -#: pathspec.c:147 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "只允许一个 'attr:' 规格。" -#: pathspec.c:150 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "属性规格不能为空" -#: pathspec.c:193 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "无效的属性名 %s" -#: pathspec.c:258 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" -#: pathspec.c:265 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" -#: pathspec.c:305 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "路径规格包含无效的神奇前缀" -#: pathspec.c:326 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" -#: pathspec.c:331 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" -#: pathspec.c:369 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" -#: pathspec.c:428 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s：'literal' 和 'glob' 不兼容" -#: pathspec.c:441 +#: pathspec.c:442 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s：'%s' 在仓库之外" -#: pathspec.c:515 +#: pathspec.c:516 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s'（助记符：'%c'）" -#: pathspec.c:525 +#: pathspec.c:526 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s：路径规格神奇前缀不被此命令支持：%s" -#: pathspec.c:592 +#: pathspec.c:593 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "路径规格 '%s' 位于符号链接中" -#: pkt-line.c:104 +#: pathspec.c:638 +#, c-format +msgid "line is badly quoted: %s" +msgstr "行被错误地引用：%s" + +#: pkt-line.c:92 +msgid "unable to write flush packet" +msgstr "无法写 flush 包" + +#: pkt-line.c:99 +msgid "unable to write delim packet" +msgstr "无法写 delim 包" + +#: pkt-line.c:106 msgid "flush packet write failed" msgstr "flush 包写错误" -#: pkt-line.c:142 pkt-line.c:228 +#: pkt-line.c:146 pkt-line.c:232 msgid "protocol error: impossibly long line" msgstr "协议错误：不可能的长行" -#: pkt-line.c:158 pkt-line.c:160 +#: pkt-line.c:162 pkt-line.c:164 msgid "packet write with format failed" msgstr "格式化包写入错误" -#: pkt-line.c:192 +#: pkt-line.c:196 msgid "packet write failed - data exceeds max packet size" msgstr "写数据包失败：数据超过了包的最大长度" -#: pkt-line.c:199 pkt-line.c:206 +#: pkt-line.c:203 pkt-line.c:210 msgid "packet write failed" msgstr "数据包写入失败" -#: pkt-line.c:291 +#: pkt-line.c:295 msgid "read error" msgstr "读取错误" -#: pkt-line.c:299 +#: pkt-line.c:303 msgid "the remote end hung up unexpectedly" msgstr "远端意外挂断了" -#: pkt-line.c:327 +#: pkt-line.c:331 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "协议错误：错误的行长度字符串：%.4s" -#: pkt-line.c:337 pkt-line.c:342 +#: pkt-line.c:341 pkt-line.c:346 #, c-format msgid "protocol error: bad line length %d" msgstr "协议错误：错误的行长度 %d" -#: preload-index.c:118 +#: pkt-line.c:362 +#, c-format +msgid "remote error: %s" +msgstr "远程错误：%s" + +#: preload-index.c:119 msgid "Refreshing index" msgstr "正在刷新索引" -#: preload-index.c:137 +#: preload-index.c:138 #, c-format msgid "unable to create threaded lstat: %s" msgstr "无法创建线程 lstat：%s" -#: pretty.c:962 +#: pretty.c:981 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" -#: range-diff.c:56 +#: promisor-remote.c:23 +msgid "Remote with no URL" +msgstr "远程未设置 URL" + +#: promisor-remote.c:58 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "promisor 远程名称不能以 '/' 开始：%s" + +#: range-diff.c:75 msgid "could not start `log`" msgstr "不能启动 `log`" -#: range-diff.c:59 +#: range-diff.c:77 msgid "could not read `log` output" msgstr "不能读取 `log` 的输出" -#: range-diff.c:74 sequencer.c:4764 +#: range-diff.c:96 sequencer.c:5163 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" -#: range-diff.c:224 +#: range-diff.c:122 +#, c-format +msgid "could not parse git header '%.*s'" +msgstr "无法解析 git 头 '%.*s'" + +#: range-diff.c:285 msgid "failed to generate diff" msgstr "生成 diff 失败" -#: range-diff.c:455 range-diff.c:457 +#: range-diff.c:518 range-diff.c:520 #, c-format msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日志" -#: read-cache.c:1490 +#: read-cache.c:680 +#, c-format +msgid "will not add file alias '%s' ('%s' already exists in index)" +msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）" + +#: read-cache.c:696 +msgid "cannot create an empty blob in the object database" +msgstr "不能在对象数据库中创建空的数据对象" + +#: read-cache.c:718 +#, c-format +msgid "%s: can only add regular files, symbolic links or git-directories" +msgstr "%s：只能添加常规文件、符号链接或 git 目录" + +#: read-cache.c:723 +#, c-format +msgid "'%s' does not have a commit checked out" +msgstr "'%s' 没有检出一个提交" + +#: read-cache.c:775 +#, c-format +msgid "unable to index file '%s'" +msgstr "无法索引文件 '%s'" + +#: read-cache.c:794 +#, c-format +msgid "unable to add '%s' to index" +msgstr "无法在索引中添加 '%s'" + +#: read-cache.c:805 +#, c-format +msgid "unable to stat '%s'" +msgstr "无法对 %s 执行 stat" + +#: read-cache.c:1325 +#, c-format +msgid "'%s' appears as both a file and as a directory" +msgstr "'%s' 看起来既是文件又是目录" + +#: read-cache.c:1531 msgid "Refresh index" msgstr "刷新索引" -#: read-cache.c:1604 +#: read-cache.c:1646 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -3751,7 +5113,7 @@ msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1614 +#: read-cache.c:1656 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -3760,60 +5122,150 @@ msgstr "" "设置了 GIT_INDEX_VERSION，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1792 +#: read-cache.c:1712 +#, c-format +msgid "bad signature 0x%08x" +msgstr "坏的签名 0x%08x" + +#: read-cache.c:1715 +#, c-format +msgid "bad index version %d" +msgstr "坏的索引版本 %d" + +#: read-cache.c:1724 +msgid "bad index file sha1 signature" +msgstr "坏的索引文件 sha1 签名" + +#: read-cache.c:1754 +#, c-format +msgid "index uses %.4s extension, which we do not understand" +msgstr "索引使用不被支持的 %.4s 扩展" + +# +#: read-cache.c:1756 +#, c-format +msgid "ignoring %.4s extension" +msgstr "忽略 %.4s 扩展" + +#: read-cache.c:1793 +#, c-format +msgid "unknown index entry format 0x%08x" +msgstr "未知的索引条目格式 0x%08x" + +#: read-cache.c:1809 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路径 '%s' 有错误的名称字段" -#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458 -#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585 -#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343 -#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144 -#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329 +#: read-cache.c:1866 +msgid "unordered stage entries in index" +msgstr "索引中有未排序的暂存条目" + +#: read-cache.c:1869 +#, c-format +msgid "multiple stage entries for merged file '%s'" +msgstr "合并文件 '%s' 有多个暂存条目" + +#: read-cache.c:1872 +#, c-format +msgid "unordered stage entries for '%s'" +msgstr "'%s' 的未排序暂存条目" + +#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470 +#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 +#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "索引文件损坏" -#: read-cache.c:2101 +#: read-cache.c:2119 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "无法创建 load_cache_entries 线程：%s" -#: read-cache.c:2114 +#: read-cache.c:2132 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "无法加入 load_cache_entries 线程：%s" -#: read-cache.c:2201 +#: read-cache.c:2165 +#, c-format +msgid "%s: index file open failed" +msgstr "%s：打开索引文件失败" + +#: read-cache.c:2169 +#, c-format +msgid "%s: cannot stat the open index" +msgstr "%s：不能对打开的索引执行 stat 操作" + +#: read-cache.c:2173 +#, c-format +msgid "%s: index file smaller than expected" +msgstr "%s：索引文件比预期的小" + +#: read-cache.c:2177 +#, c-format +msgid "%s: unable to map index file" +msgstr "%s：无法对索引文件执行 map 操作" + +#: read-cache.c:2219 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "无法创建 load_index_extensions 线程：%s" -#: read-cache.c:2228 +#: read-cache.c:2246 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "无法加入 load_index_extensions 线程：%s" -#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086 +#: read-cache.c:2278 +#, c-format +msgid "could not freshen shared index '%s'" +msgstr "无法刷新共享索引 '%s'" + +#: read-cache.c:2325 +#, c-format +msgid "broken index, expect %s in %s, got %s" +msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s" + +#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119 #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" -#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592 +#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069 #, c-format msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: read-cache.c:3068 +#: read-cache.c:3137 #, c-format msgid "unable to open git dir: %s" msgstr "不能打开 git 目录：%s" -#: read-cache.c:3080 +#: read-cache.c:3149 #, c-format msgid "unable to unlink: %s" msgstr "无法删除：%s" -#: rebase-interactive.c:10 +#: read-cache.c:3174 +#, c-format +msgid "cannot fix permission bits on '%s'" +msgstr "不能修复 '%s' 的权限位" + +#: read-cache.c:3323 +#, c-format +msgid "%s: cannot drop to stage #0" +msgstr "%s：不能落到暂存区 #0" + +#: rebase-interactive.c:26 +#, c-format +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" + +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -3853,7 +5305,14 @@ msgstr "" "\n" "可以对这些行重新排序，将从上至下执行。\n" -#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173 +#: rebase-interactive.c:56 +#, c-format +msgid "Rebase %s onto %s (%d command)" +msgid_plural "Rebase %s onto %s (%d commands)" +msgstr[0] "变基 %s 到 %s（%d 个提交）" +msgstr[1] "变基 %s 到 %s（%d 个提交）" + +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -3861,7 +5320,7 @@ msgstr "" "\n" "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" -#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -3869,7 +5328,7 @@ msgstr "" "\n" "如果您在这里删除一行，对应的提交将会丢失。\n" -#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -3883,7 +5342,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -3893,125 +5352,155 @@ msgstr "" "然而，如果您删除全部内容，变基操作将会终止。\n" "\n" -#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 msgid "Note that empty commits are commented out" msgstr "注意空提交已被注释掉" -#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186 -#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536 +#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254 #, c-format -msgid "could not read '%s'." -msgstr "不能读取 '%s'。" +msgid "could not write '%s'" +msgstr "不能写入 '%s'" + +#: rebase-interactive.c:108 +#, c-format +msgid "could not copy '%s' to '%s'." +msgstr "不能拷贝 '%s' 至 '%s'。" + +#: rebase-interactive.c:173 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"警告：一些提交可能被意外丢弃。\n" +"丢弃的提交（从新到旧）：\n" -#: refs.c:192 +#: rebase-interactive.c:180 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n" +"\n" +"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" +"可选值有：ignore、warn、error。\n" +"\n" + +#: refs.c:262 #, c-format msgid "%s does not point to a valid object!" msgstr "%s 没有指向一个有效的对象！" -#: refs.c:583 +#: refs.c:667 #, c-format msgid "ignoring dangling symref %s" msgstr "忽略悬空符号引用 %s" -#: refs.c:585 ref-filter.c:1951 +#: refs.c:669 ref-filter.c:2098 #, c-format msgid "ignoring broken ref %s" msgstr "忽略损坏的引用 %s" -#: refs.c:711 +#: refs.c:804 #, c-format msgid "could not open '%s' for writing: %s" msgstr "无法为写入打开 '%s'：%s" -#: refs.c:721 refs.c:772 +#: refs.c:814 refs.c:865 #, c-format msgid "could not read ref '%s'" msgstr "无法读取引用 '%s'" -#: refs.c:727 +#: refs.c:820 #, c-format msgid "ref '%s' already exists" msgstr "引用 '%s' 已经存在" -#: refs.c:732 +#: refs.c:825 #, c-format msgid "unexpected object ID when writing '%s'" msgstr "写入 '%s' 时意外的对象 ID" -#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636 -#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788 -#: wrapper.c:656 +#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997 +#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142 +#: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "不能写入 '%s'" -#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:728 +#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714 +#: builtin/rebase.c:1031 #, c-format msgid "could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" -#: refs.c:774 +#: refs.c:867 #, c-format msgid "unexpected object ID when deleting '%s'" msgstr "删除 '%s' 时意外的对象 ID" -#: refs.c:905 +#: refs.c:998 #, c-format msgid "log for ref %s has gap after %s" msgstr "引用 %s 的日志在 %s 之后有缺口" -#: refs.c:911 +#: refs.c:1004 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "引用 %s 的日志意外终止于 %s " -#: refs.c:969 +#: refs.c:1063 #, c-format msgid "log for %s is empty" msgstr "%s 的日志为空" -#: refs.c:1061 +#: refs.c:1155 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "拒绝更新有错误名称 '%s' 的引用" -#: refs.c:1137 +#: refs.c:1231 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "对引用 '%s' 执行 update_ref 失败：%s" -#: refs.c:1911 +#: refs.c:2023 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "不允许对引用 '%s' 多次更新" -#: refs.c:1943 +#: refs.c:2055 msgid "ref updates forbidden inside quarantine environment" msgstr "在隔离环境中禁止更新引用" -#: refs.c:2039 refs.c:2069 +#: refs.c:2151 refs.c:2181 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' 已存在，无法创建 '%s'" -#: refs.c:2045 refs.c:2080 +#: refs.c:2157 refs.c:2192 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "无法同时处理 '%s' 和 '%s'" -#: refs/files-backend.c:1228 +#: refs/files-backend.c:1234 #, c-format msgid "could not remove reference %s" msgstr "无法删除引用 %s" -#: refs/files-backend.c:1242 refs/packed-backend.c:1532 -#: refs/packed-backend.c:1542 +#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "无法删除引用 %s：%s" -#: refs/files-backend.c:1245 refs/packed-backend.c:1545 +#: refs/files-backend.c:1251 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "无法删除引用：%s" @@ -4021,348 +5510,477 @@ msgstr "无法删除引用：%s" msgid "invalid refspec '%s'" msgstr "无效的引用表达式：'%s'" -#: ref-filter.c:39 wt-status.c:1855 +#: ref-filter.c:42 wt-status.c:1938 msgid "gone" msgstr "丢失" -#: ref-filter.c:40 +#: ref-filter.c:43 #, c-format msgid "ahead %d" msgstr "领先 %d" -#: ref-filter.c:41 +#: ref-filter.c:44 #, c-format msgid "behind %d" msgstr "落后 %d" -#: ref-filter.c:42 +#: ref-filter.c:45 #, c-format msgid "ahead %d, behind %d" msgstr "领先 %d，落后 %d" -#: ref-filter.c:138 +#: ref-filter.c:165 #, c-format msgid "expected format: %%(color:<color>)" msgstr "期望的格式：%%(color:<颜色>)" -#: ref-filter.c:140 +#: ref-filter.c:167 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "未能识别的颜色：%%(color:%s)" -#: ref-filter.c:162 +#: ref-filter.c:189 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "期望整数值 refname:lstrip=%s" -#: ref-filter.c:166 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "期望整数值 refname:rstrip=%s" -#: ref-filter.c:168 +#: ref-filter.c:195 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "未能识别的 %%(%s) 参数：%s" -#: ref-filter.c:223 +#: ref-filter.c:250 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) 不带参数" -#: ref-filter.c:235 +#: ref-filter.c:272 #, c-format -msgid "%%(objectsize) does not take arguments" -msgstr "%%(objectsize) 不带参数" +msgid "unrecognized %%(objectsize) argument: %s" +msgstr "未能识别的 %%(objectsize) 参数：%s" -#: ref-filter.c:247 +#: ref-filter.c:280 +#, c-format +msgid "%%(deltabase) does not take arguments" +msgstr "%%(deltabase) 不带参数" + +#: ref-filter.c:292 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) 不带参数" -#: ref-filter.c:256 +#: ref-filter.c:301 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) 不带参数" -#: ref-filter.c:278 +#: ref-filter.c:323 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "未知的 %%(trailers) 参数：%s" -#: ref-filter.c:307 +#: ref-filter.c:352 #, c-format msgid "positive value expected contents:lines=%s" msgstr "期望一个正数 contents:lines=%s" -#: ref-filter.c:309 +#: ref-filter.c:354 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "未能识别的 %%(contents) 参数：%s" -#: ref-filter.c:324 +#: ref-filter.c:369 #, c-format msgid "positive value expected objectname:short=%s" msgstr "期望一个正数 objectname:short=%s" -#: ref-filter.c:328 +#: ref-filter.c:373 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "未能识别的 %%(objectname) 参数：%s" -#: ref-filter.c:358 +#: ref-filter.c:403 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "期望的格式：%%(align:<宽度>,<位置>)" -#: ref-filter.c:370 +#: ref-filter.c:415 #, c-format msgid "unrecognized position:%s" msgstr "未能识别的位置：%s" -#: ref-filter.c:377 +#: ref-filter.c:422 #, c-format msgid "unrecognized width:%s" msgstr "未能识别的宽度：%s" -#: ref-filter.c:386 +#: ref-filter.c:431 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "未能识别的 %%(align) 参数：%s" -#: ref-filter.c:394 +#: ref-filter.c:439 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "元素 %%(align) 需要一个正数的宽度" -#: ref-filter.c:412 +#: ref-filter.c:457 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "未能识别的 %%(if) 参数：%s" -#: ref-filter.c:508 +#: ref-filter.c:559 #, c-format msgid "malformed field name: %.*s" msgstr "格式错误的字段名：%.*s" -#: ref-filter.c:535 +#: ref-filter.c:586 #, c-format msgid "unknown field name: %.*s" msgstr "未知的字段名：%.*s" -#: ref-filter.c:539 +#: ref-filter.c:590 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "不是一个 git 仓库，但是字段 '%.*s' 需要访问对象数据" -#: ref-filter.c:663 +#: ref-filter.c:714 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素" -#: ref-filter.c:726 +#: ref-filter.c:777 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素" -#: ref-filter.c:728 +#: ref-filter.c:779 #, c-format msgid "format: %%(then) atom used more than once" msgstr "格式：%%(then) 元素用了多次" -#: ref-filter.c:730 +#: ref-filter.c:781 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "格式：%%(then) 元素用在了 %%(else) 之后" -#: ref-filter.c:758 +#: ref-filter.c:809 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素" -#: ref-filter.c:760 +#: ref-filter.c:811 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素" -#: ref-filter.c:762 +#: ref-filter.c:813 #, c-format msgid "format: %%(else) atom used more than once" msgstr "格式：%%(else) 元素用了多次" -#: ref-filter.c:777 +#: ref-filter.c:828 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "格式：使用了 %%(end) 元素却没有它的对应元素" -#: ref-filter.c:834 +#: ref-filter.c:885 #, c-format msgid "malformed format string %s" msgstr "错误的格式化字符串 %s" -#: ref-filter.c:1424 +#: ref-filter.c:1488 #, c-format -msgid "(no branch, rebasing %s)" -msgstr "（非分支，正变基 %s）" +msgid "no branch, rebasing %s" +msgstr "非分支，正变基 %s" -#: ref-filter.c:1427 -#, c-format -msgid "(no branch, rebasing detached HEAD %s)" -msgstr "（非分支，正变基分离头指针 %s）" - -#: ref-filter.c:1430 -#, c-format -msgid "(no branch, bisect started on %s)" -msgstr "（非分支，二分查找开始于 %s）" - -#. TRANSLATORS: make sure this matches "HEAD -#. detached at " in wt-status.c -#. -#: ref-filter.c:1438 +#: ref-filter.c:1491 #, c-format -msgid "(HEAD detached at %s)" -msgstr "（头指针分离于 %s）" +msgid "no branch, rebasing detached HEAD %s" +msgstr "非分支，正变基分离头指针 %s" -#. TRANSLATORS: make sure this matches "HEAD -#. detached from " in wt-status.c -#. -#: ref-filter.c:1445 +#: ref-filter.c:1494 #, c-format -msgid "(HEAD detached from %s)" -msgstr "（头指针分离自 %s）" +msgid "no branch, bisect started on %s" +msgstr "非分支，二分查找开始于 %s" -#: ref-filter.c:1449 -msgid "(no branch)" -msgstr "（非分支）" +#: ref-filter.c:1504 +msgid "no branch" +msgstr "非分支" -#: ref-filter.c:1483 ref-filter.c:1638 +#: ref-filter.c:1540 ref-filter.c:1749 #, c-format msgid "missing object %s for %s" msgstr "缺失 %2$s 的对象 %1$s" -#: ref-filter.c:1491 +#: ref-filter.c:1550 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" -#: ref-filter.c:1857 +#: ref-filter.c:2004 #, c-format msgid "malformed object at '%s'" msgstr "格式错误的对象 '%s'" -#: ref-filter.c:1946 +#: ref-filter.c:2093 #, c-format msgid "ignoring ref with broken name %s" msgstr "忽略带有错误名称 %s 的引用" -#: ref-filter.c:2232 +#: ref-filter.c:2389 #, c-format msgid "format: %%(end) atom missing" msgstr "格式：缺少 %%(end) 元素" -#: ref-filter.c:2338 +#: ref-filter.c:2489 +#, c-format +msgid "option `%s' is incompatible with --merged" +msgstr "选项 `%s' 和 --merged 不兼容" + +#: ref-filter.c:2492 +#, c-format +msgid "option `%s' is incompatible with --no-merged" +msgstr "选项 `%s' 和 --no-merged 不兼容" + +#: ref-filter.c:2502 #, c-format msgid "malformed object name %s" msgstr "格式错误的对象名 %s" -#: remote.c:607 +#: ref-filter.c:2507 +#, c-format +msgid "option `%s' must point to a commit" +msgstr "选项 `%s' 必须指向一个提交" + +#: remote.c:366 +#, c-format +msgid "config remote shorthand cannot begin with '/': %s" +msgstr "配置的远程短名称不能以 '/' 开始：%s" + +#: remote.c:413 +msgid "more than one receivepack given, using the first" +msgstr "提供了一个以上的 receivepack，使用第一个" + +#: remote.c:421 +msgid "more than one uploadpack given, using the first" +msgstr "提供了一个以上的 uploadpack，使用第一个" + +#: remote.c:611 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "不能同时获取 %s 和 %s 至 %s" -#: remote.c:611 +#: remote.c:615 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常跟踪 %s，而非 %s" -#: remote.c:615 +#: remote.c:619 #, c-format msgid "%s tracks both %s and %s" msgstr "%s 同时跟踪 %s 和 %s" -#: remote.c:623 -msgid "Internal error" -msgstr "内部错误" +#: remote.c:687 +#, c-format +msgid "key '%s' of pattern had no '*'" +msgstr "模式的键 '%s' 没有 '*'" + +#: remote.c:697 +#, c-format +msgid "value '%s' of pattern has no '*'" +msgstr "模式的值 '%s' 没有 '*'" + +#: remote.c:1003 +#, c-format +msgid "src refspec %s does not match any" +msgstr "源引用表达式 %s 没有匹配" -#: remote.c:1569 remote.c:1670 +#: remote.c:1008 +#, c-format +msgid "src refspec %s matches more than one" +msgstr "源引用表达式 %s 匹配超过一个" + +#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push +#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is +#. the <src>. +#. +#: remote.c:1023 +#, c-format +msgid "" +"The destination you provided is not a full refname (i.e.,\n" +"starting with \"refs/\"). We tried to guess what you meant by:\n" +"\n" +"- Looking for a ref that matches '%s' on the remote side.\n" +"- Checking if the <src> being pushed ('%s')\n" +" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n" +" refs/{heads,tags}/ prefix on the remote side.\n" +"\n" +"Neither worked, so we gave up. You must fully qualify the ref." +msgstr "" +"您提供的目标不是一个完整的引用名称（即以 \"refs/\" 开头）。我们\n" +"试着猜测您的想法：\n" +"\n" +"- 在远端查询和 '%s' 匹配的引用。\n" +"- 检查要推送的 <src>（'%s'）是不是在 \"refs/{heads,tags}/\" 中的\n" +" 引用。如果是，我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n" +"\n" +"都不行，所以我们已放弃。您必须给出完整的引用。" + +#: remote.c:1043 +#, c-format +msgid "" +"The <src> part of the refspec is a commit object.\n" +"Did you mean to create a new branch by pushing to\n" +"'%s:refs/heads/%s'?" +msgstr "" +"引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n" +"'%s:refs/heads/%s' 推送么？" + +#: remote.c:1048 +#, c-format +msgid "" +"The <src> part of the refspec is a tag object.\n" +"Did you mean to create a new tag by pushing to\n" +"'%s:refs/tags/%s'?" +msgstr "" +"引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n" +"'%s:refs/tags/%s' 推送么？" + +#: remote.c:1053 +#, c-format +msgid "" +"The <src> part of the refspec is a tree object.\n" +"Did you mean to tag a new tree by pushing to\n" +"'%s:refs/tags/%s'?" +msgstr "" +"引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n" +"'%s:refs/tags/%s' 推送么？" + +#: remote.c:1058 +#, c-format +msgid "" +"The <src> part of the refspec is a blob object.\n" +"Did you mean to tag a new blob by pushing to\n" +"'%s:refs/tags/%s'?" +msgstr "" +"引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n" +"'%s:refs/tags/%s' 推送么？" + +#: remote.c:1094 +#, c-format +msgid "%s cannot be resolved to branch" +msgstr "%s 无法被解析为分支" + +#: remote.c:1105 +#, c-format +msgid "unable to delete '%s': remote ref does not exist" +msgstr "无法删除 '%s'：远程引用不存在" + +#: remote.c:1117 +#, c-format +msgid "dst refspec %s matches more than one" +msgstr "目标引用表达式 %s 匹配超过一个" + +#: remote.c:1124 +#, c-format +msgid "dst ref %s receives from more than one src" +msgstr "目标引用 %s 接收超过一个源" + +#: remote.c:1627 remote.c:1728 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" -#: remote.c:1578 +#: remote.c:1636 #, c-format msgid "no such branch: '%s'" msgstr "没有此分支：'%s'" -#: remote.c:1581 +#: remote.c:1639 #, c-format msgid "no upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" -#: remote.c:1587 +#: remote.c:1645 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" -#: remote.c:1602 +#: remote.c:1660 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" -#: remote.c:1614 +#: remote.c:1672 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "分支 '%s' 没有设置要推送的远程服务器" -#: remote.c:1624 +#: remote.c:1682 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "向 '%s' 推送引用规格未包含 '%s'" -#: remote.c:1637 +#: remote.c:1695 msgid "push has no destination (push.default is 'nothing')" msgstr "推送无目标（push.default 是 'nothing'）" -#: remote.c:1659 +#: remote.c:1717 msgid "cannot resolve 'simple' push to a single destination" msgstr "无法解析 'simple' 推送至一个单独的目标" -#: remote.c:1935 +#: remote.c:1843 +#, c-format +msgid "couldn't find remote ref %s" +msgstr "无法找到远程引用 %s" + +#: remote.c:1856 +#, c-format +msgid "* Ignoring funny ref '%s' locally" +msgstr "* 在本地忽略可笑的引用 '%s'" + +#: remote.c:2019 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n" -#: remote.c:1939 +#: remote.c:2023 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n" -#: remote.c:1942 +#: remote.c:2026 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" -#: remote.c:1946 +#: remote.c:2030 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "您的分支和 '%s' 指向不同的提交。\n" -#: remote.c:1949 +#: remote.c:2033 #, c-format msgid " (use \"%s\" for details)\n" msgstr " （使用 \"%s\" 查看详情）\n" -#: remote.c:1953 +#: remote.c:2037 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" -#: remote.c:1959 +#: remote.c:2043 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 来发布您的本地提交）\n" -#: remote.c:1962 +#: remote.c:2046 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -4371,11 +5989,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" # 译者：注意保持前导空格 -#: remote.c:1970 +#: remote.c:2054 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" -#: remote.c:1973 +#: remote.c:2057 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -4391,10 +6009,15 @@ msgstr[1] "" "并且分别有 %d 和 %d 处不同的提交。\n" # 译者：注意保持前导空格 -#: remote.c:1983 +#: remote.c:2067 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" +#: remote.c:2250 +#, c-format +msgid "cannot parse expected object name '%s'" +msgstr "无法解析期望的对象名 '%s'" + #: replace-object.c:21 #, c-format msgid "bad replace ref name: %s" @@ -4418,11 +6041,6 @@ msgstr "损坏的 MERGE_RR" msgid "unable to write rerere record" msgstr "无法写入 rerere 记录" -#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162 -#, c-format -msgid "could not write '%s'" -msgstr "不能写入 '%s'" - #: rerere.c:495 #, c-format msgid "there were errors while writing '%s' (%s)" @@ -4473,8 +6091,8 @@ msgstr "不能删除 stray '%s'" msgid "Recorded preimage for '%s'" msgstr "为 '%s' 记录 preimage" -#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413 -#: builtin/submodule--helper.c:1423 +#: rerere.c:881 submodule.c:2067 builtin/log.c:1871 +#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448 #, c-format msgid "could not create directory '%s'" msgstr "不能创建目录 '%s'" @@ -4508,29 +6126,33 @@ msgstr "忘记 '%s' 的解决方案\n" msgid "unable to open rr-cache directory" msgstr "不能打开 rr-cache 目录" -#: revision.c:2324 +#: revision.c:2497 msgid "your current branch appears to be broken" msgstr "您的当前分支好像被损坏" -#: revision.c:2327 +#: revision.c:2500 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的当前分支 '%s' 尚无任何提交" -#: revision.c:2523 +#: revision.c:2708 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 与 --bisect 不兼容" -#: run-command.c:740 +#: revision.c:2712 +msgid "-L does not yet support diff formats besides -p and -s" +msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" + +#: run-command.c:762 msgid "open /dev/null failed" msgstr "不能打开 /dev/null" -#: run-command.c:1229 +#: run-command.c:1268 #, c-format msgid "cannot create async thread: %s" msgstr "不能创建 async 线程：%s" -#: run-command.c:1293 +#: run-command.c:1332 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -4539,70 +6161,75 @@ msgstr "" "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n" "配置 `git config advice.ignoredHook false` 来关闭这条警告。" -#: send-pack.c:142 +#: send-pack.c:144 msgid "unexpected flush packet while reading remote unpack status" msgstr "读取远程解包状态时收到意外的 flush 包" -#: send-pack.c:144 +#: send-pack.c:146 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "不能解析远程解包状态：%s" -#: send-pack.c:146 +#: send-pack.c:148 #, c-format msgid "remote unpack failed: %s" msgstr "远程解包失败：%s" -#: send-pack.c:308 +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "为推送证书签名失败" -#: send-pack.c:421 +#: send-pack.c:423 msgid "the receiving end does not support --signed push" msgstr "接收端不支持签名推送" -#: send-pack.c:423 +#: send-pack.c:425 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "未发送推送证书，因为接收端不支持签名推送" -#: send-pack.c:435 +#: send-pack.c:437 msgid "the receiving end does not support --atomic push" msgstr "接收端不支持原子推送" -#: send-pack.c:440 +#: send-pack.c:442 msgid "the receiving end does not support push options" msgstr "接收端不支持推送选项" -#: sequencer.c:183 +#: sequencer.c:189 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "无效的提交信息清理模式 '%s'" -#: sequencer.c:287 +#: sequencer.c:294 #, c-format msgid "could not delete '%s'" msgstr "无法删除 '%s'" -#: sequencer.c:313 +#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369 +#, c-format +msgid "could not remove '%s'" +msgstr "无法删除 '%s'" + +#: sequencer.c:323 msgid "revert" msgstr "还原" -#: sequencer.c:315 +#: sequencer.c:325 msgid "cherry-pick" msgstr "拣选" -#: sequencer.c:317 +#: sequencer.c:327 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:319 +#: sequencer.c:329 #, c-format msgid "unknown action: %d" msgstr "未知动作：%d" -#: sequencer.c:376 +#: sequencer.c:387 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -4610,7 +6237,7 @@ msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "命令标记修正后的文件" -#: sequencer.c:379 +#: sequencer.c:390 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -4619,110 +6246,114 @@ msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:392 sequencer.c:2632 +#: sequencer.c:403 sequencer.c:2993 #, c-format msgid "could not lock '%s'" msgstr "不能锁定 '%s'" -#: sequencer.c:399 +#: sequencer.c:410 #, c-format msgid "could not write eol to '%s'" msgstr "不能将换行符写入 '%s'" -#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652 -#: sequencer.c:2885 +#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013 +#: sequencer.c:3277 #, c-format msgid "failed to finalize '%s'" msgstr "无法完成 '%s'" -#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535 -#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746 -#: builtin/merge.c:1084 builtin/rebase.c:152 +#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259 +#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117 +#: builtin/rebase.c:589 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: sequencer.c:453 +#: sequencer.c:464 #, c-format msgid "your local changes would be overwritten by %s." msgstr "您的本地修改将被%s覆盖。" -#: sequencer.c:457 +#: sequencer.c:468 msgid "commit your changes or stash them to proceed." msgstr "提交您的修改或贮藏后再继续。" -#: sequencer.c:486 +#: sequencer.c:500 #, c-format msgid "%s: fast-forward" msgstr "%s：快进" +#: sequencer.c:539 builtin/tag.c:565 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "无效的清理模式 %s" + #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:575 +#: sequencer.c:633 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：无法写入新索引文件" -#: sequencer.c:591 +#: sequencer.c:650 msgid "unable to update cache tree" msgstr "不能更新缓存树" -#: sequencer.c:604 +#: sequencer.c:664 msgid "could not resolve HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:684 +#: sequencer.c:744 #, c-format msgid "no key present in '%.*s'" msgstr "在 '%.*s' 中没有 key" -#: sequencer.c:695 +#: sequencer.c:755 #, c-format msgid "unable to dequote value of '%s'" msgstr "无法为 '%s' 的值去引号" -#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719 -#: builtin/am.c:811 builtin/merge.c:1081 +#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074 #, c-format msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" -#: sequencer.c:742 +#: sequencer.c:802 msgid "'GIT_AUTHOR_NAME' already given" msgstr "已经给出 'GIT_AUTHOR_NAME'" -#: sequencer.c:747 +#: sequencer.c:807 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "已经给出 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:752 +#: sequencer.c:812 msgid "'GIT_AUTHOR_DATE' already given" msgstr "已经给出 'GIT_AUTHOR_DATE'" -#: sequencer.c:756 +#: sequencer.c:816 #, c-format msgid "unknown variable '%s'" msgstr "未知变量 '%s'" -#: sequencer.c:761 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "缺少 'GIT_AUTHOR_NAME'" -#: sequencer.c:763 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "缺少 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:765 +#: sequencer.c:825 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "缺少 'GIT_AUTHOR_DATE'" -#: sequencer.c:825 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "'%2$s' 中无效的日期格式 '%1$s'" +#: sequencer.c:902 sequencer.c:1427 +msgid "malformed ident line" +msgstr "错误的身份信息" -#: sequencer.c:842 +#: sequencer.c:925 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -4751,15 +6382,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:935 -msgid "writing root commit" -msgstr "写根提交" - -#: sequencer.c:1142 +#: sequencer.c:1218 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' 钩子失败" -#: sequencer.c:1149 +#: sequencer.c:1224 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4783,7 +6410,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1162 +#: sequencer.c:1237 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4806,300 +6433,353 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1202 +#: sequencer.c:1279 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: sequencer.c:1204 +#: sequencer.c:1281 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: sequencer.c:1250 +#: sequencer.c:1327 msgid "unable to resolve HEAD after creating commit" msgstr "创建提交后，不能解析 HEAD" -#: sequencer.c:1252 +#: sequencer.c:1329 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: sequencer.c:1256 +#: sequencer.c:1333 msgid " (root-commit)" msgstr "（根提交）" -#: sequencer.c:1277 +#: sequencer.c:1354 msgid "could not parse HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:1279 +#: sequencer.c:1356 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一个提交！" -#: sequencer.c:1283 builtin/commit.c:1543 +#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:1334 sequencer.c:1934 +#: sequencer.c:1411 sequencer.c:2055 msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677 +#: sequencer.c:1431 +msgid "corrupted author without date information" +msgstr "损坏的没有日期的作者信息" + +#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入树对象" -#: sequencer.c:1361 sequencer.c:1416 +#: sequencer.c:1480 sequencer.c:1550 #, c-format msgid "unable to read commit message from '%s'" msgstr "不能从 '%s' 读取提交说明" -#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858 -#: builtin/merge.c:883 +#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883 +#: builtin/merge.c:908 msgid "failed to write commit object" msgstr "写提交对象失败" -#: sequencer.c:1443 +#: sequencer.c:1577 #, c-format msgid "could not parse commit %s" msgstr "不能解析提交 %s" -#: sequencer.c:1448 +#: sequencer.c:1582 #, c-format msgid "could not parse parent commit %s" msgstr "不能解析父提交 %s" -#: sequencer.c:1546 sequencer.c:1654 +#: sequencer.c:1656 sequencer.c:1767 #, c-format msgid "unknown command: %d" msgstr "未知命令：%d" -#: sequencer.c:1601 sequencer.c:1626 +#: sequencer.c:1714 sequencer.c:1739 #, c-format msgid "This is a combination of %d commits." msgstr "这是一个 %d 个提交的组合。" -#: sequencer.c:1611 sequencer.c:4744 +#: sequencer.c:1724 msgid "need a HEAD to fixup" msgstr "需要一个 HEAD 来修复" -#: sequencer.c:1613 sequencer.c:2912 +#: sequencer.c:1726 sequencer.c:3304 msgid "could not read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:1615 +#: sequencer.c:1728 msgid "could not read HEAD's commit message" msgstr "不能读取 HEAD 的提交说明" -#: sequencer.c:1621 +#: sequencer.c:1734 #, c-format msgid "cannot write '%s'" msgstr "不能写 '%s'" -#: sequencer.c:1628 git-rebase--preserve-merges.sh:441 +#: sequencer.c:1741 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "这是第一个提交说明：" -#: sequencer.c:1636 +#: sequencer.c:1749 #, c-format msgid "could not read commit message of %s" msgstr "不能读取 %s 的提交说明" -#: sequencer.c:1643 +#: sequencer.c:1756 #, c-format msgid "This is the commit message #%d:" msgstr "这是提交说明 #%d：" -#: sequencer.c:1649 +#: sequencer.c:1762 #, c-format msgid "The commit message #%d will be skipped:" msgstr "提交说明 #%d 将被跳过：" -#: sequencer.c:1732 +#: sequencer.c:1850 msgid "your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:1739 +#: sequencer.c:1857 msgid "cannot fixup root commit" msgstr "不能修复根提交" -#: sequencer.c:1758 +#: sequencer.c:1876 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:1766 +#: sequencer.c:1884 sequencer.c:1892 #, c-format msgid "commit %s does not have parent %d" msgstr "提交 %s 没有第 %d 个父提交" -#: sequencer.c:1770 -#, c-format -msgid "mainline was specified but commit %s is not a merge." -msgstr "指定了主线，但是提交 %s 不是一个合并提交。" - -#: sequencer.c:1776 +#: sequencer.c:1898 #, c-format msgid "cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1795 +#: sequencer.c:1917 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:1860 +#: sequencer.c:1982 #, c-format msgid "could not rename '%s' to '%s'" msgstr "不能将 '%s' 重命名为 '%s'" -#: sequencer.c:1915 +#: sequencer.c:2037 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:1916 +#: sequencer.c:2038 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:1974 +#: sequencer.c:2105 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:1981 +#: sequencer.c:2112 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:2062 +#: sequencer.c:2189 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受参数：'%s'" -#: sequencer.c:2071 +#: sequencer.c:2198 #, c-format msgid "missing arguments for %s" msgstr "缺少 %s 的参数" -#: sequencer.c:2130 +#: sequencer.c:2235 +#, c-format +msgid "could not parse '%.*s'" +msgstr "无法解析 '%.*s'" + +#: sequencer.c:2289 #, c-format msgid "invalid line %d: %.*s" msgstr "无效行 %d：%.*s" -#: sequencer.c:2138 +#: sequencer.c:2300 #, c-format msgid "cannot '%s' without a previous commit" msgstr "没有父提交的情况下不能 '%s'" -#: sequencer.c:2209 +#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197 +#: builtin/rebase.c:223 builtin/rebase.c:248 +#, c-format +msgid "could not read '%s'." +msgstr "不能读取 '%s'。" + +#: sequencer.c:2384 +msgid "cancelling a cherry picking in progress" +msgstr "正在取消一个进行中的拣选" + +#: sequencer.c:2391 +msgid "cancelling a revert in progress" +msgstr "正在取消一个进行中的还原" + +#: sequencer.c:2435 msgid "please fix this using 'git rebase --edit-todo'." msgstr "请用 'git rebase --edit-todo' 来修改。" -#: sequencer.c:2211 +#: sequencer.c:2437 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "不可用的指令清单：'%s'" -#: sequencer.c:2216 +#: sequencer.c:2442 msgid "no commits parsed." msgstr "没有解析提交。" -#: sequencer.c:2227 +#: sequencer.c:2453 msgid "cannot cherry-pick during a revert." msgstr "不能在回退中执行拣选。" -#: sequencer.c:2229 +#: sequencer.c:2455 msgid "cannot revert during a cherry-pick." msgstr "不能在拣选中执行回退。" -#: sequencer.c:2299 +#: sequencer.c:2533 #, c-format msgid "invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: sequencer.c:2380 +#: sequencer.c:2630 msgid "unusable squash-onto" msgstr "不可用的 squash-onto" -#: sequencer.c:2396 +#: sequencer.c:2646 #, c-format msgid "malformed options sheet: '%s'" msgstr "格式错误的选项清单：'%s'" -#: sequencer.c:2479 sequencer.c:4005 +#: sequencer.c:2736 sequencer.c:4463 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:2487 -msgid "a cherry-pick or revert is already in progress" -msgstr "一个拣选或还原操作已在进行" +#: sequencer.c:2752 +msgid "revert is already in progress" +msgstr "一个还原操作已在进行" + +#: sequencer.c:2754 +#, c-format +msgid "try \"git revert (--continue | %s--abort | --quit)\"" +msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\"" + +#: sequencer.c:2757 +msgid "cherry-pick is already in progress" +msgstr "拣选操作已在进行" -#: sequencer.c:2488 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" -msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" +#: sequencer.c:2759 +#, c-format +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" +msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2491 +#: sequencer.c:2773 #, c-format msgid "could not create sequencer directory '%s'" msgstr "不能创建序列目录 '%s'" -#: sequencer.c:2505 +#: sequencer.c:2788 msgid "could not lock HEAD" msgstr "不能锁定 HEAD" -#: sequencer.c:2560 sequencer.c:3761 +#: sequencer.c:2848 sequencer.c:4209 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:2562 +#: sequencer.c:2850 sequencer.c:2861 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:2564 sequencer.c:2599 +#: sequencer.c:2852 sequencer.c:2896 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:2585 builtin/grep.c:721 +#: sequencer.c:2882 builtin/grep.c:736 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: sequencer.c:2587 +#: sequencer.c:2884 #, c-format msgid "cannot read '%s': %s" msgstr "不能读取 '%s'：%s" -#: sequencer.c:2588 +#: sequencer.c:2885 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:2594 +#: sequencer.c:2891 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:2605 +#: sequencer.c:2902 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！" -#: sequencer.c:2709 sequencer.c:3679 +#: sequencer.c:2943 +msgid "no revert in progress" +msgstr "没有正在进行的还原" + +#: sequencer.c:2951 +msgid "no cherry-pick in progress" +msgstr "没有正在进行的拣选" + +#: sequencer.c:2961 +msgid "failed to skip the commit" +msgstr "无法跳过这个提交" + +#: sequencer.c:2968 +msgid "there is nothing to skip" +msgstr "没有要跳过的" + +#: sequencer.c:2971 +#, c-format +msgid "" +"have you committed already?\n" +"try \"git %s --continue\"" +msgstr "" +"您已经提交了么？\n" +"试试 \"git %s --continue\"" + +#: sequencer.c:3095 sequencer.c:4121 #, c-format msgid "could not update %s" msgstr "不能更新 %s" -#: sequencer.c:2747 sequencer.c:3659 +#: sequencer.c:3134 sequencer.c:4101 msgid "cannot read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:2762 +#: sequencer.c:3151 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "无法拷贝 '%s' 至 '%s'" -#: sequencer.c:2770 +#: sequencer.c:3159 #, c-format msgid "" "You can amend the commit now, with\n" @@ -5118,28 +6798,23 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:2780 +#: sequencer.c:3169 #, c-format msgid "Could not apply %s... %.*s" msgstr "不能应用 %s... %.*s" -#: sequencer.c:2787 +#: sequencer.c:3176 #, c-format msgid "Could not merge %.*s" msgstr "不能合并 %.*s" -#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640 +#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" -#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019 -#: builtin/rebase.c:1372 builtin/rebase.c:1426 -msgid "could not read index" -msgstr "不能读取索引" - # 译者：注意保持前导空格 -#: sequencer.c:2829 +#: sequencer.c:3221 #, c-format msgid "" "execution failed: %s\n" @@ -5154,11 +6829,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:2835 +#: sequencer.c:3227 msgid "and made changes to the index and/or the working tree\n" msgstr "并且修改索引和/或工作区\n" -#: sequencer.c:2841 +#: sequencer.c:3233 #, c-format msgid "" "execution succeeded: %s\n" @@ -5175,76 +6850,72 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:2902 +#: sequencer.c:3294 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的标签名称：'%.*s'" -#: sequencer.c:2954 +#: sequencer.c:3348 msgid "writing fake root commit" msgstr "写伪根提交" -#: sequencer.c:2959 +#: sequencer.c:3353 msgid "writing squash-onto" msgstr "写入 squash-onto" -#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591 +#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882 #, c-format msgid "failed to find tree of %s" msgstr "无法找到 %s 指向的树。" -#: sequencer.c:3015 builtin/rebase.c:604 -msgid "could not write index" -msgstr "不能写入索引" - -#: sequencer.c:3042 +#: sequencer.c:3436 #, c-format msgid "could not resolve '%s'" msgstr "无法解析 '%s'" -#: sequencer.c:3068 +#: sequencer.c:3467 msgid "cannot merge without a current revision" msgstr "没有当前版本不能合并" -#: sequencer.c:3090 +#: sequencer.c:3489 #, c-format msgid "unable to parse '%.*s'" msgstr "无法解析 '%.*s'" -#: sequencer.c:3099 +#: sequencer.c:3498 #, c-format msgid "nothing to merge: '%.*s'" msgstr "无可用合并：'%.*s'" -#: sequencer.c:3111 +#: sequencer.c:3510 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章鱼合并不能在一个新的根提交上执行" -#: sequencer.c:3126 +#: sequencer.c:3526 #, c-format msgid "could not get commit message of '%s'" msgstr "不能获取 '%s' 的提交说明" -#: sequencer.c:3274 +#: sequencer.c:3688 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能尝试合并 '%.*s'" -#: sequencer.c:3290 +#: sequencer.c:3704 msgid "merge: Unable to write new index file" msgstr "合并：无法写入新索引文件" -#: sequencer.c:3358 builtin/rebase.c:268 +#: sequencer.c:3773 builtin/rebase.c:733 #, c-format msgid "Applied autostash.\n" msgstr "已应用 autostash。\n" -#: sequencer.c:3370 +#: sequencer.c:3785 #, c-format msgid "cannot store %s" msgstr "不能存储 %s" -#: sequencer.c:3373 builtin/rebase.c:284 +#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -5255,31 +6926,31 @@ msgstr "" "您的修改安全地保存在贮藏区中。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:3427 +#: sequencer.c:3849 #, c-format msgid "could not checkout %s" msgstr "不能检出 %s" -#: sequencer.c:3441 +#: sequencer.c:3863 #, c-format msgid "%s: not a valid OID" -msgstr "%s：不是一个有效的 OID" +msgstr "%s：不是一个有效的对象 ID" -#: sequencer.c:3446 git-rebase--preserve-merges.sh:724 +#: sequencer.c:3868 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "不能分离头指针" -#: sequencer.c:3461 +#: sequencer.c:3883 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:3463 +#: sequencer.c:3885 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:3471 +#: sequencer.c:3893 #, c-format msgid "" "Could not execute the todo command\n" @@ -5299,48 +6970,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3543 +#: sequencer.c:3979 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:3622 +#: sequencer.c:4050 #, c-format msgid "unknown command %d" msgstr "未知命令 %d" -#: sequencer.c:3667 +#: sequencer.c:4109 msgid "could not read orig-head" msgstr "不能读取 orig-head" -#: sequencer.c:3672 sequencer.c:4741 +#: sequencer.c:4114 msgid "could not read 'onto'" msgstr "不能读取 'onto'" -#: sequencer.c:3686 +#: sequencer.c:4128 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 为 %s" -#: sequencer.c:3772 +#: sequencer.c:4221 msgid "cannot rebase: You have unstaged changes." msgstr "不能变基：您有未暂存的变更。" -#: sequencer.c:3781 +#: sequencer.c:4230 msgid "cannot amend non-existing commit" msgstr "不能修补不存在的提交" -#: sequencer.c:3783 +#: sequencer.c:4232 #, c-format msgid "invalid file: '%s'" msgstr "无效文件：'%s'" -#: sequencer.c:3785 +#: sequencer.c:4234 #, c-format msgid "invalid contents: '%s'" msgstr "无效内容：'%s'" -#: sequencer.c:3788 +#: sequencer.c:4237 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -5349,79 +7020,42 @@ msgstr "" "\n" "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" -#: sequencer.c:3824 sequencer.c:3862 +#: sequencer.c:4273 sequencer.c:4312 #, c-format msgid "could not write file: '%s'" msgstr "不能写入文件：'%s'" -#: sequencer.c:3877 +#: sequencer.c:4327 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能删除 CHERRY_PICK_HEAD" -#: sequencer.c:3884 +#: sequencer.c:4334 msgid "could not commit staged changes." msgstr "不能提交暂存的修改。" -#: sequencer.c:3982 +#: sequencer.c:4440 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:3986 +#: sequencer.c:4444 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:4021 +#: sequencer.c:4479 msgid "can't revert as initial commit" msgstr "不能作为初始提交回退" -#: sequencer.c:4466 +#: sequencer.c:4952 msgid "make_script: unhandled options" msgstr "make_script：有未能处理的选项" -#: sequencer.c:4469 +#: sequencer.c:4955 msgid "make_script: error preparing revisions" msgstr "make_script：准备版本时错误" -#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840 -#, c-format -msgid "unusable todo list: '%s'" -msgstr "不可用的待办列表：'%s'" - -#: sequencer.c:4620 -#, c-format -msgid "" -"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." -msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" - -#: sequencer.c:4690 -#, c-format -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):\n" -msgstr "" -"警告：一些提交可能被意外丢弃。\n" -"丢弃的提交（从新到旧）：\n" - -#: sequencer.c:4697 -#, c-format -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error.\n" -"\n" -msgstr "" -"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n" -"\n" -"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" -"可选值有：ignore、warn、error。\n" -"\n" - -#: sequencer.c:4710 -#, c-format +#: sequencer.c:5113 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -5430,40 +7064,24 @@ msgstr "" "您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n" "或者您可以用 'git rebase --abort' 终止变基。\n" -#: sequencer.c:4848 sequencer.c:4886 +#: sequencer.c:5226 sequencer.c:5243 msgid "nothing to do" msgstr "无事可做" -#: sequencer.c:4852 -#, c-format -msgid "Rebase %s onto %s (%d command)" -msgid_plural "Rebase %s onto %s (%d commands)" -msgstr[0] "变基 %s 到 %s（%d 个提交）" -msgstr[1] "变基 %s 到 %s（%d 个提交）" - -#: sequencer.c:4864 -#, c-format -msgid "could not copy '%s' to '%s'." -msgstr "不能拷贝 '%s' 至 '%s'。" - -#: sequencer.c:4868 sequencer.c:4897 -msgid "could not transform the todo list" -msgstr "无法改变待办列表" - -#: sequencer.c:4900 +#: sequencer.c:5257 msgid "could not skip unnecessary pick commands" msgstr "无法跳过不必要的拣选" -#: sequencer.c:4983 +#: sequencer.c:5351 msgid "the script was already rearranged." msgstr "脚本已经重新编排。" -#: setup.c:123 +#: setup.c:124 #, c-format msgid "'%s' is outside repository" msgstr "'%s' 在仓库之外" -#: setup.c:172 +#: setup.c:174 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -5472,7 +7090,7 @@ msgstr "" "%s：工作区中无此路径。\n" "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。" -#: setup.c:185 +#: setup.c:187 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -5483,12 +7101,12 @@ msgstr "" "使用 '--' 来分隔版本和路径，例如：\n" "'git <命令> [<版本>...] -- [<文件>...]'" -#: setup.c:234 +#: setup.c:236 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "选项 '%s' 必须在其他非选项参数之前" -#: setup.c:253 +#: setup.c:255 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -5499,92 +7117,92 @@ msgstr "" "使用 '--' 来分隔版本和路径，例如：\n" "'git <命令> [<版本>...] -- [<文件>...]'" -#: setup.c:389 +#: setup.c:391 msgid "unable to set up work tree using invalid config" msgstr "无法使用无效配置来创建工作区" -#: setup.c:393 +#: setup.c:395 msgid "this operation must be run in a work tree" msgstr "该操作必须在一个工作区中运行" -#: setup.c:527 +#: setup.c:541 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 仓库版本 <= %d，却得到 %d" -#: setup.c:535 +#: setup.c:549 msgid "unknown repository extensions found:" msgstr "发现未知的仓库扩展：" -#: setup.c:554 +#: setup.c:568 #, c-format msgid "error opening '%s'" msgstr "打开 '%s' 出错" -#: setup.c:556 +#: setup.c:570 #, c-format msgid "too large to be a .git file: '%s'" msgstr "文件太大，无法作为 .git 文件：'%s'" -#: setup.c:558 +#: setup.c:572 #, c-format msgid "error reading %s" msgstr "读取 %s 出错" -#: setup.c:560 +#: setup.c:574 #, c-format msgid "invalid gitfile format: %s" msgstr "无效的 gitfile 格式：%s" -#: setup.c:562 +#: setup.c:576 #, c-format msgid "no path in gitfile: %s" msgstr "在 gitfile 中没有路径：%s" -#: setup.c:564 +#: setup.c:578 #, c-format msgid "not a git repository: %s" msgstr "不是一个 git 仓库：%s" -#: setup.c:663 +#: setup.c:677 #, c-format msgid "'$%s' too big" msgstr "'$%s' 太大" -#: setup.c:677 +#: setup.c:691 #, c-format msgid "not a git repository: '%s'" msgstr "不是一个 git 仓库：'%s'" -#: setup.c:706 setup.c:708 setup.c:739 +#: setup.c:720 setup.c:722 setup.c:753 #, c-format msgid "cannot chdir to '%s'" msgstr "不能切换目录到 '%s'" -#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839 +#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 msgid "cannot come back to cwd" msgstr "无法返回当前工作目录" -#: setup.c:837 -#, c-format -msgid "not a git repository (or any of the parent directories): %s" -msgstr "不是一个 git 仓库（或者任何父目录）：%s" - -#: setup.c:848 +#: setup.c:852 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "获取 '%*s%s%s' 状态（stat）失败" -#: setup.c:1078 +#: setup.c:1090 msgid "Unable to read current working directory" msgstr "不能读取当前工作目录" -#: setup.c:1090 setup.c:1096 +#: setup.c:1099 setup.c:1105 #, c-format msgid "cannot change to '%s'" msgstr "不能切换到 '%s'" -#: setup.c:1109 +#: setup.c:1110 +#, c-format +msgid "not a git repository (or any of the parent directories): %s" +msgstr "不是一个 git 仓库（或者任何父目录）：%s" + +#: setup.c:1116 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -5593,7 +7211,7 @@ msgstr "" "不是一个 git 仓库（或者直至挂载点 %s 的任何父目录）\n" "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" -#: setup.c:1192 +#: setup.c:1227 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -5602,371 +7220,453 @@ msgstr "" "参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n" "文件属主必须始终拥有读写权限。" -#: setup.c:1235 +#: setup.c:1271 msgid "open /dev/null or dup failed" msgstr "不能打开或者复制 /dev/null" -#: setup.c:1250 +#: setup.c:1286 msgid "fork failed" msgstr "fork 失败" -#: setup.c:1255 +#: setup.c:1291 msgid "setsid failed" msgstr "setsid 失败" -#: sha1-file.c:381 +#: sha1-file.c:452 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates" -#: sha1-file.c:432 +#: sha1-file.c:503 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "无法规范化备用对象路径：%s" -#: sha1-file.c:503 +#: sha1-file.c:575 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略备用对象库，嵌套太深" -#: sha1-file.c:510 +#: sha1-file.c:582 #, c-format msgid "unable to normalize object directory: %s" msgstr "无法规范化对象目录: %s" -#: sha1-file.c:565 +#: sha1-file.c:625 msgid "unable to fdopen alternates lockfile" msgstr "无法 fdopen 替换锁文件" -#: sha1-file.c:583 +#: sha1-file.c:643 msgid "unable to read alternates file" msgstr "无法读取替代文件" -#: sha1-file.c:590 +#: sha1-file.c:650 msgid "unable to move new alternates file into place" msgstr "无法将新的替代文件移动到位" -#: sha1-file.c:625 +#: sha1-file.c:685 #, c-format msgid "path '%s' does not exist" msgstr "路径 '%s' 不存在" -#: sha1-file.c:651 +#: sha1-file.c:711 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" -#: sha1-file.c:657 +#: sha1-file.c:717 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "参考仓库 '%s' 不是一个本地仓库。" -#: sha1-file.c:663 +#: sha1-file.c:723 #, c-format msgid "reference repository '%s' is shallow" msgstr "参考仓库 '%s' 是一个浅克隆" -#: sha1-file.c:671 +#: sha1-file.c:731 #, c-format msgid "reference repository '%s' is grafted" msgstr "参考仓库 '%s' 已被移植" -#: sha1-file.c:781 +#: sha1-file.c:791 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "解析备用引用时无效的行：%s" + +#: sha1-file.c:943 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>" -#: sha1-file.c:806 +#: sha1-file.c:964 msgid "mmap failed" msgstr "mmap 失败" -#: sha1-file.c:973 +#: sha1-file.c:1128 #, c-format msgid "object file %s is empty" msgstr "对象文件 %s 为空" -#: sha1-file.c:1093 sha1-file.c:2215 +#: sha1-file.c:1252 sha1-file.c:2392 #, c-format msgid "corrupt loose object '%s'" msgstr "损坏的松散对象 '%s'" -#: sha1-file.c:1095 sha1-file.c:2219 +#: sha1-file.c:1254 sha1-file.c:2396 #, c-format msgid "garbage at end of loose object '%s'" msgstr "松散对象 '%s' 后面有垃圾数据" -#: sha1-file.c:1137 +#: sha1-file.c:1296 msgid "invalid object type" msgstr "无效的对象类型" -#: sha1-file.c:1219 +#: sha1-file.c:1380 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息" -#: sha1-file.c:1222 +#: sha1-file.c:1383 #, c-format msgid "unable to unpack %s header" msgstr "无法解开 %s 头部" -#: sha1-file.c:1228 +#: sha1-file.c:1389 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" -#: sha1-file.c:1231 +#: sha1-file.c:1392 #, c-format msgid "unable to parse %s header" msgstr "无法解析 %s 头部" -#: sha1-file.c:1422 +#: sha1-file.c:1584 #, c-format msgid "failed to read object %s" msgstr "读取对象 %s 失败" -#: sha1-file.c:1426 +#: sha1-file.c:1588 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" -#: sha1-file.c:1430 +#: sha1-file.c:1592 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "松散对象 %s（保存在 %s）已损坏" -#: sha1-file.c:1434 +#: sha1-file.c:1596 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包对象 %s（保存在 %s）已损坏" -#: sha1-file.c:1536 +#: sha1-file.c:1699 #, c-format -msgid "unable to write sha1 filename %s" -msgstr "无法写入 sha1 文件名 %s" +msgid "unable to write file %s" +msgstr "无法写文件 %s" -#: sha1-file.c:1543 +#: sha1-file.c:1706 #, c-format msgid "unable to set permission to '%s'" msgstr "无法为 '%s' 设置权限" -#: sha1-file.c:1550 +#: sha1-file.c:1713 msgid "file write error" msgstr "文件写错误" -#: sha1-file.c:1569 -msgid "error when closing sha1 file" -msgstr "关闭 sha1 文件时出错" +#: sha1-file.c:1732 +msgid "error when closing loose object file" +msgstr "关闭松散对象文件时出错" -#: sha1-file.c:1635 +#: sha1-file.c:1797 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "权限不足，无法在仓库对象库 %s 中添加对象" -#: sha1-file.c:1637 +#: sha1-file.c:1799 msgid "unable to create temporary file" msgstr "无法创建临时文件" -#: sha1-file.c:1661 -msgid "unable to write sha1 file" -msgstr "无法写入 sha1 文件" +#: sha1-file.c:1823 +msgid "unable to write loose object file" +msgstr "不能写松散对象文件" -#: sha1-file.c:1667 +#: sha1-file.c:1829 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能压缩新对象 %s（%d）" -#: sha1-file.c:1671 +#: sha1-file.c:1833 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在对象 %s 上调用 deflateEnd 失败（%d）" -#: sha1-file.c:1675 +#: sha1-file.c:1837 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不稳定对象源数据搞糊涂了" -#: sha1-file.c:1685 builtin/pack-objects.c:918 +#: sha1-file.c:1847 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上调用 utime() 失败" -#: sha1-file.c:1760 +#: sha1-file.c:1922 #, c-format -msgid "cannot read sha1_file for %s" -msgstr "不能从 %s 读取 sha1 文件" +msgid "cannot read object for %s" +msgstr "不能读取对象 %s" -#: sha1-file.c:1805 +#: sha1-file.c:1962 msgid "corrupt commit" msgstr "损坏的提交" -#: sha1-file.c:1813 +#: sha1-file.c:1970 msgid "corrupt tag" msgstr "损坏的标签" -#: sha1-file.c:1912 +#: sha1-file.c:2069 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 时读取错误" -#: sha1-file.c:1915 +#: sha1-file.c:2072 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 时读入不完整" -#: sha1-file.c:1988 sha1-file.c:1997 +#: sha1-file.c:2145 sha1-file.c:2154 #, c-format msgid "%s: failed to insert into database" msgstr "%s：插入数据库失败" -#: sha1-file.c:2003 +#: sha1-file.c:2160 #, c-format msgid "%s: unsupported file type" msgstr "%s：不支持的文件类型" -#: sha1-file.c:2027 +#: sha1-file.c:2184 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一个有效的对象" -#: sha1-file.c:2029 +#: sha1-file.c:2186 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" -#: sha1-file.c:2056 builtin/index-pack.c:154 +#: sha1-file.c:2213 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "不能打开 %s" -#: sha1-file.c:2226 sha1-file.c:2278 +#: sha1-file.c:2403 sha1-file.c:2455 #, c-format -msgid "sha1 mismatch for %s (expected %s)" -msgstr "%s 的 sha1 不匹配（预期 %s）" +msgid "hash mismatch for %s (expected %s)" +msgstr "%s 的哈希值不匹配（预期 %s）" -#: sha1-file.c:2250 +#: sha1-file.c:2427 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" -#: sha1-file.c:2255 +#: sha1-file.c:2432 #, c-format msgid "unable to unpack header of %s" msgstr "无法解压缩 %s 的头部" -#: sha1-file.c:2261 +#: sha1-file.c:2438 #, c-format msgid "unable to parse header of %s" msgstr "无法解析 %s 的头部" -#: sha1-file.c:2272 +#: sha1-file.c:2449 #, c-format msgid "unable to unpack contents of %s" msgstr "无法解压缩 %s 的内容" -#: sha1-name.c:476 +#: sha1-name.c:487 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "短 SHA1 %s 存在歧义" -#: sha1-name.c:487 +#: sha1-name.c:498 msgid "The candidates are:" msgstr "候选者有：" -#: sha1-name.c:770 +#: sha1-name.c:797 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" "may be created by mistake. For example,\n" "\n" -" git checkout -b $br $(git rev-parse ...)\n" +" git switch -c $br $(git rev-parse ...)\n" "\n" "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" "examine these refs and maybe delete them. Turn this message off by\n" "running \"git config advice.objectNameWarning false\"" msgstr "" -"Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n" -"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n" +"Git 通常不会创建一个以40个十六进制字符结尾的引用，因为当您只提供40\n" +"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如：\n" "\n" -" git checkout -b $br $(git rev-parse ...)\n" +" git switch -c $br $(git rev-parse ...)\n" "\n" -"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n" -"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" -"命令关闭本消息通知。" +"当 \"$br\" 某种原因空白时，一个40位十六进制的引用将被创建。请检查这些\n" +"引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n" +"false\" 命令关闭本消息通知。" + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte +#: strbuf.c:822 +#, c-format +msgid "%u.%2.2u GiB" +msgstr "%u.%2.2u GiB" + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second +#: strbuf.c:824 +#, c-format +msgid "%u.%2.2u GiB/s" +msgstr "%u.%2.2u GiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte +#: strbuf.c:832 +#, c-format +msgid "%u.%2.2u MiB" +msgstr "%u.%2.2u MiB" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second +#: strbuf.c:834 +#, c-format +msgid "%u.%2.2u MiB/s" +msgstr "%u.%2.2u MiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte +#: strbuf.c:841 +#, c-format +msgid "%u.%2.2u KiB" +msgstr "%u.%2.2u KiB" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second +#: strbuf.c:843 +#, c-format +msgid "%u.%2.2u KiB/s" +msgstr "%u.%2.2u KiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 byte +#: strbuf.c:849 +#, c-format +msgid "%u byte" +msgid_plural "%u bytes" +msgstr[0] "%u 字节" +msgstr[1] "%u 字节" + +#. TRANSLATORS: IEC 80000-13:2008 byte/second +#: strbuf.c:851 +#, c-format +msgid "%u byte/s" +msgid_plural "%u bytes/s" +msgstr[0] "%u 字节/秒" +msgstr[1] "%u 字节/秒" + +#: strbuf.c:1149 +#, c-format +msgid "could not edit '%s'" +msgstr "不能编辑 '%s'" -#: submodule.c:116 submodule.c:145 +#: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "无法修改未合并的 .gitmodules，先解决合并冲突" -#: submodule.c:120 submodule.c:149 +#: submodule.c:118 submodule.c:147 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "无法在 .gitmodules 中找到 path=%s 的小节" -#: submodule.c:156 +#: submodule.c:154 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "无法移除 %s 的 .gitmodules 条目" -#: submodule.c:167 +#: submodule.c:165 msgid "staging updated .gitmodules failed" msgstr "将更新后 .gitmodules 添加暂存区失败" -#: submodule.c:329 +#: submodule.c:327 #, c-format msgid "in unpopulated submodule '%s'" msgstr "位于未检出的子模组 '%s'" -#: submodule.c:360 +#: submodule.c:358 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "路径规格 '%s' 在子模组 '%.*s' 中" -#: submodule.c:857 +#: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交" -#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: submodule.c:1404 +#: submodule.c:1481 +#, c-format +msgid "Could not access submodule '%s'" +msgstr "无法访问子模组 '%s'" + +#: submodule.c:1651 #, c-format msgid "'%s' not recognized as a git repository" msgstr "无法将 '%s' 识别为一个 git 仓库" -#: submodule.c:1542 +#: submodule.c:1789 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "无法在子模组 '%s' 中启动 'git status'" -#: submodule.c:1555 +#: submodule.c:1802 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "无法在子模组 '%s' 中执行 'git status'" -#: submodule.c:1648 +#: submodule.c:1817 +#, c-format +msgid "Could not unset core.worktree setting in submodule '%s'" +msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置" + +#: submodule.c:1907 #, c-format msgid "submodule '%s' has dirty index" msgstr "子模组 '%s' 中有脏索引" -#: submodule.c:1700 +#: submodule.c:1959 #, c-format msgid "Submodule '%s' could not be updated." msgstr "子模组 '%s' 无法被更新。" -#: submodule.c:1747 +#: submodule.c:2027 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中" + +#: submodule.c:2048 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" -#: submodule.c:1759 submodule.c:1815 +#: submodule.c:2060 submodule.c:2119 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "不能查询子模组 '%s' 的名称" -#: submodule.c:1766 +#: submodule.c:2064 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "禁止移动 '%s' 到现存 git 目录中" + +#: submodule.c:2071 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -5977,40 +7677,40 @@ msgstr "" "'%s' 迁移至\n" "'%s'\n" -#: submodule.c:1850 +#: submodule.c:2154 #, c-format msgid "could not recurse into submodule '%s'" msgstr "无法递归进子模组路径 '%s'" -#: submodule.c:1894 +#: submodule.c:2198 msgid "could not start ls-files in .." msgstr "无法在 .. 中启动 ls-files" -#: submodule.c:1933 +#: submodule.c:2237 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" -#: submodule-config.c:232 +#: submodule-config.c:236 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "忽略可疑的子模组名称：%s" -#: submodule-config.c:296 +#: submodule-config.c:303 msgid "negative values not allowed for submodule.fetchjobs" msgstr "submodule.fetchjobs 不允许为负值" -#: submodule-config.c:390 +#: submodule-config.c:401 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "忽略可能被解析为命令行选项的 '%s'：%s" -#: submodule-config.c:479 +#: submodule-config.c:498 #, c-format msgid "invalid value for %s" msgstr "%s 的值无效" -#: submodule-config.c:754 +#: submodule-config.c:769 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "不能更新 .gitmodules 条目 %s" @@ -6045,7 +7745,7 @@ msgstr "不能读取输入文件 '%s'" msgid "could not read from stdin" msgstr "不能自标准输入读取" -#: trailer.c:1011 builtin/am.c:47 +#: trailer.c:1011 wrapper.c:665 #, c-format msgid "could not stat %s" msgstr "不能对 %s 调用 stat" @@ -6074,46 +7774,54 @@ msgstr "不能重命名临时文件为 %s" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" -#: transport.c:142 +#: transport.c:145 #, c-format msgid "could not read bundle '%s'" msgstr "无法读取 bundle '%s'" -#: transport.c:208 +#: transport.c:214 #, c-format msgid "transport: invalid depth option '%s'" msgstr "传输：无效的深度选项 '%s'" -#: transport.c:616 +#: transport.c:266 +msgid "see protocol.version in 'git help config' for more details" +msgstr "查看 'git help config' 中的 protocol.version 获取更多信息" + +#: transport.c:267 +msgid "server options require protocol version 2 or later" +msgstr "服务端选项需要版本 2 协议或更高" + +#: transport.c:632 msgid "could not parse transport.color.* config" msgstr "不能解析 transport.color.* 配置" -#: transport.c:689 +#: transport.c:705 msgid "support for protocol v2 not implemented yet" msgstr "协议 v2 的支持尚未实现" -#: transport.c:816 +#: transport.c:831 #, c-format msgid "unknown value for config '%s': %s" msgstr "配置 '%s' 的取值未知：%s" -#: transport.c:882 +#: transport.c:897 #, c-format msgid "transport '%s' not allowed" msgstr "传输 '%s' 不允许" -#: transport.c:936 +#: transport.c:949 msgid "git-over-rsync is no longer supported" msgstr "不再支持 git-over-rsync" -#: transport.c:1031 +#: transport.c:1044 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n" -#: transport.c:1035 +#: transport.c:1048 #, c-format msgid "" "\n" @@ -6140,136 +7848,136 @@ msgstr "" "以推送至远程。\n" "\n" -#: transport.c:1043 +#: transport.c:1056 msgid "Aborting." msgstr "正在终止。" -#: transport.c:1182 +#: transport.c:1201 msgid "failed to push all needed submodules" msgstr "不能推送全部需要的子模组" -#: transport.c:1315 transport-helper.c:643 +#: transport.c:1345 transport-helper.c:656 msgid "operation not supported by protocol" msgstr "协议不支持该操作" -#: transport.c:1419 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "解析备用引用时无效的行：%s" - -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:61 transport-helper.c:90 msgid "full write to remote helper failed" msgstr "完整写入远程助手失败" -#: transport-helper.c:132 +#: transport-helper.c:144 #, c-format msgid "unable to find remote helper for '%s'" msgstr "无法为 '%s' 找到远程助手" -#: transport-helper.c:148 transport-helper.c:557 +#: transport-helper.c:160 transport-helper.c:570 msgid "can't dup helper output fd" msgstr "无法复制助手输出文件句柄" -#: transport-helper.c:199 +#: transport-helper.c:211 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " "version of Git" msgstr "未知的强制能力 %s，该远程助手可能需要新版本的Git" -#: transport-helper.c:205 +#: transport-helper.c:217 msgid "this remote helper should implement refspec capability" msgstr "远程助手需要实现 refspec 能力" -#: transport-helper.c:272 transport-helper.c:412 +#: transport-helper.c:284 transport-helper.c:424 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s 意外地说：'%s'" -#: transport-helper.c:401 +#: transport-helper.c:413 #, c-format msgid "%s also locked %s" msgstr "%s 也锁定了 %s" -#: transport-helper.c:479 +#: transport-helper.c:492 msgid "couldn't run fast-import" msgstr "不能执行 fast-import" -#: transport-helper.c:502 +#: transport-helper.c:515 msgid "error while running fast-import" msgstr "执行 fast-import 出错" -#: transport-helper.c:531 transport-helper.c:1091 +#: transport-helper.c:544 transport-helper.c:1133 #, c-format msgid "could not read ref %s" msgstr "无法读取引用 %s" -#: transport-helper.c:576 +#: transport-helper.c:589 #, c-format msgid "unknown response to connect: %s" msgstr "连接时未知的响应：%s" -#: transport-helper.c:598 +#: transport-helper.c:611 msgid "setting remote service path not supported by protocol" msgstr "协议不支持设置远程服务路径" -#: transport-helper.c:600 +#: transport-helper.c:613 msgid "invalid remote service path" msgstr "无效的远程服务路径" -#: transport-helper.c:646 +#: transport-helper.c:659 #, c-format msgid "can't connect to subservice %s" msgstr "不能连接到子服务 %s" -#: transport-helper.c:713 +#: transport-helper.c:735 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "预期 ok/error，助手说 '%s'" -#: transport-helper.c:766 +#: transport-helper.c:788 #, c-format msgid "helper reported unexpected status of %s" msgstr "助手报告 %s 的意外状态" -#: transport-helper.c:827 +#: transport-helper.c:849 #, c-format msgid "helper %s does not support dry-run" msgstr "助手 %s 不支持 dry-run" -#: transport-helper.c:830 +#: transport-helper.c:852 #, c-format msgid "helper %s does not support --signed" msgstr "助手 %s 不支持 --signed" -#: transport-helper.c:833 +#: transport-helper.c:855 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "助手 %s 不支持 --signed=if-asked" -#: transport-helper.c:840 +#: transport-helper.c:860 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "助手 %s 不支持 --atomic" + +#: transport-helper.c:866 #, c-format msgid "helper %s does not support 'push-option'" msgstr "助手 %s 不支持 'push-option'" -#: transport-helper.c:932 +#: transport-helper.c:964 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-heper 不支持 push，需要引用表达式" -#: transport-helper.c:937 +#: transport-helper.c:969 #, c-format msgid "helper %s does not support 'force'" msgstr "助手 %s 不支持 'force'" -#: transport-helper.c:984 +#: transport-helper.c:1016 msgid "couldn't run fast-export" msgstr "无法执行 fast-export" -#: transport-helper.c:989 +#: transport-helper.c:1021 msgid "error while running fast-export" msgstr "执行 fast-export 时出错" -#: transport-helper.c:1014 +#: transport-helper.c:1046 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -6278,47 +7986,47 @@ msgstr "" "没有共同的引用并且也没有指定，什么也不会做。\n" "可能您应该指定一个分支如 'master'。\n" -#: transport-helper.c:1077 +#: transport-helper.c:1119 #, c-format msgid "malformed response in ref list: %s" msgstr "引用列表中格式错误的响应：%s" -#: transport-helper.c:1231 +#: transport-helper.c:1271 #, c-format msgid "read(%s) failed" msgstr "读取（%s）失败" -#: transport-helper.c:1258 +#: transport-helper.c:1298 #, c-format msgid "write(%s) failed" msgstr "写（%s）失败" -#: transport-helper.c:1307 +#: transport-helper.c:1347 #, c-format msgid "%s thread failed" msgstr "%s 线程失败" -#: transport-helper.c:1311 +#: transport-helper.c:1351 #, c-format msgid "%s thread failed to join: %s" msgstr "%s 线程等待失败：%s" -#: transport-helper.c:1330 transport-helper.c:1334 +#: transport-helper.c:1370 transport-helper.c:1374 #, c-format msgid "can't start thread for copying data: %s" msgstr "不能启动线程来拷贝数据：%s" -#: transport-helper.c:1371 +#: transport-helper.c:1411 #, c-format msgid "%s process failed to wait" msgstr "%s 进程等待失败" -#: transport-helper.c:1375 +#: transport-helper.c:1415 #, c-format msgid "%s process failed" msgstr "%s 进程失败" -#: transport-helper.c:1393 transport-helper.c:1402 +#: transport-helper.c:1433 transport-helper.c:1442 msgid "can't start thread for copying data" msgstr "不能启动线程来拷贝数据" @@ -6334,11 +8042,16 @@ msgstr "树对象中的条目模式错误" msgid "empty filename in tree entry" msgstr "树对象条目中空的文件名" -#: tree-walk.c:115 +#: tree-walk.c:48 +#, c-format +msgid "filename in tree entry contains backslash: '%s'" +msgstr "树条目中的文件名包含反斜杠：'%s'" + +#: tree-walk.c:124 msgid "too-short tree file" msgstr "太短的树文件" -#: unpack-trees.c:112 +#: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -6347,7 +8060,7 @@ msgstr "" "您对下列文件的本地修改将被检出操作覆盖：\n" "%%s请在切换分支前提交或贮藏您的修改。" -#: unpack-trees.c:114 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -6356,7 +8069,7 @@ msgstr "" "您对下列文件的本地修改将被检出操作覆盖：\n" "%%s" -#: unpack-trees.c:117 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -6365,7 +8078,7 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" "%%s请在合并前提交或贮藏您的修改。" -#: unpack-trees.c:119 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -6374,7 +8087,7 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" "%%s" -#: unpack-trees.c:122 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -6383,7 +8096,7 @@ msgstr "" "您对下列文件的本地修改将被 %s 覆盖：\n" "%%s请在 %s 之前提交或贮藏您的修改。" -#: unpack-trees.c:124 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -6392,7 +8105,7 @@ msgstr "" "您对下列文件的本地修改将被 %s 覆盖：\n" "%%s" -#: unpack-trees.c:129 +#: unpack-trees.c:127 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -6401,7 +8114,7 @@ msgstr "" "更新如下目录将会丢失其中未跟踪的文件：\n" "%s" -#: unpack-trees.c:133 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -6410,7 +8123,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" "%%s请在切换分支之前移动或删除。" -#: unpack-trees.c:135 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -6419,7 +8132,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" "%%s" -#: unpack-trees.c:138 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -6428,7 +8141,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" "%%s请在合并前移动或删除。" -#: unpack-trees.c:140 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -6437,7 +8150,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" "%%s" -#: unpack-trees.c:143 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -6446,7 +8159,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" "%%s请在 %s 前移动或删除。" -#: unpack-trees.c:145 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -6455,7 +8168,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" "%%s" -#: unpack-trees.c:151 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -6465,7 +8178,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" "%%s请在切换分支前移动或删除。" -#: unpack-trees.c:153 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -6475,7 +8188,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" "%%s" -#: unpack-trees.c:156 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -6484,7 +8197,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" "%%s请在合并前移动或删除。" -#: unpack-trees.c:158 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -6493,7 +8206,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" "%%s" -#: unpack-trees.c:161 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -6502,7 +8215,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" "%%s请在 %s 前移动或删除。" -#: unpack-trees.c:163 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -6511,12 +8224,12 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" "%%s" -#: unpack-trees.c:171 +#: unpack-trees.c:169 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" -#: unpack-trees.c:174 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -6525,7 +8238,7 @@ msgstr "" "无法更新稀疏检出：如下条目不是最新：\n" "%s" -#: unpack-trees.c:176 +#: unpack-trees.c:174 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -6535,7 +8248,7 @@ msgstr "" "工作区中下列文件将被稀疏检出更新所覆盖：\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -6545,7 +8258,7 @@ msgstr "" "工作区中下列文件将被稀疏检出更新所删除：\n" "%s" -#: unpack-trees.c:180 +#: unpack-trees.c:178 #, c-format msgid "" "Cannot update submodule:\n" @@ -6554,16 +8267,16 @@ msgstr "" "无法更新子模组：\n" "%s" -#: unpack-trees.c:254 +#: unpack-trees.c:255 #, c-format msgid "Aborting\n" -msgstr "终止中\n" +msgstr "正在终止\n" -#: unpack-trees.c:336 -msgid "Checking out files" -msgstr "正在检出文件" +#: unpack-trees.c:317 +msgid "Updating files" +msgstr "正在更新文件" -#: unpack-trees.c:368 +#: unpack-trees.c:349 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -6572,6 +8285,10 @@ msgstr "" "以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n" "并且碰撞组中只有一个文件存在工作区中：\n" +#: unpack-trees.c:1441 +msgid "Updating index flags" +msgstr "正在更新索引标志" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "无效的 URL 方案名称或丢失 '://' 后缀" @@ -6601,206 +8318,211 @@ msgstr "无效的端口号" msgid "invalid '..' path segment" msgstr "无效的 '..' 路径片段" -#: worktree.c:249 builtin/am.c:2100 +#: worktree.c:258 builtin/am.c:2084 #, c-format msgid "failed to read '%s'" msgstr "读取 '%s' 失败" -#: worktree.c:295 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "在主工作区的 '%s' 不是仓库目录" -#: worktree.c:306 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "文件 '%s' 不包含工作区的绝对路径" -#: worktree.c:318 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "'%s' 不存在" -#: worktree.c:324 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' 不是一个 .git 文件，错误码 %d" -#: worktree.c:332 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' 没有指回到 '%s'" -#: wrapper.c:223 wrapper.c:393 +#: wrapper.c:186 wrapper.c:356 #, c-format msgid "could not open '%s' for reading and writing" msgstr "无法打开 '%s' 进行读写" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:387 wrapper.c:588 #, c-format msgid "unable to access '%s'" msgstr "不能访问 '%s'" -#: wrapper.c:632 +#: wrapper.c:596 msgid "unable to get current working directory" msgstr "不能获取当前工作目录" -#: wt-status.c:154 +#: wt-status.c:158 msgid "Unmerged paths:" msgstr "未合并的路径：" # 译者：注意保持前导空格 -#: wt-status.c:181 wt-status.c:208 +#: wt-status.c:187 wt-status.c:219 +msgid " (use \"git restore --staged <file>...\" to unstage)" +msgstr " （使用 \"git restore --staged <文件>...\" 以取消暂存）" + +# 译者：注意保持前导空格 +#: wt-status.c:190 wt-status.c:222 #, c-format -msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）" +msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" +msgstr " （使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存）" # 译者：注意保持前导空格 -#: wt-status.c:183 wt-status.c:210 +#: wt-status.c:193 wt-status.c:225 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）" # 译者：注意保持前导空格 -#: wt-status.c:187 +#: wt-status.c:197 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " （使用 \"git add <文件>...\" 标记解决方案）" # 译者：注意保持前导空格 -#: wt-status.c:189 wt-status.c:193 +#: wt-status.c:199 wt-status.c:203 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）" # 译者：注意保持前导空格 -#: wt-status.c:191 +#: wt-status.c:201 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <文件>...\" 标记解决方案）" -#: wt-status.c:202 wt-status.c:1042 +#: wt-status.c:211 wt-status.c:1074 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:220 wt-status.c:1051 +#: wt-status.c:234 wt-status.c:1083 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" # 译者：注意保持前导空格 -#: wt-status.c:224 +#: wt-status.c:238 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:226 +#: wt-status.c:240 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:227 +#: wt-status.c:241 msgid "" -" (use \"git checkout -- <file>...\" to discard changes in working directory)" -msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）" +" (use \"git restore <file>...\" to discard changes in working directory)" +msgstr " （使用 \"git restore <文件>...\" 丢弃工作区的改动）" # 译者：注意保持前导空格 -#: wt-status.c:229 +#: wt-status.c:243 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" # 译者：注意保持前导空格 -#: wt-status.c:241 +#: wt-status.c:254 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）" -#: wt-status.c:256 +#: wt-status.c:268 msgid "both deleted:" msgstr "双方删除：" -#: wt-status.c:258 +#: wt-status.c:270 msgid "added by us:" msgstr "由我们添加：" -#: wt-status.c:260 +#: wt-status.c:272 msgid "deleted by them:" msgstr "由他们删除：" -#: wt-status.c:262 +#: wt-status.c:274 msgid "added by them:" msgstr "由他们添加：" -#: wt-status.c:264 +#: wt-status.c:276 msgid "deleted by us:" msgstr "由我们删除：" -#: wt-status.c:266 +#: wt-status.c:278 msgid "both added:" msgstr "双方添加：" -#: wt-status.c:268 +#: wt-status.c:280 msgid "both modified:" msgstr "双方修改：" -#: wt-status.c:278 +#: wt-status.c:290 msgid "new file:" msgstr "新文件：" -#: wt-status.c:280 +#: wt-status.c:292 msgid "copied:" msgstr "拷贝：" -#: wt-status.c:282 +#: wt-status.c:294 msgid "deleted:" msgstr "删除：" -#: wt-status.c:284 +#: wt-status.c:296 msgid "modified:" msgstr "修改：" -#: wt-status.c:286 +#: wt-status.c:298 msgid "renamed:" msgstr "重命名：" -#: wt-status.c:288 +#: wt-status.c:300 msgid "typechange:" msgstr "类型变更：" -#: wt-status.c:290 +#: wt-status.c:302 msgid "unknown:" msgstr "未知：" -#: wt-status.c:292 +#: wt-status.c:304 msgid "unmerged:" msgstr "未合并：" # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:372 +#: wt-status.c:384 msgid "new commits, " msgstr "新提交, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:374 +#: wt-status.c:386 msgid "modified content, " msgstr "修改的内容, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:376 +#: wt-status.c:388 msgid "untracked content, " msgstr "未跟踪的内容, " -#: wt-status.c:880 +#: wt-status.c:906 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "您的贮藏区当前有 %d 条记录" msgstr[1] "您的贮藏区当前有 %d 条记录" -#: wt-status.c:912 +#: wt-status.c:938 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新：" -#: wt-status.c:914 +#: wt-status.c:940 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: wt-status.c:996 +#: wt-status.c:1022 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -6808,77 +8530,88 @@ msgstr "" "不要改动或删除上面的一行。\n" "其下所有内容都将被忽略。" -#: wt-status.c:1097 +#: wt-status.c:1114 +#, c-format +msgid "" +"\n" +"It took %.2f seconds to compute the branch ahead/behind values.\n" +"You can use '--no-ahead-behind' to avoid this.\n" +msgstr "" +"\n" +"花了 %.2f 秒才计算出分支的领先/落后范围。\n" +"为避免，您可以使用 '--no-ahead-behind'。\n" + +#: wt-status.c:1144 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:1100 +#: wt-status.c:1147 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" # 译者：注意保持前导空格 -#: wt-status.c:1102 +#: wt-status.c:1149 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " （使用 \"git merge --abort\" 终止合并）" -#: wt-status.c:1106 +#: wt-status.c:1153 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:1109 +#: wt-status.c:1156 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:1118 +#: wt-status.c:1165 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" -#: wt-status.c:1121 +#: wt-status.c:1168 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:1125 +#: wt-status.c:1172 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲突，然后运行 \"git am --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1127 +#: wt-status.c:1174 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1129 +#: wt-status.c:1176 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:1260 +#: wt-status.c:1309 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 丢失。" -#: wt-status.c:1262 +#: wt-status.c:1311 msgid "No commands done." msgstr "没有命令被执行。" -#: wt-status.c:1265 +#: wt-status.c:1314 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "最后一条命令已完成（%d 条命令被执行）：" msgstr[1] "最后的命令已完成（%d 条命令被执行）：" -#: wt-status.c:1276 +#: wt-status.c:1325 #, c-format msgid " (see more in file %s)" msgstr " （更多参见文件 %s）" -#: wt-status.c:1281 +#: wt-status.c:1330 msgid "No commands remaining." msgstr "未剩下任何命令。" -#: wt-status.c:1284 +#: wt-status.c:1333 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -6886,169 +8619,189 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）：" msgstr[1] "接下来要执行的命令（剩余 %d 条命令）：" # 译者：注意保持前导空格 -#: wt-status.c:1292 +#: wt-status.c:1341 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）" -#: wt-status.c:1304 +#: wt-status.c:1353 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" -#: wt-status.c:1309 +#: wt-status.c:1358 msgid "You are currently rebasing." msgstr "您在执行变基操作。" # 译者：注意保持前导空格 -#: wt-status.c:1322 +#: wt-status.c:1371 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1324 +#: wt-status.c:1373 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1326 +#: wt-status.c:1375 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:1333 +#: wt-status.c:1382 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:1337 +#: wt-status.c:1386 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" -#: wt-status.c:1342 +#: wt-status.c:1391 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行变基操作时拆分提交。" # 译者：注意保持前导空格 -#: wt-status.c:1345 +#: wt-status.c:1394 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:1349 +#: wt-status.c:1398 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" -#: wt-status.c:1354 +#: wt-status.c:1403 msgid "You are currently editing a commit during a rebase." msgstr "您在执行变基操作时编辑提交。" # 译者：注意保持前导空格 -#: wt-status.c:1357 +#: wt-status.c:1406 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:1359 +#: wt-status.c:1408 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:1368 +#: wt-status.c:1419 +msgid "Cherry-pick currently in progress." +msgstr "拣选操作正在进行中。" + +#: wt-status.c:1422 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1373 +#: wt-status.c:1429 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1376 +#: wt-status.c:1432 +msgid " (run \"git cherry-pick --continue\" to continue)" +msgstr " （执行 \"git cherry-pick --continue\" 以继续）" + +# 译者：注意保持前导空格 +#: wt-status.c:1435 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1378 +#: wt-status.c:1437 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " （使用 \"git cherry-pick --skip\" 跳过此补丁）" + +# 译者：注意保持前导空格 +#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" -#: wt-status.c:1386 +#: wt-status.c:1449 +msgid "Revert currently in progress." +msgstr "还原操作正在行中。" + +#: wt-status.c:1452 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1391 +#: wt-status.c:1458 msgid " (fix conflicts and run \"git revert --continue\")" -msgstr " （解决冲突并运行 \"git revert --continue\"）" +msgstr " （解决冲突并执行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1394 +#: wt-status.c:1461 +msgid " (run \"git revert --continue\" to continue)" +msgstr " （执行 \"git revert --continue\" 以继续）" + +# 译者：注意保持前导空格 +#: wt-status.c:1464 msgid " (all conflicts fixed: run \"git revert --continue\")" -msgstr " （所有冲突已解决：运行 \"git revert --continue\"）" +msgstr " （所有冲突已解决：执行 \"git revert --continue\"）" + +# 译者：注意保持前导空格 +#: wt-status.c:1466 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " （使用 \"git revert --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:1396 +#: wt-status.c:1468 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:1406 +#: wt-status.c:1478 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1410 +#: wt-status.c:1482 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 -#: wt-status.c:1413 +#: wt-status.c:1485 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1611 +#: wt-status.c:1694 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1618 +#: wt-status.c:1701 msgid "interactive rebase in progress; onto " msgstr "交互式变基操作正在进行中；至 " -#: wt-status.c:1620 +#: wt-status.c:1703 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " -#: wt-status.c:1625 -msgid "HEAD detached at " -msgstr "头指针分离于 " - -#: wt-status.c:1627 -msgid "HEAD detached from " -msgstr "头指针分离自 " - -#: wt-status.c:1630 +#: wt-status.c:1713 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1647 +#: wt-status.c:1730 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1648 +#: wt-status.c:1731 msgid "No commits yet" msgstr "尚无提交" -#: wt-status.c:1662 +#: wt-status.c:1745 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1664 +#: wt-status.c:1747 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1668 +#: wt-status.c:1751 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -7058,221 +8811,226 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1674 +#: wt-status.c:1757 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1676 +#: wt-status.c:1759 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1682 +#: wt-status.c:1765 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1687 +#: wt-status.c:1770 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" -#: wt-status.c:1690 +#: wt-status.c:1773 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1693 +#: wt-status.c:1776 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1696 +#: wt-status.c:1779 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1699 +#: wt-status.c:1782 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1702 wt-status.c:1707 +#: wt-status.c:1785 wt-status.c:1790 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1705 +#: wt-status.c:1788 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1709 +#: wt-status.c:1792 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:1822 +#: wt-status.c:1905 msgid "No commits yet on " msgstr "尚无提交在 " -#: wt-status.c:1826 +#: wt-status.c:1909 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" -#: wt-status.c:1857 +#: wt-status.c:1940 msgid "different" msgstr "不同" # 译者：注意保持句尾空格 -#: wt-status.c:1859 wt-status.c:1867 +#: wt-status.c:1942 wt-status.c:1950 msgid "behind " msgstr "落后 " -#: wt-status.c:1862 wt-status.c:1865 +#: wt-status.c:1945 wt-status.c:1948 msgid "ahead " msgstr "领先 " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2374 +#: wt-status.c:2470 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "不能%s：您有未暂存的变更。" -#: wt-status.c:2380 +#: wt-status.c:2476 msgid "additionally, your index contains uncommitted changes." msgstr "另外，您的索引中包含未提交的变更。" -#: wt-status.c:2382 +#: wt-status.c:2478 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的变更。" -#: builtin/add.c:24 +#: compat/precompose_utf8.c:58 builtin/clone.c:455 +#, c-format +msgid "failed to unlink '%s'" +msgstr "删除 '%s' 失败" + +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<选项>] [--] <路径规格>..." -#: builtin/add.c:83 +#: builtin/add.c:87 #, c-format msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:88 builtin/commit.c:284 +#: builtin/add.c:92 builtin/commit.c:288 msgid "updating files failed" msgstr "更新文件失败" -#: builtin/add.c:98 +#: builtin/add.c:102 #, c-format msgid "remove '%s'\n" msgstr "删除 '%s'\n" -#: builtin/add.c:173 +#: builtin/add.c:177 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:233 builtin/rev-parse.c:895 +#: builtin/add.c:252 builtin/rev-parse.c:899 msgid "Could not read the index" msgstr "不能读取索引" -#: builtin/add.c:244 +#: builtin/add.c:263 #, c-format msgid "Could not open '%s' for writing." msgstr "无法为写入打开 '%s'。" -#: builtin/add.c:248 +#: builtin/add.c:267 msgid "Could not write patch" msgstr "不能生成补丁" -#: builtin/add.c:251 +#: builtin/add.c:270 msgid "editing patch failed" msgstr "编辑补丁失败" -#: builtin/add.c:254 +#: builtin/add.c:273 #, c-format msgid "Could not stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: builtin/add.c:256 +#: builtin/add.c:275 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" -#: builtin/add.c:261 +#: builtin/add.c:280 #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" -#: builtin/add.c:269 +#: builtin/add.c:288 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123 -#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557 -#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165 +#: builtin/add.c:308 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:548 +#: builtin/remote.c:1344 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "演习" -#: builtin/add.c:292 +#: builtin/add.c:311 msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305 +#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307 msgid "select hunks interactively" msgstr "交互式挑选数据块" -#: builtin/add.c:294 +#: builtin/add.c:313 msgid "edit current diff and apply" msgstr "编辑当前差异并应用" -#: builtin/add.c:295 +#: builtin/add.c:314 msgid "allow adding otherwise ignored files" msgstr "允许添加忽略的文件" -#: builtin/add.c:296 +#: builtin/add.c:315 msgid "update tracked files" msgstr "更新已跟踪的文件" -#: builtin/add.c:297 +#: builtin/add.c:316 msgid "renormalize EOL of tracked files (implies -u)" msgstr "对已跟踪文件（暗含 -u）重新归一换行符" -#: builtin/add.c:298 +#: builtin/add.c:317 msgid "record only the fact that the path will be added later" msgstr "只记录，该路径稍后再添加" -#: builtin/add.c:299 +#: builtin/add.c:318 msgid "add changes from all tracked and untracked files" msgstr "添加所有改变的已跟踪文件和未跟踪文件" -#: builtin/add.c:302 +#: builtin/add.c:321 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区中移除的路径（和 --no-all 相同）" -#: builtin/add.c:304 +#: builtin/add.c:323 msgid "don't add, only refresh the index" msgstr "不添加，只刷新索引" -#: builtin/add.c:305 +#: builtin/add.c:324 msgid "just skip files which cannot be added because of errors" msgstr "跳过因出错不能添加的文件" -#: builtin/add.c:306 +#: builtin/add.c:325 msgid "check if - even missing - files are ignored in dry run" msgstr "检查在演习模式下文件（即使不存在）是否被忽略" -#: builtin/add.c:308 builtin/update-index.c:990 +#: builtin/add.c:327 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的可执行位" -#: builtin/add.c:310 +#: builtin/add.c:329 msgid "warn when adding an embedded repository" msgstr "创建一个嵌入式仓库时给予警告" -#: builtin/add.c:325 +#: builtin/add.c:347 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -7289,9 +9047,8 @@ msgid "" "\n" "See \"git help submodule\" for more information." msgstr "" -"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容，并" -"且不知道该如何获取它。\n" -"如果您要添加一个子模组，使用：\n" +"您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n" +"内容，并且不知道该如何获取它。如果您要添加一个子模组，使用：\n" "\n" "\tgit submodule add <url> %s\n" "\n" @@ -7301,146 +9058,160 @@ msgstr "" "\n" "参见 \"git help submodule\" 获取更多信息。" -#: builtin/add.c:353 +#: builtin/add.c:375 #, c-format msgid "adding embedded git repository: %s" msgstr "正在添加嵌入式 git 仓库：%s" -#: builtin/add.c:371 +#: builtin/add.c:393 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f 参数如果您确实要添加它们。\n" -#: builtin/add.c:379 +#: builtin/add.c:400 msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c:417 +#: builtin/add.c:428 builtin/commit.c:348 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容" + +#: builtin/add.c:434 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--pathspec-from-file 与 --edit 不兼容" + +#: builtin/add.c:446 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" -#: builtin/add.c:424 +#: builtin/add.c:449 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" -#: builtin/add.c:428 +#: builtin/add.c:453 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" -#: builtin/add.c:443 +#: builtin/add.c:471 builtin/checkout.c:1648 builtin/commit.c:354 +#: builtin/reset.c:327 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "--pathspec-from-file 与路径表达式参数不兼容" + +#: builtin/add.c:478 builtin/checkout.c:1660 builtin/commit.c:360 +#: builtin/reset.c:333 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "--pathspec-file-nul 需要 --pathspec-from-file" + +#: builtin/add.c:482 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" -#: builtin/add.c:444 +#: builtin/add.c:483 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" -#: builtin/am.c:363 +#: builtin/am.c:347 msgid "could not parse author script" msgstr "不能解析作者脚本" -#: builtin/am.c:447 +#: builtin/am.c:431 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 钩子删除" -#: builtin/am.c:488 +#: builtin/am.c:473 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/am.c:525 +#: builtin/am.c:511 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "从 '%s' 拷贝注解到 '%s' 时失败" -#: builtin/am.c:551 +#: builtin/am.c:537 msgid "fseek failed" msgstr "fseek 失败" -#: builtin/am.c:739 +#: builtin/am.c:725 #, c-format msgid "could not parse patch '%s'" msgstr "无法解析补丁 '%s'" -#: builtin/am.c:804 +#: builtin/am.c:790 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: builtin/am.c:852 +#: builtin/am.c:838 msgid "invalid timestamp" msgstr "无效的时间戳" -#: builtin/am.c:857 builtin/am.c:869 +#: builtin/am.c:843 builtin/am.c:855 msgid "invalid Date line" msgstr "无效的日期行" -#: builtin/am.c:864 +#: builtin/am.c:850 msgid "invalid timezone offset" msgstr "无效的时区偏移值" -#: builtin/am.c:957 +#: builtin/am.c:943 msgid "Patch format detection failed." msgstr "补丁格式探测失败。" -#: builtin/am.c:962 builtin/clone.c:408 +#: builtin/am.c:948 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "创建目录 '%s' 失败" -#: builtin/am.c:967 +#: builtin/am.c:953 msgid "Failed to split patches." msgstr "拆分补丁失败。" -#: builtin/am.c:1097 builtin/commit.c:369 -msgid "unable to write index file" -msgstr "无法写入索引文件" - -#: builtin/am.c:1111 +#: builtin/am.c:1084 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题，执行 \"%s --continue\"。" -#: builtin/am.c:1112 +#: builtin/am.c:1085 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。" -#: builtin/am.c:1113 +#: builtin/am.c:1086 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。" -#: builtin/am.c:1196 +#: builtin/am.c:1169 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。" -#: builtin/am.c:1224 +#: builtin/am.c:1197 msgid "Patch is empty." msgstr "补丁为空。" -#: builtin/am.c:1290 +#: builtin/am.c:1262 #, c-format -msgid "invalid ident line: %.*s" -msgstr "无效的身份标识：%.*s" +msgid "missing author line in commit %s" +msgstr "在提交 %s 中缺失作者行" -#: builtin/am.c:1312 +#: builtin/am.c:1265 #, c-format -msgid "unable to parse commit %s" -msgstr "不能解析提交 %s" +msgid "invalid ident line: %.*s" +msgstr "无效的身份标识：%.*s" -#: builtin/am.c:1508 +#: builtin/am.c:1484 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: builtin/am.c:1510 +#: builtin/am.c:1486 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个（三方合并的）基础目录树..." -#: builtin/am.c:1529 +#: builtin/am.c:1505 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -7448,28 +9219,24 @@ msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到索引中的数据对象上。" -#: builtin/am.c:1535 +#: builtin/am.c:1511 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基础版本上打补丁及进行三方合并..." -#: builtin/am.c:1561 +#: builtin/am.c:1537 msgid "Failed to merge in the changes." msgstr "无法合并变更。" -#: builtin/am.c:1593 +#: builtin/am.c:1569 msgid "applying to an empty history" msgstr "正应用到一个空历史上" -#: builtin/am.c:1639 builtin/am.c:1643 +#: builtin/am.c:1616 builtin/am.c:1620 #, c-format msgid "cannot resume: %s does not exist." msgstr "无法继续：%s 不存在。" -#: builtin/am.c:1659 -msgid "cannot be interactive without stdin connected to a terminal." -msgstr "标准输入没有和终端关联，不能进行交互式操作。" - -#: builtin/am.c:1664 +#: builtin/am.c:1638 msgid "Commit Body is:" msgstr "提交内容为：" @@ -7478,34 +9245,39 @@ msgstr "提交内容为：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1674 +#: builtin/am.c:1648 +#, 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:1724 +#: builtin/am.c:1695 builtin/commit.c:394 +msgid "unable to write index file" +msgstr "无法写入索引文件" + +#: builtin/am.c:1699 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "脏索引：不能应用补丁（脏文件：%s）" -#: builtin/am.c:1764 builtin/am.c:1832 +#: builtin/am.c:1739 builtin/am.c:1807 #, c-format msgid "Applying: %.*s" msgstr "应用：%.*s" -#: builtin/am.c:1781 +#: builtin/am.c:1756 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: builtin/am.c:1787 +#: builtin/am.c:1762 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补丁失败于 %s %.*s" -#: builtin/am.c:1791 +#: builtin/am.c:1766 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "用 'git am --show-current-patch' 命令查看失败的补丁" -#: builtin/am.c:1835 +#: builtin/am.c:1810 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -7515,7 +9287,7 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: builtin/am.c:1842 +#: builtin/am.c:1817 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -7526,159 +9298,159 @@ msgstr "" "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" -#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328 -#: builtin/reset.c:336 +#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346 +#: builtin/reset.c:354 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/am.c:2001 +#: builtin/am.c:1976 msgid "failed to clean index" msgstr "清空索引失败" -#: builtin/am.c:2036 +#: builtin/am.c:2020 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:2129 +#: builtin/am.c:2117 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "无效的 --patch-format 值：%s" -#: builtin/am.c:2165 +#: builtin/am.c:2153 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2166 +#: builtin/am.c:2154 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" -#: builtin/am.c:2172 +#: builtin/am.c:2160 msgid "run interactively" msgstr "以交互式方式运行" -#: builtin/am.c:2174 +#: builtin/am.c:2162 msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" -#: builtin/am.c:2176 +#: builtin/am.c:2164 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允许使用三方合并。" -#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58 -#: builtin/repack.c:306 +#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:304 builtin/stash.c:811 msgid "be quiet" msgstr "静默模式" -#: builtin/am.c:2179 +#: builtin/am.c:2167 msgid "add a Signed-off-by line to the commit message" msgstr "在提交说明中添加一个 Signed-off-by 签名" -#: builtin/am.c:2182 +#: builtin/am.c:2170 msgid "recode into utf8 (default)" msgstr "使用 utf8 字符集（默认）" -#: builtin/am.c:2184 +#: builtin/am.c:2172 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -k 参数" -#: builtin/am.c:2186 +#: builtin/am.c:2174 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -b 参数" -#: builtin/am.c:2188 +#: builtin/am.c:2176 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -m 参数" -#: builtin/am.c:2190 +#: builtin/am.c:2178 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" -#: builtin/am.c:2193 +#: builtin/am.c:2181 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" -#: builtin/am.c:2196 +#: builtin/am.c:2184 msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" +#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 #: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 -#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219 -#: builtin/am.c:2225 +#: builtin/am.c:2213 msgid "pass it through git-apply" msgstr "传递给 git-apply" -#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239 -#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854 -#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323 -#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386 -#: parse-options.h:144 parse-options.h:146 parse-options.h:268 +#: builtin/am.c:2203 builtin/commit.c:1386 builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:676 builtin/grep.c:883 builtin/merge.c:249 +#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1469 +#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 +#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 +#: parse-options.h:154 parse-options.h:175 parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38 -#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39 +#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "格式" -#: builtin/am.c:2222 +#: builtin/am.c:2210 msgid "format the patch(es) are in" msgstr "补丁的格式" -#: builtin/am.c:2228 +#: builtin/am.c:2216 msgid "override error message when patch failure occurs" msgstr "打补丁失败时显示的错误信息" -#: builtin/am.c:2230 +#: builtin/am.c:2218 msgid "continue applying patches after resolving a conflict" msgstr "冲突解决后继续应用补丁" -#: builtin/am.c:2233 +#: builtin/am.c:2221 msgid "synonyms for --continue" msgstr "和 --continue 同义" -#: builtin/am.c:2236 +#: builtin/am.c:2224 msgid "skip the current patch" msgstr "跳过当前补丁" -#: builtin/am.c:2239 +#: builtin/am.c:2227 msgid "restore the original branch and abort the patching operation." msgstr "恢复原始分支并终止打补丁操作。" -#: builtin/am.c:2242 +#: builtin/am.c:2230 msgid "abort the patching operation but keep HEAD where it is." msgstr "终止补丁操作但保持 HEAD 不变。" -#: builtin/am.c:2245 +#: builtin/am.c:2233 msgid "show the patch being applied." msgstr "显示正在应用的补丁。" -#: builtin/am.c:2249 +#: builtin/am.c:2237 msgid "lie about committer date" msgstr "将作者日期作为提交日期" -#: builtin/am.c:2251 +#: builtin/am.c:2239 msgid "use current timestamp for author date" msgstr "用当前时间作为作者日期" -#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273 -#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183 -#: builtin/revert.c:113 builtin/tag.c:402 +#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1507 +#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:509 +#: builtin/rebase.c:1513 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184 +#: builtin/am.c:2242 builtin/rebase.c:510 builtin/rebase.c:1514 msgid "GPG-sign commits" msgstr "使用 GPG 签名提交" -#: builtin/am.c:2257 +#: builtin/am.c:2245 msgid "(internal use for git-rebase)" msgstr "（内部使用，用于 git-rebase）" -#: builtin/am.c:2275 +#: builtin/am.c:2263 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." @@ -7686,16 +9458,16 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" "请不要再使用它了。" -#: builtin/am.c:2282 +#: builtin/am.c:2270 msgid "failed to read the index" msgstr "读取索引失败" -#: builtin/am.c:2297 +#: builtin/am.c:2285 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" -#: builtin/am.c:2321 +#: builtin/am.c:2309 #, c-format msgid "" "Stray %s directory found.\n" @@ -7704,10 +9476,14 @@ msgstr "" "发现了错误的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" -#: builtin/am.c:2327 +#: builtin/am.c:2315 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" +#: builtin/am.c:2325 +msgid "interactive mode requires patches on the command line" +msgstr "交互式模式需要命令行上提供补丁" + #: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<选项>] [<补丁>...]" @@ -7725,85 +9501,294 @@ msgstr "不能重定向输出" msgid "git archive: Remote with no URL" msgstr "git archive：未提供远程 URL" -#: builtin/archive.c:58 +#: builtin/archive.c:61 msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive：期望是 ACK/NAK，却得到 flush 包" -#: builtin/archive.c:61 +#: builtin/archive.c:64 #, c-format msgid "git archive: NACK %s" msgstr "git archive：NACK %s" -#: builtin/archive.c:64 +#: builtin/archive.c:65 msgid "git archive: protocol error" msgstr "git archive：协议错误" -#: builtin/archive.c:68 +#: builtin/archive.c:69 msgid "git archive: expected a flush" msgstr "git archive：应有一个 flush 包" -#: builtin/bisect--helper.c:12 +#: builtin/bisect--helper.c:22 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "git bisect--helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:13 +#: builtin/bisect--helper.c:23 msgid "git bisect--helper --write-terms <bad_term> <good_term>" msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>" -#: builtin/bisect--helper.c:14 +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" -#: builtin/bisect--helper.c:46 +#: builtin/bisect--helper.c:25 +msgid "git bisect--helper --bisect-reset [<commit>]" +msgstr "git bisect--helper --bisect-reset [<提交>]" + +#: builtin/bisect--helper.c:26 +msgid "" +"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " +"<bad_term>" +msgstr "" +"git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语" +">" + +#: builtin/bisect--helper.c:27 +msgid "" +"git bisect--helper --bisect-check-and-set-terms <command> <good_term> " +"<bad_term>" +msgstr "" +"git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>" + +#: builtin/bisect--helper.c:28 +msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" +msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]" + +#: builtin/bisect--helper.c:29 +msgid "" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"term-new]" +msgstr "" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"term-new]" + +#: builtin/bisect--helper.c:30 +msgid "" +"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" +"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +msgstr "" +"git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}" +"=<术语>][--no-checkout] [<坏> [<好>...]] [--] [<路径>...]" + +#: builtin/bisect--helper.c:86 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' 不是一个有效的术语" -#: builtin/bisect--helper.c:50 +#: builtin/bisect--helper.c:90 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "不能使用内置命令 '%s' 作为术语" -#: builtin/bisect--helper.c:60 +#: builtin/bisect--helper.c:100 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "不能修改术语 '%s' 的含义" -#: builtin/bisect--helper.c:71 +#: builtin/bisect--helper.c:111 msgid "please use two different terms" msgstr "请使用两个不同的术语" -#: builtin/bisect--helper.c:78 +#: builtin/bisect--helper.c:118 msgid "could not open the file BISECT_TERMS" msgstr "不能打开文件 BISECT_TERMS" -#: builtin/bisect--helper.c:120 +#: builtin/bisect--helper.c:155 +#, c-format +msgid "We are not bisecting.\n" +msgstr "我们没有在二分查找。\n" + +#: builtin/bisect--helper.c:163 +#, c-format +msgid "'%s' is not a valid commit" +msgstr "'%s' 不是一个有效的提交" + +#: builtin/bisect--helper.c:172 +#, c-format +msgid "" +"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." +msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。" + +#: builtin/bisect--helper.c:216 +#, c-format +msgid "Bad bisect_write argument: %s" +msgstr "坏的 bisect_write 参数：%s" + +#: builtin/bisect--helper.c:221 +#, c-format +msgid "couldn't get the oid of the rev '%s'" +msgstr "无法获取版本 '%s' 的对象 ID" + +#: builtin/bisect--helper.c:233 +#, c-format +msgid "couldn't open the file '%s'" +msgstr "无法打开文件 '%s'" + +#: builtin/bisect--helper.c:259 +#, c-format +msgid "Invalid command: you're currently in a %s/%s bisect" +msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中" + +#: builtin/bisect--helper.c:286 +#, c-format +msgid "" +"You need to give me at least one %s and %s revision.\n" +"You can use \"git bisect %s\" and \"git bisect %s\" for that." +msgstr "" +"您需要给我至少一个 %s 和一个 %s 版本。\n" +"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" + +#: builtin/bisect--helper.c:290 +#, c-format +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one %s and %s revision.\n" +"You can use \"git bisect %s\" and \"git bisect %s\" for that." +msgstr "" +"您需要执行 \"git bisect start\" 来开始。\n" +"然后需要提供我至少一个 %s 和一个 %s 版本。\n" +"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。" + +#: builtin/bisect--helper.c:322 +#, c-format +msgid "bisecting only with a %s commit" +msgstr "在只有一个 %s 提交的情况下二分查找" + +# 译者：注意保持句尾空格 +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#. +#: builtin/bisect--helper.c:330 +msgid "Are you sure [Y/n]? " +msgstr "您确认么[Y/n]？ " + +#: builtin/bisect--helper.c:377 +msgid "no terms defined" +msgstr "未定义术语" + +#: builtin/bisect--helper.c:380 +#, c-format +msgid "" +"Your current terms are %s for the old state\n" +"and %s for the new state.\n" +msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n" + +#: builtin/bisect--helper.c:390 +#, c-format +msgid "" +"invalid argument %s for 'git bisect terms'.\n" +"Supported options are: --term-good|--term-old and --term-bad|--term-new." +msgstr "" +"命令 'git bisect terms' 的参数 %s 无效。\n" +"支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。" + +#: builtin/bisect--helper.c:476 +#, c-format +msgid "unrecognized option: '%s'" +msgstr "未识别的选项：'%s'" + +#: builtin/bisect--helper.c:480 +#, c-format +msgid "'%s' does not appear to be a valid revision" +msgstr "'%s' 看起来不是一个有效的版本" + +#: builtin/bisect--helper.c:512 +msgid "bad HEAD - I need a HEAD" +msgstr "坏的 HEAD - 我需要一个 HEAD" + +#: builtin/bisect--helper.c:527 +#, c-format +msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." +msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。" + +#: builtin/bisect--helper.c:548 +msgid "won't bisect on cg-seek'ed tree" +msgstr "不会在做了 cg-seek 的树上做二分查找" + +#: builtin/bisect--helper.c:551 +msgid "bad HEAD - strange symbolic ref" +msgstr "坏的 HEAD - 奇怪的符号引用" + +#: builtin/bisect--helper.c:575 +#, c-format +msgid "invalid ref: '%s'" +msgstr "无效的引用：'%s'" + +#: builtin/bisect--helper.c:631 msgid "perform 'git bisect next'" msgstr "执行 'git bisect next'" -#: builtin/bisect--helper.c:122 +#: builtin/bisect--helper.c:633 msgid "write the terms to .git/BISECT_TERMS" msgstr "将术语写入 .git/BISECT_TERMS" -#: builtin/bisect--helper.c:124 +#: builtin/bisect--helper.c:635 msgid "cleanup the bisection state" msgstr "清除二分查找状态" -#: builtin/bisect--helper.c:126 +#: builtin/bisect--helper.c:637 msgid "check for expected revs" msgstr "检查预期的版本" -#: builtin/bisect--helper.c:128 +#: builtin/bisect--helper.c:639 +msgid "reset the bisection state" +msgstr "清除二分查找状态" + +#: builtin/bisect--helper.c:641 +msgid "write out the bisection state in BISECT_LOG" +msgstr "将二分查找的状态写入 BISECT_LOG" + +#: builtin/bisect--helper.c:643 +msgid "check and set terms in a bisection state" +msgstr "在一个二分查找状态中检查和设置术语" + +#: builtin/bisect--helper.c:645 +msgid "check whether bad or good terms exist" +msgstr "检查坏的或好的术语是否存在" + +#: builtin/bisect--helper.c:647 +msgid "print out the bisect terms" +msgstr "打印二分查找术语" + +#: builtin/bisect--helper.c:649 +msgid "start the bisect session" +msgstr "启动二分查找过程" + +#: builtin/bisect--helper.c:651 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "更新 BISECT_HEAD 而非检出当前提交" -#: builtin/bisect--helper.c:143 +#: builtin/bisect--helper.c:653 +msgid "no log for BISECT_WRITE" +msgstr "BISECT_WRITE 无日志" + +#: builtin/bisect--helper.c:670 msgid "--write-terms requires two arguments" msgstr "--write-terms 需要两个参数" -#: builtin/bisect--helper.c:147 +#: builtin/bisect--helper.c:674 msgid "--bisect-clean-state requires no arguments" -msgstr "--bisect-clean-state 不需要参数" +msgstr "--bisect-clean-state 不带参数" + +#: builtin/bisect--helper.c:681 +msgid "--bisect-reset requires either no argument or a commit" +msgstr "--bisect-reset 无需参数或者需要一个提交" + +#: builtin/bisect--helper.c:685 +msgid "--bisect-write requires either 4 or 5 arguments" +msgstr "--bisect-write 需要 4 或 5 个参数" + +#: builtin/bisect--helper.c:691 +msgid "--check-and-set-terms requires 3 arguments" +msgstr "--check-and-set-terms 需要 3 个参数" + +#: builtin/bisect--helper.c:697 +msgid "--bisect-next-check requires 2 or 3 arguments" +msgstr "--bisect-next-check 需要 2 或 3 个参数" + +#: builtin/bisect--helper.c:703 +msgid "--bisect-terms requires 0 or 1 argument" +msgstr "--bisect-terms 需要 0 或 1 个参数" #: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" @@ -7813,133 +9798,146 @@ msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" -#: builtin/blame.c:406 +#: builtin/blame.c:409 #, c-format msgid "expecting a color: %s" msgstr "期望一个颜色：%s" -#: builtin/blame.c:413 +#: builtin/blame.c:416 msgid "must end with a color" msgstr "必须以一个颜色结尾" -#: builtin/blame.c:700 +#: builtin/blame.c:729 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'" -#: builtin/blame.c:718 +#: builtin/blame.c:747 msgid "invalid value for blame.coloring" msgstr "设置 blame.coloring 中的无效取值" -#: builtin/blame.c:793 +#: builtin/blame.c:822 +#, c-format +msgid "cannot find revision %s to ignore" +msgstr "不能找到要忽略的版本 %s" + +#: builtin/blame.c:844 msgid "Show blame entries as we find them, incrementally" msgstr "增量式地显示发现的 blame 条目" -#: builtin/blame.c:794 +#: builtin/blame.c:845 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界提交显示空的 SHA-1（默认：关闭）" -#: builtin/blame.c:795 +#: builtin/blame.c:846 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "不把根提交作为边界（默认：关闭）" -#: builtin/blame.c:796 +#: builtin/blame.c:847 msgid "Show work cost statistics" msgstr "显示命令消耗统计" -#: builtin/blame.c:797 +#: builtin/blame.c:848 msgid "Force progress reporting" msgstr "强制进度显示" -#: builtin/blame.c:798 +#: builtin/blame.c:849 msgid "Show output score for blame entries" msgstr "显示判断 blame 条目位移的得分诊断信息" -#: builtin/blame.c:799 +#: builtin/blame.c:850 msgid "Show original filename (Default: auto)" msgstr "显示原始文件名（默认：自动）" -#: builtin/blame.c:800 +#: builtin/blame.c:851 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行号（默认：关闭）" -#: builtin/blame.c:801 +#: builtin/blame.c:852 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适合机器读取的格式" -#: builtin/blame.c:802 +#: builtin/blame.c:853 msgid "Show porcelain format with per-line commit information" msgstr "为每一行显示机器适用的提交信息" -#: builtin/blame.c:803 +#: builtin/blame.c:854 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" -#: builtin/blame.c:804 +#: builtin/blame.c:855 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳（默认：关闭）" -#: builtin/blame.c:805 +#: builtin/blame.c:856 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的 SHA1 提交号（默认：关闭）" -#: builtin/blame.c:806 +#: builtin/blame.c:857 msgid "Suppress author name and timestamp (Default: off)" msgstr "隐藏作者名字和时间戳（默认：关闭）" -#: builtin/blame.c:807 +#: builtin/blame.c:858 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而不是名字（默认：关闭）" -#: builtin/blame.c:808 +#: builtin/blame.c:859 msgid "Ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:809 +#: builtin/blame.c:860 builtin/log.c:1702 +msgid "rev" +msgstr "版本" + +#: builtin/blame.c:860 +msgid "Ignore <rev> when blaming" +msgstr "在执行 blame 操作时忽略 <版本>" + +#: builtin/blame.c:861 +msgid "Ignore revisions from <file>" +msgstr "忽略来自 <文件> 中的版本" + +#: builtin/blame.c:862 msgid "color redundant metadata from previous line differently" msgstr "使用颜色间隔输出与前一行不同的重复元信息" -#: builtin/blame.c:810 +#: builtin/blame.c:863 msgid "color lines by age" msgstr "依据时间着色" -#: builtin/blame.c:817 -msgid "Use an experimental heuristic to improve diffs" -msgstr "使用一个试验性的启发式算法改进差异显示" - -#: builtin/blame.c:819 +#: builtin/blame.c:864 msgid "Spend extra cycles to find better match" msgstr "花费额外的循环来找到更好的匹配" -#: builtin/blame.c:820 +#: builtin/blame.c:865 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" -#: builtin/blame.c:821 +#: builtin/blame.c:866 msgid "Use <file>'s contents as the final image" msgstr "使用 <文件> 的内容作为最终的图片" -#: builtin/blame.c:822 builtin/blame.c:823 +#: builtin/blame.c:867 builtin/blame.c:868 msgid "score" msgstr "得分" -#: builtin/blame.c:822 +#: builtin/blame.c:867 msgid "Find line copies within and across files" msgstr "找到文件内及跨文件的行拷贝" -#: builtin/blame.c:823 +#: builtin/blame.c:868 msgid "Find line movements within and across files" msgstr "找到文件内及跨文件的行移动" -#: builtin/blame.c:824 +#: builtin/blame.c:869 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:824 +#: builtin/blame.c:869 msgid "Process only line range n,m, counting from 1" msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" -#: builtin/blame.c:873 +#: builtin/blame.c:921 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" @@ -7951,18 +9949,18 @@ msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:924 +#: builtin/blame.c:972 msgid "4 years, 11 months ago" msgstr "4 年 11 个月前" -#: builtin/blame.c:1011 +#: builtin/blame.c:1079 #, 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:1057 +#: builtin/blame.c:1125 msgid "Blaming lines" msgstr "追踪代码行" @@ -7995,7 +9993,7 @@ msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<选项>] [-r | -a] [--format]" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:151 +#: builtin/branch.c:154 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -8005,7 +10003,7 @@ msgstr "" " '%s'，但未合并到 HEAD。" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:155 +#: builtin/branch.c:158 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -8014,12 +10012,12 @@ msgstr "" "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" " 然而却尚未被合并到分支 '%s' 。" -#: builtin/branch.c:169 +#: builtin/branch.c:172 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "无法查询 '%s' 指向的提交对象" -#: builtin/branch.c:173 +#: builtin/branch.c:176 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -8028,112 +10026,121 @@ msgstr "" "分支 '%s' 没有完全合并。\n" "如果您确认要删除它，执行 'git branch -D %s'。" -#: builtin/branch.c:186 +#: builtin/branch.c:189 msgid "Update of config-file failed" msgstr "更新配置文件失败" -#: builtin/branch.c:217 +#: builtin/branch.c:220 msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 同时使用" -#: builtin/branch.c:223 +#: builtin/branch.c:226 msgid "Couldn't look up commit object for HEAD" msgstr "无法查询 HEAD 指向的提交对象" -#: builtin/branch.c:237 +#: builtin/branch.c:240 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" -#: builtin/branch.c:252 +#: builtin/branch.c:255 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "未能找到远程跟踪分支 '%s'。" -#: builtin/branch.c:253 +#: builtin/branch.c:256 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未发现。" -#: builtin/branch.c:268 +#: builtin/branch.c:271 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "无法删除远程跟踪分支 '%s'" -#: builtin/branch.c:269 +#: builtin/branch.c:272 #, c-format msgid "Error deleting branch '%s'" msgstr "无法删除分支 '%s'" -#: builtin/branch.c:276 +#: builtin/branch.c:279 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n" -#: builtin/branch.c:277 +#: builtin/branch.c:280 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s（曾为 %s）。\n" -#: builtin/branch.c:421 builtin/tag.c:59 +#: builtin/branch.c:429 builtin/tag.c:61 msgid "unable to parse format string" msgstr "不能解析格式化字符串" -#: builtin/branch.c:458 +#: builtin/branch.c:460 +msgid "could not resolve HEAD" +msgstr "不能解析 HEAD 提交" + +#: builtin/branch.c:466 +#, c-format +msgid "HEAD (%s) points outside of refs/heads/" +msgstr "HEAD (%s) 指向 refs/heads/ 之外" + +#: builtin/branch.c:481 #, c-format msgid "Branch %s is being rebased at %s" msgstr "分支 %s 正被变基到 %s" -#: builtin/branch.c:462 +#: builtin/branch.c:485 #, c-format msgid "Branch %s is being bisected at %s" msgstr "分支 %s 正被二分查找于 %s" -#: builtin/branch.c:479 +#: builtin/branch.c:502 msgid "cannot copy the current branch while not on any." msgstr "无法拷贝当前分支因为不处于任何分支上。" -#: builtin/branch.c:481 +#: builtin/branch.c:504 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" -#: builtin/branch.c:492 +#: builtin/branch.c:515 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" -#: builtin/branch.c:519 +#: builtin/branch.c:542 msgid "Branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c:521 +#: builtin/branch.c:544 msgid "Branch copy failed" msgstr "分支拷贝失败" -#: builtin/branch.c:525 +#: builtin/branch.c:548 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "已为错误命名的分支 '%s' 创建了一个副本" -#: builtin/branch.c:528 +#: builtin/branch.c:551 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "已将错误命名的分支 '%s' 重命名" -#: builtin/branch.c:534 +#: builtin/branch.c:557 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" -#: builtin/branch.c:543 +#: builtin/branch.c:566 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新配置文件失败" -#: builtin/branch.c:545 +#: builtin/branch.c:568 msgid "Branch is copied, but update of config-file failed" msgstr "分支已拷贝，但更新配置文件失败" -#: builtin/branch.c:561 +#: builtin/branch.c:584 #, c-format msgid "" "Please edit the description for the branch\n" @@ -8144,239 +10151,282 @@ msgstr "" " %s\n" "以 '%c' 开头的行将被过滤。\n" -#: builtin/branch.c:594 +#: builtin/branch.c:618 msgid "Generic options" msgstr "通用选项" -#: builtin/branch.c:596 +#: builtin/branch.c:620 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" -#: builtin/branch.c:597 +#: builtin/branch.c:621 msgid "suppress informational messages" msgstr "不显示信息" -#: builtin/branch.c:598 +#: builtin/branch.c:622 msgid "set up tracking mode (see git-pull(1))" msgstr "设置跟踪模式（参见 git-pull(1)）" -#: builtin/branch.c:600 +#: builtin/branch.c:624 msgid "do not use" msgstr "不要使用" -#: builtin/branch.c:602 builtin/rebase--interactive.c:180 +#: builtin/branch.c:626 builtin/rebase.c:505 msgid "upstream" msgstr "上游" -#: builtin/branch.c:602 +#: builtin/branch.c:626 msgid "change the upstream info" msgstr "改变上游信息" -#: builtin/branch.c:603 -msgid "Unset the upstream info" +#: builtin/branch.c:627 +msgid "unset the upstream info" msgstr "取消上游信息的设置" -#: builtin/branch.c:604 +#: builtin/branch.c:628 msgid "use colored output" msgstr "使用彩色输出" -#: builtin/branch.c:605 +#: builtin/branch.c:629 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" -#: builtin/branch.c:607 builtin/branch.c:609 +#: builtin/branch.c:631 builtin/branch.c:633 msgid "print only branches that contain the commit" msgstr "只打印包含该提交的分支" -#: builtin/branch.c:608 builtin/branch.c:610 +#: builtin/branch.c:632 builtin/branch.c:634 msgid "print only branches that don't contain the commit" msgstr "只打印不包含该提交的分支" -#: builtin/branch.c:613 +#: builtin/branch.c:637 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作：" -#: builtin/branch.c:614 +#: builtin/branch.c:638 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪及本地分支" -#: builtin/branch.c:616 +#: builtin/branch.c:640 msgid "delete fully merged branch" msgstr "删除完全合并的分支" -#: builtin/branch.c:617 +#: builtin/branch.c:641 msgid "delete branch (even if not merged)" msgstr "删除分支（即使没有合并）" -#: builtin/branch.c:618 +#: builtin/branch.c:642 msgid "move/rename a branch and its reflog" msgstr "移动/重命名一个分支，以及它的引用日志" -#: builtin/branch.c:619 +#: builtin/branch.c:643 msgid "move/rename a branch, even if target exists" msgstr "移动/重命名一个分支，即使目标已存在" -#: builtin/branch.c:620 +#: builtin/branch.c:644 msgid "copy a branch and its reflog" msgstr "拷贝一个分支和它的引用日志" -#: builtin/branch.c:621 +#: builtin/branch.c:645 msgid "copy a branch, even if target exists" msgstr "拷贝一个分支，即使目标已存在" -#: builtin/branch.c:622 +#: builtin/branch.c:646 msgid "list branch names" msgstr "列出分支名" -#: builtin/branch.c:623 +#: builtin/branch.c:647 +msgid "show current branch name" +msgstr "显示当前分支名" + +#: builtin/branch.c:648 msgid "create the branch's reflog" msgstr "创建分支的引用日志" -#: builtin/branch.c:625 +#: builtin/branch.c:650 msgid "edit the description for the branch" msgstr "标记分支的描述" -#: builtin/branch.c:626 +#: builtin/branch.c:651 msgid "force creation, move/rename, deletion" msgstr "强制创建、移动/重命名、删除" -#: builtin/branch.c:627 +#: builtin/branch.c:652 msgid "print only branches that are merged" msgstr "只打印已经合并的分支" -#: builtin/branch.c:628 +#: builtin/branch.c:653 msgid "print only branches that are not merged" msgstr "只打印尚未合并的分支" -#: builtin/branch.c:629 +#: builtin/branch.c:654 msgid "list branches in columns" msgstr "以列的方式显示分支" -#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 -#: builtin/tag.c:415 -msgid "key" -msgstr "key" - -#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 -#: builtin/tag.c:416 -msgid "field name to sort on" -msgstr "排序的字段名" - -#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415 -#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581 -#: builtin/tag.c:418 +#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 +#: builtin/tag.c:433 msgid "object" msgstr "对象" -#: builtin/branch.c:634 +#: builtin/branch.c:658 msgid "print only branches of the object" msgstr "只打印指向该对象的分支" -#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425 +#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 msgid "sorting and filtering are case insensitive" msgstr "排序和过滤属于大小写不敏感" -#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423 -#: builtin/verify-tag.c:39 +#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "输出格式" -#: builtin/branch.c:660 builtin/clone.c:739 +#: builtin/branch.c:684 builtin/clone.c:784 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" -#: builtin/branch.c:683 +#: builtin/branch.c:708 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" -#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758 +#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 msgid "branch name required" msgstr "必须提供分支名" -#: builtin/branch.c:725 +#: builtin/branch.c:753 msgid "Cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" -#: builtin/branch.c:730 +#: builtin/branch.c:758 msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" -#: builtin/branch.c:737 +#: builtin/branch.c:765 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚无提交。" -#: builtin/branch.c:740 +#: builtin/branch.c:768 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" -#: builtin/branch.c:755 +#: builtin/branch.c:783 msgid "too many branches for a copy operation" msgstr "为拷贝操作提供了太多的分支名" -#: builtin/branch.c:764 +#: builtin/branch.c:792 msgid "too many arguments for a rename operation" msgstr "为重命名操作提供了太多的参数" -#: builtin/branch.c:769 +#: builtin/branch.c:797 msgid "too many arguments to set new upstream" msgstr "为设置新上游提供了太多的参数" -#: builtin/branch.c:773 +#: builtin/branch.c:801 #, 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:776 builtin/branch.c:798 +#: builtin/branch.c:804 builtin/branch.c:827 #, c-format msgid "no such branch '%s'" msgstr "没有此分支 '%s'" -#: builtin/branch.c:780 +#: builtin/branch.c:808 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c:792 +#: builtin/branch.c:821 msgid "too many arguments to unset upstream" msgstr "为取消上游设置操作提供了太多的参数" -#: builtin/branch.c:796 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" -#: builtin/branch.c:802 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" -#: builtin/branch.c:812 -msgid "-a and -r options to 'git branch' do not make sense with a branch name" -msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" +#: builtin/branch.c:841 +msgid "" +"The -a, and -r, options to 'git branch' do not take a branch name.\n" +"Did you mean to use: -a|-r --list <pattern>?" +msgstr "" +"'git branch' 的 -a 和 -r 选项不带一个分支名。\n" +"您是否想要使用：-a|-r --list <模式>？" -#: builtin/branch.c:815 +#: builtin/branch.c:845 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/bundle.c:45 -#, c-format -msgid "%s is okay\n" -msgstr "%s 可以\n" +#: builtin/bundle.c:15 builtin/bundle.c:23 +msgid "git bundle create [<options>] <file> <git-rev-list args>" +msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>" + +#: builtin/bundle.c:16 builtin/bundle.c:28 +msgid "git bundle verify [<options>] <file>" +msgstr "git bundle verify [<选项>] <文件>" + +#: builtin/bundle.c:17 builtin/bundle.c:33 +msgid "git bundle list-heads <file> [<refname>...]" +msgstr "git bundle list-heads <文件> [<引用名>...]" + +#: builtin/bundle.c:18 builtin/bundle.c:38 +msgid "git bundle unbundle <file> [<refname>...]" +msgstr "git bundle unbundle <文件> [<引用名>...]" + +#: builtin/bundle.c:66 builtin/pack-objects.c:3228 +msgid "do not show progress meter" +msgstr "不显示进度表" -#: builtin/bundle.c:58 +#: builtin/bundle.c:68 builtin/pack-objects.c:3230 +msgid "show progress meter" +msgstr "显示进度表" + +#: builtin/bundle.c:70 builtin/pack-objects.c:3232 +msgid "show progress meter during object writing phase" +msgstr "在对象写入阶段显示进度表" + +#: builtin/bundle.c:73 builtin/pack-objects.c:3235 +msgid "similar to --all-progress when progress meter is shown" +msgstr "当进度表显示时类似于 --all-progress" + +#: builtin/bundle.c:93 msgid "Need a repository to create a bundle." msgstr "需要一个仓库来创建包。" -#: builtin/bundle.c:62 +#: builtin/bundle.c:104 +msgid "do not show bundle details" +msgstr "不显示 bundle 细节" + +#: builtin/bundle.c:119 +#, c-format +msgid "%s is okay\n" +msgstr "%s 可以\n" + +#: builtin/bundle.c:160 msgid "Need a repository to unbundle." msgstr "需要一个仓库来解包。" -#: builtin/cat-file.c:587 +#: builtin/bundle.c:168 builtin/remote.c:1609 +msgid "be verbose; must be placed before a subcommand" +msgstr "冗长输出；必须置于子命令之前" + +#: builtin/bundle.c:190 builtin/remote.c:1640 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "未知子命令：%s" + +#: builtin/cat-file.c:595 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -8384,7 +10434,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" -#: builtin/cat-file.c:588 +#: builtin/cat-file.c:596 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -8392,132 +10442,132 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:609 +#: builtin/cat-file.c:617 msgid "only one batch option may be specified" msgstr "只能指定一个批处理选项" -#: builtin/cat-file.c:627 +#: builtin/cat-file.c:635 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:628 +#: builtin/cat-file.c:636 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:629 +#: builtin/cat-file.c:637 msgid "show object size" msgstr "显示对象大小" -#: builtin/cat-file.c:631 +#: builtin/cat-file.c:639 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:632 +#: builtin/cat-file.c:640 msgid "pretty-print object's content" msgstr "美观地打印对象的内容" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:642 msgid "for blob objects, run textconv on object's content" msgstr "对于数据对象，对其内容做文本转换" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:644 msgid "for blob objects, run filters on object's content" msgstr "对于数据对象，对其内容做过滤" -#: builtin/cat-file.c:637 git-submodule.sh:857 +#: builtin/cat-file.c:645 git-submodule.sh:992 msgid "blob" msgstr "数据对象" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:646 msgid "use a specific path for --textconv/--filters" msgstr "对于 --textconv/--filters 使用一个特定的路径" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:648 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允许 -s 和 -t 对损坏的对象生效" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:649 msgid "buffer --batch output" msgstr "缓冲 --batch 的输出" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:651 msgid "show info and content of objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息和内容" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:655 msgid "show info about objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:659 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）" -#: builtin/cat-file.c:653 +#: builtin/cat-file.c:661 msgid "show all objects with --batch or --batch-check" msgstr "使用 --batch 或 --batch-check 参数显示所有对象" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:663 msgid "do not order --batch-all-objects output" msgstr "不要对 --batch-all-objects 的输出排序" -#: builtin/check-attr.c:12 +#: builtin/check-attr.c:13 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." -#: builtin/check-attr.c:13 +#: builtin/check-attr.c:14 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" -#: builtin/check-attr.c:20 +#: builtin/check-attr.c:21 msgid "report all attributes set on file" msgstr "报告设置在文件上的所有属性" -#: builtin/check-attr.c:21 +#: builtin/check-attr.c:22 msgid "use .gitattributes only from the index" msgstr "只使用索引中的 .gitattributes" -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101 +#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102 msgid "read file names from stdin" msgstr "从标准输入读出文件名" -#: builtin/check-attr.c:24 builtin/check-ignore.c:26 +#: builtin/check-attr.c:25 builtin/check-ignore.c:27 msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517 -#: builtin/worktree.c:495 +#: builtin/check-ignore.c:21 builtin/checkout.c:1435 builtin/gc.c:537 +#: builtin/worktree.c:506 msgid "suppress progress reporting" msgstr "不显示进度报告" -#: builtin/check-ignore.c:28 +#: builtin/check-ignore.c:29 msgid "show non-matching input paths" msgstr "显示未匹配的输入路径" -#: builtin/check-ignore.c:30 +#: builtin/check-ignore.c:31 msgid "ignore index when checking" msgstr "检查时忽略索引" -#: builtin/check-ignore.c:159 +#: builtin/check-ignore.c:160 msgid "cannot specify pathnames with --stdin" msgstr "不能同时指定路径及 --stdin 参数" -#: builtin/check-ignore.c:162 +#: builtin/check-ignore.c:163 msgid "-z only makes sense with --stdin" msgstr "-z 需要和 --stdin 参数共用才有意义" -#: builtin/check-ignore.c:164 +#: builtin/check-ignore.c:165 msgid "no path specified" msgstr "未指定路径" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:169 msgid "--quiet is only valid with a single pathname" msgstr "参数 --quiet 只在提供一个路径名时有效" -#: builtin/check-ignore.c:170 +#: builtin/check-ignore.c:171 msgid "cannot have both --quiet and --verbose" msgstr "不能同时提供 --quiet 和 --verbose 参数" -#: builtin/check-ignore.c:173 +#: builtin/check-ignore.c:174 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 选项只在使用 --verbose 时有效" @@ -8538,54 +10588,54 @@ msgstr "不能解析联系地址：%s" msgid "no contacts specified" msgstr "未指定联系地址" -#: builtin/checkout-index.c:128 +#: builtin/checkout-index.c:131 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<选项>] [--] [<文件>...]" -#: builtin/checkout-index.c:145 +#: builtin/checkout-index.c:148 msgid "stage should be between 1 and 3 or all" msgstr "索引值应该取值 1 到 3 或者 all" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:164 msgid "check out all files in the index" msgstr "检出索引区的所有文件" -#: builtin/checkout-index.c:162 +#: builtin/checkout-index.c:165 msgid "force overwrite of existing files" msgstr "强制覆盖现有的文件" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:167 msgid "no warning for existing files and files not in index" msgstr "存在或不在索引中的文件都没有警告" -#: builtin/checkout-index.c:166 +#: builtin/checkout-index.c:169 msgid "don't checkout new files" msgstr "不检出新文件" -#: builtin/checkout-index.c:168 +#: builtin/checkout-index.c:171 msgid "update stat information in the index file" msgstr "更新索引中文件的状态信息" -#: builtin/checkout-index.c:172 +#: builtin/checkout-index.c:175 msgid "read list of paths from the standard input" msgstr "从标准输入读取路径列表" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:177 msgid "write the content to temporary files" msgstr "将内容写入临时文件" -#: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853 -#: builtin/worktree.c:668 +#: builtin/checkout-index.c:178 builtin/column.c:31 +#: builtin/submodule--helper.c:1385 builtin/submodule--helper.c:1388 +#: builtin/submodule--helper.c:1396 builtin/submodule--helper.c:1882 +#: builtin/worktree.c:679 msgid "string" msgstr "字符串" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:179 msgid "when creating files, prepend <string>" msgstr "在创建文件时，在前面加上 <字符串>" -#: builtin/checkout-index.c:178 +#: builtin/checkout-index.c:181 msgid "copy out the files from named stage" msgstr "从指定暂存区中拷出文件" @@ -8597,106 +10647,159 @@ msgstr "git checkout [<选项>] <分支>" msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<选项>] [<分支>] -- <文件>..." -#: builtin/checkout.c:144 builtin/checkout.c:177 +#: builtin/checkout.c:37 +msgid "git switch [<options>] [<branch>]" +msgstr "git switch [<选项>] [<分支>]" + +#: builtin/checkout.c:42 +msgid "git restore [<options>] [--source=<branch>] <file>..." +msgstr "git restore [<选项>] [--source=<分支>] <文件>..." + +#: builtin/checkout.c:175 builtin/checkout.c:214 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" -#: builtin/checkout.c:146 builtin/checkout.c:179 +#: builtin/checkout.c:177 builtin/checkout.c:216 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" -#: builtin/checkout.c:162 +#: builtin/checkout.c:193 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必需的版本" -#: builtin/checkout.c:206 +#: builtin/checkout.c:243 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必需的版本" -#: builtin/checkout.c:224 +#: builtin/checkout.c:261 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：无法合并" -#: builtin/checkout.c:240 +#: builtin/checkout.c:277 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268 -#: builtin/checkout.c:271 +#: builtin/checkout.c:377 +#, c-format +msgid "Recreated %d merge conflict" +msgid_plural "Recreated %d merge conflicts" +msgstr[0] "重新创建了 %d 个合并冲突" +msgstr[1] "重新创建了 %d 个合并冲突" + +#: builtin/checkout.c:382 +#, 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:389 +#, 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:412 builtin/checkout.c:415 builtin/checkout.c:418 +#: builtin/checkout.c:422 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路径时使用" -#: builtin/checkout.c:274 builtin/checkout.c:277 +#: builtin/checkout.c:425 builtin/checkout.c:428 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同时使用" -#: builtin/checkout.c:280 +#: builtin/checkout.c:432 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" -#: builtin/checkout.c:349 builtin/checkout.c:356 +#: builtin/checkout.c:436 +#, c-format +msgid "neither '%s' or '%s' is specified" +msgstr "'%s' 或 '%s' 都没有指定" + +#: builtin/checkout.c:440 +#, c-format +msgid "'%s' must be used when '%s' is not specified" +msgstr "未指定 '%2$s' 时，必须使用 '%1$s'" + +#: builtin/checkout.c:445 builtin/checkout.c:450 +#, c-format +msgid "'%s' or '%s' cannot be used with %s" +msgstr "'%s' 或 '%s' 不能和 %s 一起使用" + +#: builtin/checkout.c:509 builtin/checkout.c:516 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:608 +#: builtin/checkout.c:682 builtin/sparse-checkout.c:82 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:745 +#: builtin/checkout.c:732 +#, c-format +msgid "" +"cannot continue with staged changes in the following files:\n" +"%s" +msgstr "" +"不能继续，下列文件有暂存的修改：\n" +"%s" + +#: builtin/checkout.c:835 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能对 '%s' 执行 reflog 操作：%s\n" -#: builtin/checkout.c:786 +#: builtin/checkout.c:877 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:790 builtin/clone.c:692 +#: builtin/checkout.c:881 builtin/clone.c:716 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:794 +#: builtin/checkout.c:885 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:797 +#: builtin/checkout.c:888 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:801 +#: builtin/checkout.c:892 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:803 builtin/checkout.c:1166 +#: builtin/checkout.c:894 builtin/checkout.c:1291 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:805 +#: builtin/checkout.c:896 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:856 +#: builtin/checkout.c:947 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#: builtin/checkout.c:862 +#: builtin/checkout.c:953 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -8717,7 +10820,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:881 +#: builtin/checkout.c:972 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -8744,167 +10847,253 @@ msgstr[1] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:913 +#: builtin/checkout.c:1007 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:917 +#: builtin/checkout.c:1011 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:945 builtin/checkout.c:1161 +#: builtin/checkout.c:1051 builtin/checkout.c:1286 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c:1066 +#: builtin/checkout.c:1178 +msgid "only one reference expected" +msgstr "预期只有一个引用" + +#: builtin/checkout.c:1195 #, c-format msgid "only one reference expected, %d given." msgstr "应只有一个引用，却给出了 %d 个" -#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444 +#: builtin/checkout.c:1232 +#, c-format +msgid "" +"'%s' could be both a local file and a tracking branch.\n" +"Please use -- (and optionally --no-guess) to disambiguate" +msgstr "" +"'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n" +"请使用 --（和可选的 --no-guess）来消除歧义" + +#: builtin/checkout.c:1245 builtin/worktree.c:290 builtin/worktree.c:455 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" -#: builtin/checkout.c:1136 +#: builtin/checkout.c:1258 builtin/checkout.c:1622 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:1175 +#: builtin/checkout.c:1305 +#, c-format +msgid "a branch is expected, got tag '%s'" +msgstr "期望一个分支，得到标签 '%s'" + +#: builtin/checkout.c:1307 +#, c-format +msgid "a branch is expected, got remote branch '%s'" +msgstr "期望一个分支，得到远程分支 '%s'" + +#: builtin/checkout.c:1308 builtin/checkout.c:1316 +#, c-format +msgid "a branch is expected, got '%s'" +msgstr "期望一个分支，得到 '%s'" + +#: builtin/checkout.c:1311 +#, c-format +msgid "a branch is expected, got commit '%s'" +msgstr "期望一个分支，得到提交 '%s'" + +#: builtin/checkout.c:1327 +msgid "" +"cannot switch branch while merging\n" +"Consider \"git merge --quit\" or \"git worktree add\"." +msgstr "" +"不能在合并时切换分支\n" +"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。" + +#: builtin/checkout.c:1331 +msgid "" +"cannot switch branch in the middle of an am session\n" +"Consider \"git am --quit\" or \"git worktree add\"." +msgstr "" +"不能在一个 am 会话期间切换分支\n" +"考虑使用 \"git am --quit\" 或 \"git worktree add\"。" + +#: builtin/checkout.c:1335 +msgid "" +"cannot switch branch while rebasing\n" +"Consider \"git rebase --quit\" or \"git worktree add\"." +msgstr "" +"不能在变基时切换分支\n" +"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。" + +#: builtin/checkout.c:1339 +msgid "" +"cannot switch branch while cherry-picking\n" +"Consider \"git cherry-pick --quit\" or \"git worktree add\"." +msgstr "" +"不能在拣选时切换分支\n" +"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" + +#: builtin/checkout.c:1343 +msgid "" +"cannot switch branch while reverting\n" +"Consider \"git revert --quit\" or \"git worktree add\"." +msgstr "" +"不能在还原时切换分支\n" +"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。" + +#: builtin/checkout.c:1347 +msgid "you are switching branch while bisecting" +msgstr "您在执行二分查找时切换分支" + +#: builtin/checkout.c:1354 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:1178 builtin/checkout.c:1182 +#: builtin/checkout.c:1357 builtin/checkout.c:1361 builtin/checkout.c:1365 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194 -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1369 builtin/checkout.c:1372 builtin/checkout.c:1375 +#: builtin/checkout.c:1380 builtin/checkout.c:1385 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1202 +#: builtin/checkout.c:1382 +#, c-format +msgid "'%s' cannot take <start-point>" +msgstr "'%s' 不带 <起始点>" + +#: builtin/checkout.c:1390 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119 -#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488 -#: builtin/worktree.c:490 -msgid "branch" -msgstr "分支" +#: builtin/checkout.c:1397 +msgid "missing branch or commit argument" +msgstr "缺少分支或提交参数" -#: builtin/checkout.c:1236 -msgid "create and checkout a new branch" -msgstr "创建并检出一个新的分支" +#: builtin/checkout.c:1439 builtin/clone.c:91 builtin/commit-graph.c:52 +#: builtin/commit-graph.c:113 builtin/fetch.c:167 builtin/merge.c:285 +#: builtin/multi-pack-index.c:27 builtin/pull.c:138 builtin/push.c:563 +#: builtin/send-pack.c:174 +msgid "force progress reporting" +msgstr "强制显示进度报告" -#: builtin/checkout.c:1238 -msgid "create/reset and checkout a branch" -msgstr "创建/重置并检出一个分支" +#: builtin/checkout.c:1440 +msgid "perform a 3-way merge with the new branch" +msgstr "和新的分支执行三方合并" -#: builtin/checkout.c:1239 -msgid "create reflog for new branch" -msgstr "为新的分支创建引用日志" +#: builtin/checkout.c:1441 builtin/log.c:1690 parse-options.h:322 +msgid "style" +msgstr "风格" + +#: builtin/checkout.c:1442 +msgid "conflict style (merge or diff3)" +msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1240 builtin/worktree.c:492 +#: builtin/checkout.c:1454 builtin/worktree.c:503 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的提交分离" -#: builtin/checkout.c:1241 +#: builtin/checkout.c:1455 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1243 +#: builtin/checkout.c:1457 +msgid "force checkout (throw away local modifications)" +msgstr "强制检出（丢弃本地修改）" + +#: builtin/checkout.c:1459 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1243 +#: builtin/checkout.c:1459 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1245 +#: builtin/checkout.c:1461 builtin/merge.c:288 +msgid "update ignored files (default)" +msgstr "更新忽略的文件（默认）" + +#: builtin/checkout.c:1464 +msgid "do not check if another worktree is holding the given ref" +msgstr "不检查指定的引用是否被其他工作区所占用" + +#: builtin/checkout.c:1477 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1248 +#: builtin/checkout.c:1480 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1250 -msgid "force checkout (throw away local modifications)" -msgstr "强制检出（丢弃本地修改）" - -#: builtin/checkout.c:1252 -msgid "perform a 3-way merge with the new branch" -msgstr "和新的分支执行三方合并" - -#: builtin/checkout.c:1254 builtin/merge.c:275 -msgid "update ignored files (default)" -msgstr "更新忽略的文件（默认）" - -#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274 -msgid "style" -msgstr "风格" - -#: builtin/checkout.c:1257 -msgid "conflict style (merge or diff3)" -msgstr "冲突输出风格（merge 或 diff3）" - -#: builtin/checkout.c:1260 +#: builtin/checkout.c:1484 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1262 -msgid "second guess 'git checkout <no-such-branch>'" -msgstr "二次猜测'git checkout <无此分支>'" - -#: builtin/checkout.c:1264 -msgid "do not check if another worktree is holding the given ref" -msgstr "不检查指定的引用是否被其他工作区所占用" - -#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141 -#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572 -#: builtin/send-pack.c:174 -msgid "force progress reporting" -msgstr "强制显示进度报告" - -#: builtin/checkout.c:1298 +#: builtin/checkout.c:1537 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b、-B 和 --orphan 是互斥的" -#: builtin/checkout.c:1315 +#: builtin/checkout.c:1540 +msgid "-p and --overlay are mutually exclusive" +msgstr "-p 和 --overlay 互斥" + +#: builtin/checkout.c:1577 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1320 +#: builtin/checkout.c:1582 msgid "missing branch name; try -b" msgstr "缺少分支名，尝试 -b" -#: builtin/checkout.c:1357 +#: builtin/checkout.c:1615 +#, c-format +msgid "could not resolve %s" +msgstr "无法解析 %s" + +#: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1638 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'" -#: builtin/checkout.c:1368 +#: builtin/checkout.c:1642 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1651 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--pathspec-from-file 与 --detach 不兼容" + +#: builtin/checkout.c:1654 builtin/reset.c:324 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file 与 --patch 不兼容" + +#: builtin/checkout.c:1665 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:1392 +#: builtin/checkout.c:1670 +msgid "you must specify path(s) to restore" +msgstr "您必须指定一个要恢复的路径" + +#: builtin/checkout.c:1689 #, c-format msgid "" "'%s' matched more than one remote tracking branch.\n" @@ -8932,38 +11121,105 @@ msgstr "" "如果您总是喜欢使用模糊的简短分支名 <name>，而不喜欢如 'origin' 的远程\n" "仓库名，可以在配置中设置 checkout.defaultRemote=origin。" -#: builtin/clean.c:27 +#: builtin/checkout.c:1714 builtin/checkout.c:1716 builtin/checkout.c:1765 +#: builtin/checkout.c:1767 builtin/clone.c:121 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 +msgid "branch" +msgstr "分支" + +#: builtin/checkout.c:1715 +msgid "create and checkout a new branch" +msgstr "创建并检出一个新的分支" + +#: builtin/checkout.c:1717 +msgid "create/reset and checkout a branch" +msgstr "创建/重置并检出一个分支" + +#: builtin/checkout.c:1718 +msgid "create reflog for new branch" +msgstr "为新的分支创建引用日志" + +#: builtin/checkout.c:1720 +msgid "second guess 'git checkout <no-such-branch>' (default)" +msgstr "二次猜测 'git checkout <无此分支>'（默认）" + +#: builtin/checkout.c:1721 +msgid "use overlay mode (default)" +msgstr "使用叠加模式（默认）" + +#: builtin/checkout.c:1766 +msgid "create and switch to a new branch" +msgstr "创建并切换一个新分支" + +#: builtin/checkout.c:1768 +msgid "create/reset and switch to a branch" +msgstr "创建/重置并切换一个分支" + +#: builtin/checkout.c:1770 +msgid "second guess 'git switch <no-such-branch>'" +msgstr "二次猜测 'git switch <无此分支>'" + +#: builtin/checkout.c:1772 +msgid "throw away local modifications" +msgstr "丢弃本地修改" + +#: builtin/checkout.c:1804 +msgid "which tree-ish to checkout from" +msgstr "要检出哪一个树" + +#: builtin/checkout.c:1806 +msgid "restore the index" +msgstr "恢复索引" + +#: builtin/checkout.c:1808 +msgid "restore the working tree (default)" +msgstr "恢复工作区（默认）" + +#: builtin/checkout.c:1810 +msgid "ignore unmerged entries" +msgstr "忽略未合并条目" + +#: builtin/checkout.c:1811 +msgid "use overlay mode" +msgstr "使用叠加模式" + +#: builtin/clean.c:28 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Removing %s\n" msgstr "正删除 %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Would remove %s\n" msgstr "将删除 %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Skipping repository %s\n" msgstr "忽略仓库 %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Would skip repository %s\n" msgstr "将忽略仓库 %s\n" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "failed to remove %s" msgstr "删除 %s 失败" -#: builtin/clean.c:298 git-add--interactive.perl:579 +#: builtin/clean.c:37 +#, c-format +msgid "could not lstat %s\n" +msgstr "不能对 %s 调用 lstat\n" + +#: builtin/clean.c:301 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -8976,7 +11232,7 @@ msgstr "" "foo - 通过唯一前缀选择一个选项\n" " - （空）什么也不选择\n" -#: builtin/clean.c:302 git-add--interactive.perl:588 +#: builtin/clean.c:305 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -8997,38 +11253,33 @@ msgstr "" "* - 选择所有选项\n" " - （空）结束选择\n" -#: builtin/clean.c:518 git-add--interactive.perl:554 -#: git-add--interactive.perl:559 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" -#: builtin/clean.c:660 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除条目>> " -#: builtin/clean.c:697 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：无法找到和 %s 匹配的条目" -#: builtin/clean.c:718 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "选择要删除的条目" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:759 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "删除 %s [y/N]？" -#: builtin/clean.c:784 git-add--interactive.perl:1717 -#, c-format -msgid "Bye.\n" -msgstr "再见。\n" - -#: builtin/clean.c:792 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -9046,217 +11297,227 @@ msgstr "" "help - 显示本帮助\n" "? - 显示如何在提示符下选择的帮助" -#: builtin/clean.c:819 git-add--interactive.perl:1793 -msgid "*** Commands ***" -msgstr "*** 命令 ***" - -#: builtin/clean.c:820 git-add--interactive.perl:1790 -msgid "What now" -msgstr "请选择" - -#: builtin/clean.c:828 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "将删除如下条目：" msgstr[1] "将删除如下条目：" -#: builtin/clean.c:844 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "没有要清理的文件，退出。" -#: builtin/clean.c:906 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "不打印删除文件的名称" -#: builtin/clean.c:908 +#: builtin/clean.c:911 msgid "force" msgstr "强制" -#: builtin/clean.c:909 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "交互式清除" -#: builtin/clean.c:911 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "删除整个目录" -#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547 -#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168 -#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417 -#: builtin/show-ref.c:178 +#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 +#: builtin/grep.c:901 builtin/log.c:177 builtin/log.c:179 +#: builtin/ls-files.c:557 builtin/name-rev.c:464 builtin/name-rev.c:466 +#: builtin/show-ref.c:179 msgid "pattern" msgstr "模式" -#: builtin/clean.c:913 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "添加 <模式> 到忽略规则" -#: builtin/clean.c:914 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "也删除忽略的文件" -#: builtin/clean.c:916 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "只删除忽略的文件" -#: builtin/clean.c:934 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" -#: builtin/clean.c:938 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:941 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clone.c:43 +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<选项>] [--] <仓库> [<路径>]" -#: builtin/clone.c:88 +#: builtin/clone.c:93 msgid "don't create a checkout" msgstr "不创建一个检出" -#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 msgid "create a bare repository" msgstr "创建一个纯仓库" -#: builtin/clone.c:93 +#: builtin/clone.c:98 msgid "create a mirror repository (implies bare)" msgstr "创建一个镜像仓库（也是纯仓库）" -#: builtin/clone.c:95 +#: builtin/clone.c:100 msgid "to clone from a local repository" msgstr "从本地仓库克隆" -#: builtin/clone.c:97 +#: builtin/clone.c:102 msgid "don't use local hardlinks, always copy" msgstr "不使用本地硬链接，始终复制" -#: builtin/clone.c:99 +#: builtin/clone.c:104 msgid "setup as shared repository" msgstr "设置为共享仓库" -#: builtin/clone.c:101 builtin/clone.c:105 +#: builtin/clone.c:107 msgid "pathspec" msgstr "路径规格" -#: builtin/clone.c:101 builtin/clone.c:105 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "在克隆时初始化子模组" -#: builtin/clone.c:108 +#: builtin/clone.c:110 msgid "number of submodules cloned in parallel" msgstr "并发克隆的子模组的数量" -#: builtin/clone.c:109 builtin/init-db.c:478 +#: builtin/clone.c:111 builtin/init-db.c:486 msgid "template-directory" msgstr "模板目录" -#: builtin/clone.c:110 builtin/init-db.c:479 +#: builtin/clone.c:112 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "模板目录将被使用" -#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375 -#: builtin/submodule--helper.c:1856 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1392 +#: builtin/submodule--helper.c:1885 msgid "reference repository" msgstr "参考仓库" -#: builtin/clone.c:116 builtin/submodule--helper.c:1377 -#: builtin/submodule--helper.c:1858 +#: builtin/clone.c:118 builtin/submodule--helper.c:1394 +#: builtin/submodule--helper.c:1887 msgid "use --reference only while cloning" msgstr "仅在克隆时参考 --reference 指向的本地仓库" -#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3301 builtin/repack.c:329 +#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3294 builtin/repack.c:327 msgid "name" msgstr "名称" -#: builtin/clone.c:118 +#: builtin/clone.c:120 msgid "use <name> instead of 'origin' to track upstream" msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" -#: builtin/clone.c:120 +#: builtin/clone.c:122 msgid "checkout <branch> instead of the remote's HEAD" msgstr "检出 <分支> 而不是远程 HEAD" -#: builtin/clone.c:122 +#: builtin/clone.c:124 msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825 -#: builtin/pull.c:217 +#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:840 +#: builtin/pull.c:227 msgid "depth" msgstr "深度" -#: builtin/clone.c:124 +#: builtin/clone.c:126 msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292 +#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3283 msgid "time" msgstr "时间" -#: builtin/clone.c:126 +#: builtin/clone.c:128 msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" -#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169 -#: builtin/rebase.c:831 +#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 +#: builtin/rebase.c:1445 msgid "revision" msgstr "版本" -#: builtin/clone.c:128 builtin/fetch.c:147 +#: builtin/clone.c:130 builtin/fetch.c:173 msgid "deepen history of shallow clone, excluding rev" msgstr "深化浅克隆的历史，除了特定版本" -#: builtin/clone.c:130 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" -#: builtin/clone.c:132 +#: builtin/clone.c:134 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "不要克隆任何标签，并且后续获取操作也不下载它们" -#: builtin/clone.c:134 +#: builtin/clone.c:136 msgid "any cloned submodules will be shallow" msgstr "子模组将以浅下载模式克隆" -#: builtin/clone.c:135 builtin/init-db.c:487 +#: builtin/clone.c:137 builtin/init-db.c:495 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c:136 builtin/init-db.c:488 +#: builtin/clone.c:138 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" -#: builtin/clone.c:137 +#: builtin/clone.c:139 msgid "key=value" msgstr "key=value" -#: builtin/clone.c:138 +#: builtin/clone.c:140 msgid "set config inside the new repository" msgstr "在新仓库中设置配置信息" -#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230 -#: builtin/push.c:583 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:172 +msgid "server-specific" +msgstr "server-specific" + +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:173 +msgid "option to transmit" +msgstr "传输选项" + +#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:240 +#: builtin/push.c:574 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 地址" -#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233 -#: builtin/push.c:585 +#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:243 +#: builtin/push.c:576 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 地址" -#: builtin/clone.c:279 +#: builtin/clone.c:149 +msgid "any cloned submodules will use their remote-tracking branch" +msgstr "任何克隆的子模组将使用它们的远程跟踪分支" + +#: builtin/clone.c:151 +msgid "initialize sparse-checkout file to include only files at root" +msgstr "初始化稀疏检出文件，只包含根目录文件" + +#: builtin/clone.c:287 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -9264,180 +11525,179 @@ msgstr "" "无法猜到目录名。\n" "请在命令行指定一个目录" -#: builtin/clone.c:332 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: 不能为 '%s' 添加一个备用：%s\n" -#: builtin/clone.c:404 -#, c-format -msgid "failed to open '%s'" -msgstr "打开 '%s' 失败" - -#: builtin/clone.c:412 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" -#: builtin/clone.c:426 +#: builtin/clone.c:430 #, c-format -msgid "failed to stat %s\n" -msgstr "对 %s 调用 stat 失败\n" +msgid "failed to start iterator over '%s'" +msgstr "无法在 '%s' 上启动迭代器" -#: builtin/clone.c:443 -#, c-format -msgid "failed to unlink '%s'" -msgstr "删除 '%s' 失败" - -#: builtin/clone.c:448 +#: builtin/clone.c:460 #, c-format msgid "failed to create link '%s'" msgstr "创建链接 '%s' 失败" -#: builtin/clone.c:452 +#: builtin/clone.c:464 #, c-format msgid "failed to copy file to '%s'" msgstr "拷贝文件至 '%s' 失败" -#: builtin/clone.c:478 +#: builtin/clone.c:469 +#, c-format +msgid "failed to iterate over '%s'" +msgstr "无法在 '%s' 上迭代" + +#: builtin/clone.c:494 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:492 +#: builtin/clone.c:508 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" -"and retry the checkout with 'git checkout -f HEAD'\n" +"and retry with 'git restore --source=HEAD :/'\n" msgstr "" "克隆成功，但是检出失败。\n" "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" -"'git checkout -f HEAD' 重试\n" +"'git restore --source=HEAD :/' 重试\n" -#: builtin/clone.c:569 +#: builtin/clone.c:585 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c:680 +#: builtin/clone.c:704 #, c-format msgid "unable to update %s" msgstr "不能更新 %s" -#: builtin/clone.c:730 +#: builtin/clone.c:752 +msgid "failed to initialize sparse-checkout" +msgstr "无法初始化稀疏检出" + +#: builtin/clone.c:775 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:761 +#: builtin/clone.c:806 msgid "unable to checkout working tree" msgstr "不能检出工作区" -#: builtin/clone.c:806 +#: builtin/clone.c:856 msgid "unable to write parameters to config file" msgstr "无法将参数写入配置文件" -#: builtin/clone.c:869 +#: builtin/clone.c:919 msgid "cannot repack to clean up" msgstr "无法执行 repack 来清理" -#: builtin/clone.c:871 +#: builtin/clone.c:921 msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" -#: builtin/clone.c:911 builtin/receive-pack.c:1941 +#: builtin/clone.c:959 builtin/receive-pack.c:1948 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:915 +#: builtin/clone.c:963 msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" -#: builtin/clone.c:928 +#: builtin/clone.c:976 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:931 +#: builtin/clone.c:979 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 选项不兼容。" -#: builtin/clone.c:944 +#: builtin/clone.c:992 #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' 不存在" -#: builtin/clone.c:950 builtin/fetch.c:1606 +#: builtin/clone.c:998 builtin/fetch.c:1787 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" -#: builtin/clone.c:960 +#: builtin/clone.c:1008 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:970 +#: builtin/clone.c:1018 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271 -#: builtin/worktree.c:295 builtin/worktree.c:325 +#: builtin/clone.c:1033 builtin/clone.c:1054 builtin/difftool.c:271 +#: builtin/log.c:1866 builtin/worktree.c:302 builtin/worktree.c:334 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:990 +#: builtin/clone.c:1038 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能创建工作区目录 '%s'" -#: builtin/clone.c:1010 +#: builtin/clone.c:1058 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯仓库 '%s'...\n" -#: builtin/clone.c:1012 +#: builtin/clone.c:1060 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:1036 +#: builtin/clone.c:1084 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" -#: builtin/clone.c:1097 +#: builtin/clone.c:1148 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1099 +#: builtin/clone.c:1150 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1101 +#: builtin/clone.c:1152 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1103 +#: builtin/clone.c:1154 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1106 +#: builtin/clone.c:1157 msgid "source repository is shallow, ignoring --local" msgstr "源仓库是浅克隆，忽略 --local" -#: builtin/clone.c:1111 +#: builtin/clone.c:1162 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1181 builtin/clone.c:1189 +#: builtin/clone.c:1237 builtin/clone.c:1245 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:1192 +#: builtin/clone.c:1248 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" @@ -9473,15 +11733,83 @@ msgstr "两列之间的填充空间" msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" -#: builtin/commit.c:40 +#: builtin/commit-tree.c:18 +msgid "" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " +"<file>)...] <tree>" +msgstr "" +"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件" +">)...] <树>" + +#: builtin/commit-tree.c:31 +#, c-format +msgid "duplicate parent %s ignored" +msgstr "忽略重复的父提交 %s" + +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 +#, c-format +msgid "not a valid object name %s" +msgstr "不是一个有效的对象名 %s" + +#: builtin/commit-tree.c:93 +#, c-format +msgid "git commit-tree: failed to open '%s'" +msgstr "git commit-tree：无法打开 '%s'" + +#: builtin/commit-tree.c:96 +#, c-format +msgid "git commit-tree: failed to read '%s'" +msgstr "git commit-tree：无法读取 '%s'" + +#: builtin/commit-tree.c:98 +#, c-format +msgid "git commit-tree: failed to close '%s'" +msgstr "git commit-tree：无法关闭 '%s'" + +#: builtin/commit-tree.c:111 +msgid "parent" +msgstr "父提交" + +#: builtin/commit-tree.c:112 +msgid "id of a parent commit object" +msgstr "父提交对象 ID" + +#: builtin/commit-tree.c:114 builtin/commit.c:1496 builtin/merge.c:270 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 +#: builtin/tag.c:412 +msgid "message" +msgstr "说明" + +#: builtin/commit-tree.c:115 builtin/commit.c:1496 +msgid "commit message" +msgstr "提交说明" + +#: builtin/commit-tree.c:118 +msgid "read commit log message from file" +msgstr "从文件中读取提交说明" + +#: builtin/commit-tree.c:121 builtin/commit.c:1508 builtin/merge.c:287 +#: builtin/pull.c:195 builtin/revert.c:118 +msgid "GPG sign commit" +msgstr "GPG 提交签名" + +#: builtin/commit-tree.c:133 +msgid "must give exactly one tree" +msgstr "必须精确地提供一个树" + +#: builtin/commit-tree.c:140 +msgid "git commit-tree: failed to read" +msgstr "git commit-tree：读取失败" + +#: builtin/commit.c:41 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<选项>] [--] <路径规格>..." -#: builtin/commit.c:45 +#: builtin/commit.c:46 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<选项>] [--] <路径规格>..." -#: builtin/commit.c:50 +#: builtin/commit.c:51 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" @@ -9490,7 +11818,7 @@ msgstr "" "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" -#: builtin/commit.c:55 +#: builtin/commit.c:56 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -9504,118 +11832,131 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:62 -msgid "Otherwise, please use 'git reset'\n" -msgstr "否则，请使用命令 'git reset'\n" +#: builtin/commit.c:63 +msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgstr "否则，请使用 'git cherry-pick --skip'\n" -#: builtin/commit.c:65 +#: builtin/commit.c:66 msgid "" +"and then use:\n" +"\n" +" git cherry-pick --continue\n" +"\n" +"to resume cherry-picking the remaining commits.\n" "If you wish to skip this commit, use:\n" "\n" -" git reset\n" +" git cherry-pick --skip\n" "\n" -"Then \"git cherry-pick --continue\" will resume cherry-picking\n" -"the remaining commits.\n" msgstr "" -"如果您想跳过这个提交，使用命令：\n" +"然后使用：\n" "\n" -" git reset\n" +" git cherry-pick --continue\n" +"\n" +"来继续拣选剩余提交。如果您想跳过此提交，使用：\n" +"\n" +" git cherry-pick --skip\n" "\n" -"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" -"操作。\n" -#: builtin/commit.c:311 +#: builtin/commit.c:315 msgid "failed to unpack HEAD tree object" msgstr "解包 HEAD 树对象失败" -#: builtin/commit.c:352 +#: builtin/commit.c:351 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "--pathspec-from-file 和 -a 在一起没有意义" + +#: builtin/commit.c:364 +msgid "No paths with --include/--only does not make sense." +msgstr "参数 --include/--only 不跟路径没有意义。" + +#: builtin/commit.c:376 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:358 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:371 +#: builtin/commit.c:396 msgid "unable to update temporary index" msgstr "无法更新临时索引" -#: builtin/commit.c:373 +#: builtin/commit.c:398 msgid "Failed to update main cache tree" msgstr "不能更新树的主缓存" -#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467 +#: builtin/commit.c:423 builtin/commit.c:446 builtin/commit.c:492 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -#: builtin/commit.c:450 +#: builtin/commit.c:475 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c:452 +#: builtin/commit.c:477 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:460 +#: builtin/commit.c:485 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:479 +#: builtin/commit.c:504 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:577 +#: builtin/commit.c:602 #, c-format msgid "commit '%s' lacks author header" msgstr "提交 '%s' 缺少作者信息" -#: builtin/commit.c:579 +#: builtin/commit.c:604 #, c-format msgid "commit '%s' has malformed author line" msgstr "提交 '%s' 有格式错误的作者信息" -#: builtin/commit.c:598 +#: builtin/commit.c:623 msgid "malformed --author parameter" msgstr "格式错误的 --author 参数" -#: builtin/commit.c:650 +#: builtin/commit.c:676 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049 +#: builtin/commit.c:714 builtin/commit.c:747 builtin/commit.c:1092 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:699 builtin/shortlog.c:317 +#: builtin/commit.c:726 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:701 +#: builtin/commit.c:728 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:705 +#: builtin/commit.c:732 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:734 builtin/commit.c:742 +#: builtin/commit.c:763 builtin/commit.c:779 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:739 +#: builtin/commit.c:770 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:793 +#: builtin/commit.c:830 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:811 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -9629,7 +11970,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:816 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -9643,7 +11984,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:829 +#: builtin/commit.c:867 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -9652,7 +11993,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:837 +#: builtin/commit.c:875 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -9663,407 +12004,391 @@ msgstr "" "也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:854 +#: builtin/commit.c:892 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:862 +#: builtin/commit.c:900 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:869 +#: builtin/commit.c:907 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:887 +#: builtin/commit.c:925 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:953 +#: builtin/commit.c:992 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:967 builtin/tag.c:258 +#: builtin/commit.c:1006 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:1011 +#: builtin/commit.c:1050 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配" -#: builtin/commit.c:1025 +#: builtin/commit.c:1064 #, c-format msgid "Invalid ignored mode '%s'" msgstr "无效的忽略模式 '%s'" -#: builtin/commit.c:1039 builtin/commit.c:1276 +#: builtin/commit.c:1082 builtin/commit.c:1322 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1077 +#: builtin/commit.c:1122 msgid "--long and -z are incompatible" msgstr "--long 和 -z 选项不兼容" -#: builtin/commit.c:1110 +#: builtin/commit.c:1166 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1119 +#: builtin/commit.c:1175 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1122 +#: builtin/commit.c:1178 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1124 +#: builtin/commit.c:1180 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1127 +#: builtin/commit.c:1183 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1137 +#: builtin/commit.c:1193 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1139 +#: builtin/commit.c:1195 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" -#: builtin/commit.c:1147 +#: builtin/commit.c:1203 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1164 +#: builtin/commit.c:1220 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1166 -msgid "No paths with --include/--only does not make sense." -msgstr "参数 --include/--only 不跟路径没有意义。" - -#: builtin/commit.c:1180 builtin/tag.c:546 +#: builtin/commit.c:1226 #, c-format -msgid "Invalid cleanup mode %s" -msgstr "无效的清理模式 %s" +msgid "paths '%s ...' with -a does not make sense" +msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" -#: builtin/commit.c:1185 -msgid "Paths with -a does not make sense." -msgstr "路径和 -a 选项同时使用没有意义。" - -#: builtin/commit.c:1311 builtin/commit.c:1495 +#: builtin/commit.c:1357 builtin/commit.c:1519 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1313 builtin/commit.c:1497 +#: builtin/commit.c:1359 builtin/commit.c:1521 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1315 +#: builtin/commit.c:1361 msgid "show stash information" msgstr "显示贮藏区信息" -#: builtin/commit.c:1317 builtin/commit.c:1499 +#: builtin/commit.c:1363 builtin/commit.c:1523 msgid "compute full ahead/behind values" msgstr "计算完整的领先/落后值" -#: builtin/commit.c:1319 +#: builtin/commit.c:1365 msgid "version" msgstr "版本" -#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558 -#: builtin/worktree.c:639 +#: builtin/commit.c:1365 builtin/commit.c:1525 builtin/push.c:549 +#: builtin/worktree.c:650 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1322 builtin/commit.c:1503 +#: builtin/commit.c:1368 builtin/commit.c:1527 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1325 builtin/commit.c:1506 +#: builtin/commit.c:1371 builtin/commit.c:1530 msgid "terminate entries with NUL" msgstr "条目以 NUL 字符结尾" -#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509 -#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910 -#: builtin/tag.c:400 +#: builtin/commit.c:1373 builtin/commit.c:1377 builtin/commit.c:1533 +#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 +#: builtin/fast-export.c:1159 builtin/rebase.c:1525 parse-options.h:336 msgid "mode" msgstr "模式" -#: builtin/commit.c:1328 builtin/commit.c:1509 +#: builtin/commit.c:1374 builtin/commit.c:1533 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1332 +#: builtin/commit.c:1378 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" "显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）" -#: builtin/commit.c:1334 parse-options.h:164 +#: builtin/commit.c:1380 parse-options.h:192 msgid "when" msgstr "何时" -#: builtin/commit.c:1335 +#: builtin/commit.c:1381 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1337 +#: builtin/commit.c:1383 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1338 +#: builtin/commit.c:1384 msgid "do not detect renames" msgstr "不检测重命名" -#: builtin/commit.c:1340 +#: builtin/commit.c:1386 msgid "detect renames, optionally set similarity index" msgstr "检测重命名，可以设置索引相似度" -#: builtin/commit.c:1360 +#: builtin/commit.c:1406 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支持已忽略和未跟踪文件参数的组合" -#: builtin/commit.c:1465 +#: builtin/commit.c:1489 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1466 +#: builtin/commit.c:1490 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1468 +#: builtin/commit.c:1492 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397 +#: builtin/commit.c:1493 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1470 +#: builtin/commit.c:1494 msgid "author" msgstr "作者" -#: builtin/commit.c:1470 +#: builtin/commit.c:1494 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1471 builtin/gc.c:518 +#: builtin/commit.c:1495 builtin/gc.c:538 msgid "date" msgstr "日期" -#: builtin/commit.c:1471 +#: builtin/commit.c:1495 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409 -#: builtin/notes.c:572 builtin/tag.c:395 -msgid "message" -msgstr "说明" - -#: builtin/commit.c:1472 -msgid "commit message" -msgstr "提交说明" - -#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475 -#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280 +#: builtin/commit.c:1497 builtin/commit.c:1498 builtin/commit.c:1499 +#: builtin/commit.c:1500 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "提交" -#: builtin/commit.c:1473 +#: builtin/commit.c:1497 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1474 +#: builtin/commit.c:1498 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" -#: builtin/commit.c:1475 +#: builtin/commit.c:1499 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" -#: builtin/commit.c:1476 +#: builtin/commit.c:1500 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" -#: builtin/commit.c:1477 +#: builtin/commit.c:1501 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276 -#: builtin/pull.c:155 builtin/revert.c:106 +#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289 +#: builtin/pull.c:164 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "添加 Signed-off-by: 签名" -#: builtin/commit.c:1479 +#: builtin/commit.c:1503 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1480 +#: builtin/commit.c:1504 msgid "force edit of commit" msgstr "强制编辑提交" -# 译者：可选值，不能翻译（或是原文中笔误，应为 mode） -#: builtin/commit.c:1481 -msgid "default" -msgstr "default" - -#: builtin/commit.c:1481 builtin/tag.c:401 -msgid "how to strip spaces and #comments from message" -msgstr "设置如何删除提交说明里的空格和#注释" - -#: builtin/commit.c:1482 +#: builtin/commit.c:1506 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185 -#: builtin/revert.c:114 -msgid "GPG sign commit" -msgstr "GPG 提交签名" - -#: builtin/commit.c:1487 +#: builtin/commit.c:1511 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1488 +#: builtin/commit.c:1512 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1489 +#: builtin/commit.c:1513 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1490 +#: builtin/commit.c:1514 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1491 +#: builtin/commit.c:1515 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1492 +#: builtin/commit.c:1516 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1493 +#: builtin/commit.c:1517 msgid "bypass pre-commit and commit-msg hooks" msgstr "绕过 pre-commit 和 commit-msg 钩子" -#: builtin/commit.c:1494 +#: builtin/commit.c:1518 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1507 +#: builtin/commit.c:1531 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1508 +#: builtin/commit.c:1532 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1513 +#: builtin/commit.c:1539 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1515 +#: builtin/commit.c:1541 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1588 +#: builtin/commit.c:1614 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1595 +#: builtin/commit.c:1621 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1614 +#: builtin/commit.c:1640 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1625 +#: builtin/commit.c:1647 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1630 +#: builtin/commit.c:1652 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1665 +#: builtin/commit.c:1686 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" -"not exceeded, and then \"git reset HEAD\" to recover." +"not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" -"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满\n" -"或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。" - -#: builtin/commit-graph.c:10 -msgid "git commit-graph [--object-dir <objdir>]" -msgstr "git commit-graph [--object-dir <对象目录>]" - -#: builtin/commit-graph.c:11 builtin/commit-graph.c:23 -msgid "git commit-graph read [--object-dir <objdir>]" -msgstr "git commit-graph read [--object-dir <对象目录>]" +"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满或\n" +"磁盘配额已耗尽，然后执行 \"git restore --staged :/\" 恢复。" -#: builtin/commit-graph.c:12 builtin/commit-graph.c:18 -msgid "git commit-graph verify [--object-dir <objdir>]" -msgstr "git commit-graph verify [--object-dir <对象目录>]" +#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "" +"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--" +"[no-]progress]" -#: builtin/commit-graph.c:13 builtin/commit-graph.c:28 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" -"stdin-packs|--stdin-commits]" +"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" +"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" msgstr "" -"git commit-graph write [--object-dir <对象目录>] [--append] [--reachable|--" -"stdin-packs|--stdin-commits]" +"git commit-graph write [--object-dir <对象目录>] [--append|--split] [--" +"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" -#: builtin/commit-graph.c:48 builtin/commit-graph.c:78 -#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153 -#: builtin/log.c:1540 +#: builtin/commit-graph.c:48 builtin/commit-graph.c:103 +#: builtin/commit-graph.c:187 builtin/fetch.c:179 builtin/log.c:1657 msgid "dir" msgstr "目录" -#: builtin/commit-graph.c:49 builtin/commit-graph.c:79 -#: builtin/commit-graph.c:133 builtin/commit-graph.c:191 +#: builtin/commit-graph.c:49 builtin/commit-graph.c:104 +#: builtin/commit-graph.c:188 msgid "The object directory to store the graph" msgstr "保存图形的对象目录" -#: builtin/commit-graph.c:135 +#: builtin/commit-graph.c:51 +msgid "if the commit-graph is split, only verify the tip file" +msgstr "如果提交图形被拆分，只验证头一个文件" + +#: builtin/commit-graph.c:73 t/helper/test-read-graph.c:23 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "无法打开提交图形 '%s'" + +#: builtin/commit-graph.c:106 msgid "start walk at all refs" msgstr "开始遍历所有引用" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:108 msgid "scan pack-indexes listed by stdin for commits" msgstr "从标准输入中的包索引文件列表中扫描提交" -#: builtin/commit-graph.c:139 +#: builtin/commit-graph.c:110 msgid "start walk at commits listed by stdin" msgstr "从标准输入中的提交开始扫描" -#: builtin/commit-graph.c:141 +#: builtin/commit-graph.c:112 msgid "include all commits already in the commit-graph file" msgstr "包含 commit-graph 文件中已有所有提交" -#: builtin/commit-graph.c:150 +#: builtin/commit-graph.c:115 +msgid "allow writing an incremental commit-graph file" +msgstr "允许写一个增量提交图形文件" + +#: builtin/commit-graph.c:117 builtin/commit-graph.c:121 +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "在非基本拆分提交图形中的最大提交数" + +#: builtin/commit-graph.c:119 +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "一个拆分提交图形的两个级别之间的最大比率" + +#: builtin/commit-graph.c:137 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" @@ -10071,7 +12396,7 @@ msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" msgid "git config [<options>]" msgstr "git config [<选项>]" -#: builtin/config.c:103 +#: builtin/config.c:103 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "未能识别的 --type 参数，%s" @@ -10176,7 +12501,7 @@ msgstr "获得颜色设置：配置 [stdout-is-tty]" msgid "Type" msgstr "类型" -#: builtin/config.c:147 +#: builtin/config.c:147 builtin/env--helper.c:38 msgid "value is given this type" msgstr "取值为该类型" @@ -10220,7 +12545,7 @@ msgstr "查询时参照 include 指令递归查找" msgid "show origin of config (file, standard input, blob, command line)" msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）" -#: builtin/config.c:158 +#: builtin/config.c:158 builtin/env--helper.c:40 msgid "value" msgstr "取值" @@ -10228,48 +12553,48 @@ msgstr "取值" msgid "with --get, use default value when missing entry" msgstr "使用 --get 参数，当缺少设置时使用默认值" -#: builtin/config.c:171 +#: builtin/config.c:172 #, c-format msgid "wrong number of arguments, should be %d" msgstr "错误的参数个数，应该为 %d 个" -#: builtin/config.c:173 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "错误的参数个数，应该为从 %d 个到 %d 个" -#: builtin/config.c:307 +#: builtin/config.c:308 #, c-format msgid "invalid key pattern: %s" msgstr "无效键名模式：%s" -#: builtin/config.c:343 +#: builtin/config.c:344 #, c-format msgid "failed to format default config value: %s" msgstr "格式化默认配置值失败：%s" -#: builtin/config.c:400 +#: builtin/config.c:401 #, c-format msgid "cannot parse color '%s'" msgstr "无法解析颜色 '%s'" -#: builtin/config.c:442 +#: builtin/config.c:443 msgid "unable to parse default color value" msgstr "无法解析默认颜色值" -#: builtin/config.c:495 builtin/config.c:741 +#: builtin/config.c:496 builtin/config.c:742 msgid "not in a git directory" msgstr "不在 git 仓库中" -#: builtin/config.c:498 +#: builtin/config.c:499 msgid "writing to stdin is not supported" msgstr "不支持写到标准输入" -#: builtin/config.c:501 +#: builtin/config.c:502 msgid "writing config blobs is not supported" msgstr "不支持写到配置数据对象" -#: builtin/config.c:586 +#: builtin/config.c:587 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -10284,23 +12609,23 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:610 +#: builtin/config.c:611 msgid "only one config file at a time" msgstr "一次只能有一个配置文件" -#: builtin/config.c:615 +#: builtin/config.c:616 msgid "--local can only be used inside a git repository" msgstr "--local 只能在一个仓库内使用" -#: builtin/config.c:618 +#: builtin/config.c:619 msgid "--blob can only be used inside a git repository" msgstr "--blob 只能在一个仓库内使用" -#: builtin/config.c:637 +#: builtin/config.c:638 msgid "$HOME not set" msgstr "$HOME 未设置" -#: builtin/config.c:657 +#: builtin/config.c:658 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -10309,51 +12634,51 @@ msgstr "" "不能和多个工作区一起使用 --worktree，除非启用 worktreeConfig 配置扩展。\n" "详情请阅读“git help worktree”的“CONFIGURATION FILE”小节" -#: builtin/config.c:687 +#: builtin/config.c:688 msgid "--get-color and variable type are incoherent" msgstr "--get-color 和变量类型不兼容" -#: builtin/config.c:692 +#: builtin/config.c:693 msgid "only one action at a time" msgstr "一次只能有一个动作" -#: builtin/config.c:705 +#: builtin/config.c:706 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only 仅适用于 --list 或 --get-regexp" -#: builtin/config.c:711 +#: builtin/config.c:712 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:717 +#: builtin/config.c:718 msgid "--default is only applicable to --get" msgstr "--default 仅适用于 --get" -#: builtin/config.c:730 +#: builtin/config.c:731 #, c-format msgid "unable to read config file '%s'" msgstr "无法读取配置文件 '%s'" -#: builtin/config.c:733 +#: builtin/config.c:734 msgid "error processing config file(s)" msgstr "处理配置文件出错" -#: builtin/config.c:743 +#: builtin/config.c:744 msgid "editing stdin is not supported" msgstr "不支持编辑标准输入" -#: builtin/config.c:745 +#: builtin/config.c:746 msgid "editing blobs is not supported" msgstr "不支持编辑数据对象" -#: builtin/config.c:759 +#: builtin/config.c:760 #, c-format msgid "cannot create configuration file %s" msgstr "不能创建配置文件 %s" -#: builtin/config.c:772 +#: builtin/config.c:773 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -10362,7 +12687,7 @@ msgstr "" "无法用一个值覆盖多个值\n" " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" -#: builtin/config.c:846 builtin/config.c:857 +#: builtin/config.c:847 builtin/config.c:858 #, c-format msgid "no such section: %s" msgstr "无此小节：%s" @@ -10395,37 +12720,37 @@ msgstr "轻量级的" msgid "annotated" msgstr "附注的" -#: builtin/describe.c:272 +#: builtin/describe.c:275 #, c-format msgid "annotated tag %s not available" msgstr "附注标签 %s 无效" -#: builtin/describe.c:276 +#: builtin/describe.c:279 #, c-format msgid "annotated tag %s has no embedded name" msgstr "附注标签 %s 没有嵌入名称" -#: builtin/describe.c:278 +#: builtin/describe.c:281 #, c-format msgid "tag '%s' is really '%s' here" msgstr "标签 '%s' 的确是在 '%s'" -#: builtin/describe.c:322 +#: builtin/describe.c:325 #, c-format msgid "no tag exactly matches '%s'" msgstr "没有标签准确匹配 '%s'" -#: builtin/describe.c:324 +#: builtin/describe.c:327 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n" -#: builtin/describe.c:378 +#: builtin/describe.c:381 #, c-format msgid "finished search at %s\n" msgstr "完成搜索 %s\n" -#: builtin/describe.c:404 +#: builtin/describe.c:407 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -10434,7 +12759,7 @@ msgstr "" "没有附注标签能描述 '%s'。\n" "然而，存在未附注标签：尝试 --tags。" -#: builtin/describe.c:408 +#: builtin/describe.c:411 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -10443,12 +12768,12 @@ msgstr "" "没有标签能描述 '%s'。\n" "尝试 --always，或者创建一些标签。" -#: builtin/describe.c:438 +#: builtin/describe.c:441 #, c-format msgid "traversed %lu commits\n" msgstr "已遍历 %lu 个提交\n" -#: builtin/describe.c:441 +#: builtin/describe.c:444 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -10457,118 +12782,118 @@ msgstr "" "发现多于 %i 个标签，列出最近的 %i 个\n" "在 %s 放弃搜索\n" -#: builtin/describe.c:509 +#: builtin/describe.c:512 #, c-format msgid "describe %s\n" msgstr "描述 %s\n" -#: builtin/describe.c:512 builtin/log.c:513 +#: builtin/describe.c:515 #, c-format msgid "Not a valid object name %s" msgstr "不是一个有效的对象名 %s" -#: builtin/describe.c:520 +#: builtin/describe.c:523 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s 既不是提交也不是数据对象" -#: builtin/describe.c:534 +#: builtin/describe.c:537 msgid "find the tag that comes after the commit" msgstr "寻找该提交之后的标签" -#: builtin/describe.c:535 +#: builtin/describe.c:538 msgid "debug search strategy on stderr" msgstr "在标准错误上调试搜索策略" -#: builtin/describe.c:536 +#: builtin/describe.c:539 msgid "use any ref" msgstr "使用任意引用" -#: builtin/describe.c:537 +#: builtin/describe.c:540 msgid "use any tag, even unannotated" msgstr "使用任意标签，即使未附带注释" -#: builtin/describe.c:538 +#: builtin/describe.c:541 msgid "always use long format" msgstr "始终使用长提交号格式" -#: builtin/describe.c:539 +#: builtin/describe.c:542 msgid "only follow first parent" msgstr "只跟随第一个父提交" -#: builtin/describe.c:542 +#: builtin/describe.c:545 msgid "only output exact matches" msgstr "只输出精确匹配" -#: builtin/describe.c:544 +#: builtin/describe.c:547 msgid "consider <n> most recent tags (default: 10)" msgstr "考虑最近 <n> 个标签（默认：10）" -#: builtin/describe.c:546 +#: builtin/describe.c:549 msgid "only consider tags matching <pattern>" msgstr "只考虑匹配 <模式> 的标签" -#: builtin/describe.c:548 +#: builtin/describe.c:551 msgid "do not consider tags matching <pattern>" msgstr "不考虑匹配 <模式> 的标签" -#: builtin/describe.c:550 builtin/name-rev.c:424 +#: builtin/describe.c:553 builtin/name-rev.c:473 msgid "show abbreviated commit object as fallback" msgstr "显示简写的提交号作为后备" -#: builtin/describe.c:551 builtin/describe.c:554 +#: builtin/describe.c:554 builtin/describe.c:557 msgid "mark" msgstr "标记" -#: builtin/describe.c:552 +#: builtin/describe.c:555 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）" -#: builtin/describe.c:555 +#: builtin/describe.c:558 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）" -#: builtin/describe.c:573 +#: builtin/describe.c:576 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 不兼容" -#: builtin/describe.c:602 +#: builtin/describe.c:605 msgid "No names found, cannot describe anything." msgstr "没有发现名称，无法描述任何东西。" -#: builtin/describe.c:652 +#: builtin/describe.c:656 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty 与提交号不兼容" -#: builtin/describe.c:654 +#: builtin/describe.c:658 msgid "--broken is incompatible with commit-ishes" msgstr "--broken 与提交号不兼容" -#: builtin/diff.c:83 +#: builtin/diff.c:84 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一个正规文件或符号链接" -#: builtin/diff.c:234 +#: builtin/diff.c:235 #, c-format msgid "invalid option: %s" msgstr "无效选项：%s" -#: builtin/diff.c:363 +#: builtin/diff.c:350 msgid "Not a git repository" msgstr "不是一个 git 仓库" -#: builtin/diff.c:407 +#: builtin/diff.c:394 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c:416 +#: builtin/diff.c:403 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超过两个数据对象：'%s'" -#: builtin/diff.c:421 +#: builtin/diff.c:408 #, c-format msgid "unhandled object '%s' given." msgstr "无法处理的对象 '%s'。" @@ -10605,318 +12930,421 @@ msgstr "" "不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--" "cc'）。" -#: builtin/difftool.c:633 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "两个文件都被修改：'%s' 和 '%s'。" -#: builtin/difftool.c:635 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "工作区文件被留了下来。" -#: builtin/difftool.c:646 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "临时文件存在于 '%s'。" -#: builtin/difftool.c:647 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者恢复它们。" -#: builtin/difftool.c:696 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c:698 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "执行一个全目录差异比较" -#: builtin/difftool.c:700 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "启动差异比较工具之前不提示" -#: builtin/difftool.c:705 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符号链接" -#: builtin/difftool.c:706 +#: builtin/difftool.c:707 msgid "tool" msgstr "工具" -#: builtin/difftool.c:707 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "使用指定的差异比较工具" -#: builtin/difftool.c:709 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "显示可以用在 `--tool` 参数后的差异工具列表" -#: builtin/difftool.c:712 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出" -#: builtin/difftool.c:715 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "指定一个用于查看差异的自定义命令" +#: builtin/difftool.c:717 +msgid "passed to `diff`" +msgstr "传递给 `diff`" + +#: builtin/difftool.c:732 +msgid "difftool requires worktree or --no-index" +msgstr "difftool 要求工作区或者 --no-index" + #: builtin/difftool.c:739 +msgid "--dir-diff is incompatible with --no-index" +msgstr "--dir-diff 和 --no-index 不兼容" + +#: builtin/difftool.c:742 +msgid "--gui, --tool and --extcmd are mutually exclusive" +msgstr "--gui、--tool 和 --extcmd 互斥" + +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "没有为 --tool=<工具> 参数提供 <工具>" -#: builtin/difftool.c:746 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" +#: builtin/env--helper.c:6 +msgid "git env--helper --type=[bool|ulong] <options> <env-var>" +msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>" + +#: builtin/env--helper.c:37 builtin/hash-object.c:98 +msgid "type" +msgstr "类型" + +#: builtin/env--helper.c:41 +msgid "default for git_env_*(...) to fall back on" +msgstr "git_env_*(...) 的默认值" + +#: builtin/env--helper.c:43 +msgid "be quiet only use git_env_*() value as exit code" +msgstr "安静模式，只使用 git_env_*() 的值作为退出码" + +#: builtin/env--helper.c:62 +#, c-format +msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" +msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值，不是 `%s`" + +#: builtin/env--helper.c:77 +#, c-format +msgid "" +"option `--default' expects an unsigned long value with `--type=ulong`, not `" +"%s`" +msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型，不是 `%s`" + #: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:1006 +#: builtin/fast-export.c:852 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "错误：除非指定 --mark-tags，否则无法导出嵌套标签。" + +#: builtin/fast-export.c:1152 msgid "show progress after <n> objects" msgstr "在 <n> 个对象之后显示进度" -#: builtin/fast-export.c:1008 +#: builtin/fast-export.c:1154 msgid "select handling of signed tags" msgstr "选择如何处理签名标签" -#: builtin/fast-export.c:1011 +#: builtin/fast-export.c:1157 msgid "select handling of tags that tag filtered objects" msgstr "选择当标签指向被过滤对象时该标签的处理方式" -#: builtin/fast-export.c:1014 +#: builtin/fast-export.c:1160 +msgid "select handling of commit messages in an alternate encoding" +msgstr "选择使用备用编码处理提交说明" + +#: builtin/fast-export.c:1163 msgid "Dump marks to this file" msgstr "把标记存储到这个文件" -#: builtin/fast-export.c:1016 +#: builtin/fast-export.c:1165 msgid "Import marks from this file" msgstr "从这个文件导入标记" -#: builtin/fast-export.c:1018 +#: builtin/fast-export.c:1169 +msgid "Import marks from this file if it exists" +msgstr "从该文件导入标记（如果存在的话）" + +#: builtin/fast-export.c:1171 msgid "Fake a tagger when tags lack one" msgstr "当标签缺少标记者字段时，假装提供一个" -#: builtin/fast-export.c:1020 +#: builtin/fast-export.c:1173 msgid "Output full tree for each commit" msgstr "每次提交都输出整个树" -#: builtin/fast-export.c:1022 +#: builtin/fast-export.c:1175 msgid "Use the done feature to terminate the stream" msgstr "使用 done 功能来终止流" -#: builtin/fast-export.c:1023 +#: builtin/fast-export.c:1176 msgid "Skip output of blob data" msgstr "跳过数据对象的输出" -#: builtin/fast-export.c:1024 builtin/log.c:1588 +#: builtin/fast-export.c:1177 builtin/log.c:1705 msgid "refspec" msgstr "引用规格" -#: builtin/fast-export.c:1025 +#: builtin/fast-export.c:1178 msgid "Apply refspec to exported refs" msgstr "对导出的引用应用引用规格" -#: builtin/fast-export.c:1026 +#: builtin/fast-export.c:1179 msgid "anonymize output" msgstr "匿名输出" -#: builtin/fetch.c:28 +#: builtin/fast-export.c:1181 +msgid "Reference parents which are not in fast-export stream by object id" +msgstr "引用父对象 ID 不在 fast-export 流中" + +#: builtin/fast-export.c:1183 +msgid "Show original object ids of blobs/commits" +msgstr "显示数据对象/提交的原始对象 ID" + +#: builtin/fast-export.c:1185 +msgid "Label tags with mark ids" +msgstr "对带有标记 ID 的标签做标记" + +#: builtin/fast-export.c:1220 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists" + +#: builtin/fetch.c:34 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/fetch.c:29 +#: builtin/fetch.c:35 msgid "git fetch [<options>] <group>" msgstr "git fetch [<选项>] <组>" -#: builtin/fetch.c:30 +#: builtin/fetch.c:36 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:37 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" -#: builtin/fetch.c:115 builtin/pull.c:194 +#: builtin/fetch.c:116 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel 不能为负数" + +#: builtin/fetch.c:139 builtin/pull.c:204 msgid "fetch from all remotes" msgstr "从所有的远程抓取" -#: builtin/fetch.c:117 builtin/pull.c:197 +#: builtin/fetch.c:141 builtin/pull.c:248 +msgid "set upstream for git pull/fetch" +msgstr "为 git pull/fetch 设置上游" + +#: builtin/fetch.c:143 builtin/pull.c:207 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" -#: builtin/fetch.c:119 builtin/pull.c:200 +#: builtin/fetch.c:145 builtin/pull.c:210 msgid "path to upload pack on remote end" msgstr "上传包到远程的路径" -#: builtin/fetch.c:120 +#: builtin/fetch.c:146 msgid "force overwrite of local reference" msgstr "强制覆盖本地引用" -#: builtin/fetch.c:122 +#: builtin/fetch.c:148 msgid "fetch from multiple remotes" msgstr "从多个远程抓取" -#: builtin/fetch.c:124 builtin/pull.c:204 +#: builtin/fetch.c:150 builtin/pull.c:214 msgid "fetch all tags and associated objects" msgstr "抓取所有的标签和关联对象" -#: builtin/fetch.c:126 +#: builtin/fetch.c:152 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何标签(--no-tags)" -#: builtin/fetch.c:128 +#: builtin/fetch.c:154 msgid "number of submodules fetched in parallel" msgstr "子模组获取的并发数" -#: builtin/fetch.c:130 builtin/pull.c:207 +#: builtin/fetch.c:156 builtin/pull.c:217 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已经不存在的分支的跟踪分支" -#: builtin/fetch.c:132 +#: builtin/fetch.c:158 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除远程不存在的本地标签，并且替换变更标签" # 译者：可选值，不能翻译 -#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132 +#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:141 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:134 +#: builtin/fetch.c:160 msgid "control recursive fetching of submodules" msgstr "控制子模组的递归抓取" -#: builtin/fetch.c:138 builtin/pull.c:215 +#: builtin/fetch.c:164 builtin/pull.c:225 msgid "keep downloaded pack" msgstr "保持下载包" -#: builtin/fetch.c:140 +#: builtin/fetch.c:166 msgid "allow updating of HEAD ref" msgstr "允许更新 HEAD 引用" -#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218 +#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:228 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历史" -#: builtin/fetch.c:145 +#: builtin/fetch.c:171 msgid "deepen history of shallow repository based on time" msgstr "基于时间来深化浅克隆的历史" -#: builtin/fetch.c:151 builtin/pull.c:221 +#: builtin/fetch.c:177 builtin/pull.c:231 msgid "convert to a complete repository" msgstr "转换为一个完整的仓库" -#: builtin/fetch.c:154 +#: builtin/fetch.c:180 msgid "prepend this to submodule path output" msgstr "在子模组路径输出的前面加上此目录" -#: builtin/fetch.c:157 +#: builtin/fetch.c:183 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "递归获取子模组的缺省值（比配置文件优先级低）" -#: builtin/fetch.c:161 builtin/pull.c:224 +#: builtin/fetch.c:187 builtin/pull.c:234 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:162 builtin/pull.c:226 +#: builtin/fetch.c:188 builtin/pull.c:236 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:163 builtin/pull.c:227 +#: builtin/fetch.c:189 builtin/pull.c:237 msgid "specify fetch refmap" msgstr "指定获取操作的引用映射" -#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582 -#: builtin/send-pack.c:172 -msgid "server-specific" -msgstr "server-specific" - -#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582 -#: builtin/send-pack.c:173 -msgid "option to transmit" -msgstr "传输选项" - -#: builtin/fetch.c:170 +#: builtin/fetch.c:196 msgid "report that we have only objects reachable from this object" msgstr "报告我们只拥有从该对象开始可达的对象" -#: builtin/fetch.c:470 +#: builtin/fetch.c:199 +msgid "run 'gc --auto' after fetching" +msgstr "获取后执行 'gc --auto'" + +#: builtin/fetch.c:201 builtin/pull.c:246 +msgid "check for forced-updates on all updated branches" +msgstr "在所有更新分支上检查强制更新" + +#: builtin/fetch.c:203 +msgid "write the commit-graph after fetching" +msgstr "抓取后写提交图" + +#: builtin/fetch.c:513 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:609 +#: builtin/fetch.c:653 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "配置变量 fetch.output 包含无效值 %s" -#: builtin/fetch.c:702 +#: builtin/fetch.c:751 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c:706 +#: builtin/fetch.c:755 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807 +#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c:720 +#: builtin/fetch.c:769 msgid "can't fetch in current branch" msgstr "当前分支下不能执行获取操作" -#: builtin/fetch.c:730 +#: builtin/fetch.c:779 msgid "[tag update]" msgstr "[标签更新]" -#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787 -#: builtin/fetch.c:802 +#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 +#: builtin/fetch.c:851 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c:735 +#: builtin/fetch.c:784 msgid "would clobber existing tag" msgstr "会破坏现有的标签" -#: builtin/fetch.c:757 +#: builtin/fetch.c:806 msgid "[new tag]" msgstr "[新标签]" -#: builtin/fetch.c:760 +#: builtin/fetch.c:809 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:763 +#: builtin/fetch.c:812 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:802 +#: builtin/fetch.c:851 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:807 +#: builtin/fetch.c:856 msgid "non-fast-forward" msgstr "非快进" -#: builtin/fetch.c:853 +#: builtin/fetch.c:877 +msgid "" +"Fetch normally indicates which branches had a forced update,\n" +"but that check has been disabled. To re-enable, use '--show-forced-updates'\n" +"flag or run 'git config fetch.showForcedUpdates true'." +msgstr "" +"获取操作通常显示哪些分支发生了强制更新，但该检查已被禁用。\n" +"要重新启用，请使用 '--show-forced-updates' 选项或运行\n" +"'git config fetch.showForcedUpdates true'。" + +#: builtin/fetch.c:881 +#, c-format +msgid "" +"It took %.2f seconds to check forced updates. You can use\n" +"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " +"false'\n" +" to avoid this check.\n" +msgstr "" +"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n" +"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n" + +#: builtin/fetch.c:911 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必需的对象\n" -#: builtin/fetch.c:874 +#: builtin/fetch.c:932 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "拒绝 %s 因为浅克隆不允许被更新" -#: builtin/fetch.c:963 builtin/fetch.c:1085 +#: builtin/fetch.c:1017 builtin/fetch.c:1155 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:974 +#: builtin/fetch.c:1028 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -10926,120 +13354,150 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:1055 +#: builtin/fetch.c:1125 #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为悬空状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:1056 +#: builtin/fetch.c:1126 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为悬空状态）" -#: builtin/fetch.c:1088 +#: builtin/fetch.c:1158 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:1089 builtin/remote.c:1036 +#: builtin/fetch.c:1159 builtin/remote.c:1035 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:1112 +#: builtin/fetch.c:1182 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒绝获取到非纯仓库的当前分支 %s" -#: builtin/fetch.c:1131 +#: builtin/fetch.c:1201 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1204 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" +#: builtin/fetch.c:1412 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "检测到多分支，和 --set-upstream 不兼容" + +#: builtin/fetch.c:1427 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "没有为一个远程跟踪分支设置上游" + +#: builtin/fetch.c:1429 +msgid "not setting upstream for a remote tag" +msgstr "没有为一个远程标签设置上游" + +#: builtin/fetch.c:1431 +msgid "unknown branch type" +msgstr "未知的分支类型" + #: builtin/fetch.c:1433 +msgid "" +"no source branch found.\n" +"you need to specify exactly one branch with the --set-upstream option." +msgstr "" +"未发现源分支。\n" +"您需要使用 --set-upstream 选项指定一个分支。" + +#: builtin/fetch.c:1559 builtin/fetch.c:1622 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:1435 builtin/remote.c:100 +#: builtin/fetch.c:1569 builtin/fetch.c:1624 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:1481 builtin/fetch.c:1649 -msgid "" -"--filter can only be used with the remote configured in core.partialClone" -msgstr "只可以将 --filter 用于在 core.partialClone 中配置的远程仓库" +#: builtin/fetch.c:1581 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "无法获取 '%s'（退出码：%d）\n" -#: builtin/fetch.c:1504 +#: builtin/fetch.c:1684 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:1541 +#: builtin/fetch.c:1721 msgid "You need to specify a tag name." msgstr "您需要指定一个标签名称。" -#: builtin/fetch.c:1590 +#: builtin/fetch.c:1771 msgid "Negative depth in --deepen is not supported" msgstr "--deepen 不支持负数深度" -#: builtin/fetch.c:1592 +#: builtin/fetch.c:1773 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen 和 --depth 是互斥的" -#: builtin/fetch.c:1597 +#: builtin/fetch.c:1778 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" -#: builtin/fetch.c:1599 +#: builtin/fetch.c:1780 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库，参数 --unshallow 没有意义" -#: builtin/fetch.c:1615 +#: builtin/fetch.c:1796 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个仓库参数" -#: builtin/fetch.c:1617 +#: builtin/fetch.c:1798 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规格没有任何意义" -#: builtin/fetch.c:1626 +#: builtin/fetch.c:1807 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:1633 +#: builtin/fetch.c:1814 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规格没有意义" +#: builtin/fetch.c:1832 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialclone" +msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库" + #: builtin/fmt-merge-msg.c:18 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:674 msgid "populate log with at most <n> entries from shortlog" msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:677 msgid "alias for --log (deprecated)" msgstr "参数 --log 的别名（已弃用）" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:680 msgid "text" msgstr "文本" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:681 msgid "use <text> as start of message" msgstr "使用 <文本> 作为提交说明的开始" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:682 msgid "file to read from" msgstr "从文件中读取" @@ -11079,91 +13537,274 @@ msgstr "引用占位符适用于 Tcl" msgid "show only <n> matched refs" msgstr "只显示 <n> 个匹配的引用" -#: builtin/for-each-ref.c:39 builtin/tag.c:424 +#: builtin/for-each-ref.c:39 builtin/tag.c:439 msgid "respect format colors" msgstr "遵照格式中的颜色输出" -#: builtin/for-each-ref.c:43 +#: builtin/for-each-ref.c:42 msgid "print only refs which points at the given object" msgstr "只打印指向给定对象的引用" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:44 msgid "print only refs that are merged" msgstr "只打印已经合并的引用" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:45 msgid "print only refs that are not merged" msgstr "只打印没有合并的引用" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:46 msgid "print only refs which contain the commit" msgstr "只打印包含该提交的引用" -#: builtin/for-each-ref.c:48 +#: builtin/for-each-ref.c:47 msgid "print only refs which don't contain the commit" msgstr "只打印不包含该提交的引用" -#: builtin/fsck.c:598 +#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 +msgid "unknown" +msgstr "未知" + +#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> +#: builtin/fsck.c:100 builtin/fsck.c:120 +#, c-format +msgid "error in %s %s: %s" +msgstr "%s %s 错误：%s" + +#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> +#: builtin/fsck.c:114 +#, c-format +msgid "warning in %s %s: %s" +msgstr "%s %s 警告：%s" + +#: builtin/fsck.c:143 builtin/fsck.c:146 +#, c-format +msgid "broken link from %7s %s" +msgstr "来自 %7s %s 的损坏的链接" + +#: builtin/fsck.c:155 +msgid "wrong object type in link" +msgstr "链接中错误的对象类型" + +#: builtin/fsck.c:171 +#, c-format +msgid "" +"broken link from %7s %s\n" +" to %7s %s" +msgstr "" +"损坏的链接来自于 %7s %s\n" +" 到 %7s %s" + +#: builtin/fsck.c:282 +#, c-format +msgid "missing %s %s" +msgstr "缺失 %s %s" + +#: builtin/fsck.c:309 +#, c-format +msgid "unreachable %s %s" +msgstr "不可达 %s %s" + +#: builtin/fsck.c:329 +#, c-format +msgid "dangling %s %s" +msgstr "悬空 %s %s" + +#: builtin/fsck.c:339 +msgid "could not create lost-found" +msgstr "不能创建 lost-found" + +#: builtin/fsck.c:350 +#, c-format +msgid "could not finish '%s'" +msgstr "不能完成 '%s'" + +#: builtin/fsck.c:367 +#, c-format +msgid "Checking %s" +msgstr "正在检查 %s" + +#: builtin/fsck.c:405 +#, c-format +msgid "Checking connectivity (%d objects)" +msgstr "正在检查连通性（%d 个对象）" + +#: builtin/fsck.c:424 +#, c-format +msgid "Checking %s %s" +msgstr "正在检查 %s %s" + +#: builtin/fsck.c:429 +msgid "broken links" +msgstr "损坏的链接" + +#: builtin/fsck.c:438 +#, c-format +msgid "root %s" +msgstr "根 %s" + +#: builtin/fsck.c:446 +#, c-format +msgid "tagged %s %s (%s) in %s" +msgstr "标记 %s %s (%s) 于 %s" + +#: builtin/fsck.c:475 +#, c-format +msgid "%s: object corrupt or missing" +msgstr "%s：对象损坏或丢失" + +#: builtin/fsck.c:500 +#, c-format +msgid "%s: invalid reflog entry %s" +msgstr "%s：无效的引用日志条目 %s" + +#: builtin/fsck.c:514 +#, c-format +msgid "Checking reflog %s->%s" +msgstr "正在检查引用日志 %s->%s" + +#: builtin/fsck.c:548 +#, c-format +msgid "%s: invalid sha1 pointer %s" +msgstr "%s：无效的 sha1 指针 %s" + +#: builtin/fsck.c:555 +#, c-format +msgid "%s: not a commit" +msgstr "%s：不是一个提交" + +#: builtin/fsck.c:609 +msgid "notice: No default references" +msgstr "注意：无默认引用" + +#: builtin/fsck.c:624 +#, c-format +msgid "%s: object corrupt or missing: %s" +msgstr "%s：对象损坏或丢失：%s" + +#: builtin/fsck.c:637 +#, c-format +msgid "%s: object could not be parsed: %s" +msgstr "%s：不能解析对象：%s" + +#: builtin/fsck.c:657 +#, c-format +msgid "bad sha1 file: %s" +msgstr "坏的 sha1 文件：%s" + +#: builtin/fsck.c:672 +msgid "Checking object directory" +msgstr "正在检查对象目录" + +#: builtin/fsck.c:675 msgid "Checking object directories" -msgstr "检查对象目录中" +msgstr "正在检查对象目录" + +#: builtin/fsck.c:690 +#, c-format +msgid "Checking %s link" +msgstr "正在检查 %s 链接" -#: builtin/fsck.c:693 +#: builtin/fsck.c:695 builtin/index-pack.c:842 +#, c-format +msgid "invalid %s" +msgstr "无效的 %s" + +#: builtin/fsck.c:702 +#, c-format +msgid "%s points to something strange (%s)" +msgstr "%s 指向奇怪的东西（%s）" + +#: builtin/fsck.c:708 +#, c-format +msgid "%s: detached HEAD points at nothing" +msgstr "%s：分离头指针的指向不存在" + +#: builtin/fsck.c:712 +#, c-format +msgid "notice: %s points to an unborn branch (%s)" +msgstr "注意：%s 指向一个尚未诞生的分支（%s）" + +#: builtin/fsck.c:724 +msgid "Checking cache tree" +msgstr "正在检查缓存树" + +#: builtin/fsck.c:729 +#, c-format +msgid "%s: invalid sha1 pointer in cache-tree" +msgstr "%s：cache-tree 中无效的 sha1 指针" + +#: builtin/fsck.c:738 +msgid "non-tree in cache-tree" +msgstr "cache-tree 中非树对象" + +#: builtin/fsck.c:769 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<选项>] [<对象>...]" -#: builtin/fsck.c:699 +#: builtin/fsck.c:775 msgid "show unreachable objects" msgstr "显示不可达的对象" -#: builtin/fsck.c:700 +#: builtin/fsck.c:776 msgid "show dangling objects" msgstr "显示悬空的对象" -#: builtin/fsck.c:701 +#: builtin/fsck.c:777 msgid "report tags" msgstr "报告标签" -#: builtin/fsck.c:702 +#: builtin/fsck.c:778 msgid "report root nodes" msgstr "报告根节点" -#: builtin/fsck.c:703 +#: builtin/fsck.c:779 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" -#: builtin/fsck.c:704 +#: builtin/fsck.c:780 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点（默认）" -#: builtin/fsck.c:705 +#: builtin/fsck.c:781 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" -#: builtin/fsck.c:706 +#: builtin/fsck.c:782 msgid "check only connectivity" msgstr "仅检查连通性" -#: builtin/fsck.c:707 +#: builtin/fsck.c:783 msgid "enable more strict checking" msgstr "启用更严格的检查" -#: builtin/fsck.c:709 +#: builtin/fsck.c:785 msgid "write dangling objects in .git/lost-found" msgstr "将悬空对象写入 .git/lost-found 中" -#: builtin/fsck.c:710 builtin/prune.c:110 +#: builtin/fsck.c:786 builtin/prune.c:132 msgid "show progress" msgstr "显示进度" -#: builtin/fsck.c:711 +#: builtin/fsck.c:787 msgid "show verbose names for reachable objects" msgstr "显示可达对象的详细名称" -#: builtin/fsck.c:776 +#: builtin/fsck.c:846 builtin/index-pack.c:225 msgid "Checking objects" -msgstr "检查对象中" +msgstr "正在检查对象" + +#: builtin/fsck.c:874 +#, c-format +msgid "%s: object missing" +msgstr "%s：对象缺失" -#: builtin/gc.c:34 +#: builtin/fsck.c:885 +#, c-format +msgid "invalid parameter: expected sha1, got '%s'" +msgstr "无效的参数：期望 sha1，得到 '%s'" + +#: builtin/gc.c:35 msgid "git gc [<options>]" msgstr "git gc [<选项>]" @@ -11172,17 +13813,22 @@ msgstr "git gc [<选项>]" msgid "Failed to fstat %s: %s" msgstr "对 %s 调用 fstat 失败：%s" -#: builtin/gc.c:461 builtin/init-db.c:55 +#: builtin/gc.c:126 +#, c-format +msgid "failed to parse '%s' value '%s'" +msgstr "无法解析 '%s' 值 '%s'" + +#: builtin/gc.c:475 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: builtin/gc.c:477 +#: builtin/gc.c:491 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -11196,73 +13842,73 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:519 +#: builtin/gc.c:539 msgid "prune unreferenced objects" msgstr "清除未引用的对象" -#: builtin/gc.c:521 +#: builtin/gc.c:541 msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" -#: builtin/gc.c:522 +#: builtin/gc.c:542 msgid "enable auto-gc mode" msgstr "启用自动垃圾回收模式" -#: builtin/gc.c:525 +#: builtin/gc.c:545 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc 即使另外一个 gc 正在执行" -#: builtin/gc.c:528 +#: builtin/gc.c:548 msgid "repack all other packs except the largest pack" msgstr "除了最大的包之外，对所有其它包文件重新打包" -#: builtin/gc.c:545 +#: builtin/gc.c:565 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "解析 gc.logexpiry 的值 %s 失败" -#: builtin/gc.c:556 +#: builtin/gc.c:576 #, c-format msgid "failed to parse prune expiry value %s" msgstr "解析清除期限值 %s 失败" -#: builtin/gc.c:576 +#: builtin/gc.c:596 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自动在后台执行仓库打包以求最佳性能。\n" -#: builtin/gc.c:578 +#: builtin/gc.c:598 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包仓库以求最佳性能。\n" -#: builtin/gc.c:579 +#: builtin/gc.c:599 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护参见 \"git help gc\"。\n" -#: builtin/gc.c:619 +#: builtin/gc.c:639 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）" -#: builtin/gc.c:670 +#: builtin/gc.c:694 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" -#: builtin/grep.c:28 +#: builtin/grep.c:29 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" -#: builtin/grep.c:224 +#: builtin/grep.c:225 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep：无法创建线程：%s" -#: builtin/grep.c:278 +#: builtin/grep.c:279 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "为 %2$s 设定的线程数 (%1$d) 无效" @@ -11271,263 +13917,263 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697 -#: builtin/pack-objects.c:2719 +#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 +#: builtin/pack-objects.c:2708 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" -#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620 +#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 #, c-format msgid "unable to read tree (%s)" msgstr "无法读取树（%s）" -#: builtin/grep.c:635 +#: builtin/grep.c:650 #, c-format msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c:701 +#: builtin/grep.c:716 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c:800 +#: builtin/grep.c:815 msgid "search in index instead of in the work tree" msgstr "在索引区搜索而不是在工作区" -#: builtin/grep.c:802 +#: builtin/grep.c:817 msgid "find in contents not managed by git" msgstr "在未被 git 管理的内容中查找" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/grep.c:804 +#: builtin/grep.c:819 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" -#: builtin/grep.c:806 +#: builtin/grep.c:821 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的文件" -#: builtin/grep.c:808 +#: builtin/grep.c:823 msgid "recursively search in each submodule" msgstr "在每一个子模组中递归搜索" -#: builtin/grep.c:811 +#: builtin/grep.c:826 msgid "show non-matching lines" msgstr "显示未匹配的行" -#: builtin/grep.c:813 +#: builtin/grep.c:828 msgid "case insensitive matching" msgstr "不区分大小写匹配" -#: builtin/grep.c:815 +#: builtin/grep.c:830 msgid "match patterns only at word boundaries" msgstr "只在单词边界匹配模式" -#: builtin/grep.c:817 +#: builtin/grep.c:832 msgid "process binary files as text" msgstr "把二进制文件当做文本处理" -#: builtin/grep.c:819 +#: builtin/grep.c:834 msgid "don't match patterns in binary files" msgstr "不在二进制文件中匹配模式" -#: builtin/grep.c:822 +#: builtin/grep.c:837 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处理二进制文件" -#: builtin/grep.c:824 +#: builtin/grep.c:839 msgid "search in subdirectories (default)" msgstr "在子目录中寻找（默认）" -#: builtin/grep.c:826 +#: builtin/grep.c:841 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下寻找" -#: builtin/grep.c:830 +#: builtin/grep.c:845 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX 正则表达式" -#: builtin/grep.c:833 +#: builtin/grep.c:848 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正则表达式（默认）" -#: builtin/grep.c:836 +#: builtin/grep.c:851 msgid "interpret patterns as fixed strings" msgstr "把模式解析为固定的字符串" -#: builtin/grep.c:839 +#: builtin/grep.c:854 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的正则表达式" -#: builtin/grep.c:842 +#: builtin/grep.c:857 msgid "show line numbers" msgstr "显示行号" -#: builtin/grep.c:843 +#: builtin/grep.c:858 msgid "show column number of first match" msgstr "显示第一个匹配的列号" -#: builtin/grep.c:844 +#: builtin/grep.c:859 msgid "don't show filenames" msgstr "不显示文件名" -#: builtin/grep.c:845 +#: builtin/grep.c:860 msgid "show filenames" msgstr "显示文件名" -#: builtin/grep.c:847 +#: builtin/grep.c:862 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/grep.c:849 +#: builtin/grep.c:864 msgid "show only filenames instead of matching lines" msgstr "只显示文件名而不显示匹配的行" -#: builtin/grep.c:851 +#: builtin/grep.c:866 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同义" -#: builtin/grep.c:854 +#: builtin/grep.c:869 msgid "show only the names of files without match" msgstr "只显示未匹配的文件名" -#: builtin/grep.c:856 +#: builtin/grep.c:871 msgid "print NUL after filenames" msgstr "在文件名后输出 NUL 字符" -#: builtin/grep.c:859 +#: builtin/grep.c:874 msgid "show only matching parts of a line" msgstr "只显示行中的匹配的部分" -#: builtin/grep.c:861 +#: builtin/grep.c:876 msgid "show the number of matches instead of matching lines" msgstr "显示总匹配行数，而不显示匹配的行" -#: builtin/grep.c:862 +#: builtin/grep.c:877 msgid "highlight matches" msgstr "高亮显示匹配项" -#: builtin/grep.c:864 +#: builtin/grep.c:879 msgid "print empty line between matches from different files" msgstr "在不同文件的匹配项之间打印空行" -#: builtin/grep.c:866 +#: builtin/grep.c:881 msgid "show filename only once above matches from same file" msgstr "只在同一文件的匹配项的上面显示一次文件名" -#: builtin/grep.c:869 +#: builtin/grep.c:884 msgid "show <n> context lines before and after matches" msgstr "显示匹配项前后的 <n> 行上下文" -#: builtin/grep.c:872 +#: builtin/grep.c:887 msgid "show <n> context lines before matches" msgstr "显示匹配项前 <n> 行上下文" -#: builtin/grep.c:874 +#: builtin/grep.c:889 msgid "show <n> context lines after matches" msgstr "显示匹配项后 <n> 行上下文" -#: builtin/grep.c:876 +#: builtin/grep.c:891 msgid "use <n> worker threads" msgstr "使用 <n> 个工作线程" -#: builtin/grep.c:877 +#: builtin/grep.c:892 msgid "shortcut for -C NUM" msgstr "快捷键 -C 数字" -#: builtin/grep.c:880 +#: builtin/grep.c:895 msgid "show a line with the function name before matches" msgstr "在匹配的前面显示一行函数名" -#: builtin/grep.c:882 +#: builtin/grep.c:897 msgid "show the surrounding function" msgstr "显示所在函数的前后内容" -#: builtin/grep.c:885 +#: builtin/grep.c:900 msgid "read patterns from file" msgstr "从文件读取模式" -#: builtin/grep.c:887 +#: builtin/grep.c:902 msgid "match <pattern>" msgstr "匹配 <模式>" -#: builtin/grep.c:889 +#: builtin/grep.c:904 msgid "combine patterns specified with -e" msgstr "组合用 -e 参数设定的模式" -#: builtin/grep.c:901 +#: builtin/grep.c:916 msgid "indicate hit with exit status without output" msgstr "不输出，而用退出码标识命中状态" -#: builtin/grep.c:903 +#: builtin/grep.c:918 msgid "show only matches from files that match all patterns" msgstr "只显示匹配所有模式的文件中的匹配" -#: builtin/grep.c:905 +#: builtin/grep.c:920 msgid "show parse tree for grep expression" msgstr "显示 grep 表达式的解析树" -#: builtin/grep.c:909 +#: builtin/grep.c:924 msgid "pager" msgstr "分页" -#: builtin/grep.c:909 +#: builtin/grep.c:924 msgid "show matching files in the pager" msgstr "分页显示匹配的文件" -#: builtin/grep.c:913 +#: builtin/grep.c:928 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c:977 +#: builtin/grep.c:992 msgid "no pattern given" msgstr "未提供匹配模式" -#: builtin/grep.c:1013 +#: builtin/grep.c:1028 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同时使用" -#: builtin/grep.c:1020 +#: builtin/grep.c:1036 #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" -#: builtin/grep.c:1051 +#: builtin/grep.c:1067 msgid "invalid option combination, ignoring --threads" msgstr "无效的选项组合，忽略 --threads" -#: builtin/grep.c:1054 builtin/pack-objects.c:3397 +#: builtin/grep.c:1070 builtin/pack-objects.c:3400 msgid "no threads support, ignoring --threads" msgstr "没有线程支持，忽略 --threads" -#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716 +#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" -#: builtin/grep.c:1080 +#: builtin/grep.c:1096 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:1103 +#: builtin/grep.c:1119 msgid "option not supported with --recurse-submodules" msgstr "选项不支持和 --recurse-submodules 共用" -#: builtin/grep.c:1109 +#: builtin/grep.c:1125 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached 或 --untracked 不能与 --no-index 同时使用" -#: builtin/grep.c:1115 +#: builtin/grep.c:1131 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard 不能用于已跟踪内容" -#: builtin/grep.c:1123 +#: builtin/grep.c:1139 msgid "both --cached and trees are given" msgstr "同时给出了 --cached 和树对象" -#: builtin/hash-object.c:84 +#: builtin/hash-object.c:85 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -11535,36 +14181,32 @@ msgstr "" "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " "[--] <文件>..." -#: builtin/hash-object.c:85 +#: builtin/hash-object.c:86 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:97 -msgid "type" -msgstr "类型" - -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "object type" msgstr "对象类型" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "write the object into the object database" msgstr "将对象写入对象数据库" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "read the object from stdin" msgstr "从标准输入读取对象" -#: builtin/hash-object.c:102 +#: builtin/hash-object.c:103 msgid "store file as is without filters" msgstr "原样存储文件不使用过滤器" -#: builtin/hash-object.c:103 +#: builtin/hash-object.c:104 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" -#: builtin/hash-object.c:104 +#: builtin/hash-object.c:105 msgid "process file as it were from this path" msgstr "处理文件并假设其来自于此路径" @@ -11604,30 +14246,30 @@ msgstr "打印命令描述" msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" -#: builtin/help.c:73 +#: builtin/help.c:77 #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" -#: builtin/help.c:100 +#: builtin/help.c:104 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" -#: builtin/help.c:113 +#: builtin/help.c:117 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" -#: builtin/help.c:121 +#: builtin/help.c:125 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179 +#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 #, c-format msgid "failed to exec '%s'" msgstr "执行 '%s' 失败" -#: builtin/help.c:217 +#: builtin/help.c:221 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -11636,7 +14278,7 @@ msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" "请使用 'man.<工具>.cmd'。" -#: builtin/help.c:229 +#: builtin/help.c:233 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -11645,327 +14287,317 @@ msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<工具>.path'。" -#: builtin/help.c:346 +#: builtin/help.c:350 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:363 +#: builtin/help.c:367 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:371 +#: builtin/help.c:375 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:430 builtin/help.c:441 git.c:322 +#: builtin/help.c:434 builtin/help.c:445 git.c:336 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的别名" -#: builtin/help.c:444 +#: builtin/help.c:448 git.c:365 #, c-format msgid "bad alias.%s string: %s" msgstr "坏的 alias.%s 字符串：%s" -#: builtin/help.c:473 builtin/help.c:503 +#: builtin/help.c:477 builtin/help.c:507 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:487 +#: builtin/help.c:491 msgid "'git help config' for more information" msgstr "'git help config' 获取更多信息" -#: builtin/index-pack.c:184 +#: builtin/index-pack.c:185 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型不匹配" -#: builtin/index-pack.c:204 +#: builtin/index-pack.c:205 #, c-format msgid "did not receive expected object %s" msgstr "未能获取预期的对象 %s" -#: builtin/index-pack.c:207 +#: builtin/index-pack.c:208 #, c-format msgid "object %s: expected type %s, found %s" msgstr "对象 %s：应为类型 %s，却是 %s" -#: builtin/index-pack.c:249 +#: builtin/index-pack.c:258 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "无法填充 %d 字节" msgstr[1] "无法填充 %d 字节" -#: builtin/index-pack.c:259 +#: builtin/index-pack.c:268 msgid "early EOF" msgstr "过早的文件结束符（EOF）" -#: builtin/index-pack.c:260 +#: builtin/index-pack.c:269 msgid "read error on input" msgstr "输入上的读错误" -#: builtin/index-pack.c:272 +#: builtin/index-pack.c:281 msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" -#: builtin/index-pack.c:279 builtin/pack-objects.c:598 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" -#: builtin/index-pack.c:282 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "包超过了最大允许值" -#: builtin/index-pack.c:297 -#, c-format -msgid "unable to create '%s'" -msgstr "不能创建 '%s'" - -#: builtin/index-pack.c:303 +#: builtin/index-pack.c:312 #, c-format msgid "cannot open packfile '%s'" msgstr "无法打开包文件 '%s'" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:326 msgid "pack signature mismatch" msgstr "包签名不匹配" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:328 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "不支持包版本 %<PRIu32>" -#: builtin/index-pack.c:337 +#: builtin/index-pack.c:346 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s" -#: builtin/index-pack.c:457 +#: builtin/index-pack.c:466 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" -#: builtin/index-pack.c:506 +#: builtin/index-pack.c:515 msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" -#: builtin/index-pack.c:514 +#: builtin/index-pack.c:523 msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" -#: builtin/index-pack.c:522 +#: builtin/index-pack.c:531 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" -#: builtin/index-pack.c:553 +#: builtin/index-pack.c:562 msgid "cannot pread pack file" msgstr "无法读取包文件" -#: builtin/index-pack.c:555 +#: builtin/index-pack.c:564 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "包文件过早结束，缺少 %<PRIuMAX> 字节" msgstr[1] "包文件过早结束，缺少 %<PRIuMAX> 字节" -#: builtin/index-pack.c:581 +#: builtin/index-pack.c:590 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" -#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755 -#: builtin/index-pack.c:794 builtin/index-pack.c:803 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 +#: builtin/index-pack.c:803 builtin/index-pack.c:812 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:729 builtin/pack-objects.c:151 -#: builtin/pack-objects.c:211 builtin/pack-objects.c:305 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 #, c-format msgid "unable to read %s" msgstr "不能读 %s" -#: builtin/index-pack.c:792 +#: builtin/index-pack.c:801 #, c-format msgid "cannot read existing object info %s" msgstr "不能读取现存对象信息 %s" -#: builtin/index-pack.c:800 +#: builtin/index-pack.c:809 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:823 #, c-format msgid "invalid blob object %s" msgstr "无效的数据对象 %s" -#: builtin/index-pack.c:817 builtin/index-pack.c:836 +#: builtin/index-pack.c:826 builtin/index-pack.c:845 msgid "fsck error in packed object" msgstr "对打包对象 fsck 检查出错" -#: builtin/index-pack.c:833 -#, c-format -msgid "invalid %s" -msgstr "无效的 %s" - -#: builtin/index-pack.c:838 +#: builtin/index-pack.c:847 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" -#: builtin/index-pack.c:910 builtin/index-pack.c:941 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "应用 delta 失败" -#: builtin/index-pack.c:1109 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c:1109 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c:1143 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" -#: builtin/index-pack.c:1148 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "不能对包文件调用 fstat" -#: builtin/index-pack.c:1151 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1172 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" -#: builtin/index-pack.c:1186 +#: builtin/index-pack.c:1195 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程：%s" -#: builtin/index-pack.c:1237 +#: builtin/index-pack.c:1246 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1243 +#: builtin/index-pack.c:1252 #, 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:1255 +#: builtin/index-pack.c:1264 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" -#: builtin/index-pack.c:1259 +#: builtin/index-pack.c:1268 #, 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:1283 +#: builtin/index-pack.c:1292 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1360 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1374 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包文件名 '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1399 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "无法写入 %s 文件 '%s'" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "无法关闭已写入的 %s 文件 '%s'" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1445 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1453 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "坏的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1565 +#: builtin/index-pack.c:1593 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1567 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1615 +#: builtin/index-pack.c:1643 #, 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:1622 +#: builtin/index-pack.c:1650 #, 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:1659 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: builtin/index-pack.c:1708 builtin/index-pack.c:1711 -#: builtin/index-pack.c:1727 builtin/index-pack.c:1731 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1747 +#: builtin/index-pack.c:1777 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1749 +#: builtin/index-pack.c:1779 msgid "--stdin requires a git repository" msgstr "--stdin 需要一个 git 仓库" -#: builtin/index-pack.c:1755 +#: builtin/index-pack.c:1785 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包文件名参数" -#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:581 msgid "fsck error in pack objects" msgstr "在打包对象中 fsck 检查出错" @@ -12009,42 +14641,42 @@ msgstr "没有在 %s 中找到模版" msgid "not copying templates from '%s': %s" msgstr "没有从 '%s' 复制模版：%s" -#: builtin/init-db.c:329 +#: builtin/init-db.c:334 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" -#: builtin/init-db.c:332 +#: builtin/init-db.c:337 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" -#: builtin/init-db.c:349 builtin/init-db.c:352 +#: builtin/init-db.c:354 builtin/init-db.c:357 #, c-format msgid "%s already exists" msgstr "%s 已经存在" -#: builtin/init-db.c:405 +#: builtin/init-db.c:413 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:406 +#: builtin/init-db.c:414 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:410 +#: builtin/init-db.c:418 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "已初始化空的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:411 +#: builtin/init-db.c:419 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "已初始化空的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:460 +#: builtin/init-db.c:468 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -12052,37 +14684,37 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " "[<目录>]" -#: builtin/init-db.c:483 +#: builtin/init-db.c:491 msgid "permissions" msgstr "权限" -#: builtin/init-db.c:484 +#: builtin/init-db.c:492 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 仓库是多个用户之间共享的" -#: builtin/init-db.c:518 builtin/init-db.c:523 +#: builtin/init-db.c:529 builtin/init-db.c:534 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:527 +#: builtin/init-db.c:538 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:548 +#: builtin/init-db.c:559 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）" -#: builtin/init-db.c:576 +#: builtin/init-db.c:587 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" -#: builtin/interpret-trailers.c:15 +#: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<token>[(=|:)<value>])...] [<file>...]" @@ -12090,561 +14722,566 @@ msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" ">])...] [<文件>...]" -#: builtin/interpret-trailers.c:94 +#: builtin/interpret-trailers.c:95 msgid "edit files in place" msgstr "在原位编辑文件" -#: builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:96 msgid "trim empty trailers" msgstr "删除空的尾部署名" -#: builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:99 msgid "where to place the new trailer" msgstr "在哪里放置新的尾部署名" -#: builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:101 msgid "action if trailer already exists" msgstr "当尾部署名已经存在时所采取的动作" -#: builtin/interpret-trailers.c:102 +#: builtin/interpret-trailers.c:103 msgid "action if trailer is missing" msgstr "当尾部署名缺失时所采取的动作" -#: builtin/interpret-trailers.c:104 +#: builtin/interpret-trailers.c:105 msgid "output only the trailers" msgstr "只输出尾部署名" -#: builtin/interpret-trailers.c:105 +#: builtin/interpret-trailers.c:106 msgid "do not apply config rules" msgstr "不要应用配置规则" -#: builtin/interpret-trailers.c:106 +#: builtin/interpret-trailers.c:107 msgid "join whitespace-continued values" msgstr "连接空白折行的值" -#: builtin/interpret-trailers.c:107 +#: builtin/interpret-trailers.c:108 msgid "set parsing options" msgstr "设置解析选项" -#: builtin/interpret-trailers.c:109 +#: builtin/interpret-trailers.c:110 msgid "do not treat --- specially" msgstr "不要对 --- 特殊处理" -#: builtin/interpret-trailers.c:110 +#: builtin/interpret-trailers.c:111 msgid "trailer" msgstr "尾部署名" -#: builtin/interpret-trailers.c:111 +#: builtin/interpret-trailers.c:112 msgid "trailer(s) to add" msgstr "要添加的尾部署名" -#: builtin/interpret-trailers.c:120 +#: builtin/interpret-trailers.c:123 msgid "--trailer with --only-input does not make sense" msgstr "--trailer 和 --only-input 同时使用没有意义" -#: builtin/interpret-trailers.c:130 +#: builtin/interpret-trailers.c:133 msgid "no input file given for in-place editing" msgstr "没有给出要原位编辑的文件" -#: builtin/log.c:54 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" -#: builtin/log.c:55 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "git show [<选项>] <对象>..." -#: builtin/log.c:99 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "无效的 --decorate 选项：%s" -#: builtin/log.c:162 -msgid "suppress diff output" -msgstr "不显示差异输出" - -#: builtin/log.c:163 +#: builtin/log.c:174 msgid "show source" msgstr "显示源" -#: builtin/log.c:164 +#: builtin/log.c:175 msgid "Use mail map file" msgstr "使用邮件映射文件" -#: builtin/log.c:166 +#: builtin/log.c:177 msgid "only decorate refs that match <pattern>" msgstr "只修饰与 <模式> 匹配的引用" -#: builtin/log.c:168 +#: builtin/log.c:179 msgid "do not decorate refs that match <pattern>" msgstr "不修饰和 <模式> 匹配的引用" -#: builtin/log.c:169 +#: builtin/log.c:180 msgid "decorate options" msgstr "修饰选项" -#: builtin/log.c:172 +#: builtin/log.c:183 msgid "Process line range n,m in file, counting from 1" msgstr "处理文件中第 n 到 m 之间的行，从 1 开始" -#: builtin/log.c:270 +#: builtin/log.c:281 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:522 +#: builtin/log.c:535 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 损坏的文件" -#: builtin/log.c:537 builtin/log.c:631 +#: builtin/log.c:550 builtin/log.c:645 #, c-format -msgid "Could not read object %s" +msgid "could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:655 +#: builtin/log.c:670 #, c-format -msgid "Unknown type: %d" +msgid "unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:776 +#: builtin/log.c:814 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "%s：从描述生成附函的模式无效" + +#: builtin/log.c:821 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:877 +#: builtin/log.c:936 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:893 +#: builtin/log.c:952 #, c-format -msgid "Cannot open patch file %s" +msgid "cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:910 -msgid "Need exactly one range." -msgstr "只需要一个范围。" +#: builtin/log.c:969 +msgid "need exactly one range" +msgstr "只需要一个范围" + +#: builtin/log.c:979 +msgid "not a range" +msgstr "不是一个范围" -#: builtin/log.c:920 -msgid "Not a range." -msgstr "不是一个范围。" +#: builtin/log.c:1143 +msgid "cover letter needs email format" +msgstr "附函需要邮件地址格式" -#: builtin/log.c:1043 -msgid "Cover letter needs email format" -msgstr "信封需要邮件地址格式" +#: builtin/log.c:1149 +msgid "failed to create cover-letter file" +msgstr "无法创建附函文件" -#: builtin/log.c:1119 +#: builtin/log.c:1228 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1146 +#: builtin/log.c:1255 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" -#: builtin/log.c:1204 -msgid "Two output directories?" +#: builtin/log.c:1313 +msgid "two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068 +#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 #, c-format -msgid "Unknown commit %s" +msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526 +#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/replace.c:210 #, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "无法解析 '%s' 为一个有效引用。" +msgid "failed to resolve '%s' as a valid ref" +msgstr "无法将 '%s' 解析为一个有效引用" -#: builtin/log.c:1326 -msgid "Could not find exact merge base." -msgstr "不能找到准确的合并基线。" +#: builtin/log.c:1439 +msgid "could not find exact merge base" +msgstr "不能找到准确的合并基线" -#: builtin/log.c:1330 +#: builtin/log.c:1443 msgid "" -"Failed to get upstream, if you want to record base commit automatically,\n" +"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" -"Or you could specify base commit by --base=<base-commit-id> manually." +"Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" "无法得到上游地址，如果你想自动记录基线提交，请使用命令\n" "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" -"参数 --base=<基线提交> 手动指定一个基线提交。" +"参数 --base=<基线提交> 手动指定一个基线提交" -#: builtin/log.c:1350 -msgid "Failed to find exact merge base" +#: builtin/log.c:1463 +msgid "failed to find exact merge base" msgstr "无法找到准确的合并基线" -#: builtin/log.c:1361 +#: builtin/log.c:1474 msgid "base commit should be the ancestor of revision list" msgstr "基线提交应该是版本列表的祖先" -#: builtin/log.c:1365 +#: builtin/log.c:1478 msgid "base commit shouldn't be in revision list" msgstr "基线提交不应该出现在版本列表中" -#: builtin/log.c:1418 +#: builtin/log.c:1531 msgid "cannot get patch id" msgstr "无法得到补丁 id" -#: builtin/log.c:1470 +#: builtin/log.c:1583 msgid "failed to infer range-diff ranges" msgstr "无法推断 range-diff 范围" -#: builtin/log.c:1515 +#: builtin/log.c:1629 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" -#: builtin/log.c:1518 +#: builtin/log.c:1632 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" -#: builtin/log.c:1522 +#: builtin/log.c:1636 msgid "print patches to standard out" msgstr "打印补丁到标准输出" -#: builtin/log.c:1524 +#: builtin/log.c:1638 msgid "generate a cover letter" -msgstr "生成一封附信" +msgstr "生成一封附函" -#: builtin/log.c:1526 +#: builtin/log.c:1640 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c:1527 +#: builtin/log.c:1641 msgid "sfx" msgstr "后缀" -#: builtin/log.c:1528 +#: builtin/log.c:1642 msgid "use <sfx> instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c:1530 +#: builtin/log.c:1644 msgid "start numbering patches at <n> instead of 1" msgstr "补丁以 <n> 开始编号，而不是1" -#: builtin/log.c:1532 +#: builtin/log.c:1646 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" -#: builtin/log.c:1534 +#: builtin/log.c:1648 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1537 +#: builtin/log.c:1651 +msgid "cover-from-description-mode" +msgstr "从分支描述获取附函的模式" + +#: builtin/log.c:1652 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "基于一个分支描述生成部分附函" + +#: builtin/log.c:1654 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c:1540 +#: builtin/log.c:1657 msgid "store resulting files in <dir>" msgstr "把结果文件存储在 <目录>" -#: builtin/log.c:1543 +#: builtin/log.c:1660 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" -#: builtin/log.c:1546 +#: builtin/log.c:1663 msgid "don't output binary diffs" msgstr "不输出二进制差异" -#: builtin/log.c:1548 +#: builtin/log.c:1665 msgid "output all-zero hash in From header" msgstr "在 From 头信息中输出全为零的哈希值" -#: builtin/log.c:1550 +#: builtin/log.c:1667 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c:1552 +#: builtin/log.c:1669 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" -#: builtin/log.c:1554 +#: builtin/log.c:1671 msgid "Messaging" msgstr "邮件发送" -#: builtin/log.c:1555 +#: builtin/log.c:1672 msgid "header" msgstr "header" -#: builtin/log.c:1556 +#: builtin/log.c:1673 msgid "add email header" msgstr "添加邮件头" -#: builtin/log.c:1557 builtin/log.c:1559 +#: builtin/log.c:1674 builtin/log.c:1676 msgid "email" msgstr "邮件地址" -#: builtin/log.c:1557 +#: builtin/log.c:1674 msgid "add To: header" msgstr "添加收件人" -#: builtin/log.c:1559 +#: builtin/log.c:1676 msgid "add Cc: header" msgstr "添加抄送" -#: builtin/log.c:1561 +#: builtin/log.c:1678 msgid "ident" msgstr "标识" -#: builtin/log.c:1562 +#: builtin/log.c:1679 msgid "set From address to <ident> (or committer ident if absent)" msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）" -#: builtin/log.c:1564 +#: builtin/log.c:1681 msgid "message-id" msgstr "邮件标识" -#: builtin/log.c:1565 +#: builtin/log.c:1682 msgid "make first mail a reply to <message-id>" msgstr "使第一封邮件作为对 <邮件标识> 的回复" -#: builtin/log.c:1566 builtin/log.c:1569 +#: builtin/log.c:1683 builtin/log.c:1686 msgid "boundary" msgstr "边界" -#: builtin/log.c:1567 +#: builtin/log.c:1684 msgid "attach the patch" msgstr "附件方式添加补丁" -#: builtin/log.c:1570 +#: builtin/log.c:1687 msgid "inline the patch" msgstr "内联显示补丁" -#: builtin/log.c:1574 +#: builtin/log.c:1691 msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索，风格：浅，深" -#: builtin/log.c:1576 +#: builtin/log.c:1693 msgid "signature" msgstr "签名" -#: builtin/log.c:1577 +#: builtin/log.c:1694 msgid "add a signature" msgstr "添加一个签名" -#: builtin/log.c:1578 +#: builtin/log.c:1695 msgid "base-commit" msgstr "基线提交" -#: builtin/log.c:1579 +#: builtin/log.c:1696 msgid "add prerequisite tree info to the patch series" msgstr "为补丁列表添加前置树信息" -#: builtin/log.c:1581 +#: builtin/log.c:1698 msgid "add a signature from a file" msgstr "从文件添加一个签名" -#: builtin/log.c:1582 +#: builtin/log.c:1699 msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" -#: builtin/log.c:1584 +#: builtin/log.c:1701 msgid "show progress while generating patches" msgstr "在生成补丁时显示进度" -#: builtin/log.c:1585 -msgid "rev" -msgstr "版本" - -#: builtin/log.c:1586 +#: builtin/log.c:1703 msgid "show changes against <rev> in cover letter or single patch" msgstr "在附函或单个补丁中显示和 <rev> 的差异" -#: builtin/log.c:1589 +#: builtin/log.c:1706 msgid "show changes against <refspec> in cover letter or single patch" msgstr "在附函或单个补丁中显示和 <refspec> 的差异" -#: builtin/log.c:1591 +#: builtin/log.c:1708 msgid "percentage by which creation is weighted" msgstr "创建权重的百分比" -#: builtin/log.c:1666 +#: builtin/log.c:1792 #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" -#: builtin/log.c:1681 +#: builtin/log.c:1807 msgid "-n and -k are mutually exclusive" msgstr "-n 和 -k 互斥" -#: builtin/log.c:1683 +#: builtin/log.c:1809 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc 和 -k 互斥" -#: builtin/log.c:1691 +#: builtin/log.c:1817 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1693 +#: builtin/log.c:1819 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1695 +#: builtin/log.c:1821 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1727 +#: builtin/log.c:1854 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1729 -#, c-format -msgid "Could not create directory '%s'" -msgstr "不能创建目录 '%s'" - -#: builtin/log.c:1816 +#: builtin/log.c:1958 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:1820 +#: builtin/log.c:1962 msgid "Interdiff:" msgstr "版本间差异：" -#: builtin/log.c:1821 +#: builtin/log.c:1963 #, c-format msgid "Interdiff against v%d:" msgstr "对 v%d 的版本差异：" -#: builtin/log.c:1827 +#: builtin/log.c:1969 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor 需要 --range-diff" -#: builtin/log.c:1831 +#: builtin/log.c:1973 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:1839 +#: builtin/log.c:1981 msgid "Range-diff:" msgstr "范围差异：" -#: builtin/log.c:1840 +#: builtin/log.c:1982 #, c-format msgid "Range-diff against v%d:" msgstr "对 v%d 的范围差异：" -#: builtin/log.c:1851 +#: builtin/log.c:1993 #, c-format msgid "unable to read signature file '%s'" msgstr "无法读取签名文件 '%s'" -#: builtin/log.c:1887 +#: builtin/log.c:2029 msgid "Generating patches" msgstr "生成补丁" -#: builtin/log.c:1931 -msgid "Failed to create output files" +#: builtin/log.c:2073 +msgid "failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:1989 +#: builtin/log.c:2132 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:2043 +#: builtin/log.c:2186 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:470 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<选项>] [<文件>...]" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:526 msgid "identify the file status with tags" msgstr "用标签标识文件的状态" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:528 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小写字母表示 '假设未改变的' 文件" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:530 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "使用小写字母表示 'fsmonitor clean' 文件" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:532 msgid "show cached files in the output (default)" msgstr "显示缓存的文件（默认）" -#: builtin/ls-files.c:533 +#: builtin/ls-files.c:534 msgid "show deleted files in the output" msgstr "显示已删除的文件" -#: builtin/ls-files.c:535 +#: builtin/ls-files.c:536 msgid "show modified files in the output" msgstr "显示已修改的文件" -#: builtin/ls-files.c:537 +#: builtin/ls-files.c:538 msgid "show other files in the output" msgstr "显示其它文件" -#: builtin/ls-files.c:539 +#: builtin/ls-files.c:540 msgid "show ignored files in the output" msgstr "显示忽略的文件" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:543 msgid "show staged contents' object name in the output" msgstr "显示暂存区内容的对象名称" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:545 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需要删除的文件" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:547 msgid "show 'other' directories' names only" msgstr "只显示“其他”目录的名称" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:549 msgid "show line endings of files" msgstr "显示文件换行符格式" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:551 msgid "don't show empty directories" msgstr "不显示空目录" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:554 msgid "show unmerged files in the output" msgstr "显示未合并的文件" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:556 msgid "show resolve-undo information" msgstr "显示 resolve-undo 信息" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:558 msgid "skip files matching pattern" msgstr "匹配排除文件的模式" -#: builtin/ls-files.c:560 +#: builtin/ls-files.c:561 msgid "exclude patterns are read from <file>" msgstr "从 <文件> 中读取排除模式" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:564 msgid "read additional per-directory exclude patterns in <file>" msgstr "从 <文件> 读取额外的每个目录的排除模式" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:566 msgid "add the standard git exclusions" msgstr "添加标准的 git 排除" -#: builtin/ls-files.c:569 +#: builtin/ls-files.c:570 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/ls-files.c:572 +#: builtin/ls-files.c:573 msgid "recurse through submodules" msgstr "在子模组中递归" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:575 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都不在索引区，视为错误" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "tree-ish" -msgstr "树或提交" +msgstr "树对象" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "pretend that paths removed since <tree-ish> are still present" -msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" +msgstr "假装自从 <树对象> 之后删除的路径仍然存在" -#: builtin/ls-files.c:578 +#: builtin/ls-files.c:579 msgid "show debugging data" msgstr "显示调试数据" @@ -12662,7 +15299,7 @@ msgstr "" msgid "do not print remote URL" msgstr "不打印远程 URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1518 msgid "exec" msgstr "exec" @@ -12686,17 +15323,17 @@ msgstr "不显示已解析的标签" msgid "take url.<base>.insteadOf into account" msgstr "参考 url.<base>.insteadOf 设置" -#: builtin/ls-remote.c:73 +#: builtin/ls-remote.c:72 msgid "exit with exit code 2 if no matching refs are found" msgstr "若未找到匹配的引用则以退出码2退出" -#: builtin/ls-remote.c:76 +#: builtin/ls-remote.c:75 msgid "show underlying ref in addition to the object pointed by it" msgstr "除了显示指向的对象外，显示指向的引用名" #: builtin/ls-tree.c:30 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" -msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" +msgstr "git ls-tree [<选项>] <树对象> [<路径>...]" #: builtin/ls-tree.c:128 msgid "only show trees" @@ -12735,256 +15372,277 @@ msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）" msgid "empty mbox: '%s'" msgstr "空的 mbox：'%s'" -#: builtin/merge.c:52 +#: builtin/merge.c:55 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<选项>] [<提交>...]" -#: builtin/merge.c:53 +#: builtin/merge.c:56 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:54 +#: builtin/merge.c:57 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:111 +#: builtin/merge.c:118 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" -#: builtin/merge.c:177 +#: builtin/merge.c:141 +#, c-format +msgid "option `%s' requires a value" +msgstr "选项 `%s' 需要一个值" + +#: builtin/merge.c:187 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合并策略 '%s'。\n" -#: builtin/merge.c:178 +#: builtin/merge.c:188 #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" -#: builtin/merge.c:183 +#: builtin/merge.c:193 #, c-format msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" -#: builtin/merge.c:234 builtin/pull.c:143 +#: builtin/merge.c:244 builtin/pull.c:152 msgid "do not show a diffstat at the end of the merge" msgstr "在合并的最后不显示差异统计" -#: builtin/merge.c:237 builtin/pull.c:146 +#: builtin/merge.c:247 builtin/pull.c:155 msgid "show a diffstat at the end of the merge" msgstr "在合并的最后显示差异统计" -#: builtin/merge.c:238 builtin/pull.c:149 +#: builtin/merge.c:248 builtin/pull.c:158 msgid "(synonym to --stat)" msgstr "（和 --stat 同义）" -#: builtin/merge.c:240 builtin/pull.c:152 +#: builtin/merge.c:250 builtin/pull.c:161 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录" -#: builtin/merge.c:243 builtin/pull.c:158 +#: builtin/merge.c:253 builtin/pull.c:167 msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" -#: builtin/merge.c:245 builtin/pull.c:161 +#: builtin/merge.c:255 builtin/pull.c:170 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功，执行一次提交（默认）" -#: builtin/merge.c:247 builtin/pull.c:164 +#: builtin/merge.c:257 builtin/pull.c:173 msgid "edit message before committing" msgstr "在提交前编辑提交说明" -#: builtin/merge.c:248 +#: builtin/merge.c:259 msgid "allow fast-forward (default)" msgstr "允许快进（默认）" -#: builtin/merge.c:250 builtin/pull.c:170 +#: builtin/merge.c:261 builtin/pull.c:180 msgid "abort if fast-forward is not possible" msgstr "如果不能快进就放弃合并" -#: builtin/merge.c:254 builtin/pull.c:173 +#: builtin/merge.c:265 builtin/pull.c:183 msgid "verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177 -#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 +#: builtin/rebase.c:512 builtin/rebase.c:1531 builtin/revert.c:114 msgid "strategy" msgstr "策略" -#: builtin/merge.c:256 builtin/pull.c:178 +#: builtin/merge.c:267 builtin/pull.c:188 msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c:257 builtin/pull.c:181 +#: builtin/merge.c:268 builtin/pull.c:191 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:258 builtin/pull.c:182 +#: builtin/merge.c:269 builtin/pull.c:192 msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" -#: builtin/merge.c:260 +#: builtin/merge.c:271 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明（针对非快进式合并）" -#: builtin/merge.c:267 +#: builtin/merge.c:278 msgid "abort the current in-progress merge" msgstr "放弃当前正在进行的合并" -#: builtin/merge.c:269 +# +#: builtin/merge.c:280 +msgid "--abort but leave index and working tree alone" +msgstr "--abort，但是保留索引和工作区" + +#: builtin/merge.c:282 msgid "continue the current in-progress merge" msgstr "继续当前正在进行的合并" -#: builtin/merge.c:271 builtin/pull.c:189 +#: builtin/merge.c:284 builtin/pull.c:199 msgid "allow merging unrelated histories" msgstr "允许合并不相关的历史" -#: builtin/merge.c:277 -msgid "verify commit-msg hook" -msgstr "校验 commit-msg 钩子" +#: builtin/merge.c:290 +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "绕过 pre-merge-commit 和 commit-msg 钩子" -#: builtin/merge.c:302 +#: builtin/merge.c:307 msgid "could not run stash." msgstr "不能运行贮藏。" -#: builtin/merge.c:307 +#: builtin/merge.c:312 msgid "stash failed" msgstr "贮藏失败" -#: builtin/merge.c:312 +#: builtin/merge.c:317 #, c-format msgid "not a valid object: %s" msgstr "不是一个有效对象：%s" -#: builtin/merge.c:334 builtin/merge.c:351 +#: builtin/merge.c:339 builtin/merge.c:356 msgid "read-tree failed" msgstr "读取树失败" # 译者：注意保持前导空格 -#: builtin/merge.c:381 +#: builtin/merge.c:386 msgid " (nothing to squash)" msgstr " （无可压缩）" -#: builtin/merge.c:392 +#: builtin/merge.c:397 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩提交 -- 未更新 HEAD\n" -#: builtin/merge.c:442 +#: builtin/merge.c:447 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" -#: builtin/merge.c:493 +#: builtin/merge.c:498 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c:580 +#: builtin/merge.c:585 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c:701 +#: builtin/merge.c:705 msgid "Not handling anything other than two heads merge." msgstr "未处理两个头合并之外的任何操作。" -#: builtin/merge.c:715 +#: builtin/merge.c:719 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:730 +#: builtin/merge.c:734 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:782 +#: builtin/merge.c:786 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:791 +#: builtin/merge.c:795 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:797 -#, c-format +#: builtin/merge.c:801 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" "\n" -"Lines starting with '%c' will be ignored, and an empty message aborts\n" -"the commit.\n" msgstr "" "请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n" "合并到主题分支。\n" "\n" -"以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n" -#: builtin/merge.c:833 +#: builtin/merge.c:806 +msgid "An empty message aborts the commit.\n" +msgstr "空的提交说明会终止提交。\n" + +#: builtin/merge.c:809 +#, c-format +msgid "" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n" + +#: builtin/merge.c:862 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:852 +#: builtin/merge.c:877 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:905 +#: builtin/merge.c:938 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:944 +#: builtin/merge.c:977 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:946 +#: builtin/merge.c:979 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程仓库。" -#: builtin/merge.c:948 +#: builtin/merge.c:981 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:953 +#: builtin/merge.c:986 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1010 +#: builtin/merge.c:1043 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" -#: builtin/merge.c:1113 +#: builtin/merge.c:1146 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合并：%s" -#: builtin/merge.c:1147 +#: builtin/merge.c:1180 msgid "not something we can merge" msgstr "不能合并" -#: builtin/merge.c:1250 +#: builtin/merge.c:1283 msgid "--abort expects no arguments" msgstr "--abort 不带参数" -#: builtin/merge.c:1254 +#: builtin/merge.c:1287 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1266 +#: builtin/merge.c:1296 +msgid "--quit expects no arguments" +msgstr "--quit 不带参数" + +#: builtin/merge.c:1309 msgid "--continue expects no arguments" msgstr "--continue 不带参数" -#: builtin/merge.c:1270 +#: builtin/merge.c:1313 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "没有进行中的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1286 +#: builtin/merge.c:1329 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -12992,7 +15650,7 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1293 +#: builtin/merge.c:1336 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -13000,92 +15658,96 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1296 +#: builtin/merge.c:1339 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1305 +#: builtin/merge.c:1353 msgid "You cannot combine --squash with --no-ff." -msgstr "您不能将 --squash 与 --no-ff 同时使用。" +msgstr "您不能将 --squash 和 --no-ff 组合使用。" -#: builtin/merge.c:1313 +#: builtin/merge.c:1355 +msgid "You cannot combine --squash with --commit." +msgstr "您不能将 --squash 和 --commit 组合使用。" + +#: builtin/merge.c:1371 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1330 +#: builtin/merge.c:1388 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1332 +#: builtin/merge.c:1390 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1337 +#: builtin/merge.c:1395 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1339 +#: builtin/merge.c:1397 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1421 +#: builtin/merge.c:1476 msgid "refusing to merge unrelated histories" msgstr "拒绝合并无关的历史" -#: builtin/merge.c:1430 +#: builtin/merge.c:1485 msgid "Already up to date." msgstr "已经是最新的。" -#: builtin/merge.c:1440 +#: builtin/merge.c:1495 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1482 +#: builtin/merge.c:1537 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1489 +#: builtin/merge.c:1544 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1514 +#: builtin/merge.c:1569 msgid "Already up to date. Yeeah!" msgstr "已经是最新的。耶！" -#: builtin/merge.c:1520 +#: builtin/merge.c:1575 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1543 builtin/merge.c:1622 +#: builtin/merge.c:1598 builtin/merge.c:1663 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1547 +#: builtin/merge.c:1602 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1613 +#: builtin/merge.c:1654 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1615 +#: builtin/merge.c:1656 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1624 +#: builtin/merge.c:1665 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1636 +#: builtin/merge.c:1677 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" @@ -13170,33 +15832,33 @@ msgstr "不要警告冲突" msgid "set labels for file1/orig-file/file2" msgstr "为 文件1/初始文件/文件2 设置标签" -#: builtin/merge-recursive.c:45 +#: builtin/merge-recursive.c:47 #, c-format msgid "unknown option %s" msgstr "未知选项 %s" -#: builtin/merge-recursive.c:51 +#: builtin/merge-recursive.c:53 #, c-format msgid "could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: builtin/merge-recursive.c:55 +#: builtin/merge-recursive.c:57 #, 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:63 +#: builtin/merge-recursive.c:65 msgid "not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" -#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 #, c-format msgid "could not resolve ref '%s'" msgstr "无法解析引用 '%s'" -#: builtin/merge-recursive.c:77 +#: builtin/merge-recursive.c:82 #, c-format msgid "Merging %s with %s\n" msgstr "合并 %s 和 %s\n" @@ -13209,7 +15871,7 @@ msgstr "git mktree [-z] [--missing] [--batch]" msgid "input is NUL terminated" msgstr "输入以 NUL 字符终止" -#: builtin/mktree.c:155 builtin/write-tree.c:25 +#: builtin/mktree.c:155 builtin/write-tree.c:26 msgid "allow missing objects" msgstr "允许丢失的对象" @@ -13217,156 +15879,168 @@ msgstr "允许丢失的对象" msgid "allow creation of more than one tree" msgstr "允许创建一个以上的树" -#: builtin/multi-pack-index.c:8 -msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)" -msgstr "git multi-pack-index [--object-dir=<目录>] (write|verify)" +#: builtin/multi-pack-index.c:9 +msgid "" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" +msgstr "git multi-pack-index [<选项>] (write|verify|expire|repack --batch-size=<大小>)" -#: builtin/multi-pack-index.c:21 +#: builtin/multi-pack-index.c:26 msgid "object directory containing set of packfile and pack-index pairs" msgstr "包含成对包文件和包索引的对象目录" -#: builtin/multi-pack-index.c:39 +#: builtin/multi-pack-index.c:29 +msgid "" +"during repack, collect pack-files of smaller size into a batch that is " +"larger than this size" +msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中" + +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "太多参数" -#: builtin/multi-pack-index.c:48 +#: builtin/multi-pack-index.c:60 +msgid "--batch-size option is only for 'repack' subcommand" +msgstr "--batch-size 选项仅用于 'repack' 子命令" + +#: builtin/multi-pack-index.c:69 #, c-format -msgid "unrecognized verb: %s" -msgstr "未能识别的动作：%s" +msgid "unrecognized subcommand: %s" +msgstr "未识别的子命令：%s" -#: builtin/mv.c:17 +#: builtin/mv.c:18 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<选项>] <源>... <目标>" -#: builtin/mv.c:82 +#: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "目录 %s 在索引中并且不是子模组？" -#: builtin/mv.c:84 +#: builtin/mv.c:85 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" -#: builtin/mv.c:102 +#: builtin/mv.c:103 #, c-format msgid "%.*s is in index" msgstr "%.*s 在索引中" -#: builtin/mv.c:124 +#: builtin/mv.c:125 msgid "force move/rename even if target exists" msgstr "强制移动/重命令，即使目标存在" -#: builtin/mv.c:126 +#: builtin/mv.c:127 msgid "skip move/rename errors" msgstr "跳过移动/重命名错误" -#: builtin/mv.c:168 +#: builtin/mv.c:169 #, c-format msgid "destination '%s' is not a directory" msgstr "目标 '%s' 不是一个目录" -#: builtin/mv.c:179 +#: builtin/mv.c:180 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "检查 '%s' 到 '%s' 的重命名\n" -#: builtin/mv.c:183 +#: builtin/mv.c:184 msgid "bad source" msgstr "坏的源" -#: builtin/mv.c:186 +#: builtin/mv.c:187 msgid "can not move directory into itself" msgstr "不能将目录移动到自身" -#: builtin/mv.c:189 +#: builtin/mv.c:190 msgid "cannot move directory over file" msgstr "不能将目录移动到文件" -#: builtin/mv.c:198 +#: builtin/mv.c:199 msgid "source directory is empty" msgstr "源目录为空" -#: builtin/mv.c:223 +#: builtin/mv.c:224 msgid "not under version control" msgstr "不在版本控制之下" -#: builtin/mv.c:226 +#: builtin/mv.c:227 msgid "destination exists" msgstr "目标已存在" -#: builtin/mv.c:234 +#: builtin/mv.c:235 #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" -#: builtin/mv.c:237 +#: builtin/mv.c:238 msgid "Cannot overwrite" msgstr "不能覆盖" -#: builtin/mv.c:240 +#: builtin/mv.c:241 msgid "multiple sources for the same target" msgstr "同一目标具有多个源" -#: builtin/mv.c:242 +#: builtin/mv.c:243 msgid "destination directory does not exist" msgstr "目标目录不存在" -#: builtin/mv.c:249 +#: builtin/mv.c:250 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，源=%s，目标=%s" -#: builtin/mv.c:270 +#: builtin/mv.c:271 #, c-format msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511 +#: builtin/mv.c:277 builtin/remote.c:716 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" -#: builtin/name-rev.c:355 +#: builtin/name-rev.c:403 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<选项>] <提交>..." -#: builtin/name-rev.c:356 +#: builtin/name-rev.c:404 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<选项>] --all" -#: builtin/name-rev.c:357 +#: builtin/name-rev.c:405 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<选项>] --stdin" -#: builtin/name-rev.c:413 +#: builtin/name-rev.c:462 msgid "print only names (no SHA-1)" msgstr "只打印名称（无 SHA-1）" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:463 msgid "only use tags to name the commits" msgstr "只使用标签来命名提交" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:465 msgid "only use refs matching <pattern>" msgstr "只使用和 <模式> 相匹配的引用" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:467 msgid "ignore refs matching <pattern>" msgstr "忽略和 <模式> 相匹配的引用" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:469 msgid "list all commits reachable from all refs" msgstr "列出可以从所有引用访问的提交" -#: builtin/name-rev.c:421 +#: builtin/name-rev.c:470 msgid "read from stdin" msgstr "从标准输入读取" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:471 msgid "allow to print `undefined` names (default)" msgstr "允许打印 `未定义` 的名称（默认）" -#: builtin/name-rev.c:428 +#: builtin/name-rev.c:477 msgid "dereference tags in the input (internal use)" msgstr "反向解析输入中的标签（内部使用）" @@ -13510,14 +16184,14 @@ msgstr "不能写注解对象" msgid "the note contents have been left in %s" msgstr "注解内容被留在 %s 中" -#: builtin/notes.c:242 builtin/tag.c:513 +#: builtin/notes.c:242 builtin/tag.c:532 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" #: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 -#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524 -#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669 +#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 +#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" @@ -13550,38 +16224,38 @@ msgstr "从 '%s' 拷贝注解到 '%s' 时失败" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解" -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507 -#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662 -#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 +#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 +#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 msgid "too many parameters" msgstr "参数太多" -#: builtin/notes.c:389 builtin/notes.c:675 +#: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." msgstr "未发现对象 %s 的注解。" -#: builtin/notes.c:410 builtin/notes.c:573 +#: builtin/notes.c:410 builtin/notes.c:576 msgid "note contents as a string" msgstr "注解内容作为一个字符串" -#: builtin/notes.c:413 builtin/notes.c:576 +#: builtin/notes.c:413 builtin/notes.c:579 msgid "note contents in a file" msgstr "注解内容到一个文件中" -#: builtin/notes.c:416 builtin/notes.c:579 +#: builtin/notes.c:416 builtin/notes.c:582 msgid "reuse and edit specified note object" msgstr "重用和编辑指定的注解对象" -#: builtin/notes.c:419 builtin/notes.c:582 +#: builtin/notes.c:419 builtin/notes.c:585 msgid "reuse specified note object" msgstr "重用指定的注解对象" -#: builtin/notes.c:422 builtin/notes.c:585 +#: builtin/notes.c:422 builtin/notes.c:588 msgid "allow storing empty note" msgstr "允许保存空白注释" -#: builtin/notes.c:423 builtin/notes.c:494 +#: builtin/notes.c:423 builtin/notes.c:496 msgid "replace existing notes" msgstr "替换已存在的注解" @@ -13592,41 +16266,41 @@ msgid "" "existing notes" msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:463 builtin/notes.c:542 +#: builtin/notes.c:463 builtin/notes.c:544 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" -#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899 +#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 #, c-format msgid "Removing note for object %s\n" msgstr "删除对象 %s 的注解\n" -#: builtin/notes.c:495 +#: builtin/notes.c:497 msgid "read objects from stdin" msgstr "从标准输入读取对象" -#: builtin/notes.c:497 +#: builtin/notes.c:499 msgid "load rewriting config for <command> (implies --stdin)" msgstr "重新加载 <命令> 的配置（隐含 --stdin）" -#: builtin/notes.c:515 +#: builtin/notes.c:517 msgid "too few parameters" msgstr "参数太少" -#: builtin/notes.c:536 +#: builtin/notes.c:538 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:548 +#: builtin/notes.c:550 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "源对象 %s 缺少注解。不能拷贝。" -#: builtin/notes.c:600 +#: builtin/notes.c:603 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -13635,97 +16309,97 @@ msgstr "" "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请换用 'git notes add -f -m/-F/-c/-C'。\n" -#: builtin/notes.c:695 +#: builtin/notes.c:698 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "删除引用 NOTES_MERGE_PARTIAL 失败" -#: builtin/notes.c:697 +#: builtin/notes.c:700 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "删除引用 NOTES_MERGE_REF 失败" -#: builtin/notes.c:699 +#: builtin/notes.c:702 msgid "failed to remove 'git notes merge' worktree" msgstr "删除 'git notes merge' 工作区失败" -#: builtin/notes.c:719 +#: builtin/notes.c:722 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "读取引用 NOTES_MERGE_PARTIAL 失败" -#: builtin/notes.c:721 +#: builtin/notes.c:724 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" -#: builtin/notes.c:723 +#: builtin/notes.c:726 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" -#: builtin/notes.c:736 +#: builtin/notes.c:739 msgid "failed to resolve NOTES_MERGE_REF" msgstr "解析 NOTES_MERGE_REF 失败" -#: builtin/notes.c:739 +#: builtin/notes.c:742 msgid "failed to finalize notes merge" msgstr "无法完成注解合并" -#: builtin/notes.c:765 +#: builtin/notes.c:768 #, c-format msgid "unknown notes merge strategy %s" msgstr "未知的注解合并策略 %s" -#: builtin/notes.c:781 +#: builtin/notes.c:784 msgid "General options" msgstr "通用选项" -#: builtin/notes.c:783 +#: builtin/notes.c:786 msgid "Merge options" msgstr "合并选项" -#: builtin/notes.c:785 +#: builtin/notes.c:788 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:787 +#: builtin/notes.c:790 msgid "Committing unmerged notes" msgstr "提交未合并的注解" -#: builtin/notes.c:789 +#: builtin/notes.c:792 msgid "finalize notes merge by committing unmerged notes" msgstr "通过提交未合并的注解来完成注解合并" -#: builtin/notes.c:791 +#: builtin/notes.c:794 msgid "Aborting notes merge resolution" msgstr "中止注解合并的方案" -#: builtin/notes.c:793 +#: builtin/notes.c:796 msgid "abort notes merge" msgstr "中止注解合并" -#: builtin/notes.c:804 +#: builtin/notes.c:807 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "不能混用 --commit、--abort 或 -s/--strategy" -#: builtin/notes.c:809 +#: builtin/notes.c:812 msgid "must specify a notes ref to merge" msgstr "必须指定一个注解引用来合并" -#: builtin/notes.c:833 +#: builtin/notes.c:836 #, c-format msgid "unknown -s/--strategy: %s" msgstr "未知的 -s/--strategy：%s" -#: builtin/notes.c:870 +#: builtin/notes.c:873 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" -#: builtin/notes.c:873 +#: builtin/notes.c:876 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "无法存储链接到当前的注解引用（%s）" -#: builtin/notes.c:875 +#: builtin/notes.c:878 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -13735,169 +16409,173 @@ msgstr "" "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" "交结果，或者使用命令 'git notes merge --abort' 终止合并。\n" -#: builtin/notes.c:897 +#: builtin/notes.c:897 builtin/tag.c:545 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "无法解析 '%s' 为一个有效引用。" + +#: builtin/notes.c:900 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" -#: builtin/notes.c:909 +#: builtin/notes.c:912 msgid "attempt to remove non-existent note is not an error" msgstr "尝试删除不存在的注解不是一个错误" -#: builtin/notes.c:912 +#: builtin/notes.c:915 msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" -#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "不删除，只显示" -#: builtin/notes.c:951 +#: builtin/notes.c:955 msgid "report pruned notes" msgstr "报告清除的注解" -#: builtin/notes.c:993 +#: builtin/notes.c:998 msgid "notes-ref" msgstr "注解引用" -#: builtin/notes.c:994 +#: builtin/notes.c:999 msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:1029 +#: builtin/notes.c:1034 builtin/stash.c:1607 #, c-format msgid "unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/pack-objects.c:51 +#: builtin/pack-objects.c:52 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:53 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:422 +#: builtin/pack-objects.c:428 #, c-format msgid "bad packed object CRC for %s" msgstr "%s 错的包对象 CRC" -#: builtin/pack-objects.c:433 +#: builtin/pack-objects.c:439 #, c-format msgid "corrupt packed object for %s" msgstr "%s 损坏的包对象" -#: builtin/pack-objects.c:564 +#: builtin/pack-objects.c:570 #, c-format msgid "recursive delta detected for object %s" msgstr "发现对象 %s 递归 delta" -#: builtin/pack-objects.c:775 +#: builtin/pack-objects.c:781 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "排序了 %u 个对象，预期 %<PRIu32> 个" -#: builtin/pack-objects.c:788 +#: builtin/pack-objects.c:794 #, c-format msgid "packfile is invalid: %s" msgstr "无效的包文件：%s" -#: builtin/pack-objects.c:792 +#: builtin/pack-objects.c:798 #, c-format msgid "unable to open packfile for reuse: %s" msgstr "无法为重用打开包文件：%s" -#: builtin/pack-objects.c:796 +#: builtin/pack-objects.c:802 msgid "unable to seek in reused packfile" msgstr "无法在重用的包文件中查找" -#: builtin/pack-objects.c:807 +#: builtin/pack-objects.c:813 msgid "unable to read from reused packfile" msgstr "无法读取索引文件" -#: builtin/pack-objects.c:835 +#: builtin/pack-objects.c:841 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个" -#: builtin/pack-objects.c:848 +#: builtin/pack-objects.c:854 msgid "Writing objects" msgstr "写入对象中" -#: builtin/pack-objects.c:910 builtin/update-index.c:88 +#: builtin/pack-objects.c:917 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "对 %s 调用 stat 失败" -#: builtin/pack-objects.c:963 +#: builtin/pack-objects.c:970 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个" -#: builtin/pack-objects.c:1157 +#: builtin/pack-objects.c:1164 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" -#: builtin/pack-objects.c:1585 +#: builtin/pack-objects.c:1592 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 压缩中 delta 基准偏移越界" -#: builtin/pack-objects.c:1594 +#: builtin/pack-objects.c:1601 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基准偏移越界" -#: builtin/pack-objects.c:1863 +#: builtin/pack-objects.c:1870 msgid "Counting objects" msgstr "对象计数中" -#: builtin/pack-objects.c:1998 +#: builtin/pack-objects.c:2000 #, c-format msgid "unable to get size of %s" msgstr "不能得到 %s 的大小" -#: builtin/pack-objects.c:2013 +#: builtin/pack-objects.c:2015 #, c-format msgid "unable to parse object header of %s" msgstr "无法解析对象 %s 头信息" -#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099 -#: builtin/pack-objects.c:2109 +#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101 +#: builtin/pack-objects.c:2111 #, c-format msgid "object %s cannot be read" msgstr "对象 %s 无法读取" -#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113 +#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "对象 %s 不一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）" -#: builtin/pack-objects.c:2123 +#: builtin/pack-objects.c:2125 msgid "suboptimal pack - out of memory" msgstr "次优（suboptimal）打包 - 内存不足" -#: builtin/pack-objects.c:2451 +#: builtin/pack-objects.c:2440 #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 个线程进行压缩" -#: builtin/pack-objects.c:2583 +#: builtin/pack-objects.c:2572 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "无法为标签 %s 压缩对象" -#: builtin/pack-objects.c:2670 +#: builtin/pack-objects.c:2659 msgid "Compressing objects" msgstr "压缩对象中" -#: builtin/pack-objects.c:2676 +#: builtin/pack-objects.c:2665 msgid "inconsistency with delta count" msgstr "不一致的差异计数" -# -#: builtin/pack-objects.c:2753 +#: builtin/pack-objects.c:2742 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -13906,7 +16584,7 @@ msgstr "" "预期边界对象（edge object）ID，却得到垃圾数据：\n" " %s" -#: builtin/pack-objects.c:2759 +#: builtin/pack-objects.c:2748 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -13915,247 +16593,239 @@ msgstr "" "预期对象 ID，却得到垃圾数据：\n" " %s" -#: builtin/pack-objects.c:2857 +#: builtin/pack-objects.c:2846 msgid "invalid value for --missing" msgstr "选项 --missing 的值无效" -#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024 +#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013 msgid "cannot open pack index" msgstr "无法打开包文件索引" -#: builtin/pack-objects.c:2947 +#: builtin/pack-objects.c:2936 #, c-format msgid "loose object at %s could not be examined" msgstr "无法检查 %s 处的松散对象" -#: builtin/pack-objects.c:3032 +#: builtin/pack-objects.c:3021 msgid "unable to force loose object" msgstr "无法强制松散对象" -#: builtin/pack-objects.c:3122 +#: builtin/pack-objects.c:3113 #, c-format msgid "not a rev '%s'" msgstr "不是一个版本 '%s'" -#: builtin/pack-objects.c:3125 +#: builtin/pack-objects.c:3116 #, c-format msgid "bad revision '%s'" msgstr "坏的版本 '%s'" -#: builtin/pack-objects.c:3150 +#: builtin/pack-objects.c:3141 msgid "unable to add recent objects" msgstr "无法添加最近的对象" -#: builtin/pack-objects.c:3203 +#: builtin/pack-objects.c:3194 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:3207 +#: builtin/pack-objects.c:3198 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:3237 -msgid "do not show progress meter" -msgstr "不显示进度表" - -#: builtin/pack-objects.c:3239 -msgid "show progress meter" -msgstr "显示进度表" - -#: builtin/pack-objects.c:3241 -msgid "show progress meter during object writing phase" -msgstr "在对象写入阶段显示进度表" - -#: builtin/pack-objects.c:3244 -msgid "similar to --all-progress when progress meter is shown" -msgstr "当进度表显示时类似于 --all-progress" - -#: builtin/pack-objects.c:3245 +#: builtin/pack-objects.c:3236 msgid "<version>[,<offset>]" msgstr "<版本>[,<偏移>]" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3237 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:3249 +#: builtin/pack-objects.c:3240 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:3251 +#: builtin/pack-objects.c:3242 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从备用对象存储里借用对象" -#: builtin/pack-objects.c:3253 +#: builtin/pack-objects.c:3244 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:3255 +#: builtin/pack-objects.c:3246 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3248 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:3259 +#: builtin/pack-objects.c:3250 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:3261 +#: builtin/pack-objects.c:3252 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3254 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:3265 +#: builtin/pack-objects.c:3256 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:3267 +#: builtin/pack-objects.c:3258 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:3269 +#: builtin/pack-objects.c:3260 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:3271 +#: builtin/pack-objects.c:3262 msgid "read revision arguments from standard input" msgstr "从标准输入读取版本号参数" -#: builtin/pack-objects.c:3273 +#: builtin/pack-objects.c:3264 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3267 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3270 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3273 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" -#: builtin/pack-objects.c:3285 +#: builtin/pack-objects.c:3276 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3278 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包对象的标签对象" -#: builtin/pack-objects.c:3289 +#: builtin/pack-objects.c:3280 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:3291 +#: builtin/pack-objects.c:3282 msgid "pack loose unreachable objects" msgstr "打包松散的不可达对象" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3284 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3287 +msgid "use the sparse reachability algorithm" +msgstr "使用稀疏可达性算法" + +#: builtin/pack-objects.c:3289 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3291 msgid "create packs suitable for shallow fetches" msgstr "创建适合浅克隆仓库获取的包" -#: builtin/pack-objects.c:3300 +#: builtin/pack-objects.c:3293 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3295 msgid "ignore this pack" msgstr "忽略该 pack" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3297 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:3306 +#: builtin/pack-objects.c:3299 msgid "do not hide commits by grafts" msgstr "显示被移植隐藏的提交" -#: builtin/pack-objects.c:3308 +#: builtin/pack-objects.c:3301 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度" -#: builtin/pack-objects.c:3310 +#: builtin/pack-objects.c:3303 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同时创建 bitmap 索引" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3307 +msgid "write a bitmap index if possible" +msgstr "如果可能，写 bitmap 索引" + +#: builtin/pack-objects.c:3311 msgid "handling for missing objects" msgstr "处理丢失的对象" -#: builtin/pack-objects.c:3316 +#: builtin/pack-objects.c:3314 msgid "do not pack objects in promisor packfiles" msgstr "不要打包 promisor 包文件中的对象" -#: builtin/pack-objects.c:3318 +#: builtin/pack-objects.c:3316 msgid "respect islands during delta compression" msgstr "在增量压缩时参考数据岛" -#: builtin/pack-objects.c:3342 +#: builtin/pack-objects.c:3345 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "增量链深度 %d 太深了，强制为 %d" -#: builtin/pack-objects.c:3347 +#: builtin/pack-objects.c:3350 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d" -#: builtin/pack-objects.c:3401 +#: builtin/pack-objects.c:3404 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "不能使用 --max-pack-size 来构建传输用的包文件" -#: builtin/pack-objects.c:3403 +#: builtin/pack-objects.c:3406 msgid "minimum pack size limit is 1 MiB" msgstr "最小的包文件大小是 1 MiB" -#: builtin/pack-objects.c:3408 +#: builtin/pack-objects.c:3411 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用于创建一个可索引包" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3414 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3420 msgid "cannot use --filter without --stdout" msgstr "不能在没有 --stdout 的情况下使用 --filter" -#: builtin/pack-objects.c:3476 +#: builtin/pack-objects.c:3481 msgid "Enumerating objects" msgstr "枚举对象" -#: builtin/pack-objects.c:3495 +#: builtin/pack-objects.c:3511 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "总共 %<PRIu32> （差异 %<PRIu32>），复用 %<PRIu32> （差异 %<PRIu32>）" -#: builtin/pack-refs.c:7 +#: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<选项>]" -#: builtin/pack-refs.c:15 +#: builtin/pack-refs.c:16 msgid "pack everything" msgstr "打包一切" -#: builtin/pack-refs.c:16 +#: builtin/pack-refs.c:17 msgid "prune loose refs (default)" msgstr "清除松散的引用（默认）" @@ -14171,86 +16841,86 @@ msgstr "正在删除重复对象" msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]" -#: builtin/prune.c:109 +#: builtin/prune.c:131 msgid "report pruned objects" msgstr "报告清除的对象" -#: builtin/prune.c:112 +#: builtin/prune.c:134 msgid "expire objects older than <time>" msgstr "使早于给定时间的对象过期" -#: builtin/prune.c:114 +#: builtin/prune.c:136 msgid "limit traversal to objects outside promisor packfiles" msgstr "限制遍历 promisor 包以外的对象" -#: builtin/prune.c:129 +#: builtin/prune.c:150 msgid "cannot prune in a precious-objects repo" msgstr "不能在珍品仓库中执行清理操作" -#: builtin/pull.c:60 builtin/pull.c:62 +#: builtin/pull.c:66 builtin/pull.c:68 #, c-format msgid "Invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: builtin/pull.c:82 +#: builtin/pull.c:88 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/pull.c:133 +#: builtin/pull.c:142 msgid "control for recursive fetching of submodules" msgstr "控制子模组的递归获取" -#: builtin/pull.c:137 +#: builtin/pull.c:146 msgid "Options related to merging" msgstr "和合并相关的选项" -#: builtin/pull.c:140 +#: builtin/pull.c:149 msgid "incorporate changes by rebasing rather than merging" msgstr "使用变基操作取代合并操作以合入修改" -#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122 +#: builtin/pull.c:177 builtin/rebase.c:467 builtin/revert.c:126 msgid "allow fast-forward" msgstr "允许快进式" -#: builtin/pull.c:176 +#: builtin/pull.c:186 msgid "automatically stash/stash pop before and after rebase" msgstr "变基操作前后执行自动贮藏和弹出贮藏" -#: builtin/pull.c:192 +#: builtin/pull.c:202 msgid "Options related to fetching" msgstr "和获取相关的参数" -#: builtin/pull.c:202 +#: builtin/pull.c:212 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" -#: builtin/pull.c:210 +#: builtin/pull.c:220 msgid "number of submodules pulled in parallel" msgstr "并发拉取的子模组的数量" -#: builtin/pull.c:305 +#: builtin/pull.c:320 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff 的取值无效：%s" -#: builtin/pull.c:421 +#: builtin/pull.c:437 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "在您刚刚获取到的引用中没有变基操作的候选。" -#: builtin/pull.c:423 +#: builtin/pull.c:439 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "在您刚刚获取到的引用中没有合并操作的候选。" -#: builtin/pull.c:424 +#: builtin/pull.c:440 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" -#: builtin/pull.c:427 +#: builtin/pull.c:443 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -14260,42 +16930,42 @@ msgstr "" "您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n" "分支默认的远程仓库，您必须在命令行中指定一个分支名。" -#: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73 +#: builtin/pull.c:448 builtin/rebase.c:1375 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "您当前不在一个分支上。" -#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79 +#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "请指定您要变基到哪一个分支。" -#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82 +#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "请指定您要合并哪一个分支。" -#: builtin/pull.c:437 builtin/pull.c:452 +#: builtin/pull.c:453 builtin/pull.c:468 msgid "See git-pull(1) for details." msgstr "详见 git-pull(1)。" -#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454 -#: builtin/rebase.c:767 git-parse-remote.sh:64 +#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470 +#: builtin/rebase.c:1381 git-parse-remote.sh:64 msgid "<remote>" msgstr "<远程>" -#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459 -#: git-legacy-rebase.sh:556 git-parse-remote.sh:65 +#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475 +#: git-parse-remote.sh:65 msgid "<branch>" msgstr "<分支>" -#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75 +#: builtin/pull.c:463 builtin/rebase.c:1373 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "当前分支没有跟踪信息。" -#: builtin/pull.c:456 git-parse-remote.sh:95 +#: builtin/pull.c:472 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "如果您想要为此分支创建跟踪信息，您可以执行：" -#: builtin/pull.c:461 +#: builtin/pull.c:477 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -14304,32 +16974,32 @@ msgstr "" "您的配置中指定要合并远程的引用 '%s'，\n" "但是没有获取到这个引用。" -#: builtin/pull.c:565 +#: builtin/pull.c:587 #, c-format msgid "unable to access commit %s" msgstr "无法访问提交 %s" -#: builtin/pull.c:843 +#: builtin/pull.c:867 msgid "ignoring --verify-signatures for rebase" msgstr "为变基操作忽略 --verify-signatures" -#: builtin/pull.c:891 +#: builtin/pull.c:922 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" -#: builtin/pull.c:899 +#: builtin/pull.c:930 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未诞生的分支，变更添加至索引。" -#: builtin/pull.c:902 +#: builtin/pull.c:934 msgid "pull with rebase" msgstr "变基式拉取" -#: builtin/pull.c:903 +#: builtin/pull.c:935 msgid "please commit or stash them." msgstr "请提交或贮藏它们。" -#: builtin/pull.c:928 +#: builtin/pull.c:960 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -14339,7 +17009,7 @@ msgstr "" "fetch 更新了当前的分支。快进您的工作区\n" "至提交 %s。" -#: builtin/pull.c:934 +#: builtin/pull.c:966 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -14356,15 +17026,15 @@ msgstr "" "$ git reset --hard\n" "恢复之前的状态。" -#: builtin/pull.c:949 +#: builtin/pull.c:981 msgid "Cannot merge multiple branches into empty head." msgstr "无法将多个分支合并到空分支。" -#: builtin/pull.c:953 +#: builtin/pull.c:985 msgid "Cannot rebase onto multiple branches." msgstr "无法变基到多个分支。" -#: builtin/pull.c:960 +#: builtin/pull.c:992 msgid "cannot rebase with locally recorded submodule modifications" msgstr "本地子模组中有修改，无法变基" @@ -14372,15 +17042,15 @@ msgstr "本地子模组中有修改，无法变基" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/push.c:111 +#: builtin/push.c:112 msgid "tag shorthand without <tag>" msgstr "标签后面未提供 <标签> 参数" -#: builtin/push.c:121 +#: builtin/push.c:122 msgid "--delete only accepts plain target ref names" msgstr "--delete 只接受简单的目标引用名" -#: builtin/push.c:165 +#: builtin/push.c:168 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -14388,7 +17058,7 @@ msgstr "" "\n" "为了永久地选择任一选项，参见 'git help config' 中的 push.default。" -#: builtin/push.c:168 +#: builtin/push.c:171 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -14412,7 +17082,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:183 +#: builtin/push.c:186 #, c-format msgid "" "You are not currently on a branch.\n" @@ -14426,7 +17096,7 @@ msgstr "" "\n" " git push %s HEAD:<远程分支名字>\n" -#: builtin/push.c:197 +#: builtin/push.c:200 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -14439,12 +17109,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:205 +#: builtin/push.c:208 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "当前分支 %s 有多个上游分支，拒绝推送。" -#: builtin/push.c:208 +#: builtin/push.c:211 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -14454,12 +17124,12 @@ msgstr "" "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n" "而没有告诉我要推送什么、更新哪个远程分支。" -#: builtin/push.c:267 +#: builtin/push.c:270 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。" -#: builtin/push.c:274 +#: builtin/push.c:277 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -14470,7 +17140,7 @@ msgstr "" "再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:280 +#: builtin/push.c:283 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -14481,7 +17151,7 @@ msgstr "" "检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:286 +#: builtin/push.c:289 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -14494,11 +17164,11 @@ msgstr "" "（如 'git pull ...'）。\n" "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:293 +#: builtin/push.c:296 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒绝，因为该标签在远程已经存在。" -#: builtin/push.c:296 +#: builtin/push.c:299 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -14507,140 +17177,140 @@ msgstr "" "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n" "也不能更新远程引用让其指向一个非提交对象。\n" -#: builtin/push.c:357 +#: builtin/push.c:360 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:361 +#: builtin/push.c:367 #, c-format msgid "failed to push some refs to '%s'" msgstr "推送一些引用到 '%s' 失败" -#: builtin/push.c:395 -#, c-format -msgid "bad repository '%s'" -msgstr "坏的仓库 '%s'" - -#: builtin/push.c:396 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"没有配置推送目标。\n" -"或通过命令行指定 URL，或用下面命令配置一个远程仓库\n" -"\n" -" git remote add <名称> <地址>\n" -"\n" -"然后使用该远程仓库名执行推送\n" -"\n" -" git push <名称>\n" - -#: builtin/push.c:551 +#: builtin/push.c:542 msgid "repository" msgstr "仓库" -#: builtin/push.c:552 builtin/send-pack.c:164 +#: builtin/push.c:543 builtin/send-pack.c:164 msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:553 builtin/send-pack.c:166 +#: builtin/push.c:544 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "镜像所有引用" -#: builtin/push.c:555 +#: builtin/push.c:546 msgid "delete refs" msgstr "删除引用" -#: builtin/push.c:556 +#: builtin/push.c:547 msgid "push tags (can't be used with --all or --mirror)" msgstr "推送标签（不能使用 --all or --mirror）" -#: builtin/push.c:559 builtin/send-pack.c:167 +#: builtin/push.c:550 builtin/send-pack.c:167 msgid "force updates" msgstr "强制更新" -#: builtin/push.c:561 builtin/send-pack.c:181 +#: builtin/push.c:552 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<引用名>:<期望值>" -#: builtin/push.c:562 builtin/send-pack.c:182 +#: builtin/push.c:553 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "要求引用旧的取值为设定值" -#: builtin/push.c:565 +#: builtin/push.c:556 msgid "control recursive pushing of submodules" msgstr "控制子模组的递归推送" -#: builtin/push.c:567 builtin/send-pack.c:175 +#: builtin/push.c:558 builtin/send-pack.c:175 msgid "use thin pack" msgstr "使用精简打包" -#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161 +#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "接收包程序" -#: builtin/push.c:570 +#: builtin/push.c:561 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" -#: builtin/push.c:573 +#: builtin/push.c:564 msgid "prune locally removed refs" msgstr "清除本地删除的引用" -#: builtin/push.c:575 +#: builtin/push.c:566 msgid "bypass pre-push hook" msgstr "绕过 pre-push 钩子" -#: builtin/push.c:576 +#: builtin/push.c:567 msgid "push missing but relevant tags" msgstr "推送缺失但有关的标签" -#: builtin/push.c:579 builtin/send-pack.c:169 +#: builtin/push.c:570 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "用 GPG 为推送签名" -#: builtin/push.c:581 builtin/send-pack.c:176 +#: builtin/push.c:572 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "需要远端支持原子事务" -#: builtin/push.c:599 +#: builtin/push.c:590 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:601 +#: builtin/push.c:592 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" -#: builtin/push.c:604 +#: builtin/push.c:612 +#, c-format +msgid "bad repository '%s'" +msgstr "坏的仓库 '%s'" + +#: builtin/push.c:613 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"没有配置推送目标。\n" +"或通过命令行指定 URL，或用下面命令配置一个远程仓库\n" +"\n" +" git remote add <名称> <地址>\n" +"\n" +"然后使用该远程仓库名执行推送\n" +"\n" +" git push <名称>\n" + +#: builtin/push.c:628 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不兼容" -#: builtin/push.c:606 +#: builtin/push.c:630 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用规格同时使用" -#: builtin/push.c:610 +#: builtin/push.c:634 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不兼容" -#: builtin/push.c:612 +#: builtin/push.c:636 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用规格同时使用" -#: builtin/push.c:615 +#: builtin/push.c:639 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:634 +#: builtin/push.c:643 msgid "push options must not have new line characters" msgstr "推送选项不能有换行符" @@ -14656,28 +17326,36 @@ msgstr "git range-diff [<选项>] <old-tip>...<new-tip>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>" -#: builtin/range-diff.c:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "创建权重的百分比" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "使用简单差异颜色" -#: builtin/range-diff.c:61 builtin/range-diff.c:65 +#: builtin/range-diff.c:26 +msgid "notes" +msgstr "注解" + +#: builtin/range-diff.c:26 +msgid "passed to 'git log'" +msgstr "传递给 'git log'" + +#: builtin/range-diff.c:50 builtin/range-diff.c:54 #, c-format msgid "no .. in range: '%s'" msgstr "没有在范围中使用 ..：'%s'" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "单个参数格式必须是对称范围（即包含...）" -#: builtin/range-diff.c:90 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "需要两个提交范围" -#: builtin/read-tree.c:40 +#: builtin/read-tree.c:41 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -14687,118 +17365,306 @@ msgstr "" "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "write resulting index to <file>" msgstr "将索引结果写入 <文件>" -#: builtin/read-tree.c:126 +#: builtin/read-tree.c:127 msgid "only empty the index" msgstr "只是清空索引" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:129 msgid "Merging" msgstr "合并" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:131 msgid "perform a merge in addition to a read" msgstr "读取之余再执行一个合并" -#: builtin/read-tree.c:132 +#: builtin/read-tree.c:133 msgid "3-way merge if no file level merging required" msgstr "如果没有文件级合并需要，执行三方合并" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:135 msgid "3-way merge in presence of adds and removes" msgstr "存在添加和删除时，也执行三方合并" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:137 msgid "same as -m, but discard unmerged entries" msgstr "类似于 -m，但丢弃未合并的条目" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:138 msgid "<subdirectory>/" msgstr "<子目录>/" -#: builtin/read-tree.c:138 +#: builtin/read-tree.c:139 msgid "read the tree into the index under <subdirectory>/" msgstr "读取树对象到索引的 <子目录>/ 下" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c:142 msgid "update working tree with merge result" msgstr "用合并的结果更新工作区" -#: builtin/read-tree.c:143 +#: builtin/read-tree.c:144 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:144 +#: builtin/read-tree.c:145 msgid "allow explicitly ignored files to be overwritten" msgstr "允许忽略文件中设定的文件可以被覆盖" -#: builtin/read-tree.c:147 +#: builtin/read-tree.c:148 msgid "don't check the working tree after merging" msgstr "合并后不检查工作区" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:149 msgid "don't update the index or the work tree" msgstr "不更新索引区和工作区" -#: builtin/read-tree.c:150 +#: builtin/read-tree.c:151 msgid "skip applying sparse checkout filter" msgstr "跳过应用稀疏检出过滤器" -#: builtin/read-tree.c:152 +#: builtin/read-tree.c:153 msgid "debug unpack-trees" msgstr "调试 unpack-trees" -#: builtin/rebase.c:29 +#: builtin/read-tree.c:157 +msgid "suppress feedback messages" +msgstr "抑制反馈信息" + +#: builtin/read-tree.c:188 +msgid "You need to resolve your current index first" +msgstr "您需要先解决当前索引的冲突" + +#: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] [<上游>] [<分支>]" +"git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<" +"上游> [<分支>]]" -#: builtin/rebase.c:31 +#: builtin/rebase.c:34 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]" -#: builtin/rebase.c:33 +#: builtin/rebase.c:36 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:119 +#: builtin/rebase.c:177 builtin/rebase.c:201 builtin/rebase.c:228 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "不可用的待办列表：'%s'" + +#: builtin/rebase.c:186 builtin/rebase.c:212 builtin/rebase.c:236 +#, c-format +msgid "could not write '%s'." +msgstr "不能写入 '%s'。" + +#: builtin/rebase.c:271 +msgid "no HEAD?" +msgstr "没有 HEAD？" + +#: builtin/rebase.c:298 +#, c-format +msgid "could not create temporary %s" +msgstr "无法创建临时的 %s" + +#: builtin/rebase.c:304 +msgid "could not mark as interactive" +msgstr "无法标记为交互式" + +#: builtin/rebase.c:362 +msgid "could not generate todo list" +msgstr "无法生成待办列表" + +#: builtin/rebase.c:402 +msgid "a base commit must be provided with --upstream or --onto" +msgstr "使用 --upstream 或 --onto 必须提供一个基线提交" + +#: builtin/rebase.c:457 +msgid "git rebase--interactive [<options>]" +msgstr "git rebase--interactive [<选项>]" + +#: builtin/rebase.c:469 +msgid "keep empty commits" +msgstr "保持空提交" + +#: builtin/rebase.c:471 builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "允许提交说明为空" + +#: builtin/rebase.c:472 +msgid "rebase merge commits" +msgstr "对合并提交变基" + +#: builtin/rebase.c:474 +msgid "keep original branch points of cousins" +msgstr "保持兄弟提交的原始分支点" + +#: builtin/rebase.c:476 +msgid "move commits that begin with squash!/fixup!" +msgstr "移动以 squash!/fixup! 开头的提交" + +#: builtin/rebase.c:477 +msgid "sign commits" +msgstr "签名提交" + +#: builtin/rebase.c:479 builtin/rebase.c:1455 +msgid "display a diffstat of what changed upstream" +msgstr "显示上游变化的差异统计" + +#: builtin/rebase.c:481 +msgid "continue rebase" +msgstr "继续变基" + +#: builtin/rebase.c:483 +msgid "skip commit" +msgstr "跳过提交" + +#: builtin/rebase.c:484 +msgid "edit the todo list" +msgstr "变基待办列表" + +#: builtin/rebase.c:486 +msgid "show the current patch" +msgstr "显示当前补丁" + +#: builtin/rebase.c:489 +msgid "shorten commit ids in the todo list" +msgstr "缩短待办列表中的提交号" + +#: builtin/rebase.c:491 +msgid "expand commit ids in the todo list" +msgstr "扩展待办列表中的提交号" + +#: builtin/rebase.c:493 +msgid "check the todo list" +msgstr "检查待办列表" + +#: builtin/rebase.c:495 +msgid "rearrange fixup/squash lines" +msgstr "重新排列 fixup/squash 行" + +#: builtin/rebase.c:497 +msgid "insert exec commands in todo list" +msgstr "在待办列表中插入 exec 执行命令" + +#: builtin/rebase.c:498 +msgid "onto" +msgstr "onto" + +#: builtin/rebase.c:501 +msgid "restrict-revision" +msgstr "restrict-revision" + +#: builtin/rebase.c:501 +msgid "restrict revision" +msgstr "限制版本" + +#: builtin/rebase.c:503 +msgid "squash-onto" +msgstr "squash-onto" + +#: builtin/rebase.c:504 +msgid "squash onto" +msgstr "squash onto" + +#: builtin/rebase.c:506 +msgid "the upstream commit" +msgstr "上游提交" + +#: builtin/rebase.c:508 +msgid "head-name" +msgstr "head-name" + +#: builtin/rebase.c:508 +msgid "head name" +msgstr "head 名称" + +#: builtin/rebase.c:513 +msgid "rebase strategy" +msgstr "变基策略" + +#: builtin/rebase.c:514 +msgid "strategy-opts" +msgstr "strategy-opts" + +#: builtin/rebase.c:515 +msgid "strategy options" +msgstr "策略选项" + +#: builtin/rebase.c:516 +msgid "switch-to" +msgstr "切换到" + +#: builtin/rebase.c:517 +msgid "the branch or commit to checkout" +msgstr "要检出的分支或提交" + +#: builtin/rebase.c:518 +msgid "onto-name" +msgstr "onto-name" + +#: builtin/rebase.c:518 +msgid "onto name" +msgstr "onto name" + +#: builtin/rebase.c:519 +msgid "cmd" +msgstr "cmd" + +#: builtin/rebase.c:519 +msgid "the command to run" +msgstr "要执行的命令" + +#: builtin/rebase.c:522 builtin/rebase.c:1540 +msgid "automatically re-schedule any `exec` that fails" +msgstr "自动重新安排任何失败的 `exec`" + +#: builtin/rebase.c:540 +msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果" + +#: builtin/rebase.c:556 #, c-format msgid "%s requires an interactive rebase" msgstr "%s 需要交互式变基" -#: builtin/rebase.c:171 +#: builtin/rebase.c:608 #, c-format msgid "could not get 'onto': '%s'" msgstr "无法获取 'onto'：'%s'" -#: builtin/rebase.c:186 +#: builtin/rebase.c:623 #, c-format msgid "invalid orig-head: '%s'" msgstr "无效的原始 head：'%s'" -#: builtin/rebase.c:214 +#: builtin/rebase.c:648 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "忽略无效的 allow_rerere_autoupdate：'%s'" -#: builtin/rebase.c:259 +#: builtin/rebase.c:724 #, c-format msgid "Could not read '%s'" msgstr "不能读取 '%s'" -#: builtin/rebase.c:277 +#: builtin/rebase.c:742 #, c-format msgid "Cannot store %s" msgstr "不能存储 %s" -#: builtin/rebase.c:337 +#: builtin/rebase.c:849 +msgid "could not determine HEAD revision" +msgstr "不能确定 HEAD 版本" + +#: builtin/rebase.c:972 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -14811,11 +17677,25 @@ msgstr "" "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" "\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。" -#: builtin/rebase.c:561 -msgid "could not determine HEAD revision" -msgstr "不能确定 HEAD 版本" +#: builtin/rebase.c:1060 +#, c-format +msgid "" +"\n" +"git encountered an error while preparing the patches to replay\n" +"these revisions:\n" +"\n" +" %s\n" +"\n" +"As a result, git cannot rebase them." +msgstr "" +"\n" +"在为重放这些版本而准备补丁时，git 遇到了一个错误：\n" +"\n" +" %s\n" +"\n" +"因此 git 无法对其变基。" -#: builtin/rebase.c:753 +#: builtin/rebase.c:1367 #, c-format msgid "" "%s\n" @@ -14832,7 +17712,7 @@ msgstr "" " git rebase '<branch>'\n" "\n" -#: builtin/rebase.c:769 +#: builtin/rebase.c:1383 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -14845,149 +17725,181 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:832 +#: builtin/rebase.c:1413 +msgid "exec commands cannot contain newlines" +msgstr "exec 命令不能包含换行符" + +#: builtin/rebase.c:1417 +msgid "empty exec command" +msgstr "空的 exec 命令" + +#: builtin/rebase.c:1446 msgid "rebase onto given branch instead of upstream" msgstr "变基到给定的分支而非上游" -#: builtin/rebase.c:834 +#: builtin/rebase.c:1448 +msgid "use the merge-base of upstream and branch as the current base" +msgstr "使用上游和分支的合并基线做为当前基线" + +#: builtin/rebase.c:1450 msgid "allow pre-rebase hook to run" msgstr "允许执行 pre-rebase 钩子" -#: builtin/rebase.c:836 +#: builtin/rebase.c:1452 msgid "be quiet. implies --no-stat" msgstr "安静。暗示 --no-stat" -#: builtin/rebase.c:839 -msgid "display a diffstat of what changed upstream" -msgstr "显示上游变化的 diffstat" - -#: builtin/rebase.c:842 +#: builtin/rebase.c:1458 msgid "do not show diffstat of what changed upstream" -msgstr "不显示上游变化的 diffstat" +msgstr "不显示上游变化的差异统计" -#: builtin/rebase.c:845 +#: builtin/rebase.c:1461 msgid "add a Signed-off-by: line to each commit" msgstr "为每一个提交添加一个 Signed-off-by: 签名" -#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853 -msgid "passed to 'git am'" -msgstr "传递给 'git am'" +#: builtin/rebase.c:1464 +msgid "make committer date match author date" +msgstr "让提交者日期匹配作者日期" -#: builtin/rebase.c:855 builtin/rebase.c:857 +#: builtin/rebase.c:1466 +msgid "ignore author date and use current date" +msgstr "忽略作者日期并使用当前日期" + +#: builtin/rebase.c:1468 +msgid "synonym of --reset-author-date" +msgstr "--reset-author-date 的同义词" + +#: builtin/rebase.c:1470 builtin/rebase.c:1474 msgid "passed to 'git apply'" msgstr "传递给 'git apply'" -#: builtin/rebase.c:859 builtin/rebase.c:862 +#: builtin/rebase.c:1472 +msgid "ignore changes in whitespace" +msgstr "忽略空白字符的变更" + +#: builtin/rebase.c:1476 builtin/rebase.c:1479 msgid "cherry-pick all commits, even if unchanged" msgstr "拣选所有提交，即使未修改" -#: builtin/rebase.c:864 +#: builtin/rebase.c:1481 msgid "continue" msgstr "继续" -#: builtin/rebase.c:867 +#: builtin/rebase.c:1484 msgid "skip current patch and continue" msgstr "跳过当前补丁并继续" # 译者：注意保持前导空格 -#: builtin/rebase.c:869 +#: builtin/rebase.c:1486 msgid "abort and check out the original branch" msgstr "终止并检出原有分支" -#: builtin/rebase.c:872 +#: builtin/rebase.c:1489 msgid "abort but keep HEAD where it is" msgstr "终止但保持 HEAD 不变" -#: builtin/rebase.c:873 +#: builtin/rebase.c:1490 msgid "edit the todo list during an interactive rebase" msgstr "在交互式变基中编辑待办列表" -#: builtin/rebase.c:876 +#: builtin/rebase.c:1493 msgid "show the patch file being applied or merged" msgstr "显示正在应用或合并的补丁文件" -#: builtin/rebase.c:879 +#: builtin/rebase.c:1496 msgid "use merging strategies to rebase" msgstr "使用合并策略进行变基" -#: builtin/rebase.c:883 +#: builtin/rebase.c:1500 msgid "let the user edit the list of commits to rebase" msgstr "让用户编辑要变基的提交列表" -#: builtin/rebase.c:887 -msgid "try to recreate merges instead of ignoring them" -msgstr "尝试重建合并提交而非忽略它们" - -#: builtin/rebase.c:891 -msgid "allow rerere to update index with resolved conflict" -msgstr "允许 rerere 用已解决的冲突更新索引" +#: builtin/rebase.c:1504 +msgid "(DEPRECATED) try to recreate merges instead of ignoring them" +msgstr "（已弃用）尝试重建合并提交而非忽略它们" -#: builtin/rebase.c:894 +#: builtin/rebase.c:1509 msgid "preserve empty commits during rebase" msgstr "变基时保留空提交" -#: builtin/rebase.c:896 +#: builtin/rebase.c:1511 msgid "move commits that begin with squash!/fixup! under -i" msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交" -#: builtin/rebase.c:902 +#: builtin/rebase.c:1517 msgid "automatically stash/stash pop before and after" msgstr "在操作前后执行自动贮藏和弹出贮藏" -#: builtin/rebase.c:904 +#: builtin/rebase.c:1519 msgid "add exec lines after each commit of the editable list" msgstr "可编辑列表的每一个提交下面增加一行 exec" -#: builtin/rebase.c:908 +#: builtin/rebase.c:1523 msgid "allow rebasing commits with empty messages" msgstr "允许针对空提交说明的提交变基" -#: builtin/rebase.c:911 +#: builtin/rebase.c:1526 msgid "try to rebase merges instead of skipping them" msgstr "尝试对合并提交变基而不是忽略它们" -#: builtin/rebase.c:914 +#: builtin/rebase.c:1529 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "使用 'merge-base --fork-point' 来优化上游" -#: builtin/rebase.c:916 +#: builtin/rebase.c:1531 msgid "use the given merge strategy" msgstr "使用给定的合并策略" -#: builtin/rebase.c:918 builtin/revert.c:111 +#: builtin/rebase.c:1533 builtin/revert.c:115 msgid "option" msgstr "选项" -#: builtin/rebase.c:919 +#: builtin/rebase.c:1534 msgid "pass the argument through to the merge strategy" msgstr "将参数传递给合并策略" -#: builtin/rebase.c:922 +#: builtin/rebase.c:1537 msgid "rebase all reachable commits up to the root(s)" msgstr "将所有可达的提交变基到根提交" -#: builtin/rebase.c:938 -#, c-format -msgid "could not exec %s" -msgstr "不能执行 %s" +#: builtin/rebase.c:1554 +msgid "" +"the rebase.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"对 rebase.useBuiltin 的支持已被删除！\n" +"详见 'git help config' 中的条目。" -#: builtin/rebase.c:956 git-legacy-rebase.sh:213 +#: builtin/rebase.c:1560 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "看起来 'git-am' 正在执行中。无法变基。" -#: builtin/rebase.c:997 git-legacy-rebase.sh:395 +#: builtin/rebase.c:1601 +msgid "" +"git rebase --preserve-merges is deprecated. Use --rebase-merges instead." +msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。" + +#: builtin/rebase.c:1606 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "不能将 '--keep-base' 和 '--onto' 组合使用" + +#: builtin/rebase.c:1608 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "不能将 '--keep-base' 和 '--root' 组合使用" + +#: builtin/rebase.c:1612 msgid "No rebase in progress?" msgstr "没有正在进行的变基？" -#: builtin/rebase.c:1001 git-legacy-rebase.sh:406 +#: builtin/rebase.c:1616 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: builtin/rebase.c:1015 git-legacy-rebase.sh:413 +#: builtin/rebase.c:1639 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" -#: builtin/rebase.c:1028 git-legacy-rebase.sh:416 +#: builtin/rebase.c:1651 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -14995,21 +17907,16 @@ msgstr "" "您必须编辑所有的合并冲突，然后通过 git add\n" "命令将它们标记为已解决" -#: builtin/rebase.c:1047 +#: builtin/rebase.c:1670 msgid "could not discard worktree changes" msgstr "无法丢弃工作区变更" -#: builtin/rebase.c:1066 +#: builtin/rebase.c:1689 #, c-format msgid "could not move back to %s" msgstr "无法移回 %s" -#: builtin/rebase.c:1077 builtin/rm.c:368 -#, c-format -msgid "could not remove '%s'" -msgstr "无法删除 '%s'" - -#: builtin/rebase.c:1103 +#: builtin/rebase.c:1734 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -15028,335 +17935,160 @@ msgstr "" "\t%s\n" "然后再重新执行。 为避免丢失重要数据，我已经停止当前操作。\n" -#: builtin/rebase.c:1124 +#: builtin/rebase.c:1757 msgid "switch `C' expects a numerical value" msgstr "开关 `C' 期望一个数字值" -#: builtin/rebase.c:1161 +#: builtin/rebase.c:1798 #, c-format msgid "Unknown mode: %s" msgstr "未知模式：%s" -#: builtin/rebase.c:1183 +#: builtin/rebase.c:1820 msgid "--strategy requires --merge or --interactive" msgstr "--strategy 需要 --merge 或 --interactive" -#: builtin/rebase.c:1226 -#, c-format -msgid "" -"error: cannot combine interactive options (--interactive, --exec, --rebase-" -"merges, --preserve-merges, --keep-empty, --root + --onto) with am options " -"(%s)" -msgstr "" -"错误：无法同时使用交互式选项（--interactive, --exec, --rebase-merges, --preserve-" -"merges, --keep-empty, --root + --onto）和 am 选项（%s）" - -#: builtin/rebase.c:1231 -#, c-format -msgid "" -"error: cannot combine merge options (--merge, --strategy, --strategy-option) " -"with am options (%s)" -msgstr "错误：不能组合合并选项（--merge、--strategy、--strategy-option）和 am 选项（%s）" +#: builtin/rebase.c:1860 +msgid "--reschedule-failed-exec requires --exec or --interactive" +msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive" -#: builtin/rebase.c:1251 git-legacy-rebase.sh:536 -msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'" -msgstr "错误：不能组合 '--preserve-merges' 和 '--rebase-merges'" +#: builtin/rebase.c:1872 +msgid "cannot combine am options with either interactive or merge options" +msgstr "不能将 am 选项与交互或合并选项同时使用" -#: builtin/rebase.c:1256 git-legacy-rebase.sh:542 -msgid "error: cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "错误：不能组合 '--rebase-merges' 和 '--strategy-option'" +#: builtin/rebase.c:1891 +msgid "cannot combine '--preserve-merges' with '--rebase-merges'" +msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用" -#: builtin/rebase.c:1259 git-legacy-rebase.sh:544 -msgid "error: cannot combine '--rebase-merges' with '--strategy'" -msgstr "错误：不能组合 '--rebase-merges' 和 '--strategy'" +#: builtin/rebase.c:1895 +msgid "" +"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" +msgstr "" +"错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用" -#: builtin/rebase.c:1283 +#: builtin/rebase.c:1919 #, c-format msgid "invalid upstream '%s'" msgstr "无效的上游 '%s'" -#: builtin/rebase.c:1289 +#: builtin/rebase.c:1925 msgid "Could not create new root commit" msgstr "不能创建新的根提交" -#: builtin/rebase.c:1307 +#: builtin/rebase.c:1951 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "'%s'：只需要与分支的一个合并基线" + +#: builtin/rebase.c:1954 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s'：只需要一个合并基线" -#: builtin/rebase.c:1314 +#: builtin/rebase.c:1962 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "没有指向一个有效的提交 '%s'" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1987 #, c-format msgid "fatal: no such branch/commit '%s'" -msgstr "严重错误：无此分支/提交 '%s'" +msgstr "致命错误：无此分支/提交 '%s'" -#: builtin/rebase.c:1347 builtin/submodule--helper.c:37 -#: builtin/submodule--helper.c:1930 +#: builtin/rebase.c:1995 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:1961 #, c-format msgid "No such ref: %s" msgstr "没有这样的引用：%s" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:2006 msgid "Could not resolve HEAD to a revision" msgstr "无法将 HEAD 解析为一个版本" -#: builtin/rebase.c:1399 git-legacy-rebase.sh:665 +#: builtin/rebase.c:2044 msgid "Cannot autostash" msgstr "无法 autostash" -#: builtin/rebase.c:1402 +#: builtin/rebase.c:2047 #, c-format msgid "Unexpected stash response: '%s'" msgstr "意外的 stash 响应：'%s'" -#: builtin/rebase.c:1408 +#: builtin/rebase.c:2053 #, c-format msgid "Could not create directory for '%s'" msgstr "不能为 '%s' 创建目录" -#: builtin/rebase.c:1411 +#: builtin/rebase.c:2056 #, c-format msgid "Created autostash: %s\n" msgstr "创建了 autostash：%s\n" -#: builtin/rebase.c:1414 +#: builtin/rebase.c:2059 msgid "could not reset --hard" msgstr "无法 reset --hard" -#: builtin/rebase.c:1415 builtin/reset.c:113 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD 现在位于 %s" - -#: builtin/rebase.c:1431 git-legacy-rebase.sh:674 +#: builtin/rebase.c:2068 msgid "Please commit or stash them." msgstr "请提交或贮藏修改。" -#: builtin/rebase.c:1458 +#: builtin/rebase.c:2095 #, c-format msgid "could not parse '%s'" msgstr "无法解析 '%s'" -#: builtin/rebase.c:1470 +#: builtin/rebase.c:2108 #, c-format msgid "could not switch to %s" msgstr "无法切换到 %s" -#: builtin/rebase.c:1481 git-legacy-rebase.sh:697 -#, sh-format +#: builtin/rebase.c:2119 msgid "HEAD is up to date." msgstr "HEAD 是最新的。" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:2121 #, c-format msgid "Current branch %s is up to date.\n" msgstr "当前分支 %s 是最新的。\n" -#: builtin/rebase.c:1491 git-legacy-rebase.sh:707 -#, sh-format +#: builtin/rebase.c:2129 msgid "HEAD is up to date, rebase forced." msgstr "HEAD 是最新的，强制变基。" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:2131 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "当前分支 %s 是最新的，强制变基。\n" -#: builtin/rebase.c:1501 git-legacy-rebase.sh:208 +#: builtin/rebase.c:2139 msgid "The pre-rebase hook refused to rebase." msgstr "pre-rebase 钩子拒绝了变基操作。" -#: builtin/rebase.c:1508 +#: builtin/rebase.c:2146 #, c-format msgid "Changes to %s:\n" msgstr "到 %s 的变更：\n" -#: builtin/rebase.c:1511 +#: builtin/rebase.c:2149 #, c-format msgid "Changes from %s to %s:\n" msgstr "从 %s 到 %s 的变更：\n" -#: builtin/rebase.c:1536 +#: builtin/rebase.c:2174 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "首先，回退头指针以便在其上重放您的工作...\n" -#: builtin/rebase.c:1543 +#: builtin/rebase.c:2183 msgid "Could not detach HEAD" msgstr "无法分离头指针" -#: builtin/rebase.c:1552 +#: builtin/rebase.c:2192 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "快进 %s 到 %s。\n" -#: builtin/rebase--interactive.c:24 -msgid "no HEAD?" -msgstr "没有 HEAD？" - -#: builtin/rebase--interactive.c:51 -#, c-format -msgid "could not create temporary %s" -msgstr "无法创建临时的 %s" - -#: builtin/rebase--interactive.c:57 -msgid "could not mark as interactive" -msgstr "无法标记为交互式" - -#: builtin/rebase--interactive.c:101 -#, c-format -msgid "could not open %s" -msgstr "无法打开 %s" - -#: builtin/rebase--interactive.c:114 -msgid "could not generate todo list" -msgstr "无法生成待办列表" - -#: builtin/rebase--interactive.c:129 -msgid "git rebase--interactive [<options>]" -msgstr "git rebase--interactive [<选项>]" - -#: builtin/rebase--interactive.c:148 -msgid "keep empty commits" -msgstr "保持空提交" - -#: builtin/rebase--interactive.c:150 builtin/revert.c:124 -msgid "allow commits with empty messages" -msgstr "允许提交说明为空" - -#: builtin/rebase--interactive.c:151 -msgid "rebase merge commits" -msgstr "对合并提交变基" - -#: builtin/rebase--interactive.c:153 -msgid "keep original branch points of cousins" -msgstr "保持兄弟提交的原始分支点" - -#: builtin/rebase--interactive.c:155 -msgid "move commits that begin with squash!/fixup!" -msgstr "移动以 squash!/fixup! 开头的提交" - -#: builtin/rebase--interactive.c:156 -msgid "sign commits" -msgstr "签名提交" - -#: builtin/rebase--interactive.c:158 -msgid "continue rebase" -msgstr "继续变基" - -#: builtin/rebase--interactive.c:160 -msgid "skip commit" -msgstr "跳过提交" - -#: builtin/rebase--interactive.c:161 -msgid "edit the todo list" -msgstr "变基待办列表" - -#: builtin/rebase--interactive.c:163 -msgid "show the current patch" -msgstr "显示当前补丁" - -#: builtin/rebase--interactive.c:166 -msgid "shorten commit ids in the todo list" -msgstr "缩短待办列表中的提交号" - -#: builtin/rebase--interactive.c:168 -msgid "expand commit ids in the todo list" -msgstr "扩展待办列表中的提交号" - -#: builtin/rebase--interactive.c:170 -msgid "check the todo list" -msgstr "检查待办列表" - -#: builtin/rebase--interactive.c:172 -msgid "rearrange fixup/squash lines" -msgstr "重新排列 fixup/squash 行" - -#: builtin/rebase--interactive.c:174 -msgid "insert exec commands in todo list" -msgstr "在待办列表中插入 exec 执行命令" - -#: builtin/rebase--interactive.c:175 -msgid "onto" -msgstr "onto" - -#: builtin/rebase--interactive.c:177 -msgid "restrict-revision" -msgstr "restrict-revision" - -#: builtin/rebase--interactive.c:177 -msgid "restrict revision" -msgstr "限制版本" - -#: builtin/rebase--interactive.c:178 -msgid "squash-onto" -msgstr "squash-onto" - -#: builtin/rebase--interactive.c:179 -msgid "squash onto" -msgstr "squash onto" - -#: builtin/rebase--interactive.c:181 -msgid "the upstream commit" -msgstr "上游提交" - -#: builtin/rebase--interactive.c:182 -msgid "head-name" -msgstr "head-name" - -#: builtin/rebase--interactive.c:182 -msgid "head name" -msgstr "head 名称" - -#: builtin/rebase--interactive.c:187 -msgid "rebase strategy" -msgstr "变基策略" - -#: builtin/rebase--interactive.c:188 -msgid "strategy-opts" -msgstr "strategy-opts" - -#: builtin/rebase--interactive.c:189 -msgid "strategy options" -msgstr "策略选项" - -#: builtin/rebase--interactive.c:190 -msgid "switch-to" -msgstr "切换到" - -#: builtin/rebase--interactive.c:191 -msgid "the branch or commit to checkout" -msgstr "要检出的分支或提交" - -#: builtin/rebase--interactive.c:192 -msgid "onto-name" -msgstr "onto-name" - -#: builtin/rebase--interactive.c:192 -msgid "onto name" -msgstr "onto name" - -#: builtin/rebase--interactive.c:193 -msgid "cmd" -msgstr "cmd" - -#: builtin/rebase--interactive.c:193 -msgid "the command to run" -msgstr "要执行的命令" - -#: builtin/rebase--interactive.c:220 -msgid "--[no-]rebase-cousins has no effect without --rebase-merges" -msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果" - -#: builtin/rebase--interactive.c:226 -msgid "a base commit must be provided with --upstream or --onto" -msgstr "使用 --upstream 或 --onto 必须提供一个基线提交" - -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <仓库目录>" @@ -15405,19 +18137,74 @@ msgstr "" "\n" "若要屏蔽此信息，您可以设置它为 'refuse'。" -#: builtin/receive-pack.c:1929 +#: builtin/receive-pack.c:1936 msgid "quiet" msgstr "静默模式" -#: builtin/receive-pack.c:1943 +#: builtin/receive-pack.c:1950 msgid "You must specify a directory." msgstr "您必须指定一个目录。" -#: builtin/reflog.c:563 builtin/reflog.c:568 +#: builtin/reflog.c:17 +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--" +"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " +"<refs>..." +msgstr "" +"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--" +"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引" +"用>..." + +#: builtin/reflog.c:22 +msgid "" +"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " +"<refs>..." +msgstr "" +"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引" +"用>..." + +#: builtin/reflog.c:25 +msgid "git reflog exists <ref>" +msgstr "git reflog exists <引用>" + +#: builtin/reflog.c:567 builtin/reflog.c:572 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' 不是一个有效的时间戳" +#: builtin/reflog.c:605 +#, c-format +msgid "Marking reachable objects..." +msgstr "正在标记可达对象..." + +#: builtin/reflog.c:643 +#, c-format +msgid "%s points nowhere!" +msgstr "%s 指向不存在！" + +#: builtin/reflog.c:695 +msgid "no reflog specified to delete" +msgstr "未指定要删除的引用日志" + +#: builtin/reflog.c:704 +#, c-format +msgid "not a reflog: %s" +msgstr "不是一个引用日志：%s" + +#: builtin/reflog.c:709 +#, c-format +msgid "no reflog for '%s'" +msgstr "没有 '%s' 的引用日志" + +#: builtin/reflog.c:755 +#, c-format +msgid "invalid ref format: %s" +msgstr "无效的引用格式：%s" + +#: builtin/reflog.c:764 +msgid "git reflog [ show | expire | delete | exists ]" +msgstr "git reflog [ show | expire | delete | exists ]" + #: builtin/remote.c:16 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" @@ -15577,7 +18364,7 @@ msgstr "（匹配）" msgid "(delete)" msgstr "（删除）" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:629 builtin/remote.c:764 builtin/remote.c:863 #, c-format msgid "No such remote: '%s'" msgstr "没有此远程仓库：'%s'" @@ -15598,17 +18385,17 @@ msgstr "" "\t%s\n" "\t如果必要请手动更新配置。" -#: builtin/remote.c:702 +#: builtin/remote.c:701 #, c-format msgid "deleting '%s' failed" msgstr "删除 '%s' 失败" -#: builtin/remote.c:736 +#: builtin/remote.c:735 #, c-format msgid "creating '%s' failed" msgstr "创建 '%s' 失败" -#: builtin/remote.c:802 +#: builtin/remote.c:801 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -15618,118 +18405,118 @@ msgid_plural "" msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用：" msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用：" -#: builtin/remote.c:816 +#: builtin/remote.c:815 #, c-format msgid "Could not remove config section '%s'" msgstr "不能移除配置小节 '%s'" -#: builtin/remote.c:917 +#: builtin/remote.c:916 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的（下一次获取将存储于 remotes/%s）" -#: builtin/remote.c:920 +#: builtin/remote.c:919 msgid " tracked" msgstr " 已跟踪" -#: builtin/remote.c:922 +#: builtin/remote.c:921 msgid " stale (use 'git remote prune' to remove)" msgstr " 过时（使用 'git remote prune' 来移除）" -#: builtin/remote.c:924 +#: builtin/remote.c:923 msgid " ???" msgstr " ???" -#: builtin/remote.c:965 +#: builtin/remote.c:964 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支" -#: builtin/remote.c:974 +#: builtin/remote.c:973 #, c-format msgid "rebases interactively onto remote %s" msgstr "交互式变基到远程 %s" -#: builtin/remote.c:976 +#: builtin/remote.c:975 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "交互式变基（含合并提交）到远程 %s" -#: builtin/remote.c:979 +#: builtin/remote.c:978 #, c-format msgid "rebases onto remote %s" msgstr "变基到远程 %s" -#: builtin/remote.c:983 +#: builtin/remote.c:982 #, c-format msgid " merges with remote %s" msgstr " 与远程 %s 合并" -#: builtin/remote.c:986 +#: builtin/remote.c:985 #, c-format msgid "merges with remote %s" msgstr "与远程 %s 合并" -#: builtin/remote.c:989 +#: builtin/remote.c:988 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s 以及和远程 %s\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1031 msgid "create" msgstr "创建" -#: builtin/remote.c:1035 +#: builtin/remote.c:1034 msgid "delete" msgstr "删除" -#: builtin/remote.c:1039 +#: builtin/remote.c:1038 msgid "up to date" msgstr "最新" -#: builtin/remote.c:1042 +#: builtin/remote.c:1041 msgid "fast-forwardable" msgstr "可快进" -#: builtin/remote.c:1045 +#: builtin/remote.c:1044 msgid "local out of date" msgstr "本地已过时" -#: builtin/remote.c:1052 +#: builtin/remote.c:1051 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 强制推送至 %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1054 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推送至 %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1058 #, c-format msgid " %-*s forces to %s" msgstr " %-*s 强制推送至 %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1061 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推送至 %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1129 msgid "do not query remotes" msgstr "不查询远程" -#: builtin/remote.c:1157 +#: builtin/remote.c:1156 #, c-format msgid "* remote %s" msgstr "* 远程 %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1157 #, c-format msgid " Fetch URL: %s" msgstr " 获取地址：%s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 msgid "(no URL)" msgstr "(无 URL)" @@ -15737,32 +18524,32 @@ msgstr "(无 URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " Push URL: %s" msgstr " 推送地址：%s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支：%s" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/remote.c:1177 +#: builtin/remote.c:1176 msgid "(not queried)" msgstr "（未查询）" -#: builtin/remote.c:1179 +#: builtin/remote.c:1178 msgid "(unknown)" msgstr "（未知）" -#: builtin/remote.c:1183 +#: builtin/remote.c:1182 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n" -#: builtin/remote.c:1195 +#: builtin/remote.c:1194 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -15770,164 +18557,155 @@ msgstr[0] " 远程分支：%s" msgstr[1] " 远程分支：%s" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1197 builtin/remote.c:1223 msgid " (status not queried)" msgstr "（状态未查询）" -#: builtin/remote.c:1207 +#: builtin/remote.c:1206 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " 为 'git pull' 配置的本地分支：" msgstr[1] " 为 'git pull' 配置的本地分支：" -#: builtin/remote.c:1215 +#: builtin/remote.c:1214 msgid " Local refs will be mirrored by 'git push'" msgstr " 本地引用将在 'git push' 时被镜像" -#: builtin/remote.c:1221 +#: builtin/remote.c:1220 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 为 'git push' 配置的本地引用%s：" msgstr[1] " 为 'git push' 配置的本地引用%s：" -#: builtin/remote.c:1242 +#: builtin/remote.c:1241 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "根据远程设置 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1243 msgid "delete refs/remotes/<name>/HEAD" msgstr "删除 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1258 msgid "Cannot determine remote HEAD" msgstr "无法确定远程 HEAD" -#: builtin/remote.c:1261 +#: builtin/remote.c:1260 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多个远程 HEAD 分支。请明确地选择一个用命令：" -#: builtin/remote.c:1271 +#: builtin/remote.c:1270 #, c-format msgid "Could not delete %s" msgstr "无法删除 %s" -#: builtin/remote.c:1279 +#: builtin/remote.c:1278 #, c-format msgid "Not a valid ref: %s" msgstr "不是一个有效引用：%s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1280 #, c-format msgid "Could not setup %s" msgstr "不能设置 %s" # 译者：注意保持前导空格 -#: builtin/remote.c:1299 +#: builtin/remote.c:1298 #, c-format msgid " %s will become dangling!" msgstr " %s 将成为悬空状态！" # 译者：注意保持前导空格 -#: builtin/remote.c:1300 +#: builtin/remote.c:1299 #, c-format msgid " %s has become dangling!" msgstr " %s 已成为悬空状态！" -#: builtin/remote.c:1310 +#: builtin/remote.c:1309 #, c-format msgid "Pruning %s" msgstr "修剪 %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1310 #, c-format msgid "URL: %s" msgstr "URL：%s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1326 #, c-format msgid " * [would prune] %s" msgstr " * [将删除] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1329 #, c-format msgid " * [pruned] %s" msgstr " * [已删除] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "抓取后清除远程" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 #, c-format msgid "No such remote '%s'" msgstr "没有此远程 '%s'" -#: builtin/remote.c:1454 +#: builtin/remote.c:1453 msgid "add branch" msgstr "添加分支" -#: builtin/remote.c:1461 +#: builtin/remote.c:1460 msgid "no remote specified" msgstr "未指定远程" -#: builtin/remote.c:1478 +#: builtin/remote.c:1477 msgid "query push URLs rather than fetch URLs" msgstr "查询推送 URL 地址，而非获取 URL 地址" -#: builtin/remote.c:1480 +#: builtin/remote.c:1479 msgid "return all URLs" msgstr "返回所有 URL 地址" -#: builtin/remote.c:1508 +#: builtin/remote.c:1507 #, c-format msgid "no URLs configured for remote '%s'" msgstr "没有给远程仓库 '%s' 设定 URL" -#: builtin/remote.c:1534 +#: builtin/remote.c:1533 msgid "manipulate push URLs" msgstr "操作推送 URLS" -#: builtin/remote.c:1536 +#: builtin/remote.c:1535 msgid "add URL" msgstr "添加 URL" -#: builtin/remote.c:1538 +#: builtin/remote.c:1537 msgid "delete URLs" msgstr "删除 URLS" -#: builtin/remote.c:1545 +#: builtin/remote.c:1544 msgid "--add --delete doesn't make sense" msgstr "--add --delete 无意义" -#: builtin/remote.c:1584 +#: builtin/remote.c:1583 #, c-format msgid "Invalid old URL pattern: %s" msgstr "无效的旧 URL 匹配模版：%s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1591 #, c-format msgid "No such URL found: %s" msgstr "未找到此 URL：%s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1593 msgid "Will not delete all non-push URLs" msgstr "将不会删除所有非推送 URL 地址" -#: builtin/remote.c:1610 -msgid "be verbose; must be placed before a subcommand" -msgstr "冗长输出；必须置于子命令之前" - -#: builtin/remote.c:1641 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "未知子命令：%s" - -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "git repack [<options>]" msgstr "git repack [<选项>]" -#: builtin/repack.c:27 +#: builtin/repack.c:28 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -15935,95 +18713,127 @@ msgstr "" "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n" "或禁用 pack.writebitmaps 配置。" -#: builtin/repack.c:294 +#: builtin/repack.c:191 +msgid "could not start pack-objects to repack promisor objects" +msgstr "无法开始 pack-objects 来重新打包 promisor 对象" + +#: builtin/repack.c:230 builtin/repack.c:416 +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。" + +#: builtin/repack.c:254 +msgid "could not finish pack-objects to repack promisor objects" +msgstr "无法完成 pack-objects 来重新打包 promisor 对象" + +#: builtin/repack.c:292 msgid "pack everything in a single pack" msgstr "所有内容打包到一个包文件中" -#: builtin/repack.c:296 +#: builtin/repack.c:294 msgid "same as -a, and turn unreachable objects loose" msgstr "和 -a 相同，并将不可达的对象设为松散对象" -#: builtin/repack.c:299 +#: builtin/repack.c:297 msgid "remove redundant packs, and run git-prune-packed" msgstr "删除多余的包，运行 git-prune-packed" -#: builtin/repack.c:301 +#: builtin/repack.c:299 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" -#: builtin/repack.c:303 +#: builtin/repack.c:301 msgid "pass --no-reuse-object to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --no-reuse-object" -#: builtin/repack.c:305 +#: builtin/repack.c:303 msgid "do not run git-update-server-info" msgstr "不运行 git-update-server-info" -#: builtin/repack.c:308 +#: builtin/repack.c:306 msgid "pass --local to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --local" -#: builtin/repack.c:310 +#: builtin/repack.c:308 msgid "write bitmap index" msgstr "写 bitmap 索引" -#: builtin/repack.c:312 +#: builtin/repack.c:310 msgid "pass --delta-islands to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --delta-islands" -#: builtin/repack.c:313 +#: builtin/repack.c:311 msgid "approxidate" msgstr "近似日期" -#: builtin/repack.c:314 +#: builtin/repack.c:312 msgid "with -A, do not loosen objects older than this" msgstr "使用 -A，不要将早于给定时间的对象过期" -#: builtin/repack.c:316 +#: builtin/repack.c:314 msgid "with -a, repack unreachable objects" msgstr "使用 -a ，重新对不可达对象打包" -#: builtin/repack.c:318 +#: builtin/repack.c:316 msgid "size of the window used for delta compression" msgstr "用于增量压缩的窗口值" -#: builtin/repack.c:319 builtin/repack.c:325 +#: builtin/repack.c:317 builtin/repack.c:323 msgid "bytes" msgstr "字节" -#: builtin/repack.c:320 +#: builtin/repack.c:318 msgid "same as the above, but limit memory size instead of entries count" msgstr "和上面的相似，但限制内存大小而非条目数" -#: builtin/repack.c:322 +#: builtin/repack.c:320 msgid "limits the maximum delta depth" msgstr "限制最大增量深度" -#: builtin/repack.c:324 +#: builtin/repack.c:322 msgid "limits the maximum number of threads" msgstr "限制最大线程数" -#: builtin/repack.c:326 +#: builtin/repack.c:324 msgid "maximum size of each packfile" msgstr "每个包文件的最大尺寸" -#: builtin/repack.c:328 +#: builtin/repack.c:326 msgid "repack objects in packs marked with .keep" msgstr "对标记为 .keep 的包中的对象重新打包" -#: builtin/repack.c:330 +#: builtin/repack.c:328 msgid "do not repack this pack" msgstr "不要对该包文件重新打包" -#: builtin/repack.c:340 +#: builtin/repack.c:338 msgid "cannot delete packs in a precious-objects repo" msgstr "不能删除珍品仓库中的打包文件" -#: builtin/repack.c:344 +#: builtin/repack.c:342 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable 和 -A 不兼容" -#: builtin/repack.c:527 +#: builtin/repack.c:425 +msgid "Nothing new to pack." +msgstr "没有新的要打包。" + +#: builtin/repack.c:486 +#, c-format +msgid "" +"WARNING: Some packs in use have been renamed by\n" +"WARNING: prefixing old- to their name, in order to\n" +"WARNING: replace them with the new version of the\n" +"WARNING: file. But the operation failed, and the\n" +"WARNING: attempt to rename them back to their\n" +"WARNING: original names also failed.\n" +"WARNING: Please rename them in %s manually:\n" +msgstr "" +"警告：为了将包文件替换为新版本，一些使用中的包已经\n" +"警告：通过添加 old- 前缀的方式重命名。但是操作失败，\n" +"警告：并且尝试重命名改回原有文件名的操作也失败。\n" +"警告：请手动将 %s 下的这些文件重命名：\n" + +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "删除 '%s' 失败" @@ -16052,12 +18862,7 @@ msgstr "git replace -d <对象>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<格式>] [-l [<模式>]]" -#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206 -#, c-format -msgid "failed to resolve '%s' as a valid ref" -msgstr "无法将 '%s' 解析为一个有效引用" - -#: builtin/replace.c:86 +#: builtin/replace.c:90 #, c-format msgid "" "invalid replace format '%s'\n" @@ -16066,27 +18871,27 @@ msgstr "" "无效的替换格式 '%s'\n" "有效的格式有 'short'、'medium' 和 'long'" -#: builtin/replace.c:121 +#: builtin/replace.c:125 #, c-format msgid "replace ref '%s' not found" msgstr "未发现替换引用 '%s'" -#: builtin/replace.c:137 +#: builtin/replace.c:141 #, c-format msgid "Deleted replace ref '%s'" msgstr "已删除替换引用 '%s'" -#: builtin/replace.c:149 +#: builtin/replace.c:153 #, c-format msgid "'%s' is not a valid ref name" msgstr "'%s' 不是一个有效的引用名" -#: builtin/replace.c:154 +#: builtin/replace.c:158 #, c-format msgid "replace ref '%s' already exists" msgstr "替换引用 '%s' 已经存在" -#: builtin/replace.c:174 +#: builtin/replace.c:178 #, c-format msgid "" "Objects must be of the same type.\n" @@ -16097,107 +18902,112 @@ msgstr "" "'%s' 指向 '%s' 类型的替换对象\n" "而 '%s' 指向 '%s' 类型的替换对象。" -#: builtin/replace.c:225 +#: builtin/replace.c:229 #, c-format msgid "unable to open %s for writing" msgstr "无法为写入打开 %s" -#: builtin/replace.c:238 +#: builtin/replace.c:242 msgid "cat-file reported failure" msgstr "cat-file 报告失败" -#: builtin/replace.c:254 +#: builtin/replace.c:258 #, c-format msgid "unable to open %s for reading" msgstr "无法为读取打开 %s" -#: builtin/replace.c:268 +#: builtin/replace.c:272 msgid "unable to spawn mktree" msgstr "无法启动 mktree" -#: builtin/replace.c:272 +#: builtin/replace.c:276 msgid "unable to read from mktree" msgstr "无法从 mktree 读取" -#: builtin/replace.c:281 +#: builtin/replace.c:285 msgid "mktree reported failure" msgstr "mktree 报告失败" -#: builtin/replace.c:285 +#: builtin/replace.c:289 msgid "mktree did not return an object name" msgstr "mktree 没有返回一个对象名" -#: builtin/replace.c:294 +#: builtin/replace.c:298 #, c-format msgid "unable to fstat %s" msgstr "无法对 %s 执行 fstat" -#: builtin/replace.c:299 +#: builtin/replace.c:303 msgid "unable to write object to database" msgstr "无法向数据库写入对象" -#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415 -#: builtin/replace.c:445 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423 +#: builtin/replace.c:453 #, c-format msgid "not a valid object name: '%s'" msgstr "不是一个有效的对象名：'%s'" -#: builtin/replace.c:322 +#: builtin/replace.c:326 #, c-format msgid "unable to get object type for %s" msgstr "无法得到 %s 的对象类型" -#: builtin/replace.c:338 +#: builtin/replace.c:342 msgid "editing object file failed" msgstr "编辑对象文件失败" -#: builtin/replace.c:347 +#: builtin/replace.c:351 #, c-format msgid "new object is the same as the old one: '%s'" msgstr "新对象和旧对象相同：'%s'" -#: builtin/replace.c:407 +#: builtin/replace.c:384 +#, c-format +msgid "could not parse %s as a commit" +msgstr "无法将 %s 解析为一个提交" + +#: builtin/replace.c:415 #, c-format msgid "bad mergetag in commit '%s'" msgstr "提交 '%s' 中含有损坏的合并标签" -#: builtin/replace.c:409 +#: builtin/replace.c:417 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "提交 '%s' 中含有格式错误的合并标签" -#: builtin/replace.c:421 +#: builtin/replace.c:429 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft" -#: builtin/replace.c:460 +#: builtin/replace.c:468 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "原始提交 '%s' 中有一个 gpg 签名" -#: builtin/replace.c:461 +#: builtin/replace.c:469 msgid "the signature will be removed in the replacement commit!" msgstr "在替换的提交中签名将被移除！" -#: builtin/replace.c:471 +#: builtin/replace.c:479 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "不能为 '%s' 写替换提交" -#: builtin/replace.c:479 +#: builtin/replace.c:487 #, c-format msgid "graft for '%s' unnecessary" msgstr "对 '%s' 移植没有必要" -#: builtin/replace.c:482 +#: builtin/replace.c:491 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "新提交和旧的一样：'%s'" -#: builtin/replace.c:515 +#: builtin/replace.c:526 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -16206,71 +19016,71 @@ msgstr "" "不能转换下列移植：\n" "%s" -#: builtin/replace.c:536 +#: builtin/replace.c:547 msgid "list replace refs" msgstr "列出替换的引用" -#: builtin/replace.c:537 +#: builtin/replace.c:548 msgid "delete replace refs" msgstr "删除替换的引用" -#: builtin/replace.c:538 +#: builtin/replace.c:549 msgid "edit existing object" msgstr "编辑现存的对象" -#: builtin/replace.c:539 +#: builtin/replace.c:550 msgid "change a commit's parents" msgstr "修改一个提交的父提交" -#: builtin/replace.c:540 +#: builtin/replace.c:551 msgid "convert existing graft file" msgstr "转换现存的移植文件" -#: builtin/replace.c:541 +#: builtin/replace.c:552 msgid "replace the ref if it exists" msgstr "如果存在则替换引用" -#: builtin/replace.c:543 +#: builtin/replace.c:554 msgid "do not pretty-print contents for --edit" msgstr "不要为 --edit 操作美观显示内容" -#: builtin/replace.c:544 +#: builtin/replace.c:555 msgid "use this format" msgstr "使用此格式" -#: builtin/replace.c:557 +#: builtin/replace.c:568 msgid "--format cannot be used when not listing" msgstr "不列出时不能使用 --format" -#: builtin/replace.c:565 +#: builtin/replace.c:576 msgid "-f only makes sense when writing a replacement" msgstr "只有写一个替换时 -f 才有意义" -#: builtin/replace.c:569 +#: builtin/replace.c:580 msgid "--raw only makes sense with --edit" msgstr "--raw 只有和 --edit 共用才有意义" -#: builtin/replace.c:575 +#: builtin/replace.c:586 msgid "-d needs at least one argument" msgstr "-d 需要至少一个参数" -#: builtin/replace.c:581 +#: builtin/replace.c:592 msgid "bad number of arguments" msgstr "错误的参数个数" -#: builtin/replace.c:587 +#: builtin/replace.c:598 msgid "-e needs exactly one argument" msgstr "-e 需要且仅需要一个参数" -#: builtin/replace.c:593 +#: builtin/replace.c:604 msgid "-g needs at least one argument" msgstr "-g 需要至少一个参数" -#: builtin/replace.c:599 +#: builtin/replace.c:610 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file 不带参数" -#: builtin/replace.c:605 +#: builtin/replace.c:616 msgid "only one pattern can be given with -l" msgstr "只能为 -l 提供一个模式" @@ -16286,126 +19096,138 @@ msgstr "在索引中注册干净的解决方案" msgid "'git rerere forget' without paths is deprecated" msgstr "没有路径的 'git rerere forget' 已经过时" -#: builtin/rerere.c:111 +#: builtin/rerere.c:113 #, c-format msgid "unable to generate diff for '%s'" msgstr "无法为 '%s' 生成差异" -#: builtin/reset.c:31 +#: builtin/reset.c:32 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" -#: builtin/reset.c:32 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "git reset [-q] [<树或提交>] [--] <路径>..." - #: builtin/reset.c:33 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..." -#: builtin/reset.c:39 +#: builtin/reset.c:34 +msgid "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" +msgstr "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]" + +#: builtin/reset.c:35 +msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" +msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]" + +#: builtin/reset.c:41 msgid "mixed" msgstr "混杂" -#: builtin/reset.c:39 +#: builtin/reset.c:41 msgid "soft" msgstr "软性" -#: builtin/reset.c:39 +#: builtin/reset.c:41 msgid "hard" msgstr "硬性" -#: builtin/reset.c:39 +#: builtin/reset.c:41 msgid "merge" msgstr "合并" -#: builtin/reset.c:39 +#: builtin/reset.c:41 msgid "keep" msgstr "保持" -#: builtin/reset.c:80 +#: builtin/reset.c:82 msgid "You do not have a valid HEAD." msgstr "您没有一个有效的 HEAD。" -#: builtin/reset.c:82 +#: builtin/reset.c:84 msgid "Failed to find tree of HEAD." msgstr "无法找到 HEAD 指向的树。" -#: builtin/reset.c:88 +#: builtin/reset.c:90 #, c-format msgid "Failed to find tree of %s." msgstr "无法找到 %s 指向的树。" +#: builtin/reset.c:115 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD 现在位于 %s" + # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:192 +#: builtin/reset.c:194 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" -#: builtin/reset.c:292 +#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594 +#: builtin/stash.c:618 msgid "be quiet, only report errors" msgstr "安静模式，只报告错误" -#: builtin/reset.c:294 +#: builtin/reset.c:296 msgid "reset HEAD and index" msgstr "重置 HEAD 和索引" -#: builtin/reset.c:295 +#: builtin/reset.c:297 msgid "reset only HEAD" msgstr "只重置 HEAD" -#: builtin/reset.c:297 builtin/reset.c:299 +#: builtin/reset.c:299 builtin/reset.c:301 msgid "reset HEAD, index and working tree" msgstr "重置 HEAD、索引和工作区" -#: builtin/reset.c:301 +#: builtin/reset.c:303 msgid "reset HEAD but keep local changes" msgstr "重置 HEAD 但保存本地变更" -#: builtin/reset.c:307 +#: builtin/reset.c:309 msgid "record only the fact that removed paths will be added later" msgstr "将删除的路径标记为稍后添加" -#: builtin/reset.c:325 +#: builtin/reset.c:343 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "无法将 '%s' 解析为一个有效的版本。" -#: builtin/reset.c:333 +#: builtin/reset.c:351 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "无法将 '%s' 解析为一个有效的树对象。" -#: builtin/reset.c:342 +#: builtin/reset.c:360 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" -#: builtin/reset.c:351 +#: builtin/reset.c:370 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:353 +#: builtin/reset.c:372 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:363 +#: builtin/reset.c:387 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能对纯仓库进行%s重置" -#: builtin/reset.c:367 +#: builtin/reset.c:391 msgid "-N can only be used with --mixed" msgstr "-N 只能和 --mixed 同时使用" -#: builtin/reset.c:387 +#: builtin/reset.c:412 msgid "Unstaged changes after reset:" msgstr "重置后取消暂存的变更：" -#: builtin/reset.c:390 +#: builtin/reset.c:415 #, c-format msgid "" "\n" @@ -16417,53 +19239,48 @@ msgstr "" "重置后，枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n" "将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n" -#: builtin/reset.c:400 +#: builtin/reset.c:425 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" -#: builtin/reset.c:404 +#: builtin/reset.c:429 msgid "Could not write new index file." msgstr "不能写入新的索引文件。" -#: builtin/rev-list.c:403 +#: builtin/rev-list.c:411 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项" -#: builtin/rev-list.c:461 +#: builtin/rev-list.c:472 msgid "object filtering requires --objects" msgstr "对象过滤需要 --objects" -#: builtin/rev-list.c:464 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "无效的稀疏值 '%s'" - -#: builtin/rev-list.c:505 +#: builtin/rev-list.c:522 msgid "rev-list does not support display of notes" msgstr "rev-list 不支持显示注解" -#: builtin/rev-list.c:508 +#: builtin/rev-list.c:525 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "不能将 --use-bitmap-index 和对象过滤组合使用" -#: builtin/rev-parse.c:407 +#: builtin/rev-parse.c:408 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" -#: builtin/rev-parse.c:412 +#: builtin/rev-parse.c:413 msgid "keep the `--` passed as an arg" msgstr "保持 `--` 作为一个参数传递" -#: builtin/rev-parse.c:414 +#: builtin/rev-parse.c:415 msgid "stop parsing after the first non-option argument" msgstr "遇到第一个非选项参数后停止解析" -#: builtin/rev-parse.c:417 +#: builtin/rev-parse.c:418 msgid "output in stuck long form" msgstr "以固定长格式输出" -#: builtin/rev-parse.c:550 +#: builtin/rev-parse.c:551 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -16493,72 +19310,81 @@ msgstr "git cherry-pick [<选项>] <提交号>..." msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <子命令>" -#: builtin/revert.c:91 +#: builtin/revert.c:72 +#, c-format +msgid "option `%s' expects a number greater than zero" +msgstr "选项 `%s' 期望一个大于零的数字" + +#: builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s：%s 不能和 %s 同时使用" -#: builtin/revert.c:100 +#: builtin/revert.c:102 msgid "end revert or cherry-pick sequence" msgstr "终止反转或拣选操作" -#: builtin/revert.c:101 +#: builtin/revert.c:103 msgid "resume revert or cherry-pick sequence" msgstr "继续反转或拣选操作" -#: builtin/revert.c:102 +#: builtin/revert.c:104 msgid "cancel revert or cherry-pick sequence" msgstr "取消反转或拣选操作" -#: builtin/revert.c:103 +#: builtin/revert.c:105 +msgid "skip current commit and continue" +msgstr "跳过当前提交并继续" + +#: builtin/revert.c:107 msgid "don't automatically commit" msgstr "不要自动提交" -#: builtin/revert.c:104 +#: builtin/revert.c:108 msgid "edit the commit message" msgstr "编辑提交说明" -#: builtin/revert.c:107 +#: builtin/revert.c:111 msgid "parent-number" msgstr "父编号" -#: builtin/revert.c:108 +#: builtin/revert.c:112 msgid "select mainline parent" msgstr "选择主干父提交编号" -#: builtin/revert.c:110 +#: builtin/revert.c:114 msgid "merge strategy" msgstr "合并策略" -#: builtin/revert.c:112 +#: builtin/revert.c:116 msgid "option for merge strategy" msgstr "合并策略的选项" -#: builtin/revert.c:121 +#: builtin/revert.c:125 msgid "append commit name" msgstr "追加提交名称" -#: builtin/revert.c:123 +#: builtin/revert.c:127 msgid "preserve initially empty commits" msgstr "保留初始化的空提交" -#: builtin/revert.c:125 +#: builtin/revert.c:129 msgid "keep redundant, empty commits" msgstr "保持多余的、空的提交" -#: builtin/revert.c:219 +#: builtin/revert.c:232 msgid "revert failed" msgstr "还原失败" -#: builtin/revert.c:232 +#: builtin/revert.c:245 msgid "cherry-pick failed" msgstr "拣选失败" -#: builtin/rm.c:18 +#: builtin/rm.c:19 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<选项>] [--] <文件>..." -#: builtin/rm.c:206 +#: builtin/rm.c:207 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -16568,7 +19394,7 @@ msgid_plural "" msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样：" msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样：" -#: builtin/rm.c:211 +#: builtin/rm.c:212 msgid "" "\n" "(use -f to force removal)" @@ -16576,13 +19402,13 @@ msgstr "" "\n" "（使用 -f 强制删除）" -#: builtin/rm.c:215 +#: builtin/rm.c:216 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "下列文件索引中有变更" msgstr[1] "下列文件索引中有变更" -#: builtin/rm.c:219 builtin/rm.c:228 +#: builtin/rm.c:220 builtin/rm.c:229 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -16590,42 +19416,42 @@ msgstr "" "\n" "（使用 --cached 保留本地文件，或用 -f 强制删除）" -#: builtin/rm.c:225 +#: builtin/rm.c:226 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "如下文件有本地修改：" msgstr[1] "如下文件有本地修改：" -#: builtin/rm.c:241 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "不列出删除的文件" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "只从索引区删除" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "忽略文件更新状态检查" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "允许递归删除" -#: builtin/rm.c:246 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "即使没有匹配，也以零状态退出" -#: builtin/rm.c:288 +#: builtin/rm.c:289 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" -#: builtin/rm.c:306 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "未提供 -r 选项不会递归删除 '%s'" -#: builtin/rm.c:345 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm：不能删除 %s" @@ -16657,18 +19483,6 @@ msgstr "从标准输入读取引用" msgid "print status from remote helper" msgstr "打印来自远程 helper 的状态" -#: builtin/serve.c:7 -msgid "git serve [<options>]" -msgstr "git serve [<选项>]" - -#: builtin/serve.c:17 builtin/upload-pack.c:23 -msgid "quit after a single request/response exchange" -msgstr "在一次单独的请求/响应之后退出" - -#: builtin/serve.c:19 -msgid "exit immediately after advertising capabilities" -msgstr "对能力广告之后立即退出" - #: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]" @@ -16701,7 +19515,7 @@ msgstr "<w>[,<i1>[,<i2>]]" msgid "Linewrap output" msgstr "折行输出" -#: builtin/shortlog.c:299 +#: builtin/shortlog.c:301 msgid "too many arguments given outside repository" msgstr "仓库外执行提供了太多的参数" @@ -16728,118 +19542,118 @@ msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "忽略 %s，无法处理 %d 个以上的引用" msgstr[1] "忽略 %s，无法处理 %d 个以上的引用" -#: builtin/show-branch.c:549 +#: builtin/show-branch.c:548 #, c-format msgid "no matching refs with %s" msgstr "没有和 %s 匹配的引用" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" msgstr "显示远程跟踪的和本地的分支" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:647 msgid "show remote-tracking branches" msgstr "显示远程跟踪的分支" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" msgstr "着色 '*!+-' 到相应的分支" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" msgstr "显示共同祖先后的 <n> 个提交" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "synonym to more=-1" msgstr "和 more=-1 同义" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "suppress naming strings" msgstr "不显示字符串命名" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "include the current branch" msgstr "包括当前分支" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "name commits with their object names" msgstr "以对象名字命名提交" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:660 msgid "show possible merge bases" msgstr "显示可能合并的基线" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" msgstr "显示没有任何引用的的引用" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:664 msgid "show commits in topological order" msgstr "以拓扑顺序显示提交" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:667 msgid "show only commits not on the first branch" msgstr "只显示不在第一个分支上的提交" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" msgstr "显示仅一个分支可访问的合并提交" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" msgstr "拓扑方式排序，并尽可能地保持日期顺序" -#: builtin/show-branch.c:675 +#: builtin/show-branch.c:674 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" msgstr "显示从起始点开始的 <n> 条最近的引用日志记录" -#: builtin/show-branch.c:712 +#: builtin/show-branch.c:711 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" -#: builtin/show-branch.c:736 +#: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" msgstr "未提供分支，且 HEAD 无效" -#: builtin/show-branch.c:739 +#: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" msgstr "选项 --reflog 需要一个分支名" -#: builtin/show-branch.c:742 +#: builtin/show-branch.c:741 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "一次只能显示 %d 个条目。" msgstr[1] "一次只能显示 %d 个条目。" -#: builtin/show-branch.c:746 +#: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" msgstr "无此引用 %s" -#: builtin/show-branch.c:830 +#: builtin/show-branch.c:831 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "不能处理 %d 个以上的版本。" msgstr[1] "不能处理 %d 个以上的版本。" -#: builtin/show-branch.c:834 +#: builtin/show-branch.c:835 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' 不是一个有效的引用。" -#: builtin/show-branch.c:837 +#: builtin/show-branch.c:838 #, c-format msgid "cannot find commit %s (%s)" msgstr "不能找到提交 %s（%s）" -#: builtin/show-ref.c:11 +#: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" @@ -16847,42 +19661,317 @@ msgstr "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" -#: builtin/show-ref.c:12 +#: builtin/show-ref.c:13 msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<模式>]" -#: builtin/show-ref.c:161 +#: builtin/show-ref.c:162 msgid "only show tags (can be combined with heads)" msgstr "只显示标签（可以和头共用）" -#: builtin/show-ref.c:162 +#: builtin/show-ref.c:163 msgid "only show heads (can be combined with tags)" msgstr "只显示头（可以和标签共用）" -#: builtin/show-ref.c:163 +#: builtin/show-ref.c:164 msgid "stricter reference checking, requires exact ref path" msgstr "更严格的引用检测，需要精确的引用路径" -#: builtin/show-ref.c:166 builtin/show-ref.c:168 +#: builtin/show-ref.c:167 builtin/show-ref.c:169 msgid "show the HEAD reference, even if it would be filtered out" msgstr "显示 HEAD 引用，即使被过滤掉" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:171 msgid "dereference tags into object IDs" msgstr "转换标签到对象 ID" -#: builtin/show-ref.c:172 +#: builtin/show-ref.c:173 msgid "only show SHA1 hash using <n> digits" msgstr "只显示使用 <n> 个数字的 SHA1 哈希" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:177 msgid "do not print results to stdout (useful with --verify)" msgstr "不打印结果到标准输出（例如与 --verify 参数共用）" -#: builtin/show-ref.c:178 +#: builtin/show-ref.c:179 msgid "show refs from stdin that aren't in local repository" msgstr "显示从标准输入中读入的不在本地仓库中的引用" +#: builtin/sparse-checkout.c:20 +msgid "git sparse-checkout (init|list|set|disable) <options>" +msgstr "git sparse-checkout (init|list|set|disable) <选项>" + +#: builtin/sparse-checkout.c:61 +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "本工作区不是稀疏模式（稀疏检出文件可能不存在）" + +#: builtin/sparse-checkout.c:220 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "无法设置 extensions.worktreeConfig" + +#: builtin/sparse-checkout.c:237 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:256 +msgid "initialize the sparse-checkout in cone mode" +msgstr "初始化稀疏检出为 cone 模式" + +#: builtin/sparse-checkout.c:262 +msgid "initialize sparse-checkout" +msgstr "初始化稀疏检出" + +#: builtin/sparse-checkout.c:295 +#, c-format +msgid "failed to open '%s'" +msgstr "无法打开 '%s'" + +#: builtin/sparse-checkout.c:361 +msgid "git sparse-checkout set (--stdin | <patterns>)" +msgstr "git sparse-checkout set (--stdin | <模式>)" + +#: builtin/sparse-checkout.c:378 +msgid "read patterns from standard in" +msgstr "从标准输入读取模式" + +#: builtin/sparse-checkout.c:384 +msgid "set sparse-checkout patterns" +msgstr "设置稀疏检出模式" + +#: builtin/sparse-checkout.c:447 +msgid "disable sparse-checkout" +msgstr "禁用稀疏检出" + +#: builtin/sparse-checkout.c:459 +msgid "error while refreshing working directory" +msgstr "刷新工作目录时出错" + +#: builtin/stash.c:22 builtin/stash.c:37 +msgid "git stash list [<options>]" +msgstr "git stash list [<选项>]" + +#: builtin/stash.c:23 builtin/stash.c:42 +msgid "git stash show [<options>] [<stash>]" +msgstr "git stash show [<选项>] [<stash>]" + +#: builtin/stash.c:24 builtin/stash.c:47 +msgid "git stash drop [-q|--quiet] [<stash>]" +msgstr "git stash drop [-q|--quiet] [<stash>]" + +#: builtin/stash.c:25 +msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:26 builtin/stash.c:62 +msgid "git stash branch <branchname> [<stash>]" +msgstr "git stash branch <分支名> [<stash>]" + +#: builtin/stash.c:27 builtin/stash.c:67 +msgid "git stash clear" +msgstr "git stash clear" + +#: builtin/stash.c:28 builtin/stash.c:77 +msgid "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--] [<pathspec>...]]" +msgstr "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" +" [--] [<路径规格>...]]" + +#: builtin/stash.c:31 builtin/stash.c:84 +msgid "" +"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [<message>]" +msgstr "" +"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [<消息>]" + +#: builtin/stash.c:52 +msgid "git stash pop [--index] [-q|--quiet] [<stash>]" +msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:57 +msgid "git stash apply [--index] [-q|--quiet] [<stash>]" +msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:72 +msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" +msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>" + +#: builtin/stash.c:127 +#, c-format +msgid "'%s' is not a stash-like commit" +msgstr "'%s' 不像是一个贮藏提交" + +#: builtin/stash.c:147 +#, c-format +msgid "Too many revisions specified:%s" +msgstr "指定了太多的版本：%s" + +#: builtin/stash.c:161 git-legacy-stash.sh:549 +msgid "No stash entries found." +msgstr "未发现贮藏条目。" + +#: builtin/stash.c:175 +#, c-format +msgid "%s is not a valid reference" +msgstr "%s 不是一个有效的引用名" + +#: builtin/stash.c:224 git-legacy-stash.sh:75 +msgid "git stash clear with parameters is unimplemented" +msgstr "git stash clear 不支持参数" + +#: builtin/stash.c:403 +msgid "cannot apply a stash in the middle of a merge" +msgstr "无法在合并过程应用贮藏" + +#: builtin/stash.c:414 +#, c-format +msgid "could not generate diff %s^!." +msgstr "无法生成差异 %s^!." + +#: builtin/stash.c:421 +msgid "conflicts in index.Try without --index." +msgstr "索引中有冲突。尝试不用 --index。" + +#: builtin/stash.c:427 +msgid "could not save index tree" +msgstr "不能保存索引树" + +#: builtin/stash.c:436 +msgid "could not restore untracked files from stash" +msgstr "无法从贮藏条目中恢复未跟踪文件" + +#: builtin/stash.c:450 +#, c-format +msgid "Merging %s with %s" +msgstr "正在合并 %s 和 %s" + +#: builtin/stash.c:460 git-legacy-stash.sh:681 +msgid "Index was not unstashed." +msgstr "索引未从贮藏中恢复。" + +#: builtin/stash.c:521 builtin/stash.c:620 +msgid "attempt to recreate the index" +msgstr "尝试重建索引" + +#: builtin/stash.c:554 +#, c-format +msgid "Dropped %s (%s)" +msgstr "丢弃了 %s（%s）" + +#: builtin/stash.c:557 +#, c-format +msgid "%s: Could not drop stash entry" +msgstr "%s：无法丢弃贮藏条目" + +#: builtin/stash.c:582 +#, c-format +msgid "'%s' is not a stash reference" +msgstr "'%s' 不是一个贮藏引用" + +#: builtin/stash.c:632 git-legacy-stash.sh:695 +msgid "The stash entry is kept in case you need it again." +msgstr "贮藏条目被保留以备您再次需要。" + +#: builtin/stash.c:655 git-legacy-stash.sh:713 +msgid "No branch name specified" +msgstr "未指定分支名" + +#: builtin/stash.c:795 builtin/stash.c:832 +#, c-format +msgid "Cannot update %s with %s" +msgstr "无法用 %2$s 更新 %1$s" + +#: builtin/stash.c:813 builtin/stash.c:1470 builtin/stash.c:1506 +msgid "stash message" +msgstr "贮藏说明" + +#: builtin/stash.c:823 +msgid "\"git stash store\" requires one <commit> argument" +msgstr "\"git stash store\" 需要一个 <提交> 参数" + +#: builtin/stash.c:1045 git-legacy-stash.sh:218 +msgid "No changes selected" +msgstr "没有选择变更" + +#: builtin/stash.c:1145 git-legacy-stash.sh:150 +msgid "You do not have the initial commit yet" +msgstr "您尚未建立初始提交" + +#: builtin/stash.c:1172 git-legacy-stash.sh:165 +msgid "Cannot save the current index state" +msgstr "无法保存当前索引状态" + +#: builtin/stash.c:1181 git-legacy-stash.sh:180 +msgid "Cannot save the untracked files" +msgstr "无法保存未跟踪文件" + +#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:201 +#: git-legacy-stash.sh:214 +msgid "Cannot save the current worktree state" +msgstr "无法保存当前工作区状态" + +#: builtin/stash.c:1229 git-legacy-stash.sh:234 +msgid "Cannot record working tree state" +msgstr "不能记录工作区状态" + +#: builtin/stash.c:1278 git-legacy-stash.sh:338 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" + +#: builtin/stash.c:1294 +msgid "Did you forget to 'git add'?" +msgstr "您是否忘了执行 'git add'？" + +#: builtin/stash.c:1309 git-legacy-stash.sh:346 +msgid "No local changes to save" +msgstr "没有要保存的本地修改" + +#: builtin/stash.c:1316 git-legacy-stash.sh:351 +msgid "Cannot initialize stash" +msgstr "无法初始化贮藏" + +#: builtin/stash.c:1331 git-legacy-stash.sh:355 +msgid "Cannot save the current status" +msgstr "无法保存当前状态" + +#: builtin/stash.c:1336 +#, c-format +msgid "Saved working directory and index state %s" +msgstr "保存工作目录和索引状态 %s" + +#: builtin/stash.c:1426 git-legacy-stash.sh:385 +msgid "Cannot remove worktree changes" +msgstr "无法删除工作区变更" + +#: builtin/stash.c:1461 builtin/stash.c:1497 +msgid "keep index" +msgstr "保持索引" + +#: builtin/stash.c:1463 builtin/stash.c:1499 +msgid "stash in patch mode" +msgstr "以补丁模式贮藏" + +#: builtin/stash.c:1464 builtin/stash.c:1500 +msgid "quiet mode" +msgstr "静默模式" + +#: builtin/stash.c:1466 builtin/stash.c:1502 +msgid "include untracked files in stash" +msgstr "贮藏中包含未跟踪文件" + +#: builtin/stash.c:1468 builtin/stash.c:1504 +msgid "include ignore files" +msgstr "包含忽略的文件" + +#: builtin/stash.c:1564 +#, c-format +msgid "could not exec %s" +msgstr "不能执行 %s" + #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "git stripspace [-s | --strip-comments]" @@ -16891,48 +19980,48 @@ msgstr "git stripspace [-s | --strip-comments]" msgid "git stripspace [-c | --comment-lines]" msgstr "git stripspace [-c | --comment-lines]" -#: builtin/stripspace.c:36 +#: builtin/stripspace.c:37 msgid "skip and remove all lines starting with comment character" msgstr "跳过和移除所有的注释行" -#: builtin/stripspace.c:39 +#: builtin/stripspace.c:40 msgid "prepend comment character and space to each line" msgstr "为每一行的行首添加注释符和空格" -#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1970 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一个完整的引用名称，却得到 %s" -#: builtin/submodule--helper.c:61 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote 不带参数" -#: builtin/submodule--helper.c:99 +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "无法从 url '%s' 剥离一个组件" -#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1380 msgid "alternative anchor for relative paths" msgstr "相对路径的替代锚记（anchor）" -#: builtin/submodule--helper.c:412 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" -#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626 -#: builtin/submodule--helper.c:649 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:653 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" -#: builtin/submodule--helper.c:521 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "进入 '%s'\n" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -16941,7 +20030,7 @@ msgstr "" "对 %s 执行 run_command 返回非零值。\n" "." -#: builtin/submodule--helper.c:545 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -16951,120 +20040,119 @@ msgstr "" "在递归 %s 的子模组执行 run_command 时返回非零值。\n" "." -#: builtin/submodule--helper.c:561 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "阻止进入每一个子模组命令的输出" -#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1053 msgid "Recurse into nested submodules" msgstr "递归进入嵌套子模组中" -#: builtin/submodule--helper.c:568 -msgid "git submodule--helper foreach [--quiet] [--recursive] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] <命令>" +#: builtin/submodule--helper.c:572 +msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" -#: builtin/submodule--helper.c:595 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" -#: builtin/submodule--helper.c:663 +#: builtin/submodule--helper.c:667 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "无法为子模组 '%s' 注册 url" -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:671 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" -msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n" +msgstr "子模组 '%s'（%s）已对路径 '%s' 注册\n" -# -#: builtin/submodule--helper.c:677 +#: builtin/submodule--helper.c:681 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "警告：建议子模组 '%s' 使用命令更新模式\n" -#: builtin/submodule--helper.c:684 +#: builtin/submodule--helper.c:688 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "无法为子模组 '%s' 注册更新模式" -#: builtin/submodule--helper.c:706 +#: builtin/submodule--helper.c:710 msgid "Suppress output for initializing a submodule" msgstr "阻止子模组初始化的输出" -#: builtin/submodule--helper.c:711 -msgid "git submodule--helper init [<path>]" -msgstr "git submodule--helper init [<路径>]" +#: builtin/submodule--helper.c:715 +msgid "git submodule--helper init [<options>] [<path>]" +msgstr "git submodule--helper init [<选项>] [<路径>]" -#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:914 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" -#: builtin/submodule--helper.c:822 +#: builtin/submodule--helper.c:827 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "无法解析子模组 '%s' 的 HEAD 引用" -#: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018 +#: builtin/submodule--helper.c:854 builtin/submodule--helper.c:1023 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "递归子模组 '%s' 失败" -#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182 +#: builtin/submodule--helper.c:878 builtin/submodule--helper.c:1189 msgid "Suppress submodule status output" msgstr "阻止子模组状态输出" -#: builtin/submodule--helper.c:874 +#: builtin/submodule--helper.c:879 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交" -#: builtin/submodule--helper.c:875 +#: builtin/submodule--helper.c:880 msgid "recurse into nested submodules" msgstr "递归进入嵌套子模组中" -#: builtin/submodule--helper.c:880 +#: builtin/submodule--helper.c:885 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]" -#: builtin/submodule--helper.c:904 +#: builtin/submodule--helper.c:909 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <路径>" -#: builtin/submodule--helper.c:968 +#: builtin/submodule--helper.c:973 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "为 '%s' 同步子模组 url\n" -#: builtin/submodule--helper.c:974 +#: builtin/submodule--helper.c:979 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "无法为子模组路径 '%s' 注册 url" -#: builtin/submodule--helper.c:988 +#: builtin/submodule--helper.c:993 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "无法得到子模组 '%s' 的默认远程关联" -#: builtin/submodule--helper.c:999 +#: builtin/submodule--helper.c:1004 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "无法为子模组 '%s' 更新远程关联" -#: builtin/submodule--helper.c:1046 +#: builtin/submodule--helper.c:1051 msgid "Suppress output of synchronizing submodule url" msgstr "阻止子模组 url 同步的输出" -#: builtin/submodule--helper.c:1053 +#: builtin/submodule--helper.c:1058 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" -#: builtin/submodule--helper.c:1107 +#: builtin/submodule--helper.c:1112 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -17073,87 +20161,103 @@ msgstr "" "子模组工作区 '%s' 包含一个 .git 目录（如果您确需删除它及其全部历史，使用 'rm " "-rf' 命令）" -#: builtin/submodule--helper.c:1119 +#: builtin/submodule--helper.c:1124 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "子模组工作区 '%s' 包含本地修改；使用 '-f' 丢弃它们" -#: builtin/submodule--helper.c:1127 +#: builtin/submodule--helper.c:1132 #, c-format msgid "Cleared directory '%s'\n" msgstr "已清除目录 '%s'\n" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1134 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "无法移除子模组工作区 '%s'\n" -#: builtin/submodule--helper.c:1138 +#: builtin/submodule--helper.c:1145 #, c-format msgid "could not create empty submodule directory %s" msgstr "不能创建空的子模组目录 %s" -#: builtin/submodule--helper.c:1154 +#: builtin/submodule--helper.c:1161 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n" -#: builtin/submodule--helper.c:1183 +#: builtin/submodule--helper.c:1190 msgid "Remove submodule working trees even if they contain local changes" msgstr "删除子模组工作区，即使包含本地修改" -#: builtin/submodule--helper.c:1184 +#: builtin/submodule--helper.c:1191 msgid "Unregister all submodules" msgstr "将所有子模组取消注册" -#: builtin/submodule--helper.c:1189 +#: builtin/submodule--helper.c:1196 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]" -#: builtin/submodule--helper.c:1203 +#: builtin/submodule--helper.c:1210 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'" -#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300 +#: builtin/submodule--helper.c:1275 +msgid "" +"An alternate computed from a superproject's alternate is invalid.\n" +"To allow Git to clone without an alternate in such a case, set\n" +"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" +"'--reference-if-able' instead of '--reference'." +msgstr "" +"从一个父项目的备用仓库中计算出的备用仓库无效。\n" +"此场景下，设置 submodule.alternateErrorStrategy 为 'info'，以允许\n" +"Git 不使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而非\n" +"'--reference' 来克隆。" + +#: builtin/submodule--helper.c:1314 builtin/submodule--helper.c:1317 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模组 '%s' 不能添加仓库备选：%s" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1353 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" -#: builtin/submodule--helper.c:1343 +#: builtin/submodule--helper.c:1360 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" -#: builtin/submodule--helper.c:1366 +#: builtin/submodule--helper.c:1383 msgid "where the new submodule will be cloned to" msgstr "新的子模组将要克隆的路径" -#: builtin/submodule--helper.c:1369 +#: builtin/submodule--helper.c:1386 msgid "name of the new submodule" msgstr "新子模组的名称" -#: builtin/submodule--helper.c:1372 +#: builtin/submodule--helper.c:1389 msgid "url where to clone the submodule from" msgstr "克隆子模组的 url 地址" -#: builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1397 msgid "depth for shallow clones" msgstr "浅克隆的深度" -#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1897 msgid "force cloning progress" msgstr "强制显示克隆进度" -#: builtin/submodule--helper.c:1388 +#: builtin/submodule--helper.c:1402 builtin/submodule--helper.c:1899 +msgid "disallow cloning into non-empty directory" +msgstr "不允许克隆到一个非空目录" + +#: builtin/submodule--helper.c:1407 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -17161,134 +20265,152 @@ msgstr "" "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " "[--name <名字>] [--depth <深度>] --url <url> --path <路径>" -#: builtin/submodule--helper.c:1419 +#: builtin/submodule--helper.c:1431 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "拒绝在另一个子模组的 git dir 中创建/使用 '%s'" + +#: builtin/submodule--helper.c:1442 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "无法克隆 '%s' 到子模组路径 '%s'" -#: builtin/submodule--helper.c:1433 +#: builtin/submodule--helper.c:1446 +#, c-format +msgid "directory not empty: '%s'" +msgstr "目录非空：'%s'" + +#: builtin/submodule--helper.c:1458 #, c-format msgid "could not get submodule directory for '%s'" msgstr "无法得到 '%s' 的子模组目录" -#: builtin/submodule--helper.c:1469 +#: builtin/submodule--helper.c:1494 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效" -#: builtin/submodule--helper.c:1473 +#: builtin/submodule--helper.c:1498 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效" -#: builtin/submodule--helper.c:1566 +#: builtin/submodule--helper.c:1594 #, c-format msgid "Submodule path '%s' not initialized" msgstr "子模组 '%s' 尚未初始化" -#: builtin/submodule--helper.c:1570 +#: builtin/submodule--helper.c:1598 msgid "Maybe you want to use 'update --init'?" msgstr "也许您想要执行 'update --init'？" -#: builtin/submodule--helper.c:1600 +#: builtin/submodule--helper.c:1628 #, c-format msgid "Skipping unmerged submodule %s" msgstr "略过未合并的子模组 %s" -#: builtin/submodule--helper.c:1629 +#: builtin/submodule--helper.c:1657 #, c-format msgid "Skipping submodule '%s'" msgstr "略过子模组 '%s'" -#: builtin/submodule--helper.c:1773 +#: builtin/submodule--helper.c:1803 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "克隆 '%s' 失败。按计划重试" -#: builtin/submodule--helper.c:1784 +#: builtin/submodule--helper.c:1814 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "第二次尝试克隆 '%s' 失败，退出" -#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089 +#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:2120 msgid "path into the working tree" msgstr "到工作区的路径" -#: builtin/submodule--helper.c:1850 +#: builtin/submodule--helper.c:1879 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作区中的路径，递归嵌套子模组" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:1883 msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:1860 +#: builtin/submodule--helper.c:1889 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "创建一个指定深度的浅克隆" -#: builtin/submodule--helper.c:1863 +#: builtin/submodule--helper.c:1892 msgid "parallel jobs" msgstr "并发任务" -#: builtin/submodule--helper.c:1865 +#: builtin/submodule--helper.c:1894 msgid "whether the initial clone should follow the shallow recommendation" msgstr "初始克隆是否应该遵守推荐的浅克隆选项" -#: builtin/submodule--helper.c:1866 +#: builtin/submodule--helper.c:1895 msgid "don't print cloning progress" msgstr "不要输出克隆进度" -#: builtin/submodule--helper.c:1873 -msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" +#: builtin/submodule--helper.c:1904 +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]" -#: builtin/submodule--helper.c:1886 +#: builtin/submodule--helper.c:1917 msgid "bad value for update parameter" msgstr "update 参数取值错误" -#: builtin/submodule--helper.c:1934 +#: builtin/submodule--helper.c:1965 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上" -#: builtin/submodule--helper.c:2057 +#: builtin/submodule--helper.c:2088 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "无法获得子模组 '%s' 的仓库句柄" -#: builtin/submodule--helper.c:2090 +#: builtin/submodule--helper.c:2121 msgid "recurse into submodules" msgstr "在子模组中递归" -#: builtin/submodule--helper.c:2096 -msgid "git submodule--helper embed-git-dir [<path>...]" -msgstr "git submodule--helper embed-git-dir [<路径>...]" +#: builtin/submodule--helper.c:2127 +msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" +msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]" -#: builtin/submodule--helper.c:2152 +#: builtin/submodule--helper.c:2183 msgid "check if it is safe to write to the .gitmodules file" msgstr "检查写入 .gitmodules 文件是否安全" -#: builtin/submodule--helper.c:2157 -msgid "git submodule--helper config name [value]" -msgstr "git submodule--helper config name [value]" +#: builtin/submodule--helper.c:2186 +msgid "unset the config in the .gitmodules file" +msgstr "取消 .gitmodules 文件中的设置" -#: builtin/submodule--helper.c:2158 +#: builtin/submodule--helper.c:2191 +msgid "git submodule--helper config <name> [<value>]" +msgstr "git submodule--helper config <名称> [<值>]" + +#: builtin/submodule--helper.c:2192 +msgid "git submodule--helper config --unset <name>" +msgstr "git submodule--helper config --unset <名称>" + +#: builtin/submodule--helper.c:2193 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2175 git-submodule.sh:169 +#: builtin/submodule--helper.c:2212 git-submodule.sh:173 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "请确认 .gitmodules 文件在工作区里" -#: builtin/submodule--helper.c:2225 +#: builtin/submodule--helper.c:2262 git.c:433 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支持 --super-prefix" -#: builtin/submodule--helper.c:2231 +#: builtin/submodule--helper.c:2268 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一个有效的 submodule--helper 子命令" @@ -17323,16 +20445,17 @@ msgstr "更新的原因" #: builtin/tag.c:25 msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " -"[<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" +"\t\t<tagname> [<head>]" msgstr "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n" +"\t\t<标签名> [<头>]" -#: builtin/tag.c:26 +#: builtin/tag.c:27 msgid "git tag -d <tagname>..." msgstr "git tag -d <标签名>..." -#: builtin/tag.c:27 +#: builtin/tag.c:28 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" @@ -17342,21 +20465,21 @@ msgstr "" "at <对象>]\n" "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" -#: builtin/tag.c:29 +#: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<格式>] <标签名>..." -#: builtin/tag.c:87 +#: builtin/tag.c:89 #, c-format msgid "tag '%s' not found." msgstr "未发现标签 '%s'。" -#: builtin/tag.c:103 +#: builtin/tag.c:105 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "已删除标签 '%s'（曾为 %s）\n" -#: builtin/tag.c:133 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -17369,7 +20492,7 @@ msgstr "" " %s\n" "以 '%c' 开头的行将被忽略。\n" -#: builtin/tag.c:137 +#: builtin/tag.c:139 #, c-format msgid "" "\n" @@ -17383,358 +20506,375 @@ msgstr "" " %s\n" "以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n" -#: builtin/tag.c:191 +#: builtin/tag.c:198 msgid "unable to sign the tag" msgstr "无法签署标签" -#: builtin/tag.c:193 +#: builtin/tag.c:200 msgid "unable to write tag file" msgstr "无法写标签文件" -#: builtin/tag.c:218 +#: builtin/tag.c:216 +#, c-format +msgid "" +"You have created a nested tag. The object referred to by your new tag is\n" +"already a tag. If you meant to tag the object that it points to, use:\n" +"\n" +"\tgit tag -f %s %s^{}" +msgstr "" +"您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n" +"对其指向的目标创建标签，使用：\n" +"\n" +"\tgit tag -f %s %s^{}" + +#: builtin/tag.c:232 msgid "bad object type." msgstr "坏的对象类型。" -#: builtin/tag.c:267 +#: builtin/tag.c:284 msgid "no tag message?" msgstr "无标签说明？" -#: builtin/tag.c:274 +#: builtin/tag.c:291 #, c-format msgid "The tag message has been left in %s\n" msgstr "标签说明被保留在 %s\n" -#: builtin/tag.c:385 +#: builtin/tag.c:402 msgid "list tag names" msgstr "列出标签名称" -#: builtin/tag.c:387 +#: builtin/tag.c:404 msgid "print <n> lines of each tag message" msgstr "每个标签信息打印 <n> 行" -#: builtin/tag.c:389 +#: builtin/tag.c:406 msgid "delete tags" msgstr "删除标签" -#: builtin/tag.c:390 +#: builtin/tag.c:407 msgid "verify tags" msgstr "验证标签" -#: builtin/tag.c:392 +#: builtin/tag.c:409 msgid "Tag creation options" msgstr "标签创建选项" -#: builtin/tag.c:394 +#: builtin/tag.c:411 msgid "annotated tag, needs a message" msgstr "附注标签，需要一个说明" -#: builtin/tag.c:396 +#: builtin/tag.c:413 msgid "tag message" msgstr "标签说明" -#: builtin/tag.c:398 +#: builtin/tag.c:415 msgid "force edit of tag message" msgstr "强制编辑标签说明" -#: builtin/tag.c:399 +#: builtin/tag.c:416 msgid "annotated and GPG-signed tag" msgstr "附注并附加 GPG 签名的标签" -#: builtin/tag.c:403 +#: builtin/tag.c:419 msgid "use another key to sign the tag" msgstr "使用另外的私钥签名该标签" -#: builtin/tag.c:404 +#: builtin/tag.c:420 msgid "replace the tag if exists" msgstr "如果存在，替换现有的标签" -#: builtin/tag.c:405 builtin/update-ref.c:369 +#: builtin/tag.c:421 builtin/update-ref.c:369 msgid "create a reflog" msgstr "创建引用日志" -#: builtin/tag.c:407 +#: builtin/tag.c:423 msgid "Tag listing options" msgstr "标签列表选项" -#: builtin/tag.c:408 +#: builtin/tag.c:424 msgid "show tag list in columns" msgstr "以列的方式显示标签列表" -#: builtin/tag.c:409 builtin/tag.c:411 +#: builtin/tag.c:425 builtin/tag.c:427 msgid "print only tags that contain the commit" msgstr "只打印包含该提交的标签" -#: builtin/tag.c:410 builtin/tag.c:412 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that don't contain the commit" msgstr "只打印不包含该提交的标签" -#: builtin/tag.c:413 +#: builtin/tag.c:429 msgid "print only tags that are merged" msgstr "只打印已经合并的标签" -#: builtin/tag.c:414 +#: builtin/tag.c:430 msgid "print only tags that are not merged" msgstr "只打印尚未合并的标签" -#: builtin/tag.c:419 +#: builtin/tag.c:434 msgid "print only tags of the object" msgstr "只打印指向该对象的标签" -#: builtin/tag.c:463 +#: builtin/tag.c:482 msgid "--column and -n are incompatible" msgstr "--column 和 -n 不兼容" -#: builtin/tag.c:485 +#: builtin/tag.c:504 msgid "-n option is only allowed in list mode" msgstr "-n 选项只允许用在列表显示模式" -#: builtin/tag.c:487 +#: builtin/tag.c:506 msgid "--contains option is only allowed in list mode" msgstr "--contains 选项只允许用在列表显示模式" -#: builtin/tag.c:489 +#: builtin/tag.c:508 msgid "--no-contains option is only allowed in list mode" msgstr "--no-contains 选项只允许用在列表显示模式" -#: builtin/tag.c:491 +#: builtin/tag.c:510 msgid "--points-at option is only allowed in list mode" msgstr "--points-at 选项只允许用在列表显示模式" -#: builtin/tag.c:493 +#: builtin/tag.c:512 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式" -#: builtin/tag.c:504 +#: builtin/tag.c:523 msgid "only one -F or -m option is allowed." msgstr "只允许一个 -F 或 -m 选项。" -#: builtin/tag.c:523 +#: builtin/tag.c:542 msgid "too many params" msgstr "太多参数" -#: builtin/tag.c:529 +#: builtin/tag.c:548 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一个有效的标签名称。" -#: builtin/tag.c:534 +#: builtin/tag.c:553 #, c-format msgid "tag '%s' already exists" msgstr "标签 '%s' 已存在" -#: builtin/tag.c:565 +#: builtin/tag.c:584 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新标签 '%s'（曾为 %s）\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:501 msgid "Unpacking objects" msgstr "展开对象中" -#: builtin/update-index.c:82 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "创建目录 %s 失败" -#: builtin/update-index.c:98 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "创建文件 %s 失败" -#: builtin/update-index.c:106 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "删除文件 %s 失败" -#: builtin/update-index.c:113 builtin/update-index.c:219 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "删除目录 %s 失败" -#: builtin/update-index.c:138 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "在 '%s' 中测试 mtime " -#: builtin/update-index.c:152 +#: builtin/update-index.c:154 msgid "directory stat info does not change after adding a new file" msgstr "添加一个新文件后，目录的状态信息未改变" -#: builtin/update-index.c:165 +#: builtin/update-index.c:167 msgid "directory stat info does not change after adding a new directory" msgstr "添加一个新目录后，目录的状态信息未改变" -#: builtin/update-index.c:178 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "更新一个文件后，目录的状态信息被修改" -#: builtin/update-index.c:189 +#: builtin/update-index.c:191 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "在子目录中添加文件后，目录的状态信息被修改" -#: builtin/update-index.c:200 +#: builtin/update-index.c:202 msgid "directory stat info does not change after deleting a file" msgstr "删除一个文件后，目录的状态信息未改变" -#: builtin/update-index.c:213 +#: builtin/update-index.c:215 msgid "directory stat info does not change after deleting a directory" msgstr "删除一个目录后，目录的状态信息未改变" -#: builtin/update-index.c:220 +#: builtin/update-index.c:222 msgid " OK" msgstr " OK" -#: builtin/update-index.c:588 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<选项>] [--] [<文件>...]" -#: builtin/update-index.c:961 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "当索引需要更新时继续刷新" -#: builtin/update-index.c:964 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "刷新：忽略子模组" -#: builtin/update-index.c:967 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "不忽略新的文件" -#: builtin/update-index.c:969 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "让文件替换目录（反之亦然）" -#: builtin/update-index.c:971 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "通知文件从工作区丢失" -#: builtin/update-index.c:973 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "即使索引区包含未合并的条目也执行刷新" -#: builtin/update-index.c:976 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "刷新统计信息" -#: builtin/update-index.c:980 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置" -#: builtin/update-index.c:984 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<存取模式>,<对象>,<路径>" -#: builtin/update-index.c:985 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "添加指定的条目到索引区" -#: builtin/update-index.c:994 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "把文件标记为 \"没有变更\"" -#: builtin/update-index.c:997 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged 位" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "把文件标记为 \"仅索引\"" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree 位" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1020 +msgid "do not touch index-only entries" +msgstr "不要触碰仅索引条目" + +#: builtin/update-index.c:1022 msgid "add to index only; do not add content to object database" msgstr "只添加到索引区；不添加对象到对象库" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1024 msgid "remove named paths even if present in worktree" msgstr "即使存在工作区里，也删除路径" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "携带 --stdin：输入的行以 null 字符终止" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1028 msgid "read list of paths to be updated from standard input" msgstr "从标准输入中读取需要更新的路径列表" -#: builtin/update-index.c:1016 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "从标准输入添加条目到索引区" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1036 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "为指定文件重新生成第2和第3暂存区" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "只更新与 HEAD 不同的条目" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "忽略工作区丢失的文件" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "在标准输出显示操作" -#: builtin/update-index.c:1033 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘记保存的未解决的冲突" -#: builtin/update-index.c:1037 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "以这种格式写入索引区" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "启用或禁用索引拆分" -#: builtin/update-index.c:1041 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "启用/禁用对未跟踪文件的缓存" -#: builtin/update-index.c:1043 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "测试文件系统是否支持未跟踪文件缓存" -#: builtin/update-index.c:1045 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "无需检测文件系统，启用对未跟踪文件的缓存" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1063 msgid "write out the index even if is not flagged as changed" msgstr "即使没有被标记为已更改，也要写出索引" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "启用或禁用文件系统监控" -#: builtin/update-index.c:1051 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "标记文件为 fsmonitor 有效" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "清除 fsmonitor 有效位" -#: builtin/update-index.c:1153 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" "core.splitIndex 被设置为 false。如果您确实要启用索引拆分，请删除或修改它。" -#: builtin/update-index.c:1162 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分，请删除或修改它。" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1194 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -17742,11 +20882,11 @@ msgstr "" "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修" "改它。" -#: builtin/update-index.c:1177 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "缓存未跟踪文件被禁用" -#: builtin/update-index.c:1185 +#: builtin/update-index.c:1206 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -17754,25 +20894,25 @@ msgstr "" "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或" "修改它。" -#: builtin/update-index.c:1189 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "缓存未跟踪文件在 '%s' 启用" -#: builtin/update-index.c:1197 +#: builtin/update-index.c:1218 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "core.fsmonitor 未设置；如果想要启用 fsmonitor 请设置该选项" -#: builtin/update-index.c:1201 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "fsmonitor 被启用" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1225 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "core.fsmonitor 已设置；如果想要禁用 fsmonitor 请移除该选项" -#: builtin/update-index.c:1208 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "fsmonitor 被禁用" @@ -17816,6 +20956,10 @@ msgstr "从头开始更新文件信息" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<选项>] <目录>" +#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 +msgid "quit after a single request/response exchange" +msgstr "在一次单独的请求/响应之后退出" + #: builtin/upload-pack.c:25 msgid "exit immediately after initial ref advertisement" msgstr "在初始的引用广告后立即退出" @@ -17828,15 +20972,15 @@ msgstr "如果 <目录> 不是一个 Git 目录，不要尝试 <目录>/.git/" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "不活动 <n> 秒钟后终止传输" -#: builtin/verify-commit.c:20 +#: builtin/verify-commit.c:19 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <提交>..." -#: builtin/verify-commit.c:76 +#: builtin/verify-commit.c:68 msgid "print commit contents" msgstr "打印提交内容" -#: builtin/verify-commit.c:77 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:69 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "打印原始 gpg 状态输出" @@ -17852,11 +20996,11 @@ msgstr "冗长输出" msgid "show statistics only" msgstr "只显示统计" -#: builtin/verify-tag.c:19 +#: builtin/verify-tag.c:18 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." -#: builtin/verify-tag.c:37 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "打印标签内容" @@ -17888,7 +21032,7 @@ msgstr "git worktree remove [<选项>] <工作区>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <路径>" -#: builtin/worktree.c:60 builtin/worktree.c:871 +#: builtin/worktree.c:60 builtin/worktree.c:898 #, c-format msgid "failed to delete '%s'" msgstr "删除 '%s' 失败" @@ -17961,120 +21105,120 @@ msgstr "" "'%s' 是一个丢失但已经注册的工作区，使用\n" "'add -f' 覆盖，或 'prune' 或 'remove' 清除" -#: builtin/worktree.c:309 +#: builtin/worktree.c:308 #, c-format msgid "could not create directory of '%s'" msgstr "不能创建目录 '%s'" -#: builtin/worktree.c:428 builtin/worktree.c:434 +#: builtin/worktree.c:439 builtin/worktree.c:445 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "准备工作区（新分支 '%s'）" -#: builtin/worktree.c:430 +#: builtin/worktree.c:441 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "准备工作区（重置分支 '%s'，之前为 %s）" -#: builtin/worktree.c:439 +#: builtin/worktree.c:450 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "准备工作区（检出 '%s'）" -#: builtin/worktree.c:445 +#: builtin/worktree.c:456 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "准备工作区（分离头指针 %s）" -#: builtin/worktree.c:486 +#: builtin/worktree.c:497 msgid "checkout <branch> even if already checked out in other worktree" msgstr "检出 <分支>，即使已经被检出到其它工作区" -#: builtin/worktree.c:489 +#: builtin/worktree.c:500 msgid "create a new branch" msgstr "创建一个新分支" -#: builtin/worktree.c:491 +#: builtin/worktree.c:502 msgid "create or reset a branch" msgstr "创建或重置一个分支" -#: builtin/worktree.c:493 +#: builtin/worktree.c:504 msgid "populate the new working tree" msgstr "生成新的工作区" -#: builtin/worktree.c:494 +#: builtin/worktree.c:505 msgid "keep the new working tree locked" msgstr "锁定新工作区" -#: builtin/worktree.c:497 +#: builtin/worktree.c:508 msgid "set up tracking mode (see git-branch(1))" msgstr "设置跟踪模式（参见 git-branch(1)）" -#: builtin/worktree.c:500 +#: builtin/worktree.c:511 msgid "try to match the new branch name with a remote-tracking branch" msgstr "尝试为新分支名匹配一个远程跟踪分支" -#: builtin/worktree.c:508 +#: builtin/worktree.c:519 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b、-B 和 --detach 是互斥的" -#: builtin/worktree.c:569 +#: builtin/worktree.c:580 msgid "--[no-]track can only be used if a new branch is created" msgstr "只能在创建新分支时使用选项 --[no-]track " -#: builtin/worktree.c:669 +#: builtin/worktree.c:680 msgid "reason for locking" msgstr "锁定原因" -#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772 -#: builtin/worktree.c:899 +#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799 +#: builtin/worktree.c:926 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一个工作区" -#: builtin/worktree.c:683 builtin/worktree.c:716 +#: builtin/worktree.c:694 builtin/worktree.c:727 msgid "The main working tree cannot be locked or unlocked" msgstr "主工作区无法被加锁或解锁" -#: builtin/worktree.c:688 +#: builtin/worktree.c:699 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被锁定，原因：%s" -#: builtin/worktree.c:690 +#: builtin/worktree.c:701 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被锁定" -#: builtin/worktree.c:718 +#: builtin/worktree.c:729 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被锁定" -#: builtin/worktree.c:743 +#: builtin/worktree.c:770 msgid "working trees containing submodules cannot be moved or removed" msgstr "不能移动或删除包含子模组的工作区" -#: builtin/worktree.c:751 +#: builtin/worktree.c:778 msgid "force move even if worktree is dirty or locked" msgstr "强制移动，即使工作区是脏的或已锁定" -#: builtin/worktree.c:774 builtin/worktree.c:901 +#: builtin/worktree.c:801 builtin/worktree.c:928 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一个主工作区" -#: builtin/worktree.c:779 +#: builtin/worktree.c:806 #, c-format msgid "could not figure out destination name from '%s'" msgstr "无法从 '%s' 算出目标名称" -#: builtin/worktree.c:785 +#: builtin/worktree.c:812 #, c-format msgid "target '%s' already exists" msgstr "目标 '%s' 已存在" -#: builtin/worktree.c:793 +#: builtin/worktree.c:820 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -18083,7 +21227,7 @@ msgstr "" "无法移动一个锁定的工作区，锁定原因：%s\n" "使用 'move -f -f' 覆盖或先解锁" -#: builtin/worktree.c:795 +#: builtin/worktree.c:822 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -18091,36 +21235,36 @@ msgstr "" "无法移动一个锁定的工作区，\n" "使用 'move -f -f' 覆盖或先解锁" -#: builtin/worktree.c:798 +#: builtin/worktree.c:825 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "验证失败，无法移动工作区：%s" -#: builtin/worktree.c:803 +#: builtin/worktree.c:830 #, c-format msgid "failed to move '%s' to '%s'" msgstr "移动 '%s' 到 '%s' 失败" -#: builtin/worktree.c:851 +#: builtin/worktree.c:878 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "在 '%s' 中执行 'git status' 失败" -#: builtin/worktree.c:855 +#: builtin/worktree.c:882 #, c-format -msgid "'%s' is dirty, use --force to delete it" -msgstr "'%s' 是脏的，使用 --force 删除" +msgid "'%s' contains modified or untracked files, use --force to delete it" +msgstr "'%s' 包含修改或未跟踪的文件，使用 --force 删除" -#: builtin/worktree.c:860 +#: builtin/worktree.c:887 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d" -#: builtin/worktree.c:883 +#: builtin/worktree.c:910 msgid "force removal even if worktree is dirty or locked" msgstr "强制删除，即使工作区是脏的或已锁定" -#: builtin/worktree.c:906 +#: builtin/worktree.c:933 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -18129,7 +21273,7 @@ msgstr "" "无法删除一个锁定的工作区，锁定原因：%s\n" "使用 'remove -f -f' 覆盖或先解锁" -#: builtin/worktree.c:908 +#: builtin/worktree.c:935 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -18137,28 +21281,43 @@ msgstr "" "无法删除一个锁定的工作区，\n" "使用 'remove -f -f' 覆盖或先解锁" -#: builtin/worktree.c:911 +#: builtin/worktree.c:938 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "验证失败，无法删除工作区：%s" -#: builtin/write-tree.c:14 +#: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" -#: builtin/write-tree.c:27 +#: builtin/write-tree.c:28 msgid "<prefix>/" msgstr "<前缀>/" -#: builtin/write-tree.c:28 +#: builtin/write-tree.c:29 msgid "write tree object for a subdirectory <prefix>" msgstr "将 <前缀> 子目录内容写到一个树对象" -#: builtin/write-tree.c:30 +#: builtin/write-tree.c:31 msgid "only useful for debugging" msgstr "只对调试有用" -#: credential-cache--daemon.c:222 +#: fast-import.c:3125 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "预期 'mark' 命令，得到 %s" + +#: fast-import.c:3130 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "预期 'to' 命令，得到 %s" + +#: fast-import.c:3254 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'" + +#: credential-cache--daemon.c:223 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -18171,7 +21330,7 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: credential-cache--daemon.c:271 +#: credential-cache--daemon.c:272 msgid "print debugging messages to stderr" msgstr "调试信息输出到标准错误" @@ -18184,6 +21343,14 @@ msgstr "提交 %s 没有标记为可达" msgid "too many commits marked reachable" msgstr "太多提交标记为可达" +#: t/helper/test-serve-v2.c:7 +msgid "test-tool serve-v2 [<options>]" +msgstr "test-tool serve-v2 [<选项>]" + +#: t/helper/test-serve-v2.c:19 +msgid "exit immediately after advertising capabilities" +msgstr "对能力广告之后立即退出" + #: git.c:27 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" @@ -18204,99 +21371,151 @@ msgstr "" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" -"to read about a specific subcommand or concept." +"to read about a specific subcommand or concept.\n" +"See 'git help git' for an overview of the system." msgstr "" "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" -"帮助。" +"帮助。\n" +"有关系统的概述，查看 'git help git'。" -#: git.c:173 +#: git.c:186 #, c-format msgid "no directory given for --git-dir\n" msgstr "没有为 --git-dir 提供目录\n" -#: git.c:187 +#: git.c:200 #, c-format msgid "no namespace given for --namespace\n" msgstr "没有为 --namespace 提供命名空间\n" -#: git.c:201 +#: git.c:214 #, c-format msgid "no directory given for --work-tree\n" msgstr "没有为 --work-tree 提供目录\n" -#: git.c:215 +#: git.c:228 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "没有为 --super-prefix 提供前缀\n" -#: git.c:237 +#: git.c:250 #, c-format msgid "-c expects a configuration string\n" msgstr "应为 -c 提供一个配置字符串\n" -#: git.c:275 +#: git.c:288 #, c-format msgid "no directory given for -C\n" msgstr "没有为 -C 提供目录\n" -#: git.c:300 +#: git.c:314 #, c-format msgid "unknown option: %s\n" msgstr "未知选项：%s\n" -#: git.c:719 +#: git.c:360 +#, c-format +msgid "while expanding alias '%s': '%s'" +msgstr "在扩展别名 '%s' 时：'%s'" + +#: git.c:369 +#, c-format +msgid "" +"alias '%s' changes environment variables.\n" +"You can use '!git' in the alias to do this" +msgstr "" +"别名 '%s' 修改环境变量。您可以使用在别名中\n" +"使用 '!git'" + +#: git.c:376 +#, c-format +msgid "empty alias for %s" +msgstr "%s 的空别名" + +#: git.c:379 +#, c-format +msgid "recursive alias: %s" +msgstr "递归的别名：%s" + +#: git.c:459 +msgid "write failure on standard output" +msgstr "在标准输出写入失败" + +#: git.c:461 +msgid "unknown write failure on standard output" +msgstr "到标准输出的未知写入错误" + +#: git.c:463 +msgid "close failed on standard output" +msgstr "标准输出关闭失败" + +#: git.c:793 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "检测到别名循环：'%s'的扩展未终止：%s" -#: git.c:802 +#: git.c:843 +#, c-format +msgid "cannot handle %s as a builtin" +msgstr "不能作为内置命令处理 %s" + +#: git.c:856 +#, c-format +msgid "" +"usage: %s\n" +"\n" +msgstr "" +"用法：%s\n" +"\n" + +#: git.c:876 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 git 命令\n" -#: git.c:814 +#: git.c:888 #, c-format msgid "failed to run command '%s': %s\n" msgstr "运行命令 '%s' 失败：%s\n" -#: http.c:374 +#: http.c:378 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "http.postbuffer 为负值，默认为 %d" -#: http.c:395 +#: http.c:399 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "不支持委托控制，因为 cURL < 7.22.0" -#: http.c:404 +#: http.c:408 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0" -#: http.c:837 +#: http.c:876 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "不支持 CURLSSLOPT_NO_REVOKE，因为 cURL < 7.44.0" -#: http.c:910 +#: http.c:949 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "不支持协议限制，因为 cURL < 7.19.4" -#: http.c:1046 +#: http.c:1086 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端：" -#: http.c:1053 +#: http.c:1093 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "无法设置 SSL 后端为 '%s'：cURL: cURL 没有使用 SSL 后端构建" -#: http.c:1057 +#: http.c:1097 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "无法将 SSL 后端设置为 '%s'：已经设置" -#: http.c:1921 +#: http.c:1966 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -18307,39 +21526,176 @@ msgstr "" " 请求：%s\n" " 重定向：%s" -#: remote-curl.c:401 +#: remote-curl.c:166 +#, c-format +msgid "invalid quoting in push-option value: '%s'" +msgstr "在 push-option 取值中无效的引号：'%s'" + +#: remote-curl.c:263 +#, c-format +msgid "%sinfo/refs not valid: is this a git repository?" +msgstr "%sinfo/refs 无效：这是一个 git 仓库么？" + +#: remote-curl.c:364 +msgid "invalid server response; expected service, got flush packet" +msgstr "无效的服务端响应。预期服务，得到 flush 包" + +#: remote-curl.c:395 +#, c-format +msgid "invalid server response; got '%s'" +msgstr "无效的服务端响应，得到 '%s'" + +#: remote-curl.c:455 +#, c-format +msgid "repository '%s' not found" +msgstr "仓库 '%s' 未找到" + +#: remote-curl.c:459 +#, c-format +msgid "Authentication failed for '%s'" +msgstr "'%s' 鉴权失败" + +#: remote-curl.c:463 +#, c-format +msgid "unable to access '%s': %s" +msgstr "无法访问 '%s'：%s" + +#: remote-curl.c:469 #, c-format msgid "redirecting to %s" msgstr "重定向到 %s" -#: list-objects-filter-options.h:60 +#: remote-curl.c:593 +msgid "shouldn't have EOF when not gentle on EOF" +msgstr "当没有设置温和处理文件结束符（EOF）时，不应该有文件结束符" + +#: remote-curl.c:673 +msgid "unable to rewind rpc post data - try increasing http.postBuffer" +msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer" + +#: remote-curl.c:733 +#, c-format +msgid "RPC failed; %s" +msgstr "RPC 失败。%s" + +#: remote-curl.c:773 +msgid "cannot handle pushes this big" +msgstr "不能处理这么大的推送" + +#: remote-curl.c:888 +#, c-format +msgid "cannot deflate request; zlib deflate error %d" +msgstr "不能压缩请求，zlib 压缩错误 %d" + +#: remote-curl.c:892 +#, c-format +msgid "cannot deflate request; zlib end error %d" +msgstr "不能压缩请求，zlib 结束错误 %d" + +#: remote-curl.c:1023 +msgid "dumb http transport does not support shallow capabilities" +msgstr "哑 http 传输不支持 shalllow 能力" + +#: remote-curl.c:1037 +msgid "fetch failed." +msgstr "获取失败。" + +#: remote-curl.c:1085 +msgid "cannot fetch by sha1 over smart http" +msgstr "无法通过智能 HTTP 获取 sha1" + +#: remote-curl.c:1129 remote-curl.c:1135 +#, c-format +msgid "protocol error: expected sha/ref, got '%s'" +msgstr "协议错误：期望 sha/ref，却得到 '%s'" + +#: remote-curl.c:1147 remote-curl.c:1261 +#, c-format +msgid "http transport does not support %s" +msgstr "http 传输协议不支持 %s" + +#: remote-curl.c:1183 +msgid "git-http-push failed" +msgstr "git-http-push 失败" + +#: remote-curl.c:1367 +msgid "remote-curl: usage: git remote-curl <remote> [<url>]" +msgstr "remote-curl：用法：git remote-curl <远程> [<url>]" + +#: remote-curl.c:1399 +msgid "remote-curl: error reading command stream from git" +msgstr "remote-curl：错误读取来自 git 的命令流" + +#: remote-curl.c:1406 +msgid "remote-curl: fetch attempted without a local repo" +msgstr "remote-curl：尝试没有本地仓库下获取" + +#: remote-curl.c:1446 +#, c-format +msgid "remote-curl: unknown command '%s' from git" +msgstr "remote-curl：未知的来自 git 的命令 '%s'" + +#: list-objects-filter-options.h:85 msgid "args" msgstr "参数" -#: list-objects-filter-options.h:61 +#: list-objects-filter-options.h:86 msgid "object filtering" msgstr "对象过滤" -#: parse-options.h:154 +#: parse-options.h:183 msgid "expiry-date" msgstr "到期时间" -#: parse-options.h:169 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "空操作（向后兼容）" -#: parse-options.h:261 +#: parse-options.h:309 msgid "be more verbose" msgstr "更加详细" -#: parse-options.h:263 +#: parse-options.h:311 msgid "be more quiet" msgstr "更加安静" -#: parse-options.h:269 +#: parse-options.h:317 msgid "use <n> digits to display SHA-1s" msgstr "用 <n> 位数字显示 SHA-1 哈希值" +#: parse-options.h:336 +msgid "how to strip spaces and #comments from message" +msgstr "设置如何删除提交说明里的空格和#注释" + +#: parse-options.h:337 +msgid "read pathspec from file" +msgstr "从文件读取路径表达式" + +#: parse-options.h:338 +msgid "" +"with --pathspec-from-file, pathspec elements are separated with NUL character" +msgstr "使用 --pathspec-from-file，路径表达式用空字符分隔" + +#: ref-filter.h:101 +msgid "key" +msgstr "key" + +#: ref-filter.h:101 +msgid "field name to sort on" +msgstr "排序的字段名" + +#: rerere.h:44 +msgid "update the index with reused conflict resolution if possible" +msgstr "如果可能，重用冲突解决更新索引" + +#: wt-status.h:67 +msgid "HEAD detached at " +msgstr "头指针分离于 " + +#: wt-status.h:68 +msgid "HEAD detached from " +msgstr "头指针分离自 " + #: command-list.h:50 msgid "Add file contents to the index" msgstr "添加文件内容至索引" @@ -18426,7 +21782,7 @@ msgstr "从工作区中删除未跟踪文件" #: command-list.h:71 msgid "Clone a repository into a new directory" -msgstr "克隆一个仓库到一个新目录" +msgstr "克隆仓库到一个新目录" #: command-list.h:72 msgid "Display data in columns" @@ -18546,7 +21902,7 @@ msgstr "清除不必要的文件和优化本地仓库" #: command-list.h:101 msgid "Extract commit ID from an archive created using git-archive" -msgstr "从 git-archive 创建的归档文件中提取提交ID" +msgstr "从 git-archive 创建的归档文件中提取提交 ID" #: command-list.h:102 msgid "Print lines matching a pattern" @@ -18558,7 +21914,7 @@ msgstr "一个便携的 Git 图形客户端" #: command-list.h:104 msgid "Compute object ID and optionally creates a blob from a file" -msgstr "从一个文件计算对象ID，并可以创建 blob 数据对象" +msgstr "从一个文件计算对象 ID，并可以创建 blob 数据对象" #: command-list.h:105 msgid "Display help information about Git" @@ -18593,7 +21949,7 @@ msgid "Instantly browse your working repository in gitweb" msgstr "在 gitweb 中即时浏览您的工作仓库" #: command-list.h:113 -msgid "add or parse structured information in commit messages" +msgid "Add or parse structured information in commit messages" msgstr "添加或解析提交说明中的结构化信息" #: command-list.h:114 @@ -18699,7 +22055,7 @@ msgstr "帮助解析远程仓库访问参数的例程" #: command-list.h:139 msgid "Compute unique ID for a patch" -msgstr "计算一个补丁的唯一ID" +msgstr "计算一个补丁的唯一 ID" #: command-list.h:140 msgid "Prune all unreachable objects from the object database" @@ -18766,221 +22122,233 @@ msgid "Reset current HEAD to the specified state" msgstr "重置当前 HEAD 到指定状态" #: command-list.h:156 +msgid "Restore working tree files" +msgstr "恢复工作区文件" + +#: command-list.h:157 msgid "Revert some existing commits" msgstr "回退一些现存提交" -#: command-list.h:157 +#: command-list.h:158 msgid "Lists commit objects in reverse chronological order" msgstr "按时间顺序列出提交对象" -#: command-list.h:158 +#: command-list.h:159 msgid "Pick out and massage parameters" msgstr "选出并处理参数" -#: command-list.h:159 +#: command-list.h:160 msgid "Remove files from the working tree and from the index" msgstr "从工作区和索引中删除文件" -#: command-list.h:160 +#: command-list.h:161 msgid "Send a collection of patches as emails" msgstr "通过电子邮件发送一组补丁" -#: command-list.h:161 +#: command-list.h:162 msgid "Push objects over Git protocol to another repository" msgstr "使用 Git 协议推送对象到另一个仓库" -#: command-list.h:162 +#: command-list.h:163 msgid "Restricted login shell for Git-only SSH access" msgstr "只允许 Git SSH 访问的受限登录shell" -#: command-list.h:163 +#: command-list.h:164 msgid "Summarize 'git log' output" msgstr "'git log' 输出摘要" -#: command-list.h:164 +#: command-list.h:165 msgid "Show various types of objects" msgstr "显示各种类型的对象" -#: command-list.h:165 +#: command-list.h:166 msgid "Show branches and their commits" msgstr "显示分支和提交" -#: command-list.h:166 +#: command-list.h:167 msgid "Show packed archive index" msgstr "显示打包归档索引" -#: command-list.h:167 +#: command-list.h:168 msgid "List references in a local repository" msgstr "显示本地仓库中的引用" -#: command-list.h:168 +#: command-list.h:169 msgid "Git's i18n setup code for shell scripts" msgstr "为 shell 脚本准备的 Git 国际化设置代码" -#: command-list.h:169 +#: command-list.h:170 msgid "Common Git shell script setup code" msgstr "常用的 Git shell 脚本设置代码" -#: command-list.h:170 +#: command-list.h:171 +msgid "Initialize and modify the sparse-checkout" +msgstr "初始化及修改稀疏检出" + +#: command-list.h:172 msgid "Stash the changes in a dirty working directory away" msgstr "贮藏脏工作区中的修改" -#: command-list.h:171 +#: command-list.h:173 msgid "Add file contents to the staging area" msgstr "将文件内容添加到索引" -#: command-list.h:172 +#: command-list.h:174 msgid "Show the working tree status" msgstr "显示工作区状态" -#: command-list.h:173 +#: command-list.h:175 msgid "Remove unnecessary whitespace" msgstr "删除不必要的空白字符" -#: command-list.h:174 +#: command-list.h:176 msgid "Initialize, update or inspect submodules" msgstr "初始化、更新或检查子模组" -#: command-list.h:175 +#: command-list.h:177 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Subersion 仓库和 Git 之间的双向操作" -#: command-list.h:176 +#: command-list.h:178 +msgid "Switch branches" +msgstr "切换分支" + +#: command-list.h:179 msgid "Read, modify and delete symbolic refs" msgstr "读取、修改和删除符号引用" -#: command-list.h:177 +#: command-list.h:180 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" -#: command-list.h:178 +#: command-list.h:181 msgid "Creates a temporary file with a blob's contents" msgstr "用 blob 数据对象的内容创建一个临时文件" -#: command-list.h:179 +#: command-list.h:182 msgid "Unpack objects from a packed archive" msgstr "从打包文件中解压缩对象" -#: command-list.h:180 +#: command-list.h:183 msgid "Register file contents in the working tree to the index" msgstr "将工作区的文件内容注册到索引" -#: command-list.h:181 +#: command-list.h:184 msgid "Update the object name stored in a ref safely" msgstr "安全地更新存储于引用中的对象名称" -#: command-list.h:182 +#: command-list.h:185 msgid "Update auxiliary info file to help dumb servers" msgstr "更新辅助信息文件以帮助哑协议服务" -#: command-list.h:183 +#: command-list.h:186 msgid "Send archive back to git-archive" msgstr "将存档发送回 git-archive" -#: command-list.h:184 +#: command-list.h:187 msgid "Send objects packed back to git-fetch-pack" msgstr "将对象压缩包发送回 git-fetch-pack" -#: command-list.h:185 +#: command-list.h:188 msgid "Show a Git logical variable" msgstr "显示一个Git逻辑变量" -#: command-list.h:186 +#: command-list.h:189 msgid "Check the GPG signature of commits" msgstr "检查 GPG 提交签名" -#: command-list.h:187 +#: command-list.h:190 msgid "Validate packed Git archive files" msgstr "校验打包的Git存仓文件" -#: command-list.h:188 +#: command-list.h:191 msgid "Check the GPG signature of tags" msgstr "检查标签的 GPG 签名" -#: command-list.h:189 +#: command-list.h:192 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git web 界面（Git 仓库的 web 前端）" -#: command-list.h:190 +#: command-list.h:193 msgid "Show logs with difference each commit introduces" msgstr "显示每一个提交引入的差异日志" -#: command-list.h:191 +#: command-list.h:194 msgid "Manage multiple working trees" msgstr "管理多个工作区" -#: command-list.h:192 +#: command-list.h:195 msgid "Create a tree object from the current index" msgstr "从当前索引创建一个树对象" -#: command-list.h:193 +#: command-list.h:196 msgid "Defining attributes per path" msgstr "定义路径的属性" -#: command-list.h:194 +#: command-list.h:197 msgid "Git command-line interface and conventions" msgstr "Git 命令行界面和约定" -#: command-list.h:195 +#: command-list.h:198 msgid "A Git core tutorial for developers" msgstr "面向开发人员的 Git 核心教程" -#: command-list.h:196 +#: command-list.h:199 msgid "Git for CVS users" msgstr "适合 CVS 用户的 Git 帮助" -#: command-list.h:197 +#: command-list.h:200 msgid "Tweaking diff output" msgstr "调整差异输出" -#: command-list.h:198 +#: command-list.h:201 msgid "A useful minimum set of commands for Everyday Git" msgstr "每一天 Git 的一组有用的最小命令集合" -#: command-list.h:199 +#: command-list.h:202 msgid "A Git Glossary" msgstr "Git 词汇表" -#: command-list.h:200 +#: command-list.h:203 msgid "Hooks used by Git" msgstr "Git 使用的钩子" -#: command-list.h:201 +#: command-list.h:204 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未跟踪文件" -#: command-list.h:202 +#: command-list.h:205 msgid "Defining submodule properties" msgstr "定义子模组属性" -#: command-list.h:203 +#: command-list.h:206 msgid "Git namespaces" msgstr "Git 名字空间" -#: command-list.h:204 +#: command-list.h:207 msgid "Git Repository Layout" msgstr "Git 仓库布局" -#: command-list.h:205 +#: command-list.h:208 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本范围" -#: command-list.h:206 +#: command-list.h:209 +msgid "Mounting one repository inside another" +msgstr "将一个仓库安装到另外一个仓库中" + +#: command-list.h:210 msgid "A tutorial introduction to Git: part two" msgstr "一个 Git 教程：第二部分" -#: command-list.h:207 +#: command-list.h:211 msgid "A tutorial introduction to Git" msgstr "一个 Git 教程" -#: command-list.h:208 +#: command-list.h:212 msgid "An overview of recommended workflows with Git" msgstr "Git 推荐的工作流概览" -#: rerere.h:44 -msgid "update the index with reused conflict resolution if possible" -msgstr "如果可能，重用冲突解决更新索引" - #: git-bisect.sh:54 msgid "You need to start by \"git bisect start\"" msgstr "您需要执行 \"git bisect start\" 来开始" @@ -18993,133 +22361,49 @@ msgstr "您需要执行 \"git bisect start\" 来开始" msgid "Do you want me to do it for you [Y/n]? " msgstr "您想让我为您这样做么[Y/n]？ " -#: git-bisect.sh:121 -#, sh-format -msgid "unrecognised option: '$arg'" -msgstr "未能识别的选项：'$arg'" - -#: git-bisect.sh:125 -#, sh-format -msgid "'$arg' does not appear to be a valid revision" -msgstr "'$arg' 看起来不像是一个有效的版本" - -#: git-bisect.sh:154 -msgid "Bad HEAD - I need a HEAD" -msgstr "坏的 HEAD - 我需要一个 HEAD" - -#: git-bisect.sh:167 -#, sh-format -msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." -msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" - -#: git-bisect.sh:177 -msgid "won't bisect on cg-seek'ed tree" -msgstr "不会在做了 cg-seek 的树上做二分查找" - -#: git-bisect.sh:181 -msgid "Bad HEAD - strange symbolic ref" -msgstr "坏的 HEAD - 奇怪的符号引用" - -#: git-bisect.sh:233 -#, sh-format -msgid "Bad bisect_write argument: $state" -msgstr "坏的 bisect_write 参数：$state" - -#: git-bisect.sh:246 +#: git-bisect.sh:101 #, sh-format msgid "Bad rev input: $arg" msgstr "坏的输入版本：$arg" -#: git-bisect.sh:265 +#: git-bisect.sh:121 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "坏的输入版本：$bisected_head" -#: git-bisect.sh:274 +#: git-bisect.sh:130 #, sh-format msgid "Bad rev input: $rev" msgstr "坏的输入版本：$rev" -#: git-bisect.sh:283 +#: git-bisect.sh:139 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "'git bisect $TERM_BAD' 只能带一个参数。" -#: git-bisect.sh:306 -#, sh-format -msgid "Warning: bisecting only with a $TERM_BAD commit." -msgstr "警告：在仅有一个坏（$TERM_BAD）提交下进行二分查找。" - -# 译者：注意保持句尾空格 -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:312 -msgid "Are you sure [Y/n]? " -msgstr "您确认么[Y/n]？ " - -#: git-bisect.sh:324 -#, sh-format -msgid "" -"You need to give me at least one $bad_syn and one $good_syn revision.\n" -"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" -msgstr "" -"您需要给我至少一个好版本和一个坏版本。\n" -"（为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。）" - -#: git-bisect.sh:327 -#, sh-format -msgid "" -"You need to start by \"git bisect start\".\n" -"You then need to give me at least one $good_syn and one $bad_syn revision.\n" -"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" -msgstr "" -"您需要执行 \"git bisect start\" 来开始。\n" -"然后需要提供我至少一个好版本和一个坏版本。\n" -"（为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。）" - -#: git-bisect.sh:398 git-bisect.sh:512 -msgid "We are not bisecting." -msgstr "我们没有在二分查找。" - -#: git-bisect.sh:405 -#, sh-format -msgid "'$invalid' is not a valid commit" -msgstr "'$invalid' 不是一个有效的提交" - -#: git-bisect.sh:414 -#, sh-format -msgid "" -"Could not check out original HEAD '$branch'.\n" -"Try 'git bisect reset <commit>'." -msgstr "" -"不能检出原始 HEAD '$branch'。\n" -"尝试 'git bisect reset <提交>'。" - -#: git-bisect.sh:422 +#: git-bisect.sh:209 msgid "No logfile given" msgstr "未提供日志文件" -#: git-bisect.sh:423 +#: git-bisect.sh:210 #, sh-format msgid "cannot read $file for replaying" msgstr "不能读取 $file 来重放" -#: git-bisect.sh:444 +#: git-bisect.sh:232 msgid "?? what are you talking about?" msgstr "?? 您在说什么?" -#: git-bisect.sh:453 +#: git-bisect.sh:241 msgid "bisect run failed: no command provided." msgstr "二分查找运行失败：没有提供命令。" -#: git-bisect.sh:458 +#: git-bisect.sh:246 #, sh-format msgid "running $command" msgstr "运行 $command" -#: git-bisect.sh:465 +#: git-bisect.sh:253 #, sh-format msgid "" "bisect run failed:\n" @@ -19128,11 +22412,11 @@ msgstr "" "二分查找运行失败：\n" "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" -#: git-bisect.sh:491 +#: git-bisect.sh:279 msgid "bisect run cannot continue any more" msgstr "二分查找不能继续运行" -#: git-bisect.sh:497 +#: git-bisect.sh:285 #, sh-format msgid "" "bisect run failed:\n" @@ -19141,27 +22425,13 @@ msgstr "" "二分查找运行失败：\n" "'bisect_state $state' 退出码为 $res" -#: git-bisect.sh:504 +#: git-bisect.sh:292 msgid "bisect run success" msgstr "二分查找运行成功" -#: git-bisect.sh:533 -#, sh-format -msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." -msgstr "无效的命令：您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。" - -#: git-bisect.sh:567 -msgid "no terms defined" -msgstr "未定义术语" - -#: git-bisect.sh:584 -#, sh-format -msgid "" -"invalid argument $arg for 'git bisect terms'.\n" -"Supported options are: --term-good|--term-old and --term-bad|--term-new." -msgstr "" -"参数 $arg 对命令 'git bisect terms' 无效。\n" -"支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。" +#: git-bisect.sh:300 +msgid "We are not bisecting." +msgstr "我们没有在二分查找。" #: git-merge-octopus.sh:46 msgid "" @@ -19201,259 +22471,113 @@ msgstr "尝试和 $pretty_name 的简单合并" msgid "Simple merge did not work, trying automatic merge." msgstr "简单合并未生效，尝试自动合并。" -#: git-legacy-rebase.sh:434 -#, sh-format -msgid "Could not move back to $head_name" -msgstr "无法移回 $head_name" - -#: git-legacy-rebase.sh:460 -#, sh-format -msgid "" -"It seems that there is already a $state_dir_base directory, and\n" -"I wonder if you are in the middle of another rebase. If that is the\n" -"case, please try\n" -"\t$cmd_live_rebase\n" -"If that is not the case, please\n" -"\t$cmd_clear_stale_rebase\n" -"and run me again. I am stopping in case you still have something\n" -"valuable there." -msgstr "" -"好像已有 $state_dir_base 目录，我怀疑您正处于另外一个变基操作\n" -"过程中。 如果是这样，请执行\n" -"\t$cmd_live_rebase\n" -"如果不是这样，请执行\n" -"\t$cmd_clear_stale_rebase\n" -"然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。" - -#: git-legacy-rebase.sh:525 -msgid "error: cannot combine '--signoff' with '--preserve-merges'" -msgstr "错误：不能组合 '--signoff' 和 '--preserve-merges'" - -#: git-legacy-rebase.sh:570 -#, sh-format -msgid "invalid upstream '$upstream_name'" -msgstr "无效的上游 '$upstream_name'" - -#: git-legacy-rebase.sh:594 -#, sh-format -msgid "$onto_name: there are more than one merge bases" -msgstr "$onto_name: 有一个以上的合并基准" - -#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601 -#, sh-format -msgid "$onto_name: there is no merge base" -msgstr "$onto_name: 没有合并基准" - -#: git-legacy-rebase.sh:606 -#, sh-format -msgid "Does not point to a valid commit: $onto_name" -msgstr "没有指向一个有效的提交：$onto_name" - -#: git-legacy-rebase.sh:632 -#, sh-format -msgid "fatal: no such branch/commit '$branch_name'" -msgstr "严重错误：无此分支/提交 '$branch_name'" - -#: git-legacy-rebase.sh:670 -#, sh-format -msgid "Created autostash: $stash_abbrev" -msgstr "创建了 autostash: $stash_abbrev" - -#: git-legacy-rebase.sh:699 -#, sh-format -msgid "Current branch $branch_name is up to date." -msgstr "当前分支 $branch_name 是最新的。" - -#: git-legacy-rebase.sh:709 -#, sh-format -msgid "Current branch $branch_name is up to date, rebase forced." -msgstr "当前分支 $branch_name 是最新的，强制变基。" - -#: git-legacy-rebase.sh:723 -#, sh-format -msgid "Changes to $onto:" -msgstr "到 $onto 的变更：" - -#: git-legacy-rebase.sh:725 -#, sh-format -msgid "Changes from $mb to $onto:" -msgstr "从 $mb 到 $onto 的变更：" - -#: git-legacy-rebase.sh:736 -msgid "First, rewinding head to replay your work on top of it..." -msgstr "首先，回退分支以便在上面重放您的工作..." - -#: git-legacy-rebase.sh:746 -#, sh-format -msgid "Fast-forwarded $branch_name to $onto_name." -msgstr "快进 $branch_name 至 $onto_name。" - -#: git-stash.sh:61 -msgid "git stash clear with parameters is unimplemented" -msgstr "git stash clear 不支持参数" - -#: git-stash.sh:108 -msgid "You do not have the initial commit yet" -msgstr "您尚未建立初始提交" - -#: git-stash.sh:123 -msgid "Cannot save the current index state" -msgstr "无法保存当前索引状态" - -#: git-stash.sh:138 -msgid "Cannot save the untracked files" -msgstr "无法保存未跟踪文件" - -#: git-stash.sh:158 git-stash.sh:171 -msgid "Cannot save the current worktree state" -msgstr "无法保存当前工作区状态" - -#: git-stash.sh:175 -msgid "No changes selected" -msgstr "没有选择变更" - -#: git-stash.sh:178 +#: git-legacy-stash.sh:221 msgid "Cannot remove temporary index (can't happen)" msgstr "无法删除临时索引（不应发生）" -#: git-stash.sh:191 -msgid "Cannot record working tree state" -msgstr "不能记录工作区状态" - -#: git-stash.sh:229 +#: git-legacy-stash.sh:272 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "无法用 $w_commit 更新 $ref_stash" -#: git-stash.sh:281 +#: git-legacy-stash.sh:324 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "错误：'stash push' 的未知选项：$option" -#: git-stash.sh:295 -msgid "Can't use --patch and --include-untracked or --all at the same time" -msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" - -#: git-stash.sh:303 -msgid "No local changes to save" -msgstr "没有要保存的本地修改" - -#: git-stash.sh:308 -msgid "Cannot initialize stash" -msgstr "无法初始化贮藏" - -#: git-stash.sh:312 -msgid "Cannot save the current status" -msgstr "无法保存当前状态" - -#: git-stash.sh:313 +#: git-legacy-stash.sh:356 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "保存工作目录和索引状态 $stash_msg" -#: git-stash.sh:342 -msgid "Cannot remove worktree changes" -msgstr "无法删除工作区变更" - -#: git-stash.sh:490 +#: git-legacy-stash.sh:536 #, sh-format msgid "unknown option: $opt" msgstr "未知选项: $opt" -#: git-stash.sh:503 -msgid "No stash entries found." -msgstr "未发现贮藏条目。" - -#: git-stash.sh:510 +#: git-legacy-stash.sh:556 #, sh-format msgid "Too many revisions specified: $REV" msgstr "指定了太多的版本：$REV" -#: git-stash.sh:525 +#: git-legacy-stash.sh:571 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference 不是一个有效的引用" -#: git-stash.sh:553 +#: git-legacy-stash.sh:599 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' 不是贮藏式提交" -#: git-stash.sh:564 +#: git-legacy-stash.sh:610 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' 不是一个贮藏引用" -#: git-stash.sh:572 +#: git-legacy-stash.sh:618 msgid "unable to refresh index" msgstr "无法刷新索引" -#: git-stash.sh:576 +#: git-legacy-stash.sh:622 msgid "Cannot apply a stash in the middle of a merge" msgstr "无法在合并过程应用贮藏" -#: git-stash.sh:584 +#: git-legacy-stash.sh:630 msgid "Conflicts in index. Try without --index." msgstr "索引中有冲突。尝试不使用 --index。" -#: git-stash.sh:586 +#: git-legacy-stash.sh:632 msgid "Could not save index tree" msgstr "不能保存索引树" -#: git-stash.sh:595 +#: git-legacy-stash.sh:641 msgid "Could not restore untracked files from stash entry" msgstr "无法从贮藏条目中恢复未跟踪文件" -#: git-stash.sh:620 +#: git-legacy-stash.sh:666 msgid "Cannot unstage modified files" msgstr "无法将修改的文件取消暂存" -#: git-stash.sh:635 -msgid "Index was not unstashed." -msgstr "索引未从贮藏中恢复。" - -#: git-stash.sh:649 -msgid "The stash entry is kept in case you need it again." -msgstr "贮藏条目被保留以备您再次需要。" - -#: git-stash.sh:658 +#: git-legacy-stash.sh:704 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" -#: git-stash.sh:659 +#: git-legacy-stash.sh:705 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}：无法丢弃贮藏条目" -#: git-stash.sh:667 -msgid "No branch name specified" -msgstr "未指定分支名" - -#: git-stash.sh:746 +#: git-legacy-stash.sh:792 msgid "(To restore them type \"git stash apply\")" msgstr "（为恢复数据输入 \"git stash apply\"）" -#: git-submodule.sh:198 +#: git-submodule.sh:202 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "只能在工作区的顶级目录中使用相对路径" -#: git-submodule.sh:208 +#: git-submodule.sh:212 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始" -#: git-submodule.sh:227 +#: git-submodule.sh:231 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" -#: git-submodule.sh:230 +#: git-submodule.sh:234 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" -#: git-submodule.sh:236 +#: git-submodule.sh:241 +#, sh-format +msgid "'$sm_path' does not have a commit checked out" +msgstr "'$sm_path' 没有检出的提交" + +#: git-submodule.sh:247 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -19464,22 +22588,22 @@ msgstr "" "$sm_path\n" "如果您确实想添加它，使用 -f 参数。" -#: git-submodule.sh:259 +#: git-submodule.sh:270 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "添加位于 '$sm_path' 的现存仓库到索引" -#: git-submodule.sh:261 +#: git-submodule.sh:272 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" -#: git-submodule.sh:269 +#: git-submodule.sh:280 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库：" -#: git-submodule.sh:271 +#: git-submodule.sh:282 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -19494,49 +22618,51 @@ msgstr "" "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" "或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。" -#: git-submodule.sh:277 +#: git-submodule.sh:288 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "激活本地 git 目录到子模组 '$sm_name'。" -#: git-submodule.sh:289 +#: git-submodule.sh:300 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:294 +#: git-submodule.sh:305 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:303 +#: git-submodule.sh:314 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:563 +#: git-submodule.sh:580 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" -#: git-submodule.sh:573 +#: git-submodule.sh:590 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:578 +#: git-submodule.sh:595 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" -#: git-submodule.sh:596 +#: git-submodule.sh:613 #, sh-format -msgid "Unable to fetch in submodule path '$displaypath'" -msgstr "无法在子模组路径 '$displaypath' 中获取" +msgid "" +"Unable to fetch in submodule path '$displaypath'; trying to directly fetch " +"$sha1:" +msgstr "无法在子模组路径 '$displaypath' 中获取，尝试直接获取 $sha1：" -#: git-submodule.sh:602 +#: git-submodule.sh:619 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -19544,74 +22670,74 @@ msgid "" msgstr "" "获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。" -#: git-submodule.sh:609 +#: git-submodule.sh:626 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" -#: git-submodule.sh:610 +#: git-submodule.sh:627 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "子模组路径 '$displaypath'：检出 '$sha1'" -#: git-submodule.sh:614 +#: git-submodule.sh:631 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" -#: git-submodule.sh:615 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模组路径 '$displaypath'：变基至 '$sha1'" -#: git-submodule.sh:620 +#: git-submodule.sh:637 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" -#: git-submodule.sh:621 +#: git-submodule.sh:638 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'" -#: git-submodule.sh:626 +#: git-submodule.sh:643 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" -#: git-submodule.sh:627 +#: git-submodule.sh:644 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "子模组 '$displaypath'：'$command $sha1'" -#: git-submodule.sh:658 +#: git-submodule.sh:675 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "无法递归进子模组路径 '$displaypath'" -#: git-submodule.sh:754 +#: git-submodule.sh:886 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached 不能和选项 --files 同时使用" -#: git-submodule.sh:806 +#: git-submodule.sh:938 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:826 +#: git-submodule.sh:958 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " 警告：$display_name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:829 +#: git-submodule.sh:961 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:832 +#: git-submodule.sh:964 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst" @@ -19621,12 +22747,21 @@ msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst" msgid "See git-${cmd}(1) for details." msgstr "详见 git-${cmd}(1)。" -#: git-rebase--preserve-merges.sh:136 +#: git-rebase--preserve-merges.sh:109 +msgid "Applied autostash." +msgstr "已应用 autostash。" + +#: git-rebase--preserve-merges.sh:112 +#, sh-format +msgid "Cannot store $stash_sha1" +msgstr "不能存储 $stash_sha1" + +#: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "变基中（$new_count/$total）" -#: git-rebase--preserve-merges.sh:152 +#: git-rebase--preserve-merges.sh:207 msgid "" "\n" "Commands:\n" @@ -19664,7 +22799,7 @@ msgstr "" "\n" "可以对这些行重新排序，将从上至下执行。\n" -#: git-rebase--preserve-merges.sh:215 +#: git-rebase--preserve-merges.sh:270 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -19683,83 +22818,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:240 +#: git-rebase--preserve-merges.sh:295 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1：不是一个可以被拣选的提交" -#: git-rebase--preserve-merges.sh:279 +#: git-rebase--preserve-merges.sh:334 #, sh-format msgid "Invalid commit name: $sha1" msgstr "无效的提交名：$sha1" -#: git-rebase--preserve-merges.sh:309 +#: git-rebase--preserve-merges.sh:364 msgid "Cannot write current commit's replacement sha1" msgstr "不能写入当前提交的替代 sha1" -#: git-rebase--preserve-merges.sh:360 +#: git-rebase--preserve-merges.sh:415 #, sh-format msgid "Fast-forward to $sha1" msgstr "快进到 $sha1" -#: git-rebase--preserve-merges.sh:362 +#: git-rebase--preserve-merges.sh:417 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "不能快进到 $sha1" -#: git-rebase--preserve-merges.sh:371 +#: git-rebase--preserve-merges.sh:426 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "不能移动 HEAD 到 $first_parent" -#: git-rebase--preserve-merges.sh:376 +#: git-rebase--preserve-merges.sh:431 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "拒绝压缩一个合并：$sha1" -#: git-rebase--preserve-merges.sh:394 +#: git-rebase--preserve-merges.sh:449 #, sh-format msgid "Error redoing merge $sha1" msgstr "无法重做合并 $sha1" -#: git-rebase--preserve-merges.sh:403 +#: git-rebase--preserve-merges.sh:458 #, sh-format msgid "Could not pick $sha1" msgstr "不能拣选 $sha1" -#: git-rebase--preserve-merges.sh:412 +#: git-rebase--preserve-merges.sh:467 #, sh-format msgid "This is the commit message #${n}:" msgstr "这是提交说明 #${n}：" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:472 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "提交说明 #${n} 将被跳过：" -#: git-rebase--preserve-merges.sh:428 +#: git-rebase--preserve-merges.sh:483 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "这是一个 $count 个提交的组合。" msgstr[1] "这是一个 $count 个提交的组合。" -#: git-rebase--preserve-merges.sh:437 +#: git-rebase--preserve-merges.sh:492 #, sh-format msgid "Cannot write $fixup_msg" msgstr "不能写入 $fixup_msg" -#: git-rebase--preserve-merges.sh:440 +#: git-rebase--preserve-merges.sh:495 msgid "This is a combination of 2 commits." msgstr "这是一个 2 个提交的组合。" -#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 -#: git-rebase--preserve-merges.sh:527 +#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 +#: git-rebase--preserve-merges.sh:582 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "不能应用 $sha1... $rest" -#: git-rebase--preserve-merges.sh:556 +#: git-rebase--preserve-merges.sh:611 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -19772,32 +22907,32 @@ msgstr "" "这通常是因为空的提交说明，或者 pre-commit 钩子执行失败。如果是 pre-commit\n" "钩子执行失败，你可能需要在重写提交说明前解决这个问题。" -#: git-rebase--preserve-merges.sh:571 +#: git-rebase--preserve-merges.sh:626 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "停止在 $sha1_abbrev... $rest" -#: git-rebase--preserve-merges.sh:586 +#: git-rebase--preserve-merges.sh:641 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "没有父提交的情况下不能 '$squash_style'" -#: git-rebase--preserve-merges.sh:628 +#: git-rebase--preserve-merges.sh:683 #, sh-format msgid "Executing: $rest" msgstr "执行：$rest" -#: git-rebase--preserve-merges.sh:636 +#: git-rebase--preserve-merges.sh:691 #, sh-format msgid "Execution failed: $rest" msgstr "执行失败：$rest" -#: git-rebase--preserve-merges.sh:638 +#: git-rebase--preserve-merges.sh:693 msgid "and made changes to the index and/or the working tree" msgstr "并且修改索引和/或工作区" # 译者：注意保持前导空格 -#: git-rebase--preserve-merges.sh:640 +#: git-rebase--preserve-merges.sh:695 msgid "" "You can fix the problem, and then run\n" "\n" @@ -19808,7 +22943,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:653 +#: git-rebase--preserve-merges.sh:708 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -19822,25 +22957,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:664 +#: git-rebase--preserve-merges.sh:719 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "未知命令：$command $sha1 $rest" -#: git-rebase--preserve-merges.sh:665 +#: git-rebase--preserve-merges.sh:720 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "要修改请使用命令 'git rebase --edit-todo'。" -#: git-rebase--preserve-merges.sh:700 +#: git-rebase--preserve-merges.sh:755 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "成功变基并更新 $head_name。" -#: git-rebase--preserve-merges.sh:757 +#: git-rebase--preserve-merges.sh:812 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "不能删除 CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:762 +#: git-rebase--preserve-merges.sh:817 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -19869,51 +23004,51 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:779 +#: git-rebase--preserve-merges.sh:834 msgid "Error trying to find the author identity to amend commit" msgstr "在修补提交中查找作者信息时遇到错误" -#: git-rebase--preserve-merges.sh:784 +#: git-rebase--preserve-merges.sh:839 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "" "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" -#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 +#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 msgid "Could not commit staged changes." msgstr "不能提交暂存的修改。" -#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 +#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 msgid "Could not execute editor" msgstr "无法运行编辑器" -#: git-rebase--preserve-merges.sh:845 +#: git-rebase--preserve-merges.sh:900 #, sh-format msgid "Could not checkout $switch_to" msgstr "不能检出 $switch_to" -#: git-rebase--preserve-merges.sh:852 +#: git-rebase--preserve-merges.sh:907 msgid "No HEAD?" msgstr "没有 HEAD？" -#: git-rebase--preserve-merges.sh:853 +#: git-rebase--preserve-merges.sh:908 #, sh-format msgid "Could not create temporary $state_dir" msgstr "不能创建临时 $state_dir" -#: git-rebase--preserve-merges.sh:856 +#: git-rebase--preserve-merges.sh:911 msgid "Could not mark as interactive" msgstr "不能标记为交互式" -#: git-rebase--preserve-merges.sh:888 +#: git-rebase--preserve-merges.sh:943 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）" msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）" -#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 +#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "不能对重写提交进行初始化" @@ -19922,173 +23057,109 @@ msgstr "不能对重写提交进行初始化" msgid "usage: $dashless $USAGE" msgstr "用法：$dashless $USAGE" -#: git-sh-setup.sh:190 +#: git-sh-setup.sh:191 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "不能切换目录到 $cdup，工作区的顶级目录" -#: git-sh-setup.sh:199 git-sh-setup.sh:206 +#: git-sh-setup.sh:200 git-sh-setup.sh:207 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." -msgstr "严重错误：$program_name 不能在没有工作区的情况下使用" +msgstr "致命错误：$program_name 不能在没有工作区的情况下使用" -#: git-sh-setup.sh:220 +#: git-sh-setup.sh:221 msgid "Cannot rebase: You have unstaged changes." msgstr "不能变基：您有未暂存的变更。" -#: git-sh-setup.sh:223 +#: git-sh-setup.sh:224 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "不能重写分支：您有未暂存的变更。" -#: git-sh-setup.sh:226 +#: git-sh-setup.sh:227 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "无法通过变基方式拉取：您有未暂存的变更。" -#: git-sh-setup.sh:229 +#: git-sh-setup.sh:230 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "不能 $action：您有未暂存的变更。" -#: git-sh-setup.sh:242 +#: git-sh-setup.sh:243 msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "不能变基：您的索引中包含未提交的变更。" -#: git-sh-setup.sh:245 +#: git-sh-setup.sh:246 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。" -#: git-sh-setup.sh:248 +#: git-sh-setup.sh:249 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "不能 $action：您的索引中包含未提交的变更。" -#: git-sh-setup.sh:252 +#: git-sh-setup.sh:253 msgid "Additionally, your index contains uncommitted changes." msgstr "而且您的索引中包含未提交的变更。" -#: git-sh-setup.sh:372 +#: git-sh-setup.sh:373 msgid "You need to run this command from the toplevel of the working tree." msgstr "您需要在工作区的顶级目录中运行这个命令。" -#: git-sh-setup.sh:377 +#: git-sh-setup.sh:378 msgid "Unable to determine absolute path of git directory" msgstr "不能确定 git 目录的绝对路径" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:196 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:197 -msgid "staged" -msgstr "缓存" - -#: git-add--interactive.perl:197 -msgid "unstaged" -msgstr "未缓存" - -#: git-add--interactive.perl:253 git-add--interactive.perl:278 -msgid "binary" -msgstr "二进制" - -#: git-add--interactive.perl:262 git-add--interactive.perl:316 -msgid "nothing" -msgstr "无" - -#: git-add--interactive.perl:298 git-add--interactive.perl:313 -msgid "unchanged" -msgstr "没有修改" - -#: git-add--interactive.perl:609 -#, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "增加了 %d 个路径\n" -msgstr[1] "增加了 %d 个路径\n" - -#: git-add--interactive.perl:612 -#, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "更新了 %d 个路径\n" -msgstr[1] "更新了 %d 个路径\n" - -#: git-add--interactive.perl:615 -#, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "还原了 %d 个路径\n" -msgstr[1] "还原了 %d 个路径\n" - -#: git-add--interactive.perl:618 +#: git-add--interactive.perl:634 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "触碰了 %d 个路径\n" msgstr[1] "触碰了 %d 个路径\n" -#: git-add--interactive.perl:627 -msgid "Update" -msgstr "更新" - -#: git-add--interactive.perl:639 -msgid "Revert" -msgstr "还原" - -#: git-add--interactive.perl:662 -#, perl-format -msgid "note: %s is untracked now.\n" -msgstr "说明：%s 现已成为未跟踪的。\n" - -#: git-add--interactive.perl:673 -msgid "Add untracked" -msgstr "添加未跟踪的" - -#: git-add--interactive.perl:679 -msgid "No untracked files.\n" -msgstr "没有未跟踪的文件。\n" - -#: git-add--interactive.perl:1033 +#: git-add--interactive.perl:1053 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。" -#: git-add--interactive.perl:1036 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "如果补丁能干净地应用，编辑块将立即标记为贮藏。" -#: git-add--interactive.perl:1039 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "如果补丁能干净地应用，编辑块将立即标记为未暂存。" -#: git-add--interactive.perl:1042 git-add--interactive.perl:1051 +#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "如果补丁能干净地应用，编辑块将立即标记为应用。" -#: git-add--interactive.perl:1045 git-add--interactive.perl:1048 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 +#: git-add--interactive.perl:1074 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。" -#: git-add--interactive.perl:1085 +#: git-add--interactive.perl:1111 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "为写入打开块编辑文件失败：%s" -#: git-add--interactive.perl:1086 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" - -#: git-add--interactive.perl:1092 +#: git-add--interactive.perl:1118 #, perl-format msgid "" "---\n" @@ -20101,33 +23172,12 @@ msgstr "" "要删除 '%s' 开始的行，删除它们。\n" "以 %s 开始的行将被删除。\n" -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1100 -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" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n" -"此次编辑被终止，该块不会被修改。\n" - -#: git-add--interactive.perl:1114 +#: git-add--interactive.perl:1140 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "无法读取块编辑文件：%s" -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: git-add--interactive.perl:1213 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " - -#: git-add--interactive.perl:1222 +#: git-add--interactive.perl:1248 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -20141,7 +23191,7 @@ msgstr "" "a - 暂存该块和本文件中后面的全部块\n" "d - 不暂存该块和本文件中后面的全部块" -#: git-add--interactive.perl:1228 +#: git-add--interactive.perl:1254 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -20155,7 +23205,7 @@ msgstr "" "a - 贮藏该块和本文件中后面的全部块\n" "d - 不贮藏该块和本文件中后面的全部块" -#: git-add--interactive.perl:1234 +#: git-add--interactive.perl:1260 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -20169,7 +23219,7 @@ msgstr "" "a - 不暂存该块和本文件中后面的全部块\n" "d - 不要不暂存该块和本文件中后面的全部块" -#: git-add--interactive.perl:1240 +#: git-add--interactive.perl:1266 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -20183,7 +23233,7 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块" -#: git-add--interactive.perl:1246 +#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -20197,7 +23247,7 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1278 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -20211,7 +23261,7 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块" -#: git-add--interactive.perl:1258 +#: git-add--interactive.perl:1284 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -20225,7 +23275,21 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块" -#: git-add--interactive.perl:1273 +#: git-add--interactive.perl:1296 +msgid "" +"y - apply this hunk to worktree\n" +"n - do not apply this hunk to worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file" +msgstr "" +"y - 在工作区中应用该块\n" +"n - 不要在工作区中应用该块\n" +"q - 退出。不要应用该块及后面的全部块\n" +"a - 应用该块和本文件中后面的全部块\n" +"d - 不要应用该块和本文件中后面的全部块" + +#: git-add--interactive.perl:1311 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -20247,211 +23311,198 @@ msgstr "" "e - 手动编辑当前块\n" "? - 显示帮助\n" -#: git-add--interactive.perl:1304 +#: git-add--interactive.perl:1342 msgid "The selected hunks do not apply to the index!\n" msgstr "选中的块不能应用到索引！\n" -#: git-add--interactive.perl:1305 +#: git-add--interactive.perl:1343 msgid "Apply them to the worktree anyway? " msgstr "无论如何都要应用到工作区么？" -#: git-add--interactive.perl:1308 +#: git-add--interactive.perl:1346 msgid "Nothing was applied.\n" msgstr "未应用。\n" -#: git-add--interactive.perl:1319 +#: git-add--interactive.perl:1357 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "忽略未合入的：%s\n" -#: git-add--interactive.perl:1328 -msgid "Only binary files changed.\n" -msgstr "只有二进制文件被修改。\n" - -#: git-add--interactive.perl:1330 -msgid "No changes.\n" -msgstr "没有修改。\n" - -#: git-add--interactive.perl:1338 -msgid "Patch update" -msgstr "补丁更新" - -#: git-add--interactive.perl:1390 +#: git-add--interactive.perl:1428 #, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1391 +#: git-add--interactive.perl:1429 #, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1392 +#: git-add--interactive.perl:1430 #, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "暂存该块 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1395 +#: git-add--interactive.perl:1433 #, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1396 +#: git-add--interactive.perl:1434 #, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1397 +#: git-add--interactive.perl:1435 #, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "贮藏该块 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1400 +#: git-add--interactive.perl:1438 #, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1401 +#: git-add--interactive.perl:1439 #, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1402 +#: git-add--interactive.perl:1440 #, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1405 +#: git-add--interactive.perl:1443 #, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1406 +#: git-add--interactive.perl:1444 #, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "将删除应用到索引 [y,n,q,a,d%s,?]? " +msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1407 +#: git-add--interactive.perl:1445 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1410 +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1411 +#: git-add--interactive.perl:1449 git-add--interactive.perl:1464 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1412 +#: git-add--interactive.perl:1450 git-add--interactive.perl:1465 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1415 +#: git-add--interactive.perl:1453 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1416 +#: git-add--interactive.perl:1454 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1417 +#: git-add--interactive.perl:1455 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1420 +#: git-add--interactive.perl:1458 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1421 +#: git-add--interactive.perl:1459 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "将删除应用到索引和工作区 [y,n,q,a,d%s,?]? " +msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1422 +#: git-add--interactive.perl:1460 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1522 -msgid "No other hunks to goto\n" -msgstr "没有其它可供跳转的块\n" +#: git-add--interactive.perl:1468 +#, perl-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1529 -msgid "go to which hunk (<ret> to see more)? " -msgstr "跳转到哪个块（<回车> 查看更多）？ " +#: git-add--interactive.perl:1469 +#, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1531 -msgid "go to which hunk? " -msgstr "跳转到哪个块？" +#: git-add--interactive.perl:1470 +#, perl-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1570 +msgid "No other hunks to goto\n" +msgstr "没有其它可供跳转的块\n" -#: git-add--interactive.perl:1540 +#: git-add--interactive.perl:1588 #, perl-format msgid "Invalid number: '%s'\n" msgstr "无效数字：'%s'\n" -#: git-add--interactive.perl:1545 +#: git-add--interactive.perl:1593 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "对不起，只有 %d 个可用块。\n" msgstr[1] "对不起，只有 %d 个可用块。\n" -#: git-add--interactive.perl:1571 +#: git-add--interactive.perl:1619 msgid "No other hunks to search\n" msgstr "没有其它可供查找的块\n" -#: git-add--interactive.perl:1575 -msgid "search for regex? " -msgstr "使用正则表达式搜索？" - -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1636 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "错误的正则表达式 %s：%s\n" -#: git-add--interactive.perl:1598 +#: git-add--interactive.perl:1646 msgid "No hunk matches the given pattern\n" -msgstr "没有和给定模式相匹配的快\n" +msgstr "没有和给定模式相匹配的块\n" -#: git-add--interactive.perl:1610 git-add--interactive.perl:1632 +#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 msgid "No previous hunk\n" msgstr "没有前一个块\n" -#: git-add--interactive.perl:1619 git-add--interactive.perl:1638 +#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 msgid "No next hunk\n" msgstr "没有下一个块\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1692 msgid "Sorry, cannot split this hunk\n" msgstr "对不起，不能拆分这个块\n" -#: git-add--interactive.perl:1650 +#: git-add--interactive.perl:1698 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "拆分为 %d 块。\n" msgstr[1] "拆分为 %d 块。\n" -#: git-add--interactive.perl:1660 +#: git-add--interactive.perl:1708 msgid "Sorry, cannot edit this hunk\n" msgstr "对不起，不能编辑这个块\n" -#: git-add--interactive.perl:1706 -msgid "Review diff" -msgstr "检视 diff" - #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1725 +#: git-add--interactive.perl:1773 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -20468,18 +23519,19 @@ msgstr "" "diff - 显示 HEAD 和索引间差异\n" "add untracked - 添加未跟踪文件的内容至暂存列表\n" -#: git-add--interactive.perl:1742 git-add--interactive.perl:1747 -#: git-add--interactive.perl:1750 git-add--interactive.perl:1757 -#: git-add--interactive.perl:1761 git-add--interactive.perl:1767 +#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 +#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 +#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 +#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 msgid "missing --" msgstr "缺失 --" -#: git-add--interactive.perl:1763 +#: git-add--interactive.perl:1821 #, perl-format msgid "unknown --patch mode: %s" msgstr "未知的 --patch 模式：%s" -#: git-add--interactive.perl:1769 git-add--interactive.perl:1775 +#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 #, perl-format msgid "invalid argument %s, expecting --" msgstr "无效的参数 %s，期望是 --" @@ -20492,66 +23544,66 @@ msgstr "本地时间和 GMT 有不到一分钟间隔\n" msgid "local time offset greater than or equal to 24 hours\n" msgstr "本地时间偏移量大于等于 24 小时\n" -#: git-send-email.perl:219 git-send-email.perl:225 +#: git-send-email.perl:223 git-send-email.perl:229 msgid "the editor exited uncleanly, aborting everything" msgstr "编辑器非正常退出，终止所有操作" -#: git-send-email.perl:302 +#: git-send-email.perl:310 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" -#: git-send-email.perl:307 +#: git-send-email.perl:315 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' 包含编辑的邮件。\n" -#: git-send-email.perl:326 +#: git-send-email.perl:408 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases 和其它选项不兼容\n" -#: git-send-email.perl:395 git-send-email.perl:650 +#: git-send-email.perl:481 git-send-email.perl:683 msgid "Cannot run git format-patch from outside a repository\n" msgstr "不能在仓库之外运行 git format-patch\n" -#: git-send-email.perl:398 +#: git-send-email.perl:484 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "`batch-size` 和 `relogin` 必须同时定义（通过命令行或者配置选项）\n" -#: git-send-email.perl:468 +#: git-send-email.perl:497 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "未知的 --suppress-cc 字段：'%s'\n" -#: git-send-email.perl:497 +#: git-send-email.perl:528 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "未知的 --confirm 设置：'%s'\n" -#: git-send-email.perl:525 +#: git-send-email.perl:556 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "警告：不支持带引号的 sendmail 别名：%s\n" -#: git-send-email.perl:527 +#: git-send-email.perl:558 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "警告：不支持 `:include:`：%s\n" -#: git-send-email.perl:529 +#: git-send-email.perl:560 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n" -#: git-send-email.perl:534 +#: git-send-email.perl:565 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "警告：不能识别的 sendmail 行：%s\n" -#: git-send-email.perl:616 +#: git-send-email.perl:649 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -20566,21 +23618,21 @@ msgstr "" " * 如果含义为一个文件，使用 \"./%s\"，或者\n" " * 如果含义为一个范围，使用 --format-patch 选项。\n" -#: git-send-email.perl:637 +#: git-send-email.perl:670 #, perl-format msgid "Failed to opendir %s: %s" msgstr "无法打开目录 %s: %s" -#: git-send-email.perl:661 +#: git-send-email.perl:694 #, perl-format msgid "" "fatal: %s: %s\n" "warning: no patches were sent\n" msgstr "" -"严重：%s：%s\n" +"致命错误：%s：%s\n" "警告：补丁未能发送\n" -#: git-send-email.perl:672 +#: git-send-email.perl:705 msgid "" "\n" "No patch files specified!\n" @@ -20590,17 +23642,17 @@ msgstr "" "未指定补丁文件！\n" "\n" -#: git-send-email.perl:685 +#: git-send-email.perl:718 #, perl-format msgid "No subject line in %s?" msgstr "在 %s 中没有标题行？" -#: git-send-email.perl:695 +#: git-send-email.perl:728 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "为写入打开 %s 失败: %s" -#: git-send-email.perl:706 +#: git-send-email.perl:739 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -20609,41 +23661,41 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "" "以 \"GIT:\" 开头的行将被删除。\n" -"考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n" +"考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n" "\n" "如果您不想发送摘要，清除内容。\n" -#: git-send-email.perl:730 +#: git-send-email.perl:763 #, perl-format msgid "Failed to open %s: %s" msgstr "无法打开 %s: %s" -#: git-send-email.perl:747 +#: git-send-email.perl:780 #, perl-format msgid "Failed to open %s.final: %s" msgstr "无法打开 %s.final: %s" -#: git-send-email.perl:790 +#: git-send-email.perl:823 msgid "Summary email is empty, skipping it\n" msgstr "摘要邮件为空，跳过\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:825 +#: git-send-email.perl:858 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "您确认要使用 <%s> [y/N]？" -#: git-send-email.perl:880 +#: git-send-email.perl:913 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "如下文件含 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n" -#: git-send-email.perl:885 +#: git-send-email.perl:918 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？" -#: git-send-email.perl:893 +#: git-send-email.perl:926 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -20655,20 +23707,20 @@ msgstr "" "\t%s\n" "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n" -#: git-send-email.perl:912 +#: git-send-email.perl:945 msgid "To whom should the emails be sent (if anyone)?" msgstr "邮件将要发送给谁？" -#: git-send-email.perl:930 +#: git-send-email.perl:963 #, perl-format msgid "fatal: alias '%s' expands to itself\n" -msgstr "严重：别名 '%s' 扩展为它自己\n" +msgstr "致命错误：别名 '%s' 扩展为它自己\n" -#: git-send-email.perl:942 +#: git-send-email.perl:975 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ？" -#: git-send-email.perl:1000 git-send-email.perl:1008 +#: git-send-email.perl:1033 git-send-email.perl:1041 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n" @@ -20676,16 +23728,16 @@ msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1012 +#: git-send-email.perl:1045 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)：" -#: git-send-email.perl:1329 +#: git-send-email.perl:1362 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA 路径 \"%s\" 不存在" -#: git-send-email.perl:1412 +#: git-send-email.perl:1445 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -20710,128 +23762,128 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1427 +#: git-send-email.perl:1460 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "发送这封邮件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): " -#: git-send-email.perl:1430 +#: git-send-email.perl:1463 msgid "Send this email reply required" msgstr "发送要求的邮件回复" -#: git-send-email.perl:1458 +#: git-send-email.perl:1491 msgid "The required SMTP server is not properly defined." msgstr "要求的 SMTP 服务器未被正确定义。" -#: git-send-email.perl:1505 +#: git-send-email.perl:1538 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "服务器不支持 STARTTLS！%s" -#: git-send-email.perl:1510 git-send-email.perl:1514 +#: git-send-email.perl:1543 git-send-email.perl:1547 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS 失败！%s" -#: git-send-email.perl:1523 +#: git-send-email.perl:1556 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" -#: git-send-email.perl:1541 +#: git-send-email.perl:1574 #, perl-format msgid "Failed to send %s\n" msgstr "无法发送 %s\n" -#: git-send-email.perl:1544 +#: git-send-email.perl:1577 #, perl-format msgid "Dry-Sent %s\n" msgstr "演习发送 %s\n" -#: git-send-email.perl:1544 +#: git-send-email.perl:1577 #, perl-format msgid "Sent %s\n" msgstr "正发送 %s\n" -#: git-send-email.perl:1546 +#: git-send-email.perl:1579 msgid "Dry-OK. Log says:\n" msgstr "演习成功。日志说：\n" -#: git-send-email.perl:1546 +#: git-send-email.perl:1579 msgid "OK. Log says:\n" msgstr "OK。日志说：\n" -#: git-send-email.perl:1558 +#: git-send-email.perl:1591 msgid "Result: " msgstr "结果：" -#: git-send-email.perl:1561 +#: git-send-email.perl:1594 msgid "Result: OK\n" msgstr "结果：OK\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1612 #, perl-format msgid "can't open file %s" msgstr "无法打开文件 %s" -#: git-send-email.perl:1626 git-send-email.perl:1646 +#: git-send-email.perl:1659 git-send-email.perl:1679 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) 添加 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1632 +#: git-send-email.perl:1665 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) 添加 to：%s 自行 '%s'\n" -#: git-send-email.perl:1685 +#: git-send-email.perl:1718 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1720 +#: git-send-email.perl:1753 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) 添加 cc: %s 自行 '%s'\n" -#: git-send-email.perl:1831 +#: git-send-email.perl:1864 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) 不能执行 '%s'" -#: git-send-email.perl:1838 +#: git-send-email.perl:1871 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) 添加 %s: %s 自：'%s'\n" -#: git-send-email.perl:1842 +#: git-send-email.perl:1875 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) 无法关闭管道至 '%s'" -#: git-send-email.perl:1872 +#: git-send-email.perl:1905 msgid "cannot send message as 7bit" msgstr "不能以 7bit 形式发送信息" -#: git-send-email.perl:1880 +#: git-send-email.perl:1913 msgid "invalid transfer encoding" msgstr "无效的传送编码" -#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983 +#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 #, perl-format msgid "unable to open %s: %s\n" msgstr "不能打开 %s：%s\n" -#: git-send-email.perl:1924 +#: git-send-email.perl:1957 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s：补丁包含一个超过 998 字符的行" -#: git-send-email.perl:1941 +#: git-send-email.perl:1974 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "略过 %s 含备份后缀 '%s'。\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1945 +#: git-send-email.perl:1978 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要发送 %s？[y|N]：" |