diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 5340 |
1 files changed, 3266 insertions, 2074 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 7de9c72..39efaf1 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -14,6 +14,7 @@ # - 依云 <lilydjwg AT gmail.com> # - Yichao Yu <yyc1992 AT gmail.com> # - Zhuang Ya <zhuangya AT me.com> +# - Teng Long <dyroneteng AT gmail.com> # # Git glossary for Chinese translators # @@ -22,11 +23,13 @@ # 3-way merge | 三方合并 # abbreviate | 简写（的 SHA-1 值） # alternate object database | 备用对象库 +# attribute source | 属性来源 # amend | 修补 # ancestor | 祖先，祖先提交 # annotated tag | 附注标签 # bare repository | 纯仓库 # bisect | 二分查找 +# bitmap | 位图 # blob object | 数据对象 # bloom filter | 布隆过滤器 # branch | 分支 @@ -43,6 +46,7 @@ # commit | 提交 # commit message | 提交说明 # commit object | 提交对象 +# commit-graph | 提交图 # commit-ish (also committish) | 提交号 # cone | 锥形（稀疏检出模型）；锥（稀疏检出） # conflict | 冲突 @@ -74,6 +78,7 @@ # index entry | 索引条目 # loose object | 松散对象 # loose refs | 松散引用 +# magic | 神奇前缀（路径规格支持的一种前缀表达式） # master | master（默认分支名） # merge | 合并 # object | 对象 @@ -83,6 +88,7 @@ # object type | 对象类型 # octopus | 章鱼式合并（两分支以上的合并） # origin | origin（默认的远程名称） +# orphan | 孤立（一般指孤立分支，即没有任何提交的分支） # pack | 包 # pack index | 包索引 # packfile | 包文件 @@ -94,6 +100,7 @@ # plumbing | 管件（Git 底层核心命令的别称） # porcelain | 瓷件（Git 上层封装命令的别称） # precious-objects repo | 珍品仓库 +# preferred pack | 首选包（多包索引中引入的首选包概念） # promisor | 承诺者 # prune | 清除 # pull | 拉，拉取 @@ -102,6 +109,7 @@ # rebase | 变基 # ref | 引用 # reflog | 引用日志 +# refmap | 引用映射 # refspec | 引用规格 # remote | 远程，远程仓库 # remote-tracking branch | 远程跟踪分支 @@ -119,6 +127,7 @@ # smart HTTP protocol | 智能 HTTP 协议 # squash | 挤压 # stage | n. 暂存区（即索引）; v. 暂存 +# stale | 过期的 # stash | n. 贮藏区; v. 贮藏 # submodule | 子模组 # symref | 符号引用 @@ -138,45 +147,45 @@ # upstream | 上游 # upstream branch | 上游分支 # working tree | 工作区 -# Fangyi Zhou <me@fangyi.io>, 2021-2022. +# Fangyi Zhou <me@fangyi.io>, 2021-2023. # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-06-22 10:25+0100\n" -"PO-Revision-Date: 2022-06-14 20:52+0100\n" -"Last-Translator: Fangyi Zhou <me@fangyi.io>\n" -"Language-Team: GitHub <https://github.com/fangyi-zhou/git-po/>\n" +"POT-Creation-Date: 2024-02-16 14:27+0800\n" +"PO-Revision-Date: 2024-02-18 11:47+0800\n" +"Last-Translator: Teng Long <dyroneteng@gmail.com>\n" +"Language-Team: GitHub <https://github.com/dyrone/git/>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 40.0\n" +"X-Generator: Gtranslator 42.0\n" #: add-interactive.c #, c-format msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c builtin/rebase.c reset.c sequencer.c +#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c msgid "could not read index" msgstr "不能读取索引" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "binary" msgstr "二进制" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "nothing" msgstr "无" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "unchanged" msgstr "没有修改" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Update" msgstr "更新" @@ -189,15 +198,15 @@ msgstr "不能暂存 '%s'" msgid "could not write index" msgstr "不能写入索引" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "更新了 %d 个路径\n" msgstr[1] "更新了 %d 个路径\n" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "note: %s is untracked now.\n" msgstr "说明：%s 现已成为未跟踪的。\n" @@ -206,7 +215,7 @@ msgstr "说明：%s 现已成为未跟踪的。\n" msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Revert" msgstr "还原" @@ -214,24 +223,24 @@ msgstr "还原" msgid "Could not parse HEAD^{tree}" msgstr "不能解析 HEAD^{tree}" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "还原了 %d 个路径\n" msgstr[1] "还原了 %d 个路径\n" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c #, c-format msgid "No untracked files.\n" msgstr "没有未跟踪的文件。\n" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Add untracked" msgstr "添加未跟踪的" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "增加了 %d 个路径\n" @@ -242,21 +251,21 @@ msgstr[1] "增加了 %d 个路径\n" msgid "ignoring unmerged: %s" msgstr "忽略未合入的：%s" -#: add-interactive.c add-patch.c git-add--interactive.perl +#: add-interactive.c add-patch.c #, c-format msgid "Only binary files changed.\n" msgstr "只有二进制文件被修改。\n" -#: add-interactive.c add-patch.c git-add--interactive.perl +#: add-interactive.c add-patch.c #, c-format msgid "No changes.\n" msgstr "没有修改。\n" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Patch update" msgstr "补丁更新" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Review diff" msgstr "检视 diff" @@ -324,25 +333,25 @@ msgstr "选择一个编号条目" msgid "(empty) select nothing" msgstr "（空）不选择任何内容" -#: add-interactive.c builtin/clean.c git-add--interactive.perl +#: add-interactive.c builtin/clean.c msgid "*** Commands ***" msgstr "*** 命令 ***" -#: add-interactive.c builtin/clean.c git-add--interactive.perl +#: add-interactive.c builtin/clean.c msgid "What now" msgstr "请选择" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "staged" msgstr "缓存" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "unstaged" msgstr "未缓存" #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c -#: builtin/fetch.c builtin/merge.c builtin/pull.c builtin/submodule--helper.c -#: git-add--interactive.perl +#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c +#: builtin/pull.c builtin/submodule--helper.c msgid "path" msgstr "路径" @@ -350,28 +359,28 @@ msgstr "路径" msgid "could not refresh index" msgstr "不能刷新索引" -#: add-interactive.c builtin/clean.c git-add--interactive.perl +#: add-interactive.c builtin/clean.c #, c-format msgid "Bye.\n" msgstr "再见。\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "暂存添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "暂存该块 [y,n,q,a,d%s,?]? " @@ -395,23 +404,23 @@ msgstr "" "a - 暂存该块和本文件中后面的全部块\n" "d - 不暂存该块和本文件中后面的全部块\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "贮藏该块 [y,n,q,a,d%s,?]? " @@ -435,23 +444,23 @@ msgstr "" "a - 贮藏该块和本文件中后面的全部块\n" "d - 不贮藏该块和本文件中后面的全部块\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " @@ -475,23 +484,23 @@ msgstr "" "a - 取消暂存该块和本文件中后面的全部块\n" "d - 不要取消暂存该块和本文件中后面的全部块\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " @@ -515,23 +524,23 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " @@ -555,23 +564,23 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? " @@ -589,23 +598,23 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? " @@ -624,6 +633,26 @@ msgstr "" "d - 不要应用该块和本文件中后面的全部块\n" #: add-patch.c +#, c-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? " + +#: add-patch.c +#, c-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? " + +#: add-patch.c +#, c-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? " + +#: add-patch.c +#, c-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? " + +#: add-patch.c msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -643,11 +672,6 @@ msgid "could not parse hunk header '%.*s'" msgstr "无法解析数据块头信息 '%.*s'" #: add-patch.c -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "无法解析彩色数据块头信息 '%.*s'" - -#: add-patch.c msgid "could not parse diff" msgstr "不能解析差异信息" @@ -692,7 +716,7 @@ msgstr "" "\t不是结尾于：\n" "%.*s" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" @@ -709,9 +733,7 @@ msgstr "" "要删除 '%c' 开始的行，删除它们。\n" "以 %c 开始的行将被删除。\n" -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c git-add--interactive.perl +#: add-patch.c 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" @@ -728,21 +750,13 @@ msgstr "无法解析数据块头信息" msgid "'git apply --cached' failed" msgstr "'git apply --cached' 失败" -#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " @@ -751,11 +765,11 @@ msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！ msgid "The selected hunks do not apply to the index!" msgstr "选中的块不能应用到索引！" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "Apply them to the worktree anyway? " msgstr "无论如何都要应用到工作区么？" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "Nothing was applied.\n" msgstr "未应用。\n" @@ -793,11 +807,11 @@ msgstr "没有下一个块" msgid "No other hunks to goto" msgstr "没有其它可供跳转的块" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "go to which hunk (<ret> to see more)? " msgstr "跳转到哪个块（<回车> 查看更多）？ " -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "go to which hunk? " msgstr "跳转到哪个块？" @@ -817,7 +831,7 @@ msgstr[1] "对不起，只有 %d 个可用块。" msgid "No other hunks to search" msgstr "没有其它可供查找的块" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "search for regex? " msgstr "使用正则表达式搜索？" @@ -882,9 +896,8 @@ msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退，因为您有未合并的文件。" #: advice.c -#, c-format -msgid "It is not possible to %s because you have unmerged files." -msgstr "无法 %s，因为您有未合并的文件。" +msgid "Rebasing is not possible because you have unmerged files." +msgstr "无法变基，因为您有未合并的文件。" #: advice.c msgid "" @@ -911,6 +924,24 @@ msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" #: advice.c +msgid "" +"Diverging branches can't be fast-forwarded, you need to either:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"or:\n" +"\n" +"\tgit rebase\n" +msgstr "" +"无法在偏离的分支上进行快进操作，您需要:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"或者：\n" +"\n" +"\tgit rebase\n" + +#: advice.c msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" @@ -973,6 +1004,26 @@ msgstr "" "通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n" "\n" +#: advice.c +#, c-format +msgid "" +"The following paths have been moved outside the\n" +"sparse-checkout definition but are not sparse due to local\n" +"modifications.\n" +msgstr "" +"下列的路径已经被移动至稀疏检出的定义之外，\n" +"但是由于本地的修改而并非稀疏。\n" + +#: advice.c +msgid "" +"To correct the sparsity of these paths, do the following:\n" +"* Use \"git add --sparse <paths>\" to update the index\n" +"* Use \"git sparse-checkout reapply\" to apply the sparsity rules" +msgstr "" +"为了修正这些的路径的稀疏性，请运行下列命令：\n" +"* 使用 \"git add --sparse <路径>\" 来更新索引\n" +"* 使用 \"git sparse-checkout reapply\" 来应用稀疏规则" + #: alias.c msgid "cmdline ends with \\" msgstr "命令行以 \\ 结尾" @@ -981,6 +1032,11 @@ msgstr "命令行以 \\ 结尾" msgid "unclosed quote" msgstr "未关闭的引号" +#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c +#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c +msgid "too many arguments" +msgstr "太多参数" + #: apply.c #, c-format msgid "unrecognized whitespace option '%s'" @@ -991,14 +1047,16 @@ msgstr "未能识别的空白字符选项 '%s'" msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" -#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout.c -#: builtin/clone.c builtin/commit.c builtin/describe.c builtin/diff-tree.c -#: builtin/difftool.c builtin/fast-export.c builtin/fetch.c builtin/help.c -#: builtin/index-pack.c builtin/init-db.c builtin/log.c builtin/ls-files.c -#: builtin/merge-base.c builtin/merge.c builtin/pack-objects.c builtin/push.c -#: builtin/rebase.c builtin/repack.c builtin/reset.c builtin/rev-list.c -#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c -#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c +#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c +#: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c +#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c +#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c +#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c +#: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c +#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-list.c +#: builtin/rev-parse.c builtin/show-branch.c builtin/stash.c +#: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c +#: range-diff.c revision.c #, c-format msgid "options '%s' and '%s' cannot be used together" msgstr "选项 '%s' 和 '%s' 不能同时使用" @@ -1009,6 +1067,14 @@ msgid "'%s' outside a repository" msgstr "'%s' 在仓库之外" #: apply.c +msgid "failed to read patch" +msgstr "无法读取补丁" + +#: apply.c +msgid "patch too large" +msgstr "补丁过大" + +#: apply.c #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" @@ -1204,7 +1270,7 @@ msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却 msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: apply.c +#: apply.c builtin/mv.c #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" @@ -1372,7 +1438,7 @@ msgstr "不能为新建文件 %s 创建后端存储" msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c builtin/bisect--helper.c builtin/gc.c +#: apply.c builtin/bisect.c builtin/gc.c #, c-format msgid "failed to write to '%s'" msgstr "无法写入 '%s'" @@ -1413,6 +1479,11 @@ msgstr "截短 .rej 文件名为 %.*s.rej" msgid "cannot open %s" msgstr "不能打开 %s" +#: apply.c rerere.c +#, c-format +msgid "cannot unlink '%s'" +msgstr "不能删除 '%s'" + #: apply.c #, c-format msgid "Hunk #%d applied cleanly." @@ -1432,7 +1503,7 @@ msgstr "略过补丁 '%s'。" msgid "No valid patches in input (allow with \"--allow-empty\")" msgstr "输入中没有合法的补丁 （使用 \"--allow-empty\" 来允许）" -#: apply.c +#: apply.c t/helper/test-cache-tree.c msgid "unable to read index file" msgstr "无法读取索引文件" @@ -1462,7 +1533,7 @@ msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修复空白错误后，应用了 %d 行。" msgstr[1] "修复空白错误后，应用了 %d 行。" -#: apply.c builtin/add.c builtin/mv.c builtin/rm.c +#: apply.c builtin/mv.c builtin/rm.c msgid "Unable to write new index file" msgstr "无法写入新索引文件" @@ -1597,6 +1668,11 @@ msgstr "不能打开数据对象 %s" msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支持的文件模式：0%o (SHA1: %s)" +#: archive-tar.c archive-zip.c builtin/pack-objects.c +#, c-format +msgid "deflate error (%d)" +msgstr "压缩错误 (%d)" + #: archive-tar.c #, c-format msgid "unable to start '%s' filter" @@ -1621,11 +1697,6 @@ msgstr "路径不是有效的 UTF-8：%s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路径太长（%d 字符，SHA1：%s）：%s" -#: archive-zip.c builtin/pack-objects.c -#, c-format -msgid "deflate error (%d)" -msgstr "压缩错误 (%d)" - #: archive-zip.c #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" @@ -1650,6 +1721,11 @@ msgstr "git archive --remote <仓库> [--exec <命令>] --list" msgid "cannot read '%s'" msgstr "不能读取 '%s'" +#: archive.c +#, c-format +msgid "pathspec '%s' matches files outside the current directory" +msgstr "路径规格 '%s' 匹配了当前目录外的文件'" + #: archive.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" @@ -1665,16 +1741,12 @@ msgstr "无此引用：%.*s" msgid "not a valid object name: %s" msgstr "不是一个有效的对象名：%s" -#: archive.c +#: archive.c t/helper/test-cache-tree.c #, c-format msgid "not a tree object: %s" msgstr "不是一个树对象：%s" #: archive.c -msgid "current working directory is untracked" -msgstr "当前工作目录未被跟踪" - -#: archive.c #, c-format msgid "File not found: %s" msgstr "文件未找到：%s" @@ -1707,7 +1779,7 @@ msgstr "格式" msgid "archive format" msgstr "归档格式" -#: archive.c builtin/log.c +#: archive.c builtin/log.c parse-options.h msgid "prefix" msgstr "前缀" @@ -1716,7 +1788,7 @@ msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" #: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c -#: builtin/fast-export.c builtin/grep.c builtin/hash-object.c +#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c #: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h msgid "file" msgstr "文件" @@ -1741,6 +1813,15 @@ msgstr "读取工作区中的 .gitattributes" msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" +#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c +#: builtin/pull.c +msgid "time" +msgstr "时间" + +#: archive.c +msgid "set modification time of archive entries" +msgstr "设置归档条目的修改时间" + #: archive.c msgid "set compression level" msgstr "设置压缩级别" @@ -1783,6 +1864,11 @@ msgstr "未知参数 --output" #: archive.c #, c-format +msgid "extra command line parameter '%s'" +msgstr "额外的命令行参数：'%s'" + +#: archive.c +#, c-format msgid "Unknown archive format '%s'" msgstr "未知归档格式 '%s'" @@ -1797,6 +1883,15 @@ msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一个有效的属性名" #: attr.c +msgid "unable to add additional attribute" +msgstr "不能添加额外属性" + +#: attr.c +#, c-format +msgid "ignoring overly long attributes line %d" +msgstr "忽略过长的属性行 %d" + +#: attr.c #, c-format msgid "%s not allowed: %s:%d" msgstr "不允许 %s：%s:%d" @@ -1809,6 +1904,36 @@ msgstr "" "负值模版在 git attributes 中被忽略\n" "当字符串确实要以感叹号开始时，使用 '\\!'。" +#: attr.c +#, c-format +msgid "cannot fstat gitattributes file '%s'" +msgstr "无法 fstat gitattributes 文件 '%s'" + +#: attr.c +#, c-format +msgid "ignoring overly large gitattributes file '%s'" +msgstr "忽略过大的 gitattributes 文件 '%s'" + +#: attr.c +#, c-format +msgid "ignoring overly large gitattributes blob '%s'" +msgstr "忽略过大的 gitattributes 数据对象 '%s'" + +#: attr.c +msgid "bad --attr-source or GIT_ATTR_SOURCE" +msgstr "错误的 --attr-source 或 GIT_ATTR_SOURCE" + +#: attr.c read-cache.c +#, c-format +msgid "unable to stat '%s'" +msgstr "无法对 %s 执行 stat" + +#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c +#: builtin/pack-objects.c combine-diff.c rerere.c +#, c-format +msgid "unable to read %s" +msgstr "不能读 %s" + #: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" @@ -1933,18 +2058,14 @@ msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" #: blame.c -msgid "cannot use --contents with final commit object name" -msgstr "不能将 --contents 和最终的提交对象名共用" - -#: blame.c msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" #: blame.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c ref-filter.c -#: remote.c sequencer.c submodule.c +#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c remote.c +#: sequencer.c submodule.c msgid "revision walk setup failed" -msgstr "版本遍历设置失败" +msgstr "版本遍历初始化失败" #: blame.c msgid "" @@ -2066,8 +2187,8 @@ msgstr "一个名为 '%s' 的分支已经存在" #: branch.c #, c-format -msgid "cannot force update the branch '%s' checked out at '%s'" -msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'" +msgid "cannot force update the branch '%s' used by worktree at '%s'" +msgstr "无法强制更新被工作区 '%2$s' 所使用的分支 '%1$s'" #: branch.c #, c-format @@ -2120,10 +2241,11 @@ msgstr "子模组 '%s'：无法找到子模组" #: branch.c #, c-format msgid "" -"You may try updating the submodules using 'git checkout %s && git submodule " -"update --init'" +"You may try updating the submodules using 'git checkout --no-recurse-" +"submodules %s && git submodule update --init'" msgstr "" -"你可以用 'git checkout %s && git submodule update --init' 来尝试更新子模组" +"你可以用 'git checkout --no-recurse-submodules %s && git submodule update --" +"init' 来尝试更新子模组" #: branch.c #, c-format @@ -2132,13 +2254,8 @@ msgstr "子模组 '%s'：不能创建分支 '%s'" #: branch.c #, c-format -msgid "'%s' is already checked out at '%s'" -msgstr "'%s' 已经检出到 '%s'" - -#: branch.c -#, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "工作区 %s 的 HEAD 指向没有被更新" +msgid "'%s' is already used by worktree at '%s'" +msgstr "'%s' 已经被工作区 '%s' 使用" #: builtin/add.c msgid "git add [<options>] [--] <pathspec>..." @@ -2150,47 +2267,37 @@ msgid "cannot chmod %cx '%s'" msgstr "不能 chmod %cx '%s'" #: builtin/add.c -#, c-format -msgid "unexpected diff status %c" -msgstr "意外的差异状态 %c" - -#: builtin/add.c builtin/commit.c -msgid "updating files failed" -msgstr "更新文件失败" - -#: builtin/add.c -#, c-format -msgid "remove '%s'\n" -msgstr "删除 '%s'\n" - -#: builtin/add.c msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c builtin/rev-parse.c -msgid "Could not read the index" -msgstr "不能读取索引" +#: builtin/add.c +msgid "" +"the add.interactive.useBuiltin setting has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"设置 add.interactive.useBuiltin 已经被移除！\n" +"查看 'git help config' 中的相关条目以获取更多信息。" #: builtin/add.c -msgid "Could not write patch" -msgstr "不能生成补丁" +msgid "could not read the index" +msgstr "不能读取索引" #: builtin/add.c msgid "editing patch failed" msgstr "编辑补丁失败" -#: builtin/add.c +#: builtin/add.c read-cache.c #, c-format -msgid "Could not stat '%s'" +msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" #: builtin/add.c -msgid "Empty patch. Aborted." -msgstr "空补丁。异常终止。" +msgid "empty patch. aborted" +msgstr "空补丁。异常终止" #: builtin/add.c #, c-format -msgid "Could not apply '%s'" +msgid "could not apply '%s'" msgstr "不能应用 '%s'" #: builtin/add.c @@ -2349,14 +2456,19 @@ msgstr "" msgid "index file corrupt" msgstr "索引文件损坏" +#: builtin/add.c builtin/am.c builtin/checkout.c builtin/clone.c +#: builtin/commit.c builtin/stash.c merge.c rerere.c +msgid "unable to write new index file" +msgstr "无法写新的索引文件" + #: builtin/am.c builtin/mailinfo.c mailinfo.c #, c-format msgid "bad action '%s' for '%s'" msgstr "'%2$s' 的错误动作 '%1$s'" #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c -#: sequencer.c setup.c +#: builtin/pull.c config.c diff-merges.c gpg-interface.c ls-refs.c +#: parallel-checkout.c sequencer.c setup.c #, c-format msgid "invalid value for '%s': '%s'" msgstr "'%s' 的值无效：'%s'" @@ -2399,7 +2511,7 @@ msgstr "fseek 失败" msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" -#: builtin/am.c builtin/rebase.c strbuf.c wrapper.c +#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" @@ -2509,8 +2621,7 @@ msgstr "git write-tree 无法写入树对象" msgid "applying to an empty history" msgstr "正应用到一个空历史上" -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c -#: t/helper/test-fast-rebase.c +#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c msgid "failed to write commit object" msgstr "无法写提交对象" @@ -2598,11 +2709,6 @@ msgstr "" "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" "您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" -#: builtin/am.c builtin/checkout.c builtin/clone.c builtin/stash.c merge.c -#: rerere.c -msgid "unable to write new index file" -msgstr "无法写新的索引文件" - #: builtin/am.c builtin/reset.c #, c-format msgid "Could not parse object '%s'." @@ -2618,17 +2724,12 @@ msgid "" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" -#: builtin/am.c builtin/bisect--helper.c worktree.c +#: builtin/am.c builtin/bisect.c worktree.c #, c-format msgid "failed to read '%s'" msgstr "无法读取 '%s'" #: builtin/am.c -#, c-format -msgid "options '%s=%s' and '%s=%s' cannot be used together" -msgstr "选项 '%s=%s' 和 '%s=%s' 不能同时使用" - -#: builtin/am.c msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" @@ -2641,6 +2742,10 @@ msgid "run interactively" msgstr "以交互式方式运行" #: builtin/am.c +msgid "bypass pre-applypatch and applypatch-msg hooks" +msgstr "绕过 pre-applypatch 和 applypatch-msg 钩子" + +#: builtin/am.c msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" @@ -2678,10 +2783,6 @@ msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" #: builtin/am.c -msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" -msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" - -#: builtin/am.c msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" @@ -2700,7 +2801,8 @@ msgid "n" msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c -#: builtin/for-each-ref.c builtin/ls-tree.c builtin/replace.c builtin/tag.c +#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c +#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c #: builtin/verify-tag.c msgid "format" msgstr "格式" @@ -2804,7 +2906,7 @@ msgstr "交互式模式需要命令行上提供补丁" msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<选项>] [<补丁>...]" -#: builtin/archive.c contrib/scalar/scalar.c +#: builtin/archive.c diagnose.c msgid "could not redirect output" msgstr "不能重定向输出" @@ -2829,110 +2931,105 @@ msgstr "git archive：协议错误" msgid "git archive: expected a flush" msgstr "git archive：应有一个 flush 包" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-reset [<提交>]" - -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "" -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" -"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " -"[<paths>...]" +"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-" +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{new,bad}=<术语> --term-{old,good}" -"=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径>...]" +"git bisect start [--term-{new|bad}=<术语> --term-{old|good}=<术语>] [--no-" +"checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径规格>...]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -msgstr "git bisect--helper --bisect-state (bad|new) [<版本>]" +#: builtin/bisect.c +msgid "git bisect (good|bad) [<rev>...]" +msgstr "git bisect (good|bad) [<版本>...]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" -msgstr "git bisect--helper --bisect-state (good|old) [<版本>...]" +#: builtin/bisect.c +msgid "git bisect skip [(<rev>|<range>)...]" +msgstr "git bisect skip [(<版本>|<范围>)...]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-replay <filename>" -msgstr "git bisect--helper --bisect-replay <文件>" +#: builtin/bisect.c +msgid "git bisect reset [<commit>]" +msgstr "git bisect reset [<提交>]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" -msgstr "git bisect--helper --bisect-skip [(<版本>|<范围>)...]" +#: builtin/bisect.c +msgid "git bisect replay <logfile>" +msgstr "git bisect replay <日志文件>" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-run <cmd>..." -msgstr "git bisect--helper --bisect-run <命令>..." +#: builtin/bisect.c +msgid "git bisect run <cmd> [<arg>...]" +msgstr "git bisect run <命令> [<参数>...]" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "不能以 '%2$s' 模式打开文件 '%1$s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "could not write to file '%s'" msgstr "不能写入文件 '%s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot open file '%s' for reading" msgstr "不能打开文件 '%s' 来读取" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s' is not a valid term" msgstr "'%s' 不是一个有效的术语" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "不能使用内置命令 '%s' 作为术语" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "can't change the meaning of the term '%s'" msgstr "不能修改术语 '%s' 的含义" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "please use two different terms" msgstr "请使用两个不同的术语" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "We are not bisecting.\n" msgstr "我们没有在二分查找。\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' 不是一个有效的提交" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, 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 +#: builtin/bisect.c #, c-format msgid "Bad bisect_write argument: %s" msgstr "坏的 bisect_write 参数：%s" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "无法获取版本 '%s' 的对象 ID" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "couldn't open the file '%s'" msgstr "无法打开文件 '%s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -2941,7 +3038,7 @@ msgstr "" "您需要给我至少一个 %s 和一个 %s 版本。\n" "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -2952,7 +3049,7 @@ msgstr "" "然后需要提供我至少一个 %s 和一个 %s 版本。\n" "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "bisecting only with a %s commit" msgstr "在只有一个 %s 提交的情况下二分查找" @@ -2961,37 +3058,37 @@ msgstr "在只有一个 %s 提交的情况下二分查找" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "Are you sure [Y/n]? " msgstr "您确认么[Y/n]？ " -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "status: waiting for both good and bad commits\n" msgstr "状态：正在等待好的和坏的提交\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "status: waiting for bad commit, %d good commit known\n" msgid_plural "status: waiting for bad commit, %d good commits known\n" msgstr[0] "状态：正在等待坏的提交，已知 %d 个好的提交\n" msgstr[1] "状态：正在等待坏的提交，已知 %d 个好的提交\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "status: waiting for good commit(s), bad commit known\n" msgstr "状态：正在等待好的提交，已知坏的提交\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "no terms defined" msgstr "未定义术语" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, 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 +#: builtin/bisect.c #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -3000,52 +3097,48 @@ msgstr "" "命令 'git bisect terms' 的参数 %s 无效。\n" "支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "revision walk setup failed\n" msgstr "版本遍历设置失败\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "could not open '%s' for appending" msgstr "无法打开 '%s' 进行追加" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "'' is not a valid term" msgstr "'' 不是一个有效的术语" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "unrecognized option: '%s'" msgstr "未识别的选项：'%s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' 看起来不是一个有效的版本" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bad HEAD - I need a HEAD" msgstr "坏的 HEAD - 我需要一个 HEAD" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。" -#: builtin/bisect--helper.c -msgid "won't bisect on cg-seek'ed tree" -msgstr "不会在做了 cg-seek 的树上做二分查找" - -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bad HEAD - strange symbolic ref" msgstr "坏的 HEAD - 奇怪的符号引用" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "invalid ref: '%s'" msgstr "无效的引用：'%s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "You need to start by \"git bisect start\"\n" msgstr "您需要执行 \"git bisect start\" 来开始\n" @@ -3053,166 +3146,131 @@ msgstr "您需要执行 \"git bisect start\" 来开始\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "Do you want me to do it for you [Y/n]? " msgstr "您想让我为您这样做么[Y/n]？ " -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "Please call `--bisect-state` with at least one argument" msgstr "请使用至少一个参数调用 `--bisect-state`" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' 只能带一个参数。" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "Bad rev input: %s" msgstr "坏的版本输入：%s" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "Bad rev input (not a commit): %s" msgstr "坏的版本输入（不是提交）：%s" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "We are not bisecting." msgstr "我们没有在二分查找。" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s'?? what are you talking about?" msgstr "'%s'?? 您在说什么?" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot read file '%s' for replaying" msgstr "不能读取文件 '%s' 来重放" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "running %s\n" msgstr "正在执行 %s\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bisect run failed: no command provided." msgstr "二分查找运行失败：没有提供命令。" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format -msgid "unable to verify '%s' on good revision" -msgstr "无法在好版本中验证 '%s'" +msgid "unable to verify %s on good revision" +msgstr "无法在好版本中验证 %s" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "bogus exit code %d for good revision" msgstr "好版本返回错误的退出码 %d" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format -msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" -msgstr "二分查找运行失败：命令 '%2$s' 的退出码 %1$d < 0 或 >= 128" +msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" +msgstr "二分查找运行失败：命令 %2$s 的退出码 %1$d < 0 或 >= 128" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot open file '%s' for writing" msgstr "无法打开文件 '%s' 进行写入" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bisect run cannot continue any more" msgstr "二分查找不能继续运行" -#: builtin/bisect--helper.c -#, c-format +#: builtin/bisect.c msgid "bisect run success" msgstr "二分查找运行成功" -#: builtin/bisect--helper.c -#, c-format +#: builtin/bisect.c msgid "bisect found first bad commit" msgstr "二分查找找到了第一个坏的提交" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format -msgid "" -"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " -"code %d" -msgstr "二分查找运行失败：'git bisect--helper --bisect-state %s' 退出码为 %d" - -#: builtin/bisect--helper.c -msgid "reset the bisection state" -msgstr "清除二分查找状态" - -#: builtin/bisect--helper.c -msgid "check whether bad or good terms exist" -msgstr "检查坏的或好的术语是否存在" - -#: builtin/bisect--helper.c -msgid "print out the bisect terms" -msgstr "打印二分查找术语" - -#: builtin/bisect--helper.c -msgid "start the bisect session" -msgstr "启动二分查找过程" - -#: builtin/bisect--helper.c -msgid "find the next bisection commit" -msgstr "查询下一个二分查找提交" - -#: builtin/bisect--helper.c -msgid "mark the state of ref (or refs)" -msgstr "标记引用的状态" - -#: builtin/bisect--helper.c -msgid "list the bisection steps so far" -msgstr "列出到目前为止的二分查找步骤" - -#: builtin/bisect--helper.c -msgid "replay the bisection process from the given file" -msgstr "从给定文件重放二分查找进程" +msgid "bisect run failed: 'git bisect %s' exited with error code %d" +msgstr "二分查找运行失败：'git bisect %s' 退出码为 %d" -#: builtin/bisect--helper.c -msgid "skip some commits for checkout" -msgstr "跳过要检出的一些提交" - -#: builtin/bisect--helper.c -msgid "visualize the bisection" -msgstr "可视化二分查找过程" - -#: builtin/bisect--helper.c -msgid "use <cmd>... to automatically bisect" -msgstr "使用 <命令>... 来自动二分查找" +#: builtin/bisect.c +#, c-format +msgid "'%s' requires either no argument or a commit" +msgstr "'%s' 无需参数或者需要一个提交" -#: builtin/bisect--helper.c -msgid "no log for BISECT_WRITE" -msgstr "BISECT_WRITE 无日志" +#: builtin/bisect.c +#, c-format +msgid "'%s' requires 0 or 1 argument" +msgstr "'%s' 无需参数或者需要一个参数" -#: builtin/bisect--helper.c -msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset 无需参数或者需要一个提交" +#: builtin/bisect.c +#, c-format +msgid "'%s' requires 0 arguments" +msgstr "'%s' 无需参数" -#: builtin/bisect--helper.c -msgid "--bisect-terms requires 0 or 1 argument" -msgstr "--bisect-terms 需要 0 或 1 个参数" +#: builtin/bisect.c +msgid "no logfile given" +msgstr "未提供日志文件" -#: builtin/bisect--helper.c -msgid "--bisect-next requires 0 arguments" -msgstr "--bisect-next 需要 0 个参数" +#: builtin/bisect.c +#, c-format +msgid "'%s' failed: no command provided." +msgstr "'%s' 运行失败：没有提供命令。" -#: builtin/bisect--helper.c -msgid "--bisect-log requires 0 arguments" -msgstr "--bisect-log 需要 0 个参数" +#: builtin/bisect.c +msgid "need a command" +msgstr "需要一个命令" -#: builtin/bisect--helper.c -msgid "no logfile given" -msgstr "未提供日志文件" +#: builtin/bisect.c builtin/cat-file.c +#, c-format +msgid "unknown command: '%s'" +msgstr "未知命令：'%s'" #: builtin/blame.c msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" #: builtin/blame.c +msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git annotate [<选项>] [<版本选项>] [<版本>] [--] <文件>" + +#: builtin/blame.c msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" @@ -3414,37 +3472,38 @@ msgstr "git branch [<选项>] [-r | -a] [--format]" #, c-format msgid "" "deleting branch '%s' that has been merged to\n" -" '%s', but not yet merged to HEAD." +" '%s', but not yet merged to HEAD" msgstr "" "将要删除的分支 '%s' 已经被合并到\n" -" '%s'，但未合并到 HEAD。" +" '%s'，但未合并到 HEAD" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 #: builtin/branch.c #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" -" '%s', even though it is merged to HEAD." +" '%s', even though it is merged to HEAD" msgstr "" -"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" -" 然而却尚未被合并到分支 '%s' 。" +"并未删除分支 '%s'，虽然它已经合并到 HEAD，\n" +" 然而却尚未被合并到分支 '%s'" #: builtin/branch.c #, c-format -msgid "Couldn't look up commit object for '%s'" +msgid "couldn't look up commit object for '%s'" msgstr "无法查询 '%s' 指向的提交对象" #: builtin/branch.c #, c-format -msgid "" -"The branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'." -msgstr "" -"分支 '%s' 没有完全合并。\n" -"如果您确认要删除它，执行 'git branch -D %s'。" +msgid "the branch '%s' is not fully merged" +msgstr "分支 '%s' 没有完全合并" #: builtin/branch.c -msgid "Update of config-file failed" +#, c-format +msgid "If you are sure you want to delete it, run 'git branch -D %s'" +msgstr "如果您确认要删除它，执行 'git branch -D %s'" + +#: builtin/branch.c +msgid "update of config-file failed" msgstr "更新配置文件失败" #: builtin/branch.c @@ -3452,23 +3511,28 @@ msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 同时使用" #: builtin/branch.c -msgid "Couldn't look up commit object for HEAD" -msgstr "无法查询 HEAD 指向的提交对象" +#, c-format +msgid "cannot delete branch '%s' used by worktree at '%s'" +msgstr "无法强制更新被工作区 '%2$s' 所使用的分支 '%1$s'" #: builtin/branch.c #, c-format -msgid "Cannot delete branch '%s' checked out at '%s'" -msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" +msgid "remote-tracking branch '%s' not found" +msgstr "未能找到远程跟踪分支 '%s'" #: builtin/branch.c #, c-format -msgid "remote-tracking branch '%s' not found." -msgstr "未能找到远程跟踪分支 '%s'。" +msgid "" +"branch '%s' not found.\n" +"Did you forget --remote?" +msgstr "" +"分支 '%s' 未找到。\n" +"是否忘记指定 --remote 选项？" #: builtin/branch.c #, c-format -msgid "branch '%s' not found." -msgstr "分支 '%s' 未发现。" +msgid "branch '%s' not found" +msgstr "分支 '%s' 未发现" #: builtin/branch.c #, c-format @@ -3495,56 +3559,63 @@ msgstr "HEAD (%s) 指向 refs/heads/ 之外" #: builtin/branch.c #, c-format -msgid "Branch %s is being rebased at %s" +msgid "branch %s is being rebased at %s" msgstr "分支 %s 正被变基到 %s" #: builtin/branch.c #, c-format -msgid "Branch %s is being bisected at %s" +msgid "branch %s is being bisected at %s" msgstr "分支 %s 正被二分查找于 %s" #: builtin/branch.c -msgid "cannot copy the current branch while not on any." -msgstr "无法拷贝当前分支因为不处于任何分支上。" +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "工作区 %s 的 HEAD 指向没有被更新" #: builtin/branch.c -msgid "cannot rename the current branch while not on any." -msgstr "无法重命名当前分支因为不处于任何分支上。" +#, c-format +msgid "invalid branch name: '%s'" +msgstr "无效的分支名：'%s'" #: builtin/branch.c #, c-format -msgid "Invalid branch name: '%s'" -msgstr "无效的分支名：'%s'" +msgid "no commit on branch '%s' yet" +msgstr "分支 '%s' 尚无提交" + +#: builtin/branch.c +#, c-format +msgid "no branch named '%s'" +msgstr "没有分支 '%s'" #: builtin/branch.c -msgid "Branch rename failed" +msgid "branch rename failed" msgstr "分支重命名失败" #: builtin/branch.c -msgid "Branch copy failed" +msgid "branch copy failed" msgstr "分支拷贝失败" #: builtin/branch.c #, c-format -msgid "Created a copy of a misnamed branch '%s'" +msgid "created a copy of a misnamed branch '%s'" msgstr "已为错误命名的分支 '%s' 创建了一个副本" #: builtin/branch.c #, c-format -msgid "Renamed a misnamed branch '%s' away" +msgid "renamed a misnamed branch '%s' away" msgstr "已将错误命名的分支 '%s' 重命名" #: builtin/branch.c #, c-format -msgid "Branch renamed to %s, but HEAD is not updated!" -msgstr "分支重命名为 %s，但 HEAD 没有更新！" +msgid "branch renamed to %s, but HEAD is not updated" +msgstr "分支重命名为 %s，但 HEAD 没有更新" #: builtin/branch.c -msgid "Branch is renamed, but update of config-file failed" +msgid "branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新配置文件失败" #: builtin/branch.c -msgid "Branch is copied, but update of config-file failed" +msgid "branch is copied, but update of config-file failed" msgstr "分支已拷贝，但更新配置文件失败" #: builtin/branch.c @@ -3630,6 +3701,10 @@ msgstr "移动/重命名一个分支，以及它的引用日志" msgid "move/rename a branch, even if target exists" msgstr "移动/重命名一个分支，即使目标已存在" +#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c +msgid "do not output a newline after empty formatted refs" +msgstr "在格式化引用结果为空之后，不输出换行符" + #: builtin/branch.c msgid "copy a branch and its reflog" msgstr "拷贝一个分支和它的引用日志" @@ -3686,14 +3761,14 @@ msgstr "排序和过滤属于大小写不敏感" msgid "recurse through submodules" msgstr "在子模组中递归" -#: builtin/branch.c builtin/for-each-ref.c builtin/ls-tree.c builtin/tag.c -#: builtin/verify-tag.c +#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c +#: builtin/tag.c builtin/verify-tag.c msgid "format to use for the output" msgstr "输出格式" -#: builtin/branch.c builtin/submodule--helper.c submodule.c -msgid "Failed to resolve HEAD as a valid ref." -msgstr "无法将 HEAD 解析为有效引用。" +#: builtin/branch.c +msgid "failed to resolve HEAD as a valid ref" +msgstr "无法将 HEAD 解析为有效引用" #: builtin/branch.c builtin/clone.c msgid "HEAD not found below refs/heads!" @@ -3715,7 +3790,7 @@ msgid "branch name required" msgstr "必须提供分支名" #: builtin/branch.c -msgid "Cannot give description to detached HEAD" +msgid "cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" #: builtin/branch.c @@ -3723,14 +3798,12 @@ msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" #: builtin/branch.c -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "分支 '%s' 尚无提交。" +msgid "cannot copy the current branch while not on any" +msgstr "不处于任何分支上，无法拷贝当前分支" #: builtin/branch.c -#, c-format -msgid "No branch named '%s'." -msgstr "没有分支 '%s'。" +msgid "cannot rename the current branch while not on any" +msgstr "不处于任何分支上，无法重命名当前分支" #: builtin/branch.c msgid "too many branches for a copy operation" @@ -3747,8 +3820,8 @@ msgstr "为设置新上游提供了太多的参数" #: builtin/branch.c #, c-format msgid "" -"could not set upstream of HEAD to %s when it does not point to any branch." -msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。" +"could not set upstream of HEAD to %s when it does not point to any branch" +msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支" #: builtin/branch.c #, c-format @@ -3765,17 +3838,17 @@ msgid "too many arguments to unset upstream" msgstr "为取消上游设置操作提供了太多的参数" #: builtin/branch.c -msgid "could not unset upstream of HEAD when it does not point to any branch." +msgid "could not unset upstream of HEAD when it does not point to any branch" msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" #: builtin/branch.c #, c-format -msgid "Branch '%s' has no upstream information" +msgid "branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" #: builtin/branch.c msgid "" -"The -a, and -r, options to 'git branch' do not take a branch name.\n" +"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" @@ -3784,9 +3857,8 @@ msgstr "" #: builtin/branch.c msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " -"'--set-upstream-to' instead." -msgstr "" -"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" +"'--set-upstream-to' instead" +msgstr "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'" #: builtin/bugreport.c msgid "git version:\n" @@ -3810,8 +3882,12 @@ msgid "not run from a git repository - no hooks to show\n" msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n" #: builtin/bugreport.c -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" -msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]" +msgid "" +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<mode>]]" +msgstr "" +"git bugreport [-o|--output-directory <文件>] [(-s|--suffix) <格式>]\n" +" [--diagnose[=<模式>]" #: builtin/bugreport.c msgid "" @@ -3847,19 +3923,39 @@ msgstr "" "请检查下面错误报告中余下的内容。\n" "您可以删除任何您不想共享的内容。\n" +#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c +#: parse-options.h +msgid "mode" +msgstr "模式" + #: builtin/bugreport.c -msgid "specify a destination for the bugreport file" +msgid "" +"create an additional zip archive of detailed diagnostics (default 'stats')" +msgstr "额外创建详细诊断信息的压缩包（默认 'stats'）" + +#: builtin/bugreport.c +msgid "specify a destination for the bugreport file(s)" msgstr "指定错误报告文件的目标位置" #: builtin/bugreport.c -msgid "specify a strftime format suffix for the filename" +msgid "specify a strftime format suffix for the filename(s)" msgstr "指定文件的 strftime 格式后缀" #: builtin/bugreport.c #, c-format +msgid "unknown argument `%s'" +msgstr "未知参数 `%s'" + +#: builtin/bugreport.c builtin/diagnose.c +#, c-format msgid "could not create leading directories for '%s'" msgstr "不能为 '%s' 创建先导目录" +#: builtin/bugreport.c builtin/diagnose.c +#, c-format +msgid "unable to create diagnostics archive %s" +msgstr "不能创建诊断归档包 %s" + #: builtin/bugreport.c msgid "System Info" msgstr "系统信息" @@ -3879,20 +3975,28 @@ msgid "Created new report at '%s'.\n" msgstr "在 '%s' 创建了新报告。\n" #: builtin/bundle.c -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>" +msgid "" +"git bundle create [-q | --quiet | --progress]\n" +" [--version=<version>] <file> <git-rev-list-args>" +msgstr "" +"git bundle create [-q | --quiet | --progress]\n" +" [--version=<版本>] <文件> <git-rev-list-参数>" #: builtin/bundle.c -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<选项>] <文件>" +msgid "git bundle verify [-q | --quiet] <file>" +msgstr "git bundle verify [-q | --quiet] <文件>" #: builtin/bundle.c msgid "git bundle list-heads <file> [<refname>...]" msgstr "git bundle list-heads <文件> [<引用名>...]" #: builtin/bundle.c -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <文件> [<引用名>...]" +msgid "git bundle unbundle [--progress] <file> [<refname>...]" +msgstr "git bundle unbundle [--progress] <文件> [<引用名>...]" + +#: builtin/bundle.c +msgid "need a <file> argument" +msgstr "需要一个 <文件> 参数" #: builtin/bundle.c builtin/pack-objects.c msgid "do not show progress meter" @@ -3902,13 +4006,13 @@ msgstr "不显示进度表" msgid "show progress meter" msgstr "显示进度表" -#: builtin/bundle.c builtin/pack-objects.c -msgid "show progress meter during object writing phase" -msgstr "在对象写入阶段显示进度表" +#: builtin/bundle.c +msgid "historical; same as --progress" +msgstr "老的参数；等同于 --progress" -#: builtin/bundle.c builtin/pack-objects.c -msgid "similar to --all-progress when progress meter is shown" -msgstr "当进度表显示时类似于 --all-progress" +#: builtin/bundle.c +msgid "historical; does nothing" +msgstr "老的参数；无作用" #: builtin/bundle.c msgid "specify bundle format version" @@ -3935,11 +4039,6 @@ msgstr "需要一个仓库来解开归档包。" msgid "Unbundling objects" msgstr "解包对象中" -#: builtin/bundle.c builtin/remote.c -#, c-format -msgid "Unknown subcommand: %s" -msgstr "未知子命令：%s" - #: builtin/cat-file.c merge-recursive.c #, c-format msgid "cannot read object %s '%s'" @@ -3969,11 +4068,6 @@ msgid "%s takes no arguments" msgstr "%s 不需要参数" #: builtin/cat-file.c -#, c-format -msgid "unknown command: '%s'" -msgstr "未知命令：'%s'" - -#: builtin/cat-file.c msgid "only one batch option may be specified" msgstr "只能指定一个批处理选项" @@ -3991,23 +4085,23 @@ msgstr "git cat-file (-t | -s) [--allow-unknown-type] <对象>" #: builtin/cat-file.c msgid "" +"git cat-file (--textconv | --filters)\n" +" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]" +msgstr "" +"git cat-file (--textconv | --filters)\n" +" [<版本>:<路径|树对象> | --path=<路径|树对象> <版本>]" + +#: builtin/cat-file.c +msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-Z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" - -#: builtin/cat-file.c -msgid "" -"git cat-file (--textconv | --filters)\n" -" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]" -msgstr "" -"git cat-file (--textconv | --filters)\n" -" [<版本>:<路径|树对象> | --path=<路径|树对象> <版本>]" +" [--textconv | --filters] [-Z]" #: builtin/cat-file.c msgid "Check object existence or emit object contents" @@ -4037,6 +4131,10 @@ msgstr "显示对象大小" msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允许 -s 和 -t 对损坏的对象生效" +#: builtin/cat-file.c builtin/log.c +msgid "use mail map file" +msgstr "使用邮件映射文件" + #: builtin/cat-file.c msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "批量处理标准输入中请求的对象（或者 --batch-all-objects）" @@ -4050,6 +4148,14 @@ msgid "like --batch, but don't emit <contents>" msgstr "类似于 --batch，但不输出 <内容>" #: builtin/cat-file.c +msgid "stdin is NUL-terminated" +msgstr "标准输入以 NUL 字符分隔" + +#: builtin/cat-file.c +msgid "stdin and stdout is NUL-terminated" +msgstr "标准输入和标准输出以 NUL 字符分隔" + +#: builtin/cat-file.c msgid "read commands from stdin" msgstr "从标准输入读取命令" @@ -4128,23 +4234,23 @@ msgstr "'%s' 需要 <版本>" msgid "<object> required with '-%c'" msgstr "'-%c' 需要 <对象>" -#: builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/tag.c -msgid "too many arguments" -msgstr "太多参数" - #: builtin/cat-file.c #, c-format msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "<类型> <对象> 模式只允许两个参数，而不是 %d 个" #: builtin/check-attr.c -msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." -msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." +msgid "" +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] " +"<pathname>..." +msgstr "" +"git check-attr [--source <树对象>] [-a | --all | <属性>...] [--] <路径名>..." #: builtin/check-attr.c -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" -msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" +msgid "" +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]" +msgstr "" +"git check-attr --stdin [-z] [--source <树对象>] [-a | --all | <属性>...]" #: builtin/check-attr.c msgid "report all attributes set on file" @@ -4162,6 +4268,14 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" +#: builtin/check-attr.c +msgid "<tree-ish>" +msgstr "<树对象>" + +#: builtin/check-attr.c +msgid "which tree-ish to check attributes at" +msgstr "要用哪一个树对象来检查属性" + #: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c msgid "suppress progress reporting" msgstr "不显示进度报告" @@ -4366,6 +4480,11 @@ msgstr "'%s' 或 '%s' 不能和 %s 一起使用" #: builtin/checkout.c #, c-format +msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree" +msgstr "'%s'、'%s' 或 '%s' 不能在检出一个树时使用" + +#: builtin/checkout.c +#, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" @@ -4391,7 +4510,7 @@ msgstr "不能对 '%s' 执行 reflog 操作：%s\n" msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c +#: builtin/checkout.c builtin/clone.c msgid "unable to update HEAD" msgstr "不能更新 HEAD" @@ -4660,8 +4779,8 @@ msgid "new-branch" msgstr "新分支" #: builtin/checkout.c -msgid "new unparented branch" -msgstr "新的没有父提交的分支" +msgid "new unborn branch" +msgstr "新的未诞生的分支" #: builtin/checkout.c builtin/merge.c msgid "update ignored files (default)" @@ -4725,9 +4844,9 @@ msgstr "" #: builtin/checkout.c msgid "you must specify path(s) to restore" -msgstr "您必须指定一个要恢复的路径" +msgstr "您必须指定要恢复的路径" -#: builtin/checkout.c builtin/clone.c builtin/remote.c +#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c #: builtin/submodule--helper.c builtin/worktree.c msgid "branch" msgstr "分支" @@ -4790,9 +4909,10 @@ msgstr "使用叠加模式" #: builtin/clean.c msgid "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " +"[<pathspec>...]" msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径规格>..." #: builtin/clean.c #, c-format @@ -4832,7 +4952,7 @@ msgstr "拒绝删除当前工作目录\n" msgid "Would refuse to remove current working directory\n" msgstr "将拒绝删除当前工作目录\n" -#: builtin/clean.c git-add--interactive.perl +#: builtin/clean.c #, c-format msgid "" "Prompt help:\n" @@ -4845,7 +4965,7 @@ msgstr "" "foo - 通过唯一前缀选择一个选项\n" " - （空）什么也不选择\n" -#: builtin/clean.c git-add--interactive.perl +#: builtin/clean.c #, c-format msgid "" "Prompt help:\n" @@ -4866,8 +4986,8 @@ msgstr "" "* - 选择所有选项\n" " - （空）结束选择\n" -#: builtin/clean.c git-add--interactive.perl -#, c-format, perl-format +#: builtin/clean.c +#, c-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" @@ -4936,7 +5056,8 @@ msgid "remove whole directories" msgstr "删除整个目录" #: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c -#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c +#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c +#: ref-filter.h msgid "pattern" msgstr "模式" @@ -4966,10 +5087,6 @@ msgid "" msgstr "" "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c -msgid "-x and -X cannot be used together" -msgstr "-x 和 -X 不能同时使用" - #: builtin/clone.c msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<选项>] [--] <仓库> [<路径>]" @@ -5048,7 +5165,7 @@ msgstr "检出 <分支> 而不是远程 HEAD" msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c builtin/fetch.c builtin/grep.c builtin/pull.c +#: builtin/clone.c builtin/fetch.c builtin/pull.c msgid "depth" msgstr "深度" @@ -5056,15 +5173,12 @@ msgstr "深度" msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c builtin/fetch.c builtin/pack-objects.c builtin/pull.c -msgid "time" -msgstr "时间" - #: builtin/clone.c msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" #: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c +#: builtin/replay.c msgid "revision" msgstr "版本" @@ -5092,6 +5206,10 @@ msgstr "git目录" msgid "separate git dir from working tree" msgstr "git目录和工作区分离" +#: builtin/clone.c builtin/init-db.c +msgid "specify the reference format to use" +msgstr "指定要使用的引用格式" + #: builtin/clone.c msgid "key=value" msgstr "key=value" @@ -5110,14 +5228,6 @@ msgstr "server-specific" msgid "option to transmit" msgstr "传输选项" -#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c -msgid "use IPv4 addresses only" -msgstr "只使用 IPv4 地址" - -#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c -msgid "use IPv6 addresses only" -msgstr "只使用 IPv6 地址" - #: builtin/clone.c msgid "apply partial clone filters to submodules" msgstr "对子模组使用部分克隆过滤器" @@ -5131,6 +5241,14 @@ msgid "initialize sparse-checkout file to include only files at root" msgstr "初始化稀疏检出文件，只包含根目录文件" #: builtin/clone.c +msgid "uri" +msgstr "uri" + +#: builtin/clone.c +msgid "a URI for downloading bundles before fetching from origin remote" +msgstr "用于在从 origin 远程获取之前下载归档包的 URI" + +#: builtin/clone.c #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: 不能为 '%s' 添加一个备用：%s\n" @@ -5147,9 +5265,19 @@ msgstr "%s 存在且不是一个目录" #: builtin/clone.c #, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "'%s' 为符号链接，拒绝用 --local 克隆" + +#: builtin/clone.c +#, c-format msgid "failed to start iterator over '%s'" msgstr "无法在 '%s' 上启动迭代器" +#: builtin/clone.c +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "符号链接 '%s' 存在，拒绝用 --local 克隆" + #: builtin/clone.c compat/precompose_utf8.c #, c-format msgid "failed to unlink '%s'" @@ -5204,8 +5332,8 @@ msgid "failed to initialize sparse-checkout" msgstr "无法初始化稀疏检出" #: builtin/clone.c -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "远程 HEAD 指向一个不存在的引用，无法检出" #: builtin/clone.c msgid "unable to checkout working tree" @@ -5227,14 +5355,14 @@ msgstr "无法删除临时的 alternates 文件" msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c contrib/scalar/scalar.c +#: builtin/clone.c scalar.c msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" -#: builtin/clone.c +#: builtin/clone.c builtin/init-db.c setup.c #, c-format -msgid "options '%s' and '%s %s' cannot be used together" -msgstr "选项 '%s' 和 '%s %s' 不能同时使用" +msgid "unknown ref storage format '%s'" +msgstr "未知的引用存储格式 '%s'" #: builtin/clone.c #, c-format @@ -5325,6 +5453,19 @@ msgid "cannot clone from filtered bundle" msgstr "无法从经过过滤的归档包克隆" #: builtin/clone.c +msgid "failed to initialize the repo, skipping bundle URI" +msgstr "无法初始化仓库，跳过归档包 URI" + +#: builtin/clone.c +#, c-format +msgid "failed to fetch objects from bundle URI '%s'" +msgstr "无法从归档包 URI '%s' 获取对象" + +#: builtin/clone.c +msgid "failed to fetch advertised bundles" +msgstr "无法获取公布的归档包" + +#: builtin/clone.c msgid "remote transport reported error" msgstr "远程传输报告错误" @@ -5371,22 +5512,27 @@ msgstr "--command 必须是第一个参数" #: builtin/commit-graph.c msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" msgstr "" -"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--" -"[no-]progress]" +"git commit-graph verify [--object-dir <目录>] [--shallow] [--[no-]progress]" #: builtin/commit-graph.c msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--" -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" -msgstr "" -"git commit-graph write [--object-dir <对象目录>] [--append] [--split[=<策略" -">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--" -"[no-]max-new-filters <n>] [--[no-]progress] <切分选项>" - -#: builtin/commit-graph.c builtin/fetch.c builtin/log.c +"git commit-graph write [--object-dir <dir>] [--append]\n" +" [--split[=<strategy>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <split-options>" +msgstr "" +"git commit-graph write [--object-dir <目录>] [--append]\n" +" [--split[=<策略>]] [--reachable | --stdin-packs | --" +"stdin-commits] \n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <切分选项>" + +#: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c msgid "dir" msgstr "目录" @@ -5396,12 +5542,17 @@ msgstr "保存图形的对象目录" #: builtin/commit-graph.c msgid "if the commit-graph is split, only verify the tip file" -msgstr "如果提交图形被拆分，只验证头一个文件" +msgstr "如果提交图被拆分，只验证头一个文件" #: builtin/commit-graph.c #, c-format msgid "Could not open commit-graph '%s'" -msgstr "无法打开提交图形 '%s'" +msgstr "无法打开提交图 '%s'" + +#: builtin/commit-graph.c +#, c-format +msgid "could not open commit-graph chain '%s'" +msgstr "无法打开提交图链 '%s'" #: builtin/commit-graph.c #, c-format @@ -5445,15 +5596,15 @@ msgstr "启用变更路径的计算" #: builtin/commit-graph.c msgid "allow writing an incremental commit-graph file" -msgstr "允许写一个增量提交图形文件" +msgstr "允许写一个增量提交图文件" #: builtin/commit-graph.c msgid "maximum number of commits in a non-base split commit-graph" -msgstr "在非基本拆分提交图形中的最大提交数" +msgstr "在非基本拆分提交图中的最大提交数" #: builtin/commit-graph.c msgid "maximum ratio between two levels of a split commit-graph" -msgstr "一个拆分提交图形的两个级别之间的最大比率" +msgstr "一个拆分提交图的两个级别之间的最大比率" #: builtin/commit-graph.c msgid "only expire files older than a given date-time" @@ -5471,18 +5622,17 @@ msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" msgid "Collecting commits from input" msgstr "正从标准输入收集提交" -#: builtin/commit-graph.c builtin/multi-pack-index.c -#, c-format -msgid "unrecognized subcommand: %s" -msgstr "未识别的子命令：%s" +#: builtin/commit-tree.c +msgid "git commit-tree <tree> [(-p <parent>)...]" +msgstr "git commit-tree <树> [(-p <父提交>)...]" #: builtin/commit-tree.c msgid "" -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " -"<file>)...] <tree>" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" +" [(-F <file>)...] <tree>" msgstr "" -"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件" -">)...] <树>" +"git commit-tree [(-p <父提交>)...] [-S[<私钥 ID>]] [(-m <消息>)...]\n" +" [(-F <文件>)...] <树>" #: builtin/commit-tree.c #, c-format @@ -5539,12 +5689,30 @@ msgid "git commit-tree: failed to read" msgstr "git commit-tree：无法读取" #: builtin/commit.c -msgid "git commit [<options>] [--] <pathspec>..." -msgstr "git commit [<选项>] [--] <路径规格>..." +msgid "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|" +"reword):]<commit>)]\n" +" [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u<模式>] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) <提交> | --fixup [(amend|" +"reword):]<提交>)]\n" +" [-F <文件> | -m <消息>] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--author=<作者>]\n" +" [--date=<日期>] [--cleanup=<模式>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n" +" [(--trailer <键>[(=|:)<值>])...] [-S[<私钥 ID>]]\n" +" [--] [<路径规格>...]" #: builtin/commit.c -msgid "git status [<options>] [--] <pathspec>..." -msgstr "git status [<选项>] [--] <路径规格>..." +msgid "git status [<options>] [--] [<pathspec>...]" +msgstr "git status [<选项>] [--] [<路径规格>...]" #: builtin/commit.c msgid "" @@ -5598,6 +5766,10 @@ msgstr "" " git cherry-pick --skip\n" "\n" +#: builtin/commit.c read-cache.c +msgid "updating files failed" +msgstr "更新文件失败" + #: builtin/commit.c msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" @@ -5623,10 +5795,6 @@ msgid "Failed to update main cache tree" msgstr "不能更新树的主缓存" #: builtin/commit.c -msgid "unable to write new_index file" -msgstr "无法写 new_index 文件" - -#: builtin/commit.c msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" @@ -5671,10 +5839,10 @@ msgid "" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: builtin/commit.c +#: builtin/commit.c builtin/merge-tree.c #, c-format -msgid "could not lookup commit %s" -msgstr "不能查询提交 %s" +msgid "could not lookup commit '%s'" +msgstr "不能查询提交 '%s'" #: builtin/commit.c builtin/shortlog.c #, c-format @@ -5891,7 +6059,7 @@ msgstr "计算完整的领先/落后值" msgid "version" msgstr "版本" -#: builtin/commit.c builtin/push.c builtin/worktree.c +#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c msgid "machine-readable output" msgstr "机器可读的输出" @@ -5903,10 +6071,6 @@ msgstr "以长格式显示状态（默认）" msgid "terminate entries with NUL" msgstr "条目以 NUL 字符结尾" -#: builtin/commit.c builtin/fast-export.c builtin/rebase.c parse-options.h -msgid "mode" -msgstr "模式" - #: builtin/commit.c msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" @@ -5977,7 +6141,7 @@ msgstr "日期" msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c parse-options.h ref-filter.h +#: builtin/commit.c builtin/merge-tree.c parse-options.h ref-filter.h msgid "commit" msgstr "提交" @@ -6118,17 +6282,17 @@ msgstr "因提交说明的正文为空而终止提交。\n" #: builtin/commit.c msgid "" "repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full and quota is\n" +"new index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" -"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满或\n" +"仓库已更新，但无法写入索引文件。检查是否磁盘已满或\n" "磁盘配额已耗尽，然后执行 \"git restore --staged :/\" 恢复。" #: builtin/config.c msgid "git config [<options>]" msgstr "git config [<选项>]" -#: builtin/config.c builtin/env--helper.c +#: builtin/config.c #, c-format msgid "unrecognized --type argument, %s" msgstr "未能识别的 --type 参数，%s" @@ -6157,7 +6321,7 @@ msgstr "使用仓库级配置文件" msgid "use per-worktree config file" msgstr "使用工作区级别的配置文件" -#: builtin/config.c +#: builtin/config.c builtin/gc.c msgid "use given config file" msgstr "使用指定的配置文件" @@ -6237,11 +6401,11 @@ msgstr "获得颜色设置：配置 [stdout-is-tty]" msgid "Type" msgstr "类型" -#: builtin/config.c builtin/env--helper.c builtin/hash-object.c +#: builtin/config.c builtin/hash-object.c msgid "type" msgstr "类型" -#: builtin/config.c builtin/env--helper.c +#: builtin/config.c msgid "value is given this type" msgstr "取值为该类型" @@ -6293,7 +6457,7 @@ msgstr "显示配置的来源（文件、标准输入、数据对象，或命令 msgid "show scope of config (worktree, local, global, system, command)" msgstr "显示配置的作用域（工作区、本地、全局、系统、命令）" -#: builtin/config.c builtin/env--helper.c +#: builtin/config.c msgid "value" msgstr "取值" @@ -6378,7 +6542,7 @@ msgstr "--blob 只能在 git 仓库内使用" msgid "--worktree can only be used inside a git repository" msgstr "--worktree 只能在 git 仓库内使用" -#: builtin/config.c +#: builtin/config.c builtin/gc.c msgid "$HOME not set" msgstr "$HOME 未设置" @@ -6488,12 +6652,20 @@ msgid "unable to get credential storage lock in %d ms" msgstr "无法在 %d ms 获得凭证存储锁" #: builtin/describe.c -msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [<选项>] [<提交号>...]" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<提交号>...]" #: builtin/describe.c -msgid "git describe [<options>] --dirty" -msgstr "git describe [<选项>] --dirty" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<标记>]" + +#: builtin/describe.c +msgid "git describe <blob>" +msgstr "git describe <数据对象>" #: builtin/describe.c msgid "head" @@ -6644,6 +6816,26 @@ msgstr "没有发现名称，无法描述任何东西。" msgid "option '%s' and commit-ishes cannot be used together" msgstr "选项 '%s' 和提交号不能同时使用" +#: builtin/diagnose.c +msgid "" +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" +msgstr "" +"git diagnose [(-o | --output-directory) <路径>] [(-s | --suffix) <格式>]\n" +" [--mode=<模式>]" + +#: builtin/diagnose.c +msgid "specify a destination for the diagnostics archive" +msgstr "指定诊断归档包的目标位置" + +#: builtin/diagnose.c +msgid "specify a strftime format suffix for the filename" +msgstr "指定文件的 strftime 格式后缀" + +#: builtin/diagnose.c +msgid "specify the content of the diagnostic archive" +msgstr "指定诊断信息归档包的内容" + #: builtin/diff-tree.c msgid "--merge-base only works with two commits" msgstr "--merge-base 仅适用于两个提交" @@ -6654,6 +6846,10 @@ msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一个正规文件或符号链接" #: builtin/diff.c +msgid "no merge given, only parents." +msgstr "没有给出合并，只有父提交。" + +#: builtin/diff.c #, c-format msgid "invalid option: %s" msgstr "无效选项：%s" @@ -6796,30 +6992,6 @@ msgstr "没有为 --tool=<工具> 参数提供 <工具>" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" -#: builtin/env--helper.c -msgid "git env--helper --type=[bool|ulong] <options> <env-var>" -msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>" - -#: builtin/env--helper.c -msgid "default for git_env_*(...) to fall back on" -msgstr "git_env_*(...) 的默认值" - -#: builtin/env--helper.c -msgid "be quiet only use git_env_*() value as exit code" -msgstr "安静模式，只使用 git_env_*() 的值作为退出码" - -#: builtin/env--helper.c -#, c-format -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "选项 `--default' 和 `--type=bool` 期望一个布尔值，不是 `%s`" - -#: builtin/env--helper.c -#, c-format -msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not " -"`%s`" -msgstr "选项 `--default' 和 `--type=ulong` 期望一个无符号长整型，不是 `%s`" - #: builtin/fast-export.c msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<rev-list 选项>]" @@ -6962,147 +7134,17 @@ msgstr "git fetch --all [<选项>]" msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel 不能为负数" -#: builtin/fetch.c builtin/pull.c -msgid "fetch from all remotes" -msgstr "从所有的远程抓取" - -#: builtin/fetch.c builtin/pull.c -msgid "set upstream for git pull/fetch" -msgstr "为 git pull/fetch 设置上游" - -#: builtin/fetch.c builtin/pull.c -msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" - -#: builtin/fetch.c -msgid "use atomic transaction to update references" -msgstr "使用原子事务更新引用" - -#: builtin/fetch.c builtin/pull.c -msgid "path to upload pack on remote end" -msgstr "上传包到远程的路径" - -#: builtin/fetch.c -msgid "force overwrite of local reference" -msgstr "强制覆盖本地引用" - -#: builtin/fetch.c -msgid "fetch from multiple remotes" -msgstr "从多个远程抓取" - -#: builtin/fetch.c builtin/pull.c -msgid "fetch all tags and associated objects" -msgstr "抓取所有的标签和关联对象" - -#: builtin/fetch.c -msgid "do not fetch all tags (--no-tags)" -msgstr "不抓取任何标签(--no-tags)" - -#: builtin/fetch.c -msgid "number of submodules fetched in parallel" -msgstr "子模组获取的并发数" - -#: builtin/fetch.c -msgid "modify the refspec to place all refs within refs/prefetch/" -msgstr "修改引用规格以将所有引用放入 refs/prefetch/" - -#: builtin/fetch.c builtin/pull.c -msgid "prune remote-tracking branches no longer on remote" -msgstr "清除远程已经不存在的分支的跟踪分支" - -#: builtin/fetch.c -msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "清除远程不存在的本地标签，并且替换变更标签" - -# 译者：可选值，不能翻译 -#: builtin/fetch.c builtin/pull.c -msgid "on-demand" -msgstr "on-demand" - -#: builtin/fetch.c -msgid "control recursive fetching of submodules" -msgstr "控制子模组的递归抓取" - -#: builtin/fetch.c -msgid "write fetched references to the FETCH_HEAD file" -msgstr "将获取到的引用写入 FETCH_HEAD 文件" - -#: builtin/fetch.c builtin/pull.c -msgid "keep downloaded pack" -msgstr "保持下载包" - -#: builtin/fetch.c -msgid "allow updating of HEAD ref" -msgstr "允许更新 HEAD 引用" - -#: builtin/fetch.c builtin/pull.c -msgid "deepen history of shallow clone" -msgstr "深化浅克隆的历史" - -#: builtin/fetch.c builtin/pull.c -msgid "deepen history of shallow repository based on time" -msgstr "基于时间来深化浅克隆的历史" - -#: builtin/fetch.c builtin/pull.c -msgid "convert to a complete repository" -msgstr "转换为一个完整的仓库" - -#: builtin/fetch.c -msgid "re-fetch without negotiating common commits" -msgstr "不协商共有提交重新获取" - -#: builtin/fetch.c -msgid "prepend this to submodule path output" -msgstr "在子模组路径输出的前面加上此目录" - -#: builtin/fetch.c -msgid "" -"default for recursive fetching of submodules (lower priority than config " -"files)" -msgstr "递归获取子模组的缺省值（比配置文件优先级低）" - -#: builtin/fetch.c builtin/pull.c -msgid "accept refs that update .git/shallow" -msgstr "接受更新 .git/shallow 的引用" - -#: builtin/fetch.c builtin/pull.c -msgid "refmap" -msgstr "引用映射" - -#: builtin/fetch.c builtin/pull.c -msgid "specify fetch refmap" -msgstr "指定获取操作的引用映射" - -#: builtin/fetch.c builtin/pull.c -msgid "report that we have only objects reachable from this object" -msgstr "报告我们只拥有从该对象开始可达的对象" - -#: builtin/fetch.c -msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "不获取包文件；而是打印协商的祖先提交" - -#: builtin/fetch.c -msgid "run 'maintenance --auto' after fetching" -msgstr "获取后执行 'maintenance --auto'" - -#: builtin/fetch.c builtin/pull.c -msgid "check for forced-updates on all updated branches" -msgstr "在所有更新分支上检查强制更新" - -#: builtin/fetch.c -msgid "write the commit-graph after fetching" -msgstr "抓取后写提交图" - -#: builtin/fetch.c -msgid "accept refspecs from stdin" -msgstr "从标准输入获取引用规格" - #: builtin/fetch.c msgid "couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" #: builtin/fetch.c #, c-format +msgid "From %.*s\n" +msgstr "来自 %.*s\n" + +#: builtin/fetch.c +#, c-format msgid "object %s not found" msgstr "对象 %s 未发现" @@ -7115,12 +7157,8 @@ msgid "[rejected]" msgstr "[已拒绝]" #: builtin/fetch.c -msgid "can't fetch in current branch" -msgstr "当前分支下不能执行获取操作" - -#: builtin/fetch.c -msgid "checked out in another worktree" -msgstr "已在另一个工作树中检出" +msgid "can't fetch into checked-out branch" +msgstr "无法获取到已检出的分支" #: builtin/fetch.c msgid "[tag update]" @@ -7192,11 +7230,6 @@ msgstr "拒绝 %s 因为浅克隆的根不允许被更新" #: builtin/fetch.c #, c-format -msgid "From %.*s\n" -msgstr "来自 %.*s\n" - -#: builtin/fetch.c -#, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" @@ -7305,6 +7338,141 @@ msgstr "未指定远程仓库；请指定一个用于获取新版本的 URL 或 msgid "you need to specify a tag name" msgstr "您需要指定一个标签名称" +#: builtin/fetch.c builtin/pull.c +msgid "fetch from all remotes" +msgstr "从所有远程抓取" + +#: builtin/fetch.c builtin/pull.c +msgid "set upstream for git pull/fetch" +msgstr "为 git pull/fetch 设置上游" + +#: builtin/fetch.c builtin/pull.c +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" + +#: builtin/fetch.c +msgid "use atomic transaction to update references" +msgstr "使用原子事务更新引用" + +#: builtin/fetch.c builtin/pull.c +msgid "path to upload pack on remote end" +msgstr "上传包到远程的路径" + +#: builtin/fetch.c +msgid "force overwrite of local reference" +msgstr "强制覆盖本地引用" + +#: builtin/fetch.c +msgid "fetch from multiple remotes" +msgstr "从多个远程抓取" + +#: builtin/fetch.c builtin/pull.c +msgid "fetch all tags and associated objects" +msgstr "抓取所有的标签和关联对象" + +#: builtin/fetch.c +msgid "do not fetch all tags (--no-tags)" +msgstr "不抓取任何标签（--no-tags）" + +#: builtin/fetch.c +msgid "number of submodules fetched in parallel" +msgstr "获取子模组的并发数" + +#: builtin/fetch.c +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "修改引用规格以将所有引用放入 refs/prefetch/" + +#: builtin/fetch.c builtin/pull.c +msgid "prune remote-tracking branches no longer on remote" +msgstr "清除远程已经不存在的分支的跟踪分支" + +#: builtin/fetch.c +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "清除远程不存在的本地标签，并且替换变更标签" + +# 译者：可选值，不能翻译 +#: builtin/fetch.c builtin/pull.c +msgid "on-demand" +msgstr "on-demand" + +#: builtin/fetch.c +msgid "control recursive fetching of submodules" +msgstr "控制子模组的递归抓取" + +#: builtin/fetch.c +msgid "write fetched references to the FETCH_HEAD file" +msgstr "将获取到的引用写入 FETCH_HEAD 文件" + +#: builtin/fetch.c builtin/pull.c +msgid "keep downloaded pack" +msgstr "保持已下载的包" + +#: builtin/fetch.c +msgid "allow updating of HEAD ref" +msgstr "允许更新 HEAD 引用" + +#: builtin/fetch.c builtin/pull.c +msgid "deepen history of shallow clone" +msgstr "深化浅克隆的历史" + +#: builtin/fetch.c builtin/pull.c +msgid "deepen history of shallow repository based on time" +msgstr "基于时间来深化浅克隆的历史" + +#: builtin/fetch.c builtin/pull.c +msgid "convert to a complete repository" +msgstr "转换为一个完整的仓库" + +#: builtin/fetch.c +msgid "re-fetch without negotiating common commits" +msgstr "重新获取而不协商共同提交" + +#: builtin/fetch.c +msgid "prepend this to submodule path output" +msgstr "在子模组路径输出的前面加上此目录" + +#: builtin/fetch.c +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "递归获取子模组的缺省值（比配置文件优先级低）" + +#: builtin/fetch.c builtin/pull.c +msgid "accept refs that update .git/shallow" +msgstr "接受更新 .git/shallow 的引用" + +#: builtin/fetch.c builtin/pull.c +msgid "refmap" +msgstr "引用映射" + +#: builtin/fetch.c builtin/pull.c +msgid "specify fetch refmap" +msgstr "指定获取操作的引用映射" + +#: builtin/fetch.c builtin/pull.c +msgid "report that we have only objects reachable from this object" +msgstr "报告我们只拥有从该对象开始可达的对象" + +#: builtin/fetch.c +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "不获取包文件；而是打印协商的祖先提交" + +#: builtin/fetch.c +msgid "run 'maintenance --auto' after fetching" +msgstr "获取后执行 'maintenance --auto'" + +#: builtin/fetch.c builtin/pull.c +msgid "check for forced-updates on all updated branches" +msgstr "在所有更新分支上检查强制更新" + +#: builtin/fetch.c +msgid "write the commit-graph after fetching" +msgstr "抓取后写提交图" + +#: builtin/fetch.c +msgid "accept refspecs from stdin" +msgstr "从标准输入获取引用规格" + #: builtin/fetch.c msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only 需要一个或多个 --negotiation-tip=*" @@ -7318,6 +7486,11 @@ msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库，参数 --unshallow 没有意义" #: builtin/fetch.c +#, c-format +msgid "failed to fetch bundles from '%s'" +msgstr "无法从 '%s' 获取归档包" + +#: builtin/fetch.c msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个仓库参数" @@ -7445,9 +7618,17 @@ msgstr "只打印包含该提交的引用" msgid "print only refs which don't contain the commit" msgstr "只打印不包含该提交的引用" +#: builtin/for-each-ref.c +msgid "read reference patterns from stdin" +msgstr "从标准输入读取引用的模式" + +#: builtin/for-each-ref.c +msgid "unknown arguments supplied with --stdin" +msgstr "为 --stdin 提供了未知的命令参数" + #: builtin/for-each-repo.c -msgid "git for-each-repo --config=<config> <command-args>" -msgstr "git for-each-repo --config=<配置> <命令参数>" +msgid "git for-each-repo --config=<config> [--] <arguments>" +msgstr "git for-each-repo --config=<配置> [--] <命令参数>" #: builtin/for-each-repo.c msgid "config" @@ -7461,6 +7642,11 @@ msgstr "存储着仓库路径列表的配置项键名" msgid "missing --config=<config>" msgstr "缺少 --config=<配置>" +#: builtin/for-each-repo.c +#, c-format +msgid "got bad config --config=%s" +msgstr "发现错误的配置行 --config=%s" + #: builtin/fsck.c msgid "unknown" msgstr "未知" @@ -7646,21 +7832,45 @@ msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一个尚未诞生的分支（%s）" #: builtin/fsck.c -msgid "Checking cache tree" -msgstr "正在检查缓存树" +#, c-format +msgid "Checking cache tree of %s" +msgstr "正在检查缓存树 %s" #: builtin/fsck.c #, c-format -msgid "%s: invalid sha1 pointer in cache-tree" -msgstr "%s：cache-tree 中无效的 sha1 指针" +msgid "%s: invalid sha1 pointer in cache-tree of %s" +msgstr "%s：cache-tree %s 中存在无效的 sha1 指针" #: builtin/fsck.c msgid "non-tree in cache-tree" msgstr "cache-tree 中非树对象" #: builtin/fsck.c -msgid "git fsck [<options>] [<object>...]" -msgstr "git fsck [<选项>] [<对象>...]" +#, c-format +msgid "%s: invalid sha1 pointer in resolve-undo of %s" +msgstr "%s：resolve-undo %s 中存在无效的 sha1 指针" + +#: builtin/fsck.c +#, c-format +msgid "unable to load rev-index for pack '%s'" +msgstr "无法为包文件 %s 加载反向索引" + +#: builtin/fsck.c +#, c-format +msgid "invalid rev-index for pack '%s'" +msgstr "包文件 '%s' 的反向索引文件无效" + +#: builtin/fsck.c +msgid "" +"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" +" [--[no-]full] [--strict] [--verbose] [--lost-found]\n" +" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" +" [--[no-]name-objects] [<object>...]" +msgstr "" +"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" +" [--[no-]full] [--strict] [--verbose] [--lost-found]\n" +" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" +" [--[no-]name-objects] [<对象>...]" #: builtin/fsck.c msgid "show unreachable objects" @@ -7733,14 +7943,6 @@ msgid "git fsmonitor--daemon run [<options>]" msgstr "git fsmonitor--daemon run [<选项>]" #: builtin/fsmonitor--daemon.c -msgid "git fsmonitor--daemon stop" -msgstr "git fsmonitor--daemon stop" - -#: builtin/fsmonitor--daemon.c -msgid "git fsmonitor--daemon status" -msgstr "git fsmonitor--daemon status" - -#: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' out of range: %d" msgstr "'%s' 的值超出范围：%d" @@ -7840,7 +8042,7 @@ msgstr "等待守护进程启动的最大秒数" msgid "invalid 'ipc-threads' value (%d)" msgstr "无效的 'ipc-threads' 值（%d）" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c t/helper/test-cache-tree.c #, c-format msgid "Unhandled subcommand '%s'" msgstr "未处理的子命令 '%s'" @@ -7863,7 +8065,7 @@ msgstr "对 %s 调用 fstat 失败：%s" msgid "failed to parse '%s' value '%s'" msgstr "无法解析 '%s' 值 '%s'" -#: builtin/gc.c builtin/init-db.c +#: builtin/gc.c setup.c #, c-format msgid "cannot stat '%s'" msgstr "不能对 '%s' 调用 stat" @@ -7890,6 +8092,10 @@ msgstr "清除未引用的对象" msgid "pack unreferenced objects separately" msgstr "分开打包未引用的对象" +#: builtin/gc.c builtin/repack.c +msgid "with --cruft, limit the size of new cruft packs" +msgstr "使用 --cruft，限制新 cruft 包的总大小" + #: builtin/gc.c msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" @@ -8040,8 +8246,23 @@ msgid "use at most one of --auto and --schedule=<frequency>" msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一" #: builtin/gc.c -msgid "failed to run 'git config'" -msgstr "无法运行 'git config'" +#, c-format +msgid "unable to add '%s' value of '%s'" +msgstr "无法添加 '%2$s' 的 '%1$s' 值" + +#: builtin/gc.c +msgid "return success even if repository was not registered" +msgstr "即便仓库非注册仍然返回成功" + +#: builtin/gc.c +#, c-format +msgid "unable to unset '%s' value of '%s'" +msgstr "无法取消设置 '%2$s' 的 '%1$s' 值" + +#: builtin/gc.c +#, c-format +msgid "repository '%s' is not registered" +msgstr "仓库 '%s' 未注册" #: builtin/gc.c #, c-format @@ -8075,24 +8296,20 @@ msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "无法执行 'crontab -l'，您的系统可能不支持 'cron'" #: builtin/gc.c -msgid "failed to run 'crontab'; your system might not support 'cron'" -msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'" +msgid "failed to create crontab temporary file" +msgstr "无法创建 crontab 临时文件" #: builtin/gc.c -msgid "failed to open stdin of 'crontab'" -msgstr "无法打开 'crontab' 的标准输入" - -#: builtin/gc.c -msgid "'crontab' died" -msgstr "'crontab' 终止" +msgid "failed to open temporary file" +msgstr "无法打开临时文件" #: builtin/gc.c -msgid "failed to start systemctl" -msgstr "无法启动 systemctl" +msgid "failed to run 'crontab'; your system might not support 'cron'" +msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'" #: builtin/gc.c -msgid "failed to run systemctl" -msgstr "无法运行 systemctl" +msgid "'crontab' died" +msgstr "'crontab' 终止" #: builtin/gc.c builtin/worktree.c #, c-format @@ -8105,6 +8322,14 @@ msgid "failed to flush '%s'" msgstr "无法刷新 '%s'" #: builtin/gc.c +msgid "failed to start systemctl" +msgstr "无法启动 systemctl" + +#: builtin/gc.c +msgid "failed to run systemctl" +msgstr "无法运行 systemctl" + +#: builtin/gc.c #, c-format msgid "unrecognized --scheduler argument '%s'" msgstr "无法识别的 --scheduler 参数 '%s'" @@ -8135,6 +8360,10 @@ msgid "scheduler to trigger git maintenance run" msgstr "触发 git maintenance 执行的调度器" #: builtin/gc.c +msgid "failed to set up maintenance schedule" +msgstr "无法设置维护计划" + +#: builtin/gc.c msgid "failed to add repo to global config" msgstr "无法将仓库添加到全局配置" @@ -8142,11 +8371,6 @@ msgstr "无法将仓库添加到全局配置" msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <子命令> [<选项>]" -#: builtin/gc.c -#, c-format -msgid "invalid subcommand: %s" -msgstr "无效子命令：%s" - #: builtin/grep.c msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" @@ -8178,6 +8402,11 @@ msgstr "无法读取树（%s）" #: builtin/grep.c #, c-format +msgid "unable to read tree %s" +msgstr "无法读取树 %s" + +#: builtin/grep.c +#, c-format msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" @@ -8235,8 +8464,8 @@ msgid "search in subdirectories (default)" msgstr "在子目录中寻找（默认）" #: builtin/grep.c -msgid "descend at most <depth> levels" -msgstr "最多以指定的深度向下寻找" +msgid "descend at most <n> levels" +msgstr "最多向下寻找 <n> 层" #: builtin/grep.c msgid "use extended POSIX regular expressions" @@ -8371,6 +8600,10 @@ msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" #: builtin/grep.c +msgid "maximum number of results per file" +msgstr "每个文件的最大结果数量" + +#: builtin/grep.c msgid "no pattern given" msgstr "未提供匹配模式" @@ -8414,11 +8647,15 @@ msgstr "同时给出了 --cached 和树对象" #: builtin/hash-object.c msgid "" -"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " -"[--] <file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n" +" [--stdin [--literally]] [--] <file>..." msgstr "" -"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " -"[--] <文件>..." +"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters]\n" +" [--stdin [--literally]] [--] <文件>..." + +#: builtin/hash-object.c +msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" +msgstr "git hash-object [-t <类型>] [-w] --stdin-paths [--no-filters]" #: builtin/hash-object.c msgid "object type" @@ -8482,12 +8719,20 @@ msgid "print list of useful guides" msgstr "显示有用的指南列表" #: builtin/help.c +msgid "print list of user-facing repository, command and file interfaces" +msgstr "打印面向用户的仓库、命令和文件接口列表" + +#: builtin/help.c +msgid "print list of file formats, protocols and other developer interfaces" +msgstr "打印文件格式、协议和其他开发者接口列表" + +#: builtin/help.c msgid "print all configuration variable names" msgstr "打印所有配置变量名称" #: builtin/help.c -msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" -msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<命令>]" +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]" +msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<命令>|<文档>]" #: builtin/help.c #, c-format @@ -8573,13 +8818,21 @@ msgid "'git help config' for more information" msgstr "'git help config' 获取更多信息" #: builtin/hook.c -msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" -msgstr "git hook run [--ignore-missing] <钩子名称> [-- <钩子参数>]" +msgid "" +"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-" +"args>]" +msgstr "" +"git hook run [--ignore-missing] [--to-stdin=<路径>] <钩子名称> [-- <钩子参数" +">]" #: builtin/hook.c msgid "silently ignore missing requested <hook-name>" msgstr "静默地忽略缺失的 <钩子名称>" +#: builtin/hook.c +msgid "file to read into hooks' stdin" +msgstr "读取至钩子标准输入的文件" + #: builtin/index-pack.c #, c-format msgid "object type mismatch at %s" @@ -8675,11 +8928,6 @@ msgstr "解压缩严重的不一致" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c builtin/pack-objects.c -#, c-format -msgid "unable to read %s" -msgstr "不能读 %s" - #: builtin/index-pack.c #, c-format msgid "cannot read existing object info %s" @@ -8836,7 +9084,7 @@ msgstr "无法返回当前工作目录" msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c builtin/init-db.c +#: builtin/index-pack.c builtin/init-db.c setup.c #, c-format msgid "unknown hash algorithm '%s'" msgstr "未知的哈希算法 '%s'" @@ -8854,101 +9102,18 @@ msgid "fsck error in pack objects" msgstr "在打包对象中 fsck 检查出错" #: builtin/init-db.c -#, c-format -msgid "cannot stat template '%s'" -msgstr "不能对模版 '%s' 调用 stat" - -#: builtin/init-db.c -#, c-format -msgid "cannot opendir '%s'" -msgstr "不能打开目录 '%s'" - -#: builtin/init-db.c -#, c-format -msgid "cannot readlink '%s'" -msgstr "不能读取链接 '%s'" - -#: builtin/init-db.c -#, c-format -msgid "cannot symlink '%s' '%s'" -msgstr "不能自 '%s' 到 '%s' 创建符号链接" - -#: builtin/init-db.c -#, c-format -msgid "cannot copy '%s' to '%s'" -msgstr "不能拷贝 '%s' 至 '%s'" - -#: builtin/init-db.c -#, c-format -msgid "ignoring template %s" -msgstr "忽略模版 %s" - -#: builtin/init-db.c -#, c-format -msgid "templates not found in %s" -msgstr "没有在 %s 中找到模版" - -#: builtin/init-db.c -#, c-format -msgid "not copying templates from '%s': %s" -msgstr "没有从 '%s' 复制模版：%s" - -#: builtin/init-db.c -#, c-format -msgid "invalid initial branch name: '%s'" -msgstr "无效的初始分支名：'%s'" - -#: builtin/init-db.c -#, c-format -msgid "unable to handle file type %d" -msgstr "不能处理 %d 类型的文件" - -#: builtin/init-db.c -#, c-format -msgid "unable to move %s to %s" -msgstr "不能移动 %s 至 %s" - -#: builtin/init-db.c -msgid "attempt to reinitialize repository with different hash" -msgstr "尝试用不同的哈希算法重新初始化仓库" - -#: builtin/init-db.c -#, c-format -msgid "%s already exists" -msgstr "%s 已经存在" - -#: builtin/init-db.c -#, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "re-init：已忽略 --initial-branch=%s" - -#: builtin/init-db.c -#, c-format -msgid "Reinitialized existing shared Git repository in %s%s\n" -msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" - -#: builtin/init-db.c -#, c-format -msgid "Reinitialized existing Git repository in %s%s\n" -msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n" - -#: builtin/init-db.c -#, c-format -msgid "Initialized empty shared Git repository in %s%s\n" -msgstr "已初始化空的共享 Git 仓库于 %s%s\n" - -#: builtin/init-db.c -#, c-format -msgid "Initialized empty Git repository in %s%s\n" -msgstr "已初始化空的 Git 仓库于 %s%s\n" - -#: builtin/init-db.c msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [<directory>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [--ref-format=<format>]\n" +" [-b <branch-name> | --initial-branch=<branch-name>]\n" +" [--shared[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " -"[<目录>]" +"git init [-q | --quiet] [--bare] [--template=<模板目录>]\n" +" [--separate-git-dir <git 目录>] [--object-format=<格式>]\n" +" [--ref-format=<格式>]\n" +" [-b <分支名> | --initial-branch=<分支名>]\n" +" [--shared[=<权限>]] [<目录>]" #: builtin/init-db.c msgid "permissions" @@ -8998,11 +9163,13 @@ msgstr "--separate-git-dir 不能用于纯仓库" #: builtin/interpret-trailers.c msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<token>[(=|:)<value>])...] [<file>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer (<key>|<keyAlias>)[(=|:)<value>])...]\n" +" [--parse] [<file>...]" msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" -">])...] [<文件>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer (<键|键别名>)[(=|:)<值>])...]\n" +" [--parse] [<文件>...]" #: builtin/interpret-trailers.c msgid "edit files in place" @@ -9013,6 +9180,10 @@ msgid "trim empty trailers" msgstr "删除空的尾注" #: builtin/interpret-trailers.c +msgid "placement" +msgstr "安置" + +#: builtin/interpret-trailers.c msgid "where to place the new trailer" msgstr "在哪里放置新的尾注" @@ -9029,20 +9200,20 @@ msgid "output only the trailers" msgstr "只输出尾注" #: builtin/interpret-trailers.c -msgid "do not apply config rules" -msgstr "不要应用配置规则" +msgid "do not apply trailer.* configuration variables" +msgstr "不应用 trailer.* 配置变量" #: builtin/interpret-trailers.c -msgid "join whitespace-continued values" -msgstr "连接空白折行的值" +msgid "reformat multiline trailer values as single-line values" +msgstr "将多行尾注值重新格式化为单行值" #: builtin/interpret-trailers.c -msgid "set parsing options" -msgstr "设置解析选项" +msgid "alias for --only-trailers --only-input --unfold" +msgstr "--only-trailers --only-input --unfold 的别名" #: builtin/interpret-trailers.c -msgid "do not treat --- specially" -msgstr "不要对 --- 特殊处理" +msgid "do not treat \"---\" as the end of input" +msgstr "不要将 \"---\" 视为输入的结束" #: builtin/interpret-trailers.c msgid "trailer(s) to add" @@ -9078,8 +9249,8 @@ msgid "show source" msgstr "显示源" #: builtin/log.c -msgid "use mail map file" -msgstr "使用邮件映射文件" +msgid "clear all previously-defined decoration filters" +msgstr "清除所有之前定义的修饰过滤器" #: builtin/log.c msgid "only decorate refs that match <pattern>" @@ -9099,7 +9270,7 @@ msgid "" "<file>" msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变" -#: builtin/log.c builtin/shortlog.c bundle.c +#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" @@ -9155,6 +9326,11 @@ msgid "not a range" msgstr "不是一个范围" #: builtin/log.c +#, c-format +msgid "unable to read branch description file '%s'" +msgstr "无法读取分支描述文件 '%s'" + +#: builtin/log.c msgid "cover letter needs email format" msgstr "附函需要邮件地址格式" @@ -9281,6 +9457,10 @@ msgid "generate parts of a cover letter based on a branch's description" msgstr "基于一个分支描述生成部分附函" #: builtin/log.c +msgid "use branch description from file" +msgstr "使用来自文件的分支描述" + +#: builtin/log.c msgid "use [<prefix>] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" @@ -9405,6 +9585,10 @@ msgid "percentage by which creation is weighted" msgstr "创建权重的百分比" #: builtin/log.c +msgid "show in-body From: even if identical to the e-mail header" +msgstr "显示正文内的 From:，即使其与电子邮件头中一致" + +#: builtin/log.c #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" @@ -9479,11 +9663,31 @@ msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" +#: builtin/ls-files.c builtin/ls-tree.c +#, c-format +msgid "could not get object info about '%s'" +msgstr "无法获得关于 '%s' 的对象信息" + +#: builtin/ls-files.c +#, c-format +msgid "bad ls-files format: element '%s' does not start with '('" +msgstr "坏的 ls-files 格式：元素 '%s' 没有以 '(' 开头" + +#: builtin/ls-files.c +#, c-format +msgid "bad ls-files format: element '%s' does not end in ')'" +msgstr "坏的 ls-files 格式：元素 '%s' 没有以 ')' 结尾" + +#: builtin/ls-files.c +#, c-format +msgid "bad ls-files format: %%%.*s" +msgstr "坏的 ls-files 格式: %%%.*s" + #: builtin/ls-files.c msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<选项>] [<文件>...]" -#: builtin/ls-files.c +#: builtin/ls-files.c builtin/merge-tree.c msgid "separate paths with the NUL character" msgstr "用 NUL 字符分隔路径" @@ -9591,15 +9795,23 @@ msgstr "抑制重复条目" msgid "show sparse directories in the presence of a sparse index" msgstr "在稀疏索引存在时显示稀疏目录" +#: builtin/ls-files.c +msgid "" +"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " +"--eol" +msgstr "" +"--format 不能和 -s、-o、-k、-t、--resolve-undo、--deduplicate 和 --eol 同时使" +"用" + #: builtin/ls-remote.c msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" -" [--symref] [<repository> [<refs>...]]" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" +" [--symref] [<repository> [<patterns>...]]" msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" -" [--symref] [<仓库> [<引用>...]]" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<可执行文件>]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<键>]\n" +" [--symref] [<仓库> [<模式>...]]" #: builtin/ls-remote.c msgid "do not print remote URL" @@ -9643,11 +9855,6 @@ msgstr "git ls-tree [<选项>] <树对象> [<路径>...]" #: builtin/ls-tree.c #, c-format -msgid "could not get object info about '%s'" -msgstr "无法获得关于 '%s' 的对象信息" - -#: builtin/ls-tree.c -#, c-format msgid "bad ls-tree format: element '%s' does not start with '('" msgstr "坏的 ls-tree 格式：元素 '%s' 没有以 '(' 开头" @@ -9768,14 +9975,14 @@ msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <提交>..." #: builtin/merge-base.c -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <提交>..." - -#: builtin/merge-base.c msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <提交> <提交>" #: builtin/merge-base.c +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <提交>..." + +#: builtin/merge-base.c msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <引用> [<提交>]" @@ -9807,11 +10014,21 @@ msgstr "" "git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初" "始文件> <文件2>" +#: builtin/merge-file.c diff.c +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "选项 diff-algorithm 接受参数 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" + #: builtin/merge-file.c msgid "send results to standard output" msgstr "将结果发送到标准输出" #: builtin/merge-file.c +msgid "use object IDs instead of filenames" +msgstr "使用对象 ID 替换文件名" + +#: builtin/merge-file.c msgid "use a diff3 based merge" msgstr "使用基于 diff3 的合并" @@ -9831,6 +10048,14 @@ msgstr "如果冲突，使用他们的版本" msgid "for conflicts, use a union version" msgstr "如果冲突，使用联合版本" +#: builtin/merge-file.c diff.c +msgid "<algorithm>" +msgstr "<算法>" + +#: builtin/merge-file.c diff.c +msgid "choose a diff algorithm" +msgstr "选择一个差异算法" + #: builtin/merge-file.c msgid "for conflicts, use this marker size" msgstr "如果冲突，使用指定长度的标记" @@ -9843,6 +10068,15 @@ msgstr "不要警告冲突" msgid "set labels for file1/orig-file/file2" msgstr "为 文件1/初始文件/文件2 设置标签" +#: builtin/merge-file.c +#, c-format +msgid "object '%s' does not exist" +msgstr "对象 '%s' 不存在" + +#: builtin/merge-file.c +msgid "Could not write object file" +msgstr "不能写入对象文件" + #: builtin/merge-recursive.c #, c-format msgid "unknown option %s" @@ -9874,6 +10108,81 @@ msgstr "无法解析引用 '%s'" msgid "Merging %s with %s\n" msgstr "合并 %s 和 %s\n" +#: builtin/merge-tree.c builtin/merge.c +msgid "not something we can merge" +msgstr "不是可以合并的东西" + +#: builtin/merge-tree.c builtin/merge.c +msgid "refusing to merge unrelated histories" +msgstr "拒绝合并无关的历史" + +#: builtin/merge-tree.c +msgid "failure to merge" +msgstr "合并失败" + +#: builtin/merge-tree.c +msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" +msgstr "git merge-tree [--write-tree] [<选项>] <分支1> <分支2>" + +#: builtin/merge-tree.c +msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" +msgstr "git merge-tree [--trivial-merge] <基准树> <分支1> <分支2>" + +#: builtin/merge-tree.c +msgid "do a real merge instead of a trivial merge" +msgstr "进行真正的合并而不是简单的合并" + +#: builtin/merge-tree.c +msgid "do a trivial merge only" +msgstr "只进行简单的合并" + +#: builtin/merge-tree.c +msgid "also show informational/conflict messages" +msgstr "同时显示额外信息/冲突消息" + +#: builtin/merge-tree.c +msgid "list filenames without modes/oids/stages" +msgstr "列出没有模式/对象 ID/暂存的文件名" + +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c +msgid "allow merging unrelated histories" +msgstr "允许合并不相关的历史" + +#: builtin/merge-tree.c +msgid "perform multiple merges, one per line of input" +msgstr "实施多个合并，每输入行一个" + +#: builtin/merge-tree.c +msgid "specify a merge-base for the merge" +msgstr "指定用于合并的合并基线" + +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c +msgid "option=value" +msgstr "option=value" + +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c +msgid "option for selected merge strategy" +msgstr "所选的合并策略的选项" + +#: builtin/merge-tree.c +msgid "--trivial-merge is incompatible with all other options" +msgstr "--trivial-merge 与其他所有选项不兼容" + +#: builtin/merge-tree.c builtin/merge.c +#, c-format +msgid "unknown strategy option: -X%s" +msgstr "未知的策略选项：-X%s" + +#: builtin/merge-tree.c builtin/notes.c +#, c-format +msgid "malformed input line: '%s'." +msgstr "格式错误的输入行：'%s'。" + +#: builtin/merge-tree.c +#, c-format +msgid "merging cannot continue; got unclean result of %d" +msgstr "合并无法继续；得到不干净的结果 %d" + #: builtin/merge.c msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<选项>] [<提交>...]" @@ -9951,14 +10260,6 @@ msgstr "策略" msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c builtin/pull.c -msgid "option=value" -msgstr "option=value" - -#: builtin/merge.c builtin/pull.c -msgid "option for selected merge strategy" -msgstr "所选的合并策略的选项" - #: builtin/merge.c msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明（针对非快进式合并）" @@ -9980,10 +10281,6 @@ msgstr "--abort，但是保留索引和工作区" msgid "continue the current in-progress merge" msgstr "继续当前正在进行的合并" -#: builtin/merge.c builtin/pull.c -msgid "allow merging unrelated histories" -msgstr "允许合并不相关的历史" - #: builtin/merge.c msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "绕过 pre-merge-commit 和 commit-msg 钩子" @@ -10033,7 +10330,7 @@ msgstr "'%s' 没有指向一个提交" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" -#: builtin/merge.c builtin/stash.c merge-recursive.c +#: builtin/merge.c merge-recursive.c msgid "Unable to write index." msgstr "不能写入索引。" @@ -10043,11 +10340,6 @@ msgstr "未处理两个头合并之外的任何操作。" #: builtin/merge.c #, c-format -msgid "unknown strategy option: -X%s" -msgstr "未知的策略选项：-X%s" - -#: builtin/merge.c t/helper/test-fast-rebase.c -#, c-format msgid "unable to write %s" msgstr "不能写 %s" @@ -10118,7 +10410,7 @@ msgstr "对于 %s 没有来自 %s 的远程跟踪分支" msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" -#: builtin/merge.c read-cache.c strbuf.c wrapper.c +#: builtin/merge.c editor.c read-cache.c wrapper.c #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" @@ -10129,10 +10421,6 @@ msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合并：%s" #: builtin/merge.c -msgid "not something we can merge" -msgstr "不能合并" - -#: builtin/merge.c msgid "--abort expects no arguments" msgstr "--abort 不带参数" @@ -10194,14 +10482,19 @@ msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" #: builtin/merge.c -msgid "refusing to merge unrelated histories" -msgstr "拒绝合并无关的历史" - -#: builtin/merge.c #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" +#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"您对下列文件的本地修改将被合并操作覆盖：\n" +" %s" + #: builtin/merge.c #, c-format msgid "Trying really trivial in-index merge...\n" @@ -10242,6 +10535,11 @@ msgstr "使用 %s 策略以准备手工解决。\n" msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" +#: builtin/merge.c +#, c-format +msgid "When finished, apply stashed changes with `git stash pop`\n" +msgstr "在完成后，使用 `git stash pop` 应用贮藏的变更\n" + #: builtin/mktag.c #, c-format msgid "warning: tag input does not pass fsck: %s" @@ -10390,12 +10688,16 @@ msgid "bad source" msgstr "坏的源" #: builtin/mv.c +msgid "destination exists" +msgstr "目标已存在" + +#: builtin/mv.c msgid "can not move directory into itself" msgstr "不能将目录移动到自身" #: builtin/mv.c -msgid "cannot move directory over file" -msgstr "不能将目录移动到文件" +msgid "destination already exists" +msgstr "目标已存在" #: builtin/mv.c msgid "source directory is empty" @@ -10410,10 +10712,6 @@ msgid "conflicted" msgstr "冲突" #: builtin/mv.c -msgid "destination exists" -msgstr "目标已存在" - -#: builtin/mv.c #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" @@ -10431,6 +10729,10 @@ msgid "destination directory does not exist" msgstr "目标目录不存在" #: builtin/mv.c +msgid "destination exists in the index" +msgstr "目标在索引中已存在" + +#: builtin/mv.c #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，源=%s，目标=%s" @@ -10440,7 +10742,7 @@ msgstr "%s，源=%s，目标=%s" msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c builtin/remote.c builtin/repack.c +#: builtin/mv.c builtin/remote.c #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" @@ -10499,11 +10801,13 @@ msgstr "git notes [--ref <注解引用>] [list [<对象>]]" #: builtin/notes.c msgid "" -"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " -"| (-c | -C) <object>] [<object>]" +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--" +"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c " +"| -C) <object>] [<object>]" msgstr "" -"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " -"| (-c | -C) <对象>] [<对象>]" +"git notes [--ref <注解引用>] add [-f] [--allow-empty] [--[no-]separator|--" +"separator=<分段符>] [--[no-]stripspace] [-m <说明> | -F <文件> | (-c | -C) <" +"对象>] [<对象>]" #: builtin/notes.c msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" @@ -10511,11 +10815,13 @@ msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" #: builtin/notes.c msgid "" -"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " -"(-c | -C) <object>] [<object>]" +"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--" +"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c " +"| -C) <object>] [<object>]" msgstr "" -"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " -"(-c | -C) <对象>] [<对象>]" +"git notes [--ref <注解引用>] append [--allow-empty] [--[no-]separator|--" +"separator=<分段符>] [--[no-]stripspace] [-m <说明> | -F <文件> | (-c | -C) <" +"对象>] [<对象>]" #: builtin/notes.c msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" @@ -10643,11 +10949,6 @@ msgstr "不能从非数据对象 '%s' 中读取注解数据。" #: builtin/notes.c #, c-format -msgid "malformed input line: '%s'." -msgstr "格式错误的输入行：'%s'。" - -#: builtin/notes.c -#, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "无法把注解从 '%s' 拷贝到 '%s'" @@ -10689,6 +10990,18 @@ msgid "replace existing notes" msgstr "替换已存在的注解" #: builtin/notes.c +msgid "<paragraph-break>" +msgstr "<分段符>" + +#: builtin/notes.c +msgid "insert <paragraph-break> between paragraphs" +msgstr "在段落之间插入<分段符>" + +#: builtin/notes.c +msgid "remove unnecessary whitespace" +msgstr "删除不必要的空白字符" + +#: builtin/notes.c #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -10872,20 +11185,19 @@ msgstr "注解引用" msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c builtin/stash.c +#: builtin/notes.c builtin/remote.c parse-options.c #, c-format -msgid "unknown subcommand: %s" -msgstr "未知子命令：%s" +msgid "unknown subcommand: `%s'" +msgstr "未知子命令：`%s'" #: builtin/pack-objects.c -msgid "" -"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" -msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" +msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]" +msgstr "git pack-objects --stdout [<选项>] [< <引用列表> | < <对象列表>]" #: builtin/pack-objects.c msgid "" -"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" -msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" +"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]" +msgstr "git pack-objects [<选项>] <前缀名称> [< <引用列表> | < <对象列表>]" #: builtin/pack-objects.c #, c-format @@ -10947,7 +11259,7 @@ msgstr "无法写入位图索引" msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个" -#: builtin/pack-objects.c +#: builtin/pack-objects.c builtin/repack.c msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" @@ -11014,6 +11326,11 @@ msgstr "不一致的差异计数" #: builtin/pack-objects.c #, c-format +msgid "invalid pack.allowPackReuse value: '%s'" +msgstr "无效的 pack.allowPackReuse 值：'%s'" + +#: builtin/pack-objects.c +#, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" "hash> <uri>' (got '%s')" @@ -11114,6 +11431,14 @@ msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" #: builtin/pack-objects.c +msgid "show progress meter during object writing phase" +msgstr "在对象写入阶段显示进度表" + +#: builtin/pack-objects.c +msgid "similar to --all-progress when progress meter is shown" +msgstr "当进度表显示时类似于 --all-progress" + +#: builtin/pack-objects.c msgid "<version>[,<offset>]" msgstr "<版本>[,<偏移>]" @@ -11305,10 +11630,6 @@ msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用于创建一个可索引包" #: builtin/pack-objects.c -msgid "cannot use --filter without --stdout" -msgstr "不能在没有 --stdout 的情况下使用 --filter" - -#: builtin/pack-objects.c msgid "cannot use --filter with --stdin-packs" msgstr "不能同时使用 --filter 和 --stdin-packs" @@ -11325,10 +11646,6 @@ msgid "cannot use --stdin-packs with --cruft" msgstr "不能将 --stdin-packs 和 --cruft 同时使用" #: builtin/pack-objects.c -msgid "cannot use --max-pack-size with --cruft" -msgstr "不能将 --max-pack-size 和 --cruft 同时使用" - -#: builtin/pack-objects.c msgid "Enumerating objects" msgstr "枚举对象中" @@ -11336,10 +11653,10 @@ msgstr "枚举对象中" #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" -"reused %<PRIu32>" +"reused %<PRIu32> (from %<PRIuMAX>)" msgstr "" "总共 %<PRIu32>（差异 %<PRIu32>），复用 %<PRIu32>（差异 %<PRIu32>），包复用 " -"%<PRIu32>" +"%<PRIu32>（来自 %<PRIuMAX> 个包）" #: builtin/pack-redundant.c msgid "" @@ -11354,9 +11671,16 @@ msgstr "" "并通过发送邮件到 <git@vger.kernel.org> 让我们知道您仍旧\n" "使用它。 谢谢。\n" +#: builtin/pack-redundant.c +msgid "refusing to run without --i-still-use-this" +msgstr "拒绝在未指定 --i-still-use-this 选项时运行" + #: builtin/pack-refs.c -msgid "git pack-refs [<options>]" -msgstr "git pack-refs [<选项>]" +msgid "" +"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude " +"<pattern>]" +msgstr "" +"git pack-refs [--all] [--no-prune] [--include <模式>] [--exclude <模式>]" #: builtin/pack-refs.c msgid "pack everything" @@ -11366,6 +11690,30 @@ msgstr "打包一切" msgid "prune loose refs (default)" msgstr "清除松散的引用（默认）" +#: builtin/pack-refs.c +msgid "references to include" +msgstr "需包含的引用" + +#: builtin/pack-refs.c +msgid "references to exclude" +msgstr "需排除的引用" + +#: builtin/patch-id.c +msgid "git patch-id [--stable | --unstable | --verbatim]" +msgstr "git patch-id [--stable | --unstable | --verbatim]" + +#: builtin/patch-id.c +msgid "use the unstable patch-id algorithm" +msgstr "使用不稳定的 patch-id 算法" + +#: builtin/patch-id.c +msgid "use the stable patch-id algorithm" +msgstr "使用稳定的 patch-id 算法" + +#: builtin/patch-id.c +msgid "don't strip whitespace from the patch" +msgstr "不要从补丁中删除空白字符" + #: builtin/prune.c msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]" @@ -11426,6 +11774,14 @@ msgstr "强制覆盖本地分支" msgid "number of submodules pulled in parallel" msgstr "并发拉取的子模组的数量" +#: builtin/pull.c parse-options.h +msgid "use IPv4 addresses only" +msgstr "只使用 IPv4 地址" + +#: builtin/pull.c parse-options.h +msgid "use IPv6 addresses only" +msgstr "只使用 IPv6 地址" + #: builtin/pull.c msgid "" "There is no candidate for rebasing against among the refs that you just " @@ -11473,7 +11829,7 @@ msgstr "详见 git-pull(1)。" msgid "<remote>" msgstr "<远程>" -#: builtin/pull.c contrib/scalar/scalar.c +#: builtin/pull.c scalar.c msgid "<branch>" msgstr "<分支>" @@ -11539,9 +11895,9 @@ msgstr "更新尚未诞生的分支，变更添加至索引。" msgid "pull with rebase" msgstr "变基式拉取" -#: builtin/pull.c -msgid "please commit or stash them." -msgstr "请提交或贮藏它们。" +#: builtin/pull.c builtin/rebase.c +msgid "Please commit or stash them." +msgstr "请提交或贮藏修改。" #: builtin/pull.c #, c-format @@ -11613,9 +11969,8 @@ msgstr "" #: builtin/push.c msgid "" "\n" -"To avoid automatically configuring upstream branches when their name\n" -"doesn't match the local branch, see option 'simple' of branch." -"autoSetupMerge\n" +"To avoid automatically configuring an upstream branch when its name\n" +"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n" "in 'git help config'.\n" msgstr "" "\n" @@ -11708,36 +12063,36 @@ msgstr "" #: builtin/push.c msgid "" "Updates were rejected because the tip of your current branch is behind\n" -"its remote counterpart. Integrate the remote changes (e.g.\n" -"'git pull ...') before pushing again.\n" +"its remote counterpart. If you want to integrate the remote changes,\n" +"use 'git pull' before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n" -"再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n" -"'git push --help' 中的 'Note about fast-forwards' 小节。" +"如果您希望先与远程变更合并，请在推送前执行 'git pull'。\n" +"详见 'git push --help' 中的 'Note about fast-forwards' 小节。" #: builtin/push.c 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" -"(e.g. 'git pull ...') before pushing again.\n" +"counterpart. If you want to integrate the remote changes, use 'git pull'\n" +"before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n" -"检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n" -"'git push --help' 中的 'Note about fast-forwards' 小节。" +"如果您希望先与远程变更合并，请在推送前执行 'git pull'。\n" +"详见 'git push --help' 中的 'Note about fast-forwards' 小节。" #: builtin/push.c 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" -"to the same ref. You may want to first integrate the remote changes\n" -"(e.g., 'git pull ...') before pushing again.\n" +"Updates were rejected because the remote contains work that you do not\n" +"have locally. This is usually caused by another repository pushing to\n" +"the same ref. If you want to integrate the remote changes, use\n" +"'git pull' before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒绝，因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" -"一个仓库已向该引用进行了推送。再次推送前，您可能需要先整合远程变更\n" -"（如 'git pull ...'）。\n" +"一个仓库已向该引用进行了推送。如果您希望先与远程变更合并，请在推送\n" +"前执行 'git pull'。\n" "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" #: builtin/push.c @@ -11755,13 +12110,14 @@ msgstr "" #: builtin/push.c msgid "" -"Updates were rejected because the tip of the remote-tracking\n" -"branch has been updated since the last checkout. You may want\n" -"to integrate those changes locally (e.g., 'git pull ...')\n" -"before forcing an update.\n" +"Updates were rejected because the tip of the remote-tracking branch has\n" +"been updated since the last checkout. If you want to integrate the\n" +"remote changes, use 'git pull' before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒绝，因为远程跟踪分支的最新提交自从上次检出之后已被更新。\n" -"在强制更新前，您可能想将这些变更整合到本地（如 'git pull ...'）。\n" +"如果您希望先与远程变更合并，请在推送前执行 'git pull'。\n" +"详见 'git push --help' 中的 'Note about fast-forwards' 小节。" #: builtin/push.c #, c-format @@ -11773,6 +12129,13 @@ msgstr "推送到 %s\n" msgid "failed to push some refs to '%s'" msgstr "无法推送一些引用到 '%s'" +#: builtin/push.c +msgid "" +"recursing into submodule with push.recurseSubmodules=only; using on-demand " +"instead" +msgstr "" +"在 push.recurseSubmodules=only 时递归进入子模组；取而代之使用 on-demand" + #: builtin/push.c builtin/send-pack.c submodule-config.c #, c-format msgid "invalid value for '%s'" @@ -11782,9 +12145,9 @@ msgstr "'%s' 的值无效" msgid "repository" msgstr "仓库" -#: builtin/push.c builtin/send-pack.c -msgid "push all refs" -msgstr "推送所有引用" +#: builtin/push.c +msgid "push all branches" +msgstr "推送所有分支" #: builtin/push.c builtin/send-pack.c msgid "mirror all refs" @@ -11795,8 +12158,8 @@ msgid "delete refs" msgstr "删除引用" #: builtin/push.c -msgid "push tags (can't be used with --all or --mirror)" -msgstr "推送标签（不能使用 --all or --mirror）" +msgid "push tags (can't be used with --all or --branches or --mirror)" +msgstr "推送标签（不能使用 --all or --branches or --mirror）" #: builtin/push.c builtin/send-pack.c msgid "force updates" @@ -11854,7 +12217,7 @@ msgstr "需要远端支持原子事务" msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" -#: builtin/push.c +#: builtin/push.c t/helper/test-bundle-uri.c #, c-format msgid "bad repository '%s'" msgstr "坏的仓库 '%s'" @@ -11926,12 +12289,18 @@ msgstr "仅显示与第二个范围有关的输出" #: builtin/range-diff.c #, c-format +msgid "not a revision: '%s'" +msgstr "不是版本：'%s'" + +#: builtin/range-diff.c +#, c-format msgid "not a commit range: '%s'" -msgstr "不是一个提交范围：'%s'" +msgstr "不是提交范围：'%s'" #: builtin/range-diff.c -msgid "single arg format must be symmetric range" -msgstr "单个参数格式必须是对称范围（即包含...）" +#, c-format +msgid "not a symmetric range: '%s'" +msgstr "不是对称的范围：'%s'" #: builtin/range-diff.c msgid "need two commit ranges" @@ -11939,13 +12308,14 @@ msgstr "需要两个提交范围" #: builtin/read-tree.c msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" -"ish1> [<tree-ish2> [<tree-ish3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" -"u | -i]] [--no-sparse-checkout] [--index-output=<文件>] (--empty | <树对象一" -"> [<树对象二> [<树对象三>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>)\n" +" [-u | -i]] [--index-output=<文件>] [--no-sparse-checkout]\n" +" (--empty | <树对象一> [<树对象二> [<树对象三>]])" #: builtin/read-tree.c msgid "write resulting index to <file>" @@ -12062,8 +12432,8 @@ msgstr "%s 需要合并后端" #: builtin/rebase.c #, c-format -msgid "could not get 'onto': '%s'" -msgstr "无法获取 'onto'：'%s'" +msgid "invalid onto: '%s'" +msgstr "无效新基线：'%s'" #: builtin/rebase.c #, c-format @@ -12113,10 +12483,19 @@ msgstr "" #: builtin/rebase.c #, c-format +msgid "Unknown rebase-merges mode: %s" +msgstr "未知的变基合并模式：%s" + +#: builtin/rebase.c +#, c-format msgid "could not switch to %s" msgstr "无法切换到 %s" #: builtin/rebase.c +msgid "apply options and merge options cannot be used together" +msgstr "应用选项和合并选项不能同时使用" + +#: builtin/rebase.c #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " @@ -12124,6 +12503,16 @@ msgid "" msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"ask\"。" #: builtin/rebase.c +msgid "" +"--rebase-merges with an empty string argument is deprecated and will stop " +"working in a future version of Git. Use --rebase-merges without an argument " +"instead, which does the same thing." +msgstr "" +"为 --rebase-merges 指定空值参数的方式已经被废弃并且在 Git 未来\n" +"的版本中将不再支持。 支持使用无参数 --rebase-merges 的方式进行替\n" +"代，它们具有相同的作用。" + +#: builtin/rebase.c #, c-format msgid "" "%s\n" @@ -12266,6 +12655,10 @@ msgid "move commits that begin with squash!/fixup! under -i" msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交" #: builtin/rebase.c +msgid "update branches that point to commits that are being rebased" +msgstr "更新指向正在被变基的提交的分支" + +#: builtin/rebase.c msgid "add exec lines after each commit of the editable list" msgstr "可编辑列表的每一个提交下面增加一行 exec" @@ -12337,7 +12730,7 @@ msgstr "没有正在进行的变基？" msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: builtin/rebase.c t/helper/test-fast-rebase.c +#: builtin/rebase.c msgid "Cannot read HEAD" msgstr "不能读取 HEAD" @@ -12382,17 +12775,16 @@ msgid "switch `C' expects a numerical value" msgstr "开关 `C' 期望一个数字值" #: builtin/rebase.c -#, c-format -msgid "Unknown mode: %s" -msgstr "未知模式：%s" - -#: builtin/rebase.c -msgid "--strategy requires --merge or --interactive" -msgstr "--strategy 需要 --merge 或 --interactive" +msgid "" +"apply options are incompatible with rebase.rebaseMerges. Consider adding --" +"no-rebase-merges" +msgstr "应用的选项与 rebase.rebaseMerges 不兼容。考虑加上 --no-rebase-merges" #: builtin/rebase.c -msgid "apply options and merge options cannot be used together" -msgstr "应用选项和合并选项不能同时使用" +msgid "" +"apply options are incompatible with rebase.updateRefs. Consider adding --no-" +"update-refs" +msgstr "应用的选项与 rebase.updateRefs 不兼容。考虑加上 --no-update-refs" #: builtin/rebase.c #, c-format @@ -12423,8 +12815,8 @@ msgid "No such ref: %s" msgstr "没有这样的引用：%s" #: builtin/rebase.c -msgid "Could not resolve HEAD to a revision" -msgstr "无法将 HEAD 解析为一个版本" +msgid "Could not resolve HEAD to a commit" +msgstr "不能解析 HEAD 至一个提交" #: builtin/rebase.c #, c-format @@ -12442,10 +12834,6 @@ msgid "Does not point to a valid commit '%s'" msgstr "没有指向一个有效的提交 '%s'" #: builtin/rebase.c -msgid "Please commit or stash them." -msgstr "请提交或贮藏修改。" - -#: builtin/rebase.c msgid "HEAD is up to date." msgstr "HEAD 是最新的。" @@ -12748,12 +13136,10 @@ msgid "fetch the remote branches" msgstr "抓取远程的分支" #: builtin/remote.c -msgid "import all tags and associated objects when fetching" -msgstr "抓取时导入所有的标签和关联对象" - -#: builtin/remote.c -msgid "or do not fetch any tag at all (--no-tags)" -msgstr "或不抓取任何标签（--no-tags）" +msgid "" +"import all tags and associated objects when fetching\n" +"or do not fetch any tag at all (--no-tags)" +msgstr "抓取时导入所有的标签和关联对象，或不抓取任何标签（--no-tags）" #: builtin/remote.c msgid "branch(es) to track" @@ -12871,8 +13257,8 @@ msgid "" msgid_plural "" "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" "to delete them, use:" -msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用：" -msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用：" +msgstr[0] "注意：refs/remotes/ 层级之外的一个分支未被移除。要删除它，使用：" +msgstr[1] "注意：refs/remotes/ 层级之外的一些分支未被移除。要删除它们，使用：" #: builtin/remote.c #, c-format @@ -12889,8 +13275,12 @@ msgid " tracked" msgstr " 已跟踪" #: builtin/remote.c +msgid " skipped" +msgstr " 已跳过" + +#: builtin/remote.c msgid " stale (use 'git remote prune' to remove)" -msgstr " 过时（使用 'git remote prune' 来移除）" +msgstr " 已过期（使用 'git remote prune' 来移除）" #: builtin/remote.c msgid " ???" @@ -13222,6 +13612,16 @@ msgid "could not close refs snapshot tempfile" msgstr "不能关闭引用快照临时文件" #: builtin/repack.c +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "无法删除过期的位图： %s" + +#: builtin/repack.c +#, c-format +msgid "pack prefix %s does not begin with objdir %s" +msgstr "包前缀 %s 没有以对象目录 %s 开始" + +#: builtin/repack.c msgid "pack everything in a single pack" msgstr "所有内容打包到一个包文件中" @@ -13238,8 +13638,8 @@ msgid "approxidate" msgstr "近似日期" #: builtin/repack.c -msgid "with -C, expire objects older than this" -msgstr "使用 -C，使早于给定时间的对象过期" +msgid "with --cruft, expire objects older than this" +msgstr "使用 --cruft，使早于给定时间的对象过期" #: builtin/repack.c msgid "remove redundant packs, and run git-prune-packed" @@ -13318,24 +13718,37 @@ msgid "write a multi-pack index of the resulting packs" msgstr "写入结果包的多包索引" #: builtin/repack.c +msgid "pack prefix to store a pack containing pruned objects" +msgstr "储存被清除的对象的包的前缀" + +#: builtin/repack.c +msgid "pack prefix to store a pack containing filtered out objects" +msgstr "储存被过滤的对象的包的前缀" + +#: builtin/repack.c msgid "cannot delete packs in a precious-objects repo" msgstr "不能删除珍品仓库中的打包文件" #: builtin/repack.c +#, c-format +msgid "option '%s' can only be used along with '%s'" +msgstr "选项 '%s' 只能和 '%s' 搭配使用" + +#: builtin/repack.c msgid "Nothing new to pack." msgstr "没有新的要打包。" #: builtin/repack.c #, c-format -msgid "pack prefix %s does not begin with objdir %s" -msgstr "包前缀 %s 没有以对象目录 .%s 开始" +msgid "renaming pack to '%s' failed" +msgstr "重命名包至 '%s' 失败" #: builtin/repack.c #, c-format -msgid "missing required file: %s" -msgstr "缺少需要的文件：%s" +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects 未为包 %2$s-%3$s 写入 '%1$s' 文件" -#: builtin/repack.c +#: builtin/repack.c sequencer.c #, c-format msgid "could not unlink: %s" msgstr "不能删除：%s" @@ -13576,9 +13989,89 @@ msgstr "--convert-graft-file 不带参数" msgid "only one pattern can be given with -l" msgstr "只能为 -l 提供一个模式" +#: builtin/replay.c +msgid "need some commits to replay" +msgstr "需要一些提交来重放" + +#: builtin/replay.c +msgid "--onto and --advance are incompatible" +msgstr "--onto 和 --advance 不兼容" + +#: builtin/replay.c +msgid "all positive revisions given must be references" +msgstr "提供的所有正向版本必须为引用" + +#: builtin/replay.c +msgid "argument to --advance must be a reference" +msgstr "--advance 的参数必须是引用" + +#: builtin/replay.c +msgid "" +"cannot advance target with multiple sources because ordering would be ill-" +"defined" +msgstr "不能使用多个源推进目标，因为无法明确如何排序" + +#: builtin/replay.c +msgid "" +"cannot implicitly determine whether this is an --advance or --onto operation" +msgstr "不能隐式地确定这是 --advance 还是 --onto 的操作" + +#: builtin/replay.c +msgid "" +"cannot advance target with multiple source branches because ordering would " +"be ill-defined" +msgstr "不能使用多个源分支推进目标，因为无法明确如何排序" + +#: builtin/replay.c +msgid "cannot implicitly determine correct base for --onto" +msgstr "不能隐式地确定 --onto 正确的基线" + +#: builtin/replay.c +msgid "" +"(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance " +"<branch>) <revision-range>..." +msgstr "（试验中！）git replay ([--contained] --onto <新基线> | --advance <分支>) <版本范围>..." + +#: builtin/replay.c +msgid "make replay advance given branch" +msgstr "重放时演进给定的分支" + +#: builtin/replay.c +msgid "replay onto given commit" +msgstr "重放到给定提交" + +#: builtin/replay.c +msgid "advance all branches contained in revision-range" +msgstr "演进版本范围中包含的所有分支" + +#: builtin/replay.c +msgid "option --onto or --advance is mandatory" +msgstr "选项 --onto 或 --advance 必须指定其一" + +#: builtin/replay.c +#, c-format +msgid "" +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' " +"will be forced" +msgstr "一些版本遍历选项将被覆盖，如 'struct rev_info' 中的 '%s' 位将被强制设定" + +#: builtin/replay.c +msgid "error preparing revisions" +msgstr "准备版本时错误" + +#: builtin/replay.c +msgid "replaying down to root commit is not supported yet!" +msgstr "目前还不支持重放到根提交！" + +#: builtin/replay.c +msgid "replaying merge commits is not supported yet!" +msgstr "目前还不支持重放到合并提交！" + #: builtin/rerere.c -msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" +msgid "" +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" +msgstr "" +"git rerere [clear | forget <路径规格>... | diff | status | remaining | gc]" #: builtin/rerere.c msgid "register clean resolutions in index" @@ -13729,12 +14222,17 @@ msgstr "不能重置索引文件至版本 '%s'。" msgid "Could not write new index file." msgstr "不能写入新的索引文件。" -#: builtin/rev-list.c pack-bitmap.c +#: builtin/rev-list.c #, c-format msgid "unable to get disk usage of %s" msgstr "无法得到 %s 的磁盘使用量" #: builtin/rev-list.c +#, c-format +msgid "invalid value for '%s': '%s', the only allowed format is '%s'" +msgstr "'%s' 的值无效：'%s'，唯一允许的格式是 '%s'" + +#: builtin/rev-list.c msgid "rev-list does not support display of notes" msgstr "rev-list 不支持显示注解" @@ -13768,6 +14266,10 @@ msgid "no usage string given before the `--' separator" msgstr "在 `--' 分隔符之前没有给出使用方法字符串" #: builtin/rev-parse.c +msgid "missing opt-spec before option flags" +msgstr "选项参数之前缺少选项规格" + +#: builtin/rev-parse.c msgid "Needed a single revision" msgstr "需要一个单独的版本" @@ -13829,25 +14331,36 @@ msgid "this operation must be run in a work tree" msgstr "该操作必须在一个工作区中运行" #: builtin/rev-parse.c +msgid "Could not read the index" +msgstr "不能读取索引" + +#: builtin/rev-parse.c #, c-format msgid "unknown mode for --show-object-format: %s" msgstr "未知的 --show-object-format 模式：%s" #: builtin/revert.c -msgid "git revert [<options>] <commit-ish>..." -msgstr "git revert [<选项>] <提交号>..." +msgid "" +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " +"<commit>..." +msgstr "" +"git revert [--[no-]edit] [-n] [-m <父编号>] [-s] [-S[<私钥 ID>]] <提交>..." #: builtin/revert.c -msgid "git revert <subcommand>" -msgstr "git revert <子命令>" +msgid "git revert (--continue | --skip | --abort | --quit)" +msgstr "git revert (--continue | --skip | --abort | --quit)" #: builtin/revert.c -msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git cherry-pick [<选项>] <提交号>..." +msgid "" +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" +" [-S[<keyid>]] <commit>..." +msgstr "" +"git cherry-pick [--edit] [-n] [-m <父编号>] [-s] [-x] [--ff]\n" +" [-S[<私钥 ID>]] <提交>..." #: builtin/revert.c -msgid "git cherry-pick <subcommand>" -msgstr "git cherry-pick <子命令>" +msgid "git cherry-pick (--continue | --skip | --abort | --quit)" +msgstr "git cherry-pick (--continue | --skip | --abort | --quit)" #: builtin/revert.c #, c-format @@ -13928,8 +14441,14 @@ msgid "cherry-pick failed" msgstr "拣选失败" #: builtin/rm.c -msgid "git rm [<options>] [--] <file>..." -msgstr "git rm [<选项>] [--] <文件>..." +msgid "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n" +" [--] [<路径规格>...]" #: builtin/rm.c msgid "" @@ -14012,11 +14531,13 @@ msgid "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<host>:]<directory> (--all | <ref>...)" msgstr "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<主机>:]<目录> (--all | <引用>...)" #: builtin/send-pack.c @@ -14024,6 +14545,10 @@ msgid "remote name" msgstr "远程名称" #: builtin/send-pack.c +msgid "push all refs" +msgstr "推送所有引用" + +#: builtin/send-pack.c msgid "use stateless RPC protocol" msgstr "使用无状态的 RPC 协议" @@ -14048,8 +14573,9 @@ msgid "using multiple --group options with stdin is not supported" msgstr "不支持和标准输入一起使用多个 --group 选项" #: builtin/shortlog.c -msgid "using --group=trailer with stdin is not supported" -msgstr "不支持和标准输入一起使用 --group=trailer" +#, c-format +msgid "using %s with stdin is not supported" +msgstr "不支持对 %s 使用标准输入" #: builtin/shortlog.c #, c-format @@ -14097,12 +14623,14 @@ msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <glob>)...]" msgstr "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<何时>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<版本> | <通配符>)...]" #: builtin/show-branch.c msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" @@ -14231,17 +14759,41 @@ msgstr "未知的哈希算法" #: builtin/show-ref.c msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +"git show-ref [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<pattern>...]" +msgstr "" +"git show-ref [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<模式>...]" + +#: builtin/show-ref.c +msgid "" +"git show-ref --verify [-q | --quiet] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]]\n" +" [--] [<ref>...]" msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" +"git show-ref --verify [-q | --quiet] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]]\n" +" [--] [<引用>...]" #: builtin/show-ref.c msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<模式>]" #: builtin/show-ref.c +msgid "git show-ref --exists <ref>" +msgstr "git show-ref --exists <引用>" + +#: builtin/show-ref.c +msgid "reference does not exist" +msgstr "引用不存在" + +#: builtin/show-ref.c +msgid "failed to look up reference" +msgstr "无法找到引用" + +#: builtin/show-ref.c msgid "only show tags (can be combined with heads)" msgstr "只显示标签（可以和头共用）" @@ -14250,6 +14802,10 @@ msgid "only show heads (can be combined with tags)" msgstr "只显示头（可以和标签共用）" #: builtin/show-ref.c +msgid "check for reference existence without resolving" +msgstr "检查引用是否存在但不解析" + +#: builtin/show-ref.c msgid "stricter reference checking, requires exact ref path" msgstr "更严格的引用检测，需要精确的引用路径" @@ -14274,8 +14830,12 @@ msgid "show refs from stdin that aren't in local repository" msgstr "显示从标准输入中读入的不在本地仓库中的引用" #: builtin/sparse-checkout.c -msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <选项>" +msgid "" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<options>]" +msgstr "" +"git sparse-checkout (init | list | set | add | reapply | disable | check\n" +"-rules) [<选项>]" #: builtin/sparse-checkout.c msgid "this worktree is not sparse" @@ -14317,7 +14877,7 @@ msgstr "初始化稀疏检出为锥形模式" msgid "toggle the use of a sparse index" msgstr "切换稀疏索引的使用" -#: builtin/sparse-checkout.c commit-graph.c midx.c +#: builtin/sparse-checkout.c commit-graph.c midx.c sequencer.c #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" @@ -14415,79 +14975,86 @@ msgstr "必须在稀疏检出中重应用稀疏模式" msgid "error while refreshing working directory" msgstr "刷新工作目录时出错" -#: builtin/stash.c -msgid "git stash list [<options>]" -msgstr "git stash list [<选项>]" +#: builtin/sparse-checkout.c +msgid "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <file>]" +msgstr "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <文件>]" -#: builtin/stash.c -msgid "git stash show [<options>] [<stash>]" -msgstr "git stash show [<选项>] [<stash>]" +#: builtin/sparse-checkout.c +msgid "terminate input and output files by a NUL character" +msgstr "输入和输出的文件使用 NUL 字符终结" -#: builtin/stash.c -msgid "git stash drop [-q|--quiet] [<stash>]" -msgstr "git stash drop [-q|--quiet] [<stash>]" +#: builtin/sparse-checkout.c +msgid "when used with --rules-file interpret patterns as cone mode patterns" +msgstr "通过 --rules-file 选项传递的模型将被作为锥形（稀疏检出模型）进行解析" -#: builtin/stash.c -msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +#: builtin/sparse-checkout.c +msgid "use patterns in <file> instead of the current ones." +msgstr "从 <文件> 参数中读取模式，而不是从标准输入" #: builtin/stash.c -msgid "git stash branch <branchname> [<stash>]" -msgstr "git stash branch <分支名> [<stash>]" +msgid "git stash list [<log-options>]" +msgstr "git stash list [<日志选项>]" #: builtin/stash.c msgid "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" -" [--] [<pathspec>...]]" +"git stash show [-u | --include-untracked | --only-untracked] [<diff-" +"options>] [<stash>]" msgstr "" -"git stash [push [-p|--patch] [[-S|--staged] -k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" -" [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n" -" [--] [<路径规格>...]]" +"git stash show [-u | --include-untracked | --only-untracked] [<差异选项>] [<" +"贮存>]" #: builtin/stash.c -msgid "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<消息>]" +msgid "git stash drop [-q | --quiet] [<stash>]" +msgstr "git stash drop [-q | --quiet] [<贮存>]" #: builtin/stash.c -msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" +msgid "git stash pop [--index] [-q | --quiet] [<stash>]" +msgstr "git stash pop [--index] [-q | --quiet] [<贮存>]" #: builtin/stash.c -msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" +msgid "git stash apply [--index] [-q | --quiet] [<stash>]" +msgstr "git stash apply [--index] [-q | --quiet] [<贮存>]" + +#: builtin/stash.c +msgid "git stash branch <branchname> [<stash>]" +msgstr "git stash branch <分支名> [<stash>]" #: builtin/stash.c -msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" -msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>" +msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" +msgstr "git stash store [(-m | --message) <消息>] [-q | --quiet] <提交>" #: builtin/stash.c msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<message>]\n" +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message <消息>]\n" +" [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n" " [--] [<路径规格>...]]" #: builtin/stash.c msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<message>]" msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<消息>]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<消息>]" + +#: builtin/stash.c +msgid "git stash create [<message>]" +msgstr "git stash create [<消息>]" #: builtin/stash.c #, c-format @@ -14713,20 +15280,17 @@ msgstr "期望一个完整的引用名称，却得到 %s" #: builtin/submodule--helper.c #, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "无法获得子模组 '%s' 的仓库句柄" + +#: builtin/submodule--helper.c +#, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" #: builtin/submodule--helper.c -msgid "alternative anchor for relative paths" -msgstr "相对路径的替代锚记（anchor）" - -#: builtin/submodule--helper.c -msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" - -#: builtin/submodule--helper.c #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组路径 '%s' 的 url" @@ -14764,8 +15328,8 @@ msgid "recurse into nested submodules" msgstr "递归进入嵌套子模组中" #: builtin/submodule--helper.c -msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" +msgid "git submodule foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule foreach [--quiet] [--recursive] [--] <命令>" #: builtin/submodule--helper.c #, c-format @@ -14792,8 +15356,8 @@ msgid "suppress output for initializing a submodule" msgstr "抑制子模组初始化的输出" #: builtin/submodule--helper.c -msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [<选项>] [<路径>]" +msgid "git submodule init [<options>] [<path>]" +msgstr "git submodule init [<选项>] [<路径>]" #: builtin/submodule--helper.c #, c-format @@ -14825,10 +15389,6 @@ msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]" #: builtin/submodule--helper.c -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <路径>" - -#: builtin/submodule--helper.c #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s（数据对象）->%s（子模组）" @@ -14870,8 +15430,8 @@ msgid "limit the summary size" msgstr "限制总结的大小" #: builtin/submodule--helper.c -msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" -msgstr "git submodule--helper summary [<选项>] [<提交>] [--] [<路径>]" +msgid "git submodule summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule summary [<选项>] [<提交>] [--] [<路径>]" #: builtin/submodule--helper.c msgid "could not fetch a revision for HEAD" @@ -14889,11 +15449,6 @@ msgstr "无法为子模组路径 '%s' 注册 url" #: builtin/submodule--helper.c #, c-format -msgid "failed to get the default remote for submodule '%s'" -msgstr "无法得到子模组 '%s' 的默认远程关联" - -#: builtin/submodule--helper.c -#, c-format msgid "failed to update remote for submodule '%s'" msgstr "无法为子模组 '%s' 更新远程关联" @@ -14902,8 +15457,8 @@ msgid "suppress output of synchronizing submodule url" msgstr "抑制子模组 URL 同步的输出" #: builtin/submodule--helper.c -msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" -msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" +msgid "git submodule sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule sync [--quiet] [--recursive] [<路径>]" #: builtin/submodule--helper.c #, c-format @@ -14973,6 +15528,11 @@ msgstr "" #: builtin/submodule--helper.c #, c-format +msgid "could not get a repository handle for gitdir '%s'" +msgstr "无法获得 git 目录 '%s' 的仓库句柄" + +#: builtin/submodule--helper.c +#, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模组 '%s' 不能添加仓库备选：%s" @@ -15007,6 +15567,10 @@ msgid "could not get submodule directory for '%s'" msgstr "无法得到 '%s' 的子模组目录" #: builtin/submodule--helper.c +msgid "alternative anchor for relative paths" +msgstr "相对路径的替代锚记（anchor）" + +#: builtin/submodule--helper.c msgid "where the new submodule will be cloned to" msgstr "新的子模组将要克隆的路径" @@ -15042,11 +15606,6 @@ msgstr "" #: builtin/submodule--helper.c #, c-format -msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "子模组路径 '%2$s' 的更新模式 '%1$s' 无效" - -#: builtin/submodule--helper.c -#, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "为子模组路径 '%2$s' 配置的更新模式 '%1$s' 无效" @@ -15071,6 +15630,11 @@ msgstr "略过子模组 '%s'" #: builtin/submodule--helper.c #, c-format +msgid "cannot clone submodule '%s' without a URL" +msgstr "无法在不提供 URL 时克隆子模组 '%s'" + +#: builtin/submodule--helper.c +#, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "克隆 '%s' 失败。按计划重试" @@ -15133,6 +15697,11 @@ msgstr "获取了子模组路径 '%s'，但是它没有包含 %s。直接获取 #: builtin/submodule--helper.c #, c-format +msgid "could not initialize submodule at path '%s'" +msgstr "无法在路径 '%s' 初始化子模组" + +#: builtin/submodule--helper.c +#, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" @@ -15140,11 +15709,6 @@ msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是 #: builtin/submodule--helper.c #, c-format -msgid "could not get a repository handle for submodule '%s'" -msgstr "无法获得子模组 '%s' 的仓库句柄" - -#: builtin/submodule--helper.c -#, c-format msgid "Unable to find current revision in submodule path '%s'" msgstr "无法在子模组路径 '%s' 中找到当前版本" @@ -15184,16 +15748,16 @@ msgid "don't fetch new objects from the remote site" msgstr "不要从远程地址获取新对象" #: builtin/submodule--helper.c -msgid "path into the working tree" -msgstr "到工作区的路径" +msgid "use the 'checkout' update strategy (default)" +msgstr "使用 'checkout' 更新策略（默认）" #: builtin/submodule--helper.c -msgid "path into the working tree, across nested submodule boundaries" -msgstr "工作区中的路径，递归嵌套子模组" +msgid "use the 'merge' update strategy" +msgstr "使用 'merge' 更新策略" #: builtin/submodule--helper.c -msgid "rebase, merge, checkout or none" -msgstr "rebase、merge、checkout 或 none" +msgid "use the 'rebase' update strategy" +msgstr "使用 'rebase' 更新策略" #: builtin/submodule--helper.c msgid "create a shallow clone truncated to the specified number of revisions" @@ -15212,6 +15776,10 @@ msgid "don't print cloning progress" msgstr "不要输出克隆进度" #: builtin/submodule--helper.c +msgid "disallow cloning into non-empty directory, implies --init" +msgstr "不允许克隆到一个非空目录，暗含 --init" + +#: builtin/submodule--helper.c msgid "" "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" @@ -15223,45 +15791,21 @@ msgstr "" "shallow] [--reference <仓库>] [--recursive] [--[no-]single-branch] [--] [<路" "径>...]" -#: builtin/submodule--helper.c -msgid "bad value for update parameter" -msgstr "update 参数取值错误" - -#: builtin/submodule--helper.c -msgid "recurse into submodules" -msgstr "在子模组中递归" - -#: builtin/submodule--helper.c -msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]" - -#: builtin/submodule--helper.c -msgid "check if it is safe to write to the .gitmodules file" -msgstr "检查写入 .gitmodules 文件是否安全" - -#: builtin/submodule--helper.c -msgid "unset the config in the .gitmodules file" -msgstr "取消 .gitmodules 文件中的设置" - -#: builtin/submodule--helper.c -msgid "git submodule--helper config <name> [<value>]" -msgstr "git submodule--helper config <名称> [<值>]" - -#: builtin/submodule--helper.c -msgid "git submodule--helper config --unset <name>" -msgstr "git submodule--helper config --unset <名称>" +#: builtin/submodule--helper.c submodule.c +msgid "Failed to resolve HEAD as a valid ref." +msgstr "无法将 HEAD 解析为有效引用。" #: builtin/submodule--helper.c -msgid "please make sure that the .gitmodules file is in the working tree" -msgstr "请确认 .gitmodules 文件在工作区里" +msgid "git submodule absorbgitdirs [<options>] [<path>...]" +msgstr "git submodule absorbgitdirs [<选项>] [<路径>...]" #: builtin/submodule--helper.c msgid "suppress output for setting url of a submodule" msgstr "抑制设置子模组 URL 的输出" #: builtin/submodule--helper.c -msgid "git submodule--helper set-url [--quiet] <path> <newurl>" -msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>" +msgid "git submodule set-url [--quiet] <path> <newurl>" +msgstr "git submodule set-url [--quiet] <路径> <新地址>" #: builtin/submodule--helper.c msgid "set the default tracking branch to master" @@ -15272,14 +15816,12 @@ msgid "set the default tracking branch" msgstr "设置默认跟踪分支" #: builtin/submodule--helper.c -msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>" +msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <路径>" #: builtin/submodule--helper.c -msgid "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -msgstr "" -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>" +msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <分支> <路径>" #: builtin/submodule--helper.c msgid "--branch or --default required" @@ -15351,6 +15893,10 @@ msgid "unable to checkout submodule '%s'" msgstr "无法检出子模组 '%s'" #: builtin/submodule--helper.c +msgid "please make sure that the .gitmodules file is in the working tree" +msgstr "请确认 .gitmodules 文件在工作区里" + +#: builtin/submodule--helper.c #, c-format msgid "Failed to add submodule '%s'" msgstr "无法添加子模组 '%s'" @@ -15394,8 +15940,8 @@ msgid "" msgstr "将子模组的名称设置为给定的字符串，而非默认为其路径" #: builtin/submodule--helper.c -msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" -msgstr "git submodule--helper add [<选项>] [--] <仓库> [<路径>]" +msgid "git submodule add [<options>] [--] <repository> [<path>]" +msgstr "git submodule add [<选项>] [--] <仓库> [<路径>]" #: builtin/submodule--helper.c msgid "Relative path can only be used from the toplevel of the working tree" @@ -15411,23 +15957,21 @@ msgstr "仓库 URL：'%s' 必须是绝对路径或以 ./|../ 起始" msgid "'%s' is not a valid submodule name" msgstr "'%s' 不是一个有效的子模组名称" -#: builtin/submodule--helper.c git.c -#, c-format -msgid "%s doesn't support --super-prefix" -msgstr "%s 不支持 --super-prefix" - #: builtin/submodule--helper.c -#, c-format -msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "'%s' 不是一个有效的 submodule--helper 子命令" +msgid "git submodule--helper <command>" +msgstr "git submodule--helper <命令>" + +#: builtin/symbolic-ref.c +msgid "git symbolic-ref [-m <reason>] <name> <ref>" +msgstr "git symbolic-ref [-m <理由>] <名称> <引用>" #: builtin/symbolic-ref.c -msgid "git symbolic-ref [<options>] <name> [<ref>]" -msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" +msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>" +msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <名称>" #: builtin/symbolic-ref.c -msgid "git symbolic-ref -d [-q] <name>" -msgstr "git symbolic-ref -d [-q] <名称>" +msgid "git symbolic-ref --delete [-q] <name>" +msgstr "git symbolic-ref --delete [-q] <名称>" #: builtin/symbolic-ref.c msgid "suppress error message for non-symbolic (detached) refs" @@ -15441,6 +15985,10 @@ msgstr "删除符号引用" msgid "shorten ref output" msgstr "缩短引用输出" +#: builtin/symbolic-ref.c +msgid "recursively dereference (default)" +msgstr "递归解引用（默认）" + #: builtin/symbolic-ref.c builtin/update-ref.c msgid "reason" msgstr "原因" @@ -15451,11 +15999,11 @@ msgstr "更新的原因" #: builtin/tag.c msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" -" <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" <tagname> [<commit> | <object>]" msgstr "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n" -" <标签名> [<头>]" +"git tag [-a | -s | -u <私钥 ID>] [-f] [-m <消息> | -F <文件>] [-e]\n" +" <标签名> [<提交> | <对象>]" #: builtin/tag.c msgid "git tag -d <tagname>..." @@ -15463,14 +16011,15 @@ msgstr "git tag -d <标签名>..." #: builtin/tag.c msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <object>]\n" -" [--format=<format>] [--merged <commit>] [--no-merged <commit>] " -"[<pattern>...]" +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" +" [--points-at <object>] [--column[=<options>] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=<format>]\n" +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]" msgstr "" -"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-" -"at <对象>]\n" -" [--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]" +"git tag [-n[<数字>]] -l [--contains <提交>] [--no-contains <提交>]\n" +" [--points-at <对象>] [--column[=<选项>] | --no-column]\n" +" [--create-reflog] [--sort=<键>] [--format=<格式>]\n" +" [--merged <提交>] [--no-merged <提交>] [<模式>...]" #: builtin/tag.c msgid "git tag -v [--format=<format>] <tagname>..." @@ -15649,6 +16198,19 @@ msgid "pack exceeds maximum allowed size" msgstr "包超过了最大允许大小" #: builtin/unpack-objects.c +msgid "failed to write object in stream" +msgstr "无法在流中写入对象" + +#: builtin/unpack-objects.c +#, c-format +msgid "inflate returned (%d)" +msgstr "解压缩返回了 (%d)" + +#: builtin/unpack-objects.c +msgid "invalid blob object from stream" +msgstr "流中无效的数据对象" + +#: builtin/unpack-objects.c msgid "Unpacking objects" msgstr "展开对象中" @@ -15809,6 +16371,10 @@ msgid "write index in this format" msgstr "以这种格式写入索引区" #: builtin/update-index.c +msgid "report on-disk index format version" +msgstr "报告磁盘索引格式的版本" + +#: builtin/update-index.c msgid "enable or disable split index" msgstr "启用或禁用索引拆分" @@ -15841,6 +16407,16 @@ msgid "clear fsmonitor valid bit" msgstr "清除 fsmonitor 有效位" #: builtin/update-index.c +#, c-format +msgid "%d\n" +msgstr "%d\n" + +#: builtin/update-index.c +#, c-format +msgid "index-version: was %d, set to %d" +msgstr "索引版本：从 %d 设置为 %d" + +#: builtin/update-index.c msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -15929,8 +16505,12 @@ msgid "update the info files from scratch" msgstr "从头开始更新文件信息" #: builtin/upload-pack.c -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<选项>] <目录>" +msgid "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <directory>" +msgstr "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <目录>" #: builtin/upload-pack.c t/helper/test-serve-v2.c msgid "quit after a single request/response exchange" @@ -15949,8 +16529,8 @@ msgid "interrupt transfer after <n> seconds of inactivity" msgstr "不活动 <n> 秒钟后终止传输" #: builtin/verify-commit.c -msgid "git verify-commit [-v | --verbose] <commit>..." -msgstr "git verify-commit [-v | --verbose] <提交>..." +msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." +msgstr "git verify-commit [-v | --verbose] [--raw] <提交>..." #: builtin/verify-commit.c msgid "print commit contents" @@ -15961,8 +16541,8 @@ msgid "print raw gpg status output" msgstr "打印原始 gpg 状态输出" #: builtin/verify-pack.c -msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <包>.idx..." #: builtin/verify-pack.c msgid "verbose" @@ -15973,44 +16553,82 @@ msgid "show statistics only" msgstr "只显示统计" #: builtin/verify-tag.c -msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." -msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." +msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<格式>] [--raw] <标签>..." #: builtin/verify-tag.c msgid "print tag contents" msgstr "打印标签内容" #: builtin/worktree.c -msgid "git worktree add [<options>] <path> [<commit-ish>]" -msgstr "git worktree add [<选项>] <路径> [<提交>]" +msgid "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" +" [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]" +msgstr "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <字符串>]]\n" +" [--orphan] [(-b | -B) <新分支>] <路径> [<提交号>]" #: builtin/worktree.c -msgid "git worktree list [<options>]" -msgstr "git worktree list [<选项>]" +msgid "git worktree list [-v | --porcelain [-z]]" +msgstr "git worktree list [-v | --porcelain [-z]]" #: builtin/worktree.c -msgid "git worktree lock [<options>] <path>" -msgstr "git worktree lock [<选项>] <路径>" +msgid "git worktree lock [--reason <string>] <worktree>" +msgstr "git worktree lock [--reason <字符串>] <工作区>" #: builtin/worktree.c msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <工作区> <新路径>" #: builtin/worktree.c -msgid "git worktree prune [<options>]" -msgstr "git worktree prune [<选项>]" +msgid "git worktree prune [-n] [-v] [--expire <expire>]" +msgstr "git worktree prune [-n] [-v] [--expire <过期>]" #: builtin/worktree.c -msgid "git worktree remove [<options>] <worktree>" -msgstr "git worktree remove [<选项>] <工作区>" +msgid "git worktree remove [-f] <worktree>" +msgstr "git worktree remove [-f] <工作区>" #: builtin/worktree.c msgid "git worktree repair [<path>...]" msgstr "git worktree repair [<路径>...]" #: builtin/worktree.c -msgid "git worktree unlock <path>" -msgstr "git worktree unlock <路径>" +msgid "git worktree unlock <worktree>" +msgstr "git worktree unlock <工作区>" + +#: builtin/worktree.c +msgid "No possible source branch, inferring '--orphan'" +msgstr "没有可用的源分支，将基于 '--orphan' 选项进行推断" + +#: builtin/worktree.c +#, c-format +msgid "" +"If you meant to create a worktree containing a new unborn branch\n" +"(branch with no commits) for this repository, you can do so\n" +"using the --orphan flag:\n" +"\n" +" git worktree add --orphan -b %s %s\n" +msgstr "" +"如果你打算为此仓库创建一个包含新的未诞生的\n" +"分支（没有提交的分支）的工作区，你可以使用\n" +"选项 --orphan 来执行此操作：\n" +"\n" +" git worktree add --orphan -b %s %s\n" + +#: builtin/worktree.c +#, c-format +msgid "" +"If you meant to create a worktree containing a new unborn branch\n" +"(branch with no commits) for this repository, you can do so\n" +"using the --orphan flag:\n" +"\n" +" git worktree add --orphan %s\n" +msgstr "" +"如果你打算为此仓库创建一个包含新的未诞生的\n" +"分支（没有提交的分支）的工作区，你可以使用\n" +"选项 --orphan 来执行此操作：\n" +"\n" +" git worktree add --orphan %s\n" #: builtin/worktree.c #, c-format @@ -16079,6 +16697,11 @@ msgstr "初始化" #: builtin/worktree.c #, c-format +msgid "could not find created worktree '%s'" +msgstr "无法找到已创建的工作树 '%s'" + +#: builtin/worktree.c +#, c-format msgid "Preparing worktree (new branch '%s')" msgstr "准备工作区（新分支 '%s'）" @@ -16094,10 +16717,34 @@ msgstr "准备工作区（检出 '%s'）" #: builtin/worktree.c #, c-format +msgid "unreachable: invalid reference: %s" +msgstr "不可达：无效引用：%s" + +#: builtin/worktree.c +#, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "准备工作区（分离头指针 %s）" #: builtin/worktree.c +#, c-format +msgid "" +"HEAD points to an invalid (or orphaned) reference.\n" +"HEAD path: '%s'\n" +"HEAD contents: '%s'" +msgstr "" +"HEAD 指向了一个无用的（或孤立的）引用。\n" +"HEAD 路径： '%s'\n" +"HEAD 内容： '%s'" + +#: builtin/worktree.c +msgid "" +"No local or remote refs exist despite at least one remote\n" +"present, stopping; use 'add -f' to override or fetch a remote first" +msgstr "" +"尽管已配置远程仓库，但不存在任何本地的或远程的引用，操作终止。\n" +"请先使用 'add -f' 来覆盖或拉取一个远程仓库" + +#: builtin/worktree.c msgid "checkout <branch> even if already checked out in other worktree" msgstr "检出 <分支>，即使已经被检出到其它工作区" @@ -16110,6 +16757,10 @@ msgid "create or reset a branch" msgstr "创建或重置一个分支" #: builtin/worktree.c +msgid "create unborn branch" +msgstr "创建一个尚未诞生的分支" + +#: builtin/worktree.c msgid "populate the new working tree" msgstr "生成新的工作区" @@ -16135,6 +16786,11 @@ msgid "options '%s', '%s', and '%s' cannot be used together" msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用" #: builtin/worktree.c +#, c-format +msgid "option '%s' and commit-ish cannot be used together" +msgstr "选项 '%s' 和提交号不能同时使用" + +#: builtin/worktree.c msgid "added with --lock" msgstr "由 --lock 添加" @@ -16290,6 +16946,78 @@ msgstr "将 <前缀> 子目录内容写到一个树对象" msgid "only useful for debugging" msgstr "只对调试有用" +#: bulk-checkin.c +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "core.fsyncMethod = batch 不支持本平台" + +#: bundle-uri.c +#, c-format +msgid "could not parse bundle list key %s with value '%s'" +msgstr "不能解析归档包列表键 %s 的值 '%s'" + +#: bundle-uri.c +#, c-format +msgid "bundle list at '%s' has no mode" +msgstr "在 '%s' 的归档包列表没有模式" + +#: bundle-uri.c +msgid "failed to create temporary file" +msgstr "无法创建临时文件" + +#: bundle-uri.c +msgid "insufficient capabilities" +msgstr "缺乏能力" + +#: bundle-uri.c +#, c-format +msgid "file downloaded from '%s' is not a bundle" +msgstr "下载自 '%s' 的文件不是归档包" + +#: bundle-uri.c +msgid "failed to store maximum creation token" +msgstr "无法储存最大的创建令牌" + +#: bundle-uri.c +#, c-format +msgid "unrecognized bundle mode from URI '%s'" +msgstr "不可辨认的归档包模式来自 URI '%s'" + +#: bundle-uri.c +#, c-format +msgid "exceeded bundle URI recursion limit (%d)" +msgstr "超过了 URI 递归限制 (%d)" + +#: bundle-uri.c +#, c-format +msgid "failed to download bundle from URI '%s'" +msgstr "无法从 URI '%s' 下载归档包" + +#: bundle-uri.c +#, c-format +msgid "file at URI '%s' is not a bundle or bundle list" +msgstr "位于 URI '%s' 的文件不是归档包或归档包列表" + +#: bundle-uri.c +#, c-format +msgid "bundle-uri: unexpected argument: '%s'" +msgstr "bundle-uri: 意外的参数：'%s'" + +#: bundle-uri.c +msgid "bundle-uri: expected flush after arguments" +msgstr "bundle-uri: 在参数之后应有一个 flush" + +#: bundle-uri.c +msgid "bundle-uri: got an empty line" +msgstr "bundle-uri: 获得了空行" + +#: bundle-uri.c +msgid "bundle-uri: line is not of the form 'key=value'" +msgstr "bundle-uri: 行不是以 'key=value' 格式" + +#: bundle-uri.c +msgid "bundle-uri: line has empty key or value" +msgstr "bundle-uri: 行有空的键或值" + #: bundle.c #, c-format msgid "unrecognized bundle hash algorithm: %s" @@ -16319,6 +17047,12 @@ msgid "need a repository to verify a bundle" msgstr "需要一个仓库来校验一个归档包" #: bundle.c +msgid "" +"some prerequisite commits exist in the object store, but are not connected " +"to the repository's history" +msgstr "一些前置提交存在于对象储存中，但未连接于本仓库的历史" + +#: bundle.c #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %<PRIuMAX> refs:" @@ -16337,6 +17071,16 @@ msgstr[0] "这个归档包需要这个引用：" msgstr[1] "这个归档包需要 %<PRIuMAX> 个引用：" #: bundle.c +#, c-format +msgid "The bundle uses this hash algorithm: %s" +msgstr "该归档包使用的哈希算法：%s" + +#: bundle.c +#, c-format +msgid "The bundle uses this filter: %s" +msgstr "归档包使用了过滤器：%s" + +#: bundle.c msgid "unable to dup bundle descriptor" msgstr "无法复制归档包描述符" @@ -16382,6 +17126,11 @@ msgstr "终止块 ID 比预期更早出现" #: chunk-format.c #, c-format +msgid "chunk id %<PRIx32> not %d-byte aligned" +msgstr "块 id %<PRIx32> 未 %d 字节对齐" + +#: chunk-format.c +#, c-format msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" msgstr "不正确的块偏移 %<PRIx64> 和 %<PRIx64>" @@ -16449,8 +17198,8 @@ msgid "Move objects and refs by archive" msgstr "通过归档移动对象和引用" #: command-list.h -msgid "Provide content or type and size information for repository objects" -msgstr "提供仓库对象的内容、类型或大小" +msgid "Provide contents or details of repository objects" +msgstr "提供仓库对象的内容或详情" #: command-list.h msgid "Display gitattributes information" @@ -16553,6 +17302,10 @@ msgid "Give an object a human readable name based on an available ref" msgstr "基于一个现存的引用为一个对象起一个可读的名称" #: command-list.h +msgid "Generate a zip archive of diagnostic information" +msgstr "生成诊断信息的压缩包" + +#: command-list.h msgid "Show changes between commits, commit and working tree, etc" msgstr "显示提交之间、提交和工作区之间等的差异" @@ -16629,8 +17382,8 @@ msgid "A portable graphical interface to Git" msgstr "一个便携的 Git 图形客户端" #: command-list.h -msgid "Compute object ID and optionally creates a blob from a file" -msgstr "从一个文件计算对象 ID，并可以创建 blob 数据对象" +msgid "Compute object ID and optionally create an object from a file" +msgstr "从一个文件计算对象 ID，并支持可选地创建一个对象" #: command-list.h msgid "Display help information about Git" @@ -16721,8 +17474,8 @@ msgid "The standard helper program to use with git-merge-index" msgstr "与 git-merge-index 一起使用的标准向导程序" #: command-list.h -msgid "Show three-way merge without touching index" -msgstr "在不动索引的情况下显示三路合并" +msgid "Perform merge without touching index or working tree" +msgstr "在不触碰索引或工作树情况下应用合并" #: command-list.h msgid "Run merge conflict resolution tools to resolve merge conflicts" @@ -16826,6 +17579,10 @@ msgid "Create, list, delete refs to replace objects" msgstr "创建、列出、删除对象替换引用" #: command-list.h +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" +msgstr "试验中：基于一个新基线重放提交，同样适用于纯仓库" + +#: command-list.h msgid "Generates a summary of pending changes" msgstr "生成待定更改的摘要" @@ -16983,7 +17740,11 @@ msgid "Check the GPG signature of tags" msgstr "检查标签的 GPG 签名" #: command-list.h -msgid "Show logs with difference each commit introduces" +msgid "Display version information about Git" +msgstr "显示关于 Git 的版本信息" + +#: command-list.h +msgid "Show logs with differences each commit introduces" msgstr "显示每一个提交引入的差异日志" #: command-list.h @@ -17027,6 +17788,30 @@ msgid "Frequently asked questions about using Git" msgstr "关于使用 Git 的常见问题" #: command-list.h +msgid "The bundle file format" +msgstr "归档包文件格式" + +#: command-list.h +msgid "Chunk-based file formats" +msgstr "块式文件格式" + +#: command-list.h +msgid "Git commit-graph format" +msgstr "Git 提交图格式" + +#: command-list.h +msgid "Git index format" +msgstr "Git 索引格式" + +#: command-list.h +msgid "Git pack format" +msgstr "Git 包格式" + +#: command-list.h +msgid "Git cryptographic signature formats" +msgstr "Git 密码学签名格式" + +#: command-list.h msgid "A Git Glossary" msgstr "Git 词汇表" @@ -17036,7 +17821,7 @@ msgstr "Git 使用的钩子" #: command-list.h msgid "Specifies intentionally untracked files to ignore" -msgstr "忽略指定的未跟踪文件" +msgstr "指定故意忽略的未跟踪文件" #: command-list.h msgid "The Git repository browser" @@ -17055,6 +17840,26 @@ msgid "Git namespaces" msgstr "Git 名字空间" #: command-list.h +msgid "Protocol v0 and v1 capabilities" +msgstr "协议 v0 和 v1 能力" + +#: command-list.h +msgid "Things common to various protocols" +msgstr "不同协议的共同部分" + +#: command-list.h +msgid "Git HTTP-based protocols" +msgstr "Git 基于 HTTP 的协议" + +#: command-list.h +msgid "How packs are transferred over-the-wire" +msgstr "包在线路中传输的方式" + +#: command-list.h +msgid "Git Wire Protocol, Version 2" +msgstr "Git 传输协议，第二版" + +#: command-list.h msgid "Helper programs to interact with remote repositories" msgstr "与远程仓库交互的助手程序" @@ -17086,50 +17891,110 @@ msgstr "Git web 界面（Git 仓库的 web 前端）" msgid "An overview of recommended workflows with Git" msgstr "Git 推荐的工作流概览" +#: command-list.h +msgid "A tool for managing large Git repositories" +msgstr "一个管理大型 Git 仓库的工具" + #: commit-graph.c msgid "commit-graph file is too small" -msgstr "提交图形文件太小" +msgstr "提交图文件太小" + +#: commit-graph.c +msgid "commit-graph oid fanout chunk is wrong size" +msgstr "提交图中对象 ID 的扇出块大小错误" + +#: commit-graph.c +msgid "commit-graph fanout values out of order" +msgstr "提交图的扇出值失序" + +#: commit-graph.c +msgid "commit-graph OID lookup chunk is the wrong size" +msgstr "提交图的对象 ID 查询块大小错误" + +#: commit-graph.c +msgid "commit-graph commit data chunk is wrong size" +msgstr "提交图的提交数据块大小错误" + +#: commit-graph.c +msgid "commit-graph generations chunk is wrong size" +msgstr "提交图的世代块大小错误" + +#: commit-graph.c +msgid "commit-graph changed-path index chunk is too small" +msgstr "提交图的变更路径的索引块太小" + +#: commit-graph.c +#, c-format +msgid "" +"ignoring too-small changed-path chunk (%<PRIuMAX> < %<PRIuMAX>) in commit-" +"graph file" +msgstr "忽略提交图文件中过小的更改路径块（%<PRIuMAX> < %<PRIuMAX>）" #: commit-graph.c #, c-format msgid "commit-graph signature %X does not match signature %X" -msgstr "提交图形签名 %X 和签名 %X 不匹配" +msgstr "提交图签名 %X 和签名 %X 不匹配" #: commit-graph.c #, c-format msgid "commit-graph version %X does not match version %X" -msgstr "提交图形版本 %X 和版本 %X 不匹配" +msgstr "提交图版本 %X 和版本 %X 不匹配" #: commit-graph.c #, c-format msgid "commit-graph hash version %X does not match version %X" -msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" +msgstr "提交图哈希版本 %X 和版本 %X 不匹配" #: commit-graph.c #, c-format msgid "commit-graph file is too small to hold %u chunks" -msgstr "提交图形文件太小，容不下 %u 个块" +msgstr "提交图文件太小，容不下 %u 个块" + +#: commit-graph.c +msgid "commit-graph required OID fanout chunk missing or corrupted" +msgstr "提交图所需的对象 ID 扇出块缺失或损坏" + +#: commit-graph.c +msgid "commit-graph required OID lookup chunk missing or corrupted" +msgstr "提交图所需的对象 ID 查询块缺失或损坏" + +#: commit-graph.c +msgid "commit-graph required commit data chunk missing or corrupted" +msgstr "提交图所需的提交数据块缺失或损坏" #: commit-graph.c msgid "commit-graph has no base graphs chunk" -msgstr "提交图形没有基础图形块" +msgstr "提交图没有基础图形块" + +#: commit-graph.c +msgid "commit-graph base graphs chunk is too small" +msgstr "提交图的基础图形块过小" #: commit-graph.c msgid "commit-graph chain does not match" -msgstr "提交图形链不匹配" +msgstr "提交图链不匹配" + +#: commit-graph.c +#, c-format +msgid "commit count in base graph too high: %<PRIuMAX>" +msgstr "基础图形中的提交数量过高：%<PRIuMAX>" + +#: commit-graph.c +msgid "commit-graph chain file too small" +msgstr "提交图链文件太小" #: commit-graph.c #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" -msgstr "无效的提交图形链：行 '%s' 不是一个哈希值" +msgstr "无效的提交图链：行 '%s' 不是一个哈希值" #: commit-graph.c msgid "unable to find all commit-graph files" -msgstr "无法找到所有提交图形文件" +msgstr "无法找到所有提交图文件" #: commit-graph.c msgid "invalid commit position. commit-graph is likely corrupt" -msgstr "无效的提交位置。提交图形可能已损坏" +msgstr "无效的提交位置。提交图可能已损坏" #: commit-graph.c #, c-format @@ -17141,6 +18006,14 @@ msgid "commit-graph requires overflow generation data but has none" msgstr "提交图需要溢出世代数据，但是没有" #: commit-graph.c +msgid "commit-graph overflow generation data is too small" +msgstr "提交图溢出世代数据过小" + +#: commit-graph.c +msgid "commit-graph extra-edges pointer out of bounds" +msgstr "提交图额外边的指针越界" + +#: commit-graph.c msgid "Loading known commits in commit graph" msgstr "正在加载提交图中的已知提交" @@ -17215,15 +18088,25 @@ msgstr[1] "正在用 %d 步写出提交图" #: commit-graph.c msgid "unable to open commit-graph chain file" -msgstr "无法打开提交图形链文件" +msgstr "无法打开提交图链文件" #: commit-graph.c msgid "failed to rename base commit-graph file" -msgstr "无法重命名基础提交图形文件" +msgstr "无法重命名基础提交图文件" #: commit-graph.c msgid "failed to rename temporary commit-graph file" -msgstr "无法重命名临时提交图形文件" +msgstr "无法重命名临时提交图文件" + +#: commit-graph.c +#, c-format +msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits" +msgstr "无法合并提交图，总共已累加提交数：%<PRIuMAX>，当前待累加提交数：%<PRIuMAX>" + +#: commit-graph.c +#, c-format +msgid "cannot merge graph %s, too many commits: %<PRIuMAX>" +msgstr "无法合并提交图 %s, 提交过多：%<PRIuMAX>" #: commit-graph.c msgid "Scanning merged commits" @@ -17231,7 +18114,7 @@ msgstr "正在扫描合并提交" #: commit-graph.c msgid "Merging commit-graph" -msgstr "正在合并提交图形" +msgstr "正在合并提交图" #: commit-graph.c msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" @@ -17248,68 +18131,63 @@ msgstr "提交图文件的校验码错误，可能已经损坏" #: commit-graph.c #, c-format msgid "commit-graph has incorrect OID order: %s then %s" -msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s" +msgstr "提交图的对象 ID 顺序不正确：%s 然后 %s" #: commit-graph.c #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" -msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u" +msgstr "提交图有不正确的扇出值：fanout[%d] = %u != %u" #: commit-graph.c #, c-format msgid "failed to parse commit %s from commit-graph" -msgstr "无法从提交图形中解析提交 %s" - -#: commit-graph.c -msgid "Verifying commits in commit graph" -msgstr "正在校验提交图中的提交" +msgstr "无法从提交图中解析提交 %s" #: commit-graph.c #, c-format msgid "failed to parse commit %s from object database for commit-graph" -msgstr "无法从提交图形的对象库中解析提交 %s" +msgstr "无法从提交图的对象库中解析提交 %s" #: commit-graph.c #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" -msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" +msgstr "提交图中的提交 %s 的根树对象 ID 是 %s != %s" #: commit-graph.c #, c-format msgid "commit-graph parent list for commit %s is too long" -msgstr "提交 %s 的提交图形父提交列表太长了" +msgstr "提交 %s 的提交图父提交列表太长了" #: commit-graph.c #, c-format msgid "commit-graph parent for %s is %s != %s" -msgstr "%s 的提交图形父提交是 %s != %s" +msgstr "%s 的提交图父提交是 %s != %s" #: commit-graph.c #, c-format msgid "commit-graph parent list for commit %s terminates early" -msgstr "提交 %s 的提交图形父提交列表过早终止" +msgstr "提交 %s 的提交图父提交列表过早终止" #: commit-graph.c #, c-format -msgid "" -"commit-graph has generation number zero for commit %s, but non-zero elsewhere" -msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零" +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" +msgstr "提交图中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>" #: commit-graph.c #, c-format -msgid "" -"commit-graph has non-zero generation number for commit %s, but zero elsewhere" -msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零" +msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" +msgstr "提交图中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" #: commit-graph.c #, c-format -msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" -msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>" +msgid "" +"commit-graph has both zero and non-zero generations (e.g., commits '%s' and " +"'%s')" +msgstr "提交图具有零和非零的世代（例如：提交 '%s' 和 '%s'）" #: commit-graph.c -#, c-format -msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" -msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" +msgid "Verifying commits in commit graph" +msgstr "正在校验提交图中的提交" #: commit.c #, c-format @@ -17338,6 +18216,11 @@ msgstr "" #: commit.c #, c-format +msgid "commit %s exists in commit-graph but not in the object database" +msgstr "提交 %s 存在于提交图中，但不存在于对象数据库中" + +#: commit.c +#, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" @@ -17374,6 +18257,16 @@ msgstr "编译器信息不可用\n" msgid "no libc information available\n" msgstr "libc 信息不可用\n" +#: compat/disk.h +#, c-format +msgid "could not determine free disk size for '%s'" +msgstr "不能确定 '%s' 的空余磁盘空间" + +#: compat/disk.h +#, c-format +msgid "could not get info for '%s'" +msgstr "无法获得 '%s' 的信息" + #: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "[GLE %ld] health thread could not open '%ls'" @@ -17404,6 +18297,11 @@ msgstr "'has_worktree_moved' 中未处理的情况：%d" msgid "health thread wait failed [GLE %ld]" msgstr "健康监测线程等待失败 [GLE %ld]" +#: compat/fsmonitor/fsm-ipc-darwin.c +#, c-format +msgid "Invalid path: %s" +msgstr "无效路径： %s" + #: compat/fsmonitor/fsm-listen-darwin.c msgid "Unable to create FSEventStream." msgstr "无法创建 FSEventStream。" @@ -17442,6 +18340,36 @@ msgstr "GetOverlappedResult 失败于 '%s' [GLE %ld]" msgid "could not read directory changes [GLE %ld]" msgstr "无法获取目录变更 [GLE %ld]" +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "opendir('%s') failed" +msgstr "opendir('%s') 失败" + +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "lstat('%s') failed" +msgstr "lstat('%s') 失败" + +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "strbuf_readlink('%s') failed" +msgstr "strbuf_readlink('%s') 失败" + +#: compat/fsmonitor/fsm-path-utils-darwin.c +#, c-format +msgid "closedir('%s') failed" +msgstr "closedir('%s') 失败" + +#: compat/fsmonitor/fsm-path-utils-win32.c +#, c-format +msgid "[GLE %ld] unable to open for read '%ls'" +msgstr "[GLE %ld] 无法打开要读取的 '%ls'" + +#: compat/fsmonitor/fsm-path-utils-win32.c +#, c-format +msgid "[GLE %ld] unable to get protocol information for '%ls'" +msgstr "[GLE %ld] 无法获取 '%ls' 的协议信息 " + #: compat/mingw.c #, c-format msgid "failed to copy SID (%ld)" @@ -17788,8 +18716,8 @@ msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" #: config.c -msgid "core.commentChar should only be one character" -msgstr "core.commentChar 应该是一个字符" +msgid "core.commentChar should only be one ASCII character" +msgstr "core.commentChar 应该是一个 ASCII 编码的字符" #: config.c #, c-format @@ -17835,11 +18763,6 @@ msgid "unable to resolve config blob '%s'" msgstr "不能解析配置对象 '%s'" #: config.c -#, c-format -msgid "failed to parse %s" -msgstr "无法解析 %s" - -#: config.c msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" @@ -17929,6 +18852,11 @@ msgstr "无效的小节名称：%s" #: config.c #, c-format +msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>" +msgstr "拒绝支持内容过长的行，位于文件 '%s' 中的第 %<PRIuMAX> 行" + +#: config.c +#, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺失" @@ -17995,12 +18923,12 @@ msgstr "服务器给出未知的对象格式 '%s'" #: connect.c #, c-format -msgid "invalid ls-refs response: %s" -msgstr "无效的 ls-refs 响应：%s" +msgid "error on bundle-uri response line %d: %s" +msgstr "于 bundle-uri 响应行 %d 发生错误：%s" #: connect.c -msgid "expected flush after ref listing" -msgstr "在引用列表之后应该有一个 flush 包" +msgid "expected flush after bundle-uri listing" +msgstr "在 bundle-uri 列表之后应该有一个 flush 包" #: connect.c msgid "expected response end packet after ref listing" @@ -18008,6 +18936,15 @@ msgstr "在引用列表之后应该有响应结束包" #: connect.c #, c-format +msgid "invalid ls-refs response: %s" +msgstr "无效的 ls-refs 响应：%s" + +#: connect.c +msgid "expected flush after ref listing" +msgstr "在引用列表之后应该有一个 flush 包" + +#: connect.c +#, c-format msgid "protocol '%s' is not supported" msgstr "不支持 '%s' 协议" @@ -18115,229 +19052,6 @@ msgstr "写入 rev-list 失败" msgid "failed to close rev-list's stdin" msgstr "无法关闭 rev-list 的标准输入" -#: contrib/scalar/scalar.c worktree.c -#, c-format -msgid "'%s' does not exist" -msgstr "'%s' 不存在" - -#: contrib/scalar/scalar.c -msgid "need a working directory" -msgstr "需要一个工作目录" - -#: contrib/scalar/scalar.c -msgid "could not find enlistment root" -msgstr "无法找到登记根" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not switch to '%s'" -msgstr "无法切换到 '%s'" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not configure %s=%s" -msgstr "无法配置 %s=%s" - -#: contrib/scalar/scalar.c -msgid "could not configure log.excludeDecoration" -msgstr "无法配置 log.excludeDecoration" - -#: contrib/scalar/scalar.c -msgid "Scalar enlistments require a worktree" -msgstr "Scalar 登记需要一个工作树" - -#: contrib/scalar/scalar.c dir.c -#, c-format -msgid "could not open directory '%s'" -msgstr "不能打开目录 '%s'" - -#: contrib/scalar/scalar.c -#, c-format -msgid "skipping '%s', which is neither file nor directory" -msgstr "跳过 '%s'，既不是文件又不是目录" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not determine free disk size for '%s'" -msgstr "不能确定 '%s' 的空余磁盘空间" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not get info for '%s'" -msgstr "不能获得 '%s' 的信息" - -#: contrib/scalar/scalar.c -#, c-format -msgid "remote HEAD is not a branch: '%.*s'" -msgstr "远程 HEAD 不是一个分支：'%.*s'" - -#: contrib/scalar/scalar.c -msgid "failed to get default branch name from remote; using local default" -msgstr "无法从远程获取默认分支名称；使用本地默认值" - -#: contrib/scalar/scalar.c -msgid "failed to get default branch name" -msgstr "无法获取默认分支名称" - -#: contrib/scalar/scalar.c -msgid "failed to unregister repository" -msgstr "无法取消注册仓库" - -#: contrib/scalar/scalar.c -msgid "failed to delete enlistment directory" -msgstr "无法删除登记目录" - -#: contrib/scalar/scalar.c -msgid "branch to checkout after clone" -msgstr "克隆后要检出的分支" - -#: contrib/scalar/scalar.c -msgid "when cloning, create full working directory" -msgstr "在克隆时，创建完整的工作目录" - -#: contrib/scalar/scalar.c -msgid "only download metadata for the branch that will be checked out" -msgstr "只下载要检出的分支的元信息" - -#: contrib/scalar/scalar.c -msgid "scalar clone [<options>] [--] <repo> [<dir>]" -msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]" - -#: contrib/scalar/scalar.c -#, c-format -msgid "cannot deduce worktree name from '%s'" -msgstr "无法从 '%s' 猜测工作区名称" - -#: contrib/scalar/scalar.c -#, c-format -msgid "directory '%s' exists already" -msgstr "目录 '%s' 已存在" - -#: contrib/scalar/scalar.c -#, c-format -msgid "failed to get default branch for '%s'" -msgstr "无法获取 '%s' 的默认分支" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not configure remote in '%s'" -msgstr "无法在 '%s' 中配置远程" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not configure '%s'" -msgstr "无法配置 '%s'" - -#: contrib/scalar/scalar.c -msgid "partial clone failed; attempting full clone" -msgstr "部分克隆失败；尝试完整克隆" - -#: contrib/scalar/scalar.c -msgid "could not configure for full clone" -msgstr "无法配置完整克隆" - -#: contrib/scalar/scalar.c -msgid "scalar diagnose [<enlistment>]" -msgstr "scalar diagnose [<登记>]" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not create directory for '%s'" -msgstr "不能为 '%s' 创建目录" - -#: contrib/scalar/scalar.c -msgid "could not duplicate stdout" -msgstr "不能复制标准输出" - -#: contrib/scalar/scalar.c -msgid "failed to write archive" -msgstr "无法写入归档" - -#: contrib/scalar/scalar.c -msgid "`scalar list` does not take arguments" -msgstr "`scalar list` 不带参数" - -#: contrib/scalar/scalar.c -msgid "scalar register [<enlistment>]" -msgstr "scalar register [<登记>]" - -#: contrib/scalar/scalar.c -msgid "reconfigure all registered enlistments" -msgstr "重新配置所有注册的登记" - -#: contrib/scalar/scalar.c -msgid "scalar reconfigure [--all | <enlistment>]" -msgstr "scalar reconfigure [--all | <登记>]" - -#: contrib/scalar/scalar.c -msgid "--all or <enlistment>, but not both" -msgstr "--all 或者 <登记>，而不是两个一起" - -#: contrib/scalar/scalar.c -#, c-format -msgid "git repository gone in '%s'" -msgstr "在 '%s' 的 git 仓库已消失" - -#: contrib/scalar/scalar.c -msgid "" -"scalar run <task> [<enlistment>]\n" -"Tasks:\n" -msgstr "" -"scalar run <任务> [<登记>]\n" -"任务：\n" - -#: contrib/scalar/scalar.c -#, c-format -msgid "no such task: '%s'" -msgstr "没有此任务：'%s'" - -#: contrib/scalar/scalar.c -msgid "scalar unregister [<enlistment>]" -msgstr "scalar unregister [<登记>]" - -#: contrib/scalar/scalar.c -msgid "scalar delete <enlistment>" -msgstr "scalar delete <登记>" - -#: contrib/scalar/scalar.c -msgid "refusing to delete current working directory" -msgstr "拒绝删除当前工作目录" - -#: contrib/scalar/scalar.c -msgid "include Git version" -msgstr "包括 Git 的版本" - -#: contrib/scalar/scalar.c -msgid "include Git's build options" -msgstr "包括 Git 的构建选项" - -#: contrib/scalar/scalar.c -msgid "scalar verbose [-v | --verbose] [--build-options]" -msgstr "scalar verbose [-v | --verbose] [--build-options]" - -#: contrib/scalar/scalar.c -msgid "-C requires a <directory>" -msgstr "-C 需要 <目录>" - -#: contrib/scalar/scalar.c -#, c-format -msgid "could not change to '%s'" -msgstr "无法变更到 '%s'" - -#: contrib/scalar/scalar.c -msgid "-c requires a <key>=<value> argument" -msgstr "-c 需要 <键>=<值> 参数" - -#: contrib/scalar/scalar.c -msgid "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" -"\n" -"Commands:\n" -msgstr "" -"scalar [-C <目录>] [-c <键>=<值>] <命令> [<选项>]\n" -"\n" -"命令：\n" - #: convert.c #, c-format msgid "illegal crlf_action %d" @@ -18578,15 +19292,44 @@ msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 msgid "Marked %d islands, done.\n" msgstr "已标记 %d 个数据岛，结束。\n" +#: diagnose.c +#, c-format +msgid "invalid --%s value '%s'" +msgstr "无效的 --%s 值 '%s'" + +#: diagnose.c +#, c-format +msgid "could not archive missing directory '%s'" +msgstr "无法归档缺失的目录 '%s'" + +#: diagnose.c dir.c +#, c-format +msgid "could not open directory '%s'" +msgstr "无法打开目录 '%s'" + +#: diagnose.c +#, c-format +msgid "skipping '%s', which is neither file nor directory" +msgstr "跳过 '%s'，既不是文件又不是目录" + +#: diagnose.c +msgid "could not duplicate stdout" +msgstr "无法复制标准输出" + +#: diagnose.c +#, c-format +msgid "could not add directory '%s' to archiver" +msgstr "无法添加目录 '%s' 至归档器" + +#: diagnose.c +msgid "failed to write archive" +msgstr "无法写入归档" + #: diff-lib.c msgid "--merge-base does not work with ranges" msgstr "--merge-base 不适用于范围" #: diff-lib.c -msgid "--merge-base only works with commits" -msgstr "--merge-base 仅适用于提交" - -#: diff-lib.c msgid "unable to get HEAD" msgstr "不能解析 HEAD" @@ -18599,6 +19342,14 @@ msgid "multiple merge bases found" msgstr "找到了多条合并基线" #: diff-no-index.c +msgid "cannot compare stdin to a directory" +msgstr "无法将标准输入和目录进行比较" + +#: diff-no-index.c +msgid "cannot compare a named pipe to a directory" +msgstr "无法将命名管道和目录进行比较" + +#: diff-no-index.c msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<选项>] <路径> <路径>" @@ -18648,6 +19399,11 @@ msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模 msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" +#: diff.c transport.c +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "配置 '%s' 未知的取值：%s" + #: diff.c #, c-format msgid "" @@ -18662,6 +19418,15 @@ msgstr "" msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" +#: diff.c +msgid "--follow requires exactly one pathspec" +msgstr "--follow 明确要求只跟一个路径规格" + +#: diff.c +#, c-format +msgid "pathspec magic not supported by --follow: %s" +msgstr "指定 --follow: %s 的同时，不支持在路径规格中使用神奇前缀" + #: diff.c parse-options.c #, c-format msgid "options '%s', '%s', '%s', and '%s' cannot be used together" @@ -18679,10 +19444,6 @@ msgid "" msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 和 '%5$s' 一起使用 '%3$s'" #: diff.c -msgid "--follow requires exactly one pathspec" -msgstr "--follow 明确要求只跟一个路径规格" - -#: diff.c #, c-format msgid "invalid --stat value: %s" msgstr "无效的 --stat 值：%s" @@ -18737,13 +19498,6 @@ msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的无效模式 '%s' " #: diff.c -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" - -#: diff.c #, c-format msgid "invalid argument to %s" msgstr "%s 的参数无效" @@ -18800,8 +19554,8 @@ msgid "output only the last line of --stat" msgstr "只输出 --stat 的最后一行" #: diff.c -msgid "<param1,param2>..." -msgstr "<参数1,参数2>..." +msgid "<param1>,<param2>..." +msgstr "<参数1>,<参数2>..." #: diff.c msgid "" @@ -18813,8 +19567,8 @@ msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同义" #: diff.c -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "是 --dirstat=files,param1,param2... 的同义词" +msgid "synonym for --dirstat=files,<param1>,<param2>..." +msgstr "是 --dirstat=files,<参数1>,<参数2>... 的同义词" #: diff.c msgid "warn if changes introduce conflict markers or whitespace errors" @@ -18919,6 +19673,10 @@ msgid "do not show any source or destination prefix" msgstr "不显示任何源和目标前缀" #: diff.c +msgid "use default prefixes a/ and b/" +msgstr "使用 a/ 和 b/ 作为默认前缀" + +#: diff.c msgid "show context between diff hunks up to the specified number of lines" msgstr "显示指定行数的差异块间的上下文" @@ -19033,14 +19791,6 @@ msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 算法生成差异" #: diff.c -msgid "<algorithm>" -msgstr "<算法>" - -#: diff.c -msgid "choose a diff algorithm" -msgstr "选择一个差异算法" - -#: diff.c msgid "<text>" msgstr "<文本>" @@ -19287,6 +20037,16 @@ msgstr "不能从 '%s' 迁移 git 目录到 '%s'" msgid "hint: Waiting for your editor to close the file...%c" msgstr "提示：等待您的编辑器关闭文件...%c" +#: editor.c sequencer.c wrapper.c +#, c-format +msgid "could not write to '%s'" +msgstr "不能写入 '%s'" + +#: editor.c +#, c-format +msgid "could not edit '%s'" +msgstr "不能编辑 '%s'" + #: entry.c msgid "Filtering content" msgstr "过滤内容" @@ -19328,6 +20088,10 @@ msgid "unable to write to remote" msgstr "无法写到远程" #: fetch-pack.c +msgid "Server supports filter" +msgstr "服务器支持 filter" + +#: fetch-pack.c #, c-format msgid "invalid shallow line: %s" msgstr "无效的 shallow 信息：%s" @@ -19469,10 +20233,6 @@ msgid "Server does not support shallow requests" msgstr "服务器不支持浅克隆请求" #: fetch-pack.c -msgid "Server supports filter" -msgstr "服务器支持 filter" - -#: fetch-pack.c msgid "unable to write request to remote" msgstr "无法将请求写到远程" @@ -19596,8 +20356,9 @@ msgstr "虚拟仓库 '%s' 与 fsmonitor 不兼容" #: fsmonitor-settings.c #, c-format msgid "" -"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets" -msgstr "因为缺少 Unix 套接字，仓库 '%s' 与 fsmonitor 不兼容" +"socket directory '%s' is incompatible with fsmonitor due to lack of Unix " +"sockets support" +msgstr "因为缺少 Unix 套接字支持，套接字目录 '%s' 与 fsmonitor 不兼容" #: git.c msgid "" @@ -19606,16 +20367,14 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" -" <command> [<args>]" +" [--config-env=<name>=<envvar>] <command> [<args>]" msgstr "" -"git [-v | --version] [--help] [-C <路径>] [-c <名称>=<取值>]\n" +"git [-v | --version] [-h | --help] [-C <路径>] [-c <名称>=<取值>]\n" " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n" -" [--super-prefix=<路径>] [--config-env=<名称>=<环境变量>]\n" -" <命令> [<参数>]" +" [--config-env=<名称>=<环境变量>] <命令> [<参数>]" #: git.c msgid "" @@ -19646,11 +20405,6 @@ msgstr "没有为 --namespace 提供命名空间\n" #: git.c #, c-format -msgid "no prefix given for --super-prefix\n" -msgstr "没有为 --super-prefix 提供前缀\n" - -#: git.c -#, c-format msgid "-c expects a configuration string\n" msgstr "应为 -c 提供一个配置字符串\n" @@ -19661,6 +20415,11 @@ msgstr "没有为 --config-env 提供配置名称\n" #: git.c #, c-format +msgid "no attribute source given for --attr-source\n" +msgstr "没有为 --attr-source 提供属性来源\n" + +#: git.c +#, c-format msgid "unknown option: %s\n" msgstr "未知选项：%s\n" @@ -19783,8 +20542,13 @@ msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s" #: gpg-interface.c -msgid "gpg failed to sign the data" -msgstr "gpg 无法为数据签名" +#, c-format +msgid "" +"gpg failed to sign the data:\n" +"%s" +msgstr "" +"gpg 无法为数据签名：\n" +"%s" #: gpg-interface.c msgid "user.signingKey needs to be set for ssh signing" @@ -19887,6 +20651,14 @@ msgid "Low-level Commands / Internal Helpers" msgstr "低级命令/内部助手" #: help.c +msgid "User-facing repository, command and file interfaces" +msgstr "面向用户的仓库、命令和文件接口" + +#: help.c +msgid "Developer-facing file formats, protocols and other interfaces" +msgstr "面向开发者的文件格式、协议和其他接口" + +#: help.c #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" @@ -19904,6 +20676,14 @@ msgid "The Git concept guides are:" msgstr "Git 概念向导有：" #: help.c +msgid "User-facing repository, command and file interfaces:" +msgstr "面向用户的仓库、命令和文件接口：" + +#: help.c +msgid "File formats, protocols and other developer interfaces:" +msgstr "文件格式、协议和其他开发者接口列表：" + +#: help.c msgid "External commands" msgstr "外部命令" @@ -19968,8 +20748,8 @@ msgstr[1] "" "最相似的命令是" #: help.c -msgid "git version [<options>]" -msgstr "git version [<选项>]" +msgid "git version [--build-options]" +msgstr "git version [--build-options]" #: help.c #, c-format @@ -19999,11 +20779,6 @@ msgstr "" "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n" "配置 `git config advice.ignoredHook false` 来关闭这条警告。" -#: hook.c -#, c-format -msgid "Couldn't start hook '%s'\n" -msgstr "不能启动钩子 '%s'\n" - #: http-fetch.c #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" @@ -20221,20 +20996,16 @@ msgstr "在 ls-refs 参数后应该有一个 flush 包" msgid "quoted CRLF detected" msgstr "检测到被引用的 CRLF" -#: merge-ort-wrappers.c merge-recursive.c -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"您对下列文件的本地修改将被合并操作覆盖：\n" -" %s" - #: merge-ort.c merge-recursive.c #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "无法合并子模组 %s （没有检出）" +#: merge-ort.c +#, c-format +msgid "Failed to merge submodule %s (no merge base)" +msgstr "无法合并子模组 %s （没有合并基线）" + #: merge-ort.c merge-recursive.c #, c-format msgid "Failed to merge submodule %s (commits not present)" @@ -20258,27 +21029,8 @@ msgstr "无法合并子模组 %s" #: merge-ort.c #, c-format msgid "" -"Failed to merge submodule %s, but a possible merge resolution exists:\n" -"%s\n" -msgstr "" -"无法合并子模组 %s，但是存在一个可能的合并方案：\n" -"%s\n" - -#: merge-ort.c merge-recursive.c -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"如果这个正确，将其添加到索引，例如使用命令：\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"以接受此建议。\n" +"Failed to merge submodule %s, but a possible merge resolution exists: %s" +msgstr "无法合并子模组 %s，但是存在一个可能的合并方案：%s" #: merge-ort.c #, c-format @@ -20290,12 +21042,12 @@ msgstr "" "%s" #: merge-ort.c merge-recursive.c -msgid "Failed to execute internal merge" +msgid "failed to execute internal merge" msgstr "无法执行内部合并" #: merge-ort.c merge-recursive.c #, c-format -msgid "Unable to add %s to database" +msgid "unable to add %s to database" msgstr "不能添加 %s 至对象库" #: merge-ort.c merge-recursive.c @@ -20455,12 +21207,45 @@ msgstr "" "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本" "在树中被保留。" +#. TRANSLATORS: This is a line of advice to resolve a merge +#. conflict in a submodule. The first argument is the submodule +#. name, and the second argument is the abbreviated id of the +#. commit that needs to be merged. For example: +#. - go to submodule (mysubmodule), and either merge commit abc1234" +#. #: merge-ort.c #, c-format msgid "" -"Note: %s not up to date and in way of checking out conflicted version; old " -"copy renamed to %s" -msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副本重命名为 %s" +" - go to submodule (%s), and either merge commit %s\n" +" or update to an existing commit which has merged those changes\n" +msgstr "" +" - 进入子模组（%s），要么合并提交 %s\n" +" 要么更新至已合并这些变更的提交\n" + +#: merge-ort.c +#, c-format +msgid "" +"Recursive merging with submodules currently only supports trivial cases.\n" +"Please manually handle the merging of each conflicted submodule.\n" +"This can be accomplished with the following steps:\n" +"%s - come back to superproject and run:\n" +"\n" +" git add %s\n" +"\n" +" to record the above merge or update\n" +" - resolve any other conflicts in the superproject\n" +" - commit the resulting index in the superproject\n" +msgstr "" +"子模组内的递归合并现在只支持简单的情况。\n" +"请手动合并每个有冲突的子模组。\n" +"这可以通过下列步骤完成：\n" +"%s - 回到上级项目并运行：\n" +"\n" +" git add %s\n" +"\n" +" 来记录上述的合并或更新\n" +" - 解决上级项目中的其他冲突\n" +" - 提交上级项目中的结果索引\n" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. @@ -20549,6 +21334,22 @@ msgstr "找到子模组的一个可能的合并方案：\n" #: merge-recursive.c #, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"如果这个正确，将其添加到索引，例如使用命令：\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"以接受此建议。\n" + +#: merge-recursive.c +#, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "无法合并子模组 %s （发现多个合并）" @@ -20742,7 +21543,21 @@ msgstr "无法读取缓存" #: midx.c msgid "multi-pack-index OID fanout is of the wrong size" -msgstr "多包索引的对象ID扇出表大小错误" +msgstr "多包索引的对象 ID 扇出表大小错误" + +#: midx.c +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" +msgstr "对象 ID 扇出失序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" + +#: midx.c +msgid "multi-pack-index OID lookup chunk is the wrong size" +msgstr "多包索引的对象 ID 查询块大小错误" + +#: midx.c +msgid "multi-pack-index object offset chunk is the wrong size" +msgstr "多包索引的对象 ID 偏移块大小错误" #: midx.c #, c-format @@ -20765,20 +21580,24 @@ msgid "multi-pack-index hash version %u does not match version %u" msgstr "多包索引哈希版本 %u 和版本 %u 不匹配" #: midx.c -msgid "multi-pack-index missing required pack-name chunk" -msgstr "多包索引缺少必需的包名块" +msgid "multi-pack-index required pack-name chunk missing or corrupted" +msgstr "多包索引必需的包名块缺失或损坏" + +#: midx.c +msgid "multi-pack-index required OID fanout chunk missing or corrupted" +msgstr "多包索引必需的对象 ID 扇出块缺失或损坏" #: midx.c -msgid "multi-pack-index missing required OID fanout chunk" -msgstr "多包索引缺少必需的对象 ID 扇出块" +msgid "multi-pack-index required OID lookup chunk missing or corrupted" +msgstr "多包索引必需的对象 ID 查询块缺失或损坏" #: midx.c -msgid "multi-pack-index missing required OID lookup chunk" -msgstr "多包索引缺少必需的对象 ID 查询块" +msgid "multi-pack-index required object offsets chunk missing or corrupted" +msgstr "多包索引必需的对象偏移块缺少或损坏" #: midx.c -msgid "multi-pack-index missing required object offsets chunk" -msgstr "多包索引缺少必需的对象偏移块" +msgid "multi-pack-index pack-name chunk is too short" +msgstr "多包索引包名块过短" #: midx.c #, c-format @@ -20791,10 +21610,23 @@ msgid "bad pack-int-id: %u (%u total packs)" msgstr "错的 pack-int-id：%u（共有 %u 个包）" #: midx.c +msgid "MIDX does not contain the BTMP chunk" +msgstr "多包索引中未包含 BTMP 块" + +#: midx.c +#, c-format +msgid "could not load bitmapped pack %<PRIu32>" +msgstr "不能打开已被位图索引的包 %<PRIu32>" + +#: midx.c msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引存储一个64位偏移，但是 off_t 太小" #: midx.c +msgid "multi-pack-index large offset out of bounds" +msgstr "多包索引大偏移区越界" + +#: midx.c #, c-format msgid "failed to add packfile '%s'" msgstr "无法添加包文件 '%s'" @@ -20894,12 +21726,6 @@ msgid "Looking for referenced packfiles" msgstr "正在查找引用的包文件" #: midx.c -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" - -#: midx.c msgid "the midx contains no oid" msgstr "midx 不包含 oid" @@ -21021,11 +21847,6 @@ msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略备用对象库，嵌套太深" #: object-file.c -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "无法规范化对象目录: %s" - -#: object-file.c msgid "unable to fdopen alternates lockfile" msgstr "无法 fdopen 替换锁文件" @@ -21099,6 +21920,11 @@ msgstr "松散对象 '%s' 后面有垃圾数据" #: object-file.c #, c-format +msgid "unable to open loose object %s" +msgstr "无法打开松散对象 %s" + +#: object-file.c +#, c-format msgid "unable to parse %s header" msgstr "无法解析 %s 头部" @@ -21118,8 +21944,8 @@ msgstr "%s 的头部太长，超出了 %d 字节" #: object-file.c #, c-format -msgid "failed to read object %s" -msgstr "无法读取对象 %s" +msgid "loose object %s (stored in %s) is corrupt" +msgstr "松散对象 %s（保存在 %s）已损坏" #: object-file.c #, c-format @@ -21128,11 +21954,6 @@ msgstr "找不到 %2$s 的替代 %1$s" #: object-file.c #, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "松散对象 %s（保存在 %s）已损坏" - -#: object-file.c -#, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包对象 %s（保存在 %s）已损坏" @@ -21147,10 +21968,6 @@ msgid "unable to set permission to '%s'" msgstr "无法为 '%s' 设置权限" #: object-file.c -msgid "file write error" -msgstr "文件写错误" - -#: object-file.c msgid "error when closing loose object file" msgstr "关闭松散对象文件时出错" @@ -21184,16 +22001,37 @@ msgstr "被 %s 的不稳定对象源数据搞糊涂了" #: object-file.c #, c-format +msgid "write stream object %ld != %<PRIuMAX>" +msgstr "写入流对象 %ld != %<PRIuMAX>" + +#: object-file.c +#, c-format +msgid "unable to stream deflate new object (%d)" +msgstr "不能流式压缩新对象（%d）" + +#: object-file.c +#, c-format +msgid "deflateEnd on stream object failed (%d)" +msgstr "在流对象上调用 deflateEnd 失败（%d）" + +#: object-file.c +#, c-format +msgid "unable to create directory %s" +msgstr "无法创建目录 %s" + +#: object-file.c +#, c-format msgid "cannot read object for %s" msgstr "不能读取对象 %s" #: object-file.c -msgid "corrupt commit" -msgstr "损坏的提交" +#, c-format +msgid "object fails fsck: %s" +msgstr "对象 fsck 失败：%s" #: object-file.c -msgid "corrupt tag" -msgstr "损坏的标签" +msgid "refusing to create malformed object" +msgstr "拒绝创建格式错误的对象" #: object-file.c #, c-format @@ -21447,6 +22285,66 @@ msgstr "不能解析对象：%s" msgid "hash mismatch %s" msgstr "哈希值与 %s 不匹配" +#: pack-bitmap-write.c +msgid "trying to write commit not in index" +msgstr "尝试写入未在索引中的提交" + +#: pack-bitmap.c +msgid "failed to load bitmap index (corrupted?)" +msgstr "无法载入位图索引（已损坏？）" + +#: pack-bitmap.c +msgid "corrupted bitmap index (too small)" +msgstr "损坏的位图索引（太小）" + +#: pack-bitmap.c +msgid "corrupted bitmap index file (wrong header)" +msgstr "损坏的位图索引（错误的文件头）" + +#: pack-bitmap.c +#, c-format +msgid "unsupported version '%d' for bitmap index file" +msgstr "不支持的位图索引文件版本 '%d'" + +#: pack-bitmap.c +msgid "corrupted bitmap index file (too short to fit hash cache)" +msgstr "损坏的位图索引（太小，容不下哈希缓存）" + +#: pack-bitmap.c +msgid "corrupted bitmap index file (too short to fit lookup table)" +msgstr "损坏的位图索引（太小，容不下查询表）" + +#: pack-bitmap.c +#, c-format +msgid "duplicate entry in bitmap index: '%s'" +msgstr "位图索引中的重复条目：'%s'" + +#: pack-bitmap.c +#, c-format +msgid "corrupt ewah bitmap: truncated header for entry %d" +msgstr "损坏的 EWAH 位图：条目 %d 截断的文件头" + +#: pack-bitmap.c +#, c-format +msgid "corrupt ewah bitmap: commit index %u out of range" +msgstr "损坏的 EWAH 位图：提交索引 %u 超出范围" + +#: pack-bitmap.c +msgid "corrupted bitmap pack index" +msgstr "损坏的位图包索引" + +#: pack-bitmap.c +msgid "invalid XOR offset in bitmap pack index" +msgstr "位图包索引中 XOR 偏移值无效" + +#: pack-bitmap.c +msgid "cannot fstat bitmap file" +msgstr "不能对位图文件调用 fstat" + +#: pack-bitmap.c +msgid "checksum doesn't match in MIDX and bitmap" +msgstr "MIDX 和位图中的校验码不匹配" + #: pack-bitmap.c msgid "multi-pack bitmap is missing required reverse index" msgstr "多包位图缺少必需的反向索引" @@ -21456,15 +22354,89 @@ msgstr "多包位图缺少必需的反向索引" msgid "could not open pack %s" msgstr "不能打开包 %s" +#: pack-bitmap.c t/helper/test-read-midx.c +msgid "could not determine MIDX preferred pack" +msgstr "不能确定多包索引的首选包" + #: pack-bitmap.c #, c-format msgid "preferred pack (%s) is invalid" msgstr "首选包 (%s) 无效" #: pack-bitmap.c +msgid "corrupt bitmap lookup table: triplet position out of index" +msgstr "损坏的位图查询表：三元组位置超出索引" + +#: pack-bitmap.c +msgid "corrupt bitmap lookup table: xor chain exceeds entry count" +msgstr "损坏的位图查询表：xor 链超出条目数" + +#: pack-bitmap.c +#, c-format +msgid "corrupt bitmap lookup table: commit index %u out of range" +msgstr "损坏的位图查询表：提交索引 %u 超出范围" + +#: pack-bitmap.c +#, c-format +msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" +msgstr "损坏的 EWAH 位图：提交 \"%s\" 位图的文件头被截断" + +#: pack-bitmap.c +#, c-format +msgid "unable to load pack: '%s', disabling pack-reuse" +msgstr "无法打开包：'%s'，禁用包重用" + +#: pack-bitmap.c +#, c-format +msgid "object '%s' not found in type bitmaps" +msgstr "对象 %s 为在类型位图中找到" + +#: pack-bitmap.c +#, c-format +msgid "object '%s' does not have a unique type" +msgstr "对象 '%s' 没有唯一的类型" + +#: pack-bitmap.c +#, c-format +msgid "object '%s': real type '%s', expected: '%s'" +msgstr "对象 '%s'：实际类型 '%s'，预期：'%s'" + +#: pack-bitmap.c +#, c-format +msgid "object not in bitmap: '%s'" +msgstr "对象不在位图中：%s" + +#: pack-bitmap.c +msgid "failed to load bitmap indexes" +msgstr "无法载入位图索引" + +#: pack-bitmap.c +msgid "you must specify exactly one commit to test" +msgstr "您必须准确指定一个提交来测试" + +#: pack-bitmap.c #, c-format -msgid "could not find %s in pack %s at offset %<PRIuMAX>" -msgstr "在包 %2$s 偏移 %3$<PRIuMAX> 中无法找到 %1$s" +msgid "commit '%s' doesn't have an indexed bitmap" +msgstr "提交 '%s' 没有索引位图" + +#: pack-bitmap.c +msgid "mismatch in bitmap results" +msgstr "位图结果不一致" + +#: pack-bitmap.c +#, c-format +msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" +msgstr "无法在包 '%2$s' 偏移 %3$<PRIuMAX> 中找到 '%1$s'" + +#: pack-bitmap.c +#, c-format +msgid "unable to get disk usage of '%s'" +msgstr "无法得到 '%s' 的磁盘使用量" + +#: pack-bitmap.c +#, c-format +msgid "bitmap file '%s' has invalid checksum" +msgstr "位图文件 '%s' 有无效的校验码" #: pack-mtimes.c #, c-format @@ -21516,6 +22488,23 @@ msgstr "反向索引文件 %s 不支持的版本 %<PRIu32>" msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "反向索引文件 %s 有不支持的哈希 ID %<PRIu32>" +#: pack-revindex.c +msgid "invalid checksum" +msgstr "无效的校验码 %s" + +#: pack-revindex.c +#, c-format +msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>" +msgstr "位于 %<PRIu64> 的无效的反向索引：%<PRIu32> != %<PRIu32>" + +#: pack-revindex.c +msgid "multi-pack-index reverse-index chunk is the wrong size" +msgstr "多包索引的反向索引块大小错误" + +#: pack-revindex.c +msgid "could not determine preferred pack" +msgstr "无法确定首选包" + #: pack-write.c msgid "cannot both write and verify reverse index" msgstr "无法同时写入和校验反向索引" @@ -21581,16 +22570,6 @@ msgstr "%s 需要一个值" #: parse-options.c #, c-format -msgid "%s is incompatible with %s" -msgstr "%s 与 %s 不兼容" - -#: parse-options.c -#, c-format -msgid "%s : incompatible with something else" -msgstr "%s：和其它的不兼容" - -#: parse-options.c -#, c-format msgid "%s takes no value" msgstr "%s 不取值" @@ -21620,6 +22599,10 @@ msgid "alias of --%s" msgstr "--%s 的别名" #: parse-options.c +msgid "need a subcommand" +msgstr "需要一个子命令" + +#: parse-options.c #, c-format msgid "unknown option `%s'" msgstr "未知选项 `%s'" @@ -21685,6 +22668,11 @@ msgstr " %s" msgid "-NUM" msgstr "-数字" +#: parse-options.c +#, c-format +msgid "opposite of --no-%s" +msgstr "与 --no-%s 相反" + #: parse-options.h msgid "expiry-date" msgstr "到期时间" @@ -21706,6 +22694,10 @@ msgid "use <n> digits to display object names" msgstr "用 <n> 位数字显示对象名" #: parse-options.h +msgid "prefixed path to initial superproject" +msgstr "用来初始化父项目的前缀路径" + +#: parse-options.h msgid "how to strip spaces and #comments from message" msgstr "设置如何删除提交说明里的空格和#注释" @@ -21718,6 +22710,16 @@ msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "使用 --pathspec-from-file，路径表达式用空字符分隔" +#: parse.c +#, c-format +msgid "bad boolean environment value '%s' for '%s'" +msgstr "对于 '%2$s' 的错误的布尔环境取值 '%1$s'" + +#: parse.c +#, c-format +msgid "failed to parse %s" +msgstr "无法解析 %s" + #: path.c #, c-format msgid "Could not make %s writable by group" @@ -21776,6 +22778,11 @@ msgstr "%s：'literal' 和 'glob' 不兼容" #: pathspec.c #, c-format +msgid "'%s' is outside the directory tree" +msgstr "'%s' 位于目录树之外" + +#: pathspec.c +#, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "%s：'%s' 在位于 '%s' 的仓库之外" @@ -21885,6 +22892,11 @@ msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入" msgid "promisor remote name cannot begin with '/': %s" msgstr "promisor 远程名称不能以 '/' 开始：%s" +#: promisor-remote.c +#, c-format +msgid "could not fetch %s from promisor remote" +msgstr "无法从承诺者远程获取 %s" + #: protocol-caps.c msgid "object-info: expected flush after arguments" msgstr "object-info：在参数之后应有一个 flush" @@ -21927,6 +22939,15 @@ msgstr "无法生成 diff" msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日志" +#: reachable.c +#, c-format +msgid "invalid extra cruft tip: '%s'" +msgstr "无效的额外废弃提交版本：'%s'" + +#: reachable.c +msgid "unable to enumerate additional recent objects" +msgstr "无法枚举额外的近期对象" + #: read-cache.c #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" @@ -21953,11 +22974,6 @@ msgstr "无法在索引中添加 '%s'" #: read-cache.c #, c-format -msgid "unable to stat '%s'" -msgstr "无法对 %s 执行 stat" - -#: read-cache.c -#, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起来既是文件又是目录" @@ -22091,11 +23107,6 @@ msgstr "无法转换为稀疏索引" #: read-cache.c #, c-format -msgid "could not stat '%s'" -msgstr "不能对 '%s' 调用 stat" - -#: read-cache.c -#, c-format msgid "unable to open git dir: %s" msgstr "不能打开 git 目录：%s" @@ -22114,6 +23125,16 @@ msgstr "不能修复 '%s' 的权限位" msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暂存区 #0" +#: read-cache.c +#, c-format +msgid "unexpected diff status %c" +msgstr "意外的差异状态 %c" + +#: read-cache.c +#, c-format +msgid "remove '%s'\n" +msgstr "删除 '%s'\n" + #: rebase-interactive.c msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -22147,9 +23168,12 @@ msgid "" "l, label <label> = label current HEAD with a name\n" "t, reset <label> = reset HEAD to a label\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified); use -c <commit> to reword the commit message\n" +" create a merge commit using the original merge commit's\n" +" message (or the oneline, if no original merge commit was\n" +" specified); use -c <commit> to reword the commit message\n" +"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n" +" to this position in the new commits. The <ref> is\n" +" updated at the end of the rebase\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -22157,7 +23181,7 @@ msgstr "" "命令:\n" "p, pick <提交> = 使用提交\n" "r, reword <提交> = 使用提交，但编辑提交说明\n" -"e, edit <提交> = 使用提交，但停止以便在 shell 中修补提交\n" +"e, edit <提交> = 使用提交，但停止以便修补提交\n" "s, squash <提交> = 使用提交，但挤压到前一个提交\n" "f, fixup [-C | -c] <提交> = 类似于 \"squash\"，但只保留前一个提交\n" " 的提交说明，除非使用了 -C 参数，此情况下则只\n" @@ -22172,6 +23196,9 @@ msgstr "" ". 创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n" ". 原始提交，使用注释部分的 oneline 作为提交说明）。使用\n" ". -c <提交> 可以编辑提交说明。\n" +"u, update-ref <引用> = 为引用 <ref> 设置一个占位符，以将该引用更新为此处的新" +"提交。\n" +" 此 <引用> 在变基结束后更新。\n" "\n" "可以对这些行重新排序，将从上至下执行。\n" @@ -22278,6 +23305,16 @@ msgstr "领先 %d，落后 %d" #: ref-filter.c #, c-format +msgid "%%(%.*s) does not take arguments" +msgstr "%%(%.*s) 不带参数" + +#: ref-filter.c +#, c-format +msgid "unrecognized %%(%.*s) argument: %s" +msgstr "未能识别的 %%(%.*s) 参数：%s" + +#: ref-filter.c +#, c-format msgid "expected format: %%(color:<color>)" msgstr "期望的格式：%%(color:<颜色>)" @@ -22298,38 +23335,38 @@ msgstr "期望整数值 refname:rstrip=%s" #: ref-filter.c #, c-format -msgid "unrecognized %%(%s) argument: %s" -msgstr "未能识别的 %%(%s) 参数：%s" +msgid "expected %%(trailers:key=<value>)" +msgstr "预期 %%(trailers:key=<值>)" #: ref-filter.c #, c-format -msgid "%%(objecttype) does not take arguments" -msgstr "%%(objecttype) 不带参数" +msgid "unknown %%(trailers) argument: %s" +msgstr "未知的 %%(trailers) 参数：%s" #: ref-filter.c #, c-format -msgid "%%(deltabase) does not take arguments" -msgstr "%%(deltabase) 不带参数" +msgid "positive value expected contents:lines=%s" +msgstr "期望一个正数 contents:lines=%s" #: ref-filter.c #, c-format -msgid "%%(body) does not take arguments" -msgstr "%%(body) 不带参数" +msgid "argument expected for %s" +msgstr "预期参数 %s" #: ref-filter.c #, c-format -msgid "expected %%(trailers:key=<value>)" -msgstr "预期 %%(trailers:key=<值>)" +msgid "positive value expected %s=%s" +msgstr "预期正数参数值 %s=%s" #: ref-filter.c #, c-format -msgid "unknown %%(trailers) argument: %s" -msgstr "未知的 %%(trailers) 参数：%s" +msgid "cannot fully parse %s=%s" +msgstr "不能完整解析 %s=%s" #: ref-filter.c #, c-format -msgid "positive value expected contents:lines=%s" -msgstr "期望一个正数 contents:lines=%s" +msgid "value expected %s=" +msgstr "预期值 %s=" #: ref-filter.c #, c-format @@ -22338,11 +23375,6 @@ msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数" #: ref-filter.c #, c-format -msgid "unrecognized email option: %s" -msgstr "未识别的邮件选项：%s" - -#: ref-filter.c -#, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "期望的格式：%%(align:<宽度>,<位置>)" @@ -22358,13 +23390,18 @@ msgstr "未能识别的宽度：%s" #: ref-filter.c #, c-format +msgid "unrecognized %%(%s) argument: %s" +msgstr "未能识别的 %%(%s) 参数：%s" + +#: ref-filter.c +#, c-format msgid "positive width expected with the %%(align) atom" msgstr "元素 %%(align) 需要一个正数的宽度" #: ref-filter.c #, c-format -msgid "%%(rest) does not take arguments" -msgstr "%%(rest) 不带参数" +msgid "expected format: %%(ahead-behind:<committish>)" +msgstr "期望的格式：%%(ahead-behind:<提交号>)" #: ref-filter.c #, c-format @@ -22423,6 +23460,10 @@ msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "--format=%.*s 不能和 --python、--shell、--tcl 同时使用" #: ref-filter.c +msgid "failed to run 'describe'" +msgstr "无法运行 'describe'" + +#: ref-filter.c #, c-format msgid "(no branch, rebasing %s)" msgstr "（非分支，正变基 %s）" @@ -22499,6 +23540,10 @@ msgstr "key" msgid "field name to sort on" msgstr "排序的字段名" +#: ref-filter.h +msgid "exclude refs which match pattern" +msgstr "排除与 <模式> 相匹配的引用" + #: reflog.c #, c-format msgid "not a reflog: %s" @@ -22601,17 +23646,12 @@ msgstr "'%s' 已存在，无法创建 '%s'" msgid "cannot process '%s' and '%s' at the same time" msgstr "无法同时处理 '%s' 和 '%s'" -#: refs/files-backend.c -#, c-format -msgid "could not remove reference %s" -msgstr "无法删除引用 %s" - -#: refs/files-backend.c refs/packed-backend.c +#: refs.c #, c-format msgid "could not delete reference %s: %s" msgstr "无法删除引用 %s：%s" -#: refs/files-backend.c refs/packed-backend.c +#: refs.c #, c-format msgid "could not delete references: %s" msgstr "无法删除引用：%s" @@ -22738,6 +23778,15 @@ msgid "http transport does not support %s" msgstr "http 传输协议不支持 %s" #: remote-curl.c +msgid "protocol error: expected '<url> <path>', missing space" +msgstr "协议错误：预期 '<url> <path>'，缺少空格" + +#: remote-curl.c +#, c-format +msgid "failed to download file at URL '%s'" +msgstr "无法下载位于 URL '%s' 的文件" + +#: remote-curl.c msgid "git-http-push failed" msgstr "git-http-push 失败" @@ -23019,8 +24068,9 @@ msgstr[1] "" # 译者：注意保持前导空格 #: remote.c -msgid " (use \"git pull\" to merge the remote branch into yours)\n" -msgstr " （使用 \"git pull\" 来合并远程分支）\n" +msgid "" +" (use \"git pull\" if you want to integrate the remote branch with yours)\n" +msgstr " （如果您想将远程分支与您的更改合并，请使用 \"git pull\"）\n" #: remote.c #, c-format @@ -23112,11 +24162,6 @@ msgstr "没有为 '%s' 记忆的解决方案" #: rerere.c #, c-format -msgid "cannot unlink '%s'" -msgstr "不能删除 '%s'" - -#: rerere.c -#, c-format msgid "Updated preimage for '%s'" msgstr "已为 '%s' 更新 preimage" @@ -23143,10 +24188,34 @@ msgid "failed to find tree of %s" msgstr "无法找到 %s 指向的树" #: revision.c +#, c-format +msgid "unsupported section for hidden refs: %s" +msgstr "不支持的隐藏引用片段： %s" + +#: revision.c +msgid "--exclude-hidden= passed more than once" +msgstr "--exclude-hidden= 传递了不止一次" + +#: revision.c +#, c-format +msgid "resolve-undo records `%s` which is missing" +msgstr "resolve-undo 记录 `%s`，现缺失" + +#: revision.c +#, c-format +msgid "could not get commit for ancestry-path argument %s" +msgstr "无法获得 ancestry-path 参数 %s 的提交" + +#: revision.c msgid "--unpacked=<packfile> no longer supported" msgstr "不再支持 --unpacked=<packfile>" #: revision.c +#, c-format +msgid "invalid option '%s' in --stdin mode" +msgstr "在 --stdin 模式下的无效选项：'%s'" + +#: revision.c msgid "your current branch appears to be broken" msgstr "您的当前分支好像被损坏" @@ -23168,6 +24237,257 @@ msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" msgid "cannot create async thread: %s" msgstr "不能创建 async 线程：%s" +#: scalar.c worktree.c +#, c-format +msgid "'%s' does not exist" +msgstr "'%s' 不存在" + +#: scalar.c +#, c-format +msgid "could not switch to '%s'" +msgstr "无法切换到 '%s'" + +#: scalar.c +msgid "need a working directory" +msgstr "需要一个工作目录" + +#: scalar.c +msgid "Scalar enlistments require a worktree" +msgstr "Scalar 登记需要一个工作树" + +#: scalar.c +#, c-format +msgid "could not configure %s=%s" +msgstr "无法配置 %s=%s" + +#: scalar.c +msgid "could not configure log.excludeDecoration" +msgstr "无法配置 log.excludeDecoration" + +#: scalar.c +msgid "could not add enlistment" +msgstr "无法添加登记" + +#: scalar.c +msgid "could not set recommended config" +msgstr "无法设置推荐的配置" + +#: scalar.c +msgid "could not turn on maintenance" +msgstr "无法打开维护模式" + +#: scalar.c +msgid "could not start the FSMonitor daemon" +msgstr "无法启动 FSMonitor 守护进程" + +#: scalar.c +msgid "could not turn off maintenance" +msgstr "无法关闭维护模式" + +#: scalar.c +msgid "could not remove enlistment" +msgstr "无法删除登记" + +#: scalar.c +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "远程 HEAD 不是一个分支：'%.*s'" + +#: scalar.c +msgid "failed to get default branch name from remote; using local default" +msgstr "无法从远程获取默认分支名称；使用本地默认值" + +#: scalar.c +msgid "failed to get default branch name" +msgstr "无法获取默认分支名称" + +#: scalar.c +msgid "failed to unregister repository" +msgstr "无法取消注册仓库" + +#: scalar.c +msgid "failed to stop the FSMonitor daemon" +msgstr "无法停止 FSMonitor 守护进程" + +#: scalar.c +msgid "failed to delete enlistment directory" +msgstr "无法删除登记目录" + +#: scalar.c +msgid "branch to checkout after clone" +msgstr "克隆后要检出的分支" + +#: scalar.c +msgid "when cloning, create full working directory" +msgstr "在克隆时，创建完整的工作目录" + +#: scalar.c +msgid "only download metadata for the branch that will be checked out" +msgstr "只下载要检出的分支的元信息" + +#: scalar.c +msgid "create repository within 'src' directory" +msgstr "在 'src' 目录中创建仓库" + +#: scalar.c +msgid "" +"scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n" +"\t[--[no-]src] <url> [<enlistment>]" +msgstr "" +"scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n" +"\t[--[no-]src] <url> [<登记>]" + +#: scalar.c +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "无法从 '%s' 猜测工作区名称" + +#: scalar.c +#, c-format +msgid "directory '%s' exists already" +msgstr "目录 '%s' 已存在" + +#: scalar.c +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "无法获取 '%s' 的默认分支" + +#: scalar.c +#, c-format +msgid "could not configure remote in '%s'" +msgstr "无法在 '%s' 中配置远程" + +#: scalar.c +#, c-format +msgid "could not configure '%s'" +msgstr "无法配置 '%s'" + +#: scalar.c +msgid "partial clone failed; attempting full clone" +msgstr "部分克隆失败；尝试完整克隆" + +#: scalar.c +msgid "could not configure for full clone" +msgstr "无法配置完整克隆" + +#: scalar.c +msgid "scalar diagnose [<enlistment>]" +msgstr "scalar diagnose [<登记>]" + +#: scalar.c +msgid "`scalar list` does not take arguments" +msgstr "`scalar list` 不带参数" + +#: scalar.c +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<登记>]" + +#: scalar.c +msgid "reconfigure all registered enlistments" +msgstr "重新配置所有注册的登记" + +#: scalar.c +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scalar reconfigure [--all | <登记>]" + +#: scalar.c +msgid "--all or <enlistment>, but not both" +msgstr "--all 或者 <登记>，而不是两个一起" + +#: scalar.c +#, c-format +msgid "could not remove stale scalar.repo '%s'" +msgstr "无法删除过期的 scalar.repo '%s'" + +#: scalar.c +#, c-format +msgid "removed stale scalar.repo '%s'" +msgstr "已删除过期的 scalar.repo '%s'" + +#: scalar.c +#, c-format +msgid "repository at '%s' has different owner" +msgstr "位于 '%s' 处的仓库有不同的所有者" + +#: scalar.c +#, c-format +msgid "repository at '%s' has a format issue" +msgstr "位于 '%s' 处的仓库存在格式问题" + +#: scalar.c +#, c-format +msgid "repository not found in '%s'" +msgstr "在 '%s' 中找不到仓库" + +#: scalar.c +#, c-format +msgid "" +"to unregister this repository from Scalar, run\n" +"\tgit config --global --unset --fixed-value scalar.repo \"%s\"" +msgstr "" +"若希望从 Scalar 注销该仓库，执行\n" +"\tgit config --global --unset --fixed-value scalar.repo \"%s\"" + +#: scalar.c +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <任务> [<登记>]\n" +"任务：\n" + +#: scalar.c +#, c-format +msgid "no such task: '%s'" +msgstr "没有此任务：'%s'" + +#: scalar.c +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<登记>]" + +#: scalar.c +msgid "scalar delete <enlistment>" +msgstr "scalar delete <登记>" + +#: scalar.c +msgid "refusing to delete current working directory" +msgstr "拒绝删除当前工作目录" + +#: scalar.c +msgid "include Git version" +msgstr "包括 Git 的版本" + +#: scalar.c +msgid "include Git's build options" +msgstr "包括 Git 的构建选项" + +#: scalar.c +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +#: scalar.c +msgid "-C requires a <directory>" +msgstr "-C 需要 <目录>" + +#: scalar.c +#, c-format +msgid "could not change to '%s'" +msgstr "无法变更到 '%s'" + +#: scalar.c +msgid "-c requires a <key>=<value> argument" +msgstr "-c 需要 <键>=<值> 参数" + +#: scalar.c +msgid "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar [-C <目录>] [-c <键>=<值>] <命令> [<选项>]\n" +"\n" +"命令：\n" + #: send-pack.c msgid "unexpected flush packet while reading remote unpack status" msgstr "读取远程解包状态时收到意外的 flush 包" @@ -23284,11 +24604,6 @@ msgstr "" msgid "could not lock '%s'" msgstr "不能锁定 '%s'" -#: sequencer.c strbuf.c wrapper.c -#, c-format -msgid "could not write to '%s'" -msgstr "不能写入 '%s'" - #: sequencer.c #, c-format msgid "could not write eol to '%s'" @@ -23308,11 +24623,6 @@ msgstr "您的本地修改将被%s覆盖。" msgid "commit your changes or stash them to proceed." msgstr "提交您的修改或贮藏后再继续。" -#: sequencer.c -#, c-format -msgid "%s: fast-forward" -msgstr "%s：快进" - #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. @@ -23496,7 +24806,7 @@ msgstr "无效的作者身份 '%s'" msgid "corrupt author: missing date information" msgstr "损坏的作者：缺失日期信息" -#: sequencer.c t/helper/test-fast-rebase.c +#: sequencer.c #, c-format msgid "could not update %s" msgstr "不能更新 %s" @@ -23593,11 +24903,6 @@ msgstr "%s：不能解析父提交 %s" #: sequencer.c #, c-format -msgid "could not rename '%s' to '%s'" -msgstr "不能将 '%s' 重命名为 '%s'" - -#: sequencer.c -#, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" @@ -23623,6 +24928,26 @@ msgstr "git %s：无法刷新索引" #: sequencer.c #, c-format +msgid "'%s' is not a valid label" +msgstr "'%s' 不是一个有效的标签" + +#: sequencer.c +#, c-format +msgid "'%s' is not a valid refname" +msgstr "'%s' 不是一个有效的引用名" + +#: sequencer.c +#, c-format +msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" +msgstr "update-ref 需要一个完整的引用名，例如：refs/heads/%s" + +#: sequencer.c +#, c-format +msgid "invalid command '%.*s'" +msgstr "无效命令 '%.*s'" + +#: sequencer.c +#, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受参数：'%s'" @@ -23712,10 +25037,6 @@ msgid "could not create sequencer directory '%s'" msgstr "不能创建序列目录 '%s'" #: sequencer.c -msgid "could not lock HEAD" -msgstr "不能锁定 HEAD" - -#: sequencer.c msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" @@ -23829,21 +25150,21 @@ msgstr "" "\n" #: sequencer.c -msgid "and made changes to the index and/or the working tree\n" -msgstr "并且修改索引和/或工作区\n" +msgid "and made changes to the index and/or the working tree.\n" +msgstr "并且修改索引和/或工作区。\n" #: sequencer.c #, c-format msgid "" "execution succeeded: %s\n" -"but left changes to the index and/or the working tree\n" +"but left changes to the index and/or the working tree.\n" "Commit or stash your changes, and then run\n" "\n" " git rebase --continue\n" "\n" msgstr "" "执行成功：%s\n" -"但是在索引和/或工作区中存在变更\n" +"但是在索引和/或工作区中存在变更。\n" "提交或贮藏修改，然后运行\n" "\n" " git rebase --continue\n" @@ -23855,6 +25176,11 @@ msgid "illegal label name: '%.*s'" msgstr "非法的标签名称：'%.*s'" #: sequencer.c +#, c-format +msgid "could not resolve '%s'" +msgstr "无法解析 '%s'" + +#: sequencer.c msgid "writing fake root commit" msgstr "写伪根提交" @@ -23863,11 +25189,6 @@ msgid "writing squash-onto" msgstr "写入 squash-onto" #: sequencer.c -#, c-format -msgid "could not resolve '%s'" -msgstr "无法解析 '%s'" - -#: sequencer.c msgid "cannot merge without a current revision" msgstr "没有当前版本不能合并" @@ -23900,6 +25221,30 @@ msgid "merge: Unable to write new index file" msgstr "合并：无法写入新索引文件" #: sequencer.c +#, c-format +msgid "" +"another 'rebase' process appears to be running; '%s.lock' already exists" +msgstr "另一个 'rebase' 进程似乎在运行；'%s.lock' 已存在" + +#: sequencer.c +#, c-format +msgid "" +"Updated the following refs with %s:\n" +"%s" +msgstr "" +"已用 %s 更新下列引用：\n" +"%s" + +#: sequencer.c +#, c-format +msgid "" +"Failed to update the following refs with %s:\n" +"%s" +msgstr "" +"无法用 %s 更新下列引用：\n" +"%s" + +#: sequencer.c msgid "Cannot autostash" msgstr "无法自动贮藏" @@ -23952,6 +25297,10 @@ msgid "Autostash exists; creating a new stash entry." msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。" #: sequencer.c +msgid "autostash reference is a symref" +msgstr "自动贮藏的引用是一个符号引用" + +#: sequencer.c msgid "could not detach HEAD" msgstr "不能分离头指针" @@ -23987,13 +25336,13 @@ msgstr "" #: sequencer.c #, c-format -msgid "Rebasing (%d/%d)%s" -msgstr "正在变基（%d/%d）%s" +msgid "Stopped at %s... %.*s\n" +msgstr "停止在 %s... %.*s\n" #: sequencer.c #, c-format -msgid "Stopped at %s... %.*s\n" -msgstr "停止在 %s... %.*s\n" +msgid "Rebasing (%d/%d)%s" +msgstr "正在变基（%d/%d）%s" #: sequencer.c #, c-format @@ -24101,6 +25450,11 @@ msgstr "无法跳过不必要的拣选" msgid "the script was already rearranged." msgstr "脚本已经重新编排。" +#: sequencer.c +#, c-format +msgid "update-refs file at '%s' is invalid" +msgstr "位于 '%s' 的 update-refs 文件无效" + #: setup.c #, c-format msgid "'%s' is outside repository at '%s'" @@ -24243,18 +25597,23 @@ msgstr "" #: setup.c #, c-format msgid "" -"unsafe repository ('%s' is owned by someone else)\n" -"To add an exception for this directory, call:\n" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" "\n" "\tgit config --global --add safe.directory %s" msgstr "" -"仓库不安全（'%s' 的所有者是其他人）\n" -"要为本仓库创建特例，请使用：\n" +"在 '%s' 检测到可疑的仓库所有权\n" +"%s要为本仓库创建特例，请运行：\n" "\n" "\tgit config --global --add safe.directory %s" #: setup.c #, c-format +msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" +msgstr "无法使用纯仓库 '%s' （safe.bareRepository 为 '%s'）" + +#: setup.c +#, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." @@ -24270,6 +25629,100 @@ msgstr "fork 失败" msgid "setsid failed" msgstr "setsid 失败" +#: setup.c +#, c-format +msgid "cannot stat template '%s'" +msgstr "不能对模版 '%s' 调用 stat" + +#: setup.c +#, c-format +msgid "cannot opendir '%s'" +msgstr "不能打开目录 '%s'" + +#: setup.c +#, c-format +msgid "cannot readlink '%s'" +msgstr "不能读取链接 '%s'" + +#: setup.c +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "不能自 '%s' 到 '%s' 创建符号链接" + +#: setup.c +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "不能拷贝 '%s' 至 '%s'" + +#: setup.c +#, c-format +msgid "ignoring template %s" +msgstr "忽略模版 %s" + +#: setup.c +#, c-format +msgid "templates not found in %s" +msgstr "没有在 %s 中找到模版" + +#: setup.c +#, c-format +msgid "not copying templates from '%s': %s" +msgstr "没有从 '%s' 复制模版：%s" + +#: setup.c +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "无效的初始分支名：'%s'" + +#: setup.c +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init：已忽略 --initial-branch=%s" + +#: setup.c +#, c-format +msgid "unable to handle file type %d" +msgstr "不能处理 %d 类型的文件" + +#: setup.c +#, c-format +msgid "unable to move %s to %s" +msgstr "不能移动 %s 至 %s" + +#: setup.c +msgid "attempt to reinitialize repository with different hash" +msgstr "尝试用不同的哈希算法重新初始化仓库" + +#: setup.c +msgid "" +"attempt to reinitialize repository with different reference storage format" +msgstr "尝试使用不同的引用存储格式重新初始化仓库" + +#: setup.c +#, c-format +msgid "%s already exists" +msgstr "%s 已经存在" + +#: setup.c +#, c-format +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" + +#: setup.c +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n" + +#: setup.c +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "已初始化空的共享 Git 仓库于 %s%s\n" + +#: setup.c +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "已初始化空的 Git 仓库于 %s%s\n" + #: sparse-index.c #, c-format msgid "index entry is a directory, but not sparse (%08x)" @@ -24331,11 +25784,6 @@ msgid_plural "%u bytes/s" msgstr[0] "%u 字节/秒" msgstr[1] "%u 字节/秒" -#: strbuf.c -#, c-format -msgid "could not edit '%s'" -msgstr "不能编辑 '%s'" - #: submodule-config.c #, c-format msgid "ignoring suspicious submodule name: %s" @@ -24546,13 +25994,30 @@ msgstr "ls-tree 返回未知返回值 %d" msgid "failed to lstat '%s'" msgstr "无法执行 lstat '%s'" -#: t/helper/test-fast-rebase.c -msgid "unhandled options" -msgstr "未处理的选项" +#: t/helper/test-bundle-uri.c +msgid "no remote configured to get bundle URIs from" +msgstr "没有远程被设置为可以获取归档包 URI" -#: t/helper/test-fast-rebase.c -msgid "error preparing revisions" -msgstr "准备版本时错误" +#: t/helper/test-bundle-uri.c +#, c-format +msgid "remote '%s' has no configured URL" +msgstr "远程 '%s' 没有设置 URL" + +#: t/helper/test-bundle-uri.c +msgid "could not get the bundle-uri list" +msgstr "无法获取 bundle-uri 列表" + +#: t/helper/test-cache-tree.c +msgid "test-tool cache-tree <options> (control|prime|update)" +msgstr "test-tool cache-tree <选项> (control|prime|update)" + +#: t/helper/test-cache-tree.c +msgid "clear the cache tree before each iteration" +msgstr "在每次迭代前清除缓存树" + +#: t/helper/test-cache-tree.c +msgid "number of entries in the cache tree to invalidate (default 0)" +msgstr "缓存树中无效化的条目数量（默认 0）" #: t/helper/test-reach.c #, c-format @@ -24747,10 +26212,6 @@ msgstr "协议不支持设置远程服务路径" msgid "invalid remote service path" msgstr "无效的远程服务路径" -#: transport-helper.c transport.c -msgid "operation not supported by protocol" -msgstr "协议不支持该操作" - #: transport-helper.c #, c-format msgid "can't connect to subservice %s" @@ -24916,11 +26377,6 @@ msgstr "协议 v2 的支持尚未实现" #: transport.c #, c-format -msgid "unknown value for config '%s': %s" -msgstr "配置 '%s' 的取值未知：%s" - -#: transport.c -#, c-format msgid "transport '%s' not allowed" msgstr "传输 '%s' 不允许" @@ -24970,6 +26426,18 @@ msgstr "正在终止。" msgid "failed to push all needed submodules" msgstr "不能推送全部需要的子模组" +#: transport.c +msgid "bundle-uri operation not supported by protocol" +msgstr "协议不支持 bundle-uri 操作" + +#: transport.c +msgid "could not retrieve server-advertised bundle-uri list" +msgstr "无法获取服务器公布的 bundle-uri 列表" + +#: transport.c +msgid "operation not supported by protocol" +msgstr "协议不支持该操作" + #: tree-walk.c msgid "too-short tree object" msgstr "太短的树对象" @@ -25278,6 +26746,22 @@ msgstr "无效的端口号" msgid "invalid '..' path segment" msgstr "无效的 '..' 路径片段" +#: usage.c +msgid "usage: " +msgstr "用法：" + +#: usage.c +msgid "fatal: " +msgstr "致命错误：" + +#: usage.c +msgid "error: " +msgstr "错误：" + +#: usage.c +msgid "warning: " +msgstr "警告：" + #: walker.c msgid "Fetching objects" msgstr "正在获取对象" @@ -25406,6 +26890,10 @@ msgstr "不能访问 '%s'" msgid "unable to get current working directory" msgstr "不能获取当前工作目录" +#: wrapper.c +msgid "unable to get random bytes" +msgstr "无法获取随机字节" + #: wt-status.c msgid "Unmerged paths:" msgstr "未合并的路径：" @@ -25871,12 +27359,20 @@ msgstr "忽略的文件" #: wt-status.c #, c-format msgid "" -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -"may speed it up, but you have to be careful not to forget to add\n" -"new files yourself (see 'git help status')." +"It took %.2f seconds to enumerate untracked files,\n" +"but the results were cached, and subsequent runs may be faster." msgstr "" -"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" -"但您需要小心不要忘了添加新文件（参见 'git help status'）。" +"枚举未追踪的文件花了 %.2f 秒，\n" +"结果已被缓存，后续的执行会更快。" + +#: wt-status.c +#, c-format +msgid "It took %.2f seconds to enumerate untracked files." +msgstr "枚举未追踪的文件花了 %.2f 秒。" + +#: wt-status.c +msgid "See 'git help status' for information on how to improve this." +msgstr "参见 'git help status' 来获取如何改善的信息。" #: wt-status.c #, c-format @@ -25970,7 +27466,12 @@ msgstr "另外，您的索引中包含未提交的变更。" msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的变更。" -#: git-merge-octopus.sh +#: xdiff-interface.c +#, c-format +msgid "unknown style '%s' given for '%s'" +msgstr "'%2$s' 的未知风格取值 '%1$s'" + +#: git-merge-octopus.sh git-merge-resolve.sh msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" @@ -26049,320 +27550,6 @@ msgstr "您需要在工作区的顶级目录中运行这个命令。" 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 -#, perl-format -msgid "%12s %12s %s" -msgstr "%12s %12s %s" - -#: git-add--interactive.perl -#, 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 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging." -msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for stashing." -msgstr "如果补丁能干净地应用，编辑块将立即标记为贮藏。" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for unstaging." -msgstr "如果补丁能干净地应用，编辑块将立即标记为未暂存。" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for applying." -msgstr "如果补丁能干净地应用，编辑块将立即标记为应用。" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding." -msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。" - -#: git-add--interactive.perl -#, perl-format -msgid "failed to open hunk edit file for writing: %s" -msgstr "无法为写入打开块编辑文件：%s" - -#: git-add--interactive.perl -#, perl-format -msgid "" -"---\n" -"To remove '%s' lines, make them ' ' lines (context).\n" -"To remove '%s' lines, delete them.\n" -"Lines starting with %s will be removed.\n" -msgstr "" -"---\n" -"要删除 '%s' 开始的行，使其成为 ' ' 开始的行（上下文）。\n" -"要删除 '%s' 开始的行，删除它们。\n" -"以 %s 开始的行将被删除。\n" - -#: git-add--interactive.perl -#, perl-format -msgid "failed to open hunk edit file for reading: %s" -msgstr "无法读取块编辑文件：%s" - -#: git-add--interactive.perl -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 hunk and all later hunks in the file\n" -"d - do not stage 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 -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash 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 -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"a - unstage this hunk and all later hunks in the file\n" -"d - do not unstage 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 -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\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 -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard 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 -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard 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 -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and 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 -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 -msgid "" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"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" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"g - 选择跳转到一个块\n" -"/ - 查找和给定正则表达式匹配的块\n" -"j - 维持该块未决状态，查看下一个未决块\n" -"J - 维持该块未决状态，查看下一个块\n" -"k - 维持该块未决状态，查看上一个未决块\n" -"K - 维持该块未决状态，查看上一个块\n" -"s - 拆分当前块为更小的块\n" -"e - 手动编辑当前块\n" -"? - 显示帮助\n" - -#: git-add--interactive.perl -msgid "The selected hunks do not apply to the index!\n" -msgstr "选中的块不能应用到索引！\n" - -#: git-add--interactive.perl -#, perl-format -msgid "ignoring unmerged: %s\n" -msgstr "忽略未合入的：%s\n" - -#: git-add--interactive.perl -#, 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 -#, perl-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl -#, perl-format -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " -msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl -#, 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 -msgid "No other hunks to goto\n" -msgstr "没有其它可供跳转的块\n" - -#: git-add--interactive.perl -#, perl-format -msgid "Invalid number: '%s'\n" -msgstr "无效数字：'%s'\n" - -#: git-add--interactive.perl -#, 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 -msgid "No other hunks to search\n" -msgstr "没有其它可供查找的块\n" - -#: git-add--interactive.perl -#, perl-format -msgid "Malformed search regexp %s: %s\n" -msgstr "错误的正则表达式 %s：%s\n" - -#: git-add--interactive.perl -msgid "No hunk matches the given pattern\n" -msgstr "没有和给定模式相匹配的块\n" - -#: git-add--interactive.perl -msgid "No previous hunk\n" -msgstr "没有前一个块\n" - -#: git-add--interactive.perl -msgid "No next hunk\n" -msgstr "没有下一个块\n" - -#: git-add--interactive.perl -msgid "Sorry, cannot split this hunk\n" -msgstr "对不起，不能拆分这个块\n" - -#: git-add--interactive.perl -#, 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 -msgid "Sorry, cannot edit this hunk\n" -msgstr "对不起，不能编辑这个块\n" - -#. TRANSLATORS: please do not translate the command names -#. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl -msgid "" -"status - show paths with changes\n" -"update - add working tree state to the staged set of changes\n" -"revert - revert staged set of changes back to the HEAD version\n" -"patch - pick hunks and update selectively\n" -"diff - view diff between HEAD and index\n" -"add untracked - add contents of untracked files to the staged set of " -"changes\n" -msgstr "" -"status - 显示含变更的路径\n" -"update - 添加工作区状态至暂存列表\n" -"revert - 还原修改的暂存集至 HEAD 版本\n" -"patch - 挑选块并且有选择地更新\n" -"diff - 显示 HEAD 和索引间差异\n" -"add untracked - 添加未跟踪文件的内容至暂存列表\n" - -#: git-add--interactive.perl -msgid "missing --" -msgstr "缺失 --" - -#: git-add--interactive.perl -#, perl-format -msgid "unknown --patch mode: %s" -msgstr "未知的 --patch 模式：%s" - -#: git-add--interactive.perl -#, perl-format -msgid "invalid argument %s, expecting --" -msgstr "无效的参数 %s，期望是 --" - #: git-send-email.perl msgid "local zone differs from GMT by a non-minute interval\n" msgstr "本地时间和 GMT 有不到一分钟间隔\n" @@ -26500,13 +27687,13 @@ msgstr "" #: git-send-email.perl #, perl-format -msgid "Failed to open %s: %s" -msgstr "无法打开 %s: %s" +msgid "Failed to open %s.final: %s" +msgstr "无法打开 %s.final: %s" #: git-send-email.perl #, perl-format -msgid "Failed to open %s.final: %s" -msgstr "无法打开 %s.final: %s" +msgid "Failed to open %s: %s" +msgstr "无法打开 %s: %s" #: git-send-email.perl msgid "Summary email is empty, skipping it\n" @@ -26684,8 +27871,8 @@ msgstr "(%s) 不能执行 '%s'" #: git-send-email.perl #, perl-format -msgid "(%s) Adding %s: %s from: '%s'\n" -msgstr "(%s) 添加 %s: %s 自：'%s'\n" +msgid "(%s) Malformed output from '%s'" +msgstr "(%s) 非法的输出信息，来自于: '%s'" #: git-send-email.perl #, perl-format @@ -26693,6 +27880,11 @@ msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) 无法关闭管道至 '%s'" #: git-send-email.perl +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) 添加 %s: %s 自：'%s'\n" + +#: git-send-email.perl msgid "cannot send message as 7bit" msgstr "不能以 7bit 形式发送信息" |