# Chinese translations for Git package
# Git 软件包的简体中文翻译.
# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
+# Copyright (C) 2021-2023 Fangyi Zhou <me@fangyi.io>
# This file is distributed under the same license as the Git package.
# Contributors:
# - Fangyi Zhou <me AT fangyi.io>
# - Zhuang Ya <zhuangya AT me.com>
# - Teng Long <dyroneteng AT gmail.com>
#
-# 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 | 纯仓库
# blob object | 数据对象
# bloom filter | 布隆过滤器
# branch | 分支
-# bundle | 归档包
+# bundle | 捆绑包
# bypass | 绕过
-# cache | ç´¢å¼\95ï¼\88的别称）
+# cache | ç¼\93å\98ï¼\88ç´¢å¼\95的别称）
# chain | （提交）链
# changeset | 变更集
# checkout | 检出
# commit object | 提交对象
# commit-graph | 提交图
# commit-ish (also committish) | 提交号
-# cone | 锥形（稀疏检出模型）；锥（稀疏检出）
+# cone | 锥形模式（稀疏检出）；锥（稀疏检出）
# conflict | 冲突
# core Git | 核心 Git 工具
# cover letter | 附函
# 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 | 对象标识符
# parent | 父提交
# partial clone | 部分克隆
# patch | 补丁
+# patch hunk | 补丁块
# pathspec | 路径规格
# pattern | 模式
# pickaxe | 挖掘
-# plumbing | 管件（Git 底层核心命令的别称）
-# porcelain | 瓷件（Git 上层封装命令的别称）
+# plumbing | 管件（Git 底层命令的别称）
+# porcelain | 瓷件（Git 高层命令的别称）
# precious-objects repo | 珍品仓库
# preferred pack | 首选包（多包索引中引入的首选包概念）
# promisor | 承诺者
# squash | 挤压
# stage | n. 暂存区（即索引）; v. 暂存
# stale | 过期的
-# stash | n. 贮藏区; v. 贮藏
+# stash | n. 储藏区; v. 储藏
# submodule | 子模组
# symref | 符号引用
# tag | n. 标签; v. 打标签
# unpack | 解包
# unreachable object | 不可达对象
# unstage | 取消暂存
-# upstream | 上游
-# upstream branch | 上游分支
+# upstream | 上游（分支/仓库）
# working tree | 工作区
-# Fangyi Zhou <me@fangyi.io>, 2021-2023.
+#
+# Preferred Chinese Terms
+#
+# - 默认 (not 缺省)
+# - 其他 (not 其它)
+# - 作为 (not 做为)
+# - 当作 (not 当做)
+# - 登录 (not 登陆)
+# - 账户 (not 帐户)
+# - 密码 (not 口令)
+# - 撤销 (not 撤消)
+# - 吗？ (not 么？) # 疑问助词
+# - 无法 (not 不能)：客观。客观障碍、技术限制、物理规律，非主观
+# - 不能 (not 无法)：主观。能力不足、规则限制、逻辑冲突、设计限制、意愿拒绝
#
msgid ""
msgstr ""
#: 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"
#: 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
#: 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
#: add-interactive.c
msgid "Could not parse HEAD^{tree}"
-msgstr "不能解析 HEAD^{tree}"
+msgstr "无法解析 HEAD^{tree}"
#: add-interactive.c
#, c-format
#: add-interactive.c
msgid "Review diff"
-msgstr "æ£\80è§\86 diff"
+msgstr "æ\9f¥ç\9c\8bå·®å¼\82"
#: add-interactive.c
msgid "show paths with changes"
#: 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
#: add-interactive.c
msgid "could not refresh index"
-msgstr "不能刷新索引"
+msgstr "无法刷新索引"
#: add-interactive.c builtin/clean.c
#, c-format
#: add-patch.c
#, c-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "æ\9a\82å\98å\88 é\99¤å\8a¨ä½\9c [y,n,q,a,d%s,?]? "
+msgstr "æ\9a\82å\98å\88 é\99¤å\8f\98æ\9b´ [y,n,q,a,d%s,?]? "
#: add-patch.c
#, c-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
-msgstr "æ\9a\82å\98æ·»å\8a å\8a¨ä½\9c [y,n,q,a,d%s,?]? "
+msgstr "æ\9a\82å\98æ\96°å¢\9eå\8f\98æ\9b´ [y,n,q,a,d%s,?]? "
#: add-patch.c
#, c-format
#: 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 ""
"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
#: add-patch.c
#, c-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "å\8f\96æ¶\88æ\9a\82å\98å\88 é\99¤å\8a¨ä½\9c [y,n,q,a,d%s,?]? "
+msgstr "å\8f\96æ¶\88æ\9a\82å\98å\88 é\99¤å\8f\98æ\9b´ [y,n,q,a,d%s,?]? "
#: add-patch.c
#, c-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
-msgstr "å\8f\96æ¶\88æ\9a\82å\98æ·»å\8a å\8a¨ä½\9c [y,n,q,a,d%s,?]? "
+msgstr "å\8f\96æ¶\88æ\9a\82å\98æ\96°å¢\9eå\8f\98æ\9b´ [y,n,q,a,d%s,?]? "
#: add-patch.c
#, c-format
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
-msgstr "如果补丁能正确地应用，编辑块将立即标记为未暂存。"
+msgstr "如果补丁能正确地应用，编辑块将立即标记为取消暂存。"
#: add-patch.c
msgid ""
#: add-patch.c
#, c-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "ä»\8eå·¥ä½\9cå\8cºä¸ä¸¢å¼\83å\88 é\99¤å\8a¨ä½\9c [y,n,q,a,d%s,?]? "
+msgstr "ä»\8eå·¥ä½\9cå\8cºä¸ä¸¢å¼\83å\88 é\99¤å\8f\98æ\9b´ [y,n,q,a,d%s,?]? "
#: add-patch.c
#, c-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
-msgstr "ä»\8eå·¥ä½\9cå\8cºä¸ä¸¢å¼\83æ·»å\8a å\8a¨ä½\9c [y,n,q,a,d%s,?]? "
+msgstr "ä»\8eå·¥ä½\9cå\8cºä¸ä¸¢å¼\83æ\96°å¢\9eå\8f\98æ\9b´ [y,n,q,a,d%s,?]? "
#: add-patch.c
#, c-format
#: add-patch.c
#, c-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "ä»\8eç´¢å¼\95å\92\8cå·¥ä½\9cå\8cºä¸ä¸¢å¼\83å\88 é\99¤å\8a¨ä½\9c [y,n,q,a,d%s,?]? "
+msgstr "ä»\8eç´¢å¼\95å\92\8cå·¥ä½\9cå\8cºä¸ä¸¢å¼\83å\88 é\99¤å\8f\98æ\9b´ [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 "ä»\8eç´¢å¼\95å\92\8cå·¥ä½\9cå\8cºä¸ä¸¢å¼\83æ·»å\8a å\8a¨ä½\9c [y,n,q,a,d%s,?]? "
+msgstr "ä»\8eç´¢å¼\95å\92\8cå·¥ä½\9cå\8cºä¸ä¸¢å¼\83æ\96°å¢\9eå\8f\98æ\9b´ [y,n,q,a,d%s,?]? "
#: add-patch.c
#, c-format
#: 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
"expected context line #%d in\n"
"%.*s"
msgstr ""
-"预期上下文行 #%d 于\n"
+"é¢\84æ\9c\9fä¸\8aä¸\8bæ\96\87è¡\8c #%d ä½\8däº\8e\n"
"%.*s"
#: add-patch.c
msgstr ""
"块不重叠：\n"
"%.*s\n"
-"\t不是结尾于：\n"
+"\t未以以下内容结尾：\n"
"%.*s"
#: add-patch.c
"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
#: 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"
#: 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 (<ret> to see more)? "
#: add-patch.c
msgid "No other hunks to search"
-msgstr "没有其它可供查找的块"
+msgstr "没有其他可供查找的块"
#: add-patch.c
msgid "search for regex? "
#: add-patch.c
msgid "Sorry, cannot split this hunk"
-msgstr "对不起，不能拆分这个块"
+msgstr "对不起，无法拆分这个块"
#: add-patch.c
#, c-format
#: add-patch.c
msgid "Sorry, cannot edit this hunk"
-msgstr "对不起，不能编辑这个块"
+msgstr "对不起，无法编辑这个块"
#: add-patch.c
#, c-format
#: 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."
"* Use \"git add --sparse <paths>\" 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\" 来应用稀疏规则"
#: apply.c
#, c-format
msgid "unable to find filename in patch at line %d"
-msgstr "不能在补丁的第 %d 行找到文件名"
+msgstr "无法在补丁的第 %d 行找到文件名"
#: apply.c
#, c-format
#: apply.c
#, c-format
msgid "unable to open or read %s"
-msgstr "不能打开或读取 %s"
+msgstr "无法打开或读取 %s"
#: apply.c
#, c-format
"while searching for:\n"
"%.*s"
msgstr ""
-"å½\93æ\9f¥è¯¢ï¼\9a\n"
+"å\9c¨æ\90\9cç´¢ï¼\9a\n"
"%.*s"
#: apply.c
#: 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
#: 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
#: apply.c
#, c-format
msgid "reading from '%s' beyond a symbolic link"
-msgstr "读取位于符号链接中的 '%s'"
+msgstr "从 '%s' 读取时越过符号链接"
#: apply.c
#, c-format
#: 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
#: 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
#: apply.c
#, c-format
msgid "Falling back to direct application...\n"
-msgstr "回落到直接应用...\n"
+msgstr "改为直接应用...\n"
#: apply.c
msgid "removal patch leaves file contents"
#: apply.c
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
-msgstr "å\8f\97å½±å\93\8dç\9a\84æ\96\87件 '%s' ä½\8däº\8e符å\8f·é\93¾æ\8e¥ä¸"
+msgstr "å\8f\97å½±å\93\8dç\9a\84æ\96\87件 '%s' ä½\8däº\8e符å\8f·é\93¾æ\8e¥ä¹\8bå¤\96"
#: apply.c
#, c-format
#: 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
#: apply.c
#, c-format
msgid "unable to write file '%s' mode %o"
-msgstr "不能写文件 '%s' 权限 %o"
+msgstr "无法写文件 '%s' 权限 %o"
#: apply.c
#, c-format
#, 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"
#: 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
#: apply.c
msgid "don't apply changes matching the given path"
-msgstr "ä¸\8dè¦\81åº\94ç\94¨ä¸\8eç»\99å\87ºè·¯å¾\84å\90\91匹配的变更"
+msgstr "ä¸\8dè¦\81åº\94ç\94¨ä¸\8eç»\99å®\9aè·¯å¾\84ç\9b¸匹配的变更"
#: apply.c
msgid "apply changes matching the given path"
-msgstr "åº\94ç\94¨ä¸\8eç»\99å\87ºè·¯å¾\84å\90\91匹配的变更"
+msgstr "åº\94ç\94¨ä¸\8eç»\99å®\9aè·¯å¾\84ç\9b¸匹配的变更"
#: apply.c builtin/am.c
msgid "num"
#: apply.c
msgid "ignore additions made by the patch"
-msgstr "忽略补丁中的添加的文件"
+msgstr "忽略补丁新增的内容"
#: apply.c
msgid "instead of applying the patch, output diffstat for the input"
#: 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"
#: apply.c
msgid "build a temporary index based on embedded index information"
-msgstr "å\88\9b建ä¸\80个临æ\97¶ç´¢å¼\95å\9fºäº\8eåµ\8cå\85¥ç\9a\84ç´¢å¼\95ä¿¡æ\81¯"
+msgstr "å\9fºäº\8eåµ\8cå\85¥ç\9a\84ç´¢å¼\95ä¿¡æ\81¯å\88\9b建临æ\97¶ç´¢å¼\95"
#: apply.c builtin/checkout-index.c
msgid "paths are separated with NUL character"
#: apply.c
msgid "detect new or modified lines that have whitespace errors"
-msgstr "æ£\80æ\9f¥æ\96°å¢\9eå\92\8cä¿®æ\94¹ç\9a\84è¡\8cä¸é\97´ç\9a\84空ç\99½å\97符滥ç\94¨"
+msgstr "æ£\80æµ\8bæ\96°å¢\9eæ\88\96ä¿®æ\94¹ç\9a\84è¡\8cæ\98¯å\90¦å\98å\9c¨ç©ºç\99½é\94\99误"
#: apply.c
msgid "ignore changes in whitespace when finding context"
#: 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 "å\85\81许ä¸\8dæ£ç¡®ç\9a\84æ\96\87件æ\9c«å°¾换行符"
+msgstr "容å¿\8d误å\88¤ç\9a\84æ\96\87件æ\9c«å°¾ç¼ºå¤±换行符"
#: apply.c
msgid "do not trust the line counts in the hunk headers"
-msgstr "不信任补丁片段的头信息中的行号"
+msgstr "不信任块头信息中的行数"
#: apply.c builtin/am.c
msgid "root"
#: 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
#: 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
#: archive.c builtin/archive.c
msgid "retrieve the archive from remote repository <repo>"
-msgstr "从远程仓库（<仓库>）提取归档文件"
+msgstr "从远程仓库 <仓库> 提取归档文件"
#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c
msgid "command"
#: attr.c
msgid "unable to add additional attribute"
-msgstr "不能添加额外属性"
+msgstr "无法添加额外属性"
#: attr.c
#, c-format
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
-"负值模版在 git attributes 中被忽略\n"
+"否定模式在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时，使用 '\\!'。"
#: attr.c
#: 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
"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
"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
#: 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"
#: 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 ""
"the remote tracking information by invoking:"
msgstr ""
"\n"
-"在修复错误后，您可以通过执行以下命令来尝试修æ\94¹è¿\9cç¨\8bè·\9f踪å\88\86æ\94¯ï¼\9a"
+"在修复错误后，您可以通过执行以下命令来尝试修å¤\8dè¿\9cç¨\8bè·\9f踪信æ\81¯ï¼\9a"
#: branch.c
#, c-format
#: branch.c
#, c-format
msgid "not tracking: ambiguous information for ref '%s'"
-msgstr "不在跟踪中：引用 '%s' 有歧义的信息"
+msgstr "未跟踪：引用 '%s' 的信息含糊不清"
# 译者：为保证在输出中对齐，注意调整句中空格！
#. #-#-#-#-# branch.c.po #-#-#-#-#
"different remotes' fetch refspecs map into different\n"
"tracking namespaces."
msgstr ""
-"æ\9c\89å¤\9a个è¿\9cç¨\8bç\9a\84è\8e·å\8f\96å¼\95ç\94¨è§\84æ ¼æ\98 å°\84å\88°äº\86追踪引用 '%s'：\n"
+"æ\9c\89å¤\9a个è¿\9cç¨\8bç\9a\84è\8e·å\8f\96å¼\95ç\94¨è§\84æ ¼æ\98 å°\84å\88°äº\86è·\9f踪引用 '%s'：\n"
"%s\n"
"这一般是个配置错误。\n"
"\n"
-"å¦\82æ\9e\9cè¦\81æ\94¯æ\8c\81设置追踪å\88\86æ\94¯ï¼\8c请ä¿\9dè¯\81ä¸\8då\90\8cè¿\9cç¨\8bç\9a\84è\8e·å\8f\96å¼\95ç\94¨è§\84æ ¼æ\98 å°\84è\87³ä¸\8då\90\8cç\9a\84追踪命名空"
+"å¦\82æ\9e\9cè¦\81æ\94¯æ\8c\81设置è·\9f踪å\88\86æ\94¯ï¼\8c请ä¿\9dè¯\81ä¸\8då\90\8cè¿\9cç¨\8bç\9a\84è\8e·å\8f\96å¼\95ç\94¨è§\84æ ¼æ\98 å°\84è\87³ä¸\8då\90\8cç\9a\84è·\9f踪命名空"
"间。"
#: branch.c
"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
#: 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:"
#: builtin/add.c
msgid "could not read the index"
-msgstr "不能读取索引"
+msgstr "无法读取索引"
#: builtin/add.c
msgid "editing patch failed"
#: 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 "空补ä¸\81ã\80\82å¼\82常ç»\88止"
+msgstr "空补ä¸\81ã\80\82å·²ä¸止"
#: 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"
#: 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"
#: 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)"
#: 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"
#: builtin/add.c
msgid "warn when adding an embedded repository"
-msgstr "创建一个嵌入式仓库时给予警告"
+msgstr "添加嵌入式仓库时给予警告"
#: builtin/add.c
#, c-format
"\n"
"See \"git help submodule\" for more information."
msgstr ""
-"您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n"
+"您在当前仓库中添加了另一个 Git 仓库。外层仓库的克隆将不包含嵌入式仓库的\n"
"内容，并且不知道该如何获取它。如果您要添加一个子模组，使用：\n"
"\n"
"\tgit submodule add <url> %s\n"
#: 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
#: 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
#: 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 ""
#: builtin/am.c
msgid "Falling back to patching base and 3-way merge..."
-msgstr "å\9b\9eè\90½å\88°å\9fºç¡\80ç\89\88æ\9c¬ä¸\8aæ\89\93è¡¥ä¸\81å\8f\8aè¿\9bè¡\8cä¸\89æ\96¹合并..."
+msgstr "å\9b\9eè\90½å\88°å\9c¨å\9fºç¡\80ç\89\88æ\9c¬ä¸\8aæ\89\93è¡¥ä¸\81并è¿\9bè¡\8cä¸\89è·¯合并..."
#: builtin/am.c
msgid "Failed to merge in the changes."
#: builtin/am.c
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr "脏索引：不能应用补丁（脏文件：%s）"
+msgstr "脏索引：无法应用补丁（脏文件：%s）"
#: builtin/am.c
#, c-format
"already introduced the same changes; you might want to skip this patch."
msgstr ""
"没有变更 —— 您是不是忘了执行 'git add'？\n"
-"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
+"如果没有什么要添加到暂存区的，则很可能是其他提交已经引入了相同的变更。\n"
"您也许想要跳过这个补丁。"
#: builtin/am.c
"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"
#: builtin/am.c
msgid "allow fall back on 3way merging if needed"
-msgstr "å¦\82æ\9e\9cå¿\85è¦\81ï¼\8cå\85\81许使ç\94¨ä¸\89æ\96¹å\90\88并ã\80\82"
+msgstr "å¦\82æ\9c\89é\9c\80è¦\81ï¼\8cå\85\81许å\9b\9eè\90½å\88°ä¸\89è·¯å\90\88并"
#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c
#: builtin/stash.c
#: builtin/am.c
msgid "override error message when patch failure occurs"
-msgstr "打补丁失败时显示的错误信息"
+msgstr "覆盖打补丁失败时的错误信息"
#: builtin/am.c
msgid "continue applying patches after resolving a conflict"
#: builtin/am.c
msgid "lie about committer date"
-msgstr "将作者日期作为提交日期"
+msgstr "伪造提交者日期"
#: builtin/am.c
msgid "use current timestamp for author date"
#: 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"
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-"发现了错误的 %s 目录。\n"
+"发现了残留的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
#: builtin/am.c
#: 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"
#: 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
#: 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"
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
-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
#.
#: 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"
#: builtin/bisect.c
msgid "bad HEAD - I need a HEAD"
-msgstr "坏的 HEAD - 我需要一个 HEAD"
+msgstr "无效的 HEAD - 需要一个 HEAD"
#: builtin/bisect.c
#, c-format
#: builtin/bisect.c
msgid "bad HEAD - strange symbolic ref"
-msgstr "坏的 HEAD - 奇怪的符号引用"
+msgstr "无效的 HEAD - 奇怪的符号引用"
#: builtin/bisect.c
#, c-format
#.
#: 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"
#: 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."
#: 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
#: builtin/bisect.c
msgid "bisect run cannot continue any more"
-msgstr "二分查找不能继续运行"
+msgstr "二分查找无法继续运行"
#: builtin/bisect.c
msgid "bisect run success"
#: builtin/blame.c
#, c-format
msgid "expecting a color: %s"
-msgstr "期望一个颜色：%s"
+msgstr "期望是颜色：%s"
#: builtin/blame.c
msgid "must end with a color"
#: 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"
#: builtin/blame.c
msgid "show porcelain format with per-line commit information"
-msgstr "为æ¯\8fä¸\80è¡\8cæ\98¾ç¤ºæ\9cºå\99¨é\80\82ç\94¨的提交信息"
+msgstr "以 porcelain æ ¼å¼\8fæ\98¾ç¤ºæ¯\8fè¡\8c的提交信息"
#: builtin/blame.c
msgid "use the same output mode as git-annotate (Default: off)"
#: builtin/blame.c
msgid "color redundant metadata from previous line differently"
-msgstr "使用颜色间隔输出与前一行不同的重复元信息"
+msgstr "用不同颜色标示与前一行重复的元信息"
#: builtin/blame.c
msgid "color lines by age"
#: builtin/blame.c
msgid "use <file>'s contents as the final image"
-msgstr "使ç\94¨ <æ\96\87件> ç\9a\84å\86\85容ä½\9c为æ\9c\80ç»\88ç\9a\84é\95\9cå\83\8f"
+msgstr "使ç\94¨ <æ\96\87件> ç\9a\84å\86\85容ä½\9c为æ\9c\80ç»\88ç»\93æ\9e\9c"
#: builtin/blame.c
msgid "score"
#: 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
#: builtin/branch.c
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
-msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
+msgstr "git branch [<选项>] (-c | -C) [<旧分支>] <新分支>"
#: builtin/branch.c
msgid "git branch [<options>] [-r | -a] [--points-at]"
#: builtin/branch.c
#, c-format
msgid "cannot delete branch '%s' used by worktree at '%s'"
-msgstr "æ\97 æ³\95强å\88¶æ\9b´æ\96°è¢«å·¥ä½\9cå\8cº '%2$s' æ\89\80使用的分支 '%1$s'"
+msgstr "æ\97 æ³\95å\88 é\99¤è¢«å·¥ä½\9cå\8cº '%2$s' 使用的分支 '%1$s'"
#: builtin/branch.c
#, c-format
#: builtin/branch.c
#, c-format
msgid "branch '%s' not found"
-msgstr "分支 '%s' 未å\8f\91ç\8e°"
+msgstr "分支 '%s' 未æ\89¾å\88°"
#: builtin/branch.c
#, c-format
#: 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
#: 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 "å·¥ä½\9cå\8cº %s ç\9a\84 HEAD æ\8c\87å\90\91没æ\9c\89被更新"
+msgstr "å·¥ä½\9cå\8cº %s ç\9a\84 HEAD æ\9cª更新"
#: builtin/branch.c
#, c-format
msgstr ""
"请编辑分支的描述\n"
" %s\n"
-"以 '%s' 开头的行将被è¿\87滤ã\80\82\n"
+"以 '%s' 开头的行将被移é\99¤ã\80\82\n"
#: builtin/branch.c
msgid "Generic options"
#: 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"
#: builtin/branch.c
msgid "edit the description for the branch"
-msgstr "标记分支的描述"
+msgstr "编辑分支的描述"
#: builtin/branch.c
msgid "force creation, move/rename, deletion"
#: 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"
#: 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 ""
#: 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"
#: 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
" [(-s | --suffix) <format> | --no-suffix]\n"
" [--diagnose[=<mode>]]"
msgstr ""
-"git bugreport [-o | --output-directory <文件>]\n"
+"git bugreport [-o | --output-directory <路径>]\n"
" [(-s | --suffix) <格式> | --no-suffix]\n"
-" [--diagnose[=<模式>]"
+" [--diagnose[=<模式>]]"
#: builtin/bugreport.c
msgid ""
"\n"
"您所期望的与实际发生的有什么不同？\n"
"\n"
-"您想要补充的其它内容：\n"
+"您想要补充的其他内容：\n"
"\n"
"请检查下面错误报告中余下的内容。\n"
"您可以删除任何您不想共享的内容。\n"
#: 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"
#: 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"
#: 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"
#: 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"
#: 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', ...)"
#: 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"
#: builtin/cat-file.c
msgid "use a <path> 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"
#: 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"
#: builtin/checkout-index.c
msgid "no warning for existing files and files not in index"
-msgstr "å\98å\9c¨æ\88\96ä¸\8då\9c¨ç´¢å¼\95ä¸ç\9a\84æ\96\87件é\83½æ²¡æ\9c\89警告"
+msgstr "对已å\98å\9c¨æ\96\87件å\92\8cä¸\8då\9c¨ç´¢å¼\95ä¸ç\9a\84æ\96\87件ä¸\8då\8f\91å\87º警告"
#: builtin/checkout-index.c
msgid "don't checkout new files"
#: builtin/checkout.c
#, c-format
msgid "path '%s': cannot merge"
-msgstr "path '%s'：无法合并"
+msgstr "路径 '%s'：无法合并"
#: builtin/checkout.c
#, c-format
#: 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
"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"
#: builtin/checkout.c builtin/clone.c
msgid "unable to update HEAD"
-msgstr "不能更新 HEAD"
+msgstr "无法更新 HEAD"
#: builtin/checkout.c
#, c-format
#: builtin/checkout.c
#, c-format
msgid " ... and %d more.\n"
-msgstr " ... 及其它 %d 个。\n"
+msgstr " ... 及其他 %d 个。\n"
#: builtin/checkout.c
#, c-format
"\n"
" git checkout --track origin/<名称>\n"
"\n"
-"如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n"
-"å\90\8d称ï¼\8cå\8f¯ä»¥å\9c¨é\85\8dç½®ä¸è®¾ç½® checkout.defaultRemote=originã\80\82"
+"如果您希望在检出模糊的简短分支名 <名称> 时总是偏好某个远程（如 'origin'），\n"
+"可以在配置中设置 checkout.defaultRemote=origin。"
#: builtin/checkout.c
#, c-format
#: 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 ""
#: 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"
#: 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"
#: builtin/checkout.c
msgid "new unborn branch"
-msgstr "新的未诞生的分支"
+msgstr "新的尚未诞生分支"
#: builtin/checkout.c builtin/merge.c
msgid "update ignored files (default)"
#: 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"
#: 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 ""
#: builtin/checkout.c
msgid "which tree-ish to checkout from"
-msgstr "要检出哪一个树"
+msgstr "要从哪个树对象检出"
#: builtin/checkout.c
msgid "restore the index"
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
"[<pathspec>...]"
msgstr ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径规格>..."
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] [<路径规格>...]"
#: builtin/clean.c builtin/sparse-checkout.c
#, c-format
#: 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"
#: builtin/clean.c
#, c-format
msgid "Input ignore patterns>> "
-msgstr "输入模版以排除条目>> "
+msgstr "输入忽略模式>> "
#: builtin/clean.c
#, c-format
"? - 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"
#: 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
#: builtin/clone.c
#, c-format
msgid "unable to update %s"
-msgstr "不能更新 %s"
+msgstr "无法更新 %s"
#: builtin/clone.c
msgid "failed to initialize sparse-checkout"
#: builtin/clone.c
msgid "unable to checkout working tree"
-msgstr "不能检出工作区"
+msgstr "无法检出工作区"
#: builtin/clone.c
msgid "unable to write parameters to config file"
#: 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"
#: 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"
#: 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"
#: builtin/clone.c
msgid "key=value"
-msgstr "key=value"
+msgstr "键=值"
#: builtin/clone.c
msgid "set config inside the new repository"
#: 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
#: 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 [<options>] [--] <repo> [<dir>]"
#: 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
#: 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"
#: builtin/clone.c
#, c-format
msgid "Remote branch %s not found in upstream %s"
-msgstr "远程分支 %s 在上游 %s 未å\8f\91ç\8e°"
+msgstr "远程分支 %s 在上游 %s 未æ\89¾å\88°"
#: builtin/clone.c
#, c-format
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 <n>] [--"
"[no-]progress]\n"
" <切分选项>"
#: builtin/commit-graph.c
msgid "if the commit-graph is split, only verify the tip file"
-msgstr "如果提交图被拆分，只验证头一个文件"
+msgstr "如果提交图被拆分，只验证顶端文件"
#: builtin/commit-graph.c
#, c-format
#: 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"
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"
" [(-F <file>)...] <tree>"
msgstr ""
-"git commit-tree [(-p <父提交>)...] [-S[<私钥 ID>]] [(-m <消息>)...]\n"
+"git commit-tree [(-p <父提交>)...] [-S[<密钥 ID>]] [(-m <消息>)...]\n"
" [(-F <文件>)...] <树>"
#: builtin/commit-tree.c
#: 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"
" [--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
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
-"æ\82¨è¦\81修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
-"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
+"æ\82¨è¦\81修订最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
+"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 彻底删除该提交。\n"
#: builtin/commit.c
msgid ""
#: builtin/commit.c
msgid "No paths with --include/--only does not make sense."
-msgstr "å\8f\82æ\95° --include/--only ä¸\8dè·\9fè·¯å¾\84没有意义。"
+msgstr "å\9c¨æ\9cªæ\8c\87å®\9aè·¯å¾\84æ\97¶ä½¿ç\94¨ --include/--only 没有意义。"
#: builtin/commit.c
msgid "unable to create temporary index"
-msgstr "不能创建临时索引"
+msgstr "无法创建临时索引"
#: builtin/commit.c
msgid "interactive add failed"
#: builtin/commit.c
msgid "Failed to update main cache tree"
-msgstr "不能更新树的主缓存"
+msgstr "无法更新主缓存树"
#: builtin/commit.c
msgid "cannot do a partial commit during a merge."
#: builtin/commit.c
#, c-format
msgid "could not lookup commit '%s'"
-msgstr "不能查询提交 '%s'"
+msgstr "无法查询提交 '%s'"
#: builtin/commit.c builtin/shortlog.c
#, c-format
#: 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
#: 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
#: builtin/commit.c
msgid "could not write commit template"
-msgstr "不能写提交模版"
+msgstr "无法写提交模板"
#: builtin/commit.c
#, c-format
#: 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
#: builtin/commit.c
msgid "You have nothing to amend."
-msgstr "æ\82¨æ²¡æ\9c\89å\8f¯ä¿®è¡¥的提交。"
+msgstr "æ\82¨æ²¡æ\9c\89å\8f¯ä¿®è®¢的提交。"
#: 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."
#: 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"
#: builtin/commit.c
msgid "show stash information"
-msgstr "显示贮藏区信息"
+msgstr "显示储藏信息"
#: builtin/commit.c
msgid "compute full ahead/behind values"
#: builtin/commit.c
msgid "detect renames, optionally set similarity index"
-msgstr "检测重命名，可以设置索引相似度"
+msgstr "检测重命名，可设置相似度索引"
#: builtin/commit.c
msgid "Unsupported combination of ignored and untracked-files arguments"
#: builtin/commit.c
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
-msgstr "使ç\94¨è\87ªå\8a¨æ\8c¤å\8e\8bæ ¼å¼\8fç\9a\84æ\8f\90交说æ\98\8e对æ\8c\87å®\9aç\9a\84æ\8f\90交è¿\9bè¡\8cä¿®æ£ã\80\81修补或改写说明"
+msgstr "使ç\94¨è\87ªå\8a¨æ\8c¤å\8e\8bæ ¼å¼\8fç\9a\84æ\8f\90交说æ\98\8e对æ\8c\87å®\9aç\9a\84æ\8f\90交è¿\9bè¡\8cä¿®æ£ã\80\81修订或改写说明"
#: builtin/commit.c
msgid "use autosquash formatted message to squash specified commit"
#: 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"
#: builtin/commit.c sequencer.c
msgid "could not parse HEAD commit"
-msgstr "不能解析 HEAD 提交"
+msgstr "无法解析 HEAD 提交"
#: builtin/commit.c
#, c-format
#: 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 "ç»\88æ¢æ\8f\90交å\9b 为æ\8f\90交说æ\98\8e为空。\n"
+msgstr "ç\94±äº\8eæ\8f\90交说æ\98\8e为空ï¼\8cç»\88æ¢æ\8f\90交。\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
#: builtin/config.c
msgid "terminate values with NUL byte"
-msgstr "终止值是 NUL 字节"
+msgstr "以 NUL 字节终止值"
#: builtin/config.c
msgid "show variable names only"
#: builtin/config.c
msgid "only one type at a time"
-msgstr "一次只能一个类型"
+msgstr "一次只能指定一个类型"
#: builtin/config.c
#, c-format
#: 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
#: builtin/config.c
msgid "not in a git directory"
-msgstr "不在 git 仓库中"
+msgstr "不在 git 目录中"
#: builtin/config.c
msgid "writing to stdin is not supported"
"#\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"
#: builtin/config.c
msgid "Other"
-msgstr "其它"
+msgstr "其他"
#: builtin/config.c
msgid "respect include directives on lookup"
#: 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="
#: builtin/config.c
#, c-format
msgid "cannot create configuration file %s"
-msgstr "不能创建配置文件 %s"
+msgstr "无法创建配置文件 %s"
#: builtin/config.c
msgid "Action"
#: builtin/count-objects.c
msgid "print sizes in human readable format"
-msgstr "以用户可读的格式显示大小"
+msgstr "以人类可读的格式显示大小"
#: builtin/credential-cache--daemon.c
#, c-format
#: builtin/describe.c
#, c-format
msgid "annotated tag %s not available"
-msgstr "附注标签 %s 无效"
+msgstr "附注标签 %s 不可用"
#: builtin/describe.c
#, c-format
#: builtin/describe.c
#, c-format
msgid "finished search at %s\n"
-msgstr "å®\8cæ\88\90æ\90\9cç´¢ %s\n"
+msgstr "å\9c¨ %s å¤\84å®\8cæ\88\90æ\90\9cç´¢\n"
#: builtin/describe.c
#, c-format
#: builtin/describe.c
msgid "use any tag, even unannotated"
-msgstr "使用任意标签，即使未附带注释"
+msgstr "使用任意标签，即使未附注"
#: builtin/describe.c
msgid "always use long format"
#: 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 [<diff-options>]"
#: 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 [<options>] [<commit> [<commit>]] [--] [<path>...]"
#: 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
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] 来处理"
+msgstr "遇到提交特定编码 %.*s 的提交为 %s；使用 --reencode=[yes|no] 来处理"
#: builtin/fast-export.c
#, c-format
#: builtin/fast-export.c
msgid "fake a tagger when tags lack one"
-msgstr "å½\93æ \87ç¾ç¼ºå°\91æ \87记人å\97段æ\97¶ï¼\8cå\81\87è£\85æ\8f\90ä¾\9b一个"
+msgstr "å½\93æ \87ç¾ç¼ºå°\91æ\89\93æ \87ç¾è\80\85æ\97¶ï¼\8c伪é\80 一个"
#: builtin/fast-export.c
msgid "output full tree for each commit"
#: builtin/fast-export.c
msgid "from:to"
-msgstr "from:to"
+msgstr "从:到"
#: builtin/fast-export.c
msgid "convert <from> to <to> in anonymized output"
#: 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"
#: builtin/fast-export.c
msgid "label tags with mark ids"
-msgstr "对带有标记 ID 的标签做标记"
+msgstr "用标记 ID 标注标签"
#: builtin/fast-import.c
#, c-format
#: sequencer.c
#, c-format
msgid "unable to create leading directories of %s"
-msgstr "不能为 %s 创建先导目录"
+msgstr "无法为 %s 创建上级目录"
#: builtin/fast-import.c
#, c-format
#: builtin/fast-import.c
#, c-format
msgid "%s not found: %s"
-msgstr "未找到%s：%s"
+msgstr "未找到 %s：%s"
#: builtin/fast-import.c
msgid "tree"
#: builtin/fast-import.c
msgid "can't add a note on empty branch."
-msgstr "不能在空分支上添加注释。"
+msgstr "无法在空分支上添加注解。"
#: builtin/fast-import.c
#, c-format
#: builtin/fast-import.c
msgid "expected committer but didn't get one"
-msgstr "é¢\84æ\9c\9fæ\8f\90交è\80\85ä½\86æ\9cªè\8e·å\8f\96"
+msgstr "é¢\84æ\9c\9fæ\8f\90交è\80\85ä½\86æ\9cªè\8e·å¾\97"
#: builtin/fast-import.c
msgid "encountered signed commit; use --signed-commits=<mode> to handle it"
#: builtin/fetch-pack.c
#, c-format
msgid "Lockfile created but not reported: %s"
-msgstr "Lockfile 已创建但未报告：%s"
+msgstr "锁文件已创建但未报告：%s"
#: builtin/fetch.c
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
#: builtin/fetch.c
#, c-format
msgid "object %s not found"
-msgstr "对象 %s 未å\8f\91ç\8e°"
+msgstr "对象 %s 未æ\89¾å\88°"
#: builtin/fetch.c
msgid "[up to date]"
#: 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]"
#: builtin/fetch.c builtin/grep.c sequencer.c
#, c-format
msgid "cannot open '%s'"
-msgstr "不能打开 '%s'"
+msgstr "无法打开 '%s'"
#: builtin/fetch.c
msgid ""
#: 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
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
"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
#: builtin/fetch.c
#, c-format
msgid "could not fetch %s"
-msgstr "不能获取 %s"
+msgstr "无法获取 %s"
#: builtin/fetch.c
#, c-format
#: 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
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"
#: 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"
#: 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 <n> matched refs"
#: 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
#: builtin/fsck.c
#, c-format
msgid "%s: object could not be parsed: %s"
-msgstr "%s：不能解析对象：%s"
+msgstr "%s：无法解析对象：%s"
#: builtin/fsck.c
#, c-format
#: builtin/fsmonitor--daemon.c
#, c-format
msgid "could not cd home '%s'"
-msgstr "不能切换至家目录 '%s'"
+msgstr "无法切换至家目录 '%s'"
#: builtin/fsmonitor--daemon.c
#, c-format
#: builtin/gc.c setup.c
#, c-format
msgid "cannot stat '%s'"
-msgstr "不能对 '%s' 调用 stat"
+msgstr "无法对 '%s' 调用 stat"
#: builtin/gc.c
#, c-format
#: 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"
#: 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"
#: builtin/gc.c
msgid "perform maintenance in the background"
-msgstr "在后台执行运维"
+msgstr "在后台执行维护"
#: builtin/gc.c
msgid "frequency"
#: builtin/gc.c
msgid "do not report progress or other information over stderr"
-msgstr "不通过标准错误报告进度或其它信息"
+msgstr "不通过标准错误报告进度或其他信息"
#: builtin/gc.c
msgid "task"
#: builtin/grep.c
msgid "process binary files as text"
-msgstr "把二进制文件当做文本处理"
+msgstr "把二进制文件当作文本处理"
#: builtin/grep.c
msgid "don't match patterns in binary files"
#: 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"
#: builtin/grep.c
msgid "pager"
-msgstr "分页"
+msgstr "分页器"
#: builtin/grep.c
msgid "show matching files in the pager"
#: 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"
#: builtin/help.c
msgid "exclude guides"
-msgstr "排除向导"
+msgstr "排除指南"
#: builtin/help.c
msgid "show man page"
#: 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"
#: 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
#: builtin/index-pack.c
msgid "pack is corrupted (SHA1 mismatch)"
-msgstr "å\8c\85å\86²çª\81（SHA1 不匹配）"
+msgstr "å\8c\85å·²æ\8d\9få\9d\8f（SHA1 不匹配）"
#: builtin/index-pack.c
msgid "cannot fstat packfile"
-msgstr "不能对包文件调用 fstat"
+msgstr "无法对包文件调用 fstat"
#: builtin/index-pack.c
msgid "pack has junk at the end"
#: 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"
#: builtin/index-pack.c
#, c-format
msgid "unable to deflate appended object (%d)"
-msgstr "不能压缩附加对象（%d）"
+msgstr "无法压缩附加对象（%d）"
#: builtin/index-pack.c
#, c-format
#: 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"
#: 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
#: 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"
#: 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"
#: 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
#: 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 ""
#: 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
#: 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"
#: builtin/log.c
msgid "-L<range>:<file> cannot be used with pathspec"
-msgstr "-L<è\8c\83å\9b´>:<æ\96\87件> ä¸\8dè\83½å\92\8cè·¯å¾\84表达å¼\8f共用"
+msgstr "-L<è\8c\83å\9b´>:<æ\96\87件> ä¸\8dè\83½å\92\8cè·¯å¾\84è§\84æ ¼共用"
#: builtin/log.c
msgid ""
#: builtin/log.c
msgid "could not find exact merge base"
-msgstr "不能找到准确的合并基线"
+msgstr "无法找到准确的合并基线"
#: builtin/log.c
msgid ""
#: 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"
#: builtin/log.c
msgid "reroll-count"
-msgstr "重制-计æ\95°"
+msgstr "重制次æ\95°"
#: builtin/log.c
msgid "mark the series as Nth re-roll"
#: builtin/log.c
msgid "show patch format instead of default (patch + stat)"
-msgstr "æ\98¾ç¤ºçº¯è¡¥ä¸\81æ ¼å¼\8fè\80\8cé\9d\9eé»\98认ç\9a\84ï¼\88è¡¥ä¸\81+ç\8a¶æ\80\81）"
+msgstr "æ\98¾ç¤ºçº¯è¡¥ä¸\81æ ¼å¼\8fè\80\8cé\9d\9eé»\98认ç\9a\84ï¼\88è¡¥ä¸\81+ç»\9f计）"
#: builtin/log.c
msgid "Messaging"
#: builtin/log.c
msgid "header"
-msgstr "header"
+msgstr "头信息"
#: builtin/log.c
msgid "add email header"
#: builtin/log.c
msgid "set From address to <ident> (or committer ident if absent)"
-msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
+msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 作为地址）"
#: builtin/log.c
msgid "message-id"
#: 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"
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
-msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
+msgstr "无法找到跟踪的远程分支，请手工指定 <上游>。\n"
#: builtin/ls-files.c builtin/ls-tree.c
#, c-format
#: builtin/ls-files.c
msgid "show other files in the output"
-msgstr "显示其它文件"
+msgstr "显示其他文件"
#: builtin/ls-files.c
msgid "show ignored files in the output"
#: 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"
#: 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"
#: 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 <commit> forked from reflog of <ref>"
#: 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
#: builtin/merge-recursive.c
msgid "not handling anything other than two heads merge."
-msgstr "不能处理两个头合并之外的任何操作。"
+msgstr "无法处理两个头合并之外的任何操作。"
#: builtin/merge-recursive.c
#, c-format
#: 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"
#: builtin/merge.c
#, c-format
msgid "Could not find merge strategy '%s'.\n"
-msgstr "不能找到合并策略 '%s'。\n"
+msgstr "无法找到合并策略 '%s'。\n"
#: builtin/merge.c
#, c-format
#: 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"
#: 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"
#: 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."
#: 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
#: 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"
#: 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"
#: builtin/merge.c
#, c-format
msgid "Nope.\n"
-msgstr "无。\n"
+msgstr "不行。\n"
#: builtin/merge.c
#, c-format
#: 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
#: builtin/mktag.c
#, c-format
msgid "could not read tagged object '%s'"
-msgstr "不能读取被标记的对象 '%s'"
+msgstr "无法读取被标记的对象 '%s'"
#: builtin/mktag.c
#, c-format
#: builtin/mv.c
msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
+msgstr "请将您的修改暂存到 .gitmodules 中或储藏后再继续"
#: builtin/mv.c
#, c-format
#: builtin/mv.c
msgid "force move/rename even if target exists"
-msgstr "强制移动/重命令，即使目标存在"
+msgstr "强制移动/重命名，即使目标存在"
#: builtin/mv.c
msgid "skip move/rename errors"
#: builtin/mv.c
msgid "bad source"
-msgstr "坏的源"
+msgstr "错误的源"
#: builtin/mv.c
msgid "destination exists"
#: builtin/mv.c
msgid "can not move directory into itself"
-msgstr "不能将目录移动到自身"
+msgstr "无法将目录移动到自身"
#: builtin/mv.c
msgid "destination already exists"
#: builtin/mv.c
msgid "Cannot overwrite"
-msgstr "不能覆盖"
+msgstr "无法覆盖"
#: builtin/mv.c
msgid "multiple sources for the same target"
#: 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)"
#: builtin/notes.c
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
-msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
+msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略>] <注解引用>"
#: builtin/notes.c
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
#: builtin/notes.c
msgid "could not read 'show' output"
-msgstr "不能读取 'show' 的输出"
+msgstr "无法读取 'show' 的输出"
#: builtin/notes.c
#, c-format
#: builtin/notes.c
msgid "unable to write note object"
-msgstr "不能写注解对象"
+msgstr "无法写注解对象"
#: builtin/notes.c
#, c-format
#: builtin/notes.c builtin/tag.c
#, c-format
msgid "could not open or read '%s'"
-msgstr "不能打开或读取 '%s'"
+msgstr "无法打开或读取 '%s'"
#: builtin/notes.c
#, c-format
#: builtin/notes.c
#, c-format
msgid "cannot read note data from non-blob object '%s'."
-msgstr "不能从非数据对象 '%s' 中读取注解数据。"
+msgstr "无法从非数据对象 '%s' 中读取注解数据。"
#: builtin/notes.c
#, c-format
#: 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
#: builtin/notes.c
msgid "note contents in a file"
-msgstr "注解å\86\85容å\88°一个文件中"
+msgstr "注解å\86\85容å\9c¨一个文件中"
#: builtin/notes.c
msgid "reuse and edit specified note object"
#: builtin/notes.c
msgid "edit note message in editor"
-msgstr "在编辑器中编辑注释说明"
+msgstr "在编辑器中编辑注解说明"
#: builtin/notes.c
msgid "reuse specified note object"
#: builtin/notes.c
msgid "allow storing empty note"
-msgstr "允许保存空白注释"
+msgstr "允许保存空注解"
#: builtin/notes.c
msgid "replace existing notes"
#: builtin/notes.c
msgid "insert <paragraph-break> between paragraphs"
-msgstr "在段落之间插入<分段符>"
+msgstr "在段落之间插入 <分段符>"
#: builtin/notes.c
msgid "remove unnecessary whitespace"
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
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
#: builtin/notes.c
msgid "Aborting notes merge resolution"
-msgstr "中止注解合并的方案"
+msgstr "中止注解合并的解决过程"
#: builtin/notes.c
msgid "abort notes merge"
"'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
" [--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=<n>] [--path-walk] < <对象列表>"
#: builtin/pack-objects.c
#: 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
#: builtin/pack-objects.c
#, c-format
msgid "could not find pack '%s'"
-msgstr "不能找到包 '%s'"
+msgstr "无法找到包 '%s'"
#: builtin/pack-objects.c
#, c-format
#: 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"
#: 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"
#: builtin/pack-objects.c
msgid "ignore this pack"
-msgstr "忽略该 pack"
+msgstr "忽略该包"
#: builtin/pack-objects.c
msgid "pack compression level"
#: 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"
"reused %<PRIu32> (from %<PRIuMAX>)"
msgstr ""
"总共 %<PRIu32>（差异 %<PRIu32>），复用 %<PRIu32>（差异 %<PRIu32>），包复用 "
-"%<PRIu32>（来自
%<PRIuMAX> 个包）"
+"%<PRIu32>（来自 %<PRIuMAX> 个包）"
#: builtin/pack-refs.c
msgid "git pack-refs "
" 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"
#: builtin/pull.c builtin/revert.c
msgid "allow fast-forward"
-msgstr "允许快进式"
+msgstr "允许快进"
#: builtin/pull.c
msgid "control use of pre-merge-commit and commit-msg hooks"
#: builtin/pull.c parse-options.h
msgid "automatically stash/stash pop before and after"
-msgstr "在操作前后执行自动贮藏和弹出贮藏"
+msgstr "在操作前后执行自动储藏和弹出储藏"
#: builtin/pull.c
msgid "Options related to fetching"
#: builtin/pull.c builtin/rebase.c
msgid "Please commit or stash them."
-msgstr "请提交或贮藏修改。"
+msgstr "请提交或储藏修改。"
#: builtin/pull.c
#, c-format
#: builtin/pull.c
msgid "cannot rebase with locally recorded submodule modifications"
-msgstr "本地子模组中有修改，无法变基"
+msgstr "本地子模组中有修改，不能变基"
#: builtin/push.c
msgid "git push [<options>] [<repository> [<refspec>...]]"
#: builtin/push.c
msgid "push tags (can't be used with --all or --branches or --mirror)"
-msgstr "æ\8e¨é\80\81æ \87ç¾ï¼\88ä¸\8dè\83½ä½¿ç\94¨ --all or --branches or --mirror）"
+msgstr "æ\8e¨é\80\81æ \87ç¾ï¼\88ä¸\8dè\83½ä¸\8e --allã\80\81--branches æ\88\96 --mirror å\90\8cæ\97¶ä½¿ç\94¨）"
#: builtin/push.c builtin/send-pack.c
msgid "force updates"
#: builtin/push.c t/helper/test-bundle-uri.c
#, c-format
msgid "bad repository '%s'"
-msgstr "坏的仓库 '%s'"
+msgstr "错误的仓库 '%s'"
#: builtin/push.c
msgid ""
#: 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"
#: 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"
#: builtin/rebase.c sequencer.c
#, c-format
msgid "could not read '%s'."
-msgstr "不能读取 '%s'。"
+msgstr "无法读取 '%s'。"
#: builtin/rebase.c
#, c-format
#: 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"
#: builtin/rebase.c
msgid "Cannot read HEAD"
-msgstr "不能读取 HEAD"
+msgstr "无法读取 HEAD"
#: builtin/rebase.c
msgid ""
#: builtin/rebase.c
msgid "Could not create new root commit"
-msgstr "不能创建新的根提交"
+msgstr "无法创建新的根提交"
#: builtin/rebase.c
#, c-format
#: builtin/rebase.c
msgid "Could not resolve HEAD to a commit"
-msgstr "不能解析 HEAD 至一个提交"
+msgstr "无法解析 HEAD 至一个提交"
#: builtin/rebase.c
#, c-format
#: builtin/reflog.c
msgid "git reflog write <ref> <old-oid> <new-oid> <message>"
-msgstr "git reflog write <引用> <旧oid> <新oid> <消息>"
+msgstr "git reflog write <引用> <旧OID> <新OID> <消息>"
#: builtin/reflog.c
msgid ""
#: builtin/reflog.c
#, c-format
msgid "cannot start transaction: %s"
-msgstr "不能启动事务：%s"
+msgstr "无法启动事务：%s"
#: builtin/reflog.c
#, c-format
#: builtin/refs.c
msgid "git refs exists <ref>"
-msgstr "git reflog exists <引用>"
+msgstr "git refs exists <引用>"
#: builtin/refs.c
msgid "git refs optimize "
#: 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"
#: builtin/remote.c
#, c-format
msgid "Could not fetch %s"
-msgstr "不能获取 %s"
+msgstr "无法获取 %s"
#: builtin/remote.c
msgid ""
#: 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
msgstr ""
"配置（%s）remote.pushDefault 位于：\n"
"\t%s:%d\n"
-"现在在为不存在的远程名 '%s' 命名"
+"现在指向不存在的远程名 '%s'"
#: builtin/remote.c
msgid ""
#: 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"
#: builtin/remote.c
#, c-format
msgid "Could not remove config section '%s'"
-msgstr "不能移除配置小节 '%s'"
+msgstr "无法移除配置小节 '%s'"
#: builtin/remote.c
#, c-format
#: 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
#: 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"
#: builtin/remote.c
#, c-format
msgid "Could not set up %s"
-msgstr "不能设置 %s"
+msgstr "无法设置 %s"
#: builtin/remote.c
#, c-format
#: builtin/remote.c
msgid "manipulate push URLs"
-msgstr "操作推送 URLS"
+msgstr "管理推送 URL"
#: builtin/remote.c
msgid "add URL"
#: builtin/remote.c
msgid "delete URLs"
-msgstr "删除 URLS"
+msgstr "删除 URL"
#: builtin/remote.c
msgid "--add --delete doesn't make sense"
#: builtin/remote.c
#, c-format
msgid "Invalid old URL pattern: %s"
-msgstr "无效的旧 URL 匹配模版：%s"
+msgstr "无效的旧 URL 匹配模板：%s"
#: builtin/remote.c
#, c-format
#: 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"
#: builtin/repack.c
msgid "find a geometric progression with factor <N>"
-msgstr "使用因子 <n> 查找几何级数"
+msgstr "使用因子 <N> 查找几何级数"
#: builtin/repack.c
msgid "write a multi-pack index of the resulting packs"
#: 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
"could not convert the following graft(s):\n"
"%s"
msgstr ""
-"不能转换下列移植：\n"
+"无法转换下列嫁接：\n"
"%s"
#: builtin/replace.c
#: builtin/replace.c
msgid "convert existing graft file"
-msgstr "转换现存的移植文件"
+msgstr "转换现存的嫁接文件"
#: builtin/replace.c
msgid "replace the ref if it exists"
msgid ""
"cannot advance target with multiple sources because ordering would be ill-"
"defined"
-msgstr "不能使用多个源推进目标，因为无法明确如何排序"
+msgstr "无法使用多个源推进目标，因为无法明确如何排序"
#: builtin/replay.c
#, c-format
#: builtin/replay.c
msgid "replaying merge commits is not supported yet!"
-msgstr "ç\9b®å\89\8dè¿\98ä¸\8dæ\94¯æ\8c\81é\87\8dæ\94¾å\88°å\90\88并æ\8f\90交ï¼\81"
+msgstr "目前还不支持重放合并提交！"
#: builtin/replay.c
#, c-format
#: builtin/repo.c
msgid "Others"
-msgstr "其它"
+msgstr "其他"
#: builtin/repo.c
msgid "Reachable objects"
#: builtin/reset.c
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
-msgstr "git reset [-q] [<æ \91对象>] [--] <è·¯å¾\84表达å¼\8f>..."
+msgstr "git reset [-q] [<æ \91对象>] [--] <è·¯å¾\84è§\84æ ¼>..."
#: builtin/reset.c
msgid ""
#: builtin/reset.c
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
-msgstr "git reset --patch [<æ \91对象>] [--] [<è·¯å¾\84表达å¼\8f>...]"
+msgstr "git reset --patch [<æ \91对象>] [--] [<è·¯å¾\84è§\84æ ¼>...]"
#: builtin/reset.c
msgid "mixed"
#: 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:"
#: 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
#: 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"
#: builtin/rev-parse.c
msgid "Could not read the index"
-msgstr "不能读取索引"
+msgstr "无法读取索引"
#: builtin/rev-parse.c
#, c-format
#: builtin/revert.c
msgid "end revert or cherry-pick sequence"
-msgstr "ç»\88æ¢å\8f\8d转或拣选操作"
+msgstr "ç»\93æ\9d\9fè¿\98å\8e\9f或拣选操作"
#: 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"
#: builtin/rm.c
msgid "please stage your changes to .gitmodules or stash them to proceed"
-msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
+msgstr "请将您的修改暂存到 .gitmodules 中或储藏后再继续"
#: builtin/rm.c
#, c-format
#: 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 ""
#: 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"
#, 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
#: 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"
#: builtin/show-ref.c
msgid "dereference tags into object IDs"
-msgstr "转换标签到对象 ID"
+msgstr "将标签解引用为对象 ID"
#: builtin/show-ref.c
msgid "only show SHA1 hash using <n> digits"
#: 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"
#: builtin/sparse-checkout.c
msgid "when used with --rules-file interpret patterns as cone mode patterns"
-msgstr "é\80\9aè¿\87 --rules-file é\80\89é¡¹ä¼ é\80\92ç\9a\84模å\9e\8bå°\86被ä½\9c为é\94¥å½¢ï¼\88ç¨\80ç\96\8fæ£\80å\87ºæ¨¡å\9e\8b）进行解析"
+msgstr "é\80\9aè¿\87 --rules-file é\80\89é¡¹ä¼ é\80\92ç\9a\84模å¼\8få°\86被ä½\9c为é\94¥å½¢æ¨¡å¼\8fï¼\88ç¨\80ç\96\8fæ£\80å\87º）进行解析"
#: builtin/sparse-checkout.c
msgid "use patterns in <file> instead of the current ones."
-msgstr "ä»\8e <æ\96\87件> å\8f\82æ\95°ä¸è¯»å\8f\96模å¼\8fï¼\8cè\80\8cä¸\8dæ\98¯ä»\8eæ \87å\87\86è¾\93å\85¥"
+msgstr "使ç\94¨ <æ\96\87件> ä¸ç\9a\84模å¼\8fæ\9b¿ä»£å½\93å\89\8d模å¼\8fã\80\82"
#: builtin/stash.c
msgid "git stash list [<log-options>]"
"options>] [<stash>]"
msgstr ""
"git stash show [-u | --include-untracked | --only-untracked] [<差异选项>] [<"
-"贮存>]"
+"储藏>]"
#: builtin/stash.c
msgid "git stash drop [-q | --quiet] [<stash>]"
-msgstr "git stash drop [-q | --quiet] [<贮存>]"
+msgstr "git stash drop [-q | --quiet] [<储藏>]"
#: builtin/stash.c
msgid "git stash pop [--index] [-q | --quiet] [<stash>]"
-msgstr "git stash pop [--index] [-q | --quiet] [<贮存>]"
+msgstr "git stash pop [--index] [-q | --quiet] [<储藏>]"
#: builtin/stash.c
msgid "git stash apply [--index] [-q | --quiet] [<stash>]"
-msgstr "git stash apply [--index] [-q | --quiet] [<贮存>]"
+msgstr "git stash apply [--index] [-q | --quiet] [<储藏>]"
#: builtin/stash.c
msgid "git stash branch <branchname> [<stash>]"
-msgstr "git stash branch <分支名> [<stash>]"
+msgstr "git stash branch <分支名> [<储藏>]"
#: builtin/stash.c
msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>"
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"
" [--] [<路径规格>...]]"
#: builtin/stash.c
msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"
-msgstr "git stash export (--print | --to-ref <引用>) [<贮藏>...]"
+msgstr "git stash export (--print | --to-ref <引用>) [<储藏>...]"
#: builtin/stash.c
msgid "git stash import <commit>"
#: 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
#: builtin/stash.c
msgid "cannot apply a stash in the middle of a merge"
-msgstr "无法在合并过程中应用贮藏"
+msgstr "无法在合并过程中应用储藏"
#: builtin/stash.c
#, c-format
#: builtin/stash.c
msgid "could not save index tree"
-msgstr "不能保存索引树"
+msgstr "无法保存索引树"
#: builtin/stash.c
#, c-format
#: 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"
#: 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"
#: 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
#: builtin/stash.c
msgid "stash message"
-msgstr "贮藏说明"
+msgstr "储藏说明"
#: builtin/stash.c
msgid "\"git stash store\" requires one <commit> argument"
#: 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"
#: builtin/stash.c
msgid "Cannot initialize stash"
-msgstr "无法初始化贮藏"
+msgstr "无法初始化储藏"
#: builtin/stash.c
msgid "Cannot save the current status"
#: 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"
#: builtin/stash.c
msgid "include untracked files in stash"
-msgstr "贮藏中包含未跟踪文件"
+msgstr "储藏中包含未跟踪文件"
#: builtin/stash.c
msgid "include ignore files"
#: builtin/stash.c
#, c-format
msgid "cannot parse commit %s"
-msgstr "不能解析提交 %s"
+msgstr "无法解析提交 %s"
#: builtin/stash.c
#, c-format
#: builtin/stash.c
#, c-format
msgid "%s is not a valid exported stash commit"
-msgstr "%s 不是一个有效的且已导出的贮藏提交"
+msgstr "%s 不是一个有效的且已导出的储藏提交"
#: builtin/stash.c
#, c-format
#: builtin/stash.c
#, c-format
msgid "found stash commit %s without expected prefix"
-msgstr "发现贮藏提交 %s 缺少预期前缀"
+msgstr "发现储藏提交 %s 缺少预期前缀"
#: builtin/stash.c
#, c-format
#: builtin/stash.c
#, c-format
msgid "%s does not look like a stash commit"
-msgstr "%s 看起来不像是一个贮藏提交"
+msgstr "%s 看起来不像是一个储藏提交"
#: builtin/stash.c
#, c-format
#: 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"
#: 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"
#: builtin/submodule--helper.c
#, c-format
msgid "couldn't hash object from '%s'"
-msgstr "不能从 '%s' 创建哈希对象"
+msgstr "无法从 '%s' 创建哈希对象"
#: builtin/submodule--helper.c
#, c-format
#: builtin/submodule--helper.c
msgid "could not fetch a revision for HEAD"
-msgstr "不能为 HEAD 获取一个版本"
+msgstr "无法为 HEAD 获取一个版本"
#: builtin/submodule--helper.c
#, c-format
#: builtin/submodule--helper.c
#, c-format
msgid "could not create empty submodule directory %s"
-msgstr "不能创建空的子模组目录 %s"
+msgstr "无法创建空的子模组目录 %s"
#: builtin/submodule--helper.c
#, c-format
#: 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
#: builtin/tag.c
msgid "bad object type."
-msgstr "坏的对象类型。"
+msgstr "错误的对象类型。"
#: builtin/tag.c
msgid "no tag message?"
#: builtin/update-index.c
msgid "Untracked cache disabled"
-msgstr "缓存未跟踪文件被禁用"
+msgstr "未跟踪文件缓存已禁用"
#: builtin/update-index.c
msgid ""
#: 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"
#: builtin/worktree.c
#, c-format
msgid "could not create directory of '%s'"
-msgstr "不能创建目录 '%s'"
+msgstr "无法创建目录 '%s'"
#: builtin/worktree.c
msgid "initializing"
"HEAD path: '%s'\n"
"HEAD contents: '%s'"
msgstr ""
-"HEAD 指向了一个无用的（或孤立的）引用。\n"
+"HEAD 指向了一个无效的（或孤立的）引用。\n"
"HEAD 路径： '%s'\n"
"HEAD 内容： '%s'"
#: builtin/worktree.c
msgid "checkout <branch> even if already checked out in other worktree"
-msgstr "检出 <分支>，即使已经被检出到其它工作区"
+msgstr "检出 <分支>，即使已经被检出到其他工作区"
#: builtin/worktree.c
msgid "create a new branch"
#: builtin/worktree.c
msgid "add 'prunable' annotation to worktrees older than <time>"
-msgstr "向早于 <时间> 的工作区添添加“可修剪”注释"
+msgstr "向早于 <时间> 的工作区添加“可修剪”注释"
#: builtin/worktree.c
msgid "terminate records with a NUL character"
#: builtin/worktree.c
msgid "working trees containing submodules cannot be moved or removed"
-msgstr "不能移动或删除包含子模组的工作区"
+msgstr "无法移动或删除包含子模组的工作区"
#: builtin/worktree.c
msgid "force move even if worktree is dirty or locked"
#: bundle-uri.c
#, c-format
msgid "could not parse bundle list key %s with value '%s'"
-msgstr "不能解析归档包列表键 %s 的值 '%s'"
+msgstr "无法解析捆绑包列表键 %s 的值 '%s'"
#: bundle-uri.c
#, c-format
msgid "bundle list at '%s' has no mode"
-msgstr "在 '%s' 的归档包列表没有模式"
+msgstr "在 '%s' 的捆绑包列表没有模式"
#: bundle-uri.c
#, c-format
msgid "bundle list at '%s': bundle '%s' has no uri"
-msgstr "在 '%s' 的归档包列表中，归档包 '%s' 没有 URI"
+msgstr "在 '%s' 的捆绑包列表中，捆绑包 '%s' 没有 URI"
#: bundle-uri.c
msgid "failed to create temporary file"
#: bundle-uri.c
msgid "insufficient capabilities"
-msgstr "缺乏能力"
+msgstr "能力不足"
#: bundle-uri.c
#, c-format
msgid "file downloaded from '%s' is not a bundle"
-msgstr "下载自 '%s' 的文件不是归档包"
+msgstr "下载自 '%s' 的文件不是捆绑包"
#: bundle-uri.c
msgid "failed to store maximum creation token"
#: bundle-uri.c
#, c-format
msgid "unrecognized bundle mode from URI '%s'"
-msgstr "不可辨认的归档包模式来自 URI '%s'"
+msgstr "不可辨认的捆绑包模式来自 URI '%s'"
#: bundle-uri.c
#, c-format
#: bundle-uri.c
#, c-format
msgid "bundle '%s' has no uri"
-msgstr "归档包 '%s' 没有 URI"
+msgstr "捆绑包 '%s' 没有 URI"
#: bundle-uri.c
#, c-format
msgid "failed to download bundle from URI '%s'"
-msgstr "无法从 URI '%s' 下载归档包"
+msgstr "无法从 URI '%s' 下载捆绑包"
#: bundle-uri.c
#, c-format
msgid "file at URI '%s' is not a bundle or bundle list"
-msgstr "位于 URI '%s' 的文件不是归档包或归档包列表"
+msgstr "位于 URI '%s' 的文件不是捆绑包或捆绑包列表"
#: bundle-uri.c
#, c-format
#: bundle-uri.c
msgid "bundle-uri: line is not of the form 'key=value'"
-msgstr "bundle-uri：行不是以 'key=value' 格式"
+msgstr "bundle-uri：行不是 'key=value' 格式"
#: bundle-uri.c
msgid "bundle-uri: line has empty key or value"
#: bundle.c
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
-msgstr "未能识别的归档包哈希算法：%s"
+msgstr "未能识别的捆绑包哈希算法：%s"
#: bundle.c
#, c-format
#: bundle.c
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"
+msgstr "'%s' 不像是一个 v2 或 v3 版本的捆绑包文件"
#: bundle.c
#, c-format
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %<PRIuMAX> refs:"
-msgstr[0] "这个归档包中含有这个引用："
-msgstr[1] "这个
归档包中含有 %<PRIuMAX> 个引用："
+msgstr[0] "这个捆绑包中含有这个引用："
+msgstr[1] "这个
捆绑包中含有 %<PRIuMAX> 个引用："
#: bundle.c
msgid "The bundle records a complete history."
-msgstr "这个归档包记录一个完整历史。"
+msgstr "这个捆绑包记录一个完整历史。"
#: bundle.c
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %<PRIuMAX> refs:"
-msgstr[0] "这个归档包需要这个引用："
-msgstr[1] "这个
归档包需要 %<PRIuMAX> 个引用："
+msgstr[0] "这个捆绑包需要这个引用："
+msgstr[1] "这个
捆绑包需要 %<PRIuMAX> 个引用："
#: bundle.c
#, c-format
msgid "The bundle uses this hash algorithm: %s"
-msgstr "该归档包使用的哈希算法：%s"
+msgstr "该捆绑包使用的哈希算法：%s"
#: bundle.c
#, c-format
msgid "The bundle uses this filter: %s"
-msgstr "归档包使用了过滤器：%s"
+msgstr "捆绑包使用了过滤器：%s"
#: bundle.c
msgid "unable to dup bundle descriptor"
-msgstr "无法复制归档包描述符"
+msgstr "无法复制捆绑包描述符"
#: bundle.c
msgid "Could not spawn pack-objects"
-msgstr "不能生成 pack-objects 进程"
+msgstr "无法生成 pack-objects 进程"
#: bundle.c
msgid "pack-objects died"
#: bundle.c
#, c-format
msgid "unsupported bundle version %d"
-msgstr "不支持的归档包版本 %d"
+msgstr "不支持的捆绑包版本 %d"
#: bundle.c
#, c-format
msgid "cannot write bundle version %d with algorithm %s"
-msgstr "不能写入，归档包版本 %d 不支持算法 %s"
+msgstr "无法写入，捆绑包版本 %d 不支持算法 %s"
#: bundle.c
msgid "Refusing to create empty bundle."
-msgstr "不能创建空的归档包。"
+msgstr "无法创建空的捆绑包。"
#: bundle.c
#, c-format
msgid "cannot create '%s'"
-msgstr "不能创建 '%s'"
+msgstr "无法创建 '%s'"
#: bundle.c
msgid "index-pack died"
#: command-list.h
msgid "Copy files from the index to the working tree"
-msgstr "从索引拷贝文件到工作区"
+msgstr "从索引复制文件到工作区"
#: command-list.h
msgid "Find commits yet to be applied to upstream"
#: command-list.h
msgid "Output information on each ref"
-msgstr "对每一个引用输出信息 "
+msgstr "对每一个引用输出信息"
#: command-list.h
msgid "Run a Git command on a list of repositories"
#: command-list.h
msgid "Push objects over HTTP/DAV to another repository"
-msgstr "通过 HTTP/DAV 推送对象另一个仓库"
+msgstr "é\80\9aè¿\87 HTTP/DAV æ\8e¨é\80\81对象å\88°å\8f¦ä¸\80个ä»\93åº\93"
#: command-list.h
msgid "Send a collection of patches from stdin to an IMAP folder"
-msgstr "从标准输入将一组补丁发送到IMAP文件夹"
+msgstr "从标准输入将一组补丁发送到 IMAP 文件夹"
#: command-list.h
msgid "Build pack index file for an existing packed archive"
#: command-list.h
msgid "The standard helper program to use with git-merge-index"
-msgstr "与 git-merge-index 一起使用的标准向导程序"
+msgstr "与 git-merge-index 一起使用的标准辅助程序"
#: command-list.h
msgid "Perform merge without touching index or working tree"
#: command-list.h
msgid "Add or inspect object notes"
-msgstr "添加或检查对象注释"
+msgstr "添加或检查对象注解"
#: command-list.h
msgid "Import from and submit to Perforce repositories"
#: command-list.h
msgid "Pack heads and tags for efficient repository access"
-msgstr "æ\89\93å\8c\85头和标签以实现高效的仓库访问"
+msgstr "æ\89\93å\8c\85å\88\86æ\94¯和标签以实现高效的仓库访问"
#: command-list.h
msgid "Compute unique ID for a patch"
#: command-list.h
msgid "Applies a quilt patchset onto the current branch"
-msgstr "将一个 quilt 补丁集应用到当前分支。"
+msgstr "将一个 quilt 补丁集应用到当前分支"
#: command-list.h
msgid "Compare two commit ranges (e.g. two versions of a branch)"
#: command-list.h
msgid "Manage set of tracked repositories"
-msgstr "管理已跟踪仓库"
+msgstr "管理已跟踪的仓库集合"
#: command-list.h
msgid "Pack unpacked objects in a repository"
#: command-list.h
msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too"
-msgstr "è¯\95éª\8cä¸ï¼\9aå\9fºäº\8eä¸\80个æ\96°å\9fºçº¿é\87\8dæ\94¾æ\8f\90交ï¼\8cå\90\8cæ ·适用于纯仓库"
+msgstr "è¯\95éª\8cä¸ï¼\9aå\9c¨æ\96°å\9fºçº¿ä¸\8aé\87\8dæ\94¾æ\8f\90交ï¼\8cä¹\9f适用于纯仓库"
#: command-list.h
msgid "Retrieve information about the repository"
#: command-list.h
msgid "Generates a summary of pending changes"
-msgstr "ç\94\9fæ\88\90å¾\85å®\9aæ\9b´æ\94¹的摘要"
+msgstr "ç\94\9fæ\88\90å¾\85å¤\84ç\90\86å\8f\98æ\9b´的摘要"
#: command-list.h
msgid "Reuse recorded resolution of conflicted merges"
-msgstr "é\87\8dç\94¨å\86²çª\81å\90\88并ç\9a\84解å\86³æ\96¹æ¡\88è®°å½\95"
+msgstr "é\87\8dç\94¨å·²è®°å½\95ç\9a\84å\86²çª\81å\90\88并解å\86³æ\96¹æ¡\88"
#: command-list.h
msgid "Set `HEAD` or the index to a known state"
#: command-list.h
msgid "Lists commit objects in reverse chronological order"
-msgstr "æ\8c\89æ\97¶é\97´é¡º序列出提交对象"
+msgstr "æ\8c\89æ\97¶é\97´é\80\86序列出提交对象"
#: command-list.h
msgid "Pick out and massage parameters"
#: command-list.h
msgid "Revert some existing commits"
-msgstr "回退一些现存提交"
+msgstr "还原一些现有提交"
#: command-list.h
msgid "Remove files from the working tree and from the index"
#: command-list.h
msgid "Restricted login shell for Git-only SSH access"
-msgstr "只允许 Git SSH 访问的受限登录shell"
+msgstr "只允许 Git SSH 访问的受限登录 shell"
#: command-list.h
msgid "Summarize 'git log' output"
-msgstr "'git log' 输出摘要"
+msgstr "汇总 'git log' 输出"
#: command-list.h
msgid "Show various types of objects"
#: command-list.h
msgid "Stash the changes in a dirty working directory away"
-msgstr "贮藏脏工作区中的修改"
+msgstr "储藏脏工作区中的修改"
#: command-list.h
msgid "Show the working tree status"
#: command-list.h
msgid "Bidirectional operation between a Subversion repository and Git"
-msgstr "Subersion 仓库和 Git 之间的双向操作"
+msgstr "Subversion 仓库和 Git 之间的双向操作"
#: command-list.h
msgid "Switch branches"
#: command-list.h
msgid "Update auxiliary info file to help dumb servers"
-msgstr "更新辅助信息文件以帮助哑协议服务"
+msgstr "更新辅助信息文件以帮助哑协议服务器"
#: command-list.h
msgid "Send archive back to git-archive"
#: command-list.h
msgid "Show a Git logical variable"
-msgstr "显示一个Git逻辑变量"
+msgstr "显示一个 Git 逻辑变量"
#: command-list.h
msgid "Check the GPG signature of commits"
-msgstr "检查 GPG 提交签名"
+msgstr "检查提交的 GPG 签名"
#: command-list.h
msgid "Validate packed Git archive files"
-msgstr "校验打包的Git存仓文件"
+msgstr "校验打包的 Git 归档文件"
#: command-list.h
msgid "Check the GPG signature of tags"
#: command-list.h
msgid "Providing usernames and passwords to Git"
-msgstr "为 Git æ\8f\90ä¾\9bç\94¨æ\88·å\90\8då\92\8cå\8f£ä»¤"
+msgstr "为 Git æ\8f\90ä¾\9bç\94¨æ\88·å\90\8då\92\8cå¯\86ç \81"
#: command-list.h
msgid "Git for CVS users"
#: command-list.h
msgid "A useful minimum set of commands for Everyday Git"
-msgstr "æ¯\8fä¸\80天 Git 的一组有用的最小命令集合"
+msgstr "æ\97¥å¸¸ Git 的一组有用的最小命令集合"
#: command-list.h
msgid "Frequently asked questions about using Git"
#: command-list.h
msgid "The bundle file format"
-msgstr "归档包文件格式"
+msgstr "捆绑包文件格式"
#: command-list.h
msgid "Chunk-based file formats"
#: command-list.h
msgid "Git namespaces"
-msgstr "Git å\90\8då\97空间"
+msgstr "Git å\91½å\90\8d空间"
#: command-list.h
msgid "Protocol v0 and v1 capabilities"
-msgstr "协议 v0 和 v1 能力"
+msgstr "协议 v0 和 v1 功能"
#: command-list.h
msgid "Things common to various protocols"
#: command-list.h
msgid "How packs are transferred over-the-wire"
-msgstr "å\8c\85å\9c¨çº¿è·¯ä¸传输的方式"
+msgstr "å\8c\85å\9c¨ç½\91ç»\9cä¸\8a传输的方式"
#: command-list.h
msgid "Git Wire Protocol, Version 2"
-msgstr "Git 传输协议，第二版"
+msgstr "Git 传输协议，第 2 版"
#: command-list.h
msgid "Helper programs to interact with remote repositories"
-msgstr "与远程仓库交互的助手程序"
+msgstr "与远程仓库交互的辅助程序"
#: command-list.h
msgid "Git Repository Layout"
#: command-list.h
msgid "Specifying revisions and ranges for Git"
-msgstr "指定 Git 的版本和版本范围"
+msgstr "指定 Git 的版本和范围"
#: command-list.h
msgid "Mounting one repository inside another"
-msgstr "将一个仓库安装到另外一个仓库中"
+msgstr "将一个仓库挂载到另一个仓库中"
#: command-list.h
msgid "A tutorial introduction to Git"
#: command-list.h
msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Git web 界面（Git 仓库的 web 前端）"
+msgstr "Git Web 界面（Git 仓库的 Web 前端）"
#: command-list.h
msgid "An overview of recommended workflows with Git"
msgid ""
"ignoring too-small changed-path chunk (%<PRIuMAX> < %<PRIuMAX>) in commit-"
"graph file"
-msgstr "忽略提交图文件中过小的
更改路径块（%<PRIuMAX> < %<PRIuMAX>）"
+msgstr "忽略提交图文件中过小的
变更路径块（%<PRIuMAX> < %<PRIuMAX>）"
#: commit-graph.c
#, c-format
#: commit-graph.c
msgid "Computing commit changed paths Bloom filters"
-msgstr "计算提交变更路径的布隆过滤器"
+msgstr "正在计算提交变更路径的布隆过滤器"
#: commit-graph.c
msgid "Collecting referenced commits"
#: commit-graph.c
msgid "Finding commits for commit graph among packed objects"
-msgstr "正在打包对象中查找提交图的提交"
+msgstr "正在已打包对象中查找提交图的提交"
#: commit-graph.c
msgid "Finding extra edges in commit graph"
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
-msgstr[0] "æ£å\9c¨ç\94¨ %d æ¥写出提交图"
-msgstr[1] "æ£å\9c¨ç\94¨ %d æ¥写出提交图"
+msgstr[0] "æ£å\9c¨ç\94¨ %d 次写出提交图"
+msgstr[1] "æ£å\9c¨ç\94¨ %d 次写出提交图"
#: commit-graph.c
msgid "unable to open commit-graph chain file"
#: commit-graph.c
#, c-format
msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"
-msgstr "无法合并提交图 %s
, 提交过多：%<PRIuMAX>"
+msgstr "无法合并提交图 %s
，提交过多：%<PRIuMAX>"
#: commit-graph.c
msgid "Scanning merged commits"
#: commit-graph.c
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
-msgstr "æ£å°\9dè¯\95å\86\99æ\8f\90交å\9b¾ï¼\8cä½\86æ\98¯ 'core.commitGraph' 被禁用"
+msgstr "æ£å\9c¨å°\9dè¯\95å\86\99å\85¥æ\8f\90交å\9b¾ï¼\8cä½\86 'core.commitGraph' 被禁用"
#: commit-graph.c
#, c-format
#: commit-graph.c
msgid "too many commits to write graph"
-msgstr "提交太多不能画图"
+msgstr "提交太多，无法写入提交图"
#: commit-graph.c
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
#: commit-reach.c sequencer.c
#, c-format
msgid "could not parse commit %s"
-msgstr "不能解析提交 %s"
+msgstr "无法解析提交 %s"
#: commit.c
#, c-format
"\"git config set advice.graftFileDeprecated false\""
msgstr ""
"对 <GIT_DIR>/info/grafts 的支持已过时，并将在\n"
-"未来的Git版本中被移除。\n"
+"未来的 Git 版本中被移除。\n"
"\n"
"请使用 \"git replace --convert-graft-file\" 将\n"
-"（提交）移植转换为替换引用。\n"
+"嫁接转换为替换引用。\n"
"\n"
"运行 \"git config set advice.graftFileDeprecated false\"\n"
"可关闭本消息"
#: commit.c
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
+msgstr "提交 %s 有一个来自 %s 的有效 GPG 签名。\n"
#: commit.c
msgid ""
"variable i18n.commitEncoding to the encoding your project uses.\n"
msgstr ""
"警告：提交说明不符合 UTF-8 字符编码。\n"
-"æ\82¨å\8f¯ä»¥é\80\9aè¿\87修补提交来改正提交说明，或者将配置变量 i18n.commitEncoding\n"
+"æ\82¨å\8f¯ä»¥é\80\9aè¿\87修订提交来改正提交说明，或者将配置变量 i18n.commitEncoding\n"
"设置为您项目所用的字符编码。\n"
#: compat/compiler.h
#: compat/disk.h
#, c-format
msgid "could not determine free disk size for '%s'"
-msgstr "不能确定 '%s' 的空余磁盘空间"
+msgstr "无法确定 '%s' 的空余磁盘空间"
#: compat/disk.h
#, c-format
#: compat/fsmonitor/fsm-health-win32.c
#, c-format
msgid "[GLE %ld] health thread could not open '%ls'"
-msgstr "[GLE %ld] 健康监测线程不能打开 '%ls'"
+msgstr "[GLE %ld] 健康监测线程无法打开 '%ls'"
#: compat/fsmonitor/fsm-health-win32.c
#, c-format
#: compat/fsmonitor/fsm-health-win32.c compat/fsmonitor/fsm-listen-win32.c
#, c-format
msgid "could not convert to wide characters: '%s'"
-msgstr "不能转换至宽字符：'%s'"
+msgstr "无法转换至宽字符：'%s'"
#: compat/fsmonitor/fsm-health-win32.c
#, c-format
#: compat/fsmonitor/fsm-ipc-darwin.c
#, c-format
msgid "Invalid path: %s"
-msgstr "无效路径： %s"
+msgstr "无效路径：%s"
#: compat/fsmonitor/fsm-listen-darwin.c
msgid "Unable to create FSEventStream."
#: compat/fsmonitor/fsm-listen-win32.c
#, c-format
msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
-msgstr "GetOverlappedResult 失败äº\8e '%s' [GLE %ld]"
+msgstr "GetOverlappedResult å\9c¨ '%s' ä¸\8a失败 [GLE %ld]"
#: compat/fsmonitor/fsm-listen-win32.c
#, c-format
#: compat/fsmonitor/fsm-path-utils-win32.c
#, c-format
msgid "[GLE %ld] unable to get protocol information for '%ls'"
-msgstr "[GLE %ld] 无法获取 '%ls' 的协议信息 "
+msgstr "[GLE %ld] 无法获取 '%ls' 的协议信息"
#: compat/mingw.c
#, c-format
msgid "failed to copy SID (%ld)"
-msgstr "无法拷贝 SID (%ld)"
+msgstr "无法复制 SID (%ld)"
#: compat/mingw.c
#, c-format
#: compat/regex/regcomp.c
msgid "Invalid back reference"
-msgstr "无效的反向索引"
+msgstr "无效的反向引用"
#: compat/regex/regcomp.c
msgid "Unmatched [ or [^"
"remote URLs cannot be configured in file directly or indirectly included by "
"includeIf.hasconfig:remote.*.url"
msgstr ""
-"远程 URL 不能在文件中配置，不管直接地还是通过 "
+"远程 URL 无法在文件中配置，不管直接地还是通过 "
"includeIf.hasconfig:remote.*.url 间接地包含"
#: config.c
#: config.c
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr "缺少环境变量 '%s' 于配置 '%.*s' "
+msgstr "配置 '%3$.*2$s' 缺少环境变量 '%1$s'"
#: config.c
#, c-format
#: config.c
#, c-format
msgid "bogus config parameter: %s"
-msgstr "伪配置参数：%s"
+msgstr "无效的配置参数：%s"
#: config.c
#, c-format
#: config.c
#, c-format
msgid "bogus count in %s"
-msgstr "%s 中错误计数"
+msgstr "%s 中计数错误"
#: config.c
#, c-format
#: config.c
#, c-format
msgid "bad boolean config value '%s' for '%s'"
-msgstr "'%2$s' 的错误的布尔取值 '%1$s'"
+msgstr "配置变量 '%2$s' 的布尔值 '%1$s' 无效"
#: config.c
#, c-format
#: config.c
#, c-format
msgid "unable to resolve config blob '%s'"
-msgstr "不能解析配置对象 '%s'"
+msgstr "无法解析配置对象 '%s'"
#: config.c
msgid "unable to parse command-line config"
#: config.c
#, c-format
msgid "could not lock config file %s"
-msgstr "不能锁定配置文件 %s"
+msgstr "无法锁定配置文件 %s"
#: config.c
#, c-format
#: config.c
#, c-format
msgid "unable to mmap '%s'%s"
-msgstr "不能 mmap '%s'%s"
+msgstr "无法 mmap '%s'%s"
#: config.c
#, c-format
#: config.c
#, c-format
msgid "could not write config file %s"
-msgstr "不能写入配置文件 %s"
+msgstr "无法写入配置文件 %s"
#: config.c
#, c-format
msgid "could not set '%s' to '%s'"
-msgstr "不能设置 '%s' 为 '%s'"
+msgstr "无法设置 '%s' 为 '%s'"
#: config.c
#, c-format
#: config.c
#, c-format
msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>"
-msgstr "拒绝
支持内容过长的行，位于文件 '%s' 中的第 %<PRIuMAX> 行"
+msgstr "拒绝
处理内容过长的行，位于文件 '%s' 中的第 %<PRIuMAX> 行"
#: config.c
#, c-format
#: connect.c
#, c-format
msgid "error on bundle-uri response line %d: %s"
-msgstr "于 bundle-uri 响应行 %d 发生错误：%s"
+msgstr "在 bundle-uri 响应行 %d 发生错误：%s"
#: connect.c
msgid "expected flush after bundle-uri listing"
#: connect.c
#, c-format
msgid "cannot start proxy %s"
-msgstr "不能启动代理 %s"
+msgstr "无法启动代理 %s"
#: connect.c
msgid "no path specified; see 'git help pull' for valid url syntax"
-msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"
+msgstr "未指定路径，执行 'git help pull' 查看有效的 URL 语法"
#: connect.c
msgid "newline is forbidden in git:// hosts and repo paths"
#: connected.c
msgid "Could not run 'git rev-list'"
-msgstr "不能执行 'git rev-list'"
+msgstr "无法执行 'git rev-list'"
#: connected.c
msgid "failed write to rev-list"
msgid ""
"in the working copy of '%s', CRLF will be replaced by LF the next time Git "
"touches it"
-msgstr "在 '%s' 的工作拷贝中，下次 Git 接触时 CRLF 将被 LF 替换"
+msgstr "在 '%s' 的工作拷贝中，下次 Git 处理时 CRLF 将被 LF 替换"
#: convert.c
#, c-format
msgid ""
"in the working copy of '%s', LF will be replaced by CRLF the next time Git "
"touches it"
-msgstr "在 '%s' 的工作拷贝中，下次 Git 接触时 LF 将被 CRLF 替换"
+msgstr "在 '%s' 的工作拷贝中，下次 Git 处理时 LF 将被 CRLF 替换"
#: convert.c
#, c-format
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
"%sLE (depending on the byte order) as working-tree-encoding."
msgstr ""
-"文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字"
+"文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE 或 UTF-%sLE（取决于字"
"节序）作为工作区编码。"
#: convert.c
#: convert.c
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
+msgstr "将 '%s' 的编码从 %s 到 %s 来回转换不一致"
#: convert.c
#, c-format
msgid "cannot fork to run external filter '%s'"
-msgstr "不能 fork 以执行外部过滤器 '%s'"
+msgstr "无法 fork 以执行外部过滤器 '%s'"
#: convert.c
#, c-format
msgid "cannot feed the input to external filter '%s'"
-msgstr "不能将输入传递给外部过滤器 '%s'"
+msgstr "无法将输入传递给外部过滤器 '%s'"
#: convert.c
#, c-format
msgid "external filter '%s' failed %d"
-msgstr "外部过滤器 '%s' 失败码 %d"
+msgstr "外部过滤器 '%s' 失败，退出码 %d"
#: convert.c
#, c-format
#: credential.c
#, c-format
msgid "url has no scheme: %s"
-msgstr "URL 没有 scheme：%s"
+msgstr "URL 缺少协议：%s"
#: credential.c
#, c-format
msgid "credential url cannot be parsed: %s"
-msgstr "不能解析凭据 URL：%s"
+msgstr "无法解析凭据 URL：%s"
#: daemon.c
#, c-format
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "%s
%<PRIuMAX> 个月前"
-msgstr[1] "%s
%<PRIuMAX> 个月前"
+msgstr[0] "%s
，%<PRIuMAX> 个月前"
+msgstr[1] "%s
，%<PRIuMAX> 个月前"
#: date.c
#, c-format
#: delta-islands.c
#, c-format
msgid "bad tree object %s"
-msgstr "坏的树对象 %s"
+msgstr "无效的树对象 %s"
#: delta-islands.c
#, c-format
#: delta-islands.c
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
-msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 %d 个）"
+msgstr "来自配置的数据岛正则表达式有太多的捕获组（最多 %d 个）"
#: delta-islands.c
#, c-format
msgid "Marked %d islands, done.\n"
-msgstr "已标记 %d 个数据岛，结束。\n"
+msgstr "已标记 %d 个数据岛，完成。\n"
#: diagnose.c
#, c-format
#: diagnose.c
#, c-format
msgid "could not add directory '%s' to archiver"
-msgstr "无法添加目录 '%s' 至归档器"
+msgstr "无法添加目录 '%s' 到归档器"
#: diagnose.c
msgid "failed to write archive"
#: diff-lib.c
msgid "unable to get HEAD"
-msgstr "不能解析 HEAD"
+msgstr "无法解析 HEAD"
#: diff-lib.c
msgid "no merge base found"
msgid ""
"Limiting comparison with pathspecs is only supported if both paths are "
"directories."
-msgstr "ä»\85å½\93两个路å¾\84å\9d\87为ç\9b®å½\95æ\97¶ï¼\8cæ\89\8dæ\94¯æ\8c\81使ç\94¨è·¯å¾\84表达å¼\8f限制比较范围。"
+msgstr "ä»\85å½\93两个路å¾\84å\9d\87为ç\9b®å½\95æ\97¶ï¼\8cæ\89\8dæ\94¯æ\8c\81使ç\94¨è·¯å¾\84è§\84æ ¼限制比较范围。"
# 译者：注意保持前导空格
#: diff.c
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
-msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"
+msgstr "color-moved-ws：allow-indentation-change 不能与其他空白字符模式共用"
#: diff.c
#, c-format
#: diff.c
msgid "--follow requires exactly one pathspec"
-msgstr "--follow 明确要求只跟一个路径规格"
+msgstr "--follow 要求恰好一个路径规格"
#: diff.c
#, c-format
msgid "pathspec magic not supported by --follow: %s"
-msgstr "--follow 不支持在路径规格中使用神奇前缀：%s"
+msgstr "--follow 不支持在路径规格中使用魔法前缀：%s"
#: diff.c parse-options.c
#, c-format
#: diff.c
#, c-format
msgid "unable to resolve '%s'"
-msgstr "不能解析 '%s'"
+msgstr "无法解析 '%s'"
#: diff.c
#, c-format
#: diff.c
#, c-format
msgid "bad --color-moved argument: %s"
-msgstr "坏的 --color-moved 参数：%s"
+msgstr "无效的 --color-moved 参数：%s"
#: diff.c
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "--color-moved-ws 中的无效模式 '%s' "
+msgstr "--color-moved-ws 中的无效模式 '%s'"
#: diff.c
#, c-format
#: diff.c
#, c-format
msgid "bad --word-diff argument: %s"
-msgstr "坏的 --word-diff 参数：%s"
+msgstr "无效的 --word-diff 参数：%s"
#: diff.c
msgid "Diff output format options"
-msgstr "差异输出格式化选项"
+msgstr "差异输出格式选项"
#: diff.c
msgid "generate patch"
#: diff.c
msgid "generate diffstat with a given width"
-msgstr "使用给定的长度生成差异统计"
+msgstr "使用给定的宽度生成差异统计"
#: diff.c
msgid "generate diffstat with a given name width"
-msgstr "使用给定的文件名长度生成差异统计"
+msgstr "使用给定的文件名宽度生成差异统计"
#: diff.c
msgid "generate diffstat with a given graph width"
-msgstr "使用给定的图形长度生成差异统计"
+msgstr "使用给定的图形宽度生成差异统计"
#: diff.c
msgid "<count>"
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
-"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
-"符"
+"在 --raw 或者 --numstat 中，不对路径名转码并使用 NUL 字符作为输出字段的分隔符"
#: diff.c
msgid "<prefix>"
#: diff.c
msgid "show the given source prefix instead of \"a/\""
-msgstr "显示给定的源前缀取代 \"a/\""
+msgstr "显示给定的源前缀替代 \"a/\""
#: diff.c
msgid "show the given destination prefix instead of \"b/\""
-msgstr "显示给定的目标前缀取代 \"b/\""
+msgstr "显示给定的目标前缀替代 \"b/\""
#: diff.c
msgid "prepend an additional prefix to every line of output"
#: diff.c
msgid "break complete rewrite changes into pairs of delete and create"
-msgstr "å°\86å®\8cå\85¨é\87\8då\86\99ç\9a\84å\8f\98æ\9b´æ\89\93ç ´为成对的删除和创建"
+msgstr "å°\86å®\8cå\85¨é\87\8då\86\99ç\9a\84å\8f\98æ\9b´æ\8b\86å\88\86为成对的删除和创建"
#: diff.c
msgid "detect renames"
#: diff.c
msgid "use unmodified files as source to find copies"
-msgstr "使用未修改的文件做为发现拷贝的源"
+msgstr "使用未修改的文件作为发现拷贝的源"
#: diff.c
msgid "disable rename detection"
#: diff.c
msgid "use empty blobs as rename source"
-msgstr "使用空的数据对象做为重命名的源"
+msgstr "使用空的数据对象作为重命名的源"
#: diff.c
msgid "continue listing the history of a file beyond renames"
#: diff.c
msgid "ignore changes whose all lines match <regex>"
-msgstr "忽ç\95¥æ\89\80æ\9c\89è¡\8cé\83½å\92\8cæ£å\88\99表达å¼\8få\8c¹é\85\8d的变更"
+msgstr "忽ç\95¥æ\89\80æ\9c\89è¡\8cé\83½å\8c¹é\85\8d <æ£å\88\99> 的变更"
#: diff.c
msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr "å\90¯å\8f\91å¼\8f转æ\8d¢å·®å¼\82边界以便阅读"
+msgstr "å\90¯å\8f\91å¼\8fè°\83æ\95´å·®å¼\82å\9d\97边界以便阅读"
#: diff.c
msgid "generate diff using the \"patience diff\" algorithm"
#: diff.c
msgid "Other diff options"
-msgstr "其它差异选项"
+msgstr "其他差异选项"
#: diff.c
msgid "when run from subdir, exclude changes outside and show relative paths"
#: diff.c
msgid "treat all files as text"
-msgstr "把所有文件当做文本处理"
+msgstr "把所有文件当作文本处理"
#: diff.c
msgid "swap two inputs, reverse the diff"
#: diff.c
msgid "allow an external diff helper to be executed"
-msgstr "允许执行一个外置的差异助手"
+msgstr "允许执行一个外部差异辅助程序"
#: diff.c
msgid "run external text conversion filters when comparing binary files"
#: diff.c
msgid "treat 'git add -N' entries as real in the index"
-msgstr "将索引中 'git add -N' 条目当做真实的"
+msgstr "将索引中 'git add -N' 条目当作真实的"
#: diff.c
msgid "<string>"
#: diff.c
msgid "show all changes in the changeset with -S or -G"
-msgstr "显示使用 -S 或 -G 的变更集的所有变更"
+msgstr "显示由 -S 或 -G 选中的变更集内的全部变更"
#: diff.c
msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
+msgstr "将 -S 的 <string> 当作扩展的 POSIX 正则表达式"
#: diff.c
msgid "control the order in which files appear in the output"
#: diffcore-rename.c
msgid "Performing inexact rename detection"
-msgstr "æ£å\9c¨è¿\9bè¡\8cé\9d\9e精确ç\9a\84é\87\8då\91½å\90\8dæ\8e¢测"
+msgstr "æ£å\9c¨è¿\9bè¡\8cé\9d\9e精确ç\9a\84é\87\8då\91½å\90\8dæ£\80测"
#: diffcore-rotate.c
#, c-format
#: dir.c
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
+msgstr "路径规格 '%s' 未匹配任何 Git 已知文件"
#: dir.c
#, c-format
#: dir.c
msgid "disabling cone pattern matching"
-msgstr "停用锥形模式匹配"
+msgstr "停用锥形模式（稀疏检出）匹配"
#: dir.c
#, c-format
msgid "cannot use %s as an exclude file"
-msgstr "不能将 %s 用作排除文件"
+msgstr "无法将 %s 用作排除文件"
#: dir.c
msgid "failed to get kernel name and information"
#: dir.c
msgid "untracked cache is disabled on this system or location"
-msgstr "缓存未跟踪文件在本系统或位置中被禁用"
+msgstr "本系统或位置已禁用未跟踪文件缓存"
#: dir.c
msgid ""
#: dir.c
#, c-format
msgid "could not create directories for %s"
-msgstr "不能为 %s 创建目录"
+msgstr "无法为 %s 创建目录"
#: dir.c
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
+msgstr "无法从 '%s' 迁移 Git 目录到 '%s'"
#: editor.c
#, c-format
#: editor.c sequencer.c wrapper.c
#, c-format
msgid "could not write to '%s'"
-msgstr "不能写入 '%s'"
+msgstr "无法写入 '%s'"
#: editor.c
#, c-format
msgid "could not edit '%s'"
-msgstr "不能编辑 '%s'"
+msgstr "无法编辑 '%s'"
#: entry.c
msgid "Filtering content"
#: entry.c
#, c-format
msgid "could not stat file '%s'"
-msgstr "不能对文件 '%s' 调用 stat"
+msgstr "无法对文件 '%s' 调用 stat"
#: environment.c
#, c-format
msgid "bad git namespace path \"%s\""
-msgstr "é\94\99误ç\9a\84 git å\90\8då\97空间路径 \"%s\""
+msgstr "é\94\99误ç\9a\84 git å\91½å\90\8d空间路径 \"%s\""
#: environment.c
#, c-format
#: environment.c
msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
-msgstr "core.fsyncObjectFiles 已经被弃用；取而代之使用 core.fsync"
+msgstr "core.fsyncObjectFiles 已经被弃用；改用 core.fsync"
#: environment.c
#, c-format
msgstr ""
"您正在尝试获取 %s，它位于提交图文件中，但不在对象数据库中。\n"
"这可能是由于仓库损坏造成的。\n"
-"如果您尝试通过重新获取丢失的对象来修复此仓库损坏，请对丢失的对象使用 'git "
+"如果您尝试通过重新获取丢失的对象来修复此仓库损坏，请对缺失的对象执行 'git "
"fetch --refetch'。"
#: fetch-pack.c
#: fetch-pack.c
msgid "unable to write to remote"
-msgstr "æ\97 æ³\95å\86\99å\88°远程"
+msgstr "æ\97 æ³\95å\86\99å\85¥远程"
#: fetch-pack.c
msgid "Server supports filter"
-msgstr "服务器支持 filter"
+msgstr "服务器支持过滤器"
#: fetch-pack.c
#, c-format
msgid "invalid shallow line: %s"
-msgstr "无效的 shallow 信息：%s"
+msgstr "无效的 shallow 行：%s"
#: fetch-pack.c
#, c-format
msgid "invalid unshallow line: %s"
-msgstr "无效的 unshallow 信息：%s"
+msgstr "无效的 unshallow 行：%s"
#: fetch-pack.c
#, c-format
#: fetch-pack.c
#, c-format
msgid "no shallow found: %s"
-msgstr "未å\8f\91ç\8e° shallowï¼\9a%s"
+msgstr "未æ\89¾å\88° shallowï¼\9a%s"
#: fetch-pack.c
#, c-format
#: fetch-pack.c
msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack：无法派生 sideband 多路输出"
+msgstr "fetch-pack：无法派生 sideband 多路分解器"
#: fetch-pack.c
msgid "protocol error: bad pack header"
-msgstr "协议错误：坏的包头"
+msgstr "协议错误：无效的包头"
#: fetch-pack.c
#, c-format
#: fetch-pack.c
msgid "error in sideband demultiplexer"
-msgstr "sideband 多路输出出错"
+msgstr "sideband 多路分解器出错"
#: fetch-pack.c
#, c-format
msgid "Server version is %.*s"
-msgstr "服务器版本 %.*s"
+msgstr "服务器版本为 %.*s"
#: fetch-pack.c
#, c-format
#: fetch-pack.c
msgid "Server does not support shallow clients"
-msgstr "服务器不支持浅客户端"
+msgstr "æ\9c\8då\8a¡å\99¨ä¸\8dæ\94¯æ\8c\81æµ\85å\85\8bé\9a\86客æ\88·ç«¯"
#: fetch-pack.c
msgid "Server does not support --shallow-since"
#: fetch-pack.c
#, c-format
msgid "expected no other sections to be sent after no '%s'"
-msgstr "å\9c¨æ²¡æ\9c\89 '%s' å\90\8eä¸\8dåº\94该å\8f\91é\80\81å\85¶å®\83小节"
+msgstr "å\9c¨æ\9cªå\8f\91é\80\81 '%s' å\90\8eä¸\8dåº\94该å\86\8då\8f\91é\80\81å\85¶ä»\96小节"
#: fetch-pack.c
#, c-format
#: fetch-pack.c
msgid "no matching remote head"
-msgstr "没æ\9c\89å\8c¹é\85\8dç\9a\84è¿\9cç¨\8bå\88\86æ\94¯"
+msgstr "没æ\9c\89å\8c¹é\85\8dç\9a\84è¿\9cç¨\8b头å¼\95ç\94¨"
#: fetch-pack.c
msgid "unexpected 'ready' from remote"
-msgstr "来自远程的意外的 'ready'"
+msgstr "来自远程的意外 'ready'"
#: fetch-pack.c
#, c-format
#: fsmonitor-ipc.c
#, c-format
msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
-msgstr "fsmonitor_ipc__send_query：未知错误于 '%s'"
+msgstr "fsmonitor_ipc__send_query：在 '%s' 上发生未知错误"
#: fsmonitor-ipc.c
msgid "fsmonitor--daemon is not running"
#: fsmonitor-ipc.c
#, c-format
msgid "could not send '%s' command to fsmonitor--daemon"
-msgstr "无法发送 '%s' 命令至 fsmonitor--daemon"
+msgstr "无法发送 '%s' 命令到 fsmonitor--daemon"
#: fsmonitor-settings.c
#, c-format
msgstr ""
"git [-v | --version] [-h | --help] [-C <路径>] [-c <名称>=<取值>]\n"
" [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
-" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [\"--"
-"no-lazy-fetch]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-"
+"lazy-fetch]\n"
" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<路径>]\n"
" [--work-tree=<路径>] [--namespace=<名称>]\n"
" [--config-env=<名称>=<环境变量>] <命令> [<参数>]"
#: git.c
#, c-format
msgid "no config key given for --config-env\n"
-msgstr "没有为 --config-env 提供配置名称\n"
+msgstr "没有为 --config-env 提供配置键名\n"
#: git.c
#, c-format
"alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this"
msgstr ""
-"å\88«å\90\8d '%s' ä¿®æ\94¹ç\8e¯å¢\83å\8f\98é\87\8fã\80\82æ\82¨å\8f¯ä»¥ä½¿ç\94¨å\9c¨å\88«å\90\8dä¸\n"
-"使用 '!git'"
+"å\88«å\90\8d '%s' ä¼\9aä¿®æ\94¹ç\8e¯å¢\83å\8f\98é\87\8fã\80\82\n"
+"您可以在别名中使用 '!git' 来做到这一点"
#: git.c
#, c-format
#: git.c
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr "检测到别名循环：'%s'的扩展未终止：%s"
+msgstr "检测到别名循环：'%s' 的扩展未终止：%s"
#: git.c
msgid "write failure on standard output"
#: git.c
#, c-format
msgid "cannot handle %s as a builtin"
-msgstr "不能作为内置命令处理 %s"
+msgstr "无法作为内置命令处理 %s"
#: git.c
#, c-format
#: git.c
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
-msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 git 命令\n"
+msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 Git 命令\n"
#: git.c
#, c-format
#: gpg-interface.c
msgid "could not create temporary file"
-msgstr "不能创建临时文件"
+msgstr "无法创建临时文件"
#: gpg-interface.c
#, c-format
"ssh-keygen -Y find-principals/verify is needed for ssh signature "
"verification (available in openssh version 8.2p1+)"
msgstr ""
-"ssh 签名验证需要 ssh-keygen -Y find-principals/verify \n"
-"（openssh 8.2p1+ 版本可用）"
+"ssh 签名验证需要 ssh-keygen -Y find-principals/verify\n"
+"（OpenSSH 8.2p1+ 版本可用）"
#: gpg-interface.c
#, c-format
msgid "ssh signing revocation file configured but not found: %s"
-msgstr "设置了 ssh 签名吊销文件但无法找到：%s"
+msgstr "已设置 SSH 签名吊销文件但无法找到：%s"
#: gpg-interface.c
#, c-format
msgid "bad/incompatible signature '%s'"
-msgstr "坏的/不兼容的签名 '%s‘"
+msgstr "无效/不兼容的签名 '%s'"
#: gpg-interface.c
#, c-format
msgid "failed to get the ssh fingerprint for key '%s'"
-msgstr "无法得到密钥 '%s' 的 ssh 指纹"
+msgstr "无法得到密钥 '%s' 的 SSH 指纹"
#: gpg-interface.c
#, c-format
msgid "failed to get the ssh fingerprint for key %s"
-msgstr "无法得到密钥 '%s' 的 ssh 指纹"
+msgstr "无法得到密钥 %s 的 SSH 指纹"
#: gpg-interface.c
msgid ""
msgid ""
"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
"8.2p1+)"
-msgstr "ssh 签名需要 ssh-keygen -Y sign （openssh 8.2p1+ 版本可用）"
+msgstr "ssh 签名需要 ssh-keygen -Y sign（OpenSSH 8.2p1+ 版本可用）"
#: gpg-interface.c
#, c-format
msgid "failed reading ssh signing data buffer from '%s'"
-msgstr "无法从 '%s' 读入 ssh 签名数据"
+msgstr "无法从 '%s' 读入 SSH 签名数据"
#: graph.c
#, c-format
#: help.c
msgid "Ancillary Commands / Manipulators"
-msgstr "辅助命令/操作者"
+msgstr "辅助命令/操作类"
#: help.c
msgid "Ancillary Commands / Interrogators"
-msgstr "辅助命令/询问者"
+msgstr "辅助命令/查询类"
#: help.c
msgid "Interacting with Others"
-msgstr "与其它系统交互"
+msgstr "与其他系统交互"
#: help.c
msgid "Low-level Commands / Manipulators"
-msgstr "低级命令/操作者"
+msgstr "低级命令/操作类"
#: help.c
msgid "Low-level Commands / Interrogators"
-msgstr "低级命令/询问者"
+msgstr "低级命令/查询类"
#: help.c
msgid "Low-level Commands / Syncing Repositories"
#: help.c
msgid "Low-level Commands / Internal Helpers"
-msgstr "低级命令/内部助手"
+msgstr "低级命令/内部辅助程序"
#: help.c
msgid "User-facing repository, command and file interfaces"
#: help.c
msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "执行 'git help <command>' 来了解特定子命令"
+msgstr "执行 'git help <command>' 来了解特定子命令"
#: help.c
#, c-format
#: help.c
msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "å\94\89呀，您的系统中未发现 Git 命令。"
+msgstr "å\93\8e呀，您的系统中未发现 Git 命令。"
#: help.c
#, c-format
"Did you mean one of these?"
msgstr[0] ""
"\n"
-"您指的是这个么？"
+"您指的是这个吗？"
msgstr[1] ""
"\n"
-"您指的是这其中的某一个么？"
+"您指的是这其中的某一个吗？"
#: hook.c
#, c-format
#: http-fetch.c
msgid "not a git repository"
-msgstr "不是 git 仓库"
+msgstr "不是 Git 仓库"
#: http-fetch.c
#, c-format
#: http.c
msgid "refusing to read cookies from http.cookiefile '-'"
-msgstr "拒绝从 http.cookiefile '-' 读取 cookies"
+msgstr "拒绝从 http.cookiefile '-' 读取 Cookie"
#: http.c
msgid "ignoring http.savecookies for empty http.cookiefile"
" asked for: %s\n"
" redirect: %s"
msgstr ""
-"不能更新重定向的 url base：\n"
+"无法更新重定向后的 URL 基址：\n"
" 请求：%s\n"
" 重定向：%s"
" git config --global user.email \"you@example.com\"\n"
" git config --global user.name \"Your Name\"\n"
"\n"
-"来设置您账号的缺省身份标识。\n"
+"来设置您账号的默认身份标识。\n"
"如果仅在本仓库设置身份标识，则省略 --global 参数。\n"
"\n"
#: list-objects-filter-options.c
msgid "sparse:path filters support has been dropped"
-msgstr "sparse:path 过滤器支持已被删除"
+msgstr "sparse:path 过滤器支持已被移除"
#: list-objects-filter-options.c
#, c-format
#: list-objects-filter.c
#, c-format
msgid "unable to access sparse blob in '%s'"
-msgstr "不能访问 '%s' 中的稀疏数据对象"
+msgstr "无法访问 '%s' 中的稀疏数据对象"
#: list-objects-filter.c
#, c-format
msgstr ""
"无法创建 '%s.lock'：%s。\n"
"\n"
-"似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n"
+"似乎另一个 Git 进程在这个仓库中运行，例如：'git commit' 命令打\n"
"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n"
-"可能之前有一个 git 进程在这个仓库中异常退出：\n"
+"可能之前有一个 Git 进程在这个仓库中异常退出：\n"
"手动删除这个文件再继续。"
#: lockfile.c
#, c-format
msgid "Unable to create '%s.lock': %s"
-msgstr "不能创建 '%s.lock'：%s"
+msgstr "无法创建 '%s.lock'：%s"
#: log-tree.c
msgid "unable to create temporary object directory"
#: loose.c
#, c-format
msgid "could not write loose object index %s"
-msgstr "不能写入松散对象索引 %s"
+msgstr "无法写入松散对象索引 %s"
#: loose.c
#, c-format
#: merge-ort-wrappers.c
#, c-format
msgid "Could not parse object '%s'"
-msgstr "不能解析对象 '%s'"
+msgstr "无法解析对象 '%s'"
#: merge-ort.c
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
-msgstr "无法合并子模组 %s （没有检出）"
+msgstr "无法合并子模组 %s（没有检出）"
#: merge-ort.c
#, c-format
msgid "Failed to merge submodule %s (no merge base)"
-msgstr "无法合并子模组 %s （没有合并基线）"
+msgstr "无法合并子模组 %s（没有合并基线）"
#: merge-ort.c
#, c-format
#: merge-ort.c
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr "无法合并子模组 %s （提交未跟随合并基线）"
+msgstr "无法合并子模组 %s（提交未跟随合并基线）"
#: merge-ort.c
#, c-format
#: merge-ort.c
#, c-format
msgid "error: unable to add %s to database"
-msgstr "错误：不能添加 %s 至对象库"
+msgstr "错误：无法将 %s 添加到对象库"
#: merge-ort.c
#, c-format
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
-"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
-"å\9c¨：%s。"
+"冲突（隐式目录重命名）：隐式目录重命名要把以下路径放到 %s，但该处已有文件/目"
+"å½\95：%s。"
#: merge-ort.c
#, c-format
#: merge-ort.c
#, c-format
msgid "error: cannot read object %s"
-msgstr "错误：不能读取对象 %s"
+msgstr "错误：无法读取对象 %s"
#: merge-ort.c
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
"%s instead."
-msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。"
+msgstr "冲突（文件/目录）：目录阻挡了来自 %2$s 的 %1$s，改为将其移动到 %3$s。"
#: merge-ort.c
#, c-format
"CONFLICT (distinct types): %s had different types on each side; renamed one "
"of them so each can be recorded somewhere."
msgstr ""
-"冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同"
-"位置。"
+"冲突（不同类型）：%s 在两侧类型不同，已重命名其中之一，以便两者都能记录在某"
+"处。"
#: merge-ort.c
msgid "content"
#: midx-write.c
#, c-format
msgid "could not parse line: %s"
-msgstr "不能解析行：%s"
+msgstr "无法解析行：%s"
#: midx-write.c
#, c-format
#: midx-write.c
msgid "could not load pack"
-msgstr "不能载入包"
+msgstr "无法载入包"
#: midx-write.c
#, c-format
#: midx-write.c
#, c-format
msgid "cannot select preferred pack %s with no objects"
-msgstr "不能选择没有对象的首选包 %s"
+msgstr "无法选择没有对象的首选包 %s"
#: midx-write.c
#, c-format
#: midx-write.c
msgid "cannot expire packs from an incremental multi-pack-index"
-msgstr "增量多包索引中的包不能过期"
+msgstr "增量多包索引中的包无法过期"
#: midx-write.c
msgid "Counting referenced objects"
#: midx-write.c
msgid "could not start pack-objects"
-msgstr "不能开始 pack-objects"
+msgstr "无法开始 pack-objects"
#: midx-write.c
msgid "could not finish pack-objects"
-msgstr "不能结束 pack-objects"
+msgstr "无法结束 pack-objects"
#: midx.c
msgid "multi-pack-index OID fanout is of the wrong size"
#: midx.c
#, c-format
msgid "multi-pack-index version %d not recognized"
-msgstr "multi-pack-index 版本 %d 不能被识别"
+msgstr "multi-pack-index 版本 %d 未被识别"
#: midx.c
#, c-format
#: midx.c
#, c-format
msgid "invalid multi-pack-index chain: line '%s' not a hash"
-msgstr "无效的多包索引链：第 '%s' 行不是哈希值"
+msgstr "无效的多包索引链：行 '%s' 不是哈希值"
#: midx.c
msgid "unable to find all multi-pack index files"
#: midx.c
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
-msgstr "错的 pack-int-id：%u（共有 %u 个包）"
+msgstr "无效的 pack-int-id：%u（共有 %u 个包）"
#: midx.c
msgid "MIDX does not contain the BTMP chunk"
#: midx.c
#, c-format
msgid "could not load bitmapped pack %<PRIu32>"
-msgstr "
不能打开已被位图索引的包 %<PRIu32>"
+msgstr "
无法加载已被位图索引的包 %<PRIu32>"
#: midx.c
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
-msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
+msgstr "多包索引存储一个 64 位偏移，但是 off_t 太小"
#: midx.c
msgid "multi-pack-index large offset out of bounds"
#: midx.c
msgid "incorrect checksum"
-msgstr "不正确的校验码"
+msgstr "校验码不正确"
#: midx.c
msgid "Looking for referenced packfiles"
#: midx.c
msgid "the midx contains no oid"
-msgstr "midx 不包含 oid"
+msgstr "MIDX 不包含 OID"
#: midx.c
msgid "Verifying OID order in multi-pack-index"
#: name-hash.c
#, c-format
msgid "unable to create lazy_dir thread: %s"
-msgstr "不能创建 lazy_dir 线程：%s"
+msgstr "无法创建 lazy_dir 线程：%s"
#: name-hash.c
#, c-format
msgid "unable to create lazy_name thread: %s"
-msgstr "不能创建 lazy_name 线程：%s"
+msgstr "无法创建 lazy_name 线程：%s"
#: name-hash.c
#, c-format
msgid "unable to join lazy_name thread: %s"
-msgstr "不能加入 lazy_name 线程：%s"
+msgstr "无法加入 lazy_name 线程：%s"
#: notes-merge.c
#, c-format
"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-"您的前一次注释合并尚未结束（存在 %s）。\n"
-"在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git "
+"您的前一次注解合并尚未结束（存在 %s）。\n"
+"在开始一个新的注解合并之前，请使用 'git notes merge --commit' 或者 'git "
"notes merge --abort' 来提交/终止前一次合并。"
#: notes-merge.c
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
-msgstr "您尚未结束注释合并（存在 %s）。"
+msgstr "您尚未结束注解合并（存在 %s）。"
#: notes-utils.c
msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "不能提交未初始化/未引用的注解树"
+msgstr "无法提交未初始化/未引用的注解树"
#: notes-utils.c
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "坏的 notes.rewriteMode 值：'%s'"
+msgstr "无效的 notes.rewriteMode 值：'%s'"
#: notes-utils.c
#, c-format
#: notes-utils.c
#, c-format
msgid "Bad %s value: '%s'"
-msgstr "坏的 %s 值：'%s'"
+msgstr "无效的 %s 值：'%s'"
#: object-file-convert.c
msgid "failed to decode tree entry"
-msgstr "无法解码树对象"
+msgstr "无法解码树条目"
#: object-file-convert.c
#, c-format
msgid "failed to map tree entry for %s"
-msgstr "无法为 %s 映射树对象"
+msgstr "无法为 %s 映射树条目"
#: object-file-convert.c
#, c-format
#: object-file.c
#, c-format
msgid "unable to open %s"
-msgstr "不能打开 %s"
+msgstr "无法打开 %s"
#: object-file.c
#, c-format
#: object-file.c
msgid "unable to write loose object file"
-msgstr "不能写松散对象文件"
+msgstr "无法写入松散对象文件"
#: object-file.c
#, c-format
msgid "unable to deflate new object %s (%d)"
-msgstr "不能压缩新对象 %s（%d）"
+msgstr "无法压缩新对象 %s（%d）"
#: object-file.c
#, c-format
#: object-file.c
#, c-format
msgid "confused by unstable object source data for %s"
-msgstr "被 %s ç\9a\84ä¸\8d稳å®\9a对象æº\90æ\95°æ\8d®æ\90\9eç³\8aæ¶\82äº\86"
+msgstr "ç\94±äº\8e %s ç\9a\84对象æº\90æ\95°æ\8d®ä¸\8d稳å®\9aè\80\8cæ\97 æ³\95å¤\84ç\90\86"
#: object-file.c
#, c-format
#: object-file.c
#, c-format
msgid "unable to stream deflate new object (%d)"
-msgstr "不能流式压缩新对象（%d）"
+msgstr "无法流式压缩新对象（%d）"
#: object-file.c
#, c-format
#: object-file.c
#, c-format
msgid "cannot read object for %s"
-msgstr "不能读取对象 %s"
+msgstr "无法读取对象 %s"
#: object-file.c
#, c-format
#: object-file.c
msgid "cannot add a submodule of a different hash algorithm"
-msgstr "不能添加使用不同哈希算法的子模组"
+msgstr "无法添加使用不同哈希算法的子模组"
#: object-file.c
#, c-format
#: object-file.c
#, c-format
msgid "unable to mmap %s"
-msgstr "不能 mmap %s"
+msgstr "无法 mmap %s"
#: object-file.c
#, c-format
#: object-name.c
#, c-format
msgid "%s [bad object]"
-msgstr "%s [坏的对象]"
+msgstr "%s [无效的对象]"
#. TRANSLATORS: This is a line of ambiguous commit
#. object output. E.g.:
#: object-name.c
#, c-format
msgid "%s [bad tag, could not parse it]"
-msgstr "%s [坏的标签，无法解析]"
+msgstr "%s [无效的标签，无法解析]"
#. TRANSLATORS: This is a line of ambiguous <type>
#. object output. E.g. "deadbeef tree".
#: object-name.c
#, c-format
msgid "short object ID %s is ambiguous"
-msgstr "短对象ID %s 存在歧义"
+msgstr "短对象 ID %s 存在歧义"
#. TRANSLATORS: The argument is the list of ambiguous
#. objects composed in show_ambiguous_object(). See
"The candidates are:\n"
"%s"
msgstr ""
-"候选者有：\n"
+"候选项有：\n"
"%s"
#: object-name.c
"examine these refs and maybe delete them. Turn this message off by\n"
"running \"git config set advice.objectNameWarning false\""
msgstr ""
-"Git 通常不会创建一个以40个十六进制字符结尾的引用，因为当您只提供40\n"
+"Git 通常不会创建一个以 40 个十六进制字符结尾的引用，因为当您只提供 40\n"
"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如：\n"
"\n"
" git switch -c $br $(git rev-parse ...)\n"
"\n"
-"当 \"$br\" 某种原因空白时，一个40位十六进制的引用将被创建。请检查这些\n"
+"当 \"$br\" 由于某种原因为空时，一个 40 位十六进制的引用将被创建。请检查这些\n"
"引用，可能需要删除它们。运行 \"git config set advice.objectNameWarning\n"
-"false\" 命令关闭本消息通知。"
+"false\" 来关闭本消息通知。"
#: object-name.c
#, c-format
#: object-name.c
msgid "relative path syntax can't be used outside working tree"
-msgstr "不能在工作区之外使用相对路径语法"
+msgstr "无法在工作区之外使用相对路径语法"
#: object-name.c
#, c-format
#: object.c
#, c-format
msgid "unable to parse object: %s"
-msgstr "不能解析对象：%s"
+msgstr "无法解析对象：%s"
#: object.c
#, c-format
#: odb.c
#, c-format
msgid "reference repository '%s' is grafted"
-msgstr "参考仓库 '%s' 已被移植"
+msgstr "参考仓库 '%s' 已被嫁接"
#: odb.c
#, c-format
#: pack-bitmap.c
#, c-format
msgid "corrupt ewah bitmap: truncated header for entry %d"
-msgstr "损坏的 EWAH 位图：条目 %d 截断的文件头"
+msgstr "损坏的 EWAH 位图：条目 %d 的文件头被截断"
#: pack-bitmap.c
#, c-format
#: pack-bitmap.c
msgid "cannot fstat bitmap file"
-msgstr "不能对位图文件调用 fstat"
+msgstr "无法对位图文件调用 fstat"
#: pack-bitmap.c
msgid "checksum doesn't match in MIDX and bitmap"
#: pack-bitmap.c
#, c-format
msgid "could not open pack %s"
-msgstr "不能打开包 %s"
+msgstr "无法打开包 %s"
#: pack-bitmap.c
msgid "corrupt bitmap lookup table: triplet position out of index"
#: pack-bitmap.c
#, c-format
msgid "unable to load pack: '%s', disabling pack-reuse"
-msgstr "无法打开包：'%s'，禁用包重用"
+msgstr "无法加载包：'%s'，禁用包重用"
#: pack-bitmap.c
msgid "unable to compute preferred pack, disabling pack-reuse"
#: pack-bitmap.c
#, c-format
msgid "object '%s' not found in type bitmaps"
-msgstr "对象 %s 为在类型位图中找到"
+msgstr "对象 '%s' 未在类型位图中找到"
#: pack-bitmap.c
#, c-format
#: pack-bitmap.c
#, c-format
msgid "object not in bitmap: '%s'"
-msgstr "对象不在位图中：%s"
+msgstr "对象不在位图中：'%s'"
#: pack-bitmap.c
msgid "failed to load bitmap indexes"
#: pack-mtimes.c
#, c-format
msgid "mtimes file %s has unsupported version %<PRIu32>"
-msgstr "mtimes 文件 %s 不支持的版本 %<PRIu32>"
+msgstr "mtimes 文件 %s 版本 %<PRIu32> 不受支持"
#: pack-mtimes.c
#, c-format
msgid "mtimes file %s has unsupported hash id %<PRIu32>"
-msgstr "mtimes 文件 %s 有不支持的哈希 ID %<PRIu32>"
+msgstr "mtimes 文件 %s 的哈希 ID %<PRIu32> 不受支持"
#: pack-mtimes.c
#, c-format
#: pack-refs.c
msgid "pack everything"
-msgstr "打包一切"
+msgstr "打包全部"
#: pack-refs.c
msgid "prune loose refs (default)"
#: pack-revindex.c
#, c-format
msgid "reverse-index file %s has unknown signature"
-msgstr "反向索引文件 %s 有错误的签名"
+msgstr "反向索引文件 %s 有未知的签名"
#: pack-revindex.c
#, c-format
msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr "反向索引文件 %s 不支持的版本 %<PRIu32>"
+msgstr "反向索引文件 %s 的版本 %<PRIu32> 不受支持"
#: pack-revindex.c
#, c-format
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
-msgstr "反向索引文件 %s 有不支持的哈希 ID %<PRIu32>"
+msgstr "反向索引文件 %s 的哈希 ID %<PRIu32> 不受支持"
#: pack-revindex.c
msgid "invalid checksum"
-msgstr "无效的校验码 %s"
+msgstr "无效的校验码"
#: pack-revindex.c
#, c-format
msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>"
-msgstr "
位于 %<PRIu64> 的无效的反向索引：%<PRIu32> != %<PRIu32>"
+msgstr "
在 %<PRIu64> 的反向索引位置无效：%<PRIu32> != %<PRIu32>"
#: pack-revindex.c
msgid "multi-pack-index reverse-index chunk is the wrong size"
#: pack-write.c
msgid "cannot both write and verify reverse index"
-msgstr "无法同时写入和校验反向索引"
+msgstr "不能同时写入和校验反向索引"
#: pack-write.c
#, c-format
msgid "could not stat: %s"
-msgstr "不能调用 stat：%s"
+msgstr "无法调用 stat：%s"
#: pack-write.c
#, c-format
#: packfile.c
#, c-format
msgid "packfile %s cannot be mapped%s"
-msgstr "包文件 %s 不能被映射%s"
+msgstr "包文件 %s 无法被映射%s"
#: packfile.c
#, c-format
#: parse-options.c
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
-msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
+msgstr "%s 期望一个非负整数以及可选的 k/m/g 后缀"
#: parse-options.c
#, c-format
#: parse-options.c
#, c-format
msgid "unknown non-ascii option in string: `%s'"
-msgstr "字符串中未知的非 ascii 字符选项：`%s'"
+msgstr "字符串中未知的非 ASCII 字符选项：`%s'"
#. TRANSLATORS: The "<%s>" part of this string
#. stands for an optional value given to a command
#: parse-options.h
msgid "how to strip spaces and #comments from message"
-msgstr "设置如何删除提交说明里的空格和#注释"
+msgstr "设置如何删除提交说明里的空格和 #注释"
#: parse-options.h
msgid "read pathspec from file"
-msgstr "ä»\8eæ\96\87件读å\8f\96è·¯å¾\84表达å¼\8f"
+msgstr "ä»\8eæ\96\87件读å\8f\96è·¯å¾\84è§\84æ ¼"
#: parse-options.h
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
-msgstr "使ç\94¨ --pathspec-from-fileï¼\8cè·¯å¾\84表达å¼\8fç\94¨ç©º字符分隔"
+msgstr "使ç\94¨ --pathspec-from-fileï¼\8cè·¯å¾\84è§\84æ ¼å\85\83ç´ ç\94¨ NUL 字符分隔"
#: parse.c
#, c-format
msgid "bad boolean environment value '%s' for '%s'"
-msgstr "对于 '%2$s' 的错误的布尔环境取值 '%1$s'"
+msgstr "环境变量 '%2$s' 的布尔值 '%1$s' 无效"
#: path-walk.c
#, c-format
#: path.c
#, c-format
msgid "Could not make %s writable by group"
-msgstr "不能设置 %s 为组可写"
+msgstr "无法设置 %s 为组可写"
#: pathspec.c
msgid "Escape character '\\' not allowed as last character in attr value"
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
-msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
+msgstr "全局的 'literal' 路径规格设置和其他的全局路径规格设置不兼容"
#: pathspec.c
msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "路径规格包含无效的神奇前缀"
+msgstr "路径规格魔法 'prefix' 的参数无效"
#: pathspec.c
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
+msgstr "路径规格魔法前缀 '%.*s' 在 '%s' 中无效"
#: pathspec.c
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
+msgstr "路径规格 '%s' 的魔法前缀结尾少了一个 ')'"
#: pathspec.c
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
+msgstr "路径规格 '%2$s' 中包含未实现的魔法前缀 '%1$c'"
#: pathspec.c
#, c-format
#: pathspec.c
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
-msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
+msgstr "%s：路径规格魔法前缀不被此命令支持：%s"
#: pathspec.c
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "è·¯å¾\84è§\84æ ¼ '%s' ä½\8däº\8e符å\8f·é\93¾æ\8e¥ä¸"
+msgstr "è·¯å¾\84è§\84æ ¼ '%s' ä½\8däº\8e符å\8f·é\93¾æ\8e¥ä¹\8bå\90\8e"
#: pathspec.c
#, c-format
msgid "line is badly quoted: %s"
-msgstr "行被错误地引用：%s"
+msgstr "行引用不正确：%s"
#: pkt-line.c
msgid "unable to write flush packet"
-msgstr "无法写 flush 包"
+msgstr "无法写入 flush 包"
#: pkt-line.c
msgid "unable to write delim packet"
-msgstr "无法写 delim 包"
+msgstr "无法写入 delim 包"
#: pkt-line.c
msgid "unable to write response end packet"
#: pkt-line.c
msgid "flush packet write failed"
-msgstr "flush 包写错误"
+msgstr "flush 包写入失败"
#: pkt-line.c
msgid "protocol error: impossibly long line"
-msgstr "协议错误：不可能的长行"
+msgstr "协议错误：行过长"
#: pkt-line.c
msgid "packet write with format failed"
#: pkt-line.c
#, c-format
msgid "protocol error: bad line length character: %.4s"
-msgstr "协议错误：错误的行长度字符串：%.4s"
+msgstr "协议错误：错误的行长度字符：%.4s"
#: pkt-line.c
#, c-format
#: pretty.c
msgid "unable to parse --pretty format"
-msgstr "不能解析 --pretty 格式"
+msgstr "无法解析 --pretty 格式"
#: promisor-remote.c
msgid "lazy fetching disabled; some objects may not be available"
-msgstr "禁用延迟获取，某些对象可能不可用"
+msgstr "已禁用延迟获取，某些对象可能不可用"
#: promisor-remote.c
msgid "promisor-remote: unable to fork off fetch subprocess"
#: protocol-caps.c
msgid "object-info: expected flush after arguments"
-msgstr "object-info：在参数之后应有一个 flush"
+msgstr "object-info：在参数之后应有一个 flush 包"
#: prune-packed.c
msgid "Removing duplicate objects"
#: pseudo-merge.c
#, c-format
msgid "%s must be non-negative, using default"
-msgstr "%s 必须为非负整数，使用默认值"
+msgstr "%s 必须为非负值，使用默认值"
#: pseudo-merge.c
#, c-format
#, c-format
msgid ""
"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)"
-msgstr "来自
config 的伪合并正则表达式有太多的捕获组（最多 %<PRIuMAX> 个）"
+msgstr "来自
配置的伪合并正则表达式有太多的捕获组（最多 %<PRIuMAX> 个）"
#: pseudo-merge.c
#, c-format
#: range-diff.c
msgid "could not start `log`"
-msgstr "不能启动 `log`"
+msgstr "无法启动 `log`"
#: range-diff.c
msgid "could not read `log` output"
-msgstr "不能读取 `log` 的输出"
+msgstr "无法读取 `log` 的输出"
#: range-diff.c sequencer.c
#, c-format
msgid "could not parse commit '%s'"
-msgstr "不能解析提交 '%s'"
+msgstr "无法解析提交 '%s'"
#: range-diff.c
#, c-format
#: range-diff.c
#, c-format
msgid "could not parse log for '%s'"
-msgstr "不能解析 '%s' 的日志"
+msgstr "无法解析 '%s' 的日志"
#: reachable.c
#, c-format
msgid "invalid extra cruft tip: '%s'"
-msgstr "无效的额外废弃提交版本：'%s'"
+msgstr "无效的额外废弃对象 tip：'%s'"
#: reachable.c
msgid "unable to enumerate additional recent objects"
#: read-cache.c
msgid "cannot create an empty blob in the object database"
-msgstr "不能在对象数据库中创建空的数据对象"
+msgstr "无法在对象数据库中创建空的数据对象"
#: read-cache.c
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
-msgstr "%s：只能添加常规文件、符号链接或 git 目录"
+msgstr "%s：只能添加常规文件、符号链接或 Git 目录"
#: read-cache.c
#, c-format
#: read-cache.c
#, c-format
msgid "bad signature 0x%08x"
-msgstr "坏的签名 0x%08x"
+msgstr "无效的签名 0x%08x"
#: read-cache.c
#, c-format
msgid "bad index version %d"
-msgstr "坏的索引版本 %d"
+msgstr "无效的索引版本 %d"
#: read-cache.c
msgid "bad index file sha1 signature"
-msgstr "坏的索引文件 sha1 签名"
+msgstr "无效的索引文件 SHA-1 签名"
#: read-cache.c
#, c-format
#: read-cache.c
#, c-format
msgid "%s: cannot stat the open index"
-msgstr "%s：不能对打开的索引执行 stat 操作"
+msgstr "%s：无法对打开的索引执行 stat 操作"
#: read-cache.c
#, c-format
#: read-cache.c
#, c-format
msgid "unable to open git dir: %s"
-msgstr "不能打开 git 目录：%s"
+msgstr "无法打开 Git 目录：%s"
#: read-cache.c
#, c-format
#: read-cache.c
#, c-format
msgid "cannot fix permission bits on '%s'"
-msgstr "不能修复 '%s' 的权限位"
+msgstr "无法修复 '%s' 的权限位"
#: read-cache.c
#, c-format
msgid "%s: cannot drop to stage #0"
-msgstr "%s：不能落到暂存区 #0"
+msgstr "%s：无法落到暂存区 #0"
#: read-cache.c
#, c-format
"命令:\n"
"p, pick <提交> = 使用提交\n"
"r, reword <提交> = 使用提交，但编辑提交说明\n"
-"e, edit <æ\8f\90交> = 使ç\94¨æ\8f\90交ï¼\8cä½\86å\81\9cæ¢ä»¥ä¾¿ä¿®è¡¥提交\n"
+"e, edit <æ\8f\90交> = 使ç\94¨æ\8f\90交ï¼\8cä½\86å\81\9cæ¢ä»¥ä¾¿ä¿®è®¢提交\n"
"s, squash <提交> = 使用提交，但挤压到前一个提交\n"
"f, fixup [-C | -c] <提交> = 类似于 \"squash\"，但只保留前一个提交\n"
" 的提交说明，除非使用了 -C 参数，此情况下则只\n"
"l, label <label> = 为当前 HEAD 打上标记\n"
"t, reset <label> = 重置 HEAD 到该标记\n"
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". 创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n"
-". 原始提交，使用注释部分的 oneline 作为提交说明）。使用\n"
-". -c <提交> 可以编辑提交说明。\n"
+" 创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n"
+" 原始提交，使用注释部分的 oneline 作为提交说明）。使用\n"
+" -c <提交> 可以编辑提交说明。\n"
"u, update-ref <引用> = 为引用 <ref> 设置一个占位符，以将该引用更新为此处的新"
"提交。\n"
" 此 <引用> 在变基结束后更新。\n"
#, c-format
msgid "Rebase %s onto %s (%d command)"
msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "变基 %s 到 %s（%d 个æ\8f\90交ï¼\89"
-msgstr[1] "变基 %s 到 %s（%d 个æ\8f\90交ï¼\89"
+msgstr[0] "变基 %s 到 %s（%d 个å\91½ä»¤ï¼\89"
+msgstr[1] "变基 %s 到 %s（%d 个å\91½ä»¤ï¼\89"
#: rebase-interactive.c
msgid ""
#: rebase-interactive.c
#, c-format
msgid "could not write '%s'."
-msgstr "不能写入 '%s'。"
+msgstr "无法写入 '%s'。"
#: rebase-interactive.c
#, c-format
#: ref-filter.c
#, c-format
msgid "argument expected for %s"
-msgstr "预期参数 %s"
+msgstr "缺少 %s 的参数"
#: ref-filter.c
#, c-format
#: ref-filter.c
#, c-format
msgid "cannot fully parse %s=%s"
-msgstr "不能完整解析 %s=%s"
+msgstr "无法完整解析 %s=%s"
#: ref-filter.c
#, c-format
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
-msgstr "不是 git 仓库，但是字段 '%.*s' 需要访问对象数据"
+msgstr "不是 Git 仓库，但是字段 '%.*s' 需要访问对象数据"
#: ref-filter.c
#, c-format
#: ref-filter.h
msgid "key"
-msgstr "key"
+msgstr "键"
#: ref-filter.h
msgid "field name to sort on"
#: refs.c
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
-msgstr "引用 %s 的日志意外终止于 %s "
+msgstr "引用 %s 的日志意外终止于 %s"
#: refs.c
#, c-format
#: refs.c
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
-msgstr "无法同时处理 '%s' 和 '%s'"
+msgstr "不能同时处理 '%s' 和 '%s'"
#: refs.c
#, c-format
#: refs/reftable-backend.c
#, c-format
msgid "unable to compact stack: %s"
-msgstr "无法压缩栈：%s"
+msgstr "无法压缩堆栈：%s"
#: refs/reftable-backend.c
#, c-format
#: remote-curl.c
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
-msgstr "%sinfo/refs 无效：这是 git 仓库么？"
+msgstr "%sinfo/refs 无效：这是 Git 仓库吗？"
#: remote-curl.c
msgid "invalid server response; expected service, got flush packet"
#: remote-curl.c
#, c-format
msgid "remote-curl: bad line length character: %.4s"
-msgstr "remote-curl：错误的行宽字符：%.4s"
+msgstr "remote-curl：错误的行长度字符：%.4s"
#: remote-curl.c
msgid "remote-curl: unexpected response end packet"
#: remote-curl.c
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
-msgstr "不能压缩请求，zlib 压缩错误 %d"
+msgstr "无法压缩请求，zlib 压缩错误 %d"
#: remote-curl.c
#, c-format
msgid "cannot deflate request; zlib end error %d"
-msgstr "不能压缩请求，zlib 结束错误 %d"
+msgstr "无法压缩请求，zlib 结束错误 %d"
#: remote-curl.c
#, c-format
msgid "%d bytes of length header were received"
-msgstr "收到了 %d 字节长度的头信息"
+msgstr "收到了 %d 字节的长度头部"
#: remote-curl.c
#, c-format
#: remote-curl.c
msgid "dumb http transport does not support shallow capabilities"
-msgstr "哑 http 传输不支持浅克隆能力"
+msgstr "哑 HTTP 传输不支持浅克隆能力"
#: remote-curl.c
msgid "fetch failed."
#: remote-curl.c
msgid "cannot fetch by sha1 over smart http"
-msgstr "无法通过智能 HTTP 获取 sha1"
+msgstr "无法通过智能 HTTP 获取 SHA-1"
#: remote-curl.c
#, c-format
#: remote-curl.c
#, c-format
msgid "http transport does not support %s"
-msgstr "http 传输协议不支持 %s"
+msgstr "HTTP 传输协议不支持 %s"
#: remote-curl.c
msgid "protocol error: expected '<url> <path>', missing space"
#: remote-curl.c
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr "remote-curl：用法：git remote-curl <远程> [<url>]"
+msgstr "remote-curl：用法：git remote-curl <远程> [<URL>]"
#: remote-curl.c
msgid "remote-curl: error reading command stream from git"
#: remote-curl.c
msgid "remote-curl: fetch attempted without a local repo"
-msgstr "remote-curlï¼\9aå°\9dè¯\95没æ\9c\89æ\9c¬å\9c°ä»\93åº\93ä¸\8b获取"
+msgstr "remote-curlï¼\9aå\9c¨æ²¡æ\9c\89æ\9c¬å\9c°ä»\93åº\93ç\9a\84æ\83\85å\86µä¸\8bå°\9dè¯\95获取"
#: remote-curl.c
#, c-format
"If you cannot, please let us know why you still need to use it by\n"
"sending an e-mail to <git@vger.kernel.org>."
msgstr ""
-"正在从 \"%s/%s\" 读取远程内容，该内容被提名删除。\n"
+"正在从 \"%s/%s\" 读取远程内容，该内容被列入移除计划。\n"
"\n"
-"如果你仍然在使用 \"remotes/\" 目录，建议迁移为基于配置远程的方式：\n"
+"如果您仍然在使用 \"remotes/\" 目录，建议迁移为基于配置远程的方式：\n"
"\n"
"\tgit remote rename %s %s\n"
"\n"
-"如果你无法迁移，请发送电子邮件至 <git@vger.kernel.org> 告知我们你\n"
+"如果您无法迁移，请发送电子邮件至 <git@vger.kernel.org> 告知我们您\n"
"仍然需要使用它的原因。"
#: remote.c
#: remote.c
#, c-format
msgid "Cannot fetch both %s and %s to %s"
-msgstr "不能同时获取 %s 和 %s 至 %s"
+msgstr "不能同时获取 %s 和 %s 到 %s"
#: remote.c
#, c-format
"'%s:refs/heads/%s'?"
msgstr ""
"引用规格的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
-"'%s:refs/heads/%s' 推送么？"
+"'%s:refs/heads/%s' 推送吗？"
#: remote.c
#, c-format
"'%s:refs/tags/%s'?"
msgstr ""
"引用规格的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
-"'%s:refs/tags/%s' 推送么？"
+"'%s:refs/tags/%s' 推送吗？"
#: remote.c
#, c-format
"'%s:refs/tags/%s'?"
msgstr ""
"引用规格的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
-"'%s:refs/tags/%s' 推送么？"
+"'%s:refs/tags/%s' 推送吗？"
#: remote.c
#, c-format
"'%s:refs/tags/%s'?"
msgstr ""
"引用规格的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
-"'%s:refs/tags/%s' 推送么？"
+"'%s:refs/tags/%s' 推送吗？"
#: remote.c
#, c-format
#: remote.c
#, c-format
msgid "* Ignoring funny ref '%s' locally"
-msgstr "* å\9c¨æ\9c¬å\9c°å¿½ç\95¥å\8f¯ç¬\91的引用 '%s'"
+msgstr "* å\9c¨æ\9c¬å\9c°å¿½ç\95¥å¼\82常的引用 '%s'"
#: remote.c
#, c-format
#: remote.c
#, c-format
msgid "cannot strip one component off url '%s'"
-msgstr "无法从 url '%s' 剥离一个组件"
+msgstr "无法从 URL '%s' 剥离一个组件"
#: repack-geometry.c
#, c-format
msgid "cannot open index for %s"
-msgstr "不能打开 %s 的索引"
+msgstr "无法打开 %s 的索引"
#: repack-geometry.c
#, c-format
#: repack-geometry.c
#, c-format
msgid "pack %s too large to roll up"
-msgstr "包 %s 太大导致数字溢出"
+msgstr "包 %s 太大，无法汇总"
#: repack-midx.c
#, c-format
#: repack-midx.c
msgid "could not close refs snapshot tempfile"
-msgstr "不能关闭引用快照临时文件"
+msgstr "无法关闭引用快照临时文件"
#: repack-midx.c
#, c-format
msgid "could not remove stale bitmap: %s"
-msgstr "无法删除过期的位图： %s"
+msgstr "无法删除过期的位图：%s"
#: repack-promisor.c
msgid "could not start pack-objects to repack promisor objects"
#: repack-promisor.c
msgid "could not finish pack-objects to repack promisor objects"
-msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
+msgstr "无法完成 pack-objects 来重新打包承诺者对象"
#: repack-promisor.c
msgid "could not start pack-objects to repack promisor packs"
#: repack.c
#, c-format
msgid "renaming pack to '%s' failed"
-msgstr "重命名包至 '%s' 失败"
+msgstr "重命名包为 '%s' 失败"
#: repack.c
#, c-format
#: repack.c sequencer.c
#, c-format
msgid "could not unlink: %s"
-msgstr "不能删除：%s"
+msgstr "无法删除：%s"
#: replace-object.c
#, c-format
msgid "bad replace ref name: %s"
-msgstr "错误的替换引用名称：%s"
+msgstr "无效的替换引用名称：%s"
#: replace-object.c
#, c-format
#: rerere.c
#, c-format
msgid "could not parse conflict hunks in '%s'"
-msgstr "不能解析 '%s' 中的冲突块"
+msgstr "无法解析 '%s' 中的冲突块"
#: rerere.c
#, c-format
#: rerere.c
#, c-format
msgid "cannot unlink stray '%s'"
-msgstr "不能删除 stray '%s'"
+msgstr "无法删除多余的 '%s'"
#: rerere.c
#, c-format
#: rerere.c
msgid "unable to open rr-cache directory"
-msgstr "不能打开 rr-cache 目录"
+msgstr "无法打开 rr-cache 目录"
#: rerere.h
msgid "update the index with reused conflict resolution if possible"
-msgstr "如果可能，重用冲突解决更新索引"
+msgstr "如果可能，使用复用的冲突解决结果更新索引"
#: reset.c
msgid "could not determine HEAD revision"
-msgstr "不能确定 HEAD 版本"
+msgstr "无法确定 HEAD 版本"
#: reset.c sequencer.c
#, c-format
#: revision.c
#, c-format
msgid "unsupported section for hidden refs: %s"
-msgstr "不支持的隐藏引用片段： %s"
+msgstr "不支持的隐藏引用小节：%s"
#: revision.c
msgid "--exclude-hidden= passed more than once"
#: revision.c
#, c-format
msgid "%s exists but is a symbolic ref"
-msgstr "%s 存在但是一个符号引用"
+msgstr "%s 存在但为符号引用"
#: revision.c
msgid ""
#: revision.c
msgid "your current branch appears to be broken"
-msgstr "您的当前分支好像被损坏"
+msgstr "您的当前分支似乎已损坏"
#: revision.c
#, c-format
#: run-command.c
#, c-format
msgid "cannot create async thread: %s"
-msgstr "不能创建 async 线程：%s"
+msgstr "无法创建 async 线程：%s"
#: scalar.c worktree.c
#, c-format
#: scalar.c
msgid "only download metadata for the branch that will be checked out"
-msgstr "只下载要检出的分支的元信息"
+msgstr "只下载要检出的分支的元数据"
#: scalar.c
msgid "create repository within 'src' directory"
#: scalar.c
msgid "specify if tags should be fetched during clone"
-msgstr "如若应在克隆期间获取标签则指定"
+msgstr "指定是否在克隆期间获取标签"
#: scalar.c
msgid "specify if background maintenance should be enabled"
#: scalar.c
msgid "--all or <enlistment>, but not both"
-msgstr "--all 或者 <登记>，而不是两个一起"
+msgstr "--all 或 <登记>，但不能同时使用"
#: scalar.c
#, c-format
#: scalar.c
#, c-format
msgid "could not change to '%s'"
-msgstr "æ\97 æ³\95å\8f\98æ\9b´到 '%s'"
+msgstr "æ\97 æ³\95å\88\87æ\8d¢到 '%s'"
#: scalar.c
msgid "-c requires a <key>=<value> argument"
#: send-pack.c
#, c-format
msgid "unable to parse remote unpack status: %s"
-msgstr "不能解析远程解包状态：%s"
+msgstr "无法解析远程解包状态：%s"
#: send-pack.c
#, c-format
#: sequencer.c
#, c-format
msgid "could not lock '%s'"
-msgstr "不能锁定 '%s'"
+msgstr "无法锁定 '%s'"
#: sequencer.c
#, c-format
msgid "could not write eol to '%s'"
-msgstr "不能将换行符写入 '%s'"
+msgstr "无法将换行符写入 '%s'"
#: sequencer.c
#, c-format
#: sequencer.c
#, c-format
msgid "your local changes would be overwritten by %s."
-msgstr "您的本地修改将被%s覆盖。"
+msgstr "您的本地修改将被 %s 覆盖。"
#: sequencer.c
msgid "commit your changes or stash them to proceed."
-msgstr "提交您的修改或贮藏后再继续。"
+msgstr "提交您的修改或储藏后再继续。"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#: sequencer.c
msgid "unable to update cache tree"
-msgstr "不能更新缓存树"
+msgstr "无法更新缓存树"
#: sequencer.c
msgid "could not resolve HEAD commit"
-msgstr "不能解析 HEAD 提交"
+msgstr "无法解析 HEAD 提交"
#: sequencer.c
#, c-format
msgid "no key present in '%.*s'"
-msgstr "在 '%.*s' 中没有 key"
+msgstr "在 '%.*s' 中没有键"
#: sequencer.c
#, c-format
#: sequencer.c
msgid "could not parse newly created commit"
-msgstr "不能解析新创建的提交"
+msgstr "无法解析新创建的提交"
#: sequencer.c
msgid "unable to resolve HEAD after creating commit"
-msgstr "创建提交后，不能解析 HEAD"
+msgstr "创建提交后，无法解析 HEAD"
#: sequencer.c
msgid "detached HEAD"
#: sequencer.c
msgid "could not parse HEAD"
-msgstr "不能解析 HEAD"
+msgstr "无法解析 HEAD"
#: sequencer.c
#, c-format
#: sequencer.c
msgid "unable to parse commit author"
-msgstr "不能解析提交作者"
+msgstr "无法解析提交作者"
#: sequencer.c
#, c-format
msgid "unable to read commit message from '%s'"
-msgstr "不能从 '%s' 读取提交说明"
+msgstr "无法从 '%s' 读取提交说明"
#: sequencer.c
#, c-format
#: sequencer.c
#, c-format
msgid "could not update %s"
-msgstr "不能更新 %s"
+msgstr "无法更新 %s"
#: sequencer.c
#, c-format
msgid "could not parse parent commit %s"
-msgstr "不能解析父提交 %s"
+msgstr "无法解析父提交 %s"
#: sequencer.c
#, c-format
#: sequencer.c
#, c-format
msgid "cannot write '%s'"
-msgstr "不能写 '%s'"
+msgstr "无法写入 '%s'"
#: sequencer.c
msgid "need a HEAD to fixup"
#: sequencer.c
msgid "could not read HEAD"
-msgstr "不能读取 HEAD"
+msgstr "无法读取 HEAD"
#: sequencer.c
msgid "could not read HEAD's commit message"
-msgstr "不能读取 HEAD 的提交说明"
+msgstr "无法读取 HEAD 的提交说明"
#: sequencer.c
#, c-format
msgid "could not read commit message of %s"
-msgstr "不能读取 %s 的提交说明"
+msgstr "无法读取 %s 的提交说明"
#: sequencer.c
msgid "your index file is unmerged."
#: sequencer.c
msgid "cannot fixup root commit"
-msgstr "不能修复根提交"
+msgstr "无法修复根提交"
#: sequencer.c
#, c-format
#: sequencer.c
#, c-format
msgid "cannot get commit message for %s"
-msgstr "不能得到 %s 的提交说明"
+msgstr "无法获取 %s 的提交说明"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
#: sequencer.c
#, c-format
msgid "%s: cannot parse parent commit %s"
-msgstr "%s：不能解析父提交 %s"
+msgstr "%s：无法解析父提交 %s"
#: sequencer.c
#, c-format
msgid "could not revert %s... %s"
-msgstr "不能还原 %s... %s"
+msgstr "无法还原 %s... %s"
#: sequencer.c
#, c-format
msgid "could not apply %s... %s"
-msgstr "不能应用 %s... %s"
+msgstr "无法应用 %s... %s"
#: sequencer.c
#, c-format
"'break' to give the control back to you so that you can\n"
"do 'git commit --amend && git rebase --continue'."
msgstr ""
-"'edit”' 不接受合并提交。如果您想要重放合并，\n"
+"'edit' 不接受合并提交。如果您想要重放合并，\n"
"请在提交上使用 'merge -C'，然后使用 'break'\n"
"将控制权交还给您，以便您可以执行\n"
"'git commit --amend && git rebase --continue'。"
#: sequencer.c
msgid "cannot cherry-pick during a revert."
-msgstr "不能在回退中执行拣选。"
+msgstr "无法在回退中执行拣选。"
#: sequencer.c
msgid "cannot revert during a cherry-pick."
-msgstr "不能在拣选中执行回退。"
+msgstr "无法在拣选中执行回退。"
#: sequencer.c
msgid "unusable squash-onto"
#: sequencer.c
#, c-format
msgid "could not create sequencer directory '%s'"
-msgstr "不能创建序列目录 '%s'"
+msgstr "无法创建序列目录 '%s'"
#: sequencer.c
msgid "no cherry-pick or revert in progress"
#: sequencer.c
msgid "cannot resolve HEAD"
-msgstr "不能解析 HEAD"
+msgstr "无法解析 HEAD"
#: sequencer.c
msgid "cannot abort from a branch yet to be born"
-msgstr "不能从尚未建立的分支终止"
+msgstr "无法从尚未建立的分支终止"
#: sequencer.c
#, c-format
msgid "cannot read '%s': %s"
-msgstr "不能读取 '%s'：%s"
+msgstr "无法读取 '%s'：%s"
#: sequencer.c
msgid "unexpected end of file"
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
-"您已经提交了么？\n"
+"您已经提交了吗？\n"
"试试 \"git %s --continue\""
#: sequencer.c
msgid "cannot read HEAD"
-msgstr "不能读取 HEAD"
+msgstr "无法读取 HEAD"
#: sequencer.c
msgid "could not write commit message file"
"\n"
" git rebase --continue\n"
msgstr ""
-"æ\82¨ç\8e°å\9c¨å\8f¯ä»¥ä¿®è¡¥这个提交，使用\n"
+"æ\82¨ç\8e°å\9c¨å\8f¯ä»¥ä¿®è®¢这个提交，使用\n"
"\n"
" git commit --amend %s\n"
"\n"
#: sequencer.c
#, c-format
msgid "Could not apply %s... %.*s"
-msgstr "不能应用 %s... %.*s"
+msgstr "无法应用 %s... %.*s"
#: sequencer.c
#, c-format
msgid "Could not merge %.*s"
-msgstr "不能合并 %.*s"
+msgstr "无法合并 %.*s"
#: sequencer.c
#, c-format
#: sequencer.c
msgid "and made changes to the index and/or the working tree.\n"
-msgstr "并且修改索引和/或工作区。\n"
+msgstr "并已修改索引和/或工作区。\n"
#: sequencer.c
#, c-format
msgstr ""
"执行成功：%s\n"
"但是在索引和/或工作区中存在变更。\n"
-"提交或贮藏修改，然后运行\n"
+"提交或储藏修改，然后运行\n"
"\n"
" git rebase --continue\n"
"\n"
#: sequencer.c
msgid "writing fake root commit"
-msgstr "写伪根提交"
+msgstr "正在写入伪根提交"
#: sequencer.c
msgid "writing squash-onto"
#: sequencer.c
msgid "cannot merge without a current revision"
-msgstr "没有当前版本不能合并"
+msgstr "没有当前版本，无法合并"
#: sequencer.c
#, c-format
#: sequencer.c
#, c-format
msgid "nothing to merge: '%.*s'"
-msgstr "无可用合并：'%.*s'"
+msgstr "无可合并内容：'%.*s'"
#: sequencer.c
msgid "octopus merge cannot be executed on top of a [new root]"
-msgstr "章鱼合并不能在一个新的根提交上执行"
+msgstr "章鱼合并无法在一个新的根提交上执行"
#: sequencer.c
#, c-format
msgid "could not get commit message of '%s'"
-msgstr "不能获取 '%s' 的提交说明"
+msgstr "无法获取 '%s' 的提交说明"
#: sequencer.c
#, c-format
msgid "could not even attempt to merge '%.*s'"
-msgstr "甚至不能尝试合并 '%.*s'"
+msgstr "甚至无法尝试合并 '%.*s'"
#: sequencer.c
msgid "merge: Unable to write new index file"
#: sequencer.c
msgid "Cannot autostash"
-msgstr "无法自动贮藏"
+msgstr "无法自动储藏"
#: sequencer.c
#, c-format
msgid "Unexpected stash response: '%s'"
-msgstr "意外的贮藏响应：'%s'"
+msgstr "意外的储藏响应：'%s'"
#: sequencer.c
#, c-format
msgid "Could not create directory for '%s'"
-msgstr "不能为 '%s' 创建目录"
+msgstr "无法为 '%s' 创建目录"
#: sequencer.c
#, c-format
msgid "Created autostash: %s\n"
-msgstr "创建了自动贮藏：%s\n"
+msgstr "创建了自动储藏：%s\n"
#: sequencer.c
msgid "could not reset --hard"
#: sequencer.c
#, c-format
msgid "Applied autostash.\n"
-msgstr "已应用自动贮藏。\n"
+msgstr "已应用自动储藏。\n"
#: sequencer.c
#, c-format
msgid "cannot store %s"
-msgstr "不能存储 %s"
+msgstr "无法存储 %s"
#: sequencer.c
#, c-format
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
"%s\n"
-"您的修改在贮藏区中很安全。\n"
+"您的修改在储藏区中很安全。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
#: sequencer.c
msgid "Applying autostash resulted in conflicts."
-msgstr "应用自动贮藏导致冲突。"
+msgstr "应用自动储藏导致冲突。"
#: sequencer.c
msgid "Autostash exists; creating a new stash entry."
-msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。"
+msgstr "自动储藏已经存在；正在创建一个新的储藏条目。"
#: sequencer.c
msgid "autostash reference is a symref"
-msgstr "自动贮藏的引用是一个符号引用"
+msgstr "自动储藏的引用是一个符号引用"
#: sequencer.c
msgid "could not detach HEAD"
-msgstr "不能分离头指针"
+msgstr "无法分离头指针"
#: sequencer.c
#, c-format
#: sequencer.c
msgid "could not read orig-head"
-msgstr "不能读取 orig-head"
+msgstr "无法读取 orig-head"
#: sequencer.c
msgid "could not read 'onto'"
-msgstr "不能读取 'onto'"
+msgstr "无法读取 'onto'"
#: sequencer.c
#, c-format
msgid "could not update HEAD to %s"
-msgstr "不能更新 HEAD 为 %s"
+msgstr "无法更新 HEAD 为 %s"
#: sequencer.c
#, c-format
#: sequencer.c
msgid "cannot amend non-existing commit"
-msgstr "不能修补不存在的提交"
+msgstr "无法修订不存在的提交"
#: sequencer.c
#, c-format
#: sequencer.c
#, c-format
msgid "could not write file: '%s'"
-msgstr "不能写入文件：'%s'"
+msgstr "无法写入文件：'%s'"
#: sequencer.c
msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "不能删除 CHERRY_PICK_HEAD"
+msgstr "无法删除 CHERRY_PICK_HEAD"
#: sequencer.c
msgid "could not commit staged changes."
-msgstr "不能提交暂存的修改。"
+msgstr "无法提交暂存的修改。"
#: sequencer.c
#, c-format
msgid "%s: can't cherry-pick a %s"
-msgstr "%s：不能拣选一个%s"
+msgstr "%s：不能拣选一个 %s"
#: sequencer.c
#, c-format
msgid "%s: bad revision"
-msgstr "%s：错误的版本"
+msgstr "%s：无效的版本"
#: sequencer.c
msgid "can't revert as initial commit"
#: setup.c
#, c-format
msgid "not a git repository: %s"
-msgstr "不是 git 仓库：%s"
+msgstr "不是 Git 仓库：%s"
#: setup.c
#, c-format
#: setup.c
#, c-format
msgid "not a git repository: '%s'"
-msgstr "不是 git 仓库：'%s'"
+msgstr "不是 Git 仓库：'%s'"
#: setup.c
#, c-format
msgid "cannot chdir to '%s'"
-msgstr "不能切换目录到 '%s'"
+msgstr "无法切换目录到 '%s'"
#: setup.c
#, c-format
#: setup.c
msgid "Unable to read current working directory"
-msgstr "不能读取当前工作目录"
+msgstr "无法读取当前工作目录"
#: setup.c
#, c-format
msgid "cannot change to '%s'"
-msgstr "不能切换到 '%s'"
+msgstr "无法切换到 '%s'"
#: setup.c
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
-msgstr "不是 git 仓库（或者任何父目录）：%s"
+msgstr "不是 Git 仓库（或者任何父目录）：%s"
#: setup.c
#, c-format
"not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
-"不是 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
+"不是 Git 仓库（或者直至挂载点 %s 的任何父目录）\n"
"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
#: setup.c
#: setup.c
#, c-format
msgid "cannot stat template '%s'"
-msgstr "不能对模版 '%s' 调用 stat"
+msgstr "无法对模板 '%s' 调用 stat"
#: setup.c
#, c-format
msgid "cannot opendir '%s'"
-msgstr "不能打开目录 '%s'"
+msgstr "无法打开目录 '%s'"
#: setup.c
#, c-format
msgid "cannot readlink '%s'"
-msgstr "不能读取链接 '%s'"
+msgstr "无法读取链接 '%s'"
#: setup.c
#, c-format
msgid "cannot symlink '%s' '%s'"
-msgstr "不能自 '%s' 到 '%s' 创建符号链接"
+msgstr "无法从 '%s' 到 '%s' 创建符号链接"
#: setup.c
#, c-format
msgid "cannot copy '%s' to '%s'"
-msgstr "不能拷贝 '%s' 至 '%s'"
+msgstr "无法拷贝 '%s' 至 '%s'"
#: setup.c
#, c-format
msgid "ignoring template %s"
-msgstr "忽略模版 %s"
+msgstr "忽略模板 %s"
#: setup.c
#, c-format
msgid "templates not found in %s"
-msgstr "没有在 %s 中找到模版"
+msgstr "没有在 %s 中找到模板"
#: setup.c
#, c-format
msgid "not copying templates from '%s': %s"
-msgstr "没有从 '%s' 复制模版：%s"
+msgstr "没有从 '%s' 复制模板：%s"
#: setup.c
#, c-format
#: setup.c
#, c-format
msgid "unable to handle file type %d"
-msgstr "不能处理 %d 类型的文件"
+msgstr "无法处理 %d 类型的文件"
#: setup.c
#, c-format
msgid "unable to move %s to %s"
-msgstr "不能移动 %s 至 %s"
+msgstr "无法移动 %s 至 %s"
#: setup.c
msgid "attempt to reinitialize repository with different hash"
#: setup.c
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
-msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
+msgstr "在 %s%s 重新初始化已存在的共享 Git 仓库\n"
#: setup.c
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
-msgstr "å·²é\87\8dæ\96°å\88\9då§\8bå\8c\96å·²å\98å\9c¨ç\9a\84 Git ä»\93åº\93äº\8e %s%s\n"
+msgstr "å\9c¨ %s%s é\87\8dæ\96°å\88\9då§\8bå\8c\96å·²å\98å\9c¨ç\9a\84 Git ä»\93åº\93\n"
#: setup.c
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
-msgstr "å·²å\88\9då§\8bå\8c\96空ç\9a\84å\85±äº« Git ä»\93åº\93äº\8e %s%s\n"
+msgstr "å\9c¨ %s%s å\88\9då§\8bå\8c\96空ç\9a\84å\85±äº« Git ä»\93åº\93\n"
#: setup.c
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
-msgstr "å·²å\88\9då§\8bå\8c\96空ç\9a\84 Git ä»\93åº\93äº\8e %s%s\n"
+msgstr "å\9c¨ %s%s å\88\9då§\8bå\8c\96空ç\9a\84 Git ä»\93åº\93\n"
#: sparse-index.c
#, c-format
#: strbuf.c
#, c-format
msgid "bad %s format: element '%s' does not start with '('"
-msgstr "坏的 %s 格式：元素 '%s' 没有以 '(' 开头"
+msgstr "无效的 %s 格式：元素 '%s' 没有以 '(' 开头"
#. TRANSLATORS: The first %s is a command like "ls-tree".
#: strbuf.c
#, c-format
msgid "bad %s format: element '%s' does not end in ')'"
-msgstr "坏的 %s 格式：元素 '%s' 没有以 ')' 结尾"
+msgstr "无效的 %s 格式：元素 '%s' 没有以 ')' 结尾"
#. TRANSLATORS: %s is a command like "ls-tree".
#: strbuf.c
#, c-format
msgid "bad %s format: %%%.*s"
-msgstr "坏的 %s 格式：%%%.*s"
+msgstr "无效的 %s 格式：%%%.*s"
#: strbuf.c
#, c-format
#: submodule-config.c
#, c-format
msgid "Could not update .gitmodules entry %s"
-msgstr "不能更新 .gitmodules 条目 %s"
+msgstr "无法更新 .gitmodules 条目 %s"
#: submodule.c
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
#: submodule.c
#, c-format
msgid "bad --ignore-submodules argument: %s"
-msgstr "坏的 --ignore-submodules 参数：%s"
+msgstr "无效的 --ignore-submodules 参数：%s"
#: submodule.c
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
-msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。"
+msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。跳过它。"
#: submodule.c
#, c-format
#: submodule.c
#, c-format
msgid "Could not access submodule '%s' at commit %s\n"
-msgstr "无法访问子模组 '%s' 提交 %s\n"
+msgstr "无法访问子模组 '%s' 的提交 %s\n"
#: submodule.c
#, c-format
msgid "Fetching submodule %s%s at commit %s\n"
-msgstr "正在获取子模组 %s%s 提交 %s\n"
+msgstr "正在获取子模组 %s%s 的提交 %s\n"
#: submodule.c
#, c-format
#: submodule.c
#, c-format
msgid "'%s' not recognized as a git repository"
-msgstr "无法将 '%s' 识别为 git 仓库"
+msgstr "无法将 '%s' 识别为 Git 仓库"
#: submodule.c
#, c-format
#: submodule.c
#, c-format
msgid "could not recurse into submodule '%s'"
-msgstr "æ\97 æ³\95é\80\92å½\92è¿\9bå\90模ç»\84è·¯å¾\84 '%s'"
+msgstr "æ\97 æ³\95é\80\92å½\92è¿\9bå\85¥å\90模ç»\84 '%s'"
#: submodule.c
msgid "could not reset submodule index"
#: submodule.c
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
+msgstr "子模组 Git 目录 '%s' 位于 Git 目录 '%.*s' 中"
#: submodule.c
#, c-format
#: submodule.c
#, c-format
msgid "could not lookup name for submodule '%s'"
-msgstr "不能查询子模组 '%s' 的名称"
+msgstr "无法查询子模组 '%s' 的名称"
#: submodule.c
#, c-format
msgid "refusing to move '%s' into an existing git dir"
-msgstr "禁止移动 '%s' 到现存 git 目录中"
+msgstr "拒绝移动 '%s' 到现存 Git 目录中"
#: submodule.c
#, c-format
"'%s' to\n"
"'%s'\n"
msgstr ""
-"将 '%s%s' 的 git 目录从\n"
+"将 '%s%s' 的 Git 目录从\n"
"'%s' 迁移至\n"
"'%s'\n"
#: submodule.c
#, c-format
msgid "ls-tree returned unexpected return code %d"
-msgstr "ls-tree è¿\94å\9b\9eæ\9cªç\9f¥è¿\94å\9b\9eå\80¼ %d"
+msgstr "ls-tree è¿\94å\9b\9eæ\84\8få¤\96è¿\94å\9b\9eç \81 %d"
#: symlinks.c
#, c-format
#: t/helper/test-bundle-uri.c
msgid "no remote configured to get bundle URIs from"
-msgstr "没有远程被设置为可以获取归档包 URI"
+msgstr "没有配置可用于获取 bundle URI 的远程"
#: t/helper/test-bundle-uri.c
msgid "could not get the bundle-uri list"
#: t/helper/test-read-midx.c
msgid "could not determine MIDX preferred pack"
-msgstr "不能确定多包索引的首选包"
+msgstr "无法确定多包索引的首选包"
#: t/helper/test-serve-v2.c
msgid "test-tool serve-v2 [<options>]"
#: t/helper/test-simple-ipc.c
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
-msgstr "test-helper simple-ipc is-active [<名字>] [<选项>]"
+msgstr "test-helper simple-ipc is-active [<名称>] [<选项>]"
#: t/helper/test-simple-ipc.c
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
-msgstr "test-helper simple-ipc run-daemon [<名字>] [<线程>]"
+msgstr "test-helper simple-ipc run-daemon [<名称>] [<线程>]"
#: t/helper/test-simple-ipc.c
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
-msgstr "test-helper simple-ipc start-daemon [<名字>] [<线程>] [<最大等待>]"
+msgstr "test-helper simple-ipc start-daemon [<名称>] [<线程>] [<最大等待>]"
#: t/helper/test-simple-ipc.c
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
-msgstr "test-helper simple-ipc stop-daemon [<名字>] [<最大等待>]"
+msgstr "test-helper simple-ipc stop-daemon [<名称>] [<最大等待>]"
#: t/helper/test-simple-ipc.c
msgid "test-helper simple-ipc send [<name>] [<token>]"
-msgstr "test-helper simple-ipc send [<名字>] [<令牌>]"
+msgstr "test-helper simple-ipc send [<名称>] [<令牌>]"
#: t/helper/test-simple-ipc.c
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
-msgstr "test-helper simple-ipc sendbytes [<名字>] [<字节数>] [<字节>]"
+msgstr "test-helper simple-ipc sendbytes [<名称>] [<字节数>] [<字节>]"
#: t/helper/test-simple-ipc.c
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
msgstr ""
-"test-helper simple-ipc multiple [<名字>] [<线程>] [<字节计数>] [<批处理大"
+"test-helper simple-ipc multiple [<名称>] [<线程>] [<字节计数>] [<批处理大"
"小>]"
#: t/helper/test-simple-ipc.c
msgid "name or pathname of unix domain socket"
-msgstr "unix 域套接字的名称或路径名"
+msgstr "Unix 域套接字的名称或路径名"
#: t/helper/test-simple-ipc.c
msgid "named-pipe name"
-msgstr "命名管道的名字"
+msgstr "命名管道的名称"
#: t/helper/test-simple-ipc.c
msgid "number of threads in server thread pool"
#: t/helper/test-simple-ipc.c
msgid "ballast character"
-msgstr "ballast character"
+msgstr "压仓字符"
#: t/helper/test-simple-ipc.c
msgid "token"
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
"version of Git"
-msgstr "未知的强制能力 %s，该远程助手可能需要新版本的Git"
+msgstr "未知的强制能力 %s，该远程助手可能需要新版本的 Git"
#: transport-helper.c
msgid "this remote helper should implement refspec capability"
#: transport-helper.c
msgid "couldn't run fast-import"
-msgstr "不能执行 fast-import"
+msgstr "无法执行 fast-import"
#: transport-helper.c
msgid "error while running fast-import"
#: transport-helper.c
#, c-format
msgid "can't connect to subservice %s"
-msgstr "不能连接到子服务 %s"
+msgstr "无法连接到子服务 %s"
#: transport-helper.c transport.c
msgid "--negotiate-only requires protocol v2"
#: transport-helper.c
msgid "remote-helper doesn't support push; refspec needed"
-msgstr "remote-heper 不支持推送，需要引用规格"
+msgstr "remote-helper 不支持推送，需要引用规格"
#: transport-helper.c
#, c-format
#: transport-helper.c
#, c-format
msgid "can't start thread for copying data: %s"
-msgstr "不能启动线程来拷贝数据：%s"
+msgstr "无法启动线程来拷贝数据：%s"
#: transport-helper.c
#, c-format
#: transport-helper.c
msgid "can't start thread for copying data"
-msgstr "不能启动线程来拷贝数据"
+msgstr "无法启动线程来拷贝数据"
#: transport.c
#, c-format
#: transport.c
#, c-format
msgid "could not read bundle '%s'"
-msgstr "无法读取归档包 '%s'"
+msgstr "无法读取捆绑包 '%s'"
#: transport.c
#, c-format
#: transport.c
msgid "could not parse transport.color.* config"
-msgstr "不能解析 transport.color.* 配置"
+msgstr "无法解析 transport.color.* 配置"
#: transport.c
msgid "support for protocol v2 not implemented yet"
#: transport.c
msgid "failed to push all needed submodules"
-msgstr "不能推送全部需要的子模组"
+msgstr "无法推送全部需要的子模组"
#: transport.c
msgid "bundle-uri operation not supported by protocol"
#: tree-walk.c
msgid "too-short tree object"
-msgstr "太短的树对象"
+msgstr "树对象太短"
#: tree-walk.c
msgid "malformed mode in tree entry"
#: tree-walk.c
msgid "too-short tree file"
-msgstr "太短的树文件"
+msgstr "树文件太短"
#: unpack-trees.c
#, c-format
"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
"您对下列文件的本地修改将被检出操作覆盖：\n"
-"%%s请在切换分支前提交或贮藏您的修改。"
+"%%s请在切换分支前提交或储藏您的修改。"
#: unpack-trees.c
#, c-format
"%%sPlease commit your changes or stash them before you merge."
msgstr ""
"您对下列文件的本地修改将被合并操作覆盖：\n"
-"%%s请在合并前提交或贮藏您的修改。"
+"%%s请在合并前提交或储藏您的修改。"
#: unpack-trees.c
#, c-format
"%%sPlease commit your changes or stash them before you %s."
msgstr ""
"您对下列文件的本地修改将被 %s 覆盖：\n"
-"%%s请在 %s 之前提交或贮藏您的修改。"
+"%%s请在 %s 之前提交或储藏您的修改。"
#: unpack-trees.c
#, c-format
#: unpack-trees.c
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
-msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
+msgstr "条目 '%s' 和 '%s' 重叠。无法绑定。"
#: unpack-trees.c
#, c-format
"patterns:\n"
"%s"
msgstr ""
-"尽管存在稀疏检出模板，以下路径不是最新，因而保留：\n"
+"尽管存在稀疏检出模式，以下路径不是最新，因而保留：\n"
"%s"
#: unpack-trees.c
"The following paths are unmerged and were left despite sparse patterns:\n"
"%s"
msgstr ""
-"尽管存在稀疏检出模板，以下路径处于未合并状态，因而保留：\n"
+"尽管存在稀疏检出模式，以下路径处于未合并状态，因而保留：\n"
"%s"
#: unpack-trees.c
"patterns:\n"
"%s"
msgstr ""
-"尽管存在稀疏检出模板，以下路径已经存在，因而未更新：\n"
+"尽管存在稀疏检出模式，以下路径已经存在，因而未更新：\n"
"%s"
#: unpack-trees.c
#: usage.c
#, c-format
msgid "'%s' is nominated for removal.\n"
-msgstr "'%s' 被提名以移除。\n"
+msgstr "'%s' 已被列入移除计划。\n"
#: usage.c
#, c-format
#: worktree.c
msgid "unable to set extensions.relativeWorktrees setting"
-msgstr "无法设定 extensions.relativeWorktrees 的设置"
+msgstr "无法设定 extensions.relativeWorktrees 的配置"
#: wrapper.c
#, c-format
#: wrapper.c
#, c-format
msgid "unable to access '%s'"
-msgstr "不能访问 '%s'"
+msgstr "无法访问 '%s'"
#: wrapper.c
msgid "unable to get current working directory"
-msgstr "不能获取当前工作目录"
+msgstr "无法获取当前工作目录"
#: wrapper.c
msgid "unable to get random bytes"
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
-msgstr[0] "您的贮藏区当前有 %d 条记录"
-msgstr[1] "您的贮藏区当前有 %d 条记录"
+msgstr[0] "您的储藏区当前有 %d 条记录"
+msgstr[1] "您的储藏区当前有 %d 条记录"
#: wt-status.c
msgid "Submodules changed but not updated:"
"You can use '--no-ahead-behind' to avoid this.\n"
msgstr ""
"\n"
-"花了 %.2f 秒才计算出分支的领先/落后范围。\n"
-"为避免，您可以使用 '--no-ahead-behind'。\n"
+"花了 %.2f 秒才计算出分支的领先/落后值。\n"
+"为避免这种情况，您可以使用 '--no-ahead-behind'。\n"
#: wt-status.c
msgid "You have unmerged paths."
#: wt-status.c
#, c-format
msgid " (see more in file %s)"
-msgstr " （更多参见文件 %s）"
+msgstr " ï¼\88æ\9b´å¤\9aå\86\85容å\8f\82è§\81æ\96\87件 %sï¼\89"
#: wt-status.c
msgid "No commands remaining."
-msgstr "æ\9cªå\89©ä¸\8bä»»ä½\95命令。"
+msgstr "没æ\9c\89å\89©ä½\99命令。"
#: wt-status.c
#, c-format
# 译者：注意保持前导空格
#: wt-status.c
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
+msgstr " （一旦您的工作目录干净后，运行 \"git rebase --continue\"）"
#: wt-status.c
#, c-format
# 译者：注意保持前导空格
#: wt-status.c
msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr " ï¼\88使ç\94¨ \"git commit --amend\" 修补当前提交）"
+msgstr " ï¼\88使ç\94¨ \"git commit --amend\" 修订当前提交）"
# 译者：注意保持前导空格
#: wt-status.c
#: wt-status.c
msgid "Revert currently in progress."
-msgstr "还原操作正在行中。"
+msgstr "è¿\98å\8e\9fæ\93\8dä½\9cæ£å\9c¨è¿\9bè¡\8cä¸ã\80\82"
#: wt-status.c
#, c-format
msgid "You are currently reverting commit %s."
-msgstr "您在执行反转提交 %s 的操作。"
+msgstr "您在执行还原提交 %s 的操作。"
# 译者：注意保持前导空格
#: wt-status.c
# 译者：注意保持前导空格
#: wt-status.c
msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
+msgstr " （使用 \"git revert --abort\" 以取消还原操作）"
#: wt-status.c
#, c-format
#: wt-status.c
msgid "You are in a sparse checkout."
-msgstr "您处于一个稀疏检出中。"
+msgstr "您处于稀疏检出状态。"
#: wt-status.c
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr "æ\82¨å¤\84äº\8eç¨\80ç\96\8fæ£\80å\87ºç\8a¶æ\80\81ï¼\8cå\8c\85å\90« %d%% ç\9a\84è·\9f踪æ\96\87件"
+msgstr "æ\82¨å¤\84äº\8eç¨\80ç\96\8fæ£\80å\87ºç\8a¶æ\80\81ï¼\8cå·²å\8c\85å\90« %d%% ç\9a\84è·\9f踪æ\96\87件ã\80\82"
#: wt-status.c
msgid "On branch "
"It took %.2f seconds to enumerate untracked files,\n"
"but the results were cached, and subsequent runs may be faster."
msgstr ""
-"æ\9e\9a举æ\9cªè¿½踪的文件花了 %.2f 秒，\n"
+"æ\9e\9a举æ\9cªè·\9f踪的文件花了 %.2f 秒，\n"
"结果已被缓存，后续的执行会更快。"
#: wt-status.c
#, c-format
msgid "It took %.2f seconds to enumerate untracked files."
-msgstr "æ\9e\9a举æ\9cªè¿½踪的文件花了 %.2f 秒。"
+msgstr "æ\9e\9a举æ\9cªè·\9f踪的文件花了 %.2f 秒。"
#: wt-status.c
msgid "See 'git help status' for information on how to improve this."
-msgstr "参见 'git help status' 来获取如何改善的信息。"
+msgstr "参见 'git help status' 了解如何改善。"
#: wt-status.c
#, c-format
msgid "Untracked files not listed%s"
-msgstr "æ\9cªè·\9f踪ç\9a\84æ\96\87件没æ\9c\89列出%s"
+msgstr "æ\9cªè·\9f踪ç\9a\84æ\96\87件æ\9cª列出%s"
# 译者：中文字符串拼接，可删除前导空格
#: wt-status.c
#: wt-status.c
#, c-format
msgid "nothing to commit, working tree clean\n"
-msgstr "æ\97 æ\96\87件è¦\81æ\8f\90交ï¼\8cå¹²å\87\80ç\9a\84å·¥ä½\9cå\8cº\n"
+msgstr "æ\97 æ\96\87件è¦\81æ\8f\90交ï¼\8cå·¥ä½\9cå\8cºå¹²å\87\80\n"
#: wt-status.c
msgid "No commits yet on "
-msgstr "尚无提交在 "
+msgstr "尚无提交于 "
#: wt-status.c
msgid "HEAD (no branch)"
#: wt-status.c
#, c-format
msgid "cannot %s: You have unstaged changes."
-msgstr "不能%s：您有未暂存的变更。"
+msgstr "无法 %s：您有未暂存的变更。"
#: wt-status.c
msgid "additionally, your index contains uncommitted changes."
#: wt-status.c
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
-msgstr "不能%s：您的索引中包含未提交的变更。"
+msgstr "不能 %s：您的索引中包含未提交的变更。"
#: xdiff-interface.c
#, c-format
#: git-merge-octopus.sh
msgid "Automated merge did not work."
-msgstr "自动合并未生效。"
+msgstr "自动合并未成功。"
#: git-merge-octopus.sh
msgid "Should not be doing an octopus."
#: git-sh-setup.sh
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
-msgstr "不能切换目录到 $cdup，工作区的顶级目录"
+msgstr "无法切换到工作区的顶级目录 $cdup"
#: git-sh-setup.sh
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "致命错误：$program_name 不能在没有工作区的情况下使用"
+msgstr "致命错误：$program_name 无法在没有工作区的情况下使用"
#: git-sh-setup.sh
msgid "Cannot rewrite branches: You have unstaged changes."
-msgstr "不能重写分支：您有未暂存的变更。"
+msgstr "无法重写分支：您有未暂存的变更。"
#: git-sh-setup.sh
#, sh-format
msgid "Cannot $action: You have unstaged changes."
-msgstr "不能 $action：您有未暂存的变更。"
+msgstr "无法 $action：您有未暂存的变更。"
#: git-sh-setup.sh
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
-msgstr "不能 $action：您的索引中包含未提交的变更。"
+msgstr "无法 $action：您的索引中包含未提交的变更。"
#: git-sh-setup.sh
msgid "Additionally, your index contains uncommitted changes."
#: git-sh-setup.sh
msgid "Unable to determine absolute path of git directory"
-msgstr "不能确定 git 目录的绝对路径"
+msgstr "无法确定 Git 目录的绝对路径"
#: git-send-email.perl
msgid "local zone differs from GMT by a non-minute interval\n"
-msgstr "本地时间和 GMT 有不到一分钟间隔\n"
+msgstr "本地时间与 GMT 的偏移不是整数分钟\n"
#: git-send-email.perl
msgid "local time offset greater than or equal to 24 hours\n"
#: git-send-email.perl
#, perl-format
msgid "'%s.final' contains the composed email.\n"
-msgstr "'%s.final' 包含编辑的邮件。\n"
+msgstr "'%s.final' 包含已撰写的邮件。\n"
#: git-send-email.perl
msgid "--dump-aliases incompatible with other options\n"
-msgstr "--dump-aliases 和其它选项不兼容\n"
+msgstr "--dump-aliases 和其他选项不兼容\n"
#: git-send-email.perl
msgid "--dump-aliases and --translate-aliases are mutually exclusive\n"
#: git-send-email.perl
msgid "Cannot run git format-patch from outside a repository\n"
-msgstr "不能在仓库之外运行 git format-patch\n"
+msgstr "无法在仓库之外运行 git format-patch\n"
#: git-send-email.perl
msgid ""
#: git-send-email.perl
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
-msgstr "警告：不能识别的 sendmail 行：%s\n"
+msgstr "警告：无法识别的 sendmail 行：%s\n"
#: git-send-email.perl
#, perl-format
#: git-send-email.perl
msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？"
+msgstr "要声明哪种 8bit 编码格式 [UTF-8]？"
#: git-send-email.perl
#, perl-format
msgstr ""
"拒绝发送，因为补丁\n"
"\t%s\n"
-"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n"
+"包含模板标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n"
#: git-send-email.perl
msgid "To whom should the emails be sent (if anyone)?"
-msgstr "邮件将要发送给谁？"
+msgstr "é\82®ä»¶å°\86è¦\81å\8f\91é\80\81ç»\99è°\81ï¼\88å¦\82æ\9e\9cæ\9c\89ç\9a\84è¯\9dï¼\89ï¼\9f"
#: git-send-email.perl
#, perl-format
#: git-send-email.perl
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
-msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ？"
+msgstr "如有的话，Message-ID 要用作第一封邮件的 In-Reply-To 吗？"
#: git-send-email.perl
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
-msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n"
+msgstr "错误：无法从 %s 中提取一个有效的邮件地址\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
"\n"
msgstr ""
" 以上的抄送列表（Cc）已经用补丁提交信息中发现的地址进行\n"
-" 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
-" sendemail.confirm 配置设置。\n"
+" 了扩展。默认情况下 send-email 会给出提示。这个行为由\n"
+" sendemail.confirm 配置控制。\n"
"\n"
" 更多信息，执行 'git send-email --help'。\n"
" 要保持当前行为，但不显示此信息，运行 'git config --global\n"
#: git-send-email.perl
#, perl-format
msgid "Dry-Sent %s"
-msgstr "æ¼\94ä¹ 发送 %s"
+msgstr "模æ\8b\9f发送 %s"
#: git-send-email.perl
#, perl-format
#: git-send-email.perl
msgid "Dry-OK. Log says:"
-msgstr "æ¼\94ä¹ 成功。日志说："
+msgstr "模æ\8b\9f成功。日志说："
#: git-send-email.perl
msgid "OK. Log says:"
#: git-send-email.perl
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
-msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
+msgstr "(mbox) 添加 cc：%s 来自行 '%s'\n"
#: git-send-email.perl
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
-msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
+msgstr "(mbox) 添加 to：%s 来自行 '%s'\n"
#: git-send-email.perl
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
-msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
+msgstr "(non-mbox) 添加 cc：%s 来自行 '%s'\n"
#: git-send-email.perl
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
-msgstr "(body) 添加 cc：%s 自行 '%s'\n"
+msgstr "(body) 添加 cc：%s 来自行 '%s'\n"
#: git-send-email.perl
#, perl-format
#: git-send-email.perl
#, perl-format
msgid "(%s) Could not execute '%s'"
-msgstr "(%s) 不能执行 '%s'"
+msgstr "(%s) 无法执行 '%s'"
#: git-send-email.perl
#, perl-format
msgid "(%s) Malformed output from '%s'"
-msgstr "(%s) 非法的输出信息，来自于：'%s'"
+msgstr "(%s) 来自 '%s' 的输出信息格式错误"
#: git-send-email.perl
#, perl-format
#: git-send-email.perl
msgid "cannot send message as 7bit"
-msgstr "不能以 7bit 形式发送信息"
+msgstr "无法以 7bit 形式发送信息"
#: git-send-email.perl
msgid "invalid transfer encoding"
#: git-send-email.perl
#, perl-format
msgid "unable to open %s: %s\n"
-msgstr "不能打开 %s：%s\n"
+msgstr "无法打开 %s：%s\n"
#: git-send-email.perl
#, perl-format
projects / thirdparty / git.git / commitdiff
