# Chinese translations for Git package
# Git 软件包的简体中文翻译.
# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
# This file is distributed under the same license as the Git package.
# Contributors:
#   - Jiang Xin <worldhello.net AT gmail.com>
#   - Lian Cheng <rhythm.mail AT gmail.com>
#   - Ray Chen <oldsharp AT gmail.com>
#   - Riku <lu.riku AT gmail.com>
#   - Thynson <lanxingcan AT gmail.com>
#   - ws3389 <willsmith3389 AT gmail.com>
#   - Wang Sheng <wangsheng2008love AT 163.com>
#   - Yichao Yu <yyc1992 AT gmail.com>
#   - Zhuang Ya <zhuangya AT me.com>
#
#  Git glossary for Chinese translators
#
#   English                          |  Chinese
#   ---------------------------------+--------------------------------------
#   3-way merge                      |  三方合并
#   abbreviate                       |  简写（的 SHA-1 值）
#   alternate object database        |  备用对象库
#   amend                            |  修补
#   ancestor                         |  祖先，祖先提交
#   annotated tag                    |  附注标签
#   bare repository                  |  纯仓库
#   bisect                           |  二分查找
#   blob object                      |  数据对象
#   branch                           |  分支
#   bundle                           |  包
#   bypass                           |  绕过
#   cache                            |  索引（的别称）
#   chain                            |  （提交）链
#   changeset                        |  变更集
#   checkout                         |  检出
#   checksum                         |  校验，校验和
#   cherry-picking                   |  拣选
#   clean                            |  干净（的工作区）
#   clone                            |  克隆
#   commit                           |  提交
#   commit message                   |  提交说明
#   commit object                    |  提交对象
#   commit-ish (also committish)     |  提交号
#   conflict                         |  冲突
#   core Git                         |  核心 Git 工具
#   DAG                              |  有向无环图
#   dangling object                  |  摇摆对象
#   detached HEAD                    |  分离头指针
#   directory                        |  目录
#   dirty                            |  脏（的工作区）
#   dumb HTTP protocol               |  哑 HTTP 协议
#   evil merge                       |  坏合并（合并引入了父提交没有的修改）
#   fast-forward                     |  快进
#   fetch                            |  获取
#   file system                      |  文件系统
#   fork                             |  派生
#   Git archive                      |  仓库（对于 arch 用户）
#   gitfile                          |  gitfile（仓库链接文件）
#   grafts                           |  （提交）嫁接
#   hash                             |  哈希值
#   HEAD                             |  HEAD（头指针，亦即当前分支）
#   head                             |  头、分支
#   head ref                         |  分支
#   header                           |  头信息
#   hook                             |  钩子
#   hunk                             |  补丁片段
#   index                            |  索引
#   index entry                      |  索引条目
#   loose object                     |  松散对象
#   loose refs                       |  松散引用
#   master                           |  master（默认分支名）
#   merge                            |  合并
#   object                           |  对象
#   object database                  |  对象库
#   object identifier                |  对象标识符
#   object name                      |  对象名称
#   object type                      |  对象类型
#   octopus                          |  章鱼式合并（两分支以上的合并）
#   origin                           |  origin（默认的远程名称）
#   pack                             |  包
#   pack index                       |  包索引
#   packfile                         |  包文件
#   parent                           |  父提交
#   patch                            |  补丁
#   pathspec                         |  路径规格
#   pattern                          |  模式
#   pickaxe                          |  挖掘
#   plumbing                         |  管件（Git 底层核心命令的别称）
#   porcelain                        |  瓷件（Git 上层封装命令的别称）
#   precious-objects repo            |  珍品仓库
#   prune                            |  清除
#   pull                             |  拉，拉取
#   push                             |  推，推送
#   reachable                        |  可达
#   rebase                           |  变基
#   ref                              |  引用
#   reflog                           |  引用日志
#   refspec                          |  引用规格
#   remote                           |  远程，远程仓库
#   remote-tracking branch           |  远程跟踪分支
#   replay                           |  重放
#   repo                             |  仓库
#   repository                       |  仓库
#   resolve                          |  （冲突）解决
#   revert                           |  还原
#   revision                         |  版本
#   rewind                           |  回退
#   SCM                              |  源代码管理（工具）
#   SHA-1                            |  SHA-1（安全哈希算法1）
#   shallow repository               |  浅（克隆）仓库
#   signed tag                       |  签名标签
#   smart HTTP protocol              |  智能 HTTP 协议
#   squash                           |  压缩
#   stage                            |  n. 暂存区（即索引）; v. 暂存
#   stash                            |  n. 进度保存; v. 保存进度
#   submodule                        |  子模组
#   symref                           |  符号引用
#   tag                              |  n. 标签; v. 打标签
#   tag object                       |  标签对象
#   tagger                           |  打标签者
#   topic branch                     |  主题分支
#   track                            |  跟踪
#   tree                             |  树（工作区或树对象）
#   tree object                      |  树对象
#   tree-ish (also treeish)          |  树对象（或可以解析为一树对象）
#   unmerged index                   |  未合并索引
#   unpack                           |  解包
#   unreachable object               |  不可达对象
#   unstage                          |  取消暂存
#   upstream                         |  上游
#   upstream branch                  |  上游分支
#   working tree                     |  工作区
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2017-05-05 09:35+0800\n"
"PO-Revision-Date: 2017-05-09 21:54+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: advice.c:55
#, c-format
msgid "hint: %.*s\n"
msgstr "提示：%.*s\n"

#: advice.c:83
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "无法拣选，因为您有未合并的文件。"

#: advice.c:85
msgid "Committing is not possible because you have unmerged files."
msgstr "无法提交，因为您有未合并的文件。"

#: advice.c:87
msgid "Merging is not possible because you have unmerged files."
msgstr "无法合并，因为您有未合并的文件。"

#: advice.c:89
msgid "Pulling is not possible because you have unmerged files."
msgstr "无法拉取，因为您有未合并的文件。"

#: advice.c:91
msgid "Reverting is not possible because you have unmerged files."
msgstr "无法回退，因为您有未合并的文件。"

#: advice.c:93
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "无法 %s，因为您有未合并的文件。"

#: advice.c:101
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
"请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
"解决方案并提交。"

#: advice.c:109
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"

#: advice.c:114 builtin/merge.c:1185
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"

#: advice.c:116
msgid "Please, commit your changes before merging."
msgstr "请在合并前先提交您的修改。"

#: advice.c:117
msgid "Exiting because of unfinished merge."
msgstr "因为存在未完成的合并而退出。"

#: advice.c:123
#, c-format
msgid ""
"Note: checking out '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
"state without impacting any branches by performing another checkout.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
"do so (now or later) by using -b with the checkout command again. Example:\n"
"\n"
"  git checkout -b <new-branch-name>\n"
"\n"
msgstr ""
"注意：正在检出 '%s'。\n"
"\n"
"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以通过另"
"外\n"
"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
"\n"
"如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在检出命令添加\n"
"参数 -b 来实现（现在或稍后）。例如：\n"
"\n"
"  git checkout -b <new-branch-name>\n"
"\n"

#: apply.c:57
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "未能识别的空白字符选项 '%s'"

#: apply.c:73
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"

#: apply.c:125
msgid "--reject and --3way cannot be used together."
msgstr "--reject 和 --3say 不能同时使用。"

#: apply.c:127
msgid "--cached and --3way cannot be used together."
msgstr "--cached 和 --3way 不能同时使用。"

#: apply.c:130
msgid "--3way outside a repository"
msgstr "--3way 在一个仓库之外"

#: apply.c:141
msgid "--index outside a repository"
msgstr "--index 在一个仓库之外"

#: apply.c:144
msgid "--cached outside a repository"
msgstr "--cached 在一个仓库之外"

#: apply.c:845
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "无法准备时间戳正则表达式 %s"

#: apply.c:854
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d，输入为：%s"

#: apply.c:938
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在补丁的第 %d 行找到文件名"

#: apply.c:977
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"

#: apply.c:983
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"

#: apply.c:984
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"

#: apply.c:990
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"

#: apply.c:1488
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount：意外的行：%.*s"

#: apply.c:1557
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补丁片段没有头信息：%.*s"

#: apply.c:1577
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"component (line %d)"
msgid_plural ""
"git diff header lacks filename information when removing %d leading pathname "
"components (line %d)"
msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"

#: apply.c:1589
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"

#: apply.c:1759
msgid "new file depends on old contents"
msgstr "新文件依赖旧内容"

#: apply.c:1761
msgid "deleted file still has contents"
msgstr "删除的文件仍有内容"

#: apply.c:1795
#, c-format
msgid "corrupt patch at line %d"
msgstr "补丁在第 %d 行损坏"

#: apply.c:1832
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s 依赖旧内容"

#: apply.c:1834
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s 仍有内容"

#: apply.c:1837
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告：文件 %s 成为空文件但并未删除"

#: apply.c:1984
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏：%.*s"

#: apply.c:2021
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"

#: apply.c:2182
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"

#: apply.c:2265
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"

#: apply.c:2269
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"

#: apply.c:2922
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符：'%c'"

#: apply.c:3041
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"

#: apply.c:3053
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"

#: apply.c:3059
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
"当查询：\n"
"%.*s"

#: apply.c:3081
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"

#: apply.c:3089
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"

#: apply.c:3135
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"

#: apply.c:3145
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"

#: apply.c:3153
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "补丁应用到空文件 '%s'，但其并非空文件"

#: apply.c:3171
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"

#: apply.c:3184
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"

#: apply.c:3190
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"

#: apply.c:3211
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败：%s:%ld"

#: apply.c:3333
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"

#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"

#: apply.c:3389
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读取位于符号链接中的 '%s'"

#: apply.c:3418 apply.c:3658
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"

#: apply.c:3501 apply.c:3672
#, c-format
msgid "%s: does not exist in index"
msgstr "%s：不存在于索引中"

#: apply.c:3510 apply.c:3680
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不匹配"

#: apply.c:3545
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"

#: apply.c:3548
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "回落到三方合并...\n"

#: apply.c:3564 apply.c:3568
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "无法读取 '%s' 的当前内容"

#: apply.c:3580
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "无法回落到三方合并...\n"

#: apply.c:3594
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "应用补丁到 '%s' 存在冲突。\n"

#: apply.c:3599
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功应用补丁到 '%s'。\n"

#: apply.c:3625
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"

#: apply.c:3697
#, c-format
msgid "%s: wrong type"
msgstr "%s：错误类型"

#: apply.c:3699
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o，应为 %o"

#: apply.c:3850 apply.c:3852
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"

#: apply.c:3908
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已经存在于索引中"

#: apply.c:3911
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已经存在于工作区中"

#: apply.c:3931
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"

#: apply.c:3936
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"

#: apply.c:3956
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"

#: apply.c:3960
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：补丁未应用"

#: apply.c:3975
#, c-format
msgid "Checking patch %s..."
msgstr "检查补丁 %s..."

#: apply.c:4066
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模组 %s 的 sha1 信息缺失或无效"

#: apply.c:4073
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式被改变，但它不在当前 HEAD 中"

#: apply.c:4076
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效（%s）。"

#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"

#: apply.c:4085
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在临时索引中添加 %s"

#: apply.c:4095
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把临时索引写入到 %s"

#: apply.c:4233
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"

#: apply.c:4268
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"

#: apply.c:4274
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能对新建文件 '%s' 调用 stat"

#: apply.c:4282
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"

#: apply.c:4288 apply.c:4432
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"

#: apply.c:4329
#, c-format
msgid "failed to write to '%s'"
msgstr "无法写入 '%s'"

#: apply.c:4333
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"

#: apply.c:4403
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"

#: apply.c:4501
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"

#: apply.c:4509
msgid "internal error"
msgstr "内部错误"

#: apply.c:4512
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

#: apply.c:4523
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"

#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"

#: apply.c:4545
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"

#: apply.c:4549
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"

#: apply.c:4659
#, c-format
msgid "Skipped patch '%s'."
msgstr "略过补丁 '%s'。"

#: apply.c:4667
msgid "unrecognized input"
msgstr "未能识别的输入"

#: apply.c:4686
msgid "unable to read index file"
msgstr "无法读取索引文件"

#: apply.c:4823
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s'：%s"

#: apply.c:4850
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"

#: apply.c:4856 apply.c:4871
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行有空白字符误用。"
msgstr[1] "%d 行有空白字符误用。"

#: apply.c:4864
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "修复空白错误后，应用了 %d 行。"
msgstr[1] "修复空白错误后，应用了 %d 行。"

#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"

#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279
#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
#: git-add--interactive.perl:239
msgid "path"
msgstr "路径"

#: apply.c:4912
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"

#: apply.c:4915
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"

#: apply.c:4917 builtin/am.c:2285
msgid "num"
msgstr "数字"

#: apply.c:4918
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"

#: apply.c:4921
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"

#: apply.c:4923
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"

#: apply.c:4927
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"

#: apply.c:4929
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁，而是显示输入的概要"

#: apply.c:4931
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁，而是查看补丁是否可应用"

#: apply.c:4933
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"

#: apply.c:4935
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"

#: apply.c:4937
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"

#: apply.c:4939
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"

#: apply.c:4941
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三方合并"

#: apply.c:4943
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"

#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"

#: apply.c:4948
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"

#: apply.c:4949 builtin/am.c:2264
msgid "action"
msgstr "动作"

#: apply.c:4950
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"

#: apply.c:4953 apply.c:4956
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"

#: apply.c:4959
msgid "apply the patch in reverse"
msgstr "反向应用补丁"

#: apply.c:4961
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"

#: apply.c:4963
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"

#: apply.c:4965
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"

#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19
#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
msgid "be verbose"
msgstr "冗长输出"

#: apply.c:4968
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"

#: apply.c:4971
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"

#: apply.c:4973 builtin/am.c:2273
msgid "root"
msgstr "根目录"

#: apply.c:4974
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"

#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<选项>] <树或提交> [<路径>...]"

#: archive.c:13
msgid "git archive --list"
msgstr "git archive --list"

#: archive.c:14
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"

#: archive.c:15
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"

#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹配任何文件"

#: archive.c:417
msgid "fmt"
msgstr "格式"

#: archive.c:417
msgid "archive format"
msgstr "归档格式"

#: archive.c:418 builtin/log.c:1436
msgid "prefix"
msgstr "前缀"

#: archive.c:419
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"

#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60
#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552
#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
#: parse-options.h:153
msgid "file"
msgstr "文件"

#: archive.c:421 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "归档写入此文件"

#: archive.c:423
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"

#: archive.c:424
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"

#: archive.c:425
msgid "store only"
msgstr "只存储"

#: archive.c:426
msgid "compress faster"
msgstr "压缩速度更快"

#: archive.c:434
msgid "compress better"
msgstr "压缩效果更好"

#: archive.c:437
msgid "list supported archive formats"
msgstr "列出支持的归档格式"

#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
msgid "repo"
msgstr "仓库"

#: archive.c:440 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库（<仓库>）提取归档文件"

#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
msgid "command"
msgstr "命令"

#: archive.c:442 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"

#: archive.c:449
msgid "Unexpected option --remote"
msgstr "未知参数 --remote"

#: archive.c:451
msgid "Option --exec can only be used together with --remote"
msgstr "选项 --exec 只能和 --remote 同时使用"

#: archive.c:453
msgid "Unexpected option --output"
msgstr "未知参数 --output"

#: archive.c:475
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知归档格式 '%s'"

#: archive.c:482
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "参数不支持此格式 '%s'：-%d"

#: attr.c:212
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是一个有效的属性名"

#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时，使用 '\\!'。"

#: bisect.c:444
#, c-format
msgid "Could not open file '%s'"
msgstr "不能打开文件 '%s'"

#: bisect.c:449
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "文件 '%s' 包含错误的引用格式：%s"

#: bisect.c:657
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我们无法进行更多的二分查找！\n"

#: bisect.c:710
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一个有效的提交名 %s"

#: bisect.c:734
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
"合并基线 %s 是坏的。\n"
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"

#: bisect.c:739
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
"合并基线 %s 是新的。\n"
"介于 %s 和 [%s] 之间的属性已经被修改。\n"

#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
"合并基线 %s 是 %s。\n"
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"

#: bisect.c:752
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"git bisect cannot work properly in this case.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr ""
"一些 %s 版本不是 %s 版本的祖先。\n"
"这种情况下 git 二分查找无法正常工作。\n"
"您可能弄错了 %s 和 %s 版本？\n"

#: bisect.c:765
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"So we cannot be sure the first %s commit is between %s and %s.\n"
"We continue anyway."
msgstr ""
"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
"我们仍旧继续。"

#: bisect.c:800
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中：合并基线必须是经过测试的\n"

#: bisect.c:851
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"

#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"

#: bisect.c:919
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"

#: bisect.c:949
msgid "reading bisect refs failed"
msgstr "读取二分查找引用失败"

#: bisect.c:969
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同时为 %s 和 %s\n"

#: bisect.c:977
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
"没有发现可测试的提交。\n"
"可能您在运行时使用了错误的路径参数？\n"

#: bisect.c:996
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
msgstr[0] "（大概 %d 步）"
msgstr[1] "（大概 %d 步）"

#. TRANSLATORS: the last %s will be replaced with
#. "(roughly %d steps)" translation
#: bisect.c:1000
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

#: branch.c:53
#, c-format
msgid ""
"\n"
"After fixing the error cause you may try to fix up\n"
"the remote tracking information by invoking\n"
"\"git branch --set-upstream-to=%s%s%s\"."
msgstr ""
"\n"
"在修复错误后，您可以尝试修改远程跟踪分支，通过执行命令\n"
"\"git branch --set-upstream-to=%s%s%s\" 。"

#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "未设置分支 %s 作为它自己的上游。"

#: branch.c:93
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"

#: branch.c:94
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"

#: branch.c:98
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"

#: branch.c:99
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr "分支 %s 设置为跟踪本地分支 %s。"

#: branch.c:104
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"

#: branch.c:105
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr "分支 %s 设置为跟踪远程引用 %s。"

#: branch.c:109
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"

#: branch.c:110
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr "分支 %s 设置为跟踪本地引用 %s。"

#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr "无法写入上游分支配置"

#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "未跟踪：引用 %s 有歧义"

#: branch.c:185
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' 不是一个有效的分支名称。"

#: branch.c:190
#, c-format
msgid "A branch named '%s' already exists."
msgstr "一个分支名 '%s' 已经存在。"

#: branch.c:198
msgid "Cannot force update the current branch."
msgstr "无法强制更新当前分支。"

#: branch.c:218
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"

#: branch.c:220
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "请求的上游分支 '%s' 不存在"

#: branch.c:222
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"branch that already exists at the remote, you may need to\n"
"run \"git fetch\" to retrieve it.\n"
"\n"
"If you are planning to push out a new local branch that\n"
"will track its remote counterpart, you may want to use\n"
"\"git push -u\" to set the upstream config as you push."
msgstr ""
"\n"
"如果您正计划基于远程一个现存的上游分支开始你的工作，\n"
"您可能需要执行 \"git fetch\" 来获取分支。\n"
"\n"
"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"

#: branch.c:265
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "不是一个有效的对象名：'%s'。"

#: branch.c:285
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "歧义的对象名：'%s'。"

#: branch.c:290
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "无效的分支点：'%s'。"

#: branch.c:344
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已经检出到 '%s'"

#: branch.c:364
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "工作区 %s 的 HEAD 指向没有被更新"

#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr "'%s' 不像是一个 v2 版本的包文件"

#: bundle.c:61
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头：%s%s (%d)"

#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"

#: bundle.c:139
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的提交："

#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321
#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
#: builtin/merge.c:359 builtin/shortlog.c:176
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"

#: bundle.c:185
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "这个包中含有这个引用："
msgstr[1] "这个包中含有 %d 个引用："

#: bundle.c:192
msgid "The bundle records a complete history."
msgstr "这个包记录一个完整历史。"

#: bundle.c:194
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "这个包需要这个引用："
msgstr[1] "这个包需要 %d 个引用："

#: bundle.c:253
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 进程"

#: bundle.c:264
msgid "pack-objects died"
msgstr "pack-objects 终止"

#: bundle.c:304
msgid "rev-list died"
msgstr "rev-list 终止"

#: bundle.c:353
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"

#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"

#: bundle.c:451
msgid "Refusing to create empty bundle."
msgstr "不能创建空包。"

#: bundle.c:463
#, c-format
msgid "cannot create '%s'"
msgstr "不能创建 '%s'"

#: bundle.c:491
msgid "index-pack died"
msgstr "index-pack 终止"

#: color.c:300
#, c-format
msgid "invalid color value: %.*s"
msgstr "无效的颜色值：%.*s"

#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
#: builtin/am.c:1489 builtin/am.c:2126
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"

#: commit.c:42
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交!"

#: commit.c:1511
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr ""
"警告：提交说明不符合 UTF-8 字符编码。\n"
"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"
"设置为您项目所用的字符编码。\n"

#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "内存耗尽"

#: config.c:191
msgid "relative config include conditionals must come from files"
msgstr "包含相对路径的条件引用必须来自于文件"

#: config.c:711
#, c-format
msgid "bad config line %d in blob %s"
msgstr "数据对象 %2$s 中错误的配置行 %1$d"

#: config.c:715
#, c-format
msgid "bad config line %d in file %s"
msgstr "文件 %2$s 中错误的配置行 %1$d"

#: config.c:719
#, c-format
msgid "bad config line %d in standard input"
msgstr "标准输入中错误的配置行 %d"

#: config.c:723
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"

#: config.c:727
#, c-format
msgid "bad config line %d in command line %s"
msgstr "命令行 %2$s 中错误的配置行 %1$d"

#: config.c:731
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中错误的配置行 %1$d"

#: config.c:859
msgid "out of range"
msgstr "超出范围"

#: config.c:859
msgid "invalid unit"
msgstr "无效的单位"

#: config.c:865
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"

#: config.c:870
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

#: config.c:873
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

#: config.c:876
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"

#: config.c:879
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

#: config.c:882
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

#: config.c:885
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

#: config.c:980
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展 '%s' 中的用户目录"

#: config.c:1075 config.c:1086
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"

#: config.c:1203
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式：%s"

#: config.c:1359
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"

#: config.c:1557
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"

#: config.c:1611
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"

#: config.c:1970
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s：'%s'"

#: config.c:1991
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"

#: config.c:2017
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"

#: config.c:2028
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"

#: config.c:2030
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"

#: config.c:2089
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"

#: config.c:2423 config.c:2648
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"

#: config.c:2541
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"

#: config.c:2543 builtin/remote.c:774
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"

#: connect.c:49
msgid "The remote end hung up upon initial contact"
msgstr "远端在连接发起时即挂断"

#: connect.c:51
msgid ""
"Could not read from remote repository.\n"
"\n"
"Please make sure you have the correct access rights\n"
"and the repository exists."
msgstr ""
"无法读取远程仓库。\n"
"\n"
"请确认您有正确的访问权限并且仓库存在。"

#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140
msgid "Checking connectivity"
msgstr "检查连接中"

#: connected.c:75
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"

#: connected.c:95
msgid "failed write to rev-list"
msgstr "无法写入 rev-list"

#: connected.c:102
msgid "failed to close rev-list's stdin"
msgstr "无法关闭 rev-list 的标准输入"

#: convert.c:201
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
"The file will have its original line endings in your working directory."
msgstr ""
"文件 %s 中的 CRLF 将被 LF 替换。\n"
"在工作区中该文件仍保持原有的换行符。"

#: convert.c:205
#, c-format
msgid "CRLF would be replaced by LF in %s."
msgstr "文件 %s 中的 CRLF 将被 LF 替换。"

#: convert.c:211
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
"The file will have its original line endings in your working directory."
msgstr ""
"文件 %s 中的 LF 将被 CRLF 替换。\n"
"在工作区中该文件仍保持原有的换行符。"

#: convert.c:215
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "文件 %s 中的 LF 将被 CRLF 替换"

#: date.c:97
msgid "in the future"
msgstr "在将来"

#: date.c:103
#, c-format
msgid "%lu second ago"
msgid_plural "%lu seconds ago"
msgstr[0] "%lu 秒钟前"
msgstr[1] "%lu 秒钟前"

#: date.c:110
#, c-format
msgid "%lu minute ago"
msgid_plural "%lu minutes ago"
msgstr[0] "%lu 分钟前"
msgstr[1] "%lu 分钟前"

#: date.c:117
#, c-format
msgid "%lu hour ago"
msgid_plural "%lu hours ago"
msgstr[0] "%lu 小时前"
msgstr[1] "%lu 小时前"

#: date.c:124
#, c-format
msgid "%lu day ago"
msgid_plural "%lu days ago"
msgstr[0] "%lu 天前"
msgstr[1] "%lu 天前"

#: date.c:130
#, c-format
msgid "%lu week ago"
msgid_plural "%lu weeks ago"
msgstr[0] "%lu 周前"
msgstr[1] "%lu 周前"

#: date.c:137
#, c-format
msgid "%lu month ago"
msgid_plural "%lu months ago"
msgstr[0] "%lu 个月前"
msgstr[1] "%lu 个月前"

#: date.c:148
#, c-format
msgid "%lu year"
msgid_plural "%lu years"
msgstr[0] "%lu 年"
msgstr[1] "%lu 年"

#. TRANSLATORS: "%s" is "<n> years"
#: date.c:151
#, c-format
msgid "%s, %lu month ago"
msgid_plural "%s, %lu months ago"
msgstr[0] "%s %lu 个月前"
msgstr[1] "%s %lu 个月前"

#: date.c:156 date.c:161
#, c-format
msgid "%lu year ago"
msgid_plural "%lu years ago"
msgstr[0] "%lu 年前"
msgstr[1] "%lu 年前"

#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr "无法读取排序文件 '%s'"

#: diffcore-rename.c:536
msgid "Performing inexact rename detection"
msgstr "正在进行非精确的重命名探测"

#: diff.c:62
#, c-format
msgid "option '%s' requires a value"
msgstr "选项 '%s'  需要一个值"

#  译者：注意保持前导空格
#: diff.c:124
#, c-format
msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
msgstr "  无法解析 dirstat 截止（cut-off）百分比 '%s'\n"

#  译者：注意保持前导空格
#: diff.c:129
#, c-format
msgid "  Unknown dirstat parameter '%s'\n"
msgstr "  未知的 dirstat 参数 '%s'\n"

#: diff.c:281
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"

#: diff.c:344
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"

#: diff.c:3102
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出，停止在 %s"

#: diff.c:3428
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"

#: diff.c:3518
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"

#: diff.c:3681
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"

#: diff.c:3695
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数：'%s'"

#: diff.c:4719
msgid "inexact rename detection was skipped due to too many files."
msgstr "因为文件太多，略过不严格的重命名检查。"

#: diff.c:4722
msgid "only found copies from modified paths due to too many files."
msgstr "因为文件太多，只在修改的路径中查找拷贝。"

#: diff.c:4725
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"

#: dir.c:1899
msgid "failed to get kernel name and information"
msgstr "无法获得内核名称和信息"

#: dir.c:2018
msgid "Untracked cache is disabled on this system or location."
msgstr "缓存未跟踪文件在本系统或位置中被禁用。"

#: dir.c:2776 dir.c:2781
#, c-format
msgid "could not create directories for %s"
msgstr "不能为 %s 创建目录"

#: dir.c:2806
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

#: entry.c:280
#, c-format
msgid "could not stat file '%s'"
msgstr "不能对文件 '%s' 调用 stat"

#: fetch-pack.c:249
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack：应为 shallow 列表"

#: fetch-pack.c:261
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"

#: fetch-pack.c:280 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "远程错误：%s"

#: fetch-pack.c:281
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"

#: fetch-pack.c:333
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"

#: fetch-pack.c:419
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息：%s"

#: fetch-pack.c:425
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息：%s"

#: fetch-pack.c:427
#, c-format
msgid "object not found: %s"
msgstr "对象未找到：%s"

#: fetch-pack.c:430
#, c-format
msgid "error in object: %s"
msgstr "对象中出错：%s"

#: fetch-pack.c:432
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow：%s"

#: fetch-pack.c:435
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow，却得到 %s"

#: fetch-pack.c:474
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"

#: fetch-pack.c:488
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"

#: fetch-pack.c:521
msgid "giving up"
msgstr "放弃"

#: fetch-pack.c:531 progress.c:235
msgid "done"
msgstr "完成"

#: fetch-pack.c:543
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"

#: fetch-pack.c:589
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"

#: fetch-pack.c:737
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s（%s）"

#: fetch-pack.c:775
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：无法派生 sideband 多路输出"

#: fetch-pack.c:783
msgid "protocol error: bad pack header"
msgstr "协议错误：坏的包头"

#: fetch-pack.c:839
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack：无法派生进程 %s"

#: fetch-pack.c:855
#, c-format
msgid "%s failed"
msgstr "%s 失败"

#: fetch-pack.c:857
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"

#: fetch-pack.c:884
msgid "Server does not support shallow clients"
msgstr "服务器不支持 shalllow 客户端"

#: fetch-pack.c:888
msgid "Server supports multi_ack_detailed"
msgstr "服务器支持 multi_ack_detailed"

#: fetch-pack.c:891
msgid "Server supports no-done"
msgstr "服务器支持 no-done"

#: fetch-pack.c:897
msgid "Server supports multi_ack"
msgstr "服务器支持 multi_ack"

#: fetch-pack.c:901
msgid "Server supports side-band-64k"
msgstr "服务器支持 side-band-64k"

#: fetch-pack.c:905
msgid "Server supports side-band"
msgstr "服务器支持 side-band"

#: fetch-pack.c:909
msgid "Server supports allow-tip-sha1-in-want"
msgstr "服务器支持 allow-tip-sha1-in-want"

#: fetch-pack.c:913
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "服务器支持 allow-reachable-sha1-in-want"

#: fetch-pack.c:923
msgid "Server supports ofs-delta"
msgstr "服务器支持 ofs-delta"

#: fetch-pack.c:930
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"

#: fetch-pack.c:936
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"

#: fetch-pack.c:940
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"

#: fetch-pack.c:942
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"

#: fetch-pack.c:953
msgid "no common commits"
msgstr "没有共同的提交"

#: fetch-pack.c:965
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：获取失败。"

#: fetch-pack.c:1127
msgid "no matching remote head"
msgstr "没有匹配的远程分支"

#: fetch-pack.c:1149
#, c-format
msgid "no such remote ref %s"
msgstr "没有这样的远程引用 %s"

#: fetch-pack.c:1152
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "服务器不允许请求未公开的对象 %s"

#: gpg-interface.c:185
msgid "gpg failed to sign the data"
msgstr "gpg 无法为数据签名"

#: gpg-interface.c:215
msgid "could not create temporary file"
msgstr "不能创建临时文件"

#: gpg-interface.c:217
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "无法将分离式签名写入 '%s'"

#: graph.c:96
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"

#: grep.c:1796
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：无法读取 %s"

#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
#, c-format
msgid "failed to stat '%s'"
msgstr "对 '%s' 调用 stat 失败"

#: grep.c:1824
#, c-format
msgid "'%s': short read"
msgstr "'%s'：读取不完整"

#: help.c:218
#, c-format
msgid "available git commands in '%s'"
msgstr "在 '%s' 下可用的 git 命令"

#: help.c:225
msgid "git commands available from elsewhere on your $PATH"
msgstr "在 $PATH 路径中的其他地方可用的 git 命令"

#: help.c:256
msgid "These are common Git commands used in various situations:"
msgstr "这些是各种场合常见的 Git 命令："

#: help.c:321
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
"'%s' 像是一个 git 命令，但却无法运行。\n"
"可能是 git-%s 受损？"

#: help.c:376
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "唉呀，您的系统中未发现 Git 命令。"

#: help.c:398
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
"Continuing under the assumption that you meant '%s'"
msgstr ""
"警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n"
"是 '%s'"

#: help.c:403
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr "在 %0.1f 秒钟后自动运行..."

#: help.c:410
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"

#: help.c:414 help.c:480
msgid ""
"\n"
"Did you mean this?"
msgid_plural ""
"\n"
"Did you mean one of these?"
msgstr[0] ""
"\n"
"您指的是这个么？"
msgstr[1] ""
"\n"
"您指的是这其中的某一个么？"

#: help.c:476
#, c-format
msgid "%s: %s - %s"
msgstr "%s：%s - %s"

#: ident.c:343
msgid ""
"\n"
"*** Please tell me who you are.\n"
"\n"
"Run\n"
"\n"
"  git config --global user.email \"you@example.com\"\n"
"  git config --global user.name \"Your Name\"\n"
"\n"
"to set your account's default identity.\n"
"Omit --global to set the identity only in this repository.\n"
"\n"
msgstr ""
"\n"
"*** 请告诉我你是谁。\n"
"\n"
"运行\n"
"\n"
"  git config --global user.email \"you@example.com\"\n"
"  git config --global user.name \"Your Name\"\n"
"\n"
"来设置您账号的缺省身份标识。\n"
"如果仅在本仓库设置身份标识，则省略 --global 参数。\n"

#: ident.c:367
msgid "no email was given and auto-detection is disabled"
msgstr "未提供邮件地址且自动探测被禁用"

#: ident.c:372
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "无法自动探测邮件地址（得到 '%s'）"

#: ident.c:382
msgid "no name was given and auto-detection is disabled"
msgstr "未提供姓名且自动探测被禁用"

#: ident.c:388
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "无法自动探测姓名（得到 '%s'）"

#: ident.c:396
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "不允许空的姓名（对于 <%s>）"

#: ident.c:402
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "姓名中仅包含禁用字符：%s"

#: ident.c:417 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格式：%s"

#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
"\n"
"Another git process seems to be running in this repository, e.g.\n"
"an editor opened by 'git commit'. Please make sure all processes\n"
"are terminated then try again. If it still fails, a git process\n"
"may have crashed in this repository earlier:\n"
"remove the file manually to continue."
msgstr ""
"无法创建 '%s.lock'：%s。\n"
"\n"
"似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n"
"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n"
"可能之前有一个 git 进程在这个仓库中异常退出：\n"
"手动删除这个文件再继续。"

#: lockfile.c:160
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "不能创建 '%s.lock'：%s"

#: merge.c:41
msgid "failed to read the cache"
msgstr "无法读取缓存"

#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
#: builtin/checkout.c:607 builtin/clone.c:749
msgid "unable to write new index file"
msgstr "无法写新的索引文件"

#: merge-recursive.c:209
msgid "(bad commit)\n"
msgstr "（坏提交）\n"

#: merge-recursive.c:231 merge-recursive.c:239
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "为路径 '%s' addinfo_cache 失败"

#: merge-recursive.c:303
msgid "error building trees"
msgstr "无法创建树"

#: merge-recursive.c:727
#, c-format
msgid "failed to create path '%s'%s"
msgstr "无法创建路径 '%s'%s"

#: merge-recursive.c:738
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为子目录留出空间\n"

#: merge-recursive.c:752 merge-recursive.c:771
msgid ": perhaps a D/F conflict?"
msgstr "：可能是一个目录/文件冲突？"

#: merge-recursive.c:761
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"

#: merge-recursive.c:803 builtin/cat-file.c:34
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能读取对象 %s '%s'"

#: merge-recursive.c:805
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据对象"

#: merge-recursive.c:829
#, c-format
msgid "failed to open '%s': %s"
msgstr "无法打开 '%s'：%s"

#: merge-recursive.c:840
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "无法创建符号链接 '%s'：%s"

#: merge-recursive.c:845
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"

#: merge-recursive.c:985
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"

#: merge-recursive.c:989
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"

#: merge-recursive.c:1092
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本被保留。"

#: merge-recursive.c:1097
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr ""
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本被保留。"

#: merge-recursive.c:1104
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本保留在 %8$s 中。"

#: merge-recursive.c:1109
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree at %s."
msgstr ""
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本保留在 %9$s 中。"

#: merge-recursive.c:1143
msgid "rename"
msgstr "重命名"

#: merge-recursive.c:1143
msgid "renamed"
msgstr "重命名"

#: merge-recursive.c:1200
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"

#: merge-recursive.c:1225
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"

#: merge-recursive.c:1230
msgid " (left unresolved)"
msgstr "（留下未解决）"

#: merge-recursive.c:1292
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
"%5$s"

#: merge-recursive.c:1325
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"

#: merge-recursive.c:1528
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"

#: merge-recursive.c:1543
#, c-format
msgid "Adding merged %s"
msgstr "添加合并后的 %s"

#: merge-recursive.c:1550 merge-recursive.c:1780
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"

#: merge-recursive.c:1607
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"

#: merge-recursive.c:1610
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据对象"

#: merge-recursive.c:1679
msgid "modify"
msgstr "修改"

#: merge-recursive.c:1679
msgid "modified"
msgstr "修改"

#: merge-recursive.c:1689
msgid "content"
msgstr "内容"

#: merge-recursive.c:1696
msgid "add/add"
msgstr "添加/添加"

#: merge-recursive.c:1732
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s（已经做过相同合并）"

#: merge-recursive.c:1746
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"

#: merge-recursive.c:1750 git-submodule.sh:944
msgid "submodule"
msgstr "子模组"

#: merge-recursive.c:1751
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突（%s）：合并冲突于 %s"

#: merge-recursive.c:1845
#, c-format
msgid "Removing %s"
msgstr "删除 %s"

#: merge-recursive.c:1871
msgid "file/directory"
msgstr "文件/目录"

#: merge-recursive.c:1877
msgid "directory/file"
msgstr "目录/文件"

#: merge-recursive.c:1883
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"

#: merge-recursive.c:1892
#, c-format
msgid "Adding %s"
msgstr "添加 %s"

#: merge-recursive.c:1929
msgid "Already up-to-date!"
msgstr "已经是最新的！"

#: merge-recursive.c:1938
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"

#: merge-recursive.c:2021
msgid "Merging:"
msgstr "合并："

#: merge-recursive.c:2034
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先："
msgstr[1] "发现 %u 个共同祖先："

#: merge-recursive.c:2073
msgid "merge returned no commit"
msgstr "合并未返回提交"

#: