diff --git a/po/zh_CN.po b/po/zh_CN.po index db7518c9b8..2e249def97 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,6 +1,7 @@ # Chinese translations for Git package # Git 软件包的简体中文翻译. # Copyright (C) 2012,2013 Jiang Xin +# Copyright (C) 2021-2023 Fangyi Zhou # This file is distributed under the same license as the Git package. # Contributors: # - Fangyi Zhou @@ -16,15 +17,15 @@ # - Zhuang Ya # - Teng Long # -# Git glossary for Chinese translators +# Git glossary for Chinese translators # # English | Chinese # ---------------------------------+-------------------------------------- -# 3-way merge | 三方合并 +# 3-way merge | 三路合并 # abbreviate | 简写（的 SHA-1 值） # alternate object database | 备用对象库 # attribute source | 属性来源 -# amend | 修补 +# amend | 修订 # ancestor | 祖先，祖先提交 # annotated tag | 附注标签 # bare repository | 纯仓库 @@ -33,9 +34,9 @@ # blob object | 数据对象 # bloom filter | 布隆过滤器 # branch | 分支 -# bundle | 归档包 +# bundle | 捆绑包 # bypass | 绕过 -# cache | 索引（的别称） +# cache | 缓存（索引的别称） # chain | （提交）链 # changeset | 变更集 # checkout | 检出 @@ -48,7 +49,7 @@ # commit object | 提交对象 # commit-graph | 提交图 # commit-ish (also committish) | 提交号 -# cone | 锥形（稀疏检出模型）；锥（稀疏检出） +# cone | 锥形模式（稀疏检出）；锥（稀疏检出） # conflict | 冲突 # core Git | 核心 Git 工具 # cover letter | 附函 @@ -59,28 +60,29 @@ # dirty | 脏（的工作区） # dumb HTTP protocol | 哑 HTTP 协议 # enlistment | 登记（在 scalar 中使用） -# evil merge | 坏合并（合并引入了父提交没有的修改） +# evil merge | 恶意合并（合并引入了额外变更，即父提交没有的修改） # fast-forward | 快进 # fetch | 获取 # file system | 文件系统 # fork | 派生 # Git archive | 仓库（对于 arch 用户） # gitfile | gitfile（仓库链接文件） -# grafts | （提交）移植 +# grafts | （提交）嫁接 # hash | 哈希值 # HEAD | HEAD（头指针，亦即当前分支） # head | 头、分支 # head ref | 分支 # header | 头信息 # hook | 钩子 -# hunk | 补丁片段 # index | 索引 # index entry | 索引条目 # loose object | 松散对象 # loose refs | 松散引用 -# magic | 神奇前缀（路径规格支持的一种前缀表达式） -# master | master（默认分支名） +# magic | 魔法前缀（路径规格支持的一种前缀表达式） +# master | master（传统默认分支名，将被 main 替代） # merge | 合并 +# merge-base | 合并基线 +# note | 注解 # object | 对象 # object database | 对象库 # object identifier | 对象标识符 @@ -95,11 +97,12 @@ # parent | 父提交 # partial clone | 部分克隆 # patch | 补丁 +# patch hunk | 补丁块 # pathspec | 路径规格 # pattern | 模式 # pickaxe | 挖掘 -# plumbing | 管件（Git 底层核心命令的别称） -# porcelain | 瓷件（Git 上层封装命令的别称） +# plumbing | 管件（Git 底层命令的别称） +# porcelain | 瓷件（Git 高层命令的别称） # precious-objects repo | 珍品仓库 # preferred pack | 首选包（多包索引中引入的首选包概念） # promisor | 承诺者 @@ -130,7 +133,7 @@ # squash | 挤压 # stage | n. 暂存区（即索引）; v. 暂存 # stale | 过期的 -# stash | n. 贮藏区; v. 贮藏 +# stash | n. 储藏区; v. 储藏 # submodule | 子模组 # symref | 符号引用 # tag | n. 标签; v. 打标签 @@ -146,16 +149,28 @@ # unpack | 解包 # unreachable object | 不可达对象 # unstage | 取消暂存 -# upstream | 上游 -# upstream branch | 上游分支 +# upstream | 上游（分支/仓库） # working tree | 工作区 -# Fangyi Zhou , 2021-2023. +# +# Preferred Chinese Terms +# +# - 默认 (not 缺省) +# - 其他 (not 其它) +# - 作为 (not 做为) +# - 当作 (not 当做) +# - 登录 (not 登陆) +# - 账户 (not 帐户) +# - 密码 (not 口令) +# - 撤销 (not 撤消) +# - 吗？ (not 么？) # 疑问助词 +# - 无法 (not 不能)：客观。客观障碍、技术限制、物理规律，非主观 +# - 不能 (not 无法)：主观。能力不足、规则限制、逻辑冲突、设计限制、意愿拒绝 # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2025-11-15 22:02+0800\n" +"POT-Creation-Date: 2026-01-29 19:17+0800\n" "PO-Revision-Date: 2025-11-16 01:03+0800\n" "Last-Translator: Teng Long \n" "Language-Team: GitHub \n" @@ -178,7 +193,7 @@ msgstr "嗯（%s）？" #: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c msgid "could not read index" -msgstr "不能读取索引" +msgstr "无法读取索引" #: add-interactive.c msgid "binary" @@ -199,11 +214,11 @@ msgstr "更新" #: add-interactive.c #, c-format msgid "could not stage '%s'" -msgstr "不能暂存 '%s'" +msgstr "无法暂存 '%s'" #: add-interactive.c builtin/stash.c reset.c sequencer.c msgid "could not write index" -msgstr "不能写入索引" +msgstr "无法写入索引" #: add-interactive.c #, c-format @@ -215,7 +230,7 @@ msgstr[1] "更新了 %d 个路径\n" #: add-interactive.c #, c-format msgid "note: %s is untracked now.\n" -msgstr "说明：%s 现已成为未跟踪的。\n" +msgstr "注意：%s 现在未被跟踪。\n" #: add-interactive.c apply.c builtin/checkout.c builtin/reset.c #, c-format @@ -228,7 +243,7 @@ msgstr "还原" #: add-interactive.c msgid "Could not parse HEAD^{tree}" -msgstr "不能解析 HEAD^{tree}" +msgstr "无法解析 HEAD^{tree}" #: add-interactive.c #, c-format @@ -274,7 +289,7 @@ msgstr "补丁更新" #: add-interactive.c msgid "Review diff" -msgstr "检视 diff" +msgstr "查看差异" #: add-interactive.c msgid "show paths with changes" @@ -350,11 +365,11 @@ msgstr "请选择" #: add-interactive.c msgid "staged" -msgstr "缓存" +msgstr "已暂存" #: add-interactive.c msgid "unstaged" -msgstr "未缓存" +msgstr "未暂存" #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c #: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c @@ -364,7 +379,7 @@ msgstr "路径" #: add-interactive.c msgid "could not refresh index" -msgstr "不能刷新索引" +msgstr "无法刷新索引" #: add-interactive.c builtin/clean.c #, c-format @@ -379,12 +394,12 @@ msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " +msgstr "暂存删除变更 [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " -msgstr "暂存添加动作 [y,n,q,a,d%s,?]? " +msgstr "暂存新增变更 [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format @@ -414,28 +429,28 @@ msgstr "" #: add-patch.c #, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " +msgstr "储藏模式变更 [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " +msgstr "储藏删除变更 [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " -msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? " +msgstr "储藏新增变更 [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "贮藏该块 [y,n,q,a,d%s,?]? " +msgstr "储藏该块 [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." -msgstr "如果补丁能正确地应用，编辑块将立即标记为贮藏。" +msgstr "如果补丁能正确地应用，编辑块将立即标记为储藏。" #: add-patch.c msgid "" @@ -445,11 +460,11 @@ msgid "" "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\n" msgstr "" -"y - 贮藏该块\n" -"n - 不要贮藏该块\n" -"q - 退出。不贮藏该块及后面的全部块\n" -"a - 贮藏该块和本文件中后面的全部块\n" -"d - 不贮藏该块和本文件中后面的全部块\n" +"y - 储藏该块\n" +"n - 不要储藏该块\n" +"q - 退出。不储藏该块及后面的全部块\n" +"a - 储藏该块和本文件中后面的全部块\n" +"d - 不储藏该块和本文件中后面的全部块\n" #: add-patch.c #, c-format @@ -459,12 +474,12 @@ msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " +msgstr "取消暂存删除变更 [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " -msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? " +msgstr "取消暂存新增变更 [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format @@ -475,7 +490,7 @@ msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." -msgstr "如果补丁能正确地应用，编辑块将立即标记为未暂存。" +msgstr "如果补丁能正确地应用，编辑块将立即标记为取消暂存。" #: add-patch.c msgid "" @@ -539,12 +554,12 @@ msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " +msgstr "从工作区中丢弃删除变更 [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " -msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " +msgstr "从工作区中丢弃新增变更 [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format @@ -579,12 +594,12 @@ msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " #: 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,?]? " +msgstr "从索引和工作区中丢弃删除变更 [y,n,q,a,d%s,?]? " #: 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,?]? " +msgstr "从索引和工作区中丢弃新增变更 [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format @@ -680,11 +695,11 @@ msgstr "无法解析数据块头信息 '%.*s'" #: add-patch.c msgid "could not parse diff" -msgstr "不能解析差异信息" +msgstr "无法解析差异信息" #: add-patch.c msgid "could not parse colored diff" -msgstr "不能解析彩色差异信息" +msgstr "无法解析彩色差异信息" #: add-patch.c #, c-format @@ -707,7 +722,7 @@ msgid "" "expected context line #%d in\n" "%.*s" msgstr "" -"预期上下文行 #%d 于\n" +"预期上下文行 #%d 位于\n" "%.*s" #: add-patch.c @@ -720,7 +735,7 @@ msgid "" msgstr "" "块不重叠：\n" "%.*s\n" -"\t不是结尾于：\n" +"\t未以以下内容结尾：\n" "%.*s" #: add-patch.c @@ -746,7 +761,7 @@ msgid "" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "" -"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n" +"如果无法干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n" "此次编辑被终止，该块不会被修改。\n" #: add-patch.c @@ -766,15 +781,15 @@ msgstr "'git apply --cached' 失败" #: add-patch.c msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " +msgstr "您的编辑块无法被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " #: add-patch.c msgid "The selected hunks do not apply to the index!" -msgstr "选中的块不能应用到索引！" +msgstr "选中的块无法应用到索引！" #: add-patch.c msgid "Apply them to the worktree anyway? " -msgstr "无论如何都要应用到工作区么？" +msgstr "仍要应用到工作区吗？" #: add-patch.c msgid "Nothing was applied.\n" @@ -813,15 +828,15 @@ msgstr "预期只有一个字母，得到 '%s'" #: add-patch.c msgid "No other hunk" -msgstr "没有其它块" +msgstr "没有其他块" #: add-patch.c msgid "No other undecided hunk" -msgstr "没有其它未决定的块" +msgstr "没有其他未决定的块" #: add-patch.c msgid "No other hunks to goto" -msgstr "没有其它可供跳转的块" +msgstr "没有其他可供跳转的块" #: add-patch.c msgid "go to which hunk ( to see more)? " @@ -845,7 +860,7 @@ msgstr[1] "对不起，只有 %d 个可用块。" #: add-patch.c msgid "No other hunks to search" -msgstr "没有其它可供查找的块" +msgstr "没有其他可供查找的块" #: add-patch.c msgid "search for regex? " @@ -862,7 +877,7 @@ msgstr "没有和给定模式相匹配的块" #: add-patch.c msgid "Sorry, cannot split this hunk" -msgstr "对不起，不能拆分这个块" +msgstr "对不起，无法拆分这个块" #: add-patch.c #, c-format @@ -871,7 +886,7 @@ msgstr "拆分为 %d 块。" #: add-patch.c msgid "Sorry, cannot edit this hunk" -msgstr "对不起，不能编辑这个块" +msgstr "对不起，无法编辑这个块" #: add-patch.c #, c-format @@ -922,7 +937,7 @@ msgstr "无法拉取，因为您有未合并的文件。" #: advice.c msgid "Reverting is not possible because you have unmerged files." -msgstr "无法回退，因为您有未合并的文件。" +msgstr "无法还原，因为您有未合并的文件。" #: advice.c msgid "Rebasing is not possible because you have unmerged files." @@ -1049,7 +1064,7 @@ msgid "" "* Use \"git add --sparse \" to update the index\n" "* Use \"git sparse-checkout reapply\" to apply the sparsity rules" msgstr "" -"为了修正这些的路径的稀疏性，请运行下列命令：\n" +"为了修正这些路径的稀疏性，请运行下列命令：\n" "* 使用 \"git add --sparse <路径>\" 来更新索引\n" "* 使用 \"git sparse-checkout reapply\" 来应用稀疏规则" @@ -1083,9 +1098,9 @@ msgstr "未能识别的空白字符忽略选项 '%s'" #: 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/rebase.c builtin/repack.c -#: builtin/replay.c builtin/reset.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 +#: builtin/reset.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' 不能同时使用" @@ -1116,7 +1131,7 @@ msgstr "regexec 返回 %d，输入为：%s" #: apply.c #, c-format msgid "unable to find filename in patch at line %d" -msgstr "不能在补丁的第 %d 行找到文件名" +msgstr "无法在补丁的第 %d 行找到文件名" #: apply.c #, c-format @@ -1225,7 +1240,7 @@ msgstr "无法读取符号链接 %s" #: apply.c #, c-format msgid "unable to open or read %s" -msgstr "不能打开或读取 %s" +msgstr "无法打开或读取 %s" #: apply.c #, c-format @@ -1250,7 +1265,7 @@ msgid "" "while searching for:\n" "%.*s" msgstr "" -"当查询：\n" +"在搜索：\n" "%.*s" #: apply.c @@ -1261,12 +1276,12 @@ msgstr "缺失 '%s' 的二进制补丁数据" #: apply.c #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" -msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" +msgstr "无法反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" #: apply.c #, c-format msgid "cannot apply binary patch to '%s' without full index line" -msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" +msgstr "无法在 '%s' 上应用没有完整索引行的二进制补丁" #: apply.c #, c-format @@ -1302,7 +1317,7 @@ msgstr "打补丁失败：%s:%ld" #: apply.c builtin/mv.c #, c-format msgid "cannot checkout %s" -msgstr "不能检出 %s" +msgstr "无法检出 %s" #: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c #, c-format @@ -1312,7 +1327,7 @@ msgstr "无法读取 %s" #: apply.c #, c-format msgid "reading from '%s' beyond a symbolic link" -msgstr "读取位于符号链接中的 '%s'" +msgstr "从 '%s' 读取时越过符号链接" #: apply.c #, c-format @@ -1331,12 +1346,12 @@ msgstr "%s：和索引不匹配" #: apply.c msgid "repository lacks the necessary blob to perform 3-way merge." -msgstr "仓库缺乏执行三方合并所必需的数据对象。" +msgstr "仓库缺乏执行三路合并所必需的数据对象。" #: apply.c #, c-format msgid "Performing three-way merge...\n" -msgstr "执行三方合并...\n" +msgstr "执行三路合并...\n" #: apply.c #, c-format @@ -1346,12 +1361,12 @@ msgstr "无法读取 '%s' 的当前内容" #: apply.c #, c-format msgid "Failed to perform three-way merge...\n" -msgstr "无法执行三方合并...\n" +msgstr "无法执行三路合并...\n" #: apply.c #, c-format msgid "Applied patch to '%s' with conflicts.\n" -msgstr "应用补丁到 '%s' 存在冲突。\n" +msgstr "应用补丁到 '%s' 时发生冲突。\n" #: apply.c #, c-format @@ -1361,7 +1376,7 @@ msgstr "成功应用补丁到 '%s'。\n" #: apply.c #, c-format msgid "Falling back to direct application...\n" -msgstr "回落到直接应用...\n" +msgstr "改为直接应用...\n" #: apply.c msgid "removal patch leaves file contents" @@ -1405,7 +1420,7 @@ msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配" #: apply.c #, c-format msgid "affected file '%s' is beyond a symbolic link" -msgstr "受影响的文件 '%s' 位于符号链接中" +msgstr "受影响的文件 '%s' 位于符号链接之外" #: apply.c #, c-format @@ -1435,32 +1450,32 @@ msgstr "sha1 信息缺失或无效（%s）。" #: apply.c #, c-format msgid "could not add %s to temporary index" -msgstr "不能在临时索引中添加 %s" +msgstr "无法在临时索引中添加 %s" #: apply.c #, c-format msgid "could not write temporary index to %s" -msgstr "不能把临时索引写入到 %s" +msgstr "无法把临时索引写入到 %s" #: apply.c #, c-format msgid "unable to remove %s from index" -msgstr "不能从索引中移除 %s" +msgstr "无法从索引中移除 %s" #: apply.c #, c-format msgid "corrupt patch for submodule %s" -msgstr "子模组 %s 损坏的补丁" +msgstr "针对子模组 %s 的补丁已损坏" #: apply.c #, c-format msgid "unable to stat newly created file '%s'" -msgstr "不能对新建文件 '%s' 调用 stat" +msgstr "无法对新建文件 '%s' 调用 stat" #: apply.c #, c-format msgid "unable to create backing store for newly created file %s" -msgstr "不能为新建文件 %s 创建后端存储" +msgstr "无法为新建文件 %s 创建后端存储" #: apply.c #, c-format @@ -1480,7 +1495,7 @@ msgstr "关闭文件 '%s'" #: apply.c #, c-format msgid "unable to write file '%s' mode %o" -msgstr "不能写文件 '%s' 权限 %o" +msgstr "无法写文件 '%s' 权限 %o" #: apply.c #, c-format @@ -1495,37 +1510,37 @@ msgstr "内部错误" #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." -msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..." -msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..." +msgstr[0] "应用补丁 %%s，其中 %d 个被拒绝..." +msgstr[1] "应用补丁 %%s，其中 %d 个被拒绝..." #: apply.c #, c-format msgid "cannot open %s" -msgstr "不能打开 %s" +msgstr "无法打开 %s" #: apply.c rerere.c #, c-format msgid "cannot unlink '%s'" -msgstr "不能删除 '%s'" +msgstr "无法删除 '%s'" #: apply.c #, c-format msgid "Hunk #%d applied cleanly." -msgstr "第 #%d 个片段成功应用。" +msgstr "第 #%d 个块成功应用。" #: apply.c #, c-format msgid "Rejected hunk #%d." -msgstr "拒绝第 #%d 个片段。" +msgstr "拒绝第 #%d 个块。" #: apply.c #, c-format msgid "Skipped patch '%s'." -msgstr "略过补丁 '%s'。" +msgstr "跳过补丁 '%s'。" #: apply.c msgid "No valid patches in input (allow with \"--allow-empty\")" -msgstr "输入中没有合法的补丁 （使用 \"--allow-empty\" 来允许）" +msgstr "输入中没有合法补丁（可用 \"--allow-empty\" 允许）" #: apply.c t/helper/test-cache-tree.c msgid "unable to read index file" @@ -1534,14 +1549,14 @@ msgstr "无法读取索引文件" #: apply.c #, c-format msgid "can't open patch '%s': %s" -msgstr "不能打开补丁 '%s'：%s" +msgstr "无法打开补丁 '%s'：%s" #: apply.c #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" -msgstr[0] "抑制下仍有 %d 个空白字符误用" -msgstr[1] "抑制下仍有 %d 个空白字符误用" +msgstr[0] "已抑制 %d 个空白字符错误" +msgstr[1] "已抑制 %d 个空白字符错误" #: apply.c #, c-format @@ -1563,11 +1578,11 @@ msgstr "无法写入新索引文件" #: apply.c msgid "don't apply changes matching the given path" -msgstr "不要应用与给出路径向匹配的变更" +msgstr "不要应用与给定路径相匹配的变更" #: apply.c msgid "apply changes matching the given path" -msgstr "应用与给出路径向匹配的变更" +msgstr "应用与给定路径相匹配的变更" #: apply.c builtin/am.c msgid "num" @@ -1579,7 +1594,7 @@ msgstr "从传统的 diff 路径中移除指定数量的前导斜线" #: apply.c msgid "ignore additions made by the patch" -msgstr "忽略补丁中的添加的文件" +msgstr "忽略补丁新增的内容" #: apply.c msgid "instead of applying the patch, output diffstat for the input" @@ -1619,7 +1634,7 @@ msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" #: apply.c msgid "attempt three-way merge, fall back on normal patch if that fails" -msgstr "尝试三路合并，如果失败则回落至正常补丁模式" +msgstr "尝试三路合并，如果失败则回落到普通补丁模式" #: apply.c builtin/merge-file.c msgid "for conflicts, use our version" @@ -1635,7 +1650,7 @@ msgstr "如果冲突，使用联合版本" #: apply.c msgid "build a temporary index based on embedded index information" -msgstr "创建一个临时索引基于嵌入的索引信息" +msgstr "基于嵌入的索引信息创建临时索引" #: apply.c builtin/checkout-index.c msgid "paths are separated with NUL character" @@ -1652,7 +1667,7 @@ msgstr "动作" #: apply.c msgid "detect new or modified lines that have whitespace errors" -msgstr "检查新增和修改的行中间的空白字符滥用" +msgstr "检测新增或修改的行是否存在空白错误" #: apply.c msgid "ignore changes in whitespace when finding context" @@ -1668,19 +1683,19 @@ msgstr "无需至少一行上下文" #: apply.c msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" +msgstr "将被拒绝的块保存在对应的 *.rej 文件中" #: apply.c msgid "allow overlapping hunks" -msgstr "允许重叠的补丁片段" +msgstr "允许重叠的块" #: apply.c msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "允许不正确的文件末尾换行符" +msgstr "容忍误判的文件末尾缺失换行符" #: apply.c msgid "do not trust the line counts in the hunk headers" -msgstr "不信任补丁片段的头信息中的行号" +msgstr "不信任块头信息中的行数" #: apply.c builtin/am.c msgid "root" @@ -1701,12 +1716,12 @@ msgstr "--ours、--theirs 和 --union 需要 --3way" #: archive-tar.c archive-zip.c #, c-format msgid "cannot stream blob %s" -msgstr "不能打开数据对象 %s" +msgstr "无法流式传输数据对象 %s" #: archive-tar.c archive-zip.c #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" -msgstr "不支持的文件模式：0%o (SHA1: %s)" +msgstr "不支持的文件模式：0%o (SHA1：%s)" #: archive-tar.c archive-zip.c builtin/pack-objects.c #, c-format @@ -1759,12 +1774,12 @@ msgstr "git archive --remote <仓库> [--exec <命令>] --list" #: archive.c builtin/fast-import.c builtin/gc.c builtin/notes.c builtin/tag.c #, c-format msgid "cannot read '%s'" -msgstr "不能读取 '%s'" +msgstr "无法读取 '%s'" #: archive.c #, c-format msgid "pathspec '%s' matches files outside the current directory" -msgstr "路径规格 '%s' 匹配了当前目录外的文件'" +msgstr "路径规格 '%s' 匹配了当前目录外的文件" #: archive.c builtin/add.c builtin/rm.c #, c-format @@ -1881,7 +1896,7 @@ msgstr "仓库" #: archive.c builtin/archive.c msgid "retrieve the archive from remote repository " -msgstr "从远程仓库（<仓库>）提取归档文件" +msgstr "从远程仓库 <仓库> 提取归档文件" #: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c msgid "command" @@ -1929,7 +1944,7 @@ msgstr "%.*s 不是一个有效的属性名" #: attr.c msgid "unable to add additional attribute" -msgstr "不能添加额外属性" +msgstr "无法添加额外属性" #: attr.c #, c-format @@ -1946,7 +1961,7 @@ msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -"负值模版在 git attributes 中被忽略\n" +"否定模式在 git attributes 中被忽略\n" "当字符串确实要以感叹号开始时，使用 '\\!'。" #: attr.c @@ -1981,7 +1996,7 @@ msgstr "无法对 %s 执行 stat" #: builtin/pack-objects.c combine-diff.c object-file.c rerere.c #, c-format msgid "unable to read %s" -msgstr "不能读 %s" +msgstr "无法读取 %s" #: bisect.c #, c-format @@ -2004,7 +2019,7 @@ msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" -"合并基线 %s 是坏的。\n" +"合并基线 %s 是有问题的。\n" "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" #: bisect.c @@ -2043,14 +2058,14 @@ msgid "" "So we cannot be sure the first %s commit is between %s and %s.\n" "We continue anyway." msgstr "" -"介于 %s 和 [%s] 的合并基线一定被忽略了。\n" +"介于 %s 和 [%s] 的合并基线必须被跳过。\n" "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" -"我们仍旧继续。" +"我们仍然继续。" #: bisect.c #, c-format msgid "Bisecting: a merge base must be tested\n" -msgstr "二分查找中：合并基线必须是经过测试的\n" +msgstr "二分查找中：合并基线必须经过测试\n" #: bisect.c #, c-format @@ -2060,17 +2075,17 @@ msgstr "需要一个 %s 版本" #: bisect.c #, c-format msgid "could not create file '%s'" -msgstr "不能创建文件 '%s'" +msgstr "无法创建文件 '%s'" #: bisect.c builtin/notes.c #, c-format msgid "unable to start 'show' for object '%s'" -msgstr "不能为对象 '%s' 开始 'show'" +msgstr "无法对对象 '%s' 启动 'show'" #: bisect.c builtin/merge.c #, c-format msgid "could not read file '%s'" -msgstr "不能读取文件 '%s'" +msgstr "无法读取文件 '%s'" #: bisect.c msgid "reading bisect refs failed" @@ -2134,7 +2149,7 @@ msgstr "在 %2$s 中无此路径 %1$s" #: blame.c #, c-format msgid "cannot read blob %s for path %s" -msgstr "不能为路径 %2$s 读取数据对象 %1$s" +msgstr "无法为路径 %2$s 读取数据对象 %1$s" #: branch.c msgid "" @@ -2173,7 +2188,7 @@ msgid "" "the remote tracking information by invoking:" msgstr "" "\n" -"在修复错误后，您可以通过执行以下命令来尝试修改远程跟踪分支：" +"在修复错误后，您可以通过执行以下命令来尝试修复远程跟踪信息：" #: branch.c #, c-format @@ -2188,7 +2203,7 @@ msgstr "要求从 '%s' 继承跟踪信息，但是没有设置合并配置" #: branch.c #, c-format msgid "not tracking: ambiguous information for ref '%s'" -msgstr "不在跟踪中：引用 '%s' 有歧义的信息" +msgstr "未跟踪：引用 '%s' 的信息含糊不清" # 译者：为保证在输出中对齐，注意调整句中空格！ #. #-#-#-#-# branch.c.po #-#-#-#-# @@ -2222,11 +2237,11 @@ msgid "" "different remotes' fetch refspecs map into different\n" "tracking namespaces." msgstr "" -"有多个远程的获取引用规格映射到了追踪引用 '%s'：\n" +"有多个远程的获取引用规格映射到了跟踪引用 '%s'：\n" "%s\n" "这一般是个配置错误。\n" "\n" -"如果要支持设置追踪分支，请保证不同远程的获取引用规格映射至不同的追踪命名空" +"如果要支持设置跟踪分支，请保证不同远程的获取引用规格映射至不同的跟踪命名空" "间。" #: branch.c @@ -2235,8 +2250,8 @@ msgid "'%s' is not a valid branch name" msgstr "'%s' 不是一个有效的分支名称" #: branch.c builtin/branch.c -msgid "See `man git check-ref-format`" -msgstr "查阅 `man git check-ref-format`" +msgid "See 'git help check-ref-format'" +msgstr "参阅 'git help check-ref-format'" #: branch.c #, c-format @@ -2302,13 +2317,13 @@ msgid "" "You may try updating the submodules using 'git checkout --no-recurse-" "submodules %s && git submodule update --init'" msgstr "" -"你可以用 'git checkout --no-recurse-submodules %s && git submodule update --" +"您可以用 'git checkout --no-recurse-submodules %s && git submodule update --" "init' 来尝试更新子模组" #: branch.c #, c-format msgid "submodule '%s': cannot create branch '%s'" -msgstr "子模组 '%s'：不能创建分支 '%s'" +msgstr "子模组 '%s'：无法创建分支 '%s'" #: branch.c #, c-format @@ -2322,7 +2337,7 @@ msgstr "git add [<选项>] [--] <路径规格>..." #: builtin/add.c #, c-format msgid "cannot chmod %cx '%s'" -msgstr "不能 chmod %cx '%s'" +msgstr "无法 chmod %cx '%s'" #: builtin/add.c msgid "Unstaged changes after refreshing the index:" @@ -2330,7 +2345,7 @@ msgstr "刷新索引之后尚未被暂存的变更：" #: builtin/add.c msgid "could not read the index" -msgstr "不能读取索引" +msgstr "无法读取索引" #: builtin/add.c msgid "editing patch failed" @@ -2339,16 +2354,16 @@ msgstr "编辑补丁失败" #: builtin/add.c read-cache.c #, c-format msgid "could not stat '%s'" -msgstr "不能对 '%s' 调用 stat" +msgstr "无法对 '%s' 调用 stat" #: builtin/add.c msgid "empty patch. aborted" -msgstr "空补丁。异常终止" +msgstr "空补丁。已中止" #: builtin/add.c #, c-format msgid "could not apply '%s'" -msgstr "不能应用 '%s'" +msgstr "无法应用 '%s'" #: builtin/add.c msgid "The following paths are ignored by one of your .gitignore files:\n" @@ -2358,13 +2373,13 @@ msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" #: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c #: builtin/rm.c builtin/send-pack.c builtin/sparse-checkout.c msgid "dry run" -msgstr "演习" +msgstr "试运行" #: builtin/add.c builtin/check-ignore.c builtin/commit.c #: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c #: builtin/read-tree.c builtin/refs.c msgid "be verbose" -msgstr "冗长输出" +msgstr "输出更详细" #: builtin/add.c msgid "interactive picking" @@ -2392,11 +2407,11 @@ msgstr "对已跟踪文件（暗含 -u）重新归一换行符" #: builtin/add.c msgid "record only the fact that the path will be added later" -msgstr "只记录，该路径稍后再添加" +msgstr "只记录该路径稍后将被添加" #: builtin/add.c msgid "add changes from all tracked and untracked files" -msgstr "添加所有改变的已跟踪文件和未跟踪文件" +msgstr "添加所有已跟踪和未跟踪文件的变更" #: builtin/add.c msgid "ignore paths removed in the working tree (same as --no-all)" @@ -2408,11 +2423,11 @@ msgstr "不添加，只刷新索引" #: builtin/add.c msgid "just skip files which cannot be added because of errors" -msgstr "跳过因出错不能添加的文件" +msgstr "跳过因出错无法添加的文件" #: builtin/add.c msgid "check if - even missing - files are ignored in dry run" -msgstr "检查在演习模式下文件（即使不存在）是否被忽略" +msgstr "检查试运行时文件（即使不存在）是否被忽略" #: builtin/add.c builtin/mv.c builtin/rm.c msgid "allow updating entries outside of the sparse-checkout cone" @@ -2424,7 +2439,7 @@ msgstr "覆盖列表里文件的可执行位" #: builtin/add.c msgid "warn when adding an embedded repository" -msgstr "创建一个嵌入式仓库时给予警告" +msgstr "添加嵌入式仓库时给予警告" #: builtin/add.c #, c-format @@ -2443,7 +2458,7 @@ msgid "" "\n" "See \"git help submodule\" for more information." msgstr "" -"您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n" +"您在当前仓库中添加了另一个 Git 仓库。外层仓库的克隆将不包含嵌入式仓库的\n" "内容，并且不知道该如何获取它。如果您要添加一个子模组，使用：\n" "\n" "\tgit submodule add %s\n" @@ -2508,7 +2523,7 @@ msgstr "无法写新的索引文件" #: builtin/am.c builtin/mailinfo.c mailinfo.c #, c-format msgid "bad action '%s' for '%s'" -msgstr "'%2$s' 的错误动作 '%1$s'" +msgstr "用于 '%2$s' 的动作 '%1$s' 无效" #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c #: builtin/pull.c builtin/revert.c diff-merges.c diff.c environment.c @@ -2520,16 +2535,16 @@ msgstr "'%s' 的值无效：'%s'" #: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c #, c-format msgid "could not read '%s'" -msgstr "不能读取 '%s'" +msgstr "无法读取 '%s'" #: builtin/am.c msgid "could not parse author script" -msgstr "不能解析作者脚本" +msgstr "无法解析作者脚本" #: builtin/am.c builtin/replace.c commit.c sequencer.c #, c-format msgid "could not parse %s" -msgstr "不能解析 %s" +msgstr "无法解析 %s" #: builtin/am.c #, c-format @@ -2632,15 +2647,15 @@ msgstr "无效的身份标识：%.*s" #: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c #, c-format msgid "unable to parse commit %s" -msgstr "不能解析提交 %s" +msgstr "无法解析提交 %s" #: builtin/am.c msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "仓库缺乏必要的数据对象以进行三方合并。" +msgstr "仓库缺乏必要的数据对象，无法回落到三路合并。" #: builtin/am.c msgid "Using index info to reconstruct a base tree..." -msgstr "使用索引来重建一个（三方合并的）基础目录树..." +msgstr "使用索引来重建一个（三路合并的）基础目录树..." #: builtin/am.c msgid "" @@ -2652,7 +2667,7 @@ msgstr "" #: builtin/am.c msgid "Falling back to patching base and 3-way merge..." -msgstr "回落到基础版本上打补丁及进行三方合并..." +msgstr "回落到在基础版本上打补丁并进行三路合并..." #: builtin/am.c msgid "Failed to merge in the changes." @@ -2695,7 +2710,7 @@ msgstr "无法写入索引文件" #: builtin/am.c #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" -msgstr "脏索引：不能应用补丁（脏文件：%s）" +msgstr "脏索引：无法应用补丁（脏文件：%s）" #: builtin/am.c #, c-format @@ -2740,7 +2755,7 @@ msgid "" "already introduced the same changes; you might want to skip this patch." msgstr "" "没有变更 —— 您是不是忘了执行 'git add'？\n" -"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" +"如果没有什么要添加到暂存区的，则很可能是其他提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" #: builtin/am.c @@ -2751,13 +2766,13 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" "在您的索引中仍存在未合并的路径。\n" -"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" +"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。\n" "您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" #: builtin/am.c builtin/reset.c #, c-format msgid "Could not parse object '%s'." -msgstr "不能解析对象 '%s'。" +msgstr "无法解析对象 '%s'。" #: builtin/am.c msgid "failed to clean index" @@ -2796,7 +2811,7 @@ msgstr "老的参数 —— 无作用" #: builtin/am.c msgid "allow fall back on 3way merging if needed" -msgstr "如果必要，允许使用三方合并。" +msgstr "如有需要，允许回落到三路合并" #: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c #: builtin/stash.c @@ -2859,7 +2874,7 @@ msgstr "补丁的格式" #: builtin/am.c msgid "override error message when patch failure occurs" -msgstr "打补丁失败时显示的错误信息" +msgstr "覆盖打补丁失败时的错误信息" #: builtin/am.c msgid "continue applying patches after resolving a conflict" @@ -2895,7 +2910,7 @@ msgstr "把空补丁记录为空提交" #: builtin/am.c msgid "lie about committer date" -msgstr "将作者日期作为提交日期" +msgstr "伪造提交者日期" #: builtin/am.c msgid "use current timestamp for author date" @@ -2904,7 +2919,7 @@ msgstr "用当前时间作为作者日期" #: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c #: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c msgid "key-id" -msgstr "key-id" +msgstr "密钥 ID" #: builtin/am.c builtin/rebase.c msgid "GPG-sign commits" @@ -2941,7 +2956,7 @@ msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -"发现了错误的 %s 目录。\n" +"发现了残留的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" #: builtin/am.c @@ -2958,7 +2973,7 @@ msgstr "git apply [<选项>] [<补丁>...]" #: builtin/archive.c diagnose.c msgid "could not redirect output" -msgstr "不能重定向输出" +msgstr "无法重定向输出" #: builtin/archive.c msgid "git archive: expected ACK/NAK, got a flush packet" @@ -3030,17 +3045,17 @@ msgstr "git bisect run <命令> [<参数>...]" #: builtin/bisect.c #, c-format msgid "cannot open file '%s' in mode '%s'" -msgstr "不能以 '%2$s' 模式打开文件 '%1$s'" +msgstr "无法以 '%2$s' 模式打开文件 '%1$s'" #: builtin/bisect.c #, c-format msgid "could not write to file '%s'" -msgstr "不能写入文件 '%s'" +msgstr "无法写入文件 '%s'" #: builtin/bisect.c #, c-format msgid "cannot open file '%s' for reading" -msgstr "不能打开文件 '%s' 来读取" +msgstr "无法打开文件 '%s' 来读取" #: builtin/bisect.c #, c-format @@ -3050,12 +3065,12 @@ msgstr "'%s' 不是一个有效的术语" #: builtin/bisect.c #, c-format msgid "can't use the builtin command '%s' as a term" -msgstr "不能使用内置命令 '%s' 作为术语" +msgstr "无法使用内置命令 '%s' 作为术语" #: builtin/bisect.c #, c-format msgid "can't change the meaning of the term '%s'" -msgstr "不能修改术语 '%s' 的含义" +msgstr "无法修改术语 '%s' 的含义" #: builtin/bisect.c msgid "please use two different terms" @@ -3075,12 +3090,12 @@ msgstr "'%s' 不是一个有效的提交" #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset '." -msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。" +msgstr "无法检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。" #: builtin/bisect.c #, c-format msgid "Bad bisect_write argument: %s" -msgstr "坏的 bisect_write 参数：%s" +msgstr "错误的 bisect_write 参数：%s" #: builtin/bisect.c #, c-format @@ -3128,7 +3143,7 @@ msgstr "在只有一个 %s 提交的情况下二分查找" #. #: builtin/bisect.c msgid "Are you sure [Y/n]? " -msgstr "您确认么[Y/n]？ " +msgstr "您确认吗 [Y/n]？ " #: builtin/bisect.c msgid "status: waiting for both good and bad commits\n" @@ -3186,7 +3201,7 @@ msgstr "'%s' 看起来不是一个有效的版本" #: builtin/bisect.c msgid "bad HEAD - I need a HEAD" -msgstr "坏的 HEAD - 我需要一个 HEAD" +msgstr "无效的 HEAD - 需要一个 HEAD" #: builtin/bisect.c #, c-format @@ -3195,7 +3210,7 @@ msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。" #: builtin/bisect.c msgid "bad HEAD - strange symbolic ref" -msgstr "坏的 HEAD - 奇怪的符号引用" +msgstr "无效的 HEAD - 奇怪的符号引用" #: builtin/bisect.c #, c-format @@ -3212,7 +3227,7 @@ msgstr "您需要执行 \"git bisect start\" 来开始\n" #. #: builtin/bisect.c msgid "Do you want me to do it for you [Y/n]? " -msgstr "您想让我为您这样做么[Y/n]？ " +msgstr "您想让我为您这样做吗[Y/n]？ " #: builtin/bisect.c msgid "Please call `--bisect-state` with at least one argument" @@ -3226,12 +3241,12 @@ msgstr "'git bisect %s' 只能带一个参数。" #: builtin/bisect.c #, c-format msgid "Bad rev input: %s" -msgstr "坏的版本输入：%s" +msgstr "错误的版本输入：%s" #: builtin/bisect.c #, c-format msgid "Bad rev input (not a commit): %s" -msgstr "坏的版本输入（不是提交）：%s" +msgstr "错误的版本输入（不是提交）：%s" #: builtin/bisect.c msgid "We are not bisecting." @@ -3240,12 +3255,12 @@ msgstr "我们没有在二分查找。" #: builtin/bisect.c #, c-format msgid "'%s'?? what are you talking about?" -msgstr "'%s'?? 您在说什么?" +msgstr "'%s'？？您在说什么？" #: builtin/bisect.c #, c-format msgid "cannot read file '%s' for replaying" -msgstr "不能读取文件 '%s' 来重放" +msgstr "无法读取文件 '%s' 来重放" #: builtin/bisect.c #, c-format @@ -3278,7 +3293,7 @@ msgstr "无法打开文件 '%s' 进行写入" #: builtin/bisect.c msgid "bisect run cannot continue any more" -msgstr "二分查找不能继续运行" +msgstr "二分查找无法继续运行" #: builtin/bisect.c msgid "bisect run success" @@ -3341,16 +3356,29 @@ msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" #: builtin/blame.c #, c-format msgid "expecting a color: %s" -msgstr "期望一个颜色：%s" +msgstr "期望是颜色：%s" #: builtin/blame.c msgid "must end with a color" msgstr "必须以一个颜色结尾" +#: builtin/blame.c diff.c merge-ort.c transport.c +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "配置 '%s' 未知的取值：%s" + +#: builtin/blame.c builtin/merge-file.c diff.c +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"选项 diff-algorithm 接受参数 \"myers\"、\"minimal\"、\"patience\" 和 " +"\"histogram\"" + #: builtin/blame.c #, c-format msgid "cannot find revision %s to ignore" -msgstr "不能找到要忽略的版本 %s" +msgstr "无法找到要忽略的版本 %s" #: builtin/blame.c msgid "show blame entries as we find them, incrementally" @@ -3392,7 +3420,7 @@ msgstr "显示为一个适合机器读取的格式" #: builtin/blame.c msgid "show porcelain format with per-line commit information" -msgstr "为每一行显示机器适用的提交信息" +msgstr "以 porcelain 格式显示每行的提交信息" #: builtin/blame.c msgid "use the same output mode as git-annotate (Default: off)" @@ -3418,6 +3446,14 @@ msgstr "显示作者的邮箱而不是名字（默认：关闭）" msgid "ignore whitespace differences" msgstr "忽略空白差异" +#: builtin/blame.c builtin/merge-file.c diff.c +msgid "" +msgstr "<算法>" + +#: builtin/blame.c builtin/merge-file.c diff.c +msgid "choose a diff algorithm" +msgstr "选择一个差异算法" + #: builtin/blame.c builtin/clone.c builtin/log.c msgid "rev" msgstr "版本" @@ -3432,15 +3468,15 @@ msgstr "忽略来自 <文件> 中的版本" #: builtin/blame.c msgid "color redundant metadata from previous line differently" -msgstr "使用颜色间隔输出与前一行不同的重复元信息" +msgstr "用不同颜色标示与前一行重复的元信息" #: builtin/blame.c msgid "color lines by age" msgstr "依据时间着色" #: builtin/blame.c -msgid "spend extra cycles to find better match" -msgstr "花费额外的循环来找到更好的匹配" +msgid "spend extra cycles to find a better match" +msgstr "花费更多计算来找到更好的匹配" #: builtin/blame.c msgid "use revisions from instead of calling git-rev-list" @@ -3448,7 +3484,7 @@ msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" #: builtin/blame.c msgid "use 's contents as the final image" -msgstr "使用 <文件> 的内容作为最终的镜像" +msgstr "使用 <文件> 的内容作为最终结果" #: builtin/blame.c msgid "score" @@ -3472,7 +3508,7 @@ msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数 #: builtin/blame.c msgid "--progress can't be used with --incremental or porcelain formats" -msgstr "--progress 不能和 --incremental 或机器内部格式一起使用" +msgstr "--progress 不能和 --incremental 或 porcelain 格式一起使用" #. TRANSLATORS: This string is used to tell us the #. maximum display width for a relative timestamp in @@ -3521,7 +3557,7 @@ msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" #: builtin/branch.c msgid "git branch [] (-c | -C) [] " -msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>" +msgstr "git branch [<选项>] (-c | -C) [<旧分支>] <新分支>" #: builtin/branch.c msgid "git branch [] [-r | -a] [--points-at]" @@ -3577,7 +3613,7 @@ msgstr "不能将 -a 和 -d 同时使用" #: builtin/branch.c #, c-format msgid "cannot delete branch '%s' used by worktree at '%s'" -msgstr "无法强制更新被工作区 '%2$s' 所使用的分支 '%1$s'" +msgstr "无法删除被工作区 '%2$s' 使用的分支 '%1$s'" #: builtin/branch.c #, c-format @@ -3596,7 +3632,7 @@ msgstr "" #: builtin/branch.c #, c-format msgid "branch '%s' not found" -msgstr "分支 '%s' 未发现" +msgstr "分支 '%s' 未找到" #: builtin/branch.c #, c-format @@ -3610,11 +3646,11 @@ msgstr "已删除分支 %s（曾为 %s）。\n" #: builtin/branch.c builtin/tag.c msgid "unable to parse format string" -msgstr "不能解析格式化字符串" +msgstr "无法解析格式化字符串" #: builtin/branch.c msgid "could not resolve HEAD" -msgstr "不能解析 HEAD 提交" +msgstr "无法解析 HEAD" #: builtin/branch.c #, c-format @@ -3629,12 +3665,12 @@ msgstr "分支 %s 正被变基到 %s" #: builtin/branch.c #, c-format msgid "branch %s is being bisected at %s" -msgstr "分支 %s 正被二分查找于 %s" +msgstr "分支 %s 正在 %s 处进行二分查找" #: builtin/branch.c #, c-format msgid "HEAD of working tree %s is not updated" -msgstr "工作区 %s 的 HEAD 指向没有被更新" +msgstr "工作区 %s 的 HEAD 未更新" #: builtin/branch.c #, c-format @@ -3691,7 +3727,7 @@ msgid "" msgstr "" "请编辑分支的描述\n" " %s\n" -"以 '%s' 开头的行将被过滤。\n" +"以 '%s' 开头的行将被移除。\n" #: builtin/branch.c msgid "Generic options" @@ -3743,7 +3779,7 @@ msgstr "只打印不包含该提交的分支" #: builtin/branch.c msgid "Specific git-branch actions:" -msgstr "具体的 git-branch 动作：" +msgstr "具体的 git-branch 操作：" #: builtin/branch.c msgid "list both remote-tracking and local branches" @@ -3791,7 +3827,7 @@ msgstr "创建分支的引用日志" #: builtin/branch.c msgid "edit the description for the branch" -msgstr "标记分支的描述" +msgstr "编辑分支的描述" #: builtin/branch.c msgid "force creation, move/rename, deletion" @@ -3819,7 +3855,7 @@ msgstr "只打印指向该对象的分支" #: builtin/branch.c builtin/for-each-ref.c builtin/tag.c msgid "sorting and filtering are case insensitive" -msgstr "排序和过滤属于大小写不敏感" +msgstr "排序和过滤不区分大小写" #: builtin/branch.c builtin/ls-files.c msgid "recurse through submodules" @@ -3836,7 +3872,7 @@ msgstr "无法将 HEAD 解析为有效引用" #: builtin/branch.c builtin/clone.c msgid "HEAD not found below refs/heads!" -msgstr "HEAD 没有位于 /refs/heads 之下！" +msgstr "HEAD 没有位于 refs/heads 之下！" #: builtin/branch.c msgid "" @@ -3855,11 +3891,11 @@ msgstr "必须提供分支名" #: builtin/branch.c msgid "cannot give description to detached HEAD" -msgstr "不能向分离头指针提供描述" +msgstr "无法向分离头指针提供描述" #: builtin/branch.c msgid "cannot edit description of more than one branch" -msgstr "不能为一个以上的分支编辑描述" +msgstr "无法为一个以上的分支编辑描述" #: builtin/branch.c msgid "cannot copy the current branch while not on any" @@ -3903,7 +3939,7 @@ msgstr "为取消上游设置操作提供了太多的参数" #: builtin/branch.c msgid "could not unset upstream of HEAD when it does not point to any branch" -msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" +msgstr "无法取消 HEAD 的上游设置，因为它没有指向任何分支" #: builtin/branch.c #, c-format @@ -3946,9 +3982,9 @@ msgid "" " [(-s | --suffix) | --no-suffix]\n" " [--diagnose[=]]" msgstr "" -"git bugreport [-o | --output-directory <文件>]\n" +"git bugreport [-o | --output-directory <路径>]\n" " [(-s | --suffix) <格式> | --no-suffix]\n" -" [--diagnose[=<模式>]" +" [--diagnose[=<模式>]]" #: builtin/bugreport.c msgid "" @@ -3979,13 +4015,13 @@ msgstr "" "\n" "您所期望的与实际发生的有什么不同？\n" "\n" -"您想要补充的其它内容：\n" +"您想要补充的其他内容：\n" "\n" "请检查下面错误报告中余下的内容。\n" "您可以删除任何您不想共享的内容。\n" #: builtin/bugreport.c builtin/commit.c builtin/fast-export.c -#: builtin/pack-objects.c builtin/rebase.c parse-options.h +#: builtin/pack-objects.c builtin/rebase.c builtin/replay.c parse-options.h msgid "mode" msgstr "模式" @@ -4010,12 +4046,12 @@ msgstr "未知参数 `%s'" #: builtin/bugreport.c builtin/diagnose.c #, c-format msgid "could not create leading directories for '%s'" -msgstr "不能为 '%s' 创建先导目录" +msgstr "无法为 '%s' 创建上级目录" #: builtin/bugreport.c builtin/diagnose.c #, c-format msgid "unable to create diagnostics archive %s" -msgstr "不能创建诊断归档包 %s" +msgstr "无法创建诊断归档包 %s" #: builtin/bugreport.c msgid "System Info" @@ -4061,11 +4097,11 @@ msgstr "需要一个 <文件> 参数" #: builtin/bundle.c builtin/pack-objects.c msgid "do not show progress meter" -msgstr "不显示进度表" +msgstr "不显示进度条" #: builtin/bundle.c builtin/pack-objects.c msgid "show progress meter" -msgstr "显示进度表" +msgstr "显示进度条" #: builtin/bundle.c msgid "historical; same as --progress" @@ -4077,28 +4113,28 @@ msgstr "老的参数；无作用" #: builtin/bundle.c msgid "specify bundle format version" -msgstr "指定归档包的格式版本" +msgstr "指定捆绑包的格式版本" #: builtin/bundle.c msgid "Need a repository to create a bundle." -msgstr "需要一个仓库来创建归档包。" +msgstr "需要一个仓库来创建捆绑包。" #: builtin/bundle.c msgid "do not show bundle details" -msgstr "不显示归档包的细节" +msgstr "不显示捆绑包的细节" #: builtin/bundle.c bundle.c msgid "need a repository to verify a bundle" -msgstr "需要一个仓库来校验一个归档包" +msgstr "需要一个仓库来校验一个捆绑包" #: builtin/bundle.c #, c-format msgid "%s is okay\n" -msgstr "%s 可以\n" +msgstr "%s 没问题\n" #: builtin/bundle.c msgid "Need a repository to unbundle." -msgstr "需要一个仓库来解开归档包。" +msgstr "需要一个仓库来解开捆绑包。" #: builtin/bundle.c msgid "Unbundling objects" @@ -4107,7 +4143,7 @@ msgstr "解包对象中" #: builtin/cat-file.c #, c-format msgid "cannot read object %s '%s'" -msgstr "不能读取对象 %s '%s'" +msgstr "无法读取对象 %s '%s'" #: builtin/cat-file.c msgid "flush is only for --buffer mode" @@ -4178,7 +4214,7 @@ msgstr "美观地打印 <对象> 的内容" #: builtin/cat-file.c msgid "Emit [broken] object attributes" -msgstr "输出 [坏的] 对象属性" +msgstr "输出 [损坏的] 对象属性" #: builtin/cat-file.c msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" @@ -4206,11 +4242,11 @@ msgstr "类似于 --batch，但不输出 <内容>" #: builtin/cat-file.c msgid "stdin is NUL-terminated" -msgstr "标准输入以 NUL 字符分隔" +msgstr "标准输入以 NUL 字符终止" #: builtin/cat-file.c msgid "stdin and stdout is NUL-terminated" -msgstr "标准输入和标准输出以 NUL 字符分隔" +msgstr "标准输入和标准输出以 NUL 字符终止" #: builtin/cat-file.c msgid "read commands from stdin" @@ -4256,7 +4292,7 @@ msgstr "数据对象|树" #: builtin/cat-file.c msgid "use a for (--textconv | --filters); Not with 'batch'" -msgstr "(--textconv | --filters) 使用 <路径>；而不是 'batch'" +msgstr "为 (--textconv | --filters) 使用 <路径>；不能与 'batch' 同用" #: builtin/cat-file.c msgid "objects filter only supported in batch mode" @@ -4421,7 +4457,7 @@ msgstr "git checkout-index [<选项>] [--] [<文件>...]" #: builtin/checkout-index.c msgid "stage should be between 1 and 3 or all" -msgstr "索引值应该取值 1 到 3 或者 all" +msgstr "暂存区编号应为 1 到 3 或 all" #: builtin/checkout-index.c msgid "check out all files in the index" @@ -4437,7 +4473,7 @@ msgstr "强制覆盖现有的文件" #: builtin/checkout-index.c msgid "no warning for existing files and files not in index" -msgstr "存在或不在索引中的文件都没有警告" +msgstr "对已存在文件和不在索引中的文件不发出警告" #: builtin/checkout-index.c msgid "don't checkout new files" @@ -4498,7 +4534,7 @@ msgstr "路径 '%s' 没有必需的版本" #: builtin/checkout.c #, c-format msgid "path '%s': cannot merge" -msgstr "path '%s'：无法合并" +msgstr "路径 '%s'：无法合并" #: builtin/checkout.c #, c-format @@ -4534,7 +4570,7 @@ msgstr "'%s' 不能在更新路径时使用" #: builtin/checkout.c #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." -msgstr "不能同时更新路径并切换到分支'%s'。" +msgstr "不能同时更新路径并切换到分支 '%s'。" #: builtin/checkout.c #, c-format @@ -4577,13 +4613,13 @@ msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -"不能继续，下列文件有暂存的修改：\n" +"无法继续，下列文件有暂存的修改：\n" "%s" #: builtin/checkout.c #, c-format msgid "Can not do reflog for '%s': %s\n" -msgstr "不能对 '%s' 执行 reflog 操作：%s\n" +msgstr "无法对 '%s' 执行 reflog 操作：%s\n" #: builtin/checkout.c msgid "HEAD is now at" @@ -4591,7 +4627,7 @@ msgstr "HEAD 目前位于" #: builtin/checkout.c builtin/clone.c msgid "unable to update HEAD" -msgstr "不能更新 HEAD" +msgstr "无法更新 HEAD" #: builtin/checkout.c #, c-format @@ -4622,7 +4658,7 @@ msgstr "切换到分支 '%s'\n" #: builtin/checkout.c #, c-format msgid " ... and %d more.\n" -msgstr " ... 及其它 %d 个。\n" +msgstr " ... 及其他 %d 个。\n" #: builtin/checkout.c #, c-format @@ -4709,8 +4745,8 @@ msgstr "" "\n" " git checkout --track origin/<名称>\n" "\n" -"如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n" -"名称，可以在配置中设置 checkout.defaultRemote=origin。" +"如果您希望在检出模糊的简短分支名 <名称> 时总是偏好某个远程（如 'origin'），\n" +"可以在配置中设置 checkout.defaultRemote=origin。" #: builtin/checkout.c #, c-format @@ -4759,7 +4795,7 @@ msgstr "期望一个分支，得到提交 '%s'" #: builtin/checkout.c msgid "" "If you want to detach HEAD at the commit, try again with the --detach option." -msgstr "如果你在本提交分离头指针，使用 --detach 选项重试。" +msgstr "如果您想在该提交处分离 HEAD，请使用 --detach 选项重试。" #: builtin/checkout.c msgid "" @@ -4832,7 +4868,7 @@ msgstr "'%s' 不带 <起始点>" #: builtin/checkout.c #, c-format msgid "Cannot switch branch to a non-commit '%s'" -msgstr "不能切换分支到一个非提交 '%s'" +msgstr "无法切换分支到一个非提交 '%s'" #: builtin/checkout.c msgid "missing branch or commit argument" @@ -4845,7 +4881,7 @@ msgstr "未知的冲突风格 '%s'" #: builtin/checkout.c msgid "perform a 3-way merge with the new branch" -msgstr "和新的分支执行三方合并" +msgstr "和新的分支执行三路合并" #: builtin/checkout.c builtin/log.c builtin/range-diff.c parse-options.h msgid "style" @@ -4869,7 +4905,7 @@ msgstr "新分支" #: builtin/checkout.c msgid "new unborn branch" -msgstr "新的未诞生的分支" +msgstr "新的尚未诞生分支" #: builtin/checkout.c builtin/merge.c msgid "update ignored files (default)" @@ -4889,12 +4925,12 @@ msgstr "对尚未合并的文件检出他们的版本" #: builtin/checkout.c msgid "do not limit pathspecs to sparse entries only" -msgstr "对路径不做稀疏检出的限制" +msgstr "对路径规格不只限于稀疏条目" #: builtin/checkout.c #, c-format msgid "options '-%c', '-%c', and '%s' cannot be used together" -msgstr "选项 '-%c'、'-%c' 和 ‘%s' 不能同时使用" +msgstr "选项 '-%c'、'-%c' 和 '%s' 不能同时使用" #: builtin/checkout.c msgid "--track needs a branch name" @@ -4905,10 +4941,10 @@ msgstr "--track 需要一个分支名" msgid "missing branch name; try -%c" msgstr "缺少分支名，尝试 -%c" -#: builtin/checkout.c +#: builtin/checkout.c sequencer.c #, c-format -msgid "could not resolve %s" -msgstr "无法解析 %s" +msgid "could not resolve '%s'" +msgstr "无法解析 '%s'" #: builtin/checkout.c msgid "invalid path specification" @@ -4917,12 +4953,12 @@ msgstr "无效的路径规格" #: builtin/checkout.c #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" -msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'" +msgstr "'%s' 不是一个提交，无法基于它创建分支 '%s'" #: builtin/checkout.c #, c-format msgid "git checkout: --detach does not take a path argument '%s'" -msgstr "git checkout：--detach 不能接收路径参数 '%s'" +msgstr "git checkout：--detach 不接收路径参数 '%s'" #: builtin/checkout.c msgid "" @@ -4978,7 +5014,7 @@ msgstr "丢弃本地修改" #: builtin/checkout.c msgid "which tree-ish to checkout from" -msgstr "要检出哪一个树" +msgstr "要从哪个树对象检出" #: builtin/checkout.c msgid "restore the index" @@ -5001,7 +5037,7 @@ msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] " "[...]" msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径规格>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] [<路径规格>...]" #: builtin/clean.c builtin/sparse-checkout.c #, c-format @@ -5016,22 +5052,22 @@ msgstr "将删除 %s\n" #: builtin/clean.c #, c-format msgid "Skipping repository %s\n" -msgstr "忽略仓库 %s\n" +msgstr "跳过仓库 %s\n" #: builtin/clean.c #, c-format msgid "Would skip repository %s\n" -msgstr "将忽略仓库 %s\n" +msgstr "将跳过仓库 %s\n" #: builtin/clean.c midx.c #, c-format msgid "failed to remove %s" -msgstr "无法删除 '%s'" +msgstr "无法删除 %s" #: builtin/clean.c #, c-format msgid "could not lstat %s\n" -msgstr "不能对 %s 调用 lstat\n" +msgstr "无法对 %s 调用 lstat\n" #: builtin/clean.c msgid "Refusing to remove current working directory\n" @@ -5083,7 +5119,7 @@ msgstr "嗯（%s）？\n" #: builtin/clean.c #, c-format msgid "Input ignore patterns>> " -msgstr "输入模版以排除条目>> " +msgstr "输入忽略模式>> " #: builtin/clean.c #, c-format @@ -5111,7 +5147,7 @@ msgid "" "? - help for prompt selection" msgstr "" "clean - 开始清理\n" -"filter by pattern - 通过模版排除要删除的条目\n" +"filter by pattern - 通过模式排除要删除的条目\n" "select by numbers - 通过数字选择要删除的条目\n" "ask each - 针对删除逐一询问（就像 \"rm -i\"）\n" "quit - 停止删除并退出\n" @@ -5169,7 +5205,7 @@ msgstr "clean.requireForce 设置为 true 且未提供 -f 选项：拒绝执行 #: builtin/clone.c #, c-format msgid "info: Could not add alternate for '%s': %s\n" -msgstr "info: 不能为 '%s' 添加一个备用：%s\n" +msgstr "info：无法为 '%s' 添加一个备用：%s\n" #: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c #, c-format @@ -5248,7 +5284,7 @@ msgstr "远程没有发送所有必需的对象" #: builtin/clone.c #, c-format msgid "unable to update %s" -msgstr "不能更新 %s" +msgstr "无法更新 %s" #: builtin/clone.c msgid "failed to initialize sparse-checkout" @@ -5260,7 +5296,7 @@ msgstr "远程 HEAD 指向一个不存在的引用，无法检出" #: builtin/clone.c msgid "unable to checkout working tree" -msgstr "不能检出工作区" +msgstr "无法检出工作区" #: builtin/clone.c msgid "unable to write parameters to config file" @@ -5320,7 +5356,7 @@ msgstr "模板目录" #: builtin/clone.c builtin/init-db.c msgid "directory from which templates will be used" -msgstr "模板目录将被使用" +msgstr "将从该目录使用模板" #: builtin/clone.c builtin/submodule--helper.c msgid "reference repository" @@ -5370,7 +5406,7 @@ msgstr "引用" #: builtin/clone.c builtin/fetch.c builtin/pull.c msgid "deepen history of shallow clone, excluding ref" -msgstr "深化浅克隆的历史，除了给定的引用" +msgstr "深化浅克隆的历史，不包含指定引用" #: builtin/clone.c builtin/submodule--helper.c msgid "clone only one branch, HEAD or --branch" @@ -5382,15 +5418,15 @@ msgstr "克隆标签，并在后续获取时不跟随它们" #: builtin/clone.c msgid "any cloned submodules will be shallow" -msgstr "子模组将以浅下载模式克隆" +msgstr "所有被克隆的子模组都将是浅克隆" #: builtin/clone.c builtin/init-db.c msgid "gitdir" -msgstr "git目录" +msgstr "git 目录" #: builtin/clone.c builtin/init-db.c msgid "separate git dir from working tree" -msgstr "git目录和工作区分离" +msgstr "将 git 目录与工作区分离" #: builtin/clone.c builtin/init-db.c builtin/submodule--helper.c msgid "specify the reference format to use" @@ -5398,7 +5434,7 @@ msgstr "指定要使用的引用格式" #: builtin/clone.c msgid "key=value" -msgstr "key=value" +msgstr "键=值" #: builtin/clone.c msgid "set config inside the new repository" @@ -5407,7 +5443,7 @@ msgstr "在新仓库中设置配置信息" #: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c #: builtin/push.c builtin/send-pack.c msgid "server-specific" -msgstr "server-specific" +msgstr "服务端特定" #: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c #: builtin/push.c builtin/send-pack.c @@ -5424,15 +5460,15 @@ msgstr "任何克隆的子模组将使用它们的远程跟踪分支" #: builtin/clone.c msgid "initialize sparse-checkout file to include only files at root" -msgstr "初始化稀疏检出文件，只包含根目录文件" +msgstr "初始化稀疏检出文件，只包含根目录中的文件" #: builtin/clone.c msgid "uri" -msgstr "uri" +msgstr "URI" #: builtin/clone.c msgid "a URI for downloading bundles before fetching from origin remote" -msgstr "用于在从 origin 远程获取之前下载归档包的 URI" +msgstr "用于在从 origin 远程获取之前下载捆绑包的 URI" #: builtin/clone.c msgid "git clone [] [--] []" @@ -5480,12 +5516,12 @@ msgstr "工作区 '%s' 已经存在。" #: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c #, c-format msgid "could not create leading directories of '%s'" -msgstr "不能为 '%s' 创建先导目录" +msgstr "无法为 '%s' 创建上级目录" #: builtin/clone.c #, c-format msgid "could not create work tree dir '%s'" -msgstr "不能创建工作区目录 '%s'" +msgstr "无法创建工作区目录 '%s'" #: builtin/clone.c #, c-format @@ -5538,20 +5574,20 @@ msgstr "--local 被忽略" #: builtin/clone.c msgid "cannot clone from filtered bundle" -msgstr "无法从经过过滤的归档包克隆" +msgstr "无法从经过过滤的捆绑包克隆" #: builtin/clone.c msgid "failed to initialize the repo, skipping bundle URI" -msgstr "无法初始化仓库，跳过归档包 URI" +msgstr "无法初始化仓库，跳过捆绑包 URI" #: builtin/clone.c #, c-format msgid "failed to fetch objects from bundle URI '%s'" -msgstr "无法从归档包 URI '%s' 获取对象" +msgstr "无法从捆绑包 URI '%s' 获取对象" #: builtin/clone.c msgid "failed to fetch advertised bundles" -msgstr "无法获取公布的归档包" +msgstr "无法获取公布的捆绑包" #: builtin/clone.c msgid "remote transport reported error" @@ -5560,7 +5596,7 @@ msgstr "远程传输报告错误" #: builtin/clone.c #, c-format msgid "Remote branch %s not found in upstream %s" -msgstr "远程分支 %s 在上游 %s 未发现" +msgstr "远程分支 %s 在上游 %s 未找到" #: builtin/clone.c #, c-format @@ -5625,7 +5661,7 @@ msgid "" msgstr "" "git commit-graph write [--object-dir <目录>] [--append]\n" " [--split[=<策略>]] [--reachable | --stdin-packs | --" -"stdin-commits] \n" +"stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" " <切分选项>" @@ -5641,7 +5677,7 @@ 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 @@ -5687,7 +5723,7 @@ msgstr "从标准输入中的提交开始扫描" #: builtin/commit-graph.c msgid "include all commits already in the commit-graph file" -msgstr "包含 commit-graph 文件中已有所有提交" +msgstr "包含 commit-graph 文件中已有的所有提交" #: builtin/commit-graph.c msgid "enable computation for changed paths" @@ -5730,7 +5766,7 @@ msgid "" "git commit-tree [(-p )...] [-S[]] [(-m )...]\n" " [(-F )...] " msgstr "" -"git commit-tree [(-p <父提交>)...] [-S[<私钥 ID>]] [(-m <消息>)...]\n" +"git commit-tree [(-p <父提交>)...] [-S[<密钥 ID>]] [(-m <消息>)...]\n" " [(-F <文件>)...] <树>" #: builtin/commit-tree.c @@ -5777,7 +5813,7 @@ msgstr "从文件中读取提交说明" #: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c #: builtin/revert.c msgid "GPG sign commit" -msgstr "GPG 提交签名" +msgstr "GPG 签名提交" #: builtin/commit-tree.c msgid "must give exactly one tree" @@ -5806,7 +5842,7 @@ msgstr "" " [--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" +" [(--trailer <键>[(=|:)<值>])...] [-S[<密钥 ID>]]\n" " [--] [<路径规格>...]" #: builtin/commit.c @@ -5819,8 +5855,8 @@ msgid "" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -"您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" -"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" +"您要修订最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" +"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 彻底删除该提交。\n" #: builtin/commit.c msgid "" @@ -5875,11 +5911,11 @@ msgstr "无法解包 HEAD 树对象" #: builtin/commit.c msgid "No paths with --include/--only does not make sense." -msgstr "参数 --include/--only 不跟路径没有意义。" +msgstr "在未指定路径时使用 --include/--only 没有意义。" #: builtin/commit.c msgid "unable to create temporary index" -msgstr "不能创建临时索引" +msgstr "无法创建临时索引" #: builtin/commit.c msgid "interactive add failed" @@ -5891,7 +5927,7 @@ msgstr "无法更新临时索引" #: builtin/commit.c msgid "Failed to update main cache tree" -msgstr "不能更新树的主缓存" +msgstr "无法更新主缓存树" #: builtin/commit.c msgid "cannot do a partial commit during a merge." @@ -5941,7 +5977,7 @@ msgstr "无法选择一个未被当前提交说明使用的注释字符" #: builtin/commit.c #, c-format msgid "could not lookup commit '%s'" -msgstr "不能查询提交 '%s'" +msgstr "无法查询提交 '%s'" #: builtin/commit.c builtin/shortlog.c #, c-format @@ -5950,12 +5986,12 @@ msgstr "（正从标准输入中读取日志信息）\n" #: builtin/commit.c msgid "could not read log from standard input" -msgstr "不能从标准输入中读取日志信息" +msgstr "无法从标准输入中读取日志信息" #: builtin/commit.c #, c-format msgid "could not read log file '%s'" -msgstr "不能读取日志文件 '%s'" +msgstr "无法读取日志文件 '%s'" #: builtin/commit.c #, c-format @@ -5964,11 +6000,11 @@ msgstr "选项 '%s' 和 '%s:%s' 不能同时使用" #: builtin/commit.c msgid "could not read SQUASH_MSG" -msgstr "不能读取 SQUASH_MSG" +msgstr "无法读取 SQUASH_MSG" #: builtin/commit.c msgid "could not read MERGE_MSG" -msgstr "不能读取 MERGE_MSG" +msgstr "无法读取 MERGE_MSG" #: builtin/commit.c bundle.c rerere.c sequencer.c #, c-format @@ -5977,7 +6013,7 @@ msgstr "无法打开 '%s'" #: builtin/commit.c msgid "could not write commit template" -msgstr "不能写提交模版" +msgstr "无法写提交模板" #: builtin/commit.c #, c-format @@ -6092,11 +6128,11 @@ msgstr "无效的未跟踪文件参数 '%s'" #: builtin/commit.c msgid "You are in the middle of a merge -- cannot reword." -msgstr "您正处于一个合并过程中 -- 无法改写说明。" +msgstr "您正处于一个合并过程中 -- 不能改写说明。" #: builtin/commit.c msgid "You are in the middle of a cherry-pick -- cannot reword." -msgstr "您正处于一个拣选过程中 -- 无法改写说明。" +msgstr "您正处于一个拣选过程中 -- 不能改写说明。" #: builtin/commit.c #, c-format @@ -6110,19 +6146,19 @@ msgstr "改写说明选项 '%s' 和 '%s' 不能同时使用" #: builtin/commit.c msgid "You have nothing to amend." -msgstr "您没有可修补的提交。" +msgstr "您没有可修订的提交。" #: builtin/commit.c msgid "You are in the middle of a merge -- cannot amend." -msgstr "您正处于一个合并过程中 -- 无法修补提交。" +msgstr "您正处于一个合并过程中 -- 不能修订提交。" #: builtin/commit.c msgid "You are in the middle of a cherry-pick -- cannot amend." -msgstr "您正处于一个拣选过程中 -- 无法修补提交。" +msgstr "您正处于一个拣选过程中 -- 不能修订提交。" #: builtin/commit.c msgid "You are in the middle of a rebase -- cannot amend." -msgstr "您正处于一个变基过程中 -- 无法修补提交。" +msgstr "您正处于一个变基过程中 -- 不能修订提交。" #: builtin/commit.c msgid "--reset-author can be used only with -C, -c or --amend." @@ -6136,7 +6172,7 @@ msgstr "未知选项：--fixup=%s:%s" #: builtin/commit.c #, c-format msgid "paths '%s ...' with -a does not make sense" -msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" +msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" #: builtin/commit.c msgid "show status concisely" @@ -6148,7 +6184,7 @@ msgstr "显示分支信息" #: builtin/commit.c msgid "show stash information" -msgstr "显示贮藏区信息" +msgstr "显示储藏信息" #: builtin/commit.c msgid "compute full ahead/behind values" @@ -6202,7 +6238,7 @@ msgstr "不检测重命名" #: builtin/commit.c msgid "detect renames, optionally set similarity index" -msgstr "检测重命名，可以设置索引相似度" +msgstr "检测重命名，可设置相似度索引" #: builtin/commit.c msgid "Unsupported combination of ignored and untracked-files arguments" @@ -6262,7 +6298,7 @@ msgstr "[(amend|reword):]提交" #: builtin/commit.c msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" -msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明" +msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修订或改写说明" #: builtin/commit.c msgid "use autosquash formatted message to squash specified commit" @@ -6339,7 +6375,7 @@ msgstr "绕过 post-rewrite 钩子" #: builtin/commit.c msgid "ok to record an empty change" -msgstr "允许一个空提交" +msgstr "允许记录空变更" #: builtin/commit.c msgid "ok to record a change with an empty message" @@ -6347,7 +6383,7 @@ msgstr "允许空的提交说明" #: builtin/commit.c sequencer.c msgid "could not parse HEAD commit" -msgstr "不能解析 HEAD 提交" +msgstr "无法解析 HEAD 提交" #: builtin/commit.c #, c-format @@ -6356,22 +6392,22 @@ msgstr "损坏的 MERGE_HEAD 文件（%s）" #: builtin/commit.c msgid "could not read MERGE_MODE" -msgstr "不能读取 MERGE_MODE" +msgstr "无法读取 MERGE_MODE" #: builtin/commit.c #, c-format msgid "could not read commit message: %s" -msgstr "不能读取提交说明：%s" +msgstr "无法读取提交说明：%s" #: builtin/commit.c #, c-format msgid "Aborting commit due to empty commit message.\n" -msgstr "终止提交因为提交说明为空。\n" +msgstr "由于提交说明为空，终止提交。\n" #: builtin/commit.c #, c-format msgid "Aborting commit; you did not edit the message.\n" -msgstr "终止提交；您未更改来自模版的提交说明。\n" +msgstr "终止提交；您未更改来自模板的提交说明。\n" #: builtin/commit.c #, c-format @@ -6522,7 +6558,7 @@ msgstr "显示选项" #: builtin/config.c msgid "terminate values with NUL byte" -msgstr "终止值是 NUL 字节" +msgstr "以 NUL 字节终止值" #: builtin/config.c msgid "show variable names only" @@ -6547,7 +6583,7 @@ msgstr "未能识别的 --type 参数，%s" #: builtin/config.c msgid "only one type at a time" -msgstr "一次只能一个类型" +msgstr "一次只能指定一个类型" #: builtin/config.c #, c-format @@ -6557,7 +6593,7 @@ msgstr "错误的参数个数，应该为 %d 个" #: builtin/config.c #, c-format msgid "wrong number of arguments, should be from %d to %d" -msgstr "错误的参数个数，应该为从 %d 个到 %d 个" +msgstr "错误的参数个数，应为 %d 到 %d 个" #: builtin/config.c #, c-format @@ -6585,7 +6621,7 @@ msgstr "无法解析默认颜色值" #: builtin/config.c msgid "not in a git directory" -msgstr "不在 git 仓库中" +msgstr "不在 git 目录中" #: builtin/config.c msgid "writing to stdin is not supported" @@ -6604,9 +6640,9 @@ msgid "" "#\tname = %s\n" "#\temail = %s\n" msgstr "" -"# This is Git's per-user configuration file.\n" +"# 这是 Git 的用户级配置文件。\n" "[user]\n" -"# Please adapt and uncomment the following lines:\n" +"# 请根据需要修改并取消注释以下行：\n" "#\tname = %s\n" "#\temail = %s\n" @@ -6641,7 +6677,7 @@ msgstr "" #: builtin/config.c msgid "Other" -msgstr "其它" +msgstr "其他" #: builtin/config.c msgid "respect include directives on lookup" @@ -6694,7 +6730,7 @@ msgstr "缺少条目时使用默认值" #: builtin/config.c msgid "--fixed-value only applies with 'value-pattern'" -msgstr "--fixed-value 仅适用于有 '值模式'" +msgstr "--fixed-value 仅适用于 '值模式'" #: builtin/config.c msgid "--default= cannot be used with --all or --url=" @@ -6732,10 +6768,18 @@ msgstr "--append 不能与 --value=<模式> 一起使用" #, c-format msgid "" "cannot overwrite multiple values with a single value\n" -" Use a regexp, --add or --replace-all to change %s." +" Use --value=, --append or --all to change %s." msgstr "" -"无法用一个值覆盖多个值\n" -" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" +"无法用单个值覆盖多个值\n" +" 使用 --value=<模式>, --append 或 --all 来修改 %s。" + +#: builtin/config.c +msgid "unset all multi-valued config options" +msgstr "取消设置所有多值配置选项" + +#: builtin/config.c +msgid "unset multi-valued config options with matching values" +msgstr "取消设置匹配值的多值配置选项" #: builtin/config.c #, c-format @@ -6753,7 +6797,7 @@ msgstr "不支持编辑数据对象" #: builtin/config.c #, c-format msgid "cannot create configuration file %s" -msgstr "不能创建配置文件 %s" +msgstr "无法创建配置文件 %s" #: builtin/config.c msgid "Action" @@ -6845,9 +6889,18 @@ msgstr "--default 仅适用于 --get" msgid "--comment is only applicable to add/set/replace operations" msgstr "--comment 仅适用于 add/set/replace 操作" +#: builtin/config.c +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" +"无法用一个值覆盖多个值\n" +" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" + #: builtin/count-objects.c msgid "print sizes in human readable format" -msgstr "以用户可读的格式显示大小" +msgstr "以人类可读的格式显示大小" #: builtin/credential-cache--daemon.c #, c-format @@ -6910,7 +6963,7 @@ msgstr "附注的" #: builtin/describe.c #, c-format msgid "annotated tag %s not available" -msgstr "附注标签 %s 无效" +msgstr "附注标签 %s 不可用" #: builtin/describe.c #, c-format @@ -6930,7 +6983,7 @@ msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n" #: builtin/describe.c #, c-format msgid "finished search at %s\n" -msgstr "完成搜索 %s\n" +msgstr "在 %s 处完成搜索\n" #: builtin/describe.c #, c-format @@ -6999,7 +7052,7 @@ msgstr "使用任意引用" #: builtin/describe.c msgid "use any tag, even unannotated" -msgstr "使用任意标签，即使未附带注释" +msgstr "使用任意标签，即使未附注" #: builtin/describe.c msgid "always use long format" @@ -7073,12 +7126,12 @@ msgstr "指定诊断信息归档包的内容" #: builtin/diff-pairs.c #, c-format msgid "unable to parse mode: %s" -msgstr "不能解析模式：%s" +msgstr "无法解析模式：%s" #: builtin/diff-pairs.c #, c-format msgid "unable to parse object id: %s" -msgstr "不能解析对象 ID：%s" +msgstr "无法解析对象 ID：%s" #: builtin/diff-pairs.c msgid "git diff-pairs -z []" @@ -7177,7 +7230,7 @@ msgstr "无法处理的对象 '%s'。" #: builtin/diff.c #, c-format msgid "%s...%s: multiple merge bases, using %s" -msgstr "%s...%s：多条合并基线，使用 %s" +msgstr "%s...%s：多个合并基线，使用 %s" #: builtin/difftool.c msgid "git difftool [] [ []] [--] [...]" @@ -7213,12 +7266,12 @@ msgstr "两个文件都被修改：'%s' 和 '%s'。" #: builtin/difftool.c msgid "working tree file has been left." -msgstr "工作区文件被留了下来。" +msgstr "工作区文件已保留。" #: builtin/difftool.c sequencer.c #, c-format msgid "could not copy '%s' to '%s'" -msgstr "不能拷贝 '%s' 至 '%s'" +msgstr "无法拷贝 '%s' 至 '%s'" #: builtin/difftool.c #, c-format @@ -7346,13 +7399,7 @@ msgstr "无法在提交 %s 中找到提交者" msgid "" "encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|" "no] to handle it" -msgstr "" -"在提交 %3$s 中遇到提交特定编码 %2$.*1$s；使用 --reencode=[yes|no] 来处理" - -#: builtin/fast-export.c -#, c-format -msgid "encountered signed commit %s; use --signed-commits= to handle it" -msgstr "遇到已签名提交 %s；使用 --signed-commits=<模式> 来处理" +msgstr "遇到提交特定编码 %.*s 的提交为 %s；使用 --reencode=[yes|no] 来处理" #: builtin/fast-export.c #, c-format @@ -7364,6 +7411,19 @@ msgstr "正在导出提交 %2$s 的 %1$ 个签名" msgid "stripping signature(s) from commit %s" msgstr "正在剥离提交 %s 的签名" +#: builtin/fast-export.c +#, c-format +msgid "encountered signed commit %s; use --signed-commits= to handle it" +msgstr "遇到已签名提交 %s；使用 --signed-commits=<模式> 来处理" + +#: builtin/fast-export.c +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" +"commits=" +msgstr "" +"在 git fast-export 的 --signed-commits=<模式> 中，'strip-if-invalid' 不是有效" +"模式" + #: builtin/fast-export.c #, c-format msgid "" @@ -7378,11 +7438,6 @@ msgstr "" msgid "could not read tag %s" msgstr "无法读取标签 %s" -#: builtin/fast-export.c -#, c-format -msgid "encountered signed tag %s; use --signed-tags= to handle it" -msgstr "遇到已签名标签 %s；使用 --signed-tags=<模式> 来处理" - #: builtin/fast-export.c #, c-format msgid "exporting signed tag %s" @@ -7393,6 +7448,19 @@ msgstr "正在导出已签名标签 %s" msgid "stripping signature from tag %s" msgstr "正在从标签 %s 中剥离签名" +#: builtin/fast-export.c +#, c-format +msgid "encountered signed tag %s; use --signed-tags= to handle it" +msgstr "遇到已签名标签 %s；使用 --signed-tags=<模式> 来处理" + +#: builtin/fast-export.c +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" +"tags=" +msgstr "" +"在 git fast-export 的 --signed-tags=<模式> 中，'strip-if-invalid' 不是有效模" +"式" + #: builtin/fast-export.c #, c-format msgid "" @@ -7488,7 +7556,7 @@ msgstr "如果文件存在，从该文件导入标记" #: builtin/fast-export.c msgid "fake a tagger when tags lack one" -msgstr "当标签缺少标记人字段时，假装提供一个" +msgstr "当标签缺少打标签者时，伪造一个" #: builtin/fast-export.c msgid "output full tree for each commit" @@ -7516,7 +7584,7 @@ msgstr "匿名输出" #: builtin/fast-export.c msgid "from:to" -msgstr "from:to" +msgstr "从:到" #: builtin/fast-export.c msgid "convert to in anonymized output" @@ -7524,7 +7592,7 @@ msgstr "在匿名输出中将 转换为 " #: builtin/fast-export.c msgid "reference parents which are not in fast-export stream by object id" -msgstr "引用父对象 ID 不在 fast-export 流中" +msgstr "通过对象 ID 引用不在 fast-export 流中的父对象" #: builtin/fast-export.c msgid "show original object ids of blobs/commits" @@ -7532,7 +7600,7 @@ msgstr "显示数据对象/提交的原始对象 ID" #: builtin/fast-export.c msgid "label tags with mark ids" -msgstr "对带有标记 ID 的标签做标记" +msgstr "用标记 ID 标注标签" #: builtin/fast-import.c #, c-format @@ -7649,7 +7717,7 @@ msgstr "未更新 %s（新的分支顶端 %s 不包含 %s）" #: sequencer.c #, c-format msgid "unable to create leading directories of %s" -msgstr "不能为 %s 创建先导目录" +msgstr "无法为 %s 创建上级目录" #: builtin/fast-import.c #, c-format @@ -7798,7 +7866,7 @@ msgstr "目录不能指定为 'inline'：%s" #: builtin/fast-import.c #, c-format msgid "%s not found: %s" -msgstr "未找到%s：%s" +msgstr "未找到 %s：%s" #: builtin/fast-import.c msgid "tree" @@ -7816,7 +7884,7 @@ msgstr "路径 %s 不在分支中" #: builtin/fast-import.c msgid "can't add a note on empty branch." -msgstr "不能在空分支上添加注释。" +msgstr "无法在空分支上添加注解。" #: builtin/fast-import.c #, c-format @@ -7883,9 +7951,40 @@ msgstr "发现多个 %s 签名，忽略附加的签名" msgid "parse_one_signature() returned unknown hash algo" msgstr "parse_one_signature() 返回了未知的哈希算法" +#: builtin/fast-import.c builtin/fsck.c +msgid "unknown" +msgstr "未知" + +#: builtin/fast-import.c +#, c-format +msgid "" +"stripping invalid signature for commit '%.100s...'\n" +" allegedly by %s" +msgstr "" +"正在剥离提交 '%.100s...' 的无效签名\n" +" 据称由 %s 提供" + +#: builtin/fast-import.c +#, c-format +msgid "" +"stripping invalid signature for commit '%.*s'\n" +" allegedly by %s" +msgstr "" +"正在剥离提交 '%.*s' 的无效签名\n" +" 据称由 %s 提供" + +#: builtin/fast-import.c +#, c-format +msgid "" +"stripping invalid signature for commit\n" +" allegedly by %s" +msgstr "" +"正在剥离提交的无效签名\n" +" 据称由 %s 提供" + #: builtin/fast-import.c msgid "expected committer but didn't get one" -msgstr "预期提交者但未获取" +msgstr "预期提交者但未获得" #: builtin/fast-import.c msgid "encountered signed commit; use --signed-commits= to handle it" @@ -7899,10 +7998,6 @@ msgstr "正在剥离提交签名" msgid "importing a commit signature verbatim" msgstr "逐字导入提交签名" -#: builtin/fast-import.c -msgid "encountered signed tag; use --signed-tags= to handle it" -msgstr "遇到已签名标签；使用 --signed-tags=<模式> 来处理它" - #: builtin/fast-import.c #, c-format msgid "importing a tag signature verbatim for tag '%s'" @@ -7913,6 +8008,18 @@ msgstr "逐字导入标签 '%s' 的签名" msgid "stripping a tag signature for tag '%s'" msgstr "正在剥离标签 '%s' 的签名" +#: builtin/fast-import.c +msgid "encountered signed tag; use --signed-tags= to handle it" +msgstr "遇到已签名标签；使用 --signed-tags=<模式> 来处理它" + +#: builtin/fast-import.c +msgid "" +"'strip-if-invalid' is not a valid mode for git fast-import with --signed-" +"tags=" +msgstr "" +"在 git fast-import 的 --signed-tags=<模式> 中，'strip-if-invalid' 不是有效模" +"式" + #: builtin/fast-import.c #, c-format msgid "expected 'from' command, got '%s'" @@ -8100,7 +8207,7 @@ msgstr "流过早结束" #: builtin/fetch-pack.c #, c-format msgid "Lockfile created but not reported: %s" -msgstr "Lockfile 已创建但未报告：%s" +msgstr "锁文件已创建但未报告：%s" #: builtin/fetch.c msgid "git fetch [] [ [...]]" @@ -8111,8 +8218,8 @@ msgid "git fetch [] " msgstr "git fetch [<选项>] <组>" #: builtin/fetch.c -msgid "git fetch --multiple [] [( | )...]" -msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" +msgid "git fetch --multiple [] [(|)...]" +msgstr "git fetch --multiple [<选项>] [(<仓库>|<组>)...]" #: builtin/fetch.c msgid "git fetch --all []" @@ -8134,7 +8241,7 @@ msgstr "来自 %.*s\n" #: builtin/fetch.c #, c-format msgid "object %s not found" -msgstr "对象 %s 未发现" +msgstr "对象 %s 未找到" #: builtin/fetch.c msgid "[up to date]" @@ -8154,11 +8261,11 @@ msgstr "[标签更新]" #: builtin/fetch.c msgid "unable to update local ref" -msgstr "不能更新本地引用" +msgstr "无法更新本地引用" #: builtin/fetch.c msgid "would clobber existing tag" -msgstr "会破坏现有的标签" +msgstr "会覆盖现有的标签" #: builtin/fetch.c msgid "[new tag]" @@ -8183,7 +8290,7 @@ msgstr "非快进" #: builtin/fetch.c builtin/grep.c sequencer.c #, c-format msgid "cannot open '%s'" -msgstr "不能打开 '%s'" +msgstr "无法打开 '%s'" #: builtin/fetch.c msgid "" @@ -8237,7 +8344,7 @@ msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" #: builtin/fetch.c #, c-format msgid "option \"%s\" is ignored for %s" -msgstr "选项 \"%s\" 为 %s 所忽略" +msgstr "选项 \"%s\" 对 %s 将被忽略" #: builtin/fetch.c odb.c #, c-format @@ -8260,7 +8367,7 @@ msgid "" msgstr "" "运行 'git remote set-head %s %s' 同步变更，或通过配置选项\n" "'remote.%s.followRemoteHEAD' 设置为其他值以屏蔽此提示。具体可通过\n" -"运行命令 'git config remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n" +"运行命令 'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n" "以禁用该警告，直到远程将 HEAD 更改为其他内容。" #: builtin/fetch.c @@ -8295,7 +8402,7 @@ msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -"一些本地引用不能被更新；尝试运行\n" +"一些本地引用无法被更新；尝试运行\n" " 'git remote prune %s' 来删除旧的、有冲突的分支" #: builtin/fetch.c @@ -8342,7 +8449,7 @@ msgstr "正在获取 %s\n" #: builtin/fetch.c #, c-format msgid "could not fetch %s" -msgstr "不能获取 %s" +msgstr "无法获取 %s" #: builtin/fetch.c #, c-format @@ -8405,11 +8512,11 @@ msgstr "修改引用规格以将所有引用放入 refs/prefetch/" #: builtin/fetch.c builtin/pull.c msgid "prune remote-tracking branches no longer on remote" -msgstr "清除远程已经不存在的分支的跟踪分支" +msgstr "清除远程已不存在的远程跟踪分支" #: builtin/fetch.c msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "清除远程不存在的本地标签，并且替换变更标签" +msgstr "清除远程已不存在的本地标签，并覆盖已变更的标签" # 译者：可选值，不能翻译 #: builtin/fetch.c builtin/pull.c @@ -8456,7 +8563,7 @@ msgstr "在子模组路径输出的前面加上此目录" msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" -msgstr "递归获取子模组的缺省值（比配置文件优先级低）" +msgstr "递归获取子模组的默认值（比配置文件优先级低）" #: builtin/fetch.c builtin/pull.c msgid "accept refs that update .git/shallow" @@ -8513,7 +8620,7 @@ msgstr "对于一个完整的仓库，参数 --unshallow 没有意义" #: builtin/fetch.c #, c-format msgid "failed to fetch bundles from '%s'" -msgstr "无法从 '%s' 获取归档包" +msgstr "无法从 '%s' 获取捆绑包" #: builtin/fetch.c msgid "fetch --all does not take a repository argument" @@ -8585,19 +8692,19 @@ msgstr "从文件中读取" #: builtin/for-each-ref.c msgid "quote placeholders suitably for shells" -msgstr "引用占位符适用于 shells" +msgstr "为 shell 适当引用占位符" #: builtin/for-each-ref.c msgid "quote placeholders suitably for perl" -msgstr "引用占位符适用于 perl" +msgstr "为 perl 适当引用占位符" #: builtin/for-each-ref.c msgid "quote placeholders suitably for python" -msgstr "引用占位符适用于 python" +msgstr "为 python 适当引用占位符" #: builtin/for-each-ref.c msgid "quote placeholders suitably for Tcl" -msgstr "引用占位符适用于 Tcl" +msgstr "为 Tcl 适当引用占位符" #: builtin/for-each-ref.c msgid "show only matched refs" @@ -8684,10 +8791,6 @@ msgstr "缺少 --config=<配置>" msgid "got bad config --config=%s" msgstr "发现错误的配置行 --config=%s" -#: builtin/fsck.c -msgid "unknown" -msgstr "未知" - #. TRANSLATORS: e.g. error in tree 01bfda: #: builtin/fsck.c #, c-format @@ -8739,18 +8842,18 @@ msgstr "悬空 %s %s" #: builtin/fsck.c msgid "could not create lost-found" -msgstr "不能创建 lost-found" +msgstr "无法创建 lost-found" #: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c #: sequencer.c #, c-format msgid "could not write '%s'" -msgstr "不能写入 '%s'" +msgstr "无法写入 '%s'" #: builtin/fsck.c #, c-format msgid "could not finish '%s'" -msgstr "不能完成 '%s'" +msgstr "无法完成 '%s'" #: builtin/fsck.c #, c-format @@ -8806,6 +8909,11 @@ msgstr "%s：无效的 sha1 指针 %s" msgid "%s: not a commit" msgstr "%s：不是一个提交" +#: builtin/fsck.c +#, c-format +msgid "invalid parameter: expected sha1, got '%s'" +msgstr "无效的参数：期望 sha1，得到 '%s'" + #: builtin/fsck.c msgid "notice: No default references" msgstr "注意：无默认引用" @@ -8823,7 +8931,7 @@ msgstr "%s：对象损坏或丢失：%s" #: builtin/fsck.c #, c-format msgid "%s: object could not be parsed: %s" -msgstr "%s：不能解析对象：%s" +msgstr "%s：无法解析对象：%s" #: builtin/fsck.c #, c-format @@ -8838,31 +8946,6 @@ msgstr "正在检查对象目录" msgid "Checking object directories" msgstr "正在检查对象目录" -#: builtin/fsck.c -#, c-format -msgid "Checking %s link" -msgstr "正在检查 %s 链接" - -#: builtin/fsck.c builtin/index-pack.c -#, c-format -msgid "invalid %s" -msgstr "无效的 %s" - -#: builtin/fsck.c -#, c-format -msgid "%s points to something strange (%s)" -msgstr "%s 指向奇怪的东西（%s）" - -#: builtin/fsck.c -#, c-format -msgid "%s: detached HEAD points at nothing" -msgstr "%s：分离头指针的指向不存在" - -#: builtin/fsck.c -#, c-format -msgid "notice: %s points to an unborn branch (%s)" -msgstr "注意：%s 指向一个尚未诞生的分支（%s）" - #: builtin/fsck.c #, c-format msgid "Checking cache tree of %s" @@ -8964,16 +9047,6 @@ msgstr "检查引用数据库一致性" msgid "Checking objects" msgstr "正在检查对象" -#: builtin/fsck.c -#, c-format -msgid "%s: object missing" -msgstr "%s：对象缺失" - -#: builtin/fsck.c -#, c-format -msgid "invalid parameter: expected sha1, got '%s'" -msgstr "无效的参数：期望 sha1，得到 '%s'" - #: builtin/fsmonitor--daemon.c msgid "git fsmonitor--daemon start []" msgstr "git fsmonitor--daemon start [<选项>]" @@ -9010,7 +9083,7 @@ msgstr "无法创建 fsmonitor cookie '%s'" #: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor: cookie_result '%d' != SEEN" -msgstr "fsmonitor: cookie_result '%d' != SEEN" +msgstr "fsmonitor：cookie_result '%d' != SEEN" #: builtin/fsmonitor--daemon.c #, c-format @@ -9036,7 +9109,7 @@ msgstr "无法初始化健康检查线程" #: builtin/fsmonitor--daemon.c #, c-format msgid "could not cd home '%s'" -msgstr "不能切换至家目录 '%s'" +msgstr "无法切换至家目录 '%s'" #: builtin/fsmonitor--daemon.c #, c-format @@ -9108,7 +9181,7 @@ msgstr "无法解析 '%s' 值 '%s'" #: builtin/gc.c setup.c #, c-format msgid "cannot stat '%s'" -msgstr "不能对 '%s' 调用 stat" +msgstr "无法对 '%s' 调用 stat" #: builtin/gc.c #, c-format @@ -9154,7 +9227,7 @@ msgstr "强制执行 gc 即使另外一个 gc 正在执行" #: builtin/gc.c msgid "repack all other packs except the largest pack" -msgstr "除了最大的包之外，对所有其它包文件重新打包" +msgstr "除了最大的包之外，对所有其他包文件重新打包" #: builtin/gc.c builtin/repack.c msgid "pack prefix to store a pack containing pruned objects" @@ -9276,7 +9349,7 @@ msgstr "'%s' 不是一个有效的任务" #: builtin/gc.c #, c-format msgid "task '%s' cannot be selected multiple times" -msgstr "任务 '%s' 不能被多次选择" +msgstr "任务 '%s' 无法被多次选择" #: builtin/gc.c msgid "run tasks based on the state of the repository" @@ -9284,7 +9357,7 @@ msgstr "基于仓库状态来运行任务" #: builtin/gc.c msgid "perform maintenance in the background" -msgstr "在后台执行运维" +msgstr "在后台执行维护" #: builtin/gc.c msgid "frequency" @@ -9296,7 +9369,7 @@ msgstr "基于频率运行任务" #: builtin/gc.c msgid "do not report progress or other information over stderr" -msgstr "不通过标准错误报告进度或其它信息" +msgstr "不通过标准错误报告进度或其他信息" #: builtin/gc.c msgid "task" @@ -9444,6 +9517,10 @@ msgstr "无法设置维护计划" msgid "failed to add repo to global config" msgstr "无法将仓库添加到全局配置" +#: builtin/gc.c +msgid "check a specific task" +msgstr "检查特定任务" + #: builtin/gc.c msgid "git maintenance []" msgstr "git maintenance <子命令> [<选项>]" @@ -9521,7 +9598,7 @@ msgstr "只在单词边界匹配模式" #: builtin/grep.c msgid "process binary files as text" -msgstr "把二进制文件当做文本处理" +msgstr "把二进制文件当作文本处理" #: builtin/grep.c msgid "don't match patterns in binary files" @@ -9629,7 +9706,7 @@ msgstr "使用 个工作线程" #: builtin/grep.c msgid "shortcut for -C NUM" -msgstr "快捷键 -C 数字" +msgstr "-C NUM 的快捷方式" #: builtin/grep.c msgid "show a line with the function name before matches" @@ -9661,7 +9738,7 @@ msgstr "只显示匹配所有模式的文件中的匹配" #: builtin/grep.c msgid "pager" -msgstr "分页" +msgstr "分页器" #: builtin/grep.c msgid "show matching files in the pager" @@ -9686,7 +9763,7 @@ msgstr "--no-index 或 --untracked 不能和版本同时使用" #: builtin/grep.c #, c-format msgid "unable to resolve revision: %s" -msgstr "不能解析版本：%s" +msgstr "无法解析版本：%s" #: builtin/grep.c msgid "--untracked not supported with --recurse-submodules" @@ -9768,7 +9845,7 @@ msgstr "在 --all 中显示别名" #: builtin/help.c msgid "exclude guides" -msgstr "排除向导" +msgstr "排除指南" #: builtin/help.c msgid "show man page" @@ -9969,7 +10046,7 @@ msgstr "解压缩返回 %d" #: builtin/index-pack.c msgid "offset value overflow for delta base object" -msgstr "偏移值覆盖了 delta 基准对象" +msgstr "delta 基准对象的偏移值溢出" #: builtin/index-pack.c msgid "delta base offset is out of bound" @@ -10003,12 +10080,12 @@ msgstr "发现 %s 出现 SHA1 冲突！" #: builtin/index-pack.c #, c-format msgid "cannot read existing object info %s" -msgstr "不能读取现存对象信息 %s" +msgstr "无法读取现存对象信息 %s" #: builtin/index-pack.c #, c-format msgid "cannot read existing object %s" -msgstr "不能读取现存对象 %s" +msgstr "无法读取现存对象 %s" #: builtin/index-pack.c #, c-format @@ -10019,6 +10096,11 @@ msgstr "无效的数据对象 %s" msgid "fsck error in packed object" msgstr "对打包对象 fsck 检查出错" +#: builtin/index-pack.c +#, c-format +msgid "invalid %s" +msgstr "无效的 %s" + #: builtin/index-pack.c #, c-format msgid "Not all child objects of %s are reachable" @@ -10038,11 +10120,11 @@ msgstr "索引对象中" #: builtin/index-pack.c msgid "pack is corrupted (SHA1 mismatch)" -msgstr "包冲突（SHA1 不匹配）" +msgstr "包已损坏（SHA1 不匹配）" #: builtin/index-pack.c msgid "cannot fstat packfile" -msgstr "不能对包文件调用 fstat" +msgstr "无法对包文件调用 fstat" #: builtin/index-pack.c msgid "pack has junk at the end" @@ -10059,7 +10141,7 @@ msgstr "处理 delta 中" #: builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "unable to create thread: %s" -msgstr "不能创建线程：%s" +msgstr "无法创建线程：%s" #: builtin/index-pack.c msgid "confusion beyond insanity" @@ -10087,7 +10169,7 @@ msgstr[1] "包有 %d 个未解决的 delta" #: builtin/index-pack.c #, c-format msgid "unable to deflate appended object (%d)" -msgstr "不能压缩附加对象（%d）" +msgstr "无法压缩附加对象（%d）" #: builtin/index-pack.c #, c-format @@ -10112,7 +10194,7 @@ msgstr "无法关闭已写入的 %s 文件 '%s'" #: builtin/index-pack.c #, c-format msgid "unable to rename temporary '*.%s' file to '%s'" -msgstr "不能重命名临时文件 '*.%s' 为 '%s'" +msgstr "无法重命名临时文件 '*.%s' 为 '%s'" #: builtin/index-pack.c msgid "error while closing pack file" @@ -10144,8 +10226,8 @@ msgstr[1] "非 delta：%d 个对象" #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" -msgstr[0] "链长 = %d: %lu 对象" -msgstr[1] "链长 = %d: %lu 对象" +msgstr[0] "链长 = %d：%lu 对象" +msgstr[1] "链长 = %d：%lu 对象" #: builtin/index-pack.c msgid "could not start pack-objects to repack local links" @@ -10176,7 +10258,7 @@ msgstr "错误的 --pack_header：%s" #: builtin/index-pack.c #, c-format msgid "bad %s" -msgstr "错误选项 %s" +msgstr "错误的 %s" #: builtin/index-pack.c builtin/init-db.c setup.c #, c-format @@ -10185,7 +10267,7 @@ msgstr "未知的哈希算法 '%s'" #: builtin/index-pack.c msgid "--promisor cannot be used with a pack name" -msgstr "--promisor 无法与包名称一起使用" +msgstr "--promisor 不能与包名称一起使用" #: builtin/index-pack.c msgid "--stdin requires a git repository" @@ -10195,6 +10277,10 @@ msgstr "--stdin 需要 git 仓库" msgid "--verify with no packfile name given" msgstr "--verify 没有提供包文件名参数" +#: builtin/index-pack.c +msgid "cannot perform queued object checks outside of a repository" +msgstr "无法在仓库之外执行排队的对象检查" + #: builtin/index-pack.c builtin/unpack-objects.c msgid "fsck error in pack objects" msgstr "在打包对象中 fsck 检查出错" @@ -10227,7 +10313,7 @@ msgstr "覆盖初始分支名称" #: builtin/init-db.c builtin/verify-pack.c msgid "hash" -msgstr "hash" +msgstr "哈希" #: builtin/init-db.c builtin/show-index.c builtin/verify-pack.c msgid "specify the hash algorithm to use" @@ -10236,12 +10322,12 @@ msgstr "指定要使用的哈希算法" #: builtin/init-db.c #, c-format msgid "cannot mkdir %s" -msgstr "不能创建目录 %s" +msgstr "无法创建目录 %s" #: builtin/init-db.c #, c-format msgid "cannot chdir to %s" -msgstr "不能切换目录到 %s" +msgstr "无法切换目录到 %s" #: builtin/init-db.c #, c-format @@ -10253,11 +10339,11 @@ msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git #: builtin/init-db.c #, c-format msgid "Cannot access work tree '%s'" -msgstr "不能访问工作区 '%s'" +msgstr "无法访问工作区 '%s'" #: builtin/init-db.c msgid "--separate-git-dir incompatible with bare repository" -msgstr "--separate-git-dir 不能用于纯仓库" +msgstr "--separate-git-dir 和纯仓库不兼容" #: builtin/interpret-trailers.c msgid "" @@ -10272,7 +10358,7 @@ msgstr "" #: builtin/interpret-trailers.c wrapper.c #, c-format msgid "could not stat %s" -msgstr "不能对 %s 调用 stat" +msgstr "无法对 %s 调用 stat" #: builtin/interpret-trailers.c #, c-format @@ -10286,21 +10372,21 @@ msgstr "文件 %s 用户不可写" #: builtin/interpret-trailers.c msgid "could not open temporary file" -msgstr "不能打开临时文件" +msgstr "无法打开临时文件" #: builtin/interpret-trailers.c #, c-format msgid "could not read input file '%s'" -msgstr "不能读取输入文件 '%s'" +msgstr "无法读取输入文件 '%s'" #: builtin/interpret-trailers.c builtin/mktag.c imap-send.c msgid "could not read from stdin" -msgstr "不能自标准输入读取" +msgstr "无法自标准输入读取" #: builtin/interpret-trailers.c #, c-format msgid "could not rename temporary file to %s" -msgstr "不能重命名临时文件为 %s" +msgstr "无法重命名临时文件为 %s" #: builtin/interpret-trailers.c msgid "edit files in place" @@ -10431,7 +10517,7 @@ msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数 #: builtin/log.c msgid "-L: cannot be used with pathspec" -msgstr "-L<范围>:<文件> 不能和路径表达式共用" +msgstr "-L<范围>:<文件> 不能和路径规格共用" #: builtin/log.c msgid "" @@ -10452,7 +10538,7 @@ msgstr "" #: builtin/log.c #, c-format msgid "git show %s: bad file" -msgstr "git show %s: 损坏的文件" +msgstr "git show %s：损坏的文件" #: builtin/log.c #, c-format @@ -10524,7 +10610,7 @@ msgstr "无法将 '%s' 解析为一个有效引用" #: builtin/log.c msgid "could not find exact merge base" -msgstr "不能找到准确的合并基线" +msgstr "无法找到准确的合并基线" #: builtin/log.c msgid "" @@ -10550,7 +10636,7 @@ msgstr "基线提交不应该出现在版本列表中" #: builtin/log.c msgid "cannot get patch id" -msgstr "无法得到补丁 id" +msgstr "无法得到补丁 ID" #: builtin/log.c msgid "failed to infer range-diff origin of current series" @@ -10595,7 +10681,7 @@ msgstr "补丁以 开始编号，而不是1" #: builtin/log.c msgid "reroll-count" -msgstr "重制-计数" +msgstr "重制次数" #: builtin/log.c msgid "mark the series as Nth re-roll" @@ -10651,7 +10737,7 @@ msgstr "不包含已在上游提交中的补丁" #: builtin/log.c msgid "show patch format instead of default (patch + stat)" -msgstr "显示纯补丁格式而非默认的（补丁+状态）" +msgstr "显示纯补丁格式而非默认的（补丁+统计）" #: builtin/log.c msgid "Messaging" @@ -10659,7 +10745,7 @@ msgstr "邮件发送" #: builtin/log.c msgid "header" -msgstr "header" +msgstr "头信息" #: builtin/log.c msgid "add email header" @@ -10683,7 +10769,7 @@ msgstr "标识" #: builtin/log.c msgid "set From address to (or committer ident if absent)" -msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）" +msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 作为地址）" #: builtin/log.c msgid "message-id" @@ -10777,7 +10863,7 @@ msgstr "--remerge-diff 无意义" #: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c #, c-format msgid "could not create directory '%s'" -msgstr "不能创建目录 '%s'" +msgstr "无法创建目录 '%s'" #: builtin/log.c msgid "--interdiff requires --cover-letter or single patch" @@ -10826,7 +10912,7 @@ msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" -msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" +msgstr "无法找到跟踪的远程分支，请手工指定 <上游>。\n" #: builtin/ls-files.c builtin/ls-tree.c #, c-format @@ -10867,7 +10953,7 @@ msgstr "显示已修改的文件" #: builtin/ls-files.c msgid "show other files in the output" -msgstr "显示其它文件" +msgstr "显示其他文件" #: builtin/ls-files.c msgid "show ignored files in the output" @@ -10969,7 +11055,7 @@ msgstr "不打印远程 URL" #: builtin/ls-remote.c builtin/rebase.c msgid "exec" -msgstr "exec" +msgstr "可执行命令" #: builtin/ls-remote.c msgid "path of git-upload-pack on the remote host" @@ -10997,7 +11083,7 @@ msgstr "参考 url..insteadOf 设置" #: builtin/ls-remote.c msgid "exit with exit code 2 if no matching refs are found" -msgstr "若未找到匹配的引用则以退出码2退出" +msgstr "若未找到匹配的引用则以退出码 2 退出" #: builtin/ls-remote.c msgid "show underlying ref in addition to the object pointed by it" @@ -11131,11 +11217,11 @@ msgstr "查找一个多路合并的祖先提交" #: builtin/merge-base.c msgid "list revs not reachable from others" -msgstr "显示不能被其他访问到的版本" +msgstr "显示无法被其他访问到的版本" #: builtin/merge-base.c msgid "is the first one ancestor of the other?" -msgstr "第一个是其他的祖先提交么？" +msgstr "第一个是其他的祖先提交吗？" #: builtin/merge-base.c msgid "find where forked from reflog of " @@ -11149,14 +11235,6 @@ 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 "将结果发送到标准输出" @@ -11173,14 +11251,6 @@ msgstr "使用基于 diff3 的合并" msgid "use a zealous diff3 based merge" msgstr "使用基于狂热 diff3（zealous diff3）的合并" -#: builtin/merge-file.c diff.c -msgid "" -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 "如果冲突，使用指定长度的标记" @@ -11200,12 +11270,12 @@ msgstr "对象 '%s' 不存在" #: builtin/merge-file.c msgid "Could not write object file" -msgstr "不能写入对象文件" +msgstr "无法写入对象文件" #: builtin/merge-recursive.c #, c-format msgid "could not parse object '%s'" -msgstr "不能解析对象 '%s'" +msgstr "无法解析对象 '%s'" #: builtin/merge-recursive.c #, c-format @@ -11216,7 +11286,7 @@ msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" #: builtin/merge-recursive.c msgid "not handling anything other than two heads merge." -msgstr "不能处理两个头合并之外的任何操作。" +msgstr "无法处理两个头合并之外的任何操作。" #: builtin/merge-recursive.c #, c-format @@ -11287,7 +11357,7 @@ msgstr "指定用于合并的合并基线" #: builtin/merge-tree.c builtin/merge.c builtin/pull.c msgid "option=value" -msgstr "option=value" +msgstr "选项=值" #: builtin/merge-tree.c builtin/merge.c builtin/pull.c msgid "option for selected merge strategy" @@ -11323,7 +11393,7 @@ msgstr "选项 `%s' 需要一个值" #: builtin/merge.c #, c-format msgid "Could not find merge strategy '%s'.\n" -msgstr "不能找到合并策略 '%s'。\n" +msgstr "无法找到合并策略 '%s'。\n" #: builtin/merge.c #, c-format @@ -11373,7 +11443,7 @@ msgstr "允许快进（默认）" #: builtin/merge.c builtin/pull.c msgid "abort if fast-forward is not possible" -msgstr "如果不能快进就放弃合并" +msgstr "如果无法快进就放弃合并" #: builtin/merge.c builtin/pull.c msgid "verify that the named commit has a valid GPG signature" @@ -11415,11 +11485,11 @@ msgstr "绕过 pre-merge-commit 和 commit-msg 钩子" #: builtin/merge.c msgid "could not run stash." -msgstr "不能运行贮藏。" +msgstr "无法运行储藏。" #: builtin/merge.c msgid "stash failed" -msgstr "贮藏失败" +msgstr "储藏失败" #: builtin/merge.c msgid "read-tree failed" @@ -11455,7 +11525,7 @@ msgstr "坏的 branch.%s.mergeoptions 字符串：%s" #: builtin/merge.c merge-ort-wrappers.c msgid "Unable to write index." -msgstr "不能写入索引。" +msgstr "无法写入索引。" #: builtin/merge.c msgid "Not handling anything other than two heads merge." @@ -11464,12 +11534,12 @@ msgstr "未处理两个头合并之外的任何操作。" #: builtin/merge.c builtin/sparse-checkout.c #, c-format msgid "unable to write %s" -msgstr "不能写 %s" +msgstr "无法写 %s" #: builtin/merge.c #, c-format msgid "Could not read from '%s'" -msgstr "不能从 '%s' 读取" +msgstr "无法从 '%s' 读取" #: builtin/merge.c #, c-format @@ -11536,12 +11606,12 @@ msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" #: builtin/merge.c editor.c read-cache.c wrapper.c #, c-format msgid "could not close '%s'" -msgstr "不能关闭 '%s'" +msgstr "无法关闭 '%s'" #: builtin/merge.c #, c-format msgid "not something we can merge in %s: %s" -msgstr "不能在 %s 中合并：%s" +msgstr "无法在 %s 中合并：%s" #: builtin/merge.c msgid "--abort expects no arguments" @@ -11598,7 +11668,7 @@ msgstr "到空分支的非快进式提交没有意义" #: builtin/merge.c #, c-format msgid "%s - not something we can merge" -msgstr "%s - 不能被合并" +msgstr "%s - 无法被合并" #: builtin/merge.c msgid "Can merge only exactly one commit into empty head" @@ -11626,7 +11696,7 @@ msgstr "尝试非常小的索引内合并...\n" #: builtin/merge.c #, c-format msgid "Nope.\n" -msgstr "无。\n" +msgstr "不行。\n" #: builtin/merge.c #, c-format @@ -11661,7 +11731,7 @@ msgstr "自动合并进展顺利，按要求在提交前停止\n" #: builtin/merge.c #, c-format msgid "When finished, apply stashed changes with `git stash pop`\n" -msgstr "在完成后，使用 `git stash pop` 应用贮藏的变更\n" +msgstr "在完成后，使用 `git stash pop` 应用储藏的变更\n" #: builtin/mktag.c #, c-format @@ -11676,7 +11746,7 @@ msgstr "错误：标签输入未通过 fsck：%s" #: builtin/mktag.c #, c-format msgid "could not read tagged object '%s'" -msgstr "不能读取被标记的对象 '%s'" +msgstr "无法读取被标记的对象 '%s'" #: builtin/mktag.c #, c-format @@ -11780,7 +11850,7 @@ msgstr "目录 %s 在索引中并且不是子模组？" #: builtin/mv.c msgid "Please stage your changes to .gitmodules or stash them to proceed" -msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" +msgstr "请将您的修改暂存到 .gitmodules 中或储藏后再继续" #: builtin/mv.c #, c-format @@ -11789,7 +11859,7 @@ msgstr "%.*s 在索引中" #: builtin/mv.c msgid "force move/rename even if target exists" -msgstr "强制移动/重命令，即使目标存在" +msgstr "强制移动/重命名，即使目标存在" #: builtin/mv.c msgid "skip move/rename errors" @@ -11807,7 +11877,7 @@ msgstr "检查 '%s' 到 '%s' 的重命名\n" #: builtin/mv.c msgid "bad source" -msgstr "坏的源" +msgstr "错误的源" #: builtin/mv.c msgid "destination exists" @@ -11815,7 +11885,7 @@ msgstr "目标已存在" #: builtin/mv.c msgid "can not move directory into itself" -msgstr "不能将目录移动到自身" +msgstr "无法将目录移动到自身" #: builtin/mv.c msgid "destination already exists" @@ -11840,7 +11910,7 @@ msgstr "覆盖 '%s'" #: builtin/mv.c msgid "Cannot overwrite" -msgstr "不能覆盖" +msgstr "无法覆盖" #: builtin/mv.c msgid "multiple sources for the same target" @@ -11916,7 +11986,7 @@ msgstr "标注标准输入的文字" #: builtin/name-rev.c msgid "allow to print `undefined` names (default)" -msgstr "允许打印 `未定义` 的名称（默认）" +msgstr "允许打印 `undefined` 的名称（默认）" #: builtin/name-rev.c msgid "dereference tags in the input (internal use)" @@ -11961,7 +12031,7 @@ msgstr "git notes [--ref <注解引用>] show [<对象>]" #: builtin/notes.c msgid "" "git notes [--ref ] merge [-v | -q] [-s ] " -msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" +msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略>] <注解引用>" #: builtin/notes.c msgid "git notes [--ref ] remove [...]" @@ -12029,7 +12099,7 @@ msgstr "为下面的对象写/编辑说明：" #: builtin/notes.c msgid "could not read 'show' output" -msgstr "不能读取 'show' 的输出" +msgstr "无法读取 'show' 的输出" #: builtin/notes.c #, c-format @@ -12042,7 +12112,7 @@ msgstr "请通过 -m 或 -F 选项为注解提供内容" #: builtin/notes.c msgid "unable to write note object" -msgstr "不能写注解对象" +msgstr "无法写注解对象" #: builtin/notes.c #, c-format @@ -12052,7 +12122,7 @@ msgstr "注解内容被留在 %s 中" #: builtin/notes.c builtin/tag.c #, c-format msgid "could not open or read '%s'" -msgstr "不能打开或读取 '%s'" +msgstr "无法打开或读取 '%s'" #: builtin/notes.c #, c-format @@ -12067,7 +12137,7 @@ msgstr "无法读取对象 '%s'。" #: builtin/notes.c #, c-format msgid "cannot read note data from non-blob object '%s'." -msgstr "不能从非数据对象 '%s' 中读取注解数据。" +msgstr "无法从非数据对象 '%s' 中读取注解数据。" #: builtin/notes.c #, c-format @@ -12080,7 +12150,7 @@ msgstr "无法把注解从 '%s' 拷贝到 '%s'" #: builtin/notes.c #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" -msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解" +msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s 注解" #: builtin/notes.c #, c-format @@ -12093,7 +12163,7 @@ msgstr "注解内容作为一个字符串" #: builtin/notes.c msgid "note contents in a file" -msgstr "注解内容到一个文件中" +msgstr "注解内容在一个文件中" #: builtin/notes.c msgid "reuse and edit specified note object" @@ -12101,7 +12171,7 @@ msgstr "重用和编辑指定的注解对象" #: builtin/notes.c msgid "edit note message in editor" -msgstr "在编辑器中编辑注释说明" +msgstr "在编辑器中编辑注解说明" #: builtin/notes.c msgid "reuse specified note object" @@ -12109,7 +12179,7 @@ msgstr "重用指定的注解对象" #: builtin/notes.c msgid "allow storing empty note" -msgstr "允许保存空白注释" +msgstr "允许保存空注解" #: builtin/notes.c msgid "replace existing notes" @@ -12121,7 +12191,7 @@ msgstr "<分段符>" #: builtin/notes.c msgid "insert between paragraphs" -msgstr "在段落之间插入<分段符>" +msgstr "在段落之间插入 <分段符>" #: builtin/notes.c msgid "remove unnecessary whitespace" @@ -12132,7 +12202,7 @@ msgstr "删除不必要的空白字符" msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" -msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" +msgstr "无法添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" #: builtin/notes.c #, c-format @@ -12161,12 +12231,12 @@ msgstr "参数太少" msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" -msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" +msgstr "无法拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" #: builtin/notes.c #, c-format msgid "missing notes on source object %s. Cannot copy." -msgstr "源对象 %s 缺少注解。不能拷贝。" +msgstr "源对象 %s 缺少注解。无法拷贝。" #: builtin/notes.c #, c-format @@ -12238,7 +12308,7 @@ msgstr "通过提交未合并的注解来完成注解合并" #: builtin/notes.c msgid "Aborting notes merge resolution" -msgstr "中止注解合并的方案" +msgstr "中止注解合并的解决过程" #: builtin/notes.c msgid "abort notes merge" @@ -12274,7 +12344,7 @@ msgid "" "'git notes merge --commit', or abort the merge with 'git notes merge --" "abort'.\n" msgstr "" -"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" +"自动注解合并失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" "交结果，或者使用命令 'git notes merge --abort' 终止合并。\n" #: builtin/notes.c builtin/tag.c @@ -12335,7 +12405,7 @@ msgstr "" " [--revs [--unpacked | --all]] [--keep-pack=<包名>]\n" " [--cruft] [--cruft-expiration=<时间>]\n" " [--stdout [--filter=<过滤规格>] | <基线名称>]\n" -" [--shallow] [--keep-true-parents] [--[no-]sparse]\"\n" +" [--shallow] [--keep-true-parents] [--[no-]sparse]\n" " [--name-hash-version=] [--path-walk] < <对象列表>" #: builtin/pack-objects.c @@ -12414,7 +12484,7 @@ msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" #: builtin/pack-objects.c #, c-format msgid "delta base offset overflow in pack for %s" -msgstr "%s 压缩中 delta 基准偏移越界" +msgstr "包 %s 中 delta 基准偏移溢出" #: builtin/pack-objects.c #, c-format @@ -12508,10 +12578,15 @@ msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置（得到 ' msgid "could not get type of object %s in pack %s" msgstr "无法获得包 %2$s 中对象 %1$s 的类型" +#: builtin/pack-objects.c +#, c-format +msgid "packfile %s is a promisor but --exclude-promisor-objects was given" +msgstr "包文件 %s 是承诺者，但已给出 --exclude-promisor-objects" + #: builtin/pack-objects.c #, c-format msgid "could not find pack '%s'" -msgstr "不能找到包 '%s'" +msgstr "无法找到包 '%s'" #: builtin/pack-objects.c #, c-format @@ -12550,7 +12625,7 @@ msgstr "" #: builtin/pack-objects.c reachable.c msgid "could not load cruft pack .mtimes" -msgstr "不能载入废弃包 .mtimes" +msgstr "无法载入废弃包 .mtimes" #: builtin/pack-objects.c msgid "cannot open pack index" @@ -12577,7 +12652,7 @@ msgstr "不是一个版本 '%s'" #: builtin/pack-objects.c builtin/rev-parse.c #, c-format msgid "bad revision '%s'" -msgstr "坏的版本 '%s'" +msgstr "错误的版本 '%s'" #: builtin/pack-objects.c msgid "unable to add recent objects" @@ -12727,7 +12802,7 @@ msgstr "忽略配有 .keep 文件的包" #: builtin/pack-objects.c msgid "ignore this pack" -msgstr "忽略该 pack" +msgstr "忽略该包" #: builtin/pack-objects.c msgid "pack compression level" @@ -12735,7 +12810,7 @@ msgstr "打包压缩级别" #: builtin/pack-objects.c msgid "do not hide commits by grafts" -msgstr "显示被移植隐藏的提交" +msgstr "显示被嫁接隐藏的提交" #: builtin/pack-objects.c msgid "use a bitmap index if available to speed up counting objects" @@ -12828,7 +12903,7 @@ msgid "" "reused % (from %)" msgstr "" "总共 %（差异 %），复用 %（差异 %），包复用 " -"%（来自 % 个包）" +"%（来自 % 个包）" #: builtin/pack-refs.c msgid "git pack-refs " @@ -12839,12 +12914,12 @@ 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 算法" +msgid "use the unstable patch ID algorithm" +msgstr "使用不稳定的 patch ID 算法" #: builtin/patch-id.c -msgid "use the stable patch-id algorithm" -msgstr "使用稳定的 patch-id 算法" +msgid "use the stable patch ID algorithm" +msgstr "使用稳定的 patch ID 算法" #: builtin/patch-id.c msgid "don't strip whitespace from the patch" @@ -12874,50 +12949,6 @@ msgstr "不能在珍品仓库中执行清理操作" msgid "git pull [] [ [...]]" msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/pull.c -msgid "control for recursive fetching of submodules" -msgstr "控制子模组的递归获取" - -#: builtin/pull.c -msgid "Options related to merging" -msgstr "和合并相关的选项" - -#: builtin/pull.c -msgid "incorporate changes by rebasing rather than merging" -msgstr "使用变基操作取代合并操作以合入修改" - -#: builtin/pull.c builtin/revert.c -msgid "allow fast-forward" -msgstr "允许快进式" - -#: builtin/pull.c -msgid "control use of pre-merge-commit and commit-msg hooks" -msgstr "控制 pre-merge-commit 和 commit-msg 钩子的使用" - -#: builtin/pull.c parse-options.h -msgid "automatically stash/stash pop before and after" -msgstr "在操作前后执行自动贮藏和弹出贮藏" - -#: builtin/pull.c -msgid "Options related to fetching" -msgstr "和获取相关的参数" - -#: builtin/pull.c -msgid "force overwrite of local branch" -msgstr "强制覆盖本地分支" - -#: builtin/pull.c -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 " @@ -13025,8 +13056,52 @@ msgstr "" " git config pull.ff only # 仅快进\n" "\n" "您可以将 \"git config\" 替换为 \"git config --global\" 以便为所有仓库设置\n" -"缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase，\n" -"或者 --ff-only 参数覆盖缺省设置。\n" +"默认的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase，\n" +"或者 --ff-only 参数覆盖默认设置。\n" + +#: builtin/pull.c +msgid "control for recursive fetching of submodules" +msgstr "控制子模组的递归获取" + +#: builtin/pull.c +msgid "Options related to merging" +msgstr "和合并相关的选项" + +#: builtin/pull.c +msgid "incorporate changes by rebasing rather than merging" +msgstr "使用变基操作取代合并操作以合入修改" + +#: builtin/pull.c builtin/revert.c +msgid "allow fast-forward" +msgstr "允许快进" + +#: builtin/pull.c +msgid "control use of pre-merge-commit and commit-msg hooks" +msgstr "控制 pre-merge-commit 和 commit-msg 钩子的使用" + +#: builtin/pull.c parse-options.h +msgid "automatically stash/stash pop before and after" +msgstr "在操作前后执行自动储藏和弹出储藏" + +#: builtin/pull.c +msgid "Options related to fetching" +msgstr "和获取相关的参数" + +#: builtin/pull.c +msgid "force overwrite of local branch" +msgstr "强制覆盖本地分支" + +#: builtin/pull.c +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 "Updating an unborn branch with changes added to the index." @@ -13038,7 +13113,7 @@ msgstr "变基式拉取" #: builtin/pull.c builtin/rebase.c msgid "Please commit or stash them." -msgstr "请提交或贮藏修改。" +msgstr "请提交或储藏修改。" #: builtin/pull.c #, c-format @@ -13085,7 +13160,7 @@ msgstr "需要指定如何调和偏离的分支。" #: builtin/pull.c msgid "cannot rebase with locally recorded submodule modifications" -msgstr "本地子模组中有修改，无法变基" +msgstr "本地子模组中有修改，不能变基" #: builtin/push.c msgid "git push [] [ [...]]" @@ -13300,7 +13375,7 @@ msgstr "删除引用" #: builtin/push.c msgid "push tags (can't be used with --all or --branches or --mirror)" -msgstr "推送标签（不能使用 --all or --branches or --mirror）" +msgstr "推送标签（不能与 --all、--branches 或 --mirror 同时使用）" #: builtin/push.c builtin/send-pack.c msgid "force updates" @@ -13361,7 +13436,7 @@ msgstr "--delete 未接任何引用没有意义" #: builtin/push.c t/helper/test-bundle-uri.c #, c-format msgid "bad repository '%s'" -msgstr "坏的仓库 '%s'" +msgstr "错误的仓库 '%s'" #: builtin/push.c msgid "" @@ -13489,11 +13564,11 @@ msgstr "读取之余再执行一个合并" #: builtin/read-tree.c msgid "3-way merge if no file level merging required" -msgstr "如果没有文件级合并需要，执行三方合并" +msgstr "如果没有文件级合并需要，执行三路合并" #: builtin/read-tree.c msgid "3-way merge in presence of adds and removes" -msgstr "存在添加和删除时，也执行三方合并" +msgstr "存在添加和删除时，也执行三路合并" #: builtin/read-tree.c msgid "same as -m, but discard unmerged entries" @@ -13517,7 +13592,7 @@ msgstr "gitignore" #: builtin/read-tree.c msgid "allow explicitly ignored files to be overwritten" -msgstr "允许忽略文件中设定的文件可以被覆盖" +msgstr "允许显式忽略的文件被覆盖" #: builtin/read-tree.c msgid "don't check the working tree after merging" @@ -13560,7 +13635,7 @@ msgstr "" #: builtin/rebase.c sequencer.c #, c-format msgid "could not read '%s'." -msgstr "不能读取 '%s'。" +msgstr "无法读取 '%s'。" #: builtin/rebase.c #, c-format @@ -13701,7 +13776,7 @@ msgstr "变基到给定的分支而非上游" #: builtin/rebase.c msgid "use the merge-base of upstream and branch as the current base" -msgstr "使用上游和分支的合并基线做为当前基线" +msgstr "使用上游和分支的合并基线作为当前基线" #: builtin/rebase.c msgid "allow pre-rebase hook to run" @@ -13877,7 +13952,7 @@ msgstr "动作 --edit-todo 只能用在交互式变基过程中。" #: builtin/rebase.c msgid "Cannot read HEAD" -msgstr "不能读取 HEAD" +msgstr "无法读取 HEAD" #: builtin/rebase.c msgid "" @@ -13947,7 +14022,7 @@ msgstr "无效的上游 '%s'" #: builtin/rebase.c msgid "Could not create new root commit" -msgstr "不能创建新的根提交" +msgstr "无法创建新的根提交" #: builtin/rebase.c #, c-format @@ -13961,7 +14036,7 @@ msgstr "没有这样的引用：%s" #: builtin/rebase.c msgid "Could not resolve HEAD to a commit" -msgstr "不能解析 HEAD 至一个提交" +msgstr "无法解析 HEAD 至一个提交" #: builtin/rebase.c #, c-format @@ -14095,7 +14170,7 @@ msgstr "git reflog exists <引用>" #: builtin/reflog.c msgid "git reflog write " -msgstr "git reflog write <引用> <旧oid> <新oid> <消息>" +msgstr "git reflog write <引用> <旧OID> <新OID> <消息>" #: builtin/reflog.c msgid "" @@ -14233,7 +14308,7 @@ msgstr "新对象 '%s' 不存在" #: builtin/reflog.c #, c-format msgid "cannot start transaction: %s" -msgstr "不能启动事务：%s" +msgstr "无法启动事务：%s" #: builtin/reflog.c #, c-format @@ -14255,7 +14330,7 @@ msgstr "git refs verify [--strict] [--verbose]" #: builtin/refs.c msgid "git refs exists " -msgstr "git reflog exists <引用>" +msgstr "git refs exists <引用>" #: builtin/refs.c msgid "git refs optimize " @@ -14292,7 +14367,7 @@ msgstr "'git refs verify' 不接受任何参数" #: builtin/refs.c msgid "git refs list " -msgstr "git reflog list" +msgstr "git refs list " #: builtin/refs.c msgid "'git refs exists' requires a reference" @@ -14391,7 +14466,7 @@ msgstr "更新 %s 中" #: builtin/remote.c #, c-format msgid "Could not fetch %s" -msgstr "不能获取 %s" +msgstr "无法获取 %s" #: builtin/remote.c msgid "" @@ -14482,12 +14557,12 @@ msgstr "（删除）" #: builtin/remote.c #, c-format msgid "could not set '%s'" -msgstr "不能设置 '%s'" +msgstr "无法设置 '%s'" #: builtin/remote.c config.c #, c-format msgid "could not unset '%s'" -msgstr "不能取消设置 '%s'" +msgstr "无法取消设置 '%s'" #: builtin/remote.c #, c-format @@ -14498,7 +14573,7 @@ msgid "" msgstr "" "配置（%s）remote.pushDefault 位于：\n" "\t%s:%d\n" -"现在在为不存在的远程名 '%s' 命名" +"现在指向不存在的远程名 '%s'" #: builtin/remote.c msgid "" @@ -14524,7 +14599,7 @@ msgstr "没有此远程仓库：'%s'" #: builtin/remote.c #, c-format msgid "Could not rename config section '%s' to '%s'" -msgstr "不能重命名配置小节 '%s' 到 '%s'" +msgstr "无法重命名配置小节 '%s' 到 '%s'" #: builtin/remote.c msgid "Renaming remote references" @@ -14564,7 +14639,7 @@ msgstr[1] "注意：refs/remotes/ 层级之外的一些分支未被移除。要 #: builtin/remote.c #, c-format msgid "Could not remove config section '%s'" -msgstr "不能移除配置小节 '%s'" +msgstr "无法移除配置小节 '%s'" #: builtin/remote.c #, c-format @@ -14590,7 +14665,7 @@ msgstr " ???" #: builtin/remote.c #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" -msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支" +msgstr "无效的 branch.%s.merge，无法变基到一个以上的分支" #: builtin/remote.c #, c-format @@ -14620,7 +14695,7 @@ msgstr "与远程 %s 合并" #: builtin/remote.c #, c-format msgid "%-*s and with remote %s\n" -msgstr "%-*s 以及和远程 %s\n" +msgstr "%-*s 以及与远程 %s\n" #: builtin/remote.c msgid "create" @@ -14793,7 +14868,7 @@ msgstr "不是一个有效引用：%s" #: builtin/remote.c #, c-format msgid "Could not set up %s" -msgstr "不能设置 %s" +msgstr "无法设置 %s" #: builtin/remote.c #, c-format @@ -14842,7 +14917,7 @@ msgstr "返回所有 URL 地址" #: builtin/remote.c msgid "manipulate push URLs" -msgstr "操作推送 URLS" +msgstr "管理推送 URL" #: builtin/remote.c msgid "add URL" @@ -14850,7 +14925,7 @@ msgstr "添加 URL" #: builtin/remote.c msgid "delete URLs" -msgstr "删除 URLS" +msgstr "删除 URL" #: builtin/remote.c msgid "--add --delete doesn't make sense" @@ -14859,7 +14934,7 @@ msgstr "--add --delete 无意义" #: builtin/remote.c #, c-format msgid "Invalid old URL pattern: %s" -msgstr "无效的旧 URL 匹配模版：%s" +msgstr "无效的旧 URL 匹配模板：%s" #: builtin/remote.c #, c-format @@ -14955,7 +15030,7 @@ msgstr "向 git-pack-objects 传递参数 --delta-islands" #: builtin/repack.c msgid "with -A, do not loosen objects older than this" -msgstr "使用 -A，不要将早于给定时间的对象过期" +msgstr "使用 -A，不要将早于给定时间的对象变为松散对象" #: builtin/repack.c msgid "with -a, repack unreachable objects" @@ -14995,7 +15070,7 @@ msgstr "不要对该包文件重新打包" #: builtin/repack.c msgid "find a geometric progression with factor " -msgstr "使用因子 查找几何级数" +msgstr "使用因子 查找几何级数" #: builtin/repack.c msgid "write a multi-pack index of the resulting packs" @@ -15165,12 +15240,12 @@ msgstr "在替换的提交中签名将被移除！" #: builtin/replace.c #, c-format msgid "could not write replacement commit for: '%s'" -msgstr "不能为 '%s' 写替换提交" +msgstr "无法为 '%s' 写替换提交" #: builtin/replace.c #, c-format msgid "graft for '%s' unnecessary" -msgstr "对 '%s' 移植没有必要" +msgstr "对 '%s' 嫁接没有必要" #: builtin/replace.c #, c-format @@ -15183,7 +15258,7 @@ msgid "" "could not convert the following graft(s):\n" "%s" msgstr "" -"不能转换下列移植：\n" +"无法转换下列嫁接：\n" "%s" #: builtin/replace.c @@ -15204,7 +15279,7 @@ msgstr "修改一个提交的父提交" #: builtin/replace.c msgid "convert existing graft file" -msgstr "转换现存的移植文件" +msgstr "转换现存的嫁接文件" #: builtin/replace.c msgid "replace the ref if it exists" @@ -15254,6 +15329,11 @@ msgstr "--convert-graft-file 不带参数" msgid "only one pattern can be given with -l" msgstr "只能为 -l 提供一个模式" +#: builtin/replay.c +#, c-format +msgid "'%s' is not a valid commit-ish for %s" +msgstr "'%s' 不是 %s 的有效提交号" + #: builtin/replay.c msgid "need some commits to replay" msgstr "需要一些提交来重放" @@ -15270,30 +15350,20 @@ msgstr "--advance 的参数必须是引用" msgid "" "cannot advance target with multiple sources because ordering would be ill-" "defined" -msgstr "不能使用多个源推进目标，因为无法明确如何排序" +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 正确的基线" +#, c-format +msgid "invalid %s value: '%s'" +msgstr "无效的 %s 值：'%s'" #: builtin/replay.c msgid "" "(EXPERIMENTAL!) git replay ([--contained] --onto | --advance " -") ..." +") [--ref-action[=]] " msgstr "" -"（试验中！）git replay ([--contained] --onto <新基线> | --advance <分支>) <版" -"本范围>..." +"（试验中！）git replay ([--contained] --onto <新基线> | --advance <分支>) [--" +"ref-action[=<模式>]] <版本范围>" #: builtin/replay.c msgid "make replay advance given branch" @@ -15304,8 +15374,12 @@ msgid "replay onto given commit" msgstr "重放到给定提交" #: builtin/replay.c -msgid "advance all branches contained in revision-range" -msgstr "演进版本范围中包含的所有分支" +msgid "update all branches that point at commits in " +msgstr "更新指向 <版本范围> 中提交的所有分支" + +#: builtin/replay.c +msgid "control ref update behavior (update|print)" +msgstr "控制引用更新行为（update|print）" #: builtin/replay.c msgid "option --onto or --advance is mandatory" @@ -15319,17 +15393,32 @@ msgid "" msgstr "" "一些版本遍历选项将被覆盖，如 'struct rev_info' 中的 '%s' 位将被强制设定" +#: builtin/replay.c +#, c-format +msgid "failed to begin ref transaction: %s" +msgstr "无法开始引用事务：%s" + #: builtin/replay.c msgid "error preparing revisions" msgstr "准备版本时错误" #: builtin/replay.c -msgid "replaying down to root commit is not supported yet!" -msgstr "目前还不支持重放到根提交！" +msgid "replaying down from root commit is not supported yet!" +msgstr "目前还不支持从根提交向下重放！" #: builtin/replay.c msgid "replaying merge commits is not supported yet!" -msgstr "目前还不支持重放到合并提交！" +msgstr "目前还不支持重放合并提交！" + +#: builtin/replay.c +#, c-format +msgid "failed to update ref '%s': %s" +msgstr "无法更新引用 '%s'：%s" + +#: builtin/replay.c +#, c-format +msgid "failed to commit ref transaction: %s" +msgstr "无法提交引用事务：%s" #: builtin/repo.c #, c-format @@ -15349,10 +15438,18 @@ msgstr "输出格式" msgid "synonym for --format=nul" msgstr "和 --format=nul 同义" +#: builtin/repo.c +msgid "print all keys/values" +msgstr "打印所有键/值" + #: builtin/repo.c msgid "unsupported output format" msgstr "不支持的输出格式" +#: builtin/repo.c +msgid "--all and cannot be used together" +msgstr "--all 不能和 一起使用" + #: builtin/repo.c msgid "References" msgstr "引用" @@ -15375,7 +15472,7 @@ msgstr "远程" #: builtin/repo.c msgid "Others" -msgstr "其它" +msgstr "其他" #: builtin/repo.c msgid "Reachable objects" @@ -15393,6 +15490,14 @@ msgstr "树" msgid "Blobs" msgstr "数据对象" +#: builtin/repo.c +msgid "Inflated size" +msgstr "展开后大小" + +#: builtin/repo.c +msgid "Disk size" +msgstr "磁盘大小" + #: builtin/repo.c msgid "Repository structure" msgstr "仓库结构" @@ -15431,7 +15536,7 @@ msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>] #: builtin/reset.c msgid "git reset [-q] [] [--] ..." -msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..." +msgstr "git reset [-q] [<树对象>] [--] <路径规格>..." #: builtin/reset.c msgid "" @@ -15440,7 +15545,7 @@ msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象> #: builtin/reset.c msgid "git reset --patch [] [--] [...]" -msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]" +msgstr "git reset --patch [<树对象>] [--] [<路径规格>...]" #: builtin/reset.c msgid "mixed" @@ -15532,13 +15637,13 @@ msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。" #: builtin/reset.c #, c-format msgid "Cannot do %s reset with paths." -msgstr "不能带路径进行%s重置。" +msgstr "无法带路径进行%s重置。" # 译者：汉字之间无空格，故删除%s前后空格 #: builtin/reset.c #, c-format msgid "%s reset is not allowed in a bare repository" -msgstr "不能对纯仓库进行%s重置" +msgstr "不允许对纯仓库进行%s重置" #: builtin/reset.c msgid "Unstaged changes after reset:" @@ -15554,11 +15659,11 @@ msgstr "在重置后花了 %.2f 秒来刷新索引。使用 '--no-refresh' 以 #: builtin/reset.c #, c-format msgid "Could not reset index file to revision '%s'." -msgstr "不能重置索引文件至版本 '%s'。" +msgstr "无法重置索引文件至版本 '%s'。" #: builtin/reset.c msgid "Could not write new index file." -msgstr "不能写入新的索引文件。" +msgstr "无法写入新的索引文件。" #: builtin/rev-list.c #, c-format @@ -15636,7 +15741,7 @@ msgstr "--resolve-git-dir 需要一个参数" #: builtin/rev-parse.c #, c-format msgid "not a gitdir '%s'" -msgstr "不是一个git目录 '%s'" +msgstr "不是一个 git 目录 '%s'" #: builtin/rev-parse.c msgid "--git-path requires an argument" @@ -15683,7 +15788,7 @@ msgstr "该操作必须在一个工作区中运行" #: builtin/rev-parse.c msgid "Could not read the index" -msgstr "不能读取索引" +msgstr "无法读取索引" #: builtin/rev-parse.c #, c-format @@ -15725,15 +15830,15 @@ msgstr "%s：%s 不能和 %s 同时使用" #: builtin/revert.c msgid "end revert or cherry-pick sequence" -msgstr "终止反转或拣选操作" +msgstr "结束还原或拣选操作" #: builtin/revert.c msgid "resume revert or cherry-pick sequence" -msgstr "继续反转或拣选操作" +msgstr "继续还原或拣选操作" #: builtin/revert.c msgid "cancel revert or cherry-pick sequence" -msgstr "取消反转或拣选操作" +msgstr "取消还原或拣选操作" #: builtin/revert.c msgid "skip current commit and continue" @@ -15865,7 +15970,7 @@ msgstr "没有提供路径规格。我应该删除哪些文件？" #: builtin/rm.c msgid "please stage your changes to .gitmodules or stash them to proceed" -msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" +msgstr "请将您的修改暂存到 .gitmodules 中或储藏后再继续" #: builtin/rm.c #, c-format @@ -15875,7 +15980,7 @@ msgstr "未提供 -r 选项不会递归删除 '%s'" #: builtin/rm.c #, c-format msgid "git rm: unable to remove %s" -msgstr "git rm：不能删除 %s" +msgstr "git rm：无法删除 %s" #: builtin/send-pack.c msgid "" @@ -16033,11 +16138,11 @@ msgstr "以对象名字命名提交" #: builtin/show-branch.c msgid "show possible merge bases" -msgstr "显示可能合并的基线" +msgstr "显示可能的合并基线" #: builtin/show-branch.c msgid "show refs unreachable from any other ref" -msgstr "显示没有任何引用的的引用" +msgstr "显示任何其他引用都不可达的引用" #: builtin/show-branch.c msgid "show commits in topological order" @@ -16087,8 +16192,8 @@ msgstr "无此引用 %s" #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." -msgstr[0] "不能处理 %d 个以上的版本。" -msgstr[1] "不能处理 %d 个以上的版本。" +msgstr[0] "无法处理 %d 个以上的版本。" +msgstr[1] "无法处理 %d 个以上的版本。" #: builtin/show-branch.c #, c-format @@ -16098,7 +16203,7 @@ msgstr "'%s' 不是一个有效的引用。" #: builtin/show-branch.c #, c-format msgid "cannot find commit %s (%s)" -msgstr "不能找到提交 %s（%s）" +msgstr "无法找到提交 %s（%s）" #: builtin/show-index.c msgid "hash-algorithm" @@ -16158,7 +16263,7 @@ msgstr "显示 HEAD 引用，即使被过滤掉" #: builtin/show-ref.c msgid "dereference tags into object IDs" -msgstr "转换标签到对象 ID" +msgstr "将标签解引用为对象 ID" #: builtin/show-ref.c msgid "only show SHA1 hash using digits" @@ -16207,7 +16312,7 @@ msgstr "无法为稀疏检出文件创建目录" #: builtin/sparse-checkout.c #, c-format msgid "unable to fdopen %s" -msgstr "不能 fdopen %s" +msgstr "无法 fdopen %s" #: builtin/sparse-checkout.c msgid "failed to initialize worktree config" @@ -16363,11 +16468,11 @@ msgstr "输入和输出的文件使用 NUL 字符终结" #: builtin/sparse-checkout.c msgid "when used with --rules-file interpret patterns as cone mode patterns" -msgstr "通过 --rules-file 选项传递的模型将被作为锥形（稀疏检出模型）进行解析" +msgstr "通过 --rules-file 选项传递的模式将被作为锥形模式（稀疏检出）进行解析" #: builtin/sparse-checkout.c msgid "use patterns in instead of the current ones." -msgstr "从 <文件> 参数中读取模式，而不是从标准输入" +msgstr "使用 <文件> 中的模式替代当前模式。" #: builtin/stash.c msgid "git stash list []" @@ -16379,23 +16484,23 @@ msgid "" "options>] []" msgstr "" "git stash show [-u | --include-untracked | --only-untracked] [<差异选项>] [<" -"贮存>]" +"储藏>]" #: builtin/stash.c msgid "git stash drop [-q | --quiet] []" -msgstr "git stash drop [-q | --quiet] [<贮存>]" +msgstr "git stash drop [-q | --quiet] [<储藏>]" #: builtin/stash.c msgid "git stash pop [--index] [-q | --quiet] []" -msgstr "git stash pop [--index] [-q | --quiet] [<贮存>]" +msgstr "git stash pop [--index] [-q | --quiet] [<储藏>]" #: builtin/stash.c msgid "git stash apply [--index] [-q | --quiet] []" -msgstr "git stash apply [--index] [-q | --quiet] [<贮存>]" +msgstr "git stash apply [--index] [-q | --quiet] [<储藏>]" #: builtin/stash.c msgid "git stash branch []" -msgstr "git stash branch <分支名> []" +msgstr "git stash branch <分支名> [<储藏>]" #: builtin/stash.c msgid "git stash store [(-m | --message) ] [-q | --quiet] " @@ -16412,7 +16517,7 @@ msgid "" msgstr "" "git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " "| --quiet]\n" -" [-u | --include-untracked] [-a | --all] [(-m | --message <消息>]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) <消息>]\n" " [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n" " [--] [<路径规格>...]]" @@ -16432,7 +16537,7 @@ msgstr "git stash create [<消息>]" #: builtin/stash.c msgid "git stash export (--print | --to-ref ) [...]" -msgstr "git stash export (--print | --to-ref <引用>) [<贮藏>...]" +msgstr "git stash export (--print | --to-ref <引用>) [<储藏>...]" #: builtin/stash.c msgid "git stash import " @@ -16441,11 +16546,11 @@ msgstr "git stash import <提交>" #: builtin/stash.c #, c-format msgid "'%s' is not a stash-like commit" -msgstr "'%s' 不像是一个贮藏提交" +msgstr "'%s' 不像是一个储藏提交" #: builtin/stash.c msgid "No stash entries found." -msgstr "未发现贮藏条目。" +msgstr "未发现储藏条目。" #: builtin/stash.c #, c-format @@ -16474,7 +16579,7 @@ msgstr "" #: builtin/stash.c msgid "cannot apply a stash in the middle of a merge" -msgstr "无法在合并过程中应用贮藏" +msgstr "无法在合并过程中应用储藏" #: builtin/stash.c #, c-format @@ -16487,7 +16592,7 @@ msgstr "索引中有冲突。尝试不用 --index。" #: builtin/stash.c msgid "could not save index tree" -msgstr "不能保存索引树" +msgstr "无法保存索引树" #: builtin/stash.c #, c-format @@ -16496,11 +16601,11 @@ msgstr "正在合并 %s 和 %s" #: builtin/stash.c msgid "Index was not unstashed." -msgstr "索引未从贮藏中恢复。" +msgstr "索引未从储藏中恢复。" #: builtin/stash.c msgid "could not restore untracked files from stash" -msgstr "无法从贮藏条目中恢复未跟踪文件" +msgstr "无法从储藏条目中恢复未跟踪文件" #: builtin/stash.c msgid "attempt to recreate the index" @@ -16514,16 +16619,16 @@ msgstr "丢弃了 %s（%s）" #: builtin/stash.c #, c-format msgid "%s: Could not drop stash entry" -msgstr "%s：无法丢弃贮藏条目" +msgstr "%s：无法丢弃储藏条目" #: builtin/stash.c #, c-format msgid "'%s' is not a stash reference" -msgstr "'%s' 不是一个贮藏引用" +msgstr "'%s' 不是一个储藏引用" #: builtin/stash.c msgid "The stash entry is kept in case you need it again." -msgstr "贮藏条目被保留以备您再次需要。" +msgstr "储藏条目被保留以备您再次需要。" #: builtin/stash.c msgid "No branch name specified" @@ -16539,11 +16644,11 @@ msgstr "无法解包目录树" #: builtin/stash.c msgid "include untracked files in the stash" -msgstr "在贮藏中包含未跟踪文件" +msgstr "在储藏中包含未跟踪文件" #: builtin/stash.c msgid "only show untracked files in the stash" -msgstr "仅显示贮藏中的未跟踪文件" +msgstr "仅显示储藏中的未跟踪文件" #: builtin/stash.c #, c-format @@ -16552,7 +16657,7 @@ msgstr "无法用 %2$s 更新 %1$s" #: builtin/stash.c msgid "stash message" -msgstr "贮藏说明" +msgstr "储藏说明" #: builtin/stash.c msgid "\"git stash store\" requires one argument" @@ -16588,7 +16693,7 @@ msgstr "无法保存当前暂存状态" #: builtin/stash.c msgid "Cannot record working tree state" -msgstr "不能记录工作区状态" +msgstr "无法记录工作区状态" #: builtin/stash.c msgid "Can't use --patch and --include-untracked or --all at the same time" @@ -16608,7 +16713,7 @@ msgstr "没有要保存的本地修改" #: builtin/stash.c msgid "Cannot initialize stash" -msgstr "无法初始化贮藏" +msgstr "无法初始化储藏" #: builtin/stash.c msgid "Cannot save the current status" @@ -16629,11 +16734,11 @@ msgstr "保持索引" #: builtin/stash.c msgid "stash staged changes only" -msgstr "只贮藏暂存的变更" +msgstr "只储藏暂存的变更" #: builtin/stash.c msgid "stash in patch mode" -msgstr "以补丁模式贮藏" +msgstr "以补丁模式储藏" #: builtin/stash.c msgid "quiet mode" @@ -16641,7 +16746,7 @@ msgstr "静默模式" #: builtin/stash.c msgid "include untracked files in stash" -msgstr "贮藏中包含未跟踪文件" +msgstr "储藏中包含未跟踪文件" #: builtin/stash.c msgid "include ignore files" @@ -16650,7 +16755,7 @@ msgstr "包含忽略的文件" #: builtin/stash.c #, c-format msgid "cannot parse commit %s" -msgstr "不能解析提交 %s" +msgstr "无法解析提交 %s" #: builtin/stash.c #, c-format @@ -16674,7 +16779,7 @@ msgstr "不是提交：%s" #: builtin/stash.c #, c-format msgid "%s is not a valid exported stash commit" -msgstr "%s 不是一个有效的且已导出的贮藏提交" +msgstr "%s 不是一个有效的且已导出的储藏提交" #: builtin/stash.c #, c-format @@ -16684,7 +16789,7 @@ msgstr "发现根提交 %s 包含无效数据" #: builtin/stash.c #, c-format msgid "found stash commit %s without expected prefix" -msgstr "发现贮藏提交 %s 缺少预期前缀" +msgstr "发现储藏提交 %s 缺少预期前缀" #: builtin/stash.c #, c-format @@ -16694,7 +16799,7 @@ msgstr "无法解析该提交的父提交：%s" #: builtin/stash.c #, c-format msgid "%s does not look like a stash commit" -msgstr "%s 看起来不像是一个贮藏提交" +msgstr "%s 看起来不像是一个储藏提交" #: builtin/stash.c #, c-format @@ -16704,7 +16809,7 @@ msgstr "无法读取提交的缓冲区：%s" #: builtin/stash.c #, c-format msgid "cannot save the stash for %s" -msgstr "无法保存 %s 的贮藏" +msgstr "无法保存 %s 的储藏" #: builtin/stash.c msgid "unable to write base commit" @@ -16713,7 +16818,7 @@ msgstr "无法写入基线提交" #: builtin/stash.c #, c-format msgid "unable to find stash entry %s" -msgstr "无法找到贮藏条目 %s" +msgstr "无法找到储藏条目 %s" #: builtin/stash.c msgid "print the object ID instead of writing it to a ref" @@ -16863,7 +16968,7 @@ msgstr "%s" #: builtin/submodule--helper.c #, c-format msgid "couldn't hash object from '%s'" -msgstr "不能从 '%s' 创建哈希对象" +msgstr "无法从 '%s' 创建哈希对象" #: builtin/submodule--helper.c #, c-format @@ -16892,7 +16997,7 @@ msgstr "git submodule summary [<选项>] [<提交>] [--] [<路径>]" #: builtin/submodule--helper.c msgid "could not fetch a revision for HEAD" -msgstr "不能为 HEAD 获取一个版本" +msgstr "无法为 HEAD 获取一个版本" #: builtin/submodule--helper.c #, c-format @@ -16946,7 +17051,7 @@ msgstr "无法移除子模组工作区 '%s'\n" #: builtin/submodule--helper.c #, c-format msgid "could not create empty submodule directory %s" -msgstr "不能创建空的子模组目录 %s" +msgstr "无法创建空的子模组目录 %s" #: builtin/submodule--helper.c #, c-format @@ -16991,17 +17096,17 @@ msgstr "无法获得 git 目录 '%s' 的仓库句柄" #: builtin/submodule--helper.c #, c-format msgid "submodule '%s' cannot add alternate: %s" -msgstr "子模组 '%s' 不能添加仓库备选：%s" +msgstr "子模组 '%s' 无法添加仓库备选：%s" #: builtin/submodule--helper.c #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" -msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" +msgstr "无法识别 submodule.alternateErrorStrategy 的取值 '%s'" #: builtin/submodule--helper.c #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" -msgstr "不能识别 submodule.alternateLocation 的取值 '%s'" +msgstr "无法识别 submodule.alternateLocation 的取值 '%s'" #: builtin/submodule--helper.c submodule.c #, c-format @@ -17378,7 +17483,7 @@ msgstr "'%s' 已经存在于索引中" msgid "'%s' already exists in the index and is not a submodule" msgstr "'%s' 已经存在于索引中且不是一个子模组" -#: builtin/submodule--helper.c read-cache.c +#: builtin/submodule--helper.c object-file.c #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' 没有检出一个提交" @@ -17550,7 +17655,7 @@ msgstr "" #: builtin/tag.c msgid "bad object type." -msgstr "坏的对象类型。" +msgstr "错误的对象类型。" #: builtin/tag.c msgid "no tag message?" @@ -17913,7 +18018,7 @@ msgstr "" #: builtin/update-index.c msgid "Untracked cache disabled" -msgstr "缓存未跟踪文件被禁用" +msgstr "未跟踪文件缓存已禁用" #: builtin/update-index.c msgid "" @@ -17926,7 +18031,7 @@ msgstr "" #: builtin/update-index.c #, c-format msgid "Untracked cache enabled for '%s'" -msgstr "缓存未跟踪文件在 '%s' 启用" +msgstr "已为 '%s' 启用未跟踪文件缓存" #: builtin/update-index.c msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" @@ -18110,7 +18215,7 @@ msgstr "" #: builtin/worktree.c #, c-format msgid "Removing %s/%s: %s" -msgstr "删除 %s/%s: %s" +msgstr "删除 %s/%s：%s" #: builtin/worktree.c msgid "report pruned working trees" @@ -18166,7 +18271,7 @@ msgstr "无法在 '%2$s' 中取消配置 '%1$s'" #: builtin/worktree.c #, c-format msgid "could not create directory of '%s'" -msgstr "不能创建目录 '%s'" +msgstr "无法创建目录 '%s'" #: builtin/worktree.c msgid "initializing" @@ -18204,7 +18309,7 @@ msgid "" "HEAD path: '%s'\n" "HEAD contents: '%s'" msgstr "" -"HEAD 指向了一个无用的（或孤立的）引用。\n" +"HEAD 指向了一个无效的（或孤立的）引用。\n" "HEAD 路径： '%s'\n" "HEAD 内容： '%s'" @@ -18218,7 +18323,7 @@ msgstr "" #: builtin/worktree.c msgid "checkout even if already checked out in other worktree" -msgstr "检出 <分支>，即使已经被检出到其它工作区" +msgstr "检出 <分支>，即使已经被检出到其他工作区" #: builtin/worktree.c msgid "create a new branch" @@ -18280,7 +18385,7 @@ msgstr "显示扩展的注释和原因（如果有）" #: builtin/worktree.c msgid "add 'prunable' annotation to worktrees older than