# 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>
-# - Lian Cheng <rhythm.mail AT gmail.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: 2015-07-14 07:19+0800\n"
-"PO-Revision-Date: 2015-07-14 07:32+0800\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"
msgid "hint: %.*s\n"
msgstr "提示：%.*s\n"
-#: advice.c:88
+#: 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."
"请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
"解决方案并提交。"
-#: archive.c:11
-msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<选项>] <树或提交> [<路径>...]"
+#: advice.c:109
+msgid "Exiting because of an unresolved conflict."
+msgstr "因为存在未解决的冲突而退出。"
-#: archive.c:12
-msgid "git archive --list"
-msgstr "git archive --list"
+#: advice.c:114 builtin/merge.c:1185
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
-#: archive.c:13
-msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr ""
-"git archive --remote <版本库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
+#: advice.c:116
+msgid "Please, commit your changes before merging."
+msgstr "请在合并前先提交您的修改。"
-#: archive.c:14
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr "git archive --remote <版本库> [--exec <命令>] --list"
+#: advice.c:117
+msgid "Exiting because of unfinished merge."
+msgstr "因为存在未完成的合并而退出。"
-#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327
+#: advice.c:123
#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "路径规则 '%s' 未匹配任何文件"
+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"
-#: archive.c:427
-msgid "fmt"
-msgstr "格式"
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "未能识别的空白字符选项 '%s'"
-#: archive.c:427
-msgid "archive format"
-msgstr "归档格式"
+#: apply.c:73
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "未能识别的空白字符忽略选项 '%s'"
-#: archive.c:428 builtin/log.c:1204
-msgid "prefix"
-msgstr "前缀"
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject 和 --3say 不能同时使用。"
-#: archive.c:429
-msgid "prepend prefix to each pathname in the archive"
-msgstr "为归档中每个路径名加上前缀"
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached 和 --3way 不能同时使用。"
-#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
-#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
-#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99
-#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
-#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150
-msgid "file"
-msgstr "文件"
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr "--3way 在一个仓库之外"
-#: archive.c:431 builtin/archive.c:89
-msgid "write the archive to this file"
-msgstr "归档写入此文件"
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr "--index 在一个仓库之外"
-#: archive.c:433
-msgid "read .gitattributes in working directory"
-msgstr "读取工作区中的 .gitattributes"
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr "--cached 在一个仓库之外"
-#: archive.c:434
-msgid "report archived files on stderr"
-msgstr "在标准错误上报告归档文件"
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "无法准备时间戳正则表达式 %s"
-#: archive.c:435
-msgid "store only"
-msgstr "只存储"
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec 返回 %d，输入为：%s"
-#: archive.c:436
-msgid "compress faster"
-msgstr "压缩速度更快"
+#: apply.c:938
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "不能在补丁的第 %d 行找到文件名"
-#: archive.c:444
-msgid "compress better"
-msgstr "压缩效果更好"
+#: 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"
-#: archive.c:447
-msgid "list supported archive formats"
-msgstr "列出支持的归档格式"
+#: apply.c:983
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
-#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77
-msgid "repo"
-msgstr "版本库"
+#: apply.c:984
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
-#: archive.c:450 builtin/archive.c:91
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "从远程版本库（<版本库>）提取归档文件"
+#: 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"
-#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
-msgid "command"
-msgstr "命令"
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount：意外的行：%.*s"
-#: archive.c:452 builtin/archive.c:93
-msgid "path to the remote git-upload-archive command"
-msgstr "远程 git-upload-archive 命令的路径"
+#: apply.c:1557
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "第 %d 行的补丁片段没有头信息：%.*s"
-#: attr.c:265
+#: apply.c:1577
+#, c-format
msgid ""
-"Negative patterns are ignored in git attributes\n"
-"Use '\\!' for literal leading exclamation."
-msgstr ""
-"负值模版在 git attributes 中被忽略\n"
-"当字符串确实要以感叹号开始时，使用 '\\!'。"
+"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 行）"
-#: branch.c:60
+#: apply.c:1589
#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "未设置分支 %s 作为它自己的上游。"
+msgid "git diff header lacks filename information (line %d)"
+msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"
-#: branch.c:83
-#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
+#: apply.c:1759
+msgid "new file depends on old contents"
+msgstr "新文件依赖旧内容"
-#: branch.c:84
-#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
+#: apply.c:1761
+msgid "deleted file still has contents"
+msgstr "删除的文件仍有内容"
-#: branch.c:88
+#: apply.c:1795
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
+msgid "corrupt patch at line %d"
+msgstr "补丁在第 %d 行损坏"
-#: branch.c:89
+#: apply.c:1832
#, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "分支 %s 设置为跟踪本地分支 %s。"
+msgid "new file %s depends on old contents"
+msgstr "新文件 %s 依赖旧内容"
-#: branch.c:94
+#: apply.c:1834
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "å\88\86æ\94¯ %s 设置为使ç\94¨å\8f\98å\9fºæ\9d¥è·\9f踪è¿\9cç¨\8bå¼\95ç\94¨ %sã\80\82"
+msgid "deleted file %s still has contents"
+msgstr "å\88 é\99¤ç\9a\84æ\96\87件 %s ä»\8dæ\9c\89å\86\85容"
-#: branch.c:95
+#: apply.c:1837
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "分支 %s 设置为跟踪远程引用 %s。"
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** 警告：文件 %s 成为空文件但并未删除"
-#: branch.c:99
+#: apply.c:1984
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "二进制补丁在第 %d 行损坏：%.*s"
-#: branch.c:100
+#: apply.c:2021
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "分支 %s 设置为跟踪本地引用 %s。"
+msgid "unrecognized binary patch at line %d"
+msgstr "未能识别的二进制补丁位于第 %d 行"
-#: branch.c:133
+#: apply.c:2182
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "未跟踪：引用 %s 有歧义"
+msgid "patch with only garbage at line %d"
+msgstr "补丁文件的第 %d 行只有垃圾数据"
-#: branch.c:162
+#: apply.c:2265
#, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' 不是一个有效的分支名称。"
+msgid "unable to read symlink %s"
+msgstr "无法读取符号链接 %s"
-#: branch.c:167
+#: apply.c:2269
#, c-format
-msgid "A branch named '%s' already exists."
-msgstr "ä¸\80个å\88\86æ\94¯å\90\8d '%s' å·²ç»\8få\98å\9c¨ã\80\82"
+msgid "unable to open or read %s"
+msgstr "ä¸\8dè\83½æ\89\93å¼\80æ\88\96读å\8f\96 %s"
-#: branch.c:175
-msgid "Cannot force update the current branch."
-msgstr "无法强制更新当前分支。"
+#: apply.c:2922
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "无效的行首字符：'%c'"
-#: branch.c:195
+#: apply.c:3041
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"
+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 行）"
-#: branch.c:197
+#: apply.c:3053
#, c-format
-msgid "the requested upstream branch '%s' does not exist"
-msgstr "请求的上游分支 '%s' 不存在"
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
-#: branch.c:199
+#: apply.c:3059
+#, c-format
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."
+"while searching for:\n"
+"%.*s"
msgstr ""
-"\n"
-"如果您正计划基于远程一个现存的上游分支开始你的工作，\n"
-"您可能需要执行 \"git fetch\" 来获取分支。\n"
-"\n"
-"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
-"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
+"当查询：\n"
+"%.*s"
-#: branch.c:243
+#: apply.c:3081
#, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "不是一个有效的对象名：'%s'。"
+msgid "missing binary patch data for '%s'"
+msgstr "缺失 '%s' 的二进制补丁数据"
-#: branch.c:263
+#: apply.c:3089
#, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "歧义的对象名：'%s'。"
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
-#: branch.c:268
+#: apply.c:3135
#, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "无效的分支点：'%s'。"
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
-#: bundle.c:34
+#: apply.c:3145
#, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' 不像是一个 v2 版本的包文件"
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
-#: bundle.c:61
+#: apply.c:3153
#, c-format
-msgid "unrecognized header: %s%s (%d)"
-msgstr "未能识别的包头：%s%s (%d)"
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "补丁应用到空文件 '%s'，但其并非空文件"
-#: bundle.c:87 builtin/commit.c:766
+#: apply.c:3171
#, c-format
-msgid "could not open '%s'"
-msgstr "不能打开 '%s'"
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
-#: bundle.c:139
-msgid "Repository lacks these prerequisite commits:"
-msgstr "版本库缺少这些必备的提交："
+#: apply.c:3184
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "二进制补丁未应用到 '%s'"
-#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
-#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330
-#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358
-#: builtin/shortlog.c:158
-msgid "revision walk setup failed"
-msgstr "版本遍历设置失败"
+#: apply.c:3190
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
-#: bundle.c:185
+#: apply.c:3211
#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "这个包中含有这个引用："
-msgstr[1] "这个包中含有 %d 个引用："
+msgid "patch failed: %s:%ld"
+msgstr "打补丁失败：%s:%ld"
-#: bundle.c:192
-msgid "The bundle records a complete history."
-msgstr "这个包记录一个完整历史。"
+#: apply.c:3333
+#, c-format
+msgid "cannot checkout %s"
+msgstr "不能检出 %s"
-#: bundle.c:194
+#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "这个包需要这个引用："
-msgstr[1] "这个包需要 %d 个引用："
+msgid "failed to read %s"
+msgstr "无法读取 %s"
-#: bundle.c:251
-msgid "Could not spawn pack-objects"
-msgstr "不能生成 pack-objects 进程"
+#: apply.c:3389
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "读取位于符号链接中的 '%s'"
-#: bundle.c:269
-msgid "pack-objects died"
-msgstr "pack-objects 终止"
+#: apply.c:3418 apply.c:3658
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "路径 %s 已经被重命名/删除"
-#: bundle.c:309
-msgid "rev-list died"
-msgstr "rev-list 终止"
-
-#: bundle.c:358
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "引用 '%s' 被 rev-list 选项排除"
-
-#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
+#: apply.c:3501 apply.c:3672
#, c-format
-msgid "unrecognized argument: %s"
-msgstr "未能识别的参数：%s"
-
-#: bundle.c:443
-msgid "Refusing to create empty bundle."
-msgstr "不能创建空包。"
+msgid "%s: does not exist in index"
+msgstr "%s：不存在于索引中"
-#: bundle.c:453
+#: apply.c:3510 apply.c:3680
#, c-format
-msgid "cannot create '%s'"
-msgstr "不能创建 '%s'"
+msgid "%s: does not match index"
+msgstr "%s：和索引不匹配"
-#: bundle.c:474
-msgid "index-pack died"
-msgstr "index-pack 终止"
+#: apply.c:3545
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: color.c:260
+#: apply.c:3548
#, c-format
-msgid "invalid color value: %.*s"
-msgstr "无效的颜色值：%.*s"
+msgid "Falling back to three-way merge...\n"
+msgstr "回落到三方合并...\n"
-#: commit.c:40
+#: apply.c:3564 apply.c:3568
#, c-format
-msgid "could not parse %s"
-msgstr "不能解析 %s"
+msgid "cannot read the current contents of '%s'"
+msgstr "无法读取 '%s' 的当前内容"
-#: commit.c:42
+#: apply.c:3580
#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s 不是一个提交!"
-
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
-msgstr "内存耗尽"
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "无法回落到三方合并...\n"
-#: config.c:474 config.c:476
+#: apply.c:3594
#, c-format
-msgid "bad config file line %d in %s"
-msgstr "配置文件 %2$s 出错于第 %1$d 行"
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "应用补丁到 '%s' 存在冲突。\n"
-#: config.c:592
+#: apply.c:3599
#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr "æ\96\87件 %3$s ä¸é\85\8dç½®å\8f\98é\87\8f '%2$s' ç\9a\84æ\95°å\97å\8f\96å\80¼ '%1$s' 设置é\94\99误: %4$s"
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "æ\88\90å\8a\9fåº\94ç\94¨è¡¥ä¸\81å\88° '%s'ã\80\82\n"
-#: config.c:594
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
+#: apply.c:3625
+msgid "removal patch leaves file contents"
+msgstr "移除补丁仍留下了文件内容"
-#: config.c:679
+#: apply.c:3697
#, c-format
-msgid "failed to expand user dir in: '%s'"
-msgstr "无法扩展 '%s' 中的用户目录"
+msgid "%s: wrong type"
+msgstr "%s：错误类型"
-#: config.c:757 config.c:768
+#: apply.c:3699
#, c-format
-msgid "bad zlib compression level %d"
-msgstr "错误的 zlib 压缩级别 %d"
+msgid "%s has type %o, expected %o"
+msgstr "%s 的类型是 %o，应为 %o"
-#: config.c:890
+#: apply.c:3850 apply.c:3852
#, c-format
-msgid "invalid mode for object creation: %s"
-msgstr "无效的对象创建模式：%s"
-
-#: config.c:1216
-msgid "unable to parse command-line config"
-msgstr "无法解析命令行中的配置"
-
-#: config.c:1277
-msgid "unknown error occured while reading the configuration files"
-msgstr "在读取配置文件时遇到未知错误"
+msgid "invalid path '%s'"
+msgstr "无效路径 '%s'"
-#: config.c:1601
+#: apply.c:3908
#, c-format
-msgid "unable to parse '%s' from command-line config"
-msgstr "无法解析命令行配置中的 '%s'"
+msgid "%s: already exists in index"
+msgstr "%s：已经存在于索引中"
-#: config.c:1603
+#: apply.c:3911
#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
-msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
+msgid "%s: already exists in working directory"
+msgstr "%s：已经存在于工作区中"
-#: config.c:1662
+#: apply.c:3931
#, c-format
-msgid "%s has multiple values"
-msgstr "%s 有多个取值"
-
-#: connected.c:69
-msgid "Could not run 'git rev-list'"
-msgstr "不能执行 'git rev-list'"
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
-#: connected.c:89
+#: apply.c:3936
#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "无法写入 rev-list：%s"
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
-#: connected.c:97
+#: apply.c:3956
#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "无法关闭 rev-list 的标准输入：%s"
-
-#: date.c:95
-msgid "in the future"
-msgstr "在将来"
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "受影响的文件 '%s' 位于符号链接中"
-#: date.c:101
+#: apply.c:3960
#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "%lu 秒钟前"
-msgstr[1] "%lu 秒钟前"
+msgid "%s: patch does not apply"
+msgstr "%s：补丁未应用"
-#: date.c:108
+#: apply.c:3975
#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "%lu 分钟前"
-msgstr[1] "%lu 分钟前"
+msgid "Checking patch %s..."
+msgstr "检查补丁 %s..."
-#: date.c:115
+#: apply.c:4066
#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "%lu 小时前"
-msgstr[1] "%lu 小时前"
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "子模组 %s 的 sha1 信息缺失或无效"
-#: date.c:122
+#: apply.c:4073
#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "%lu 天前"
-msgstr[1] "%lu 天前"
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "%s 的模式被改变，但它不在当前 HEAD 中"
-#: date.c:128
+#: apply.c:4076
#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "%lu 周前"
-msgstr[1] "%lu 周前"
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "sha1 信息缺失或无效（%s）。"
-#: date.c:135
+#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "%lu 个月前"
-msgstr[1] "%lu 个月前"
+msgid "make_cache_entry failed for path '%s'"
+msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
-#: date.c:146
+#: apply.c:4085
#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu 年"
-msgstr[1] "%lu 年"
+msgid "could not add %s to temporary index"
+msgstr "不能在临时索引中添加 %s"
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:149
+#: apply.c:4095
#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "%s %lu 个月前"
-msgstr[1] "%s %lu 个月前"
+msgid "could not write temporary index to %s"
+msgstr "不能把临时索引写入到 %s"
-#: date.c:154 date.c:159
+#: apply.c:4233
#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "%lu 年前"
-msgstr[1] "%lu 年前"
+msgid "unable to remove %s from index"
+msgstr "不能从索引中移除 %s"
-#: diffcore-order.c:24
+#: apply.c:4268
#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "无法读取排序文件 '%s'"
-
-#: diffcore-rename.c:536
-msgid "Performing inexact rename detection"
-msgstr "正在进行非精确的重命名检测"
+msgid "corrupt patch for submodule %s"
+msgstr "子模组 %s 损坏的补丁"
-# 译者：注意保持前导空格
-#: diff.c:114
+#: apply.c:4274
#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
+msgid "unable to stat newly created file '%s'"
+msgstr "不能对新建文件 '%s' 调用 stat"
-# 译者：注意保持前导空格
-#: diff.c:119
+#: apply.c:4282
#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
-msgstr " 未知的 dirstat 参数 '%s'\n"
+msgid "unable to create backing store for newly created file %s"
+msgstr "不能为新建文件 %s 创建后端存储"
-#: diff.c:214
+#: apply.c:4288 apply.c:4432
#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
+msgid "unable to add cache entry for %s"
+msgstr "无法为 %s 添加缓存条目"
-#: diff.c:266
+#: apply.c:4329
#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
-msgstr ""
-"发现配置变量 'diff.dirstat' 中的错误：\n"
-"%s"
+msgid "failed to write to '%s'"
+msgstr "无法写入 '%s'"
-#: diff.c:2997
+#: apply.c:4333
#, c-format
-msgid "external diff died, stopping at %s"
-msgstr "外部 diff 退出，停止在 %s"
-
-#: diff.c:3393
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow 参数后只跟一个 pathspec"
+msgid "closing file '%s'"
+msgstr "关闭文件 '%s'"
-#: diff.c:3556
+#: apply.c:4403
#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr ""
-"无法解析 --dirstat/-X 选项的参数：\n"
-"%s"
+msgid "unable to write file '%s' mode %o"
+msgstr "不能写文件 '%s' 权限 %o"
-#: diff.c:3570
+#: apply.c:4501
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "无法解析 --submodule 选项的参数：'%s'"
-
-#: dir.c:1852
-msgid "failed to get kernel name and information"
-msgstr "无法获得内核名称和信息"
-
-#: dir.c:1945
-msgid "Untracked cache is disabled on this system."
-msgstr "缓存未跟踪文件在本系统被禁用"
-
-#: gpg-interface.c:129 gpg-interface.c:200
-msgid "could not run gpg."
-msgstr "不能执行 gpg。"
-
-#: gpg-interface.c:141
-msgid "gpg did not accept the data"
-msgstr "gpg 没有接受数据"
+msgid "Applied patch %s cleanly."
+msgstr "成功应用补丁 %s。"
-#: gpg-interface.c:152
-msgid "gpg failed to sign the data"
-msgstr "gpg 无法为数据签名"
+#: apply.c:4509
+msgid "internal error"
+msgstr "内部错误"
-#: gpg-interface.c:185
+#: apply.c:4512
#, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "不能创建临时文件 '%s'：%s"
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
+msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
-#: gpg-interface.c:188
+#: apply.c:4523
#, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "æ\97 æ³\95å°\86å\88\86离å¼\8fç¾å\90\8då\86\99å\85¥ '%s'ï¼\9a%s"
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "æ\88ªç\9f .rej æ\96\87件å\90\8d为 %.*s.rej"
-#: grep.c:1718
+#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
#, c-format
-msgid "'%s': unable to read %s"
-msgstr "'%s'：无法读取 %s"
+msgid "cannot open %s"
+msgstr "不能打开 %s"
-#: grep.c:1735
+#: apply.c:4545
#, c-format
-msgid "'%s': %s"
-msgstr "'%s'：%s"
+msgid "Hunk #%d applied cleanly."
+msgstr "第 #%d 个片段成功应用。"
-#: grep.c:1746
+#: apply.c:4549
#, c-format
-msgid "'%s': short read %s"
-msgstr "'%s'：读取不完整 %s"
+msgid "Rejected hunk #%d."
+msgstr "拒绝第 #%d 个片段。"
-#: help.c:207
+#: apply.c:4659
#, c-format
-msgid "available git commands in '%s'"
-msgstr "在 '%s' 下可用的 git 命令"
+msgid "Skipped patch '%s'."
+msgstr "略过补丁 '%s'。"
-#: help.c:214
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
+#: apply.c:4667
+msgid "unrecognized input"
+msgstr "未能识别的输入"
-#: help.c:246
-msgid "These are common Git commands used in various situations:"
-msgstr "这些是各种场合常见的 Git 命令："
+#: apply.c:4686
+msgid "unable to read index file"
+msgstr "无法读取索引文件"
-#: help.c:311
+#: apply.c:4823
#, 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:368
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "唉呀，您的系统中未发现 Git 命令。"
+msgid "can't open patch '%s': %s"
+msgstr "不能打开补丁 '%s'：%s"
-#: help.c:390
+#: apply.c:4850
#, 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'"
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "抑制下仍有 %d 个空白字符误用"
+msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: help.c:395
+#: apply.c:4856 apply.c:4871
#, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "在 %0.1f 秒钟后自动运行..."
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d 行有空白字符误用。"
+msgstr[1] "%d 行有空白字符误用。"
-#: help.c:402
+#: apply.c:4864
#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
-
-#: help.c:406 help.c:466
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-"\n"
-"您指的是这个么？"
-msgstr[1] ""
-"\n"
-"您指的是这其中的某一个么？"
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] "修复空白错误后，应用了 %d 行。"
+msgstr[1] "修复空白错误后，应用了 %d 行。"
-#: help.c:462
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s：%s - %s"
+#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+msgid "Unable to write new index file"
+msgstr "无法写入新索引文件"
-#: lockfile.c:345
-msgid "BUG: reopen a lockfile that is still open"
-msgstr "BUG: 重新打开一个仍打开着的锁文件"
+#: 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 "路径"
-#: lockfile.c:347
-msgid "BUG: reopen a lockfile that has been committed"
-msgstr "BUG: 重新打开一个已提交的锁文件"
+#: apply.c:4912
+msgid "don't apply changes matching the given path"
+msgstr "不要应用与给出路径向匹配的变更"
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "无法读取缓存"
+#: apply.c:4915
+msgid "apply changes matching the given path"
+msgstr "应用与给出路径向匹配的变更"
-#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
-#: builtin/clone.c:647
-msgid "unable to write new index file"
-msgstr "无法写新的索引文件"
+#: apply.c:4917 builtin/am.c:2285
+msgid "num"
+msgstr "数字"
-#: merge-recursive.c:189
-#, c-format
-msgid "(bad commit)\n"
-msgstr "（坏提交）\n"
+#: apply.c:4918
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: merge-recursive.c:209
-#, c-format
-msgid "addinfo_cache failed for path '%s'"
-msgstr "为路径 '%s' addinfo_cache 失败"
+#: apply.c:4921
+msgid "ignore additions made by the patch"
+msgstr "忽略补丁中的添加的文件"
-#: merge-recursive.c:270
-msgid "error building trees"
-msgstr "无法创建树"
+#: apply.c:4923
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
-#: merge-recursive.c:687
-#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "无法创建路径 '%s'%s"
+#: apply.c:4927
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "以十进制数显示添加和删除的行数"
-#: merge-recursive.c:698
-#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "删除 %s 以便为子目录留出空间\n"
+#: apply.c:4929
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "不应用补丁，而是显示输入的概要"
-#: merge-recursive.c:712 merge-recursive.c:733
-msgid ": perhaps a D/F conflict?"
-msgstr "：可能是一个目录/文件冲突？"
+#: apply.c:4931
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "不应用补丁，而是查看补丁是否可应用"
-#: merge-recursive.c:723
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
+#: apply.c:4933
+msgid "make sure the patch is applicable to the current index"
+msgstr "确认补丁可以应用到当前索引"
-#: merge-recursive.c:763
-#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "不能读取对象 %s '%s'"
+#: apply.c:4935
+msgid "apply a patch without touching the working tree"
+msgstr "应用补丁而不修改工作区"
-#: merge-recursive.c:765
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "%s '%s' 应为数据（blob）对象"
+#: apply.c:4937
+msgid "accept a patch that touches outside the working area"
+msgstr "接受修改工作区之外文件的补丁"
-#: merge-recursive.c:788 builtin/clone.c:306
-#, c-format
-msgid "failed to open '%s'"
-msgstr "无法打开 '%s'"
+#: apply.c:4939
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
-#: merge-recursive.c:796
-#, c-format
-msgid "failed to symlink '%s'"
-msgstr "无法创建符号链接 '%s'"
+#: apply.c:4941
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "如果一个补丁不能应用则尝试三方合并"
-#: merge-recursive.c:799
-#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "不知道如何处理 %06o %s '%s'"
+#: apply.c:4943
+msgid "build a temporary index based on embedded index information"
+msgstr "创建一个临时索引基于嵌入的索引信息"
-#: merge-recursive.c:937
-msgid "Failed to execute internal merge"
-msgstr "无法执行内部合并"
+#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
+msgid "paths are separated with NUL character"
+msgstr "路径以 NUL 字符分隔"
-#: merge-recursive.c:941
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "不能添加 %s 至对象库"
+#: apply.c:4948
+msgid "ensure at least <n> lines of context match"
+msgstr "确保至少匹配 <n> 行上下文"
-#: merge-recursive.c:957
-msgid "unsupported object type in the tree"
-msgstr "å\9c¨æ \91ä¸æ\9c\89ä¸\8dæ\94¯æ\8c\81ç\9a\84对象类å\9e\8b"
+#: apply.c:4949 builtin/am.c:2264
+msgid "action"
+msgstr "å\8a¨ä½\9c"
-#: merge-recursive.c:1032 merge-recursive.c:1046
-#, 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 中"
-"的版本被保留。"
+#: apply.c:4950
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "检查新增和修改的行中间的空白字符滥用"
-#: merge-recursive.c:1038 merge-recursive.c:1051
-#, 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 中。"
+#: apply.c:4953 apply.c:4956
+msgid "ignore changes in whitespace when finding context"
+msgstr "查找上下文时忽略空白字符的变更"
-#: merge-recursive.c:1092
-msgid "rename"
-msgstr "重命名"
+#: apply.c:4959
+msgid "apply the patch in reverse"
+msgstr "反向应用补丁"
-#: merge-recursive.c:1092
-msgid "renamed"
-msgstr "重命名"
+#: apply.c:4961
+msgid "don't expect at least one line of context"
+msgstr "无需至少一行上下文"
-#: merge-recursive.c:1148
-#, c-format
-msgid "%s is a directory in %s adding as %s instead"
-msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
+#: apply.c:4963
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: merge-recursive.c:1170
-#, 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"
+#: apply.c:4965
+msgid "allow overlapping hunks"
+msgstr "允许重叠的补丁片段"
-#: merge-recursive.c:1175
-msgid " (left unresolved)"
-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 "冗长输出"
-#: merge-recursive.c:1229
-#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+#: 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 ""
-"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
-"%5$s"
+"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
-#: merge-recursive.c:1259
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"
+#: archive.c:15
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <仓库> [--exec <命令>] --list"
-#: merge-recursive.c:1458
+#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
#, 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"
+msgid "pathspec '%s' did not match any files"
+msgstr "路径规格 '%s' 未匹配任何文件"
-#: merge-recursive.c:1468
-#, c-format
-msgid "Adding merged %s"
-msgstr "添加合并后的 %s"
+#: archive.c:417
+msgid "fmt"
+msgstr "格式"
-#: merge-recursive.c:1473 merge-recursive.c:1671
-#, c-format
-msgid "Adding as %s instead"
-msgstr "而是以 %s 为名添加"
+#: archive.c:417
+msgid "archive format"
+msgstr "归档格式"
-#: merge-recursive.c:1524
-#, c-format
-msgid "cannot read object %s"
-msgstr "不能读取对象 %s"
+#: archive.c:418 builtin/log.c:1436
+msgid "prefix"
+msgstr "前缀"
-#: merge-recursive.c:1527
-#, c-format
-msgid "object %s is not a blob"
-msgstr "对象 %s 不是一个数据（blob）对象"
+#: archive.c:419
+msgid "prepend prefix to each pathname in the archive"
+msgstr "为归档中每个路径名加上前缀"
-#: merge-recursive.c:1575
-msgid "modify"
-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 "文件"
-#: merge-recursive.c:1575
-msgid "modified"
-msgstr "修改"
+#: archive.c:421 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr "归档写入此文件"
-#: merge-recursive.c:1585
-msgid "content"
-msgstr "内容"
+#: archive.c:423
+msgid "read .gitattributes in working directory"
+msgstr "读取工作区中的 .gitattributes"
-#: merge-recursive.c:1592
-msgid "add/add"
-msgstr "添加/添加"
+#: archive.c:424
+msgid "report archived files on stderr"
+msgstr "在标准错误上报告归档文件"
-#: merge-recursive.c:1626
-#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "略过 %s（已经做过相同合并）"
+#: archive.c:425
+msgid "store only"
+msgstr "只存储"
-#: merge-recursive.c:1640
-#, c-format
-msgid "Auto-merging %s"
-msgstr "自动合并 %s"
+#: archive.c:426
+msgid "compress faster"
+msgstr "压缩速度更快"
-#: merge-recursive.c:1644 git-submodule.sh:1150
-msgid "submodule"
-msgstr "å\90模ç»\84"
+#: archive.c:434
+msgid "compress better"
+msgstr "å\8e\8b缩æ\95\88æ\9e\9cæ\9b´å¥½"
-#: merge-recursive.c:1645
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "冲突（%s）：合并冲突于 %s"
+#: archive.c:437
+msgid "list supported archive formats"
+msgstr "列出支持的归档格式"
-#: merge-recursive.c:1731
-#, c-format
-msgid "Removing %s"
-msgstr "删除 %s"
+#: 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 "仓库"
-#: merge-recursive.c:1756
-msgid "file/directory"
-msgstr "文件/目录"
+#: archive.c:440 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "从远程仓库（<仓库>）提取归档文件"
-#: merge-recursive.c:1762
-msgid "directory/file"
-msgstr "目录/文件"
+#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
+msgid "command"
+msgstr "命令"
-#: merge-recursive.c:1767
-#, 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"
+#: archive.c:442 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
+msgstr "远程 git-upload-archive 命令的路径"
-#: merge-recursive.c:1777
-#, c-format
-msgid "Adding %s"
-msgstr "添加 %s"
+#: archive.c:449
+msgid "Unexpected option --remote"
+msgstr "未知参数 --remote"
-#: merge-recursive.c:1794
-msgid "Fatal merge failure, shouldn't happen."
-msgstr "严重的合并错误，不应发生。"
+#: archive.c:451
+msgid "Option --exec can only be used together with --remote"
+msgstr "选项 --exec 只能和 --remote 同时使用"
-#: merge-recursive.c:1813
-msgid "Already up-to-date!"
-msgstr "已经是最新的！"
+#: archive.c:453
+msgid "Unexpected option --output"
+msgstr "未知参数 --output"
-#: merge-recursive.c:1822
+#: archive.c:475
#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "æ\97 æ³\95å\90\88并æ \91 %s å\92\8c %s"
+msgid "Unknown archive format '%s'"
+msgstr "æ\9cªç\9f¥å½\92æ¡£æ ¼å¼\8f '%s'"
-#: merge-recursive.c:1852
+#: archive.c:482
#, c-format
-msgid "Unprocessed path??? %s"
-msgstr "未处理的路径??? %s"
+msgid "Argument not supported for format '%s': -%d"
+msgstr "参数不支持此格式 '%s'：-%d"
-#: merge-recursive.c:1900
-msgid "Merging:"
-msgstr "合并："
-
-#: merge-recursive.c:1913
+#: attr.c:212
#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] "发现 %u 个共同祖先："
-msgstr[1] "发现 %u 个共同祖先："
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s 不是一个有效的属性名"
-#: merge-recursive.c:1950
-msgid "merge returned no commit"
-msgstr "合并未返回提交"
+#: attr.c:408
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"负值模版在 git attributes 中被忽略\n"
+"当字符串确实要以感叹号开始时，使用 '\\!'。"
-#: merge-recursive.c:2007
+#: bisect.c:444
#, c-format
-msgid "Could not parse object '%s'"
-msgstr "不能解析对象 '%s'"
+msgid "Could not open file '%s'"
+msgstr "不能打开文件 '%s'"
-#: merge-recursive.c:2018 builtin/merge.c:645
-msgid "Unable to write index."
-msgstr "不能写入索引。"
+#: bisect.c:449
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "文件 '%s' 包含错误的引用格式：%s"
-#: notes-utils.c:41
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "不能提交未初始化/未引用的注解树"
+#: bisect.c:657
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "我们无法进行更多的二分查找！\n"
-#: notes-utils.c:82
+#: bisect.c:710
#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "坏的 notes.rewriteMode 值：'%s'"
+msgid "Not a valid commit name %s"
+msgstr "不是一个有效的提交名 %s"
-#: notes-utils.c:92
+#: bisect.c:734
#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
+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"
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:119
+#: bisect.c:739
#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "坏的 %s 值：'%s'"
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"合并基线 %s 是新的。\n"
+"介于 %s 和 [%s] 之间的属性已经被修改。\n"
-#: object.c:242
+#: bisect.c:744
#, c-format
-msgid "unable to parse object: %s"
-msgstr "不能解析对象：%s"
-
-#: parse-options.c:546
-msgid "..."
-msgstr "..."
-
-#: parse-options.c:564
-#, c-format
-msgid "usage: %s"
-msgstr "用法：%s"
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:568
-#, c-format
-msgid " or: %s"
-msgstr " 或：%s"
+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"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c:571
+#: bisect.c:752
#, c-format
-msgid " %s"
-msgstr " %s"
-
-#: parse-options.c:605
-msgid "-NUM"
-msgstr "-数字"
-
-#: pathspec.c:133
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
-
-#: pathspec.c:143
msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
-
-#: pathspec.c:177
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "路径规则包含无效的神奇前缀"
+"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"
-#: pathspec.c:183
+#: bisect.c:765
#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
+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"
+"我们仍旧继续。"
-#: pathspec.c:187
+#: bisect.c:800
#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "二分查找中：合并基线必须是经过测试的\n"
-#: pathspec.c:205
+#: bisect.c:851
#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
+msgid "a %s revision is needed"
+msgstr "需要一个 %s 版本"
-#: pathspec.c:230
+#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s：'literal' 和 'glob' 不兼容"
+msgid "could not create file '%s'"
+msgstr "不能创建文件 '%s'"
-#: pathspec.c:241
+#: bisect.c:919
#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s：'%s' 在版本库之外"
+msgid "could not read file '%s'"
+msgstr "不能读取文件 '%s'"
-#: pathspec.c:291
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
+#: bisect.c:949
+msgid "reading bisect refs failed"
+msgstr "读取二分查找引用失败"
-#: pathspec.c:353
+#: bisect.c:969
#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
-msgstr "%s：路径规则神奇前缀不被此命令支持：%s"
+msgid "%s was both %s and %s\n"
+msgstr "%s 同时为 %s 和 %s\n"
-#: pathspec.c:432
+#: bisect.c:977
#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "路径规则 '%s' 位于符号链接中"
-
-#: pathspec.c:441
msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
msgstr ""
-"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
-"添加 ':/' 或 '.' ？"
-
-#: pretty.c:968
-msgid "unable to parse --pretty format"
-msgstr "不能解析 --pretty 格式"
+"没有发现可测试的提交。\n"
+"可能您在运行时使用了错误的路径参数？\n"
-#: progress.c:236
-msgid "done"
-msgstr "完成"
+#: bisect.c:996
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "（大概 %d 步）"
+msgstr[1] "（大概 %d 步）"
-#: read-cache.c:1295
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:1000
#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr ""
-"设置了 index.version，但是取值无效。\n"
-"使用版本 %i"
+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"
-#: read-cache.c:1305
+#: branch.c:53
#, c-format
msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+"\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 ""
-"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
-"使用版本 %i"
+"\n"
+"在修复错误后，您可以尝试修改远程跟踪分支，通过执行命令\n"
+"\"git branch --set-upstream-to=%s%s%s\" 。"
-#: remote.c:792
+#: branch.c:67
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "不能同时获取 %s 和 %s 至 %s"
+msgid "Not setting branch %s as its own upstream."
+msgstr "未设置分支 %s 作为它自己的上游。"
-#: remote.c:796
+#: branch.c:93
#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s 通常跟踪 %s，而非 %s"
+msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
-#: remote.c:800
+#: branch.c:94
#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s 同时跟踪 %s 和 %s"
-
-#: remote.c:808
-msgid "Internal error"
-msgstr "内部错误"
-
-#: remote.c:1723 remote.c:1766
-msgid "HEAD does not point to a branch"
-msgstr "HEAD 没有指向一个分支"
+msgid "Branch %s set up to track remote branch %s from %s."
+msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
-#: remote.c:1732
+#: branch.c:98
#, c-format
-msgid "no such branch: '%s'"
-msgstr "没有此分支：'%s'"
+msgid "Branch %s set up to track local branch %s by rebasing."
+msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
-#: remote.c:1735
+#: branch.c:99
#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "å°\9aæ\9cªç»\99å\88\86æ\94¯ '%s' 设置ä¸\8a游"
+msgid "Branch %s set up to track local branch %s."
+msgstr "å\88\86æ\94¯ %s 设置为è·\9f踪æ\9c¬å\9c°å\88\86æ\94¯ %sã\80\82"
-#: remote.c:1741
+#: branch.c:104
#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
+msgid "Branch %s set up to track remote ref %s by rebasing."
+msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
-#: remote.c:1756
+#: branch.c:105
#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
+msgid "Branch %s set up to track remote ref %s."
+msgstr "分支 %s 设置为跟踪远程引用 %s。"
-#: remote.c:1771
+#: branch.c:109
#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "分支 '%s' 没有设置要推送的远程服务器"
+msgid "Branch %s set up to track local ref %s by rebasing."
+msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
-#: remote.c:1782
+#: branch.c:110
#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "向 '%s' 推送引用表达式未包含 '%s'"
-
-#: remote.c:1795
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "推送无目标（push.default 是 'nothing'）"
+msgid "Branch %s set up to track local ref %s."
+msgstr "分支 %s 设置为跟踪本地引用 %s。"
-#: remote.c:1817
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "无法解析 'simple' 推送至一个单独的目标"
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "无法写入上游分支配置"
-#: remote.c:2124
+#: branch.c:156
#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
-
-#: remote.c:2128
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "未跟踪：引用 %s 有歧义"
-#: remote.c:2131
+#: branch.c:185
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
-msgstr "您的分支与上游分支 '%s' 一致。\n"
+msgid "'%s' is not a valid branch name."
+msgstr "'%s' 不是一个有效的分支名称。"
-#: remote.c:2135
+#: branch.c:190
#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
-msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
+msgid "A branch named '%s' already exists."
+msgstr "一个分支名 '%s' 已经存在。"
-#: remote.c:2141
-msgid " (use \"git push\" to publish your local commits)\n"
-msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
+#: branch.c:198
+msgid "Cannot force update the current branch."
+msgstr "无法强制更新当前分支。"
-#: remote.c:2144
+#: branch.c:218
#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
-msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
-
-# 译者：注意保持前导空格
-#: remote.c:2152
-msgid " (use \"git pull\" to update your local branch)\n"
-msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"
-#: remote.c:2155
+#: branch.c:220
#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-"您的分支和 '%s' 出现了偏离，\n"
-"并且分别有 %d 和 %d 处不同的提交。\n"
-msgstr[1] ""
-"您的分支和 '%s' 出现了偏离，\n"
-"并且分别有 %d 和 %d 处不同的提交。\n"
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "请求的上游分支 '%s' 不存在"
-# 译者：注意保持前导空格
-#: remote.c:2165
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr " （使用 \"git pull\" 来合并远程分支）\n"
+#: 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\" 推送分支并配置和上游的关联。"
-#: revision.c:2366
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent 与 --bisect 不兼容"
+#: branch.c:265
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "不是一个有效的对象名：'%s'。"
-#: run-command.c:83
-msgid "open /dev/null failed"
-msgstr "不能打开 /dev/null"
+#: branch.c:285
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "歧义的对象名：'%s'。"
-#: run-command.c:85
+#: branch.c:290
#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "不能调用 dup2(%d,%d)"
+msgid "Not a valid branch point: '%s'."
+msgstr "无效的分支点：'%s'。"
-#: send-pack.c:272
-msgid "failed to sign the push certificate"
-msgstr "无法为推送证书签名"
+#: branch.c:344
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr "'%s' 已经检出到 '%s'"
-#: send-pack.c:378
-msgid "the receiving end does not support --signed push"
-msgstr "接收端不支持签名推送"
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "工作区 %s 的 HEAD 指向没有被更新"
-#: send-pack.c:389
-msgid "the receiving end does not support --atomic push"
-msgstr "接收端不支持原子推送"
+#: bundle.c:34
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "'%s' 不像是一个 v2 版本的包文件"
-#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
-#: builtin/merge.c:983
+#: bundle.c:61
#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "不能为写入打开 '%s'"
+msgid "unrecognized header: %s%s (%d)"
+msgstr "未能识别的包头：%s%s (%d)"
-#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
-#: builtin/merge.c:988
+#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
#, c-format
-msgid "Could not write to '%s'"
-msgstr "不能写入 '%s'"
+msgid "could not open '%s'"
+msgstr "不能打开 '%s'"
-#: sequencer.c:195
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr ""
-"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
-"命令标记修正后的文件"
+#: bundle.c:139
+msgid "Repository lacks these prerequisite commits:"
+msgstr "仓库中缺少这些必备的提交："
-#: sequencer.c:198
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'\n"
-"and commit the result with 'git commit'"
-msgstr ""
-"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
-"对修正后的文件做标记，然后用 'git commit' 提交"
+#: 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 "版本遍历设置失败"
-#: sequencer.c:211 sequencer.c:861 sequencer.c:944
+#: bundle.c:185
#, c-format
-msgid "Could not write to %s"
-msgstr "不能写入 %s"
+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 "这个包记录一个完整历史。"
-#: sequencer.c:214
+#: bundle.c:194
#, c-format
-msgid "Error wrapping up %s"
-msgstr "错误收尾 %s"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "这个包需要这个引用："
+msgstr[1] "这个包需要 %d 个引用："
-#: sequencer.c:229
-msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "您的本地修改将被拣选操作覆盖。"
+#: bundle.c:253
+msgid "Could not spawn pack-objects"
+msgstr "不能生成 pack-objects 进程"
-#: sequencer.c:231
-msgid "Your local changes would be overwritten by revert."
-msgstr "您的本地修改将被还原操作覆盖。"
+#: bundle.c:264
+msgid "pack-objects died"
+msgstr "pack-objects 终止"
-#: sequencer.c:234
-msgid "Commit your changes or stash them to proceed."
-msgstr "提交您的修改或保存进度后再继续。"
+#: bundle.c:304
+msgid "rev-list died"
+msgstr "rev-list 终止"
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:321
+#: bundle.c:353
#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s：无法写入新索引文件"
-
-#: sequencer.c:339
-msgid "Could not resolve HEAD commit\n"
-msgstr "不能解析 HEAD 提交\n"
-
-#: sequencer.c:359
-msgid "Unable to update cache tree\n"
-msgstr "不能更新缓存\n"
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "引用 '%s' 被 rev-list 选项排除"
-#: sequencer.c:411
+#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
#, c-format
-msgid "Could not parse commit %s\n"
-msgstr "不能解析提交 %s\n"
+msgid "unrecognized argument: %s"
+msgstr "未能识别的参数：%s"
-#: sequencer.c:416
+#: bundle.c:451
+msgid "Refusing to create empty bundle."
+msgstr "不能创建空包。"
+
+#: bundle.c:463
#, c-format
-msgid "Could not parse parent commit %s\n"
-msgstr "不能解析父提交 %s\n"
+msgid "cannot create '%s'"
+msgstr "不能创建 '%s'"
-#: sequencer.c:482
-msgid "Your index file is unmerged."
-msgstr "您的索引文件未完成合并。"
+#: bundle.c:491
+msgid "index-pack died"
+msgstr "index-pack 终止"
-#: sequencer.c:501
+#: color.c:300
#, c-format
-msgid "Commit %s is a merge but no -m option was given."
-msgstr "æ\8f\90交 %s æ\98¯ä¸\80个å\90\88并æ\8f\90交ä½\86æ\9cªæ\8f\90ä¾\9b -m é\80\89项ã\80\82"
+msgid "invalid color value: %.*s"
+msgstr "æ\97 æ\95\88ç\9a\84é¢\9cè\89²å\80¼ï¼\9a%.*s"
-#: sequencer.c:509
+#: 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 "Commit %s does not have parent %d"
-msgstr "提交 %s 没有父提交 %d"
+msgid "could not parse %s"
+msgstr "不能解析 %s"
-#: sequencer.c:513
+#: commit.c:42
#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
-msgstr "指定了主线但提交 %s 不是一个合并。"
+msgid "%s %s is not a commit!"
+msgstr "%s %s 不是一个提交!"
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:526
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-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"
-#: sequencer.c:530
-#, c-format
-msgid "Cannot get commit message for %s"
-msgstr "不能得到 %s 的提交说明"
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "内存耗尽"
-#: sequencer.c:616
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "不能还原 %s... %s"
+#: config.c:191
+msgid "relative config include conditionals must come from files"
+msgstr "包含相对路径的条件引用必须来自于文件"
-#: sequencer.c:617
+#: config.c:711
#, c-format
-msgid "could not apply %s... %s"
-msgstr "不能应用 %s... %s"
+msgid "bad config line %d in blob %s"
+msgstr "数据对象 %2$s 中错误的配置行 %1$d"
-#: sequencer.c:653
-msgid "empty commit set passed"
-msgstr "提供了空的提交集"
+#: config.c:715
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "文件 %2$s 中错误的配置行 %1$d"
-#: sequencer.c:661
+#: config.c:719
#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s：无法读取索引"
+msgid "bad config line %d in standard input"
+msgstr "标准输入中错误的配置行 %d"
-#: sequencer.c:665
+#: config.c:723
#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s：无法刷新索引"
+msgid "bad config line %d in submodule-blob %s"
+msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
-#: sequencer.c:725
+#: config.c:727
#, c-format
-msgid "Cannot %s during a %s"
-msgstr "无法 %s 在一个 %s 过程中"
+msgid "bad config line %d in command line %s"
+msgstr "命令行 %2$s 中错误的配置行 %1$d"
-#: sequencer.c:747
+#: config.c:731
#, c-format
-msgid "Could not parse line %d."
-msgstr "不能解析第 %d 行。"
+msgid "bad config line %d in %s"
+msgstr "在 %2$s 中错误的配置行 %1$d"
-#: sequencer.c:752
-msgid "No commits parsed."
-msgstr "没有提交被解析。"
+#: config.c:859
+msgid "out of range"
+msgstr "超出范围"
-#: sequencer.c:765
+#: config.c:859
+msgid "invalid unit"
+msgstr "无效的单位"
+
+#: config.c:865
#, c-format
-msgid "Could not open %s"
-msgstr "不能打开 %s"
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
-#: sequencer.c:769
+#: config.c:870
#, c-format
-msgid "Could not read %s."
-msgstr "不能读取 %s。"
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: sequencer.c:776
+#: config.c:873
#, c-format
-msgid "Unusable instruction sheet: %s"
-msgstr "æ\97 ç\94¨ç\9a\84æ\8c\87令表å\8d\95ï¼\9a%s"
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "æ\96\87件 %3$s ä¸é\85\8dç½®å\8f\98é\87\8f '%2$s' é\94\99误ç\9a\84å\8f\96å\80¼ '%1$s'ï¼\9a%4$s"
-#: sequencer.c:806
+#: config.c:876
#, c-format
-msgid "Invalid key: %s"
-msgstr "æ\97 æ\95\88é\94®å\90\8dï¼\9a%s"
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "æ \87å\87\86è¾\93å\85¥ä¸é\85\8dç½®å\8f\98é\87\8f '%2$s' é\94\99误ç\9a\84å\8f\96å\80¼ '%1$s'ï¼\9a%3$s"
-#: sequencer.c:809
+#: config.c:879
#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "%s 的值无效：%s"
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: sequencer.c:821
+#: config.c:882
#, c-format
-msgid "Malformed options sheet: %s"
-msgstr "非法的选项表单：%s"
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: sequencer.c:842
-msgid "a cherry-pick or revert is already in progress"
-msgstr "一个拣选或还原操作已在进行"
+#: 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"
-#: sequencer.c:843
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
+#: config.c:980
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "无法扩展 '%s' 中的用户目录"
-#: sequencer.c:847
+#: config.c:1075 config.c:1086
#, c-format
-msgid "Could not create sequencer directory %s"
-msgstr "不能创建序列目录 %s"
+msgid "bad zlib compression level %d"
+msgstr "错误的 zlib 压缩级别 %d"
-#: sequencer.c:863 sequencer.c:948
+#: config.c:1203
#, c-format
-msgid "Error wrapping up %s."
-msgstr "错误收尾 %s。"
+msgid "invalid mode for object creation: %s"
+msgstr "无效的对象创建模式：%s"
-#: sequencer.c:882 sequencer.c:1018
-msgid "no cherry-pick or revert in progress"
-msgstr "拣选或还原操作并未进行"
+#: config.c:1359
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "错误的打包压缩级别 %d"
-#: sequencer.c:884
-msgid "cannot resolve HEAD"
-msgstr "不能解析 HEAD"
+#: config.c:1557
+msgid "unable to parse command-line config"
+msgstr "无法解析命令行中的配置"
-#: sequencer.c:886
-msgid "cannot abort from a branch yet to be born"
-msgstr "不能从尚未建立的分支终止"
+#: config.c:1611
+msgid "unknown error occurred while reading the configuration files"
+msgstr "在读取配置文件时遇到未知错误"
-#: sequencer.c:908 builtin/apply.c:4291
+#: config.c:1970
#, c-format
-msgid "cannot open %s: %s"
-msgstr "不能打开 %s：%s"
+msgid "Invalid %s: '%s'"
+msgstr "无效 %s：'%s'"
-#: sequencer.c:911
+#: config.c:1991
#, c-format
-msgid "cannot read %s: %s"
-msgstr "不能读取 %s：%s"
-
-#: sequencer.c:912
-msgid "unexpected end of file"
-msgstr "意外的文件结束"
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"
-#: sequencer.c:918
+#: config.c:2017
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
-#: sequencer.c:941
+#: config.c:2028
#, c-format
-msgid "Could not format %s."
-msgstr "不能格式化 %s。"
+msgid "unable to parse '%s' from command-line config"
+msgstr "无法解析命令行配置中的 '%s'"
-#: sequencer.c:1086
+#: config.c:2030
#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s：不能拣选一个%s"
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: sequencer.c:1089
+#: config.c:2089
#, c-format
-msgid "%s: bad revision"
-msgstr "%s：错误的版本"
+msgid "%s has multiple values"
+msgstr "%s 有多个取值"
-#: sequencer.c:1123
-msgid "Can't revert as initial commit"
-msgstr "不能作为初始提交还原"
+#: config.c:2423 config.c:2648
+#, c-format
+msgid "fstat on %s failed"
+msgstr "对 %s 调用 fstat 失败"
-#: sequencer.c:1124
-msgid "Can't cherry-pick into empty head"
-msgstr "不能拣选到空分支"
+#: config.c:2541
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "不能设置 '%s' 为 '%s'"
-#: setup.c:243
+#: config.c:2543 builtin/remote.c:774
#, c-format
-msgid "failed to read %s"
-msgstr "无法读取 %s"
+msgid "could not unset '%s'"
+msgstr "不能取消设置 '%s'"
-#: sha1_name.c:453
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
+msgstr "远端在连接发起时即挂断"
+
+#: connect.c:51
msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+"Could not read from remote repository.\n"
"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
msgstr ""
-"Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n"
-"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+"无法读取远程仓库。\n"
"\n"
-"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"
-"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
-"命令关闭本消息通知。"
+"请确认您有正确的访问权限并且仓库存在。"
-#: submodule.c:64 submodule.c:98
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
+#: 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"
-#: submodule.c:68 submodule.c:102
+#: connected.c:102
+msgid "failed to close rev-list's stdin"
+msgstr "无法关闭 rev-list 的标准输入"
+
+#: convert.c:201
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
+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"
+"在工作区中该文件仍保持原有的换行符。"
-#: submodule.c:76
+#: convert.c:205
#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "不能更新 .gitmodules 条目 %s"
+msgid "CRLF would be replaced by LF in %s."
+msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
-#: submodule.c:109
+#: convert.c:211
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "无法移除 %s 的 .gitmodules 条目"
+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"
+"在工作区中该文件仍保持原有的换行符。"
-#: submodule.c:120
-msgid "staging updated .gitmodules failed"
-msgstr "将更新后 .gitmodules 添加暂存区失败"
+#: convert.c:215
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "文件 %s 中的 LF 将被 CRLF 替换"
-#: submodule.c:1115
+#: date.c:97
+msgid "in the future"
+msgstr "在将来"
+
+#: date.c:103
#, c-format
-msgid "Could not set core.worktree in %s"
-msgstr "不能在 %s 中设置 core.worktree"
+msgid "%lu second ago"
+msgid_plural "%lu seconds ago"
+msgstr[0] "%lu 秒钟前"
+msgstr[1] "%lu 秒钟前"
-#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
-#: trailer.c:561
+#: date.c:110
#, c-format
-msgid "unknown value '%s' for key '%s'"
-msgstr "键 '%2$s' 的未知取值 '%1$s'"
+msgid "%lu minute ago"
+msgid_plural "%lu minutes ago"
+msgstr[0] "%lu 分钟前"
+msgstr[1] "%lu 分钟前"
-#: trailer.c:543 trailer.c:548 builtin/remote.c:290
+#: date.c:117
#, c-format
-msgid "more than one %s"
-msgstr "多于一个 %s"
+msgid "%lu hour ago"
+msgid_plural "%lu hours ago"
+msgstr[0] "%lu 小时前"
+msgstr[1] "%lu 小时前"
-#: trailer.c:581
+#: date.c:124
#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "签名 '%.*s' 的键为空"
+msgid "%lu day ago"
+msgid_plural "%lu days ago"
+msgstr[0] "%lu 天前"
+msgstr[1] "%lu 天前"
-#: trailer.c:701
+#: date.c:130
#, c-format
-msgid "could not read input file '%s'"
-msgstr "不能读取输入文件 '%s'"
+msgid "%lu week ago"
+msgid_plural "%lu weeks ago"
+msgstr[0] "%lu 周前"
+msgstr[1] "%lu 周前"
-#: trailer.c:704
-msgid "could not read from stdin"
-msgstr "不能自标准输入读取"
+#: date.c:137
+#, c-format
+msgid "%lu month ago"
+msgid_plural "%lu months ago"
+msgstr[0] "%lu 个月前"
+msgstr[1] "%lu 个月前"
-#: unpack-trees.c:203
-msgid "Checking out files"
-msgstr "正在检出文件"
+#: date.c:148
+#, c-format
+msgid "%lu year"
+msgid_plural "%lu years"
+msgstr[0] "%lu 年"
+msgstr[1] "%lu 年"
-#: urlmatch.c:120
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
+#. 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 个月前"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: date.c:156 date.c:161
#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "无效的 %XX 转义序列"
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] "%lu 年前"
+msgstr[1] "%lu 年前"
-#: urlmatch.c:172
-msgid "missing host and scheme is not 'file:'"
-msgstr "缺失主机名且URL方案不是 'file:'"
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "无法读取排序文件 '%s'"
-#: urlmatch.c:189
-msgid "a 'file:' URL may not have a port number"
-msgstr "一个 'file:' URL 不应该包含端口号"
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
+msgstr "正在进行非精确的重命名探测"
-#: urlmatch.c:199
-msgid "invalid characters in host name"
-msgstr "主机名中包含无效的字符"
+#: diff.c:62
+#, c-format
+msgid "option '%s' requires a value"
+msgstr "选项 '%s' 需要一个值"
-#: urlmatch.c:244 urlmatch.c:255
-msgid "invalid port number"
-msgstr "无效的端口号"
+# 译者：注意保持前导空格
+#: diff.c:124
+#, c-format
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
-#: urlmatch.c:322
-msgid "invalid '..' path segment"
-msgstr "无效的 '..' 路径片段"
+# 译者：注意保持前导空格
+#: diff.c:129
+#, c-format
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr " 未知的 dirstat 参数 '%s'\n"
-#: wrapper.c:523
+#: diff.c:281
#, c-format
-msgid "unable to access '%s': %s"
-msgstr "不能访问 '%s'：%s"
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
-#: wrapper.c:544
+#: diff.c:344
#, c-format
-msgid "unable to access '%s'"
-msgstr "不能访问 '%s'"
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"发现配置变量 'diff.dirstat' 中的错误：\n"
+"%s"
-#: wrapper.c:555
+#: diff.c:3102
#, c-format
-msgid "unable to look up current user in the passwd file: %s"
-msgstr "无法在口令文件中查询到当前用户：%s"
+msgid "external diff died, stopping at %s"
+msgstr "外部 diff 退出，停止在 %s"
-#: wrapper.c:556
-msgid "no such user"
-msgstr "无此用户"
+#: diff.c:3428
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: wrapper.c:564
-msgid "unable to get current working directory"
-msgstr "不能获取当前工作目录"
+#: diff.c:3518
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow 明确要求只跟一个路径规格"
-#: wrapper.c:575
+#: diff.c:3681
#, c-format
-msgid "could not open %s for writing"
-msgstr "不能写入 %s"
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"无法解析 --dirstat/-X 选项的参数：\n"
+"%s"
-#: wrapper.c:587
+#: diff.c:3695
#, c-format
-msgid "could not write to %s"
-msgstr "不能写入 %s"
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr "无法解析 --submodule 选项的参数：'%s'"
-#: wrapper.c:593
-#, c-format
-msgid "could not close %s"
-msgstr "不能关闭 %s"
+#: diff.c:4719
+msgid "inexact rename detection was skipped due to too many files."
+msgstr "因为文件太多，略过不严格的重命名检查。"
-#: wt-status.c:150
-msgid "Unmerged paths:"
-msgstr "未合并的路径："
+#: diff.c:4722
+msgid "only found copies from modified paths due to too many files."
+msgstr "因为文件太多，只在修改的路径中查找拷贝。"
-# 译者：注意保持前导空格
-#: wt-status.c:177 wt-status.c:204
+#: diff.c:4725
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " （使用 \"git reset %s <文件>...\" 撤出暂存区）"
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
-# 译者：注意保持前导空格
-#: wt-status.c:179 wt-status.c:206
-msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " （使用 \"git rm --cached <文件>...\" 撤出暂存区）"
+#: dir.c:1899
+msgid "failed to get kernel name and information"
+msgstr "无法获得内核名称和信息"
-# 译者：注意保持前导空格
-#: wt-status.c:183
-msgid " (use \"git add <file>...\" to mark resolution)"
-msgstr " （使用 \"git add <文件>...\" 标记解决方案）"
+#: dir.c:2018
+msgid "Untracked cache is disabled on this system or location."
+msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
-# 译者：注意保持前导空格
-#: wt-status.c:185 wt-status.c:189
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
+#: dir.c:2776 dir.c:2781
+#, c-format
+msgid "could not create directories for %s"
+msgstr "不能为 %s 创建目录"
-# 译者：注意保持前导空格
-#: wt-status.c:187
-msgid " (use \"git rm <file>...\" to mark resolution)"
-msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
+#: dir.c:2806
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
-#: wt-status.c:198 wt-status.c:881
-msgid "Changes to be committed:"
-msgstr "要提交的变更："
+#: entry.c:280
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "不能对文件 '%s' 调用 stat"
-#: wt-status.c:216 wt-status.c:890
-msgid "Changes not staged for commit:"
-msgstr "尚未暂存以备提交的变更："
+#: fetch-pack.c:249
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack：应为 shallow 列表"
-# 译者：注意保持前导空格
-#: wt-status.c:220
-msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"
+#: fetch-pack.c:261
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"
-# 译者：注意保持前导空格
-#: wt-status.c:222
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
+#: fetch-pack.c:280 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "远程错误：%s"
-# 译者：注意保持前导空格
-#: wt-status.c:223
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
-msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
+#: fetch-pack.c:281
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-# 译者：注意保持前导空格
-#: wt-status.c:225
-msgid " (commit or discard the untracked or modified content in submodules)"
-msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
+#: fetch-pack.c:333
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc 需要 multi_ack_detailed"
-# 译者：注意保持前导空格
-#: wt-status.c:237
+#: fetch-pack.c:419
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"
-
-#: wt-status.c:252
-msgid "both deleted:"
-msgstr "双方删除："
+msgid "invalid shallow line: %s"
+msgstr "无效的 shallow 信息：%s"
-#: wt-status.c:254
-msgid "added by us:"
-msgstr "由我们添加："
+#: fetch-pack.c:425
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "无效的 unshallow 信息：%s"
-#: wt-status.c:256
-msgid "deleted by them:"
-msgstr "由他们删除："
+#: fetch-pack.c:427
+#, c-format
+msgid "object not found: %s"
+msgstr "对象未找到：%s"
-#: wt-status.c:258
-msgid "added by them:"
-msgstr "由他们添加："
+#: fetch-pack.c:430
+#, c-format
+msgid "error in object: %s"
+msgstr "对象中出错：%s"
-#: wt-status.c:260
-msgid "deleted by us:"
-msgstr "由我们删除："
+#: fetch-pack.c:432
+#, c-format
+msgid "no shallow found: %s"
+msgstr "未发现 shallow：%s"
-#: wt-status.c:262
-msgid "both added:"
-msgstr "双方添加："
+#: fetch-pack.c:435
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "应为 shallow/unshallow，却得到 %s"
-#: wt-status.c:264
-msgid "both modified:"
-msgstr "双方修改："
+#: fetch-pack.c:474
+#, c-format
+msgid "got %s %d %s"
+msgstr "得到 %s %d %s"
-#: wt-status.c:266
+#: fetch-pack.c:488
#, c-format
-msgid "bug: unhandled unmerged status %x"
-msgstr "bug：无法处理的未合并状态 %x"
+msgid "invalid commit %s"
+msgstr "无效提交 %s"
-#: wt-status.c:274
-msgid "new file:"
-msgstr "æ\96°æ\96\87件ï¼\9a"
+#: fetch-pack.c:521
+msgid "giving up"
+msgstr "æ\94¾å¼\83"
-#: wt-status.c:276
-msgid "copied:"
-msgstr "拷贝："
+#: fetch-pack.c:531 progress.c:235
+msgid "done"
+msgstr "完成"
-#: wt-status.c:278
-msgid "deleted:"
-msgstr "删除："
+#: fetch-pack.c:543
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "得到 %s (%d) %s"
-#: wt-status.c:280
-msgid "modified:"
-msgstr "修改："
+#: fetch-pack.c:589
+#, c-format
+msgid "Marking %s as complete"
+msgstr "标记 %s 为完成"
-#: wt-status.c:282
-msgid "renamed:"
-msgstr "重命名："
+#: fetch-pack.c:737
+#, c-format
+msgid "already have %s (%s)"
+msgstr "已经有 %s（%s）"
-#: wt-status.c:284
-msgid "typechange:"
-msgstr "类型变更："
+#: fetch-pack.c:775
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack：无法派生 sideband 多路输出"
-#: wt-status.c:286
-msgid "unknown:"
-msgstr "未知："
+#: fetch-pack.c:783
+msgid "protocol error: bad pack header"
+msgstr "协议错误：坏的包头"
-#: wt-status.c:288
-msgid "unmerged:"
-msgstr "未合并："
+#: fetch-pack.c:839
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack：无法派生进程 %s"
-# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:370
-msgid "new commits, "
-msgstr "新提交, "
+#: fetch-pack.c:855
+#, c-format
+msgid "%s failed"
+msgstr "%s 失败"
-# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:372
-msgid "modified content, "
-msgstr "修改的内容, "
+#: fetch-pack.c:857
+msgid "error in sideband demultiplexer"
+msgstr "sideband 多路输出出错"
-# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:374
-msgid "untracked content, "
-msgstr "未跟踪的内容, "
+#: fetch-pack.c:884
+msgid "Server does not support shallow clients"
+msgstr "服务器不支持 shalllow 客户端"
-#: wt-status.c:391
-#, c-format
-msgid "bug: unhandled diff status %c"
-msgstr "bug：无法处理的差异状态 %c"
+#: fetch-pack.c:888
+msgid "Server supports multi_ack_detailed"
+msgstr "服务器支持 multi_ack_detailed"
-#: wt-status.c:755
-msgid "Submodules changed but not updated:"
-msgstr "子模组已修改但尚未更新："
+#: fetch-pack.c:891
+msgid "Server supports no-done"
+msgstr "服务器支持 no-done"
-#: wt-status.c:757
-msgid "Submodule changes to be committed:"
-msgstr "要提交的子模组变更："
+#: fetch-pack.c:897
+msgid "Server supports multi_ack"
+msgstr "服务器支持 multi_ack"
-#: wt-status.c:838
-msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
-msgstr ""
-"不要改动上面的一行。\n"
-"下面的所有内容均将被删除。"
+#: fetch-pack.c:901
+msgid "Server supports side-band-64k"
+msgstr "服务器支持 side-band-64k"
-#: wt-status.c:949
-msgid "You have unmerged paths."
-msgstr "æ\82¨æ\9c\89å°\9aæ\9cªå\90\88并ç\9a\84è·¯å¾\84ã\80\82"
+#: fetch-pack.c:905
+msgid "Server supports side-band"
+msgstr "æ\9c\8då\8a¡å\99¨æ\94¯æ\8c\81 side-band"
-# 译者：注意保持前导空格
-#: wt-status.c:952
-msgid " (fix conflicts and run \"git commit\")"
-msgstr " （解决冲突并运行 \"git commit\"）"
+#: fetch-pack.c:909
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "服务器支持 allow-tip-sha1-in-want"
-#: wt-status.c:955
-msgid "All conflicts fixed but you are still merging."
-msgstr "æ\89\80æ\9c\89å\86²çª\81已解å\86³ä½\86æ\82¨ä»\8då¤\84äº\8eå\90\88并ä¸ã\80\82"
+#: fetch-pack.c:913
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "æ\9c\8då\8a¡å\99¨æ\94¯æ\8c\81 allow-reachable-sha1-in-want"
-# 译者：注意保持前导空格
-#: wt-status.c:958
-msgid " (use \"git commit\" to conclude merge)"
-msgstr " （使用 \"git commit\" 结束合并）"
+#: fetch-pack.c:923
+msgid "Server supports ofs-delta"
+msgstr "服务器支持 ofs-delta"
-#: wt-status.c:968
-msgid "You are in the middle of an am session."
-msgstr "您正处于 am 操作过程中。"
+#: fetch-pack.c:930
+#, c-format
+msgid "Server version is %.*s"
+msgstr "服务器版本 %.*s"
-#: wt-status.c:971
-msgid "The current patch is empty."
-msgstr "当前的补丁为空。"
+#: fetch-pack.c:936
+msgid "Server does not support --shallow-since"
+msgstr "服务器不支持 --shallow-since"
-# 译者：注意保持前导空格
-#: wt-status.c:975
-msgid " (fix conflicts and then run \"git am --continue\")"
-msgstr " （解决冲突，然后运行 \"git am --continue\"）"
+#: fetch-pack.c:940
+msgid "Server does not support --shallow-exclude"
+msgstr "服务器不支持 --shallow-exclude"
-# 译者：注意保持前导空格
-#: wt-status.c:977
-msgid " (use \"git am --skip\" to skip this patch)"
-msgstr " （使用 \"git am --skip\" 跳过此补丁）"
+#: fetch-pack.c:942
+msgid "Server does not support --deepen"
+msgstr "服务器不支持 --deepen"
-# 译者：注意保持前导空格
-#: wt-status.c:979
-msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr " （使用 \"git am --abort\" 恢复原有分支）"
+#: 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 "没有匹配的远程分支"
-#: wt-status.c:1039 wt-status.c:1056
+#: fetch-pack.c:1149
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "æ\82¨å\9c¨æ\89§è¡\8cå°\86å\88\86æ\94¯ '%s' å\8f\98å\9fºå\88° '%s' ç\9a\84æ\93\8dä½\9cã\80\82"
+msgid "no such remote ref %s"
+msgstr "没æ\9c\89è¿\99æ ·ç\9a\84è¿\9cç¨\8bå¼\95ç\94¨ %s"
-#: wt-status.c:1044 wt-status.c:1061
-msgid "You are currently rebasing."
-msgstr "您在执行变基操作。"
+#: fetch-pack.c:1152
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "服务器不允许请求未公开的对象 %s"
-# 译者：注意保持前导空格
-#: wt-status.c:1047
-msgid " (fix conflicts and then run \"git rebase --continue\")"
-msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
+#: gpg-interface.c:185
+msgid "gpg failed to sign the data"
+msgstr "gpg 无法为数据签名"
-# 译者：注意保持前导空格
-#: wt-status.c:1049
-msgid " (use \"git rebase --skip\" to skip this patch)"
-msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
+#: gpg-interface.c:215
+msgid "could not create temporary file"
+msgstr "不能创建临时文件"
-# 译者：注意保持前导空格
-#: wt-status.c:1051
-msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
+#: gpg-interface.c:217
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "无法将分离式签名写入 '%s'"
-# 译者：注意保持前导空格
-#: wt-status.c:1064
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
-msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
+#: graph.c:96
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
-#: wt-status.c:1068
+#: grep.c:1796
#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
+msgid "'%s': unable to read %s"
+msgstr "'%s'：无法读取 %s"
-#: wt-status.c:1073
-msgid "You are currently splitting a commit during a rebase."
-msgstr "您在执行变基操作时拆分提交。"
+#: 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 失败"
-# 译者：注意保持前导空格
-#: wt-status.c:1076
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
+#: grep.c:1824
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s'：读取不完整"
-#: wt-status.c:1080
+#: help.c:218
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
+msgid "available git commands in '%s'"
+msgstr "在 '%s' 下可用的 git 命令"
-#: wt-status.c:1085
-msgid "You are currently editing a commit during a rebase."
-msgstr "您在执行变基操作时编辑提交。"
+#: help.c:225
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
-# 译者：注意保持前导空格
-#: wt-status.c:1088
-msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr " （使用 \"git commit --amend\" 修补当前提交）"
+#: help.c:256
+msgid "These are common Git commands used in various situations:"
+msgstr "这些是各种场合常见的 Git 命令："
-# 译者：注意保持前导空格
-#: wt-status.c:1090
+#: help.c:321
+#, c-format
msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
+"'%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 命令。"
-#: wt-status.c:1100
+#: help.c:398
#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "您在执行拣选提交 %s 的操作。"
+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'"
-# 译者：注意保持前导空格
-#: wt-status.c:1105
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
+#: help.c:403
+#, c-format
+msgid "in %0.1f seconds automatically..."
+msgstr "在 %0.1f 秒钟后自动运行..."
-# 译者：注意保持前导空格
-#: wt-status.c:1108
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
+#: help.c:410
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
-# 译者：注意保持前导空格
-#: wt-status.c:1110
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
+#: 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"
+"您指的是这其中的某一个么？"
-#: wt-status.c:1119
+#: help.c:476
#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "您在执行反转提交 %s 的操作。"
-
-# 译者：注意保持前导空格
-#: wt-status.c:1124
-msgid " (fix conflicts and run \"git revert --continue\")"
-msgstr " （解决冲突并运行 \"git revert --continue\"）"
+msgid "%s: %s - %s"
+msgstr "%s：%s - %s"
-# 译者：注意保持前导空格
-#: wt-status.c:1127
-msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"
+#: 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"
-# 译者：注意保持前导空格
-#: wt-status.c:1129
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
+#: ident.c:367
+msgid "no email was given and auto-detection is disabled"
+msgstr "未提供邮件地址且自动探测被禁用"
-#: wt-status.c:1140
+#: ident.c:372
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "æ\82¨å\9c¨æ\89§è¡\8cä»\8eå\88\86æ\94¯ '%s' å¼\80å§\8bç\9a\84äº\8cå\88\86æ\9f¥æ\89¾æ\93\8dä½\9cã\80\82"
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "æ\97 æ³\95è\87ªå\8a¨æ\8e¢æµ\8bé\82®ä»¶å\9c°å\9d\80ï¼\88å¾\97å\88° '%s'ï¼\89"
-#: wt-status.c:1144
-msgid "You are currently bisecting."
-msgstr "æ\82¨å\9c¨æ\89§è¡\8cäº\8cå\88\86æ\9f¥æ\89¾æ\93\8dä½\9cã\80\82"
+#: ident.c:382
+msgid "no name was given and auto-detection is disabled"
+msgstr "æ\9cªæ\8f\90ä¾\9bå§\93å\90\8dä¸\94è\87ªå\8a¨æ\8e¢æµ\8b被ç¦\81ç\94¨"
-# 译者：注意保持前导空格
-#: wt-status.c:1147
-msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
-
-#: wt-status.c:1324
-msgid "On branch "
-msgstr "位于分支 "
-
-#: wt-status.c:1331
-msgid "rebase in progress; onto "
-msgstr "变基操作正在进行中；至 "
-
-#: wt-status.c:1336
-msgid "HEAD detached at "
-msgstr "头指针分离于 "
-
-#: wt-status.c:1338
-msgid "HEAD detached from "
-msgstr "头指针分离自 "
-
-#: wt-status.c:1341
-msgid "Not currently on any branch."
-msgstr "当前不在任何分支上。"
+#: ident.c:388
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "无法自动探测姓名（得到 '%s'）"
-#: wt-status.c:1358
-msgid "Initial commit"
-msgstr "初始提交"
+#: ident.c:396
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "不允许空的姓名（对于 <%s>）"
-#: wt-status.c:1372
-msgid "Untracked files"
-msgstr "未跟踪的文件"
+#: ident.c:402
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "姓名中仅包含禁用字符：%s"
-#: wt-status.c:1374
-msgid "Ignored files"
-msgstr "忽略的文件"
+#: ident.c:417 builtin/commit.c:611
+#, c-format
+msgid "invalid date format: %s"
+msgstr "无效的日期格式：%s"
-#: wt-status.c:1378
+#: lockfile.c:152
#, c-format
msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
+"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 ""
-"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
-"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
+"无法创建 '%s.lock'：%s。\n"
+"\n"
+"似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n"
+"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n"
+"可能之前有一个 git 进程在这个仓库中异常退出：\n"
+"手动删除这个文件再继续。"
-#: wt-status.c:1384
+#: lockfile.c:160
#, c-format
-msgid "Untracked files not listed%s"
-msgstr "未跟踪的文件没有列出%s"
+msgid "Unable to create '%s.lock': %s"
+msgstr "不能创建 '%s.lock'：%s"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1386
-msgid " (use -u option to show untracked files)"
-msgstr "（使用 -u 参数显示未跟踪的文件）"
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "无法读取缓存"
-#: wt-status.c:1392
-msgid "No changes"
-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 "无法写新的索引文件"
-#: wt-status.c:1397
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
+#: merge-recursive.c:209
+msgid "(bad commit)\n"
+msgstr "（坏提交）\n"
-#: wt-status.c:1400
+#: merge-recursive.c:231 merge-recursive.c:239
#, c-format
-msgid "no changes added to commit\n"
-msgstr "ä¿®æ\94¹å°\9aæ\9cªå\8a å\85¥æ\8f\90交\n"
+msgid "addinfo_cache failed for path '%s'"
+msgstr "为路å¾\84 '%s' addinfo_cache 失败"
-#: wt-status.c:1403
-#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
+#: merge-recursive.c:303
+msgid "error building trees"
+msgstr "无法创建树"
-#: wt-status.c:1406
+#: merge-recursive.c:727
#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "æ\8f\90交为空ï¼\8cä½\86æ\98¯å\98å\9c¨å°\9aæ\9cªè·\9f踪ç\9a\84æ\96\87件\n"
+msgid "failed to create path '%s'%s"
+msgstr "æ\97 æ³\95å\88\9b建路å¾\84 '%s'%s"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1409
+#: merge-recursive.c:738
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
+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 "：可能是一个目录/文件冲突？"
-#: wt-status.c:1412 wt-status.c:1417
+#: merge-recursive.c:761
#, c-format
-msgid "nothing to commit\n"
-msgstr "æ\97 æ\96\87件è¦\81æ\8f\90交\n"
+msgid "refusing to lose untracked file at '%s'"
+msgstr "æ\8b\92ç»\9d丢å¼\83 '%s' ä¸ç\9a\84æ\9cªè·\9f踪æ\96\87件"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1415
+#: merge-recursive.c:803 builtin/cat-file.c:34
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
+msgid "cannot read object %s '%s'"
+msgstr "不能读取对象 %s '%s'"
-# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1419
+#: merge-recursive.c:805
#, c-format
-msgid "nothing to commit, working directory clean\n"
-msgstr "无文件要提交，干净的工作区\n"
+msgid "blob expected for %s '%s'"
+msgstr "%s '%s' 应为数据对象"
-#: wt-status.c:1528
-msgid "HEAD (no branch)"
-msgstr "HEAD（非分支）"
+#: merge-recursive.c:829
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "无法打开 '%s'：%s"
-# 译者：注意保持句尾空格
-#: wt-status.c:1534
-msgid "Initial commit on "
-msgstr "初始提交于 "
+#: merge-recursive.c:840
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "无法创建符号链接 '%s'：%s"
-#: wt-status.c:1561
-msgid "gone"
-msgstr "丢失"
+#: merge-recursive.c:845
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "不知道如何处理 %06o %s '%s'"
-# 译者：注意保持句尾空格
-#: wt-status.c:1563 wt-status.c:1571
-msgid "behind "
-msgstr "落后 "
+#: merge-recursive.c:985
+msgid "Failed to execute internal merge"
+msgstr "无法执行内部合并"
-#: compat/precompose_utf8.c:55 builtin/clone.c:345
+#: merge-recursive.c:989
#, c-format
-msgid "failed to unlink '%s'"
-msgstr "无法删除 '%s'"
+msgid "Unable to add %s to database"
+msgstr "不能添加 %s 至对象库"
-#: builtin/add.c:22
-msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<选项>] [--] <路径规则>..."
+#: 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 版"
+"本被保留。"
-#: builtin/add.c:65
+#: merge-recursive.c:1097
#, c-format
-msgid "unexpected diff status %c"
-msgstr "意外的差异状态 %c"
+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 版本被保留。"
-#: builtin/add.c:70 builtin/commit.c:277
-msgid "updating files failed"
-msgstr "更新文件失败"
+#: 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 中。"
-#: builtin/add.c:80
+#: merge-recursive.c:1109
#, c-format
-msgid "remove '%s'\n"
-msgstr "删除 '%s'\n"
+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 中。"
-#: builtin/add.c:134
-msgid "Unstaged changes after refreshing the index:"
-msgstr "刷新索引之后尚未被暂存的变更："
+#: merge-recursive.c:1143
+msgid "rename"
+msgstr "重命名"
-#: builtin/add.c:194 builtin/rev-parse.c:796
-msgid "Could not read the index"
-msgstr "不能读取索引"
+#: merge-recursive.c:1143
+msgid "renamed"
+msgstr "重命名"
-#: builtin/add.c:205
+#: merge-recursive.c:1200
#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "不能打开 '%s' 以写入。"
-
-#: builtin/add.c:209
-msgid "Could not write patch"
-msgstr "不能生成补丁"
-
-#: builtin/add.c:212
-msgid "editing patch failed"
-msgstr "编辑补丁失败"
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: builtin/add.c:215
+#: merge-recursive.c:1225
#, c-format
-msgid "Could not stat '%s'"
-msgstr "不能查看文件状态 '%s'"
+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"
-#: builtin/add.c:217
-msgid "Empty patch. Aborted."
-msgstr "空补丁。异常终止。"
+#: merge-recursive.c:1230
+msgid " (left unresolved)"
+msgstr "（留下未解决）"
-#: builtin/add.c:222
+#: merge-recursive.c:1292
#, c-format
-msgid "Could not apply '%s'"
-msgstr "不能应用 '%s'"
-
-#: builtin/add.c:232
-msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
+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"
-#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369
-#: builtin/rm.c:268
-msgid "dry run"
-msgstr "演习"
+#: merge-recursive.c:1325
+#, c-format
+msgid "Renaming %s to %s and %s to %s instead"
+msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"
-#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616
-#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
-msgid "be verbose"
-msgstr "冗长输出"
+#: 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"
-#: builtin/add.c:252
-msgid "interactive picking"
-msgstr "交互式拣选"
+#: merge-recursive.c:1543
+#, c-format
+msgid "Adding merged %s"
+msgstr "添加合并后的 %s"
-#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
-msgid "select hunks interactively"
-msgstr "交互式挑选数据块"
+#: merge-recursive.c:1550 merge-recursive.c:1780
+#, c-format
+msgid "Adding as %s instead"
+msgstr "而是以 %s 为名添加"
-#: builtin/add.c:254
-msgid "edit current diff and apply"
-msgstr "编辑当前差异并应用"
+#: merge-recursive.c:1607
+#, c-format
+msgid "cannot read object %s"
+msgstr "不能读取对象 %s"
-#: builtin/add.c:255
-msgid "allow adding otherwise ignored files"
-msgstr "允许添加忽略的文件"
+#: merge-recursive.c:1610
+#, c-format
+msgid "object %s is not a blob"
+msgstr "对象 %s 不是一个数据对象"
-#: builtin/add.c:256
-msgid "update tracked files"
-msgstr "更新已跟踪的文件"
+#: merge-recursive.c:1679
+msgid "modify"
+msgstr "修改"
-#: builtin/add.c:257
-msgid "record only the fact that the path will be added later"
-msgstr "只记录，该路径稍后再添加"
+#: merge-recursive.c:1679
+msgid "modified"
+msgstr "修改"
-#: builtin/add.c:258
-msgid "add changes from all tracked and untracked files"
-msgstr "添加所有改变的已跟踪文件和未跟踪文件"
+#: merge-recursive.c:1689
+msgid "content"
+msgstr "内容"
-#: builtin/add.c:261
-msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
+#: merge-recursive.c:1696
+msgid "add/add"
+msgstr "添加/添加"
-#: builtin/add.c:263
-msgid "don't add, only refresh the index"
-msgstr "不添加，只刷新索引"
+#: merge-recursive.c:1732
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "略过 %s（已经做过相同合并）"
-#: builtin/add.c:264
-msgid "just skip files which cannot be added because of errors"
-msgstr "跳过因出错不能添加的文件"
+#: merge-recursive.c:1746
+#, c-format
+msgid "Auto-merging %s"
+msgstr "自动合并 %s"
-#: builtin/add.c:265
-msgid "check if - even missing - files are ignored in dry run"
-msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
+#: merge-recursive.c:1750 git-submodule.sh:944
+msgid "submodule"
+msgstr "子模组"
-#: builtin/add.c:287
+#: merge-recursive.c:1751
#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "使用 -f 参数如果您确实要添加它们。\n"
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "冲突（%s）：合并冲突于 %s"
-#: builtin/add.c:294
-msgid "adding files failed"
-msgstr "添加文件失败"
+#: merge-recursive.c:1845
+#, c-format
+msgid "Removing %s"
+msgstr "删除 %s"
-#: builtin/add.c:330
-msgid "-A and -u are mutually incompatible"
-msgstr "-A 和 -u 选项互斥"
+#: merge-recursive.c:1871
+msgid "file/directory"
+msgstr "文件/目录"
-#: builtin/add.c:337
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
+#: merge-recursive.c:1877
+msgid "directory/file"
+msgstr "目录/文件"
-#: builtin/add.c:358
+#: merge-recursive.c:1883
#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr "没有指定文件，也没有文件被添加。\n"
+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"
-#: builtin/add.c:359
+#: merge-recursive.c:1892
#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "也许您想要执行 'git add .'？\n"
+msgid "Adding %s"
+msgstr "添加 %s"
-#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918
-#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
-msgid "index file corrupt"
-msgstr "索引文件损坏"
+#: merge-recursive.c:1929
+msgid "Already up-to-date!"
+msgstr "已经是最新的！"
-#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
-msgid "Unable to write new index file"
-msgstr "无法写入新索引文件"
+#: merge-recursive.c:1938
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "无法合并树 %s 和 %s"
-#: builtin/apply.c:59
-msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<选项>] [<补丁>...]"
+#: merge-recursive.c:2021
+msgid "Merging:"
+msgstr "合并："
-#: builtin/apply.c:112
+#: merge-recursive.c:2034
#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr "未能识别的空白字符选项 '%s'"
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "发现 %u 个共同祖先："
+msgstr[1] "发现 %u 个共同祖先："
-#: builtin/apply.c:127
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr "未能识别的空白字符忽略选项 '%s'"
+#: merge-recursive.c:2073
+msgid "merge returned no commit"
+msgstr "合并未返回提交"
-#: builtin/apply.c:822
+#: merge-recursive.c:2136
#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr "无法准备时间戳正则表达式 %s"
+msgid "Could not parse object '%s'"
+msgstr "不能解析对象 '%s'"
+
+#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
+msgid "Unable to write index."
+msgstr "不能写入索引。"
-#: builtin/apply.c:831
+#: notes-merge.c:273
#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr "regexec 返回 %d，输入为：%s"
+msgid ""
+"You have not concluded your previous notes merge (%s exists).\n"
+"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 "
+"notes merge --abort' 来提交/终止前一次合并。"
-#: builtin/apply.c:912
+#: notes-merge.c:280
#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr "不能在补丁的第 %d 行找到文件名"
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "您尚未结束注释合并（存在 %s）。"
-#: builtin/apply.c:944
+#: notes-utils.c:41
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "不能提交未初始化/未引用的注解树"
+
+#: notes-utils.c:100
#, 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"
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "坏的 notes.rewriteMode 值：'%s'"
-#: builtin/apply.c:948
+#: notes-utils.c:110
#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
-#: builtin/apply.c:949
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: notes-utils.c:137
#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
+msgid "Bad %s value: '%s'"
+msgstr "坏的 %s 值：'%s'"
-#: builtin/apply.c:956
+#: object.c:240
#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
+msgid "unable to parse object: %s"
+msgstr "不能解析对象：%s"
+
+#: parse-options.c:572
+msgid "..."
+msgstr "..."
-#: builtin/apply.c:1419
+#: parse-options.c:590
#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount：意外的行：%.*s"
+msgid "usage: %s"
+msgstr "用法：%s"
-#: builtin/apply.c:1476
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:594
#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "第 %d 行的补丁片段没有头信息：%.*s"
+msgid " or: %s"
+msgstr " 或：%s"
-#: builtin/apply.c:1493
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#: parse-options.c:597
#, 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 行）"
+msgid " %s"
+msgstr " %s"
-#: builtin/apply.c:1659
-msgid "new file depends on old contents"
-msgstr "新文件依赖旧内容"
+#: parse-options.c:631
+msgid "-NUM"
+msgstr "-数字"
-#: builtin/apply.c:1661
-msgid "deleted file still has contents"
-msgstr "删除的文件仍有内容"
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "非法的对象名 '%s'"
-#: builtin/apply.c:1687
+#: path.c:810
#, c-format
-msgid "corrupt patch at line %d"
-msgstr "补丁在第 %d 行损坏"
+msgid "Could not make %s writable by group"
+msgstr "不能设置 %s 为组可写"
+
+#: pathspec.c:125
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
-#: builtin/apply.c:1723
+#: pathspec.c:143
+msgid "Only one 'attr:' specification is allowed."
+msgstr "只允许一个 'attr:' 规格。"
+
+#: pathspec.c:146
+msgid "attr spec must not be empty"
+msgstr "属性规格不能为空"
+
+#: pathspec.c:189
#, c-format
-msgid "new file %s depends on old contents"
-msgstr "新文件 %s 依赖旧内容"
+msgid "invalid attribute name %s"
+msgstr "无效的属性名 %s"
+
+#: pathspec.c:254
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
+
+#: pathspec.c:261
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
+
+#: pathspec.c:301
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "路径规格包含无效的神奇前缀"
-#: builtin/apply.c:1725
+#: pathspec.c:322
#, c-format
-msgid "deleted file %s still has contents"
-msgstr "å\88 é\99¤ç\9a\84æ\96\87件 %s ä»\8dæ\9c\89å\86\85容"
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "å\9c¨è·¯å¾\84è§\84æ ¼ '%3$s' ä¸æ\97 æ\95\88ç\9a\84ç¥\9eå¥\87å\89\8dç¼\80 '%2$.*1$s'"
-#: builtin/apply.c:1728
+#: pathspec.c:327
#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** 警告：文件 %s 成为空文件但并未删除"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
-#: builtin/apply.c:1874
+#: pathspec.c:365
#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr "二进制补丁在第 %d 行损坏：%.*s"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
-#: builtin/apply.c:1903
+#: pathspec.c:421 pathspec.c:443
#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr "未能识别的二进制补丁位于第 %d 行"
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
-#: builtin/apply.c:2054
+#: pathspec.c:483
#, c-format
-msgid "patch with only garbage at line %d"
-msgstr "补丁文件的第 %d 行只有垃圾数据"
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s：'literal' 和 'glob' 不兼容"
-#: builtin/apply.c:2144
+#: pathspec.c:496
#, c-format
-msgid "unable to read symlink %s"
-msgstr "无法读取符号链接 %s"
+msgid "%s: '%s' is outside repository"
+msgstr "%s：'%s' 在仓库之外"
-#: builtin/apply.c:2148
+#: pathspec.c:584
#, c-format
-msgid "unable to open or read %s"
-msgstr "不能打开或读取 %s"
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s'（助记符：'%c'）"
-#: builtin/apply.c:2781
+#: pathspec.c:594
#, c-format
-msgid "invalid start of line: '%c'"
-msgstr "无效的行首字符：'%c'"
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
+
+#: pathspec.c:644
+msgid ""
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
+msgstr ""
+"在下一个版本中，使用空字符串作为路径规格将被视作非法。如果要匹配所有路径，\n"
+"请代之以 ."
-#: builtin/apply.c:2900
+#: pathspec.c:668
#, 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 行）"
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "路径规格 '%s' 位于符号链接中"
+
+#: pretty.c:982
+msgid "unable to parse --pretty format"
+msgstr "不能解析 --pretty 格式"
-#: builtin/apply.c:2912
+#: read-cache.c:1442
#, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"设置了 index.version，但是取值无效。\n"
+"使用版本 %i"
-#: builtin/apply.c:2918
+#: read-cache.c:1452
#, c-format
msgid ""
-"while searching for:\n"
-"%.*s"
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-"当查询：\n"
-"%.*s"
+"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
+"使用版本 %i"
-#: builtin/apply.c:2938
+#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr "缺失 '%s' 的二进制补丁数据"
+msgid "could not stat '%s'"
+msgstr "不能对 '%s' 调用 stat"
-#: builtin/apply.c:3039
+#: read-cache.c:2388
#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr "äº\8cè¿\9bå\88¶è¡¥ä¸\81æ\9cªåº\94ç\94¨å\88° '%s'"
+msgid "unable to open git dir: %s"
+msgstr "ä¸\8dè\83½æ\89\93å¼\80 git ç\9b®å½\95ï¼\9a%s"
-#: builtin/apply.c:3045
+#: read-cache.c:2400
#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
+msgid "unable to unlink: %s"
+msgstr "无法删除：%s"
-#: builtin/apply.c:3066
+#: refs.c:620 builtin/merge.c:844
#, c-format
-msgid "patch failed: %s:%ld"
-msgstr "æ\89\93è¡¥ä¸\81失败ï¼\9a%s:%ld"
+msgid "Could not open '%s' for writing"
+msgstr "æ\97 æ³\95æ\89\93å¼\80 '%s' è¿\9bè¡\8cå\86\99å\85¥"
-#: builtin/apply.c:3190
+#: refs.c:1667
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "在隔离环境中禁止更新引用"
+
+#: refs/files-backend.c:1631
#, c-format
-msgid "cannot checkout %s"
-msgstr "不能检出 %s"
+msgid "could not delete reference %s: %s"
+msgstr "无法删除引用 %s：%s"
-#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
+#: refs/files-backend.c:1634
#, c-format
-msgid "read of %s failed"
-msgstr "读取 %s 失败"
+msgid "could not delete references: %s"
+msgstr "无法删除引用：%s"
-#: builtin/apply.c:3243
+#: refs/files-backend.c:1643
#, c-format
-msgid "reading from '%s' beyond a symbolic link"
-msgstr "读取位于符号链接中的 '%s'"
+msgid "could not remove reference %s"
+msgstr "无法删除引用 %s"
+
+#: ref-filter.c:35 wt-status.c:1780
+msgid "gone"
+msgstr "丢失"
-#: builtin/apply.c:3271 builtin/apply.c:3493
+#: ref-filter.c:36
#, c-format
-msgid "path %s has been renamed/deleted"
-msgstr "路径 %s 已经被重命名/删除"
+msgid "ahead %d"
+msgstr "领先 %d"
-#: builtin/apply.c:3352 builtin/apply.c:3507
+#: ref-filter.c:37
#, c-format
-msgid "%s: does not exist in index"
-msgstr "%s：不存在于索引中"
+msgid "behind %d"
+msgstr "落后 %d"
-#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
+#: ref-filter.c:38
#, c-format
-msgid "%s: %s"
-msgstr "%s：%s"
+msgid "ahead %d, behind %d"
+msgstr "领先 %d，落后 %d"
-#: builtin/apply.c:3361 builtin/apply.c:3515
+#: ref-filter.c:104
#, c-format
-msgid "%s: does not match index"
-msgstr "%s：和索引不匹配"
+msgid "expected format: %%(color:<color>)"
+msgstr "期望的格式：%%(color:<color>)"
-#: builtin/apply.c:3463
-msgid "removal patch leaves file contents"
-msgstr "移除补丁仍留下了文件内容"
+#: ref-filter.c:106
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "未能识别的颜色：%%(color:%s)"
-#: builtin/apply.c:3532
+#: ref-filter.c:120
#, c-format
-msgid "%s: wrong type"
-msgstr "%s：错误类型"
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "期望整数值 refname:lstrip=%s"
-#: builtin/apply.c:3534
+#: ref-filter.c:124
#, c-format
-msgid "%s has type %o, expected %o"
-msgstr "%s 的类型是 %o，应为 %o"
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "期望整数值 refname:rstrip=%s"
-#: builtin/apply.c:3693 builtin/apply.c:3695
+#: ref-filter.c:126
#, c-format
-msgid "invalid path '%s'"
-msgstr "æ\97 æ\95\88è·¯å¾\84 '%s'"
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "æ\9cªè\83½è¯\86å\88«ç\9a\84 %%(%s) å\8f\82æ\95°ï¼\9a%s"
-#: builtin/apply.c:3750
+#: ref-filter.c:166
#, c-format
-msgid "%s: already exists in index"
-msgstr "%s：已经存在于索引中"
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) 不带参数"
-#: builtin/apply.c:3753
+#: ref-filter.c:173
#, c-format
-msgid "%s: already exists in working directory"
-msgstr "%s：已经存在于工作区中"
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) 不带参数"
-#: builtin/apply.c:3773
+#: ref-filter.c:180
#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
+msgid "%%(trailers) does not take arguments"
+msgstr "%%(trailers) 不带参数"
-#: builtin/apply.c:3778
+#: ref-filter.c:199
#, 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）不匹配"
+msgid "positive value expected contents:lines=%s"
+msgstr "期望一个正数 contents:lines=%s"
-#: builtin/apply.c:3798
+#: ref-filter.c:201
#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
-msgstr "受影响的文件 '%s' 位于符号链接中"
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "未能识别的 %%(contents) 参数：%s"
-#: builtin/apply.c:3802
+#: ref-filter.c:214
#, c-format
-msgid "%s: patch does not apply"
-msgstr "%s：补丁未应用"
+msgid "positive value expected objectname:short=%s"
+msgstr "期望一个正数 objectname:short=%s"
-#: builtin/apply.c:3816
+#: ref-filter.c:218
#, c-format
-msgid "Checking patch %s..."
-msgstr "æ£\80æ\9f¥è¡¥ä¸\81 %s..."
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "æ\9cªè\83½è¯\86å\88«ç\9a\84 %%(objectname) å\8f\82æ\95°ï¼\9a%s"
-#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
+#: ref-filter.c:245
#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "期望的格式：%%(align:<width>,<position>)"
-#: builtin/apply.c:4052
+#: ref-filter.c:257
#, c-format
-msgid "unable to remove %s from index"
-msgstr "不能从索引中移除 %s"
+msgid "unrecognized position:%s"
+msgstr "未能识别的位置：%s"
-#: builtin/apply.c:4081
+#: ref-filter.c:261
#, c-format
-msgid "corrupt patch for submodule %s"
-msgstr "子模组 %s 损坏的补丁"
+msgid "unrecognized width:%s"
+msgstr "未能识别的宽度：%s"
-#: builtin/apply.c:4085
+#: ref-filter.c:267
#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr "不能枚举新建文件 '%s' 的状态"
+msgid "unrecognized %%(align) argument: %s"
+msgstr "未能识别的 %%(align) 参数：%s"
-#: builtin/apply.c:4090
+#: ref-filter.c:271
#, c-format
-msgid "unable to create backing store for newly created file %s"
-msgstr "不能为新建文件 %s 创建后端存储"
+msgid "positive width expected with the %%(align) atom"
+msgstr "元素 %%(align) 需要一个正数的宽度"
-#: builtin/apply.c:4093 builtin/apply.c:4201
+#: ref-filter.c:286
#, c-format
-msgid "unable to add cache entry for %s"
-msgstr "æ\97 æ³\95为 %s æ·»å\8a ç¼\93å\98æ\9d¡ç\9b®"
+msgid "unrecognized %%(if) argument: %s"
+msgstr "æ\9cªè\83½è¯\86å\88«ç\9a\84 %%(if) å\8f\82æ\95°ï¼\9a%s"
-#: builtin/apply.c:4126
+#: ref-filter.c:371
#, c-format
-msgid "closing file '%s'"
-msgstr "关闭文件 '%s'"
+msgid "malformed field name: %.*s"
+msgstr "非法的字段名：%.*s"
-#: builtin/apply.c:4175
+#: ref-filter.c:397
#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr "不能写文件 '%s' 权限 %o"
+msgid "unknown field name: %.*s"
+msgstr "未知的字段名：%.*s"
-#: builtin/apply.c:4262
+#: ref-filter.c:501
#, c-format
-msgid "Applied patch %s cleanly."
-msgstr "æ\88\90å\8a\9fåº\94ç\94¨è¡¥ä¸\81 %sã\80\82"
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "æ ¼å¼\8fï¼\9a使ç\94¨äº\86 %%(if) å\85\83ç´ è\80\8c没æ\9c\89 %%(then) å\85\83ç´ "
-#: builtin/apply.c:4270
-msgid "internal error"
-msgstr "内部错误"
+#: ref-filter.c:561
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"
-#: builtin/apply.c:4273
+#: ref-filter.c:563
#, 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 个被拒绝..."
+msgid "format: %%(then) atom used more than once"
+msgstr "格式：%%(then) 元素用了多次"
-#: builtin/apply.c:4283
+#: ref-filter.c:565
#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr "æ\88ªç\9f .rej æ\96\87件å\90\8d为 %.*s.rej"
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "æ ¼å¼\8fï¼\9a%%(then) å\85\83ç´ ç\94¨å\9c¨äº\86 %%(else) ä¹\8bå\90\8e"
-#: builtin/apply.c:4304
+#: ref-filter.c:591
#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr "第 #%d 个片段成功应用。"
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"
-#: builtin/apply.c:4307
+#: ref-filter.c:593
#, c-format
-msgid "Rejected hunk #%d."
-msgstr "æ\8b\92ç»\9d第 #%d 个ç\89\87段ã\80\82"
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "æ ¼å¼\8fï¼\9a使ç\94¨äº\86 %%(else) å\85\83ç´ è\80\8c没æ\9c\89 %%(then) å\85\83ç´ "
-#: builtin/apply.c:4397
-msgid "unrecognized input"
-msgstr "未能识别的输入"
+#: ref-filter.c:595
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "格式：%%(else) 元素用了多次"
-#: builtin/apply.c:4408
-msgid "unable to read index file"
-msgstr "无法读取索引文件"
+#: ref-filter.c:608
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
-#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85
-#: builtin/fetch.c:92
-msgid "path"
-msgstr "路径"
+#: ref-filter.c:663
+#, c-format
+msgid "malformed format string %s"
+msgstr "非法的格式化字符串 %s"
-#: builtin/apply.c:4526
-msgid "don't apply changes matching the given path"
-msgstr "不要应用与给出路径向匹配的变更"
+#: ref-filter.c:1247
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "（非分支，正变基 %s）"
-#: builtin/apply.c:4529
-msgid "apply changes matching the given path"
-msgstr "应用与给出路径向匹配的变更"
-
-#: builtin/apply.c:4531
-msgid "num"
-msgstr "数字"
+#: ref-filter.c:1250
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "（非分支，二分查找开始于 %s）"
-#: builtin/apply.c:4532
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: ref-filter.c:1256
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "（头指针分离于 %s）"
-#: builtin/apply.c:4535
-msgid "ignore additions made by the patch"
-msgstr "忽略补丁中的添加的文件"
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: ref-filter.c:1261
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "（头指针分离自 %s）"
-#: builtin/apply.c:4537
-msgid "instead of applying the patch, output diffstat for the input"
-msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
+#: ref-filter.c:1265
+msgid "(no branch)"
+msgstr "（非分支）"
-#: builtin/apply.c:4541
-msgid "show number of added and deleted lines in decimal notation"
-msgstr "以十进制数显示添加和删除的行数"
+#: ref-filter.c:1420 ref-filter.c:1451
+#, c-format
+msgid "missing object %s for %s"
+msgstr "缺失 %2$s 的对象 %1$s"
-#: builtin/apply.c:4543
-msgid "instead of applying the patch, output a summary for the input"
-msgstr "不应用补丁，而是显示输入的概要"
+#: ref-filter.c:1423 ref-filter.c:1454
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
-#: builtin/apply.c:4545
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr "不应用补丁，而是查看补丁是否可应用"
+#: ref-filter.c:1692
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "非法的对象于 '%s'"
-#: builtin/apply.c:4547
-msgid "make sure the patch is applicable to the current index"
-msgstr "确认补丁可以应用到当前索引"
+#: ref-filter.c:1759
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "忽略带有错误名称 %s 的引用"
-#: builtin/apply.c:4549
-msgid "apply a patch without touching the working tree"
-msgstr "应用补丁而不修改工作区"
+#: ref-filter.c:1764
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "忽略损坏的引用 %s"
-#: builtin/apply.c:4551
-msgid "accept a patch that touches outside the working area"
-msgstr "接受修改工作区之外文件的补丁"
+#: ref-filter.c:2028
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "格式：缺少 %%(end) 元素"
-#: builtin/apply.c:4553
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
+#: ref-filter.c:2109
+#, c-format
+msgid "malformed object name %s"
+msgstr "非法的对象名 %s"
-#: builtin/apply.c:4555
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "如果一个补丁不能应用则尝试三路合并"
+#: remote.c:754
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "不能同时获取 %s 和 %s 至 %s"
-#: builtin/apply.c:4557
-msgid "build a temporary index based on embedded index information"
-msgstr "创建一个临时索引基于嵌入的索引信息"
+#: remote.c:758
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s 通常跟踪 %s，而非 %s"
-#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
-msgid "paths are separated with NUL character"
-msgstr "路径以 NUL 字符分隔"
+#: remote.c:762
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s 同时跟踪 %s 和 %s"
-#: builtin/apply.c:4562
-msgid "ensure at least <n> lines of context match"
-msgstr "确保至少匹配 <n> 行上下文"
+#: remote.c:770
+msgid "Internal error"
+msgstr "内部错误"
-#: builtin/apply.c:4563
-msgid "action"
-msgstr "动作"
+#: remote.c:1685 remote.c:1787
+msgid "HEAD does not point to a branch"
+msgstr "HEAD 没有指向一个分支"
-#: builtin/apply.c:4564
-msgid "detect new or modified lines that have whitespace errors"
-msgstr "检查新增和修改的行中间的空白字符滥用"
+#: remote.c:1694
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "没有此分支：'%s'"
-#: builtin/apply.c:4567 builtin/apply.c:4570
-msgid "ignore changes in whitespace when finding context"
-msgstr "查找上下文时忽略空白字符的变更"
+#: remote.c:1697
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "尚未给分支 '%s' 设置上游"
-#: builtin/apply.c:4573
-msgid "apply the patch in reverse"
-msgstr "反向应用补丁"
+#: remote.c:1703
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: builtin/apply.c:4575
-msgid "don't expect at least one line of context"
-msgstr "无需至少一行上下文"
+#: remote.c:1718
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
-#: builtin/apply.c:4577
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
+#: remote.c:1730
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "分支 '%s' 没有设置要推送的远程服务器"
-#: builtin/apply.c:4579
-msgid "allow overlapping hunks"
-msgstr "允许重叠的补丁片段"
+#: remote.c:1741
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "向 '%s' 推送引用规格未包含 '%s'"
-#: builtin/apply.c:4582
-msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr "允许不正确的文件末尾换行符"
+#: remote.c:1754
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "推送无目标（push.default 是 'nothing'）"
-#: builtin/apply.c:4585
-msgid "do not trust the line counts in the hunk headers"
-msgstr "不信任补丁片段的头信息中的行号"
+#: remote.c:1776
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "无法解析 'simple' 推送至一个单独的目标"
-#: builtin/apply.c:4587
-msgid "root"
-msgstr "根目录"
+#: remote.c:2081
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
-#: builtin/apply.c:4588
-msgid "prepend <root> to all filenames"
-msgstr "为所有文件名前添加 <根目录>"
+#: remote.c:2085
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
-#: builtin/apply.c:4610
-msgid "--3way outside a repository"
-msgstr "--3way 在一个版本库之外"
+#: remote.c:2088
+#, c-format
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: builtin/apply.c:4618
-msgid "--index outside a repository"
-msgstr "--index 在一个版本库之外"
+#: remote.c:2092
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
+msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
-#: builtin/apply.c:4621
-msgid "--cached outside a repository"
-msgstr "--cached 在一个版本库之外"
+#: remote.c:2098
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
-#: builtin/apply.c:4640
+#: remote.c:2101
#, c-format
-msgid "can't open patch '%s'"
-msgstr "不能打开补丁 '%s'"
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
+msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
-#: builtin/apply.c:4654
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] "抑制下仍有 %d 个空白字符误用"
-msgstr[1] "抑制下仍有 %d 个空白字符误用"
+# 译者：注意保持前导空格
+#: remote.c:2109
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
-#: builtin/apply.c:4660 builtin/apply.c:4670
+#: remote.c:2112
#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d 行有空白字符误用。"
-msgstr[1] "%d 行有空白字符误用。"
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"您的分支和 '%s' 出现了偏离，\n"
+"并且分别有 %d 和 %d 处不同的提交。\n"
+msgstr[1] ""
+"您的分支和 '%s' 出现了偏离，\n"
+"并且分别有 %d 和 %d 处不同的提交。\n"
-#: builtin/archive.c:17
+# 译者：注意保持前导空格
+#: remote.c:2122
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr " （使用 \"git pull\" 来合并远程分支）\n"
+
+#: revision.c:2158
+msgid "your current branch appears to be broken"
+msgstr "您的当前分支好像被损坏"
+
+#: revision.c:2161
#, c-format
-msgid "could not create archive file '%s'"
-msgstr "不能创建归档文件 '%s'"
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "您的当前分支 '%s' 尚无任何提交"
-#: builtin/archive.c:20
-msgid "could not redirect output"
-msgstr "不能重定向输出"
+#: revision.c:2355
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent 与 --bisect 不兼容"
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
-msgstr "git archive：未提供远程URL"
+#: run-command.c:125
+msgid "open /dev/null failed"
+msgstr "不能打开 /dev/null"
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive：应为ACK/NACK，却得到EOF"
+#: run-command.c:127
+#, c-format
+msgid "dup2(%d,%d) failed"
+msgstr "不能调用 dup2(%d,%d)"
-#: builtin/archive.c:61
+#: send-pack.c:150
#, c-format
-msgid "git archive: NACK %s"
-msgstr "git archive：NACK %s"
+msgid "unable to parse remote unpack status: %s"
+msgstr "不能解析远程解包状态：%s"
-#: builtin/archive.c:63
+#: send-pack.c:152
#, c-format
-msgid "remote error: %s"
-msgstr "远程错误：%s"
+msgid "remote unpack failed: %s"
+msgstr "远程解包失败：%s"
-#: builtin/archive.c:64
-msgid "git archive: protocol error"
-msgstr "git archive：协议错误"
+#: send-pack.c:315
+msgid "failed to sign the push certificate"
+msgstr "无法为推送证书签名"
-#: builtin/archive.c:68
-msgid "git archive: expected a flush"
-msgstr "git archive：应为刷新"
+#: send-pack.c:428
+msgid "the receiving end does not support --signed push"
+msgstr "接收端不支持签名推送"
-#: builtin/bisect--helper.c:7
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
+#: send-pack.c:430
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr "未发送推送证书，因为接收端不支持签名推送"
-#: builtin/bisect--helper.c:17
-msgid "perform 'git bisect next'"
-msgstr "æ\89§è¡\8c 'git bisect next'"
+#: send-pack.c:442
+msgid "the receiving end does not support --atomic push"
+msgstr "æ\8e¥æ\94¶ç«¯ä¸\8dæ\94¯æ\8c\81å\8e\9få\90æ\8e¨é\80\81"
-#: builtin/bisect--helper.c:19
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "æ\9b´æ\96° BISECT_HEAD è\80\8cé\9d\9eæ£\80å\87ºå½\93å\89\8dæ\8f\90交"
+#: send-pack.c:447
+msgid "the receiving end does not support push options"
+msgstr "æ\8e¥æ\94¶ç«¯ä¸\8dæ\94¯æ\8c\81æ\8e¨é\80\81é\80\89项"
-#: builtin/blame.c:31
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
+#: sequencer.c:215
+msgid "revert"
+msgstr "还原"
-#: builtin/blame.c:36
-msgid "<rev-opts> are documented in git-rev-list(1)"
-msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
+#: sequencer.c:217
+msgid "cherry-pick"
+msgstr "拣选"
-#: builtin/blame.c:2500
-msgid "Show blame entries as we find them, incrementally"
-msgstr "增量式地显示发现的 blame 条目"
+#: sequencer.c:219
+msgid "rebase -i"
+msgstr "rebase -i"
-#: builtin/blame.c:2501
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "边界提交显示空的 SHA-1（默认：关闭）"
+#: sequencer.c:221
+#, c-format
+msgid "Unknown action: %d"
+msgstr "未知动作：%d"
-#: builtin/blame.c:2502
-msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr "不把根提交作为边界（默认：关闭）"
+#: sequencer.c:278
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
+"命令标记修正后的文件"
-#: builtin/blame.c:2503
-msgid "Show work cost statistics"
-msgstr "显示命令消耗统计"
+#: sequencer.c:281
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'\n"
+"and commit the result with 'git commit'"
+msgstr ""
+"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
+"对修正后的文件做标记，然后用 'git commit' 提交"
-#: builtin/blame.c:2504
-msgid "Show output score for blame entries"
-msgstr "显示判断 blame 条目位移的得分诊断信息"
+#: sequencer.c:294 sequencer.c:1682
+#, c-format
+msgid "could not lock '%s'"
+msgstr "不能锁定 '%s'"
-#: builtin/blame.c:2505
-msgid "Show original filename (Default: auto)"
-msgstr "显示原始文件名（默认：自动）"
+#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
+#, c-format
+msgid "could not write to '%s'"
+msgstr "不能写入 '%s'"
-#: builtin/blame.c:2506
-msgid "Show original linenumber (Default: off)"
-msgstr "显示原始的行号（默认：关闭）"
+#: sequencer.c:301
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "不能将换行符写入 '%s'"
-#: builtin/blame.c:2507
-msgid "Show in a format designed for machine consumption"
-msgstr "显示为一个适合机器读取的格式"
+#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
+#, c-format
+msgid "failed to finalize '%s'."
+msgstr "无法完成 '%s'。"
-#: builtin/blame.c:2508
-msgid "Show porcelain format with per-line commit information"
-msgstr "为每一行显示机器适用的提交信息"
+#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
+#: builtin/commit.c:749 builtin/merge.c:1018
+#, c-format
+msgid "could not read '%s'"
+msgstr "不能读取 '%s'"
-#: builtin/blame.c:2509
-msgid "Use the same output mode as git-annotate (Default: off)"
-msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
+#: sequencer.c:355
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "您的本地修改将被%s覆盖。"
-#: builtin/blame.c:2510
-msgid "Show raw timestamp (Default: off)"
-msgstr "æ\98¾ç¤ºå\8e\9få§\8bæ\97¶é\97´æ\88³ï¼\88é»\98认ï¼\9aå\85³é\97ï¼\89"
+#: sequencer.c:359
+msgid "commit your changes or stash them to proceed."
+msgstr "æ\8f\90交æ\82¨ç\9a\84ä¿®æ\94¹æ\88\96ä¿\9då\98è¿\9b度å\90\8eå\86\8d继ç»ã\80\82"
-#: builtin/blame.c:2511
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "显示长的SHA1提交号（默认：关闭）"
-
-#: builtin/blame.c:2512
-msgid "Suppress author name and timestamp (Default: off)"
-msgstr "隐藏作者名字和时间戳（默认：关闭）"
-
-#: builtin/blame.c:2513
-msgid "Show author email instead of name (Default: off)"
-msgstr "显示作者的邮箱而不是名字（默认：关闭）"
+#: sequencer.c:388
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s：快进"
-#: builtin/blame.c:2514
-msgid "Ignore whitespace differences"
-msgstr "忽略空白差异"
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. * "rebase -i".
+#.
+#: sequencer.c:470
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s：无法写入新索引文件"
-#: builtin/blame.c:2515
-msgid "Spend extra cycles to find better match"
-msgstr "花费额外的循环来找到更好的匹配"
+#: sequencer.c:489
+msgid "could not resolve HEAD commit\n"
+msgstr "不能解析 HEAD 提交\n"
-#: builtin/blame.c:2516
-msgid "Use revisions from <file> instead of calling git-rev-list"
-msgstr "使ç\94¨æ\9d¥è\87ª <æ\96\87件> ç\9a\84修订é\9b\86è\80\8cä¸\8dæ\98¯è°\83ç\94¨ git-rev-list"
+#: sequencer.c:509
+msgid "unable to update cache tree\n"
+msgstr "ä¸\8dè\83½æ\9b´æ\96°ç¼\93å\98æ \91\n"
-#: builtin/blame.c:2517
-msgid "Use <file>'s contents as the final image"
-msgstr "使用 <文件> 的内容作为最终的图片"
+#: sequencer.c:592
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+"您的工作区中存在已暂存的修改\n"
+"如果这些修改需要被并入前一个提交，执行：\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"如果这些修改要形成一个新提交，执行：\n"
+"\n"
+" git commit %s\n"
+"\n"
+"无论哪种情况，当您完成提交，继续执行：\n"
+"\n"
+" git rebase --continue\n"
-#: builtin/blame.c:2518 builtin/blame.c:2519
-msgid "score"
-msgstr "得分"
+#: sequencer.c:694
+#, c-format
+msgid "could not parse commit %s\n"
+msgstr "不能解析提交 %s\n"
-#: builtin/blame.c:2518
-msgid "Find line copies within and across files"
-msgstr "找到文件内及跨文件的行拷贝"
+#: sequencer.c:699
+#, c-format
+msgid "could not parse parent commit %s\n"
+msgstr "不能解析父提交 %s\n"
-#: builtin/blame.c:2519
-msgid "Find line movements within and across files"
-msgstr "找到文件内及跨文件的行移动"
+#: sequencer.c:821
+#, c-format
+msgid ""
+"unexpected 1st line of squash message:\n"
+"\n"
+"\t%.*s"
+msgstr ""
+"意外的压缩提交首行提交信息：\n"
+"\n"
+"\t%.*s"
-#: builtin/blame.c:2520
-msgid "n,m"
-msgstr "n,m"
+#: sequencer.c:827
+#, c-format
+msgid ""
+"invalid 1st line of squash message:\n"
+"\n"
+"\t%.*s"
+msgstr ""
+"压缩提交的首行提交信息无效：\n"
+"\n"
+"\t%.*s"
-#: builtin/blame.c:2520
-msgid "Process only line range n,m, counting from 1"
-msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
+#: sequencer.c:833 sequencer.c:858
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "这是一个 %d 个提交的组合。"
-#. TRANSLATORS: This string is used to tell us the maximum
-#. display width for a relative timestamp in "git blame"
-#. output. For C locale, "4 years, 11 months ago", which
-#. takes 22 places, is the longest among various forms of
-#. relative timestamps, but your language may need more or
-#. fewer display columns.
-#: builtin/blame.c:2601
-msgid "4 years, 11 months ago"
-msgstr "4 年 11 个月前"
+#: sequencer.c:842
+msgid "need a HEAD to fixup"
+msgstr "需要一个 HEAD 来修复"
-#: builtin/branch.c:24
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
+#: sequencer.c:844
+msgid "could not read HEAD"
+msgstr "不能读取 HEAD"
-#: builtin/branch.c:25
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
+#: sequencer.c:846
+msgid "could not read HEAD's commit message"
+msgstr "不能读取 HEAD 的提交说明"
-#: builtin/branch.c:26
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
-msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
+#: sequencer.c:852
+#, c-format
+msgid "cannot write '%s'"
+msgstr "不能写 '%s'"
-#: builtin/branch.c:27
-msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
-msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
+#: sequencer.c:861 git-rebase--interactive.sh:445
+msgid "This is the 1st commit message:"
+msgstr "这是第一个提交说明："
-# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:150
+#: sequencer.c:869
#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
-msgstr ""
-"将要删除的分支 '%s' 已经被合并到\n"
-" '%s'，但未合并到 HEAD。"
+msgid "could not read commit message of %s"
+msgstr "不能读取 %s 的提交说明"
-# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:154
+#: sequencer.c:876
#, c-format
-msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-" '%s', even though it is merged to HEAD."
-msgstr ""
-"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
-" 然而却尚未被合并到分支 '%s' 。"
+msgid "This is the commit message #%d:"
+msgstr "这是提交说明 #%d："
-#: builtin/branch.c:168
+#: sequencer.c:881
#, c-format
-msgid "Couldn't look up commit object for '%s'"
-msgstr "æ\97 æ³\95æ\9f¥è¯¢ '%s' æ\8c\87å\90\91ç\9a\84æ\8f\90交对象"
+msgid "The commit message #%d will be skipped:"
+msgstr "æ\8f\90交说æ\98\8e #%d å°\86被跳è¿\87ï¼\9a"
-#: builtin/branch.c:172
+#: sequencer.c:886
#, c-format
-msgid ""
-"The branch '%s' is not fully merged.\n"
-"If you are sure you want to delete it, run 'git branch -D %s'."
-msgstr ""
-"分支 '%s' 没有完全合并。\n"
-"如果您确认要删除它，执行 'git branch -D %s'。"
-
-#: builtin/branch.c:185
-msgid "Update of config-file failed"
-msgstr "无法更新 config 文件"
+msgid "unknown command: %d"
+msgstr "未知命令：%d"
-#: builtin/branch.c:213
-msgid "cannot use -a with -d"
-msgstr "不能将 -a 和 -d 同时使用"
+#: sequencer.c:952
+msgid "your index file is unmerged."
+msgstr "您的索引文件未完成合并。"
-#: builtin/branch.c:219
-msgid "Couldn't look up commit object for HEAD"
-msgstr "无法查询 HEAD 指向的提交对象"
+#: sequencer.c:970
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: builtin/branch.c:227
+#: sequencer.c:978
#, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "æ\97 æ³\95å\88 é\99¤æ\82¨å½\93å\89\8dæ\89\80å\9c¨ç\9a\84å\88\86æ\94¯ '%s'ã\80\82"
+msgid "commit %s does not have parent %d"
+msgstr "æ\8f\90交 %s 没æ\9c\89第 %d 个ç\88¶æ\8f\90交"
-#: builtin/branch.c:243
+#: sequencer.c:982
#, c-format
-msgid "remote-tracking branch '%s' not found."
-msgstr "æ\9cªè\83½æ\89¾å\88°è¿\9cç¨\8bè·\9f踪å\88\86æ\94¯ '%s'。"
+msgid "mainline was specified but commit %s is not a merge."
+msgstr "æ\8c\87å®\9aäº\86主线ï¼\8cä½\86æ\98¯æ\8f\90交 %s ä¸\8dæ\98¯ä¸\80个å\90\88并æ\8f\90交。"
-#: builtin/branch.c:244
+#: sequencer.c:988
#, c-format
-msgid "branch '%s' not found."
-msgstr "分支 '%s' 未发现。"
+msgid "cannot get commit message for %s"
+msgstr "不能得到 %s 的提交说明"
-#: builtin/branch.c:258
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1009
#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "无法删除远程跟踪分支 '%s'"
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s：不能解析父提交 %s"
-#: builtin/branch.c:259
+#: sequencer.c:1071 sequencer.c:1827
#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "无法删除分支 '%s'"
+msgid "could not rename '%s' to '%s'"
+msgstr "不能将 '%s' 重命名为 '%s'"
-#: builtin/branch.c:266
+#: sequencer.c:1122
#, c-format
-msgid "Deleted remote-tracking branch %s (was %s).\n"
-msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
+msgid "could not revert %s... %s"
+msgstr "不能还原 %s... %s"
-#: builtin/branch.c:267
+#: sequencer.c:1123
#, c-format
-msgid "Deleted branch %s (was %s).\n"
-msgstr "已删除分支 %s（曾为 %s）。\n"
+msgid "could not apply %s... %s"
+msgstr "不能应用 %s... %s"
-#: builtin/branch.c:368
+#: sequencer.c:1165
+msgid "empty commit set passed"
+msgstr "提供了空的提交集"
+
+#: sequencer.c:1175
#, c-format
-msgid "branch '%s' does not point at a commit"
-msgstr "分支 '%s' 未指向一个提交"
+msgid "git %s: failed to read the index"
+msgstr "git %s：无法读取索引"
-#: builtin/branch.c:451
+#: sequencer.c:1182
#, c-format
-msgid "[%s: gone]"
-msgstr "[%s: 丢失]"
+msgid "git %s: failed to refresh the index"
+msgstr "git %s：无法刷新索引"
-#: builtin/branch.c:456
+#: sequencer.c:1303
#, c-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid "invalid line %d: %.*s"
+msgstr "无效行 %d：%.*s"
-#: builtin/branch.c:461
+#: sequencer.c:1311
#, c-format
-msgid "[%s: behind %d]"
-msgstr "[%s：落后 %d]"
+msgid "cannot '%s' without a previous commit"
+msgstr "没有父提交的情况下不能 '%s'"
-#: builtin/branch.c:463
+#: sequencer.c:1344
#, c-format
-msgid "[behind %d]"
-msgstr "[落后 %d]"
+msgid "could not read '%s'."
+msgstr "不能读取 '%s'。"
+
+#: sequencer.c:1356
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: builtin/branch.c:467
+#: sequencer.c:1358
#, c-format
-msgid "[%s: ahead %d]"
-msgstr "[%s：领先 %d]"
+msgid "unusable instruction sheet: '%s'"
+msgstr "不可用的指令清单：'%s'"
-#: builtin/branch.c:469
+#: sequencer.c:1363
+msgid "no commits parsed."
+msgstr "没有解析提交。"
+
+#: sequencer.c:1374
+msgid "cannot cherry-pick during a revert."
+msgstr "不能在回退中执行拣选。"
+
+#: sequencer.c:1376
+msgid "cannot revert during a cherry-pick."
+msgstr "不能在拣选中执行回退。"
+
+#: sequencer.c:1439
#, c-format
-msgid "[ahead %d]"
-msgstr "[领先 %d]"
+msgid "invalid key: %s"
+msgstr "无效键名：%s"
-#: builtin/branch.c:472
+#: sequencer.c:1442
#, c-format
-msgid "[%s: ahead %d, behind %d]"
-msgstr "[%s：领先 %d，落后 %d]"
+msgid "invalid value for %s: %s"
+msgstr "%s 的值无效：%s"
-#: builtin/branch.c:475
+#: sequencer.c:1499
#, c-format
-msgid "[ahead %d, behind %d]"
-msgstr "[领先 %d，落后 %d]"
+msgid "malformed options sheet: '%s'"
+msgstr "非法的选项清单：'%s'"
-#: builtin/branch.c:488
-msgid " **** invalid ref ****"
-msgstr " **** 无效引用 ****"
+#: sequencer.c:1537
+msgid "a cherry-pick or revert is already in progress"
+msgstr "一个拣选或还原操作已在进行"
-#: builtin/branch.c:579
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "（非分支，正变基 %s）"
+#: sequencer.c:1538
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
-#: builtin/branch.c:582
+#: sequencer.c:1541
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "（非分支，二分查找开始于 %s）"
+msgid "could not create sequencer directory '%s'"
+msgstr "不能创建序列目录 '%s'"
+
+#: sequencer.c:1555
+msgid "could not lock HEAD"
+msgstr "不能锁定 HEAD"
-#: builtin/branch.c:588
+#: sequencer.c:1611 sequencer.c:2181
+msgid "no cherry-pick or revert in progress"
+msgstr "拣选或还原操作并未进行"
+
+#: sequencer.c:1613
+msgid "cannot resolve HEAD"
+msgstr "不能解析 HEAD"
+
+#: sequencer.c:1615 sequencer.c:1649
+msgid "cannot abort from a branch yet to be born"
+msgstr "不能从尚未建立的分支终止"
+
+#: sequencer.c:1635 builtin/grep.c:910
#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "（头指针分离于 %s）"
+msgid "cannot open '%s'"
+msgstr "不能打开 '%s'"
-#: builtin/branch.c:591
+#: sequencer.c:1637
#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "（头指针分离自 %s）"
+msgid "cannot read '%s': %s"
+msgstr "不能读取 '%s'：%s"
-#: builtin/branch.c:595
-msgid "(no branch)"
-msgstr "（非分支）"
+#: sequencer.c:1638
+msgid "unexpected end of file"
+msgstr "意外的文件结束"
-#: builtin/branch.c:642
+#: sequencer.c:1644
#, c-format
-msgid "object '%s' does not point to a commit"
-msgstr "对象 '%s' 没有指向一个提交"
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: builtin/branch.c:690
-msgid "some refs could not be read"
-msgstr "一些引用不能读取"
+#: sequencer.c:1655
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
-#: builtin/branch.c:703
-msgid "cannot rename the current branch while not on any."
-msgstr "无法重命名当前分支因为不处于任何分支上。"
+#: sequencer.c:1792 sequencer.c:2080
+msgid "cannot read HEAD"
+msgstr "不能读取 HEAD"
-#: builtin/branch.c:713
+#: sequencer.c:1832 builtin/difftool.c:616
#, c-format
-msgid "Invalid branch name: '%s'"
-msgstr "无效的分支名：'%s'"
+msgid "could not copy '%s' to '%s'"
+msgstr "不能拷贝 '%s' 至 '%s'"
-#: builtin/branch.c:728
-msgid "Branch rename failed"
-msgstr "分支重命名失败"
+#: sequencer.c:1848
+msgid "could not read index"
+msgstr "不能读取索引"
-#: builtin/branch.c:732
+# 译者：注意保持前导空格
+#: sequencer.c:1853
#, c-format
-msgid "Renamed a misnamed branch '%s' away"
-msgstr "重命名掉一个错误命名的旧分支 '%s'"
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"执行失败：%s\n"
+"%s您可以改正该问题，然后运行\n"
+"\n"
+" git rebase --continue\n"
+"\n"
-#: builtin/branch.c:736
-#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
-msgstr "分支重命名为 %s，但 HEAD 没有更新！"
+#: sequencer.c:1859
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "并且修改索引和/或工作区\n"
-#: builtin/branch.c:743
-msgid "Branch is renamed, but update of config-file failed"
-msgstr "分支被重命名，但更新 config 文件失败"
+#: sequencer.c:1865
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"执行成功：%s\n"
+"但是在索引和/或工作区中存在变更\n"
+"提交或暂存修改，然后运行\n"
+"\n"
+" git rebase --continue\n"
+"\n"
-#: builtin/branch.c:758
+#: sequencer.c:1920 git-rebase.sh:169
#, c-format
-msgid "malformed object name %s"
-msgstr "非法的对象名 %s"
+msgid "Applied autostash."
+msgstr "成功应用 autostash。"
-#: builtin/branch.c:780
+#: sequencer.c:1932
#, c-format
-msgid "could not write branch description template: %s"
-msgstr "ä¸\8dè\83½å\86\99å\88\86æ\94¯æ\8f\8f述模ç\89\88ï¼\9a%s"
+msgid "cannot store %s"
+msgstr "ä¸\8dè\83½å\98å\82¨ %s"
-#: builtin/branch.c:810
-msgid "Generic options"
-msgstr "通用选项"
+#: sequencer.c:1934 git-rebase.sh:173
+#, c-format
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"应用 autostash 导致冲突。\n"
+"您的修改安全地保存在 stash 中。\n"
+"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: builtin/branch.c:812
-msgid "show hash and subject, give twice for upstream branch"
-msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
+#: sequencer.c:2016
+#, c-format
+msgid "Stopped at %s... %.*s\n"
+msgstr "停止在 %s... %.*s\n"
-#: builtin/branch.c:813
-msgid "suppress informational messages"
-msgstr "不显示信息"
+#: sequencer.c:2058
+#, c-format
+msgid "unknown command %d"
+msgstr "未知命令 %d"
-#: builtin/branch.c:814
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "设置跟踪模式（参见 git-pull(1)）"
+#: sequencer.c:2088
+msgid "could not read orig-head"
+msgstr "不能读取 orig-head"
-#: builtin/branch.c:816
-msgid "change upstream info"
-msgstr "改变上游信息"
+#: sequencer.c:2092
+msgid "could not read 'onto'"
+msgstr "不能读取 'onto'"
-#: builtin/branch.c:820
-msgid "use colored output"
-msgstr "使用彩色输出"
+#: sequencer.c:2099
+#, c-format
+msgid "could not update %s"
+msgstr "不能更新 %s"
-#: builtin/branch.c:821
-msgid "act on remote-tracking branches"
-msgstr "作用于远程跟踪分支"
+#: sequencer.c:2106
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "不能更新 HEAD 为 %s"
-#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851
-#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616
-#: builtin/tag.c:622
-msgid "commit"
-msgstr "提交"
+#: sequencer.c:2190
+msgid "cannot rebase: You have unstaged changes."
+msgstr "不能变基：您有未暂存的变更。"
-#: builtin/branch.c:825 builtin/branch.c:831
-msgid "print only branches that contain the commit"
-msgstr "只打印包含该提交的分支"
+#: sequencer.c:2195
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "不能删除 CHERRY_PICK_HEAD"
-#: builtin/branch.c:837
-msgid "Specific git-branch actions:"
-msgstr "具体的 git-branch 动作："
+#: sequencer.c:2204
+msgid "cannot amend non-existing commit"
+msgstr "不能修补不存在的提交"
-#: builtin/branch.c:838
-msgid "list both remote-tracking and local branches"
-msgstr "列出远程跟踪及本地分支"
+#: sequencer.c:2206
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "无效文件：'%s'"
-#: builtin/branch.c:840
-msgid "delete fully merged branch"
-msgstr "删除完全合并的分支"
+#: sequencer.c:2208
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "无效内容：'%s'"
-#: builtin/branch.c:841
-msgid "delete branch (even if not merged)"
-msgstr "删除分支（即使没有合并）"
-
-#: builtin/branch.c:842
-msgid "move/rename a branch and its reflog"
-msgstr "移动/重命名一个分支，以及它的引用日志"
-
-#: builtin/branch.c:843
-msgid "move/rename a branch, even if target exists"
-msgstr "移动/重命名一个分支，即使目标已存在"
-
-#: builtin/branch.c:844
-msgid "list branch names"
-msgstr "列出分支名"
+#: sequencer.c:2211
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: builtin/branch.c:845
-msgid "create the branch's reflog"
-msgstr "创建分支的引用日志"
+#: sequencer.c:2221
+msgid "could not commit staged changes."
+msgstr "不能提交暂存的修改。"
-#: builtin/branch.c:847
-msgid "edit the description for the branch"
-msgstr "标记分支的描述"
+#: sequencer.c:2301
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s：不能拣选一个%s"
-#: builtin/branch.c:848
-msgid "force creation, move/rename, deletion"
-msgstr "强制创建、移动/重命名、删除"
+#: sequencer.c:2305
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s：错误的版本"
-#: builtin/branch.c:851
-msgid "print only not merged branches"
-msgstr "只打印没有合并的分支"
+#: sequencer.c:2338
+msgid "can't revert as initial commit"
+msgstr "不能作为初始提交回退"
-#: builtin/branch.c:857
-msgid "print only merged branches"
-msgstr "只打印合并的分支"
+#: setup.c:165
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s：工作区中无此路径。\n"
+"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
-#: builtin/branch.c:861
-msgid "list branches in columns"
-msgstr "以列的方式显示分支"
+#: setup.c:178
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"有歧义的参数 '%s'：未知的版本或路径不存在于工作区中。\n"
+"使用 '--' 来分隔版本和路径，例如：\n"
+"'git <command> [<revision>...] -- [<file>...]'"
-#: builtin/branch.c:874
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "无法将 HEAD 解析为有效引用。"
+#: setup.c:228
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"有歧义的参数 '%s'：可同时是版本和文件\n"
+"使用 '--' 来分隔版本和路径，例如：\n"
+"'git <command> [<revision>...] -- [<file>...]'"
-#: builtin/branch.c:878 builtin/clone.c:622
-msgid "HEAD not found below refs/heads!"
-msgstr "HEAD 没有位于 /refs/heads 之下！"
+#: setup.c:475
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "期望 git 仓库版本 <= %d，却得到 %d"
-#: builtin/branch.c:900
-msgid "--column and --verbose are incompatible"
-msgstr "--column 和 --verbose 不兼容"
+#: setup.c:483
+msgid "unknown repository extensions found:"
+msgstr "发现未知的仓库扩展："
-#: builtin/branch.c:911 builtin/branch.c:950
-msgid "branch name required"
-msgstr "必须提供分支名"
+#: setup.c:776
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr "不是一个 git 仓库（或者任何父目录）：%s"
-#: builtin/branch.c:926
-msgid "Cannot give description to detached HEAD"
-msgstr "不能向分离头指针提供描述"
+#: setup.c:778 builtin/index-pack.c:1646
+msgid "Cannot come back to cwd"
+msgstr "无法返回当前工作目录"
-#: builtin/branch.c:931
-msgid "cannot edit description of more than one branch"
-msgstr "不能为一个以上的分支编辑描述"
+#: setup.c:1010
+msgid "Unable to read current working directory"
+msgstr "不能读取当前工作目录"
-#: builtin/branch.c:938
+#: setup.c:1022 setup.c:1028
#, c-format
-msgid "No commit on branch '%s' yet."
-msgstr "分支 '%s' 尚无提交。"
+msgid "Cannot change to '%s'"
+msgstr "不能切换到 '%s'"
-#: builtin/branch.c:941
+#: setup.c:1041
#, c-format
-msgid "No branch named '%s'."
-msgstr "没有分支 '%s'。"
-
-#: builtin/branch.c:956
-msgid "too many branches for a rename operation"
-msgstr "为重命名操作提供了太多的分支名"
-
-#: builtin/branch.c:961
-msgid "too many branches to set new upstream"
-msgstr "为设置新上游提供了太多的分支名"
+msgid ""
+"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_DISCOVERY_ACROSS_FILESYSTEM）。"
-#: builtin/branch.c:965
+#: setup.c:1106
#, c-format
msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
-msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
+"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"
+"文件属主必须始终拥有读写权限。"
-#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011
+#: sha1_file.c:559
#, c-format
-msgid "no such branch '%s'"
-msgstr "没有此分支 '%s'"
+msgid "path '%s' does not exist"
+msgstr "路径 '%s' 不存在"
-#: builtin/branch.c:972
+#: sha1_file.c:585
#, c-format
-msgid "branch '%s' does not exist"
-msgstr "å\88\86æ\94¯ '%s' ä¸\8då\98å\9c¨"
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "å°\9aä¸\8dæ\94¯æ\8c\81å°\86å\8f\82è\80\83ä»\93åº\93 '%s' ä½\9c为ä¸\80个é\93¾æ\8e¥æ£\80å\87ºã\80\82"
-#: builtin/branch.c:984
-msgid "too many branches to unset upstream"
-msgstr "为取消上游设置操作提供了太多的分支名"
+#: sha1_file.c:591
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "参考仓库 '%s' 不是一个本地仓库。"
-#: builtin/branch.c:988
-msgid "could not unset upstream of HEAD when it does not point to any branch."
-msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
+#: sha1_file.c:597
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "参考仓库 '%s' 是一个浅克隆"
-#: builtin/branch.c:994
+#: sha1_file.c:605
#, c-format
-msgid "Branch '%s' has no upstream information"
-msgstr "å\88\86æ\94¯ '%s' 没æ\9c\89ä¸\8a游信æ\81¯"
+msgid "reference repository '%s' is grafted"
+msgstr "å\8f\82è\80\83ä»\93åº\93 '%s' 已被å«\81æ\8e¥"
-#: builtin/branch.c:1008
-msgid "it does not make sense to create 'HEAD' manually"
-msgstr "æ\89\8bå·¥å\88\9b建 'HEAD' 没æ\9c\89æ\84\8fä¹\89"
+#: sha1_file.c:1245
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "å\81\8f移é\87\8få\9c¨å\8c\85æ\96\87件ç»\93æ\9d\9fä¹\8bå\89\8dï¼\88æ\8d\9få\9d\8fç\9a\84 .idxï¼\9fï¼\89"
-#: builtin/branch.c:1014
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
+#: sha1_file.c:2721
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
-#: builtin/branch.c:1017
+#: sha1_file.c:2725
#, c-format
-msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
-msgstr ""
-"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
-#: builtin/branch.c:1034
+#: sha1_name.c:409
#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "短 SHA1 %s 存在歧义"
+
+#: sha1_name.c:420
+msgid "The candidates are:"
+msgstr "候选者有："
+
+#: sha1_name.c:580
msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
+" git checkout -b $br $(git rev-parse ...)\n"
"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
msgstr ""
+"Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n"
+"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"
"\n"
-"如果你想用 '%s' 跟踪 '%s', 这么做：\n"
+" git checkout -b $br $(git rev-parse ...)\n"
"\n"
+"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"
+"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
+"命令关闭本消息通知。"
+
+#: submodule.c:67 submodule.c:101
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
-#: builtin/branch.c:1035
+#: submodule.c:71 submodule.c:105
#, c-format
-msgid " git branch -d %s\n"
-msgstr " git branch -d %s\n"
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
-#: builtin/branch.c:1036
+#: submodule.c:79
#, c-format
-msgid " git branch --set-upstream-to %s\n"
-msgstr " git branch --set-upstream-to %s\n"
+msgid "Could not update .gitmodules entry %s"
+msgstr "不能更新 .gitmodules 条目 %s"
-#: builtin/bundle.c:51
+#: submodule.c:112
#, c-format
-msgid "%s is okay\n"
-msgstr "%s 可以\n"
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "无法移除 %s 的 .gitmodules 条目"
-#: builtin/bundle.c:64
-msgid "Need a repository to create a bundle."
-msgstr "需要一个版本库来创建包。"
+#: submodule.c:123
+msgid "staging updated .gitmodules failed"
+msgstr "将更新后 .gitmodules 添加暂存区失败"
-#: builtin/bundle.c:68
-msgid "Need a repository to unbundle."
-msgstr "需要一个版本库来解包。"
+#: submodule.c:161
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "submodule.fetchJobs 不允许为负值"
-#: builtin/cat-file.c:369
-msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<type>|--textconv) <object>"
-msgstr ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
-">|--textconv) <对象>"
+#: submodule.c:1194
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "无法将 '%s' 识别为一个 git 仓库"
-#: builtin/cat-file.c:370
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
-"objects>"
-msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"
+#: submodule.c:1332
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "无法在子模组 '%s' 中启动 'git status'"
-#: builtin/cat-file.c:407
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
+#: submodule.c:1345
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "无法在子模组 '%s' 中执行 'git status'"
-#: builtin/cat-file.c:408
-msgid "show object type"
-msgstr "显示对象类型"
+#: submodule.c:1421
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "子模组 '%s' 中有脏索引"
-#: builtin/cat-file.c:409
-msgid "show object size"
-msgstr "显示对象大小"
+#: submodule.c:1678
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
-#: builtin/cat-file.c:411
-msgid "exit with zero when there's no error"
-msgstr "当没有错误时退出并返回零"
+#: submodule.c:1690 submodule.c:1746
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "不能查询子模组 '%s' 的名称"
-#: builtin/cat-file.c:412
-msgid "pretty-print object's content"
-msgstr "美观地打印对象的内容"
+#: submodule.c:1694 builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:688
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "不能创建目录 '%s'"
-#: builtin/cat-file.c:414
-msgid "for blob objects, run textconv on object's content"
-msgstr "对于数据（blob）对象，对其内容执行 textconv"
+#: submodule.c:1697
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"将 '%s%s' 的 git 目录从\n"
+"'%s' 迁移至\n"
+"'%s'\n"
-#: builtin/cat-file.c:416
-msgid "allow -s and -t to work with broken/corrupt objects"
-msgstr "允许 -s 和 -t 对损坏的对象生效"
+#: submodule.c:1781
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "无法递归进子模组路径 '%s'"
-#: builtin/cat-file.c:418
-msgid "show info and content of objects fed from the standard input"
-msgstr "æ\98¾ç¤ºä»\8eæ \87å\87\86è¾\93å\85¥æ\8f\90ä¾\9bç\9a\84对象ç\9a\84ä¿¡æ\81¯å\92\8cå\86\85容"
+#: submodule.c:1825
+msgid "could not start ls-files in .."
+msgstr "æ\97 æ³\95å\9c¨ .. ä¸å\90¯å\8a¨ ls-files"
-#: builtin/cat-file.c:421
-msgid "show info about objects fed from the standard input"
-msgstr "显示从标准输入提供的对象的信息"
+#: submodule.c:1845
+msgid "BUG: returned path string doesn't match cwd?"
+msgstr "BUG：返回的路径和当前路径不匹配？"
-#: builtin/cat-file.c:424
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
+#: submodule.c:1864
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree 返回未知返回值 %d"
-#: builtin/check-attr.c:11
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
-msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
+#: submodule-config.c:380
+#, c-format
+msgid "invalid value for %s"
+msgstr "%s 的值无效"
-#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
-msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
+#: trailer.c:240
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "执行 trailer 命令 '%s' 失败"
-#: builtin/check-attr.c:19
-msgid "report all attributes set on file"
-msgstr "报告设置在文件上的所有属性"
+#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539
+#: trailer.c:543
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "键 '%2$s' 的未知取值 '%1$s'"
-#: builtin/check-attr.c:20
-msgid "use .gitattributes only from the index"
-msgstr "只使用索引中的 .gitattributes"
+#: trailer.c:525 trailer.c:530 builtin/remote.c:289
+#, c-format
+msgid "more than one %s"
+msgstr "多于一个 %s"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
-msgid "read file names from stdin"
-msgstr "从标准输入读出文件名"
+#: trailer.c:702
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "签名 '%.*s' 的键为空"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:24
-msgid "terminate input and output records by a NUL character"
-msgstr "输入和输出的记录使用 NUL 字符终结"
+#: trailer.c:722
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "不能读取输入文件 '%s'"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
-msgid "suppress progress reporting"
-msgstr "不显示进度报告"
+#: trailer.c:725
+msgid "could not read from stdin"
+msgstr "不能自标准输入读取"
-#: builtin/check-ignore.c:26
-msgid "show non-matching input paths"
-msgstr "显示未匹配的输入路径"
+#: trailer.c:949 builtin/am.c:44
+#, c-format
+msgid "could not stat %s"
+msgstr "不能对 %s 调用 stat"
-#: builtin/check-ignore.c:28
-msgid "ignore index when checking"
-msgstr "检查时忽略索引"
+#: trailer.c:951
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "文件 %s 不是一个正规文件"
-#: builtin/check-ignore.c:154
-msgid "cannot specify pathnames with --stdin"
-msgstr "不能同时提供路径及 --stdin 参数"
+#: trailer.c:953
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "文件 %s 用户不可写"
-#: builtin/check-ignore.c:157
-msgid "-z only makes sense with --stdin"
-msgstr "-z 需要和 --stdin 参数共用才有意义"
+#: trailer.c:965
+msgid "could not open temporary file"
+msgstr "不能打开临时文件"
-#: builtin/check-ignore.c:159
-msgid "no path specified"
-msgstr "未指定路径"
+#: trailer.c:1001
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "不能重命名临时文件为 %s"
-#: builtin/check-ignore.c:163
-msgid "--quiet is only valid with a single pathname"
-msgstr "参数 --quiet 只在提供一个路径名时有效"
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
-#: builtin/check-ignore.c:165
-msgid "cannot have both --quiet and --verbose"
-msgstr "不能同时提供 --quiet 和 --verbose 参数"
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "传输：无效的深度选项 '%s'"
-#: builtin/check-ignore.c:168
-msgid "--non-matching is only valid with --verbose"
-msgstr "--non-matching 选项只在使用 --verbose 时有效"
+#: transport.c:889
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
-#: builtin/check-mailmap.c:8
-msgid "git check-mailmap [<options>] <contact>..."
-msgstr "git check-mailmap [<选项>] <联系地址>..."
+#: transport.c:893
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"请尝试\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"或者进入到子目录执行\n"
+"\n"
+"\tgit push\n"
+"\n"
+"以推送至远程。\n"
+"\n"
-#: builtin/check-mailmap.c:13
-msgid "also read contacts from stdin"
-msgstr "还从标准输入读取联系地址"
+#: transport.c:901
+msgid "Aborting."
+msgstr "正在终止。"
-#: builtin/check-mailmap.c:24
+#: transport-helper.c:1080
#, c-format
-msgid "unable to parse contact: %s"
-msgstr "ä¸\8dè\83½è§£æ\9e\90è\81\94ç³»å\9c°å\9d\80ï¼\9a%s"
+msgid "Could not read ref %s"
+msgstr "ä¸\8dè\83½è¯»å\8f\96å¼\95ç\94¨ %s"
-#: builtin/check-mailmap.c:47
-msgid "no contacts specified"
-msgstr "未指定联系地址"
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr "太短的树对象"
-#: builtin/checkout-index.c:126
-msgid "git checkout-index [<options>] [--] [<file>...]"
-msgstr "git checkout-index [<选项>] [--] [<文件>...]"
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr "树对象中的条目模式错误"
-#: builtin/checkout-index.c:188
-msgid "check out all files in the index"
-msgstr "æ£\80å\87ºç´¢å¼\95å\8cºç\9a\84æ\89\80æ\9c\89æ\96\87件"
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
+msgstr "æ \91对象æ\9d¡ç\9b®ä¸ç©ºç\9a\84æ\96\87件å\90\8d"
-#: builtin/checkout-index.c:189
-msgid "force overwrite of existing files"
-msgstr "强制覆盖现有的文件"
-
-#: builtin/checkout-index.c:191
-msgid "no warning for existing files and files not in index"
-msgstr "存在或不在索引中的文件都没有警告"
-
-#: builtin/checkout-index.c:193
-msgid "don't checkout new files"
-msgstr "不检出新文件"
-
-#: builtin/checkout-index.c:195
-msgid "update stat information in the index file"
-msgstr "更新索引中文件的状态信息"
-
-#: builtin/checkout-index.c:201
-msgid "read list of paths from the standard input"
-msgstr "从标准输入读取路径列表"
-
-#: builtin/checkout-index.c:203
-msgid "write the content to temporary files"
-msgstr "将内容写入临时文件"
-
-#: builtin/checkout-index.c:204 builtin/column.c:30
-msgid "string"
-msgstr "字符串"
-
-#: builtin/checkout-index.c:205
-msgid "when creating files, prepend <string>"
-msgstr "在创建文件时，在前面加上<字符串>"
-
-#: builtin/checkout-index.c:208
-msgid "copy out the files from named stage"
-msgstr "从指定暂存区中拷出文件"
+#: tree-walk.c:113
+msgid "too-short tree file"
+msgstr "太短的树文件"
-#: builtin/checkout.c:24
-msgid "git checkout [<options>] <branch>"
-msgstr "git checkout [<选项>] <分支>"
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you switch branches."
+msgstr ""
+"您对下列文件的本地修改将被检出操作覆盖：\n"
+"%%s请在切换分支前提交您的修改或者保存进度。"
-#: builtin/checkout.c:25
-msgid "git checkout [<options>] [<branch>] -- <file>..."
-msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
+#: unpack-trees.c:106
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被检出操作覆盖：\n"
+"%%s"
-#: builtin/checkout.c:134 builtin/checkout.c:167
+#: unpack-trees.c:109
#, c-format
-msgid "path '%s' does not have our version"
-msgstr "路径 '%s' 没有我们的版本"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"您对下列文件的本地修改将被合并操作覆盖：\n"
+"%%s请在合并前提交您的修改或者保存进度。"
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: unpack-trees.c:111
#, c-format
-msgid "path '%s' does not have their version"
-msgstr "路径 '%s' 没有他们的版本"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被合并操作覆盖：\n"
+"%%s"
-#: builtin/checkout.c:152
+#: unpack-trees.c:114
#, c-format
-msgid "path '%s' does not have all necessary versions"
-msgstr "路径 '%s' 没有全部必须的版本"
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"您对下列文件的本地修改将被 %s 覆盖：\n"
+"%%s请在 %s 之前提交您的修改或者保存进度。"
-#: builtin/checkout.c:196
+#: unpack-trees.c:116
#, c-format
-msgid "path '%s' does not have necessary versions"
-msgstr "路径 '%s' 没有必须的版本"
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被 %s 覆盖：\n"
+"%%s"
-#: builtin/checkout.c:213
+#: unpack-trees.c:121
#, c-format
-msgid "path '%s': cannot merge"
-msgstr "path '%s'：无法合并"
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"更新如下目录将会丢失其中未跟踪的文件：\n"
+"%s"
-#: builtin/checkout.c:230
+#: unpack-trees.c:125
#, c-format
-msgid "Unable to add merge result for '%s'"
-msgstr "无法为 '%s' 添加合并结果"
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
+"%%s请在切换分支之前移动或删除。"
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: unpack-trees.c:127
#, c-format
-msgid "'%s' cannot be used with updating paths"
-msgstr "'%s' 不能在更新路径时使用"
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
+"%%s"
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: unpack-trees.c:130
#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' 不能和 %s 同时使用"
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
+"%%s请在合并前移动或删除。"
-#: builtin/checkout.c:269
+#: unpack-trees.c:132
#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
-msgstr "不能同时更新路径并切换到分支'%s'。"
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
+"%%s"
-#: builtin/checkout.c:280 builtin/checkout.c:474
-msgid "corrupt index file"
-msgstr "损坏的索引文件"
+#: unpack-trees.c:135
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
+"%%s请在 %s 前移动或删除。"
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: unpack-trees.c:137
#, c-format
-msgid "path '%s' is unmerged"
-msgstr "路径 '%s' 未合并"
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
+"%%s"
-#: builtin/checkout.c:496
-msgid "you need to resolve your current index first"
-msgstr "您需要先解决当前索引的冲突"
+#: unpack-trees.c:142
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
+"%%s请在切换分支前移动或删除。"
-#: builtin/checkout.c:627
+#: unpack-trees.c:144
#, c-format
-msgid "Can not do reflog for '%s'\n"
-msgstr "不能对 '%s' 执行 reflog 操作\n"
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
+"%%s"
-#: builtin/checkout.c:663
-msgid "HEAD is now at"
-msgstr "HEAD 目前位于"
+#: unpack-trees.c:147
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
+"%%s请在合并前移动或删除。"
-#: builtin/checkout.c:670
+#: unpack-trees.c:149
#, c-format
-msgid "Reset branch '%s'\n"
-msgstr "重置分支 '%s'\n"
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
+"%%s"
-#: builtin/checkout.c:673
+#: unpack-trees.c:152
#, c-format
-msgid "Already on '%s'\n"
-msgstr "已经位于 '%s'\n"
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
+"%%s请在 %s 前移动或删除。"
-#: builtin/checkout.c:677
+#: unpack-trees.c:154
#, c-format
-msgid "Switched to and reset branch '%s'\n"
-msgstr "切换并重置分支 '%s'\n"
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
+"%%s"
-#: builtin/checkout.c:679 builtin/checkout.c:1134
+#: unpack-trees.c:161
#, c-format
-msgid "Switched to a new branch '%s'\n"
-msgstr "切换到一个新分支 '%s'\n"
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
-#: builtin/checkout.c:681
+#: unpack-trees.c:164
#, c-format
-msgid "Switched to branch '%s'\n"
-msgstr "切换到分支 '%s'\n"
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"无法更新稀疏检出：如下条目不是最新：\n"
+"%s"
-# 译者：注意保持前导空格
-#: builtin/checkout.c:733
+#: unpack-trees.c:166
#, c-format
-msgid " ... and %d more.\n"
-msgstr " ... 及其它 %d 个。\n"
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"工作区中下列文件将被稀疏检出更新所覆盖：\n"
+"%s"
-#: builtin/checkout.c:739
+#: unpack-trees.c:168
#, c-format
msgid ""
-"Warning: you are leaving %d commit behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgid_plural ""
-"Warning: you are leaving %d commits behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgstr[0] ""
-"警告：您正丢下 %d 个提交，未和任何分支关联：\n"
-"\n"
-"%s\n"
-msgstr[1] ""
-"警告：您正丢下 %d 个提交，未和任何分支关联：\n"
-"\n"
-"%s\n"
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"工作区中下列文件将被稀疏检出更新所删除：\n"
+"%s"
-#: builtin/checkout.c:758
+#: unpack-trees.c:170
#, c-format
msgid ""
-"If you want to keep it by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch <new-branch-name> %s\n"
-"\n"
-msgid_plural ""
-"If you want to keep them by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch <new-branch-name> %s\n"
-"\n"
-msgstr[0] ""
-"如果您想要通过创建新分支保存它，这可能是一个好时候。\n"
-"如下操作：\n"
-"\n"
-" git branch <新分支名> %s\n"
-"\n"
-msgstr[1] ""
-"如果您想要通过创建新分支保存它们，这可能是一个好时候。\n"
-"如下操作：\n"
-"\n"
-" git branch <新分支名> %s\n"
-"\n"
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"无法更新子模组：\n"
+"%s"
-#: builtin/checkout.c:794
-msgid "internal error in revision walk"
-msgstr "在版本遍历时遇到内部错误"
+#: unpack-trees.c:247
+#, c-format
+msgid "Aborting\n"
+msgstr "终止中\n"
-#: builtin/checkout.c:798
-msgid "Previous HEAD position was"
-msgstr "之前的 HEAD 位置是"
+#: unpack-trees.c:272
+#, c-format
+msgid "submodule update strategy not supported for submodule '%s'"
+msgstr "子模组 %s 不支持子模组更新策略"
-#: builtin/checkout.c:825 builtin/checkout.c:1129
-msgid "You are on a branch yet to be born"
-msgstr "您位于一个尚未初始化的分支"
+#: unpack-trees.c:340
+msgid "Checking out files"
+msgstr "正在检出文件"
+
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
-#: builtin/checkout.c:931
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
-msgid "'%s' is already checked out at '%s'"
-msgstr "'%s' 已经检出到 '%s'"
+msgid "invalid %XX escape sequence"
+msgstr "无效的 %XX 转义序列"
+
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
+msgstr "缺失主机名且 URL 方案不是 'file:'"
+
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
+msgstr "一个 'file:' URL 不应该包含端口号"
+
+#: urlmatch.c:247
+msgid "invalid characters in host name"
+msgstr "主机名中包含无效的字符"
+
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
+msgstr "无效的端口号"
+
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
+msgstr "无效的 '..' 路径片段"
-#: builtin/checkout.c:1036
+#: worktree.c:285
#, c-format
-msgid "only one reference expected, %d given."
-msgstr "只要一个引用，却给出了 %d 个"
+msgid "failed to read '%s'"
+msgstr "无法读取 '%s'"
-#: builtin/checkout.c:1075
+#: wrapper.c:222 wrapper.c:392
#, c-format
-msgid "invalid reference: %s"
-msgstr "æ\97 æ\95\88å¼\95ç\94¨ï¼\9a%s"
+msgid "could not open '%s' for reading and writing"
+msgstr "æ\97 æ³\95æ\89\93å¼\80 '%s' è¿\9bè¡\8c读å\86\99"
-#: builtin/checkout.c:1104
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
#, c-format
-msgid "reference is not a tree: %s"
-msgstr "引用不是一个树：%s"
+msgid "could not open '%s' for writing"
+msgstr "无法打开 '%s' 进行写入"
-#: builtin/checkout.c:1143
-msgid "paths cannot be used with switching branches"
-msgstr "路径不能和切换分支同时使用"
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757
+#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015
+#: builtin/pull.c:341
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "无法打开 '%s' 进行读取"
-#: builtin/checkout.c:1146 builtin/checkout.c:1150
+#: wrapper.c:581 wrapper.c:602
#, c-format
-msgid "'%s' cannot be used with switching branches"
-msgstr "'%s' 不能和切换分支同时使用"
+msgid "unable to access '%s'"
+msgstr "不能访问 '%s'"
-#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
-#: builtin/checkout.c:1165
+#: wrapper.c:610
+msgid "unable to get current working directory"
+msgstr "不能获取当前工作目录"
+
+#: wrapper.c:634
#, c-format
-msgid "'%s' cannot be used with '%s'"
-msgstr "'%s' 不能和 '%s' 同时使用"
+msgid "could not write to %s"
+msgstr "不能写入 %s"
-#: builtin/checkout.c:1170
+#: wrapper.c:636
#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
-msgstr "ä¸\8dè\83½å\88\87æ\8d¢å\88\86æ\94¯å\88°ä¸\80个é\9d\9eæ\8f\90交 '%s'"
+msgid "could not close %s"
+msgstr "ä¸\8dè\83½å\85³é\97 %s"
-#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
-#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
-#: builtin/worktree.c:284
-msgid "branch"
-msgstr "分支"
+#: wt-status.c:151
+msgid "Unmerged paths:"
+msgstr "未合并的路径："
-#: builtin/checkout.c:1204
-msgid "create and checkout a new branch"
-msgstr "创建并检出一个新的分支"
+# 译者：注意保持前导空格
+#: wt-status.c:178 wt-status.c:205
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"
-#: builtin/checkout.c:1206
-msgid "create/reset and checkout a branch"
-msgstr "创建/重置并检出一个分支"
+# 译者：注意保持前导空格
+#: wt-status.c:180 wt-status.c:207
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"
-#: builtin/checkout.c:1207
-msgid "create reflog for new branch"
-msgstr "为新的分支创建引用日志"
+# 译者：注意保持前导空格
+#: wt-status.c:184
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " （使用 \"git add <文件>...\" 标记解决方案）"
-#: builtin/checkout.c:1208
-msgid "detach the HEAD at named commit"
-msgstr "成为指向该提交的分离头指针"
+# 译者：注意保持前导空格
+#: wt-status.c:186 wt-status.c:190
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
-#: builtin/checkout.c:1209
-msgid "set upstream info for new branch"
-msgstr "为新的分支设置上游信息"
+# 译者：注意保持前导空格
+#: wt-status.c:188
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
-#: builtin/checkout.c:1211
-msgid "new-branch"
-msgstr "新分支"
+#: wt-status.c:199 wt-status.c:958
+msgid "Changes to be committed:"
+msgstr "要提交的变更："
-#: builtin/checkout.c:1211
-msgid "new unparented branch"
-msgstr "新的没有父提交的分支"
+#: wt-status.c:217 wt-status.c:967
+msgid "Changes not staged for commit:"
+msgstr "尚未暂存以备提交的变更："
-#: builtin/checkout.c:1212
-msgid "checkout our version for unmerged files"
-msgstr "对尚未合并的文件检出我们的版本"
+# 译者：注意保持前导空格
+#: wt-status.c:221
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"
-#: builtin/checkout.c:1214
-msgid "checkout their version for unmerged files"
-msgstr "对尚未合并的文件检出他们的版本"
+# 译者：注意保持前导空格
+#: wt-status.c:223
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
-#: builtin/checkout.c:1216
-msgid "force checkout (throw away local modifications)"
-msgstr "强制检出（丢弃本地修改）"
+# 译者：注意保持前导空格
+#: wt-status.c:224
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
-#: builtin/checkout.c:1217
-msgid "perform a 3-way merge with the new branch"
-msgstr "和新的分支执行三路合并"
+# 译者：注意保持前导空格
+#: wt-status.c:226
+msgid " (commit or discard the untracked or modified content in submodules)"
+msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
-#: builtin/checkout.c:1218 builtin/merge.c:227
-msgid "update ignored files (default)"
-msgstr "更新忽略的文件（默认）"
+# 译者：注意保持前导空格
+#: wt-status.c:238
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"
-#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
-msgid "style"
-msgstr "风格"
+#: wt-status.c:253
+msgid "both deleted:"
+msgstr "双方删除："
-#: builtin/checkout.c:1220
-msgid "conflict style (merge or diff3)"
-msgstr "冲突输出风格（merge 或 diff3）"
+#: wt-status.c:255
+msgid "added by us:"
+msgstr "由我们添加："
-#: builtin/checkout.c:1223
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "对路径不做稀疏检出的限制"
+#: wt-status.c:257
+msgid "deleted by them:"
+msgstr "由他们删除："
-#: builtin/checkout.c:1225
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "二次猜测'git checkout <无此分支>'"
+#: wt-status.c:259
+msgid "added by them:"
+msgstr "由他们添加："
-#: builtin/checkout.c:1227
-msgid "do not check if another worktree is holding the given ref"
-msgstr "不检查指定的引用是否被其他工作区所占用"
+#: wt-status.c:261
+msgid "deleted by us:"
+msgstr "由我们删除："
-#: builtin/checkout.c:1252
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b、-B 和 --orphan 是互斥的"
+#: wt-status.c:263
+msgid "both added:"
+msgstr "双方添加："
-#: builtin/checkout.c:1269
-msgid "--track needs a branch name"
-msgstr "--track 需要一个分支名"
+#: wt-status.c:265
+msgid "both modified:"
+msgstr "双方修改："
-#: builtin/checkout.c:1274
-msgid "Missing branch name; try -b"
-msgstr "缺少分支名；尝试 -b"
+#: wt-status.c:275
+msgid "new file:"
+msgstr "新文件："
-#: builtin/checkout.c:1310
-msgid "invalid path specification"
-msgstr "æ\97 æ\95\88ç\9a\84è·¯å¾\84è§\84æ ¼"
+#: wt-status.c:277
+msgid "copied:"
+msgstr "æ\8b·è´\9dï¼\9a"
-#: builtin/checkout.c:1317
-#, c-format
-msgid ""
-"Cannot update paths and switch to branch '%s' at the same time.\n"
-"Did you intend to checkout '%s' which can not be resolved as commit?"
-msgstr ""
-"不能同时更新路径并切换到分支'%s'。\n"
-"您是想要检出 '%s' 但其未能解析为提交么？"
+#: wt-status.c:279
+msgid "deleted:"
+msgstr "删除："
-#: builtin/checkout.c:1322
-#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
-msgstr "git checkout：--detach 不能接收路径参数 '%s'"
+#: wt-status.c:281
+msgid "modified:"
+msgstr "修改："
-#: builtin/checkout.c:1326
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
-msgstr ""
-"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
+#: wt-status.c:283
+msgid "renamed:"
+msgstr "重命名："
-#: builtin/clean.c:26
-msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
-msgstr ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
+#: wt-status.c:285
+msgid "typechange:"
+msgstr "类型变更："
-#: builtin/clean.c:30
-#, c-format
-msgid "Removing %s\n"
-msgstr "正删除 %s\n"
+#: wt-status.c:287
+msgid "unknown:"
+msgstr "未知："
-#: builtin/clean.c:31
-#, c-format
-msgid "Would remove %s\n"
-msgstr "将删除 %s\n"
+#: wt-status.c:289
+msgid "unmerged:"
+msgstr "未合并："
-#: builtin/clean.c:32
-#, c-format
-msgid "Skipping repository %s\n"
-msgstr "忽略版本库 %s\n"
+# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#: wt-status.c:371
+msgid "new commits, "
+msgstr "新提交, "
-#: builtin/clean.c:33
-#, c-format
-msgid "Would skip repository %s\n"
-msgstr "将忽略版本库 %s\n"
+# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#: wt-status.c:373
+msgid "modified content, "
+msgstr "修改的内容, "
-#: builtin/clean.c:34
-#, c-format
-msgid "failed to remove %s"
-msgstr "æ\97 æ³\95å\88 é\99¤ %s"
+# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#: wt-status.c:375
+msgid "untracked content, "
+msgstr "æ\9cªè·\9f踪ç\9a\84å\86\85容, "
-#: builtin/clean.c:295
-msgid ""
-"Prompt help:\n"
-"1 - select a numbered item\n"
-"foo - select item based on unique prefix\n"
-" - (empty) select nothing"
-msgstr ""
-"帮助：\n"
-"1 - 通过编号选择一个选项\n"
-"foo - 通过标题选择一个选项\n"
-" - （空）什么也不选择"
+#: wt-status.c:831
+msgid "Submodules changed but not updated:"
+msgstr "子模组已修改但尚未更新："
+
+#: wt-status.c:833
+msgid "Submodule changes to be committed:"
+msgstr "要提交的子模组变更："
-#: builtin/clean.c:299
+#: wt-status.c:914
msgid ""
-"Prompt help:\n"
-"1 - select a single item\n"
-"3-5 - select a range of items\n"
-"2-3,6-9 - select multiple ranges\n"
-"foo - select item based on unique prefix\n"
-"-... - unselect specified items\n"
-"* - choose all items\n"
-" - (empty) finish selecting"
+"Do not touch the line above.\n"
+"Everything below will be removed."
msgstr ""
-"帮助：\n"
-"1 - 选择一个选项\n"
-"3-5 - 选择一个范围内的所有选项\n"
-"2-3,6-9 - 选择多个范围内的所有选项\n"
-"foo - 通过标题选择一个选项\n"
-"-... - 反选特定的选项\n"
-"* - 选择所有选项\n"
-" - （空）结束选择"
+"不要改动上面的一行。\n"
+"下面的所有内容均将被删除。"
-#: builtin/clean.c:515
-#, c-format
-msgid "Huh (%s)?"
-msgstr "嗯（%s）？"
+#: wt-status.c:1026
+msgid "You have unmerged paths."
+msgstr "您有尚未合并的路径。"
-#: builtin/clean.c:657
-#, c-format
-msgid "Input ignore patterns>> "
-msgstr "输入模版以排除条目>> "
+# 译者：注意保持前导空格
+#: wt-status.c:1029
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " （解决冲突并运行 \"git commit\"）"
-#: builtin/clean.c:694
-#, c-format
-msgid "WARNING: Cannot find items matched by: %s"
-msgstr "警告：无法找到和 %s 匹配的条目"
+# 译者：注意保持前导空格
+#: wt-status.c:1031
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " （使用 \"git merge --abort\" 终止合并）"
-#: builtin/clean.c:715
-msgid "Select items to delete"
-msgstr "选择要删除的条目"
+#: wt-status.c:1036
+msgid "All conflicts fixed but you are still merging."
+msgstr "所有冲突已解决但您仍处于合并中。"
-#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:756
-#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "删除 %s [y/N]？"
+# 译者：注意保持前导空格
+#: wt-status.c:1039
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " （使用 \"git commit\" 结束合并）"
-#: builtin/clean.c:781
-msgid "Bye."
-msgstr "再见。"
+#: wt-status.c:1049
+msgid "You are in the middle of an am session."
+msgstr "您正处于 am 操作过程中。"
-#: builtin/clean.c:789
-msgid ""
-"clean - start cleaning\n"
-"filter by pattern - exclude items from deletion\n"
-"select by numbers - select items to be deleted by numbers\n"
-"ask each - confirm each deletion (like \"rm -i\")\n"
-"quit - stop cleaning\n"
-"help - this screen\n"
-"? - help for prompt selection"
-msgstr ""
-"clean - 开始清理\n"
-"filter by pattern - 通过模版排除要删除的条目\n"
-"select by numbers - 通过数字选择要删除的条目\n"
-"ask each - 针对删除逐一询问（就像 \"rm -i\"）\n"
-"quit - 停止删除并退出\n"
-"help - 显示本帮助\n"
-"? - 显示如何在提示符下选择的帮助"
+#: wt-status.c:1052
+msgid "The current patch is empty."
+msgstr "当前的补丁为空。"
-#: builtin/clean.c:816
-msgid "*** Commands ***"
-msgstr "*** 命令 ***"
+# 译者：注意保持前导空格
+#: wt-status.c:1056
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " （解决冲突，然后运行 \"git am --continue\"）"
-#: builtin/clean.c:817
-msgid "What now"
-msgstr "请选择"
+# 译者：注意保持前导空格
+#: wt-status.c:1058
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " （使用 \"git am --skip\" 跳过此补丁）"
-#: builtin/clean.c:825
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] "将删除如下条目："
-msgstr[1] "将删除如下条目："
+# 译者：注意保持前导空格
+#: wt-status.c:1060
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " （使用 \"git am --abort\" 恢复原有分支）"
-#: builtin/clean.c:842
-msgid "No more files to clean, exiting."
-msgstr "没有要清理的文件，退出。"
+#: wt-status.c:1189
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo 丢失。"
-#: builtin/clean.c:873
-msgid "do not print names of files removed"
-msgstr "不打印删除文件的名称"
+#: wt-status.c:1191
+msgid "No commands done."
+msgstr "没有命令被执行。"
-#: builtin/clean.c:875
-msgid "force"
-msgstr "强制"
+#: wt-status.c:1194
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "最后一条命令已完成（%d 条命令被执行）："
+msgstr[1] "最后的命令已完成（%d 条命令被执行）："
-#: builtin/clean.c:876
-msgid "interactive cleaning"
-msgstr "交互式清除"
+#: wt-status.c:1205
+#, c-format
+msgid " (see more in file %s)"
+msgstr " （更多参见文件 %s）"
-#: builtin/clean.c:878
-msgid "remove whole directories"
-msgstr "删除整个目录"
+#: wt-status.c:1210
+msgid "No commands remaining."
+msgstr "未剩下任何命令。"
-#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714
-#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
-msgid "pattern"
-msgstr "模式"
+#: wt-status.c:1213
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "接下来要执行的命令（剩余 %d 条命令）："
+msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："
-#: builtin/clean.c:880
-msgid "add <pattern> to ignore rules"
-msgstr "添加<模式>到忽略规则"
+# 译者：注意保持前导空格
+#: wt-status.c:1221
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"
-#: builtin/clean.c:881
-msgid "remove ignored files, too"
-msgstr "也删除忽略的文件"
+#: wt-status.c:1234
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
-#: builtin/clean.c:883
-msgid "remove only ignored files"
-msgstr "只删除忽略的文件"
+#: wt-status.c:1239
+msgid "You are currently rebasing."
+msgstr "您在执行变基操作。"
-#: builtin/clean.c:901
-msgid "-x and -X cannot be used together"
-msgstr "-x 和 -X 不能同时使用"
+# 译者：注意保持前导空格
+#: wt-status.c:1253
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
-#: builtin/clean.c:905
-msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
-msgstr ""
-"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
+# 译者：注意保持前导空格
+#: wt-status.c:1255
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
-#: builtin/clean.c:908
-msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
-msgstr ""
-"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
+# 译者：注意保持前导空格
+#: wt-status.c:1257
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
-#: builtin/clone.c:37
-msgid "git clone [<options>] [--] <repo> [<dir>]"
-msgstr "git clone [<选项>] [--] <版本库> [<路径>]"
+# 译者：注意保持前导空格
+#: wt-status.c:1263
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
-#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224
-#: builtin/push.c:523
-msgid "force progress reporting"
-msgstr "强制显示进度报告"
+#: wt-status.c:1267
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
-#: builtin/clone.c:59
-msgid "don't create a checkout"
-msgstr "不创建一个检出"
+#: wt-status.c:1272
+msgid "You are currently splitting a commit during a rebase."
+msgstr "您在执行变基操作时拆分提交。"
-#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503
-msgid "create a bare repository"
-msgstr "创建一个纯版本库"
+# 译者：注意保持前导空格
+#: wt-status.c:1275
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
-#: builtin/clone.c:64
-msgid "create a mirror repository (implies bare)"
-msgstr "创建一个镜像版本库（也是纯版本库）"
+#: wt-status.c:1279
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
-#: builtin/clone.c:66
-msgid "to clone from a local repository"
-msgstr "从本地版本库克隆"
+#: wt-status.c:1284
+msgid "You are currently editing a commit during a rebase."
+msgstr "您在执行变基操作时编辑提交。"
-#: builtin/clone.c:68
-msgid "don't use local hardlinks, always copy"
-msgstr "不使用本地硬链接，始终复制"
+# 译者：注意保持前导空格
+#: wt-status.c:1287
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " （使用 \"git commit --amend\" 修补当前提交）"
-#: builtin/clone.c:70
-msgid "setup as shared repository"
-msgstr "设置为共享版本库"
+# 译者：注意保持前导空格
+#: wt-status.c:1289
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
-#: builtin/clone.c:72 builtin/clone.c:74
-msgid "initialize submodules in the clone"
-msgstr "在克隆时初始化子模组"
+#: wt-status.c:1299
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "您在执行拣选提交 %s 的操作。"
-#: builtin/clone.c:75 builtin/init-db.c:500
-msgid "template-directory"
-msgstr "模板目录"
+# 译者：注意保持前导空格
+#: wt-status.c:1304
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
-#: builtin/clone.c:76 builtin/init-db.c:501
-msgid "directory from which templates will be used"
-msgstr "模板目录将被使用"
+# 译者：注意保持前导空格
+#: wt-status.c:1307
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
-#: builtin/clone.c:78
-msgid "reference repository"
-msgstr "参考版本库"
+# 译者：注意保持前导空格
+#: wt-status.c:1309
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
-#: builtin/clone.c:80
-msgid "use --reference only while cloning"
-msgstr "仅在克隆时参考 --reference 指向的本地版本库"
+#: wt-status.c:1318
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "您在执行反转提交 %s 的操作。"
-#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
-msgid "name"
-msgstr "名称"
+# 译者：注意保持前导空格
+#: wt-status.c:1323
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " （解决冲突并运行 \"git revert --continue\"）"
-#: builtin/clone.c:82
-msgid "use <name> instead of 'origin' to track upstream"
-msgstr "使用<名称>而不是 'origin' 去跟踪上游"
+# 译者：注意保持前导空格
+#: wt-status.c:1326
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"
-#: builtin/clone.c:84
-msgid "checkout <branch> instead of the remote's HEAD"
-msgstr "检出<分支>而不是远程HEAD"
+# 译者：注意保持前导空格
+#: wt-status.c:1328
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
-#: builtin/clone.c:86
-msgid "path to git-upload-pack on the remote"
-msgstr "远程 git-upload-pack 路径"
+#: wt-status.c:1339
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
-#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659
-msgid "depth"
-msgstr "深度"
+#: wt-status.c:1343
+msgid "You are currently bisecting."
+msgstr "æ\82¨å\9c¨æ\89§è¡\8cäº\8cå\88\86æ\9f¥æ\89¾æ\93\8dä½\9cã\80\82"
-#: builtin/clone.c:88
-msgid "create a shallow clone of that depth"
-msgstr "创建一个指定深度的浅克隆"
+# 译者：注意保持前导空格
+#: wt-status.c:1346
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
-#: builtin/clone.c:90
-msgid "clone only one branch, HEAD or --branch"
-msgstr "只克隆一个分支、HEAD 或 --branch"
+#: wt-status.c:1543
+msgid "On branch "
+msgstr "位于分支 "
-#: builtin/clone.c:91 builtin/init-db.c:509
-msgid "gitdir"
-msgstr "git目录"
+#: wt-status.c:1549
+msgid "interactive rebase in progress; onto "
+msgstr "交互式变基操作正在进行中；至 "
-#: builtin/clone.c:92 builtin/init-db.c:510
-msgid "separate git dir from working tree"
-msgstr "git目录和工作区分离"
+#: wt-status.c:1551
+msgid "rebase in progress; onto "
+msgstr "变基操作正在进行中；至 "
-#: builtin/clone.c:93
-msgid "key=value"
-msgstr "key=value"
+#: wt-status.c:1556
+msgid "HEAD detached at "
+msgstr "头指针分离于 "
-#: builtin/clone.c:94
-msgid "set config inside the new repository"
-msgstr "å\9c¨æ\96°ç\89\88æ\9c¬åº\93ä¸è®¾ç½®é\85\8d置信æ\81¯"
+#: wt-status.c:1558
+msgid "HEAD detached from "
+msgstr "头æ\8c\87é\92\88å\88\86离è\87ª "
-#: builtin/clone.c:240
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "参考版本库 '%s' 不是一个本地版本库。"
+#: wt-status.c:1561
+msgid "Not currently on any branch."
+msgstr "当前不在任何分支上。"
-#: builtin/clone.c:244
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "参考版本库 '%s' 是一个浅克隆"
+#: wt-status.c:1579
+msgid "Initial commit"
+msgstr "初始提交"
-#: builtin/clone.c:247
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "参考版本库 '%s' 已被嫁接"
+#: wt-status.c:1593
+msgid "Untracked files"
+msgstr "未跟踪的文件"
-#: builtin/clone.c:310
-#, c-format
-msgid "failed to create directory '%s'"
-msgstr "无法创建目录 '%s'"
+#: wt-status.c:1595
+msgid "Ignored files"
+msgstr "忽略的文件"
-#: builtin/clone.c:312 builtin/diff.c:84
+#: wt-status.c:1599
#, c-format
-msgid "failed to stat '%s'"
-msgstr "无法枚举 '%s' 状态"
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
+"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
-#: builtin/clone.c:314
+#: wt-status.c:1605
#, c-format
-msgid "%s exists and is not a directory"
-msgstr "%s 存在且不是一个目录"
+msgid "Untracked files not listed%s"
+msgstr "未跟踪的文件没有列出%s"
-#: builtin/clone.c:328
-#, c-format
-msgid "failed to stat %s\n"
-msgstr "无法枚举 %s 状态\n"
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1607
+msgid " (use -u option to show untracked files)"
+msgstr "（使用 -u 参数显示未跟踪的文件）"
-#: builtin/clone.c:350
-#, c-format
-msgid "failed to create link '%s'"
-msgstr "无法创建链接 '%s'"
+#: wt-status.c:1613
+msgid "No changes"
+msgstr "没有修改"
-#: builtin/clone.c:354
+#: wt-status.c:1618
#, c-format
-msgid "failed to copy file to '%s'"
-msgstr "无法拷贝文件至 '%s'"
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
-#: builtin/clone.c:377 builtin/clone.c:551
+#: wt-status.c:1621
#, c-format
-msgid "done.\n"
-msgstr "完成。\n"
+msgid "no changes added to commit\n"
+msgstr "修改尚未加入提交\n"
-#: builtin/clone.c:389
+#: wt-status.c:1624
+#, c-format
msgid ""
-"Clone succeeded, but checkout failed.\n"
-"You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
-msgstr ""
-"克隆成功，但是检出失败。\n"
-"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
-"'git checkout -f HEAD' 重试\n"
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
-#: builtin/clone.c:466
+#: wt-status.c:1627
#, c-format
-msgid "Could not find remote branch %s to clone."
-msgstr "不能发现要克隆的远程分支 %s。"
+msgid "nothing added to commit but untracked files present\n"
+msgstr "提交为空，但是存在尚未跟踪的文件\n"
-#: builtin/clone.c:546
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1630
#, c-format
-msgid "Checking connectivity... "
-msgstr "æ£\80æ\9f¥è¿\9eæ\8e¥... "
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr "æ\97 æ\96\87件è¦\81æ\8f\90交ï¼\88å\88\9b建/æ\8b·è´\9dæ\96\87件并使ç\94¨ \"git add\" 建ç«\8bè·\9f踪ï¼\89\n"
-#: builtin/clone.c:549
-msgid "remote did not send all necessary objects"
-msgstr "远程没有发送所有必须的对象"
+#: wt-status.c:1633 wt-status.c:1638
+#, c-format
+msgid "nothing to commit\n"
+msgstr "无文件要提交\n"
-#: builtin/clone.c:613
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1636
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
-#: builtin/clone.c:644
-msgid "unable to checkout working tree"
-msgstr "不能检出工作区"
+# 译者：中文字符串拼接，可删除前导空格
+#: wt-status.c:1640
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "无文件要提交，干净的工作区\n"
-#: builtin/clone.c:731
-msgid "cannot repack to clean up"
-msgstr "无法执行 repack 来清理"
+# 译者：注意保持句尾空格
+#: wt-status.c:1749
+msgid "Initial commit on "
+msgstr "初始提交于 "
-#: builtin/clone.c:733
-msgid "cannot unlink temporary alternates file"
-msgstr "无法删除临时的 alternates 文件"
+#: wt-status.c:1753
+msgid "HEAD (no branch)"
+msgstr "HEAD（非分支）"
-#: builtin/clone.c:763
-msgid "Too many arguments."
-msgstr "太多参数。"
+# 译者：注意保持句尾空格
+#: wt-status.c:1782 wt-status.c:1790
+msgid "behind "
+msgstr "落后 "
-#: builtin/clone.c:767
-msgid "You must specify a repository to clone."
-msgstr "您必须指定一个版本库来克隆。"
+#: wt-status.c:1785 wt-status.c:1788
+msgid "ahead "
+msgstr "领先 "
-#: builtin/clone.c:778
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2280
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare 和 --origin %s 选项不兼容。"
+msgid "cannot %s: You have unstaged changes."
+msgstr "不能%s：您有未暂存的变更。"
-#: builtin/clone.c:781
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare 和 --separate-git-dir 选项不兼容。"
+#: wt-status.c:2286
+msgid "additionally, your index contains uncommitted changes."
+msgstr "另外，您的索引中包含未提交的变更。"
-#: builtin/clone.c:794
+#: wt-status.c:2288
#, c-format
-msgid "repository '%s' does not exist"
-msgstr "版本库 '%s' 不存在"
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "不能%s：您的索引中包含未提交的变更。"
-#: builtin/clone.c:800 builtin/fetch.c:1160
+#: compat/precompose_utf8.c:57 builtin/clone.c:432
#, c-format
-msgid "depth %s is not a positive number"
-msgstr "深度 %s ä¸\8dæ\98¯ä¸\80个æ£æ\95°"
+msgid "failed to unlink '%s'"
+msgstr "æ\97 æ³\95å\88 é\99¤ '%s'"
-#: builtin/clone.c:810
-#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
-msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
+#: builtin/add.c:22
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<选项>] [--] <路径规格>..."
-#: builtin/clone.c:820
+#: builtin/add.c:80
#, c-format
-msgid "working tree '%s' already exists."
-msgstr "工作区 '%s' 已经存在。"
+msgid "unexpected diff status %c"
+msgstr "意外的差异状态 %c"
-#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
-#: builtin/worktree.c:220
-#, c-format
-msgid "could not create leading directories of '%s'"
-msgstr "不能为 '%s' 创建先导目录"
+#: builtin/add.c:85 builtin/commit.c:291
+msgid "updating files failed"
+msgstr "更新文件失败"
-#: builtin/clone.c:838
+#: builtin/add.c:95
#, c-format
-msgid "could not create work tree dir '%s'"
-msgstr "不能创建工作区目录 '%s'"
+msgid "remove '%s'\n"
+msgstr "删除 '%s'\n"
-#: builtin/clone.c:856
-#, c-format
-msgid "Cloning into bare repository '%s'...\n"
-msgstr "克隆到纯版本库 '%s'...\n"
+#: builtin/add.c:149
+msgid "Unstaged changes after refreshing the index:"
+msgstr "刷新索引之后尚未被暂存的变更："
+
+#: builtin/add.c:209 builtin/rev-parse.c:872
+msgid "Could not read the index"
+msgstr "不能读取索引"
-#: builtin/clone.c:858
+#: builtin/add.c:220
#, c-format
-msgid "Cloning into '%s'...\n"
-msgstr "æ£å\85\8bé\9a\86å\88° '%s'...\n"
+msgid "Could not open '%s' for writing."
+msgstr "æ\97 æ³\95æ\89\93å¼\80 '%s' è¿\9bè¡\8cå\86\99å\85¥ã\80\82"
-#: builtin/clone.c:883
-msgid "--dissociate given, but there is no --reference"
-msgstr "提供了参数 --dissociate，但未提供 --reference"
+#: builtin/add.c:224
+msgid "Could not write patch"
+msgstr "不能生成补丁"
-#: builtin/clone.c:900
-msgid "--depth is ignored in local clones; use file:// instead."
-msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
+#: builtin/add.c:227
+msgid "editing patch failed"
+msgstr "编辑补丁失败"
-#: builtin/clone.c:903
-msgid "source repository is shallow, ignoring --local"
-msgstr "源版本库是浅克隆，忽略 --local"
+#: builtin/add.c:230
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "不能对 '%s' 调用 stat"
-#: builtin/clone.c:908
-msgid "--local is ignored"
-msgstr "--local 被忽略"
-
-#: builtin/clone.c:912
-#, c-format
-msgid "Don't know how to clone %s"
-msgstr "不知道如何克隆 %s"
+#: builtin/add.c:232
+msgid "Empty patch. Aborted."
+msgstr "空补丁。异常终止。"
-#: builtin/clone.c:961 builtin/clone.c:969
+#: builtin/add.c:237
#, c-format
-msgid "Remote branch %s not found in upstream %s"
-msgstr "远程分支 %s 在上游 %s 未发现"
+msgid "Could not apply '%s'"
+msgstr "不能应用 '%s'"
-#: builtin/clone.c:972
-msgid "You appear to have cloned an empty repository."
-msgstr "您似乎克隆了一个空版本库。"
+#: builtin/add.c:247
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
-#: builtin/column.c:9
-msgid "git column [<options>]"
-msgstr "git column [<选项>]"
+#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524
+#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
+msgid "dry run"
+msgstr "演习"
-#: builtin/column.c:26
-msgid "lookup config vars"
-msgstr "查找配置变量"
+#: builtin/add.c:269
+msgid "interactive picking"
+msgstr "交互式拣选"
-#: builtin/column.c:27 builtin/column.c:28
-msgid "layout to use"
-msgstr "要使用的布局"
+#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
+msgid "select hunks interactively"
+msgstr "交互式挑选数据块"
-#: builtin/column.c:29
-msgid "Maximum width"
-msgstr "最大宽度"
+#: builtin/add.c:271
+msgid "edit current diff and apply"
+msgstr "编辑当前差异并应用"
-#: builtin/column.c:30
-msgid "Padding space on left border"
-msgstr "左边æ¡\86ç\9a\84å¡«å\85\85空é\97´"
+#: builtin/add.c:272
+msgid "allow adding otherwise ignored files"
+msgstr "å\85\81许添å\8a 忽ç\95¥ç\9a\84æ\96\87件"
-#: builtin/column.c:31
-msgid "Padding space on right border"
-msgstr "右边框的填充空间"
+#: builtin/add.c:273
+msgid "update tracked files"
+msgstr "更新已跟踪的文件"
-#: builtin/column.c:32
-msgid "Padding space between columns"
-msgstr "两列之间的填充空间"
+#: builtin/add.c:274
+msgid "record only the fact that the path will be added later"
+msgstr "只记录，该路径稍后再添加"
-#: builtin/column.c:51
-msgid "--command must be the first argument"
-msgstr "--command 必须是第一个参数"
+#: builtin/add.c:275
+msgid "add changes from all tracked and untracked files"
+msgstr "添加所有改变的已跟踪文件和未跟踪文件"
-#: builtin/commit.c:37
-msgid "git commit [<options>] [--] <pathspec>..."
-msgstr "git commit [<选项>] [--] <路径规则>..."
+#: builtin/add.c:278
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
-#: builtin/commit.c:42
-msgid "git status [<options>] [--] <pathspec>..."
-msgstr "git status [<选项>] [--] <路径规则>..."
+#: builtin/add.c:280
+msgid "don't add, only refresh the index"
+msgstr "不添加，只刷新索引"
-#: builtin/commit.c:47
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-" git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-" git commit --amend --reset-author\n"
-msgstr ""
-"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
-"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
-"中编辑您的配置文件：\n"
-"\n"
-" git config --global --edit\n"
-"\n"
-"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
-"\n"
-" git commit --amend --reset-author\n"
+#: builtin/add.c:281
+msgid "just skip files which cannot be added because of errors"
+msgstr "跳过因出错不能添加的文件"
-#: builtin/commit.c:60
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-" git config --global user.name \"Your Name\"\n"
-" git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-" git commit --amend --reset-author\n"
-msgstr ""
-"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
-"与否。您可以对其进行设置以免再出现本提示信息：\n"
-"\n"
-" git config --global user.name \"Your Name\"\n"
-" git config --global user.email you@example.com\n"
-"\n"
-"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
-"\n"
-" git commit --amend --reset-author\n"
+#: builtin/add.c:282
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
-#: builtin/commit.c:72
-msgid ""
-"You asked to amend the most recent commit, but doing so would make\n"
-"it empty. You can repeat your command with --allow-empty, or you can\n"
-"remove the commit entirely with \"git reset HEAD^\".\n"
-msgstr ""
-"您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
-"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
+#: builtin/add.c:283 builtin/update-index.c:951
+msgid "(+/-)x"
+msgstr "(+/-)x"
-#: builtin/commit.c:77
-msgid ""
-"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
-"If you wish to commit it anyway, use:\n"
-"\n"
-" git commit --allow-empty\n"
-"\n"
-msgstr ""
-"之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n"
-"也要提交，使用命令：\n"
-"\n"
-" git commit --allow-empty\n"
-"\n"
+#: builtin/add.c:283 builtin/update-index.c:952
+msgid "override the executable bit of the listed files"
+msgstr "覆盖列表里文件的可执行位"
-#: builtin/commit.c:84
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "否则，请使用命令 'git reset'\n"
+#: builtin/add.c:305
+#, c-format
+msgid "Use -f if you really want to add them.\n"
+msgstr "使用 -f 参数如果您确实要添加它们。\n"
-#: builtin/commit.c:87
-msgid ""
-"If you wish to skip this commit, use:\n"
-"\n"
-" git reset\n"
-"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
-msgstr ""
-"如果您想跳过这个提交，使用命令：\n"
-"\n"
-" git reset\n"
-"\n"
-"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
-"操作。\n"
+#: builtin/add.c:312
+msgid "adding files failed"
+msgstr "添加文件失败"
-#: builtin/commit.c:304
-msgid "failed to unpack HEAD tree object"
-msgstr "无法解包 HEAD 树对象"
+#: builtin/add.c:348
+msgid "-A and -u are mutually incompatible"
+msgstr "-A 和 -u 选项互斥"
-#: builtin/commit.c:344
-msgid "unable to create temporary index"
-msgstr "不能创建临时索引"
+#: builtin/add.c:355
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
-#: builtin/commit.c:350
-msgid "interactive add failed"
-msgstr "交互式添加失败"
+#: builtin/add.c:359
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
-#: builtin/commit.c:361
-msgid "unable to write index file"
-msgstr "无法写入索引文件"
+#: builtin/add.c:374
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "没有指定文件，也没有文件被添加。\n"
-#: builtin/commit.c:363
-msgid "unable to update temporary index"
-msgstr "无法更新临时索引"
+#: builtin/add.c:375
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "也许您想要执行 'git add .'？\n"
-#: builtin/commit.c:365
-msgid "Failed to update main cache tree"
-msgstr "不能更新树的主缓存"
+#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298
+#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350
+#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271
+#: builtin/submodule--helper.c:244
+msgid "index file corrupt"
+msgstr "索引文件损坏"
-#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
-msgid "unable to write new_index file"
-msgstr "无法写 new_index 文件"
+#: builtin/am.c:412
+msgid "could not parse author script"
+msgstr "不能解析作者脚本"
-#: builtin/commit.c:445
-msgid "cannot do a partial commit during a merge."
-msgstr "在合并过程中不能做部分提交。"
+#: builtin/am.c:489
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "'%s' 被 applypatch-msg 钩子删除"
-#: builtin/commit.c:447
-msgid "cannot do a partial commit during a cherry-pick."
-msgstr "在拣选过程中不能做部分提交。"
+#: builtin/am.c:530
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "非法的输入行：'%s'。"
-#: builtin/commit.c:456
-msgid "cannot read the index"
-msgstr "无法读取索引"
+#: builtin/am.c:567
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/commit.c:475
-msgid "unable to write temporary index file"
-msgstr "无法写临时索引文件"
+#: builtin/am.c:593
+msgid "fseek failed"
+msgstr "fseek 失败"
-#: builtin/commit.c:580
+#: builtin/am.c:777
#, c-format
-msgid "commit '%s' lacks author header"
-msgstr "æ\8f\90交 '%s' 缺å°\91ä½\9cè\80\85ä¿¡æ\81¯"
+msgid "could not parse patch '%s'"
+msgstr "æ\97 æ³\95解æ\9e\90è¡¥ä¸\81 '%s'"
-#: builtin/commit.c:582
-#, c-format
-msgid "commit '%s' has malformed author line"
-msgstr "提交 '%s' 有非法的作者信息"
+#: builtin/am.c:842
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "一次只能有一个 StGIT 补丁队列被应用"
-#: builtin/commit.c:601
-msgid "malformed --author parameter"
-msgstr "非法的 --author 参数"
+#: builtin/am.c:889
+msgid "invalid timestamp"
+msgstr "无效的时间戳"
-#: builtin/commit.c:609
-#, c-format
-msgid "invalid date format: %s"
-msgstr "无效的日期格式：%s"
+#: builtin/am.c:892 builtin/am.c:900
+msgid "invalid Date line"
+msgstr "无效的日期行"
-#: builtin/commit.c:653
-msgid ""
-"unable to select a comment character that is not used\n"
-"in the current commit message"
-msgstr "无法选择一个未被当前提交说明使用的注释字符"
+#: builtin/am.c:897
+msgid "invalid timezone offset"
+msgstr "无效的时区偏移值"
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/am.c:986
+msgid "Patch format detection failed."
+msgstr "补丁格式探测失败。"
+
+#: builtin/am.c:991 builtin/clone.c:397
#, c-format
-msgid "could not lookup commit %s"
-msgstr "不能查询提交 %s"
+msgid "failed to create directory '%s'"
+msgstr "无法创建目录 '%s'"
+
+#: builtin/am.c:995
+msgid "Failed to split patches."
+msgstr "无法拆分补丁。"
+
+#: builtin/am.c:1127 builtin/commit.c:376
+msgid "unable to write index file"
+msgstr "无法写入索引文件"
-#: builtin/commit.c:702 builtin/shortlog.c:273
+#: builtin/am.c:1178
#, c-format
-msgid "(reading log message from standard input)\n"
-msgstr "（正从标准输入中读取日志信息）\n"
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "当您解决这一问题，执行 \"%s --continue\"。"
-#: builtin/commit.c:704
-msgid "could not read log from standard input"
-msgstr "不能从标准输入中读取日志信息"
+#: builtin/am.c:1179
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
-#: builtin/commit.c:708
+#: builtin/am.c:1180
#, c-format
-msgid "could not read log file '%s'"
-msgstr "不能读取日志文件 '%s'"
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "不能读取 MERGE_MSG"
+#: builtin/am.c:1315
+msgid "Patch is empty. Was it split wrong?"
+msgstr "补丁为空。是不是切分错误？"
-#: builtin/commit.c:734
-msgid "could not read SQUASH_MSG"
-msgstr "不能读取 SQUASH_MSG"
+#: builtin/am.c:1386 builtin/log.c:1557
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "包含无效的身份标识：%s"
-#: builtin/commit.c:738 builtin/merge.c:1079
+#: builtin/am.c:1413
#, c-format
-msgid "could not read '%s'"
-msgstr "ä¸\8dè\83½è¯»å\8f\96 '%s'"
+msgid "unable to parse commit %s"
+msgstr "ä¸\8dè\83½è§£æ\9e\90æ\8f\90交 %s"
-#: builtin/commit.c:785
-msgid "could not write commit template"
-msgstr "ä¸\8dè\83½å\86\99æ\8f\90交模ç\89\88"
+#: builtin/am.c:1606
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr "ä»\93åº\93缺ä¹\8få¿\85è¦\81ç\9a\84æ\95°æ\8d®å¯¹è±¡ä»¥è¿\9bè¡\8cä¸\89æ\96¹å\90\88并ã\80\82"
-#: builtin/commit.c:803
-#, c-format
+#: builtin/am.c:1608
+msgid "Using index info to reconstruct a base tree..."
+msgstr "使用索引来重建一个（三方合并的）基础目录树..."
+
+#: builtin/am.c:1627
msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
msgstr ""
-"\n"
-"似乎您正在做一个合并提交。如果不对，请删除文件\n"
-"\t%s\n"
-"然后重试。\n"
+"您是否曾手动编辑过您的补丁？\n"
+"无法应用补丁到索引中的数据对象上。"
-#: builtin/commit.c:808
-#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
-msgstr ""
-"\n"
-"似乎您正在做一个拣选提交。如果不对，请删除文件\n"
-"\t%s\n"
-"然后重试。\n"
+#: builtin/am.c:1633
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/commit.c:821
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
-"说明将会终止提交。\n"
+#: builtin/am.c:1658
+msgid "Failed to merge in the changes."
+msgstr "无法合并变更。"
-#: builtin/commit.c:828
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您原意\n"
-"也可以删除它们。一个空的提交说明将会终止提交。\n"
+#: builtin/am.c:1682 builtin/merge.c:631
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree 无法写入一树对象"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:848
-#, c-format
-msgid "%sAuthor: %.*s <%.*s>"
-msgstr "%s作者： %.*s <%.*s>"
+#: builtin/am.c:1689
+msgid "applying to an empty history"
+msgstr "正应用到一个空历史上"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:856
-#, c-format
-msgid "%sDate: %s"
-msgstr "%s日期： %s"
+#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/merge.c:827
+msgid "failed to write commit object"
+msgstr "无法写提交对象"
-# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:863
+#: builtin/am.c:1735 builtin/am.c:1739
#, c-format
-msgid "%sCommitter: %.*s <%.*s>"
-msgstr "%s提交者：%.*s <%.*s>"
+msgid "cannot resume: %s does not exist."
+msgstr "无法继续：%s 不存在。"
-#: builtin/commit.c:881
-msgid "Cannot read index"
-msgstr "æ\97 æ³\95读å\8f\96ç´¢å¼\95"
+#: builtin/am.c:1755
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr "æ \87å\87\86è¾\93å\85¥æ²¡æ\9c\89å\92\8cç»\88端å\85³è\81\94ï¼\8cä¸\8dè\83½è¿\9bè¡\8c交äº\92å¼\8fæ\93\8dä½\9cã\80\82"
-#: builtin/commit.c:938
-msgid "Error building trees"
-msgstr "无法创建树对象"
+#: builtin/am.c:1760
+msgid "Commit Body is:"
+msgstr "提交内容为："
+
+# 译者：注意保持句尾空格
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#.
+#: builtin/am.c:1770
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
-#: builtin/commit.c:953 builtin/tag.c:495
+#: builtin/am.c:1820
#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
-msgstr "请使ç\94¨ -m æ\88\96 -F é\80\89项æ\8f\90ä¾\9bæ\8f\90交说æ\98\8eã\80\82\n"
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "è\84\8fç´¢å¼\95ï¼\9aä¸\8dè\83½åº\94ç\94¨è¡¥ä¸\81ï¼\88è\84\8fæ\96\87件ï¼\9a%sï¼\89"
-#: builtin/commit.c:1055
+#: builtin/am.c:1860 builtin/am.c:1932
#, c-format
-msgid "--author '%s' is not 'Name <email>' and matches no existing author"
-msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"
+msgid "Applying: %.*s"
+msgstr "应用：%.*s"
+
+#: builtin/am.c:1876
+msgid "No changes -- Patch already applied."
+msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/am.c:1884
#, c-format
-msgid "Invalid untracked files mode '%s'"
-msgstr "æ\97 æ\95\88ç\9a\84æ\9cªè¿½è¸ªæ\96\87件å\8f\82æ\95° '%s'"
+msgid "Patch failed at %s %.*s"
+msgstr "æ\89\93è¡¥ä¸\81失败äº\8e %s %.*s"
-#: builtin/commit.c:1107
-msgid "--long and -z are incompatible"
-msgstr "--long 和 -z 选项不兼容"
+#: builtin/am.c:1890
+#, c-format
+msgid "The copy of the patch that failed is found in: %s"
+msgstr "失败的补丁文件副本位于：%s"
-#: builtin/commit.c:1137
-msgid "Using both --reset-author and --author does not make sense"
-msgstr "同时使用 --reset-author 和 --author 没有意义"
+#: builtin/am.c:1935
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
+msgstr ""
+"没有变更 —— 您是不是忘了执行 'git add'？\n"
+"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
+"您也许想要跳过这个补丁。"
-#: builtin/commit.c:1146
-msgid "You have nothing to amend."
-msgstr "您没有可修补的提交。"
+#: builtin/am.c:1942
+msgid ""
+"You still have unmerged paths in your index.\n"
+"Did you forget to use 'git add'?"
+msgstr ""
+"您的索引中仍有未合并的路径。\n"
+"您是否忘了执行 'git add'？"
-#: builtin/commit.c:1149
-msgid "You are in the middle of a merge -- cannot amend."
-msgstr "您正处于一个合并过程中 -- 无法修补提交。"
+#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
+#: builtin/reset.c:316
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "不能解析对象 '%s'。"
-#: builtin/commit.c:1151
-msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr "æ\82¨æ£å¤\84äº\8eä¸\80个æ\8b£é\80\89è¿\87ç¨\8bä¸ -- æ\97 æ³\95修补æ\8f\90交ã\80\82"
+#: builtin/am.c:2102
+msgid "failed to clean index"
+msgstr "æ\97 æ³\95æ¸\85空索å¼\95"
-#: builtin/commit.c:1154
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "选项 --squash 和 --fixup 不能同时使用"
+#: builtin/am.c:2136
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
-#: builtin/commit.c:1164
-msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
+#: builtin/am.c:2199
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "无效的 --patch-format 值：%s"
-#: builtin/commit.c:1166
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
-msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
+#: builtin/am.c:2232
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/commit.c:1174
-msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
+#: builtin/am.c:2233
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/commit.c:1191
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
+#: builtin/am.c:2239
+msgid "run interactively"
+msgstr "以交互式方式运行"
-#: builtin/commit.c:1193
-msgid "No paths with --include/--only does not make sense."
-msgstr "参数 --include/--only 不跟路径没有意义。"
+#: builtin/am.c:2241
+msgid "historical option -- no-op"
+msgstr "老的参数 —— 无作用"
-#: builtin/commit.c:1195
-msgid "Clever... amending the last one with dirty index."
-msgstr "聪明... 在索引不干净下修补最后的提交。"
+#: builtin/am.c:2243
+msgid "allow fall back on 3way merging if needed"
+msgstr "如果必要，允许使用三方合并。"
-#: builtin/commit.c:1197
-msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."
+#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/repack.c:178
+msgid "be quiet"
+msgstr "静默模式"
+
+#: builtin/am.c:2246
+msgid "add a Signed-off-by line to the commit message"
+msgstr "在提交说明中添加一个 Signed-off-by 签名"
+
+#: builtin/am.c:2249
+msgid "recode into utf8 (default)"
+msgstr "使用 utf8 字符集（默认）"
+
+#: builtin/am.c:2251
+msgid "pass -k flag to git-mailinfo"
+msgstr "向 git-mailinfo 传递 -k 参数"
+
+#: builtin/am.c:2253
+msgid "pass -b flag to git-mailinfo"
+msgstr "向 git-mailinfo 传递 -b 参数"
+
+#: builtin/am.c:2255
+msgid "pass -m flag to git-mailinfo"
+msgstr "向 git-mailinfo 传递 -m 参数"
+
+#: builtin/am.c:2257
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
+
+#: builtin/am.c:2260
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
+
+#: builtin/am.c:2263
+msgid "strip everything before a scissors line"
+msgstr "丢弃裁切线前的所有内容"
+
+#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274
+#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286
+#: builtin/am.c:2292
+msgid "pass it through git-apply"
+msgstr "传递给 git-apply"
+
+#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
+#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
+#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+msgid "n"
+msgstr "n"
-#: builtin/commit.c:1209 builtin/tag.c:728
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "æ\97 æ\95\88ç\9a\84æ¸\85ç\90\86模å¼\8f %s"
+#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37
+#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38
+msgid "format"
+msgstr "æ ¼å¼\8f"
-#: builtin/commit.c:1214
-msgid "Paths with -a does not make sense."
-msgstr "è·¯å¾\84å\92\8c -a é\80\89项å\90\8cæ\97¶ä½¿ç\94¨æ²¡æ\9c\89æ\84\8fä¹\89ã\80\82"
+#: builtin/am.c:2289
+msgid "format the patch(es) are in"
+msgstr "è¡¥ä¸\81ç\9a\84æ ¼å¼\8f"
-#: builtin/commit.c:1324 builtin/commit.c:1603
-msgid "show status concisely"
-msgstr "以简洁的格式显示状态"
+#: builtin/am.c:2295
+msgid "override error message when patch failure occurs"
+msgstr "打补丁失败时显示的错误信息"
-#: builtin/commit.c:1326 builtin/commit.c:1605
-msgid "show branch information"
-msgstr "显示分支信息"
+#: builtin/am.c:2297
+msgid "continue applying patches after resolving a conflict"
+msgstr "冲突解决后继续应用补丁"
-#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509
-msgid "machine-readable output"
-msgstr "机器可读的输出"
+#: builtin/am.c:2300
+msgid "synonyms for --continue"
+msgstr "和 --continue 同义"
-#: builtin/commit.c:1331 builtin/commit.c:1609
-msgid "show status in long format (default)"
-msgstr "以长格式显示状态（默认）"
+#: builtin/am.c:2303
+msgid "skip the current patch"
+msgstr "跳过当前补丁"
-#: builtin/commit.c:1334 builtin/commit.c:1612
-msgid "terminate entries with NUL"
-msgstr "æ\9d¡ç\9b®ä»¥NULå\97符ç»\93å°¾"
+#: builtin/am.c:2306
+msgid "restore the original branch and abort the patching operation."
+msgstr "æ\81¢å¤\8då\8e\9få§\8bå\88\86æ\94¯å¹¶ç»\88æ¢æ\89\93è¡¥ä¸\81æ\93\8dä½\9cã\80\82"
-#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980
-#: builtin/fast-export.c:983 builtin/tag.c:603
-msgid "mode"
-msgstr "模式"
+#: builtin/am.c:2310
+msgid "lie about committer date"
+msgstr "将作者日期作为提交日期"
-#: builtin/commit.c:1337 builtin/commit.c:1615
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
-msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
+#: builtin/am.c:2312
+msgid "use current timestamp for author date"
+msgstr "用当前时间作为作者日期"
-#: builtin/commit.c:1340
-msgid "show ignored files"
-msgstr "显示忽略的文件"
+#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
+#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
+msgid "key-id"
+msgstr "key-id"
-#: builtin/commit.c:1341 parse-options.h:152
-msgid "when"
-msgstr "何时"
+#: builtin/am.c:2315
+msgid "GPG-sign commits"
+msgstr "使用 GPG 签名提交"
+
+#: builtin/am.c:2318
+msgid "(internal use for git-rebase)"
+msgstr "（内部使用，用于 git-rebase）"
-#: builtin/commit.c:1342
+#: builtin/am.c:2333
msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
+"The -b/--binary option has been a no-op for long time, and\n"
+"it will be removed. Please do not use it anymore."
msgstr ""
-"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
+"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
+"请不要再使用它了。"
-#: builtin/commit.c:1344
-msgid "list untracked files in columns"
-msgstr "以列的方式显示未跟踪的文件"
+#: builtin/am.c:2340
+msgid "failed to read the index"
+msgstr "无法读取索引"
-#: builtin/commit.c:1430
-msgid "couldn't look up newly created commit"
-msgstr "无法找到新创建的提交"
+#: builtin/am.c:2355
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
-#: builtin/commit.c:1432
-msgid "could not parse newly created commit"
-msgstr "不能解析新创建的提交"
+#: builtin/am.c:2379
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"发现了错误的 %s 目录。\n"
+"使用 \"git am --abort\" 删除它。"
-#: builtin/commit.c:1477
-msgid "detached HEAD"
-msgstr "分离头指针"
+#: builtin/am.c:2385
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "解决操作未进行，我们不会继续。"
-# 译者：中文字符串拼接，可删除前导空格
-#: builtin/commit.c:1480
-msgid " (root-commit)"
-msgstr "（根提交）"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<选项>] [<补丁>...]"
-#: builtin/commit.c:1573
-msgid "suppress summary after successful commit"
-msgstr "提交成功后不显示概述信息"
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr "不能创建归档文件 '%s'"
-#: builtin/commit.c:1574
-msgid "show diff in commit message template"
-msgstr "在提交说明模板里显示差异"
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr "不能重定向输出"
-#: builtin/commit.c:1576
-msgid "Commit message options"
-msgstr "提交说明选项"
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr "git archive：未提供远程 URL"
-#: builtin/commit.c:1577 builtin/tag.c:601
-msgid "read message from file"
-msgstr "从文件中读取提交说明"
+#: builtin/archive.c:58
+msgid "git archive: expected ACK/NAK, got EOF"
+msgstr "git archive：应为 ACK/NACK，却得到 EOF"
-#: builtin/commit.c:1578
-msgid "author"
-msgstr "作者"
+#: builtin/archive.c:61
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive：NACK %s"
-#: builtin/commit.c:1578
-msgid "override author for commit"
-msgstr "提交时覆盖作者"
+#: builtin/archive.c:64
+msgid "git archive: protocol error"
+msgstr "git archive：协议错误"
-#: builtin/commit.c:1579 builtin/gc.c:280
-msgid "date"
-msgstr "日期"
+#: builtin/archive.c:68
+msgid "git archive: expected a flush"
+msgstr "git archive：应有一个 flush 刷新"
-#: builtin/commit.c:1579
-msgid "override date for commit"
-msgstr "提交时覆盖日期"
+#: builtin/bisect--helper.c:7
+msgid "git bisect--helper --next-all [--no-checkout]"
+msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391
-#: builtin/notes.c:554 builtin/tag.c:599
-msgid "message"
-msgstr "说明"
+#: builtin/bisect--helper.c:17
+msgid "perform 'git bisect next'"
+msgstr "执行 'git bisect next'"
-#: builtin/commit.c:1580
-msgid "commit message"
-msgstr "æ\8f\90交说æ\98\8e"
+#: builtin/bisect--helper.c:19
+msgid "update BISECT_HEAD instead of checking out the current commit"
+msgstr "æ\9b´æ\96° BISECT_HEAD è\80\8cé\9d\9eæ£\80å\87ºå½\93å\89\8dæ\8f\90交"
-#: builtin/commit.c:1581
-msgid "reuse and edit message from specified commit"
-msgstr "重用并编辑指定提交的提交说明"
+#: builtin/blame.c:33
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
-#: builtin/commit.c:1582
-msgid "reuse message from specified commit"
-msgstr "重用指定提交的提交说明"
+#: builtin/blame.c:38
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
-#: builtin/commit.c:1583
-msgid "use autosquash formatted message to fixup specified commit"
-msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
+#: builtin/blame.c:1777
+msgid "Blaming lines"
+msgstr "追踪代码行"
-#: builtin/commit.c:1584
-msgid "use autosquash formatted message to squash specified commit"
-msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
+#: builtin/blame.c:2573
+msgid "Show blame entries as we find them, incrementally"
+msgstr "增量式地显示发现的 blame 条目"
-#: builtin/commit.c:1585
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
-msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
+#: builtin/blame.c:2574
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
+msgstr "边界提交显示空的 SHA-1（默认：关闭）"
-#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86
-msgid "add Signed-off-by:"
-msgstr "添加 Signed-off-by: 签名"
+#: builtin/blame.c:2575
+msgid "Do not treat root commits as boundaries (Default: off)"
+msgstr "不把根提交作为边界（默认：关闭）"
-#: builtin/commit.c:1587
-msgid "use specified template file"
-msgstr "使用指定的模板文件"
+#: builtin/blame.c:2576
+msgid "Show work cost statistics"
+msgstr "显示命令消耗统计"
-#: builtin/commit.c:1588
-msgid "force edit of commit"
-msgstr "强制编辑提交"
+#: builtin/blame.c:2577
+msgid "Force progress reporting"
+msgstr "强制进度显示"
-# 译者：可选值，不能翻译（或是原文中笔误，应为 mode）
-#: builtin/commit.c:1589
-msgid "default"
-msgstr "default"
+#: builtin/blame.c:2578
+msgid "Show output score for blame entries"
+msgstr "显示判断 blame 条目位移的得分诊断信息"
-#: builtin/commit.c:1589 builtin/tag.c:604
-msgid "how to strip spaces and #comments from message"
-msgstr "设置如何删除提交说明里的空格和#注释"
+#: builtin/blame.c:2579
+msgid "Show original filename (Default: auto)"
+msgstr "显示原始文件名（默认：自动）"
-#: builtin/commit.c:1590
-msgid "include status in commit message template"
-msgstr "在提交说明模板里包含状态信息"
+#: builtin/blame.c:2580
+msgid "Show original linenumber (Default: off)"
+msgstr "显示原始的行号（默认：关闭）"
-#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92
-#: builtin/tag.c:605
-msgid "key-id"
-msgstr "key-id"
+#: builtin/blame.c:2581
+msgid "Show in a format designed for machine consumption"
+msgstr "显示为一个适合机器读取的格式"
-#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93
-msgid "GPG sign commit"
-msgstr "GPG 提交签名"
+#: builtin/blame.c:2582
+msgid "Show porcelain format with per-line commit information"
+msgstr "为每一行显示机器适用的提交信息"
-#: builtin/commit.c:1595
-msgid "Commit contents options"
-msgstr "提交内容选项"
+#: builtin/blame.c:2583
+msgid "Use the same output mode as git-annotate (Default: off)"
+msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
-#: builtin/commit.c:1596
-msgid "commit all changed files"
-msgstr "æ\8f\90交æ\89\80æ\9c\89æ\94¹å\8a¨ç\9a\84æ\96\87件"
+#: builtin/blame.c:2584
+msgid "Show raw timestamp (Default: off)"
+msgstr "æ\98¾ç¤ºå\8e\9få§\8bæ\97¶é\97´æ\88³ï¼\88é»\98认ï¼\9aå\85³é\97ï¼\89"
-#: builtin/commit.c:1597
-msgid "add specified files to index for commit"
-msgstr "æ·»å\8a æ\8c\87å®\9aç\9a\84æ\96\87件å\88°ç´¢å¼\95å\8cºç\89å¾\85æ\8f\90交"
+#: builtin/blame.c:2585
+msgid "Show long commit SHA1 (Default: off)"
+msgstr "æ\98¾ç¤ºé\95¿ç\9a\84 SHA1 æ\8f\90交å\8f·ï¼\88é»\98认ï¼\9aå\85³é\97ï¼\89"
-#: builtin/commit.c:1598
-msgid "interactively add files"
-msgstr "交互式添加文件"
+#: builtin/blame.c:2586
+msgid "Suppress author name and timestamp (Default: off)"
+msgstr "隐藏作者名字和时间戳（默认：关闭）"
-#: builtin/commit.c:1599
-msgid "interactively add changes"
-msgstr "交互式添加变更"
+#: builtin/blame.c:2587
+msgid "Show author email instead of name (Default: off)"
+msgstr "显示作者的邮箱而不是名字（默认：关闭）"
-#: builtin/commit.c:1600
-msgid "commit only specified files"
-msgstr "å\8fªæ\8f\90交æ\8c\87å®\9aç\9a\84æ\96\87件"
+#: builtin/blame.c:2588
+msgid "Ignore whitespace differences"
+msgstr "忽ç\95¥ç©ºç\99½å·®å¼\82"
-#: builtin/commit.c:1601
-msgid "bypass pre-commit hook"
-msgstr "绕过 pre-commit 钩子"
+#: builtin/blame.c:2595
+msgid "Use an experimental heuristic to improve diffs"
+msgstr "使用一个试验性的启发式算法改进差异显示"
-#: builtin/commit.c:1602
-msgid "show what would be committed"
-msgstr "显示将要提交的内容"
+#: builtin/blame.c:2597
+msgid "Spend extra cycles to find better match"
+msgstr "花费额外的循环来找到更好的匹配"
-#: builtin/commit.c:1613
-msgid "amend previous commit"
-msgstr "ä¿®æ\94¹å\85\88å\89\8dç\9a\84æ\8f\90交"
+#: builtin/blame.c:2598
+msgid "Use revisions from <file> instead of calling git-rev-list"
+msgstr "使ç\94¨æ\9d¥è\87ª <æ\96\87件> ç\9a\84修订é\9b\86è\80\8cä¸\8dæ\98¯è°\83ç\94¨ git-rev-list"
-#: builtin/commit.c:1614
-msgid "bypass post-rewrite hook"
-msgstr "绕过 post-rewrite 钩子"
+#: builtin/blame.c:2599
+msgid "Use <file>'s contents as the final image"
+msgstr "使用 <文件> 的内容作为最终的图片"
-#: builtin/commit.c:1619
-msgid "ok to record an empty change"
-msgstr "å\85\81许ä¸\80个空æ\8f\90交"
+#: builtin/blame.c:2600 builtin/blame.c:2601
+msgid "score"
+msgstr "å¾\97å\88\86"
-#: builtin/commit.c:1621
-msgid "ok to record a change with an empty message"
-msgstr "允许空的提交说明"
+#: builtin/blame.c:2600
+msgid "Find line copies within and across files"
+msgstr "找到文件内及跨文件的行拷贝"
-#: builtin/commit.c:1650
-msgid "could not parse HEAD commit"
-msgstr "不能解析 HEAD 提交"
+#: builtin/blame.c:2601
+msgid "Find line movements within and across files"
+msgstr "找到文件内及跨文件的行移动"
-#: builtin/commit.c:1689 builtin/merge.c:1076
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "不能为读入打开 '%s'"
+#: builtin/blame.c:2602
+msgid "n,m"
+msgstr "n,m"
-#: builtin/commit.c:1696
-#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
-msgstr "损坏的 MERGE_HEAD 文件（%s）"
+#: builtin/blame.c:2602
+msgid "Process only line range n,m, counting from 1"
+msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
-#: builtin/commit.c:1703
-msgid "could not read MERGE_MODE"
-msgstr "不能读取 MERGE_MODE"
+#: builtin/blame.c:2649
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
-#: builtin/commit.c:1722
-#, c-format
-msgid "could not read commit message: %s"
-msgstr "不能读取提交说明：%s"
+#. TRANSLATORS: This string is used to tell us the maximum
+#. display width for a relative timestamp in "git blame"
+#. output. For C locale, "4 years, 11 months ago", which
+#. takes 22 places, is the longest among various forms of
+#. relative timestamps, but your language may need more or
+#. fewer display columns.
+#: builtin/blame.c:2697
+msgid "4 years, 11 months ago"
+msgstr "4 年 11 个月前"
-#: builtin/commit.c:1733
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "终止提交；您未更改来自模版的提交说明。\n"
+#: builtin/blame.c:2777
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents 和 --reverse 不能混用。"
-#: builtin/commit.c:1738
-#, c-format
-msgid "Aborting commit due to empty commit message.\n"
-msgstr "终止提交因为提交说明为空。\n"
+#: builtin/blame.c:2797
+msgid "cannot use --contents with final commit object name"
+msgstr "不能将 --contents 和最终的提交对象名共用"
-#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854
-msgid "failed to write commit object"
-msgstr "无法写提交对象"
+#: builtin/blame.c:2802
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: builtin/commit.c:1786
+#: builtin/blame.c:2829
msgid ""
-"Repository has been updated, but unable to write\n"
-"new_index file. Check that disk is not full and quota is\n"
-"not exceeded, and then \"git reset HEAD\" to recover."
-msgstr ""
-"版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
-"或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
-
-#: builtin/config.c:8
-msgid "git config [<options>]"
-msgstr "git config [<选项>]"
+"--reverse --first-parent together require range along first-parent chain"
+msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
-#: builtin/config.c:53
-msgid "Config file location"
-msgstr "配置文件位置"
+#: builtin/blame.c:2840
+#, c-format
+msgid "no such path %s in %s"
+msgstr "在 %2$s 中无此路径 %1$s"
-#: builtin/config.c:54
-msgid "use global config file"
-msgstr "使用全局配置文件"
+#: builtin/blame.c:2851
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "不能为路径 %2$s 读取数据对象 %1$s"
-#: builtin/config.c:55
-msgid "use system config file"
-msgstr "使用系统级配置文件"
+#: builtin/blame.c:2870
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] "文件 %s 只有 %lu 行"
+msgstr[1] "文件 %s 只有 %lu 行"
-#: builtin/config.c:56
-msgid "use repository config file"
-msgstr "使用版本库级配置文件"
+#: builtin/branch.c:26
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
-#: builtin/config.c:57
-msgid "use given config file"
-msgstr "使用指定的配置文件"
+#: builtin/branch.c:27
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
-#: builtin/config.c:58
-msgid "blob-id"
-msgstr "数据对象ID"
+#: builtin/branch.c:28
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
-#: builtin/config.c:58
-msgid "read config from given blob object"
-msgstr "从给定的数据对象读取配置"
+#: builtin/branch.c:29
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
-#: builtin/config.c:59
-msgid "Action"
-msgstr "操作"
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<选项>] [-r | -a] [--points-at]"
-#: builtin/config.c:60
-msgid "get value: name [value-regex]"
-msgstr "获取值：name [value-regex]"
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<选项>] [-r | -a] [--format]"
-#: builtin/config.c:61
-msgid "get all values: key [value-regex]"
-msgstr "获得所有的值：key [value-regex]"
+# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
+#: builtin/branch.c:144
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
+msgstr ""
+"将要删除的分支 '%s' 已经被合并到\n"
+" '%s'，但未合并到 HEAD。"
-#: builtin/config.c:62
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "根据正则表达式获得值：name-regex [value-regex]"
+# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
+#: builtin/branch.c:148
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
+msgstr ""
+"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
+" 然而却尚未被合并到分支 '%s' 。"
-#: builtin/config.c:63
-msgid "get value specific for the URL: section[.var] URL"
-msgstr "获得 URL 取值：section[.var] URL"
+#: builtin/branch.c:162
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "无法查询 '%s' 指向的提交对象"
-#: builtin/config.c:64
-msgid "replace all matching variables: name value [value_regex]"
-msgstr "替换所有匹配的变量：name value [value_regex]"
+#: builtin/branch.c:166
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
+"分支 '%s' 没有完全合并。\n"
+"如果您确认要删除它，执行 'git branch -D %s'。"
-#: builtin/config.c:65
-msgid "add a new variable: name value"
-msgstr "æ·»å\8a ä¸\80个æ\96°ç\9a\84å\8f\98é\87\8fï¼\9aname value"
+#: builtin/branch.c:179
+msgid "Update of config-file failed"
+msgstr "æ\97 æ³\95æ\9b´æ\96° config æ\96\87件"
-#: builtin/config.c:66
-msgid "remove a variable: name [value-regex]"
-msgstr "删除一个变量：name [value-regex]"
+#: builtin/branch.c:210
+msgid "cannot use -a with -d"
+msgstr "不能将 -a 和 -d 同时使用"
-#: builtin/config.c:67
-msgid "remove all matches: name [value-regex]"
-msgstr "删除所有匹配项：name [value-regex]"
+#: builtin/branch.c:216
+msgid "Couldn't look up commit object for HEAD"
+msgstr "无法查询 HEAD 指向的提交对象"
-#: builtin/config.c:68
-msgid "rename section: old-name new-name"
-msgstr "重命名小节：old-name new-name"
+#: builtin/branch.c:230
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
-#: builtin/config.c:69
-msgid "remove a section: name"
-msgstr "删除一个小节：name"
+#: builtin/branch.c:245
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr "未能找到远程跟踪分支 '%s'。"
-#: builtin/config.c:70
-msgid "list all"
-msgstr "列出所有"
+#: builtin/branch.c:246
+#, c-format
+msgid "branch '%s' not found."
+msgstr "分支 '%s' 未发现。"
-#: builtin/config.c:71
-msgid "open an editor"
-msgstr "打开一个编辑器"
+#: builtin/branch.c:261
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
+msgstr "无法删除远程跟踪分支 '%s'"
-#: builtin/config.c:72
-msgid "find the color configured: slot [default]"
-msgstr "获得配置的颜色：配置 [默认]"
+#: builtin/branch.c:262
+#, c-format
+msgid "Error deleting branch '%s'"
+msgstr "无法删除分支 '%s'"
-#: builtin/config.c:73
-msgid "find the color setting: slot [stdout-is-tty]"
-msgstr "获得颜色设置：配置 [stdout-is-tty]"
+#: builtin/branch.c:269
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
-#: builtin/config.c:74
-msgid "Type"
-msgstr "类型"
+#: builtin/branch.c:270
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "已删除分支 %s（曾为 %s）。\n"
-#: builtin/config.c:75
-msgid "value is \"true\" or \"false\""
-msgstr "值是 \"true\" 或 \"false\""
+#: builtin/branch.c:441
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "分支 %s 正被变基到 %s"
-#: builtin/config.c:76
-msgid "value is decimal number"
-msgstr "值是十进制数"
+#: builtin/branch.c:445
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "分支 %s 正被二分查找于 %s"
-#: builtin/config.c:77
-msgid "value is --bool or --int"
-msgstr "值是 --bool or --int"
+#: builtin/branch.c:460
+msgid "cannot rename the current branch while not on any."
+msgstr "无法重命名当前分支因为不处于任何分支上。"
-#: builtin/config.c:78
-msgid "value is a path (file or directory name)"
-msgstr "值是一个路径（文件或目录名）"
+#: builtin/branch.c:470
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "无效的分支名：'%s'"
-#: builtin/config.c:79
-msgid "Other"
-msgstr "å\85¶å®\83"
+#: builtin/branch.c:487
+msgid "Branch rename failed"
+msgstr "å\88\86æ\94¯é\87\8då\91½å\90\8d失败"
-#: builtin/config.c:80
-msgid "terminate values with NUL byte"
-msgstr "终止值是NUL字节"
+#: builtin/branch.c:490
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "重命名掉一个错误命名的旧分支 '%s'"
-#: builtin/config.c:81
-msgid "respect include directives on lookup"
-msgstr "查询时参照 include 指令递归查找"
+#: builtin/branch.c:493
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr "分支重命名为 %s，但 HEAD 没有更新！"
-#: builtin/config.c:316
-msgid "unable to parse default color value"
-msgstr "不能解析缺省的颜色值"
+#: builtin/branch.c:502
+msgid "Branch is renamed, but update of config-file failed"
+msgstr "分支被重命名，但更新 config 文件失败"
-#: builtin/config.c:457
+#: builtin/branch.c:518
#, c-format
msgid ""
-"# This is Git's per-user configuration file.\n"
-"[user]\n"
-"# Please adapt and uncomment the following lines:\n"
-"#\tname = %s\n"
-"#\temail = %s\n"
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
msgstr ""
-"# This is Git's per-user configuration file.\n"
-"[user]\n"
-"# Please adapt and uncomment the following lines:\n"
-"#\tname = %s\n"
-"#\temail = %s\n"
+"请编辑分支的描述\n"
+" %s\n"
+"以 '%c' 开头的行将被过滤。\n"
-#: builtin/config.c:587
-#, c-format
-msgid "cannot create configuration file %s"
-msgstr "不能创建配置文件 %s"
+#: builtin/branch.c:551
+msgid "Generic options"
+msgstr "通用选项"
-#: builtin/count-objects.c:55
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
+#: builtin/branch.c:553
+msgid "show hash and subject, give twice for upstream branch"
+msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
-#: builtin/count-objects.c:65
-msgid "print sizes in human readable format"
-msgstr "以ç\94¨æ\88·å\8f¯è¯»ç\9a\84æ ¼å¼\8fæ\98¾ç¤ºå¤§å°\8f"
+#: builtin/branch.c:554
+msgid "suppress informational messages"
+msgstr "ä¸\8dæ\98¾ç¤ºä¿¡æ\81¯"
-#: builtin/describe.c:17
-msgid "git describe [<options>] [<commit-ish>...]"
-msgstr "git describe [<选项>] [<提交号>...]"
+#: builtin/branch.c:555
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "设置跟踪模式（参见 git-pull(1)）"
-#: builtin/describe.c:18
-msgid "git describe [<options>] --dirty"
-msgstr "git describe [<选项>] --dirty"
+#: builtin/branch.c:557
+msgid "change upstream info"
+msgstr "改变上游信息"
-#: builtin/describe.c:217
-#, c-format
-msgid "annotated tag %s not available"
-msgstr "注释 tag %s 无效"
+#: builtin/branch.c:559
+msgid "upstream"
+msgstr "上游"
-#: builtin/describe.c:221
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "注释 tag %s 没有嵌入名称"
+#: builtin/branch.c:559
+msgid "change the upstream info"
+msgstr "改变上游信息"
-#: builtin/describe.c:223
-#, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "tag '%s' 的确是在 '%s'"
+#: builtin/branch.c:560
+msgid "Unset the upstream info"
+msgstr "取消上游信息的设置"
-#: builtin/describe.c:250 builtin/log.c:452
-#, c-format
-msgid "Not a valid object name %s"
-msgstr "不是一个有效的对象名 %s"
+#: builtin/branch.c:561
+msgid "use colored output"
+msgstr "使用彩色输出"
-#: builtin/describe.c:253
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s 不是一个有效的 '%s' 对象"
+#: builtin/branch.c:562
+msgid "act on remote-tracking branches"
+msgstr "作用于远程跟踪分支"
-#: builtin/describe.c:270
-#, c-format
-msgid "no tag exactly matches '%s'"
-msgstr "没有 tag 准确匹配 '%s'"
+#: builtin/branch.c:564 builtin/branch.c:566
+msgid "print only branches that contain the commit"
+msgstr "只打印包含该提交的分支"
-#: builtin/describe.c:272
-#, c-format
-msgid "searching to describe %s\n"
-msgstr "搜索描述 %s\n"
+#: builtin/branch.c:565 builtin/branch.c:567
+msgid "print only branches that don't contain the commit"
+msgstr "只打印不包含该提交的分支"
-#: builtin/describe.c:319
-#, c-format
-msgid "finished search at %s\n"
-msgstr "完成搜索 %s\n"
+#: builtin/branch.c:570
+msgid "Specific git-branch actions:"
+msgstr "具体的 git-branch 动作："
-#: builtin/describe.c:346
-#, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
-msgstr ""
-"没有注释 tag 能描述 '%s'。\n"
-"然而，有非注释 tag：尝试 --tags。"
+#: builtin/branch.c:571
+msgid "list both remote-tracking and local branches"
+msgstr "列出远程跟踪及本地分支"
-#: builtin/describe.c:350
-#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
-msgstr ""
-"没有注释 tag 能描述 '%s'。\n"
-"尝试 --always，或者创建一些 tag。"
+#: builtin/branch.c:573
+msgid "delete fully merged branch"
+msgstr "删除完全合并的分支"
-#: builtin/describe.c:371
-#, c-format
-msgid "traversed %lu commits\n"
-msgstr "已遍历 %lu 个提交\n"
+#: builtin/branch.c:574
+msgid "delete branch (even if not merged)"
+msgstr "删除分支（即使没有合并）"
-#: builtin/describe.c:374
-#, c-format
-msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
-msgstr ""
-"发现多于 %i 个 tag，列出最近的 %i 个\n"
-"在 %s 放弃搜索\n"
+#: builtin/branch.c:575
+msgid "move/rename a branch and its reflog"
+msgstr "移动/重命名一个分支，以及它的引用日志"
-#: builtin/describe.c:396
-msgid "find the tag that comes after the commit"
-msgstr "寻找提交之后的 tag（用于描述提交）"
+#: builtin/branch.c:576
+msgid "move/rename a branch, even if target exists"
+msgstr "移动/重命名一个分支，即使目标已存在"
-#: builtin/describe.c:397
-msgid "debug search strategy on stderr"
-msgstr "å\9c¨æ \87å\87\86é\94\99误ä¸\8aè°\83è¯\95æ\90\9cç´¢ç\96ç\95¥"
+#: builtin/branch.c:577
+msgid "list branch names"
+msgstr "å\88\97å\87ºå\88\86æ\94¯å\90\8d"
-#: builtin/describe.c:398
-msgid "use any ref"
-msgstr "使用任意引用"
+#: builtin/branch.c:578
+msgid "create the branch's reflog"
+msgstr "创建分支的引用日志"
-#: builtin/describe.c:399
-msgid "use any tag, even unannotated"
-msgstr "使用任意 tag，即使未带注解"
+#: builtin/branch.c:580
+msgid "edit the description for the branch"
+msgstr "标记分支的描述"
-#: builtin/describe.c:400
-msgid "always use long format"
-msgstr "å§\8bç»\88使ç\94¨é\95¿æ\8f\90交å\8f·æ ¼å¼\8f"
+#: builtin/branch.c:581
+msgid "force creation, move/rename, deletion"
+msgstr "强å\88¶å\88\9b建ã\80\81移å\8a¨/é\87\8då\91½å\90\8dã\80\81å\88 é\99¤"
-#: builtin/describe.c:401
-msgid "only follow first parent"
-msgstr "只跟随第一个父提交"
+#: builtin/branch.c:582
+msgid "print only branches that are merged"
+msgstr "只打印已经合并的分支"
-#: builtin/describe.c:404
-msgid "only output exact matches"
-msgstr "只输出精确匹配"
+#: builtin/branch.c:583
+msgid "print only branches that are not merged"
+msgstr "只打印尚未合并的分支"
-#: builtin/describe.c:406
-msgid "consider <n> most recent tags (default: 10)"
-msgstr "考虑最近 <n> 个 tags（默认：10）"
+#: builtin/branch.c:584
+msgid "list branches in columns"
+msgstr "以列的方式显示分支"
-#: builtin/describe.c:408
-msgid "only consider tags matching <pattern>"
-msgstr "只考虑匹配 <模式> 的 tags"
+#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
+msgid "key"
+msgstr "key"
-#: builtin/describe.c:410 builtin/name-rev.c:318
-msgid "show abbreviated commit object as fallback"
-msgstr "æ\98¾ç¤ºç®\80å\86\99ç\9a\84æ\8f\90交å\8f·ä½\9c为å\90\8eå¤\87"
+#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
+msgid "field name to sort on"
+msgstr "æ\8e\92åº\8fç\9a\84å\97段å\90\8d"
-#: builtin/describe.c:411
-msgid "mark"
-msgstr "标记"
+#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
+#: builtin/tag.c:429
+msgid "object"
+msgstr "对象"
-#: builtin/describe.c:412
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
-msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）"
+#: builtin/branch.c:589
+msgid "print only branches of the object"
+msgstr "只打印指向该对象的分支"
-#: builtin/describe.c:430
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long 与 --abbrev=0 不兼容"
+#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
+msgid "sorting and filtering are case insensitive"
+msgstr "排序和过滤属于大小写不敏感"
-#: builtin/describe.c:456
-msgid "No names found, cannot describe anything."
-msgstr "没有发现名称，无法描述任何东西。"
+#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
+#: builtin/verify-tag.c:38
+msgid "format to use for the output"
+msgstr "输出格式"
-#: builtin/describe.c:476
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty 不能与提交同时使用"
+#: builtin/branch.c:611
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "无法将 HEAD 解析为有效引用。"
+
+#: builtin/branch.c:615 builtin/clone.c:724
+msgid "HEAD not found below refs/heads!"
+msgstr "HEAD 没有位于 /refs/heads 之下！"
+
+#: builtin/branch.c:638
+msgid "--column and --verbose are incompatible"
+msgstr "--column 和 --verbose 不兼容"
+
+#: builtin/branch.c:649 builtin/branch.c:701
+msgid "branch name required"
+msgstr "必须提供分支名"
+
+#: builtin/branch.c:677
+msgid "Cannot give description to detached HEAD"
+msgstr "不能向分离头指针提供描述"
+
+#: builtin/branch.c:682
+msgid "cannot edit description of more than one branch"
+msgstr "不能为一个以上的分支编辑描述"
-#: builtin/diff.c:86
+#: builtin/branch.c:689
#, c-format
-msgid "'%s': not a regular file or symlink"
-msgstr "'%s'：不是一个正规文件或符号链接"
+msgid "No commit on branch '%s' yet."
+msgstr "分支 '%s' 尚无提交。"
-#: builtin/diff.c:237
+#: builtin/branch.c:692
#, c-format
-msgid "invalid option: %s"
-msgstr "æ\97 æ\95\88é\80\89项ï¼\9a%s"
+msgid "No branch named '%s'."
+msgstr "没æ\9c\89å\88\86æ\94¯ '%s'ã\80\82"
-#: builtin/diff.c:358
-msgid "Not a git repository"
-msgstr "ä¸\8dæ\98¯ä¸\80个 git ç\89\88æ\9c¬åº\93"
+#: builtin/branch.c:707
+msgid "too many branches for a rename operation"
+msgstr "为é\87\8då\91½å\90\8dæ\93\8dä½\9cæ\8f\90ä¾\9bäº\86太å¤\9aç\9a\84å\88\86æ\94¯å\90\8d"
-#: builtin/diff.c:401
+#: builtin/branch.c:712
+msgid "too many branches to set new upstream"
+msgstr "为设置新上游提供了太多的分支名"
+
+#: builtin/branch.c:716
#, c-format
-msgid "invalid object '%s' given."
-msgstr "提供了无效对象 '%s'。"
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
-#: builtin/diff.c:410
+#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
#, c-format
-msgid "more than two blobs given: '%s'"
-msgstr "æ\8f\90ä¾\9bäº\86è¶\85è¿\87两个æ\95°æ\8d®ï¼\88blobï¼\89对象ï¼\9a'%s'"
+msgid "no such branch '%s'"
+msgstr "没æ\9c\89æ¤å\88\86æ\94¯ '%s'"
-#: builtin/diff.c:417
+#: builtin/branch.c:723
#, c-format
-msgid "unhandled object '%s' given."
-msgstr "无法处理的对象 '%s'。"
+msgid "branch '%s' does not exist"
+msgstr "分支 '%s' 不存在"
-#: builtin/fast-export.c:24
-msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [rev-list-opts]"
+#: builtin/branch.c:735
+msgid "too many branches to unset upstream"
+msgstr "为取消上游设置操作提供了太多的分支名"
-#: builtin/fast-export.c:979
-msgid "show progress after <n> objects"
-msgstr "在 <n> 个对象之后显示进度"
+#: builtin/branch.c:739
+msgid "could not unset upstream of HEAD when it does not point to any branch."
+msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
-#: builtin/fast-export.c:981
-msgid "select handling of signed tags"
-msgstr "选择如何处理签名 tags"
+#: builtin/branch.c:745
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "分支 '%s' 没有上游信息"
-#: builtin/fast-export.c:984
-msgid "select handling of tags that tag filtered objects"
-msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
+#: builtin/branch.c:759
+msgid "it does not make sense to create 'HEAD' manually"
+msgstr "手工创建 'HEAD' 没有意义"
-#: builtin/fast-export.c:987
-msgid "Dump marks to this file"
-msgstr "把标记存储到这个文件"
+#: builtin/branch.c:765
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
-#: builtin/fast-export.c:989
-msgid "Import marks from this file"
-msgstr "从这个文件导入标记"
+#: builtin/branch.c:768
+#, c-format
+msgid ""
+"The --set-upstream flag is deprecated and will be removed. Consider using --"
+"track or --set-upstream-to\n"
+msgstr ""
+"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
-#: builtin/fast-export.c:991
-msgid "Fake a tagger when tags lack one"
-msgstr "当 tags 缺少标记者字段时，假装提供一个"
+#: builtin/branch.c:785
+#, c-format
+msgid ""
+"\n"
+"If you wanted to make '%s' track '%s', do this:\n"
+"\n"
+msgstr ""
+"\n"
+"如果你想用 '%s' 跟踪 '%s', 这么做：\n"
+"\n"
-#: builtin/fast-export.c:993
-msgid "Output full tree for each commit"
-msgstr "每次提交都输出整个树"
+#: builtin/bundle.c:45
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s 可以\n"
-#: builtin/fast-export.c:995
-msgid "Use the done feature to terminate the stream"
-msgstr "使用 done 功能来终止流"
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
+msgstr "需要一个仓库来创建包。"
-#: builtin/fast-export.c:996
-msgid "Skip output of blob data"
-msgstr "跳过数据对象的输出"
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
+msgstr "需要一个仓库来解包。"
-#: builtin/fast-export.c:997
-msgid "refspec"
-msgstr "引用表达式"
+#: builtin/cat-file.c:513
+msgid ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+msgstr ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
-#: builtin/fast-export.c:998
-msgid "Apply refspec to exported refs"
-msgstr "对导出的引用应用引用表达式"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
-#: builtin/fast-export.c:999
-msgid "anonymize output"
-msgstr "匿名输出"
+#: builtin/cat-file.c:551
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
-#: builtin/fetch.c:19
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
+#: builtin/cat-file.c:552
+msgid "show object type"
+msgstr "显示对象类型"
-#: builtin/fetch.c:20
-msgid "git fetch [<options>] <group>"
-msgstr "git fetch [<选项>] <组>"
+#: builtin/cat-file.c:553
+msgid "show object size"
+msgstr "显示对象大小"
-#: builtin/fetch.c:21
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
-msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
+#: builtin/cat-file.c:555
+msgid "exit with zero when there's no error"
+msgstr "当没有错误时退出并返回零"
-#: builtin/fetch.c:22
-msgid "git fetch --all [<options>]"
-msgstr "git fetch --all [<选项>]"
+#: builtin/cat-file.c:556
+msgid "pretty-print object's content"
+msgstr "美观地打印对象的内容"
-#: builtin/fetch.c:89
-msgid "fetch from all remotes"
-msgstr "从所有的远程抓取"
+#: builtin/cat-file.c:558
+msgid "for blob objects, run textconv on object's content"
+msgstr "对于数据对象，对其内容做文本转换"
-#: builtin/fetch.c:91
-msgid "append to .git/FETCH_HEAD instead of overwriting"
-msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
+#: builtin/cat-file.c:560
+msgid "for blob objects, run filters on object's content"
+msgstr "对于数据对象，对其内容做过滤"
-#: builtin/fetch.c:93
-msgid "path to upload pack on remote end"
-msgstr "上传包到远程的路径"
+#: builtin/cat-file.c:561 git-submodule.sh:943
+msgid "blob"
+msgstr "数据对象"
-#: builtin/fetch.c:94
-msgid "force overwrite of local branch"
-msgstr "强å\88¶è¦\86ç\9b\96æ\9c¬å\9c°å\88\86æ\94¯"
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
+msgstr "对äº\8e --textconv/--filters 使ç\94¨ä¸\80个ç\89¹å®\9aç\9a\84è·¯å¾\84"
-#: builtin/fetch.c:96
-msgid "fetch from multiple remotes"
-msgstr "从多个远程抓取"
+#: builtin/cat-file.c:564
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr "允许 -s 和 -t 对损坏的对象生效"
-#: builtin/fetch.c:98
-msgid "fetch all tags and associated objects"
-msgstr "抓取所有的 tags 和关联对象"
+#: builtin/cat-file.c:565
+msgid "buffer --batch output"
+msgstr "缓冲 --batch 的输出"
-#: builtin/fetch.c:100
-msgid "do not fetch all tags (--no-tags)"
-msgstr "不抓取任何 tags (--no-tags)"
+#: builtin/cat-file.c:567
+msgid "show info and content of objects fed from the standard input"
+msgstr "显示从标准输入提供的对象的信息和内容"
-#: builtin/fetch.c:102
-msgid "prune remote-tracking branches no longer on remote"
-msgstr "æ¸\85é\99¤è¿\9cç¨\8bå·²ç»\8fä¸\8då\98å\9c¨ç\9a\84å\88\86æ\94¯ç\9a\84è·\9f踪å\88\86æ\94¯"
+#: builtin/cat-file.c:570
+msgid "show info about objects fed from the standard input"
+msgstr "æ\98¾ç¤ºä»\8eæ \87å\87\86è¾\93å\85¥æ\8f\90ä¾\9bç\9a\84对象ç\9a\84ä¿¡æ\81¯"
-# 译者：可选值，不能翻译
-#: builtin/fetch.c:103
-msgid "on-demand"
-msgstr "on-demand"
+#: builtin/cat-file.c:573
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
-#: builtin/fetch.c:104
-msgid "control recursive fetching of submodules"
-msgstr "控制子模组的递归抓取"
+#: builtin/cat-file.c:575
+msgid "show all objects with --batch or --batch-check"
+msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
-#: builtin/fetch.c:108
-msgid "keep downloaded pack"
-msgstr "保持下载包"
+#: builtin/check-attr.c:11
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
-#: builtin/fetch.c:110
-msgid "allow updating of HEAD ref"
-msgstr "允许更新 HEAD 引用"
+#: builtin/check-attr.c:12
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
-#: builtin/fetch.c:113
-msgid "deepen history of shallow clone"
-msgstr "æ·±å\8c\96æµ\85å\85\8bé\9a\86ç\9a\84å\8e\86å\8f²"
+#: builtin/check-attr.c:19
+msgid "report all attributes set on file"
+msgstr "æ\8a¥å\91\8a设置å\9c¨æ\96\87件ä¸\8aç\9a\84æ\89\80æ\9c\89å±\9eæ\80§"
-#: builtin/fetch.c:115
-msgid "convert to a complete repository"
-msgstr "转换为一个完整的版本库"
+#: builtin/check-attr.c:20
+msgid "use .gitattributes only from the index"
+msgstr "只使用索引中的 .gitattributes"
-#: builtin/fetch.c:117 builtin/log.c:1208
-msgid "dir"
-msgstr "目录"
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
+msgid "read file names from stdin"
+msgstr "从标准输入读出文件名"
-#: builtin/fetch.c:118
-msgid "prepend this to submodule path output"
-msgstr "在子模组路径输出的前面加上此目录"
+#: builtin/check-attr.c:23 builtin/check-ignore.c:24
+msgid "terminate input and output records by a NUL character"
+msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/fetch.c:121
-msgid "default mode for recursion"
-msgstr "递归的默认模式"
+#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
+msgid "suppress progress reporting"
+msgstr "不显示进度报告"
-#: builtin/fetch.c:123
-msgid "accept refs that update .git/shallow"
-msgstr "æ\8e¥å\8f\97æ\9b´æ\96° .git/shallow ç\9a\84å¼\95ç\94¨"
+#: builtin/check-ignore.c:26
+msgid "show non-matching input paths"
+msgstr "æ\98¾ç¤ºæ\9cªå\8c¹é\85\8dç\9a\84è¾\93å\85¥è·¯å¾\84"
-#: builtin/fetch.c:124
-msgid "refmap"
-msgstr "引用映射"
+#: builtin/check-ignore.c:28
+msgid "ignore index when checking"
+msgstr "检查时忽略索引"
-#: builtin/fetch.c:125
-msgid "specify fetch refmap"
-msgstr "指定获取操作的引用映射"
+#: builtin/check-ignore.c:154
+msgid "cannot specify pathnames with --stdin"
+msgstr "不能同时指定路径及 --stdin 参数"
-#: builtin/fetch.c:377
-msgid "Couldn't find remote ref HEAD"
-msgstr "无法发现远程 HEAD 引用"
+#: builtin/check-ignore.c:157
+msgid "-z only makes sense with --stdin"
+msgstr "-z 需要和 --stdin 参数共用才有意义"
-#: builtin/fetch.c:457
-#, c-format
-msgid "object %s not found"
-msgstr "对象 %s 未发现"
+#: builtin/check-ignore.c:159
+msgid "no path specified"
+msgstr "未指定路径"
-#: builtin/fetch.c:462
-msgid "[up to date]"
-msgstr "[最新]"
+#: builtin/check-ignore.c:163
+msgid "--quiet is only valid with a single pathname"
+msgstr "参数 --quiet 只在提供一个路径名时有效"
+
+#: builtin/check-ignore.c:165
+msgid "cannot have both --quiet and --verbose"
+msgstr "不能同时提供 --quiet 和 --verbose 参数"
+
+#: builtin/check-ignore.c:168
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching 选项只在使用 --verbose 时有效"
+
+#: builtin/check-mailmap.c:8
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<选项>] <联系地址>..."
+
+#: builtin/check-mailmap.c:13
+msgid "also read contacts from stdin"
+msgstr "还从标准输入读取联系地址"
-#: builtin/fetch.c:476
+#: builtin/check-mailmap.c:24
#, c-format
-msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
-msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"
+msgid "unable to parse contact: %s"
+msgstr "不能解析联系地址：%s"
-#: builtin/fetch.c:477 builtin/fetch.c:563
-msgid "[rejected]"
-msgstr "[已拒绝]"
+#: builtin/check-mailmap.c:47
+msgid "no contacts specified"
+msgstr "未指定联系地址"
-#: builtin/fetch.c:488
-msgid "[tag update]"
-msgstr "[tag更新]"
+#: builtin/checkout-index.c:127
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<选项>] [--] [<文件>...]"
-# 译者：注意保持前导空格
-#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543
-msgid " (unable to update local ref)"
-msgstr " （不能更新本地引用）"
+#: builtin/checkout-index.c:144
+msgid "stage should be between 1 and 3 or all"
+msgstr "索引值应该取值 1 到 3 或者 all"
-#: builtin/fetch.c:508
-msgid "[new tag]"
-msgstr "[新tag]"
+#: builtin/checkout-index.c:160
+msgid "check out all files in the index"
+msgstr "检出索引区的所有文件"
-#: builtin/fetch.c:511
-msgid "[new branch]"
-msgstr "[新分支]"
+#: builtin/checkout-index.c:161
+msgid "force overwrite of existing files"
+msgstr "强制覆盖现有的文件"
-#: builtin/fetch.c:514
-msgid "[new ref]"
-msgstr "[新引用]"
+#: builtin/checkout-index.c:163
+msgid "no warning for existing files and files not in index"
+msgstr "存在或不在索引中的文件都没有警告"
-#: builtin/fetch.c:559
-msgid "unable to update local ref"
-msgstr "不能更新本地引用"
+#: builtin/checkout-index.c:165
+msgid "don't checkout new files"
+msgstr "不检出新文件"
-#: builtin/fetch.c:559
-msgid "forced update"
-msgstr "强制更新"
+#: builtin/checkout-index.c:167
+msgid "update stat information in the index file"
+msgstr "更新索引中文件的状态信息"
-#: builtin/fetch.c:565
-msgid "(non-fast-forward)"
-msgstr "（非快进式）"
+#: builtin/checkout-index.c:171
+msgid "read list of paths from the standard input"
+msgstr "从标准输入读取路径列表"
-#: builtin/fetch.c:599 builtin/fetch.c:832
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "无法打开 %s：%s\n"
+#: builtin/checkout-index.c:173
+msgid "write the content to temporary files"
+msgstr "将内容写入临时文件"
-#: builtin/fetch.c:608
-#, c-format
-msgid "%s did not send all necessary objects\n"
-msgstr "%s 未发送所有必须的对象\n"
+#: builtin/checkout-index.c:174 builtin/column.c:30
+#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
+#: builtin/worktree.c:477
+msgid "string"
+msgstr "字符串"
-#: builtin/fetch.c:626
-#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr "拒绝 %s 因为浅克隆不允许被更新"
+#: builtin/checkout-index.c:175
+msgid "when creating files, prepend <string>"
+msgstr "在创建文件时，在前面加上 <字符串>"
-#: builtin/fetch.c:714 builtin/fetch.c:797
-#, c-format
-msgid "From %.*s\n"
-msgstr "来自 %.*s\n"
+#: builtin/checkout-index.c:177
+msgid "copy out the files from named stage"
+msgstr "从指定暂存区中拷出文件"
-#: builtin/fetch.c:725
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
-msgstr ""
-"一些本地引用不能被更新；尝试运行\n"
-" 'git remote prune %s' 来删除旧的、有冲突的分支"
+#: builtin/checkout.c:27
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<选项>] <分支>"
-# 译者：注意保持前导空格
-#: builtin/fetch.c:777
+#: builtin/checkout.c:28
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
+
+#: builtin/checkout.c:153 builtin/checkout.c:186
#, c-format
-msgid " (%s will become dangling)"
-msgstr " （%s 将成为摇摆状态）"
+msgid "path '%s' does not have our version"
+msgstr "路径 '%s' 没有我们的版本"
-# 译者：注意保持前导空格
-#: builtin/fetch.c:778
+#: builtin/checkout.c:155 builtin/checkout.c:188
#, c-format
-msgid " (%s has become dangling)"
-msgstr " （%s 已成为摇摆状态）"
+msgid "path '%s' does not have their version"
+msgstr "路径 '%s' 没有他们的版本"
-#: builtin/fetch.c:802
-msgid "[deleted]"
-msgstr "[已删除]"
+#: builtin/checkout.c:171
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "路径 '%s' 没有全部必须的版本"
-#: builtin/fetch.c:803 builtin/remote.c:1057
-msgid "(none)"
-msgstr "（无）"
+#: builtin/checkout.c:215
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "路径 '%s' 没有必须的版本"
-#: builtin/fetch.c:822
+#: builtin/checkout.c:232
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "拒绝获取到非纯版本库的当前分支 %s"
+msgid "path '%s': cannot merge"
+msgstr "path '%s'：无法合并"
-#: builtin/fetch.c:841
+#: builtin/checkout.c:249
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
+msgid "Unable to add merge result for '%s'"
+msgstr "无法为 '%s' 添加合并结果"
-#: builtin/fetch.c:844
+#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
+#: builtin/checkout.c:278
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "选项 \"%s\" 为 %s 所忽略\n"
+msgid "'%s' cannot be used with updating paths"
+msgstr "'%s' 不能在更新路径时使用"
-#: builtin/fetch.c:900
+#: builtin/checkout.c:281 builtin/checkout.c:284
#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "不知道如何从 %s 获取"
+msgid "'%s' cannot be used with %s"
+msgstr "'%s' 不能和 %s 同时使用"
-#: builtin/fetch.c:1063
+#: builtin/checkout.c:287
#, c-format
-msgid "Fetching %s\n"
-msgstr "正在获取 %s\n"
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr "不能同时更新路径并切换到分支'%s'。"
-#: builtin/fetch.c:1065 builtin/remote.c:90
+#: builtin/checkout.c:358 builtin/checkout.c:365
#, c-format
-msgid "Could not fetch %s"
-msgstr "不能获取 %s"
+msgid "path '%s' is unmerged"
+msgstr "路径 '%s' 未合并"
-#: builtin/fetch.c:1083
-msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
-msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"
+#: builtin/checkout.c:513
+msgid "you need to resolve your current index first"
+msgstr "您需要先解决当前索引的冲突"
-#: builtin/fetch.c:1106
-msgid "You need to specify a tag name."
-msgstr "您需要指定一个 tag 名称。"
+#: builtin/checkout.c:644
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
-#: builtin/fetch.c:1148
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth 和 --unshallow 不能同时使用"
+#: builtin/checkout.c:685
+msgid "HEAD is now at"
+msgstr "HEAD 目前位于"
-#: builtin/fetch.c:1150
-msgid "--unshallow on a complete repository does not make sense"
-msgstr "对于一个完整的版本库，参数 --unshallow 没有意义"
+#: builtin/checkout.c:689 builtin/clone.c:678
+msgid "unable to update HEAD"
+msgstr "不能更新 HEAD"
-#: builtin/fetch.c:1173
-msgid "fetch --all does not take a repository argument"
-msgstr "fetch --all 不能带一个版本库参数"
-
-#: builtin/fetch.c:1175
-msgid "fetch --all does not make sense with refspecs"
-msgstr "fetch --all 带引用规则没有任何意义"
-
-#: builtin/fetch.c:1186
+#: builtin/checkout.c:693
#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "没有这样的远程或远程组：%s"
-
-#: builtin/fetch.c:1194
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "获取组并指定引用规则没有意义"
+msgid "Reset branch '%s'\n"
+msgstr "重置分支 '%s'\n"
-#: builtin/fmt-merge-msg.c:13
-msgid ""
-"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
-msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
+#: builtin/checkout.c:696
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "已经位于 '%s'\n"
-#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698
-#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
-#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590
-#: parse-options.h:131 parse-options.h:238
-msgid "n"
-msgstr "n"
+#: builtin/checkout.c:700
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "切换并重置分支 '%s'\n"
-#: builtin/fmt-merge-msg.c:669
-msgid "populate log with at most <n> entries from shortlog"
-msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
+#: builtin/checkout.c:702 builtin/checkout.c:1090
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "切换到一个新分支 '%s'\n"
-#: builtin/fmt-merge-msg.c:672
-msgid "alias for --log (deprecated)"
-msgstr "参数 --log 的别名（已弃用）"
+#: builtin/checkout.c:704
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "切换到分支 '%s'\n"
-#: builtin/fmt-merge-msg.c:675
-msgid "text"
-msgstr "文本"
+# 译者：注意保持前导空格
+#: builtin/checkout.c:755
+#, c-format
+msgid " ... and %d more.\n"
+msgstr " ... 及其它 %d 个。\n"
-#: builtin/fmt-merge-msg.c:676
-msgid "use <text> as start of message"
-msgstr "使用 <文本> 作为提交说明的开始"
+#: builtin/checkout.c:761
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+"警告：您正丢下 %d 个提交，未和任何分支关联：\n"
+"\n"
+"%s\n"
+msgstr[1] ""
+"警告：您正丢下 %d 个提交，未和任何分支关联：\n"
+"\n"
+"%s\n"
-#: builtin/fmt-merge-msg.c:677
-msgid "file to read from"
-msgstr "从文件中读取"
+#: builtin/checkout.c:780
+#, c-format
+msgid ""
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[0] ""
+"如果您想要通过创建新分支保存它，这可能是一个好时候。\n"
+"如下操作：\n"
+"\n"
+" git branch <新分支名> %s\n"
+"\n"
+msgstr[1] ""
+"如果您想要通过创建新分支保存它们，这可能是一个好时候。\n"
+"如下操作：\n"
+"\n"
+" git branch <新分支名> %s\n"
+"\n"
-#: builtin/for-each-ref.c:687
-msgid "unable to parse format"
-msgstr "不能解析格式"
+#: builtin/checkout.c:816
+msgid "internal error in revision walk"
+msgstr "在版本遍历时遇到内部错误"
-#: builtin/for-each-ref.c:1083
-msgid "git for-each-ref [<options>] [<pattern>]"
-msgstr "git for-each-ref [<选项>] [<模式>]"
+#: builtin/checkout.c:820
+msgid "Previous HEAD position was"
+msgstr "之前的 HEAD 位置是"
-#: builtin/for-each-ref.c:1098
-msgid "quote placeholders suitably for shells"
-msgstr "引用占位符适用于 shells"
+#: builtin/checkout.c:847 builtin/checkout.c:1085
+msgid "You are on a branch yet to be born"
+msgstr "您位于一个尚未初始化的分支"
-#: builtin/for-each-ref.c:1100
-msgid "quote placeholders suitably for perl"
-msgstr "引用占位符适用于 perl"
+#: builtin/checkout.c:991
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "应只有一个引用，却给出了 %d 个"
-#: builtin/for-each-ref.c:1102
-msgid "quote placeholders suitably for python"
-msgstr "引用占位符适用于 python"
+#: builtin/checkout.c:1031 builtin/worktree.c:214
+#, c-format
+msgid "invalid reference: %s"
+msgstr "无效引用：%s"
-#: builtin/for-each-ref.c:1104
-msgid "quote placeholders suitably for Tcl"
-msgstr "引用占位符适用于 Tcl"
+#: builtin/checkout.c:1060
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "引用不是一个树：%s"
-#: builtin/for-each-ref.c:1107
-msgid "show only <n> matched refs"
-msgstr "只显示 <n> 个匹配的引用"
+#: builtin/checkout.c:1099
+msgid "paths cannot be used with switching branches"
+msgstr "路径不能和切换分支同时使用"
-#: builtin/for-each-ref.c:1108 builtin/replace.c:438
-msgid "format"
-msgstr "格式"
+#: builtin/checkout.c:1102 builtin/checkout.c:1106
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/for-each-ref.c:1108
-msgid "format to use for the output"
-msgstr "输出格式"
+#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
+#: builtin/checkout.c:1121
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/for-each-ref.c:1109
-msgid "key"
-msgstr "key"
+#: builtin/checkout.c:1126
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/for-each-ref.c:1110
-msgid "field name to sort on"
-msgstr "排序的字段名"
+#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329
+#: builtin/worktree.c:331
+msgid "branch"
+msgstr "分支"
-#: builtin/fsck.c:147 builtin/prune.c:137
-msgid "Checking connectivity"
-msgstr "检查连接中"
+#: builtin/checkout.c:1160
+msgid "create and checkout a new branch"
+msgstr "创建并检出一个新的分支"
-#: builtin/fsck.c:548
-msgid "Checking object directories"
-msgstr "检查对象目录中"
+#: builtin/checkout.c:1162
+msgid "create/reset and checkout a branch"
+msgstr "创建/重置并检出一个分支"
-#: builtin/fsck.c:611
-msgid "git fsck [<options>] [<object>...]"
-msgstr "git fsck [<选项>] [<对象>...]"
+#: builtin/checkout.c:1163
+msgid "create reflog for new branch"
+msgstr "为新的分支创建引用日志"
-#: builtin/fsck.c:617
-msgid "show unreachable objects"
-msgstr "显示不可达的对象"
+#: builtin/checkout.c:1164 builtin/worktree.c:333
+msgid "detach HEAD at named commit"
+msgstr "HEAD 从指定的提交分离"
-#: builtin/fsck.c:618
-msgid "show dangling objects"
-msgstr "显示摇摆的对象"
+#: builtin/checkout.c:1165
+msgid "set upstream info for new branch"
+msgstr "为新的分支设置上游信息"
-#: builtin/fsck.c:619
-msgid "report tags"
-msgstr "æ\8a¥å\91\8a tags"
+#: builtin/checkout.c:1167
+msgid "new-branch"
+msgstr "æ\96°å\88\86æ\94¯"
-#: builtin/fsck.c:620
-msgid "report root nodes"
-msgstr "æ\8a¥å\91\8aæ ¹è\8a\82ç\82¹"
+#: builtin/checkout.c:1167
+msgid "new unparented branch"
+msgstr "æ\96°ç\9a\84没æ\9c\89ç\88¶æ\8f\90交ç\9a\84å\88\86æ\94¯"
-#: builtin/fsck.c:621
-msgid "make index objects head nodes"
-msgstr "å°\86ç´¢å¼\95亦ä½\9c为æ£\80æ\9f¥ç\9a\84头è\8a\82ç\82¹"
+#: builtin/checkout.c:1168
+msgid "checkout our version for unmerged files"
+msgstr "对å°\9aæ\9cªå\90\88并ç\9a\84æ\96\87件æ£\80å\87ºæ\88\91们ç\9a\84ç\89\88æ\9c¬"
-#: builtin/fsck.c:622
-msgid "make reflogs head nodes (default)"
-msgstr "å°\86å¼\95ç\94¨æ\97¥å¿\97ä½\9c为æ£\80æ\9f¥ç\9a\84头è\8a\82ç\82¹ï¼\88é»\98认ï¼\89"
+#: builtin/checkout.c:1170
+msgid "checkout their version for unmerged files"
+msgstr "对å°\9aæ\9cªå\90\88并ç\9a\84æ\96\87件æ£\80å\87ºä»\96们ç\9a\84ç\89\88æ\9c¬"
-#: builtin/fsck.c:623
-msgid "also consider packs and alternate objects"
-msgstr "也考虑包和备用对象"
+#: builtin/checkout.c:1172
+msgid "force checkout (throw away local modifications)"
+msgstr "强制检出（丢弃本地修改）"
-#: builtin/fsck.c:624
-msgid "enable more strict checking"
-msgstr "å\90¯ç\94¨æ\9b´ä¸¥æ ¼ç\9a\84æ£\80æ\9f¥"
+#: builtin/checkout.c:1173
+msgid "perform a 3-way merge with the new branch"
+msgstr "å\92\8cæ\96°ç\9a\84å\88\86æ\94¯æ\89§è¡\8cä¸\89æ\96¹å\90\88并"
-#: builtin/fsck.c:626
-msgid "write dangling objects in .git/lost-found"
-msgstr "将摇摆对象写入 .git/lost-found 中"
+#: builtin/checkout.c:1174 builtin/merge.c:234
+msgid "update ignored files (default)"
+msgstr "更新忽略的文件（默认）"
-#: builtin/fsck.c:627 builtin/prune.c:107
-msgid "show progress"
-msgstr "显示进度"
+#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
+msgid "style"
+msgstr "风格"
-#: builtin/fsck.c:677
-msgid "Checking objects"
-msgstr "检查对象中"
+#: builtin/checkout.c:1176
+msgid "conflict style (merge or diff3)"
+msgstr "冲突输出风格（merge 或 diff3）"
-#: builtin/gc.c:24
-msgid "git gc [<options>]"
-msgstr "git gc [<选项>]"
+#: builtin/checkout.c:1179
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "对路径不做稀疏检出的限制"
-#: builtin/gc.c:67
-#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "无效 %s：'%s'"
+#: builtin/checkout.c:1181
+msgid "second guess 'git checkout <no-such-branch>'"
+msgstr "二次猜测'git checkout <无此分支>'"
-#: builtin/gc.c:112
-#, c-format
-msgid "insanely long object directory %.*s"
-msgstr "不正常的长对象目录 %.*s"
+#: builtin/checkout.c:1183
+msgid "do not check if another worktree is holding the given ref"
+msgstr "不检查指定的引用是否被其他工作区所占用"
-#: builtin/gc.c:281
-msgid "prune unreferenced objects"
-msgstr "清除未引用的对象"
+#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119
+#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539
+#: builtin/send-pack.c:172
+msgid "force progress reporting"
+msgstr "强制显示进度报告"
-#: builtin/gc.c:283
-msgid "be more thorough (increased runtime)"
-msgstr "更彻底（增加运行时间）"
+#: builtin/checkout.c:1224
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr "-b、-B 和 --orphan 是互斥的"
-#: builtin/gc.c:284
-msgid "enable auto-gc mode"
-msgstr "启用自动垃圾回收模式"
+#: builtin/checkout.c:1241
+msgid "--track needs a branch name"
+msgstr "--track 需要一个分支名"
-#: builtin/gc.c:285
-msgid "force running gc even if there may be another gc running"
-msgstr "强制执行 gc 即使另外一个 gc 正在执行"
+#: builtin/checkout.c:1246
+msgid "Missing branch name; try -b"
+msgstr "缺少分支名；尝试 -b"
-#: builtin/gc.c:327
-#, c-format
-msgid "Auto packing the repository in background for optimum performance.\n"
-msgstr "自动在后台执行版本库打包以求最佳性能。\n"
+#: builtin/checkout.c:1282
+msgid "invalid path specification"
+msgstr "无效的路径规格"
-#: builtin/gc.c:329
+#: builtin/checkout.c:1289
#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
-msgstr "自动打包版本库以求最佳性能。\n"
+msgid ""
+"Cannot update paths and switch to branch '%s' at the same time.\n"
+"Did you intend to checkout '%s' which can not be resolved as commit?"
+msgstr ""
+"不能同时更新路径并切换到分支'%s'。\n"
+"您是想要检出 '%s' 但其未能解析为提交么？"
-#: builtin/gc.c:330
+#: builtin/checkout.c:1294
#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
-msgstr "手工维护参见 \"git help gc\"。\n"
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout：--detach 不能接收路径参数 '%s'"
-#: builtin/gc.c:348
-#, c-format
+#: builtin/checkout.c:1298
msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
msgstr ""
-"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）"
+"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
-#: builtin/gc.c:376
+#: builtin/clean.c:25
msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
-
-#: builtin/grep.c:23
-msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
-msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
-#: builtin/grep.c:218
+#: builtin/clean.c:29
#, c-format
-msgid "grep: failed to create thread: %s"
-msgstr "grep：无法创建线程：%s"
+msgid "Removing %s\n"
+msgstr "正删除 %s\n"
-#: builtin/grep.c:441 builtin/grep.c:476
+#: builtin/clean.c:30
#, c-format
-msgid "unable to read tree (%s)"
-msgstr "无法读取树（%s）"
+msgid "Would remove %s\n"
+msgstr "将删除 %s\n"
-#: builtin/grep.c:491
+#: builtin/clean.c:31
#, c-format
-msgid "unable to grep from object of type %s"
-msgstr "无法抓取来自于 %s 类型的对象"
+msgid "Skipping repository %s\n"
+msgstr "忽略仓库 %s\n"
-#: builtin/grep.c:547
+#: builtin/clean.c:32
#, c-format
-msgid "switch `%c' expects a numerical value"
-msgstr "å¼\80å\85³ `%c' æ\9c\9fæ\9c\9bä¸\80个æ\95°å\97å\80¼"
+msgid "Would skip repository %s\n"
+msgstr "å°\86忽ç\95¥ä»\93åº\93 %s\n"
-#: builtin/grep.c:564
+#: builtin/clean.c:33
#, c-format
-msgid "cannot open '%s'"
-msgstr "不能打开 '%s'"
+msgid "failed to remove %s"
+msgstr "无法删除 %s"
-#: builtin/grep.c:638
-msgid "search in index instead of in the work tree"
-msgstr "在索引区搜索而不是在工作区"
+#: builtin/clean.c:297 git-add--interactive.perl:614
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1 - select a numbered item\n"
+"foo - select item based on unique prefix\n"
+" - (empty) select nothing\n"
+msgstr ""
+"帮助：\n"
+"1 - 通过编号选择一个选项\n"
+"foo - 通过唯一前缀选择一个选项\n"
+" - （空）什么也不选择\n"
-#: builtin/grep.c:640
-msgid "find in contents not managed by git"
-msgstr "在未被 git 管理的内容中查找"
+#: builtin/clean.c:301 git-add--interactive.perl:623
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1 - select a single item\n"
+"3-5 - select a range of items\n"
+"2-3,6-9 - select multiple ranges\n"
+"foo - select item based on unique prefix\n"
+"-... - unselect specified items\n"
+"* - choose all items\n"
+" - (empty) finish selecting\n"
+msgstr ""
+"帮助：\n"
+"1 - 选择一个选项\n"
+"3-5 - 选择一个范围内的所有选项\n"
+"2-3,6-9 - 选择多个范围内的所有选项\n"
+"foo - 通过唯一前缀选择一个选项\n"
+"-... - 反选特定的选项\n"
+"* - 选择所有选项\n"
+" - （空）结束选择\n"
-# 译者：中文字符串拼接，可删除前导空格
-#: builtin/grep.c:642
-msgid "search in both tracked and untracked files"
-msgstr "在跟踪和未跟踪的文件中搜索"
+#: builtin/clean.c:517 git-add--interactive.perl:589
+#: git-add--interactive.perl:594
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr "嗯（%s）？\n"
-#: builtin/grep.c:644
-msgid "ignore files specified via '.gitignore'"
-msgstr "忽略 '.gitignore' 包含的文件"
+#: builtin/clean.c:659
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "输入模版以排除条目>> "
-#: builtin/grep.c:647
-msgid "show non-matching lines"
-msgstr "显示未匹配的行"
+#: builtin/clean.c:696
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "警告：无法找到和 %s 匹配的条目"
-#: builtin/grep.c:649
-msgid "case insensitive matching"
-msgstr "不区分大小写匹配"
+#: builtin/clean.c:717
+msgid "Select items to delete"
+msgstr "选择要删除的条目"
-#: builtin/grep.c:651
-msgid "match patterns only at word boundaries"
-msgstr "只在单词边界匹配模式"
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:758
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "删除 %s [y/N]？"
-#: builtin/grep.c:653
-msgid "process binary files as text"
-msgstr "把二进制文件当做文本处理"
+#: builtin/clean.c:783 git-add--interactive.perl:1660
+#, c-format
+msgid "Bye.\n"
+msgstr "再见。\n"
-#: builtin/grep.c:655
-msgid "don't match patterns in binary files"
-msgstr "不在二进制文件中匹配模式"
+#: builtin/clean.c:791
+msgid ""
+"clean - start cleaning\n"
+"filter by pattern - exclude items from deletion\n"
+"select by numbers - select items to be deleted by numbers\n"
+"ask each - confirm each deletion (like \"rm -i\")\n"
+"quit - stop cleaning\n"
+"help - this screen\n"
+"? - help for prompt selection"
+msgstr ""
+"clean - 开始清理\n"
+"filter by pattern - 通过模版排除要删除的条目\n"
+"select by numbers - 通过数字选择要删除的条目\n"
+"ask each - 针对删除逐一询问（就像 \"rm -i\"）\n"
+"quit - 停止删除并退出\n"
+"help - 显示本帮助\n"
+"? - 显示如何在提示符下选择的帮助"
-#: builtin/grep.c:658
-msgid "process binary files with textconv filters"
-msgstr "用 textconv 过滤器处理二进制文件"
+#: builtin/clean.c:818 git-add--interactive.perl:1736
+msgid "*** Commands ***"
+msgstr "*** 命令 ***"
-#: builtin/grep.c:660
-msgid "descend at most <depth> levels"
-msgstr "最多以指定的深度向下寻找"
+#: builtin/clean.c:819 git-add--interactive.perl:1733
+msgid "What now"
+msgstr "请选择"
-#: builtin/grep.c:664
-msgid "use extended POSIX regular expressions"
-msgstr "使用扩展的 POSIX 正则表达式"
+#: builtin/clean.c:827
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "将删除如下条目："
+msgstr[1] "将删除如下条目："
-#: builtin/grep.c:667
-msgid "use basic POSIX regular expressions (default)"
-msgstr "使用基本的 POSIX 正则表达式（默认）"
+#: builtin/clean.c:844
+msgid "No more files to clean, exiting."
+msgstr "没有要清理的文件，退出。"
-#: builtin/grep.c:670
-msgid "interpret patterns as fixed strings"
-msgstr "把模式解析为固定的字符串"
+#: builtin/clean.c:875
+msgid "do not print names of files removed"
+msgstr "不打印删除文件的名称"
-#: builtin/grep.c:673
-msgid "use Perl-compatible regular expressions"
-msgstr "使用 Perl 兼容的正则表达式"
+#: builtin/clean.c:877
+msgid "force"
+msgstr "强制"
-#: builtin/grep.c:676
-msgid "show line numbers"
-msgstr "显示行号"
+#: builtin/clean.c:878
+msgid "interactive cleaning"
+msgstr "交互式清除"
-#: builtin/grep.c:677
-msgid "don't show filenames"
-msgstr "不显示文件名"
+#: builtin/clean.c:880
+msgid "remove whole directories"
+msgstr "删除整个目录"
-#: builtin/grep.c:678
-msgid "show filenames"
-msgstr "显示文件名"
+#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
+#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348
+#: builtin/name-rev.c:350 builtin/show-ref.c:176
+msgid "pattern"
+msgstr "模式"
-#: builtin/grep.c:680
-msgid "show filenames relative to top directory"
-msgstr "æ\98¾ç¤ºç\9b¸å¯¹äº\8e顶级ç\9b®å½\95ç\9a\84æ\96\87件å\90\8d"
+#: builtin/clean.c:882
+msgid "add <pattern> to ignore rules"
+msgstr "æ·»å\8a <模å¼\8f> å\88°å¿½ç\95¥è§\84å\88\99"
-#: builtin/grep.c:682
-msgid "show only filenames instead of matching lines"
-msgstr "只显示文件名而不显示匹配的行"
+#: builtin/clean.c:883
+msgid "remove ignored files, too"
+msgstr "也删除忽略的文件"
-#: builtin/grep.c:684
-msgid "synonym for --files-with-matches"
-msgstr "å\92\8c --files-with-matches å\90\8cä¹\89"
+#: builtin/clean.c:885
+msgid "remove only ignored files"
+msgstr "å\8fªå\88 é\99¤å¿½ç\95¥ç\9a\84æ\96\87件"
-#: builtin/grep.c:687
-msgid "show only the names of files without match"
-msgstr "只显示未匹配的文件名"
+#: builtin/clean.c:903
+msgid "-x and -X cannot be used together"
+msgstr "-x 和 -X 不能同时使用"
-#: builtin/grep.c:689
-msgid "print NUL after filenames"
-msgstr "在文件名后输出 NUL 字符"
+#: builtin/clean.c:907
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
-#: builtin/grep.c:691
-msgid "show the number of matches instead of matching lines"
-msgstr "显示总匹配行数，而不显示匹配的行"
+#: builtin/clean.c:910
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
-#: builtin/grep.c:692
-msgid "highlight matches"
-msgstr "高亮显示匹配项"
+#: builtin/clone.c:37
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
-#: builtin/grep.c:694
-msgid "print empty line between matches from different files"
-msgstr "在不同文件的匹配项之间打印空行"
+#: builtin/clone.c:80
+msgid "don't create a checkout"
+msgstr "不创建一个检出"
-#: builtin/grep.c:696
-msgid "show filename only once above matches from same file"
-msgstr "å\8fªå\9c¨å\90\8cä¸\80æ\96\87件ç\9a\84å\8c¹é\85\8d项ç\9a\84ä¸\8aé\9d¢æ\98¾ç¤ºä¸\80次æ\96\87件å\90\8d"
+#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
+msgid "create a bare repository"
+msgstr "å\88\9b建ä¸\80个纯ä»\93åº\93"
-#: builtin/grep.c:699
-msgid "show <n> context lines before and after matches"
-msgstr "显示匹配项前后的 <n> 行上下文"
+#: builtin/clone.c:85
+msgid "create a mirror repository (implies bare)"
+msgstr "创建一个镜像仓库（也是纯仓库）"
-#: builtin/grep.c:702
-msgid "show <n> context lines before matches"
-msgstr "显示匹配项前 <n> 行上下文"
+#: builtin/clone.c:87
+msgid "to clone from a local repository"
+msgstr "从本地仓库克隆"
-#: builtin/grep.c:704
-msgid "show <n> context lines after matches"
-msgstr "显示匹配项后 <n> 行上下文"
+#: builtin/clone.c:89
+msgid "don't use local hardlinks, always copy"
+msgstr "不使用本地硬链接，始终复制"
-#: builtin/grep.c:705
-msgid "shortcut for -C NUM"
-msgstr "快捷键 -C 数字"
+#: builtin/clone.c:91
+msgid "setup as shared repository"
+msgstr "设置为共享仓库"
-#: builtin/grep.c:708
-msgid "show a line with the function name before matches"
-msgstr "在匹配的前面显示一行函数名"
+#: builtin/clone.c:93 builtin/clone.c:97
+msgid "pathspec"
+msgstr "路径规格"
-#: builtin/grep.c:710
-msgid "show the surrounding function"
-msgstr "显示所在函数的前后内容"
+#: builtin/clone.c:93 builtin/clone.c:97
+msgid "initialize submodules in the clone"
+msgstr "在克隆时初始化子模组"
-#: builtin/grep.c:713
-msgid "read patterns from file"
-msgstr "ä»\8eæ\96\87件读å\8f\96模å¼\8f"
+#: builtin/clone.c:100
+msgid "number of submodules cloned in parallel"
+msgstr "并å\8f\91å\85\8bé\9a\86ç\9a\84å\90模ç»\84ç\9a\84æ\95°é\87\8f"
-#: builtin/grep.c:715
-msgid "match <pattern>"
-msgstr "匹配 <模式>"
+#: builtin/clone.c:101 builtin/init-db.c:475
+msgid "template-directory"
+msgstr "模板目录"
-#: builtin/grep.c:717
-msgid "combine patterns specified with -e"
-msgstr "组合用 -e 参数设定的模式"
+#: builtin/clone.c:102 builtin/init-db.c:476
+msgid "directory from which templates will be used"
+msgstr "模板目录将被使用"
-#: builtin/grep.c:729
-msgid "indicate hit with exit status without output"
-msgstr "不输出，而用退出码标识命中状态"
+#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/submodule--helper.c:983
+msgid "reference repository"
+msgstr "参考仓库"
-#: builtin/grep.c:731
-msgid "show only matches from files that match all patterns"
-msgstr "只显示匹配所有模式的文件中的匹配"
+#: builtin/clone.c:108
+msgid "use --reference only while cloning"
+msgstr "仅在克隆时参考 --reference 指向的本地仓库"
-#: builtin/grep.c:733
-msgid "show parse tree for grep expression"
-msgstr "显示 grep 表达式的解析树"
+#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
+msgid "name"
+msgstr "名称"
-#: builtin/grep.c:737
-msgid "pager"
-msgstr "分页"
+#: builtin/clone.c:110
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
-#: builtin/grep.c:737
-msgid "show matching files in the pager"
-msgstr "分页显示匹配的文件"
+#: builtin/clone.c:112
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "检出 <分支> 而不是远程 HEAD"
-#: builtin/grep.c:740
-msgid "allow calling of grep(1) (ignored by this build)"
-msgstr "允许调用 grep(1)（本次构建忽略）"
+#: builtin/clone.c:114
+msgid "path to git-upload-pack on the remote"
+msgstr "远程 git-upload-pack 路径"
-#: builtin/grep.c:741 builtin/show-ref.c:189
-msgid "show usage"
-msgstr "显示用法"
+#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
+#: builtin/pull.c:202
+msgid "depth"
+msgstr "深度"
-#: builtin/grep.c:808
-msgid "no pattern given."
-msgstr "未提供模式匹配。"
+#: builtin/clone.c:116
+msgid "create a shallow clone of that depth"
+msgstr "创建一个指定深度的浅克隆"
-#: builtin/grep.c:866
-msgid "--open-files-in-pager only works on the worktree"
-msgstr "--open-files-in-pager 仅用于工作区"
+#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
+#: parse-options.h:142
+msgid "time"
+msgstr "时间"
-#: builtin/grep.c:892
-msgid "--cached or --untracked cannot be used with --no-index."
-msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
+#: builtin/clone.c:118
+msgid "create a shallow clone since a specific time"
+msgstr "从一个特定时间创建一个浅克隆"
-#: builtin/grep.c:897
-msgid "--no-index or --untracked cannot be used with revs."
-msgstr "--no-index 或 --untracked 不能和版本同时使用。"
+#: builtin/clone.c:119 builtin/fetch.c:124
+msgid "revision"
+msgstr "版本"
-#: builtin/grep.c:900
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
-msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
+#: builtin/clone.c:120 builtin/fetch.c:125
+msgid "deepen history of shallow clone, excluding rev"
+msgstr "深化浅克隆的历史，除了特定版本"
-#: builtin/grep.c:908
-msgid "both --cached and trees are given."
-msgstr "å\90\8cæ\97¶ç»\99å\87ºäº\86 --cached å\92\8cæ \91对象ã\80\82"
+#: builtin/clone.c:122
+msgid "clone only one branch, HEAD or --branch"
+msgstr "å\8fªå\85\8bé\9a\86ä¸\80个å\88\86æ\94¯ã\80\81HEAD æ\88\96 --branch"
-#: builtin/hash-object.c:80
-msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
-msgstr ""
-"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
-"[--] <文件>..."
+#: builtin/clone.c:124
+msgid "any cloned submodules will be shallow"
+msgstr "子模组将以浅下载模式克隆"
-#: builtin/hash-object.c:81
-msgid "git hash-object --stdin-paths < <list-of-paths>"
-msgstr "git hash-object --stdin-paths < <路径列表>"
+#: builtin/clone.c:125 builtin/init-db.c:484
+msgid "gitdir"
+msgstr "git目录"
-#: builtin/hash-object.c:92 builtin/tag.c:612
-msgid "type"
-msgstr "类型"
+#: builtin/clone.c:126 builtin/init-db.c:485
+msgid "separate git dir from working tree"
+msgstr "git目录和工作区分离"
-#: builtin/hash-object.c:92
-msgid "object type"
-msgstr "对象类型"
+#: builtin/clone.c:127
+msgid "key=value"
+msgstr "key=value"
-#: builtin/hash-object.c:93
-msgid "write the object into the object database"
-msgstr "å°\86对象å\86\99å\85¥å¯¹è±¡æ\95°æ\8d®åº\93"
+#: builtin/clone.c:128
+msgid "set config inside the new repository"
+msgstr "å\9c¨æ\96°ä»\93åº\93ä¸è®¾ç½®é\85\8d置信æ\81¯"
-#: builtin/hash-object.c:95
-msgid "read the object from stdin"
-msgstr "从标准输入读取对象"
+#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
+msgid "use IPv4 addresses only"
+msgstr "只使用 IPv4 地址"
-#: builtin/hash-object.c:97
-msgid "store file as is without filters"
-msgstr "å\8e\9fæ ·å\98å\82¨æ\96\87件ä¸\8d使ç\94¨è¿\87滤å\99¨"
+#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
+msgid "use IPv6 addresses only"
+msgstr "å\8fªä½¿ç\94¨ IPv6 å\9c°å\9d\80"
-#: builtin/hash-object.c:98
+#: builtin/clone.c:268
msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
-msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
-
-#: builtin/hash-object.c:99
-msgid "process file as it were from this path"
-msgstr "处理文件并假设其来自于此路径"
-
-#: builtin/help.c:41
-msgid "print all available commands"
-msgstr "打印所有可用的命令"
-
-#: builtin/help.c:42
-msgid "print list of useful guides"
-msgstr "显示有用的指南列表"
-
-#: builtin/help.c:43
-msgid "show man page"
-msgstr "显示 man 手册"
-
-#: builtin/help.c:44
-msgid "show manual in web browser"
-msgstr "在 web 浏览器中显示手册"
-
-#: builtin/help.c:46
-msgid "show info page"
-msgstr "显示 info 手册"
-
-#: builtin/help.c:52
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"无法猜到目录名。\n"
+"请在命令行指定一个目录"
-#: builtin/help.c:64
+#: builtin/clone.c:321
#, c-format
-msgid "unrecognized help format '%s'"
-msgstr "未能识别的帮助格式 '%s'"
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
-#: builtin/help.c:91
-msgid "Failed to start emacsclient."
-msgstr "无法启动 emacsclient。"
+#: builtin/clone.c:393
+#, c-format
+msgid "failed to open '%s'"
+msgstr "无法打开 '%s'"
-#: builtin/help.c:104
-msgid "Failed to parse emacsclient version."
-msgstr "无法解析 emacsclient 版本。"
+#: builtin/clone.c:401
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s 存在且不是一个目录"
-#: builtin/help.c:112
+#: builtin/clone.c:415
#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
-msgstr "emacsclient 版本 '%d' 太老（< 22）。"
+msgid "failed to stat %s\n"
+msgstr "对 %s 调用 stat 失败\n"
-#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
+#: builtin/clone.c:437
#, c-format
-msgid "failed to exec '%s': %s"
-msgstr "无法执行 '%s'：%s"
+msgid "failed to create link '%s'"
+msgstr "无法创建链接 '%s'"
-#: builtin/help.c:215
+#: builtin/clone.c:441
#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
-msgstr ""
-"'%s'：不支持的 man 手册查看器的路径。\n"
-"请使用 'man.<工具>.cmd'。"
+msgid "failed to copy file to '%s'"
+msgstr "无法拷贝文件至 '%s'"
-#: builtin/help.c:227
+#: builtin/clone.c:466
#, c-format
+msgid "done.\n"
+msgstr "完成。\n"
+
+#: builtin/clone.c:478
msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
+"Clone succeeded, but checkout failed.\n"
+"You can inspect what was checked out with 'git status'\n"
+"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-"'%s': 支持的 man 手册查看器命令。\n"
-"请使用 'man.<工具>.path'。"
+"克隆成功，但是检出失败。\n"
+"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
+"'git checkout -f HEAD' 重试\n"
-#: builtin/help.c:354
+#: builtin/clone.c:555
#, c-format
-msgid "'%s': unknown man viewer."
-msgstr "'%s'：未知的 man 查看器。"
-
-#: builtin/help.c:371
-msgid "no man viewer handled the request"
-msgstr "没有 man 查看器处理此请求"
-
-#: builtin/help.c:379
-msgid "no info viewer handled the request"
-msgstr "没有 info 查看器处理此请求"
-
-#: builtin/help.c:428
-msgid "Defining attributes per path"
-msgstr "定义路径的属性"
-
-#: builtin/help.c:429
-msgid "Everyday Git With 20 Commands Or So"
-msgstr "每一天 Git 常用的约 20 条命令"
+msgid "Could not find remote branch %s to clone."
+msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/help.c:430
-msgid "A Git glossary"
-msgstr "Git 词汇表"
+#: builtin/clone.c:650
+msgid "remote did not send all necessary objects"
+msgstr "远程没有发送所有必须的对象"
-#: builtin/help.c:431
-msgid "Specifies intentionally untracked files to ignore"
-msgstr "忽略指定的未跟踪文件"
+#: builtin/clone.c:666
+#, c-format
+msgid "unable to update %s"
+msgstr "不能更新 %s"
-#: builtin/help.c:432
-msgid "Defining submodule properties"
-msgstr "定义子模组属性"
+#: builtin/clone.c:715
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
-#: builtin/help.c:433
-msgid "Specifying revisions and ranges for Git"
-msgstr "指定 Git 的版本和版本范围"
+#: builtin/clone.c:746
+msgid "unable to checkout working tree"
+msgstr "不能检出工作区"
-#: builtin/help.c:434
-msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
-msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"
+#: builtin/clone.c:786
+msgid "unable to write parameters to config file"
+msgstr "无法将参数写入配置文件"
-#: builtin/help.c:435
-msgid "An overview of recommended workflows with Git"
-msgstr "Git 推荐的工作流概览"
+#: builtin/clone.c:849
+msgid "cannot repack to clean up"
+msgstr "无法执行 repack 来清理"
-#: builtin/help.c:447
-msgid "The common Git guides are:\n"
-msgstr "æ\9c\80常ç\94¨ç\9a\84 Git å\90\91导æ\9c\89ï¼\9a\n"
+#: builtin/clone.c:851
+msgid "cannot unlink temporary alternates file"
+msgstr "æ\97 æ³\95å\88 é\99¤ä¸´æ\97¶ç\9a\84 alternates æ\96\87件"
-#: builtin/help.c:468 builtin/help.c:485
-#, c-format
-msgid "usage: %s%s"
-msgstr "用法：%s%s"
+#: builtin/clone.c:884 builtin/receive-pack.c:1900
+msgid "Too many arguments."
+msgstr "太多参数。"
-#: builtin/help.c:501
-#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "`git %s' 是 `%s' 的别名"
+#: builtin/clone.c:888
+msgid "You must specify a repository to clone."
+msgstr "您必须指定一个仓库来克隆。"
-#: builtin/index-pack.c:151
+#: builtin/clone.c:901
#, c-format
-msgid "unable to open %s"
-msgstr "不能打开 %s"
+msgid "--bare and --origin %s options are incompatible."
+msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/index-pack.c:201
-#, c-format
-msgid "object type mismatch at %s"
-msgstr "%s 的对象类型不匹配"
+#: builtin/clone.c:904
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/index-pack.c:221
+#: builtin/clone.c:917
#, c-format
-msgid "did not receive expected object %s"
-msgstr "未能获取期望的对象 %s"
+msgid "repository '%s' does not exist"
+msgstr "仓库 '%s' 不存在"
-#: builtin/index-pack.c:224
+#: builtin/clone.c:923 builtin/fetch.c:1337
#, c-format
-msgid "object %s: expected type %s, found %s"
-msgstr "对象 %s：期待类型 %s，却是 %s"
+msgid "depth %s is not a positive number"
+msgstr "深度 %s 不是一个正数"
-#: builtin/index-pack.c:266
+#: builtin/clone.c:933
#, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
-msgstr[0] "无法填充 %d 字节"
-msgstr[1] "无法填充 %d 字节"
-
-#: builtin/index-pack.c:276
-msgid "early EOF"
-msgstr "过早的文件结束符（EOF）"
-
-#: builtin/index-pack.c:277
-msgid "read error on input"
-msgstr "输入上的读错误"
-
-#: builtin/index-pack.c:289
-msgid "used more bytes than were available"
-msgstr "用掉了超过可用的字节"
-
-#: builtin/index-pack.c:296
-msgid "pack too large for current definition of off_t"
-msgstr "包太大超过了当前 off_t 的定义"
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/index-pack.c:312
+#: builtin/clone.c:943
#, c-format
-msgid "unable to create '%s'"
-msgstr "不能创建 '%s'"
+msgid "working tree '%s' already exists."
+msgstr "工作区 '%s' 已经存在。"
-#: builtin/index-pack.c:317
+#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
+#: builtin/worktree.c:221 builtin/worktree.c:251
#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "无法打开包文件 '%s'"
-
-#: builtin/index-pack.c:331
-msgid "pack signature mismatch"
-msgstr "包签名不匹配"
+msgid "could not create leading directories of '%s'"
+msgstr "不能为 '%s' 创建先导目录"
-#: builtin/index-pack.c:333
+#: builtin/clone.c:961
#, c-format
-msgid "pack version %<PRIu32> unsupported"
-msgstr "不支持包版本 %<PRIu32>"
+msgid "could not create work tree dir '%s'"
+msgstr "不能创建工作区目录 '%s'"
-#: builtin/index-pack.c:351
+#: builtin/clone.c:973
#, c-format
-msgid "pack has bad object at offset %lu: %s"
-msgstr "å\8c\85ä¸æ\9c\89é\94\99误ç\9a\84对象ä½\8däº\8e %luï¼\9a%s"
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "å\85\8bé\9a\86å\88°çº¯ä»\93åº\93 '%s'...\n"
-#: builtin/index-pack.c:472
+#: builtin/clone.c:975
#, c-format
-msgid "inflate returned %d"
-msgstr "解压缩返回 %d"
-
-#: builtin/index-pack.c:521
-msgid "offset value overflow for delta base object"
-msgstr "偏移值覆盖了 delta 基准对象"
+msgid "Cloning into '%s'...\n"
+msgstr "正克隆到 '%s'...\n"
-#: builtin/index-pack.c:529
-msgid "delta base offset is out of bound"
-msgstr "delta 基准偏移越界"
+#: builtin/clone.c:999
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
-#: builtin/index-pack.c:537
-#, c-format
-msgid "unknown object type %d"
-msgstr "未知对象类型 %d"
+#: builtin/clone.c:1055
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/index-pack.c:568
-msgid "cannot pread pack file"
-msgstr "无法读取包文件"
+#: builtin/clone.c:1057
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/index-pack.c:570
-#, c-format
-msgid "premature end of pack file, %lu byte missing"
-msgid_plural "premature end of pack file, %lu bytes missing"
-msgstr[0] "包文件过早结束，缺少 %lu 字节"
-msgstr[1] "包文件过早结束，缺少 %lu 字节"
+#: builtin/clone.c:1059
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/index-pack.c:596
-msgid "serious inflate inconsistency"
-msgstr "解压缩严重的不一致"
+#: builtin/clone.c:1062
+msgid "source repository is shallow, ignoring --local"
+msgstr "源仓库是浅克隆，忽略 --local"
-#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771
-#: builtin/index-pack.c:805 builtin/index-pack.c:814
-#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
-msgstr "发现 %s 出现 SHA1 冲突！"
+#: builtin/clone.c:1067
+msgid "--local is ignored"
+msgstr "--local 被忽略"
-#: builtin/index-pack.c:745 builtin/pack-objects.c:162
-#: builtin/pack-objects.c:254
+#: builtin/clone.c:1071
#, c-format
-msgid "unable to read %s"
-msgstr "不能读 %s"
+msgid "Don't know how to clone %s"
+msgstr "不知道如何克隆 %s"
-#: builtin/index-pack.c:811
+#: builtin/clone.c:1126 builtin/clone.c:1134
#, c-format
-msgid "cannot read existing object %s"
-msgstr "不能读取现存对象 %s"
+msgid "Remote branch %s not found in upstream %s"
+msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/index-pack.c:825
-#, c-format
-msgid "invalid blob object %s"
-msgstr "无效的数据（blob）对象 %s"
+#: builtin/clone.c:1137
+msgid "You appear to have cloned an empty repository."
+msgstr "您似乎克隆了一个空仓库。"
-#: builtin/index-pack.c:839
-#, c-format
-msgid "invalid %s"
-msgstr "无效的 %s"
+#: builtin/column.c:9
+msgid "git column [<options>]"
+msgstr "git column [<选项>]"
-#: builtin/index-pack.c:843
-msgid "Error in object"
-msgstr "对象中出错"
+#: builtin/column.c:26
+msgid "lookup config vars"
+msgstr "查找配置变量"
-#: builtin/index-pack.c:845
-#, c-format
-msgid "Not all child objects of %s are reachable"
-msgstr "%s 的所有子对象并非都可达"
+#: builtin/column.c:27 builtin/column.c:28
+msgid "layout to use"
+msgstr "要使用的布局"
-#: builtin/index-pack.c:917 builtin/index-pack.c:948
-msgid "failed to apply delta"
-msgstr "æ\97 æ³\95åº\94ç\94¨ delta"
+#: builtin/column.c:29
+msgid "Maximum width"
+msgstr "æ\9c\80大宽度"
-#: builtin/index-pack.c:1118
-msgid "Receiving objects"
-msgstr "接收对象中"
+#: builtin/column.c:30
+msgid "Padding space on left border"
+msgstr "左边框的填充空间"
-#: builtin/index-pack.c:1118
-msgid "Indexing objects"
-msgstr "索引对象中"
+#: builtin/column.c:31
+msgid "Padding space on right border"
+msgstr "右边框的填充空间"
-#: builtin/index-pack.c:1150
-msgid "pack is corrupted (SHA1 mismatch)"
-msgstr "包冲突（SHA1 不匹配）"
+#: builtin/column.c:32
+msgid "Padding space between columns"
+msgstr "两列之间的填充空间"
-#: builtin/index-pack.c:1155
-msgid "cannot fstat packfile"
-msgstr "不能枚举包文件状态"
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr "--command 必须是第一个参数"
-#: builtin/index-pack.c:1158
-msgid "pack has junk at the end"
-msgstr "包的结尾有垃圾数据"
+#: builtin/commit.c:38
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<选项>] [--] <路径规格>..."
-#: builtin/index-pack.c:1169
-msgid "confusion beyond insanity in parse_pack_objects()"
-msgstr "parse_pack_objects() 中遇到不可理喻的问题"
+#: builtin/commit.c:43
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<选项>] [--] <路径规格>..."
-#: builtin/index-pack.c:1194
-msgid "Resolving deltas"
-msgstr "处理 delta 中"
+#: builtin/commit.c:48
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
+msgstr ""
+"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
+"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
+"中编辑您的配置文件：\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
+"\n"
+" git commit --amend --reset-author\n"
-#: builtin/index-pack.c:1205
-#, c-format
-msgid "unable to create thread: %s"
-msgstr "不能创建线程：%s"
+#: builtin/commit.c:61
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
+msgstr ""
+"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
+"与否。您可以对其进行设置以免再出现本提示信息：\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
+"\n"
+" git commit --amend --reset-author\n"
-#: builtin/index-pack.c:1247
-msgid "confusion beyond insanity"
-msgstr "不可理喻"
+#: builtin/commit.c:73
+msgid ""
+"You asked to amend the most recent commit, but doing so would make\n"
+"it empty. You can repeat your command with --allow-empty, or you can\n"
+"remove the commit entirely with \"git reset HEAD^\".\n"
+msgstr ""
+"您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
+"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
-#: builtin/index-pack.c:1253
-#, c-format
-msgid "completed with %d local objects"
-msgstr "完成 %d 个本地对象"
+#: builtin/commit.c:78
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
+msgstr ""
+"之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n"
+"也要提交，使用命令：\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
-#: builtin/index-pack.c:1263
-#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
-msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
+#: builtin/commit.c:85
+msgid "Otherwise, please use 'git reset'\n"
+msgstr "否则，请使用命令 'git reset'\n"
-#: builtin/index-pack.c:1267
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] "包有 %d 个未解决的 delta"
-msgstr[1] "包有 %d 个未解决的 delta"
+#: builtin/commit.c:88
+msgid ""
+"If you wish to skip this commit, use:\n"
+"\n"
+" git reset\n"
+"\n"
+"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+"the remaining commits.\n"
+msgstr ""
+"如果您想跳过这个提交，使用命令：\n"
+"\n"
+" git reset\n"
+"\n"
+"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
+"操作。\n"
-#: builtin/index-pack.c:1291
-#, c-format
-msgid "unable to deflate appended object (%d)"
-msgstr "不能压缩附加对象（%d）"
+#: builtin/commit.c:318
+msgid "failed to unpack HEAD tree object"
+msgstr "无法解包 HEAD 树对象"
-#: builtin/index-pack.c:1367
-#, c-format
-msgid "local object %s is corrupt"
-msgstr "本地对象 %s 已损坏"
+#: builtin/commit.c:359
+msgid "unable to create temporary index"
+msgstr "不能创建临时索引"
-#: builtin/index-pack.c:1391
-msgid "error while closing pack file"
-msgstr "关闭包文件时出错"
+#: builtin/commit.c:365
+msgid "interactive add failed"
+msgstr "交互式添加失败"
-#: builtin/index-pack.c:1404
-#, c-format
-msgid "cannot write keep file '%s'"
-msgstr "无法写保留文件 '%s'"
+#: builtin/commit.c:378
+msgid "unable to update temporary index"
+msgstr "无法更新临时索引"
-#: builtin/index-pack.c:1412
-#, c-format
-msgid "cannot close written keep file '%s'"
-msgstr "无法关闭保留文件 '%s'"
+#: builtin/commit.c:380
+msgid "Failed to update main cache tree"
+msgstr "不能更新树的主缓存"
-#: builtin/index-pack.c:1425
-msgid "cannot store pack file"
-msgstr "æ\97 æ³\95å\98å\82¨å\8c\85文件"
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
+msgid "unable to write new_index file"
+msgstr "æ\97 æ³\95å\86\99 new_index 文件"
-#: builtin/index-pack.c:1436
-msgid "cannot store index file"
-msgstr "无法存储索引文件"
+#: builtin/commit.c:458
+msgid "cannot do a partial commit during a merge."
+msgstr "在合并过程中不能做部分提交。"
-#: builtin/index-pack.c:1469
-#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
-msgstr "坏的 pack.indexversion=%<PRIu32>"
+#: builtin/commit.c:460
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr "在拣选过程中不能做部分提交。"
-#: builtin/index-pack.c:1475
-#, c-format
-msgid "invalid number of threads specified (%d)"
-msgstr "指定的线程数无效（%d）"
+#: builtin/commit.c:469
+msgid "cannot read the index"
+msgstr "无法读取索引"
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1658
-#, c-format
-msgid "no threads support, ignoring %s"
-msgstr "没有线程支持，忽略 %s"
+#: builtin/commit.c:488
+msgid "unable to write temporary index file"
+msgstr "无法写临时索引文件"
-#: builtin/index-pack.c:1537
+#: builtin/commit.c:582
#, c-format
-msgid "Cannot open existing pack file '%s'"
-msgstr "æ\97 æ³\95æ\89\93å¼\80ç\8e°å\98å\8c\85æ\96\87件 '%s'"
+msgid "commit '%s' lacks author header"
+msgstr "æ\8f\90交 '%s' 缺å°\91ä½\9cè\80\85ä¿¡æ\81¯"
-#: builtin/index-pack.c:1539
+#: builtin/commit.c:584
#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
-msgstr "无法为 %s 打开包索引文件"
+msgid "commit '%s' has malformed author line"
+msgstr "提交 '%s' 有非法的作者信息"
+
+#: builtin/commit.c:603
+msgid "malformed --author parameter"
+msgstr "非法的 --author 参数"
+
+#: builtin/commit.c:655
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr "无法选择一个未被当前提交说明使用的注释字符"
-#: builtin/index-pack.c:1586
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] "非 delta：%d 个对象"
-msgstr[1] "非 delta：%d 个对象"
+msgid "could not lookup commit %s"
+msgstr "不能查询提交 %s"
-#: builtin/index-pack.c:1593
+#: builtin/commit.c:704 builtin/shortlog.c:294
#, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] "链长 = %d: %lu 对象"
-msgstr[1] "链长 = %d: %lu 对象"
+msgid "(reading log message from standard input)\n"
+msgstr "（正从标准输入中读取日志信息）\n"
-#: builtin/index-pack.c:1622
-msgid "Cannot come back to cwd"
-msgstr "无法返回当前工作目录"
+#: builtin/commit.c:706
+msgid "could not read log from standard input"
+msgstr "不能从标准输入中读取日志信息"
-#: builtin/index-pack.c:1670 builtin/index-pack.c:1673
-#: builtin/index-pack.c:1685 builtin/index-pack.c:1689
+#: builtin/commit.c:710
#, c-format
-msgid "bad %s"
-msgstr "错误选项 %s"
+msgid "could not read log file '%s'"
+msgstr "不能读取日志文件 '%s'"
-#: builtin/index-pack.c:1703
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin 不能和 --stdin 同时使用"
+#: builtin/commit.c:737 builtin/commit.c:745
+msgid "could not read SQUASH_MSG"
+msgstr "不能读取 SQUASH_MSG"
-#: builtin/index-pack.c:1707 builtin/index-pack.c:1716
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "包名 '%s' 没有以 '.pack' 结尾"
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "不能读取 MERGE_MSG"
-#: builtin/index-pack.c:1724
-msgid "--verify with no packfile name given"
-msgstr "--verify 没有提供包名参数"
+#: builtin/commit.c:796
+msgid "could not write commit template"
+msgstr "不能写提交模版"
-#: builtin/init-db.c:35
+#: builtin/commit.c:814
#, c-format
-msgid "Could not make %s writable by group"
-msgstr "不能设置 %s 为组可写"
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"似乎您正在做一个合并提交。如果不对，请删除文件\n"
+"\t%s\n"
+"然后重试。\n"
-#: builtin/init-db.c:62
+#: builtin/commit.c:819
#, c-format
-msgid "insanely long template name %s"
-msgstr "太长的模版名 %s"
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"似乎您正在做一个拣选提交。如果不对，请删除文件\n"
+"\t%s\n"
+"然后重试。\n"
-#: builtin/init-db.c:67
+#: builtin/commit.c:832
#, c-format
-msgid "cannot stat '%s'"
-msgstr "不能枚举 '%s' 状态"
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
+"说明将会终止提交。\n"
-#: builtin/init-db.c:73
+#: builtin/commit.c:839
#, c-format
-msgid "cannot stat template '%s'"
-msgstr "不能枚举模版 '%s' 状态"
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您原意\n"
+"也可以删除它们。一个空的提交说明将会终止提交。\n"
-#: builtin/init-db.c:80
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#: builtin/commit.c:859
#, c-format
-msgid "cannot opendir '%s'"
-msgstr "不能打开目录 '%s'"
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr "%s作者： %.*s <%.*s>"
-#: builtin/init-db.c:97
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#: builtin/commit.c:867
#, c-format
-msgid "cannot readlink '%s'"
-msgstr "不能读取链接 '%s'"
+msgid "%sDate: %s"
+msgstr "%s日期： %s"
-#: builtin/init-db.c:99
+# 译者：为保证在输出中对齐，注意调整句中空格！
+#: builtin/commit.c:874
#, c-format
-msgid "insanely long symlink %s"
-msgstr "太长的符号链接 %s"
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%s提交者：%.*s <%.*s>"
-#: builtin/init-db.c:102
-#, c-format
-msgid "cannot symlink '%s' '%s'"
-msgstr "不能自 '%s' 到 '%s' 创建符号链接"
+#: builtin/commit.c:892
+msgid "Cannot read index"
+msgstr "无法读取索引"
-#: builtin/init-db.c:106
-#, c-format
-msgid "cannot copy '%s' to '%s'"
-msgstr "不能拷贝 '%s' 至 '%s'"
+#: builtin/commit.c:954
+msgid "Error building trees"
+msgstr "无法创建树对象"
-#: builtin/init-db.c:110
+#: builtin/commit.c:968 builtin/tag.c:273
#, c-format
-msgid "ignoring template %s"
-msgstr "忽略模版 %s"
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
-#: builtin/init-db.c:136
+#: builtin/commit.c:1071
#, c-format
-msgid "insanely long template path %s"
-msgstr "太长的模版路径 %s"
-
-#: builtin/init-db.c:144
-#, c-format
-msgid "templates not found %s"
-msgstr "模版未找到 %s"
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"
-#: builtin/init-db.c:157
+#: builtin/commit.c:1086 builtin/commit.c:1325
#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr "没æ\9c\89ä»\8e '%2$s' å¤\8då\88¶å¸¦æ\9c\89é\94\99误ç\89\88æ\9c¬ %1$d ç\9a\84模ç\89\88"
+msgid "Invalid untracked files mode '%s'"
+msgstr "æ\97 æ\95\88ç\9a\84æ\9cªè¿½è¸ªæ\96\87件å\8f\82æ\95° '%s'"
-#: builtin/init-db.c:211
-#, c-format
-msgid "insane git directory %s"
-msgstr "不正常的 git 目录 %s"
+#: builtin/commit.c:1124
+msgid "--long and -z are incompatible"
+msgstr "--long 和 -z 选项不兼容"
-#: builtin/init-db.c:343 builtin/init-db.c:346
-#, c-format
-msgid "%s already exists"
-msgstr "%s 已经存在"
+#: builtin/commit.c:1154
+msgid "Using both --reset-author and --author does not make sense"
+msgstr "同时使用 --reset-author 和 --author 没有意义"
-#: builtin/init-db.c:374
-#, c-format
-msgid "unable to handle file type %d"
-msgstr "不能处理 %d 类型的文件"
+#: builtin/commit.c:1163
+msgid "You have nothing to amend."
+msgstr "您没有可修补的提交。"
-#: builtin/init-db.c:377
-#, c-format
-msgid "unable to move %s to %s"
-msgstr "不能移动 %s 至 %s"
+#: builtin/commit.c:1166
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "您正处于一个合并过程中 -- 无法修补提交。"
-#. TRANSLATORS: The first '%s' is either "Reinitialized
-#. existing" or "Initialized empty", the second " shared" or
-#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:433
-#, c-format
-msgid "%s%s Git repository in %s%s\n"
-msgstr "%s%s Git 版本库于 %s%s\n"
+#: builtin/commit.c:1168
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
-#: builtin/init-db.c:434
-msgid "Reinitialized existing"
-msgstr "é\87\8dæ\96°å\88\9då§\8bå\8c\96ç\8e°å\98ç\9a\84"
+#: builtin/commit.c:1171
+msgid "Options --squash and --fixup cannot be used together"
+msgstr "é\80\89项 --squash å\92\8c --fixup ä¸\8dè\83½å\90\8cæ\97¶ä½¿ç\94¨"
-#: builtin/init-db.c:434
-msgid "Initialized empty"
-msgstr "å\88\9då§\8bå\8c\96空ç\9a\84"
+#: builtin/commit.c:1181
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr "å\8fªè\83½ç\94¨ä¸\80个 -c/-C/-F/--fixup é\80\89项ã\80\82"
-# 译者：中文字符串拼接，可删除前导空格
-#: builtin/init-db.c:435
-msgid " shared"
-msgstr "共享"
+#: builtin/commit.c:1183
+msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
-#: builtin/init-db.c:482
-msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
-msgstr ""
-"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
-"[<目录>]"
+#: builtin/commit.c:1191
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
-#: builtin/init-db.c:505
-msgid "permissions"
-msgstr "权限"
+#: builtin/commit.c:1208
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
-#: builtin/init-db.c:506
-msgid "specify that the git repository is to be shared amongst several users"
-msgstr "指定 git 版本库是多个用户之间共享的"
+#: builtin/commit.c:1210
+msgid "No paths with --include/--only does not make sense."
+msgstr "参数 --include/--only 不跟路径没有意义。"
-#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171
-msgid "be quiet"
-msgstr "保持安静"
+#: builtin/commit.c:1212
+msgid "Explicit paths specified without -i or -o; assuming --only paths..."
+msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."
-#: builtin/init-db.c:540 builtin/init-db.c:545
+#: builtin/commit.c:1224 builtin/tag.c:551
#, c-format
-msgid "cannot mkdir %s"
-msgstr "不能创建目录 %s"
+msgid "Invalid cleanup mode %s"
+msgstr "无效的清理模式 %s"
-#: builtin/init-db.c:549
-#, c-format
-msgid "cannot chdir to %s"
-msgstr "不能切换目录到 %s"
+#: builtin/commit.c:1229
+msgid "Paths with -a does not make sense."
+msgstr "路径和 -a 选项同时使用没有意义。"
-#: builtin/init-db.c:570
-#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
-msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
+#: builtin/commit.c:1339 builtin/commit.c:1612
+msgid "show status concisely"
+msgstr "以简洁的格式显示状态"
-#: builtin/init-db.c:598
-#, c-format
-msgid "Cannot access work tree '%s'"
-msgstr "不能访问工作区 '%s'"
+#: builtin/commit.c:1341 builtin/commit.c:1614
+msgid "show branch information"
+msgstr "显示分支信息"
-#: builtin/interpret-trailers.c:15
-msgid ""
-"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
-"[<file>...]"
-msgstr ""
-"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
-">...]"
+#: builtin/commit.c:1343
+msgid "version"
+msgstr "版本"
-#: builtin/interpret-trailers.c:25
-msgid "trim empty trailers"
-msgstr "删除空签名"
+#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
+#: builtin/worktree.c:448
+msgid "machine-readable output"
+msgstr "机器可读的输出"
-#: builtin/interpret-trailers.c:26
-msgid "trailer"
-msgstr "签名"
+#: builtin/commit.c:1346 builtin/commit.c:1618
+msgid "show status in long format (default)"
+msgstr "以长格式显示状态（默认）"
-#: builtin/interpret-trailers.c:27
-msgid "trailer(s) to add"
-msgstr "要添加的签名"
+#: builtin/commit.c:1349 builtin/commit.c:1621
+msgid "terminate entries with NUL"
+msgstr "条目以 NUL 字符结尾"
-#: builtin/log.c:41
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
-msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
+#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:411
+msgid "mode"
+msgstr "模式"
-#: builtin/log.c:42
-msgid "git show [<options>] <object>..."
-msgstr "git show [<选项>] <对象>..."
+#: builtin/commit.c:1352 builtin/commit.c:1624
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
-#: builtin/log.c:81
-#, c-format
-msgid "invalid --decorate option: %s"
-msgstr "无效的 --decorate 选项：%s"
+#: builtin/commit.c:1355
+msgid "show ignored files"
+msgstr "显示忽略的文件"
-#: builtin/log.c:127
-msgid "suppress diff output"
-msgstr "ä¸\8dæ\98¾ç¤ºå·®å¼\82è¾\93å\87º"
+#: builtin/commit.c:1356 parse-options.h:155
+msgid "when"
+msgstr "ä½\95æ\97¶"
-#: builtin/log.c:128
-msgid "show source"
-msgstr "显示源"
+#: builtin/commit.c:1357
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
-#: builtin/log.c:129
-msgid "Use mail map file"
-msgstr "使ç\94¨é\82®ä»¶æ\98 å°\84æ\96\87件"
+#: builtin/commit.c:1359
+msgid "list untracked files in columns"
+msgstr "以å\88\97ç\9a\84æ\96¹å¼\8fæ\98¾ç¤ºæ\9cªè·\9f踪ç\9a\84æ\96\87件"
-#: builtin/log.c:130
-msgid "decorate options"
-msgstr "修饰选项"
+#: builtin/commit.c:1435
+msgid "couldn't look up newly created commit"
+msgstr "无法找到新创建的提交"
-#: builtin/log.c:133
-msgid "Process line range n,m in file, counting from 1"
-msgstr "处理文件中第 n 到 m 之间的行，从 1 开始"
+#: builtin/commit.c:1437
+msgid "could not parse newly created commit"
+msgstr "不能解析新创建的提交"
-#: builtin/log.c:229
-#, c-format
-msgid "Final output: %d %s\n"
-msgstr "最终输出：%d %s\n"
+#: builtin/commit.c:1482
+msgid "detached HEAD"
+msgstr "分离头指针"
-#: builtin/log.c:458
-#, c-format
-msgid "git show %s: bad file"
-msgstr "git show %s: 损坏的文件"
+# 译者：中文字符串拼接，可删除前导空格
+#: builtin/commit.c:1485
+msgid " (root-commit)"
+msgstr "（根提交）"
-#: builtin/log.c:472 builtin/log.c:564
-#, c-format
-msgid "Could not read object %s"
-msgstr "不能读取对象 %s"
+#: builtin/commit.c:1582
+msgid "suppress summary after successful commit"
+msgstr "提交成功后不显示概述信息"
-#: builtin/log.c:588
-#, c-format
-msgid "Unknown type: %d"
-msgstr "未知类型：%d"
+#: builtin/commit.c:1583
+msgid "show diff in commit message template"
+msgstr "在提交说明模板里显示差异"
-#: builtin/log.c:689
-msgid "format.headers without value"
-msgstr "format.headers 没有值"
+#: builtin/commit.c:1585
+msgid "Commit message options"
+msgstr "提交说明选项"
-#: builtin/log.c:773
-msgid "name of output directory is too long"
-msgstr "输出目录名太长"
+#: builtin/commit.c:1586 builtin/tag.c:409
+msgid "read message from file"
+msgstr "从文件中读取提交说明"
-#: builtin/log.c:789
-#, c-format
-msgid "Cannot open patch file %s"
-msgstr "无法打开补丁文件 %s"
+#: builtin/commit.c:1587
+msgid "author"
+msgstr "作者"
-#: builtin/log.c:803
-msgid "Need exactly one range."
-msgstr "只需要一个范围。"
+#: builtin/commit.c:1587
+msgid "override author for commit"
+msgstr "提交时覆盖作者"
-#: builtin/log.c:813
-msgid "Not a range."
-msgstr "不是一个范围。"
+#: builtin/commit.c:1588 builtin/gc.c:357
+msgid "date"
+msgstr "日期"
-#: builtin/log.c:919
-msgid "Cover letter needs email format"
-msgstr "信封需要邮件地址格式"
+#: builtin/commit.c:1588
+msgid "override date for commit"
+msgstr "提交时覆盖日期"
-#: builtin/log.c:998
-#, c-format
-msgid "insane in-reply-to: %s"
-msgstr "不正常的 in-reply-to：%s"
+#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:407
+msgid "message"
+msgstr "说明"
-#: builtin/log.c:1026
-msgid "git format-patch [<options>] [<since> | <revision-range>]"
-msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
+#: builtin/commit.c:1589
+msgid "commit message"
+msgstr "提交说明"
-#: builtin/log.c:1071
-msgid "Two output directories?"
-msgstr "两个输出目录？"
+#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
+#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
+msgid "commit"
+msgstr "提交"
-#: builtin/log.c:1186
-msgid "use [PATCH n/m] even with a single patch"
-msgstr "使用 [PATCH n/m]，即使只有一个补丁"
+#: builtin/commit.c:1590
+msgid "reuse and edit message from specified commit"
+msgstr "重用并编辑指定提交的提交说明"
-#: builtin/log.c:1189
-msgid "use [PATCH] even with multiple patches"
-msgstr "使用 [PATCH]，即使有多个补丁"
+#: builtin/commit.c:1591
+msgid "reuse message from specified commit"
+msgstr "重用指定提交的提交说明"
-#: builtin/log.c:1193
-msgid "print patches to standard out"
-msgstr "打印补丁到标准输出"
+#: builtin/commit.c:1592
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
-#: builtin/log.c:1195
-msgid "generate a cover letter"
-msgstr "生成一封附信"
+#: builtin/commit.c:1593
+msgid "use autosquash formatted message to squash specified commit"
+msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
-#: builtin/log.c:1197
-msgid "use simple number sequence for output file names"
-msgstr "使用简单的数字序列作为输出文件名"
+#: builtin/commit.c:1594
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/log.c:1198
-msgid "sfx"
-msgstr "后缀"
+#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
+msgid "add Signed-off-by:"
+msgstr "添加 Signed-off-by: 签名"
-#: builtin/log.c:1199
-msgid "use <sfx> instead of '.patch'"
-msgstr "使用 <后缀> 代替 '.patch'"
+#: builtin/commit.c:1596
+msgid "use specified template file"
+msgstr "使用指定的模板文件"
-#: builtin/log.c:1201
-msgid "start numbering patches at <n> instead of 1"
-msgstr "补丁以 <n> 开始编号，而不是1"
+#: builtin/commit.c:1597
+msgid "force edit of commit"
+msgstr "强制编辑提交"
-#: builtin/log.c:1203
-msgid "mark the series as Nth re-roll"
-msgstr "标记补丁系列是第几次重制"
+# 译者：可选值，不能翻译（或是原文中笔误，应为 mode）
+#: builtin/commit.c:1598
+msgid "default"
+msgstr "default"
-#: builtin/log.c:1205
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "使用 [<前缀>] 代替 [PATCH]"
+#: builtin/commit.c:1598 builtin/tag.c:412
+msgid "how to strip spaces and #comments from message"
+msgstr "设置如何删除提交说明里的空格和#注释"
-#: builtin/log.c:1208
-msgid "store resulting files in <dir>"
-msgstr "把结果文件存储在 <目录>"
+#: builtin/commit.c:1599
+msgid "include status in commit message template"
+msgstr "在提交说明模板里包含状态信息"
-#: builtin/log.c:1211
-msgid "don't strip/add [PATCH]"
-msgstr "不删除/添加 [PATCH]"
+#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
+#: builtin/revert.c:112
+msgid "GPG sign commit"
+msgstr "GPG 提交签名"
-#: builtin/log.c:1214
-msgid "don't output binary diffs"
-msgstr "不输出二进制差异"
+#: builtin/commit.c:1604
+msgid "Commit contents options"
+msgstr "提交内容选项"
-#: builtin/log.c:1216
-msgid "don't include a patch matching a commit upstream"
-msgstr "不包含已在上游提交中的补丁"
+#: builtin/commit.c:1605
+msgid "commit all changed files"
+msgstr "提交所有改动的文件"
-#: builtin/log.c:1218
-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ï¼\89"
+#: builtin/commit.c:1606
+msgid "add specified files to index for commit"
+msgstr "æ·»å\8a æ\8c\87å®\9aç\9a\84æ\96\87件å\88°ç´¢å¼\95å\8cºç\89å¾\85æ\8f\90交"
-#: builtin/log.c:1220
-msgid "Messaging"
-msgstr "邮件发送"
+#: builtin/commit.c:1607
+msgid "interactively add files"
+msgstr "交互式添加文件"
-#: builtin/log.c:1221
-msgid "header"
-msgstr "header"
+#: builtin/commit.c:1608
+msgid "interactively add changes"
+msgstr "交互式添加变更"
-#: builtin/log.c:1222
-msgid "add email header"
-msgstr "添加邮件头"
+#: builtin/commit.c:1609
+msgid "commit only specified files"
+msgstr "只提交指定的文件"
-#: builtin/log.c:1223 builtin/log.c:1225
-msgid "email"
-msgstr "邮件地址"
+#: builtin/commit.c:1610
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "绕过 pre-commit 和 commit-msg 钩子"
-#: builtin/log.c:1223
-msgid "add To: header"
-msgstr "æ·»å\8a æ\94¶ä»¶äºº"
+#: builtin/commit.c:1611
+msgid "show what would be committed"
+msgstr "æ\98¾ç¤ºå°\86è¦\81æ\8f\90交ç\9a\84å\86\85容"
-#: builtin/log.c:1225
-msgid "add Cc: header"
-msgstr "添加抄送"
+#: builtin/commit.c:1622
+msgid "amend previous commit"
+msgstr "修改先前的提交"
-#: builtin/log.c:1227
-msgid "ident"
-msgstr "标识"
+#: builtin/commit.c:1623
+msgid "bypass post-rewrite hook"
+msgstr "绕过 post-rewrite 钩子"
-#: builtin/log.c:1228
-msgid "set From address to <ident> (or committer ident if absent)"
-msgstr "å°\86 From å\9c°å\9d\80设置为 <æ \87è¯\86>ï¼\88å¦\82è\8b¥ä¸\8dæ\8f\90ä¾\9bï¼\8cå\88\99ç\94¨æ\8f\90交è\80\85IDå\81\9a为å\9c°å\9d\80ï¼\89"
+#: builtin/commit.c:1628
+msgid "ok to record an empty change"
+msgstr "å\85\81许ä¸\80个空æ\8f\90交"
-#: builtin/log.c:1230
-msgid "message-id"
-msgstr "邮件标识"
+#: builtin/commit.c:1630
+msgid "ok to record a change with an empty message"
+msgstr "允许空的提交说明"
-#: builtin/log.c:1231
-msgid "make first mail a reply to <message-id>"
-msgstr "使第ä¸\80å°\81é\82®ä»¶ä½\9c为对 <é\82®ä»¶æ \87è¯\86> ç\9a\84å\9b\9eå¤\8d"
+#: builtin/commit.c:1659
+msgid "could not parse HEAD commit"
+msgstr "ä¸\8dè\83½è§£æ\9e\90 HEAD æ\8f\90交"
-#: builtin/log.c:1232 builtin/log.c:1235
-msgid "boundary"
-msgstr "边界"
+#: builtin/commit.c:1707
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "损坏的 MERGE_HEAD 文件（%s）"
-#: builtin/log.c:1233
-msgid "attach the patch"
-msgstr "附件方式添加补丁"
+#: builtin/commit.c:1714
+msgid "could not read MERGE_MODE"
+msgstr "不能读取 MERGE_MODE"
-#: builtin/log.c:1236
-msgid "inline the patch"
-msgstr "内联显示补丁"
+#: builtin/commit.c:1733
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "不能读取提交说明：%s"
-#: builtin/log.c:1240
-msgid "enable message threading, styles: shallow, deep"
-msgstr "启用邮件线索，风格：浅，深"
+#: builtin/commit.c:1744
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "终止提交；您未更改来自模版的提交说明。\n"
-#: builtin/log.c:1242
-msgid "signature"
-msgstr "签名"
+#: builtin/commit.c:1749
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "终止提交因为提交说明为空。\n"
-#: builtin/log.c:1243
-msgid "add a signature"
-msgstr "添加一个签名"
+#: builtin/commit.c:1797
+msgid ""
+"Repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full and quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
+msgstr ""
+"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
+"或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
-#: builtin/log.c:1245
-msgid "add a signature from a file"
-msgstr "从文件添加一个签名"
+#: builtin/config.c:9
+msgid "git config [<options>]"
+msgstr "git config [<选项>]"
-#: builtin/log.c:1246
-msgid "don't print the patch filenames"
-msgstr "不要打印补丁文件名"
+#: builtin/config.c:56
+msgid "Config file location"
+msgstr "配置文件位置"
-#: builtin/log.c:1320
-#, c-format
-msgid "invalid ident line: %s"
-msgstr "包含无效的身份标识：%s"
+#: builtin/config.c:57
+msgid "use global config file"
+msgstr "使用全局配置文件"
-#: builtin/log.c:1335
-msgid "-n and -k are mutually exclusive."
-msgstr "-n 和 -k 互斥。"
+#: builtin/config.c:58
+msgid "use system config file"
+msgstr "使用系统级配置文件"
-#: builtin/log.c:1337
-msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "--subject-prefix 和 -k 互斥。"
+#: builtin/config.c:59
+msgid "use repository config file"
+msgstr "使用仓库级配置文件"
-#: builtin/log.c:1345
-msgid "--name-only does not make sense"
-msgstr "--name-only 无意义"
+#: builtin/config.c:60
+msgid "use given config file"
+msgstr "使用指定的配置文件"
-#: builtin/log.c:1347
-msgid "--name-status does not make sense"
-msgstr "--name-status 无意义"
+#: builtin/config.c:61
+msgid "blob-id"
+msgstr "数据对象 ID"
-#: builtin/log.c:1349
-msgid "--check does not make sense"
-msgstr "--check 无意义"
+#: builtin/config.c:61
+msgid "read config from given blob object"
+msgstr "从给定的数据对象读取配置"
-#: builtin/log.c:1372
-msgid "standard output, or directory, which one?"
-msgstr "æ \87å\87\86è¾\93å\87ºæ\88\96ç\9b®å½\95ï¼\8cå\93ªä¸\80个ï¼\9f"
+#: builtin/config.c:62
+msgid "Action"
+msgstr "æ\93\8dä½\9c"
-#: builtin/log.c:1374
-#, c-format
-msgid "Could not create directory '%s'"
-msgstr "不能创建目录 '%s'"
+#: builtin/config.c:63
+msgid "get value: name [value-regex]"
+msgstr "获取值：name [value-regex]"
-#: builtin/log.c:1472
-#, c-format
-msgid "unable to read signature file '%s'"
-msgstr "无法读取签名文件 '%s'"
+#: builtin/config.c:64
+msgid "get all values: key [value-regex]"
+msgstr "获得所有的值：key [value-regex]"
-#: builtin/log.c:1535
-msgid "Failed to create output files"
-msgstr "æ\97 æ³\95å\88\9b建è¾\93å\87ºæ\96\87件"
+#: builtin/config.c:65
+msgid "get values for regexp: name-regex [value-regex]"
+msgstr "æ ¹æ\8d®æ£å\88\99表达å¼\8fè\8e·å¾\97å\80¼ï¼\9aname-regex [value-regex]"
-#: builtin/log.c:1583
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
-msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
+#: builtin/config.c:66
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "获得 URL 取值：section[.var] URL"
-#: builtin/log.c:1637
-#, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
-msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
+#: builtin/config.c:67
+msgid "replace all matching variables: name value [value_regex]"
+msgstr "替换所有匹配的变量：name value [value_regex]"
-#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662
-#, c-format
-msgid "Unknown commit %s"
-msgstr "未知提交 %s"
+#: builtin/config.c:68
+msgid "add a new variable: name value"
+msgstr "添加一个新的变量：name value"
-#: builtin/ls-files.c:358
-msgid "git ls-files [<options>] [<file>...]"
-msgstr "git ls-files [<选项>] [<文件>...]"
+#: builtin/config.c:69
+msgid "remove a variable: name [value-regex]"
+msgstr "删除一个变量：name [value-regex]"
-#: builtin/ls-files.c:415
-msgid "identify the file status with tags"
-msgstr "用标签标识文件的状态"
+#: builtin/config.c:70
+msgid "remove all matches: name [value-regex]"
+msgstr "删除所有匹配项：name [value-regex]"
-#: builtin/ls-files.c:417
-msgid "use lowercase letters for 'assume unchanged' files"
-msgstr "使用小写字母表示 '假设未改变的' 文件"
+#: builtin/config.c:71
+msgid "rename section: old-name new-name"
+msgstr "重命名小节：old-name new-name"
-#: builtin/ls-files.c:419
-msgid "show cached files in the output (default)"
-msgstr "显示缓存的文件（默认）"
+#: builtin/config.c:72
+msgid "remove a section: name"
+msgstr "删除一个小节：name"
-#: builtin/ls-files.c:421
-msgid "show deleted files in the output"
-msgstr "显示已删除的文件"
+#: builtin/config.c:73
+msgid "list all"
+msgstr "列出所有"
-#: builtin/ls-files.c:423
-msgid "show modified files in the output"
-msgstr "æ\98¾ç¤ºå·²ä¿®æ\94¹ç\9a\84æ\96\87件"
+#: builtin/config.c:74
+msgid "open an editor"
+msgstr "æ\89\93å¼\80ä¸\80个ç¼\96è¾\91å\99¨"
-#: builtin/ls-files.c:425
-msgid "show other files in the output"
-msgstr "显示其它文件"
+#: builtin/config.c:75
+msgid "find the color configured: slot [default]"
+msgstr "获得配置的颜色：配置 [默认]"
-#: builtin/ls-files.c:427
-msgid "show ignored files in the output"
-msgstr "显示忽略的文件"
+#: builtin/config.c:76
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr "获得颜色设置：配置 [stdout-is-tty]"
-#: builtin/ls-files.c:430
-msgid "show staged contents' object name in the output"
-msgstr "显示暂存区内容的对象名称"
+#: builtin/config.c:77
+msgid "Type"
+msgstr "类型"
-#: builtin/ls-files.c:432
-msgid "show files on the filesystem that need to be removed"
-msgstr "显示文件系统需要删除的文件"
+#: builtin/config.c:78
+msgid "value is \"true\" or \"false\""
+msgstr "值是 \"true\" 或 \"false\""
-#: builtin/ls-files.c:434
-msgid "show 'other' directories' names only"
-msgstr "å\8fªæ\98¾ç¤ºâ\80\9cå\85¶ä»\96â\80\9dç\9b®å½\95ç\9a\84å\90\8d称"
+#: builtin/config.c:79
+msgid "value is decimal number"
+msgstr "å\80¼æ\98¯å\8d\81è¿\9bå\88¶æ\95°"
-#: builtin/ls-files.c:437
-msgid "don't show empty directories"
-msgstr "不显示空目录"
+#: builtin/config.c:80
+msgid "value is --bool or --int"
+msgstr "值是 --bool or --int"
-#: builtin/ls-files.c:440
-msgid "show unmerged files in the output"
-msgstr "显示未合并的文件"
+#: builtin/config.c:81
+msgid "value is a path (file or directory name)"
+msgstr "值是一个路径（文件或目录名）"
-#: builtin/ls-files.c:442
-msgid "show resolve-undo information"
-msgstr "显示 resolve-undo 信息"
+#: builtin/config.c:82
+msgid "Other"
+msgstr "其它"
-#: builtin/ls-files.c:444
-msgid "skip files matching pattern"
-msgstr "匹配排除文件的模式"
+#: builtin/config.c:83
+msgid "terminate values with NUL byte"
+msgstr "终止值是 NUL 字节"
-#: builtin/ls-files.c:447
-msgid "exclude patterns are read from <file>"
-msgstr "从 <文件> 中读取排除模式"
+#: builtin/config.c:84
+msgid "show variable names only"
+msgstr "只显示变量名"
-#: builtin/ls-files.c:450
-msgid "read additional per-directory exclude patterns in <file>"
-msgstr "从 <文件> 读取额外的每个目录的排除模式"
+#: builtin/config.c:85
+msgid "respect include directives on lookup"
+msgstr "查询时参照 include 指令递归查找"
-#: builtin/ls-files.c:452
-msgid "add the standard git exclusions"
-msgstr "æ·»å\8a æ \87å\87\86ç\9a\84 git æ\8e\92é\99¤"
+#: builtin/config.c:86
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr "æ\98¾ç¤ºé\85\8dç½®ç\9a\84æ\9d¥æº\90ï¼\88æ\96\87件ã\80\81æ \87å\87\86è¾\93å\85¥ã\80\81æ\95°æ\8d®å¯¹è±¡ï¼\8cæ\88\96å\91½ä»¤è¡\8cï¼\89"
-#: builtin/ls-files.c:455
-msgid "make the output relative to the project top directory"
-msgstr "显示相对于顶级目录的文件名"
+#: builtin/config.c:328
+msgid "unable to parse default color value"
+msgstr "不能解析默认颜色值"
-#: builtin/ls-files.c:458
-msgid "if any <file> is not in the index, treat this as an error"
-msgstr "如果任何 <文件> 都不在索引区，视为错误"
+#: builtin/config.c:472
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+msgstr ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
-#: builtin/ls-files.c:459
-msgid "tree-ish"
-msgstr "树或提交"
+#: builtin/config.c:615
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "不能创建配置文件 %s"
-#: builtin/ls-files.c:460
-msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
-
-#: builtin/ls-files.c:462
-msgid "show debugging data"
-msgstr "显示调试数据"
+#: builtin/config.c:627
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"无法用一个值覆盖多个值\n"
+" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
-#: builtin/ls-tree.c:28
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
+#: builtin/count-objects.c:86
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/ls-tree.c:127
-msgid "only show trees"
-msgstr "只显示树"
+#: builtin/count-objects.c:96
+msgid "print sizes in human readable format"
+msgstr "以用户可读的格式显示大小"
-#: builtin/ls-tree.c:129
-msgid "recurse into subtrees"
-msgstr "递归到子树"
+#: builtin/describe.c:18
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<选项>] [<提交号>...]"
-#: builtin/ls-tree.c:131
-msgid "show trees when recursing"
-msgstr "当递归时显示树"
+#: builtin/describe.c:19
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<选项>] --dirty"
-#: builtin/ls-tree.c:134
-msgid "terminate entries with NUL byte"
-msgstr "条目以NUL字符终止"
+#: builtin/describe.c:53
+msgid "head"
+msgstr "头"
-#: builtin/ls-tree.c:135
-msgid "include object size"
-msgstr "包括对象大小"
+#: builtin/describe.c:53
+msgid "lightweight"
+msgstr "轻量级的"
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
-msgid "list only filenames"
-msgstr "只列出文件名"
+#: builtin/describe.c:53
+msgid "annotated"
+msgstr "附注的"
-#: builtin/ls-tree.c:142
-msgid "use full path names"
-msgstr "使用文件的全路径"
+#: builtin/describe.c:250
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "附注标签 %s 无效"
-#: builtin/ls-tree.c:144
-msgid "list entire tree; not just current directory (implies --full-name)"
-msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）"
+#: builtin/describe.c:254
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr "附注标签 %s 没有嵌入名称"
-#: builtin/merge.c:45
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<选项>] [<提交>...]"
+#: builtin/describe.c:256
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr "标签 '%s' 的确是在 '%s'"
-#: builtin/merge.c:46
-msgid "git merge [<options>] <msg> HEAD <commit>"
-msgstr "git merge [<选项>] <说明> HEAD <提交>"
+#: builtin/describe.c:283 builtin/log.c:487
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "不是一个有效的对象名 %s"
-#: builtin/merge.c:47
-msgid "git merge --abort"
-msgstr "git merge --abort"
+#: builtin/describe.c:286
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s 不是一个有效的 '%s' 对象"
-#: builtin/merge.c:100
-msgid "switch `m' requires a value"
-msgstr "开关 `m' 需要一个值"
+#: builtin/describe.c:303
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "没有标签准确匹配 '%s'"
-#: builtin/merge.c:137
+#: builtin/describe.c:305
#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr "不能找到合并策略 '%s'。\n"
+msgid "searching to describe %s\n"
+msgstr "搜索描述 %s\n"
-#: builtin/merge.c:138
+#: builtin/describe.c:352
#, c-format
-msgid "Available strategies are:"
-msgstr "å\8f¯ç\94¨ç\9a\84ç\96ç\95¥æ\9c\89ï¼\9a"
+msgid "finished search at %s\n"
+msgstr "å®\8cæ\88\90æ\90\9cç´¢ %s\n"
-#: builtin/merge.c:143
+#: builtin/describe.c:379
#, c-format
-msgid "Available custom strategies are:"
-msgstr "可用的自定义策略有："
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+"没有附注标签能描述 '%s'。\n"
+"然而，存在未附注标签：尝试 --tags。"
-#: builtin/merge.c:193
-msgid "do not show a diffstat at the end of the merge"
-msgstr "在合并的最后不显示差异统计"
+#: builtin/describe.c:383
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+"没有标签能描述 '%s'。\n"
+"尝试 --always，或者创建一些标签。"
-#: builtin/merge.c:196
-msgid "show a diffstat at the end of the merge"
-msgstr "在合并的最后显示差异统计"
+#: builtin/describe.c:413
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "已遍历 %lu 个提交\n"
-#: builtin/merge.c:197
-msgid "(synonym to --stat)"
-msgstr "（和 --stat 同义）"
+#: builtin/describe.c:416
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+msgstr ""
+"发现多于 %i 个标签，列出最近的 %i 个\n"
+"在 %s 放弃搜索\n"
-#: builtin/merge.c:199
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr "å\9c¨å\90\88并æ\8f\90交信æ\81¯ä¸æ·»å\8a ï¼\88æ\9c\80å¤\9a <n> æ\9d¡ï¼\89ç²¾ç®\80æ\8f\90交记å½\95"
+#: builtin/describe.c:438
+msgid "find the tag that comes after the commit"
+msgstr "寻æ\89¾è¯¥æ\8f\90交ä¹\8bå\90\8eç\9a\84æ \87ç¾"
-#: builtin/merge.c:202
-msgid "create a single commit instead of doing a merge"
-msgstr "å\88\9b建ä¸\80个å\8d\95ç\8b¬ç\9a\84æ\8f\90交è\80\8cä¸\8dæ\98¯å\81\9aä¸\80次å\90\88并"
+#: builtin/describe.c:439
+msgid "debug search strategy on stderr"
+msgstr "å\9c¨æ \87å\87\86é\94\99误ä¸\8aè°\83è¯\95æ\90\9cç´¢ç\96ç\95¥"
-#: builtin/merge.c:204
-msgid "perform a commit if the merge succeeds (default)"
-msgstr "如果合并成功，执行一次提交（默认）"
+#: builtin/describe.c:440
+msgid "use any ref"
+msgstr "使用任意引用"
-#: builtin/merge.c:206
-msgid "edit message before committing"
-msgstr "在提交前编辑提交说明"
+#: builtin/describe.c:441
+msgid "use any tag, even unannotated"
+msgstr "使用任意标签，即使未附带注释"
-#: builtin/merge.c:207
-msgid "allow fast-forward (default)"
-msgstr "å\85\81许快è¿\9bï¼\88é»\98认ï¼\89"
+#: builtin/describe.c:442
+msgid "always use long format"
+msgstr "å§\8bç»\88使ç\94¨é\95¿æ\8f\90交å\8f·æ ¼å¼\8f"
-#: builtin/merge.c:209
-msgid "abort if fast-forward is not possible"
-msgstr "å¦\82æ\9e\9cä¸\8dè\83½å¿«è¿\9bå°±æ\94¾å¼\83å\90\88并"
+#: builtin/describe.c:443
+msgid "only follow first parent"
+msgstr "å\8fªè·\9fé\9a\8f第ä¸\80个ç\88¶æ\8f\90交"
-#: builtin/merge.c:213
-msgid "Verify that the named commit has a valid GPG signature"
-msgstr "éª\8cè¯\81æ\8c\87å®\9aç\9a\84æ\8f\90交æ\98¯å\90¦å\8c\85å\90«ä¸\80个æ\9c\89æ\95\88ç\9a\84 GPG ç¾å\90\8d"
+#: builtin/describe.c:446
+msgid "only output exact matches"
+msgstr "å\8fªè¾\93å\87ºç²¾ç¡®å\8c¹é\85\8d"
-#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
-msgid "strategy"
-msgstr "策略"
+#: builtin/describe.c:448
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "考虑最近 <n> 个标签（默认：10）"
-#: builtin/merge.c:215
-msgid "merge strategy to use"
-msgstr "要使用的合并策略"
+#: builtin/describe.c:450
+msgid "only consider tags matching <pattern>"
+msgstr "只考虑匹配 <模式> 的标签"
-#: builtin/merge.c:216
-msgid "option=value"
-msgstr "option=value"
+#: builtin/describe.c:452
+msgid "do not consider tags matching <pattern>"
+msgstr "不考虑匹配 <模式> 的标签"
-#: builtin/merge.c:217
-msgid "option for selected merge strategy"
-msgstr "æ\89\80é\80\89ç\9a\84å\90\88并ç\96ç\95¥ç\9a\84é\80\89项"
+#: builtin/describe.c:454 builtin/name-rev.c:357
+msgid "show abbreviated commit object as fallback"
+msgstr "æ\98¾ç¤ºç®\80å\86\99ç\9a\84æ\8f\90交å\8f·ä½\9c为å\90\8eå¤\87"
-#: builtin/merge.c:219
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "合并的提交说明（针对非快进式合并）"
+#: builtin/describe.c:455 builtin/describe.c:458
+msgid "mark"
+msgstr "标记"
-#: builtin/merge.c:223
-msgid "abort the current in-progress merge"
-msgstr "放弃当前正在进行的合并"
+#: builtin/describe.c:456
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
-#: builtin/merge.c:251
-msgid "could not run stash."
-msgstr "不能进行进度保存。"
+#: builtin/describe.c:459
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）"
-#: builtin/merge.c:256
-msgid "stash failed"
-msgstr "进度保存失败"
+#: builtin/describe.c:477
+msgid "--long is incompatible with --abbrev=0"
+msgstr "--long 与 --abbrev=0 不兼容"
-#: builtin/merge.c:261
-#, c-format
-msgid "not a valid object: %s"
-msgstr "不是一个有效对象：%s"
+#: builtin/describe.c:506
+msgid "No names found, cannot describe anything."
+msgstr "没有发现名称，无法描述任何东西。"
-#: builtin/merge.c:280 builtin/merge.c:297
-msgid "read-tree failed"
-msgstr "读取树失败"
+#: builtin/describe.c:549
+msgid "--dirty is incompatible with commit-ishes"
+msgstr "--dirty 与提交号不兼容"
-# 译者：注意保持前导空格
-#: builtin/merge.c:327
-msgid " (nothing to squash)"
-msgstr " （无可压缩）"
+#: builtin/describe.c:551
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken 与提交号不兼容"
-#: builtin/merge.c:340
+#: builtin/diff.c:83
#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "压缩提交 -- 未更新 HEAD\n"
+msgid "'%s': not a regular file or symlink"
+msgstr "'%s'：不是一个正规文件或符号链接"
-#: builtin/merge.c:372
-msgid "Writing SQUASH_MSG"
-msgstr "写入 SQUASH_MSG"
+#: builtin/diff.c:234
+#, c-format
+msgid "invalid option: %s"
+msgstr "无效选项：%s"
-#: builtin/merge.c:374
-msgid "Finishing SQUASH_MSG"
-msgstr "完成 SQUASH_MSG"
+#: builtin/diff.c:358
+msgid "Not a git repository"
+msgstr "不是一个 git 仓库"
-#: builtin/merge.c:397
+#: builtin/diff.c:401
#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr "æ\97 å\90\88并信æ\81¯ -- æ\9cªæ\9b´æ\96° HEAD\n"
+msgid "invalid object '%s' given."
+msgstr "æ\8f\90ä¾\9bäº\86æ\97 æ\95\88对象 '%s'ã\80\82"
-#: builtin/merge.c:447
+#: builtin/diff.c:410
#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "'%s' 没有指向一个提交"
+msgid "more than two blobs given: '%s'"
+msgstr "提供了超过两个数据对象：'%s'"
-#: builtin/merge.c:537
+#: builtin/diff.c:417
#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
-
-#: builtin/merge.c:632
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree 无法写入一树对象"
+msgid "unhandled object '%s' given."
+msgstr "无法处理的对象 '%s'。"
-#: builtin/merge.c:656
-msgid "Not handling anything other than two heads merge."
-msgstr "不能处理两个头合并之外的任何操作。"
+#: builtin/difftool.c:28
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
-#: builtin/merge.c:670
+#: builtin/difftool.c:241
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "merge-recursive 的未知选项：-X%s"
+msgid "failed: %d"
+msgstr "失败：%d"
-#: builtin/merge.c:683
+#: builtin/difftool.c:283
#, c-format
-msgid "unable to write %s"
-msgstr "不能写 %s"
+msgid "could not read symlink %s"
+msgstr "无法读取符号链接 %s"
-#: builtin/merge.c:772
+#: builtin/difftool.c:285
#, c-format
-msgid "Could not read from '%s'"
-msgstr "不能从 '%s' 读取"
+msgid "could not read symlink file %s"
+msgstr "无法读取符号链接文件 %s"
-#: builtin/merge.c:781
+#: builtin/difftool.c:293
#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr "æ\9cªæ\8f\90交å\90\88并ï¼\8c使ç\94¨ 'git commit' å®\8cæ\88\90æ¤æ¬¡å\90\88并ã\80\82\n"
+msgid "could not read object %s for symlink %s"
+msgstr "æ\97 æ³\95读å\8f\96符å\8f·é\93¾æ\8e¥ %2$s æ\8c\87å\90\91ç\9a\84对象 %1$s"
-#: builtin/merge.c:787
-#, c-format
+#: builtin/difftool.c:395
msgid ""
-"Please enter a commit message to explain why this merge is necessary,\n"
-"especially if it merges an updated upstream into a topic branch.\n"
-"\n"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-"请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n"
-"合并到主题分支。\n"
-"\n"
-"以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
-
-#: builtin/merge.c:811
-msgid "Empty commit message."
-msgstr "空提交信息。"
+"不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--"
+"cc'）。"
-#: builtin/merge.c:823
+#: builtin/difftool.c:609
#, c-format
-msgid "Wonderful.\n"
-msgstr "太棒了。\n"
+msgid "both files modified: '%s' and '%s'."
+msgstr "两个文件都被修改：'%s' 和 '%s'。"
-#: builtin/merge.c:878
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
+#: builtin/difftool.c:611
+msgid "working tree file has been left."
+msgstr "工作区文件被留了下来。"
-#: builtin/merge.c:894
+#: builtin/difftool.c:622
#, c-format
-msgid "'%s' is not a commit"
-msgstr "'%s' 不是一个提交"
+msgid "temporary files exist in '%s'."
+msgstr "临时文件存在于 '%s'。"
-#: builtin/merge.c:935
-msgid "No current branch."
-msgstr "没æ\9c\89å½\93å\89\8då\88\86æ\94¯。"
+#: builtin/difftool.c:623
+msgid "you may want to cleanup or recover these."
+msgstr "æ\82¨å\8f¯è\83½æ\83³è¦\81æ¸\85ç\90\86æ\88\96è\80\85æ\81¢å¤\8då®\83们。"
-#: builtin/merge.c:937
-msgid "No remote for the current branch."
-msgstr "当前分支没有对应的远程版本库。"
+#: builtin/difftool.c:669
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/merge.c:939
-msgid "No default upstream defined for the current branch."
-msgstr "当前分支没有定义默认的上游分支。"
+#: builtin/difftool.c:671
+msgid "perform a full-directory diff"
+msgstr "执行一个全目录差异比较"
-#: builtin/merge.c:944
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
+#: builtin/difftool.c:673
+msgid "do not prompt before launching a diff tool"
+msgstr "启动差异比较工具之前不提示"
-#: builtin/merge.c:1081
-#, c-format
-msgid "could not close '%s'"
-msgstr "不能关闭 '%s'"
+#: builtin/difftool.c:679
+msgid "use symlinks in dir-diff mode"
+msgstr "在 dir-diff 模式中使用符号链接"
-#: builtin/merge.c:1208
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
+#: builtin/difftool.c:680
+msgid "<tool>"
+msgstr "<工具>"
-#: builtin/merge.c:1224
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
-"请在合并前先提交您的修改。"
+#: builtin/difftool.c:681
+msgid "use the specified diff tool"
+msgstr "使用指定的差异比较工具"
-#: builtin/merge.c:1227 git-pull.sh:74
-msgid "You have not concluded your merge (MERGE_HEAD exists)."
-msgstr "æ\82¨å°\9aæ\9cªç»\93æ\9d\9fæ\82¨ç\9a\84å\90\88并ï¼\88å\98å\9c¨ MERGE_HEADï¼\89ã\80\82"
+#: builtin/difftool.c:683
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr "æ\98¾ç¤ºå\8f¯ä»¥ç\94¨å\9c¨ `--tool` å\8f\82æ\95°å\90\8eç\9a\84å·®å¼\82å·¥å\85·å\88\97表"
-#: builtin/merge.c:1231
+#: builtin/difftool.c:686
msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
-"请在合并前先提交您的修改。"
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出"
-#: builtin/merge.c:1234
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
+#: builtin/difftool.c:688
+msgid "<command>"
+msgstr "<命令>"
-#: builtin/merge.c:1243
-msgid "You cannot combine --squash with --no-ff."
-msgstr "æ\82¨ä¸\8dè\83½å°\86 --squash ä¸\8e --no-ff å\90\8cæ\97¶ä½¿ç\94¨ã\80\82"
+#: builtin/difftool.c:689
+msgid "specify a custom command for viewing diffs"
+msgstr "æ\8c\87å®\9aä¸\80个ç\94¨äº\8eæ\9f¥ç\9c\8bå·®å¼\82ç\9a\84è\87ªå®\9aä¹\89å\91½ä»¤"
-#: builtin/merge.c:1251
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "æ\9cªæ\8c\87å®\9aæ\8f\90交并ä¸\94 merge.defaultToUpstream æ\9cªè®¾ç½®ã\80\82"
+#: builtin/difftool.c:713
+msgid "no <tool> given for --tool=<tool>"
+msgstr "没æ\9c\89为 --tool=<å·¥å\85·> å\8f\82æ\95°æ\8f\90ä¾\9b <å·¥å\85·>"
-#: builtin/merge.c:1268
-msgid "Squash commit into empty head not supported yet"
-msgstr "尚不支持到空分支的压缩提交"
+#: builtin/difftool.c:720
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
-#: builtin/merge.c:1270
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr "到空分支的非快进式提交没有意义"
+#: builtin/fast-export.c:25
+msgid "git fast-export [rev-list-opts]"
+msgstr "git fast-export [rev-list-opts]"
-#: builtin/merge.c:1276
-#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s - 不能被合并"
+#: builtin/fast-export.c:980
+msgid "show progress after <n> objects"
+msgstr "在 <n> 个对象之后显示进度"
-#: builtin/merge.c:1278
-msgid "Can merge only exactly one commit into empty head"
-msgstr "只能将一个提交合并到空分支上"
-
-#: builtin/merge.c:1333
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
+#: builtin/fast-export.c:982
+msgid "select handling of signed tags"
+msgstr "选择如何处理签名标签"
-#: builtin/merge.c:1336
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
+#: builtin/fast-export.c:985
+msgid "select handling of tags that tag filtered objects"
+msgstr "选择当标签指向被过滤对象时该标签的处理方式"
-#: builtin/merge.c:1339
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "提交 %s 没有一个 GPG 签名。"
+#: builtin/fast-export.c:988
+msgid "Dump marks to this file"
+msgstr "把标记存储到这个文件"
-#: builtin/merge.c:1342
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
+#: builtin/fast-export.c:990
+msgid "Import marks from this file"
+msgstr "从这个文件导入标记"
-#: builtin/merge.c:1423
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr "更新 %s..%s\n"
+#: builtin/fast-export.c:992
+msgid "Fake a tagger when tags lack one"
+msgstr "当标签缺少标记者字段时，假装提供一个"
-#: builtin/merge.c:1462
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "尝试非常小的索引内合并...\n"
+#: builtin/fast-export.c:994
+msgid "Output full tree for each commit"
+msgstr "每次提交都输出整个树"
-#: builtin/merge.c:1469
-#, c-format
-msgid "Nope.\n"
-msgstr "无。\n"
+#: builtin/fast-export.c:996
+msgid "Use the done feature to terminate the stream"
+msgstr "使用 done 功能来终止流"
-#: builtin/merge.c:1501
-msgid "Not possible to fast-forward, aborting."
-msgstr "无法快进，终止。"
+#: builtin/fast-export.c:997
+msgid "Skip output of blob data"
+msgstr "跳过数据对象的输出"
-#: builtin/merge.c:1524 builtin/merge.c:1603
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "将树回滚至原始状态...\n"
+#: builtin/fast-export.c:998
+msgid "refspec"
+msgstr "引用规格"
-#: builtin/merge.c:1528
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "尝试合并策略 %s...\n"
+#: builtin/fast-export.c:999
+msgid "Apply refspec to exported refs"
+msgstr "对导出的引用应用引用规格"
-#: builtin/merge.c:1594
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "没有合并策略处理此合并。\n"
+#: builtin/fast-export.c:1000
+msgid "anonymize output"
+msgstr "匿名输出"
-#: builtin/merge.c:1596
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "使用策略 %s 合并失败。\n"
+#: builtin/fetch.c:21
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/merge.c:1605
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "使用 %s 以准备手工解决。\n"
+#: builtin/fetch.c:22
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<选项>] <组>"
-#: builtin/merge.c:1617
-#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr "自动合并进展顺利，按要求在提交前停止\n"
+#: builtin/fetch.c:23
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
-#: builtin/merge-base.c:29
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <提交> <提交>..."
+#: builtin/fetch.c:24
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<选项>]"
-#: builtin/merge-base.c:30
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <提交>..."
+#: builtin/fetch.c:95 builtin/pull.c:175
+msgid "fetch from all remotes"
+msgstr "从所有的远程抓取"
-#: builtin/merge-base.c:31
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <提交>..."
+#: builtin/fetch.c:97 builtin/pull.c:178
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
-#: builtin/merge-base.c:32
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <提交> <提交>"
+#: builtin/fetch.c:99 builtin/pull.c:181
+msgid "path to upload pack on remote end"
+msgstr "上传包到远程的路径"
-#: builtin/merge-base.c:33
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <引用> [<提交>]"
+#: builtin/fetch.c:100 builtin/pull.c:183
+msgid "force overwrite of local branch"
+msgstr "强制覆盖本地分支"
-#: builtin/merge-base.c:214
-msgid "output all common ancestors"
-msgstr "输出所有共同的祖先"
+#: builtin/fetch.c:102
+msgid "fetch from multiple remotes"
+msgstr "从多个远程抓取"
-#: builtin/merge-base.c:216
-msgid "find ancestors for a single n-way merge"
-msgstr "æ\9f¥æ\89¾ä¸\80个å¤\9aè·¯å\90\88并ç\9a\84ç¥\96å\85\88æ\8f\90交"
+#: builtin/fetch.c:104 builtin/pull.c:185
+msgid "fetch all tags and associated objects"
+msgstr "æ\8a\93å\8f\96æ\89\80æ\9c\89ç\9a\84æ \87ç¾å\92\8cå\85³è\81\94对象"
-#: builtin/merge-base.c:218
-msgid "list revs not reachable from others"
-msgstr "显示不能被其他访问到的版本"
+#: builtin/fetch.c:106
+msgid "do not fetch all tags (--no-tags)"
+msgstr "不抓取任何标签(--no-tags)"
-#: builtin/merge-base.c:220
-msgid "is the first one ancestor of the other?"
-msgstr "第一个是其他的祖先提交么？"
+#: builtin/fetch.c:108
+msgid "number of submodules fetched in parallel"
+msgstr "子模组获取的并发数"
-#: builtin/merge-base.c:222
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr "æ\9f¥æ\89¾ <æ\8f\90交> ä»\8e<å¼\95ç\94¨>æ\97¥å¿\97ç\9a\84ä½\95å¤\84å\88\86æ\94¯ç\9a\84"
+#: builtin/fetch.c:110 builtin/pull.c:188
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "æ¸\85é\99¤è¿\9cç¨\8bå·²ç»\8fä¸\8då\98å\9c¨ç\9a\84å\88\86æ\94¯ç\9a\84è·\9f踪å\88\86æ\94¯"
-#: builtin/merge-file.c:8
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
-msgstr ""
-"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
-"件> <文件2>"
+# 译者：可选值，不能翻译
+#: builtin/fetch.c:111 builtin/pull.c:191
+msgid "on-demand"
+msgstr "on-demand"
-#: builtin/merge-file.c:33
-msgid "send results to standard output"
-msgstr "将结果发送到标准输出"
+#: builtin/fetch.c:112 builtin/pull.c:192
+msgid "control recursive fetching of submodules"
+msgstr "控制子模组的递归抓取"
-#: builtin/merge-file.c:34
-msgid "use a diff3 based merge"
-msgstr "使ç\94¨å\9fºäº\8e diff3 ç\9a\84å\90\88并"
+#: builtin/fetch.c:116 builtin/pull.c:200
+msgid "keep downloaded pack"
+msgstr "ä¿\9dæ\8c\81ä¸\8bè½½å\8c\85"
-#: builtin/merge-file.c:35
-msgid "for conflicts, use our version"
-msgstr "å¦\82æ\9e\9cå\86²çª\81ï¼\8c使ç\94¨æ\88\91们ç\9a\84ç\89\88æ\9c¬"
+#: builtin/fetch.c:118
+msgid "allow updating of HEAD ref"
+msgstr "å\85\81许æ\9b´æ\96° HEAD å¼\95ç\94¨"
-#: builtin/merge-file.c:37
-msgid "for conflicts, use their version"
-msgstr "如果冲突，使用他们的版本"
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
+msgid "deepen history of shallow clone"
+msgstr "深化浅克隆的历史"
-#: builtin/merge-file.c:39
-msgid "for conflicts, use a union version"
-msgstr "å¦\82æ\9e\9cå\86²çª\81ï¼\8c使ç\94¨è\81\94å\90\88ç\89\88æ\9c¬"
+#: builtin/fetch.c:123
+msgid "deepen history of shallow repository based on time"
+msgstr "å\9fºäº\8eæ\97¶é\97´æ\9d¥æ·±å\8c\96æµ\85å\85\8bé\9a\86ç\9a\84å\8e\86å\8f²"
-#: builtin/merge-file.c:42
-msgid "for conflicts, use this marker size"
-msgstr "如果冲突，使用指定长度的标记"
+#: builtin/fetch.c:129 builtin/pull.c:206
+msgid "convert to a complete repository"
+msgstr "转换为一个完整的仓库"
-#: builtin/merge-file.c:43
-msgid "do not warn about conflicts"
-msgstr "不要警告冲突"
+#: builtin/fetch.c:131 builtin/log.c:1440
+msgid "dir"
+msgstr "目录"
-#: builtin/merge-file.c:45
-msgid "set labels for file1/orig-file/file2"
-msgstr "为 文件1/初始文件/文件2 设置标签"
+#: builtin/fetch.c:132
+msgid "prepend this to submodule path output"
+msgstr "在子模组路径输出的前面加上此目录"
-#: builtin/mktree.c:64
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
+#: builtin/fetch.c:135
+msgid "default mode for recursion"
+msgstr "递归的默认模式"
-#: builtin/mktree.c:150
-msgid "input is NUL terminated"
-msgstr "输入以 NUL 字符终止"
+#: builtin/fetch.c:137 builtin/pull.c:209
+msgid "accept refs that update .git/shallow"
+msgstr "接受更新 .git/shallow 的引用"
-#: builtin/mktree.c:151 builtin/write-tree.c:24
-msgid "allow missing objects"
-msgstr "å\85\81许丢失ç\9a\84对象"
+#: builtin/fetch.c:138 builtin/pull.c:211
+msgid "refmap"
+msgstr "å¼\95ç\94¨æ\98 å°\84"
-#: builtin/mktree.c:152
-msgid "allow creation of more than one tree"
-msgstr "允许创建一个以上的树"
+#: builtin/fetch.c:139 builtin/pull.c:212
+msgid "specify fetch refmap"
+msgstr "指定获取操作的引用映射"
-#: builtin/mv.c:15
-msgid "git mv [<options>] <source>... <destination>"
-msgstr "git mv [<选项>] <源>... <目标>"
+#: builtin/fetch.c:395
+msgid "Couldn't find remote ref HEAD"
+msgstr "无法发现远程 HEAD 引用"
-#: builtin/mv.c:69
+#: builtin/fetch.c:513
#, c-format
-msgid "Directory %s is in index and no submodule?"
-msgstr "目录 %s 在索引中并且不是子模组？"
-
-#: builtin/mv.c:71
-msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "配置变量 fetch.output 包含无效值 %s"
-#: builtin/mv.c:89
+#: builtin/fetch.c:606
#, c-format
-msgid "%.*s is in index"
-msgstr "%.*s 在索引中"
+msgid "object %s not found"
+msgstr "对象 %s 未发现"
-#: builtin/mv.c:111
-msgid "force move/rename even if target exists"
-msgstr "强制移动/重命令，即使目标存在"
+#: builtin/fetch.c:610
+msgid "[up to date]"
+msgstr "[最新]"
-#: builtin/mv.c:112
-msgid "skip move/rename errors"
-msgstr "跳过移动/重命名错误"
+#: builtin/fetch.c:623 builtin/fetch.c:703
+msgid "[rejected]"
+msgstr "[已拒绝]"
-#: builtin/mv.c:151
-#, c-format
-msgid "destination '%s' is not a directory"
-msgstr "目标 '%s' 不是一个目录"
+#: builtin/fetch.c:624
+msgid "can't fetch in current branch"
+msgstr "当前分支下不能执行获取操作"
-#: builtin/mv.c:162
-#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
-msgstr "检查 '%s' 到 '%s' 的重命名\n"
+#: builtin/fetch.c:633
+msgid "[tag update]"
+msgstr "[标签更新]"
-#: builtin/mv.c:166
-msgid "bad source"
-msgstr "坏的源"
+#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
+#: builtin/fetch.c:698
+msgid "unable to update local ref"
+msgstr "不能更新本地引用"
-#: builtin/mv.c:169
-msgid "can not move directory into itself"
-msgstr "不能将目录移动到自身"
+#: builtin/fetch.c:653
+msgid "[new tag]"
+msgstr "[新标签]"
-#: builtin/mv.c:172
-msgid "cannot move directory over file"
-msgstr "不能将目录移动到文件"
+#: builtin/fetch.c:656
+msgid "[new branch]"
+msgstr "[新分支]"
-#: builtin/mv.c:181
-msgid "source directory is empty"
-msgstr "源目录为空"
+#: builtin/fetch.c:659
+msgid "[new ref]"
+msgstr "[新引用]"
-#: builtin/mv.c:206
-msgid "not under version control"
-msgstr "不在版本控制之下"
+#: builtin/fetch.c:698
+msgid "forced update"
+msgstr "强制更新"
-#: builtin/mv.c:209
-msgid "destination exists"
-msgstr "目标已存在"
+#: builtin/fetch.c:703
+msgid "non-fast-forward"
+msgstr "非快进"
-#: builtin/mv.c:217
+#: builtin/fetch.c:748
#, c-format
-msgid "overwriting '%s'"
-msgstr "覆盖 '%s'"
-
-#: builtin/mv.c:220
-msgid "Cannot overwrite"
-msgstr "不能覆盖"
-
-#: builtin/mv.c:223
-msgid "multiple sources for the same target"
-msgstr "同一目标具有多个源"
+msgid "%s did not send all necessary objects\n"
+msgstr "%s 未发送所有必须的对象\n"
-#: builtin/mv.c:225
-msgid "destination directory does not exist"
-msgstr "目标目录不存在"
+#: builtin/fetch.c:768
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr "拒绝 %s 因为浅克隆不允许被更新"
-#: builtin/mv.c:232
+#: builtin/fetch.c:855 builtin/fetch.c:951
#, c-format
-msgid "%s, source=%s, destination=%s"
-msgstr "%s，源=%s，目标=%s"
+msgid "From %.*s\n"
+msgstr "来自 %.*s\n"
-#: builtin/mv.c:253
+#: builtin/fetch.c:866
#, c-format
-msgid "Renaming %s to %s\n"
-msgstr "重命名 %s 至 %s\n"
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"一些本地引用不能被更新；尝试运行\n"
+" 'git remote prune %s' 来删除旧的、有冲突的分支"
-#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361
+# 译者：注意保持前导空格
+#: builtin/fetch.c:921
#, c-format
-msgid "renaming '%s' failed"
-msgstr "重命名 '%s' 失败"
+msgid " (%s will become dangling)"
+msgstr " （%s 将成为摇摆状态）"
-#: builtin/name-rev.c:255
-msgid "git name-rev [<options>] <commit>..."
-msgstr "git name-rev [<选项>] <提交>..."
-
-#: builtin/name-rev.c:256
-msgid "git name-rev [<options>] --all"
-msgstr "git name-rev [<选项>] --all"
-
-#: builtin/name-rev.c:257
-msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<选项>] --stdin"
+# 译者：注意保持前导空格
+#: builtin/fetch.c:922
+#, c-format
+msgid " (%s has become dangling)"
+msgstr " （%s 已成为摇摆状态）"
-#: builtin/name-rev.c:309
-msgid "print only names (no SHA-1)"
-msgstr "只打印名称（无 SHA-1）"
+#: builtin/fetch.c:954
+msgid "[deleted]"
+msgstr "[已删除]"
-#: builtin/name-rev.c:310
-msgid "only use tags to name the commits"
-msgstr "只使用 tags 来命名提交"
+#: builtin/fetch.c:955 builtin/remote.c:1022
+msgid "(none)"
+msgstr "（无）"
-#: builtin/name-rev.c:312
-msgid "only use refs matching <pattern>"
-msgstr "只使用和 <模式> 相匹配的引用"
+#: builtin/fetch.c:978
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr "拒绝获取到非纯仓库的当前分支 %s"
-#: builtin/name-rev.c:314
-msgid "list all commits reachable from all refs"
-msgstr "列出可以从所有引用访问的提交"
+#: builtin/fetch.c:997
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/name-rev.c:315
-msgid "read from stdin"
-msgstr "从标准输入读取"
+#: builtin/fetch.c:1000
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/name-rev.c:316
-msgid "allow to print `undefined` names (default)"
-msgstr "允许打印 `未定义` 的名称（默认）"
+#: builtin/fetch.c:1076
+#, c-format
+msgid "Don't know how to fetch from %s"
+msgstr "不知道如何从 %s 获取"
-#: builtin/name-rev.c:322
-msgid "dereference tags in the input (internal use)"
-msgstr "反向解析输入中的 tags（内部使用）"
+#: builtin/fetch.c:1236
+#, c-format
+msgid "Fetching %s\n"
+msgstr "正在获取 %s\n"
-#: builtin/notes.c:24
-msgid "git notes [--ref <notes-ref>] [list [<object>]]"
-msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
+#: builtin/fetch.c:1238 builtin/remote.c:96
+#, c-format
+msgid "Could not fetch %s"
+msgstr "不能获取 %s"
-#: builtin/notes.c:25
+#: builtin/fetch.c:1256
msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
-msgstr ""
-"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
-"| (-c | -C) <对象>] [<对象>]"
-
-#: builtin/notes.c:26
-msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
+msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"
-#: builtin/notes.c:27
-msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
-msgstr ""
-"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
-"(-c | -C) <对象>] [<对象>]"
+#: builtin/fetch.c:1279
+msgid "You need to specify a tag name."
+msgstr "您需要指定一个标签名称。"
-#: builtin/notes.c:28
-msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
-msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
+#: builtin/fetch.c:1321
+msgid "Negative depth in --deepen is not supported"
+msgstr "--deepen 不支持负数深度"
-#: builtin/notes.c:29
-msgid "git notes [--ref <notes-ref>] show [<object>]"
-msgstr "git notes [--ref <注解引用>] show [<对象>]"
+#: builtin/fetch.c:1323
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen 和 --depth 是互斥的"
-#: builtin/notes.c:30
-msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
-msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
+#: builtin/fetch.c:1328
+msgid "--depth and --unshallow cannot be used together"
+msgstr "--depth 和 --unshallow 不能同时使用"
-#: builtin/notes.c:31
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
+#: builtin/fetch.c:1330
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
-#: builtin/notes.c:32
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
+#: builtin/fetch.c:1352
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/notes.c:33
-msgid "git notes [--ref <notes-ref>] remove [<object>...]"
-msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
+#: builtin/fetch.c:1354
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/notes.c:34
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
-msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
+#: builtin/fetch.c:1365
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "没有这样的远程或远程组：%s"
-#: builtin/notes.c:35
-msgid "git notes [--ref <notes-ref>] get-ref"
-msgstr "git notes [--ref <注解引用>] get-ref"
+#: builtin/fetch.c:1373
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr "获取组并指定引用规格没有意义"
-#: builtin/notes.c:40
-msgid "git notes [list [<object>]]"
-msgstr "git notes [list [<对象>]]"
+#: builtin/fmt-merge-msg.c:14
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
-#: builtin/notes.c:45
-msgid "git notes add [<options>] [<object>]"
-msgstr "git notes add [<选项>] [<对象>]"
+#: builtin/fmt-merge-msg.c:663
+msgid "populate log with at most <n> entries from shortlog"
+msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
-#: builtin/notes.c:50
-msgid "git notes copy [<options>] <from-object> <to-object>"
-msgstr "git notes copy [<选项>] <源对象> <目标对象>"
+#: builtin/fmt-merge-msg.c:666
+msgid "alias for --log (deprecated)"
+msgstr "参数 --log 的别名（已弃用）"
-#: builtin/notes.c:51
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
-msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
+#: builtin/fmt-merge-msg.c:669
+msgid "text"
+msgstr "文本"
-#: builtin/notes.c:56
-msgid "git notes append [<options>] [<object>]"
-msgstr "git notes append [<选项>] [<对象>]"
+#: builtin/fmt-merge-msg.c:670
+msgid "use <text> as start of message"
+msgstr "使用 <文本> 作为提交说明的开始"
-#: builtin/notes.c:61
-msgid "git notes edit [<object>]"
-msgstr "git notes edit [<对象>]"
+#: builtin/fmt-merge-msg.c:671
+msgid "file to read from"
+msgstr "从文件中读取"
-#: builtin/notes.c:66
-msgid "git notes show [<object>]"
-msgstr "git notes show [<对象>]"
+#: builtin/for-each-ref.c:9
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr "git for-each-ref [<选项>] [<模式>]"
-#: builtin/notes.c:71
-msgid "git notes merge [<options>] <notes-ref>"
-msgstr "git notes merge [<选项>] <注解引用>"
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <对象>]"
-#: builtin/notes.c:72
-msgid "git notes merge --commit [<options>]"
-msgstr "git notes merge --commit [<选项>]"
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
-#: builtin/notes.c:73
-msgid "git notes merge --abort [<options>]"
-msgstr "git notes merge --abort [<选项>]"
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
-#: builtin/notes.c:78
-msgid "git notes remove [<object>]"
-msgstr "git notes remove [<对象>]"
+#: builtin/for-each-ref.c:27
+msgid "quote placeholders suitably for shells"
+msgstr "引用占位符适用于 shells"
-#: builtin/notes.c:83
-msgid "git notes prune [<options>]"
-msgstr "git notes prune [<选项>]"
+#: builtin/for-each-ref.c:29
+msgid "quote placeholders suitably for perl"
+msgstr "引用占位符适用于 perl"
-#: builtin/notes.c:88
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
+#: builtin/for-each-ref.c:31
+msgid "quote placeholders suitably for python"
+msgstr "引用占位符适用于 python"
-#: builtin/notes.c:146
-#, c-format
-msgid "unable to start 'show' for object '%s'"
-msgstr "不能为对象 '%s' 开始 'show'"
+#: builtin/for-each-ref.c:33
+msgid "quote placeholders suitably for Tcl"
+msgstr "引用占位符适用于 Tcl"
-#: builtin/notes.c:150
-msgid "could not read 'show' output"
-msgstr "不能读取 'show' 的输出"
+#: builtin/for-each-ref.c:36
+msgid "show only <n> matched refs"
+msgstr "只显示 <n> 个匹配的引用"
-#: builtin/notes.c:158
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
-msgstr "无法为对象 '%s' 完成 'show'"
+#: builtin/for-each-ref.c:41
+msgid "print only refs which points at the given object"
+msgstr "只打印指向给定对象的引用"
-#: builtin/notes.c:173 builtin/tag.c:477
-#, c-format
-msgid "could not create file '%s'"
-msgstr "不能创建文件 '%s'"
+#: builtin/for-each-ref.c:43
+msgid "print only refs that are merged"
+msgstr "只打印已经合并的引用"
-#: builtin/notes.c:192
-msgid "Please supply the note contents using either -m or -F option"
-msgstr "请通过 -m 或 -F 选项为注解提供内容"
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are not merged"
+msgstr "只打印没有合并的引用"
-#: builtin/notes.c:201
-msgid "unable to write note object"
-msgstr "不能写注解对象"
+#: builtin/for-each-ref.c:45
+msgid "print only refs which contain the commit"
+msgstr "只打印包含该提交的引用"
-#: builtin/notes.c:203
-#, c-format
-msgid "The note contents have been left in %s"
-msgstr "注解内容被留在 %s 中"
+#: builtin/for-each-ref.c:46
+msgid "print only refs which don't contain the commit"
+msgstr "只打印不包含该提交的引用"
-#: builtin/notes.c:231 builtin/tag.c:693
-#, c-format
-msgid "cannot read '%s'"
-msgstr "不能读取 '%s'"
+#: builtin/fsck.c:554
+msgid "Checking object directories"
+msgstr "检查对象目录中"
-#: builtin/notes.c:233 builtin/tag.c:696
-#, c-format
-msgid "could not open or read '%s'"
-msgstr "不能打开或读取 '%s'"
+#: builtin/fsck.c:646
+msgid "git fsck [<options>] [<object>...]"
+msgstr "git fsck [<选项>] [<对象>...]"
-#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
-#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
-#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
-#: builtin/notes.c:854 builtin/tag.c:709
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "无法解析 '%s' 为一个有效引用。"
+#: builtin/fsck.c:652
+msgid "show unreachable objects"
+msgstr "显示不可达的对象"
-#: builtin/notes.c:255
-#, c-format
-msgid "Failed to read object '%s'."
-msgstr "无法读取对象 '%s'。"
+#: builtin/fsck.c:653
+msgid "show dangling objects"
+msgstr "显示摇摆的对象"
-#: builtin/notes.c:259
-#, c-format
-msgid "Cannot read note data from non-blob object '%s'."
-msgstr "不能从非数据对象 '%s' 中读取注解数据"
+#: builtin/fsck.c:654
+msgid "report tags"
+msgstr "报告标签"
-#: builtin/notes.c:299
-#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "非法的输入行：'%s'。"
+#: builtin/fsck.c:655
+msgid "report root nodes"
+msgstr "报告根节点"
-#: builtin/notes.c:314
-#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "无法从 '%s' 到 '%s' 拷贝注解"
+#: builtin/fsck.c:656
+msgid "make index objects head nodes"
+msgstr "将索引亦作为检查的头节点"
-#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
-#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
-#: builtin/notes.c:919
-msgid "too many parameters"
-msgstr "参数太多"
+#: builtin/fsck.c:657
+msgid "make reflogs head nodes (default)"
+msgstr "将引用日志作为检查的头节点（默认）"
-#: builtin/notes.c:371 builtin/notes.c:658
-#, c-format
-msgid "No note found for object %s."
-msgstr "未发现对象 %s 的注解。"
+#: builtin/fsck.c:658
+msgid "also consider packs and alternate objects"
+msgstr "也考虑包和备用对象"
-#: builtin/notes.c:392 builtin/notes.c:555
-msgid "note contents as a string"
-msgstr "注解内容作为一个字符串"
+#: builtin/fsck.c:659
+msgid "check only connectivity"
+msgstr "仅检查连通性"
-#: builtin/notes.c:395 builtin/notes.c:558
-msgid "note contents in a file"
-msgstr "注解内容到一个文件中"
+#: builtin/fsck.c:660
+msgid "enable more strict checking"
+msgstr "启用更严格的检查"
-#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
-#: builtin/notes.c:563 builtin/tag.c:628
-msgid "object"
-msgstr "对象"
+#: builtin/fsck.c:662
+msgid "write dangling objects in .git/lost-found"
+msgstr "将摇摆对象写入 .git/lost-found 中"
-#: builtin/notes.c:398 builtin/notes.c:561
-msgid "reuse and edit specified note object"
-msgstr "重用和编辑指定的注解对象"
+#: builtin/fsck.c:663 builtin/prune.c:107
+msgid "show progress"
+msgstr "显示进度"
-#: builtin/notes.c:401 builtin/notes.c:564
-msgid "reuse specified note object"
-msgstr "重用指定的注解对象"
+#: builtin/fsck.c:664
+msgid "show verbose names for reachable objects"
+msgstr "显示可达对象的详细名称"
-#: builtin/notes.c:404 builtin/notes.c:567
-msgid "allow storing empty note"
-msgstr "允许保存空白注释"
+#: builtin/fsck.c:725
+msgid "Checking objects"
+msgstr "检查对象中"
-#: builtin/notes.c:405 builtin/notes.c:476
-msgid "replace existing notes"
-msgstr "替换已存在的注解"
+#: builtin/gc.c:25
+msgid "git gc [<options>]"
+msgstr "git gc [<选项>]"
-#: builtin/notes.c:430
+#: builtin/gc.c:78
#, c-format
-msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
-msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
+msgid "Failed to fstat %s: %s"
+msgstr "对 %s 调用 fstat 失败：%s"
-#: builtin/notes.c:445 builtin/notes.c:524
+#: builtin/gc.c:310
#, c-format
-msgid "Overwriting existing notes for object %s\n"
-msgstr "覆盖对象 %s 现存注解\n"
+msgid "Can't stat %s"
+msgstr "不能对 %s 调用 stat"
-#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
+#: builtin/gc.c:319
#, c-format
-msgid "Removing note for object %s\n"
-msgstr "删除对象 %s 的注解\n"
-
-#: builtin/notes.c:477
-msgid "read objects from stdin"
-msgstr "从标准输入读取对象"
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
+"在该文件被删除之前，自动清理将不会执行。\n"
+"\n"
+"%s"
-#: builtin/notes.c:479
-msgid "load rewriting config for <command> (implies --stdin)"
-msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
+#: builtin/gc.c:358
+msgid "prune unreferenced objects"
+msgstr "清除未引用的对象"
-#: builtin/notes.c:497
-msgid "too few parameters"
-msgstr "参数太少"
+#: builtin/gc.c:360
+msgid "be more thorough (increased runtime)"
+msgstr "更彻底（增加运行时间）"
+
+#: builtin/gc.c:361
+msgid "enable auto-gc mode"
+msgstr "启用自动垃圾回收模式"
+
+#: builtin/gc.c:362
+msgid "force running gc even if there may be another gc running"
+msgstr "强制执行 gc 即使另外一个 gc 正在执行"
-#: builtin/notes.c:518
+#: builtin/gc.c:379
#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
-msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
+msgid "Failed to parse gc.logexpiry value %s"
+msgstr "无法解析 gc.logexpiry 的值 %s"
-#: builtin/notes.c:530
+#: builtin/gc.c:407
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
-msgstr "源对象 %s 缺少注解。不能拷贝。"
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr "自动在后台执行仓库打包以求最佳性能。\n"
-#: builtin/notes.c:582
+#: builtin/gc.c:409
#, c-format
-msgid ""
-"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
-"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
-msgstr ""
-"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
-"请换用 'git notes add -f -m/-F/-c/-C'。\n"
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "自动打包仓库以求最佳性能。\n"
-#: builtin/notes.c:750
-msgid "General options"
-msgstr "通用选项"
+#: builtin/gc.c:410
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "手工维护参见 \"git help gc\"。\n"
-#: builtin/notes.c:752
-msgid "Merge options"
-msgstr "合并选项"
+#: builtin/gc.c:431
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
-#: builtin/notes.c:754
+#: builtin/gc.c:475
msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
-msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
-#: builtin/notes.c:756
-msgid "Committing unmerged notes"
-msgstr "提交未合并的注解"
+#: builtin/grep.c:25
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
-#: builtin/notes.c:758
-msgid "finalize notes merge by committing unmerged notes"
-msgstr "通过提交未合并的注解来完成注解合并"
+#: builtin/grep.c:232
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep：无法创建线程：%s"
-#: builtin/notes.c:760
-msgid "Aborting notes merge resolution"
-msgstr "中止注解合并的方案"
+#: builtin/grep.c:290
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
-#: builtin/notes.c:762
-msgid "abort notes merge"
-msgstr "中止注解合并"
+#: builtin/grep.c:769 builtin/grep.c:810
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "无法读取树（%s）"
-#: builtin/notes.c:857
+#: builtin/grep.c:829
#, c-format
-msgid "Object %s has no note\n"
-msgstr "对象 %s 没有注解\n"
+msgid "unable to grep from object of type %s"
+msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/notes.c:869
-msgid "attempt to remove non-existent note is not an error"
-msgstr "尝试删除不存在的注解不是一个错误"
+#: builtin/grep.c:893
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "开关 `%c' 期望一个数字值"
-#: builtin/notes.c:872
-msgid "read object names from the standard input"
-msgstr "从标准输入读取对象名称"
+#: builtin/grep.c:980
+msgid "search in index instead of in the work tree"
+msgstr "在索引区搜索而不是在工作区"
-#: builtin/notes.c:953
-msgid "notes-ref"
-msgstr "注解引用"
+#: builtin/grep.c:982
+msgid "find in contents not managed by git"
+msgstr "在未被 git 管理的内容中查找"
-#: builtin/notes.c:954
-msgid "use notes from <notes-ref>"
-msgstr "从 <注解引用> 使用注解"
+# 译者：中文字符串拼接，可删除前导空格
+#: builtin/grep.c:984
+msgid "search in both tracked and untracked files"
+msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/notes.c:989 builtin/remote.c:1618
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "未知子命令：%s"
+#: builtin/grep.c:986
+msgid "ignore files specified via '.gitignore'"
+msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/pack-objects.c:28
-msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
-msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
+#: builtin/grep.c:988
+msgid "recursively search in each submodule"
+msgstr "在每一个子模组中递归搜索"
-#: builtin/pack-objects.c:29
-msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
-msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
+#: builtin/grep.c:990
+msgid "basename"
+msgstr "基本名"
-#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
-#, c-format
-msgid "deflate error (%d)"
-msgstr "压缩错误 (%d)"
+#: builtin/grep.c:991
+msgid "prepend parent project's basename to output"
+msgstr "在输出中以父项目的基本名为前缀"
-#: builtin/pack-objects.c:771
-msgid "Writing objects"
-msgstr "写入对象中"
+#: builtin/grep.c:994
+msgid "show non-matching lines"
+msgstr "显示未匹配的行"
-#: builtin/pack-objects.c:1011
-msgid "disabling bitmap writing, as some objects are not being packed"
-msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
+#: builtin/grep.c:996
+msgid "case insensitive matching"
+msgstr "不区分大小写匹配"
-#: builtin/pack-objects.c:2171
-msgid "Compressing objects"
-msgstr "å\8e\8b缩对象ä¸"
+#: builtin/grep.c:998
+msgid "match patterns only at word boundaries"
+msgstr "å\8fªå\9c¨å\8d\95è¯\8dè¾¹ç\95\8cå\8c¹é\85\8d模å¼\8f"
-#: builtin/pack-objects.c:2568
-#, c-format
-msgid "unsupported index version %s"
-msgstr "不支持的索引版本 %s"
+#: builtin/grep.c:1000
+msgid "process binary files as text"
+msgstr "把二进制文件当做文本处理"
-#: builtin/pack-objects.c:2572
-#, c-format
-msgid "bad index version '%s'"
-msgstr "坏的索引版本 '%s'"
+#: builtin/grep.c:1002
+msgid "don't match patterns in binary files"
+msgstr "不在二进制文件中匹配模式"
-#: builtin/pack-objects.c:2595
-#, c-format
-msgid "option %s does not accept negative form"
-msgstr "选项 %s 不接受否定格式"
+#: builtin/grep.c:1005
+msgid "process binary files with textconv filters"
+msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/pack-objects.c:2599
-#, c-format
-msgid "unable to parse value '%s' for option %s"
-msgstr "不能解析选项 %1$s 的值 '%2$s'"
+#: builtin/grep.c:1007
+msgid "descend at most <depth> levels"
+msgstr "最多以指定的深度向下寻找"
-#: builtin/pack-objects.c:2619
-msgid "do not show progress meter"
-msgstr "ä¸\8dæ\98¾ç¤ºè¿\9b度表"
+#: builtin/grep.c:1011
+msgid "use extended POSIX regular expressions"
+msgstr "使ç\94¨æ\89©å±\95ç\9a\84 POSIX æ£å\88\99表达å¼\8f"
-#: builtin/pack-objects.c:2621
-msgid "show progress meter"
-msgstr "显示进度表"
+#: builtin/grep.c:1014
+msgid "use basic POSIX regular expressions (default)"
+msgstr "使用基本的 POSIX 正则表达式（默认）"
-#: builtin/pack-objects.c:2623
-msgid "show progress meter during object writing phase"
-msgstr "在对象写入阶段显示进度表"
+#: builtin/grep.c:1017
+msgid "interpret patterns as fixed strings"
+msgstr "把模式解析为固定的字符串"
-#: builtin/pack-objects.c:2626
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "当进度表显示时类似于 --all-progress"
+#: builtin/grep.c:1020
+msgid "use Perl-compatible regular expressions"
+msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/pack-objects.c:2627
-msgid "version[,offset]"
-msgstr "版本[,偏移]"
+#: builtin/grep.c:1023
+msgid "show line numbers"
+msgstr "显示行号"
-#: builtin/pack-objects.c:2628
-msgid "write the pack index file in the specified idx format version"
-msgstr "用指定的 idx 格式版本来写包索引文件"
+#: builtin/grep.c:1024
+msgid "don't show filenames"
+msgstr "不显示文件名"
-#: builtin/pack-objects.c:2631
-msgid "maximum size of each output pack file"
-msgstr "æ¯\8f个è¾\93å\87ºå\8c\85ç\9a\84æ\9c\80大尺寸"
+#: builtin/grep.c:1025
+msgid "show filenames"
+msgstr "æ\98¾ç¤ºæ\96\87件å\90\8d"
-#: builtin/pack-objects.c:2633
-msgid "ignore borrowed objects from alternate object store"
-msgstr "忽略从替代对象存储里借用对象"
+#: builtin/grep.c:1027
+msgid "show filenames relative to top directory"
+msgstr "显示相对于顶级目录的文件名"
-#: builtin/pack-objects.c:2635
-msgid "ignore packed objects"
-msgstr "忽ç\95¥å\8c\85对象"
+#: builtin/grep.c:1029
+msgid "show only filenames instead of matching lines"
+msgstr "å\8fªæ\98¾ç¤ºæ\96\87件å\90\8dè\80\8cä¸\8dæ\98¾ç¤ºå\8c¹é\85\8dç\9a\84è¡\8c"
-#: builtin/pack-objects.c:2637
-msgid "limit pack window by objects"
-msgstr "限制打包窗口的对象数"
+#: builtin/grep.c:1031
+msgid "synonym for --files-with-matches"
+msgstr "和 --files-with-matches 同义"
-#: builtin/pack-objects.c:2639
-msgid "limit pack window by memory in addition to object limit"
-msgstr "除对象数量限制外设置打包窗口的内存限制"
+#: builtin/grep.c:1034
+msgid "show only the names of files without match"
+msgstr "只显示未匹配的文件名"
-#: builtin/pack-objects.c:2641
-msgid "maximum length of delta chain allowed in the resulting pack"
-msgstr "æ\89\93å\8c\85å\85\81许ç\9a\84 delta é\93¾ç\9a\84æ\9c\80大é\95¿åº¦"
+#: builtin/grep.c:1036
+msgid "print NUL after filenames"
+msgstr "å\9c¨æ\96\87件å\90\8då\90\8eè¾\93å\87º NUL å\97符"
-#: builtin/pack-objects.c:2643
-msgid "reuse existing deltas"
-msgstr "重用已存在的 deltas"
+#: builtin/grep.c:1038
+msgid "show the number of matches instead of matching lines"
+msgstr "显示总匹配行数，而不显示匹配的行"
-#: builtin/pack-objects.c:2645
-msgid "reuse existing objects"
-msgstr "é\87\8dç\94¨å·²å\98å\9c¨ç\9a\84对象"
+#: builtin/grep.c:1039
+msgid "highlight matches"
+msgstr "é«\98亮æ\98¾ç¤ºå\8c¹é\85\8d项"
-#: builtin/pack-objects.c:2647
-msgid "use OFS_DELTA objects"
-msgstr "使用 OFS_DELTA 对象"
+#: builtin/grep.c:1041
+msgid "print empty line between matches from different files"
+msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/pack-objects.c:2649
-msgid "use threads when searching for best delta matches"
-msgstr "使ç\94¨çº¿ç¨\8bæ\9f¥è¯¢æ\9c\80ä½³ delta å\8c¹é\85\8d"
+#: builtin/grep.c:1043
+msgid "show filename only once above matches from same file"
+msgstr "å\8fªå\9c¨å\90\8cä¸\80æ\96\87件ç\9a\84å\8c¹é\85\8d项ç\9a\84ä¸\8aé\9d¢æ\98¾ç¤ºä¸\80次æ\96\87件å\90\8d"
-#: builtin/pack-objects.c:2651
-msgid "do not create an empty pack output"
-msgstr "不创建空的包输出"
+#: builtin/grep.c:1046
+msgid "show <n> context lines before and after matches"
+msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/pack-objects.c:2653
-msgid "read revision arguments from standard input"
-msgstr "从标准输入读取版本号参数"
+#: builtin/grep.c:1049
+msgid "show <n> context lines before matches"
+msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/pack-objects.c:2655
-msgid "limit the objects to those that are not yet packed"
-msgstr "限制那些尚未打包的对象"
+#: builtin/grep.c:1051
+msgid "show <n> context lines after matches"
+msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/pack-objects.c:2658
-msgid "include objects reachable from any reference"
-msgstr "包括可以从任何引用访问到的对象"
+#: builtin/grep.c:1053
+msgid "use <n> worker threads"
+msgstr "使用 <n> 个工作线程"
-#: builtin/pack-objects.c:2661
-msgid "include objects referred by reflog entries"
-msgstr "å\8c\85æ\8b¬è¢«å¼\95ç\94¨æ\97¥å¿\97å¼\95ç\94¨å\88°ç\9a\84对象"
+#: builtin/grep.c:1054
+msgid "shortcut for -C NUM"
+msgstr "å¿«æ\8d·é\94® -C æ\95°å\97"
-#: builtin/pack-objects.c:2664
-msgid "include objects referred to by the index"
-msgstr "å\8c\85æ\8b¬è¢«ç´¢å¼\95å¼\95ç\94¨å\88°ç\9a\84对象"
+#: builtin/grep.c:1057
+msgid "show a line with the function name before matches"
+msgstr "å\9c¨å\8c¹é\85\8dç\9a\84å\89\8dé\9d¢æ\98¾ç¤ºä¸\80è¡\8cå\87½æ\95°å\90\8d"
-#: builtin/pack-objects.c:2667
-msgid "output pack to stdout"
-msgstr "输出包到标准输出"
+#: builtin/grep.c:1059
+msgid "show the surrounding function"
+msgstr "显示所在函数的前后内容"
-#: builtin/pack-objects.c:2669
-msgid "include tag objects that refer to objects to be packed"
-msgstr "包括引用了打包对象的 tag"
+#: builtin/grep.c:1062
+msgid "read patterns from file"
+msgstr "从文件读取模式"
-#: builtin/pack-objects.c:2671
-msgid "keep unreachable objects"
-msgstr "维持不可达的对象"
+#: builtin/grep.c:1064
+msgid "match <pattern>"
+msgstr "匹配 <模式>"
-#: builtin/pack-objects.c:2672 parse-options.h:139
-msgid "time"
-msgstr "时间"
+#: builtin/grep.c:1066
+msgid "combine patterns specified with -e"
+msgstr "组合用 -e 参数设定的模式"
-#: builtin/pack-objects.c:2673
-msgid "unpack unreachable objects newer than <time>"
-msgstr "将比给定 <时间> 新的无法访问的对象解包"
+#: builtin/grep.c:1078
+msgid "indicate hit with exit status without output"
+msgstr "不输出，而用退出码标识命中状态"
-#: builtin/pack-objects.c:2676
-msgid "create thin packs"
-msgstr "å\88\9b建精ç®\80å\8c\85"
+#: builtin/grep.c:1080
+msgid "show only matches from files that match all patterns"
+msgstr "å\8fªæ\98¾ç¤ºå\8c¹é\85\8dæ\89\80æ\9c\89模å¼\8fç\9a\84æ\96\87件ä¸ç\9a\84å\8c¹é\85\8d"
-#: builtin/pack-objects.c:2678
-msgid "create packs suitable for shallow fetches"
-msgstr "创建适合浅克隆版本库获取的包"
+#: builtin/grep.c:1082
+msgid "show parse tree for grep expression"
+msgstr "显示 grep 表达式的解析树"
-#: builtin/pack-objects.c:2680
-msgid "ignore packs that have companion .keep file"
-msgstr "忽ç\95¥é\85\8dæ\9c\89 .keep æ\96\87件ç\9a\84å\8c\85"
+#: builtin/grep.c:1086
+msgid "pager"
+msgstr "å\88\86页"
-#: builtin/pack-objects.c:2682
-msgid "pack compression level"
-msgstr "打包压缩级别"
+#: builtin/grep.c:1086
+msgid "show matching files in the pager"
+msgstr "分页显示匹配的文件"
-#: builtin/pack-objects.c:2684
-msgid "do not hide commits by grafts"
-msgstr "显示被嫁接隐藏的提交"
+#: builtin/grep.c:1089
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "允许调用 grep(1)（本次构建忽略）"
-#: builtin/pack-objects.c:2686
-msgid "use a bitmap index if available to speed up counting objects"
-msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
+#: builtin/grep.c:1153
+msgid "no pattern given."
+msgstr "未提供模式匹配。"
-#: builtin/pack-objects.c:2688
-msgid "write a bitmap index together with the pack index"
-msgstr "在建立包索引的同时创建 bitmap 索引"
+#: builtin/grep.c:1189
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index 或 --untracked 不能和版本同时使用"
-#: builtin/pack-objects.c:2779
-msgid "Counting objects"
-msgstr "对象计数中"
+#: builtin/grep.c:1195
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "不能解析版本：%s"
-#: builtin/pack-refs.c:6
-msgid "git pack-refs [<options>]"
-msgstr "git pack-refs [<选项>]"
+#: builtin/grep.c:1228 builtin/index-pack.c:1485
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "指定的线程数无效（%d）"
-#: builtin/pack-refs.c:14
-msgid "pack everything"
-msgstr "打包一切"
+#: builtin/grep.c:1251
+msgid "--open-files-in-pager only works on the worktree"
+msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/pack-refs.c:15
-msgid "prune loose refs (default)"
-msgstr "清除松散的引用（默认）"
+#: builtin/grep.c:1274
+msgid "option not supported with --recurse-submodules."
+msgstr "选项不支持和 --recurse-submodules 共用。"
-#: builtin/prune-packed.c:7
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#: builtin/grep.c:1280
+msgid "--cached or --untracked cannot be used with --no-index."
+msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
-#: builtin/prune-packed.c:40
-msgid "Removing duplicate objects"
-msgstr "正在删除重复对象"
+#: builtin/grep.c:1286
+msgid "--[no-]exclude-standard cannot be used for tracked contents."
+msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
-#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
+#: builtin/grep.c:1294
+msgid "both --cached and trees are given."
+msgstr "同时给出了 --cached 和树对象。"
-#: builtin/prune.c:105 builtin/worktree.c:112
-msgid "do not remove, show only"
-msgstr "不删除，只显示"
+#: builtin/hash-object.c:81
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
+"[--] <文件>..."
-#: builtin/prune.c:106 builtin/worktree.c:113
-msgid "report pruned objects"
-msgstr "报告清除的对象"
+#: builtin/hash-object.c:82
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
-#: builtin/prune.c:109 builtin/worktree.c:115
-msgid "expire objects older than <time>"
-msgstr "使早于给定时间的对象过期"
+#: builtin/hash-object.c:94
+msgid "type"
+msgstr "类型"
-#: builtin/push.c:14
-msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
+#: builtin/hash-object.c:94
+msgid "object type"
+msgstr "对象类型"
-#: builtin/push.c:85
-msgid "tag shorthand without <tag>"
-msgstr "tag 后面未提供 <标签> 参数"
+#: builtin/hash-object.c:95
+msgid "write the object into the object database"
+msgstr "将对象写入对象数据库"
-#: builtin/push.c:95
-msgid "--delete only accepts plain target ref names"
-msgstr "--delete 只接受简单的目标引用名"
+#: builtin/hash-object.c:97
+msgid "read the object from stdin"
+msgstr "从标准输入读取对象"
-#: builtin/push.c:139
-msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
-msgstr ""
-"\n"
-"为了永久地选择任一选项，参见 'git help config' 中的 push.default。"
+#: builtin/hash-object.c:99
+msgid "store file as is without filters"
+msgstr "原样存储文件不使用过滤器"
-#: builtin/push.c:142
-#, c-format
+#: builtin/hash-object.c:100
msgid ""
-"The upstream branch of your current branch does not match\n"
-"the name of your current branch. To push to the upstream branch\n"
-"on the remote, use\n"
-"\n"
-" git push %s HEAD:%s\n"
-"\n"
-"To push to the branch of the same name on the remote, use\n"
-"\n"
-" git push %s %s\n"
-"%s"
-msgstr ""
-"如果您当前分支的上游分支和您当前分支名不匹配，为推送到远程的\n"
-"上游分支，使用\n"
-"\n"
-" git push %s HEAD:%s\n"
-"\n"
-"为推送至远程同名分支，使用\n"
-"\n"
-" git push %s %s\n"
-"%s"
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
+
+#: builtin/hash-object.c:101
+msgid "process file as it were from this path"
+msgstr "处理文件并假设其来自于此路径"
+
+#: builtin/help.c:42
+msgid "print all available commands"
+msgstr "打印所有可用的命令"
+
+#: builtin/help.c:43
+msgid "exclude guides"
+msgstr "排除向导"
+
+#: builtin/help.c:44
+msgid "print list of useful guides"
+msgstr "显示有用的指南列表"
+
+#: builtin/help.c:45
+msgid "show man page"
+msgstr "显示 man 手册"
-#: builtin/push.c:157
+#: builtin/help.c:46
+msgid "show manual in web browser"
+msgstr "在 web 浏览器中显示手册"
+
+#: builtin/help.c:48
+msgid "show info page"
+msgstr "显示 info 手册"
+
+#: builtin/help.c:54
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
+
+#: builtin/help.c:66
#, c-format
-msgid ""
-"You are not currently on a branch.\n"
-"To push the history leading to the current (detached HEAD)\n"
-"state now, use\n"
-"\n"
-" git push %s HEAD:<name-of-remote-branch>\n"
-msgstr ""
-"您当前不在一个分支上。\n"
-"现在为推送当前（分离头指针）的历史，使用\n"
-"\n"
-" git push %s HEAD:<远程分支名字>\n"
+msgid "unrecognized help format '%s'"
+msgstr "未能识别的帮助格式 '%s'"
+
+#: builtin/help.c:93
+msgid "Failed to start emacsclient."
+msgstr "无法启动 emacsclient。"
+
+#: builtin/help.c:106
+msgid "Failed to parse emacsclient version."
+msgstr "无法解析 emacsclient 版本。"
-#: builtin/push.c:171
+#: builtin/help.c:114
#, c-format
-msgid ""
-"The current branch %s has no upstream branch.\n"
-"To push the current branch and set the remote as upstream, use\n"
-"\n"
-" git push --set-upstream %s %s\n"
-msgstr ""
-"当前分支 %s 没有对应的上游分支。\n"
-"为推送当前分支并建立与远程上游的跟踪，使用\n"
-"\n"
-" git push --set-upstream %s %s\n"
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr "emacsclient 版本 '%d' 太老（< 22）。"
-#: builtin/push.c:179
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
-msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
+msgid "failed to exec '%s'"
+msgstr "无法执行 '%s'"
-#: builtin/push.c:182
+#: builtin/help.c:207
#, c-format
msgid ""
-"You are pushing to remote '%s', which is not the upstream of\n"
-"your current branch '%s', without telling me what to push\n"
-"to update which remote branch."
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-"您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
-"è\80\8c没æ\9c\89å\91\8aè¯\89æ\88\91è¦\81æ\8e¨é\80\81ä»\80ä¹\88ã\80\81æ\9b´æ\96°å\93ªä¸ªè¿\9cç¨\8bå\88\86æ\94¯。"
+"'%s'：不支持的 man 手册查看器的路径。\n"
+"请使ç\94¨ 'man.<å·¥å\85·>.cmd'。"
-# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短
-#: builtin/push.c:205
+#: builtin/help.c:219
+#, c-format
msgid ""
-"push.default is unset; its implicit value has changed in\n"
-"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
-"and maintain the traditional behavior, use:\n"
-"\n"
-" git config --global push.default matching\n"
-"\n"
-"To squelch this message and adopt the new behavior now, use:\n"
-"\n"
-" git config --global push.default simple\n"
-"\n"
-"When push.default is set to 'matching', git will push local branches\n"
-"to the remote branches that already exist with the same name.\n"
-"\n"
-"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
-"behavior, which only pushes the current branch to the corresponding\n"
-"remote branch that 'git pull' uses to update the current branch.\n"
-"\n"
-"See 'git help config' and search for 'push.default' for further "
-"information.\n"
-"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
-"'current' instead of 'simple' if you sometimes use older versions of Git)"
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
msgstr ""
-"push.default 尚未设置，它的默认值在 Git 2.0 已从 'matching'\n"
-"变更为 'simple'。若要不再显示本信息并保持传统习惯，进行如下设置：\n"
-"\n"
-" git config --global push.default matching\n"
-"\n"
-"若要不再显示本信息并从现在开始采用新的使用习惯，设置：\n"
-"\n"
-" git config --global push.default simple\n"
-"\n"
-"当 push.default 设置为 'matching' 后，git 将推送和远程同名的所有\n"
-"本地分支。\n"
-"\n"
-"从 Git 2.0 开始，Git 缺省采用更为保守的 'simple' 模式，只推送当前\n"
-"分支到远程关联的同名分支，即 'git push' 推送当前分支。\n"
-"\n"
-"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
-"（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n"
-"为保持兼容，请用 'current' 代替 'simple'）"
+"'%s': 支持的 man 手册查看器命令。\n"
+"请使用 'man.<工具>.path'。"
-#: builtin/push.c:272
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "您没有为推送指定任何引用规则，并且 push.default 为 \"nothing\"。"
+#: builtin/help.c:336
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr "'%s'：未知的 man 查看器。"
-#: builtin/push.c:279
-msgid ""
-"Updates were rejected because the tip of your current branch is behind\n"
-"its remote counterpart. Integrate the remote changes (e.g.\n"
-"'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr ""
-"更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n"
-"再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
-"'git push --help' 中的 'Note about fast-forwards' 小节。"
+#: builtin/help.c:353
+msgid "no man viewer handled the request"
+msgstr "没有 man 查看器处理此请求"
-#: builtin/push.c:285
-msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. Check out this branch and integrate the remote changes\n"
-"(e.g. 'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr ""
-"更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
-"检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"
-"'git push --help' 中的 'Note about fast-forwards' 小节。"
+#: builtin/help.c:361
+msgid "no info viewer handled the request"
+msgstr "没有 info 查看器处理此请求"
-#: builtin/push.c:291
-msgid ""
-"Updates were rejected because the remote contains work that you do\n"
-"not have locally. This is usually caused by another repository pushing\n"
-"to the same ref. You may want to first integrate the remote changes\n"
-"(e.g., 'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr ""
-"更新被拒绝，因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
-"一个版本库已向该引用进行了推送。再次推送前，您可能需要先整合远程变更\n"
-"（如 'git pull ...'）。\n"
-"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
+#: builtin/help.c:403
+msgid "Defining attributes per path"
+msgstr "定义路径的属性"
-#: builtin/push.c:298
-msgid "Updates were rejected because the tag already exists in the remote."
-msgstr "æ\9b´æ\96°è¢«æ\8b\92ç»\9då\9b 为 tag å\9c¨è¿\9cç¨\8bå·²ç»\8få\98å\9c¨ã\80\82"
+#: builtin/help.c:404
+msgid "Everyday Git With 20 Commands Or So"
+msgstr "æ¯\8fä¸\80天 Git 常ç\94¨ç\9a\84约 20 æ\9d¡å\91½ä»¤"
-#: builtin/push.c:301
-msgid ""
-"You cannot update a remote ref that points at a non-commit object,\n"
-"or update a remote ref to make it point at a non-commit object,\n"
-"without using the '--force' option.\n"
-msgstr ""
-"如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"
-"也不能更新远程引用让其指向一个非提交对象。\n"
+#: builtin/help.c:405
+msgid "A Git glossary"
+msgstr "Git 词汇表"
+
+#: builtin/help.c:406
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "忽略指定的未跟踪文件"
+
+#: builtin/help.c:407
+msgid "Defining submodule properties"
+msgstr "定义子模组属性"
+
+#: builtin/help.c:408
+msgid "Specifying revisions and ranges for Git"
+msgstr "指定 Git 的版本和版本范围"
-#: builtin/push.c:360
+#: builtin/help.c:409
+msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
+msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"
+
+#: builtin/help.c:410
+msgid "An overview of recommended workflows with Git"
+msgstr "Git 推荐的工作流概览"
+
+#: builtin/help.c:422
+msgid "The common Git guides are:\n"
+msgstr "最常用的 Git 向导有：\n"
+
+#: builtin/help.c:440
#, c-format
-msgid "Pushing to %s\n"
-msgstr "推送到 %s\n"
+msgid "`git %s' is aliased to `%s'"
+msgstr "`git %s' 是 `%s' 的别名"
-#: builtin/push.c:364
+#: builtin/help.c:462 builtin/help.c:479
#, c-format
-msgid "failed to push some refs to '%s'"
-msgstr "无法推送一些引用到 '%s'"
+msgid "usage: %s%s"
+msgstr "用法：%s%s"
-#: builtin/push.c:394
+#: builtin/index-pack.c:154
#, c-format
-msgid "bad repository '%s'"
-msgstr "坏的版本库 '%s'"
+msgid "unable to open %s"
+msgstr "不能打开 %s"
-#: builtin/push.c:395
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-" git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-" git push <name>\n"
+#: builtin/index-pack.c:204
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "%s 的对象类型不匹配"
+
+#: builtin/index-pack.c:224
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "未能获取预期的对象 %s"
+
+#: builtin/index-pack.c:227
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "对象 %s：应为类型 %s，却是 %s"
+
+#: builtin/index-pack.c:269
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] "无法填充 %d 字节"
+msgstr[1] "无法填充 %d 字节"
+
+#: builtin/index-pack.c:279
+msgid "early EOF"
+msgstr "过早的文件结束符（EOF）"
+
+#: builtin/index-pack.c:280
+msgid "read error on input"
+msgstr "输入上的读错误"
+
+#: builtin/index-pack.c:292
+msgid "used more bytes than were available"
+msgstr "用掉了超过可用的字节"
+
+#: builtin/index-pack.c:299
+msgid "pack too large for current definition of off_t"
+msgstr "包太大超过了当前 off_t 的定义"
+
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
+msgstr "包超过了最大允许值"
+
+#: builtin/index-pack.c:317
+#, c-format
+msgid "unable to create '%s'"
+msgstr "不能创建 '%s'"
+
+#: builtin/index-pack.c:323
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr "无法打开包文件 '%s'"
+
+#: builtin/index-pack.c:337
+msgid "pack signature mismatch"
+msgstr "包签名不匹配"
+
+#: builtin/index-pack.c:339
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "不支持包版本 %<PRIu32>"
+
+#: builtin/index-pack.c:357
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s"
+
+#: builtin/index-pack.c:479
+#, c-format
+msgid "inflate returned %d"
+msgstr "解压缩返回 %d"
+
+#: builtin/index-pack.c:528
+msgid "offset value overflow for delta base object"
+msgstr "偏移值覆盖了 delta 基准对象"
+
+#: builtin/index-pack.c:536
+msgid "delta base offset is out of bound"
+msgstr "delta 基准偏移越界"
+
+#: builtin/index-pack.c:544
+#, c-format
+msgid "unknown object type %d"
+msgstr "未知对象类型 %d"
+
+#: builtin/index-pack.c:575
+msgid "cannot pread pack file"
+msgstr "无法读取包文件"
+
+#: builtin/index-pack.c:577
+#, c-format
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] "包文件过早结束，缺少 %<PRIuMAX> 字节"
+msgstr[1] "包文件过早结束，缺少 %<PRIuMAX> 字节"
+
+#: builtin/index-pack.c:603
+msgid "serious inflate inconsistency"
+msgstr "解压缩严重的不一致"
+
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr "发现 %s 出现 SHA1 冲突！"
+
+#: builtin/index-pack.c:752 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:257
+#, c-format
+msgid "unable to read %s"
+msgstr "不能读 %s"
+
+#: builtin/index-pack.c:814
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "不能读取现存对象信息 %s"
+
+#: builtin/index-pack.c:822
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "不能读取现存对象 %s"
+
+#: builtin/index-pack.c:836
+#, c-format
+msgid "invalid blob object %s"
+msgstr "无效的数据对象 %s"
+
+#: builtin/index-pack.c:850
+#, c-format
+msgid "invalid %s"
+msgstr "无效的 %s"
+
+#: builtin/index-pack.c:853
+msgid "Error in object"
+msgstr "对象中出错"
+
+#: builtin/index-pack.c:855
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr "%s 的所有子对象并非都可达"
+
+#: builtin/index-pack.c:927 builtin/index-pack.c:958
+msgid "failed to apply delta"
+msgstr "无法应用 delta"
+
+#: builtin/index-pack.c:1128
+msgid "Receiving objects"
+msgstr "接收对象中"
+
+#: builtin/index-pack.c:1128
+msgid "Indexing objects"
+msgstr "索引对象中"
+
+#: builtin/index-pack.c:1160
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "包冲突（SHA1 不匹配）"
+
+#: builtin/index-pack.c:1165
+msgid "cannot fstat packfile"
+msgstr "不能对包文件调用 fstat"
+
+#: builtin/index-pack.c:1168
+msgid "pack has junk at the end"
+msgstr "包的结尾有垃圾数据"
+
+#: builtin/index-pack.c:1179
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "parse_pack_objects() 中遇到不可理喻的问题"
+
+#: builtin/index-pack.c:1202
+msgid "Resolving deltas"
+msgstr "处理 delta 中"
+
+#: builtin/index-pack.c:1213
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "不能创建线程：%s"
+
+#: builtin/index-pack.c:1255
+msgid "confusion beyond insanity"
+msgstr "不可理喻"
+
+#: builtin/index-pack.c:1261
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "完成 %d 个本地对象"
+msgstr[1] "完成 %d 个本地对象"
+
+#: builtin/index-pack.c:1273
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
+
+#: builtin/index-pack.c:1277
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] "包有 %d 个未解决的 delta"
+msgstr[1] "包有 %d 个未解决的 delta"
+
+#: builtin/index-pack.c:1301
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "不能压缩附加对象（%d）"
+
+#: builtin/index-pack.c:1377
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "本地对象 %s 已损坏"
+
+#: builtin/index-pack.c:1403
+msgid "error while closing pack file"
+msgstr "关闭包文件时出错"
+
+#: builtin/index-pack.c:1415
+#, c-format
+msgid "cannot write keep file '%s'"
+msgstr "无法写保留文件 '%s'"
+
+#: builtin/index-pack.c:1423
+#, c-format
+msgid "cannot close written keep file '%s'"
+msgstr "无法关闭保留文件 '%s'"
+
+#: builtin/index-pack.c:1433
+msgid "cannot store pack file"
+msgstr "无法存储包文件"
+
+#: builtin/index-pack.c:1441
+msgid "cannot store index file"
+msgstr "无法存储索引文件"
+
+#: builtin/index-pack.c:1479
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "坏的 pack.indexversion=%<PRIu32>"
+
+#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "没有线程支持，忽略 %s"
+
+#: builtin/index-pack.c:1547
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "无法打开现存包文件 '%s'"
+
+#: builtin/index-pack.c:1549
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "无法为 %s 打开包索引文件"
+
+#: builtin/index-pack.c:1596
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] "非 delta：%d 个对象"
+msgstr[1] "非 delta：%d 个对象"
+
+#: builtin/index-pack.c:1603
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] "链长 = %d: %lu 对象"
+msgstr[1] "链长 = %d: %lu 对象"
+
+#: builtin/index-pack.c:1616
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
+
+#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
+#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
+#, c-format
+msgid "bad %s"
+msgstr "错误选项 %s"
+
+#: builtin/index-pack.c:1737
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin 不能和 --stdin 同时使用"
+
+#: builtin/index-pack.c:1739
+msgid "--stdin requires a git repository"
+msgstr "--stdin 需要一个 git 仓库"
+
+#: builtin/index-pack.c:1747
+msgid "--verify with no packfile name given"
+msgstr "--verify 没有提供包文件名参数"
+
+#: builtin/init-db.c:54
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "不能对 '%s' 调用 stat"
+
+#: builtin/init-db.c:60
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "不能对模版 '%s' 调用 stat"
+
+#: builtin/init-db.c:65
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "不能打开目录 '%s'"
+
+#: builtin/init-db.c:76
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "不能读取链接 '%s'"
+
+#: builtin/init-db.c:78
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "不能自 '%s' 到 '%s' 创建符号链接"
+
+#: builtin/init-db.c:84
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "不能拷贝 '%s' 至 '%s'"
+
+#: builtin/init-db.c:88
+#, c-format
+msgid "ignoring template %s"
+msgstr "忽略模版 %s"
+
+#: builtin/init-db.c:119
+#, c-format
+msgid "templates not found %s"
+msgstr "模版未找到 %s"
+
+#: builtin/init-db.c:134
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr "没有从 '%s' 复制模版：%s"
+
+#: builtin/init-db.c:327
+#, c-format
+msgid "unable to handle file type %d"
+msgstr "不能处理 %d 类型的文件"
+
+#: builtin/init-db.c:330
+#, c-format
+msgid "unable to move %s to %s"
+msgstr "不能移动 %s 至 %s"
+
+#: builtin/init-db.c:347 builtin/init-db.c:350
+#, c-format
+msgid "%s already exists"
+msgstr "%s 已经存在"
+
+#: builtin/init-db.c:403
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
+
+#: builtin/init-db.c:404
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
+
+#: builtin/init-db.c:408
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
+
+#: builtin/init-db.c:409
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "已初始化空的 Git 仓库于 %s%s\n"
+
+#: builtin/init-db.c:457
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
+"[<目录>]"
+
+#: builtin/init-db.c:480
+msgid "permissions"
+msgstr "权限"
+
+#: builtin/init-db.c:481
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr "指定 git 仓库是多个用户之间共享的"
+
+#: builtin/init-db.c:515 builtin/init-db.c:520
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "不能创建目录 %s"
+
+#: builtin/init-db.c:524
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "不能切换目录到 %s"
+
+#: builtin/init-db.c:545
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
+
+#: builtin/init-db.c:573
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "不能访问工作区 '%s'"
+
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
+">])...] [<文件>...]"
+
+#: builtin/interpret-trailers.c:26
+msgid "edit files in place"
+msgstr "在原位编辑文件"
+
+#: builtin/interpret-trailers.c:27
+msgid "trim empty trailers"
+msgstr "删除空签名"
+
+#: builtin/interpret-trailers.c:28
+msgid "trailer"
+msgstr "签名"
+
+#: builtin/interpret-trailers.c:29
+msgid "trailer(s) to add"
+msgstr "要添加的签名"
+
+#: builtin/interpret-trailers.c:42
+msgid "no input file given for in-place editing"
+msgstr "没有给出要原位编辑的文件"
+
+#: builtin/log.c:44
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
+
+#: builtin/log.c:45
+msgid "git show [<options>] <object>..."
+msgstr "git show [<选项>] <对象>..."
+
+#: builtin/log.c:89
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "无效的 --decorate 选项：%s"
+
+#: builtin/log.c:144
+msgid "suppress diff output"
+msgstr "不显示差异输出"
+
+#: builtin/log.c:145
+msgid "show source"
+msgstr "显示源"
+
+#: builtin/log.c:146
+msgid "Use mail map file"
+msgstr "使用邮件映射文件"
+
+#: builtin/log.c:147
+msgid "decorate options"
+msgstr "修饰选项"
+
+#: builtin/log.c:150
+msgid "Process line range n,m in file, counting from 1"
+msgstr "处理文件中第 n 到 m 之间的行，从 1 开始"
+
+#: builtin/log.c:246
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr "最终输出：%d %s\n"
+
+#: builtin/log.c:493
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: 损坏的文件"
+
+#: builtin/log.c:507 builtin/log.c:601
+#, c-format
+msgid "Could not read object %s"
+msgstr "不能读取对象 %s"
+
+#: builtin/log.c:625
+#, c-format
+msgid "Unknown type: %d"
+msgstr "未知类型：%d"
+
+#: builtin/log.c:746
+msgid "format.headers without value"
+msgstr "format.headers 没有值"
+
+#: builtin/log.c:846
+msgid "name of output directory is too long"
+msgstr "输出目录名太长"
+
+#: builtin/log.c:861
+#, c-format
+msgid "Cannot open patch file %s"
+msgstr "无法打开补丁文件 %s"
+
+#: builtin/log.c:875
+msgid "Need exactly one range."
+msgstr "只需要一个范围。"
+
+#: builtin/log.c:885
+msgid "Not a range."
+msgstr "不是一个范围。"
+
+#: builtin/log.c:991
+msgid "Cover letter needs email format"
+msgstr "信封需要邮件地址格式"
+
+#: builtin/log.c:1071
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "不正常的 in-reply-to：%s"
+
+#: builtin/log.c:1098
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
+
+#: builtin/log.c:1148
+msgid "Two output directories?"
+msgstr "两个输出目录？"
+
+#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
+#, c-format
+msgid "Unknown commit %s"
+msgstr "未知提交 %s"
+
+#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "无法解析 '%s' 为一个有效引用。"
+
+#: builtin/log.c:1270
+msgid "Could not find exact merge base."
+msgstr "不能找到准确的合并基线。"
+
+#: builtin/log.c:1274
+msgid ""
+"Failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually."
+msgstr ""
+"无法得到上游地址，如果你想自动记录基线提交，请使用命令\n"
+"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
+"参数 --base=<base-commit-id> 手动指定一个基线提交。"
+
+#: builtin/log.c:1294
+msgid "Failed to find exact merge base"
+msgstr "无法找到准确的合并基线"
+
+#: builtin/log.c:1305
+msgid "base commit should be the ancestor of revision list"
+msgstr "基线提交应该是版本列表的祖先"
+
+#: builtin/log.c:1309
+msgid "base commit shouldn't be in revision list"
+msgstr "基线提交不应该出现在版本列表中"
+
+#: builtin/log.c:1358
+msgid "cannot get patch id"
+msgstr "无法得到补丁 id"
+
+#: builtin/log.c:1415
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "使用 [PATCH n/m]，即使只有一个补丁"
+
+#: builtin/log.c:1418
+msgid "use [PATCH] even with multiple patches"
+msgstr "使用 [PATCH]，即使有多个补丁"
+
+#: builtin/log.c:1422
+msgid "print patches to standard out"
+msgstr "打印补丁到标准输出"
+
+#: builtin/log.c:1424
+msgid "generate a cover letter"
+msgstr "生成一封附信"
+
+#: builtin/log.c:1426
+msgid "use simple number sequence for output file names"
+msgstr "使用简单的数字序列作为输出文件名"
+
+#: builtin/log.c:1427
+msgid "sfx"
+msgstr "后缀"
+
+#: builtin/log.c:1428
+msgid "use <sfx> instead of '.patch'"
+msgstr "使用 <后缀> 代替 '.patch'"
+
+#: builtin/log.c:1430
+msgid "start numbering patches at <n> instead of 1"
+msgstr "补丁以 <n> 开始编号，而不是1"
+
+#: builtin/log.c:1432
+msgid "mark the series as Nth re-roll"
+msgstr "标记补丁系列是第几次重制"
+
+#: builtin/log.c:1434
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "使用 [RFC PATCH] 代替 [PATCH]"
+
+#: builtin/log.c:1437
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr "使用 [<前缀>] 代替 [PATCH]"
+
+#: builtin/log.c:1440
+msgid "store resulting files in <dir>"
+msgstr "把结果文件存储在 <目录>"
+
+#: builtin/log.c:1443
+msgid "don't strip/add [PATCH]"
+msgstr "不删除/添加 [PATCH]"
+
+#: builtin/log.c:1446
+msgid "don't output binary diffs"
+msgstr "不输出二进制差异"
+
+#: builtin/log.c:1448
+msgid "output all-zero hash in From header"
+msgstr "在 From 头信息中输出全为零的哈希值"
+
+#: builtin/log.c:1450
+msgid "don't include a patch matching a commit upstream"
+msgstr "不包含已在上游提交中的补丁"
+
+#: builtin/log.c:1452
+msgid "show patch format instead of default (patch + stat)"
+msgstr "显示纯补丁格式而非默认的（补丁+状态）"
+
+#: builtin/log.c:1454
+msgid "Messaging"
+msgstr "邮件发送"
+
+#: builtin/log.c:1455
+msgid "header"
+msgstr "header"
+
+#: builtin/log.c:1456
+msgid "add email header"
+msgstr "添加邮件头"
+
+#: builtin/log.c:1457 builtin/log.c:1459
+msgid "email"
+msgstr "邮件地址"
+
+#: builtin/log.c:1457
+msgid "add To: header"
+msgstr "添加收件人"
+
+#: builtin/log.c:1459
+msgid "add Cc: header"
+msgstr "添加抄送"
+
+#: builtin/log.c:1461
+msgid "ident"
+msgstr "标识"
+
+#: builtin/log.c:1462
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
+
+#: builtin/log.c:1464
+msgid "message-id"
+msgstr "邮件标识"
+
+#: builtin/log.c:1465
+msgid "make first mail a reply to <message-id>"
+msgstr "使第一封邮件作为对 <邮件标识> 的回复"
+
+#: builtin/log.c:1466 builtin/log.c:1469
+msgid "boundary"
+msgstr "边界"
+
+#: builtin/log.c:1467
+msgid "attach the patch"
+msgstr "附件方式添加补丁"
+
+#: builtin/log.c:1470
+msgid "inline the patch"
+msgstr "内联显示补丁"
+
+#: builtin/log.c:1474
+msgid "enable message threading, styles: shallow, deep"
+msgstr "启用邮件线索，风格：浅，深"
+
+#: builtin/log.c:1476
+msgid "signature"
+msgstr "签名"
+
+#: builtin/log.c:1477
+msgid "add a signature"
+msgstr "添加一个签名"
+
+#: builtin/log.c:1478
+msgid "base-commit"
+msgstr "基线提交"
+
+#: builtin/log.c:1479
+msgid "add prerequisite tree info to the patch series"
+msgstr "为补丁列表添加前置树信息"
+
+#: builtin/log.c:1481
+msgid "add a signature from a file"
+msgstr "从文件添加一个签名"
+
+#: builtin/log.c:1482
+msgid "don't print the patch filenames"
+msgstr "不要打印补丁文件名"
+
+#: builtin/log.c:1572
+msgid "-n and -k are mutually exclusive."
+msgstr "-n 和 -k 互斥。"
+
+#: builtin/log.c:1574
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+msgstr "--subject-prefix/--rfc 和 -k 互斥。"
+
+#: builtin/log.c:1582
+msgid "--name-only does not make sense"
+msgstr "--name-only 无意义"
+
+#: builtin/log.c:1584
+msgid "--name-status does not make sense"
+msgstr "--name-status 无意义"
+
+#: builtin/log.c:1586
+msgid "--check does not make sense"
+msgstr "--check 无意义"
+
+#: builtin/log.c:1616
+msgid "standard output, or directory, which one?"
+msgstr "标准输出或目录，哪一个？"
+
+#: builtin/log.c:1618
+#, c-format
+msgid "Could not create directory '%s'"
+msgstr "不能创建目录 '%s'"
+
+#: builtin/log.c:1712
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "无法读取签名文件 '%s'"
+
+#: builtin/log.c:1784
+msgid "Failed to create output files"
+msgstr "无法创建输出文件"
+
+#: builtin/log.c:1833
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
+
+#: builtin/log.c:1887
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
+
+#: builtin/ls-files.c:468
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<选项>] [<文件>...]"
+
+#: builtin/ls-files.c:517
+msgid "identify the file status with tags"
+msgstr "用标签标识文件的状态"
+
+#: builtin/ls-files.c:519
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr "使用小写字母表示 '假设未改变的' 文件"
+
+#: builtin/ls-files.c:521
+msgid "show cached files in the output (default)"
+msgstr "显示缓存的文件（默认）"
+
+#: builtin/ls-files.c:523
+msgid "show deleted files in the output"
+msgstr "显示已删除的文件"
+
+#: builtin/ls-files.c:525
+msgid "show modified files in the output"
+msgstr "显示已修改的文件"
+
+#: builtin/ls-files.c:527
+msgid "show other files in the output"
+msgstr "显示其它文件"
+
+#: builtin/ls-files.c:529
+msgid "show ignored files in the output"
+msgstr "显示忽略的文件"
+
+#: builtin/ls-files.c:532
+msgid "show staged contents' object name in the output"
+msgstr "显示暂存区内容的对象名称"
+
+#: builtin/ls-files.c:534
+msgid "show files on the filesystem that need to be removed"
+msgstr "显示文件系统需要删除的文件"
+
+#: builtin/ls-files.c:536
+msgid "show 'other' directories' names only"
+msgstr "只显示“其他”目录的名称"
+
+#: builtin/ls-files.c:538
+msgid "show line endings of files"
+msgstr "显示文件换行符格式"
+
+#: builtin/ls-files.c:540
+msgid "don't show empty directories"
+msgstr "不显示空目录"
+
+#: builtin/ls-files.c:543
+msgid "show unmerged files in the output"
+msgstr "显示未合并的文件"
+
+#: builtin/ls-files.c:545
+msgid "show resolve-undo information"
+msgstr "显示 resolve-undo 信息"
+
+#: builtin/ls-files.c:547
+msgid "skip files matching pattern"
+msgstr "匹配排除文件的模式"
+
+#: builtin/ls-files.c:550
+msgid "exclude patterns are read from <file>"
+msgstr "从 <文件> 中读取排除模式"
+
+#: builtin/ls-files.c:553
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr "从 <文件> 读取额外的每个目录的排除模式"
+
+#: builtin/ls-files.c:555
+msgid "add the standard git exclusions"
+msgstr "添加标准的 git 排除"
+
+#: builtin/ls-files.c:558
+msgid "make the output relative to the project top directory"
+msgstr "显示相对于顶级目录的文件名"
+
+#: builtin/ls-files.c:561
+msgid "recurse through submodules"
+msgstr "在子模组中递归"
+
+#: builtin/ls-files.c:563
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr "如果任何 <文件> 都不在索引区，视为错误"
+
+#: builtin/ls-files.c:564
+msgid "tree-ish"
+msgstr "树或提交"
+
+#: builtin/ls-files.c:565
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
+
+#: builtin/ls-files.c:567
+msgid "show debugging data"
+msgstr "显示调试数据"
+
+#: builtin/ls-remote.c:7
+msgid ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
+msgstr ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<仓库> [<引用>...]]"
+
+#: builtin/ls-remote.c:52
+msgid "do not print remote URL"
+msgstr "不打印远程 URL"
+
+#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
+msgid "exec"
+msgstr "exec"
+
+#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
+msgid "path of git-upload-pack on the remote host"
+msgstr "远程主机上的 git-upload-pack 路径"
+
+#: builtin/ls-remote.c:58
+msgid "limit to tags"
+msgstr "仅限于标签"
+
+#: builtin/ls-remote.c:59
+msgid "limit to heads"
+msgstr "仅限于分支"
+
+#: builtin/ls-remote.c:60
+msgid "do not show peeled tags"
+msgstr "不显示已解析的标签"
+
+#: builtin/ls-remote.c:62
+msgid "take url.<base>.insteadOf into account"
+msgstr "参考 url.<base>.insteadOf 设置"
+
+#: builtin/ls-remote.c:64
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr "若未找到匹配的引用则以退出码2退出"
+
+#: builtin/ls-remote.c:66
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "除了显示指向的对象外，显示指向的引用名"
+
+#: builtin/ls-tree.c:28
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
+
+#: builtin/ls-tree.c:126
+msgid "only show trees"
+msgstr "只显示树"
+
+#: builtin/ls-tree.c:128
+msgid "recurse into subtrees"
+msgstr "递归到子树"
+
+#: builtin/ls-tree.c:130
+msgid "show trees when recursing"
+msgstr "当递归时显示树"
+
+#: builtin/ls-tree.c:133
+msgid "terminate entries with NUL byte"
+msgstr "条目以 NUL 字符终止"
+
+#: builtin/ls-tree.c:134
+msgid "include object size"
+msgstr "包括对象大小"
+
+#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
+msgid "list only filenames"
+msgstr "只列出文件名"
+
+#: builtin/ls-tree.c:141
+msgid "use full path names"
+msgstr "使用文件的全路径"
+
+#: builtin/ls-tree.c:143
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）"
+
+#: builtin/merge.c:46
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<选项>] [<提交>...]"
+
+#: builtin/merge.c:47
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:48
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:103
+msgid "switch `m' requires a value"
+msgstr "开关 `m' 需要一个值"
+
+#: builtin/merge.c:140
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "不能找到合并策略 '%s'。\n"
+
+#: builtin/merge.c:141
+#, c-format
+msgid "Available strategies are:"
+msgstr "可用的策略有："
+
+#: builtin/merge.c:146
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "可用的自定义策略有："
+
+#: builtin/merge.c:196 builtin/pull.c:127
+msgid "do not show a diffstat at the end of the merge"
+msgstr "在合并的最后不显示差异统计"
+
+#: builtin/merge.c:199 builtin/pull.c:130
+msgid "show a diffstat at the end of the merge"
+msgstr "在合并的最后显示差异统计"
+
+#: builtin/merge.c:200 builtin/pull.c:133
+msgid "(synonym to --stat)"
+msgstr "（和 --stat 同义）"
+
+#: builtin/merge.c:202 builtin/pull.c:136
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
+
+#: builtin/merge.c:205 builtin/pull.c:139
+msgid "create a single commit instead of doing a merge"
+msgstr "创建一个单独的提交而不是做一次合并"
+
+#: builtin/merge.c:207 builtin/pull.c:142
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "如果合并成功，执行一次提交（默认）"
+
+#: builtin/merge.c:209 builtin/pull.c:145
+msgid "edit message before committing"
+msgstr "在提交前编辑提交说明"
+
+#: builtin/merge.c:210
+msgid "allow fast-forward (default)"
+msgstr "允许快进（默认）"
+
+#: builtin/merge.c:212 builtin/pull.c:151
+msgid "abort if fast-forward is not possible"
+msgstr "如果不能快进就放弃合并"
+
+#: builtin/merge.c:216 builtin/pull.c:154
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
+
+#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
+#: builtin/revert.c:108
+msgid "strategy"
+msgstr "策略"
+
+#: builtin/merge.c:218 builtin/pull.c:159
+msgid "merge strategy to use"
+msgstr "要使用的合并策略"
+
+#: builtin/merge.c:219 builtin/pull.c:162
+msgid "option=value"
+msgstr "option=value"
+
+#: builtin/merge.c:220 builtin/pull.c:163
+msgid "option for selected merge strategy"
+msgstr "所选的合并策略的选项"
+
+#: builtin/merge.c:222
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "合并的提交说明（针对非快进式合并）"
+
+#: builtin/merge.c:226
+msgid "abort the current in-progress merge"
+msgstr "放弃当前正在进行的合并"
+
+#: builtin/merge.c:228
+msgid "continue the current in-progress merge"
+msgstr "继续当前正在进行的合并"
+
+#: builtin/merge.c:230 builtin/pull.c:170
+msgid "allow merging unrelated histories"
+msgstr "允许合并不相关的历史"
+
+#: builtin/merge.c:258
+msgid "could not run stash."
+msgstr "不能进行进度保存。"
+
+#: builtin/merge.c:263
+msgid "stash failed"
+msgstr "进度保存失败"
+
+#: builtin/merge.c:268
+#, c-format
+msgid "not a valid object: %s"
+msgstr "不是一个有效对象：%s"
+
+#: builtin/merge.c:287 builtin/merge.c:304
+msgid "read-tree failed"
+msgstr "读取树失败"
+
+# 译者：注意保持前导空格
+#: builtin/merge.c:334
+msgid " (nothing to squash)"
+msgstr " （无可压缩）"
+
+#: builtin/merge.c:345
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "压缩提交 -- 未更新 HEAD\n"
+
+#: builtin/merge.c:395
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "无合并信息 -- 未更新 HEAD\n"
+
+#: builtin/merge.c:446
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' 没有指向一个提交"
+
+#: builtin/merge.c:536
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
+
+#: builtin/merge.c:656
+msgid "Not handling anything other than two heads merge."
+msgstr "未处理两个头合并之外的任何操作。"
+
+#: builtin/merge.c:670
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "merge-recursive 的未知选项：-X%s"
+
+#: builtin/merge.c:685
+#, c-format
+msgid "unable to write %s"
+msgstr "不能写 %s"
+
+#: builtin/merge.c:737
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "不能从 '%s' 读取"
+
+#: builtin/merge.c:746
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
+
+#: builtin/merge.c:752
+#, c-format
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n"
+"合并到主题分支。\n"
+"\n"
+"以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
+
+#: builtin/merge.c:776
+msgid "Empty commit message."
+msgstr "空提交信息。"
+
+#: builtin/merge.c:796
+#, c-format
+msgid "Wonderful.\n"
+msgstr "太棒了。\n"
+
+#: builtin/merge.c:851
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
+
+#: builtin/merge.c:890
+msgid "No current branch."
+msgstr "没有当前分支。"
+
+#: builtin/merge.c:892
+msgid "No remote for the current branch."
+msgstr "当前分支没有对应的远程仓库。"
+
+#: builtin/merge.c:894
+msgid "No default upstream defined for the current branch."
+msgstr "当前分支没有定义默认的上游分支。"
+
+#: builtin/merge.c:899
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
+
+#: builtin/merge.c:946
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
+
+#: builtin/merge.c:1020
+#, c-format
+msgid "could not close '%s'"
+msgstr "不能关闭 '%s'"
+
+#: builtin/merge.c:1047
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "不能在 %s 中合并：%s"
+
+#: builtin/merge.c:1081
+msgid "not something we can merge"
+msgstr "不能合并"
+
+#: builtin/merge.c:1146
+msgid "--abort expects no arguments"
+msgstr "--abort 不带参数"
+
+#: builtin/merge.c:1150
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
+
+#: builtin/merge.c:1162
+msgid "--continue expects no arguments"
+msgstr "--continue 不带参数"
+
+#: builtin/merge.c:1166
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
+
+#: builtin/merge.c:1182
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
+"请在合并前先提交您的修改。"
+
+#: builtin/merge.c:1189
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
+"请在合并前先提交您的修改。"
+
+#: builtin/merge.c:1192
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
+
+#: builtin/merge.c:1201
+msgid "You cannot combine --squash with --no-ff."
+msgstr "您不能将 --squash 与 --no-ff 同时使用。"
+
+#: builtin/merge.c:1209
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
+
+#: builtin/merge.c:1226
+msgid "Squash commit into empty head not supported yet"
+msgstr "尚不支持到空分支的压缩提交"
+
+#: builtin/merge.c:1228
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "到空分支的非快进式提交没有意义"
+
+#: builtin/merge.c:1233
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - 不能被合并"
+
+#: builtin/merge.c:1235
+msgid "Can merge only exactly one commit into empty head"
+msgstr "只能将一个提交合并到空分支上"
+
+#: builtin/merge.c:1269
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
+
+#: builtin/merge.c:1272
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
+
+#: builtin/merge.c:1275
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "提交 %s 没有一个 GPG 签名。"
+
+#: builtin/merge.c:1278
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
+
+#: builtin/merge.c:1340
+msgid "refusing to merge unrelated histories"
+msgstr "拒绝合并无关的历史"
+
+#: builtin/merge.c:1349
+msgid "Already up-to-date."
+msgstr "已经是最新的。"
+
+#: builtin/merge.c:1359
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "更新 %s..%s\n"
+
+#: builtin/merge.c:1400
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "尝试非常小的索引内合并...\n"
+
+#: builtin/merge.c:1407
+#, c-format
+msgid "Nope.\n"
+msgstr "无。\n"
+
+#: builtin/merge.c:1432
+msgid "Already up-to-date. Yeeah!"
+msgstr "已经是最新的。耶！"
+
+#: builtin/merge.c:1438
+msgid "Not possible to fast-forward, aborting."
+msgstr "无法快进，终止。"
+
+#: builtin/merge.c:1461 builtin/merge.c:1540
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "将树回滚至原始状态...\n"
+
+#: builtin/merge.c:1465
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "尝试合并策略 %s...\n"
+
+#: builtin/merge.c:1531
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "没有合并策略处理此合并。\n"
+
+#: builtin/merge.c:1533
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "使用策略 %s 合并失败。\n"
+
+#: builtin/merge.c:1542
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "使用 %s 以准备手工解决。\n"
+
+#: builtin/merge.c:1554
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr "自动合并进展顺利，按要求在提交前停止\n"
+
+#: builtin/merge-base.c:29
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <提交> <提交>..."
+
+#: builtin/merge-base.c:30
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <提交>..."
+
+#: builtin/merge-base.c:31
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <提交>..."
+
+#: builtin/merge-base.c:32
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <提交> <提交>"
+
+#: builtin/merge-base.c:33
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <引用> [<提交>]"
+
+#: builtin/merge-base.c:217
+msgid "output all common ancestors"
+msgstr "输出所有共同的祖先"
+
+#: builtin/merge-base.c:219
+msgid "find ancestors for a single n-way merge"
+msgstr "查找一个多路合并的祖先提交"
+
+#: builtin/merge-base.c:221
+msgid "list revs not reachable from others"
+msgstr "显示不能被其他访问到的版本"
+
+#: builtin/merge-base.c:223
+msgid "is the first one ancestor of the other?"
+msgstr "第一个是其他的祖先提交么？"
+
+#: builtin/merge-base.c:225
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
+
+#: builtin/merge-file.c:8
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
+"件> <文件2>"
+
+#: builtin/merge-file.c:32
+msgid "send results to standard output"
+msgstr "将结果发送到标准输出"
+
+#: builtin/merge-file.c:33
+msgid "use a diff3 based merge"
+msgstr "使用基于 diff3 的合并"
+
+#: builtin/merge-file.c:34
+msgid "for conflicts, use our version"
+msgstr "如果冲突，使用我们的版本"
+
+#: builtin/merge-file.c:36
+msgid "for conflicts, use their version"
+msgstr "如果冲突，使用他们的版本"
+
+#: builtin/merge-file.c:38
+msgid "for conflicts, use a union version"
+msgstr "如果冲突，使用联合版本"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use this marker size"
+msgstr "如果冲突，使用指定长度的标记"
+
+#: builtin/merge-file.c:42
+msgid "do not warn about conflicts"
+msgstr "不要警告冲突"
+
+#: builtin/merge-file.c:44
+msgid "set labels for file1/orig-file/file2"
+msgstr "为 文件1/初始文件/文件2 设置标签"
+
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr "未知选项 %s"
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "不能解析对象 '%s'"
+
+#: builtin/merge-recursive.c:55
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
+msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
+
+#: builtin/merge-recursive.c:63
+msgid "not handling anything other than two heads merge."
+msgstr "不能处理两个头合并之外的任何操作。"
+
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "无法解析引用 '%s'"
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "合并 %s 和 %s\n"
+
+#: builtin/mktree.c:65
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr "git mktree [-z] [--missing] [--batch]"
+
+#: builtin/mktree.c:152
+msgid "input is NUL terminated"
+msgstr "输入以 NUL 字符终止"
+
+#: builtin/mktree.c:153 builtin/write-tree.c:24
+msgid "allow missing objects"
+msgstr "允许丢失的对象"
+
+#: builtin/mktree.c:154
+msgid "allow creation of more than one tree"
+msgstr "允许创建一个以上的树"
+
+#: builtin/mv.c:16
+msgid "git mv [<options>] <source>... <destination>"
+msgstr "git mv [<选项>] <源>... <目标>"
+
+#: builtin/mv.c:82
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr "目录 %s 在索引中并且不是子模组？"
+
+#: builtin/mv.c:84 builtin/rm.c:290
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
+
+#: builtin/mv.c:102
+#, c-format
+msgid "%.*s is in index"
+msgstr "%.*s 在索引中"
+
+#: builtin/mv.c:124
+msgid "force move/rename even if target exists"
+msgstr "强制移动/重命令，即使目标存在"
+
+#: builtin/mv.c:125
+msgid "skip move/rename errors"
+msgstr "跳过移动/重命名错误"
+
+#: builtin/mv.c:167
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "目标 '%s' 不是一个目录"
+
+#: builtin/mv.c:178
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "检查 '%s' 到 '%s' 的重命名\n"
+
+#: builtin/mv.c:182
+msgid "bad source"
+msgstr "坏的源"
+
+#: builtin/mv.c:185
+msgid "can not move directory into itself"
+msgstr "不能将目录移动到自身"
+
+#: builtin/mv.c:188
+msgid "cannot move directory over file"
+msgstr "不能将目录移动到文件"
+
+#: builtin/mv.c:197
+msgid "source directory is empty"
+msgstr "源目录为空"
+
+#: builtin/mv.c:222
+msgid "not under version control"
+msgstr "不在版本控制之下"
+
+#: builtin/mv.c:225
+msgid "destination exists"
+msgstr "目标已存在"
+
+#: builtin/mv.c:233
+#, c-format
+msgid "overwriting '%s'"
+msgstr "覆盖 '%s'"
+
+#: builtin/mv.c:236
+msgid "Cannot overwrite"
+msgstr "不能覆盖"
+
+#: builtin/mv.c:239
+msgid "multiple sources for the same target"
+msgstr "同一目标具有多个源"
+
+#: builtin/mv.c:241
+msgid "destination directory does not exist"
+msgstr "目标目录不存在"
+
+#: builtin/mv.c:248
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s，源=%s，目标=%s"
+
+#: builtin/mv.c:269
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr "重命名 %s 至 %s\n"
+
+#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384
+#, c-format
+msgid "renaming '%s' failed"
+msgstr "重命名 '%s' 失败"
+
+#: builtin/name-rev.c:289
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<选项>] <提交>..."
+
+#: builtin/name-rev.c:290
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<选项>] --all"
+
+#: builtin/name-rev.c:291
+msgid "git name-rev [<options>] --stdin"
+msgstr "git name-rev [<选项>] --stdin"
+
+#: builtin/name-rev.c:346
+msgid "print only names (no SHA-1)"
+msgstr "只打印名称（无 SHA-1）"
+
+#: builtin/name-rev.c:347
+msgid "only use tags to name the commits"
+msgstr "只使用标签来命名提交"
+
+#: builtin/name-rev.c:349
+msgid "only use refs matching <pattern>"
+msgstr "只使用和 <模式> 相匹配的引用"
+
+#: builtin/name-rev.c:351
+msgid "ignore refs matching <pattern>"
+msgstr "忽略和 <模式> 相匹配的引用"
+
+#: builtin/name-rev.c:353
+msgid "list all commits reachable from all refs"
+msgstr "列出可以从所有引用访问的提交"
+
+#: builtin/name-rev.c:354
+msgid "read from stdin"
+msgstr "从标准输入读取"
+
+#: builtin/name-rev.c:355
+msgid "allow to print `undefined` names (default)"
+msgstr "允许打印 `未定义` 的名称（默认）"
+
+#: builtin/name-rev.c:361
+msgid "dereference tags in the input (internal use)"
+msgstr "反向解析输入中的标签（内部使用）"
+
+#: builtin/notes.c:25
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
+
+#: builtin/notes.c:26
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
+"| (-c | -C) <对象>] [<对象>]"
+
+#: builtin/notes.c:27
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
+
+#: builtin/notes.c:28
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
+"(-c | -C) <对象>] [<对象>]"
+
+#: builtin/notes.c:29
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr "git notes [--ref <注解引用>] show [<对象>]"
+
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
+
+#: builtin/notes.c:32
+msgid "git notes merge --commit [-v | -q]"
+msgstr "git notes merge --commit [-v | -q]"
+
+#: builtin/notes.c:33
+msgid "git notes merge --abort [-v | -q]"
+msgstr "git notes merge --abort [-v | -q]"
+
+#: builtin/notes.c:34
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
+
+#: builtin/notes.c:35
+msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
+msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
+
+#: builtin/notes.c:36
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <注解引用>] get-ref"
+
+#: builtin/notes.c:41
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<对象>]]"
+
+#: builtin/notes.c:46
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<选项>] [<对象>]"
+
+#: builtin/notes.c:51
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<选项>] <源对象> <目标对象>"
+
+#: builtin/notes.c:52
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
+
+#: builtin/notes.c:57
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<选项>] [<对象>]"
+
+#: builtin/notes.c:62
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<对象>]"
+
+#: builtin/notes.c:67
+msgid "git notes show [<object>]"
+msgstr "git notes show [<对象>]"
+
+#: builtin/notes.c:72
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr "git notes merge [<选项>] <注解引用>"
+
+#: builtin/notes.c:73
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<选项>]"
+
+#: builtin/notes.c:74
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<选项>]"
+
+#: builtin/notes.c:79
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<对象>]"
+
+#: builtin/notes.c:84
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<选项>]"
+
+#: builtin/notes.c:89
+msgid "git notes get-ref"
+msgstr "git notes get-ref"
+
+#: builtin/notes.c:94
+msgid "Write/edit the notes for the following object:"
+msgstr "为下面的对象写/编辑说明："
+
+#: builtin/notes.c:147
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "不能为对象 '%s' 开始 'show'"
+
+#: builtin/notes.c:151
+msgid "could not read 'show' output"
+msgstr "不能读取 'show' 的输出"
+
+#: builtin/notes.c:159
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr "无法为对象 '%s' 完成 'show'"
+
+#: builtin/notes.c:194
+msgid "please supply the note contents using either -m or -F option"
+msgstr "请通过 -m 或 -F 选项为注解提供内容"
+
+#: builtin/notes.c:203
+msgid "unable to write note object"
+msgstr "不能写注解对象"
+
+#: builtin/notes.c:205
+#, c-format
+msgid "the note contents have been left in %s"
+msgstr "注解内容被留在 %s 中"
+
+#: builtin/notes.c:233 builtin/tag.c:516
+#, c-format
+msgid "cannot read '%s'"
+msgstr "不能读取 '%s'"
+
+#: builtin/notes.c:235 builtin/tag.c:519
+#, c-format
+msgid "could not open or read '%s'"
+msgstr "不能打开或读取 '%s'"
+
+#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
+#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "无法解析 '%s' 为一个有效引用。"
+
+#: builtin/notes.c:257
+#, c-format
+msgid "failed to read object '%s'."
+msgstr "无法读取对象 '%s'。"
+
+#: builtin/notes.c:261
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "不能从非数据对象 '%s' 中读取注解数据。"
+
+#: builtin/notes.c:301
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "非法的输入行：'%s'。"
+
+#: builtin/notes.c:316
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
+
+#. TRANSLATORS: the first %s will be replaced by a
+#. git notes command: 'add', 'merge', 'remove', etc.
+#: builtin/notes.c:345
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解"
+
+#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
+#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
+msgid "too many parameters"
+msgstr "参数太多"
+
+#: builtin/notes.c:378 builtin/notes.c:664
+#, c-format
+msgid "no note found for object %s."
+msgstr "未发现对象 %s 的注解。"
+
+#: builtin/notes.c:399 builtin/notes.c:562
+msgid "note contents as a string"
+msgstr "注解内容作为一个字符串"
+
+#: builtin/notes.c:402 builtin/notes.c:565
+msgid "note contents in a file"
+msgstr "注解内容到一个文件中"
+
+#: builtin/notes.c:405 builtin/notes.c:568
+msgid "reuse and edit specified note object"
+msgstr "重用和编辑指定的注解对象"
+
+#: builtin/notes.c:408 builtin/notes.c:571
+msgid "reuse specified note object"
+msgstr "重用指定的注解对象"
+
+#: builtin/notes.c:411 builtin/notes.c:574
+msgid "allow storing empty note"
+msgstr "允许保存空白注释"
+
+#: builtin/notes.c:412 builtin/notes.c:483
+msgid "replace existing notes"
+msgstr "替换已存在的注解"
+
+#: builtin/notes.c:437
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
+
+#: builtin/notes.c:452 builtin/notes.c:531
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr "覆盖对象 %s 现存注解\n"
+
+#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr "删除对象 %s 的注解\n"
+
+#: builtin/notes.c:484
+msgid "read objects from stdin"
+msgstr "从标准输入读取对象"
+
+#: builtin/notes.c:486
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
+
+#: builtin/notes.c:504
+msgid "too few parameters"
+msgstr "参数太少"
+
+#: builtin/notes.c:525
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
+
+#: builtin/notes.c:537
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "源对象 %s 缺少注解。不能拷贝。"
+
+#: builtin/notes.c:589
+#, c-format
+msgid ""
+"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
+"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+msgstr ""
+"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
+"请换用 'git notes add -f -m/-F/-c/-C'。\n"
+
+#: builtin/notes.c:684
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:686
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "无法删除引用 NOTES_MERGE_REF"
+
+#: builtin/notes.c:688
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "无法删除 'git notes merge' 工作区"
+
+#: builtin/notes.c:708
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:710
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
+
+#: builtin/notes.c:712
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
+
+#: builtin/notes.c:725
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "无法解析 NOTES_MERGE_REF"
+
+#: builtin/notes.c:728
+msgid "failed to finalize notes merge"
+msgstr "无法完成注解合并"
+
+#: builtin/notes.c:754
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "未知的注解合并策略 %s"
+
+#: builtin/notes.c:770
+msgid "General options"
+msgstr "通用选项"
+
+#: builtin/notes.c:772
+msgid "Merge options"
+msgstr "合并选项"
+
+#: builtin/notes.c:774
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
+
+#: builtin/notes.c:776
+msgid "Committing unmerged notes"
+msgstr "提交未合并的注解"
+
+#: builtin/notes.c:778
+msgid "finalize notes merge by committing unmerged notes"
+msgstr "通过提交未合并的注解来完成注解合并"
+
+#: builtin/notes.c:780
+msgid "Aborting notes merge resolution"
+msgstr "中止注解合并的方案"
+
+#: builtin/notes.c:782
+msgid "abort notes merge"
+msgstr "中止注解合并"
+
+#: builtin/notes.c:793
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "不能混用 --commit、--abort 或 -s/--strategy"
+
+#: builtin/notes.c:798
+msgid "must specify a notes ref to merge"
+msgstr "必须指定一个注解引用来合并"
+
+#: builtin/notes.c:822
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr "未知的 -s/--strategy：%s"
+
+#: builtin/notes.c:859
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
+
+#: builtin/notes.c:862
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr "无法存储链接到当前的注解引用（%s）"
+
+#: builtin/notes.c:864
+#, c-format
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
+msgstr ""
+"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
+"交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
+
+#: builtin/notes.c:886
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "对象 %s 没有注解\n"
+
+#: builtin/notes.c:898
+msgid "attempt to remove non-existent note is not an error"
+msgstr "尝试删除不存在的注解不是一个错误"
+
+#: builtin/notes.c:901
+msgid "read object names from the standard input"
+msgstr "从标准输入读取对象名称"
+
+#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
+msgid "do not remove, show only"
+msgstr "不删除，只显示"
+
+#: builtin/notes.c:940
+msgid "report pruned notes"
+msgstr "报告清除的注解"
+
+#: builtin/notes.c:982
+msgid "notes-ref"
+msgstr "注解引用"
+
+#: builtin/notes.c:983
+msgid "use notes from <notes-ref>"
+msgstr "从 <注解引用> 使用注解"
+
+#: builtin/notes.c:1018
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr "未知子命令：%s"
+
+#: builtin/pack-objects.c:29
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
+
+#: builtin/pack-objects.c:30
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
+
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#, c-format
+msgid "deflate error (%d)"
+msgstr "压缩错误 (%d)"
+
+#: builtin/pack-objects.c:770
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
+
+#: builtin/pack-objects.c:783
+msgid "Writing objects"
+msgstr "写入对象中"
+
+#: builtin/pack-objects.c:1063
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
+
+#: builtin/pack-objects.c:2426
+msgid "Compressing objects"
+msgstr "压缩对象中"
+
+#: builtin/pack-objects.c:2829
+#, c-format
+msgid "unsupported index version %s"
+msgstr "不支持的索引版本 %s"
+
+#: builtin/pack-objects.c:2833
+#, c-format
+msgid "bad index version '%s'"
+msgstr "坏的索引版本 '%s'"
+
+#: builtin/pack-objects.c:2863
+msgid "do not show progress meter"
+msgstr "不显示进度表"
+
+#: builtin/pack-objects.c:2865
+msgid "show progress meter"
+msgstr "显示进度表"
+
+#: builtin/pack-objects.c:2867
+msgid "show progress meter during object writing phase"
+msgstr "在对象写入阶段显示进度表"
+
+#: builtin/pack-objects.c:2870
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "当进度表显示时类似于 --all-progress"
+
+#: builtin/pack-objects.c:2871
+msgid "version[,offset]"
+msgstr "版本[,偏移]"
+
+#: builtin/pack-objects.c:2872
+msgid "write the pack index file in the specified idx format version"
+msgstr "用指定的 idx 格式版本来写包索引文件"
+
+#: builtin/pack-objects.c:2875
+msgid "maximum size of each output pack file"
+msgstr "每个输出包的最大尺寸"
+
+#: builtin/pack-objects.c:2877
+msgid "ignore borrowed objects from alternate object store"
+msgstr "忽略从备用对象存储里借用对象"
+
+#: builtin/pack-objects.c:2879
+msgid "ignore packed objects"
+msgstr "忽略包对象"
+
+#: builtin/pack-objects.c:2881
+msgid "limit pack window by objects"
+msgstr "限制打包窗口的对象数"
+
+#: builtin/pack-objects.c:2883
+msgid "limit pack window by memory in addition to object limit"
+msgstr "除对象数量限制外设置打包窗口的内存限制"
+
+#: builtin/pack-objects.c:2885
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr "打包允许的 delta 链的最大长度"
+
+#: builtin/pack-objects.c:2887
+msgid "reuse existing deltas"
+msgstr "重用已存在的 deltas"
+
+#: builtin/pack-objects.c:2889
+msgid "reuse existing objects"
+msgstr "重用已存在的对象"
+
+#: builtin/pack-objects.c:2891
+msgid "use OFS_DELTA objects"
+msgstr "使用 OFS_DELTA 对象"
+
+#: builtin/pack-objects.c:2893
+msgid "use threads when searching for best delta matches"
+msgstr "使用线程查询最佳 delta 匹配"
+
+#: builtin/pack-objects.c:2895
+msgid "do not create an empty pack output"
+msgstr "不创建空的包输出"
+
+#: builtin/pack-objects.c:2897
+msgid "read revision arguments from standard input"
+msgstr "从标准输入读取版本号参数"
+
+#: builtin/pack-objects.c:2899
+msgid "limit the objects to those that are not yet packed"
+msgstr "限制那些尚未打包的对象"
+
+#: builtin/pack-objects.c:2902
+msgid "include objects reachable from any reference"
+msgstr "包括可以从任何引用访问到的对象"
+
+#: builtin/pack-objects.c:2905
+msgid "include objects referred by reflog entries"
+msgstr "包括被引用日志引用到的对象"
+
+#: builtin/pack-objects.c:2908
+msgid "include objects referred to by the index"
+msgstr "包括被索引引用到的对象"
+
+#: builtin/pack-objects.c:2911
+msgid "output pack to stdout"
+msgstr "输出包到标准输出"
+
+#: builtin/pack-objects.c:2913
+msgid "include tag objects that refer to objects to be packed"
+msgstr "包括那些引用了待打包对象的标签对象"
+
+#: builtin/pack-objects.c:2915
+msgid "keep unreachable objects"
+msgstr "维持不可达的对象"
+
+#: builtin/pack-objects.c:2917
+msgid "pack loose unreachable objects"
+msgstr "打包松散的不可达对象"
+
+#: builtin/pack-objects.c:2919
+msgid "unpack unreachable objects newer than <time>"
+msgstr "将比给定 <时间> 新的无法访问的对象解包"
+
+#: builtin/pack-objects.c:2922
+msgid "create thin packs"
+msgstr "创建精简包"
+
+#: builtin/pack-objects.c:2924
+msgid "create packs suitable for shallow fetches"
+msgstr "创建适合浅克隆仓库获取的包"
+
+#: builtin/pack-objects.c:2926
+msgid "ignore packs that have companion .keep file"
+msgstr "忽略配有 .keep 文件的包"
+
+#: builtin/pack-objects.c:2928
+msgid "pack compression level"
+msgstr "打包压缩级别"
+
+#: builtin/pack-objects.c:2930
+msgid "do not hide commits by grafts"
+msgstr "显示被嫁接隐藏的提交"
+
+#: builtin/pack-objects.c:2932
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
+
+#: builtin/pack-objects.c:2934
+msgid "write a bitmap index together with the pack index"
+msgstr "在建立包索引的同时创建 bitmap 索引"
+
+#: builtin/pack-objects.c:3061
+msgid "Counting objects"
+msgstr "对象计数中"
+
+#: builtin/pack-refs.c:6
+msgid "git pack-refs [<options>]"
+msgstr "git pack-refs [<选项>]"
+
+#: builtin/pack-refs.c:14
+msgid "pack everything"
+msgstr "打包一切"
+
+#: builtin/pack-refs.c:15
+msgid "prune loose refs (default)"
+msgstr "清除松散的引用（默认）"
+
+#: builtin/prune-packed.c:7
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+
+#: builtin/prune-packed.c:40
+msgid "Removing duplicate objects"
+msgstr "正在删除重复对象"
+
+#: builtin/prune.c:11
+msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
+
+#: builtin/prune.c:106
+msgid "report pruned objects"
+msgstr "报告清除的对象"
+
+#: builtin/prune.c:109
+msgid "expire objects older than <time>"
+msgstr "使早于给定时间的对象过期"
+
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr "不能在珍品仓库中执行清理操作"
+
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "%s 的值无效：%s"
+
+#: builtin/pull.c:73
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
+
+#: builtin/pull.c:121
+msgid "Options related to merging"
+msgstr "和合并相关的选项"
+
+#: builtin/pull.c:124
+msgid "incorporate changes by rebasing rather than merging"
+msgstr "使用变基操作取代合并操作以合入修改"
+
+#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
+msgid "allow fast-forward"
+msgstr "允许快进式"
+
+#: builtin/pull.c:157
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "自动在变基操作前后执行 stash/stash pop"
+
+#: builtin/pull.c:173
+msgid "Options related to fetching"
+msgstr "和获取相关的参数"
+
+#: builtin/pull.c:195
+msgid "number of submodules pulled in parallel"
+msgstr "并发拉取的子模组的数量"
+
+#: builtin/pull.c:284
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr "pull.ff 的取值无效：%s"
+
+#: builtin/pull.c:397
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
+
+#: builtin/pull.c:399
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
+
+#: builtin/pull.c:400
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
+
+#: builtin/pull.c:403
+#, c-format
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
+msgstr ""
+"您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
+"分支默认的远程仓库，您必须在命令行中指定一个分支名。"
+
+#: builtin/pull.c:408 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr "您当前不在一个分支上。"
+
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr "请指定您要变基到哪一个分支。"
+
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr "请指定您要合并哪一个分支。"
+
+#: builtin/pull.c:413 builtin/pull.c:428
+msgid "See git-pull(1) for details."
+msgstr "详见 git-pull(1)。"
+
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<远程>"
+
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<分支>"
+
+#: builtin/pull.c:423 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr "当前分支没有跟踪信息。"
+
+#: builtin/pull.c:432 git-parse-remote.sh:95
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr "如果您想要为此分支创建跟踪信息，您可以执行："
+
+#: builtin/pull.c:437
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+"您的配置中指定要合并远程的引用 '%s'，\n"
+"但是没有获取到这个引用。"
+
+#: builtin/pull.c:754
+msgid "ignoring --verify-signatures for rebase"
+msgstr "为变基操作忽略 --verify-signatures"
+
+#: builtin/pull.c:801
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
+
+#: builtin/pull.c:809
+msgid "Updating an unborn branch with changes added to the index."
+msgstr "更新尚未诞生的分支，变更添加至索引。"
+
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr "变基式拉取"
+
+#: builtin/pull.c:813
+msgid "please commit or stash them."
+msgstr "请提交或为它们保存进度。"
+
+#: builtin/pull.c:838
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"fetch 更新了当前的分支。快进您的工作区\n"
+"至提交 %s。"
+
+#: builtin/pull.c:843
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+"您当前的工作区无法执行快进操作。\n"
+"首先执行如下命令：\n"
+"$ git diff %s\n"
+"以确认所有有用的数据均已保存。然后执行下面的命令\n"
+"$ git reset --hard\n"
+"恢复之前的状态。"
+
+#: builtin/pull.c:858
+msgid "Cannot merge multiple branches into empty head."
+msgstr "无法将多个分支合并到空分支。"
+
+#: builtin/pull.c:862
+msgid "Cannot rebase onto multiple branches."
+msgstr "无法变基到多个分支。"
+
+#: builtin/push.c:16
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
+
+#: builtin/push.c:89
+msgid "tag shorthand without <tag>"
+msgstr "标签后面未提供 <标签> 参数"
+
+#: builtin/push.c:99
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete 只接受简单的目标引用名"
+
+#: builtin/push.c:143
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+"\n"
+"为了永久地选择任一选项，参见 'git help config' 中的 push.default。"
+
+#: builtin/push.c:146
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch. To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+" git push %s %s\n"
+"%s"
+msgstr ""
+"如果您当前分支的上游分支和您当前分支名不匹配，为推送到远程的\n"
+"上游分支，使用\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"为推送至远程同名分支，使用\n"
+"\n"
+" git push %s %s\n"
+"%s"
+
+#: builtin/push.c:161
+#, c-format
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+" git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+"您当前不在一个分支上。\n"
+"现在为推送当前（分离头指针）的历史，使用\n"
+"\n"
+" git push %s HEAD:<远程分支名字>\n"
+
+#: builtin/push.c:175
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+" git push --set-upstream %s %s\n"
+msgstr ""
+"当前分支 %s 没有对应的上游分支。\n"
+"为推送当前分支并建立与远程上游的跟踪，使用\n"
+"\n"
+" git push --set-upstream %s %s\n"
+
+#: builtin/push.c:183
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
+
+#: builtin/push.c:186
+#, c-format
+msgid ""
+"You are pushing to remote '%s', which is not the upstream of\n"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
+msgstr ""
+"您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
+"而没有告诉我要推送什么、更新哪个远程分支。"
+
+#: builtin/push.c:245
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。"
+
+#: builtin/push.c:252
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. Integrate the remote changes (e.g.\n"
+"'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n"
+"再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
+"'git push --help' 中的 'Note about fast-forwards' 小节。"
+
+#: builtin/push.c:258
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. Check out this branch and integrate the remote changes\n"
+"(e.g. 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
+"检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"
+"'git push --help' 中的 'Note about fast-forwards' 小节。"
+
+#: builtin/push.c:264
+msgid ""
+"Updates were rejected because the remote contains work that you do\n"
+"not have locally. This is usually caused by another repository pushing\n"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"更新被拒绝，因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
+"一个仓库已向该引用进行了推送。再次推送前，您可能需要先整合远程变更\n"
+"（如 'git pull ...'）。\n"
+"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
+
+#: builtin/push.c:271
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr "更新被拒绝，因为该标签在远程已经存在。"
+
+#: builtin/push.c:274
+msgid ""
+"You cannot update a remote ref that points at a non-commit object,\n"
+"or update a remote ref to make it point at a non-commit object,\n"
+"without using the '--force' option.\n"
+msgstr ""
+"如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"
+"也不能更新远程引用让其指向一个非提交对象。\n"
+
+#: builtin/push.c:334
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "推送到 %s\n"
+
+#: builtin/push.c:338
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "无法推送一些引用到 '%s'"
+
+#: builtin/push.c:369
+#, c-format
+msgid "bad repository '%s'"
+msgstr "坏的仓库 '%s'"
+
+#: builtin/push.c:370
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+" git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+" git push <name>\n"
+msgstr ""
+"没有配置推送目标。\n"
+"或通过命令行指定 URL，或用下面命令配置一个远程仓库\n"
+"\n"
+" git remote add <名称> <地址>\n"
+"\n"
+"然后使用该远程仓库名执行推送\n"
+"\n"
+" git push <名称>\n"
+
+#: builtin/push.c:388
+msgid "--all and --tags are incompatible"
+msgstr "--all 和 --tags 不兼容"
+
+#: builtin/push.c:389
+msgid "--all can't be combined with refspecs"
+msgstr "--all 不能和引用规格同时使用"
+
+#: builtin/push.c:394
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror 和 --tags 不兼容"
+
+#: builtin/push.c:395
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror 不能和引用规格同时使用"
+
+#: builtin/push.c:400
+msgid "--all and --mirror are incompatible"
+msgstr "--all 和 --mirror 不兼容"
+
+#: builtin/push.c:518
+msgid "repository"
+msgstr "仓库"
+
+#: builtin/push.c:519 builtin/send-pack.c:162
+msgid "push all refs"
+msgstr "推送所有引用"
+
+#: builtin/push.c:520 builtin/send-pack.c:164
+msgid "mirror all refs"
+msgstr "镜像所有引用"
+
+#: builtin/push.c:522
+msgid "delete refs"
+msgstr "删除引用"
+
+#: builtin/push.c:523
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr "推送标签（不能使用 --all or --mirror）"
+
+#: builtin/push.c:526 builtin/send-pack.c:165
+msgid "force updates"
+msgstr "强制更新"
+
+#: builtin/push.c:528 builtin/send-pack.c:179
+msgid "refname>:<expect"
+msgstr "引用名>:<期望值"
+
+#: builtin/push.c:529 builtin/send-pack.c:180
+msgid "require old value of ref to be at this value"
+msgstr "要求引用旧的取值为设定值"
+
+#: builtin/push.c:532
+msgid "control recursive pushing of submodules"
+msgstr "控制子模组的递归推送"
+
+#: builtin/push.c:534 builtin/send-pack.c:173
+msgid "use thin pack"
+msgstr "使用精简打包"
+
+#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
+#: builtin/send-pack.c:160
+msgid "receive pack program"
+msgstr "接收包程序"
+
+#: builtin/push.c:537
+msgid "set upstream for git pull/status"
+msgstr "设置 git pull/status 的上游"
+
+#: builtin/push.c:540
+msgid "prune locally removed refs"
+msgstr "清除本地删除的引用"
+
+#: builtin/push.c:542
+msgid "bypass pre-push hook"
+msgstr "绕过 pre-push 钩子"
+
+#: builtin/push.c:543
+msgid "push missing but relevant tags"
+msgstr "推送缺失但有关的标签"
+
+#: builtin/push.c:546 builtin/send-pack.c:167
+msgid "GPG sign the push"
+msgstr "用 GPG 为推送签名"
+
+#: builtin/push.c:548 builtin/send-pack.c:174
+msgid "request atomic transaction on remote side"
+msgstr "需要远端支持原子事务"
+
+#: builtin/push.c:549 builtin/send-pack.c:170
+msgid "server-specific"
+msgstr "server-specific"
+
+#: builtin/push.c:549 builtin/send-pack.c:171
+msgid "option to transmit"
+msgstr "传输选项"
+
+#: builtin/push.c:563
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
+
+#: builtin/push.c:565
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete 未接任何引用没有意义"
+
+#: builtin/push.c:584
+msgid "push options must not have new line characters"
+msgstr "推送选项不能有换行符"
+
+#: builtin/read-tree.c:40
+msgid ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+msgstr ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
+"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
+
+#: builtin/read-tree.c:130
+msgid "write resulting index to <file>"
+msgstr "将索引结果写入 <文件>"
+
+#: builtin/read-tree.c:133
+msgid "only empty the index"
+msgstr "只是清空索引"
+
+#: builtin/read-tree.c:135
+msgid "Merging"
+msgstr "合并"
+
+#: builtin/read-tree.c:137
+msgid "perform a merge in addition to a read"
+msgstr "读取之余再执行一个合并"
+
+#: builtin/read-tree.c:139
+msgid "3-way merge if no file level merging required"
+msgstr "如果没有文件级合并需要，执行三方合并"
+
+#: builtin/read-tree.c:141
+msgid "3-way merge in presence of adds and removes"
+msgstr "存在添加和删除时，也执行三方合并"
+
+#: builtin/read-tree.c:143
+msgid "same as -m, but discard unmerged entries"
+msgstr "类似于 -m，但丢弃未合并的条目"
+
+#: builtin/read-tree.c:144
+msgid "<subdirectory>/"
+msgstr "<子目录>/"
+
+#: builtin/read-tree.c:145
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "读取树对象到索引的 <子目录>/ 下"
+
+#: builtin/read-tree.c:148
+msgid "update working tree with merge result"
+msgstr "用合并的结果更新工作区"
+
+#: builtin/read-tree.c:150
+msgid "gitignore"
+msgstr "gitignore"
+
+#: builtin/read-tree.c:151
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "允许忽略文件中设定的文件可以被覆盖"
+
+#: builtin/read-tree.c:154
+msgid "don't check the working tree after merging"
+msgstr "合并后不检查工作区"
+
+#: builtin/read-tree.c:155
+msgid "don't update the index or the work tree"
+msgstr "不更新索引区和工作区"
+
+#: builtin/read-tree.c:157
+msgid "skip applying sparse checkout filter"
+msgstr "跳过应用稀疏检出过滤器"
+
+#: builtin/read-tree.c:159
+msgid "debug unpack-trees"
+msgstr "调试 unpack-trees"
+
+#: builtin/rebase--helper.c:7
+msgid "git rebase--helper [<options>]"
+msgstr "git rebase--helper [<选项>]"
+
+#: builtin/rebase--helper.c:19
+msgid "continue rebase"
+msgstr "继续变基"
+
+#: builtin/rebase--helper.c:21
+msgid "abort rebase"
+msgstr "中止变基"
+
+#: builtin/receive-pack.c:27
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <git-dir>"
+
+#: builtin/receive-pack.c:795
+msgid ""
+"By default, updating the current branch in a non-bare repository\n"
+"is denied, because it will make the index and work tree inconsistent\n"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+"默认禁止更新非纯仓库的当前分支，因为您推送的内容将导致索引和工作区\n"
+"不一致，并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
+"\n"
+"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
+"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做，除非您\n"
+"用某种方式将其工作区更新至您推送的状态。\n"
+"\n"
+"若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
+"配置变量为 'refuse'。"
+
+#: builtin/receive-pack.c:815
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+"默认禁止删除当前分支，因为下一次 'git clone' 将不会检出任何文件，\n"
+"导致困惑。\n"
+"\n"
+"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
+"'warn'（显示警告信息）或 'ignore'（忽略警告信息）以允许删除当前分支。\n"
+"\n"
+"若要屏蔽此信息，您可以设置它为 'refuse'。"
+
+#: builtin/receive-pack.c:1888
+msgid "quiet"
+msgstr "静默模式"
+
+#: builtin/receive-pack.c:1902
+msgid "You must specify a directory."
+msgstr "您必须指定一个目录。"
+
+#: builtin/reflog.c:423
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
+
+#: builtin/reflog.c:540 builtin/reflog.c:545
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr "'%s' 不是一个有效的时间戳"
+
+#: builtin/remote.c:12
+msgid "git remote [-v | --verbose]"
+msgstr "git remote [-v | --verbose]"
+
+#: builtin/remote.c:13
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <名称> <地址>"
+
+#: builtin/remote.c:14 builtin/remote.c:34
+msgid "git remote rename <old> <new>"
+msgstr "git remote rename <旧名称> <新名称>"
+
+#: builtin/remote.c:15 builtin/remote.c:39
+msgid "git remote remove <name>"
+msgstr "git remote remove <名称>"
+
+#: builtin/remote.c:16 builtin/remote.c:44
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
+
+#: builtin/remote.c:17
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr "git remote [-v | --verbose] show [-n] <名称>"
+
+#: builtin/remote.c:18
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr "git remote prune [-n | --dry-run] <名称>"
+
+#: builtin/remote.c:19
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
+
+#: builtin/remote.c:20
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr "git remote set-branches [--add] <名称> <分支>..."
+
+#: builtin/remote.c:21 builtin/remote.c:70
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <名称>"
+
+#: builtin/remote.c:22 builtin/remote.c:75
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
+
+#: builtin/remote.c:23 builtin/remote.c:76
+msgid "git remote set-url --add <name> <newurl>"
+msgstr "git remote set-url --add <名称> <新的地址>"
+
+#: builtin/remote.c:24 builtin/remote.c:77
+msgid "git remote set-url --delete <name> <url>"
+msgstr "git remote set-url --delete <名称> <地址>"
+
+#: builtin/remote.c:29
+msgid "git remote add [<options>] <name> <url>"
+msgstr "git remote add [<选项>] <名称> <地址>"
+
+#: builtin/remote.c:49
+msgid "git remote set-branches <name> <branch>..."
+msgstr "git remote set-branches <名称> <分支>..."
+
+#: builtin/remote.c:50
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr "git remote set-branches --add <名称> <分支>..."
+
+#: builtin/remote.c:55
+msgid "git remote show [<options>] <name>"
+msgstr "git remote show [<选项>] <名称>"
+
+#: builtin/remote.c:60
+msgid "git remote prune [<options>] <name>"
+msgstr "git remote prune [<选项>] <名称>"
+
+#: builtin/remote.c:65
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr "git remote update [<选项>] [<组> | <远程>]..."
+
+#: builtin/remote.c:94
+#, c-format
+msgid "Updating %s"
+msgstr "更新 %s 中"
+
+#: builtin/remote.c:126
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+"--mirror 选项危险且过时，请使用 --mirror=fetch\n"
+"\t 或 --mirror=push"
+
+#: builtin/remote.c:143
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr "未知的镜像参数：%s"
+
+#: builtin/remote.c:159
+msgid "fetch the remote branches"
+msgstr "抓取远程的分支"
+
+#: builtin/remote.c:161
+msgid "import all tags and associated objects when fetching"
+msgstr "抓取时导入所有的标签和关联对象"
+
+#: builtin/remote.c:164
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr "或不抓取任何标签（--no-tags）"
+
+#: builtin/remote.c:166
+msgid "branch(es) to track"
+msgstr "跟踪的分支"
+
+#: builtin/remote.c:167
+msgid "master branch"
+msgstr "主线分支"
+
+#: builtin/remote.c:168
+msgid "push|fetch"
+msgstr "push|fetch"
+
+#: builtin/remote.c:169
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr "把远程设置为用以推送或抓取的镜像"
+
+#: builtin/remote.c:181
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
+
+#: builtin/remote.c:183
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
+
+#: builtin/remote.c:190 builtin/remote.c:629
+#, c-format
+msgid "remote %s already exists."
+msgstr "远程 %s 已经存在。"
+
+#: builtin/remote.c:194 builtin/remote.c:633
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' 不是一个有效的远程名称"
+
+#: builtin/remote.c:234
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr "无法设置 master '%s'"
+
+#: builtin/remote.c:336
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr "无法得到引用规格 %s 的获取列表"
+
+#: builtin/remote.c:437 builtin/remote.c:445
+msgid "(matching)"
+msgstr "（匹配）"
+
+#: builtin/remote.c:449
+msgid "(delete)"
+msgstr "（删除）"
+
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
+#, c-format
+msgid "No such remote: %s"
+msgstr "没有这样的远程：%s"
+
+#: builtin/remote.c:639
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr "不能重命名配置小节 '%s' 到 '%s'"
+
+#: builtin/remote.c:659
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+"没有更新非默认的获取引用规格\n"
+"\t%s\n"
+"\t如果必要请手动更新配置。"
+
+#: builtin/remote.c:695
+#, c-format
+msgid "deleting '%s' failed"
+msgstr "删除 '%s' 失败"
+
+#: builtin/remote.c:729
+#, c-format
+msgid "creating '%s' failed"
+msgstr "创建 '%s' 失败"
+
+#: builtin/remote.c:794
+msgid ""
+"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
+"to delete it, use:"
+msgid_plural ""
+"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
+"to delete them, use:"
+msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
+msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
+
+#: builtin/remote.c:808
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "不能移除配置小节 '%s'"
+
+#: builtin/remote.c:909
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr " 新的（下一次获取将存储于 remotes/%s）"
+
+#: builtin/remote.c:912
+msgid " tracked"
+msgstr " 已跟踪"
+
+#: builtin/remote.c:914
+msgid " stale (use 'git remote prune' to remove)"
+msgstr " 过时（使用 'git remote prune' 来移除）"
+
+#: builtin/remote.c:916
+msgid " ???"
+msgstr " ???"
+
+#: builtin/remote.c:957
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
+
+#: builtin/remote.c:965
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr "交互式变基到远程 %s"
+
+#: builtin/remote.c:966
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "变基到远程 %s"
+
+#: builtin/remote.c:969
+#, c-format
+msgid " merges with remote %s"
+msgstr " 与远程 %s 合并"
+
+#: builtin/remote.c:972
+#, c-format
+msgid "merges with remote %s"
+msgstr "与远程 %s 合并"
+
+#: builtin/remote.c:975
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr "%-*s 以及和远程 %s\n"
+
+#: builtin/remote.c:1018
+msgid "create"
+msgstr "创建"
+
+#: builtin/remote.c:1021
+msgid "delete"
+msgstr "删除"
+
+#: builtin/remote.c:1025
+msgid "up to date"
+msgstr "最新"
+
+#: builtin/remote.c:1028
+msgid "fast-forwardable"
+msgstr "可快进"
+
+#: builtin/remote.c:1031
+msgid "local out of date"
+msgstr "本地已过时"
+
+#: builtin/remote.c:1038
+#, c-format
+msgid " %-*s forces to %-*s (%s)"
+msgstr " %-*s 强制推送至 %-*s (%s)"
+
+#: builtin/remote.c:1041
+#, c-format
+msgid " %-*s pushes to %-*s (%s)"
+msgstr " %-*s 推送至 %-*s (%s)"
+
+#: builtin/remote.c:1045
+#, c-format
+msgid " %-*s forces to %s"
+msgstr " %-*s 强制推送至 %s"
+
+#: builtin/remote.c:1048
+#, c-format
+msgid " %-*s pushes to %s"
+msgstr " %-*s 推送至 %s"
+
+#: builtin/remote.c:1116
+msgid "do not query remotes"
+msgstr "不查询远程"
+
+#: builtin/remote.c:1143
+#, c-format
+msgid "* remote %s"
+msgstr "* 远程 %s"
+
+#: builtin/remote.c:1144
+#, c-format
+msgid " Fetch URL: %s"
+msgstr " 获取地址：%s"
+
+#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
+msgid "(no URL)"
+msgstr "(无 URL)"
+
+#. TRANSLATORS: the colon ':' should align with
+#. the one in " Fetch URL: %s" translation
+#: builtin/remote.c:1156 builtin/remote.c:1158
+#, c-format
+msgid " Push URL: %s"
+msgstr " 推送地址：%s"
+
+#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
+#, c-format
+msgid " HEAD branch: %s"
+msgstr " HEAD 分支：%s"
+
+# 译者：中文字符串拼接，可删除前导空格
+#: builtin/remote.c:1160
+msgid "(not queried)"
+msgstr "（未查询）"
+
+#: builtin/remote.c:1162
+msgid "(unknown)"
+msgstr "（未知）"
+
+#: builtin/remote.c:1166
+#, c-format
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
+
+#: builtin/remote.c:1178
+#, c-format
+msgid " Remote branch:%s"
+msgid_plural " Remote branches:%s"
+msgstr[0] " 远程分支：%s"
+msgstr[1] " 远程分支：%s"
+
+# 译者：中文字符串拼接，可删除前导空格
+#: builtin/remote.c:1181 builtin/remote.c:1207
+msgid " (status not queried)"
+msgstr "（状态未查询）"
+
+#: builtin/remote.c:1190
+msgid " Local branch configured for 'git pull':"
+msgid_plural " Local branches configured for 'git pull':"
+msgstr[0] " 为 'git pull' 配置的本地分支："
+msgstr[1] " 为 'git pull' 配置的本地分支："
+
+#: builtin/remote.c:1198
+msgid " Local refs will be mirrored by 'git push'"
+msgstr " 本地引用将在 'git push' 时被镜像"
+
+#: builtin/remote.c:1204
+#, c-format
+msgid " Local ref configured for 'git push'%s:"
+msgid_plural " Local refs configured for 'git push'%s:"
+msgstr[0] " 为 'git push' 配置的本地引用%s："
+msgstr[1] " 为 'git push' 配置的本地引用%s："
+
+#: builtin/remote.c:1225
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
+
+#: builtin/remote.c:1227
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr "删除 refs/remotes/<名称>/HEAD"
+
+#: builtin/remote.c:1242
+msgid "Cannot determine remote HEAD"
+msgstr "无法确定远程 HEAD"
+
+#: builtin/remote.c:1244
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
+
+#: builtin/remote.c:1254
+#, c-format
+msgid "Could not delete %s"
+msgstr "无法删除 %s"
+
+#: builtin/remote.c:1262
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr "不是一个有效引用：%s"
+
+#: builtin/remote.c:1264
+#, c-format
+msgid "Could not setup %s"
+msgstr "不能设置 %s"
+
+# 译者：注意保持前导空格
+#: builtin/remote.c:1282
+#, c-format
+msgid " %s will become dangling!"
+msgstr " %s 将成为摇摆状态！"
+
+# 译者：注意保持前导空格
+#: builtin/remote.c:1283
+#, c-format
+msgid " %s has become dangling!"
+msgstr " %s 已成为摇摆状态！"
+
+#: builtin/remote.c:1293
+#, c-format
+msgid "Pruning %s"
+msgstr "修剪 %s"
+
+#: builtin/remote.c:1294
+#, c-format
+msgid "URL: %s"
+msgstr "URL：%s"
+
+#: builtin/remote.c:1310
+#, c-format
+msgid " * [would prune] %s"
+msgstr " * [将删除] %s"
+
+#: builtin/remote.c:1313
+#, c-format
+msgid " * [pruned] %s"
+msgstr " * [已删除] %s"
+
+#: builtin/remote.c:1358
+msgid "prune remotes after fetching"
+msgstr "抓取后清除远程"
+
+#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
+#, c-format
+msgid "No such remote '%s'"
+msgstr "没有此远程 '%s'"
+
+#: builtin/remote.c:1437
+msgid "add branch"
+msgstr "添加分支"
+
+#: builtin/remote.c:1444
+msgid "no remote specified"
+msgstr "未指定远程"
+
+#: builtin/remote.c:1461
+msgid "query push URLs rather than fetch URLs"
+msgstr "查询推送 URL 地址，而非获取 URL 地址"
+
+#: builtin/remote.c:1463
+msgid "return all URLs"
+msgstr "返回所有 URL 地址"
+
+#: builtin/remote.c:1491
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "没有给远程仓库 '%s' 设定 URL"
+
+#: builtin/remote.c:1517
+msgid "manipulate push URLs"
+msgstr "操作推送 URLS"
+
+#: builtin/remote.c:1519
+msgid "add URL"
+msgstr "添加 URL"
+
+#: builtin/remote.c:1521
+msgid "delete URLs"
+msgstr "删除 URLS"
+
+#: builtin/remote.c:1528
+msgid "--add --delete doesn't make sense"
+msgstr "--add --delete 无意义"
+
+#: builtin/remote.c:1569
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr "无效的旧 URL 匹配模版：%s"
+
+#: builtin/remote.c:1577
+#, c-format
+msgid "No such URL found: %s"
+msgstr "未找到此 URL：%s"
+
+#: builtin/remote.c:1579
+msgid "Will not delete all non-push URLs"
+msgstr "将不会删除所有非推送 URL 地址"
+
+#: builtin/remote.c:1593
+msgid "be verbose; must be placed before a subcommand"
+msgstr "冗长输出；必须置于子命令之前"
+
+#: builtin/remote.c:1624
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "未知子命令：%s"
+
+#: builtin/repack.c:17
+msgid "git repack [<options>]"
+msgstr "git repack [<选项>]"
+
+#: builtin/repack.c:22
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes. Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-"没有配置推送目标。\n"
-"或通过命令行指定URL，或用下面命令配置一个远程版本库\n"
-"\n"
-" git remote add <名称> <地址>\n"
-"\n"
-"然后使用该远程版本库名执行推送\n"
-"\n"
-" git push <名称>\n"
+"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
+"或禁用 pack.writebitmaps 配置。"
+
+#: builtin/repack.c:166
+msgid "pack everything in a single pack"
+msgstr "所有内容打包到一个包文件中"
+
+#: builtin/repack.c:168
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "和 -a 相同，并将不可达的对象设为松散对象"
+
+#: builtin/repack.c:171
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "删除多余的包，运行 git-prune-packed"
+
+#: builtin/repack.c:173
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
+
+#: builtin/repack.c:175
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
+
+#: builtin/repack.c:177
+msgid "do not run git-update-server-info"
+msgstr "不运行 git-update-server-info"
+
+#: builtin/repack.c:180
+msgid "pass --local to git-pack-objects"
+msgstr "向 git-pack-objects 传递参数 --local"
+
+#: builtin/repack.c:182
+msgid "write bitmap index"
+msgstr "写 bitmap 索引"
+
+#: builtin/repack.c:183
+msgid "approxidate"
+msgstr "近似日期"
+
+#: builtin/repack.c:184
+msgid "with -A, do not loosen objects older than this"
+msgstr "使用 -A，不要将早于给定时间的对象过期"
-#: builtin/push.c:410
-msgid "--all and --tags are incompatible"
-msgstr "--all 和 --tags 不兼容"
+#: builtin/repack.c:186
+msgid "with -a, repack unreachable objects"
+msgstr "使用 -a ，重新对不可达对象打包"
-#: builtin/push.c:411
-msgid "--all can't be combined with refspecs"
-msgstr "--all 不能和引用规则同时使用"
+#: builtin/repack.c:188
+msgid "size of the window used for delta compression"
+msgstr "用于增量压缩的窗口值"
-#: builtin/push.c:416
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror 和 --tags 不兼容"
+#: builtin/repack.c:189 builtin/repack.c:193
+msgid "bytes"
+msgstr "字节"
-#: builtin/push.c:417
-msgid "--mirror can't be combined with refspecs"
-msgstr "--mirror 不能和引用规则同时使用"
+#: builtin/repack.c:190
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr "和上面的相似，但限制内存大小而非条目数"
-#: builtin/push.c:422
-msgid "--all and --mirror are incompatible"
-msgstr "--all 和 --mirror 不兼容"
+#: builtin/repack.c:192
+msgid "limits the maximum delta depth"
+msgstr "限制最大增量深度"
-#: builtin/push.c:502
-msgid "repository"
-msgstr "版本库"
+#: builtin/repack.c:194
+msgid "maximum size of each packfile"
+msgstr "每个包文件的最大尺寸"
-#: builtin/push.c:503
-msgid "push all refs"
-msgstr "推送所有引用"
+#: builtin/repack.c:196
+msgid "repack objects in packs marked with .keep"
+msgstr "对标记为 .keep 的包中的对象重新打包"
-#: builtin/push.c:504
-msgid "mirror all refs"
-msgstr "镜像所有引用"
+#: builtin/repack.c:206
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "不能删除珍品仓库中的打包文件"
-#: builtin/push.c:506
-msgid "delete refs"
-msgstr "删除引用"
+#: builtin/repack.c:210
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable 和 -A 不兼容"
-#: builtin/push.c:507
-msgid "push tags (can't be used with --all or --mirror)"
-msgstr "推送 tags（不能使用 --all or --mirror）"
+#: builtin/repack.c:400 builtin/worktree.c:115
+#, c-format
+msgid "failed to remove '%s'"
+msgstr "无法删除 '%s'"
-#: builtin/push.c:510
-msgid "force updates"
-msgstr "强制更新"
+#: builtin/replace.c:19
+msgid "git replace [-f] <object> <replacement>"
+msgstr "git replace [-f] <对象> <替换物>"
-#: builtin/push.c:512
-msgid "refname>:<expect"
-msgstr "引用名>:<期望值"
+#: builtin/replace.c:20
+msgid "git replace [-f] --edit <object>"
+msgstr "git replace [-f] --edit <对象>"
-#: builtin/push.c:513
-msgid "require old value of ref to be at this value"
-msgstr "要求引用旧的取值为设定值"
+#: builtin/replace.c:21
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr "git replace [-f] --graft <提交> [<父提交>...]"
-#: builtin/push.c:516
-msgid "control recursive pushing of submodules"
-msgstr "控制子模组的递归推送"
+#: builtin/replace.c:22
+msgid "git replace -d <object>..."
+msgstr "git replace -d <对象>..."
-#: builtin/push.c:518
-msgid "use thin pack"
-msgstr "使用精简打包"
+#: builtin/replace.c:23
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr "git replace [--format=<格式>] [-l [<模式>]]"
-#: builtin/push.c:519 builtin/push.c:520
-msgid "receive pack program"
-msgstr "接收包程序"
+#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
+#, c-format
+msgid "Not a valid object name: '%s'"
+msgstr "不是一个有效的对象名：'%s'"
-#: builtin/push.c:521
-msgid "set upstream for git pull/status"
-msgstr "设置 git pull/status 的上游"
+#: builtin/replace.c:360
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr "提交 '%s' 中含有损坏的合并标签"
-#: builtin/push.c:524
-msgid "prune locally removed refs"
-msgstr "清除本地删除的引用"
+#: builtin/replace.c:362
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr "提交 '%s' 中含有非法的合并标签"
-#: builtin/push.c:526
-msgid "bypass pre-push hook"
-msgstr "绕过 pre-push 钩子"
+#: builtin/replace.c:373
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft"
-#: builtin/push.c:527
-msgid "push missing but relevant tags"
-msgstr "推送缺失的有关的 tags"
+#: builtin/replace.c:406
+#, c-format
+msgid "the original commit '%s' has a gpg signature."
+msgstr "原始提交 '%s' 中包含一个 GPG 签名"
-#: builtin/push.c:529
-msgid "GPG sign the push"
-msgstr "用 GPG 为推送签名"
+#: builtin/replace.c:407
+msgid "the signature will be removed in the replacement commit!"
+msgstr "在替换的提交中签名将被移除！"
-#: builtin/push.c:530
-msgid "request atomic transaction on remote side"
-msgstr "需要远端支持原子事务"
+#: builtin/replace.c:413
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr "不能为 '%s' 写替换提交"
-#: builtin/push.c:539
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
+#: builtin/replace.c:437
+msgid "list replace refs"
+msgstr "列出替换的引用"
-#: builtin/push.c:541
-msgid "--delete doesn't make sense without any refs"
-msgstr "--delete 未接任何引用没有意义"
+#: builtin/replace.c:438
+msgid "delete replace refs"
+msgstr "删除替换的引用"
+
+#: builtin/replace.c:439
+msgid "edit existing object"
+msgstr "编辑现存的对象"
+
+#: builtin/replace.c:440
+msgid "change a commit's parents"
+msgstr "修改一个提交的父提交"
+
+#: builtin/replace.c:441
+msgid "replace the ref if it exists"
+msgstr "如果存在则替换引用"
+
+#: builtin/replace.c:442
+msgid "do not pretty-print contents for --edit"
+msgstr "不要为 --edit 操作美观显示内容"
+
+#: builtin/replace.c:443
+msgid "use this format"
+msgstr "使用此格式"
-#: builtin/read-tree.c:37
+#: builtin/rerere.c:12
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
+
+#: builtin/rerere.c:58
+msgid "register clean resolutions in index"
+msgstr "在索引中注册干净的解决方案"
+
+#: builtin/reset.c:26
msgid ""
-"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
-msgstr ""
-"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
-"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
-#: builtin/read-tree.c:110
-msgid "write resulting index to <file>"
-msgstr "将索引结果写入 <文件>"
+#: builtin/reset.c:27
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
-#: builtin/read-tree.c:113
-msgid "only empty the index"
-msgstr "只是清空索引"
+#: builtin/reset.c:28
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
-#: builtin/read-tree.c:115
-msgid "Merging"
-msgstr "合并"
+#: builtin/reset.c:34
+msgid "mixed"
+msgstr "混杂"
-#: builtin/read-tree.c:117
-msgid "perform a merge in addition to a read"
-msgstr "读å\8f\96ä¹\8bä½\99å\86\8dæ\89§è¡\8cä¸\80个å\90\88并"
+#: builtin/reset.c:34
+msgid "soft"
+msgstr "软æ\80§"
-#: builtin/read-tree.c:119
-msgid "3-way merge if no file level merging required"
-msgstr "如果没有文件级合并需要，执行三路合并"
+#: builtin/reset.c:34
+msgid "hard"
+msgstr "硬性"
-#: builtin/read-tree.c:121
-msgid "3-way merge in presence of adds and removes"
-msgstr "å\98å\9c¨æ·»å\8a å\92\8cå\88 é\99¤æ\97¶ï¼\8cä¹\9fæ\89§è¡\8cä¸\89è·¯å\90\88并"
+#: builtin/reset.c:34
+msgid "merge"
+msgstr "合并"
-#: builtin/read-tree.c:123
-msgid "same as -m, but discard unmerged entries"
-msgstr "类似于 -m，但丢弃未合并的条目"
+#: builtin/reset.c:34
+msgid "keep"
+msgstr "保持"
-#: builtin/read-tree.c:124
-msgid "<subdirectory>/"
-msgstr "<子目录>/"
+#: builtin/reset.c:74
+msgid "You do not have a valid HEAD."
+msgstr "您没有一个有效的 HEAD。"
-#: builtin/read-tree.c:125
-msgid "read the tree into the index under <subdirectory>/"
-msgstr "读取树对象到索引的 <子目录>/ 下"
+#: builtin/reset.c:76
+msgid "Failed to find tree of HEAD."
+msgstr "无法找到 HEAD 指向的树。"
-#: builtin/read-tree.c:128
-msgid "update working tree with merge result"
-msgstr "用合并的结果更新工作区"
+#: builtin/reset.c:82
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "无法找到 %s 指向的树。"
-#: builtin/read-tree.c:130
-msgid "gitignore"
-msgstr "gitignore"
+#: builtin/reset.c:100
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD 现在位于 %s"
-#: builtin/read-tree.c:131
-msgid "allow explicitly ignored files to be overwritten"
-msgstr "允许忽略文件中设定的文件可以被覆盖"
+# 译者：汉字之间无空格，故删除%s前后空格
+#: builtin/reset.c:183
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr "在合并过程中不能做%s重置操作。"
-#: builtin/read-tree.c:134
-msgid "don't check the working tree after merging"
-msgstr "å\90\88并å\90\8eä¸\8dæ£\80æ\9f¥å·¥ä½\9cå\8cº"
+#: builtin/reset.c:276
+msgid "be quiet, only report errors"
+msgstr "å®\89é\9d\99模å¼\8fï¼\8cå\8fªæ\8a¥å\91\8aé\94\99误"
-#: builtin/read-tree.c:135
-msgid "don't update the index or the work tree"
-msgstr "不更新索引区和工作区"
+#: builtin/reset.c:278
+msgid "reset HEAD and index"
+msgstr "重置 HEAD 和索引"
-#: builtin/read-tree.c:137
-msgid "skip applying sparse checkout filter"
-msgstr "跳过应用稀疏检出过滤器"
+#: builtin/reset.c:279
+msgid "reset only HEAD"
+msgstr "只重置 HEAD"
-#: builtin/read-tree.c:139
-msgid "debug unpack-trees"
-msgstr "调试 unpack-trees"
+#: builtin/reset.c:281 builtin/reset.c:283
+msgid "reset HEAD, index and working tree"
+msgstr "重置 HEAD、索引和工作区"
+
+#: builtin/reset.c:285
+msgid "reset HEAD but keep local changes"
+msgstr "重置 HEAD 但保存本地变更"
+
+#: builtin/reset.c:288
+msgid "record only the fact that removed paths will be added later"
+msgstr "将删除的路径标记为稍后添加"
-#: builtin/reflog.c:430
+#: builtin/reset.c:305
#, c-format
-msgid "%s' for '%s' is not a valid timestamp"
-msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr "无法将 '%s' 解析为一个有效的版本。"
-#: builtin/reflog.c:547 builtin/reflog.c:552
+#: builtin/reset.c:313
#, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr "'%s' 不是一个有效的时间戳"
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr "无法将 '%s' 解析为一个有效的树对象。"
-#: builtin/remote.c:12
-msgid "git remote [-v | --verbose]"
-msgstr "git remote [-v | --verbose]"
+#: builtin/reset.c:322
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
-#: builtin/remote.c:13
-msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
-msgstr ""
-"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <名称> <地址>"
+#: builtin/reset.c:331
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
-#: builtin/remote.c:14 builtin/remote.c:33
-msgid "git remote rename <old> <new>"
-msgstr "git remote rename <旧名称> <新名称>"
+# 译者：汉字之间无空格，故删除%s前后空格
+#: builtin/reset.c:333
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "不能带路径进行%s重置。"
-#: builtin/remote.c:15 builtin/remote.c:38
-msgid "git remote remove <name>"
-msgstr "git remote remove <名称>"
+# 译者：汉字之间无空格，故删除%s前后空格
+#: builtin/reset.c:343
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr "不能对纯仓库进行%s重置"
-#: builtin/remote.c:16 builtin/remote.c:43
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
-msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
+#: builtin/reset.c:347
+msgid "-N can only be used with --mixed"
+msgstr "-N 只能和 --mixed 同时使用"
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose] show [-n] <name>"
-msgstr "git remote [-v | --verbose] show [-n] <名称>"
+#: builtin/reset.c:364
+msgid "Unstaged changes after reset:"
+msgstr "重置后取消暂存的变更："
-#: builtin/remote.c:18
-msgid "git remote prune [-n | --dry-run] <name>"
-msgstr "git remote prune [-n | --dry-run] <名称>"
+#: builtin/reset.c:370
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr "不能重置索引文件至版本 '%s'。"
-#: builtin/remote.c:19
-msgid ""
-"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
-msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
+#: builtin/reset.c:374
+msgid "Could not write new index file."
+msgstr "不能写入新的索引文件。"
-#: builtin/remote.c:20
-msgid "git remote set-branches [--add] <name> <branch>..."
-msgstr "git remote set-branches [--add] <名称> <分支>..."
+#: builtin/rev-list.c:354
+msgid "rev-list does not support display of notes"
+msgstr "rev-list 不支持显示注解"
-#: builtin/remote.c:21 builtin/remote.c:69
-msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
-msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
+#: builtin/rev-parse.c:393
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
-#: builtin/remote.c:22 builtin/remote.c:70
-msgid "git remote set-url --add <name> <newurl>"
-msgstr "git remote set-url --add <名称> <新的地址>"
+#: builtin/rev-parse.c:398
+msgid "keep the `--` passed as an arg"
+msgstr "保持 `--` 作为一个参数传递"
-#: builtin/remote.c:23 builtin/remote.c:71
-msgid "git remote set-url --delete <name> <url>"
-msgstr "git remote set-url --delete <名称> <地址>"
+#: builtin/rev-parse.c:400
+msgid "stop parsing after the first non-option argument"
+msgstr "遇到第一个非选项参数后停止解析"
-#: builtin/remote.c:28
-msgid "git remote add [<options>] <name> <url>"
-msgstr "git remote add [<选项>] <名称> <地址>"
+#: builtin/rev-parse.c:403
+msgid "output in stuck long form"
+msgstr "以固定长格式输出"
-#: builtin/remote.c:48
-msgid "git remote set-branches <name> <branch>..."
-msgstr "git remote set-branches <名称> <分支>..."
+#: builtin/rev-parse.c:534
+msgid ""
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+" or: git rev-parse --sq-quote [<arg>...]\n"
+" or: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+msgstr ""
+"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
+" 或者：git rev-parse --sq-quote [<参数>...]\n"
+" 或者：git rev-parse [<选项>] [<参数>...]\n"
+"\n"
+"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
-#: builtin/remote.c:49
-msgid "git remote set-branches --add <name> <branch>..."
-msgstr "git remote set-branches --add <名称> <分支>..."
+#: builtin/revert.c:22
+msgid "git revert [<options>] <commit-ish>..."
+msgstr "git revert [<选项>] <提交号>..."
-#: builtin/remote.c:54
-msgid "git remote show [<options>] <name>"
-msgstr "git remote show [<选项>] <名称>"
+#: builtin/revert.c:23
+msgid "git revert <subcommand>"
+msgstr "git revert <子命令>"
-#: builtin/remote.c:59
-msgid "git remote prune [<options>] <name>"
-msgstr "git remote prune [<选项>] <名称>"
+#: builtin/revert.c:28
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr "git cherry-pick [<选项>] <提交号>..."
-#: builtin/remote.c:64
-msgid "git remote update [<options>] [<group> | <remote>]..."
-msgstr "git remote update [<选项>] [<组> | <远程>]..."
+#: builtin/revert.c:29
+msgid "git cherry-pick <subcommand>"
+msgstr "git cherry-pick <子命令>"
-#: builtin/remote.c:88
+#: builtin/revert.c:89
#, c-format
-msgid "Updating %s"
-msgstr "更新 %s 中"
-
-#: builtin/remote.c:120
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
-msgstr ""
-"--mirror 选项危险且过时，请使用 --mirror=fetch\n"
-"\t 或 --mirror=push"
+msgid "%s: %s cannot be used with %s"
+msgstr "%s：%s 不能和 %s 同时使用"
-#: builtin/remote.c:137
-#, c-format
-msgid "unknown mirror argument: %s"
-msgstr "未知的镜像参数：%s"
+#: builtin/revert.c:98
+msgid "end revert or cherry-pick sequence"
+msgstr "终止反转或拣选操作"
-#: builtin/remote.c:153
-msgid "fetch the remote branches"
-msgstr "抓取远程的分支"
+#: builtin/revert.c:99
+msgid "resume revert or cherry-pick sequence"
+msgstr "继续反转或拣选操作"
-#: builtin/remote.c:155
-msgid "import all tags and associated objects when fetching"
-msgstr "抓取时导入所有的 tags 和关联对象"
+#: builtin/revert.c:100
+msgid "cancel revert or cherry-pick sequence"
+msgstr "取消反转或拣选操作"
-#: builtin/remote.c:158
-msgid "or do not fetch any tag at all (--no-tags)"
-msgstr "或不抓取任何 tag（--no-tags）"
+#: builtin/revert.c:101
+msgid "don't automatically commit"
+msgstr "不要自动提交"
-#: builtin/remote.c:160
-msgid "branch(es) to track"
-msgstr "跟踪的分支"
+#: builtin/revert.c:102
+msgid "edit the commit message"
+msgstr "编辑提交说明"
-#: builtin/remote.c:161
-msgid "master branch"
-msgstr "主线分支"
+#: builtin/revert.c:105
+msgid "parent-number"
+msgstr "父编号"
-#: builtin/remote.c:162
-msgid "push|fetch"
-msgstr "push|fetch"
+#: builtin/revert.c:106
+msgid "select mainline parent"
+msgstr "选择主干父提交编号"
-#: builtin/remote.c:163
-msgid "set up remote as a mirror to push to or fetch from"
-msgstr "把远程设置为用以推送或抓取的镜像"
+#: builtin/revert.c:108
+msgid "merge strategy"
+msgstr "合并策略"
-#: builtin/remote.c:175
-msgid "specifying a master branch makes no sense with --mirror"
-msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
+#: builtin/revert.c:109
+msgid "option"
+msgstr "选项"
-#: builtin/remote.c:177
-msgid "specifying branches to track makes sense only with fetch mirrors"
-msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
+#: builtin/revert.c:110
+msgid "option for merge strategy"
+msgstr "合并策略的选项"
-#: builtin/remote.c:187 builtin/remote.c:640
-#, c-format
-msgid "remote %s already exists."
-msgstr "远程 %s 已经存在。"
+#: builtin/revert.c:119
+msgid "append commit name"
+msgstr "追加提交名称"
-#: builtin/remote.c:191 builtin/remote.c:644
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "'%s' 不是一个有效的远程名称"
+#: builtin/revert.c:121
+msgid "preserve initially empty commits"
+msgstr "保留初始化的空提交"
-#: builtin/remote.c:235
-#, c-format
-msgid "Could not setup master '%s'"
-msgstr "无法设置 master '%s'"
+#: builtin/revert.c:122
+msgid "allow commits with empty messages"
+msgstr "允许提交说明为空"
-#: builtin/remote.c:335
-#, c-format
-msgid "Could not get fetch map for refspec %s"
-msgstr "无法得到引用规则 %s 的获取列表"
+#: builtin/revert.c:123
+msgid "keep redundant, empty commits"
+msgstr "保持多余的、空的提交"
-#: builtin/remote.c:436 builtin/remote.c:444
-msgid "(matching)"
-msgstr "（匹配）"
+#: builtin/revert.c:211
+msgid "revert failed"
+msgstr "还原失败"
-#: builtin/remote.c:448
-msgid "(delete)"
-msgstr "（删除）"
+#: builtin/revert.c:224
+msgid "cherry-pick failed"
+msgstr "拣选失败"
-#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
-#, c-format
-msgid "Could not append '%s' to '%s'"
-msgstr "不能添加 '%s' 至 '%s'"
+#: builtin/rm.c:17
+msgid "git rm [<options>] [--] <file>..."
+msgstr "git rm [<选项>] [--] <文件>..."
-#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892
-#, c-format
-msgid "No such remote: %s"
-msgstr "没有这样的远程：%s"
+#: builtin/rm.c:205
+msgid ""
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
+msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
-#: builtin/remote.c:650
-#, c-format
-msgid "Could not rename config section '%s' to '%s'"
-msgstr "不能重命名配置小节 '%s' 到 '%s'"
+#: builtin/rm.c:210
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+"\n"
+"（使用 -f 强制删除）"
-#: builtin/remote.c:656 builtin/remote.c:844
-#, c-format
-msgid "Could not remove config section '%s'"
-msgstr "不能移除配置小节 '%s'"
+#: builtin/rm.c:214
+msgid "the following file has changes staged in the index:"
+msgid_plural "the following files have changes staged in the index:"
+msgstr[0] "下列文件索引中有变更"
+msgstr[1] "下列文件索引中有变更"
-#: builtin/remote.c:671
-#, c-format
+#: builtin/rm.c:218 builtin/rm.c:227
msgid ""
-"Not updating non-default fetch refspec\n"
-"\t%s\n"
-"\tPlease update the configuration manually if necessary."
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-"没有更新非默认的获取引用规则\n"
-"\t%s\n"
-"\t如果必要请手动更新配置。"
+"\n"
+"（使用 --cached 保留本地文件，或用 -f 强制删除）"
-#: builtin/remote.c:677
-#, c-format
-msgid "Could not append '%s'"
-msgstr "不能追加 '%s'"
+#: builtin/rm.c:224
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] "如下文件有本地修改："
+msgstr[1] "如下文件有本地修改："
-#: builtin/remote.c:688
-#, c-format
-msgid "Could not set '%s'"
-msgstr "不能设置 '%s'"
+#: builtin/rm.c:242
+msgid "do not list removed files"
+msgstr "不列出删除的文件"
-#: builtin/remote.c:710
-#, c-format
-msgid "deleting '%s' failed"
-msgstr "删除 '%s' 失败"
+#: builtin/rm.c:243
+msgid "only remove from the index"
+msgstr "只从索引区删除"
-#: builtin/remote.c:744
-#, c-format
-msgid "creating '%s' failed"
-msgstr "创建 '%s' 失败"
+#: builtin/rm.c:244
+msgid "override the up-to-date check"
+msgstr "忽略文件更新状态检查"
-#: builtin/remote.c:763
-#, c-format
-msgid "Could not remove branch %s"
-msgstr "无法移除分支 %s"
+#: builtin/rm.c:245
+msgid "allow recursive removal"
+msgstr "允许递归删除"
-#: builtin/remote.c:830
-msgid ""
-"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
-"to delete it, use:"
-msgid_plural ""
-"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
-"to delete them, use:"
-msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
-msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
+#: builtin/rm.c:247
+msgid "exit with a zero status even if nothing matched"
+msgstr "即使没有匹配，也以零状态退出"
-#: builtin/remote.c:945
+#: builtin/rm.c:308
#, c-format
-msgid " new (next fetch will store in remotes/%s)"
-msgstr " 新的（下一次获取将存储于 remotes/%s）"
+msgid "not removing '%s' recursively without -r"
+msgstr "未提供 -r 选项不会递归删除 '%s'"
-#: builtin/remote.c:948
-msgid " tracked"
-msgstr " 已跟踪"
+#: builtin/rm.c:347
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr "git rm：不能删除 %s"
-#: builtin/remote.c:950
-msgid " stale (use 'git remote prune' to remove)"
-msgstr " 过时（使用 'git remote prune' 来移除）"
+#: builtin/rm.c:370
+#, c-format
+msgid "could not remove '%s'"
+msgstr "无法删除 '%s'"
-#: builtin/remote.c:952
-msgid " ???"
-msgstr " ???"
+#: builtin/send-pack.c:18
+msgid ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+" --all and explicit <ref> specification are mutually exclusive."
+msgstr ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
+" --all 和明确的 <引用> 互斥。"
-#: builtin/remote.c:993
-#, c-format
-msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
-msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
+#: builtin/send-pack.c:161
+msgid "remote name"
+msgstr "远程名称"
-#: builtin/remote.c:1000
-#, c-format
-msgid "rebases onto remote %s"
-msgstr "变基到远程 %s"
+#: builtin/send-pack.c:175
+msgid "use stateless RPC protocol"
+msgstr "使用无状态的 RPC 协议"
-#: builtin/remote.c:1003
-#, c-format
-msgid " merges with remote %s"
-msgstr " 与远程 %s 合并"
+#: builtin/send-pack.c:176
+msgid "read refs from stdin"
+msgstr "从标准输入读取引用"
-#: builtin/remote.c:1004
-msgid " and with remote"
-msgstr " 且有远程"
+#: builtin/send-pack.c:177
+msgid "print status from remote helper"
+msgstr "打印来自远程 helper 的状态"
-#: builtin/remote.c:1006
-#, c-format
-msgid "merges with remote %s"
-msgstr "与远程 %s 合并"
+#: builtin/shortlog.c:13
+msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
-#: builtin/remote.c:1007
-msgid " and with remote"
-msgstr " 且有远程"
+#: builtin/shortlog.c:248
+msgid "Group by committer rather than author"
+msgstr "按照提交者分组而不是作者"
-#: builtin/remote.c:1053
-msgid "create"
-msgstr "创建"
+#: builtin/shortlog.c:250
+msgid "sort output according to the number of commits per author"
+msgstr "根据每个作者的提交数量排序"
-#: builtin/remote.c:1056
-msgid "delete"
-msgstr "删除"
+#: builtin/shortlog.c:252
+msgid "Suppress commit descriptions, only provides commit count"
+msgstr "隐藏提交说明，只提供提交数量"
-#: builtin/remote.c:1060
-msgid "up to date"
-msgstr "æ\9c\80æ\96°"
+#: builtin/shortlog.c:254
+msgid "Show the email address of each author"
+msgstr "æ\98¾ç¤ºæ¯\8f个ä½\9cè\80\85ç\9a\84ç\94µå\90é\82®ä»¶å\9c°å\9d\80"
-#: builtin/remote.c:1063
-msgid "fast-forwardable"
-msgstr "可快进"
+#: builtin/shortlog.c:255
+msgid "w[,i1[,i2]]"
+msgstr "w[,i1[,i2]]"
-#: builtin/remote.c:1066
-msgid "local out of date"
-msgstr "æ\9c¬å\9c°å·²è¿\87æ\97¶"
+#: builtin/shortlog.c:256
+msgid "Linewrap output"
+msgstr "æ\8a\98è¡\8cè¾\93å\87º"
-#: builtin/remote.c:1073
-#, c-format
-msgid " %-*s forces to %-*s (%s)"
-msgstr " %-*s 强制推送至 %-*s (%s)"
+#: builtin/show-branch.c:10
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+msgstr ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
-#: builtin/remote.c:1076
-#, c-format
-msgid " %-*s pushes to %-*s (%s)"
-msgstr " %-*s 推送至 %-*s (%s)"
+#: builtin/show-branch.c:14
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
-#: builtin/remote.c:1080
+#: builtin/show-branch.c:374
#, c-format
-msgid " %-*s forces to %s"
-msgstr " %-*s 强制推送至 %s"
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] "忽略 %s，无法处理 %d 个以上的引用"
+msgstr[1] "忽略 %s，无法处理 %d 个以上的引用"
-#: builtin/remote.c:1083
+#: builtin/show-branch.c:536
#, c-format
-msgid " %-*s pushes to %s"
-msgstr " %-*s 推送至 %s"
+msgid "no matching refs with %s"
+msgstr "没有和 %s 匹配的引用"
-#: builtin/remote.c:1151
-msgid "do not query remotes"
-msgstr "不查询远程"
+#: builtin/show-branch.c:632
+msgid "show remote-tracking and local branches"
+msgstr "显示远程跟踪的和本地的分支"
-#: builtin/remote.c:1178
-#, c-format
-msgid "* remote %s"
-msgstr "* 远程 %s"
+#: builtin/show-branch.c:634
+msgid "show remote-tracking branches"
+msgstr "显示远程跟踪的分支"
-#: builtin/remote.c:1179
-#, c-format
-msgid " Fetch URL: %s"
-msgstr " 获取地址：%s"
+#: builtin/show-branch.c:636
+msgid "color '*!+-' corresponding to the branch"
+msgstr "着色 '*!+-' 到相应的分支"
-#: builtin/remote.c:1180 builtin/remote.c:1331
-msgid "(no URL)"
-msgstr "(无 URL)"
+#: builtin/show-branch.c:638
+msgid "show <n> more commits after the common ancestor"
+msgstr "显示共同祖先后的 <n> 个提交"
-#: builtin/remote.c:1189 builtin/remote.c:1191
-#, c-format
-msgid " Push URL: %s"
-msgstr " 推送地址：%s"
+#: builtin/show-branch.c:640
+msgid "synonym to more=-1"
+msgstr "和 more=-1 同义"
-#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197
-#, c-format
-msgid " HEAD branch: %s"
-msgstr " HEAD分支：%s"
+#: builtin/show-branch.c:641
+msgid "suppress naming strings"
+msgstr "不显示字符串命名"
-#: builtin/remote.c:1199
-#, c-format
-msgid ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
-msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
+#: builtin/show-branch.c:643
+msgid "include the current branch"
+msgstr "包括当前分支"
-#: builtin/remote.c:1211
-#, c-format
-msgid " Remote branch:%s"
-msgid_plural " Remote branches:%s"
-msgstr[0] " 远程分支：%s"
-msgstr[1] " 远程分支：%s"
+#: builtin/show-branch.c:645
+msgid "name commits with their object names"
+msgstr "以对象名字命名提交"
-# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1214 builtin/remote.c:1241
-msgid " (status not queried)"
-msgstr "（状态未查询）"
+#: builtin/show-branch.c:647
+msgid "show possible merge bases"
+msgstr "显示可能合并的基线"
-#: builtin/remote.c:1223
-msgid " Local branch configured for 'git pull':"
-msgid_plural " Local branches configured for 'git pull':"
-msgstr[0] " 为 'git pull' 配置的本地分支："
-msgstr[1] " 为 'git pull' 配置的本地分支："
+#: builtin/show-branch.c:649
+msgid "show refs unreachable from any other ref"
+msgstr "显示没有任何引用的的引用"
-#: builtin/remote.c:1231
-msgid " Local refs will be mirrored by 'git push'"
-msgstr " 本地引用将在 'git push' 时被镜像"
+#: builtin/show-branch.c:651
+msgid "show commits in topological order"
+msgstr "以拓扑顺序显示提交"
-#: builtin/remote.c:1238
-#, c-format
-msgid " Local ref configured for 'git push'%s:"
-msgid_plural " Local refs configured for 'git push'%s:"
-msgstr[0] " 为 'git push' 配置的本地引用%s："
-msgstr[1] " 为 'git push' 配置的本地引用%s："
+#: builtin/show-branch.c:654
+msgid "show only commits not on the first branch"
+msgstr "只显示不在第一个分支上的提交"
-#: builtin/remote.c:1259
-msgid "set refs/remotes/<name>/HEAD according to remote"
-msgstr "æ ¹æ\8d®è¿\9cç¨\8b设置 refs/remotes/<å\90\8d称>/HEAD"
+#: builtin/show-branch.c:656
+msgid "show merges reachable from only one tip"
+msgstr "æ\98¾ç¤ºä»\85ä¸\80个å\88\86æ\94¯å\8f¯è®¿é\97®ç\9a\84å\90\88并æ\8f\90交"
-#: builtin/remote.c:1261
-msgid "delete refs/remotes/<name>/HEAD"
-msgstr "删除 refs/remotes/<名称>/HEAD"
+#: builtin/show-branch.c:658
+msgid "topologically sort, maintaining date order where possible"
+msgstr "拓扑方式排序，并尽可能地保持日期顺序"
-#: builtin/remote.c:1276
-msgid "Cannot determine remote HEAD"
-msgstr "无法确定远程 HEAD"
+#: builtin/show-branch.c:661
+msgid "<n>[,<base>]"
+msgstr "<n>[,<base>]"
-#: builtin/remote.c:1278
-msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
-msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
+#: builtin/show-branch.c:662
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
-#: builtin/remote.c:1288
-#, c-format
-msgid "Could not delete %s"
-msgstr "无法删除 %s"
+#: builtin/show-branch.c:696
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
-#: builtin/remote.c:1296
-#, c-format
-msgid "Not a valid ref: %s"
-msgstr "不是一个有效引用：%s"
+#: builtin/show-branch.c:720
+msgid "no branches given, and HEAD is not valid"
+msgstr "未提供分支，且 HEAD 无效"
-#: builtin/remote.c:1298
-#, c-format
-msgid "Could not setup %s"
-msgstr "不能设置 %s"
+#: builtin/show-branch.c:723
+msgid "--reflog option needs one branch name"
+msgstr "选项 --reflog 需要一个分支名"
-# 译者：注意保持前导空格
-#: builtin/remote.c:1316
+#: builtin/show-branch.c:726
#, c-format
-msgid " %s will become dangling!"
-msgstr " %s 将成为摇摆状态！"
+msgid "only %d entry can be shown at one time."
+msgid_plural "only %d entries can be shown at one time."
+msgstr[0] "一次只能显示 %d 个条目。"
+msgstr[1] "一次只能显示 %d 个条目。"
-# 译者：注意保持前导空格
-#: builtin/remote.c:1317
+#: builtin/show-branch.c:730
#, c-format
-msgid " %s has become dangling!"
-msgstr " %s 已成为摇摆状态！"
+msgid "no such ref %s"
+msgstr "无此引用 %s"
-#: builtin/remote.c:1327
+#: builtin/show-branch.c:814
#, c-format
-msgid "Pruning %s"
-msgstr "修剪 %s"
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] "不能处理 %d 个以上的版本。"
+msgstr[1] "不能处理 %d 个以上的版本。"
-#: builtin/remote.c:1328
+#: builtin/show-branch.c:818
#, c-format
-msgid "URL: %s"
-msgstr "URL：%s"
+msgid "'%s' is not a valid ref."
+msgstr "'%s' 不是一个有效的引用。"
-#: builtin/remote.c:1351
+#: builtin/show-branch.c:821
#, c-format
-msgid " * [would prune] %s"
-msgstr " * [将删除] %s"
+msgid "cannot find commit %s (%s)"
+msgstr "不能找到提交 %s（%s）"
-#: builtin/remote.c:1354
-#, c-format
-msgid " * [pruned] %s"
-msgstr " * [已删除] %s"
+#: builtin/show-ref.c:10
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+msgstr ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
-#: builtin/remote.c:1399
-msgid "prune remotes after fetching"
-msgstr "抓取后清除远程"
+#: builtin/show-ref.c:11
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<模式>]"
-#: builtin/remote.c:1465 builtin/remote.c:1539
-#, c-format
-msgid "No such remote '%s'"
-msgstr "没有此远程 '%s'"
+#: builtin/show-ref.c:159
+msgid "only show tags (can be combined with heads)"
+msgstr "只显示标签（可以和头共用）"
-#: builtin/remote.c:1485
-msgid "add branch"
-msgstr "添加分支"
+#: builtin/show-ref.c:160
+msgid "only show heads (can be combined with tags)"
+msgstr "只显示头（可以和标签共用）"
-#: builtin/remote.c:1492
-msgid "no remote specified"
-msgstr "æ\9cªæ\8c\87å®\9aè¿\9cç¨\8b"
+#: builtin/show-ref.c:161
+msgid "stricter reference checking, requires exact ref path"
+msgstr "æ\9b´ä¸¥æ ¼ç\9a\84å¼\95ç\94¨æ£\80æµ\8bï¼\8cé\9c\80è¦\81精确ç\9a\84å¼\95ç\94¨è·¯å¾\84"
-#: builtin/remote.c:1514
-msgid "manipulate push URLs"
-msgstr "æ\93\8dä½\9cæ\8e¨é\80\81 URLS"
+#: builtin/show-ref.c:164 builtin/show-ref.c:166
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "æ\98¾ç¤º HEAD å¼\95ç\94¨ï¼\8cå\8d³ä½¿è¢«è¿\87滤æ\8e\89"
-#: builtin/remote.c:1516
-msgid "add URL"
-msgstr "添加 URL"
+#: builtin/show-ref.c:168
+msgid "dereference tags into object IDs"
+msgstr "转换标签到对象 ID"
-#: builtin/remote.c:1518
-msgid "delete URLs"
-msgstr "å\88 é\99¤ URLS"
+#: builtin/show-ref.c:170
+msgid "only show SHA1 hash using <n> digits"
+msgstr "å\8fªæ\98¾ç¤ºä½¿ç\94¨ <n> 个æ\95°å\97ç\9a\84 SHA1 å\93\88å¸\8c"
-#: builtin/remote.c:1525
-msgid "--add --delete doesn't make sense"
-msgstr "--add --delete æ\97 æ\84\8fä¹\89"
+#: builtin/show-ref.c:174
+msgid "do not print results to stdout (useful with --verify)"
+msgstr "ä¸\8dæ\89\93å\8d°ç»\93æ\9e\9cå\88°æ \87å\87\86è¾\93å\87ºï¼\88ä¾\8bå¦\82ä¸\8e --verify å\8f\82æ\95°å\85±ç\94¨ï¼\89"
-#: builtin/remote.c:1565
-#, c-format
-msgid "Invalid old URL pattern: %s"
-msgstr "无效的旧URL匹配模版：%s"
+#: builtin/show-ref.c:176
+msgid "show refs from stdin that aren't in local repository"
+msgstr "显示从标准输入中读入的不在本地仓库中的引用"
-#: builtin/remote.c:1573
-#, c-format
-msgid "No such URL found: %s"
-msgstr "未找到此URL：%s"
+#: builtin/stripspace.c:17
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
-#: builtin/remote.c:1575
-msgid "Will not delete all non-push URLs"
-msgstr "将不会删除所有非推送URL地址"
+#: builtin/stripspace.c:18
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
-#: builtin/remote.c:1589
-msgid "be verbose; must be placed before a subcommand"
-msgstr "冗长输出；必须置于子命令之前"
+#: builtin/stripspace.c:35
+msgid "skip and remove all lines starting with comment character"
+msgstr "跳过和移除所有的注释行"
-#: builtin/repack.c:17
-msgid "git repack [<options>]"
-msgstr "git repack [<选项>]"
+#: builtin/stripspace.c:38
+msgid "prepend comment character and space to each line"
+msgstr "为每一行的行首添加注释符和空格"
-#: builtin/repack.c:159
-msgid "pack everything in a single pack"
-msgstr "所有内容打包到一个包文件中"
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
+#, c-format
+msgid "No such ref: %s"
+msgstr "没有这样的引用：%s"
-#: builtin/repack.c:161
-msgid "same as -a, and turn unreachable objects loose"
-msgstr "和 -a 相同，并将不可达的对象设为松散对象"
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "期望一个完整的引用名称，却得到 %s"
-#: builtin/repack.c:164
-msgid "remove redundant packs, and run git-prune-packed"
-msgstr "删除多余的包，运行 git-prune-packed"
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "无法从 url '%s' 剥离一个组件"
-#: builtin/repack.c:166
-msgid "pass --no-reuse-delta to git-pack-objects"
-msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
+#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+msgid "alternative anchor for relative paths"
+msgstr "相对路径的替代锚记（anchor）"
-#: builtin/repack.c:168
-msgid "pass --no-reuse-object to git-pack-objects"
-msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
+#: builtin/submodule--helper.c:310
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-#: builtin/repack.c:170
-msgid "do not run git-update-server-info"
-msgstr "不运行 git-update-server-info"
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
-#: builtin/repack.c:173
-msgid "pass --local to git-pack-objects"
-msgstr "向 git-pack-objects 传递参数 --local"
+#: builtin/submodule--helper.c:395
+#, c-format
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
-#: builtin/repack.c:175
-msgid "write bitmap index"
-msgstr "写 bitmap 索引"
+#: builtin/submodule--helper.c:406
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "无法为子模组 '%s' 注册 url"
-#: builtin/repack.c:176
-msgid "approxidate"
-msgstr "近似日期"
+#: builtin/submodule--helper.c:410
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
-#: builtin/repack.c:177
-msgid "with -A, do not loosen objects older than this"
-msgstr "使用 -A，不要将早于给定时间的对象过期"
+#
+#: builtin/submodule--helper.c:420
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"
-#: builtin/repack.c:179
-msgid "size of the window used for delta compression"
-msgstr "用于增量压缩的窗口值"
+#: builtin/submodule--helper.c:427
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "无法为子模组 '%s' 注册更新模式"
-#: builtin/repack.c:180 builtin/repack.c:184
-msgid "bytes"
-msgstr "å\97è\8a\82"
+#: builtin/submodule--helper.c:443
+msgid "Suppress output for initializing a submodule"
+msgstr "å\88\9då§\8bå\8c\96å\90模ç»\84æ\97¶æ\8a\91å\88¶è¾\93å\87º"
-#: builtin/repack.c:181
-msgid "same as the above, but limit memory size instead of entries count"
-msgstr "和上面的相似，但限制内存大小而非条目数"
+#: builtin/submodule--helper.c:448
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<路径>]"
-#: builtin/repack.c:183
-msgid "limits the maximum delta depth"
-msgstr "限制最大增量深度"
+#: builtin/submodule--helper.c:476
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <路径>"
-#: builtin/repack.c:185
-msgid "maximum size of each packfile"
-msgstr "每个包的最大尺寸"
+#: builtin/submodule--helper.c:482
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
-#: builtin/repack.c:187
-msgid "repack objects in packs marked with .keep"
-msgstr "对标记为 .keep 的包中的对象重新打包"
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "子模组 '%s' 不能添加仓库备选：%s"
-#: builtin/repack.c:377
+#: builtin/submodule--helper.c:604
#, c-format
-msgid "removing '%s' failed"
-msgstr "删除 '%s' 失败"
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/replace.c:19
-msgid "git replace [-f] <object> <replacement>"
-msgstr "git replace [-f] <对象> <替换物>"
+#: builtin/submodule--helper.c:611
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
-#: builtin/replace.c:20
-msgid "git replace [-f] --edit <object>"
-msgstr "git replace [-f] --edit <对象>"
+#: builtin/submodule--helper.c:633
+msgid "where the new submodule will be cloned to"
+msgstr "新的子模组将要克隆的路径"
-#: builtin/replace.c:21
-msgid "git replace [-f] --graft <commit> [<parent>...]"
-msgstr "git replace [-f] --graft <提交> [<父提交>...]"
+#: builtin/submodule--helper.c:636
+msgid "name of the new submodule"
+msgstr "新子模组的名称"
-#: builtin/replace.c:22
-msgid "git replace -d <object>..."
-msgstr "git replace -d <对象>..."
+#: builtin/submodule--helper.c:639
+msgid "url where to clone the submodule from"
+msgstr "克隆子模组的 url 地址"
-#: builtin/replace.c:23
-msgid "git replace [--format=<format>] [-l [<pattern>]]"
-msgstr "git replace [--format=<格式>] [-l [<模式>]]"
+#: builtin/submodule--helper.c:645
+msgid "depth for shallow clones"
+msgstr "浅克隆的深度"
+
+#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+msgid "force cloning progress"
+msgstr "强制显示克隆进度"
+
+#: builtin/submodule--helper.c:653
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr ""
+"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
+"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
-#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#: builtin/submodule--helper.c:684
#, c-format
-msgid "Not a valid object name: '%s'"
-msgstr "不是一个有效的对象名：'%s'"
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "无法克隆 '%s' 到子模组路径 '%s'"
-#: builtin/replace.c:355
+#: builtin/submodule--helper.c:699
#, c-format
-msgid "bad mergetag in commit '%s'"
-msgstr "æ\8f\90交 '%s' ä¸æ\8d\9få\9d\8fç\9a\84 mergetag"
+msgid "could not get submodule directory for '%s'"
+msgstr "æ\97 æ³\95å¾\97å\88° '%s' ç\9a\84å\90模ç»\84ç\9b®å½\95"
-#: builtin/replace.c:357
+#: builtin/submodule--helper.c:764
#, c-format
-msgid "malformed mergetag in commit '%s'"
-msgstr "提交 '%s' 中非法的 mergetag"
+msgid "Submodule path '%s' not initialized"
+msgstr "子模组 '%s' 尚未初始化"
+
+#: builtin/submodule--helper.c:768
+msgid "Maybe you want to use 'update --init'?"
+msgstr "也许您想要执行 'update --init'？"
-#: builtin/replace.c:368
+#: builtin/submodule--helper.c:793
#, c-format
-msgid ""
-"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
-"instead of --graft"
-msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s'，使用 --edit 代替 --graft"
+msgid "Skipping unmerged submodule %s"
+msgstr "略过未合并的子模组 %s"
-#: builtin/replace.c:401
+#: builtin/submodule--helper.c:814
#, c-format
-msgid "the original commit '%s' has a gpg signature."
-msgstr "原始提交 '%s' 中包含一个 GPG 签名"
+msgid "Skipping submodule '%s'"
+msgstr "略过子模组 '%s'"
-#: builtin/replace.c:402
-msgid "the signature will be removed in the replacement commit!"
-msgstr "在替换的提交中签名将被移除！"
+#: builtin/submodule--helper.c:942
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "克隆 '%s' 失败。按计划重试"
-#: builtin/replace.c:408
+#: builtin/submodule--helper.c:953
#, c-format
-msgid "could not write replacement commit for: '%s'"
-msgstr "不能为 '%s' 写替换提交"
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "第二次尝试克隆 '%s' 失败，退出"
-#: builtin/replace.c:432
-msgid "list replace refs"
-msgstr "å\88\97å\87ºæ\9b¿æ\8d¢ç\9a\84å¼\95ç\94¨"
+#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+msgid "path into the working tree"
+msgstr "å\88°å·¥ä½\9cå\8cºç\9a\84è·¯å¾\84"
-#: builtin/replace.c:433
-msgid "delete replace refs"
-msgstr "å\88 é\99¤æ\9b¿æ\8d¢ç\9a\84å¼\95ç\94¨"
+#: builtin/submodule--helper.c:977
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "å·¥ä½\9cå\8cºä¸ç\9a\84è·¯å¾\84ï¼\8cé\80\92å½\92åµ\8cå¥\97å\90模ç»\84"
-#: builtin/replace.c:434
-msgid "edit existing object"
-msgstr "编辑现存的对象"
+#: builtin/submodule--helper.c:981
+msgid "rebase, merge, checkout or none"
+msgstr "rebase、merge、checkout 或 none"
-#: builtin/replace.c:435
-msgid "change a commit's parents"
-msgstr "修改一个提交的父提交"
+#: builtin/submodule--helper.c:985
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "创建一个指定深度的浅克隆"
-#: builtin/replace.c:436
-msgid "replace the ref if it exists"
-msgstr "å¦\82æ\9e\9cå\98å\9c¨å\88\99æ\9b¿æ\8d¢å¼\95ç\94¨"
+#: builtin/submodule--helper.c:988
+msgid "parallel jobs"
+msgstr "并å\8f\91ä»»å\8a¡"
-#: builtin/replace.c:437
-msgid "do not pretty-print contents for --edit"
-msgstr "ä¸\8dè¦\81为 --edit æ\93\8dä½\9cç¾\8eè§\82æ\98¾ç¤ºå\86\85容"
+#: builtin/submodule--helper.c:990
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "å\88\9då§\8bå\85\8bé\9a\86æ\98¯å\90¦åº\94该é\81µå®\88æ\8e¨è\8d\90ç\9a\84æµ\85å\85\8bé\9a\86é\80\89项"
-#: builtin/replace.c:438
-msgid "use this format"
-msgstr "使ç\94¨æ¤æ ¼å¼\8f"
+#: builtin/submodule--helper.c:991
+msgid "don't print cloning progress"
+msgstr "ä¸\8dè¦\81è¾\93å\87ºå\85\8bé\9a\86è¿\9b度"
-#: builtin/rerere.c:12
-msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
-msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
+#: builtin/submodule--helper.c:998
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
-#: builtin/rerere.c:57
-msgid "register clean resolutions in index"
-msgstr "在索引中注册干净的解决方案"
+#: builtin/submodule--helper.c:1008
+msgid "bad value for update parameter"
+msgstr "update 参数取值错误"
-#: builtin/reset.c:26
+#: builtin/submodule--helper.c:1079
+#, c-format
msgid ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
-
-#: builtin/reset.c:27
-msgid "git reset [-q] <tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <树或提交> [--] <路径>..."
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上"
-#: builtin/reset.c:28
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
+#: builtin/submodule--helper.c:1163
+msgid "recurse into submodules"
+msgstr "在子模组中递归"
-#: builtin/reset.c:34
-msgid "mixed"
-msgstr "混杂"
+#: builtin/submodule--helper.c:1169
+msgid "git submodule--helper embed-git-dir [<path>...]"
+msgstr "git submodule--helper embed-git-dir [<路径>...]"
-#: builtin/reset.c:34
-msgid "soft"
-msgstr "软性"
+#: builtin/submodule--helper.c:1226
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "submodule-helper 子命令必须由另外的子命令调用"
-#: builtin/reset.c:34
-msgid "hard"
-msgstr "硬性"
+#: builtin/submodule--helper.c:1233
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr "%s 不支持 --super-prefix"
-#: builtin/reset.c:34
-msgid "merge"
-msgstr "合并"
+#: builtin/submodule--helper.c:1239
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
-#: builtin/reset.c:34
-msgid "keep"
-msgstr "保持"
+#: builtin/symbolic-ref.c:7
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
-#: builtin/reset.c:74
-msgid "You do not have a valid HEAD."
-msgstr "您没有一个有效的 HEAD。"
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr "git symbolic-ref -d [-q] <名称>"
-#: builtin/reset.c:76
-msgid "Failed to find tree of HEAD."
-msgstr "无法找到 HEAD 指向的树。"
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr "不显示非符号（分离的）引用的错误信息"
-#: builtin/reset.c:82
-#, c-format
-msgid "Failed to find tree of %s."
-msgstr "无法找到 %s 指向的树。"
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
+msgstr "删除符号引用"
-#: builtin/reset.c:100
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD 现在位于 %s"
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
+msgstr "简短的引用输出"
-# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:183
-#, c-format
-msgid "Cannot do a %s reset in the middle of a merge."
-msgstr "在合并过程中不能做%s重置操作。"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+msgid "reason"
+msgstr "原因"
-#: builtin/reset.c:276
-msgid "be quiet, only report errors"
-msgstr "安静模式，只报告错误"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+msgid "reason of the update"
+msgstr "更新的原因"
-#: builtin/reset.c:278
-msgid "reset HEAD and index"
-msgstr "重置 HEAD 和索引"
+#: builtin/tag.c:23
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
+msgstr ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
-#: builtin/reset.c:279
-msgid "reset only HEAD"
-msgstr "只重置 HEAD"
+#: builtin/tag.c:24
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <标签名>..."
-#: builtin/reset.c:281 builtin/reset.c:283
-msgid "reset HEAD, index and working tree"
-msgstr "重置 HEAD、索引和工作区"
+#: builtin/tag.c:25
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+msgstr ""
+"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
+"at <对象>]\n"
+"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
-#: builtin/reset.c:285
-msgid "reset HEAD but keep local changes"
-msgstr "重置 HEAD 但保存本地变更"
+#: builtin/tag.c:27
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr "git tag -v [--format=<格式>] <标签名>..."
-#: builtin/reset.c:288
-msgid "record only the fact that removed paths will be added later"
-msgstr "将删除的路径标记为稍后添加"
+#: builtin/tag.c:83
+#, c-format
+msgid "tag '%s' not found."
+msgstr "未发现标签 '%s'。"
-#: builtin/reset.c:305
+#: builtin/tag.c:99
#, c-format
-msgid "Failed to resolve '%s' as a valid revision."
-msgstr "无法将 '%s' 解析为一个有效的版本。"
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr "已删除标签 '%s'（曾为 %s）\n"
-#: builtin/reset.c:308 builtin/reset.c:316
+#: builtin/tag.c:128
#, c-format
-msgid "Could not parse object '%s'."
-msgstr "不能解析对象 '%s'。"
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+"\n"
+"输入一个标签说明：\n"
+" %s\n"
+"以 '%c' 开头的行将被忽略。\n"
-#: builtin/reset.c:313
+#: builtin/tag.c:132
#, c-format
-msgid "Failed to resolve '%s' as a valid tree."
-msgstr "无法将 '%s' 解析为一个有效的树对象。"
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
+msgstr ""
+"\n"
+"输入一个标签说明：\n"
+" %s\n"
+"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
-#: builtin/reset.c:322
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
+#: builtin/tag.c:210
+msgid "unable to sign the tag"
+msgstr "无法签署标签"
-#: builtin/reset.c:331
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
-msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
+#: builtin/tag.c:212
+msgid "unable to write tag file"
+msgstr "无法写标签文件"
-# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:333
-#, c-format
-msgid "Cannot do %s reset with paths."
-msgstr "不能带路径进行%s重置。"
+#: builtin/tag.c:236
+msgid "bad object type."
+msgstr "坏的对象类型。"
-# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:343
+#: builtin/tag.c:282
+msgid "no tag message?"
+msgstr "无标签说明？"
+
+#: builtin/tag.c:289
#, c-format
-msgid "%s reset is not allowed in a bare repository"
-msgstr "不能对纯版本库进行%s重置"
+msgid "The tag message has been left in %s\n"
+msgstr "标签说明被保留在 %s\n"
-#: builtin/reset.c:347
-msgid "-N can only be used with --mixed"
-msgstr "-N 只能和 --mixed 同时使用"
+#: builtin/tag.c:397
+msgid "list tag names"
+msgstr "列出标签名称"
-#: builtin/reset.c:364
-msgid "Unstaged changes after reset:"
-msgstr "重置后撤出暂存区的变更："
+#: builtin/tag.c:399
+msgid "print <n> lines of each tag message"
+msgstr "每个标签信息打印 <n> 行"
-#: builtin/reset.c:370
-#, c-format
-msgid "Could not reset index file to revision '%s'."
-msgstr "不能重置索引文件至版本 '%s'。"
+#: builtin/tag.c:401
+msgid "delete tags"
+msgstr "删除标签"
-#: builtin/reset.c:374
-msgid "Could not write new index file."
-msgstr "不能写入新的索引文件。"
+#: builtin/tag.c:402
+msgid "verify tags"
+msgstr "验证标签"
-#: builtin/rev-parse.c:361
-msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
-msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
+#: builtin/tag.c:404
+msgid "Tag creation options"
+msgstr "标签创建选项"
-#: builtin/rev-parse.c:366
-msgid "keep the `--` passed as an arg"
-msgstr "保持 `--` 作为一个参数传递"
+#: builtin/tag.c:406
+msgid "annotated tag, needs a message"
+msgstr "附注标签，需要一个说明"
-#: builtin/rev-parse.c:368
-msgid "stop parsing after the first non-option argument"
-msgstr "遇到第一个非选项参数后停止解析"
+#: builtin/tag.c:408
+msgid "tag message"
+msgstr "标签说明"
-#: builtin/rev-parse.c:371
-msgid "output in stuck long form"
-msgstr "以固定长格式输出"
+#: builtin/tag.c:410
+msgid "annotated and GPG-signed tag"
+msgstr "附注并附加 GPG 签名的标签"
-#: builtin/rev-parse.c:499
-msgid ""
-"git rev-parse --parseopt [<options>] -- [<args>...]\n"
-" or: git rev-parse --sq-quote [<arg>...]\n"
-" or: git rev-parse [<options>] [<arg>...]\n"
-"\n"
-"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
-msgstr ""
-"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
-" 或者：git rev-parse --sq-quote [<参数>...]\n"
-" 或者：git rev-parse [<选项>] [<参数>...]\n"
-"\n"
-"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
+#: builtin/tag.c:414
+msgid "use another key to sign the tag"
+msgstr "使用另外的私钥签名该标签"
-#: builtin/revert.c:22
-msgid "git revert [<options>] <commit-ish>..."
-msgstr "git revert [<选项>] <提交号>..."
+#: builtin/tag.c:415
+msgid "replace the tag if exists"
+msgstr "如果存在，替换现有的标签"
-#: builtin/revert.c:23
-msgid "git revert <subcommand>"
-msgstr "git revert <子命令>"
+#: builtin/tag.c:416 builtin/update-ref.c:368
+msgid "create a reflog"
+msgstr "创建引用日志"
-#: builtin/revert.c:28
-msgid "git cherry-pick [<options>] <commit-ish>..."
-msgstr "git cherry-pick [<选项>] <提交号>..."
+#: builtin/tag.c:418
+msgid "Tag listing options"
+msgstr "标签列表选项"
-#: builtin/revert.c:29
-msgid "git cherry-pick <subcommand>"
-msgstr "git cherry-pick <子命令>"
+#: builtin/tag.c:419
+msgid "show tag list in columns"
+msgstr "以列的方式显示标签列表"
+
+#: builtin/tag.c:420 builtin/tag.c:422
+msgid "print only tags that contain the commit"
+msgstr "只打印包含该提交的标签"
+
+#: builtin/tag.c:421 builtin/tag.c:423
+msgid "print only tags that don't contain the commit"
+msgstr "只打印不包含该提交的标签"
+
+#: builtin/tag.c:424
+msgid "print only tags that are merged"
+msgstr "只打印已经合并的标签"
+
+#: builtin/tag.c:425
+msgid "print only tags that are not merged"
+msgstr "只打印尚未合并的标签"
+
+#: builtin/tag.c:430
+msgid "print only tags of the object"
+msgstr "只打印指向该对象的标签"
-#: builtin/revert.c:71
-#, c-format
-msgid "%s: %s cannot be used with %s"
-msgstr "%s：%s 不能和 %s 同时使用"
+#: builtin/tag.c:469
+msgid "--column and -n are incompatible"
+msgstr "--column 和 -n 不兼容"
-#: builtin/revert.c:80
-msgid "end revert or cherry-pick sequence"
-msgstr "终止反转或拣选操作"
+#: builtin/tag.c:491
+msgid "-n option is only allowed in list mode"
+msgstr "-n 选项只允许用在列表显示模式"
-#: builtin/revert.c:81
-msgid "resume revert or cherry-pick sequence"
-msgstr "继续反转或拣选操作"
+#: builtin/tag.c:493
+msgid "--contains option is only allowed in list mode"
+msgstr "--contains 选项只允许用在列表显示模式"
-#: builtin/revert.c:82
-msgid "cancel revert or cherry-pick sequence"
-msgstr "取消反转或拣选操作"
+#: builtin/tag.c:495
+msgid "--no-contains option is only allowed in list mode"
+msgstr "--no-contains 选项只允许用在列表显示模式"
-#: builtin/revert.c:83
-msgid "don't automatically commit"
-msgstr "不要自动提交"
+#: builtin/tag.c:497
+msgid "--points-at option is only allowed in list mode"
+msgstr "--points-at 选项只允许用在列表显示模式"
-#: builtin/revert.c:84
-msgid "edit the commit message"
-msgstr "编辑提交说明"
+#: builtin/tag.c:499
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
-#: builtin/revert.c:87
-msgid "parent number"
-msgstr "父编号"
+#: builtin/tag.c:510
+msgid "only one -F or -m option is allowed."
+msgstr "只允许一个 -F 或 -m 选项。"
-#: builtin/revert.c:89
-msgid "merge strategy"
-msgstr "å\90\88并ç\96ç\95¥"
+#: builtin/tag.c:529
+msgid "too many params"
+msgstr "太å¤\9aå\8f\82æ\95°"
-#: builtin/revert.c:90
-msgid "option"
-msgstr "选项"
+#: builtin/tag.c:535
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr "'%s' 不是一个有效的标签名称。"
-#: builtin/revert.c:91
-msgid "option for merge strategy"
-msgstr "合并策略的选项"
+#: builtin/tag.c:540
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "标签 '%s' 已存在"
-#: builtin/revert.c:104
-msgid "append commit name"
-msgstr "追加提交名称"
+#: builtin/tag.c:570
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "已更新标签 '%s'（曾为 %s）\n"
-#: builtin/revert.c:105
-msgid "allow fast-forward"
-msgstr "å\85\81许快è¿\9bå¼\8f"
+#: builtin/unpack-objects.c:493
+msgid "Unpacking objects"
+msgstr "å±\95å¼\80对象ä¸"
-#: builtin/revert.c:106
-msgid "preserve initially empty commits"
-msgstr "保留初始化的空提交"
+#: builtin/update-index.c:79
+#, c-format
+msgid "failed to create directory %s"
+msgstr "无法创建目录 %s"
-#: builtin/revert.c:107
-msgid "allow commits with empty messages"
-msgstr "允许提交说明为空"
+#: builtin/update-index.c:85
+#, c-format
+msgid "failed to stat %s"
+msgstr "对 %s 调用 stat 失败"
-#: builtin/revert.c:108
-msgid "keep redundant, empty commits"
-msgstr "保持多余的、空的提交"
+#: builtin/update-index.c:95
+#, c-format
+msgid "failed to create file %s"
+msgstr "无法创建文件 %s"
-#: builtin/revert.c:112
-msgid "program error"
-msgstr "程序错误"
+#: builtin/update-index.c:103
+#, c-format
+msgid "failed to delete file %s"
+msgstr "无法删除文件 %s"
-#: builtin/revert.c:197
-msgid "revert failed"
-msgstr "还原失败"
+#: builtin/update-index.c:110 builtin/update-index.c:216
+#, c-format
+msgid "failed to delete directory %s"
+msgstr "无法删除目录 %s"
-#: builtin/revert.c:212
-msgid "cherry-pick failed"
-msgstr "拣选失败"
+#: builtin/update-index.c:135
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr "在 '%s' 中测试 mtime "
-#: builtin/rm.c:17
-msgid "git rm [<options>] [--] <file>..."
-msgstr "git rm [<选项>] [--] <文件>..."
+#: builtin/update-index.c:149
+msgid "directory stat info does not change after adding a new file"
+msgstr "添加一个新文件后，目录的状态信息未改变"
-#: builtin/rm.c:65
-msgid ""
-"the following submodule (or one of its nested submodules)\n"
-"uses a .git directory:"
-msgid_plural ""
-"the following submodules (or one of their nested submodules)\n"
-"use a .git directory:"
-msgstr[0] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
-msgstr[1] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
+#: builtin/update-index.c:162
+msgid "directory stat info does not change after adding a new directory"
+msgstr "添加一个新目录后，目录的状态信息未改变"
-#: builtin/rm.c:71
-msgid ""
-"\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-"\n"
-"（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
+#: builtin/update-index.c:175
+msgid "directory stat info changes after updating a file"
+msgstr "更新一个文件后，目录的状态信息被修改"
-#: builtin/rm.c:230
-msgid ""
-"the following file has staged content different from both the\n"
-"file and the HEAD:"
-msgid_plural ""
-"the following files have staged content different from both the\n"
-"file and the HEAD:"
-msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
-msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
+#: builtin/update-index.c:186
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr "在子目录中添加文件后，目录的状态信息被修改"
-#: builtin/rm.c:235
-msgid ""
-"\n"
-"(use -f to force removal)"
-msgstr ""
-"\n"
-"（使用 -f 强制删除）"
+#: builtin/update-index.c:197
+msgid "directory stat info does not change after deleting a file"
+msgstr "删除一个文件后，目录的状态信息未改变"
-#: builtin/rm.c:239
-msgid "the following file has changes staged in the index:"
-msgid_plural "the following files have changes staged in the index:"
-msgstr[0] "如下文件相对索引区的内容有修改"
-msgstr[1] "如下文件相对索引区的内容有修改"
+#: builtin/update-index.c:210
+msgid "directory stat info does not change after deleting a directory"
+msgstr "删除一个目录后，目录的状态信息未改变"
-#: builtin/rm.c:243 builtin/rm.c:254
-msgid ""
-"\n"
-"(use --cached to keep the file, or -f to force removal)"
-msgstr ""
-"\n"
-"（使用 --cached 保留本地文件，或用 -f 强制删除）"
+#: builtin/update-index.c:217
+msgid " OK"
+msgstr " OK"
-#: builtin/rm.c:251
-msgid "the following file has local modifications:"
-msgid_plural "the following files have local modifications:"
-msgstr[0] "如下文件有本地修改："
-msgstr[1] "如下文件有本地修改："
+#: builtin/update-index.c:568
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr "git update-index [<选项>] [--] [<文件>...]"
-#: builtin/rm.c:269
-msgid "do not list removed files"
-msgstr "不列出删除的文件"
+#: builtin/update-index.c:923
+msgid "continue refresh even when index needs update"
+msgstr "当索引需要更新时继续刷新"
-#: builtin/rm.c:270
-msgid "only remove from the index"
-msgstr "å\8fªä»\8eç´¢å¼\95å\8cºå\88 é\99¤"
+#: builtin/update-index.c:926
+msgid "refresh: ignore submodules"
+msgstr "å\88·æ\96°ï¼\9a忽ç\95¥å\90模ç»\84"
-#: builtin/rm.c:271
-msgid "override the up-to-date check"
-msgstr "忽略文件更新状态检查"
+#: builtin/update-index.c:929
+msgid "do not ignore new files"
+msgstr "不忽略新的文件"
-#: builtin/rm.c:272
-msgid "allow recursive removal"
-msgstr "允许递归删除"
+#: builtin/update-index.c:931
+msgid "let files replace directories and vice-versa"
+msgstr "让文件替换目录（反之亦然）"
-#: builtin/rm.c:274
-msgid "exit with a zero status even if nothing matched"
-msgstr "即使没有匹配，也以零状态退出"
+#: builtin/update-index.c:933
+msgid "notice files missing from worktree"
+msgstr "通知文件从工作区丢失"
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
+#: builtin/update-index.c:935
+msgid "refresh even if index contains unmerged entries"
+msgstr "即使索引区包含未合并的条目也执行刷新"
-#: builtin/rm.c:335
-#, c-format
-msgid "not removing '%s' recursively without -r"
-msgstr "未提供 -r 选项不会递归删除 '%s'"
+#: builtin/update-index.c:938
+msgid "refresh stat information"
+msgstr "刷新统计信息"
-#: builtin/rm.c:374
-#, c-format
-msgid "git rm: unable to remove %s"
-msgstr "git rm：不能删除 %s"
+#: builtin/update-index.c:942
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
-#: builtin/shortlog.c:13
-msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
-msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
+#: builtin/update-index.c:946
+msgid "<mode>,<object>,<path>"
+msgstr "<存取模式>,<对象>,<路径>"
-#: builtin/shortlog.c:131
-#, c-format
-msgid "Missing author: %s"
-msgstr "缺少作者：%s"
+#: builtin/update-index.c:947
+msgid "add the specified entry to the index"
+msgstr "添加指定的条目到索引区"
-#: builtin/shortlog.c:230
-msgid "sort output according to the number of commits per author"
-msgstr "æ ¹æ\8d®æ¯\8f个ä½\9cè\80\85ç\9a\84æ\8f\90交æ\95°é\87\8fæ\8e\92åº\8f"
+#: builtin/update-index.c:956
+msgid "mark files as \"not changing\""
+msgstr "æ\8a\8aæ\96\87件æ \87记为 \"没æ\9c\89å\8f\98æ\9b´\""
-#: builtin/shortlog.c:232
-msgid "Suppress commit descriptions, only provides commit count"
-msgstr "隐藏提交说明，只提供提交数量"
+#: builtin/update-index.c:959
+msgid "clear assumed-unchanged bit"
+msgstr "清除 assumed-unchanged 位"
-#: builtin/shortlog.c:234
-msgid "Show the email address of each author"
-msgstr "æ\98¾ç¤ºæ¯\8f个ä½\9cè\80\85ç\9a\84ç\94µå\90é\82®ä»¶å\9c°å\9d\80"
+#: builtin/update-index.c:962
+msgid "mark files as \"index-only\""
+msgstr "æ\8a\8aæ\96\87件æ \87记为 \"ä»\85ç´¢å¼\95\""
-#: builtin/shortlog.c:235
-msgid "w[,i1[,i2]]"
-msgstr "w[,i1[,i2]]"
+#: builtin/update-index.c:965
+msgid "clear skip-worktree bit"
+msgstr "清除 skip-worktree 位"
-#: builtin/shortlog.c:236
-msgid "Linewrap output"
-msgstr "折行输出"
+#: builtin/update-index.c:968
+msgid "add to index only; do not add content to object database"
+msgstr "只添加到索引区；不添加对象到对象库"
-#: builtin/show-branch.c:9
-msgid ""
-"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
-msgstr ""
-"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
+#: builtin/update-index.c:970
+msgid "remove named paths even if present in worktree"
+msgstr "即使存在工作区里，也删除路径"
-#: builtin/show-branch.c:13
-msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
-msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
+#: builtin/update-index.c:972
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr "携带 --stdin：输入的行以 null 字符终止"
-#: builtin/show-branch.c:659
-msgid "show remote-tracking and local branches"
-msgstr "显示远程跟踪的和本地的分支"
+#: builtin/update-index.c:974
+msgid "read list of paths to be updated from standard input"
+msgstr "从标准输入中读取需要更新的路径列表"
-#: builtin/show-branch.c:661
-msgid "show remote-tracking branches"
-msgstr "显示远程跟踪的分支"
+#: builtin/update-index.c:978
+msgid "add entries from standard input to the index"
+msgstr "从标准输入添加条目到索引区"
-#: builtin/show-branch.c:663
-msgid "color '*!+-' corresponding to the branch"
-msgstr "着色 '*!+-' 到相应的分支"
+#: builtin/update-index.c:982
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr "为指定文件重新生成第2和第3暂存区"
-#: builtin/show-branch.c:665
-msgid "show <n> more commits after the common ancestor"
-msgstr "显示共同祖先后的 <n> 个提交"
+#: builtin/update-index.c:986
+msgid "only update entries that differ from HEAD"
+msgstr "只更新与 HEAD 不同的条目"
-#: builtin/show-branch.c:667
-msgid "synonym to more=-1"
-msgstr "å\92\8c more=-1 å\90\8cä¹\89"
+#: builtin/update-index.c:990
+msgid "ignore files missing from worktree"
+msgstr "忽ç\95¥å·¥ä½\9cå\8cºä¸¢å¤±ç\9a\84æ\96\87件"
-#: builtin/show-branch.c:668
-msgid "suppress naming strings"
-msgstr "不显示字符串命名"
+#: builtin/update-index.c:993
+msgid "report actions to standard output"
+msgstr "在标准输出显示操作"
-#: builtin/show-branch.c:670
-msgid "include the current branch"
-msgstr "包括当前分支"
+#: builtin/update-index.c:995
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "(for porcelains) 忘记保存的未解决的冲突"
-#: builtin/show-branch.c:672
-msgid "name commits with their object names"
-msgstr "以对象名字命名提交"
+#: builtin/update-index.c:999
+msgid "write index in this format"
+msgstr "以这种格式写入索引区"
-#: builtin/show-branch.c:674
-msgid "show possible merge bases"
-msgstr "显示可能合并的基线"
+#: builtin/update-index.c:1001
+msgid "enable or disable split index"
+msgstr "启用或禁用索引拆分"
-#: builtin/show-branch.c:676
-msgid "show refs unreachable from any other ref"
-msgstr "显示没有任何引用的的引用"
+#: builtin/update-index.c:1003
+msgid "enable/disable untracked cache"
+msgstr "启用/禁用对未跟踪文件的缓存"
-#: builtin/show-branch.c:678
-msgid "show commits in topological order"
-msgstr "以拓扑顺序显示提交"
+#: builtin/update-index.c:1005
+msgid "test if the filesystem supports untracked cache"
+msgstr "测试文件系统是否支持未跟踪文件缓存"
-#: builtin/show-branch.c:681
-msgid "show only commits not on the first branch"
-msgstr "只显示不在第一个分支上的提交"
+#: builtin/update-index.c:1007
+msgid "enable untracked cache without testing the filesystem"
+msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
-#: builtin/show-branch.c:683
-msgid "show merges reachable from only one tip"
-msgstr "显示仅一个分支可访问的合并提交"
+#: builtin/update-index.c:1107
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex 被设置为 false。如果您确实要启用索引拆分，请删除或修改它。"
-#: builtin/show-branch.c:685
-msgid "topologically sort, maintaining date order where possible"
-msgstr "拓扑方式排序，并尽可能地保持日期顺序"
+#: builtin/update-index.c:1116
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分，请删除或修改它。"
-#: builtin/show-branch.c:688
-msgid "<n>[,<base>]"
-msgstr "<n>[,<base>]"
+#: builtin/update-index.c:1127
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修"
+"改它。"
-#: builtin/show-branch.c:689
-msgid "show <n> most recent ref-log entries starting at base"
-msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
+#: builtin/update-index.c:1131
+msgid "Untracked cache disabled"
+msgstr "缓存未跟踪文件被禁用"
-#: builtin/show-ref.c:10
+#: builtin/update-index.c:1139
msgid ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
msgstr ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
+"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或"
+"修改它。"
-#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=pattern] < ref-list"
-msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
+#: builtin/update-index.c:1143
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr "缓存未跟踪文件在 '%s' 启用"
-#: builtin/show-ref.c:170
-msgid "only show tags (can be combined with heads)"
-msgstr "只显示 tags（可以和头共用）"
+#: builtin/update-ref.c:9
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
-#: builtin/show-ref.c:171
-msgid "only show heads (can be combined with tags)"
-msgstr "只显示头（可以和 tags 共用）"
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
-#: builtin/show-ref.c:172
-msgid "stricter reference checking, requires exact ref path"
-msgstr "更严格的引用检测，需要精确的引用路径"
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr "git update-ref [<选项>] --stdin [-z]"
-#: builtin/show-ref.c:175 builtin/show-ref.c:177
-msgid "show the HEAD reference, even if it would be filtered out"
-msgstr "显示 HEAD 引用，即使被过滤掉"
+#: builtin/update-ref.c:363
+msgid "delete the reference"
+msgstr "删除引用"
-#: builtin/show-ref.c:179
-msgid "dereference tags into object IDs"
-msgstr "转换 tags 到对象ID"
+#: builtin/update-ref.c:365
+msgid "update <refname> not the one it points to"
+msgstr "更新 <引用名> 本身而不是它指向的引用"
-#: builtin/show-ref.c:181
-msgid "only show SHA1 hash using <n> digits"
-msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
+#: builtin/update-ref.c:366
+msgid "stdin has NUL-terminated arguments"
+msgstr "标准输入有以 NUL 字符终止的参数"
-#: builtin/show-ref.c:185
-msgid "do not print results to stdout (useful with --verify)"
-msgstr "ä¸\8dæ\89\93å\8d°ç»\93æ\9e\9cå\88°æ \87å\87\86è¾\93å\87ºï¼\88ä¾\8bå¦\82ä¸\8e --verify å\8f\82æ\95°å\85±ç\94¨ï¼\89"
+#: builtin/update-ref.c:367
+msgid "read updates from stdin"
+msgstr "ä»\8eæ \87å\87\86è¾\93å\85¥è¯»å\8f\96æ\9b´æ\96°"
-#: builtin/show-ref.c:187
-msgid "show refs from stdin that aren't in local repository"
-msgstr "显示从标准输入中读入的不在本地版本库中的引用"
+#: builtin/update-server-info.c:6
+msgid "git update-server-info [--force]"
+msgstr "git update-server-info [--force]"
-#: builtin/symbolic-ref.c:7
-msgid "git symbolic-ref [<options>] <name> [<ref>]"
-msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
+#: builtin/update-server-info.c:14
+msgid "update the info files from scratch"
+msgstr "从头开始更新文件信息"
-#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref -d [-q] <name>"
-msgstr "git symbolic-ref -d [-q] <名称>"
+#: builtin/verify-commit.c:17
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr "git verify-commit [-v | --verbose] <提交>..."
-#: builtin/symbolic-ref.c:40
-msgid "suppress error message for non-symbolic (detached) refs"
-msgstr "不显示非符号（分离的）引用的错误信息"
+#: builtin/verify-commit.c:72
+msgid "print commit contents"
+msgstr "打印提交内容"
-#: builtin/symbolic-ref.c:41
-msgid "delete symbolic ref"
-msgstr "删除符号引用"
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:37
+msgid "print raw gpg status output"
+msgstr "打印原始 gpg 状态输出"
-#: builtin/symbolic-ref.c:42
-msgid "shorten ref output"
-msgstr "简短的引用输出"
+#: builtin/verify-pack.c:54
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
-msgid "reason"
-msgstr "å\8e\9få\9b "
+#: builtin/verify-pack.c:64
+msgid "verbose"
+msgstr "å\86\97é\95¿è¾\93å\87º"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
-msgid "reason of the update"
-msgstr "更新的原因"
+#: builtin/verify-pack.c:66
+msgid "show statistics only"
+msgstr "只显示统计"
-#: builtin/tag.c:22
-msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
-msgstr ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
+#: builtin/verify-tag.c:18
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
-#: builtin/tag.c:23
-msgid "git tag -d <tagname>..."
-msgstr "git tag -d <标签名>..."
+#: builtin/verify-tag.c:36
+msgid "print tag contents"
+msgstr "打印标签内容"
-#: builtin/tag.c:24
-msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
-"\t\t[<pattern>...]"
-msgstr ""
-"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
+#: builtin/worktree.c:15
+msgid "git worktree add [<options>] <path> [<branch>]"
+msgstr "git worktree add [<选项>] <路径> [<分支>]"
-#: builtin/tag.c:26
-msgid "git tag -v <tagname>..."
-msgstr "git tag -v <标签名>..."
+#: builtin/worktree.c:16
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<选项>]"
-#: builtin/tag.c:69
-#, c-format
-msgid "malformed object at '%s'"
-msgstr "非法的对象于 '%s'"
+#: builtin/worktree.c:17
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<选项>] <路径>"
+
+#: builtin/worktree.c:18
+msgid "git worktree prune [<options>]"
+msgstr "git worktree prune [<选项>]"
+
+#: builtin/worktree.c:19
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <路径>"
-#: builtin/tag.c:301
+#: builtin/worktree.c:43
#, c-format
-msgid "tag name too long: %.*s..."
-msgstr "tag 名字太长：%.*s..."
+msgid "Removing worktrees/%s: not a valid directory"
+msgstr "删除工作区/%s：不是一个有效的目录"
-#: builtin/tag.c:306
+#: builtin/worktree.c:49
#, c-format
-msgid "tag '%s' not found."
-msgstr "tag '%s' 未发现。"
+msgid "Removing worktrees/%s: gitdir file does not exist"
+msgstr "删除 worktrees/%s：gitdir 文件不存在"
-#: builtin/tag.c:321
+#: builtin/worktree.c:54
#, c-format
-msgid "Deleted tag '%s' (was %s)\n"
-msgstr "å·²å\88 é\99¤ tag '%s'ï¼\88æ\9b¾ä¸º %sï¼\89\n"
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+msgstr "å\88 é\99¤ worktrees/%sï¼\9aæ\97 æ³\95读å\8f\96 gitdir æ\96\87件 (%s)"
-#: builtin/tag.c:333
+#: builtin/worktree.c:65
#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "不能校验 tag '%s'"
+msgid "Removing worktrees/%s: invalid gitdir file"
+msgstr "删除 worktrees/%s：无效的 gitdir 文件"
-#: builtin/tag.c:343
+#: builtin/worktree.c:81
#, c-format
-msgid ""
-"\n"
-"Write a message for tag:\n"
-" %s\n"
-"Lines starting with '%c' will be ignored.\n"
-msgstr ""
-"\n"
-"输入一个 tag 说明：\n"
-" %s\n"
-"以 '%c' 开头的行将被忽略。\n"
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
+
+#: builtin/worktree.c:128
+msgid "report pruned working trees"
+msgstr "报告清除的工作区"
-#: builtin/tag.c:347
+#: builtin/worktree.c:130
+msgid "expire working trees older than <time>"
+msgstr "将早于 <time> 的工作区过期"
+
+#: builtin/worktree.c:204
#, c-format
-msgid ""
-"\n"
-"Write a message for tag:\n"
-" %s\n"
-"Lines starting with '%c' will be kept; you may remove them yourself if you "
-"want to.\n"
-msgstr ""
-"\n"
-"输入一个 tag 说明：\n"
-" %s\n"
-"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
+msgid "'%s' already exists"
+msgstr "'%s' 已经存在"
-#: builtin/tag.c:371
+#: builtin/worktree.c:235
#, c-format
-msgid "unsupported sort specification '%s'"
-msgstr "不支持的排序规格 '%s'"
+msgid "could not create directory of '%s'"
+msgstr "不能创建目录 '%s'"
-#: builtin/tag.c:373
+#: builtin/worktree.c:274
#, c-format
-msgid "unsupported sort specification '%s' in variable '%s'"
-msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
+msgid "Preparing %s (identifier %s)"
+msgstr "准备 %s（标识符 %s）"
-#: builtin/tag.c:428
-msgid "unable to sign the tag"
-msgstr "æ\97 æ³\95ç¾ç½² tag"
+#: builtin/worktree.c:328
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr "æ£\80å\87ºå\88\86æ\94¯ <branch> å\8d³ä½¿å·²ç»\8f被æ£\80å\87ºå\88°å\85¶å®\83å·¥ä½\9cå\8cº"
-#: builtin/tag.c:430
-msgid "unable to write tag file"
-msgstr "无法写 tag 文件"
+#: builtin/worktree.c:330
+msgid "create a new branch"
+msgstr "创建一个新分支"
-#: builtin/tag.c:455
-msgid "bad object type."
-msgstr "å\9d\8fç\9a\84对象类å\9e\8bã\80\82"
+#: builtin/worktree.c:332
+msgid "create or reset a branch"
+msgstr "å\88\9b建æ\88\96é\87\8dç½®ä¸\80个å\88\86æ\94¯"
-#: builtin/tag.c:468
-msgid "tag header too big."
-msgstr "tag 头信息太大。"
+#: builtin/worktree.c:334
+msgid "populate the new working tree"
+msgstr "生成新的工作区"
-#: builtin/tag.c:504
-msgid "no tag message?"
-msgstr "无 tag 说明？"
+#: builtin/worktree.c:335
+msgid "keep the new working tree locked"
+msgstr "锁定新工作区"
-#: builtin/tag.c:510
+#: builtin/worktree.c:343
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr "-b、-B 和 --detach 是互斥的"
+
+#: builtin/worktree.c:478
+msgid "reason for locking"
+msgstr "锁定原因"
+
+#: builtin/worktree.c:490 builtin/worktree.c:523
#, c-format
-msgid "The tag message has been left in %s\n"
-msgstr "tag 说明被保留在 %s\n"
+msgid "'%s' is not a working tree"
+msgstr "'%s' 不是一个工作区"
-#: builtin/tag.c:559
-msgid "switch 'points-at' requires an object"
-msgstr "开关 'points-at' 需要一个对象"
+#: builtin/worktree.c:492 builtin/worktree.c:525
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "主工作区无法被加锁或解锁"
-#: builtin/tag.c:561
+#: builtin/worktree.c:497
#, c-format
-msgid "malformed object name '%s'"
-msgstr "非法的对象名 '%s'"
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s' 已被锁定，原因：%s"
-#: builtin/tag.c:589
-msgid "list tag names"
-msgstr "列出tag名称"
+#: builtin/worktree.c:499
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s' 已被锁定"
-#: builtin/tag.c:591
-msgid "print <n> lines of each tag message"
-msgstr "每个 tag 信息打印 <n> 行"
+#: builtin/worktree.c:527
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s' 未被锁定"
-#: builtin/tag.c:593
-msgid "delete tags"
-msgstr "删除 tags"
+#: builtin/write-tree.c:13
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
-#: builtin/tag.c:594
-msgid "verify tags"
-msgstr "验证 tags"
+#: builtin/write-tree.c:26
+msgid "<prefix>/"
+msgstr "<前缀>/"
-#: builtin/tag.c:596
-msgid "Tag creation options"
-msgstr "Tag 创建选项"
+#: builtin/write-tree.c:27
+msgid "write tree object for a subdirectory <prefix>"
+msgstr "将 <前缀> 子目录内容写到一个树对象"
-#: builtin/tag.c:598
-msgid "annotated tag, needs a message"
-msgstr "注解 tag，需要一个说明"
+#: builtin/write-tree.c:30
+msgid "only useful for debugging"
+msgstr "只对调试有用"
-#: builtin/tag.c:600
-msgid "tag message"
-msgstr "tag 说明"
+#: upload-pack.c:22
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<选项>] <目录>"
-#: builtin/tag.c:602
-msgid "annotated and GPG-signed tag"
-msgstr "注解并 GPG 签名的 tag"
+#: upload-pack.c:1040
+msgid "quit after a single request/response exchange"
+msgstr "在一次单独的请求/响应（request/response）交换后退出"
-#: builtin/tag.c:606
-msgid "use another key to sign the tag"
-msgstr "使用另外的私钥签名 tag"
+#: upload-pack.c:1042
+msgid "exit immediately after initial ref advertisement"
+msgstr "在初始的引用广告后立即退出"
-#: builtin/tag.c:607
-msgid "replace the tag if exists"
-msgstr "如果存在，替换现有的 tag"
+#: upload-pack.c:1044
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
-#: builtin/tag.c:609
-msgid "Tag listing options"
-msgstr "Tag 列表选项"
+#: upload-pack.c:1046
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "不活动 <n> 秒钟后终止传输"
-#: builtin/tag.c:610
-msgid "show tag list in columns"
-msgstr "以列的方式显示 tag"
+#: credential-cache--daemon.c:223
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"您的 socket 目录权限过于宽松，其他用户可能会读取您缓存的认证信息。考虑执"
+"行：\n"
+"\n"
+"\tchmod 0700 %s"
-#: builtin/tag.c:612
-msgid "sort tags"
-msgstr "排序 tags"
+#: credential-cache--daemon.c:271
+msgid "print debugging messages to stderr"
+msgstr "调试信息输出到标准错误"
-#: builtin/tag.c:617 builtin/tag.c:623
-msgid "print only tags that contain the commit"
-msgstr "只打印包含提交的tags"
+#: git.c:14
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept."
+msgstr ""
+"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
+"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
+"帮助。"
-#: builtin/tag.c:629
-msgid "print only tags of the object"
-msgstr "只打印tags对象"
+#: http.c:336
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "http.postbuffer 为负值，默认为 %d"
-#: builtin/tag.c:655
-msgid "--column and -n are incompatible"
-msgstr "--column 和 -n 不兼容"
+#: http.c:357
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "当 cURL < 7.22.0 时，不支持委托控制"
-#: builtin/tag.c:667
-msgid "--sort and -n are incompatible"
-msgstr "--sort 和 -n 不兼容"
+#: http.c:366
+msgid "Public key pinning not supported with cURL < 7.44.0"
+msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
-#: builtin/tag.c:674
-msgid "-n option is only allowed with -l."
-msgstr "-n 选项只允许和 -l 同时使用。"
+#: http.c:1766
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
+msgstr ""
+"不能更新重定向的 url base：\n"
+" 请求：%s\n"
+" 重定向：%s"
-#: builtin/tag.c:676
-msgid "--contains option is only allowed with -l."
-msgstr "--contains 选项只允许和 -l 同时使用。"
+#: remote-curl.c:323
+#, c-format
+msgid "redirecting to %s"
+msgstr "重定向到 %s"
-#: builtin/tag.c:678
-msgid "--points-at option is only allowed with -l."
-msgstr "--points-at 选项只允许和 -l 同时使用。"
+#: common-cmds.h:9
+msgid "start a working area (see also: git help tutorial)"
+msgstr "开始一个工作区（参见：git help tutorial）"
-#: builtin/tag.c:686
-msgid "only one -F or -m option is allowed."
-msgstr "å\8fªå\85\81许ä¸\80个 -F æ\88\96 -m é\80\89项ã\80\82"
+#: common-cmds.h:10
+msgid "work on the current change (see also: git help everyday)"
+msgstr "å\9c¨å½\93å\89\8då\8f\98æ\9b´ä¸\8aå·¥ä½\9cï¼\88å\8f\82è§\81ï¼\9agit help everydayï¼\89"
-#: builtin/tag.c:706
-msgid "too many params"
-msgstr "太多参数"
+#: common-cmds.h:11
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "检查历史和状态（参见：git help revisions）"
-#: builtin/tag.c:712
-#, c-format
-msgid "'%s' is not a valid tag name."
-msgstr "'%s' 不是一个有效的tag名称。"
+#: common-cmds.h:12
+msgid "grow, mark and tweak your common history"
+msgstr "扩展、标记和调校您的历史记录"
-#: builtin/tag.c:717
-#, c-format
-msgid "tag '%s' already exists"
-msgstr "tag '%s' 已存在"
+#: common-cmds.h:13
+msgid "collaborate (see also: git help workflows)"
+msgstr "协同（参见：git help workflows）"
-#: builtin/tag.c:741
-#, c-format
-msgid "Updated tag '%s' (was %s)\n"
-msgstr "已更新tag '%s'（曾为 %s）\n"
+#: common-cmds.h:17
+msgid "Add file contents to the index"
+msgstr "添加文件内容至索引"
-#: builtin/unpack-objects.c:489
-msgid "Unpacking objects"
-msgstr "展开对象中"
+#: common-cmds.h:18
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr "通过二分查找定位引入 bug 的提交"
-#: builtin/update-index.c:70
-#, c-format
-msgid "failed to create directory %s"
-msgstr "无法创建目录 %s"
+#: common-cmds.h:19
+msgid "List, create, or delete branches"
+msgstr "列出、创建或删除分支"
+
+#: common-cmds.h:20
+msgid "Switch branches or restore working tree files"
+msgstr "切换分支或恢复工作区文件"
-#: builtin/update-index.c:76
-#, c-format
-msgid "failed to stat %s"
-msgstr "无法枚举 %s 状态"
+#: common-cmds.h:21
+msgid "Clone a repository into a new directory"
+msgstr "克隆一个仓库到一个新目录"
-#: builtin/update-index.c:86
-#, c-format
-msgid "failed to create file %s"
-msgstr "无法创建文件 %s"
+#: common-cmds.h:22
+msgid "Record changes to the repository"
+msgstr "记录变更到仓库"
-#: builtin/update-index.c:94
-#, c-format
-msgid "failed to delete file %s"
-msgstr "无法删除文件 %s"
+#: common-cmds.h:23
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr "显示提交之间、提交和工作区之间等的差异"
-#: builtin/update-index.c:101 builtin/update-index.c:203
-#, c-format
-msgid "failed to delete directory %s"
-msgstr "无法删除目录 %s"
+#: common-cmds.h:24
+msgid "Download objects and refs from another repository"
+msgstr "从另外一个仓库下载对象和引用"
-#: builtin/update-index.c:124
-#, c-format
-msgid "Testing "
-msgstr "正在测试 "
+#: common-cmds.h:25
+msgid "Print lines matching a pattern"
+msgstr "输出和模式匹配的行"
-#: builtin/update-index.c:136
-msgid "directory stat info does not change after adding a new file"
-msgstr "添加一个新文件后，目录的状态信息未改变"
+#: common-cmds.h:26
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
-#: builtin/update-index.c:149
-msgid "directory stat info does not change after adding a new directory"
-msgstr "æ·»å\8a ä¸\80个æ\96°ç\9b®å½\95å\90\8eï¼\8cç\9b®å½\95ç\9a\84ç\8a¶æ\80\81ä¿¡æ\81¯æ\9cªæ\94¹å\8f\98"
+#: common-cmds.h:27
+msgid "Show commit logs"
+msgstr "æ\98¾ç¤ºæ\8f\90交æ\97¥å¿\97"
-#: builtin/update-index.c:162
-msgid "directory stat info changes after updating a file"
-msgstr "更新一个文件后，目录的状态信息被修改"
+#: common-cmds.h:28
+msgid "Join two or more development histories together"
+msgstr "合并两个或更多开发历史"
-#: builtin/update-index.c:173
-msgid "directory stat info changes after adding a file inside subdirectory"
-msgstr "在子目录中添加文件后，目录的状态信息被修改"
+#: common-cmds.h:29
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr "移动或重命名一个文件、目录或符号链接"
-#: builtin/update-index.c:184
-msgid "directory stat info does not change after deleting a file"
-msgstr "删除一个文件后，目录的状态信息未改变"
+#: common-cmds.h:30
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr "获取并整合另外的仓库或一个本地分支"
-#: builtin/update-index.c:197
-msgid "directory stat info does not change after deleting a directory"
-msgstr "删除一个目录后，目录的状态信息未改变"
+#: common-cmds.h:31
+msgid "Update remote refs along with associated objects"
+msgstr "更新远程引用和相关的对象"
-#: builtin/update-index.c:204
-msgid " OK"
-msgstr " OK"
+#: common-cmds.h:32
+msgid "Reapply commits on top of another base tip"
+msgstr "在另一个分支上重新应用提交"
-#: builtin/update-index.c:564
-msgid "git update-index [<options>] [--] [<file>...]"
-msgstr "git update-index [<选项>] [--] [<文件>...]"
+#: common-cmds.h:33
+msgid "Reset current HEAD to the specified state"
+msgstr "重置当前 HEAD 到指定状态"
-#: builtin/update-index.c:918
-msgid "continue refresh even when index needs update"
-msgstr "当索引需要更新时继续刷新"
+#: common-cmds.h:34
+msgid "Remove files from the working tree and from the index"
+msgstr "从工作区和索引中删除文件"
-#: builtin/update-index.c:921
-msgid "refresh: ignore submodules"
-msgstr "刷新：忽略子模组"
+#: common-cmds.h:35
+msgid "Show various types of objects"
+msgstr "显示各种类型的对象"
-#: builtin/update-index.c:924
-msgid "do not ignore new files"
-msgstr "不忽略新的文件"
+#: common-cmds.h:36
+msgid "Show the working tree status"
+msgstr "显示工作区状态"
-#: builtin/update-index.c:926
-msgid "let files replace directories and vice-versa"
-msgstr "让文件替换目录（反之亦然）"
+#: common-cmds.h:37
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
-#: builtin/update-index.c:928
-msgid "notice files missing from worktree"
-msgstr "通知文件从工作区丢失"
+#: parse-options.h:145
+msgid "expiry-date"
+msgstr "到期时间"
-#: builtin/update-index.c:930
-msgid "refresh even if index contains unmerged entries"
-msgstr "即使索引区包含未合并的条目也执行刷新"
+#: parse-options.h:160
+msgid "no-op (backward compatibility)"
+msgstr "空操作（向后兼容）"
-#: builtin/update-index.c:933
-msgid "refresh stat information"
-msgstr "刷新统计信息"
+#: parse-options.h:238
+msgid "be more verbose"
+msgstr "更加详细"
-#: builtin/update-index.c:937
-msgid "like --refresh, but ignore assume-unchanged setting"
-msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
+#: parse-options.h:240
+msgid "be more quiet"
+msgstr "更加安静"
-#: builtin/update-index.c:941
-msgid "<mode>,<object>,<path>"
-msgstr "<存取模式>,<对象>,<路径>"
+#: parse-options.h:246
+msgid "use <n> digits to display SHA-1s"
+msgstr "用 <n> 位数字显示 SHA-1 哈希值"
-#: builtin/update-index.c:942
-msgid "add the specified entry to the index"
-msgstr "添加指定的条目到索引区"
+#: rerere.h:40
+msgid "update the index with reused conflict resolution if possible"
+msgstr "如果可能，重用冲突解决更新索引"
-#: builtin/update-index.c:946
-msgid "(+/-)x"
-msgstr "(+/-)x"
+#: git-bisect.sh:54
+msgid "You need to start by \"git bisect start\""
+msgstr "您需要执行 \"git bisect start\" 来开始"
-#: builtin/update-index.c:947
-msgid "override the executable bit of the listed files"
-msgstr "覆盖列表里文件的可执行位"
+# 译者：注意保持句尾空格
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:60
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "您想让我为您这样做么[Y/n]？ "
-#: builtin/update-index.c:951
-msgid "mark files as \"not changing\""
-msgstr "把文件标记为 \"没有变更\""
+#: git-bisect.sh:121
+#, sh-format
+msgid "unrecognised option: '$arg'"
+msgstr "未能识别的选项：'$arg'"
-#: builtin/update-index.c:954
-msgid "clear assumed-unchanged bit"
-msgstr "清除 assumed-unchanged 位"
+#: git-bisect.sh:125
+#, sh-format
+msgid "'$arg' does not appear to be a valid revision"
+msgstr "'$arg' 看起来不像是一个有效的版本"
-#: builtin/update-index.c:957
-msgid "mark files as \"index-only\""
-msgstr "把文件标记为 \"仅索引\""
+#: git-bisect.sh:154
+msgid "Bad HEAD - I need a HEAD"
+msgstr "坏的 HEAD - 我需要一个 HEAD"
-#: builtin/update-index.c:960
-msgid "clear skip-worktree bit"
-msgstr "清除 skip-worktree 位"
+#: git-bisect.sh:167
+#, sh-format
+msgid ""
+"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
-#: builtin/update-index.c:963
-msgid "add to index only; do not add content to object database"
-msgstr "只添加到索引区；不添加对象到对象库"
+#: git-bisect.sh:177
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "不会在做了 cg-seek 的树上做二分查找"
-#: builtin/update-index.c:965
-msgid "remove named paths even if present in worktree"
-msgstr "å\8d³ä½¿å\98å\9c¨å·¥ä½\9cå\8cºé\87\8cï¼\8cä¹\9få\88 é\99¤è·¯å¾\84"
+#: git-bisect.sh:181
+msgid "Bad HEAD - strange symbolic ref"
+msgstr "å\9d\8fç\9a\84 HEAD - å¥\87æ\80ªç\9a\84符å\8f·å¼\95ç\94¨"
-#: builtin/update-index.c:967
-msgid "with --stdin: input lines are terminated by null bytes"
-msgstr "携带 --stdin：输入的行以 null 字符终止"
+#: git-bisect.sh:233
+#, sh-format
+msgid "Bad bisect_write argument: $state"
+msgstr "坏的 bisect_write 参数：$state"
-#: builtin/update-index.c:969
-msgid "read list of paths to be updated from standard input"
-msgstr "从标准输入中读取需要更新的路径列表"
+#: git-bisect.sh:262
+#, sh-format
+msgid "Bad rev input: $arg"
+msgstr "坏的输入版本：$arg"
-#: builtin/update-index.c:973
-msgid "add entries from standard input to the index"
-msgstr "从标准输入添加条目到索引区"
+#: git-bisect.sh:281
+#, sh-format
+msgid "Bad rev input: $bisected_head"
+msgstr "坏的输入版本：$bisected_head"
-#: builtin/update-index.c:977
-msgid "repopulate stages #2 and #3 for the listed paths"
-msgstr "为指定文件重新生成第2和第3暂存区"
+#: git-bisect.sh:290
+#, sh-format
+msgid "Bad rev input: $rev"
+msgstr "坏的输入版本：$rev"
-#: builtin/update-index.c:981
-msgid "only update entries that differ from HEAD"
-msgstr "只更新与 HEAD 不同的条目"
+#: git-bisect.sh:299
+#, sh-format
+msgid "'git bisect $TERM_BAD' can take only one argument."
+msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
-#: builtin/update-index.c:985
-msgid "ignore files missing from worktree"
-msgstr "忽略工作区丢失的文件"
+#: git-bisect.sh:322
+#, sh-format
+msgid "Warning: bisecting only with a $TERM_BAD commit."
+msgstr "警告：在仅有一个坏（$TERM_BAD）提交下进行二分查找。"
-#: builtin/update-index.c:988
-msgid "report actions to standard output"
-msgstr "在标准输出显示操作"
+# 译者：注意保持句尾空格
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:328
+msgid "Are you sure [Y/n]? "
+msgstr "您确认么[Y/n]？ "
-#: builtin/update-index.c:990
-msgid "(for porcelains) forget saved unresolved conflicts"
-msgstr "(for porcelains) 忘记保存的未解决的冲突"
+#: git-bisect.sh:340
+#, sh-format
+msgid ""
+"You need to give me at least one $bad_syn and one $good_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+msgstr ""
+"您需要给我至少一个好版本和一个坏版本。\n"
+"（为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。）"
-#: builtin/update-index.c:994
-msgid "write index in this format"
-msgstr "以这种格式写入索引区"
+#: git-bisect.sh:343
+#, sh-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+msgstr ""
+"您需要执行 \"git bisect start\" 来开始。\n"
+"然后需要提供我至少一个好版本和一个坏版本。\n"
+"（为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。）"
-#: builtin/update-index.c:996
-msgid "enable or disable split index"
-msgstr "启用或禁用索引拆分"
+#: git-bisect.sh:414 git-bisect.sh:546
+msgid "We are not bisecting."
+msgstr "我们没有在二分查找。"
-#: builtin/update-index.c:998
-msgid "enable/disable untracked cache"
-msgstr "启用/禁用对未跟踪文件的缓存"
+#: git-bisect.sh:421
+#, sh-format
+msgid "'$invalid' is not a valid commit"
+msgstr "'$invalid' 不是一个有效的提交"
-#: builtin/update-index.c:1000
-msgid "enable untracked cache without testing the filesystem"
-msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
+#: git-bisect.sh:430
+#, sh-format
+msgid ""
+"Could not check out original HEAD '$branch'.\n"
+"Try 'git bisect reset <commit>'."
+msgstr ""
+"不能检出原始 HEAD '$branch'。\n"
+"尝试 'git bisect reset <提交>'。"
-#: builtin/update-ref.c:9
-msgid "git update-ref [<options>] -d <refname> [<old-val>]"
-msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
+#: git-bisect.sh:458
+msgid "No logfile given"
+msgstr "未提供日志文件"
-#: builtin/update-ref.c:10
-msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
-msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
+#: git-bisect.sh:459
+#, sh-format
+msgid "cannot read $file for replaying"
+msgstr "不能读取 $file 来重放"
-#: builtin/update-ref.c:11
-msgid "git update-ref [<options>] --stdin [-z]"
-msgstr "git update-ref [<选项>] --stdin [-z]"
+#: git-bisect.sh:480
+msgid "?? what are you talking about?"
+msgstr "?? 您在说什么?"
-#: builtin/update-ref.c:359
-msgid "delete the reference"
-msgstr "删除引用"
+#: git-bisect.sh:492
+#, sh-format
+msgid "running $command"
+msgstr "运行 $command"
-#: builtin/update-ref.c:361
-msgid "update <refname> not the one it points to"
-msgstr "更新 <引用名> 本身而不是它指向的引用"
+#: git-bisect.sh:499
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"exit code $res from '$command' is < 0 or >= 128"
+msgstr ""
+"二分查找运行失败：\n"
+"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
-#: builtin/update-ref.c:362
-msgid "stdin has NUL-terminated arguments"
-msgstr "标准输入有以 NUL 字符终止的参数"
+#: git-bisect.sh:525
+msgid "bisect run cannot continue any more"
+msgstr "二分查找不能继续运行"
+
+#: git-bisect.sh:531
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"'bisect_state $state' exited with error code $res"
+msgstr ""
+"二分查找运行失败：\n"
+"'bisect_state $state' 退出码为 $res"
-#: builtin/update-ref.c:363
-msgid "read updates from stdin"
-msgstr "ä»\8eæ \87å\87\86è¾\93å\85¥è¯»å\8f\96æ\9b´æ\96°"
+#: git-bisect.sh:538
+msgid "bisect run success"
+msgstr "äº\8cå\88\86æ\9f¥æ\89¾è¿\90è¡\8cæ\88\90å\8a\9f"
-#: builtin/update-server-info.c:6
-msgid "git update-server-info [--force]"
-msgstr "git update-server-info [--force]"
+#: git-bisect.sh:565
+msgid "please use two different terms"
+msgstr "请使用两个不同的术语"
-#: builtin/update-server-info.c:14
-msgid "update the info files from scratch"
-msgstr "从头开始更新文件信息"
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
+msgstr "'$term' 不是一个有效的名称"
-#: builtin/verify-commit.c:17
-msgid "git verify-commit [-v | --verbose] <commit>..."
-msgstr "git verify-commit [-v | --verbose] <提交>..."
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
+msgstr "不能使用内置命令 '$term' 作为术语"
-#: builtin/verify-commit.c:75
-msgid "print commit contents"
-msgstr "打印提交内容"
+#: git-bisect.sh:587 git-bisect.sh:593
+#, sh-format
+msgid "can't change the meaning of term '$term'"
+msgstr "不能修改术语 '$term' 的含义"
-#: builtin/verify-pack.c:54
-msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
-msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
+#: git-bisect.sh:606
+#, sh-format
+msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
+msgstr "无效的命令：您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
-#: builtin/verify-pack.c:64
-msgid "verbose"
-msgstr "冗长输出"
+#: git-bisect.sh:636
+msgid "no terms defined"
+msgstr "未定义术语"
-#: builtin/verify-pack.c:66
-msgid "show statistics only"
-msgstr "只显示统计"
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"参数 $arg 对命令 'git bisect terms' 无效。\n"
+"支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
-#: builtin/verify-tag.c:17
-msgid "git verify-tag [-v | --verbose] <tag>..."
-msgstr "git verify-tag [-v | --verbose] <标签>..."
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr "错误：您对下列文件的本地修改将被合并操作覆盖"
-#: builtin/verify-tag.c:73
-msgid "print tag contents"
-msgstr "打印 tag 内容"
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "自动合并未生效。"
-#: builtin/worktree.c:11
-msgid "git worktree add [<options>] <path> <branch>"
-msgstr "git worktree add [<选项>] <路径> <分支>"
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
+msgstr "不应该执行章鱼式合并。"
-#: builtin/worktree.c:12
-msgid "git worktree prune [<options>]"
-msgstr "git worktree prune [<选项>]"
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "无法找到和 $pretty_name 的基线提交"
-#: builtin/worktree.c:27
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "å\88 é\99¤å·¥ä½\9cå\8cº/%sï¼\9aä¸\8dæ\98¯ä¸\80个æ\9c\89æ\95\88ç\9a\84ç\9b®å½\95"
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up-to-date with $pretty_name"
+msgstr "å·²ç»\8få\92\8c $pretty_name ä¿\9dæ\8c\81ä¸\80è\87´"
-#: builtin/worktree.c:33
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "å\88 é\99¤ worktrees/%sï¼\9agitdir æ\96\87件ä¸\8då\98å\9c¨"
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "å¿«è¿\9bè\87³ï¼\9a$pretty_name"
-#: builtin/worktree.c:38
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "å\88 é\99¤ worktrees/%sï¼\9aæ\97 æ³\95读å\8f\96 gitdir æ\96\87件 (%s)"
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "å°\9dè¯\95å\92\8c $pretty_name ç\9a\84ç®\80å\8d\95å\90\88并"
-#: builtin/worktree.c:49
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "删除 worktrees/%s：无效的 gitdir 文件"
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "简单合并未生效，尝试自动合并。"
-#: builtin/worktree.c:65
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
+#: git-rebase.sh:58
+msgid ""
+"When you have resolved this problem, run \"git rebase --continue\".\n"
+"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
+"To check out the original branch and stop rebasing, run \"git rebase --abort"
+"\"."
+msgstr ""
+"当您解决了此问题后，执行 \"git rebase --continue\"。\n"
+"如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n"
+"要恢复原分支并停止变基，执行 \"git rebase --abort\"。"
-#: builtin/worktree.c:100
-#, c-format
-msgid "failed to remove: %s"
-msgstr "无法删除：%s"
+#: git-rebase.sh:158 git-rebase.sh:397
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr "无法移回 $head_name"
-#: builtin/worktree.c:186
-#, c-format
-msgid "'%s' already exists"
-msgstr "'%s' 已经存在"
+#: git-rebase.sh:172
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "无法保存 $stash_sha1"
-#: builtin/worktree.c:207
-#, c-format
-msgid "could not create directory of '%s'"
-msgstr "不能创建目录 '%s'"
+#: git-rebase.sh:212
+msgid "The pre-rebase hook refused to rebase."
+msgstr "钩子 pre-rebase 拒绝变基操作。"
-#: builtin/worktree.c:241
-msgid "unable to resolve HEAD"
-msgstr "ä¸\8dè\83½è§£æ\9e\90 HEAD"
+#: git-rebase.sh:217
+msgid "It looks like git-am is in progress. Cannot rebase."
+msgstr "ä¼¼ä¹\8eæ£å¤\84äº\8eå\9c¨ git-am ç\9a\84æ\89§è¡\8cè¿\87ç¨\8bä¸ã\80\82æ\97 æ³\95å\8f\98å\9fºã\80\82"
-#: builtin/worktree.c:249
-#, c-format
-msgid "Enter %s (identifier %s)"
-msgstr "输入 %s （标识符 %s）"
+#: git-rebase.sh:358
+msgid "No rebase in progress?"
+msgstr "没有正在进行的变基？"
-#: builtin/worktree.c:281
-msgid "checkout <branch> even if already checked out in other worktree"
-msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
+#: git-rebase.sh:369
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: builtin/worktree.c:283
-msgid "create a new branch"
-msgstr "创建一个新分支"
+#: git-rebase.sh:376
+msgid "Cannot read HEAD"
+msgstr "不能读取 HEAD"
-#: builtin/worktree.c:285
-msgid "create or reset a branch"
-msgstr "创建或重置一个分支"
+#: git-rebase.sh:379
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"您必须编辑所有的合并冲突，然后通过 git add\n"
+"命令将它们标记为已解决"
-#: builtin/worktree.c:286
-msgid "detach HEAD at named commit"
-msgstr "HEAD 从指定的提交分离"
+#: git-rebase.sh:419
+#, sh-format
+msgid ""
+"It seems that there is already a $state_dir_base directory, and\n"
+"I wonder if you are in the middle of another rebase. If that is the\n"
+"case, please try\n"
+"\t$cmd_live_rebase\n"
+"If that is not the case, please\n"
+"\t$cmd_clear_stale_rebase\n"
+"and run me again. I am stopping in case you still have something\n"
+"valuable there."
+msgstr ""
+"好像已有 $state_dir_base 目录，我怀疑您正处于另外一个变基操作\n"
+"过程中。 如果是这样，请执行\n"
+"\t$cmd_live_rebase\n"
+"如果不是这样，请执行\n"
+"\t$cmd_clear_stale_rebase\n"
+"然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。"
-#: builtin/worktree.c:292
-msgid "-b and -B are mutually exclusive"
-msgstr "-b 和 -B 互斥"
+#: git-rebase.sh:470
+#, sh-format
+msgid "invalid upstream $upstream_name"
+msgstr "无效的上游 $upstream_name"
-#: builtin/write-tree.c:13
-msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
-msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
+#: git-rebase.sh:494
+#, sh-format
+msgid "$onto_name: there are more than one merge bases"
+msgstr "$onto_name: 有一个以上的合并基准"
-#: builtin/write-tree.c:26
-msgid "<prefix>/"
-msgstr "<前缀>/"
+#: git-rebase.sh:497 git-rebase.sh:501
+#, sh-format
+msgid "$onto_name: there is no merge base"
+msgstr "$onto_name: 没有合并基准"
-#: builtin/write-tree.c:27
-msgid "write tree object for a subdirectory <prefix>"
-msgstr "将 <前缀> 子目录内容写到一个树对象"
+#: git-rebase.sh:506
+#, sh-format
+msgid "Does not point to a valid commit: $onto_name"
+msgstr "没有指向一个有效的提交：$onto_name"
-#: builtin/write-tree.c:30
-msgid "only useful for debugging"
-msgstr "只对调试有用"
+#: git-rebase.sh:529
+#, sh-format
+msgid "fatal: no such branch: $branch_name"
+msgstr "严重错误：无此分支：$branch_name"
-#: credential-cache--daemon.c:267
-msgid "print debugging messages to stderr"
-msgstr "调试信息输出到标准错误"
+#: git-rebase.sh:562
+msgid "Cannot autostash"
+msgstr "无法 autostash"
-#: git.c:14
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept."
-msgstr ""
-"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
-"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
-"帮助。"
+#: git-rebase.sh:567
+#, sh-format
+msgid "Created autostash: $stash_abbrev"
+msgstr "创建了 autostash: $stash_abbrev"
-#: common-cmds.h:10
-msgid "start a working area (see also: git help tutorial)"
-msgstr "开始一个工作区（参见：git help tutorial）"
+#: git-rebase.sh:571
+msgid "Please commit or stash them."
+msgstr "请提交或为它们保存进度。"
-#: common-cmds.h:11
-msgid "work on the current change (see also: git help everyday)"
-msgstr "在当前变更上工作（参见：git help everyday）"
+#: git-rebase.sh:591
+#, sh-format
+msgid "Current branch $branch_name is up to date."
+msgstr "当前分支 $branch_name 是最新的。"
-#: common-cmds.h:12
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "检查历史和状态（参见：git help revisions）"
+#: git-rebase.sh:595
+#, sh-format
+msgid "Current branch $branch_name is up to date, rebase forced."
+msgstr "当前分支 $branch_name 是最新的，强制变基。"
-#: common-cmds.h:13
-msgid "grow, mark and tweak your common history"
-msgstr "扩展、标记和调校您的历史记录"
+#: git-rebase.sh:606
+#, sh-format
+msgid "Changes from $mb to $onto:"
+msgstr "变更从 $mb 到 $onto："
-#: common-cmds.h:14
-msgid "collaborate (see also: git help workflows)"
-msgstr "协同（参见：git help workflows）"
+#: git-rebase.sh:615
+msgid "First, rewinding head to replay your work on top of it..."
+msgstr "首先，回退分支以便在上面重放您的工作..."
-#: common-cmds.h:18
-msgid "Add file contents to the index"
-msgstr "添加文件内容至索引"
+#: git-rebase.sh:625
+#, sh-format
+msgid "Fast-forwarded $branch_name to $onto_name."
+msgstr "快进 $branch_name 至 $onto_name。"
-#: common-cmds.h:19
-msgid "Find by binary search the change that introduced a bug"
-msgstr "通过二分查找定位引入 bug 的变更"
+#: git-stash.sh:53
+msgid "git stash clear with parameters is unimplemented"
+msgstr "git stash clear 不支持参数"
-#: common-cmds.h:20
-msgid "List, create, or delete branches"
-msgstr "列出、创建或删除分支"
+#: git-stash.sh:94
+msgid "You do not have the initial commit yet"
+msgstr "您尚未建立初始提交"
-#: common-cmds.h:21
-msgid "Switch branches or restore working tree files"
-msgstr "切换分支或恢复工作区文件"
+#: git-stash.sh:109
+msgid "Cannot save the current index state"
+msgstr "无法保存当前索引状态"
-#: common-cmds.h:22
-msgid "Clone a repository into a new directory"
-msgstr "克隆一个版本库到一个新目录"
+#: git-stash.sh:124
+msgid "Cannot save the untracked files"
+msgstr "无法保存未跟踪文件"
-#: common-cmds.h:23
-msgid "Record changes to the repository"
-msgstr "记录变更到版本库"
+#: git-stash.sh:144 git-stash.sh:157
+msgid "Cannot save the current worktree state"
+msgstr "无法保存当前工作区状态"
-#: common-cmds.h:24
-msgid "Show changes between commits, commit and working tree, etc"
-msgstr "æ\98¾ç¤ºæ\8f\90交ä¹\8bé\97´ã\80\81æ\8f\90交å\92\8cå·¥ä½\9cå\8cºä¹\8bé\97´ç\89ç\9a\84å·®å¼\82"
+#: git-stash.sh:161
+msgid "No changes selected"
+msgstr "没æ\9c\89é\80\89æ\8b©å\8f\98æ\9b´"
-#: common-cmds.h:25
-msgid "Download objects and refs from another repository"
-msgstr "从另外一个版本库下载对象和引用"
+#: git-stash.sh:164
+msgid "Cannot remove temporary index (can't happen)"
+msgstr "无法删除临时索引（不应发生）"
-#: common-cmds.h:26
-msgid "Print lines matching a pattern"
-msgstr "输出和模式匹配的行"
+#: git-stash.sh:177
+msgid "Cannot record working tree state"
+msgstr "不能记录工作区状态"
-#: common-cmds.h:27
-msgid "Create an empty Git repository or reinitialize an existing one"
-msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
+#: git-stash.sh:209
+#, sh-format
+msgid "Cannot update $ref_stash with $w_commit"
+msgstr "无法用 $w_commit 更新 $ref_stash"
-#: common-cmds.h:28
-msgid "Show commit logs"
-msgstr "显示提交日志"
+#. TRANSLATORS: $option is an invalid option, like
+#. `--blah-blah'. The 7 spaces at the beginning of the
+#. second line correspond to "error: ". So you should line
+#. up the second line with however many characters the
+#. translation of "error: " takes in your language. E.g. in
+#. English this is:
+#.
+#. $ git stash save --blah-blah 2>&1 | head -n 2
+#. error: unknown option for 'stash save': --blah-blah
+#. To provide a message, use git stash save -- '--blah-blah'
+#: git-stash.sh:265
+#, sh-format
+msgid ""
+"error: unknown option for 'stash save': $option\n"
+" To provide a message, use git stash save -- '$option'"
+msgstr ""
+"错误：'stash save' 的未知选项：$option\n"
+" 要提供一个描述信息，使用 git stash save -- '$option'"
-#: common-cmds.h:29
-msgid "Join two or more development histories together"
-msgstr "合并两个或更多开发历史"
+#: git-stash.sh:278
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
-#: common-cmds.h:30
-msgid "Move or rename a file, a directory, or a symlink"
-msgstr "移动或重命名一个文件、目录或符号链接"
+#: git-stash.sh:286
+msgid "No local changes to save"
+msgstr "没有要保存的本地修改"
-#: common-cmds.h:31
-msgid "Fetch from and integrate with another repository or a local branch"
-msgstr "获取并整合另外的版本库或一个本地分支"
+#: git-stash.sh:291
+msgid "Cannot initialize stash"
+msgstr "无法初始化 stash"
-#: common-cmds.h:32
-msgid "Update remote refs along with associated objects"
-msgstr "æ\9b´æ\96°è¿\9cç¨\8bå¼\95ç\94¨å\92\8cç\9b¸å\85³ç\9a\84对象"
+#: git-stash.sh:295
+msgid "Cannot save the current status"
+msgstr "æ\97 æ³\95ä¿\9då\98å½\93å\89\8dç\8a¶æ\80\81"
-#: common-cmds.h:33
-msgid "Forward-port local commits to the updated upstream head"
-msgstr "本地提交转移至更新后的上游分支中"
+#: git-stash.sh:296
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr "保存工作目录和索引状态 $stash_msg"
-#: common-cmds.h:34
-msgid "Reset current HEAD to the specified state"
-msgstr "重置当前HEAD到指定状态"
+#: git-stash.sh:323
+msgid "Cannot remove worktree changes"
+msgstr "无法删除工作区变更"
-#: common-cmds.h:35
-msgid "Remove files from the working tree and from the index"
-msgstr "从工作区和索引中删除文件"
+#: git-stash.sh:471
+#, sh-format
+msgid "unknown option: $opt"
+msgstr "未知选项: $opt"
-#: common-cmds.h:36
-msgid "Show various types of objects"
-msgstr "æ\98¾ç¤ºå\90\84ç§\8dç±»å\9e\8bç\9a\84对象"
+#: git-stash.sh:484
+msgid "No stash found."
+msgstr "æ\9cªå\8f\91ç\8e° stashã\80\82"
-#: common-cmds.h:37
-msgid "Show the working tree status"
-msgstr "显示工作区状态"
+#: git-stash.sh:491
+#, sh-format
+msgid "Too many revisions specified: $REV"
+msgstr "指定了太多的版本：$REV"
-#: common-cmds.h:38
-msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
+#: git-stash.sh:506
+#, sh-format
+msgid "$reference is not a valid reference"
+msgstr "$reference 不是一个有效的引用"
-#: parse-options.h:142
-msgid "expiry-date"
-msgstr "到期时间"
+#: git-stash.sh:534
+#, sh-format
+msgid "'$args' is not a stash-like commit"
+msgstr "'$args' 不是 stash 样提交"
-#: parse-options.h:157
-msgid "no-op (backward compatibility)"
-msgstr "空操作（向后兼容）"
+#: git-stash.sh:545
+#, sh-format
+msgid "'$args' is not a stash reference"
+msgstr "'$args' 不是一个 stash 引用"
-#: parse-options.h:231
-msgid "be more verbose"
-msgstr "æ\9b´å\8a 详ç»\86"
+#: git-stash.sh:553
+msgid "unable to refresh index"
+msgstr "æ\97 æ³\95å\88·æ\96°ç´¢å¼\95"
-#: parse-options.h:233
-msgid "be more quiet"
-msgstr "æ\9b´å\8a å®\89é\9d\99"
+#: git-stash.sh:557
+msgid "Cannot apply a stash in the middle of a merge"
+msgstr "æ\97 æ³\95å\9c¨å\90\88并è¿\87ç¨\8bä¸æ\81¢å¤\8dè¿\9b度"
-#: parse-options.h:239
-msgid "use <n> digits to display SHA-1s"
-msgstr "ç\94¨ <n> ä½\8dæ\95°å\97æ\98¾ç¤º SHA-1 å\93\88å¸\8cå\80¼"
+#: git-stash.sh:565
+msgid "Conflicts in index. Try without --index."
+msgstr "ç´¢å¼\95ä¸æ\9c\89å\86²çª\81ã\80\82å°\9dè¯\95ä¸\8d使ç\94¨ --indexã\80\82"
-#: rerere.h:27
-msgid "update the index with reused conflict resolution if possible"
-msgstr "如果可能，重用冲突解决更新索引"
+#: git-stash.sh:567
+msgid "Could not save index tree"
+msgstr "不能保存索引树"
-#: git-am.sh:53
-msgid "You need to set your committer info first"
-msgstr "æ\82¨é\9c\80è¦\81å\85\88è®¾ç½®ä½ ç\9a\84æ\8f\90交è\80\85ä¿¡æ\81¯"
+#: git-stash.sh:576
+msgid "Could not restore untracked files from stash"
+msgstr "æ\97 æ³\95ä»\8eè¿\9b度ä¿\9då\98ä¸æ\81¢å¤\8dæ\9cªè·\9f踪æ\96\87件"
-#: git-am.sh:100
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
-msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
+#: git-stash.sh:601
+msgid "Cannot unstage modified files"
+msgstr "无法将修改的文件取消暂存"
-#: git-am.sh:110
-#, sh-format
-msgid ""
-"When you have resolved this problem, run \"$cmdline --continue\".\n"
-"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
-"To restore the original branch and stop patching, run \"$cmdline --abort\"."
-msgstr ""
-"当您解决了此问题后，执行 \"$cmdline --continue\"。\n"
-"如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n"
-"要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"
+#: git-stash.sh:616
+msgid "Index was not unstashed."
+msgstr "索引的进度没有被恢复。"
-#: git-am.sh:126
-msgid "Cannot fall back to three-way merge."
-msgstr "æ\97 æ³\95æ±\82å\8a©äº\8eä¸\89è·¯å\90\88并。"
+#: git-stash.sh:630
+msgid "The stash is kept in case you need it again."
+msgstr "æ\9a\82å\98被ä¿\9dç\95\99以å¤\87æ\82¨å\86\8d次é\9c\80è¦\81。"
-#: git-am.sh:142
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr "版本库缺乏必要的数据（blob）对象以进行三路合并。"
+#: git-stash.sh:639
+#, sh-format
+msgid "Dropped ${REV} ($s)"
+msgstr "丢弃了 ${REV} ($s)"
-#: git-am.sh:144
-msgid "Using index info to reconstruct a base tree..."
-msgstr "使用索引来重建一个（三路合并的）基础目录树..."
+#: git-stash.sh:640
+#, sh-format
+msgid "${REV}: Could not drop stash entry"
+msgstr "${REV}：不能丢弃进度条目"
-#: git-am.sh:159
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-msgstr ""
-"您是否曾手动编辑过您的补丁？\n"
-"无法应用补丁到索引中的数据（blob）对象上。"
+#: git-stash.sh:648
+msgid "No branch name specified"
+msgstr "未指定分支名"
-#: git-am.sh:168
-msgid "Falling back to patching base and 3-way merge..."
-msgstr "转而在基础版本上打补丁及进行三路合并..."
+#: git-stash.sh:727
+msgid "(To restore them type \"git stash apply\")"
+msgstr "（为恢复数据输入 \"git stash apply\"）"
-#: git-am.sh:185
-msgid "Failed to merge in the changes."
-msgstr "无法合并变更。"
+#: git-submodule.sh:181
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "只能在工作区的顶级目录中使用相对路径"
-#: git-am.sh:280
-msgid "Only one StGIT patch series can be applied at once"
-msgstr "一次只能有一个 StGIT 补丁队列被应用"
+#: git-submodule.sh:191
+#, sh-format
+msgid "repo URL: '$repo' must be absolute or begin with ./|../"
+msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
-#: git-am.sh:367
+#: git-submodule.sh:210
#, sh-format
-msgid "Patch format $patch_format is not supported."
-msgstr "不支持 $patch_format 补丁格式。"
+msgid "'$sm_path' already exists in the index"
+msgstr "'$sm_path' 已经存在于索引中"
-#: git-am.sh:369
-msgid "Patch format detection failed."
-msgstr "补丁格式检测失败。"
+#: git-submodule.sh:213
+#, sh-format
+msgid "'$sm_path' already exists in the index and is not a submodule"
+msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
-#: git-am.sh:407
+#: git-submodule.sh:218
+#, sh-format
msgid ""
-"The -b/--binary option has been a no-op for long time, and\n"
-"it will be removed. Please do not use it anymore."
+"The following path is ignored by one of your .gitignore files:\n"
+"$sm_path\n"
+"Use -f if you really want to add it."
msgstr ""
-"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被删除。\n"
-"请不要再使用它了。"
+"以下路径被您的一个 .gitignore 文件所忽略：\n"
+"$sm_path\n"
+"如果您确实想添加它，使用 -f 参数。"
+
+#: git-submodule.sh:236
+#, sh-format
+msgid "Adding existing repo at '$sm_path' to the index"
+msgstr "添加位于 '$sm_path' 的现存仓库到索引"
-#: git-am.sh:507
+#: git-submodule.sh:238
#, sh-format
-msgid "previous rebase directory $dotest still exists but mbox given."
-msgstr "之前的变基目录 $dotest 仍然存在，但却提供了 mbox。"
+msgid "'$sm_path' already exists and is not a valid git repo"
+msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
-#: git-am.sh:512
-msgid "Please make up your mind. --skip or --abort?"
-msgstr "请下决心。--skip 或是 --abort ？"
+#: git-submodule.sh:246
+#, sh-format
+msgid "A git directory for '$sm_name' is found locally with remote(s):"
+msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库："
-#: git-am.sh:560
+#: git-submodule.sh:248
#, sh-format
msgid ""
-"Stray $dotest directory found.\n"
-"Use \"git am --abort\" to remove it."
+"If you want to reuse this local git directory instead of cloning again from\n"
+" $realrepo\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
-"发现了错误的 $dotest 目录。\n"
-"使用 \"git am --abort\" 删除它。"
+"如果您想要重用这个本地 git 目录而非重新克隆自\n"
+" $realrepo\n"
+"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
+"或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。"
-#: git-am.sh:568
-msgid "Resolve operation not in progress, we are not resuming."
-msgstr "解决操作未进行，我们不会继续。"
+#: git-submodule.sh:254
+#, sh-format
+msgid "Reactivating local git directory for submodule '$sm_name'."
+msgstr "激活本地 git 目录到子模组 '$sm_name'。"
-#: git-am.sh:635
+#: git-submodule.sh:266
#, sh-format
-msgid "Dirty index: cannot apply patches (dirty: $files)"
-msgstr "脏的索引：不能应用补丁（脏文件：$files）"
+msgid "Unable to checkout submodule '$sm_path'"
+msgstr "不能检出子模组 '$sm_path'"
-#: git-am.sh:747
+#: git-submodule.sh:271
#, sh-format
-msgid ""
-"Patch is empty. Was it split wrong?\n"
-"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-"To restore the original branch and stop patching run \"$cmdline --abort\"."
-msgstr ""
-"补丁为空。是不是切分错误？\n"
-"如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n"
-"要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"
+msgid "Failed to add submodule '$sm_path'"
+msgstr "无法添加子模组 '$sm_path'"
-#: git-am.sh:774
-msgid "Patch does not have a valid e-mail address."
-msgstr "补丁中没有一个有效的邮件地址。"
+#: git-submodule.sh:280
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
+msgstr "无法注册子模组 '$sm_path'"
-#: git-am.sh:821
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "标准输入没有和终端关联，不能进行交互式操作。"
+#: git-submodule.sh:341
+#, sh-format
+msgid "Entering '$displaypath'"
+msgstr "正在进入 '$displaypath'"
-#: git-am.sh:825
-msgid "Commit Body is:"
-msgstr "提交内容为："
+#: git-submodule.sh:361
+#, sh-format
+msgid "Stopping at '$displaypath'; script returned non-zero status."
+msgstr "停止于 '$displaypath'；脚本返回非零值。"
-# 译者：注意保持句尾空格
-#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
-#. in your translation. The program will only accept English
-#. input at this point.
-#: git-am.sh:832
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
-msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
+#: git-submodule.sh:432
+#, sh-format
+msgid "pathspec and --all are incompatible"
+msgstr "pathspec 和 --all 不兼容"
-#: git-am.sh:868
+#: git-submodule.sh:437
#, sh-format
-msgid "Applying: $FIRSTLINE"
-msgstr "正应用：$FIRSTLINE"
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
-#: git-am.sh:889
+#: git-submodule.sh:457
+#, sh-format
msgid ""
-"No changes - did you forget to use 'git add'?\n"
-"If there is nothing left to stage, chances are that something else\n"
-"already introduced the same changes; you might want to skip this patch."
+"Submodule work tree '$displaypath' contains a .git directory\n"
+"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-"没有变更 —— 您是不是忘了执行 'git add'？\n"
-"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
-"您也许想要跳过这个补丁。"
+"子模组工作区 '$displaypath' 包含一个 .git 目录\n"
+"（如果您真的想删除它及其全部历史，使用 'rm -rf' 命令）"
-#: git-am.sh:897
+#: git-submodule.sh:465
+#, sh-format
msgid ""
-"You still have unmerged paths in your index\n"
-"did you forget to use 'git add'?"
-msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？"
-
-#: git-am.sh:913
-msgid "No changes -- Patch already applied."
-msgstr "没有变更 —— 补丁已经应用过。"
+"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
+"discard them"
+msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们"
-#: git-am.sh:923
+#: git-submodule.sh:468
#, sh-format
-msgid "Patch failed at $msgnum $FIRSTLINE"
-msgstr "补丁失败于 $msgnum $FIRSTLINE"
+msgid "Cleared directory '$displaypath'"
+msgstr "已清除目录 '$displaypath'"
-#: git-am.sh:926
+#: git-submodule.sh:469
#, sh-format
-msgid ""
-"The copy of the patch that failed is found in:\n"
-" $dotest/patch"
-msgstr ""
-"失败的补丁文件副本位于：\n"
-" $dotest/patch"
-
-#: git-am.sh:945
-msgid "applying to an empty history"
-msgstr "正应用到一个空历史上"
-
-#: git-bisect.sh:48
-msgid "You need to start by \"git bisect start\""
-msgstr "您需要执行 \"git bisect start\" 来开始"
+msgid "Could not remove submodule work tree '$displaypath'"
+msgstr "无法移除子模组工作区 '$displaypath'"
-# 译者：注意保持句尾空格
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:54
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "您想让我为您这样做么[Y/n]？ "
+#: git-submodule.sh:472
+#, sh-format
+msgid "Could not create empty submodule directory '$displaypath'"
+msgstr "不能创建空的子模组目录 '$displaypath'"
-#: git-bisect.sh:95
+#: git-submodule.sh:481
#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "未能识别的选项：'$arg'"
+msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
-#: git-bisect.sh:99
+#: git-submodule.sh:637
#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr "'$arg' 看起来不像是一个有效的版本"
+msgid "Unable to find current revision in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
-#: git-bisect.sh:117
-msgid "Bad HEAD - I need a HEAD"
-msgstr "坏的 HEAD - 我需要一个 HEAD"
+#: git-submodule.sh:647
+#, sh-format
+msgid "Unable to fetch in submodule path '$sm_path'"
+msgstr "无法在子模组路径 '$sm_path' 中获取"
-#: git-bisect.sh:130
+#: git-submodule.sh:652
#, sh-format
msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
-
-#: git-bisect.sh:140
-msgid "won't bisect on cg-seek'ed tree"
-msgstr "不会在做了 cg-seek 的树上做二分查找"
-
-#: git-bisect.sh:144
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "坏的 HEAD - 奇怪的符号引用"
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
-#: git-bisect.sh:189
+#: git-submodule.sh:670
#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "坏的 bisect_write 参数：$state"
+msgid "Unable to fetch in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中获取"
-#: git-bisect.sh:218
+#: git-submodule.sh:676
#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "输入坏的版本：$arg"
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+"获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。"
-#: git-bisect.sh:232
-msgid "Please call 'bisect_state' with at least one argument."
-msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
+#: git-submodule.sh:683
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-#: git-bisect.sh:244
+#: git-submodule.sh:684
#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "输入坏的版本：$rev"
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
-#: git-bisect.sh:253
-msgid "'git bisect bad' can take only one argument."
-msgstr "'git bisect bad' 只能带一个参数。"
+#: git-submodule.sh:688
+#, sh-format
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-#: git-bisect.sh:276
-msgid "Warning: bisecting only with a bad commit."
-msgstr "警告：在仅有一个坏提交下进行二分查找。"
+#: git-submodule.sh:689
+#, sh-format
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
-# 译者：注意保持句尾空格
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:282
-msgid "Are you sure [Y/n]? "
-msgstr "您确认么[Y/n]？ "
+#: git-submodule.sh:694
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-#: git-bisect.sh:292
-msgid ""
-"You need to give me at least one good and one bad revision.\n"
-"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
-msgstr ""
-"您需要给我至少一个好版本和一个坏版本。\n"
-"（为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。）"
+#: git-submodule.sh:695
+#, sh-format
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
-#: git-bisect.sh:295
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one good and one bad revision.\n"
-"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
-msgstr ""
-"您需要执行 \"git bisect start\" 来开始。\n"
-"然后需要提供我至少一个好版本和一个坏版本。\n"
-"（为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。）"
+#: git-submodule.sh:700
+#, sh-format
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
-#: git-bisect.sh:366 git-bisect.sh:493
-msgid "We are not bisecting."
-msgstr "我们没有在二分查找。"
+#: git-submodule.sh:701
+#, sh-format
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "子模组 '$displaypath'：'$command $sha1'"
-#: git-bisect.sh:373
+#: git-submodule.sh:732
#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr "'$invalid' 不是一个有效的提交"
+msgid "Failed to recurse into submodule path '$displaypath'"
+msgstr "无法递归进子模组路径 '$displaypath'"
-#: git-bisect.sh:382
+#: git-submodule.sh:840
+msgid "The --cached option cannot be used with the --files option"
+msgstr "选项 --cached 不能和选项 --files 同时使用"
+
+#: git-submodule.sh:892
#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr ""
-"不能检出原始 HEAD '$branch'。\n"
-"尝试 'git bisect reset <提交>'。"
+msgid "unexpected mode $mod_dst"
+msgstr "意外的模式 $mod_dst"
-#: git-bisect.sh:409
-msgid "No logfile given"
-msgstr "未提供日志文件"
+# 译者：注意保持前导空格
+#: git-submodule.sh:912
+#, sh-format
+msgid " Warn: $display_name doesn't contain commit $sha1_src"
+msgstr " 警告：$display_name 未包含提交 $sha1_src"
-#: git-bisect.sh:410
+# 译者：注意保持前导空格
+#: git-submodule.sh:915
#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "不能读取 $file 来重放"
+msgid " Warn: $display_name doesn't contain commit $sha1_dst"
+msgstr " 警告：$display_name 未包含提交 $sha1_dst"
-#: git-bisect.sh:427
-msgid "?? what are you talking about?"
-msgstr "?? 您在说什么?"
+# 译者：注意保持前导空格
+#: git-submodule.sh:918
+#, sh-format
+msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"
-#: git-bisect.sh:439
+#: git-submodule.sh:1064
#, sh-format
-msgid "running $command"
-msgstr "运行 $command"
+msgid "Failed to recurse into submodule path '$sm_path'"
+msgstr "无法递归进子模组路径 '$sm_path'"
-#: git-bisect.sh:446
+#: git-submodule.sh:1136
#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"二分查找运行失败：\n"
-"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
+msgid "Synchronizing submodule url for '$displaypath'"
+msgstr "为 '$displaypath' 同步子模组 url"
-#: git-bisect.sh:472
-msgid "bisect run cannot continue any more"
-msgstr "二分查找不能继续运行"
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "详见 git-${cmd}(1)。"
-#: git-bisect.sh:478
+#: git-rebase--interactive.sh:140
#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "变基中（$new_count/$total）"
+
+#: git-rebase--interactive.sh:156
msgid ""
-"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"\n"
+"Commands:\n"
+" p, pick = use commit\n"
+" r, reword = use commit, but edit the commit message\n"
+" e, edit = use commit, but stop for amending\n"
+" s, squash = use commit, but meld into previous commit\n"
+" f, fixup = like \"squash\", but discard this commit's log message\n"
+" x, exec = run command (the rest of the line) using shell\n"
+" d, drop = remove commit\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-"二分查找运行失败：\n"
-"'bisect_state $state' 退出码为 $res"
-
-#: git-bisect.sh:485
-msgid "bisect run success"
-msgstr "二分查找运行成功"
+"\n"
+"命令:\n"
+" p, pick = 使用提交\n"
+" r, reword = 使用提交，但修改提交说明\n"
+" e, edit = 使用提交，但停止以便进行提交修补\n"
+" s, squash = 使用提交，但和前一个版本融合\n"
+" f, fixup = 类似于 \"squash\"，但丢弃提交说明日志\n"
+" x, exec = 使用 shell 运行命令（此行剩余部分）\n"
+" d, drop = 删除提交\n"
+"\n"
+"这些行可以被重新排序；它们会被从上至下地执行。\n"
+"\n"
-#: git-pull.sh:61
+#: git-rebase--interactive.sh:171
msgid ""
-"Pull is not possible because you have unmerged files.\n"
-"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
-"as appropriate to mark resolution and make a commit."
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
-"Pull 不可用，因为您尚有未合并的文件。请先在工作区改正文件，\n"
-"然后酌情使用 'git add/rm <文件>' 标记解决方案，再做提交。"
-
-#: git-pull.sh:65
-msgid "Pull is not possible because you have unmerged files."
-msgstr "Pull 不可用，因为您尚有未合并的文件。"
+"\n"
+"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
-#: git-pull.sh:71
+#: git-rebase--interactive.sh:175
msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you can merge."
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
-"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
-"请在合并前先提交您的修改。"
-
-#: git-pull.sh:285
-msgid "updating an unborn branch with changes added to the index"
-msgstr "更新尚未诞生的分支，变更添加至索引"
+"\n"
+"如果您在这里删除一行，对应的提交将会丢失。\n"
-#: git-pull.sh:311
+#: git-rebase--interactive.sh:211
#, sh-format
msgid ""
-"Warning: fetch updated the current branch head.\n"
-"Warning: fast-forwarding your working tree from\n"
-"Warning: commit $orig_head."
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
msgstr ""
-"警告：fetch 更新了当前的分支。您的工作区\n"
-"警告：从原提交 $orig_head 快进。"
+"您现在可以修补这个提交，使用\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"当您对变更感到满意，执行\n"
+"\n"
+"\tgit rebase --continue"
-#: git-pull.sh:336
-msgid "Cannot merge multiple branches into empty head"
-msgstr "无法将多个分支合并到空分支"
+#: git-rebase--interactive.sh:236
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr "$sha1：不是一个可以被拣选的提交"
-#: git-pull.sh:340
-msgid "Cannot rebase onto multiple branches"
-msgstr "无法变基到多个分支"
+#: git-rebase--interactive.sh:275
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "无效的提交名：$sha1"
-#: git-rebase.sh:57
-msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
-msgstr ""
-"当您解决了此问题后，执行 \"git rebase --continue\"。\n"
-"如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n"
-"要恢复原分支并停止变基，执行 \"git rebase --abort\"。"
+#: git-rebase--interactive.sh:317
+msgid "Cannot write current commit's replacement sha1"
+msgstr "不能写入当前提交的替代 sha1"
-#: git-rebase.sh:165
-msgid "Applied autostash."
-msgstr "成功应用 autostash。"
+#: git-rebase--interactive.sh:369
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "快进到 $sha1"
-#: git-rebase.sh:168
+#: git-rebase--interactive.sh:371
#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "无法保存 $stash_sha1"
+msgid "Cannot fast-forward to $sha1"
+msgstr "不能快进到 $sha1"
-#: git-rebase.sh:169
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"应用 autostash 导致冲突。\n"
-"您的修改安全地保存在 stash 中。\n"
-"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
+#: git-rebase--interactive.sh:380
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "不能移动 HEAD 到 $first_parent"
-#: git-rebase.sh:208
-msgid "The pre-rebase hook refused to rebase."
-msgstr "钩子 pre-rebase 拒绝变基操作。"
+#: git-rebase--interactive.sh:385
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "拒绝压缩一个合并：$sha1"
-#: git-rebase.sh:213
-msgid "It looks like git-am is in progress. Cannot rebase."
-msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
+#: git-rebase--interactive.sh:399
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "无法重做合并 $sha1"
-#: git-rebase.sh:351
-msgid "The --exec option must be used with the --interactive option"
-msgstr "选项 --exec 必须和选项 --interactive 同时使用"
+#: git-rebase--interactive.sh:407
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "不能拣选 $sha1"
-#: git-rebase.sh:356
-msgid "No rebase in progress?"
-msgstr "没有正在进行的变基？"
+#: git-rebase--interactive.sh:416
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "这是提交说明 #${n}："
-#: git-rebase.sh:367
-msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
+#: git-rebase--interactive.sh:421
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr "提交说明 #${n} 将被跳过："
-#: git-rebase.sh:374
-msgid "Cannot read HEAD"
-msgstr "不能读取 HEAD"
+#: git-rebase--interactive.sh:432
+#, sh-format
+msgid "This is a combination of $count commit."
+msgid_plural "This is a combination of $count commits."
+msgstr[0] "这是一个 $count 个提交的组合。"
+msgstr[1] "这是一个 $count 个提交的组合。"
-#: git-rebase.sh:377
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
-msgstr ""
-"您必须编辑所有的合并冲突，然后通过 git add\n"
-"命令将它们标记为已解决"
+#: git-rebase--interactive.sh:441
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "不能写入 $fixup_msg"
-#: git-rebase.sh:395
+#: git-rebase--interactive.sh:444
+msgid "This is a combination of 2 commits."
+msgstr "这是一个 2 个提交的组合。"
+
+#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
+#: git-rebase--interactive.sh:531
#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "无法移回 $head_name"
+msgid "Could not apply $sha1... $rest"
+msgstr "不能应用 $sha1... $rest"
-#: git-rebase.sh:414
+#: git-rebase--interactive.sh:559
#, sh-format
msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
msgstr ""
-"好像已有 $state_dir_base 目录，我怀疑您正处于另外一个变基操作\n"
-"过程中。 如果是这样，请执行\n"
-"\t$cmd_live_rebase\n"
-"如果不是这样，请执行\n"
-"\t$cmd_clear_stale_rebase\n"
-"然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。"
+"不能在成功拣选 $sha1... $rest 之后修补提交\n"
+"这通常是因为空的提交说明，或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
+"钩子执行失败，你可能需要在重写提交说明前解决这个问题。"
-#: git-rebase.sh:465
+#: git-rebase--interactive.sh:574
#, sh-format
-msgid "invalid upstream $upstream_name"
-msgstr "无效的上游 $upstream_name"
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "停止在 $sha1_abbrev... $rest"
-#: git-rebase.sh:489
+#: git-rebase--interactive.sh:589
#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr "$onto_name: 有一个以上的合并基准"
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "没有父提交的情况下不能 '$squash_style'"
-#: git-rebase.sh:492 git-rebase.sh:496
+#: git-rebase--interactive.sh:631
#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr "$onto_name: 没有合并基准"
+msgid "Executing: $rest"
+msgstr "执行：$rest"
-#: git-rebase.sh:501
+#: git-rebase--interactive.sh:639
#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr "没æ\9c\89æ\8c\87å\90\91ä¸\80个æ\9c\89æ\95\88ç\9a\84æ\8f\90交ï¼\9a$onto_name"
+msgid "Execution failed: $rest"
+msgstr "æ\89§è¡\8c失败ï¼\9a$rest"
-#: git-rebase.sh:524
-#, sh-format
-msgid "fatal: no such branch: $branch_name"
-msgstr "严重错误：无此分支：$branch_name"
+#: git-rebase--interactive.sh:641
+msgid "and made changes to the index and/or the working tree"
+msgstr "并且修改索引和/或工作区"
-#: git-rebase.sh:557
-msgid "Cannot autostash"
-msgstr "无法 autostash"
+# 译者：注意保持前导空格
+#: git-rebase--interactive.sh:643
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"您可以解决这个问题，然后运行\n"
+"\n"
+"\tgit rebase --continue"
-#: git-rebase.sh:562
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--interactive.sh:656
#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr "创建了 autostash: $stash_abbrev"
-
-#: git-rebase.sh:566
-msgid "Please commit or stash them."
-msgstr "请提交或为它们保存进度。"
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"执行成功：$rest\n"
+"但是在索引和/或工作区中存在变更。提交或暂存修改，然后运行\n"
+"\n"
+"\tgit rebase --continue"
-#: git-rebase.sh:586
+#: git-rebase--interactive.sh:667
#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr "当前分支 $branch_name 是最新的。"
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "未知命令：$command $sha1 $rest"
-#: git-rebase.sh:590
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr "当前分支 $branch_name 是最新的，强制变基。"
+#: git-rebase--interactive.sh:668
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "要修改请使用命令 'git rebase --edit-todo'。"
-#: git-rebase.sh:601
+#: git-rebase--interactive.sh:703
#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr "变更从 $mb 到 $onto："
+msgid "Successfully rebased and updated $head_name."
+msgstr "成功变基并更新 $head_name。"
-#: git-rebase.sh:610
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr "首先，重置头指针以便在上面重放您的工作..."
+#: git-rebase--interactive.sh:750
+msgid "Could not skip unnecessary pick commands"
+msgstr "不能跳过不必要的拣选命令"
-#: git-rebase.sh:620
+#: git-rebase--interactive.sh:908
#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "快进 $branch_name 至 $onto_name。"
+msgid ""
+"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+" - $line"
+msgstr ""
+"警告：缺失 SHA-1 或者在下面一行中不是一个提交：\n"
+" - $line"
-#: git-stash.sh:51
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash clear 不支持参数"
+#: git-rebase--interactive.sh:941
+#, sh-format
+msgid ""
+"Warning: the command isn't recognized in the following line:\n"
+" - $line"
+msgstr ""
+"警告：下面一行中的命令未能被识别：\n"
+" - $line"
-#: git-stash.sh:74
-msgid "You do not have the initial commit yet"
-msgstr "您尚未建立初始提交"
+#: git-rebase--interactive.sh:980
+msgid "could not detach HEAD"
+msgstr "不能检出为分离头指针"
-#: git-stash.sh:89
-msgid "Cannot save the current index state"
-msgstr "无法保存当前索引状态"
+#: git-rebase--interactive.sh:1018
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):"
+msgstr "警告：一些提交可能被意外丢弃。丢弃的提交（从新到旧）："
-#: git-stash.sh:124 git-stash.sh:137
-msgid "Cannot save the current worktree state"
-msgstr "无法保存当前工作区状态"
+#: git-rebase--interactive.sh:1026
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error."
+msgstr ""
+"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"
+"\n"
+"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
+"可选值有：ignore、warn、error。"
-#: git-stash.sh:141
-msgid "No changes selected"
-msgstr "没有选择变更"
+#: git-rebase--interactive.sh:1037
+#, sh-format
+msgid ""
+"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
+"Ignoring."
+msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
-#: git-stash.sh:144
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "无法删除临时索引（不应发生）"
+#: git-rebase--interactive.sh:1054
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'."
+msgstr ""
+"您可以用 'git rebase --edit-todo' 修正问题然后执行 'git rebase --continue'。"
-#: git-stash.sh:157
-msgid "Cannot record working tree state"
-msgstr "不能记录工作区状态"
+#: git-rebase--interactive.sh:1055
+msgid "Or you can abort the rebase with 'git rebase --abort'."
+msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。"
-#: git-stash.sh:191
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "无法用 $w_commit 更新 $ref_stash"
+#: git-rebase--interactive.sh:1083
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "不能删除 CHERRY_PICK_HEAD"
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:241
+#: git-rebase--interactive.sh:1088
#, sh-format
msgid ""
-"error: unknown option for 'stash save': $option\n"
-" To provide a message, use git stash save -- '$option'"
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
msgstr ""
-"错误：'stash save' 的未知选项：$option\n"
-" 要提供一个描述信息，使用 git stash save -- '$option'"
+"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交，执行：\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"如果这些变更要形成一个新提交，执行：\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"无论哪种情况，当您完成提交，继续执行：\n"
+"\n"
+" git rebase --continue\n"
-#: git-stash.sh:262
-msgid "No local changes to save"
-msgstr "没有要保存的本地修改"
+#: git-rebase--interactive.sh:1105
+msgid "Error trying to find the author identity to amend commit"
+msgstr "在修补提交中查找作者信息时遇到错误"
+
+#: git-rebase--interactive.sh:1110
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
+
+#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+msgid "Could not commit staged changes."
+msgstr "不能提交暂存的修改。"
+
+#: git-rebase--interactive.sh:1147
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基，\n"
+"请执行：\n"
+" git rebase --continue\n"
+"\n"
-#: git-stash.sh:266
-msgid "Cannot initialize stash"
-msgstr "无法初始化 stash"
+#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+msgid "Could not execute editor"
+msgstr "无法运行编辑器"
-#: git-stash.sh:270
-msgid "Cannot save the current status"
-msgstr "无法保存当前状态"
+#: git-rebase--interactive.sh:1168
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "不能检出 $switch_to"
-#: git-stash.sh:288
-msgid "Cannot remove worktree changes"
-msgstr "æ\97 æ³\95å\88 é\99¤å·¥ä½\9cå\8cºå\8f\98æ\9b´"
+#: git-rebase--interactive.sh:1173
+msgid "No HEAD?"
+msgstr "没æ\9c\89 HEADï¼\9f"
-#: git-stash.sh:389
+#: git-rebase--interactive.sh:1174
#, sh-format
-msgid "unknown option: $opt"
-msgstr "未知选项: $opt"
+msgid "Could not create temporary $state_dir"
+msgstr "不能创建临时 $state_dir"
-#: git-stash.sh:399
-msgid "No stash found."
-msgstr "未发现 stash。"
+#: git-rebase--interactive.sh:1176
+msgid "Could not mark as interactive"
+msgstr "不能标记为交互式"
-#: git-stash.sh:406
+#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+msgid "Could not init rewritten commits"
+msgstr "不能对重写提交进行初始化"
+
+#: git-rebase--interactive.sh:1291
#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "指定了太多的版本：$REV"
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
+msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
+
+#: git-rebase--interactive.sh:1296
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"然而，如果您删除全部内容，变基操作将会终止。\n"
+"\n"
-#: git-stash.sh:412
+#: git-rebase--interactive.sh:1303
+msgid "Note that empty commits are commented out"
+msgstr "注意空提交已被注释掉"
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference 不是一个有效的引用"
+msgid "usage: $dashless $USAGE"
+msgstr "用法：$dashless $USAGE"
-#: git-stash.sh:440
+#: git-sh-setup.sh:190
#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' 不是 stash 样提交"
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr "不能切换目录到 $cdup，工作区的顶级目录"
-#: git-stash.sh:451
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' 不是一个 stash 引用"
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "严重错误：$program_name 不能在没有工作区的情况下使用"
-#: git-stash.sh:459
-msgid "unable to refresh index"
-msgstr "无法刷新索引"
+#: git-sh-setup.sh:220
+msgid "Cannot rebase: You have unstaged changes."
+msgstr "不能变基：您有未暂存的变更。"
-#: git-stash.sh:463
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "无法在合并过程中恢复进度"
+#: git-sh-setup.sh:223
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr "不能重写分支：您有未暂存的变更。"
-#: git-stash.sh:471
-msgid "Conflicts in index. Try without --index."
-msgstr "索引中有冲突。尝试不使用 --index。"
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr "无法通过变基方式拉取：您有未暂存的变更。"
-#: git-stash.sh:473
-msgid "Could not save index tree"
-msgstr "不能保存索引树"
+#: git-sh-setup.sh:229
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "不能 $action：您有未暂存的变更。"
-#: git-stash.sh:507
-msgid "Cannot unstage modified files"
-msgstr "无法还原修改的文件"
+#: git-sh-setup.sh:242
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr "不能变基：您的索引中包含未提交的变更。"
-#: git-stash.sh:522
-msgid "Index was not unstashed."
-msgstr "索引的进度没有被恢复。"
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。"
-#: git-stash.sh:545
+#: git-sh-setup.sh:248
#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "丢å¼\83äº\86 ${REV} ($s)"
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr "ä¸\8dè\83½ $actionï¼\9aæ\82¨ç\9a\84ç´¢å¼\95ä¸å\8c\85å\90«æ\9cªæ\8f\90交ç\9a\84å\8f\98æ\9b´ã\80\82"
-#: git-stash.sh:546
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}：不能丢弃进度条目"
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "而且您的索引中包含未提交的变更。"
-#: git-stash.sh:554
-msgid "No branch name specified"
-msgstr "æ\9cªæ\8c\87å®\9aå\88\86æ\94¯å\90\8d"
+#: git-sh-setup.sh:372
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr "æ\82¨é\9c\80è¦\81å\9c¨å·¥ä½\9cå\8cºç\9a\84顶级ç\9b®å½\95ä¸è¿\90è¡\8cè¿\99个å\91½ä»¤ã\80\82"
-#: git-stash.sh:626
-msgid "(To restore them type \"git stash apply\")"
-msgstr "（为恢复数据输入 \"git stash apply\"）"
+#: git-sh-setup.sh:377
+msgid "Unable to determine absolute path of git directory"
+msgstr "不能确定 git 目录的绝对路径"
-#: git-submodule.sh:95
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "无法从 url '$remoteurl' 剥离一个组件"
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:238
+#, perl-format
+msgid "%12s %12s %s"
+msgstr "%12s %12s %s"
-#: git-submodule.sh:237
-#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
-msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
+#: git-add--interactive.perl:239
+msgid "staged"
+msgstr "缓存"
-#: git-submodule.sh:287
-#, sh-format
-msgid "Clone of '$url' into submodule path '$sm_path' failed"
-msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
+#: git-add--interactive.perl:239
+msgid "unstaged"
+msgstr "未缓存"
-#: git-submodule.sh:296
-#, sh-format
-msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
+#: git-add--interactive.perl:288 git-add--interactive.perl:313
+msgid "binary"
+msgstr "二进制"
-#: git-submodule.sh:406
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr "只能在工作区的顶级目录中使用相对路径"
+#: git-add--interactive.perl:297 git-add--interactive.perl:351
+msgid "nothing"
+msgstr "无"
-#: git-submodule.sh:416
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
+#: git-add--interactive.perl:333 git-add--interactive.perl:348
+msgid "unchanged"
+msgstr "没有修改"
-#: git-submodule.sh:433
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' 已经存在于索引中"
+#: git-add--interactive.perl:644
+#, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "增加了 %d 个路径\n"
+msgstr[1] "增加了 %d 个路径\n"
+
+#: git-add--interactive.perl:647
+#, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "更新了 %d 个路径\n"
+msgstr[1] "更新了 %d 个路径\n"
+
+#: git-add--interactive.perl:650
+#, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "还原了 %d 个路径\n"
+msgstr[1] "还原了 %d 个路径\n"
+
+#: git-add--interactive.perl:653
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] "触碰了 %d 个路径\n"
+msgstr[1] "触碰了 %d 个路径\n"
+
+#: git-add--interactive.perl:662
+msgid "Update"
+msgstr "更新"
+
+#: git-add--interactive.perl:674
+msgid "Revert"
+msgstr "还原"
+
+#: git-add--interactive.perl:697
+#, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "说明：%s 现已成为未跟踪的。\n"
+
+#: git-add--interactive.perl:708
+msgid "Add untracked"
+msgstr "添加未跟踪的"
+
+#: git-add--interactive.perl:714
+msgid "No untracked files.\n"
+msgstr "没有未跟踪的文件。\n"
+
+#: git-add--interactive.perl:1030
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。"
+
+#: git-add--interactive.perl:1033
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr "如果补丁能干净地应用，编辑块将立即标记为保存进度。"
+
+#: git-add--interactive.perl:1036
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr "如果补丁能干净地应用，编辑块将立即标记为未暂存。"
+
+#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for applying."
+msgstr "如果补丁能干净地应用，编辑块将立即标记为应用。"
+
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding."
+msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。"
+
+#: git-add--interactive.perl:1058
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr "无法写入块编辑文件：%s"
+
+#: git-add--interactive.perl:1059
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
+
+#: git-add--interactive.perl:1065
+#, perl-format
+msgid ""
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+"---\n"
+"要删除 '%s' 开始的行，使其成为 ' ' 开始的行（上下文）。\n"
+"要删除 '%s' 开始的行，删除它们。\n"
+"以 %s 开始的行将被删除。\n"
-#: git-submodule.sh:437
-#, sh-format
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: git-add--interactive.perl:1073
msgid ""
-"The following path is ignored by one of your .gitignore files:\n"
-"$sm_path\n"
-"Use -f if you really want to add it."
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again. If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
msgstr ""
-"以下路径被您的一个 .gitignore 文件所忽略：\n"
-"$sm_path\n"
-"如果您确实想添加它，使用 -f 参数。"
+"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
+"此次编辑被终止，该块不会被修改。\n"
-#: git-submodule.sh:455
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "æ·»å\8a ä½\8däº\8e '$sm_path' ç\9a\84ç\8e°å\98ç\89\88æ\9c¬åº\93å\88°ç´¢å¼\95"
+#: git-add--interactive.perl:1087
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr "æ\97 æ³\95读å\8f\96å\9d\97ç¼\96è¾\91æ\96\87件ï¼\9a%s"
-#: git-submodule.sh:457
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: git-add--interactive.perl:1178
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
-#: git-submodule.sh:465
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程版本库："
+#: git-add--interactive.perl:1187
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 暂存该块\n"
+"n - 不要暂存该块\n"
+"q - 退出。不暂存该块及后面的全部块\n"
+"a - 暂存该块和本文件中后面的全部块\n"
+"d - 不暂存该块和本文件中后面的全部块"
+
+#: git-add--interactive.perl:1193
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 贮藏该块\n"
+"n - 不要贮藏该块\n"
+"q - 退出。不贮藏该块及后面的全部块\n"
+"a - 贮藏该块和本文件中后面的全部块\n"
+"d - 不贮藏该块和本文件中后面的全部块"
+
+#: git-add--interactive.perl:1199
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 不暂存该块\n"
+"n - 不要不暂存该块\n"
+"q - 退出。不要不暂存该块及后面的全部块\n"
+"a - 不暂存该块和本文件中后面的全部块\n"
+"d - 不要不暂存该块和本文件中后面的全部块"
+
+#: git-add--interactive.perl:1205
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 在索引中应用该块\n"
+"n - 不要在索引中应用该块\n"
+"q - 退出。不要应用该块及后面的全部块\n"
+"a - 应用该块和本文件中后面的全部块\n"
+"d - 不要应用该块和本文件中后面的全部块"
+
+#: git-add--interactive.perl:1211
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 在工作区中丢弃该块\n"
+"n - 不要在工作区中丢弃该块\n"
+"q - 退出。不要丢弃该块及后面的全部块\n"
+"a - 丢弃该块和本文件中后面的全部块\n"
+"d - 不要丢弃该块和本文件中后面的全部块"
+
+#: git-add--interactive.perl:1217
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 在索引和工作区中丢弃该块\n"
+"n - 不要在索引和工作区中丢弃该块\n"
+"q - 退出。不要丢弃该块及后面的全部块\n"
+"a - 丢弃该块和本文件中后面的全部块\n"
+"d - 不要丢弃该块和本文件中后面的全部块"
+
+#: git-add--interactive.perl:1223
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 在索引和工作区中应用该块\n"
+"n - 不要在索引和工作区中应用该块\n"
+"q - 退出。不要应用该块及后面的全部块\n"
+"a - 应用该块和本文件中后面的全部块\n"
+"d - 不要应用该块和本文件中后面的全部块"
+
+#: git-add--interactive.perl:1232
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"g - 选择跳转到一个块\n"
+"/ - 查找和给定正则表达式匹配的块\n"
+"j - 维持该块未决状态，查看下一个未决块\n"
+"J - 维持该块未决状态，查看下一个块\n"
+"k - 维持该块未决状态，查看上一个未决块\n"
+"K - 维持该块未决状态，查看上一个块\n"
+"s - 拆分当前块为更小的块\n"
+"e - 手动编辑当前块\n"
+"? - 显示帮助\n"
+
+#: git-add--interactive.perl:1263
+msgid "The selected hunks do not apply to the index!\n"
+msgstr "选中的块不能应用到索引！\n"
+
+#: git-add--interactive.perl:1264
+msgid "Apply them to the worktree anyway? "
+msgstr "无论如何都要应用到工作区么？"
+
+#: git-add--interactive.perl:1267
+msgid "Nothing was applied.\n"
+msgstr "未应用。\n"
+
+#: git-add--interactive.perl:1278
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr "忽略未合入的：%s\n"
+
+#: git-add--interactive.perl:1287
+msgid "Only binary files changed.\n"
+msgstr "只有二进制文件被修改。\n"
+
+#: git-add--interactive.perl:1289
+msgid "No changes.\n"
+msgstr "没有修改。\n"
+
+#: git-add--interactive.perl:1297
+msgid "Patch update"
+msgstr "补丁更新"
+
+#: git-add--interactive.perl:1349
+#, perl-format
+msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
+msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1350
+#, perl-format
+msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
+msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1351
+#, perl-format
+msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
+msgstr "暂存该块 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1354
+#, perl-format
+msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
+msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1355
+#, perl-format
+msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
+msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1356
+#, perl-format
+msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
+msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1359
+#, perl-format
+msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
+msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1360
+#, perl-format
+msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
+msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1361
+#, perl-format
+msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
+msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1364
+#, perl-format
+msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
+msgstr "修改索引中的应用状态 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1365
+#, perl-format
+msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
+msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1366
+#, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
+msgstr "将此块应用到索引 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1369
+#, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
+msgstr "修改工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1370
+#, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
+msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1371
+#, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
+msgstr "从工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1374
+#, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr "修改索引和工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1375
+#, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr "从索引和工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1376
+#, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1379
+#, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr "修改索引和工作区中的应用状态 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1380
+#, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr "从索引和工作区中删除应用状态 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1381
+#, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr "在索引和工作区中应用该块 [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1484
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "跳转到哪个块（<回车> 查看更多）？ "
+
+#: git-add--interactive.perl:1486
+msgid "go to which hunk? "
+msgstr "跳转到哪个块？"
+
+#: git-add--interactive.perl:1495
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr "无效数字：'%s'\n"
+
+#: git-add--interactive.perl:1500
+#, perl-format
+msgid "Sorry, only %d hunk available.\n"
+msgid_plural "Sorry, only %d hunks available.\n"
+msgstr[0] "对不起，只有 %d 个可用块。\n"
+msgstr[1] "对不起，只有 %d 个可用块。\n"
+
+#: git-add--interactive.perl:1526
+msgid "search for regex? "
+msgstr "使用正则表达式搜索？"
+
+#: git-add--interactive.perl:1539
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr "错误的正则表达式 %s：%s\n"
+
+#: git-add--interactive.perl:1549
+msgid "No hunk matches the given pattern\n"
+msgstr "没有和给定模式相匹配的快\n"
+
+#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
+msgid "No previous hunk\n"
+msgstr "没有前一个块\n"
+
+#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
+msgid "No next hunk\n"
+msgstr "没有下一个块\n"
+
+#: git-add--interactive.perl:1597
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] "拆分为 %d 块。\n"
+msgstr[1] "拆分为 %d 块。\n"
+
+#: git-add--interactive.perl:1649
+msgid "Review diff"
+msgstr "检视 diff"
+
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+#: git-add--interactive.perl:1668
+msgid ""
+"status - show paths with changes\n"
+"update - add working tree state to the staged set of changes\n"
+"revert - revert staged set of changes back to the HEAD version\n"
+"patch - pick hunks and update selectively\n"
+"diff - view diff between HEAD and index\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
+msgstr ""
+"status - 显示含变更的路径\n"
+"update - 添加工作区状态至暂存列表\n"
+"revert - 还原修改的暂存集至 HEAD 版本\n"
+"patch - 挑选块并且有选择地更新\n"
+"diff - 显示 HEAD 和索引间差异\n"
+"add untracked - 添加未跟踪文件的内容至暂存列表\n"
+
+#: git-add--interactive.perl:1685 git-add--interactive.perl:1690
+#: git-add--interactive.perl:1693 git-add--interactive.perl:1700
+#: git-add--interactive.perl:1704 git-add--interactive.perl:1710
+msgid "missing --"
+msgstr "缺失 --"
+
+#: git-add--interactive.perl:1706
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr "未知的 --patch 模式：%s"
+
+#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr "无效的参数 %s，期望是 --"
+
+#: git-send-email.perl:121
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr "本地时间和 GMT 有不到一分钟间隔\n"
+
+#: git-send-email.perl:128 git-send-email.perl:134
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr "本地时间偏移量大于等于 24 小时\n"
+
+#: git-send-email.perl:202 git-send-email.perl:208
+msgid "the editor exited uncleanly, aborting everything"
+msgstr "编辑器非正常退出，终止所有操作"
+
+#: git-send-email.perl:282
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
+
+#: git-send-email.perl:287
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr "'%s.final' 包含编辑的邮件。\n"
+
+#: git-send-email.perl:305
+msgid "--dump-aliases incompatible with other options\n"
+msgstr "--dump-aliases 和其它选项不兼容\n"
+
+#: git-send-email.perl:368 git-send-email.perl:623
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr "不能在仓库之外运行 git format-patch\n"
+
+#: git-send-email.perl:437
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr "未知的 --suppress-cc 字段：'%s'\n"
+
+#: git-send-email.perl:466
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr "未知的 --confirm 设置：'%s'\n"
+
+#: git-send-email.perl:498
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr "警告：不支持带引号的 sendmail 别名：%s\n"
+
+#: git-send-email.perl:500
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr "警告：不支持 `:include:`：%s\n"
+
+#: git-send-email.perl:502
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n"
+
+#: git-send-email.perl:507
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr "警告：不能识别的 sendmail 行：%s\n"
+
+#: git-send-email.perl:589
+#, perl-format
+msgid ""
+"File '%s' exists but it could also be the range of commits\n"
+"to produce patches for. Please disambiguate by...\n"
+"\n"
+" * Saying \"./%s\" if you mean a file; or\n"
+" * Giving --format-patch option if you mean a range.\n"
+msgstr ""
+"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
+"歧义：\n"
+"\n"
+" * 如果含义为一个文件，使用 \"./%s\"，或者\n"
+" * 如果含义为一个范围，使用 --format-patch 选项。\n"
-#: git-submodule.sh:467
-#, sh-format
+#: git-send-email.perl:610
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr "无法打开目录 %s: %s"
+
+#: git-send-email.perl:634
+#, perl-format
msgid ""
-"If you want to reuse this local git directory instead of cloning again from"
-msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
+"fatal: %s: %s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"严重：%s：%s\n"
+"警告：补丁未能发送\n"
-#: git-submodule.sh:469
-#, sh-format
+#: git-send-email.perl:645
msgid ""
-"use the '--force' option. If the local git directory is not the correct repo"
-msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+"\n"
+"未指定补丁文件！\n"
+"\n"
-#: git-submodule.sh:470
-#, sh-format
+#: git-send-email.perl:658
+#, perl-format
+msgid "No subject line in %s?"
+msgstr "在 %s 中没有标题行？"
+
+#: git-send-email.perl:668
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr "无法写入 %s: %s"
+
+#: git-send-email.perl:678
msgid ""
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
+"Lines beginning in \"GIT:\" will be removed.\n"
+"Consider including an overall diffstat or table of contents\n"
+"for the patch you are writing.\n"
+"\n"
+"Clear the body content if you don't wish to send a summary.\n"
+msgstr ""
+"以 \"GIT:\" 开头的行将被删除。\n"
+"考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n"
+"\n"
+"如果您不想发送摘要，清除内容。\n"
-#: git-submodule.sh:472
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "æ¿\80æ´»æ\9c¬å\9c° git ç\9b®å½\95å\88°å\90模ç»\84 '$sm_name'ã\80\82"
+#: git-send-email.perl:701
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "æ\97 æ³\95æ\89\93å¼\80 %s.final: %s"
-#: git-submodule.sh:484
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "不能检出子模组 '$sm_path'"
+#: git-send-email.perl:704
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr "无法打开 %s: %s"
-#: git-submodule.sh:489
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "无法添加子模组 '$sm_path'"
+#: git-send-email.perl:739
+msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+msgstr "To/Cc/Bcc 字段不解析，它们被忽略\n"
-#: git-submodule.sh:498
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "无法注册子模组 '$sm_path'"
+#: git-send-email.perl:748
+msgid "Summary email is empty, skipping it\n"
+msgstr "摘要邮件为空，跳过\n"
-#: git-submodule.sh:542
-#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "正在进入 '$prefix$displaypath'"
+#. TRANSLATORS: please keep [y/N] as is.
+#: git-send-email.perl:780
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr "您确认要使用 <%s> [y/N]？"
-#: git-submodule.sh:562
-#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
-msgstr "停止于 '$prefix$displaypath'，脚本返回非零值。"
+#: git-send-email.perl:809
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr "如下文件含 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n"
-#: git-submodule.sh:608
-#, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
+#: git-send-email.perl:814
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？"
-#: git-submodule.sh:617
-#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "无法为子模组路径 '$displaypath' 注册 url"
+#: git-send-email.perl:822
+#, perl-format
+msgid ""
+"Refusing to send because the patch\n"
+"\t%s\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
+msgstr ""
+"拒绝发送，因为补丁\n"
+"\t%s\n"
+"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n"
-#: git-submodule.sh:619
-#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
+#: git-send-email.perl:841
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr "邮件将要发送给谁？"
-#: git-submodule.sh:636
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
+#: git-send-email.perl:859
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr "严重：别名 '%s' 扩展为它自己\n"
-#: git-submodule.sh:674
-#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
+#: git-send-email.perl:871
+msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
+msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ？"
-#: git-submodule.sh:691
-#, sh-format
-msgid "Submodule work tree '$displaypath' contains a .git directory"
-msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
+#: git-send-email.perl:921 git-send-email.perl:929
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n"
-#: git-submodule.sh:692
-#, sh-format
-msgid ""
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
+#. TRANSLATORS: Make sure to include [q] [d] [e] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:933
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)："
+
+#: git-send-email.perl:1234
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr "CA 路径 \"%s\" 不存在"
+
+#: git-send-email.perl:1309
+msgid ""
+" The Cc list above has been expanded by additional\n"
+" addresses found in the patch commit message. By default\n"
+" send-email prompts before sending whenever this occurs.\n"
+" This behavior is controlled by the sendemail.confirm\n"
+" configuration setting.\n"
+"\n"
+" For additional information, run 'git send-email --help'.\n"
+" To retain the current behavior, but squelch this message,\n"
+" run 'git config --global sendemail.confirm auto'.\n"
+"\n"
+msgstr ""
+" 以上的抄送列表（Cc）已经用补丁提交信息中发现的地址进行\n"
+" 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
+" sendemail.confirm 配置设置。\n"
+"\n"
+" 更多信息，执行 'git send-email --help'。\n"
+" 要保持当前行为，但不显示此信息，运行 'git config --global\n"
+" sendemail.confirm auto'。\n"
+"\n"
-#: git-submodule.sh:698
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们"
+#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1324
+msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
+msgstr "发送邮件？([y]es|[n]o|[q]uit|[a]ll)："
+
+#: git-send-email.perl:1327
+msgid "Send this email reply required"
+msgstr "发送要求的邮件回复"
+
+#: git-send-email.perl:1353
+msgid "The required SMTP server is not properly defined."
+msgstr "要求的 SMTP 服务器未被正确定义。"
+
+#: git-send-email.perl:1397
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr "服务器不支持 STARTTLS！%s"
+
+#: git-send-email.perl:1403
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
+
+#: git-send-email.perl:1421
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "无法发送 %s\n"
+
+#: git-send-email.perl:1424
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr "演习发送 %s\n"
+
+#: git-send-email.perl:1424
+#, perl-format
+msgid "Sent %s\n"
+msgstr "正发送 %s\n"
+
+#: git-send-email.perl:1426
+msgid "Dry-OK. Log says:\n"
+msgstr "演习成功。日志说：\n"
+
+#: git-send-email.perl:1426
+msgid "OK. Log says:\n"
+msgstr "OK。日志说：\n"
+
+#: git-send-email.perl:1438
+msgid "Result: "
+msgstr "结果："
+
+#: git-send-email.perl:1441
+msgid "Result: OK\n"
+msgstr "结果：OK\n"
+
+#: git-send-email.perl:1454
+#, perl-format
+msgid "can't open file %s"
+msgstr "无法打开文件 %s"
+
+#: git-send-email.perl:1501 git-send-email.perl:1521
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
+
+#: git-send-email.perl:1507
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
+
+#: git-send-email.perl:1555
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
+
+#: git-send-email.perl:1578
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr "(body) 添加 cc: %s 自行 '%s'\n"
+
+#: git-send-email.perl:1676
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr "(%s) 不能执行 '%s'"
-#: git-submodule.sh:701
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr "已清除目录 '$displaypath'"
+#: git-send-email.perl:1683
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) 添加 %s: %s 自：'%s'\n"
-#: git-submodule.sh:702
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr "无法移除子模组工作区 '$displaypath'"
+#: git-send-email.perl:1687
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr "(%s) 无法关闭管道至 '%s'"
-#: git-submodule.sh:705
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr "不能创建空的子模组目录 '$displaypath'"
+#: git-send-email.perl:1714
+msgid "cannot send message as 7bit"
+msgstr "不能以 7bit 形式发送信息"
-#: git-submodule.sh:714
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
+#: git-send-email.perl:1722
+msgid "invalid transfer encoding"
+msgstr "无效的传送编码"
-#: git-submodule.sh:830
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"子模组路径 '$displaypath' 没有初始化\n"
-"也许您想用 'update --init'？"
+#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
+#, perl-format
+msgid "unable to open %s: %s\n"
+msgstr "不能打开 %s：%s\n"
-#: git-submodule.sh:843
-#, sh-format
-msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
+#: git-send-email.perl:1744
+#, perl-format
+msgid "%s: patch contains a line longer than 998 characters"
+msgstr "%s：补丁包含一个超过 998 字符的行"
-#: git-submodule.sh:852
-#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr "无法在子模组路径 '$sm_path' 中获取"
+#: git-send-email.perl:1760
+#, perl-format
+msgid "Skipping %s with backup suffix '%s'.\n"
+msgstr "略过 %s 含备份后缀 '%s'。\n"
-#: git-submodule.sh:876
-#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
-msgstr "无法在子模组路径 '$displaypath' 中获取"
+#. TRANSLATORS: please keep "[y|N]" as is.
+#: git-send-email.perl:1764
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr "您真的要发送 %s？[y|N]："
-#: git-submodule.sh:890
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
+#~ msgid "tag: tagging "
+#~ msgstr "tag: tagging "
+
+#~ msgid "object of unknown type"
+#~ msgstr "未知类型的对象"
+
+#~ msgid "commit object"
+#~ msgstr "提交对象"
-#: git-submodule.sh:891
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
+#~ msgid "tree object"
+#~ msgstr "树对象"
-#: git-submodule.sh:895
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
+#~ msgid "blob object"
+#~ msgstr "数据对象"
-#: git-submodule.sh:896
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
+#~ msgid "other tag object"
+#~ msgstr "其它标签对象"
-#: git-submodule.sh:901
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
+#~ msgid ""
+#~ "There is nothing to exclude from by :(exclude) patterns.\n"
+#~ "Perhaps you forgot to add either ':/' or '.' ?"
+#~ msgstr ""
+#~ "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
+#~ "添加 ':/' 或 '.' ？"
-#: git-submodule.sh:902
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
+#~ msgid "unrecognized format: %%(%s)"
+#~ msgstr "未能识别的格式：%%(%s)"
-#: git-submodule.sh:907
-#, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
-msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
+#~ msgid ":strip= requires a positive integer argument"
+#~ msgstr ":strip= 需要一个正整型参数"
-#: git-submodule.sh:908
-#, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
+#~ msgid "ref '%s' does not have %ld components to :strip"
+#~ msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
-#: git-submodule.sh:938
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "无法递归进子模组路径 '$displaypath'"
+#~ msgid "unknown %.*s format %s"
+#~ msgstr "未知的 %.*s 格式 %s"
-#: git-submodule.sh:1046
-msgid "The --cached option cannot be used with the --files option"
-msgstr "选项 --cached 不能和选项 --files 同时使用"
+#~ msgid "[%s: gone]"
+#~ msgstr "[%s: 丢失]"
-#: git-submodule.sh:1098
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "意外的模式 $mod_dst"
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
-# 译者：注意保持前导空格
-#: git-submodule.sh:1118
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr " 警告：$display_name 未包含提交 $sha1_src"
+#~ msgid "[%s: behind %d]"
+#~ msgstr "[%s：落后 %d]"
-# 译者：注意保持前导空格
-#: git-submodule.sh:1121
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr " 警告：$display_name 未包含提交 $sha1_dst"
+#~ msgid "[%s: ahead %d]"
+#~ msgstr "[%s：领先 %d]"
-# 译者：注意保持前导空格
-#: git-submodule.sh:1124
-#, sh-format
-msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"
+#~ msgid "[%s: ahead %d, behind %d]"
+#~ msgstr "[%s：领先 %d，落后 %d]"
-#: git-submodule.sh:1149
-msgid "blob"
-msgstr "数据对象"
+#~ msgid " **** invalid ref ****"
+#~ msgstr " **** 无效引用 ****"
-#: git-submodule.sh:1267
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr "无法递归进子模组路径 '$sm_path'"
+#~ msgid "insanely long object directory %.*s"
+#~ msgstr "不正常的长对象目录 %.*s"
-#: git-submodule.sh:1331
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "为 '$displaypath' 同步子模组 url"
+#~ msgid "git merge [<options>] <msg> HEAD <commit>"
+#~ msgstr "git merge [<选项>] <说明> HEAD <提交>"
+
+#~ msgid "'%s' is not a commit"
+#~ msgstr "'%s' 不是一个提交"
+
+#~ msgid "cannot open file '%s'"
+#~ msgstr "无法打开文件 '%s'"
+
+#~ msgid "could not close file %s"
+#~ msgstr "无法关闭文件 %s"
+
+#~ msgid "tag name too long: %.*s..."
+#~ msgstr "标签名称太长：%.*s..."
+
+#~ msgid "tag header too big."
+#~ msgstr "标签头信息太大。"
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for discarding"
+#~ msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃"
+
+#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
+#~ msgstr "使用一个试验性的基于空行的启发式算法改进差异显示"
+
+#~ msgid "Clever... amending the last one with dirty index."
+#~ msgstr "聪明... 用脏索引修补最后一个提交。"
+
+#~ msgid ""
+#~ "the following submodule (or one of its nested submodules)\n"
+#~ "uses a .git directory:"
+#~ msgid_plural ""
+#~ "the following submodules (or one of their nested submodules)\n"
+#~ "use a .git directory:"
+#~ msgstr[0] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
+#~ msgstr[1] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
+
+#~ msgid ""
+#~ "\n"
+#~ "(use 'rm -rf' if you really want to remove it including all of its "
+#~ "history)"
+#~ msgstr ""
+#~ "\n"
+#~ "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
+
+#~ msgid "Could not write to %s"
+#~ msgstr "不能写入 %s"
+
+#~ msgid "Error wrapping up %s."
+#~ msgstr "错误收尾 %s。"
+
+#~ msgid "Your local changes would be overwritten by cherry-pick."
+#~ msgstr "您的本地修改将被拣选操作覆盖。"
+
+#~ msgid "Cannot revert during another revert."
+#~ msgstr "不能在回退中执行另一回退。"
+
+#~ msgid "Cannot cherry-pick during another cherry-pick."
+#~ msgstr "不能在拣选过程中执行另一拣选。"
+
+#~ msgid "Could not parse line %d."
+#~ msgstr "不能解析第 %d 行。"
+
+#~ msgid "Could not open %s"
+#~ msgstr "不能打开 %s"
+
+#~ msgid "Could not read %s."
+#~ msgstr "不能读取 %s。"
+
+#~ msgid "Could not format %s."
+#~ msgstr "不能格式化 %s。"
+
+#~ msgid "%s: %s"
+#~ msgstr "%s：%s"
+
+#~ msgid "cannot open %s: %s"
+#~ msgstr "不能打开 %s：%s"
+
+#~ msgid "You need to set your committer info first"
+#~ msgstr "您需要先设置您的提交者信息"